[ros-diffs] [jgardou] 53571: [WINETESTS/GDI32] - fix warnings

Author: jgardou
Date: Sun Sep  4 11:31:17 2011
New Revision: 53571

URL: http://svn.reactos.org/svn/reactos?rev=53571&view=rev
Log:
[WINETESTS/GDI32]
- fix warnings

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

Modified: trunk/rostests/winetests/gdi32/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/CMakeLists...
==============================================================================
--- trunk/rostests/winetests/gdi32/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/rostests/winetests/gdi32/CMakeLists.txt [iso-8859-1] Sun Sep  4 11:31:17 2011
@@ -2,6 +2,8 @@
 add_definitions(
     -D__ROS_LONG64__
     -D_DLL -D__USE_CRTIMP)
+
+remove_definitions(-DWINVER=0x502 -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x502)

list(APPEND SOURCE
     bitmap.c

Modified: trunk/rostests/winetests/gdi32/metafile.c
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/metafile.c...
==============================================================================
--- trunk/rostests/winetests/gdi32/metafile.c [iso-8859-1] (original)
+++ trunk/rostests/winetests/gdi32/metafile.c [iso-8859-1] Sun Sep  4 11:31:17 2011
@@ -1427,14 +1427,15 @@
    const ENHMETARECORD *emr1 = (const ENHMETARECORD *)(bits + offset1);
    const ENHMETARECORD *emr2 = (const ENHMETARECORD *)(buf + offset2);

-#if 1
+if(1)
    skip("skipping match_emf_record(), bug 5393\n");
-#else
+else
+{
    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;
-#endif
+}

/* We have already bailed out if iType or nSize don't match */
    offset1 += emr1->nSize;