Paul Vriens : user32/tests: Fix some test failures on Win9x and WinMe.
Alexandre Julliard
julliard at winehq.org
Thu Nov 6 08:26:10 CST 2008
Module: wine
Branch: master
Commit: bb6e59ec7ff41e5751764de9a936c5bf4f455bdd
URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb6e59ec7ff41e5751764de9a936c5bf4f455bdd
Author: Paul Vriens <Paul.Vriens.Wine at gmail.com>
Date: Thu Nov 6 12:11:55 2008 +0100
user32/tests: Fix some test failures on Win9x and WinMe.
---
dlls/user32/tests/cursoricon.c | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c
index 760348e..d488ef9 100644
--- a/dlls/user32/tests/cursoricon.c
+++ b/dlls/user32/tests/cursoricon.c
@@ -736,7 +736,9 @@ static void test_LoadImageFile(const unsigned char * image_data,
handle = LoadImageA(NULL, filename, IMAGE_CURSOR, 0, 0, LR_LOADFROMFILE);
ok(handle == NULL, "LoadImage(%s) as IMAGE_CURSOR succeeded incorrectly.\n", ext);
error = GetLastError();
- ok(error == 0, "Last error: %u\n", error);
+ ok(error == 0 ||
+ broken(error == ERROR_BAD_PATHNAME), /* Win9x, WinMe */
+ "Last error: %u\n", error);
if (handle != NULL) DestroyCursor(handle);
/* Load as icon. For all tested formats, this should fail */
@@ -744,7 +746,9 @@ static void test_LoadImageFile(const unsigned char * image_data,
handle = LoadImageA(NULL, filename, IMAGE_ICON, 0, 0, LR_LOADFROMFILE);
ok(handle == NULL, "LoadImage(%s) as IMAGE_ICON succeeded incorrectly.\n", ext);
error = GetLastError();
- ok(error == 0, "Last error: %u\n", error);
+ ok(error == 0 ||
+ broken(error == ERROR_BAD_PATHNAME), /* Win9x, WinMe */
+ "Last error: %u\n", error);
if (handle != NULL) DestroyIcon(handle);
/* Load as bitmap. Should succeed if bmp, fail for everything else */
@@ -754,7 +758,9 @@ static void test_LoadImageFile(const unsigned char * image_data,
ok(handle != NULL, "LoadImage(%s) as IMAGE_BITMAP failed.\n", ext);
else ok(handle == NULL, "LoadImage(%s) as IMAGE_BITMAP succeeded incorrectly.\n", ext);
error = GetLastError();
- ok(error == 0, "Last error: %u\n", error);
+ ok(error == 0 ||
+ error == 0xdeadbeef, /* Win9x, WinMe */
+ "Last error: %u\n", error);
if (handle != NULL) DeleteObject(handle);
DeleteFileA(filename);
@@ -815,7 +821,9 @@ static void test_LoadImage(void)
handle = LoadImageA(NULL, "icon.ico", IMAGE_CURSOR, 0, 0, LR_LOADFROMFILE);
ok(handle != NULL, "LoadImage() failed.\n");
error = GetLastError();
- ok(error == 0, "Last error: %u\n", error);
+ ok(error == 0 ||
+ broken(error == ERROR_BAD_PATHNAME), /* Win9x, WinMe */
+ "Last error: %u\n", error);
/* Test the icon information. */
SetLastError(0xdeadbeef);
More information about the wine-cvs
mailing list