[2/2] Make Wine pass the new Testcase and Fix Regression Bug 20153 (try 2)
Wilfried Pasquazzo
wilfried.pasquazzo at gmail.com
Fri Oct 2 15:28:08 CDT 2009
See [1/2] for Details
Wilfried Pasquazzo
-------------- next part --------------
From 47f93c5406591feb3eb090ea03cda4c2c74fdf95 Mon Sep 17 00:00:00 2001
From: Wilfried Pasquazzo <wilfried.pasquazzo at gmail.com>
Date: Fri, 2 Oct 2009 21:55:26 +0000
Subject: [PATCH 2/2] DrawState always use real Icon size for drawing
---
dlls/user32/tests/cursoricon.c | 2 +-
dlls/user32/uitools.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c
index 1019c73..8d576f3 100644
--- a/dlls/user32/tests/cursoricon.c
+++ b/dlls/user32/tests/cursoricon.c
@@ -1341,7 +1341,7 @@ static void test_DrawState(void)
/* DSS_NORMAL draw Icon without any modifications */
/* DSS_UNION draw the Icon dithered */
- todo_wine check_DrawState_Size(hdcDst, FALSE, 0x00A0B0C0, 32, 0, DSS_NORMAL, __LINE__);
+ check_DrawState_Size(hdcDst, FALSE, 0x00A0B0C0, 32, 0, DSS_NORMAL, __LINE__);
check_DrawState_Color(hdcDst, FALSE, 0x00A0B0C0, 32, 0, DSS_NORMAL, 0x00FFFFFF, 0x00C0B0A0, 0x00C0B0A0, __LINE__);
cleanup:
diff --git a/dlls/user32/uitools.c b/dlls/user32/uitools.c
index 54dab13..a401fc3 100644
--- a/dlls/user32/uitools.c
+++ b/dlls/user32/uitools.c
@@ -1534,7 +1534,7 @@ static BOOL UITOOLS_DrawStateJam( HDC hdc, UINT opcode, DRAWSTATEPROC func, LPAR
return DrawTextA(hdc, (LPSTR)lp, (INT)wp, rc, dtflags);
case DST_ICON:
- return DrawIcon(hdc, rc->left, rc->top, (HICON)lp);
+ return DrawIconEx(hdc, rc->left, rc->top, (HICON)lp, 0, 0, 0, NULL, DI_NORMAL);
case DST_BITMAP:
memdc = CreateCompatibleDC(hdc);
--
1.6.4.4
More information about the wine-patches
mailing list