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@codeweavers.com --- 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 5f05aeb77..fc67f92ae 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)