From 604a7a51edfb1a20b7e5c3dec73e718122fe7d8d Mon Sep 17 00:00:00 2001 From: Sylvain Petreolle Date: Sun, 11 Jul 2010 19:11:51 +0000 Subject: [PATCH] Properly skip known crasher in gdi32:metafile test. Commit 48k dedicated to dreimer svn path=/trunk/; revision=48000 --- rostests/winetests/gdi32/metafile.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/rostests/winetests/gdi32/metafile.c b/rostests/winetests/gdi32/metafile.c index 8cf0df0f024..2a80b974a41 100755 --- a/rostests/winetests/gdi32/metafile.c +++ b/rostests/winetests/gdi32/metafile.c @@ -1427,16 +1427,14 @@ 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); - skip("skipping match_emf_record(), bug 5392\n"); -// 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; - +#if 1 + skip("skipping match_emf_record(), bug 5393\n"); +#else trace("%s: EMF record %u, size %u/record %u, size %u\n", - desc, emr1->iType, emr1->nSize, emr2->iType, emr2->nSize); - + 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;