Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-31 10:21:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WINESYNC] reg: Consistently use 'hkey' for HKEY variables.

Browse source 
Signed-off-by: Hugh McMaster <hugh.mcmaster@outlook.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id c809f9462455ffb0e03a9ae4057f0cd47c85ee5d by Hugh McMaster <hugh.mcmaster@outlook.com>
This commit is contained in:
winesync 2022-01-16 21:15:47 +01:00 • committed by Thomas Csovcsity
parent a0060cdcee
commit f0c76942b7
5 changed files with 35 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

16
base/applications/cmdutils/reg/delete.c
View file

@ -21,7 +21,7 @@
static int run_delete(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name,
BOOL value_empty, BOOL value_all, BOOL force)
{
HKEY key;
HKEY hkey;
if (!force)
{
@ -53,7 +53,7 @@ static int run_delete(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name
return 0;
}
if (RegOpenKeyExW(root, path, 0, KEY_READ|KEY_SET_VALUE, &key))
if (RegOpenKeyExW(root, path, 0, KEY_READ|KEY_SET_VALUE, &hkey))
{
output_message(STRING_KEY_NONEXIST);
return 1;
@ -70,14 +70,14 @@ static int run_delete(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name
while (1)
{
value_len = max_value_len;
rc = RegEnumValueW(key, 0, value_name, &value_len, NULL, NULL, NULL, NULL);
rc = RegEnumValueW(hkey, 0, value_name, &value_len, NULL, NULL, NULL, NULL);
if (rc == ERROR_SUCCESS)
{
rc = RegDeleteValueW(key, value_name);
rc = RegDeleteValueW(hkey, value_name);
if (rc != ERROR_SUCCESS)
{
free(value_name);
RegCloseKey(key);
RegCloseKey(hkey);
output_message(STRING_VALUEALL_FAILED, key_name);
return 1;
}
@ -93,15 +93,15 @@ static int run_delete(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name
}
else if (value_name || value_empty)
{
if (RegDeleteValueW(key, value_name))
if (RegDeleteValueW(hkey, value_name))
{
RegCloseKey(key);
RegCloseKey(hkey);
output_message(STRING_VALUE_NONEXIST);
return 1;
}
}
RegCloseKey(key);
RegCloseKey(hkey);
output_message(STRING_SUCCESS);
return 0;
}