marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msi: Always use the 64-bit registry view to retrieve registered owner and organization. 

Signed-off-by: Hans Leidekker <hans@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
stable
Hans Leidekker 2019-04-19 11:30:15 +02:00 committed by Alexandre Julliard
parent dec192ce22
commit 0d17f36c13
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dlls/msi/package.c
View File

@ -742,7 +742,7 @@ static VOID set_installer_properties(MSIPACKAGE *package)
'W','i','n','d','o','w','s',' ','N','T','\\', 'W','i','n','d','o','w','s',' ','N','T','\\',
'C','u','r','r','e','n','t','V','e','r','s','i','o','n',0 'C','u','r','r','e','n','t','V','e','r','s','i','o','n',0
}; };
static const WCHAR szRegisteredUser[] = {'R','e','g','i','s','t','e','r','e','d','O','w','n','e','r',0}; static const WCHAR szRegisteredOwner[] = {'R','e','g','i','s','t','e','r','e','d','O','w','n','e','r',0};
static const WCHAR szRegisteredOrganization[] = { static const WCHAR szRegisteredOrganization[] = {
'R','e','g','i','s','t','e','r','e','d','O','r','g','a','n','i','z','a','t','i','o','n',0 'R','e','g','i','s','t','e','r','e','d','O','r','g','a','n','i','z','a','t','i','o','n',0
}; };
@ -971,10 +971,11 @@ static VOID set_installer_properties(MSIPACKAGE *package)
CloseHandle( hkey ); CloseHandle( hkey );
} }
if ((!username || !companyname) && if ((!username || !companyname) &&
RegOpenKeyW( HKEY_LOCAL_MACHINE, szCurrentVersionNT, &hkey ) == ERROR_SUCCESS) RegOpenKeyExW( HKEY_LOCAL_MACHINE, szCurrentVersionNT, 0, KEY_QUERY_VALUE|KEY_WOW64_64KEY,
&hkey ) == ERROR_SUCCESS)
{ {
if (!username && if (!username &&
(username = msi_reg_get_val_str( hkey, szRegisteredUser ))) (username = msi_reg_get_val_str( hkey, szRegisteredOwner )))
msi_set_property( package->db, szUSERNAME, username, -1 ); msi_set_property( package->db, szUSERNAME, username, -1 );
if (!companyname && if (!companyname &&
(companyname = msi_reg_get_val_str( hkey, szRegisteredOrganization ))) (companyname = msi_reg_get_val_str( hkey, szRegisteredOrganization )))