Alexandre Julliard : gdi32/tests: Fix an uninitialized pointer check for Win64.
Alexandre Julliard
julliard at winehq.org
Sat Jan 10 11:16:32 CST 2009
Module: wine
Branch: master
Commit: 328ca0e00c210d41823ea4d0e541773d6b42c21e
URL: http://source.winehq.org/git/wine.git/?a=commit;h=328ca0e00c210d41823ea4d0e541773d6b42c21e
Author: Alexandre Julliard <julliard at winehq.org>
Date: Fri Jan 9 18:08:50 2009 +0100
gdi32/tests: Fix an uninitialized pointer check for Win64.
---
dlls/gdi32/tests/font.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c
index 0624de0..0aa9af6 100644
--- a/dlls/gdi32/tests/font.c
+++ b/dlls/gdi32/tests/font.c
@@ -1185,6 +1185,7 @@ static void test_GetOutlineTextMetrics(void)
HFONT hfont, hfont_old;
HDC hdc;
DWORD ret, otm_size;
+ LPSTR unset_ptr;
if (!is_font_installed("Arial"))
{
@@ -1241,6 +1242,7 @@ static void test_GetOutlineTextMetrics(void)
/* ask about truncated data */
memset(otm, 0xAA, otm_size);
+ memset(&unset_ptr, 0xAA, sizeof(unset_ptr));
SetLastError(0xdeadbeef);
otm->otmSize = sizeof(*otm) - sizeof(LPSTR); /* just in case for Win9x compatibility */
ret = GetOutlineTextMetrics(hdc, otm->otmSize, otm);
@@ -1253,7 +1255,7 @@ static void test_GetOutlineTextMetrics(void)
ok(otm->otmpFaceName == NULL, "expected NULL got %p\n", otm->otmpFaceName);
ok(otm->otmpStyleName == NULL, "expected NULL got %p\n", otm->otmpStyleName);
}
- ok(otm->otmpFullName == (LPSTR)0xAAAAAAAA, "expected 0xAAAAAAAA got %p\n", otm->otmpFullName);
+ ok(otm->otmpFullName == unset_ptr, "expected %p got %p\n", unset_ptr, otm->otmpFullName);
HeapFree(GetProcessHeap(), 0, otm);
More information about the wine-cvs
mailing list