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

msi: Get rid of a redundant get_registry_view call. 

Signed-off-by: Hans Leidekker <hans@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Hans Leidekker 2019-04-16 11:25:29 +02:00 committed by Alexandre Julliard
parent 70732e273e
commit 5caebb2650
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/msi/action.c
View File

@ -2922,7 +2922,7 @@ static int is_key_empty(const MSICOMPONENT *comp, HKEY root, const WCHAR *path)
HKEY key; HKEY key;
LONG res; 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; if (!key) return 0;
res = RegQueryInfoKeyW(key, 0, 0, 0, &subkeys, 0, 0, &values, 0, 0, 0, 0); res = RegQueryInfoKeyW(key, 0, 0, 0, &subkeys, 0, 0, &values, 0, 0, 0, 0);
@ -2934,12 +2934,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 ) static void delete_key( const MSICOMPONENT *comp, HKEY root, const WCHAR *path )
{ {
LONG res = ERROR_SUCCESS; LONG res = ERROR_SUCCESS;
REGSAM access = 0; REGSAM access = get_registry_view( comp );
WCHAR *subkey, *p; WCHAR *subkey, *p;
HKEY hkey; HKEY hkey;
access |= get_registry_view( comp );
if (!(subkey = strdupW( path ))) return; if (!(subkey = strdupW( path ))) return;
do do
{ {
@ -2947,7 +2945,7 @@ static void delete_key( const MSICOMPONENT *comp, HKEY root, const WCHAR *path )
{ {
*p = 0; *p = 0;
if (!p[1]) continue; /* trailing backslash */ 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 (!hkey) break;
if (!is_key_empty(comp, hkey, p + 1)) if (!is_key_empty(comp, hkey, p + 1))
{ {