[PATCH] Fix two test failures on Win9x

Paul Vriens Paul.Vriens.Wine at gmail.com
Thu Mar 12 09:08:13 CDT 2009


---
 dlls/gdi32/tests/metafile.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c
index b0c6f24..cf889c1 100644
--- a/dlls/gdi32/tests/metafile.c
+++ b/dlls/gdi32/tests/metafile.c
@@ -1223,7 +1223,9 @@ static void test_SetMetaFileBits(void)
     SetLastError(0xdeadbeef);
     hmf = SetMetaFileBitsEx(0, MF_GRAPHICS_BITS);
     ok(!hmf, "SetMetaFileBitsEx should fail\n");
-    ok(GetLastError() == ERROR_INVALID_DATA, "wrong error %d\n", GetLastError());
+    ok(GetLastError() == ERROR_INVALID_DATA ||
+       broken(GetLastError() == ERROR_INVALID_PARAMETER), /* Win9x */
+       "wrong error %d\n", GetLastError());
 
     /* Now with not even size */
     SetLastError(0xdeadbeef);
@@ -1242,7 +1244,9 @@ static void test_SetMetaFileBits(void)
     SetLastError(0xdeadbeef);
     hmf = SetMetaFileBitsEx(sizeof(MF_GRAPHICS_BITS), buf);
     ok(!hmf, "SetMetaFileBitsEx should fail\n");
-    ok(GetLastError() == ERROR_INVALID_DATA, "wrong error %d\n", GetLastError());
+    ok(GetLastError() == ERROR_INVALID_DATA ||
+       broken(GetLastError() == ERROR_INVALID_PARAMETER), /* Win9x */
+       "wrong error %d\n", GetLastError());
 
     /* Now with corrupted mtSize field */
     memcpy(buf, MF_GRAPHICS_BITS, sizeof(MF_GRAPHICS_BITS));
-- 
1.6.0.6


--------------060204050003040909030406--



More information about the wine-patches mailing list