From 13868ee0e85c5b778d5f2d136205fbf10ffacf0c Mon Sep 17 00:00:00 2001 From: Katayama Hirofumi MZ Date: Sat, 15 Oct 2022 21:00:13 +0900 Subject: [PATCH] [USER32][NTUSER] Fill by white in DrawFrameControl:DFC_MENU (#4779) DrawFrameControl:DFC_MENU draws the monochrome image of menu arrow or checkmark. However, the function didn't draw the entire rectangle correctly when the rectangle was not a square. CORE-18417 --- win32ss/user/ntuser/draw.c | 1 + win32ss/user/user32/windows/draw.c | 1 + 2 files changed, 2 insertions(+) diff --git a/win32ss/user/ntuser/draw.c b/win32ss/user/ntuser/draw.c index dd4a0ff4a62..77be7370e2e 100644 --- a/win32ss/user/ntuser/draw.c +++ b/win32ss/user/ntuser/draw.c @@ -959,6 +959,7 @@ BOOL FASTCALL UITOOLS95_DrawFrameMenu(HDC dc, LPRECT r, UINT uFlags) WCHAR Symbol; RECT myr; INT cxy; + FillRect(dc, r, (HBRUSH)NtGdiGetStockObject(WHITE_BRUSH)); cxy = UITOOLS_MakeSquareRect(r, &myr); switch(uFlags & 0x1f) { diff --git a/win32ss/user/user32/windows/draw.c b/win32ss/user/user32/windows/draw.c index ff0fb72bff4..1789be8ecd5 100644 --- a/win32ss/user/user32/windows/draw.c +++ b/win32ss/user/user32/windows/draw.c @@ -978,6 +978,7 @@ static BOOL UITOOLS95_DrawFrameMenu(HDC dc, LPRECT r, UINT uFlags) TCHAR Symbol; RECT myr; INT cxy; + FillRect(dc, r, (HBRUSH)GetStockObject(WHITE_BRUSH)); cxy = UITOOLS_MakeSquareRect(r, &myr); switch(uFlags & 0x1f) { -- 2.17.1