Zhiyi Zhang : comctl32/button: Do not restore command link font after themed painting.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 887e1bcfc31d0fa722433c7652f70dabd05a3c63
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=887e1bcfc31d0fa722433c7652f70dabd05a3c63

Author: Zhiyi Zhang <zzhang at codeweavers.com>
Date:   Fri Oct  1 11:29:55 2021 +0800

comctl32/button: Do not restore command link font after themed painting.

Fix button test failures when theming is on.

Signed-off-by: Zhiyi Zhang <zzhang at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/comctl32/button.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c
index 1a5d2afa999..b576e6c6db6 100644
--- a/dlls/comctl32/button.c
+++ b/dlls/comctl32/button.c
@@ -2982,12 +2982,13 @@ static void SB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in
 
 static void CL_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, int state, UINT dtFlags, BOOL focused)
 {
-    HFONT old_font = infoPtr->font ? SelectObject(hDC, infoPtr->font) : NULL;
     NMCUSTOMDRAW nmcd;
     LRESULT cdrf;
     HWND parent;
     RECT rc;
 
+    if (infoPtr->font) SelectObject(hDC, infoPtr->font);
+
     GetClientRect(infoPtr->hwnd, &rc);
     init_custom_draw(&nmcd, infoPtr, hDC, &rc);
 
@@ -2996,7 +2997,7 @@ static void CL_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in
 
     /* Send erase notifications */
     cdrf = SendMessageW(parent, WM_NOTIFY, nmcd.hdr.idFrom, (LPARAM)&nmcd);
-    if (cdrf & CDRF_SKIPDEFAULT) goto cleanup;
+    if (cdrf & CDRF_SKIPDEFAULT) return;
 
     if (IsThemeBackgroundPartiallyTransparent(theme, BP_COMMANDLINK, state))
         DrawThemeParentBackground(infoPtr->hwnd, hDC, NULL);
@@ -3011,7 +3012,7 @@ static void CL_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in
     /* Send paint notifications */
     nmcd.dwDrawStage = CDDS_PREPAINT;
     cdrf = SendMessageW(parent, WM_NOTIFY, nmcd.hdr.idFrom, (LPARAM)&nmcd);
-    if (cdrf & CDRF_SKIPDEFAULT) goto cleanup;
+    if (cdrf & CDRF_SKIPDEFAULT) return;
 
     if (!(cdrf & CDRF_DOERASE))
     {
@@ -3083,7 +3084,7 @@ static void CL_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in
         nmcd.dwDrawStage = CDDS_POSTPAINT;
         SendMessageW(parent, WM_NOTIFY, nmcd.hdr.idFrom, (LPARAM)&nmcd);
     }
-    if (cdrf & CDRF_SKIPPOSTPAINT) goto cleanup;
+    if (cdrf & CDRF_SKIPPOSTPAINT) return;
 
     if (focused)
     {
@@ -3098,9 +3099,6 @@ static void CL_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in
         rc.bottom -= margins.cyBottomHeight;
         DrawFocusRect(hDC, &rc);
     }
-
-cleanup:
-    if (old_font) SelectObject(hDC, old_font);
 }
 
 void BUTTON_Register(void)