From acda44fd71e9260db4c3f07b404774173bf4b000 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=B4me=20Gardou?= Date: Sun, 4 Sep 2011 11:31:17 +0000 Subject: [PATCH] [WINETESTS/GDI32] - fix warnings svn path=/trunk/; revision=53571 --- rostests/winetests/gdi32/CMakeLists.txt | 2 ++ rostests/winetests/gdi32/metafile.c | 7 ++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/rostests/winetests/gdi32/CMakeLists.txt b/rostests/winetests/gdi32/CMakeLists.txt index 4d32dbabe7f..6259f6b2ae0 100644 --- a/rostests/winetests/gdi32/CMakeLists.txt +++ b/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 diff --git a/rostests/winetests/gdi32/metafile.c b/rostests/winetests/gdi32/metafile.c index 2a80b974a41..39eacec9751 100755 --- a/rostests/winetests/gdi32/metafile.c +++ b/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; -- 2.17.1