wine-commits December 2023

wine-commits@winehq.org

1 participants
418 discussions

Henri Verbeet : vkd3d-shader: Add a VKD3D_FORCE_32_BIT_ENUM element to enum vkd3d_shader_compile_option_fragment_coordinate_origin.
by Alexandre Julliard 04 Dec '23

04 Dec '23

Module: vkd3d Branch: master Commit: ee1c6bd48811166177593b01f39ae663b9981565 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ee1c6bd48811166177593b01f39ae… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sat Dec 2 17:09:31 2023 +0100 vkd3d-shader: Add a VKD3D_FORCE_32_BIT_ENUM element to enum vkd3d_shader_compile_option_fragment_coordinate_origin. --- include/vkd3d_shader.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 66a7de9b..ed6d6432 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -191,6 +191,8 @@ enum vkd3d_shader_compile_option_fragment_coordinate_origin /** Fragment coordinates originate from the lower-left. This matches the * traditional behaviour of OpenGL environments. */ VKD3D_SHADER_COMPILE_OPTION_FRAGMENT_COORDINATE_ORIGIN_LOWER_LEFT = 0x00000001, + + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_COMPILE_OPTION_FRAGMENT_COORDINATE_ORIGIN), }; enum vkd3d_shader_compile_option_name

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

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

Robert Wilhelm : vbscript: Handle numdecimalplaces argument in Round().
by Alexandre Julliard 01 Dec '23

01 Dec '23

Module: wine Branch: master Commit: 369b540abf32869df8e9b28e283d795ae92b6a05 URL: https://gitlab.winehq.org/wine/wine/-/commit/369b540abf32869df8e9b28e283d79… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Thu Nov 30 23:31:17 2023 +0100 vbscript: Handle numdecimalplaces argument in Round(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55185 --- dlls/vbscript/global.c | 31 +++++++++++++++++++++++-------- dlls/vbscript/tests/api.vbs | 23 +++++++++++++++++++++++ 2 files changed, 46 insertions(+), 8 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 3d36cba6341..058ddabcde1 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -3153,32 +3153,47 @@ static HRESULT Global_MonthName(BuiltinDisp *This, VARIANT *args, unsigned args_ return return_bstr(res, ret); } -static HRESULT Global_Round(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) +static HRESULT Global_Round(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, VARIANT *res) { - double n; + int decimal_places = 0; + double d; HRESULT hres; - TRACE("%s\n", debugstr_variant(arg)); + TRACE("%s %s\n", debugstr_variant(args), args_cnt == 2 ? debugstr_variant(args + 1) : "0"); + + assert(args_cnt == 1 || args_cnt == 2); if(!res) return S_OK; - switch(V_VT(arg)) { + if(args_cnt == 2) { + if (V_VT(args + 1) != VT_ERROR) { + hres = to_int(args + 1, &decimal_places); + if (FAILED(hres)) + return hres; + } + } + + switch(V_VT(args)) { case VT_I2: case VT_I4: case VT_BOOL: - *res = *arg; + *res = *args; return S_OK; case VT_R8: - n = V_R8(arg); + d = V_R8(args); break; default: - hres = to_double(arg, &n); + hres = to_double(args, &d); if(FAILED(hres)) return hres; } - return return_double(res, round(n)); + hres = VarR8Round(d, decimal_places, &d); + if(FAILED(hres)) + return hres; + + return return_double(res, d); } static HRESULT Global_Escape(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 8d9e0e3e7d1..3974781d6a8 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -1090,6 +1090,29 @@ TestRound "2", 2, "VT_R8" TestRound true, true, "VT_BOOL" TestRound false, false, "VT_BOOL" +Sub TestRound2(val, decnum, exval, vt) + Call ok(Round(val, decnum) = exval, "Round(" & val & " , " & decnum & ") = " & Round(val, decnum)) + Call ok(getVT(Round(val, decnum)) = vt, "getVT(Round(" & val & " , " & decnum & ")) = " & getVT(Round(val, decnum))) +End Sub + +TestRound2 3, 0, 3, "VT_I2" +TestRound2 3, 1, 3, "VT_I2" +TestRound2 3.3, 0, 3, "VT_R8" +TestRound2 3.8, 0, 4, "VT_R8" +TestRound2 3.5, 0, 4, "VT_R8" +TestRound2 -3.3, 0, -3, "VT_R8" +TestRound2 -3.5, 0, -4, "VT_R8" +TestRound2 3.3, 1, 3.3, "VT_R8" +TestRound2 3.8, 1, 3.8, "VT_R8" +TestRound2 3.5, 1, 3.5, "VT_R8" +TestRound2 -3.3, 1, -3.3, "VT_R8" +TestRound2 -3.5, 1, -3.5, "VT_R8" +TestRound2 "2", 1, 2, "VT_R8" +TestRound2 true, 0, true, "VT_BOOL" +TestRound2 false, 0, false, "VT_BOOL" +TestRound2 true, 1, true, "VT_BOOL" +TestRound2 false, 1, false, "VT_BOOL" + if isEnglishLang then Call ok(WeekDayName(1) = "Sunday", "WeekDayName(1) = " & WeekDayName(1)) Call ok(WeekDayName(3) = "Tuesday", "WeekDayName(3) = " & WeekDayName(3))

1 0

Nikolay Sivov : vbscript: Coerce to VT_BOOL when evaluating jump conditions.
by Alexandre Julliard 01 Dec '23

01 Dec '23

Module: wine Branch: master Commit: 0a7f5646e48358222327f90d77339e762922d7ad URL: https://gitlab.winehq.org/wine/wine/-/commit/0a7f5646e48358222327f90d77339e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 21 11:50:04 2023 +0200 vbscript: Coerce to VT_BOOL when evaluating jump conditions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/vbscript/interp.c | 39 +++++++++------------------ dlls/vbscript/tests/lang.vbs | 63 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+), 26 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index eb1dcab5f01..2d979f07605 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -413,43 +413,30 @@ static HRESULT stack_assume_val(exec_ctx_t *ctx, unsigned n) return S_OK; } -static int stack_pop_bool(exec_ctx_t *ctx, BOOL *b) +static HRESULT stack_pop_bool(exec_ctx_t *ctx, BOOL *b) { variant_val_t val; HRESULT hres; - VARIANT_BOOL vb; + VARIANT v; hres = stack_pop_val(ctx, &val); if(FAILED(hres)) return hres; - switch (V_VT(val.v)) + if (V_VT(val.v) == VT_NULL) { - case VT_BOOL: - *b = V_BOOL(val.v); - break; - case VT_NULL: - case VT_EMPTY: *b = FALSE; - break; - case VT_I2: - *b = V_I2(val.v); - break; - case VT_I4: - *b = V_I4(val.v); - break; - case VT_BSTR: - hres = VarBoolFromStr(V_BSTR(val.v), ctx->script->lcid, 0, &vb); - if(FAILED(hres)) - return hres; - *b=vb; - break; - default: - FIXME("unsupported for %s\n", debugstr_variant(val.v)); - release_val(&val); - return E_NOTIMPL; } - return S_OK; + else + { + V_VT(&v) = VT_EMPTY; + if (SUCCEEDED(hres = VariantChangeType(&v, val.v, VARIANT_LOCALBOOL, VT_BOOL))) + *b = !!V_BOOL(&v); + } + + release_val(&val); + + return hres; } static HRESULT stack_pop_disp(exec_ctx_t *ctx, IDispatch **ret) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 3c437f7f15d..42af6df0e76 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -420,6 +420,69 @@ else end if Call ok(x = 1, "if ""-1"" not executed") +x = 0 +if 0.1 then + x = 1 +else + ok false, "if ""0.1"" else executed" +end if +Call ok(x = 1, "if ""0.1"" not executed") + +x = 0 +if "TRUE" then + x = 1 +else + ok false, "if ""TRUE"" else executed" +end if +Call ok(x = 1, "if ""TRUE"" not executed") + +x = 0 +if "#TRUE#" then + x = 1 +else + ok false, "if ""#TRUE#"" else executed" +end if +Call ok(x = 1, "if ""#TRUE#"" not executed") + +x = 0 +if (not "#FALSE#") then + x = 1 +else + ok false, "if ""not #FALSE#"" else executed" +end if +Call ok(x = 1, "if ""not #FALSE#"" not executed") + +Class ValClass + Public myval + + Public default Property Get defprop + defprop = myval + End Property +End Class + +Dim MyObject +Set MyObject = New ValClass + +MyObject.myval = 1 +Call ok(CBool(MyObject) = True, "CBool(MyObject) = " & CBool(MyObject)) +x = 0 +if MyObject then + x = 1 +else + ok false, "if ""MyObject(1)"" else executed" +end if +Call ok(x = 1, "if ""MyObject(1)"" not executed") + +MyObject.myval = 0 +Call ok(CBool(MyObject) = False, "CBool(MyObject) = " & CBool(MyObject)) +x = 0 +if not MyObject then + x = 1 +else + ok false, "if ""MyObject(0)"" else executed" +end if +Call ok(x = 1, "if ""MyObject(0)"" not executed") + x = 0 WHILE x < 3 : x = x + 1 : Wend Call ok(x = 3, "x not equal to 3")

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

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

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: 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 : 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

← Newer
1
...
35
36
37
38
39
40
41
42
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2023