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

msi: Remove 32-bit component registry keys with KEY_WOW64_32KEY flag.

This commit is contained in:
Akihiro Sagawa 2015-01-18 22:04:06 +09:00 committed by Alexandre Julliard
parent cdf3c23645
commit e52cbbcd03
2 changed files with 16 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
dlls/msi/action.c
View File

@ -2588,30 +2588,6 @@ static const WCHAR *get_root_key( MSIPACKAGE *package, INT root, HKEY *root_key
return ret; return ret;
} }
static WCHAR *get_keypath( MSICOMPONENT *comp, HKEY root, const WCHAR *path )
{
static const WCHAR prefixW[] = {'S','O','F','T','W','A','R','E','\\'};
static const UINT len = sizeof(prefixW) / sizeof(prefixW[0]);
if ((is_64bit || is_wow64) &&
!(comp->Attributes & msidbComponentAttributes64bit) &&
root == HKEY_LOCAL_MACHINE && !strncmpiW( path, prefixW, len ))
{
UINT size;
WCHAR *path_32node;
size = (strlenW( path ) + strlenW( szWow6432Node ) + 2) * sizeof(WCHAR);
if (!(path_32node = msi_alloc( size ))) return NULL;
memcpy( path_32node, path, len * sizeof(WCHAR) );
strcpyW( path_32node + len, szWow6432Node );
strcatW( path_32node, szBackSlash );
strcatW( path_32node, path + len );
return path_32node;
}
return strdupW( path );
}
static inline REGSAM get_registry_view( const MSICOMPONENT *comp ) static inline REGSAM get_registry_view( const MSICOMPONENT *comp )
{ {
REGSAM view = 0; REGSAM view = 0;
@ -2627,9 +2603,7 @@ static HKEY open_key( const MSICOMPONENT *comp, HKEY root, const WCHAR *path, BO
HKEY hkey, ret = NULL; HKEY hkey, ret = NULL;
LONG res; LONG res;
if (comp) access |= get_registry_view( comp );
access |= get_registry_view( comp );
else if (is_wow64) access |= KEY_WOW64_64KEY;
if (!(subkey = strdupW( path ))) return NULL; if (!(subkey = strdupW( path ))) return NULL;
p = subkey; p = subkey;
@ -2952,20 +2926,20 @@ static UINT ACTION_WriteRegistryValues(MSIPACKAGE *package)
return rc; return rc;
} }
static void delete_key( HKEY root, const WCHAR *path ) static void delete_key( const MSICOMPONENT *comp, HKEY root, const WCHAR *path )
{ {
REGSAM access = 0; REGSAM access = 0;
WCHAR *subkey, *p; WCHAR *subkey, *p;
HKEY hkey; HKEY hkey;
LONG res; LONG res;
if (is_wow64) access |= KEY_WOW64_64KEY; access |= get_registry_view( comp );
if (!(subkey = strdupW( path ))) return; if (!(subkey = strdupW( path ))) return;
for (;;) for (;;)
{ {
if ((p = strrchrW( subkey, '\\' ))) *p = 0; if ((p = strrchrW( subkey, '\\' ))) *p = 0;
hkey = open_key( NULL, root, subkey, FALSE ); hkey = open_key( comp, root, subkey, FALSE );
if (!hkey) break; if (!hkey) break;
if (p && p[1]) if (p && p[1])
res = RegDeleteKeyExW( hkey, p + 1, access, 0 ); res = RegDeleteKeyExW( hkey, p + 1, access, 0 );
@ -2982,13 +2956,13 @@ static void delete_key( HKEY root, const WCHAR *path )
msi_free( subkey ); msi_free( subkey );
} }
static void delete_value( HKEY root, const WCHAR *path, const WCHAR *value ) static void delete_value( const MSICOMPONENT *comp, HKEY root, const WCHAR *path, const WCHAR *value )
{ {
LONG res; LONG res;
HKEY hkey; HKEY hkey;
DWORD num_subkeys, num_values; DWORD num_subkeys, num_values;
if ((hkey = open_key( NULL, root, path, FALSE ))) if ((hkey = open_key( comp, root, path, FALSE )))
{ {
if ((res = RegDeleteValueW( hkey, value ))) if ((res = RegDeleteValueW( hkey, value )))
TRACE("failed to delete value %s (%d)\n", debugstr_w(value), res); TRACE("failed to delete value %s (%d)\n", debugstr_w(value), res);
@ -2999,20 +2973,20 @@ static void delete_value( HKEY root, const WCHAR *path, const WCHAR *value )
if (!res && !num_subkeys && !num_values) if (!res && !num_subkeys && !num_values)
{ {
TRACE("removing empty key %s\n", debugstr_w(path)); TRACE("removing empty key %s\n", debugstr_w(path));
delete_key( root, path ); delete_key( comp, root, path );
} }
} }
} }
static void delete_tree( HKEY root, const WCHAR *path ) static void delete_tree( const MSICOMPONENT *comp, HKEY root, const WCHAR *path )
{ {
LONG res; LONG res;
HKEY hkey; HKEY hkey;
if (!(hkey = open_key( NULL, root, path, FALSE ))) return; if (!(hkey = open_key( comp, root, path, FALSE ))) return;
res = RegDeleteTreeW( hkey, NULL ); res = RegDeleteTreeW( hkey, NULL );
if (res) TRACE("failed to delete subtree of %s (%d)\n", debugstr_w(path), res); if (res) TRACE("failed to delete subtree of %s (%d)\n", debugstr_w(path), res);
delete_key( root, path ); delete_key( comp, root, path );
RegCloseKey( hkey ); RegCloseKey( hkey );
} }
@ -3020,7 +2994,7 @@ static UINT ITERATE_RemoveRegistryValuesOnUninstall( MSIRECORD *row, LPVOID para
{ {
MSIPACKAGE *package = param; MSIPACKAGE *package = param;
LPCWSTR component, name, key_str, root_key_str; LPCWSTR component, name, key_str, root_key_str;
LPWSTR deformated_key, deformated_name, ui_key_str, keypath; LPWSTR deformated_key, deformated_name, ui_key_str;
MSICOMPONENT *comp; MSICOMPONENT *comp;
MSIRECORD *uirow; MSIRECORD *uirow;
BOOL delete_key = FALSE; BOOL delete_key = FALSE;
@ -3069,11 +3043,9 @@ static UINT ITERATE_RemoveRegistryValuesOnUninstall( MSIRECORD *row, LPVOID para
deformat_string( package, name, &deformated_name ); deformat_string( package, name, &deformated_name );
keypath = get_keypath( comp, hkey_root, deformated_key ); if (delete_key) delete_tree( comp, hkey_root, deformated_key );
else delete_value( comp, hkey_root, deformated_key, deformated_name );
msi_free( deformated_key ); msi_free( deformated_key );
if (delete_key) delete_tree( hkey_root, keypath );
else delete_value( hkey_root, keypath, deformated_name );
msi_free( keypath );
uirow = MSI_CreateRecord( 2 ); uirow = MSI_CreateRecord( 2 );
MSI_RecordSetStringW( uirow, 1, ui_key_str ); MSI_RecordSetStringW( uirow, 1, ui_key_str );
@ -3090,7 +3062,7 @@ static UINT ITERATE_RemoveRegistryValuesOnInstall( MSIRECORD *row, LPVOID param
{ {
MSIPACKAGE *package = param; MSIPACKAGE *package = param;
LPCWSTR component, name, key_str, root_key_str; LPCWSTR component, name, key_str, root_key_str;
LPWSTR deformated_key, deformated_name, ui_key_str, keypath; LPWSTR deformated_key, deformated_name, ui_key_str;
MSICOMPONENT *comp; MSICOMPONENT *comp;
MSIRECORD *uirow; MSIRECORD *uirow;
BOOL delete_key = FALSE; BOOL delete_key = FALSE;
@ -3134,11 +3106,9 @@ static UINT ITERATE_RemoveRegistryValuesOnInstall( MSIRECORD *row, LPVOID param
deformat_string( package, name, &deformated_name ); deformat_string( package, name, &deformated_name );
keypath = get_keypath( comp, hkey_root, deformated_key ); if (delete_key) delete_tree( comp, hkey_root, deformated_key );
else delete_value( comp, hkey_root, deformated_key, deformated_name );
msi_free( deformated_key ); msi_free( deformated_key );
if (delete_key) delete_tree( hkey_root, keypath );
else delete_value( hkey_root, keypath, deformated_name );
msi_free( keypath );
uirow = MSI_CreateRecord( 2 ); uirow = MSI_CreateRecord( 2 );
MSI_RecordSetStringW( uirow, 1, ui_key_str ); MSI_RecordSetStringW( uirow, 1, ui_key_str );

1
dlls/msi/msipriv.h
View File

@ -1159,7 +1159,6 @@ static const WCHAR szX64[] = {'x','6','4',0};
static const WCHAR szAMD64[] = {'A','M','D','6','4',0}; static const WCHAR szAMD64[] = {'A','M','D','6','4',0};
static const WCHAR szARM[] = {'A','r','m',0}; static const WCHAR szARM[] = {'A','r','m',0};
static const WCHAR szWow6432NodeCLSID[] = {'W','o','w','6','4','3','2','N','o','d','e','\\','C','L','S','I','D',0}; static const WCHAR szWow6432NodeCLSID[] = {'W','o','w','6','4','3','2','N','o','d','e','\\','C','L','S','I','D',0};
static const WCHAR szWow6432Node[] = {'W','o','w','6','4','3','2','N','o','d','e',0};
static const WCHAR szStreams[] = {'_','S','t','r','e','a','m','s',0}; static const WCHAR szStreams[] = {'_','S','t','r','e','a','m','s',0};
static const WCHAR szStorages[] = {'_','S','t','o','r','a','g','e','s',0}; static const WCHAR szStorages[] = {'_','S','t','o','r','a','g','e','s',0};
static const WCHAR szMsiPublishAssemblies[] = {'M','s','i','P','u','b','l','i','s','h','A','s','s','e','m','b','l','i','e','s',0}; static const WCHAR szMsiPublishAssemblies[] = {'M','s','i','P','u','b','l','i','s','h','A','s','s','e','m','b','l','i','e','s',0};