shell32/tests: Trace the effective ShellExecuteEx() flags.
authorFrancois Gouget <fgouget@codeweavers.com>
Wed, 13 Jan 2016 11:42:10 +0000 (12:42 +0100)
committerAlexandre Julliard <julliard@winehq.org>
Wed, 13 Jan 2016 14:47:04 +0000 (23:47 +0900)
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>
dlls/shell32/tests/shlexec.c

index 3acfe4d8d201a2017a75d45f4c26573d8ac68de9..cc6e06aa5dd94b5684103def68f51f520e63b5e2 100644 (file)
@@ -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)
-    {
-        char smask[11];
-        sprintf(smask, "0x%x", mask);
-        strcat_param(shell_call, "mask", smask);
-    }
+    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;