Francois Gouget : testbot/TestLauncher: Fix the missing dll error on Windows <= Vista.

[Alexandre Julliard]

Module: tools
Branch: master
Commit: ada2dd71f94e137de0a16e466611b40eaf029f4a
URL:    https://source.winehq.org/git/tools.git/?a=commit;h=ada2dd71f94e137de0a16e46...

Author: Francois Gouget <fgouget(a)codeweavers.com>
Date:   Tue Apr  6 16:24:02 2021 +0200

testbot/TestLauncher: Fix the missing dll error on Windows <= Vista.

On Vista and lower the critical error dialog title is different for
missing dlls but that is unrelated to side-by-side dlls.

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 testbot/src/TestLauncher/TestLauncher.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/testbot/src/TestLauncher/TestLauncher.c b/testbot/src/TestLauncher/TestLauncher.c
index 5f05aeb..fc67f92 100644
--- a/testbot/src/TestLauncher/TestLauncher.c
+++ b/testbot/src/TestLauncher/TestLauncher.c
@@ -183,14 +183,11 @@ BOOL CALLBACK DetectCriticalErrorDialog(HWND TopWnd, LPARAM lParam)
 
    /* Followed by a reason */
    Reason = NULL;
-   if (strcmp(Buffer + TestFileLen, " - System Error") == 0)
+   if (/* Windows >= 7 */
+       strcmp(Buffer + TestFileLen, " - System Error") == 0 ||
+       /* Windows <= Vista */
+       strcmp(Buffer + TestFileLen, " - Unable To Locate Component") == 0)
       Reason = "missing dll";
-   else if (strcmp(Buffer + TestFileLen, " - Unable To Locate Component") == 0)
-   {
-      /* Sadly Windows >= 7 reports this as "System Error" */
-      Reason = "missing manifest for side-by-side dll";
-      IsSkip = FALSE;
-   }
    else if (strcmp(Buffer + TestFileLen, " - Entry Point Not Found") == 0)
       Reason = "missing entry point";
    else if (strcmp(Buffer + TestFileLen, " - Ordinal Not Found") == 0)