[ros-diffs] 01/01: [SHELL32] Fix a careless mistake of ShellExecCmdLine (#737)

[Katayama Hirofumi MZ]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=db13b422b3281ccc97dad…

commit db13b422b3281ccc97dad4b6e574eb26bf447e07
Author:     Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com>
AuthorDate: Fri Aug 10 20:25:50 2018 +0900
Commit:     Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org>
CommitDate: Fri Aug 10 13:25:50 2018 +0200

    [SHELL32] Fix a careless mistake of ShellExecCmdLine (#737)
    
    CORE-14886
---
 dll/win32/shell32/shlexec.cpp                          | 1 -
 modules/rostests/apitests/shell32/ShellExecCmdLine.cpp | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/dll/win32/shell32/shlexec.cpp b/dll/win32/shell32/shlexec.cpp
index 55b3d051fe..09ccfec0a3 100644
--- a/dll/win32/shell32/shlexec.cpp
+++ b/dll/win32/shell32/shlexec.cpp
@@ -2430,7 +2430,6 @@ HRESULT WINAPI ShellExecCmdLine(
             SearchPathW(pwszStartDir, szFile, wszCom, _countof(szFile2), szFile2, NULL))
         {
             StringCchCopyW(szFile, _countof(szFile), szFile2);
-            pchParams = NULL;
         }
         else if (SearchPathW(NULL, lpCommand, NULL, _countof(szFile2), szFile2, NULL) ||
                  SearchPathW(NULL, lpCommand, wszExe, _countof(szFile2), szFile2, NULL)
||
diff --git a/modules/rostests/apitests/shell32/ShellExecCmdLine.cpp
b/modules/rostests/apitests/shell32/ShellExecCmdLine.cpp
index c540321a65..44a22a5162 100644
--- a/modules/rostests/apitests/shell32/ShellExecCmdLine.cpp
+++ b/modules/rostests/apitests/shell32/ShellExecCmdLine.cpp
@@ -140,7 +140,6 @@ HRESULT WINAPI ShellExecCmdLine(
             SearchPathW(pwszStartDir, szFile, wszCom, _countof(szFile2), szFile2, NULL))
         {
             StringCchCopyW(szFile, _countof(szFile), szFile2);
-            pchParams = NULL;
         }
         else if (SearchPathW(NULL, lpCommand, NULL, _countof(szFile2), szFile2, NULL) ||
                  SearchPathW(NULL, lpCommand, wszExe, _countof(szFile2), szFile2, NULL)
||
@@ -415,6 +414,7 @@ static void DoEntry(const TEST_ENTRY *pEntry)
             {
                 bFound = TRUE;
                 SendMessage(hwnd, WM_CLOSE, 0, 0);
+                Sleep(RETRY_INTERVAL);
                 break;
             }
             Sleep(RETRY_INTERVAL);