[PATCH 4/5] cmd: Run files with ShellExecute() if CreateProcess() fails.

[Elizabeth]

From: Elizabeth

Based on a patch by Jason Edmeades.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=18154
---
 programs/cmd/wcmdmain.c | 41 ++++++++++++++++++++++++++++++++---------
 1 file changed, 32 insertions(+), 9 deletions(-)

diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c
index 24b2b75307c..320a6daf0a1 100644
--- a/programs/cmd/wcmdmain.c
+++ b/programs/cmd/wcmdmain.c
@@ -1385,6 +1385,8 @@ static RETURN_CODE run_full_path(const WCHAR *file, WCHAR *full_cmdline, BOOL ca
     WCHAR exe_path[MAX_PATH];
     PROCESS_INFORMATION pi;
     SHFILEINFOW psfi;
+    HANDLE handle;
+    BOOL ret;

TRACE("%s\n", debugstr_w(file));

@@ -1412,21 +1414,42 @@ static RETURN_CODE run_full_path(const WCHAR *file, WCHAR *full_cmdline, BOOL ca
         console = SHGetFileInfoW(exe_path, 0, &psfi, sizeof(psfi), SHGFI_EXETYPE);

init_msvcrt_io_block(&si);
-    if (!CreateProcessW(file, full_cmdline, NULL, NULL, TRUE, 0, NULL, NULL, &si, &pi))
+    ret = CreateProcessW(file, full_cmdline, NULL, NULL, TRUE, 0, NULL, NULL, &si, &pi);
+    free(si.lpReserved2);
+
+    if (ret)
     {
-        errorlevel = GetLastError();
-        free(si.lpReserved2);
-        return errorlevel;
+        CloseHandle(pi.hThread);
+        handle = pi.hProcess;
+    }
+    else
+    {
+        SHELLEXECUTEINFOW sei = {.cbSize = sizeof(sei)};
+        WCHAR *args;
+
+        WCMD_parameter(full_cmdline, 1, &args, FALSE, TRUE);
+        sei.fMask = SEE_MASK_NO_CONSOLE | SEE_MASK_NOCLOSEPROCESS;
+        sei.lpFile = file;
+        sei.lpParameters = args;
+        sei.nShow = SW_SHOWNORMAL;
+
+        if (ShellExecuteExW(&sei) && (INT_PTR)sei.hInstApp >= 32)
+        {
+            handle = sei.hProcess;
+        }
+        else
+        {
+            errorlevel = GetLastError();
+            return errorlevel;
+        }
     }
-    free(si.lpReserved2);

if (!interactive || (console && !HIWORD(console)))
-        WaitForSingleObject(pi.hProcess, INFINITE);
-    GetExitCodeProcess(pi.hProcess, &exit_code);
+        WaitForSingleObject(handle, INFINITE);
+    GetExitCodeProcess(handle, &exit_code);
     errorlevel = (exit_code == STILL_ACTIVE) ? NO_ERROR : exit_code;

-    CloseHandle(pi.hProcess);
-    CloseHandle(pi.hThread);
+    CloseHandle(handle);
     return errorlevel;
 }