December 2023 - Wine-commits

Henri Verbeet : vkd3d-shader: Update the vkd3d_shader_scan() documentation.
by Alexandre Julliard 04 Dec '23

04 Dec '23

Module: vkd3d Branch: master Commit: 803dfc1246a33e23665a85d28ea78205a6efb998 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/803dfc1246a33e23665a85d28ea78… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 4 16:44:48 2023 +0100 vkd3d-shader: Update the vkd3d_shader_scan() documentation. Scanning d3dbc sources is supported now, and vkd3d_shader_scan_combined_resource_sampler_info is supported as a chained structure. --- include/vkd3d_shader.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index ed6d6432..c43b619d 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -2148,12 +2148,14 @@ VKD3D_SHADER_API int vkd3d_shader_convert_root_signature(struct vkd3d_shader_ver * * Currently this function supports the following code types: * - VKD3D_SHADER_SOURCE_DXBC_TPF + * - VKD3D_SHADER_SOURCE_D3D_BYTECODE * * \param compile_info A chained structure containing scan parameters. * \n - * The DXBC_TPF scanner supports the following chained structures: + * The scanner supports the following chained structures: * - vkd3d_shader_scan_descriptor_info * - vkd3d_shader_scan_signature_info + * - vkd3d_shader_scan_combined_resource_sampler_info * \n * Although the \a compile_info parameter is read-only, chained structures * passed to this function need not be, and may serve as output parameters,

1 0

Conor McCarthy : vkd3d-shader/spirv: Do not emit a fixme for SV_TARGET in get_spirv_builtin_for_sysval().
by Alexandre Julliard 04 Dec '23

04 Dec '23

Module: vkd3d Branch: master Commit: f11e1461aadbdf4c2fcd752ed6e1101425d9d4e3 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/f11e1461aadbdf4c2fcd752ed6e11… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Dec 1 00:20:06 2023 +1000 vkd3d-shader/spirv: Do not emit a fixme for SV_TARGET in get_spirv_builtin_for_sysval(). --- libs/vkd3d-shader/spirv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index be149a0c..55afa1cc 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4455,7 +4455,7 @@ static const struct vkd3d_spirv_builtin *get_spirv_builtin_for_sysval( enum vkd3d_shader_spirv_environment environment; unsigned int i; - if (!sysval) + if (sysval == VKD3D_SHADER_SV_NONE || sysval == VKD3D_SHADER_SV_TARGET) return NULL; /* In pixel shaders, SV_Position is mapped to SpvBuiltInFragCoord. */

1 0

Conor McCarthy : vkd3d-shader/spirv: Do not emit a fixme for SV_TARGET in vkd3d_get_spirv_builtin().
by Alexandre Julliard 04 Dec '23

04 Dec '23

Module: vkd3d Branch: master Commit: b4d03c0221b2e97d78dfdb7f9803e02051009459 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b4d03c0221b2e97d78dfdb7f9803e… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Dec 1 00:21:46 2023 +1000 vkd3d-shader/spirv: Do not emit a fixme for SV_TARGET in vkd3d_get_spirv_builtin(). --- libs/vkd3d-shader/spirv.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 55afa1cc..2197b74d 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4500,8 +4500,11 @@ static const struct vkd3d_spirv_builtin *vkd3d_get_spirv_builtin(const struct sp if ((builtin = get_spirv_builtin_for_register(reg_type))) return builtin; - if (sysval != VKD3D_SHADER_SV_NONE || (reg_type != VKD3DSPR_OUTPUT && reg_type != VKD3DSPR_PATCHCONST)) + if ((sysval != VKD3D_SHADER_SV_NONE && sysval != VKD3D_SHADER_SV_TARGET) + || (reg_type != VKD3DSPR_OUTPUT && reg_type != VKD3DSPR_PATCHCONST)) + { FIXME("Unhandled builtin (register type %#x, sysval %#x).\n", reg_type, sysval); + } return NULL; }

1 0

Rémi Bernon : win32u: Introduce a new NtUserSystemTrayCall message call.
by Alexandre Julliard 01 Dec '23

01 Dec '23

Module: wine Branch: master Commit: 22bfdbeb4809d731744591eba67cd112e0c24d9f URL: https://gitlab.winehq.org/wine/wine/-/commit/22bfdbeb4809d731744591eba67cd1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jun 21 22:59:38 2023 +0200 win32u: Introduce a new NtUserSystemTrayCall message call. --- dlls/win32u/Makefile.in | 1 + dlls/win32u/driver.c | 24 ++++++++++++++++++++ dlls/win32u/message.c | 3 +++ dlls/win32u/ntuser_private.h | 4 ++++ dlls/win32u/systray.c | 49 ++++++++++++++++++++++++++++++++++++++++ dlls/wow64win/user.c | 53 ++++++++++++++++++++++++++++++++++++++++++++ include/ntuser.h | 9 ++++++++ include/wine/gdi_driver.h | 4 ++++ programs/explorer/systray.c | 18 +++++++-------- 9 files changed, 156 insertions(+), 9 deletions(-)

1 0

Rémi Bernon : winemac: Use the new NotifyIcon user driver interface.
by Alexandre Julliard 01 Dec '23

01 Dec '23

Module: wine Branch: master Commit: 550cac96865ecd6f7a98d70ad88bf7f6d0ce2560 URL: https://gitlab.winehq.org/wine/wine/-/commit/550cac96865ecd6f7a98d70ad88bf7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Nov 27 09:51:15 2023 +0100 winemac: Use the new NotifyIcon user driver interface. --- dlls/winemac.drv/dllmain.c | 6 ----- dlls/winemac.drv/gdi.c | 2 ++ dlls/winemac.drv/macdrv.h | 3 ++- dlls/winemac.drv/macdrv_main.c | 57 --------------------------------------- dlls/winemac.drv/systray.c | 24 ++++++----------- dlls/winemac.drv/unixlib.h | 8 ------ dlls/winemac.drv/winemac.drv.spec | 2 -- 7 files changed, 12 insertions(+), 90 deletions(-) diff --git a/dlls/winemac.drv/dllmain.c b/dlls/winemac.drv/dllmain.c index 8812426cc44..5917ed0906f 100644 --- a/dlls/winemac.drv/dllmain.c +++ b/dlls/winemac.drv/dllmain.c @@ -424,9 +424,3 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) macdrv_module = instance; return process_attach(); } - -int CDECL wine_notify_icon(DWORD msg, NOTIFYICONDATAW *data) -{ - struct notify_icon_params params = { .msg = msg, .data = data }; - return MACDRV_CALL(notify_icon, &params); -} diff --git a/dlls/winemac.drv/gdi.c b/dlls/winemac.drv/gdi.c index 60ee9339467..6c2241514a9 100644 --- a/dlls/winemac.drv/gdi.c +++ b/dlls/winemac.drv/gdi.c @@ -269,6 +269,8 @@ static const struct user_driver_funcs macdrv_funcs = .pBeep = macdrv_Beep, .pChangeDisplaySettings = macdrv_ChangeDisplaySettings, .pClipCursor = macdrv_ClipCursor, + .pNotifyIcon = macdrv_NotifyIcon, + .pCleanupIcons = macdrv_CleanupIcons, .pClipboardWindowProc = macdrv_ClipboardWindowProc, .pDesktopWindowProc = macdrv_DesktopWindowProc, .pDestroyCursorIcon = macdrv_DestroyCursorIcon, diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index a1cdcc76ebc..e1dd1c61b3f 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -134,6 +134,8 @@ extern BOOL macdrv_UpdateDisplayDevices( const struct gdi_device_manager *device extern BOOL macdrv_GetDeviceGammaRamp(PHYSDEV dev, LPVOID ramp); extern BOOL macdrv_SetDeviceGammaRamp(PHYSDEV dev, LPVOID ramp); extern BOOL macdrv_ClipCursor(const RECT *clip, BOOL reset); +extern LRESULT macdrv_NotifyIcon(HWND hwnd, UINT msg, NOTIFYICONDATAW *data); +extern void macdrv_CleanupIcons(HWND hwnd); extern LRESULT macdrv_DesktopWindowProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam); extern void macdrv_DestroyWindow(HWND hwnd); extern void macdrv_SetDesktopWindow(HWND hwnd); @@ -281,7 +283,6 @@ extern NTSTATUS macdrv_dnd_get_formats(void *arg); extern NTSTATUS macdrv_dnd_have_format(void *arg); extern NTSTATUS macdrv_dnd_release(void *arg); extern NTSTATUS macdrv_dnd_retain(void *arg); -extern NTSTATUS macdrv_notify_icon(void *arg); extern NTSTATUS macdrv_client_func(enum macdrv_client_funcs func, const void *params, ULONG size); diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index b40bf02f267..21b148ff558 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -623,7 +623,6 @@ const unixlib_entry_t __wine_unix_call_funcs[] = macdrv_dnd_release, macdrv_dnd_retain, macdrv_init, - macdrv_notify_icon, macdrv_quit_result, }; @@ -661,61 +660,6 @@ static NTSTATUS wow64_init(void *arg) return macdrv_init(&params); } -static NTSTATUS wow64_notify_icon(void *arg) -{ - struct - { - DWORD msg; - ULONG data; - } *params32 = arg; - struct - { - DWORD cbSize; - ULONG hWnd; - UINT uID; - UINT uFlags; - UINT uCallbackMessage; - ULONG hIcon; - WCHAR szTip[128]; - DWORD dwState; - DWORD dwStateMask; - WCHAR szInfo[256]; - UINT uTimeout; - WCHAR szInfoTitle[64]; - DWORD dwInfoFlags; - GUID guidItem; - ULONG hBalloonIcon; - } *data32 = UlongToPtr(params32->data); - - struct notify_icon_params params; - NOTIFYICONDATAW data; - - params.msg = params32->msg; - params.data = &data; - - data.cbSize = sizeof(data); - data.hWnd = UlongToHandle(data32->hWnd); - data.uID = data32->uID; - data.uFlags = data32->uFlags; - data.uCallbackMessage = data32->uCallbackMessage; - data.hIcon = UlongToHandle(data32->hIcon); - if (data.uFlags & NIF_TIP) - wcscpy(data.szTip, data32->szTip); - data.dwState = data32->dwState; - data.dwStateMask = data32->dwStateMask; - if (data.uFlags & NIF_INFO) - { - wcscpy(data.szInfoTitle, data32->szInfoTitle); - wcscpy(data.szInfo, data32->szInfo); - data.uTimeout = data32->uTimeout; - data.dwInfoFlags = data32->dwInfoFlags; - } - data.guidItem = data32->guidItem; - data.hBalloonIcon = UlongToHandle(data32->hBalloonIcon); - - return macdrv_notify_icon(&params); -} - const unixlib_entry_t __wine_unix_call_wow64_funcs[] = { wow64_dnd_get_data, @@ -724,7 +668,6 @@ const unixlib_entry_t __wine_unix_call_wow64_funcs[] = macdrv_dnd_release, macdrv_dnd_retain, wow64_init, - wow64_notify_icon, macdrv_quit_result, }; diff --git a/dlls/winemac.drv/systray.c b/dlls/winemac.drv/systray.c index 42ffe49f563..0231e08e82b 100644 --- a/dlls/winemac.drv/systray.c +++ b/dlls/winemac.drv/systray.c @@ -59,12 +59,11 @@ static struct list icon_list = LIST_INIT(icon_list); static BOOL delete_icon(struct tray_icon *icon); + /*********************************************************************** - * cleanup_icons - * - * Delete all systray icons owned by a given window. + * CleanupIcons (MACDRV.@) */ -static void cleanup_icons(HWND hwnd) +void macdrv_CleanupIcons(HWND hwnd) { struct tray_icon *icon, *next; @@ -245,18 +244,14 @@ static BOOL delete_icon(struct tray_icon *icon) /*********************************************************************** - * wine_notify_icon (MACDRV.@) - * - * Driver-side implementation of Shell_NotifyIcon. + * NotifyIcon (MACDRV.@) */ -NTSTATUS macdrv_notify_icon(void *arg) +LRESULT macdrv_NotifyIcon(HWND hwnd, UINT msg, NOTIFYICONDATAW *data) { - struct notify_icon_params *params = arg; - NOTIFYICONDATAW *data = params->data; BOOL ret = FALSE; struct tray_icon *icon; - switch (params->msg) + switch (msg) { case NIM_ADD: ret = add_icon(data); @@ -267,9 +262,6 @@ NTSTATUS macdrv_notify_icon(void *arg) case NIM_MODIFY: if ((icon = get_icon(data->hWnd, data->uID))) ret = modify_icon(icon, data); break; - case 0xdead: /* Wine extension: owner window has died */ - cleanup_icons(data->hWnd); - break; case NIM_SETVERSION: if ((icon = get_icon(data->hWnd, data->uID))) { @@ -278,8 +270,8 @@ NTSTATUS macdrv_notify_icon(void *arg) } break; default: - FIXME("unhandled tray message: %u\n", params->msg); - break; + ERR("Unexpected NotifyIconProc call\n"); + return -1; } return ret; } diff --git a/dlls/winemac.drv/unixlib.h b/dlls/winemac.drv/unixlib.h index 7f14517a8ee..e77a31a86c1 100644 --- a/dlls/winemac.drv/unixlib.h +++ b/dlls/winemac.drv/unixlib.h @@ -27,7 +27,6 @@ enum macdrv_funcs unix_dnd_release, unix_dnd_retain, unix_init, - unix_notify_icon, unix_quit_result, unix_funcs_count }; @@ -70,13 +69,6 @@ struct init_params struct localized_string *strings; }; -/* macdrv_notify_icon params */ -struct notify_icon_params -{ - unsigned int msg; - struct _NOTIFYICONDATAW *data; -}; - /* macdrv_quit_result params */ struct quit_result_params { diff --git a/dlls/winemac.drv/winemac.drv.spec b/dlls/winemac.drv/winemac.drv.spec index 5f086f5c4e5..e69de29bb2d 100644 --- a/dlls/winemac.drv/winemac.drv.spec +++ b/dlls/winemac.drv/winemac.drv.spec @@ -1,2 +0,0 @@ -# System tray -@ cdecl wine_notify_icon(long ptr)

1 0

Rémi Bernon : win32u: Introduce new SystrayDock driver entry points.
by Alexandre Julliard 01 Dec '23

01 Dec '23

Module: wine Branch: master Commit: 62c6646d8f44cee55ffdef6d2bede19f681dc9b8 URL: https://gitlab.winehq.org/wine/wine/-/commit/62c6646d8f44cee55ffdef6d2bede1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jun 23 15:17:44 2023 +0200 win32u: Introduce new SystrayDock driver entry points. --- dlls/win32u/driver.c | 46 +++++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/systray.c | 12 ++++++++++++ include/ntuser.h | 4 ++++ include/wine/gdi_driver.h | 4 ++++ programs/explorer/systray.c | 23 ++++++++++++++++++++--- 5 files changed, 86 insertions(+), 3 deletions(-) diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c index c9093e87645..bc3409a9e34 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c @@ -775,6 +775,24 @@ static void nulldrv_CleanupIcons( HWND hwnd ) { } +static void nulldrv_SystrayDockInit( HWND hwnd ) +{ +} + +static BOOL nulldrv_SystrayDockInsert( HWND hwnd, UINT cx, UINT cy, void *icon ) +{ + return FALSE; +} + +static void nulldrv_SystrayDockClear( HWND hwnd ) +{ +} + +static BOOL nulldrv_SystrayDockRemove( HWND hwnd ) +{ + return FALSE; +} + static void nulldrv_UpdateClipboard(void) { } @@ -1176,6 +1194,26 @@ static void loaderdrv_CleanupIcons( HWND hwnd ) load_driver()->pCleanupIcons( hwnd ); } +static void loaderdrv_SystrayDockInit( HWND hwnd ) +{ + load_driver()->pSystrayDockInit( hwnd ); +} + +static BOOL loaderdrv_SystrayDockInsert( HWND hwnd, UINT cx, UINT cy, void *icon ) +{ + return load_driver()->pSystrayDockInsert( hwnd, cx, cy, icon ); +} + +static void loaderdrv_SystrayDockClear( HWND hwnd ) +{ + load_driver()->pSystrayDockClear( hwnd ); +} + +static BOOL loaderdrv_SystrayDockRemove( HWND hwnd ) +{ + return load_driver()->pSystrayDockRemove( hwnd ); +} + static LRESULT nulldrv_ClipboardWindowProc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) { return 0; @@ -1265,6 +1303,10 @@ static const struct user_driver_funcs lazy_load_driver = /* systray functions */ loaderdrv_NotifyIcon, loaderdrv_CleanupIcons, + loaderdrv_SystrayDockInit, + loaderdrv_SystrayDockInsert, + loaderdrv_SystrayDockClear, + loaderdrv_SystrayDockRemove, /* clipboard functions */ nulldrv_ClipboardWindowProc, loaderdrv_UpdateClipboard, @@ -1351,6 +1393,10 @@ void __wine_set_user_driver( const struct user_driver_funcs *funcs, UINT version SET_USER_FUNC(ClipCursor); SET_USER_FUNC(NotifyIcon); SET_USER_FUNC(CleanupIcons); + SET_USER_FUNC(SystrayDockInit); + SET_USER_FUNC(SystrayDockInsert); + SET_USER_FUNC(SystrayDockClear); + SET_USER_FUNC(SystrayDockRemove); SET_USER_FUNC(ClipboardWindowProc); SET_USER_FUNC(UpdateClipboard); SET_USER_FUNC(ChangeDisplaySettings); diff --git a/dlls/win32u/systray.c b/dlls/win32u/systray.c index 2e4e2b757e5..67217dad634 100644 --- a/dlls/win32u/systray.c +++ b/dlls/win32u/systray.c @@ -40,6 +40,18 @@ LRESULT system_tray_call( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, voi case WINE_SYSTRAY_CLEANUP_ICONS: user_driver->pCleanupIcons( hwnd ); return 0; + + case WINE_SYSTRAY_DOCK_INIT: + user_driver->pSystrayDockInit( hwnd ); + return 0; + case WINE_SYSTRAY_DOCK_INSERT: + return user_driver->pSystrayDockInsert( hwnd, wparam, lparam, data ); + case WINE_SYSTRAY_DOCK_CLEAR: + user_driver->pSystrayDockClear( hwnd ); + return 0; + case WINE_SYSTRAY_DOCK_REMOVE: + return user_driver->pSystrayDockRemove( hwnd ); + default: FIXME( "Unknown NtUserSystemTrayCall msg %#x\n", msg ); break; diff --git a/include/ntuser.h b/include/ntuser.h index 1ba55210e46..dd19c57221e 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -526,6 +526,10 @@ enum wine_systray_call { WINE_SYSTRAY_NOTIFY_ICON, WINE_SYSTRAY_CLEANUP_ICONS, + WINE_SYSTRAY_DOCK_INIT, + WINE_SYSTRAY_DOCK_INSERT, + WINE_SYSTRAY_DOCK_CLEAR, + WINE_SYSTRAY_DOCK_REMOVE, }; #define WM_SYSTIMER 0x0118 diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index c786863d6c9..aaa2f92cbfa 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -309,6 +309,10 @@ struct user_driver_funcs /* notify icon functions */ LRESULT (*pNotifyIcon)(HWND,UINT,NOTIFYICONDATAW *); void (*pCleanupIcons)(HWND); + void (*pSystrayDockInit)(HWND); + BOOL (*pSystrayDockInsert)(HWND,UINT,UINT,void *); + void (*pSystrayDockClear)(HWND); + BOOL (*pSystrayDockRemove)(HWND); /* clipboard functions */ LRESULT (*pClipboardWindowProc)(HWND,UINT,WPARAM,LPARAM); void (*pUpdateClipboard)(void); diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index ac0015e4ebf..1cf0e9a7b8d 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -60,6 +60,7 @@ struct notify_data /* platform-independent format for NOTIFYICONDATA */ static int (CDECL *wine_notify_icon)(DWORD,NOTIFYICONDATAW *); #define ICON_DISPLAY_HIDDEN -1 +#define ICON_DISPLAY_DOCKED -2 /* an individual systray icon, unpacked from the NOTIFYICONDATA and always in unicode */ struct icon @@ -472,6 +473,8 @@ static void systray_add_icon( struct icon *icon ) if (icon->display != ICON_DISPLAY_HIDDEN) return; /* already added */ icon->display = nb_displayed++; + SetWindowLongW( icon->window, GWL_STYLE, GetWindowLongW( icon->window, GWL_STYLE ) | WS_CHILD ); + SetParent( icon->window, tray_window ); pos = get_icon_pos( icon ); SetWindowPos( icon->window, 0, pos.x, pos.y, 0, 0, SWP_NOSIZE | SWP_NOACTIVATE | SWP_NOZORDER | SWP_SHOWWINDOW ); @@ -502,6 +505,8 @@ static void systray_remove_icon( struct icon *icon ) TRACE( "removed %u now %d icons\n", icon->id, nb_displayed ); icon->display = ICON_DISPLAY_HIDDEN; + SetParent( icon->window, GetDesktopWindow() ); + SetWindowLongW( icon->window, GWL_STYLE, GetWindowLongW( icon->window, GWL_STYLE ) & ~WS_CHILD ); } /* make an icon visible */ @@ -511,6 +516,9 @@ static BOOL show_icon(struct icon *icon) if (icon->display != ICON_DISPLAY_HIDDEN) return TRUE; /* already displayed */ + if (!enable_taskbar && NtUserMessageCall( icon->window, WINE_SYSTRAY_DOCK_INSERT, icon_cx, + icon_cy, icon, NtUserSystemTrayCall, FALSE )) + icon->display = ICON_DISPLAY_DOCKED; systray_add_icon( icon ); update_tooltip_position( icon ); @@ -525,6 +533,9 @@ static BOOL hide_icon(struct icon *icon) if (icon->display == ICON_DISPLAY_HIDDEN) return TRUE; /* already hidden */ + if (!enable_taskbar && NtUserMessageCall( icon->window, WINE_SYSTRAY_DOCK_REMOVE, 0, 0, + NULL, NtUserSystemTrayCall, FALSE )) + icon->display = ICON_DISPLAY_HIDDEN; ShowWindow( icon->window, SW_HIDE ); systray_remove_icon( icon ); @@ -554,7 +565,12 @@ static BOOL modify_icon( struct icon *icon, NOTIFYICONDATAW *nid ) { if (icon->image) DestroyIcon(icon->image); icon->image = CopyIcon(nid->hIcon); - if (icon->display >= 0) InvalidateRect( icon->window, NULL, TRUE ); + + if (icon->display >= 0) + InvalidateRect( icon->window, NULL, TRUE ); + else if (!enable_taskbar) + NtUserMessageCall( icon->window, WINE_SYSTRAY_DOCK_CLEAR, 0, 0, + NULL, NtUserSystemTrayCall, FALSE ); } if (nid->uFlags & NIF_MESSAGE) @@ -604,8 +620,8 @@ static BOOL add_icon(NOTIFYICONDATAW *nid) icon->owner = nid->hWnd; icon->display = ICON_DISPLAY_HIDDEN; - CreateWindowW( tray_icon_class.lpszClassName, NULL, WS_CHILD, - 0, 0, icon_cx, icon_cy, tray_window, NULL, NULL, icon ); + CreateWindowExW( 0, tray_icon_class.lpszClassName, NULL, WS_CLIPSIBLINGS | WS_POPUP, + 0, 0, icon_cx, icon_cy, 0, NULL, NULL, icon ); if (!icon->window) ERR( "Failed to create systray icon window\n" ); list_add_tail(&icon_list, &icon->entry); @@ -1027,6 +1043,7 @@ void initialize_systray( HMODULE graphics_driver, BOOL using_root, BOOL arg_enab SIZE size = get_window_size(); tray_window = CreateWindowExW( 0, shell_traywnd_class.lpszClassName, L"", WS_CAPTION | WS_SYSMENU, CW_USEDEFAULT, CW_USEDEFAULT, size.cx, size.cy, 0, 0, 0, 0 ); + NtUserMessageCall( tray_window, WINE_SYSTRAY_DOCK_INIT, 0, 0, NULL, NtUserSystemTrayCall, FALSE ); } if (!tray_window)

1 0

Rémi Bernon : explorer: Use layered windows for the docked systray icons.
by Alexandre Julliard 01 Dec '23

01 Dec '23

Module: wine Branch: master Commit: 229b4561d9a8f10cbb49342dff0b6a3472d81c68 URL: https://gitlab.winehq.org/wine/wine/-/commit/229b4561d9a8f10cbb49342dff0b6a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Nov 29 10:27:18 2023 +0100 explorer: Use layered windows for the docked systray icons. --- programs/explorer/systray.c | 102 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 97 insertions(+), 5 deletions(-) diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index 1cf0e9a7b8d..94b2a856ba0 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -69,6 +69,7 @@ struct icon HICON image; /* the image to render */ HWND owner; /* the HWND passed in to the Shell_NotifyIcon call */ HWND window; /* the adaptor window */ + BOOL layered; /* whether we are using a layered window */ HWND tooltip; /* Icon tooltip */ UINT state; /* state flags */ UINT id; /* the unique id given by the app */ @@ -363,6 +364,80 @@ static void update_tooltip_position( struct icon *icon ) if (balloon_icon == icon) set_balloon_position( icon ); } +static void paint_layered_icon( struct icon *icon ) +{ + BLENDFUNCTION blend = {AC_SRC_OVER, 0, 255, AC_SRC_ALPHA}; + int width = GetSystemMetrics( SM_CXSMICON ); + int height = GetSystemMetrics( SM_CYSMICON ); + BITMAPINFO *info; + HBITMAP dib, mask; + HDC hdc; + RECT rc; + SIZE size; + POINT pos; + int i, x, y; + void *color_bits, *mask_bits; + DWORD *ptr; + BOOL has_alpha = FALSE; + + GetWindowRect( icon->window, &rc ); + size.cx = rc.right - rc.left; + size.cy = rc.bottom - rc.top; + pos.x = (size.cx - width) / 2; + pos.y = (size.cy - height) / 2; + + if (!(info = calloc( 1, FIELD_OFFSET( BITMAPINFO, bmiColors[2] ) ))) return; + info->bmiHeader.biSize = sizeof(info->bmiHeader); + info->bmiHeader.biWidth = size.cx; + info->bmiHeader.biHeight = size.cy; + info->bmiHeader.biBitCount = 32; + info->bmiHeader.biPlanes = 1; + info->bmiHeader.biCompression = BI_RGB; + + hdc = CreateCompatibleDC( 0 ); + if (!(dib = CreateDIBSection( 0, info, DIB_RGB_COLORS, &color_bits, NULL, 0 ))) goto done; + SelectObject( hdc, dib ); + DrawIconEx( hdc, pos.x, pos.y, icon->image, width, height, 0, 0, DI_DEFAULTSIZE | DI_NORMAL ); + + /* check if the icon was drawn with an alpha channel */ + for (i = 0, ptr = color_bits; i < size.cx * size.cy; i++) + if ((has_alpha = (ptr[i] & 0xff000000) != 0)) break; + + if (!has_alpha) + { + unsigned int width_bytes = (size.cx + 31) / 32 * 4; + + info->bmiHeader.biBitCount = 1; + info->bmiColors[0].rgbRed = 0; + info->bmiColors[0].rgbGreen = 0; + info->bmiColors[0].rgbBlue = 0; + info->bmiColors[0].rgbReserved = 0; + info->bmiColors[1].rgbRed = 0xff; + info->bmiColors[1].rgbGreen = 0xff; + info->bmiColors[1].rgbBlue = 0xff; + info->bmiColors[1].rgbReserved = 0; + + if (!(mask = CreateDIBSection( 0, info, DIB_RGB_COLORS, &mask_bits, NULL, 0 ))) goto done; + memset( mask_bits, 0xff, width_bytes * size.cy ); + SelectObject( hdc, mask ); + DrawIconEx( hdc, pos.x, pos.y, icon->image, width, height, 0, 0, DI_DEFAULTSIZE | DI_MASK ); + + for (y = 0, ptr = color_bits; y < size.cy; y++) + for (x = 0; x < size.cx; x++, ptr++) + if (!((((BYTE *)mask_bits)[y * width_bytes + x / 8] << (x % 8)) & 0x80)) + *ptr |= 0xff000000; + + SelectObject( hdc, dib ); + DeleteObject( mask ); + } + + UpdateLayeredWindow( icon->window, 0, NULL, NULL, hdc, NULL, 0, &blend, ULW_ALPHA ); +done: + free( info ); + if (hdc) DeleteDC( hdc ); + if (dib) DeleteObject( dib ); +} + static BOOL notify_owner( struct icon *icon, UINT msg, LPARAM lparam ) { WPARAM wp = icon->id; @@ -410,14 +485,22 @@ static LRESULT WINAPI tray_icon_wndproc( HWND hwnd, UINT msg, WPARAM wparam, LPA create_tooltip( icon ); break; + case WM_SIZE: + case WM_MOVE: + if (icon->layered) paint_layered_icon( icon ); + break; + case WM_PAINT: { PAINTSTRUCT ps; RECT rc; HDC hdc; - int cx = GetSystemMetrics( SM_CXSMICON ); - int cy = GetSystemMetrics( SM_CYSMICON ); + int cx, cy; + + if (icon->layered) break; + cx = GetSystemMetrics( SM_CXSMICON ); + cy = GetSystemMetrics( SM_CYSMICON ); hdc = BeginPaint( hwnd, &ps ); GetClientRect( hwnd, &rc ); TRACE( "painting rect %s\n", wine_dbgstr_rect( &rc ) ); @@ -516,9 +599,13 @@ static BOOL show_icon(struct icon *icon) if (icon->display != ICON_DISPLAY_HIDDEN) return TRUE; /* already displayed */ - if (!enable_taskbar && NtUserMessageCall( icon->window, WINE_SYSTRAY_DOCK_INSERT, icon_cx, - icon_cy, icon, NtUserSystemTrayCall, FALSE )) + if (!enable_taskbar && NtUserMessageCall( icon->window, WINE_SYSTRAY_DOCK_INSERT, icon_cx, icon_cy, + icon, NtUserSystemTrayCall, FALSE )) + { icon->display = ICON_DISPLAY_DOCKED; + icon->layered = TRUE; + SendMessageW( icon->window, WM_SIZE, SIZE_RESTORED, MAKELONG( icon_cx, icon_cy ) ); + } systray_add_icon( icon ); update_tooltip_position( icon ); @@ -535,7 +622,10 @@ static BOOL hide_icon(struct icon *icon) if (!enable_taskbar && NtUserMessageCall( icon->window, WINE_SYSTRAY_DOCK_REMOVE, 0, 0, NULL, NtUserSystemTrayCall, FALSE )) + { icon->display = ICON_DISPLAY_HIDDEN; + icon->layered = FALSE; + } ShowWindow( icon->window, SW_HIDE ); systray_remove_icon( icon ); @@ -568,6 +658,8 @@ static BOOL modify_icon( struct icon *icon, NOTIFYICONDATAW *nid ) if (icon->display >= 0) InvalidateRect( icon->window, NULL, TRUE ); + else if (icon->layered) + paint_layered_icon( icon ); else if (!enable_taskbar) NtUserMessageCall( icon->window, WINE_SYSTRAY_DOCK_CLEAR, 0, 0, NULL, NtUserSystemTrayCall, FALSE ); @@ -620,7 +712,7 @@ static BOOL add_icon(NOTIFYICONDATAW *nid) icon->owner = nid->hWnd; icon->display = ICON_DISPLAY_HIDDEN; - CreateWindowExW( 0, tray_icon_class.lpszClassName, NULL, WS_CLIPSIBLINGS | WS_POPUP, + CreateWindowExW( WS_EX_LAYERED, tray_icon_class.lpszClassName, NULL, WS_CLIPSIBLINGS | WS_POPUP, 0, 0, icon_cx, icon_cy, 0, NULL, NULL, icon ); if (!icon->window) ERR( "Failed to create systray icon window\n" );

1 0

Rémi Bernon : winex11: Use the new SystrayDock driver interface.
by Alexandre Julliard 01 Dec '23

01 Dec '23

Module: wine Branch: master Commit: 48e6bf3cf1aabdd2ac640f572416b9169e324f21 URL: https://gitlab.winehq.org/wine/wine/-/commit/48e6bf3cf1aabdd2ac640f572416b9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 22 13:50:52 2023 +0200 winex11: Use the new SystrayDock driver interface. --- dlls/winex11.drv/dllmain.c | 2 - dlls/winex11.drv/event.c | 6 +- dlls/winex11.drv/init.c | 4 + dlls/winex11.drv/systray.c | 748 +------------------------------------- dlls/winex11.drv/unixlib.h | 20 - dlls/winex11.drv/window.c | 82 ++--- dlls/winex11.drv/winex11.drv.spec | 3 - dlls/winex11.drv/x11drv.h | 10 +- dlls/winex11.drv/x11drv_dll.h | 2 - dlls/winex11.drv/x11drv_main.c | 48 +-- programs/explorer/systray.c | 18 + 11 files changed, 60 insertions(+), 883 deletions(-)

1 0

Rémi Bernon : explorer: Remove now unnecessary wine_notify_icon support.
by Alexandre Julliard 01 Dec '23

01 Dec '23

Module: wine Branch: master Commit: b088d311a06d38b9797571aaeba8e9f4a3d66251 URL: https://gitlab.winehq.org/wine/wine/-/commit/b088d311a06d38b9797571aaeba8e9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 22 21:00:51 2023 +0200 explorer: Remove now unnecessary wine_notify_icon support. --- programs/explorer/desktop.c | 9 +++------ programs/explorer/explorer_private.h | 2 +- programs/explorer/systray.c | 11 ++--------- 3 files changed, 6 insertions(+), 16 deletions(-) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 0af8d4c8e3c..9a58f13d887 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -841,7 +841,7 @@ static BOOL get_default_enable_shell( const WCHAR *name ) return result; } -static HMODULE load_graphics_driver( const WCHAR *driver, GUID *guid ) +static void load_graphics_driver( const WCHAR *driver, GUID *guid ) { static const WCHAR device_keyW[] = L"System\\CurrentControlSet\\Control\\Video\\{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}\\0000"; @@ -914,8 +914,6 @@ static HMODULE load_graphics_driver( const WCHAR *driver, GUID *guid ) RegSetValueExA( hkey, "DriverError", 0, REG_SZ, (BYTE *)error, strlen(error) + 1 ); RegCloseKey( hkey ); } - - return module; } static const char *debugstr_devmodew( const DEVMODEW *devmode ) @@ -1018,7 +1016,6 @@ void manage_desktop( WCHAR *arg ) GUID guid; MSG msg; HWND hwnd; - HMODULE graphics_driver; unsigned int width, height; WCHAR *cmdline = NULL, *driver = NULL; WCHAR *p = arg; @@ -1062,7 +1059,7 @@ void manage_desktop( WCHAR *arg ) UuidCreate( &guid ); TRACE( "display guid %s\n", debugstr_guid(&guid) ); - graphics_driver = load_graphics_driver( driver, &guid ); + load_graphics_driver( driver, &guid ); if (name && width && height) { @@ -1104,7 +1101,7 @@ void manage_desktop( WCHAR *arg ) if (using_root) enable_shell = FALSE; - initialize_systray( graphics_driver, using_root, enable_shell ); + initialize_systray( using_root, enable_shell ); if (!using_root) initialize_launchers( hwnd ); if ((shell32 = LoadLibraryW( L"shell32.dll" )) && diff --git a/programs/explorer/explorer_private.h b/programs/explorer/explorer_private.h index df598187fc1..34aa1cf046b 100644 --- a/programs/explorer/explorer_private.h +++ b/programs/explorer/explorer_private.h @@ -22,7 +22,7 @@ #define __WINE_EXPLORER_PRIVATE_H extern void manage_desktop( WCHAR *arg ); -extern void initialize_systray( HMODULE graphics_driver, BOOL using_root, BOOL enable_shell ); +extern void initialize_systray( BOOL using_root, BOOL enable_shell ); extern void initialize_appbar(void); extern void handle_parent_notify( HWND hwnd, WPARAM wp ); extern void do_startmenu( HWND owner ); diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index 670493be086..1af8a72de46 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -57,8 +57,6 @@ struct notify_data /* platform-independent format for NOTIFYICONDATA */ UINT bpp; }; -static int (CDECL *wine_notify_icon)(DWORD,NOTIFYICONDATAW *); - #define ICON_DISPLAY_HIDDEN -1 #define ICON_DISPLAY_DOCKED -2 @@ -743,7 +741,6 @@ static void cleanup_systray_window( HWND hwnd ) if (icon->owner == hwnd) delete_icon( icon ); NtUserMessageCall( hwnd, WINE_SYSTRAY_CLEANUP_ICONS, 0, 0, NULL, NtUserSystemTrayCall, FALSE ); - if (wine_notify_icon) wine_notify_icon( 0xdead, &nid ); } /* update the taskbar buttons when something changed */ @@ -842,8 +839,6 @@ static BOOL handle_incoming(HWND hwndSource, COPYDATASTRUCT *cds) if ((ret = NtUserMessageCall( hwndSource, WINE_SYSTRAY_NOTIFY_ICON, cds->dwData, 0, &nid, NtUserSystemTrayCall, FALSE )) != -1) goto done; - if (wine_notify_icon && ((ret = wine_notify_icon( cds->dwData, &nid )) != -1)) - goto done; ret = FALSE; } @@ -1110,12 +1105,10 @@ void handle_parent_notify( HWND hwnd, WPARAM wp ) } /* this function creates the listener window */ -void initialize_systray( HMODULE graphics_driver, BOOL using_root, BOOL arg_enable_shell ) +void initialize_systray( BOOL using_root, BOOL arg_enable_shell ) { RECT work_rect, primary_rect, taskbar_rect; - if (using_root && graphics_driver) wine_notify_icon = (void *)GetProcAddress( graphics_driver, "wine_notify_icon" ); - shell_traywnd_class.hIcon = LoadIconW( 0, (const WCHAR *)IDI_WINLOGO ); shell_traywnd_class.hCursor = LoadCursorW( 0, (const WCHAR *)IDC_ARROW ); tray_icon_class.hIcon = shell_traywnd_class.hIcon; @@ -1132,7 +1125,7 @@ void initialize_systray( HMODULE graphics_driver, BOOL using_root, BOOL arg_enab ERR( "Could not register SysTray window class\n" ); return; } - if (!wine_notify_icon && !RegisterClassExW( &tray_icon_class )) + if (!RegisterClassExW( &tray_icon_class )) { ERR( "Could not register Wine SysTray window classes\n" ); return;

1 0

Brendan Shanks : ntdll: Fix macOS build error with LLVM 17.
by Alexandre Julliard 01 Dec '23

01 Dec '23

Module: wine Branch: master Commit: 295d521b11644fb76c36854336b13c2155bb7d79 URL: https://gitlab.winehq.org/wine/wine/-/commit/295d521b11644fb76c36854336b13c… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Nov 29 11:28:38 2023 -0800 ntdll: Fix macOS build error with LLVM 17. LLVM no longer allows non-private labels to appear between .cfi_startproc/endproc when targeting Mach-O. Based on a patch by Jacek Caban. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55863 --- dlls/ntdll/unix/signal_x86_64.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index ea177982d05..0c291633ac6 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1892,15 +1892,15 @@ static BOOL handle_syscall_trap( ucontext_t *sigcontext ) if ((void *)RIP_sig( sigcontext ) == __wine_syscall_dispatcher) { - extern void __wine_syscall_dispatcher_prolog_end(void); + extern const void *__wine_syscall_dispatcher_prolog_end_ptr; - RIP_sig( sigcontext ) = (ULONG64)__wine_syscall_dispatcher_prolog_end; + RIP_sig( sigcontext ) = (ULONG64)__wine_syscall_dispatcher_prolog_end_ptr; } else if ((void *)RIP_sig( sigcontext ) == __wine_unix_call_dispatcher) { - extern void __wine_unix_call_dispatcher_prolog_end(void); + extern const void *__wine_unix_call_dispatcher_prolog_end_ptr; - RIP_sig( sigcontext ) = (ULONG64)__wine_unix_call_dispatcher_prolog_end; + RIP_sig( sigcontext ) = (ULONG64)__wine_unix_call_dispatcher_prolog_end_ptr; R10_sig( sigcontext ) = RCX_sig( sigcontext ); } else return FALSE; @@ -2607,8 +2607,7 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, "popq 0x80(%rcx)\n\t" __ASM_CFI(".cfi_adjust_cfa_offset -8\n\t") "movl $0,0xb4(%rcx)\n\t" /* frame->restore_flags */ - ".globl " __ASM_NAME("__wine_syscall_dispatcher_prolog_end") "\n" - __ASM_NAME("__wine_syscall_dispatcher_prolog_end") ":\n\t" + __ASM_LOCAL_LABEL("__wine_syscall_dispatcher_prolog_end") ":\n\t" "movq %rax,0x00(%rcx)\n\t" "movq %rbx,0x08(%rcx)\n\t" __ASM_CFI_REG_IS_AT1(rbx, rcx, 0x08) @@ -2844,8 +2843,7 @@ __ASM_GLOBAL_FUNC( __wine_unix_call_dispatcher, __ASM_CFI(".cfi_adjust_cfa_offset -8\n\t") __ASM_CFI_REG_IS_AT2(rip, rcx, 0xf0,0x00) "movl $0,0xb4(%rcx)\n\t" /* frame->restore_flags */ - ".globl " __ASM_NAME("__wine_unix_call_dispatcher_prolog_end") "\n" - __ASM_NAME("__wine_unix_call_dispatcher_prolog_end") ":\n\t" + __ASM_LOCAL_LABEL("__wine_unix_call_dispatcher_prolog_end") ":\n\t" "movq %rbx,0x08(%rcx)\n\t" __ASM_CFI_REG_IS_AT1(rbx, rcx, 0x08) "movq %rsi,0x20(%rcx)\n\t" @@ -2943,6 +2941,14 @@ __ASM_GLOBAL_FUNC( __wine_unix_call_dispatcher, __ASM_CFI(".cfi_adjust_cfa_offset 8\n\t") "ret" ) +asm( ".data\n\t" + ".globl " __ASM_NAME("__wine_syscall_dispatcher_prolog_end_ptr") "\n" + __ASM_NAME("__wine_syscall_dispatcher_prolog_end_ptr") ":\n\t" + ".quad " __ASM_LOCAL_LABEL("__wine_syscall_dispatcher_prolog_end") "\n\t" + ".globl " __ASM_NAME("__wine_unix_call_dispatcher_prolog_end_ptr") "\n" + __ASM_NAME("__wine_unix_call_dispatcher_prolog_end_ptr") ":\n\t" + ".quad " __ASM_LOCAL_LABEL("__wine_unix_call_dispatcher_prolog_end") "\n\t" + ".text\n\t" ); /*********************************************************************** * __wine_setjmpex

1 0