user32: DrawState always uses real icon size for drawing.

diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c
index 5e7558dcc51f68692ffcd9ce8946ed71123156ee..ff86cd0d1abef10f59dcb00ff733839b3ed223f3 100644 (file)
--- 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 54dab138da7dfa447405f1295a62cc64f16b3a75..a401fc3b487a02b969a59c2aedb86eac7590d242 100644 (file)
--- 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);