[WINETESTS/GDI32]

- fix warnings

svn path=/trunk/; revision=53571

rostests/winetests/gdi32/CMakeLists.txt

@@ -3,6 +3,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
     brush.c

rostests/winetests/gdi32/metafile.c

@@ -1427,14 +1427,15 @@ static int compare_emf_bits(const HENHMETAFILE mf, const unsigned char *bits,
 	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;