Paul Vriens : gdi32/tests: Fix a few failures on Win9x and WinMe.

Alexandre Julliard julliard at winehq.org
Thu Nov 13 08:51:46 CST 2008


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

Author: Paul Vriens <Paul.Vriens.Wine at gmail.com>
Date:   Thu Nov 13 14:41:34 2008 +0100

gdi32/tests: Fix a few failures on Win9x and WinMe.

---

 dlls/gdi32/tests/metafile.c |   20 +++++++++++++++-----
 1 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c
index 499fd6c..85bc529 100644
--- a/dlls/gdi32/tests/metafile.c
+++ b/dlls/gdi32/tests/metafile.c
@@ -2119,7 +2119,9 @@ static void test_SetEnhMetaFileBits(void)
     SetLastError(0xdeadbeef);
     hemf = SetEnhMetaFileBits(sizeof(data), data);
     ok(!hemf, "SetEnhMetaFileBits should fail\n");
-    ok(GetLastError() == ERROR_INVALID_DATA, "expected ERROR_INVALID_DATA, got %u\n", GetLastError());
+    ok(GetLastError() == ERROR_INVALID_DATA ||
+       GetLastError() == ERROR_INVALID_PARAMETER, /* Win9x, WinMe */
+       "expected ERROR_INVALID_DATA or ERROR_INVALID_PARAMETER, got %u\n", GetLastError());
 
     emh = (ENHMETAHEADER *)data;
     memset(emh, 0, sizeof(*emh));
@@ -2141,15 +2143,23 @@ static void test_SetEnhMetaFileBits(void)
     emh->nBytes++;
     SetLastError(0xdeadbeef);
     hemf = SetEnhMetaFileBits(emh->nBytes, data);
-    ok(!hemf, "SetEnhMetaFileBits should fail\n");
-    /* XP doesn't set error in this case */
+    ok(!hemf ||
+       broken(hemf != NULL), /* Win9x, WinMe */
+       "SetEnhMetaFileBits should fail\n");
+    todo_wine
+    ok(GetLastError() == 0xdeadbeef, "Expected deadbeef, got %u\n", GetLastError());
+    DeleteEnhMetaFile(hemf);
 
     emh->dSignature = 0;
     emh->nBytes--;
     SetLastError(0xdeadbeef);
     hemf = SetEnhMetaFileBits(emh->nBytes, data);
-    ok(!hemf, "SetEnhMetaFileBits should fail\n");
-    /* XP doesn't set error in this case */
+    ok(!hemf ||
+       broken(hemf != NULL), /* Win9x, WinMe */
+       "SetEnhMetaFileBits should fail\n");
+    todo_wine
+    ok(GetLastError() == 0xdeadbeef, "Expected deadbeef, got %u\n", GetLastError());
+    DeleteEnhMetaFile(hemf);
 }
 
 START_TEST(metafile)




More information about the wine-cvs mailing list