From: Alex Schwartz <alexschwartz01@gmail.com> --- dlls/win32u/defwnd.c | 2 +- dlls/win32u/driver.c | 6 +++--- dlls/win32u/window.c | 2 +- dlls/winewayland.drv/waylanddrv.h | 2 +- dlls/winewayland.drv/waylanddrv_main.c | 2 +- dlls/winewayland.drv/window.c | 4 ++-- dlls/winex11.drv/init.c | 2 +- dlls/winex11.drv/window.c | 4 ++-- dlls/winex11.drv/x11drv.h | 2 +- include/wine/gdi_driver.h | 2 +- 10 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/win32u/defwnd.c b/dlls/win32u/defwnd.c index a09784e06a3..c24ab182263 100644 --- a/dlls/win32u/defwnd.c +++ b/dlls/win32u/defwnd.c @@ -420,7 +420,7 @@ static HICON set_window_icon( HWND hwnd, WPARAM type, HICON icon ) icon = win->hIcon; icon_small = win->hIconSmall2 ? win->hIconSmall2 : win->hIconSmall; - BOOL need_icons = win->has_icons = !is_child && user_driver->pNeedsToplevelIcon(hwnd); + BOOL need_icons = win->has_icons = !is_child && user_driver->pAllowsToplevelIcon(hwnd); release_win_ptr( win ); if (need_icons && (icon = get_window_icon_info( hwnd, ICON_BIG, icon, &ii ))) diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c index 9c942592f13..5a0e2a64d92 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c @@ -834,7 +834,7 @@ static void nulldrv_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw ) { } -static BOOL nulldrv_NeedsToplevelIcon( HWND hwnd ) +static BOOL nulldrv_AllowsToplevelIcon( HWND hwnd ) { return FALSE; } @@ -1298,7 +1298,7 @@ static const struct user_driver_funcs lazy_load_driver = loaderdrv_SetLayeredWindowAttributes, nulldrv_SetParent, loaderdrv_SetWindowRgn, - nulldrv_NeedsToplevelIcon, + nulldrv_AllowsToplevelIcon, nulldrv_SetWindowIcons, nulldrv_SetWindowStyle, nulldrv_SetWindowText, @@ -1398,7 +1398,7 @@ void __wine_set_user_driver( const struct user_driver_funcs *funcs, UINT version SET_USER_FUNC(SetLayeredWindowAttributes); SET_USER_FUNC(SetParent); SET_USER_FUNC(SetWindowRgn); - SET_USER_FUNC(NeedsToplevelIcon); + SET_USER_FUNC(AllowsToplevelIcon); SET_USER_FUNC(SetWindowIcons); SET_USER_FUNC(SetWindowStyle); SET_USER_FUNC(SetWindowText); diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index 943dee68c43..5429054cadd 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -2252,7 +2252,7 @@ static BOOL apply_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, stru (swp_flags & (SWP_HIDEWINDOW | SWP_SHOWWINDOW | SWP_STATECHANGED | SWP_FRAMECHANGED))) invalidate_dce( win, &old_rects.window ); - if (win->dwStyle & WS_VISIBLE && !is_child && !win->has_icons && user_driver->pNeedsToplevelIcon(hwnd)) + if (win->dwStyle & WS_VISIBLE && !is_child && !win->has_icons && user_driver->pAllowsToplevelIcon(hwnd)) { icon = win->hIcon; icon_small = win->hIconSmall2 ? win->hIconSmall2 : win->hIconSmall; diff --git a/dlls/winewayland.drv/waylanddrv.h b/dlls/winewayland.drv/waylanddrv.h index 97f046a6d31..a0e99b13011 100644 --- a/dlls/winewayland.drv/waylanddrv.h +++ b/dlls/winewayland.drv/waylanddrv.h @@ -445,7 +445,7 @@ BOOL WAYLAND_SetIMECompositionRect(HWND hwnd, RECT rect); void WAYLAND_SetCursor(HWND hwnd, HCURSOR hcursor); BOOL WAYLAND_SetCursorPos(INT x, INT y); void WAYLAND_SetLayeredWindowAttributes(HWND hwnd, COLORREF key, BYTE alpha, DWORD flags); -BOOL WAYLAND_NeedsToplevelIcon(HWND hwnd); +BOOL WAYLAND_AllowsToplevelIcon(HWND hwnd); void WAYLAND_SetWindowIcons(HWND hwnd, HICON icon, const ICONINFO *ii, HICON icon_small, const ICONINFO *ii_small); void WAYLAND_SetWindowStyle(HWND hwnd, INT offset, STYLESTRUCT *style); void WAYLAND_SetWindowText(HWND hwnd, LPCWSTR text); diff --git a/dlls/winewayland.drv/waylanddrv_main.c b/dlls/winewayland.drv/waylanddrv_main.c index 69d81560f98..90826f46f7a 100644 --- a/dlls/winewayland.drv/waylanddrv_main.c +++ b/dlls/winewayland.drv/waylanddrv_main.c @@ -45,7 +45,7 @@ static const struct user_driver_funcs waylanddrv_funcs = .pSetCursor = WAYLAND_SetCursor, .pSetCursorPos = WAYLAND_SetCursorPos, .pSetLayeredWindowAttributes = WAYLAND_SetLayeredWindowAttributes, - .pNeedsToplevelIcon = WAYLAND_NeedsToplevelIcon, + .pAllowsToplevelIcon = WAYLAND_AllowsToplevelIcon, .pSetWindowIcons = WAYLAND_SetWindowIcons, .pSetWindowStyle = WAYLAND_SetWindowStyle, .pSetWindowText = WAYLAND_SetWindowText, diff --git a/dlls/winewayland.drv/window.c b/dlls/winewayland.drv/window.c index dad5c4db63f..1c38ebc52f9 100644 --- a/dlls/winewayland.drv/window.c +++ b/dlls/winewayland.drv/window.c @@ -665,9 +665,9 @@ static enum xdg_toplevel_resize_edge hittest_to_resize_edge(WPARAM hittest) } /***************************************************************** - * WAYLAND_NeedsToplevelIcon + * WAYLAND_AllowsToplevelIcon */ -BOOL WAYLAND_NeedsToplevelIcon(HWND hwnd) +BOOL WAYLAND_AllowsToplevelIcon(HWND hwnd) { struct wayland_win_data *data; diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index 5f65b0a3389..23343642006 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -698,7 +698,7 @@ static const struct user_driver_funcs x11drv_funcs = .pActivateWindow = X11DRV_ActivateWindow, .pSetLayeredWindowAttributes = X11DRV_SetLayeredWindowAttributes, .pSetParent = X11DRV_SetParent, - .pNeedsToplevelIcon = X11DRV_NeedsToplevelIcon, + .pAllowsToplevelIcon = X11DRV_AllowsToplevelIcon, .pSetWindowIcons = X11DRV_SetWindowIcons, .pSetWindowRgn = X11DRV_SetWindowRgn, .pSetWindowStyle = X11DRV_SetWindowStyle, diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 2e0f11a4f4d..c9d6c8e662a 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -3394,9 +3394,9 @@ done: /********************************************************************** - * NeedsToplevelIcon (X11DRV.@) + * AllowsToplevelIcon (X11DRV.@) */ -BOOL X11DRV_NeedsToplevelIcon(HWND hwnd) +BOOL X11DRV_AllowsToplevelIcon(HWND hwnd) { return TRUE; } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 221e04d744e..81e786b85e2 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -238,7 +238,7 @@ extern void X11DRV_SetDesktopWindow( HWND hwnd ); extern void X11DRV_SetLayeredWindowAttributes( HWND hwnd, COLORREF key, BYTE alpha, DWORD flags ); extern void X11DRV_SetParent( HWND hwnd, HWND parent, HWND old_parent ); -extern BOOL X11DRV_NeedsToplevelIcon( HWND hwnd ); +extern BOOL X11DRV_AllowsToplevelIcon( HWND hwnd ); extern void X11DRV_SetWindowIcons( HWND hwnd, HICON icon, const ICONINFO *ii, HICON icon_small, const ICONINFO *ii_small ); extern void X11DRV_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw ); extern void X11DRV_SetWindowStyle( HWND hwnd, INT offset, STYLESTRUCT *style ); diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index 03c23cab15e..067fc0d63cf 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -415,7 +415,7 @@ struct user_driver_funcs void (*pSetLayeredWindowAttributes)(HWND,COLORREF,BYTE,DWORD); void (*pSetParent)(HWND,HWND,HWND); void (*pSetWindowRgn)(HWND,HRGN,BOOL); - BOOL (*pNeedsToplevelIcon)(HWND); + BOOL (*pAllowsToplevelIcon)(HWND); void (*pSetWindowIcons)(HWND,HICON,const ICONINFO*,HICON,const ICONINFO*); void (*pSetWindowStyle)(HWND,INT,STYLESTRUCT*); void (*pSetWindowText)(HWND,LPCWSTR); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/9832