From e5d8f301dbab8809cbc1183dcfe725045b579977 Mon Sep 17 00:00:00 2001 From: Gregor Schneider Date: Wed, 19 Aug 2009 11:23:31 +0000 Subject: [PATCH] - GetGlyphOutline: fail if output or transformation matrix buffers are not passed - Fixes three gdi32 font winetests svn path=/trunk/; revision=42780 --- reactos/dll/win32/gdi32/objects/font.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/reactos/dll/win32/gdi32/objects/font.c b/reactos/dll/win32/gdi32/objects/font.c index dbb83442732..7df57445cf1 100644 --- a/reactos/dll/win32/gdi32/objects/font.c +++ b/reactos/dll/win32/gdi32/objects/font.c @@ -929,6 +929,7 @@ GetGlyphOutlineA( DWORD ret; UINT c; DPRINT("GetGlyphOutlineA uChar %x\n", uChar); + if (!lpgm || !lpmat2) return GDI_ERROR; if(!(uFormat & GGO_GLYPH_INDEX)) { int len; char mbchs[2]; @@ -966,7 +967,7 @@ GetGlyphOutlineW( ) { DPRINT("GetGlyphOutlineW uChar %x\n", uChar); - if (!lpgm & !lpmat2) return GDI_ERROR; + if (!lpgm || !lpmat2) return GDI_ERROR; if (!lpvBuffer) cbBuffer = 0; return NtGdiGetGlyphOutline ( hdc, uChar, uFormat, lpgm, cbBuffer, lpvBuffer, (CONST LPMAT2)lpmat2, TRUE); }