shell32/tests: Trace the effective ShellExecuteEx() flags.

shell_execute_ex() adds some flags for its own internal needs. The traces should reflect that. Signed-off-by: Francois Gouget <fgouget@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

shell32/tests: Trace the effective ShellExecuteEx() flags.
9cc07a2b · Francois Gouget · Alexandre Julliard · f816bc93 · 9cc07a2b
Commit 9cc07a2b authored Jan 13, 2016 by Francois Gouget Committed by Alexandre Julliard Jan 13, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 7 deletions

shlexec.c dlls/shell32/tests/shlexec.c +7 -7

No files found.
--- a/dlls/shell32/tests/shlexec.c
+++ b/dlls/shell32/tests/shlexec.c
@@ -164,17 +164,17 @@ static INT_PTR shell_execute_ex(DWORD mask, LPCSTR verb, LPCSTR file,
                                LPCSTR parameters, LPCSTR directory,
                                LPCSTR class)
 {
+    char smask[11];
    SHELLEXECUTEINFOA sei;
    BOOL success;
    INT_PTR rc;
+    /* Add some flags so we can wait for the child process */
+    mask |= SEE_MASK_NOCLOSEPROCESS | SEE_MASK_NO_CONSOLE;
    strcpy(shell_call, "ShellExecuteEx(");
-    if (mask)
+    sprintf(smask, "0x%x", mask);
-    {
+    strcat_param(shell_call, "mask", smask);
-        char smask[11];
-        sprintf(smask, "0x%x", mask);
-        strcat_param(shell_call, "mask", smask);
-    }
    strcat_param(shell_call, "verb", verb);
    strcat_param(shell_call, "file", file);
    strcat_param(shell_call, "params", parameters);
@@ -185,7 +185,7 @@ static INT_PTR shell_execute_ex(DWORD mask, LPCSTR verb, LPCSTR file,
        trace("%s\n", shell_call);
    sei.cbSize=sizeof(sei);
-    sei.fMask=SEE_MASK_NOCLOSEPROCESS | SEE_MASK_NO_CONSOLE | mask;
+    sei.fMask=mask;
    sei.hwnd=NULL;
    sei.lpVerb=verb;
    sei.lpFile=file;