Hans Leidekker : msi: Always use the 64-bit registry view to retrieve registered owner and organization.
Alexandre Julliard
julliard at winehq.org
Fri Apr 19 17:30:45 CDT 2019
Module: wine
Branch: master
Commit: 0d17f36c13f129d5bfed290a0583b441657a6a9a
URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d17f36c13f129d5bfed290a0583b441657a6a9a
Author: Hans Leidekker <hans at codeweavers.com>
Date: Fri Apr 19 11:30:15 2019 +0200
msi: Always use the 64-bit registry view to retrieve registered owner and organization.
Signed-off-by: Hans Leidekker <hans at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/msi/package.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/dlls/msi/package.c b/dlls/msi/package.c
index 490c687..1e16fb1 100644
--- a/dlls/msi/package.c
+++ b/dlls/msi/package.c
@@ -742,7 +742,7 @@ static VOID set_installer_properties(MSIPACKAGE *package)
'W','i','n','d','o','w','s',' ','N','T','\\',
'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[] = {
'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 );
}
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 &&
- (username = msi_reg_get_val_str( hkey, szRegisteredUser )))
+ (username = msi_reg_get_val_str( hkey, szRegisteredOwner )))
msi_set_property( package->db, szUSERNAME, username, -1 );
if (!companyname &&
(companyname = msi_reg_get_val_str( hkey, szRegisteredOrganization )))
More information about the wine-cvs
mailing list