Paul Vriens : gdi32/tests: Fix the last test failure on NT4.

Alexandre Julliard julliard at winehq.org
Tue Jun 16 09:09:36 CDT 2009


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

Author: Paul Vriens <Paul.Vriens.Wine at gmail.com>
Date:   Tue Jun 16 11:35:38 2009 +0200

gdi32/tests: Fix the last test failure on NT4.

---

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

diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c
index 59ab3d1..6164050 100644
--- a/dlls/gdi32/tests/metafile.c
+++ b/dlls/gdi32/tests/metafile.c
@@ -1277,6 +1277,26 @@ static BOOL match_emf_record(const ENHMETARECORD *emr1, const ENHMETARECORD *emr
         HeapFree(GetProcessHeap(), 0, eto1);
         HeapFree(GetProcessHeap(), 0, eto2);
     }
+    else if (emr1->iType == EMR_EXTSELECTCLIPRGN && !lstrcmpA(desc, "emf_clipping"))
+    {
+        /* We have to take care of NT4 differences here */
+        diff = memcmp(emr1, emr2, emr1->nSize);
+        if (diff)
+        {
+            ENHMETARECORD *emr_nt4;
+
+            emr_nt4 = HeapAlloc(GetProcessHeap(), 0, emr2->nSize);
+            memcpy(emr_nt4, emr2, emr2->nSize);
+            /* Correct the nRgnSize field */
+            emr_nt4->dParm[5] = sizeof(RECT);
+
+            diff = memcmp(emr1, emr_nt4, emr1->nSize);
+            if (!diff)
+                win_skip("Catered for NT4 differences\n");
+
+            HeapFree(GetProcessHeap(), 0, emr_nt4);
+        }
+    }
     else
         diff = memcmp(emr1, emr2, emr1->nSize);
 




More information about the wine-cvs mailing list