Signed-off-by: Nikolay Sivov nsivov@codeweavers.com --- dlls/comctl32/button.c | 5 ++--- dlls/comctl32/tests/button.c | 33 ++++++++++++++++++++++++++++++++- 2 files changed, 34 insertions(+), 4 deletions(-)
diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index d7a47cb9a7..9869585744 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -1220,7 +1220,7 @@ static void OB_Paint( const BUTTON_INFO *infoPtr, HDC hDC, UINT action ) DRAWITEMSTRUCT dis; LONG_PTR id = GetWindowLongPtrW( infoPtr->hwnd, GWLP_ID ); HWND parent; - HFONT hFont, hPrevFont = 0; + HFONT hFont; HRGN hrgn;
dis.CtlType = ODT_BUTTON; @@ -1235,7 +1235,7 @@ static void OB_Paint( const BUTTON_INFO *infoPtr, HDC hDC, UINT action ) dis.itemData = 0; GetClientRect( infoPtr->hwnd, &dis.rcItem );
- if ((hFont = infoPtr->font)) hPrevFont = SelectObject( hDC, hFont ); + if ((hFont = infoPtr->font)) SelectObject( hDC, hFont ); parent = GetParent(infoPtr->hwnd); if (!parent) parent = infoPtr->hwnd; SendMessageW( parent, WM_CTLCOLORBTN, (WPARAM)hDC, (LPARAM)infoPtr->hwnd ); @@ -1243,7 +1243,6 @@ static void OB_Paint( const BUTTON_INFO *infoPtr, HDC hDC, UINT action ) hrgn = set_control_clipping( hDC, &dis.rcItem );
SendMessageW( GetParent(infoPtr->hwnd), WM_DRAWITEM, id, (LPARAM)&dis ); - if (hPrevFont) SelectObject(hDC, hPrevFont); SelectClipRgn( hDC, hrgn ); if (hrgn) DeleteObject( hrgn ); } diff --git a/dlls/comctl32/tests/button.c b/dlls/comctl32/tests/button.c index 45a390d7f7..53bde54e40 100644 --- a/dlls/comctl32/tests/button.c +++ b/dlls/comctl32/tests/button.c @@ -519,11 +519,12 @@ static void test_button_messages(void) setfocus_seq, killfocus_seq, setstyle_seq, setstate_seq, setstate_seq, setcheck_ignored_seq }, }; + LOGFONTA logfont = { 0 }; const struct message *seq; + HFONT zfont, hfont2; unsigned int i; HWND hwnd, parent; DWORD dlg_code; - HFONT zfont; BOOL todo;
/* selection with VK_SPACE should capture button window */ @@ -540,10 +541,19 @@ static void test_button_messages(void) 100, 100, 200, 200, 0, 0, 0, NULL); ok(parent != 0, "Failed to create parent window\n");
+ logfont.lfHeight = -12; + logfont.lfWeight = FW_NORMAL; + strcpy(logfont.lfFaceName, "Tahoma"); + + hfont2 = CreateFontIndirectA(&logfont); + ok(hfont2 != NULL, "Failed to create Tahoma font\n"); + for (i = 0; i < sizeof(button)/sizeof(button[0]); i++) { + HFONT prevfont, hfont; MSG msg; DWORD style, state; + HDC hdc;
trace("%d: button test sequence\n", i); hwnd = create_button(button[i].style, parent); @@ -686,9 +696,30 @@ static void test_button_messages(void) else ok(style == button[i].style, "expected style %04x got %04x\n", button[i].style, style);
+ /* Test that original font is not selected back after painting */ + hfont = (HFONT)SendMessageA(hwnd, WM_GETFONT, 0, 0); + ok(hfont == NULL, "Unexpected control font.\n"); + + SendMessageA(hwnd, WM_SETFONT, (WPARAM)GetStockObject(SYSTEM_FONT), 0); + + hdc = CreateCompatibleDC(0); + + prevfont = SelectObject(hdc, hfont2); + SendMessageA(hwnd, WM_PRINTCLIENT, (WPARAM)hdc, 0); + ok(hfont2 != GetCurrentObject(hdc, OBJ_FONT), "button[%u]: unexpected font selected after WM_PRINTCLIENT\n", i); + SelectObject(hdc, prevfont); + + prevfont = SelectObject(hdc, hfont2); + SendMessageA(hwnd, WM_PAINT, (WPARAM)hdc, 0); + ok(hfont2 != GetCurrentObject(hdc, OBJ_FONT), "button[%u]: unexpected font selected after WM_PAINT\n", i); + SelectObject(hdc, prevfont); + + DeleteDC(hdc); + DestroyWindow(hwnd); }
+ DeleteObject(hfont2); DestroyWindow(parent);
hwnd = create_button(BS_PUSHBUTTON, NULL);
Hi,
While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=36317
Your paranoid android.
=== wxppro (32 bit button) === button.c:709: Test failed: button[0]: unexpected font selected after WM_PRINTCLIENT button.c:714: Test failed: button[0]: unexpected font selected after WM_PAINT button.c:709: Test failed: button[1]: unexpected font selected after WM_PRINTCLIENT button.c:714: Test failed: button[1]: unexpected font selected after WM_PAINT button.c:709: Test failed: button[2]: unexpected font selected after WM_PRINTCLIENT button.c:714: Test failed: button[2]: unexpected font selected after WM_PAINT button.c:709: Test failed: button[3]: unexpected font selected after WM_PRINTCLIENT button.c:714: Test failed: button[3]: unexpected font selected after WM_PAINT button.c:709: Test failed: button[4]: unexpected font selected after WM_PRINTCLIENT button.c:714: Test failed: button[4]: unexpected font selected after WM_PAINT button.c:709: Test failed: button[5]: unexpected font selected after WM_PRINTCLIENT button.c:714: Test failed: button[5]: unexpected font selected after WM_PAINT button.c:709: Test failed: button[6]: unexpected font selected after WM_PRINTCLIENT button.c:714: Test failed: button[6]: unexpected font selected after WM_PAINT button.c:709: Test failed: button[8]: unexpected font selected after WM_PRINTCLIENT button.c:714: Test failed: button[8]: unexpected font selected after WM_PAINT button.c:709: Test failed: button[9]: unexpected font selected after WM_PRINTCLIENT button.c:714: Test failed: button[9]: unexpected font selected after WM_PAINT button.c:709: Test failed: button[11]: unexpected font selected after WM_PRINTCLIENT button.c:714: Test failed: button[11]: unexpected font selected after WM_PAINT button.c:709: Test failed: button[12]: unexpected font selected after WM_PRINTCLIENT button.c:714: Test failed: button[12]: unexpected font selected after WM_PAINT button.c:709: Test failed: button[13]: unexpected font selected after WM_PRINTCLIENT button.c:714: Test failed: button[13]: unexpected font selected after WM_PAINT button.c:709: Test failed: button[14]: unexpected font selected after WM_PRINTCLIENT button.c:714: Test failed: button[14]: unexpected font selected after WM_PAINT
-
Marvin -
Nikolay Sivov