Paul Vriens : gdi32/tests: Fix a failure on NT4.

Alexandre Julliard julliard at winehq.org
Wed Dec 10 07:41:51 CST 2008


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

Author: Paul Vriens <Paul.Vriens.Wine at gmail.com>
Date:   Tue Dec  9 13:42:08 2008 +0100

gdi32/tests: Fix a failure on NT4.

---

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

diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c
index 85bc529..21e6767 100644
--- a/dlls/gdi32/tests/metafile.c
+++ b/dlls/gdi32/tests/metafile.c
@@ -121,8 +121,11 @@ static int CALLBACK eto_emf_enum_proc(HDC hdc, HANDLETABLE *handle_table,
         const EMREXTTEXTOUTW *emr_ExtTextOutW = (const EMREXTTEXTOUTW *)emr;
         dx = (const INT *)((const char *)emr + emr_ExtTextOutW->emrtext.offDx);
 
+        SetLastError(0xdeadbeef);
         ret = GetObjectA(GetCurrentObject(hdc, OBJ_FONT), sizeof(device_lf), &device_lf);
-        ok( ret == sizeof(device_lf), "GetObjectA error %d\n", GetLastError());
+        ok( ret == sizeof(device_lf) ||
+            broken(ret == (sizeof(device_lf) - LF_FACESIZE + strlen(device_lf.lfFaceName) + 1)), /* NT4 */
+            "GetObjectA error %d\n", GetLastError());
 
         /* compare up to lfOutPrecision, other values are not interesting,
          * and in fact sometimes arbitrary adapted by Win9x.




More information about the wine-cvs mailing list