shell32/tests: Skip a few ShellExecute() tests when the process has insufficient privileges.

Signed-off-by: Francois Gouget <fgouget@free.fr> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

shell32/tests: Skip a few ShellExecute() tests when the process has insufficient privileges.
96baeb72 · Francois Gouget · Alexandre Julliard · 13fdfede · 96baeb72
Commit 96baeb72 authored Feb 08, 2016 by Francois Gouget Committed by Alexandre Julliard Feb 08, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 20 additions and 14 deletions

shlexec.c dlls/shell32/tests/shlexec.c +20 -14

No files found.
--- a/dlls/shell32/tests/shlexec.c
+++ b/dlls/shell32/tests/shlexec.c
@@ -2124,12 +2124,15 @@ static void test_lnks(void)
    okChildInt("argcA", 4);
    okChildString("argvA3", "Lnk");
-    /* An explicit class overrides lnk's ContextMenuHandler */
+    if (!skip_shlexec_tests)
-    rc=shell_execute_ex(SEE_MASK_CLASSNAME | SEE_MASK_NOZONECHECKS, NULL, filename, NULL, NULL, "shlexec.shlexec");
+    {
-    okShell(rc > 32, "failed: rc=%lu err=%u\n", rc, GetLastError());
+        /* An explicit class overrides lnk's ContextMenuHandler */
-    okChildInt("argcA", 5);
+        rc=shell_execute_ex(SEE_MASK_CLASSNAME | SEE_MASK_NOZONECHECKS, NULL, filename, NULL, NULL, "shlexec.shlexec");
-    okChildString("argvA3", "Open");
+        okShell(rc > 32, "failed: rc=%lu err=%u\n", rc, GetLastError());
-    okChildPath("argvA4", filename);
+        okChildInt("argcA", 5);
+        okChildString("argvA3", "Open");
+        okChildPath("argvA4", filename);
+    }
    if (dllver.dwMajorVersion>=6)
    {
@@ -2241,14 +2244,17 @@ static void test_exes(void)
                                    "notaverb", argv0, NULL, NULL, NULL);
    todo_wine okShell(rc == SE_ERR_NOASSOC, "returned %lu\n", rc);
-    /* A class overrides the normal handling of executables too */
+    if (!skip_shlexec_tests)
-    /* FIXME SEE_MASK_FLAG_NO_UI is only needed due to Wine's bug */
+    {
-    rc = shell_execute_ex(SEE_MASK_CLASSNAME | SEE_MASK_FLAG_NO_UI,
+        /* A class overrides the normal handling of executables too */
-                          NULL, argv0, NULL, NULL, ".shlexec");
+        /* FIXME SEE_MASK_FLAG_NO_UI is only needed due to Wine's bug */
-    todo_wine okShell(rc > 32, "returned %lu\n", rc);
+        rc = shell_execute_ex(SEE_MASK_CLASSNAME | SEE_MASK_FLAG_NO_UI,
-    okChildInt("argcA", 5);
+                              NULL, argv0, NULL, NULL, ".shlexec");
-    todo_wine okChildString("argvA3", "Open");
+        todo_wine okShell(rc > 32, "returned %lu\n", rc);
-    todo_wine okChildPath("argvA4", argv0);
+        okChildInt("argcA", 5);
+        todo_wine okChildString("argvA3", "Open");
+        todo_wine okChildPath("argvA4", argv0);
+    }
 }
 typedef struct