[PATCH v9 0/9] MR9830: fix toplevel icon protocol for Wayland
Fixes https://bugs.winehq.org/show_bug.cgi?id=59149 -- v9: use get_window_icon_info from win32u/window.c https://gitlab.winehq.org/wine/wine/-/merge_requests/9830
From: Alex Schwartz <alexschwartz01@gmail.com> --- dlls/win32u/driver.c | 7 +++++++ dlls/win32u/window.c | 2 +- dlls/winewayland.drv/waylanddrv.h | 1 + dlls/winewayland.drv/waylanddrv_main.c | 1 + dlls/winewayland.drv/window.c | 27 +++++++++++++++++++++----- dlls/winex11.drv/init.c | 1 + dlls/winex11.drv/window.c | 8 ++++++++ dlls/winex11.drv/x11drv.h | 1 + include/wine/gdi_driver.h | 3 ++- 9 files changed, 44 insertions(+), 7 deletions(-) diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c index 60aba702d1a..6bab380417c 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c @@ -834,6 +834,11 @@ static void nulldrv_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw ) { } +static BOOL nulldrv_IsTopLevel( HWND hwnd ) +{ + return FALSE; +} + static void nulldrv_SetWindowIcons( HWND hwnd, HICON icon, const ICONINFO *ii, HICON icon_small, const ICONINFO *ii_small ) { } @@ -1293,6 +1298,7 @@ static const struct user_driver_funcs lazy_load_driver = loaderdrv_SetLayeredWindowAttributes, nulldrv_SetParent, loaderdrv_SetWindowRgn, + nulldrv_IsTopLevel, nulldrv_SetWindowIcons, nulldrv_SetWindowStyle, nulldrv_SetWindowText, @@ -1392,6 +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(IsTopLevel); 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 1464d45697e..f4c79a011ae 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) + if (win->dwStyle & WS_VISIBLE && !is_child && !win->has_icons && user_driver->pIsTopLevel(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 7ab1f58ba64..9e7fae3af84 100644 --- a/dlls/winewayland.drv/waylanddrv.h +++ b/dlls/winewayland.drv/waylanddrv.h @@ -445,6 +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_IsTopLevel(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 cdb5dd8a956..e8e804a9341 100644 --- a/dlls/winewayland.drv/waylanddrv_main.c +++ b/dlls/winewayland.drv/waylanddrv_main.c @@ -45,6 +45,7 @@ static const struct user_driver_funcs waylanddrv_funcs = .pSetCursor = WAYLAND_SetCursor, .pSetCursorPos = WAYLAND_SetCursorPos, .pSetLayeredWindowAttributes = WAYLAND_SetLayeredWindowAttributes, + .pIsTopLevel = WAYLAND_IsTopLevel, .pSetWindowIcons = WAYLAND_SetWindowIcons, .pSetWindowStyle = WAYLAND_SetWindowStyle, .pSetWindowText = WAYLAND_SetWindowText, diff --git a/dlls/winewayland.drv/window.c b/dlls/winewayland.drv/window.c index b838fd84191..f6adc0b8edf 100644 --- a/dlls/winewayland.drv/window.c +++ b/dlls/winewayland.drv/window.c @@ -664,6 +664,25 @@ static enum xdg_toplevel_resize_edge hittest_to_resize_edge(WPARAM hittest) } } +/***************************************************************** + * WAYLAND_IsTopLevel + */ +BOOL WAYLAND_IsTopLevel(HWND hwnd) +{ + struct wayland_win_data *data; + + if ((data = wayland_win_data_get(hwnd))) + { + if (data->wayland_surface && wayland_surface_is_toplevel(data->wayland_surface)) + { + wayland_win_data_release(data); + return TRUE; + } + wayland_win_data_release(data); + } + return FALSE; +} + /***************************************************************** * WAYLAND_SetWindowIcons */ @@ -677,11 +696,9 @@ void WAYLAND_SetWindowIcons(HWND hwnd, HICON icon, const ICONINFO *ii, HICON ico { if ((data = wayland_win_data_get(hwnd))) { - if (data->wayland_surface && wayland_surface_is_toplevel(data->wayland_surface)) - { - wayland_surface_set_icon(data->wayland_surface, ICON_BIG, ii); - wayland_surface_set_icon(data->wayland_surface, ICON_SMALL, ii_small); - } + wayland_surface_set_icon(data->wayland_surface, ICON_BIG, ii); + wayland_surface_set_icon(data->wayland_surface, ICON_SMALL, ii_small); + wayland_win_data_release(data); } } diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index 09ef2bf8664..d253b86a816 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -698,6 +698,7 @@ static const struct user_driver_funcs x11drv_funcs = .pActivateWindow = X11DRV_ActivateWindow, .pSetLayeredWindowAttributes = X11DRV_SetLayeredWindowAttributes, .pSetParent = X11DRV_SetParent, + .pIsTopLevel = X11DRV_IsTopLevel, .pSetWindowIcons = X11DRV_SetWindowIcons, .pSetWindowRgn = X11DRV_SetWindowRgn, .pSetWindowStyle = X11DRV_SetWindowStyle, diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index d256674c9c1..b40416cdc00 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -3393,6 +3393,14 @@ done: } +/********************************************************************** + * IsTopLevel (X11DRV.@) + */ +BOOL X11DRV_IsTopLevel(HWND hwnd) +{ + return TRUE; +} + /********************************************************************** * SetWindowIcons (X11DRV.@) */ diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 9232988c9c7..3d7ae00653d 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -238,6 +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_IsTopLevel( 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 81932436963..0c518eb2f7c 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -218,7 +218,7 @@ struct gdi_dc_funcs }; /* increment this when you change the DC function table */ -#define WINE_GDI_DRIVER_VERSION 108 +#define WINE_GDI_DRIVER_VERSION 109 #define GDI_PRIORITY_NULL_DRV 0 /* null driver */ #define GDI_PRIORITY_FONT_DRV 100 /* any font driver */ @@ -415,6 +415,7 @@ struct user_driver_funcs void (*pSetLayeredWindowAttributes)(HWND,COLORREF,BYTE,DWORD); void (*pSetParent)(HWND,HWND,HWND); void (*pSetWindowRgn)(HWND,HRGN,BOOL); + BOOL (*pIsTopLevel)(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/9830
From: Alex Schwartz <alexschwartz01@gmail.com> --- dlls/winewayland.drv/window.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/winewayland.drv/window.c b/dlls/winewayland.drv/window.c index f6adc0b8edf..1e85dd383b8 100644 --- a/dlls/winewayland.drv/window.c +++ b/dlls/winewayland.drv/window.c @@ -696,8 +696,11 @@ void WAYLAND_SetWindowIcons(HWND hwnd, HICON icon, const ICONINFO *ii, HICON ico { if ((data = wayland_win_data_get(hwnd))) { - wayland_surface_set_icon(data->wayland_surface, ICON_BIG, ii); - wayland_surface_set_icon(data->wayland_surface, ICON_SMALL, ii_small); + if (data->wayland_surface && wayland_surface_is_toplevel(data->wayland_surface)) + { + wayland_surface_set_icon(data->wayland_surface, ICON_BIG, ii); + wayland_surface_set_icon(data->wayland_surface, ICON_SMALL, ii_small); + } wayland_win_data_release(data); } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/9830
From: Alex Schwartz <alexschwartz01@gmail.com> --- dlls/winewayland.drv/window.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/winewayland.drv/window.c b/dlls/winewayland.drv/window.c index 1e85dd383b8..afb5f4d3395 100644 --- a/dlls/winewayland.drv/window.c +++ b/dlls/winewayland.drv/window.c @@ -701,7 +701,6 @@ void WAYLAND_SetWindowIcons(HWND hwnd, HICON icon, const ICONINFO *ii, HICON ico wayland_surface_set_icon(data->wayland_surface, ICON_BIG, ii); wayland_surface_set_icon(data->wayland_surface, ICON_SMALL, ii_small); } - wayland_win_data_release(data); } } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/9830
From: Alex Schwartz <alexschwartz01@gmail.com> --- dlls/winewayland.drv/window.c | 40 ++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/dlls/winewayland.drv/window.c b/dlls/winewayland.drv/window.c index afb5f4d3395..4e6ef379b3f 100644 --- a/dlls/winewayland.drv/window.c +++ b/dlls/winewayland.drv/window.c @@ -433,6 +433,24 @@ BOOL WAYLAND_WindowPosChanging(HWND hwnd, UINT swp_flags, BOOL shaped, const str return TRUE; } +static HICON get_icon_info(HICON icon, ICONINFO *ii) +{ + return icon && NtUserGetIconInfo(icon, ii, NULL, NULL, NULL, 0) ? icon : NULL; +} + +static HICON get_window_icon(HWND hwnd, UINT type, HICON icon, ICONINFO *ret) +{ + if ((icon = get_icon_info( icon, ret ))) return icon; + if ((icon = get_icon_info( (HICON)send_message( hwnd, WM_GETICON, type, 0 ), ret ))) return icon; + if ((icon = get_icon_info( (HICON)NtUserGetClassLongPtrW( hwnd, GCLP_HICON ), ret ))) return icon; + if (type == ICON_BIG) + { + icon = LoadImageW( 0, (const WCHAR *)IDI_WINLOGO, IMAGE_ICON, 0, 0, LR_SHARED | LR_DEFAULTSIZE ); + return get_icon_info( icon, ret ); + } + return NULL; +} + /*********************************************************************** * WAYLAND_WindowPosChanged */ @@ -443,7 +461,7 @@ void WAYLAND_WindowPosChanged(HWND hwnd, HWND insert_after, HWND owner_hint, UIN struct wayland_surface *toplevel_surface; struct wayland_client_surface *client; struct wayland_win_data *data, *toplevel_data; - BOOL managed, fullscreen = swp_flags & WINE_SWP_FULLSCREEN; + BOOL managed, needs_icon, fullscreen = swp_flags & WINE_SWP_FULLSCREEN; TRACE("hwnd %p new_rects %s after %p flags %08x\n", hwnd, debugstr_window_rects(new_rects), insert_after, swp_flags); @@ -481,7 +499,27 @@ void WAYLAND_WindowPosChanged(HWND hwnd, HWND insert_after, HWND owner_hint, UIN wayland_win_data_update_wayland_state(data); } + needs_icon = data->wayland_surface && !data->wayland_surface->big_icon_buffer && + wayland_surface_is_toplevel(data->wayland_surface) && + process_wayland.xdg_toplevel_icon_manager_v1; + wayland_win_data_release(data); + + if (needs_icon) + { + HICON big, small; + ICONINFO ii, ii_small; + big = get_window_icon(hwnd, ICON_BIG, 0, &ii); + small = get_window_icon(hwnd, ICON_SMALL, 0, &ii_small); + + if((data = wayland_win_data_get(hwnd))) + { + if (big) wayland_surface_set_icon(data->wayland_surface, ICON_BIG, &ii); + if (small) wayland_surface_set_icon(data->wayland_surface, ICON_SMALL, &ii_small); + + wayland_win_data_release(data); + } + } } static void wayland_configure_window(HWND hwnd) -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/9830
From: Alex Schwartz <alexschwartz01@gmail.com> --- dlls/win32u/window.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index f4c79a011ae..1464d45697e 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->pIsTopLevel(hwnd)) + if (win->dwStyle & WS_VISIBLE && !is_child && !win->has_icons) { icon = win->hIcon; icon_small = win->hIconSmall2 ? win->hIconSmall2 : win->hIconSmall; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/9830
From: Alex Schwartz <alexschwartz01@gmail.com> --- dlls/win32u/driver.c | 7 ------- dlls/winewayland.drv/waylanddrv.h | 1 - dlls/winewayland.drv/waylanddrv_main.c | 1 - dlls/winewayland.drv/window.c | 19 ------------------- dlls/winex11.drv/init.c | 1 - dlls/winex11.drv/window.c | 8 -------- dlls/winex11.drv/x11drv.h | 1 - include/wine/gdi_driver.h | 3 +-- 8 files changed, 1 insertion(+), 40 deletions(-) diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c index 6bab380417c..60aba702d1a 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c @@ -834,11 +834,6 @@ static void nulldrv_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw ) { } -static BOOL nulldrv_IsTopLevel( HWND hwnd ) -{ - return FALSE; -} - static void nulldrv_SetWindowIcons( HWND hwnd, HICON icon, const ICONINFO *ii, HICON icon_small, const ICONINFO *ii_small ) { } @@ -1298,7 +1293,6 @@ static const struct user_driver_funcs lazy_load_driver = loaderdrv_SetLayeredWindowAttributes, nulldrv_SetParent, loaderdrv_SetWindowRgn, - nulldrv_IsTopLevel, nulldrv_SetWindowIcons, nulldrv_SetWindowStyle, nulldrv_SetWindowText, @@ -1398,7 +1392,6 @@ 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(IsTopLevel); SET_USER_FUNC(SetWindowIcons); SET_USER_FUNC(SetWindowStyle); SET_USER_FUNC(SetWindowText); diff --git a/dlls/winewayland.drv/waylanddrv.h b/dlls/winewayland.drv/waylanddrv.h index 9e7fae3af84..7ab1f58ba64 100644 --- a/dlls/winewayland.drv/waylanddrv.h +++ b/dlls/winewayland.drv/waylanddrv.h @@ -445,7 +445,6 @@ 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_IsTopLevel(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 e8e804a9341..cdb5dd8a956 100644 --- a/dlls/winewayland.drv/waylanddrv_main.c +++ b/dlls/winewayland.drv/waylanddrv_main.c @@ -45,7 +45,6 @@ static const struct user_driver_funcs waylanddrv_funcs = .pSetCursor = WAYLAND_SetCursor, .pSetCursorPos = WAYLAND_SetCursorPos, .pSetLayeredWindowAttributes = WAYLAND_SetLayeredWindowAttributes, - .pIsTopLevel = WAYLAND_IsTopLevel, .pSetWindowIcons = WAYLAND_SetWindowIcons, .pSetWindowStyle = WAYLAND_SetWindowStyle, .pSetWindowText = WAYLAND_SetWindowText, diff --git a/dlls/winewayland.drv/window.c b/dlls/winewayland.drv/window.c index 4e6ef379b3f..dd0c83bc9c8 100644 --- a/dlls/winewayland.drv/window.c +++ b/dlls/winewayland.drv/window.c @@ -702,25 +702,6 @@ static enum xdg_toplevel_resize_edge hittest_to_resize_edge(WPARAM hittest) } } -/***************************************************************** - * WAYLAND_IsTopLevel - */ -BOOL WAYLAND_IsTopLevel(HWND hwnd) -{ - struct wayland_win_data *data; - - if ((data = wayland_win_data_get(hwnd))) - { - if (data->wayland_surface && wayland_surface_is_toplevel(data->wayland_surface)) - { - wayland_win_data_release(data); - return TRUE; - } - wayland_win_data_release(data); - } - return FALSE; -} - /***************************************************************** * WAYLAND_SetWindowIcons */ diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index d253b86a816..09ef2bf8664 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -698,7 +698,6 @@ static const struct user_driver_funcs x11drv_funcs = .pActivateWindow = X11DRV_ActivateWindow, .pSetLayeredWindowAttributes = X11DRV_SetLayeredWindowAttributes, .pSetParent = X11DRV_SetParent, - .pIsTopLevel = X11DRV_IsTopLevel, .pSetWindowIcons = X11DRV_SetWindowIcons, .pSetWindowRgn = X11DRV_SetWindowRgn, .pSetWindowStyle = X11DRV_SetWindowStyle, diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index b40416cdc00..d256674c9c1 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -3393,14 +3393,6 @@ done: } -/********************************************************************** - * IsTopLevel (X11DRV.@) - */ -BOOL X11DRV_IsTopLevel(HWND hwnd) -{ - return TRUE; -} - /********************************************************************** * SetWindowIcons (X11DRV.@) */ diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 3d7ae00653d..9232988c9c7 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -238,7 +238,6 @@ 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_IsTopLevel( 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 0c518eb2f7c..81932436963 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -218,7 +218,7 @@ struct gdi_dc_funcs }; /* increment this when you change the DC function table */ -#define WINE_GDI_DRIVER_VERSION 109 +#define WINE_GDI_DRIVER_VERSION 108 #define GDI_PRIORITY_NULL_DRV 0 /* null driver */ #define GDI_PRIORITY_FONT_DRV 100 /* any font driver */ @@ -415,7 +415,6 @@ struct user_driver_funcs void (*pSetLayeredWindowAttributes)(HWND,COLORREF,BYTE,DWORD); void (*pSetParent)(HWND,HWND,HWND); void (*pSetWindowRgn)(HWND,HRGN,BOOL); - BOOL (*pIsTopLevel)(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/9830
From: Alex Schwartz <alexschwartz01@gmail.com> --- dlls/winewayland.drv/window.c | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/dlls/winewayland.drv/window.c b/dlls/winewayland.drv/window.c index dd0c83bc9c8..861c4d02ff9 100644 --- a/dlls/winewayland.drv/window.c +++ b/dlls/winewayland.drv/window.c @@ -707,22 +707,7 @@ static enum xdg_toplevel_resize_edge hittest_to_resize_edge(WPARAM hittest) */ void WAYLAND_SetWindowIcons(HWND hwnd, HICON icon, const ICONINFO *ii, HICON icon_small, const ICONINFO *ii_small) { - struct wayland_win_data *data; - - TRACE("hwnd=%p icon=%p ii=%p icon_small=%p ii_small=%p\n", hwnd, icon, ii, icon_small, ii_small); - - if (process_wayland.xdg_toplevel_icon_manager_v1) - { - if ((data = wayland_win_data_get(hwnd))) - { - if (data->wayland_surface && wayland_surface_is_toplevel(data->wayland_surface)) - { - wayland_surface_set_icon(data->wayland_surface, ICON_BIG, ii); - wayland_surface_set_icon(data->wayland_surface, ICON_SMALL, ii_small); - } - wayland_win_data_release(data); - } - } + return; } /*********************************************************************** -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/9830
From: Alex Schwartz <alexschwartz01@gmail.com> --- dlls/winewayland.drv/window.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/winewayland.drv/window.c b/dlls/winewayland.drv/window.c index 861c4d02ff9..590fd39af19 100644 --- a/dlls/winewayland.drv/window.c +++ b/dlls/winewayland.drv/window.c @@ -707,7 +707,6 @@ static enum xdg_toplevel_resize_edge hittest_to_resize_edge(WPARAM hittest) */ void WAYLAND_SetWindowIcons(HWND hwnd, HICON icon, const ICONINFO *ii, HICON icon_small, const ICONINFO *ii_small) { - return; } /*********************************************************************** -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/9830
From: Alex Schwartz <alexschwartz01@gmail.com> --- dlls/win32u/driver.c | 3 ++- dlls/win32u/window.c | 2 +- dlls/winewayland.drv/waylanddrv.h | 3 ++- dlls/winewayland.drv/window.c | 25 ++++--------------------- dlls/winex11.drv/window.c | 3 ++- dlls/winex11.drv/x11drv.h | 3 ++- include/wine/gdi_driver.h | 4 +++- 7 files changed, 16 insertions(+), 27 deletions(-) diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c index 60aba702d1a..657b9237eb2 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c @@ -891,7 +891,8 @@ static void nulldrv_MoveWindowBits( HWND hwnd, const struct window_rects *old_re } static void nulldrv_WindowPosChanged( HWND hwnd, HWND insert_after, HWND owner_hint, UINT swp_flags, - const struct window_rects *new_rects, struct window_surface *surface ) + const struct window_rects *new_rects, struct window_surface *surface, + HICON (*get_window_icon_info)(HWND, UINT, HICON, ICONINFO*) ) { } diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index 1464d45697e..b7fd97c43fc 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -2345,7 +2345,7 @@ static BOOL apply_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, stru if (owner_hint) owner_hint = NtUserGetAncestor(owner_hint, GA_ROOT); user_driver->pWindowPosChanged( hwnd, insert_after, owner_hint, swp_flags, &monitor_rects, - get_driver_window_surface( new_surface, raw_dpi ) ); + get_driver_window_surface( new_surface, raw_dpi ), get_window_icon_info ); update_client_surfaces( toplevel ); } diff --git a/dlls/winewayland.drv/waylanddrv.h b/dlls/winewayland.drv/waylanddrv.h index 7ab1f58ba64..16f5f14fc96 100644 --- a/dlls/winewayland.drv/waylanddrv.h +++ b/dlls/winewayland.drv/waylanddrv.h @@ -452,7 +452,8 @@ LRESULT WAYLAND_SysCommand(HWND hwnd, WPARAM wparam, LPARAM lparam, const POINT UINT WAYLAND_UpdateDisplayDevices(const struct gdi_device_manager *device_manager, void *param); LRESULT WAYLAND_WindowMessage(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp); void WAYLAND_WindowPosChanged(HWND hwnd, HWND insert_after, HWND owner_hint, UINT swp_flags, - const struct window_rects *new_rects, struct window_surface *surface); + const struct window_rects *new_rects, struct window_surface *surface, + HICON (*get_window_icon_info)(HWND, UINT, HICON, ICONINFO*)); BOOL WAYLAND_WindowPosChanging(HWND hwnd, UINT swp_flags, BOOL shaped, const struct window_rects *rects); BOOL WAYLAND_CreateWindowSurface(HWND hwnd, BOOL layered, const RECT *surface_rect, struct window_surface **surface); UINT WAYLAND_VulkanInit(UINT version, void *vulkan_handle, const struct vulkan_driver_funcs **driver_funcs); diff --git a/dlls/winewayland.drv/window.c b/dlls/winewayland.drv/window.c index 590fd39af19..75a0569f34d 100644 --- a/dlls/winewayland.drv/window.c +++ b/dlls/winewayland.drv/window.c @@ -433,29 +433,12 @@ BOOL WAYLAND_WindowPosChanging(HWND hwnd, UINT swp_flags, BOOL shaped, const str return TRUE; } -static HICON get_icon_info(HICON icon, ICONINFO *ii) -{ - return icon && NtUserGetIconInfo(icon, ii, NULL, NULL, NULL, 0) ? icon : NULL; -} - -static HICON get_window_icon(HWND hwnd, UINT type, HICON icon, ICONINFO *ret) -{ - if ((icon = get_icon_info( icon, ret ))) return icon; - if ((icon = get_icon_info( (HICON)send_message( hwnd, WM_GETICON, type, 0 ), ret ))) return icon; - if ((icon = get_icon_info( (HICON)NtUserGetClassLongPtrW( hwnd, GCLP_HICON ), ret ))) return icon; - if (type == ICON_BIG) - { - icon = LoadImageW( 0, (const WCHAR *)IDI_WINLOGO, IMAGE_ICON, 0, 0, LR_SHARED | LR_DEFAULTSIZE ); - return get_icon_info( icon, ret ); - } - return NULL; -} - /*********************************************************************** * WAYLAND_WindowPosChanged */ void WAYLAND_WindowPosChanged(HWND hwnd, HWND insert_after, HWND owner_hint, UINT swp_flags, - const struct window_rects *new_rects, struct window_surface *surface) + const struct window_rects *new_rects, struct window_surface *surface, + HICON (*get_window_icon_info)(HWND, UINT, HICON, ICONINFO*)) { HWND toplevel = NtUserGetAncestor(hwnd, GA_ROOT); struct wayland_surface *toplevel_surface; @@ -509,8 +492,8 @@ void WAYLAND_WindowPosChanged(HWND hwnd, HWND insert_after, HWND owner_hint, UIN { HICON big, small; ICONINFO ii, ii_small; - big = get_window_icon(hwnd, ICON_BIG, 0, &ii); - small = get_window_icon(hwnd, ICON_SMALL, 0, &ii_small); + big = get_window_icon_info(hwnd, ICON_BIG, 0, &ii); + small = get_window_icon_info(hwnd, ICON_SMALL, 0, &ii_small); if((data = wayland_win_data_get(hwnd))) { diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index d256674c9c1..21e126b76d5 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -3249,7 +3249,8 @@ static BOOL get_desired_wm_state( DWORD style, const struct window_rects *rects * WindowPosChanged (X11DRV.@) */ void X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, HWND owner_hint, UINT swp_flags, - const struct window_rects *new_rects, struct window_surface *surface ) + const struct window_rects *new_rects, struct window_surface *surface, + HICON (*get_window_icon_info)(HWND, UINT, HICON, ICONINFO*) ) { struct x11drv_win_data *data; UINT ex_style = NtUserGetWindowLongW( hwnd, GWL_EXSTYLE ), new_style = NtUserGetWindowLongW( hwnd, GWL_STYLE ); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 9232988c9c7..694eef499dc 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -255,7 +255,8 @@ extern BOOL X11DRV_CreateWindowSurface( HWND hwnd, BOOL layered, const RECT *sur extern void X11DRV_MoveWindowBits( HWND hwnd, const struct window_rects *old_rects, const struct window_rects *new_rects, const RECT *valid_rects ); extern void X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, HWND owner_hint, UINT swp_flags, - const struct window_rects *new_rects, struct window_surface *surface ); + const struct window_rects *new_rects, struct window_surface *surface, + HICON (*get_window_icon_info)(HWND, UINT, HICON, ICONINFO*) ); extern BOOL X11DRV_SystemParametersInfo( UINT action, UINT int_param, void *ptr_param, UINT flags ); extern LRESULT X11DRV_WintabProc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, void *buffer ); diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index 81932436963..826905c71fa 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -427,7 +427,9 @@ struct user_driver_funcs BOOL (*pGetWindowStateUpdates)(HWND,UINT*,UINT*,RECT*,HWND*); BOOL (*pCreateWindowSurface)(HWND,BOOL,const RECT *,struct window_surface**); void (*pMoveWindowBits)(HWND,const struct window_rects *,const struct window_rects *,const RECT *); - void (*pWindowPosChanged)(HWND,HWND,HWND,UINT,const struct window_rects*,struct window_surface*); + void (*pWindowPosChanged)(HWND,HWND,HWND,UINT,const struct window_rects*,struct window_surface*, + HICON (*get_window_icon_info)(HWND, UINT, HICON, ICONINFO*) + ); /* system parameters */ BOOL (*pSystemParametersInfo)(UINT,UINT,void*,UINT); /* wintab support */ -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/9830
participants (2)
-
Alex Schwartz -
Alex Schwartz (＠alexschwartz01)