From 59cca65ce0edd88b65a55a847468761e11dfab0b Mon Sep 17 00:00:00 2001 From: Dmitry Timoshkov Date: Tue, 20 Oct 2015 21:56:15 +0800 Subject: [PATCH] comctl32: Always call BeginPaint/EndPaint when handling a WM_PAINT message for the button. Signed-off-by: Dmitry Timoshkov Signed-off-by: Alexandre Julliard --- dlls/comctl32/theme_button.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/comctl32/theme_button.c b/dlls/comctl32/theme_button.c index 327c76baecf..edb31e602a2 100644 --- a/dlls/comctl32/theme_button.c +++ b/dlls/comctl32/theme_button.c @@ -319,9 +319,6 @@ static BOOL BUTTON_Paint(HTHEME theme, HWND hwnd, HDC hParamDC) ButtonState drawState; pfThemedPaint paint = btnThemedPaintFunc[ dwStyle & BUTTON_TYPE ]; - if(!paint) - return FALSE; - if(IsWindowEnabled(hwnd)) { if(state & BST_PUSHED) drawState = STATE_PRESSED; @@ -332,7 +329,7 @@ static BOOL BUTTON_Paint(HTHEME theme, HWND hwnd, HDC hParamDC) else drawState = STATE_DISABLED; hDC = hParamDC ? hParamDC : BeginPaint(hwnd, &ps); - paint(theme, hwnd, hDC, drawState, dtFlags, state & BST_FOCUS); + if (paint) paint(theme, hwnd, hDC, drawState, dtFlags, state & BST_FOCUS); if (!hParamDC) EndPaint(hwnd, &ps); return TRUE; }