Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-29 02:25:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WINESYNC] msi: Get rid of a redundant get_registry_view call.

Browse source 
Signed-off-by: Hans Leidekker <hans@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 5caebb2650e386904544a2c0326e2b0f1bd39bc3 by Hans Leidekker <hans@codeweavers.com>
This commit is contained in:
winesync 2022-03-13 01:23:58 +01:00 committed by Mark Jansen
parent 3635da2096
commit 92a82b2faa
No known key found for this signature in database
GPG key ID: B39240EE84BEAE8B
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
dll/win32/msi/action.c
View file

@ -2929,7 +2929,7 @@ static int is_key_empty(const MSICOMPONENT *comp, HKEY root, const WCHAR *path)
HKEY key;
LONG res;
key = open_key(comp, root, path, FALSE, get_registry_view(comp) | KEY_READ);
key = open_key(comp, root, path, FALSE, KEY_READ);
if (!key) return 0;
res = RegQueryInfoKeyW(key, 0, 0, 0, &subkeys, 0, 0, &values, 0, 0, 0, 0);
@ -2941,12 +2941,10 @@ static int is_key_empty(const MSICOMPONENT *comp, HKEY root, const WCHAR *path)
static void delete_key( const MSICOMPONENT *comp, HKEY root, const WCHAR *path )
{
LONG res = ERROR_SUCCESS;
REGSAM access = 0;
REGSAM access = get_registry_view( comp );
WCHAR *subkey, *p;
HKEY hkey;
access |= get_registry_view( comp );
if (!(subkey = strdupW( path ))) return;
do
{
@ -2954,7 +2952,7 @@ static void delete_key( const MSICOMPONENT *comp, HKEY root, const WCHAR *path )
{
*p = 0;
if (!p[1]) continue; /* trailing backslash */
hkey = open_key( comp, root, subkey, FALSE, access | READ_CONTROL );
hkey = open_key( comp, root, subkey, FALSE, READ_CONTROL );
if (!hkey) break;
if (!is_key_empty(comp, hkey, p + 1))
{