system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-14 17:26:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

reg: Fail if access is denied when deleting registry data.

Browse source 
Signed-off-by: Hugh McMaster <hugh.mcmaster@outlook.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Hugh McMaster 2021-05-12 22:24:23 +10:00 committed by Alexandre Julliard
parent 004b1179e9
commit ab64b0e339
1 changed files with 28 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
programs/reg/delete.c
View file

@ -18,9 +18,27 @@
#include "reg.h" #include "reg.h"
static BOOL op_delete_key = TRUE;
static void output_error(LONG rc)
{
if (rc == ERROR_FILE_NOT_FOUND)
{
if (op_delete_key)
output_message(STRING_KEY_NONEXIST);
else
output_message(STRING_VALUE_NONEXIST);
}
else
{
output_message(STRING_ACCESS_DENIED);
}
}
static int run_delete(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name, static int run_delete(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name,
BOOL value_empty, BOOL value_all, BOOL force) BOOL value_empty, BOOL value_all, BOOL force)
{ {
LONG rc;
HKEY hkey; HKEY hkey;
if (!force) if (!force)
@ -44,26 +62,28 @@ static int run_delete(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name
/* Delete registry key if no /v* option is given */ /* Delete registry key if no /v* option is given */
if (!value_name && !value_empty && !value_all) if (!value_name && !value_empty && !value_all)
{ {
if (RegDeleteTreeW(root, path) != ERROR_SUCCESS) if ((rc = RegDeleteTreeW(root, path)))
{ {
output_message(STRING_KEY_NONEXIST); output_error(rc);
return 1; return 1;
} }
output_message(STRING_SUCCESS); output_message(STRING_SUCCESS);
return 0; return 0;
} }
if (RegOpenKeyExW(root, path, 0, KEY_READ|KEY_SET_VALUE, &hkey)) if ((rc = RegOpenKeyExW(root, path, 0, KEY_READ|KEY_SET_VALUE, &hkey)))
{ {
output_message(STRING_KEY_NONEXIST); output_error(rc);
return 1; return 1;
} }
op_delete_key = FALSE;
if (value_all) if (value_all)
{ {
DWORD max_value_len = 256, value_len; DWORD max_value_len = 256, value_len;
WCHAR *value_name; WCHAR *value_name;
LONG rc;
value_name = malloc(max_value_len * sizeof(WCHAR)); value_name = malloc(max_value_len * sizeof(WCHAR));
@ -79,6 +99,7 @@ static int run_delete(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name
free(value_name); free(value_name);
RegCloseKey(hkey); RegCloseKey(hkey);
output_message(STRING_VALUEALL_FAILED, key_name); output_message(STRING_VALUEALL_FAILED, key_name);
output_error(rc);
return 1; return 1;
} }
} }
@ -93,10 +114,10 @@ static int run_delete(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name
} }
else if (value_name || value_empty) else if (value_name || value_empty)
{ {
if (RegDeleteValueW(hkey, value_name)) if ((rc = RegDeleteValueW(hkey, value_name)))
{ {
RegCloseKey(hkey); RegCloseKey(hkey);
output_message(STRING_VALUE_NONEXIST); output_error(rc);
return 1; return 1;
} }
} }