Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-10-01 23:14:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

[GDI32_WINETEST]

Browse source 
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.

svn path=/trunk/; revision=54111
This commit is contained in:
Kamil Hornicek 2011-10-13 14:11:50 +00:00
parent db72017f94
commit 9955d0ed84
1 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
rostests/winetests/gdi32/metafile.c
View file

@ -1654,26 +1654,27 @@ static int compare_emf_bits(const HENHMETAFILE mf, const unsigned char *bits,
"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);
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",
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;
}