[ros-diffs] [reactos] 235/360: [WINESYNC] msi: Always use the 64-bit registry view to retrieve registered owner and organization.

[winesync]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bef1f25922726d1e19f6e…

commit bef1f25922726d1e19f6e1cd69a07dfe73c953f2
Author:     winesync <ros-dev(a)reactos.org>
AuthorDate: Sun Mar 13 01:24:01 2022 +0100
Commit:     Mark Jansen <mark.jansen(a)reactos.org>
CommitDate: Sun Mar 20 19:28:20 2022 +0100

    [WINESYNC] msi: Always use the 64-bit registry view to retrieve registered owner and
organization.
    
    Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>
    Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
    
    wine commit id 0d17f36c13f129d5bfed290a0583b441657a6a9a by Hans Leidekker
<hans(a)codeweavers.com>
---
 dll/win32/msi/package.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/dll/win32/msi/package.c b/dll/win32/msi/package.c
index a634a101961..7438ad82a1e 100644
--- a/dll/win32/msi/package.c
+++ b/dll/win32/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 )))