[ros-diffs] [khornicek] 54111: [GDI32_WINETEST] Bail out of compare_emf_bits earlier. This way we only record one skipped test, but it allows us to actually complete the metafile tests. Restore formatting to i...

khornicek at svn.reactos.org khornicek at svn.reactos.org
Thu Oct 13 14:11:50 UTC 2011


Author: khornicek
Date: Thu Oct 13 14:11:50 2011
New Revision: 54111

URL: http://svn.reactos.org/svn/reactos?rev=54111&view=rev
Log:
[GDI32_WINETEST]
Bail out of compare_emf_bits earlier. This way we only record one skipped test, but it allows us to actually complete the metafile tests. Restore formatting to its previous glory.

Modified:
    trunk/rostests/winetests/gdi32/metafile.c

Modified: trunk/rostests/winetests/gdi32/metafile.c
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/metafile.c?rev=54111&r1=54110&r2=54111&view=diff
==============================================================================
--- trunk/rostests/winetests/gdi32/metafile.c [iso-8859-1] (original)
+++ trunk/rostests/winetests/gdi32/metafile.c [iso-8859-1] Thu Oct 13 14:11:50 2011
@@ -1654,26 +1654,27 @@
        "expected nBytes %u, got %u\n", emh1->nBytes, emh2->nBytes);
     ok(emh1->nRecords == emh2->nRecords, "expected nRecords %u, got %u\n", emh1->nRecords, emh2->nRecords);
 
+    if(!winetest_interactive)
+    {
+        skip("skipping match_emf_record(), bug 5393\n");
+        return 0;
+    }
+
     offset1 = emh1->nSize;
     offset2 = emh2->nSize; /* Needed for Win9x/WinME/NT4 */
     while (offset1 < emh1->nBytes)
     {
-	const ENHMETARECORD *emr1 = (const ENHMETARECORD *)(bits + offset1);
-	const ENHMETARECORD *emr2 = (const ENHMETARECORD *)(buf + offset2);
-
-if(!winetest_interactive)
-    skip("skipping match_emf_record(), bug 5393\n");
-else
-{
-	trace("%s: EMF record %u, size %u/record %u, size %u\n",
+        const ENHMETARECORD *emr1 = (const ENHMETARECORD *)(bits + offset1);
+        const ENHMETARECORD *emr2 = (const ENHMETARECORD *)(buf + offset2);
+
+        trace("%s: EMF record %u, size %u/record %u, size %u\n",
               desc, emr1->iType, emr1->nSize, emr2->iType, emr2->nSize);
 
         if (!match_emf_record(emr1, emr2, desc, ignore_scaling)) return -1;
-}
 
         /* We have already bailed out if iType or nSize don't match */
-	offset1 += emr1->nSize;
-	offset2 += emr2->nSize;
+        offset1 += emr1->nSize;
+        offset2 += emr2->nSize;
     }
     return 0;
 }




More information about the Ros-diffs mailing list