regedit/tests: Comprehensively check for elevated privileges before starting tests.

Calls to regedit.exe on user accounts with standard privileges trigger a UAC prompt. Not responding to the prompt eventually causes a test timeout, so use registry API calls to determine if the tests are running with elevated privileges. Signed-off-by: Hugh McMaster <hugh.mcmaster@outlook.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

regedit/tests: Comprehensively check for elevated privileges before starting tests.
bedd54c9 · Hugh McMaster · Alexandre Julliard · bfdb2e11 · bedd54c9
Commit bedd54c9 authored Feb 25, 2021 by Hugh McMaster Committed by Alexandre Julliard Feb 25, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 16 additions and 5 deletions

regedit.c programs/regedit/tests/regedit.c +16 -5

No files found.
--- a/programs/regedit/tests/regedit.c
+++ b/programs/regedit/tests/regedit.c
@@ -3741,16 +3741,27 @@ static void test_export(void)

 START_TEST(regedit)
 {
-    if(!exec_import_str("REGEDIT4\r\n\r\n")){
-        win_skip("regedit not available, skipping regedit tests\n");
-        return;
-    }
+    HKEY hkey;
+    LONG err;

-    if (!run_regedit_exe("regedit.exe /s test.reg") && GetLastError() == ERROR_ELEVATION_REQUIRED)
+    /* Check if regedit.exe is running with elevated privileges */
+    err = RegDeleteKeyA(HKEY_CLASSES_ROOT, KEY_BASE);
+    if (err == ERROR_ACCESS_DENIED)
    {
        win_skip("User is a non-elevated admin; skipping regedit tests.\n");
        return;
    }
+    if (err == ERROR_FILE_NOT_FOUND)
+    {
+        if (RegCreateKeyExA(HKEY_CLASSES_ROOT, KEY_BASE, 0, NULL, REG_OPTION_NON_VOLATILE,
+                            KEY_READ, NULL, &hkey, NULL))
+        {
+            win_skip("User is a non-elevated admin; skipping regedit tests.\n");
+            return;
+        }
+        RegCloseKey(hkey);
+        RegDeleteKeyA(HKEY_CLASSES_ROOT, KEY_BASE);
+    }

    test_basic_import();
    test_basic_import_unicode();