[PATCH 1/3] reg: Support use of registry views when deleting registry values

[Hugh McMaster]

Signed-off-by: Hugh McMaster <hugh.mcmaster at outlook.com>
---
 programs/reg/delete.c       | 22 ++++++++++++++++++----
 programs/reg/tests/delete.c | 28 ++++++++++++++--------------
 2 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/programs/reg/delete.c b/programs/reg/delete.c
index 8804e16e52f..f6965493faa 100644
--- a/programs/reg/delete.c
+++ b/programs/reg/delete.c
@@ -35,7 +35,7 @@ static void output_error(LONG rc)
     }
 }
 
-static int run_delete(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name,
+static int run_delete(HKEY root, WCHAR *path, REGSAM sam, WCHAR *key_name, WCHAR *value_name,
                       BOOL value_empty, BOOL value_all, BOOL force)
 {
     LONG rc;
@@ -72,7 +72,7 @@ static int run_delete(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name
         return 0;
     }
 
-    if ((rc = RegOpenKeyExW(root, path, 0, KEY_READ|KEY_SET_VALUE, &hkey)))
+    if ((rc = RegOpenKeyExW(root, path, 0, KEY_READ|KEY_SET_VALUE|sam, &hkey)))
     {
         output_error(rc);
         return 1;
@@ -132,6 +132,7 @@ int reg_delete(int argc, WCHAR *argvW[])
     HKEY root;
     WCHAR *path, *key_name, *value_name = NULL;
     BOOL value_all = FALSE, value_empty = FALSE, force = FALSE;
+    REGSAM sam = 0;
     int i;
 
     if (!parse_registry_key(argvW[2], &root, &path))
@@ -158,8 +159,18 @@ int reg_delete(int argc, WCHAR *argvW[])
             value_empty = TRUE;
             continue;
         }
-        else if (!lstrcmpiW(str, L"reg:32") || !lstrcmpiW(str, L"reg:64"))
+        else if (!lstrcmpiW(str, L"reg:32"))
+        {
+            if (sam & KEY_WOW64_32KEY) goto invalid;
+            sam |= KEY_WOW64_32KEY;
+            continue;
+        }
+        else if (!lstrcmpiW(str, L"reg:64"))
+        {
+            if (sam & KEY_WOW64_64KEY) goto invalid;
+            sam |= KEY_WOW64_64KEY;
             continue;
+        }
         else if (!str[0] || str[1])
             goto invalid;
 
@@ -181,9 +192,12 @@ int reg_delete(int argc, WCHAR *argvW[])
     if ((value_name && value_empty) || (value_name && value_all) || (value_empty && value_all))
         goto invalid;
 
+    if (sam == (KEY_WOW64_32KEY|KEY_WOW64_64KEY))
+        goto invalid;
+
     key_name = get_long_key(root, path);
 
-    return run_delete(root, path, key_name, value_name, value_empty, value_all, force);
+    return run_delete(root, path, sam, key_name, value_name, value_empty, value_all, force);
 
 invalid:
     output_message(STRING_INVALID_SYNTAX);
diff --git a/programs/reg/tests/delete.c b/programs/reg/tests/delete.c
index d6a3b7e1d04..102fc0d788a 100644
--- a/programs/reg/tests/delete.c
+++ b/programs/reg/tests/delete.c
@@ -270,17 +270,17 @@ static void test_registry_view_win64(void)
     open_key(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY, &hkey);
 
     run_reg_exe("reg delete HKLM\\" KEY_BASE " /v DWORD /f /reg:32", &r);
-    todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
-    todo_wine verify_reg_nonexist(hkey, "DWORD");
+    ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
+    verify_reg_nonexist(hkey, "DWORD");
 
     run_reg_exe("reg delete HKLM\\" KEY_BASE " /ve /f /reg:32", &r);
-    todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
-    todo_wine verify_reg_nonexist(hkey, NULL);
+    ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
+    verify_reg_nonexist(hkey, NULL);
 
     run_reg_exe("reg delete HKLM\\" KEY_BASE " /va /f /reg:32", &r);
-    todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
-    todo_wine verify_reg_nonexist(hkey, "String");
-    todo_wine verify_reg_nonexist(hkey, "Multiple Strings");
+    ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
+    verify_reg_nonexist(hkey, "String");
+    verify_reg_nonexist(hkey, "Multiple Strings");
     verify_key(hkey, "Subkey", KEY_WOW64_32KEY);
 
     run_reg_exe("reg delete HKLM\\" KEY_BASE "\\Subkey /f /reg:32", &r);
@@ -380,17 +380,17 @@ static void test_registry_view_wow64(void)
     open_key(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY, &hkey);
 
     run_reg_exe("reg delete HKLM\\" KEY_BASE " /v DWORD /f /reg:64", &r);
-    todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
-    todo_wine verify_reg_nonexist(hkey, "DWORD");
+    ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
+    verify_reg_nonexist(hkey, "DWORD");
 
     run_reg_exe("reg delete HKLM\\" KEY_BASE " /ve /f /reg:64", &r);
-    todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
-    todo_wine verify_reg_nonexist(hkey, NULL);
+    ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
+    verify_reg_nonexist(hkey, NULL);
 
     run_reg_exe("reg delete HKLM\\" KEY_BASE " /va /f /reg:64", &r);
-    todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
-    todo_wine verify_reg_nonexist(hkey, "String");
-    todo_wine verify_reg_nonexist(hkey, "Multiple Strings");
+    ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
+    verify_reg_nonexist(hkey, "String");
+    verify_reg_nonexist(hkey, "Multiple Strings");
     verify_key(hkey, "Subkey", KEY_WOW64_64KEY);
 
     run_reg_exe("reg delete HKLM\\" KEY_BASE "\\Subkey /f /reg:64", &r);
-- 
2.32.0