ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msi: Fix MSIREG_OpenUserComponentsKey and MSIREG_DeleteUpgradeCodesKey for Wow64. 

Signed-off-by: Hans Leidekker <hans@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Hans Leidekker 2016-11-29 09:43:59 +01:00 committed by Alexandre Julliard
parent cada88a64b
commit 3b5b3ef185
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dlls/msi/registry.c
View File

@ -653,6 +653,7 @@ UINT MSIREG_OpenUserDataFeaturesKey(LPCWSTR szProduct, LPCWSTR szUserSid, MSIINS
UINT MSIREG_OpenUserComponentsKey(LPCWSTR szComponent, HKEY *key, BOOL create) UINT MSIREG_OpenUserComponentsKey(LPCWSTR szComponent, HKEY *key, BOOL create)
{ {
WCHAR squashed_cc[SQUASHED_GUID_SIZE], keypath[0x200]; WCHAR squashed_cc[SQUASHED_GUID_SIZE], keypath[0x200];
REGSAM access = KEY_WOW64_64KEY | KEY_ALL_ACCESS;
UINT ret; UINT ret;
if (!squash_guid( szComponent, squashed_cc)) return ERROR_FUNCTION_FAILED; if (!squash_guid( szComponent, squashed_cc)) return ERROR_FUNCTION_FAILED;
@ -667,7 +668,7 @@ UINT MSIREG_OpenUserComponentsKey(LPCWSTR szComponent, HKEY *key, BOOL create)
strcpyW(keypath, szInstaller_Components); strcpyW(keypath, szInstaller_Components);
strcatW( keypath, squashed_cc ); strcatW( keypath, squashed_cc );
return RegOpenKeyW(HKEY_LOCAL_MACHINE, keypath, key); return RegOpenKeyExW( HKEY_LOCAL_MACHINE, keypath, 0, access, key );
} }
UINT MSIREG_OpenUserDataComponentKey(LPCWSTR szComponent, LPCWSTR szUserSid, HKEY *key, BOOL create) UINT MSIREG_OpenUserDataComponentKey(LPCWSTR szComponent, LPCWSTR szUserSid, HKEY *key, BOOL create)
@ -942,14 +943,18 @@ UINT MSIREG_OpenUserUpgradeCodesKey(LPCWSTR szUpgradeCode, HKEY* key, BOOL creat
UINT MSIREG_DeleteUpgradeCodesKey( const WCHAR *code ) UINT MSIREG_DeleteUpgradeCodesKey( const WCHAR *code )
{ {
WCHAR squashed_code[SQUASHED_GUID_SIZE], keypath[0x200]; WCHAR squashed_code[SQUASHED_GUID_SIZE];
REGSAM access = KEY_WOW64_64KEY | KEY_ALL_ACCESS;
HKEY hkey;
LONG ret;
if (!squash_guid( code, squashed_code )) return ERROR_FUNCTION_FAILED; if (!squash_guid( code, squashed_code )) return ERROR_FUNCTION_FAILED;
TRACE( "%s squashed %s\n", debugstr_w(code), debugstr_w(squashed_code) ); TRACE( "%s squashed %s\n", debugstr_w(code), debugstr_w(squashed_code) );
strcpyW( keypath, szInstaller_UpgradeCodes ); if (RegOpenKeyExW( HKEY_LOCAL_MACHINE, szInstaller_UpgradeCodes, 0, access, &hkey )) return ERROR_SUCCESS;
strcatW( keypath, squashed_code ); ret = RegDeleteTreeW( hkey, squashed_code );
return RegDeleteTreeW( HKEY_LOCAL_MACHINE, keypath ); RegCloseKey( hkey );
return ret;
} }
UINT MSIREG_DeleteUserUpgradeCodesKey(LPCWSTR szUpgradeCode) UINT MSIREG_DeleteUserUpgradeCodesKey(LPCWSTR szUpgradeCode)