From 4a61832f367761c2cf5d2daee8448f790dff352f Mon Sep 17 00:00:00 2001 From: Gregor Schneider Date: Sun, 23 Aug 2009 21:55:24 +0000 Subject: [PATCH] - Fix two inverted pointer checks, found by Amine Khaldi - Add, correct implemented comment svn path=/trunk/; revision=42889 --- reactos/dll/win32/gdi32/objects/eng.c | 11 +++++++---- reactos/dll/win32/gdi32/objects/font.c | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/reactos/dll/win32/gdi32/objects/eng.c b/reactos/dll/win32/gdi32/objects/eng.c index ce8a8c3f106..d29adf08a08 100644 --- a/reactos/dll/win32/gdi32/objects/eng.c +++ b/reactos/dll/win32/gdi32/objects/eng.c @@ -38,7 +38,11 @@ copy_my_glyphset( FD_GLYPHSET *dst_glyphset , FD_GLYPHSET * src_glyphset, ULONG return retValue; } -FD_GLYPHSET* WINAPI +/* + * @implemented + */ +FD_GLYPHSET* +WINAPI EngComputeGlyphSet(INT nCodePage,INT nFirstChar,INT cChars) { FD_GLYPHSET * ntfd_glyphset; @@ -46,13 +50,12 @@ EngComputeGlyphSet(INT nCodePage,INT nFirstChar,INT cChars) ntfd_glyphset = NtGdiEngComputeGlyphSet(nCodePage,nFirstChar,cChars); - if (!ntfd_glyphset) + if (ntfd_glyphset) { if (ntfd_glyphset->cjThis) { myfd_glyphset = GlobalAlloc(0,ntfd_glyphset->cjThis); - - if (!myfd_glyphset) + if (myfd_glyphset) { if (copy_my_glyphset(myfd_glyphset,ntfd_glyphset,ntfd_glyphset->cjThis) == FALSE) { diff --git a/reactos/dll/win32/gdi32/objects/font.c b/reactos/dll/win32/gdi32/objects/font.c index 7cac4e004bd..7b5629605e8 100644 --- a/reactos/dll/win32/gdi32/objects/font.c +++ b/reactos/dll/win32/gdi32/objects/font.c @@ -1700,7 +1700,7 @@ GdiGetCharDimensions(HDC hdc, LPTEXTMETRICW lptm, LONG *height) * */ /* - * @unimplemented + * @implemented */ BOOL WINAPI