Module: wine Branch: master Commit: 2326f3d4d57f1aed68b7988862ad31052b1c5516 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2326f3d4d57f1aed68b7988862...
Author: Wilfried Pasquazzo wilfried.pasquazzo@gmail.com Date: Fri Oct 2 21:55:26 2009 +0000
user32: DrawState always uses 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 5e7558d..ff86cd0 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);