Paul Vriens : user32/tests: Fix some test failures on Win9x.

Alexandre Julliard julliard at winehq.org
Fri Nov 7 07:23:56 CST 2008


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

Author: Paul Vriens <Paul.Vriens.Wine at gmail.com>
Date:   Fri Nov  7 08:32:21 2008 +0100

user32/tests: Fix some test failures on Win9x.

---

 dlls/user32/tests/cursoricon.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c
index d488ef9..36f5e98 100644
--- a/dlls/user32/tests/cursoricon.c
+++ b/dlls/user32/tests/cursoricon.c
@@ -737,7 +737,8 @@ static void test_LoadImageFile(const unsigned char * image_data,
     ok(handle == NULL, "LoadImage(%s) as IMAGE_CURSOR succeeded incorrectly.\n", ext);
     error = GetLastError();
     ok(error == 0 ||
-        broken(error == ERROR_BAD_PATHNAME), /* Win9x, WinMe */
+        broken(error == 0xdeadbeef) || /* Win9x */
+        broken(error == ERROR_BAD_PATHNAME), /* Win98, WinMe */
         "Last error: %u\n", error);
     if (handle != NULL) DestroyCursor(handle);
 
@@ -747,7 +748,8 @@ static void test_LoadImageFile(const unsigned char * image_data,
     ok(handle == NULL, "LoadImage(%s) as IMAGE_ICON succeeded incorrectly.\n", ext);
     error = GetLastError();
     ok(error == 0 ||
-        broken(error == ERROR_BAD_PATHNAME), /* Win9x, WinMe */
+        broken(error == 0xdeadbeef) || /* Win9x */
+        broken(error == ERROR_BAD_PATHNAME), /* Win98, WinMe */
         "Last error: %u\n", error);
     if (handle != NULL) DestroyIcon(handle);
 
@@ -822,7 +824,8 @@ static void test_LoadImage(void)
     ok(handle != NULL, "LoadImage() failed.\n");
     error = GetLastError();
     ok(error == 0 ||
-        broken(error == ERROR_BAD_PATHNAME), /* Win9x, WinMe */
+        broken(error == 0xdeadbeef) || /* Win9x */
+        broken(error == ERROR_BAD_PATHNAME), /* Win98, WinMe */
         "Last error: %u\n", error);
 
     /* Test the icon information. */




More information about the wine-cvs mailing list