[ros-diffs] [gschneider] 42780: - GetGlyphOutline: fail if output or transformation matrix buffers are not passed - Fixes three gdi32 font winetests

[gschneider at svn.reactos.org]

Author: gschneider
Date: Wed Aug 19 13:23:31 2009
New Revision: 42780

URL: http://svn.reactos.org/svn/reactos?rev=42780&view=rev
Log:
- GetGlyphOutline: fail if output or transformation matrix buffers are not passed
- Fixes three gdi32 font winetests

Modified:
    trunk/reactos/dll/win32/gdi32/objects/font.c

Modified: trunk/reactos/dll/win32/gdi32/objects/font.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/font.c?rev=42780&r1=42779&r2=42780&view=diff
==============================================================================
--- trunk/reactos/dll/win32/gdi32/objects/font.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/gdi32/objects/font.c [iso-8859-1] Wed Aug 19 13:23:31 2009
@@ -929,6 +929,7 @@
     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 @@
 	)
 {
   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);
 }