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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 9cc07a2b31c62ba5b60f00a9128988bb7195da33
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=9cc07a2b31c62ba5b60f00a9128988bb7195da33

Author: Francois Gouget <fgouget at codeweavers.com>
Date:   Wed Jan 13 12:42:10 2016 +0100

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 at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/shell32/tests/shlexec.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c
index 3acfe4d..cc6e06a 100644
--- 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)
-    {
-        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;