June 2022 - Wine-Devel - list.winehq.org

[PATCH 0/3] MR241: uiautomationcore: Test fix and MSAA provider navigation patches.

by Connor McAdams (＠cmcadams)

Opened the previous merge request before the testbot had updated, so it failed to run the tests. Should be updated by now :) -- https://gitlab.winehq.org/wine/wine/-/merge_requests/241

June 14, 2022

Re: [PATCH 5/5] user32: Reimplement GetMenuContextHelpId on top of GetMenuInfo.

by Marvin

Hi, While running your changed tests, 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=116902 Your paranoid android. === debian11 (32 bit Chinese:China report) === user32: msg.c:6881: Test failed: SetFocus(hwnd) on a button: 5: the msg 0x0135 was expected, but got msg 0x030f instead msg.c:6881: Test failed: SetFocus(hwnd) on a button: 7: the msg 0x8000 was expected, but got msg 0x0086 instead msg.c:6881: Test failed: SetFocus(hwnd) on a button: 8: the msg sequence is not complete: expected 0000 - actual 0006

June 14, 2022

Re: [PATCH 4/5] win32u: Move PopupMenuWndProc implementation from user32.

by Marvin

Hi, While running your changed tests, 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=116901 Your paranoid android. === debian11 (32 bit report) === user32: menu.c:2324: Test failed: test 25

June 14, 2022

Re: [PATCH 3/5] win32u: Move MENU_DrawMenuBar implementation from user32.

by Marvin

Hi, While running your changed tests, 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=116900 Your paranoid android. === debian11 (64 bit WoW report) === user32: msg.c:6881: Test failed: SetFocus(hwnd) on a button: 5: the msg 0x0138 was expected, but got msg 0x030f instead msg.c:6881: Test failed: SetFocus(hwnd) on a button: 8: the msg 0x8000 was expected, but got msg 0x0086 instead msg.c:6881: Test failed: SetFocus(hwnd) on a button: 9: the msg sequence is not complete: expected 0000 - actual 0006

June 14, 2022

Re: [PATCH 2/5] win32u: Move NtUserDrawMenuBarTemp implementation from user32.

by Marvin

Hi, While running your changed tests, 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=116899 Your paranoid android. === debian11 (32 bit Chinese:China report) === user32: msg.c:6881: Test failed: SetFocus(hwnd) on a button: 5: the msg 0x0135 was expected, but got msg 0x030f instead msg.c:6881: Test failed: SetFocus(hwnd) on a button: 6: the msg 0x002b was expected, but got msg 0x001c instead msg.c:6881: Test failed: SetFocus(hwnd) on a button: 7: the msg 0x0111 was expected, but got msg 0x0086 instead msg.c:6881: Test failed: SetFocus(hwnd) on a button: 8: the msg 0x8000 was expected, but got msg 0x0006 instead msg.c:6881: Test failed: SetFocus(hwnd) on a button: 9: the msg sequence is not complete: expected 0000 - actual 0009 win.c:11787: Test failed: 007200BE: expected NOT topmost win.c:11606: Test succeeded inside todo block: 5: hwnd 01420056 is still topmost

June 14, 2022

Re: [PATCH 1/5] win32u: Move WM_NCCALCSIZE implementation from user32.

by Marvin

Hi, While running your changed tests, 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=116898 Your paranoid android. === debian11 (32 bit report) === user32: menu.c:2324: Test failed: test 25 === debian11 (32 bit Chinese:China report) === user32: win.c:11787: Test failed: 007200BE: expected NOT topmost win.c:11606: Test succeeded inside todo block: 5: hwnd 013F0054 is still topmost

June 14, 2022

Re: [PATCH 0/1] MR149: user32: Plug icon handle leak in MDI_AugmentFrameMenu (Coverity). - approved

by Jacek Caban (＠jacek)

This merge request was approved by Jacek Caban. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/149

June 14, 2022

[PATCH 5/5] user32: Reimplement GetMenuContextHelpId on top of GetMenuInfo.

by Jacek Caban

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/menu.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index f5b74a24c25..73aee6b849d 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -4309,20 +4309,13 @@ BOOL WINAPI GetMenuInfo( HMENU menu, MENUINFO *info ) /********************************************************************** * GetMenuContextHelpId (USER32.@) */ -DWORD WINAPI GetMenuContextHelpId( HMENU hMenu ) +DWORD WINAPI GetMenuContextHelpId( HMENU menu ) { - DWORD help_id = 0; - POPUPMENU *menu; - - TRACE("(%p)\n", hMenu); - - if ((menu = grab_menu_ptr(hMenu))) - { - help_id = menu->dwContextHelpID; - release_menu_ptr(menu); - } - - return help_id; + MENUINFO info; + TRACE( "(%p)\n", menu ); + info.cbSize = sizeof(info); + info.fMask = MIM_HELPID; + return GetMenuInfo( menu, &info ) ? info.dwContextHelpID : 0; } /********************************************************************** -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/240

June 14, 2022

[PATCH 4/5] win32u: Move PopupMenuWndProc implementation from user32.

by Jacek Caban

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/menu.c | 165 ++------------------------------ dlls/win32u/menu.c | 179 +++++++++++++++++++++++++++++++++++ dlls/win32u/message.c | 2 + dlls/win32u/win32u_private.h | 3 + dlls/win32u/window.c | 2 +- include/ntuser.h | 1 + 6 files changed, 193 insertions(+), 159 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 2d01e01872c..f5b74a24c25 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -1196,62 +1196,6 @@ static void MENU_PopupMenuCalcSize( LPPOPUPMENU lppop, UINT max_height ) } -static void draw_scroll_arrow(HDC hdc, int x, int top, int height, BOOL up, BOOL enabled) -{ - RECT rect, light_rect; - HBRUSH brush = GetSysColorBrush( enabled ? COLOR_BTNTEXT : COLOR_BTNSHADOW ); - HBRUSH light = GetSysColorBrush( COLOR_3DLIGHT ); - - if (!up) - { - top = top + height; - if (!enabled) - { - SetRect( &rect, x + 1, top, x + 2, top + 1); - FillRect( hdc, &rect, light ); - } - top--; - } - - SetRect( &rect, x, top, x + 1, top + 1); - while (height--) - { - FillRect( hdc, &rect, brush ); - if (!enabled && !up && height) - { - SetRect( &light_rect, rect.right, rect.top, rect.right + 2, rect.bottom ); - FillRect( hdc, &light_rect, light ); - } - InflateRect( &rect, 1, 0 ); - OffsetRect( &rect, 0, up ? 1 : -1 ); - } - - if (!enabled && up) - { - rect.left += 2; - FillRect( hdc, &rect, light ); - } -} - -/*********************************************************************** - * MENU_DrawScrollArrows - * - * Draw scroll arrows. - */ -static void -MENU_DrawScrollArrows(const POPUPMENU *menu, HDC hdc) -{ - UINT full_height = get_scroll_arrow_height( menu ); - UINT arrow_height = full_height / 3; - BOOL at_end = menu->nScrollPos + menu->items_rect.bottom - menu->items_rect.top == menu->nTotalHeight; - - draw_scroll_arrow( hdc, menu->Width / 3, arrow_height, arrow_height, - TRUE, menu->nScrollPos != 0); - draw_scroll_arrow( hdc, menu->Width / 3, menu->Height - 2 * arrow_height, arrow_height, - FALSE, !at_end ); -} - - /*********************************************************************** * draw_popup_arrow * @@ -1634,66 +1578,6 @@ done: } -/*********************************************************************** - * MENU_DrawPopupMenu - * - * Paint a popup menu. - */ -static void MENU_DrawPopupMenu( HWND hwnd, HDC hdc, HMENU hmenu ) -{ - HBRUSH hPrevBrush, brush = GetSysColorBrush( COLOR_MENU ); - RECT rect; - POPUPMENU *menu = MENU_GetMenu( hmenu ); - - TRACE("wnd=%p dc=%p menu=%p\n", hwnd, hdc, hmenu); - - GetClientRect( hwnd, &rect ); - - if (menu && menu->hbrBack) brush = menu->hbrBack; - if ((hPrevBrush = SelectObject( hdc, brush )) - && SelectObject( hdc, get_menu_font(FALSE) )) - { - HPEN hPrevPen; - - Rectangle( hdc, rect.left, rect.top, rect.right, rect.bottom ); - - hPrevPen = SelectObject( hdc, GetStockObject( NULL_PEN ) ); - if( hPrevPen ) - { - BOOL flat_menu = FALSE; - - SystemParametersInfoW (SPI_GETFLATMENU, 0, &flat_menu, 0); - if (flat_menu) - FrameRect(hdc, &rect, GetSysColorBrush(COLOR_BTNSHADOW)); - else - DrawEdge (hdc, &rect, EDGE_RAISED, BF_RECT); - - if (menu) - { - TRACE("hmenu %p Style %08lx\n", hmenu, menu->dwStyle); - /* draw menu items */ - if (menu->nItems) - { - MENUITEM *item; - UINT u; - - item = menu->items; - for (u = menu->nItems; u > 0; u--, item++) - MENU_DrawMenuItem( hwnd, menu, menu->hwndOwner, hdc, - item, FALSE, ODA_DRAWENTIRE ); - } - /* draw scroll arrows */ - if (menu->bScrolling) - MENU_DrawScrollArrows(menu, hdc); - } - } else - { - SelectObject( hdc, hPrevBrush ); - } - } -} - - /*********************************************************************** * MENU_InitPopup * @@ -3347,40 +3231,8 @@ BOOL WINAPI TrackPopupMenu( HMENU hMenu, UINT wFlags, INT x, INT y, */ LRESULT WINAPI PopupMenuWndProc( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ) { - TRACE("hwnd=%p msg=0x%04x wp=0x%04Ix lp=0x%08Ix\n", hwnd, message, wParam, lParam); - switch(message) { - case WM_CREATE: - { - CREATESTRUCTW *cs = (CREATESTRUCTW*)lParam; - SetWindowLongPtrW( hwnd, 0, (LONG_PTR)cs->lpCreateParams ); - return 0; - } - - case WM_MOUSEACTIVATE: /* We don't want to be activated */ - return MA_NOACTIVATE; - - case WM_PAINT: - { - PAINTSTRUCT ps; - NtUserBeginPaint( hwnd, &ps ); - MENU_DrawPopupMenu( hwnd, ps.hdc, - (HMENU)GetWindowLongPtrW( hwnd, 0 ) ); - NtUserEndPaint( hwnd, &ps ); - return 0; - } - - case WM_PRINTCLIENT: - { - MENU_DrawPopupMenu( hwnd, (HDC)wParam, - (HMENU)GetWindowLongPtrW( hwnd, 0 ) ); - return 0; - } - - case WM_ERASEBKGND: - return 1; - case WM_DESTROY: /* zero out global pointer in case resident popup window was destroyed. */ if (hwnd == top_popup) { @@ -3389,18 +3241,15 @@ LRESULT WINAPI PopupMenuWndProc( HWND hwnd, UINT message, WPARAM wParam, LPARAM } break; + case WM_CREATE: + case WM_MOUSEACTIVATE: + case WM_PAINT: + case WM_PRINTCLIENT: + case WM_ERASEBKGND: case WM_SHOWWINDOW: - - if( wParam ) - { - if (!GetWindowLongPtrW( hwnd, 0 )) ERR("no menu to display\n"); - } - else - SetWindowLongPtrW( hwnd, 0, 0 ); - break; - case MN_GETHMENU: - return GetWindowLongPtrW( hwnd, 0 ); + return NtUserMessageCall( hwnd, message, wParam, lParam, + NULL, NtUserPopupMenuWndProc, FALSE ); default: return DefWindowProcW( hwnd, message, wParam, lParam ); diff --git a/dlls/win32u/menu.c b/dlls/win32u/menu.c index b794b9a162a..7825e0f416f 100644 --- a/dlls/win32u/menu.c +++ b/dlls/win32u/menu.c @@ -2226,3 +2226,182 @@ DWORD WINAPI NtUserDrawMenuBarTemp( HWND hwnd, HDC hdc, RECT *rect, HMENU handle if (prev_font) NtGdiSelectFont( hdc, prev_font ); return retvalue; } + +static UINT get_scroll_arrow_height( const POPUPMENU *menu ) +{ + return menucharsize.cy + 4; +} + +static void draw_scroll_arrow( HDC hdc, int x, int top, int height, BOOL up, BOOL enabled ) +{ + RECT rect, light_rect; + HBRUSH brush = get_sys_color_brush( enabled ? COLOR_BTNTEXT : COLOR_BTNSHADOW ); + HBRUSH light = get_sys_color_brush( COLOR_3DLIGHT ); + + if (!up) + { + top = top + height; + if (!enabled) + { + SetRect( &rect, x + 1, top, x + 2, top + 1); + fill_rect( hdc, &rect, light ); + } + top--; + } + + SetRect( &rect, x, top, x + 1, top + 1); + while (height--) + { + fill_rect( hdc, &rect, brush ); + if (!enabled && !up && height) + { + SetRect( &light_rect, rect.right, rect.top, rect.right + 2, rect.bottom ); + fill_rect( hdc, &light_rect, light ); + } + InflateRect( &rect, 1, 0 ); + OffsetRect( &rect, 0, up ? 1 : -1 ); + } + + if (!enabled && up) + { + rect.left += 2; + fill_rect( hdc, &rect, light ); + } +} + +static void draw_scroll_arrows( const POPUPMENU *menu, HDC hdc ) +{ + UINT full_height = get_scroll_arrow_height( menu ); + UINT arrow_height = full_height / 3; + BOOL at_end = menu->nScrollPos + menu->items_rect.bottom - menu->items_rect.top == menu->nTotalHeight; + + draw_scroll_arrow( hdc, menu->Width / 3, arrow_height, arrow_height, + TRUE, menu->nScrollPos != 0); + draw_scroll_arrow( hdc, menu->Width / 3, menu->Height - 2 * arrow_height, arrow_height, + FALSE, !at_end ); +} + +static int frame_rect( HDC hdc, const RECT *rect, HBRUSH hbrush ) +{ + HBRUSH prev_brush; + RECT r = *rect; + + if (IsRectEmpty(&r)) return 0; + if (!(prev_brush = NtGdiSelectBrush( hdc, hbrush ))) return 0; + + NtGdiPatBlt( hdc, r.left, r.top, 1, r.bottom - r.top, PATCOPY ); + NtGdiPatBlt( hdc, r.right - 1, r.top, 1, r.bottom - r.top, PATCOPY ); + NtGdiPatBlt( hdc, r.left, r.top, r.right - r.left, 1, PATCOPY ); + NtGdiPatBlt( hdc, r.left, r.bottom - 1, r.right - r.left, 1, PATCOPY ); + + NtGdiSelectBrush( hdc, prev_brush ); + return TRUE; +} + +static void draw_popup_menu( HWND hwnd, HDC hdc, HMENU hmenu ) +{ + HBRUSH prev_hrush, brush = get_sys_color_brush( COLOR_MENU ); + POPUPMENU *menu = unsafe_menu_ptr( hmenu ); + RECT rect; + + TRACE( "wnd=%p dc=%p menu=%p\n", hwnd, hdc, hmenu ); + + get_client_rect( hwnd, &rect ); + + if (menu && menu->hbrBack) brush = menu->hbrBack; + if ((prev_hrush = NtGdiSelectBrush( hdc, brush )) + && NtGdiSelectFont( hdc, get_menu_font( FALSE ))) + { + HPEN prev_pen; + + NtGdiRectangle( hdc, rect.left, rect.top, rect.right, rect.bottom ); + + prev_pen = NtGdiSelectPen( hdc, GetStockObject( NULL_PEN )); + if (prev_pen) + { + BOOL flat_menu = FALSE; + + NtUserSystemParametersInfo( SPI_GETFLATMENU, 0, &flat_menu, 0 ); + if (flat_menu) + frame_rect( hdc, &rect, get_sys_color_brush( COLOR_BTNSHADOW )); + else + draw_rect_edge( hdc, &rect, EDGE_RAISED, BF_RECT, 1 ); + + if (menu) + { + TRACE( "hmenu %p Style %08x\n", hmenu, menu->dwStyle ); + /* draw menu items */ + if (menu->nItems) + { + MENUITEM *item; + UINT u; + + item = menu->items; + for (u = menu->nItems; u > 0; u--, item++) + draw_menu_item( hwnd, menu, menu->hwndOwner, hdc, + item, FALSE, ODA_DRAWENTIRE ); + } + if (menu->bScrolling) draw_scroll_arrows( menu, hdc ); + } + } + else + { + NtGdiSelectBrush( hdc, prev_hrush ); + } + } +} + +LRESULT popup_menu_window_proc( HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam ) +{ + TRACE( "hwnd=%p msg=0x%04x wp=0x%04lx lp=0x%08lx\n", hwnd, message, wparam, lparam ); + + switch(message) + { + case WM_CREATE: + { + CREATESTRUCTW *cs = (CREATESTRUCTW *)lparam; + NtUserSetWindowLongPtr( hwnd, 0, (LONG_PTR)cs->lpCreateParams, FALSE ); + return 0; + } + + case WM_MOUSEACTIVATE: /* We don't want to be activated */ + return MA_NOACTIVATE; + + case WM_PAINT: + { + PAINTSTRUCT ps; + NtUserBeginPaint( hwnd, &ps ); + draw_popup_menu( hwnd, ps.hdc, (HMENU)get_window_long_ptr( hwnd, 0, FALSE )); + NtUserEndPaint( hwnd, &ps ); + return 0; + } + + case WM_PRINTCLIENT: + { + draw_popup_menu( hwnd, (HDC)wparam, (HMENU)get_window_long_ptr( hwnd, 0, FALSE )); + return 0; + } + + case WM_ERASEBKGND: + return 1; + + case WM_DESTROY: + break; + + case WM_SHOWWINDOW: + if (wparam) + { + if (!get_window_long_ptr( hwnd, 0, FALSE )) ERR( "no menu to display\n" ); + } + else + NtUserSetWindowLongPtr( hwnd, 0, 0, FALSE ); + break; + + case MN_GETHMENU: + return get_window_long_ptr( hwnd, 0, FALSE ); + + default: + return default_window_proc( hwnd, message, wparam, lparam, FALSE ); + } + return 0; +} diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index b41d252457d..cea1a33812a 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -2890,6 +2890,8 @@ LRESULT WINAPI NtUserMessageCall( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpa { switch (type) { + case NtUserPopupMenuWndProc: + return popup_menu_window_proc( hwnd, msg, wparam, lparam ); case NtUserDesktopWindowProc: return desktop_window_proc( hwnd, msg, wparam, lparam ); case NtUserDefWindowProc: diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index cf3e5c75b16..d3f060669a4 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -402,6 +402,8 @@ extern BOOL get_menu_info( HMENU handle, MENUINFO *info ) DECLSPEC_HIDDEN; extern INT get_menu_item_count( HMENU handle ) DECLSPEC_HIDDEN; extern UINT get_menu_state( HMENU handle, UINT item_id, UINT flags ) DECLSPEC_HIDDEN; extern BOOL is_menu( HMENU handle ) DECLSPEC_HIDDEN; +extern LRESULT popup_menu_window_proc( HWND hwnd, UINT message, WPARAM wparam, + LPARAM lparam ) DECLSPEC_HIDDEN; extern BOOL set_window_menu( HWND hwnd, HMENU handle ) DECLSPEC_HIDDEN; /* message.c */ @@ -473,6 +475,7 @@ extern BOOL is_window_unicode( HWND hwnd ) DECLSPEC_HIDDEN; extern BOOL is_window_visible( HWND hwnd ) DECLSPEC_HIDDEN; extern BOOL is_zoomed( HWND hwnd ) DECLSPEC_HIDDEN; extern DWORD get_window_long( HWND hwnd, INT offset ) DECLSPEC_HIDDEN; +extern ULONG_PTR get_window_long_ptr( HWND hwnd, INT offset, BOOL ansi ) DECLSPEC_HIDDEN; extern BOOL get_window_rect( HWND hwnd, RECT *rect, UINT dpi ) DECLSPEC_HIDDEN; enum coords_relative; extern BOOL get_window_rects( HWND hwnd, enum coords_relative relative, RECT *window_rect, diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index f98dabe27f3..94f285de2bb 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -1097,7 +1097,7 @@ DWORD get_window_long( HWND hwnd, INT offset ) } /* see GetWindowLongPtr */ -static ULONG_PTR get_window_long_ptr( HWND hwnd, INT offset, BOOL ansi ) +ULONG_PTR get_window_long_ptr( HWND hwnd, INT offset, BOOL ansi ) { return get_window_long_size( hwnd, offset, sizeof(LONG_PTR), ansi ); } diff --git a/include/ntuser.h b/include/ntuser.h index 9cf26534e10..5f744c24906 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -204,6 +204,7 @@ struct render_synthesized_format_params /* NtUserMessageCall codes */ enum { + NtUserPopupMenuWndProc = 0x029c, NtUserDesktopWindowProc = 0x029d, NtUserDefWindowProc = 0x029e, NtUserCallWindowProc = 0x02ab, -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/240

June 14, 2022

[PATCH 3/5] win32u: Move MENU_DrawMenuBar implementation from user32.

by Jacek Caban

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/controls.h | 1 - dlls/user32/menu.c | 20 -------------------- dlls/user32/user_main.c | 1 - dlls/win32u/defwnd.c | 7 +++++-- dlls/win32u/menu.c | 2 +- dlls/win32u/ntuser_private.h | 1 - dlls/win32u/win32u_private.h | 1 + 7 files changed, 7 insertions(+), 26 deletions(-) diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index 2b6c4912709..c09ab1233d0 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -116,7 +116,6 @@ extern BOOL update_wallpaper( const WCHAR *wallpaper, const WCHAR *pattern ) DEC extern HWND MENU_IsMenuActive(void) DECLSPEC_HIDDEN; extern void MENU_TrackMouseMenuBar( HWND hwnd, INT ht, POINT pt ) DECLSPEC_HIDDEN; extern void MENU_TrackKbdMenuBar( HWND hwnd, UINT wParam, WCHAR wChar ) DECLSPEC_HIDDEN; -extern UINT MENU_DrawMenuBar( HDC hDC, LPRECT lprect, HWND hwnd ) DECLSPEC_HIDDEN; extern void MENU_EndMenu(HWND) DECLSPEC_HIDDEN; extern HMENU MENU_GetSysMenu( HWND hWnd, HMENU hPopupMenu ) DECLSPEC_HIDDEN; diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 1372baca6cc..2d01e01872c 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -1693,26 +1693,6 @@ static void MENU_DrawPopupMenu( HWND hwnd, HDC hdc, HMENU hmenu ) } } -/*********************************************************************** - * MENU_DrawMenuBar - * - * Paint a menu bar. Returns the height of the menu bar. - * called from [windows/nonclient.c] - */ -UINT MENU_DrawMenuBar( HDC hDC, LPRECT lprect, HWND hwnd ) -{ - LPPOPUPMENU lppop; - HMENU hMenu = GetMenu(hwnd); - - lppop = MENU_GetMenu( hMenu ); - if (lppop == NULL || lprect == NULL) - { - return GetSystemMetrics(SM_CYMENU); - } - - return NtUserDrawMenuBarTemp( hwnd, hDC, lprect, hMenu, NULL ); -} - /*********************************************************************** * MENU_InitPopup diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index 5344dafd359..bca56fc4141 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -145,7 +145,6 @@ static const struct user_callbacks user_funcs = ImmProcessKey, ImmTranslateMessage, NtWaitForMultipleObjects, - MENU_DrawMenuBar, SCROLL_DrawNCScrollBar, free_win_ptr, MENU_GetSysMenu, diff --git a/dlls/win32u/defwnd.c b/dlls/win32u/defwnd.c index 9a51b9a463a..f9a23bcee3f 100644 --- a/dlls/win32u/defwnd.c +++ b/dlls/win32u/defwnd.c @@ -1487,12 +1487,15 @@ static void nc_paint( HWND hwnd, HRGN clip ) if (has_menu( hwnd, style )) { RECT r = rect; + HMENU menu; + r.bottom = rect.top + get_system_metrics( SM_CYMENU ); TRACE( "drawing menu with rect %s\n", wine_dbgstr_rect( &r )); - if (user_callbacks) - rect.top += user_callbacks->draw_menu( hdc, &r, hwnd ) + 1; + menu = get_menu( hwnd ); + if (!is_menu( menu )) rect.top += get_system_metrics( SM_CYMENU ); + else rect.top += NtUserDrawMenuBarTemp( hwnd, hdc, &r, menu, NULL ); } TRACE( "rect after menu %s\n", wine_dbgstr_rect( &rect )); diff --git a/dlls/win32u/menu.c b/dlls/win32u/menu.c index 182dbb6cf58..b794b9a162a 100644 --- a/dlls/win32u/menu.c +++ b/dlls/win32u/menu.c @@ -241,7 +241,7 @@ static POPUPMENU *unsafe_menu_ptr( HMENU handle ) } /* see IsMenu */ -static BOOL is_menu( HMENU handle ) +BOOL is_menu( HMENU handle ) { POPUPMENU *menu; BOOL is_menu; diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h index 6fc1c1423bd..69fb831c03f 100644 --- a/dlls/win32u/ntuser_private.h +++ b/dlls/win32u/ntuser_private.h @@ -36,7 +36,6 @@ struct user_callbacks BOOL (WINAPI *pImmProcessKey)(HWND, HKL, UINT, LPARAM, DWORD); BOOL (WINAPI *pImmTranslateMessage)(HWND, UINT, WPARAM, LPARAM); NTSTATUS (WINAPI *pNtWaitForMultipleObjects)(ULONG,const HANDLE*,BOOLEAN,BOOLEAN,const LARGE_INTEGER*); - UINT (CDECL *draw_menu)( HDC hDC, LPRECT lprect, HWND hwnd ); void (CDECL *draw_nc_scrollbar)( HWND hwnd, HDC hdc, BOOL draw_horizontal, BOOL draw_vertical ); void (CDECL *free_win_ptr)( struct tagWND *win ); HMENU (CDECL *get_sys_menu)( HWND hwnd, HMENU popup ); diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 5f5563ec9f9..cf3e5c75b16 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -401,6 +401,7 @@ extern UINT get_menu_bar_height( HWND hwnd, UINT width, INT org_x, INT org_y ) D extern BOOL get_menu_info( HMENU handle, MENUINFO *info ) DECLSPEC_HIDDEN; extern INT get_menu_item_count( HMENU handle ) DECLSPEC_HIDDEN; extern UINT get_menu_state( HMENU handle, UINT item_id, UINT flags ) DECLSPEC_HIDDEN; +extern BOOL is_menu( HMENU handle ) DECLSPEC_HIDDEN; extern BOOL set_window_menu( HWND hwnd, HMENU handle ) DECLSPEC_HIDDEN; /* message.c */ -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/240

June 14, 2022