Dmitry Timoshkov : gdi32:
Fix a couple of problems with negative lfWidth test.
Alexandre Julliard
julliard at wine.codeweavers.com
Thu Apr 12 09:59:54 CDT 2007
Module: wine
Branch: master
Commit: ebe2ac4879a47f3bf7a7819a5b4ac2da2f5db096
URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebe2ac4879a47f3bf7a7819a5b4ac2da2f5db096
Author: Dmitry Timoshkov <dmitry at codeweavers.com>
Date: Wed Apr 11 22:00:22 2007 +0900
gdi32: Fix a couple of problems with negative lfWidth test.
---
dlls/gdi32/tests/font.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c
index 532037c..fefb448 100644
--- a/dlls/gdi32/tests/font.c
+++ b/dlls/gdi32/tests/font.c
@@ -1484,7 +1484,7 @@ static void test_text_metrics(const LOGFONTA *lf)
hfont_old = SelectObject(hdc, hfont);
if(lf->lfWidth > 0) {
- HFONT hfont2;
+ HFONT hfont2, hfont_prev;
GLYPHMETRICS gm1, gm2;
LOGFONTA lf2 = *lf;
MAT2 mat2 = { {0,1}, {0,0}, {0,0}, {0,1} };
@@ -1494,15 +1494,15 @@ static void test_text_metrics(const LOGFONTA *lf)
SetLastError(0xdeadbeef);
hfont2 = CreateFontIndirectA(&lf2);
- ok(hfont != 0, "CreateFontIndirect error %u\n", GetLastError());
- SelectObject(hdc, hfont2);
+ ok(hfont2 != 0, "CreateFontIndirect error %u\n", GetLastError());
+ hfont_prev = SelectObject(hdc, hfont2);
memset(&gm1, 0xaa, sizeof(gm1));
SetLastError(0xdeadbeef);
ret = GetGlyphOutlineA(hdc, 'x', GGO_METRICS, &gm1, 0, NULL, &mat2);
ok(ret != GDI_ERROR, "GetGlyphOutline error 0x%x\n", GetLastError());
- SelectObject(hdc, hfont);
+ SelectObject(hdc, hfont_prev);
DeleteObject(hfont2);
memset(&gm2, 0xbb, sizeof(gm2));
More information about the wine-cvs
mailing list