Hugh McMaster : regedit/tests: Remove elevated user checks from the Windows 3.1 test sequences.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: d1fbb6b99937c226031b7094ce3d60b920d003fa
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=d1fbb6b99937c226031b7094ce3d60b920d003fa

Author: Hugh McMaster <hugh.mcmaster at outlook.com>
Date:   Thu Feb 25 18:26:15 2021 +1100

regedit/tests: Remove elevated user checks from the Windows 3.1 test sequences.

The tests only run if regedit.exe is started with elevated privileges.
This is determined when the test suite is invoked.

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

---

 programs/regedit/tests/regedit.c | 28 ++++++++--------------------
 1 file changed, 8 insertions(+), 20 deletions(-)

diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c
index 8c6e71907c0..0f58b6d85b8 100644
--- a/programs/regedit/tests/regedit.c
+++ b/programs/regedit/tests/regedit.c
@@ -1119,17 +1119,9 @@ static void test_basic_import_31(void)
 {
     HKEY hkey;
     DWORD dispos;
-    LONG lr;
 
-    /* Check if regedit.exe is running with elevated privileges */
-    lr = RegCreateKeyExA(HKEY_CLASSES_ROOT, KEY_BASE, 0, NULL, REG_OPTION_NON_VOLATILE,
-                         KEY_READ|KEY_SET_VALUE, NULL, &hkey, &dispos);
-    if (lr == ERROR_ACCESS_DENIED)
-    {
-        win_skip("regedit.exe is not running with elevated privileges; "
-                 "skipping Windows 3.1 import tests\n");
-        return;
-    }
+    RegCreateKeyExA(HKEY_CLASSES_ROOT, KEY_BASE, 0, NULL, REG_OPTION_NON_VOLATILE,
+                    KEY_READ|KEY_SET_VALUE, NULL, &hkey, &dispos);
 
     if (dispos == REG_OPENED_EXISTING_KEY)
         delete_value(hkey, NULL);
@@ -2226,17 +2218,13 @@ static void test_invalid_import_unicode(void)
 static void test_invalid_import_31(void)
 {
     HKEY hkey;
-    LONG lr;
+    DWORD dispos;
 
-    /* Check if regedit.exe is running with elevated privileges */
-    lr = RegCreateKeyExA(HKEY_CLASSES_ROOT, KEY_BASE, 0, NULL, REG_OPTION_NON_VOLATILE,
-                         KEY_READ, NULL, &hkey, NULL);
-    if (lr == ERROR_ACCESS_DENIED)
-    {
-        win_skip("regedit.exe is not running with elevated privileges; "
-            "skipping Windows 3.1 invalid import tests\n");
-        return;
-    }
+    RegCreateKeyExA(HKEY_CLASSES_ROOT, KEY_BASE, 0, NULL, REG_OPTION_NON_VOLATILE,
+                     KEY_READ|KEY_SET_VALUE, NULL, &hkey, &dispos);
+
+    if (dispos == REG_OPENED_EXISTING_KEY)
+        delete_value(hkey, NULL);
 
     /* Test character validity at the start of the line */
     exec_import_str("REGEDIT\r\n"