Huw Davies : gdi32/tests: Don' t continue with the tests if GetWinMetaFileBits fails.
Alexandre Julliard
julliard at winehq.org
Wed Jul 8 14:35:55 CDT 2009
Module: wine
Branch: master
Commit: 904b2749f79b096f6ed04462ee00734ca42d1461
URL: http://source.winehq.org/git/wine.git/?a=commit;h=904b2749f79b096f6ed04462ee00734ca42d1461
Author: Huw Davies <huw at codeweavers.com>
Date: Wed Jul 8 15:20:25 2009 +0100
gdi32/tests: Don't continue with the tests if GetWinMetaFileBits fails.
---
dlls/gdi32/tests/metafile.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c
index 49a5489..2eacd37 100644
--- a/dlls/gdi32/tests/metafile.c
+++ b/dlls/gdi32/tests/metafile.c
@@ -2331,7 +2331,7 @@ static void getwinmetafilebits(UINT mode, int scale, RECT *rc)
UINT size, emf_size, i;
WORD check = 0;
DWORD rec_num = 0;
- METAHEADER *mh;
+ METAHEADER *mh = NULL;
METARECORD *rec;
INT horz_res, vert_res, horz_size, vert_size;
@@ -2363,6 +2363,7 @@ static void getwinmetafilebits(UINT mode, int scale, RECT *rc)
size = GetWinMetaFileBits(emf, 0, NULL, mode, display_dc);
ok(size, "GetWinMetaFileBits returns 0\n");
+ if(!size) goto end;
mh = HeapAlloc(GetProcessHeap(), 0, size);
GetWinMetaFileBits(emf, size, (BYTE*)mh, mode, display_dc);
@@ -2464,6 +2465,7 @@ static void getwinmetafilebits(UINT mode, int scale, RECT *rc)
rec = (METARECORD*)((WORD*)rec + rec->rdSize);
}
+end:
HeapFree(GetProcessHeap(), 0, mh);
HeapFree(GetProcessHeap(), 0, enh_header);
DeleteEnhMetaFile(emf);
More information about the wine-cvs
mailing list