Paul Vriens : setupapi/tests: Don't crash on WinMe.

Alexandre Julliard julliard at winehq.org
Fri Oct 2 11:02:21 CDT 2009


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

Author: Paul Vriens <Paul.Vriens.Wine at gmail.com>
Date:   Fri Oct  2 10:49:41 2009 +0200

setupapi/tests: Don't crash on WinMe.

---

 dlls/setupapi/tests/query.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/dlls/setupapi/tests/query.c b/dlls/setupapi/tests/query.c
index 0b7883c..6e956a2 100644
--- a/dlls/setupapi/tests/query.c
+++ b/dlls/setupapi/tests/query.c
@@ -167,14 +167,15 @@ static void test_SetupGetInfInformation(void)
        broken(GetLastError() == ERROR_FILE_NOT_FOUND) || /* win98 */
        broken(GetLastError() == ERROR_PATH_NOT_FOUND) || /* NT4 */
        broken(GetLastError() == ERROR_INVALID_NAME) || /* win2k */
-       broken(GetLastError() == ERROR_GENERAL_SYNTAX), /* another win2k */
+       broken(GetLastError() == ERROR_GENERAL_SYNTAX), /* another win2k / winMe */
        "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError());
     ok(size == 0xdeadbeef, "Expected size to remain unchanged\n");
 
     /* try an invalid inf filename */
-    /* do not use NULL as absolute inf filename on win9x (crash) */
+    /* do not use NULL as absolute inf filename on win9x/winMe (crash) */
     if ((GetLastError() != ERROR_BAD_PATHNAME) &&   /* win95 */
-        (GetLastError() != ERROR_FILE_NOT_FOUND))  /* win98 */
+        (GetLastError() != ERROR_FILE_NOT_FOUND) &&  /* win98 */
+        (GetLastError() != ERROR_GENERAL_SYNTAX))  /* winMe */
     {
         size = 0xdeadbeef;
         SetLastError(0xbeefcafe);




More information about the wine-cvs mailing list