From c13224e68cb9b11418fc86b24c44b311e32d449e Mon Sep 17 00:00:00 2001 From: Joachim Henze Date: Fri, 25 Oct 2019 00:42:01 +0200 Subject: [PATCH] [0.4.13][WIN32SS] Fix last user visible parts of regression CORE-10855 When Themesvc was disabled, some Window titlebar frames were drawn too thin until the window was actively resized in y by the user. That and similar symptoms started to show up after SVN r68904 == 6dfa71c487dbb193ed7fb1a249a8c964ec3aef0d Many thanks to patches author Doug Lyons. We leave the ticket unresolved still due to explicit request of James Tabor, who wants to continue working in that context. cherry picked from commit 0.4.14-dev-121-g 9e14a762d5fa9a0a46ca5b0eb89b5932a8be52dd --- win32ss/user/ntuser/defwnd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/win32ss/user/ntuser/defwnd.c b/win32ss/user/ntuser/defwnd.c index 7b07ec4b0ad..241d1c6e3ed 100644 --- a/win32ss/user/ntuser/defwnd.c +++ b/win32ss/user/ntuser/defwnd.c @@ -420,7 +420,7 @@ UserPaintCaption(PWND pWnd, INT Flags) else { HDC hDC = UserGetDCEx(pWnd, NULL, DCX_WINDOW|DCX_USESTYLE); - UserDrawCaptionBar(pWnd, hDC, Flags); + UserDrawCaptionBar(pWnd, hDC, Flags | DC_FRAME); // DCFRAME added as fix for CORE-10855. UserReleaseDC(pWnd, hDC, FALSE); } Ret = TRUE; @@ -1232,7 +1232,7 @@ IntDefWindowProc( { HDC hDC = UserGetDCEx(Wnd, NULL, DCX_WINDOW|DCX_USESTYLE); TRACE("WM_NCUAHDRAWCAPTION: wParam DC_ flags %08x\n",wParam); - UserDrawCaptionBar(Wnd, hDC, wParam|DC_FRAME); // Include DC_FRAME to comp for drawing glich. + UserDrawCaptionBar(Wnd, hDC, wParam | DC_FRAME); // Include DC_FRAME to comp for drawing glitch. UserReleaseDC(Wnd, hDC, FALSE); return 0; }