January 2024 - Wine-commits

Nikolay Sivov : mfplat/tests: Skip tests that require d3d9 support.
by Alexandre Julliard 30 Jan '24

30 Jan '24

Module: wine Branch: master Commit: e450bf42ab4052e9bd8412a89afdbabb93e29c82 URL: https://gitlab.winehq.org/wine/wine/-/commit/e450bf42ab4052e9bd8412a89afdba… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 30 10:11:43 2024 +0100 mfplat/tests: Skip tests that require d3d9 support. --- dlls/mfplat/tests/mfplat.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 42d682be426..d75ad051d35 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -7765,9 +7765,13 @@ static void test_MFCreateDXSurfaceBuffer(void) return; } - window = create_window(); d3d = Direct3DCreate9(D3D_SDK_VERSION); - ok(!!d3d, "Failed to create a D3D object.\n"); + if (!d3d) + { + skip("Failed to create a D3D9 object, skipping tests.\n"); + return; + } + window = create_window(); if (!(device = create_d3d9_device(d3d, window))) { skip("Failed to create a D3D device, skipping tests.\n"); @@ -9124,9 +9128,13 @@ static void test_sample_allocator_d3d9(void) if (!pMFCreateVideoSampleAllocatorEx) return; - window = create_window(); d3d9 = Direct3DCreate9(D3D_SDK_VERSION); - ok(!!d3d9, "Failed to create a D3D9 object.\n"); + if (!d3d9) + { + skip("Failed to create a D3D9 object, skipping tests.\n"); + return; + } + window = create_window(); if (!(d3d9_device = create_d3d9_device(d3d9, window))) { skip("Failed to create a D3D9 device, skipping tests.\n");

1 0

Helix Graziani : cfgmgr32: Add CM_Get_Device_Interface_PropertyW stub.
by Alexandre Julliard 30 Jan '24

30 Jan '24

Module: wine Branch: master Commit: 91d60983acad0e8791b94f60dad5d318b67c0166 URL: https://gitlab.winehq.org/wine/wine/-/commit/91d60983acad0e8791b94f60dad5d3… Author: Helix Graziani <helix.graziani(a)hotmail.com> Date: Mon Jan 29 19:24:07 2024 -0500 cfgmgr32: Add CM_Get_Device_Interface_PropertyW stub. --- dlls/cfgmgr32/cfgmgr32.spec | 2 +- dlls/cfgmgr32/main.c | 13 +++++++++++++ include/cfgmgr32.h | 2 ++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/cfgmgr32/cfgmgr32.spec b/dlls/cfgmgr32/cfgmgr32.spec index e4cd845e2a4..29de7bbdc55 100644 --- a/dlls/cfgmgr32/cfgmgr32.spec +++ b/dlls/cfgmgr32/cfgmgr32.spec @@ -91,7 +91,7 @@ @ stdcall CM_Get_Device_Interface_List_SizeW(ptr ptr wstr long) setupapi.CM_Get_Device_Interface_List_SizeW @ stdcall CM_Get_Device_Interface_List_Size_ExA(ptr ptr str long ptr) setupapi.CM_Get_Device_Interface_List_Size_ExA @ stdcall CM_Get_Device_Interface_List_Size_ExW(ptr ptr wstr long ptr) setupapi.CM_Get_Device_Interface_List_Size_ExW -@ stub CM_Get_Device_Interface_PropertyW +@ stdcall CM_Get_Device_Interface_PropertyW(wstr ptr ptr ptr ptr long) @ stub CM_Get_First_Log_Conf @ stub CM_Get_First_Log_Conf_Ex @ stub CM_Get_Global_State diff --git a/dlls/cfgmgr32/main.c b/dlls/cfgmgr32/main.c index f40068af0df..7d48a96be85 100644 --- a/dlls/cfgmgr32/main.c +++ b/dlls/cfgmgr32/main.c @@ -67,3 +67,16 @@ CONFIGRET WINAPI CM_Register_Notification( CM_NOTIFY_FILTER *filter, void *conte return CR_CALL_NOT_IMPLEMENTED; } + +/*********************************************************************** + * CM_Get_Device_Interface_PropertyW (cfgmgr32.@) + */ +CONFIGRET WINAPI CM_Get_Device_Interface_PropertyW( LPCWSTR device_interface, const DEVPROPKEY *property_key, + DEVPROPTYPE *property_type, BYTE *property_buffer, + ULONG *property_buffer_size, ULONG flags ) +{ + FIXME("%s %p %p %p %p %ld stub!\n", debugstr_w(device_interface), property_key, property_type, + property_buffer, property_buffer_size, flags); + + return CR_CALL_NOT_IMPLEMENTED; +} diff --git a/include/cfgmgr32.h b/include/cfgmgr32.h index a0bb89a2a67..ee1846b0e97 100644 --- a/include/cfgmgr32.h +++ b/include/cfgmgr32.h @@ -26,6 +26,7 @@ #endif #include <winreg.h> +#include <devpropdef.h> /* cfgmgr32 doesn't use the normal convention, it adds an underscore before A/W */ #ifdef WINE_NO_UNICODE_MACROS @@ -312,6 +313,7 @@ CMAPI CONFIGRET WINAPI CM_Get_Device_ID_List_ExW(PCWSTR,PWCHAR,ULONG,ULONG,HMACH #define CM_Get_Device_ID_List_Ex WINELIB_NAME_AW(CM_Get_Device_ID_List_Ex) CMAPI CONFIGRET WINAPI CM_Get_Device_ID_Size(PULONG,DEVINST,ULONG); CMAPI CONFIGRET WINAPI CM_Get_Device_ID_Size_Ex(PULONG,DEVINST,ULONG,HMACHINE); +CMAPI CONFIGRET WINAPI CM_Get_Device_Interface_PropertyW(LPCWSTR,const DEVPROPKEY*,DEVPROPTYPE*,PBYTE,PULONG,ULONG); CMAPI CONFIGRET WINAPI CM_Get_DevNode_Status(PULONG,PULONG,DEVINST,ULONG); CMAPI CONFIGRET WINAPI CM_Get_DevNode_Status_Ex(PULONG,PULONG,DEVINST,ULONG,HMACHINE); CMAPI CONFIGRET WINAPI CM_Get_Sibling(PDEVINST,DEVINST,ULONG);

1 0

Alexandre Julliard : include: Include cfg.h from cfgmgr32.h.
by Alexandre Julliard 30 Jan '24

30 Jan '24

Module: wine Branch: master Commit: 008f64557d3ad9ef83e956204079b48f8fa1eaa7 URL: https://gitlab.winehq.org/wine/wine/-/commit/008f64557d3ad9ef83e956204079b4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 30 16:45:45 2024 +0100 include: Include cfg.h from cfgmgr32.h. --- dlls/cfgmgr32/main.c | 1 + dlls/cfgmgr32/tests/cfgmgr32.c | 1 + dlls/hidclass.sys/hid.h | 1 + dlls/win32u/sysparams.c | 2 +- dlls/winexinput.sys/main.c | 1 + include/cfgmgr32.h | 23 ++--------------------- 6 files changed, 7 insertions(+), 22 deletions(-) diff --git a/dlls/cfgmgr32/main.c b/dlls/cfgmgr32/main.c index 7d48a96be85..b545d761f68 100644 --- a/dlls/cfgmgr32/main.c +++ b/dlls/cfgmgr32/main.c @@ -17,6 +17,7 @@ */ #include "wine/debug.h" +#include "winreg.h" #include "cfgmgr32.h" WINE_DEFAULT_DEBUG_CHANNEL(setupapi); diff --git a/dlls/cfgmgr32/tests/cfgmgr32.c b/dlls/cfgmgr32/tests/cfgmgr32.c index aa1a2100ee1..22344c45afc 100644 --- a/dlls/cfgmgr32/tests/cfgmgr32.c +++ b/dlls/cfgmgr32/tests/cfgmgr32.c @@ -17,6 +17,7 @@ */ #include "wine/test.h" +#include "winreg.h" #include "cfgmgr32.h" static void test_CM_MapCrToWin32Err(void) diff --git a/dlls/hidclass.sys/hid.h b/dlls/hidclass.sys/hid.h index 3eefbf87f63..7b5d5f19298 100644 --- a/dlls/hidclass.sys/hid.h +++ b/dlls/hidclass.sys/hid.h @@ -22,6 +22,7 @@ #include "winbase.h" #include "winternl.h" #include "winioctl.h" +#include "winreg.h" #include "ddk/wdm.h" #include "hidusage.h" #include "ddk/hidport.h" diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index e2c5b10da9e..9a43de8fd76 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -31,7 +31,7 @@ #define WIN32_NO_STATUS #include "ntgdi_private.h" #include "ntuser_private.h" -#include "devpropdef.h" +#include "winreg.h" #include "cfgmgr32.h" #include "d3dkmdt.h" #include "wine/wingdi16.h" diff --git a/dlls/winexinput.sys/main.c b/dlls/winexinput.sys/main.c index f07e6b31bd5..26764fa78ef 100644 --- a/dlls/winexinput.sys/main.c +++ b/dlls/winexinput.sys/main.c @@ -27,6 +27,7 @@ #include "winbase.h" #include "winternl.h" #include "winioctl.h" +#include "winreg.h" #include "cfgmgr32.h" #include "ddk/wdm.h" diff --git a/include/cfgmgr32.h b/include/cfgmgr32.h index ee1846b0e97..0893e42b399 100644 --- a/include/cfgmgr32.h +++ b/include/cfgmgr32.h @@ -19,15 +19,13 @@ #ifndef _CFGMGR32_H_ #define _CFGMGR32_H_ -/* FIXME: #include <cfg.h> */ +#include <cfg.h> +#include <devpropdef.h> #ifndef GUID_DEFINED # include <guiddef.h> #endif -#include <winreg.h> -#include <devpropdef.h> - /* cfgmgr32 doesn't use the normal convention, it adds an underscore before A/W */ #ifdef WINE_NO_UNICODE_MACROS # define DECL_WINELIB_CFGMGR32_TYPE_AW(type) /* nothing */ @@ -193,23 +191,6 @@ typedef CHAR *DEVNODEID_A, *DEVINSTID_A; typedef WCHAR *DEVNODEID_W, *DEVINSTID_W; typedef ULONG REGDISPOSITION; -typedef enum _PNP_VETO_TYPE -{ - PNP_VetoTypeUnknown, - PNP_VetoLegacyDevice, - PNP_VetoPendingClose, - PNP_VetoWindowsApp, - PNP_VetoWindowsService, - PNP_VetoOutstandingOpen, - PNP_VetoDevice, - PNP_VetoDriver, - PNP_VetoIllegalDeviceRequest, - PNP_VetoInsufficientPower, - PNP_VetoNonDisableable, - PNP_VetoLegacyDriver, - PNP_VetoInsufficientRights -} PNP_VETO_TYPE, *PPNP_VETO_TYPE; - typedef enum _CM_NOTIFY_FILTER_TYPE { CM_NOTIFY_FILTER_TYPE_DEVICEINTERFACE,

1 0

Alexandre Julliard : ntdll: Report the correct address for breakpoint exception on ARM platforms.
by Alexandre Julliard 30 Jan '24

30 Jan '24

Module: wine Branch: master Commit: 982e323070d5fb8dffbc68b75fb30c4be5f84e67 URL: https://gitlab.winehq.org/wine/wine/-/commit/982e323070d5fb8dffbc68b75fb30c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 30 15:45:48 2024 +0100 ntdll: Report the correct address for breakpoint exception on ARM platforms. --- dlls/ntdll/unix/signal_arm.c | 52 +++++++++++++++++++++++++++--------------- dlls/ntdll/unix/signal_arm64.c | 45 ++++++++++++++++++++++-------------- 2 files changed, 62 insertions(+), 35 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index 2a375e6f15f..9ca0569bd62 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -967,33 +967,27 @@ NTSTATUS get_thread_wow64_context( HANDLE handle, void *ctx, ULONG size ) /*********************************************************************** - * setup_exception - * - * Modify the signal context to call the exception raise function. + * setup_raise_exception */ -static void setup_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec ) +static void setup_raise_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec, CONTEXT *context ) { struct exc_stack_layout *stack; void *stack_ptr = (void *)(SP_sig(sigcontext) & ~7); - CONTEXT context; NTSTATUS status; - rec->ExceptionAddress = (void *)PC_sig(sigcontext); - save_context( &context, sigcontext ); - - status = send_debug_event( rec, &context, TRUE ); + status = send_debug_event( rec, context, TRUE ); if (status == DBG_CONTINUE || status == DBG_EXCEPTION_HANDLED) { - restore_context( &context, sigcontext ); + restore_context( context, sigcontext ); return; } /* fix up instruction pointer in context for EXCEPTION_BREAKPOINT */ - if (rec->ExceptionCode == EXCEPTION_BREAKPOINT) context.Pc -= 2; + if (rec->ExceptionCode == EXCEPTION_BREAKPOINT) context->Pc -= 2; stack = virtual_setup_exception( stack_ptr, sizeof(*stack), rec ); stack->rec = *rec; - stack->context = context; + stack->context = *context; /* now modify the sigcontext to return to the raise function */ SP_sig(sigcontext) = (DWORD)stack; @@ -1003,6 +997,21 @@ static void setup_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec ) } +/*********************************************************************** + * setup_exception + * + * Modify the signal context to call the exception raise function. + */ +static void setup_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec ) +{ + CONTEXT context; + + rec->ExceptionAddress = (void *)PC_sig(sigcontext); + save_context( &context, sigcontext ); + setup_raise_exception( sigcontext, rec, &context ); +} + + /*********************************************************************** * call_user_apc_dispatcher */ @@ -1243,6 +1252,10 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) { EXCEPTION_RECORD rec = { 0 }; ucontext_t *context = sigcontext; + CONTEXT ctx; + + rec.ExceptionAddress = (void *)PC_sig(context); + save_context( &ctx, sigcontext ); switch (get_trap_code(signal, context)) { @@ -1251,10 +1264,7 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) { case 0xfb: /* __fastfail */ { - CONTEXT ctx; - save_context( &ctx, sigcontext ); rec.ExceptionCode = STATUS_STACK_BUFFER_OVERRUN; - rec.ExceptionAddress = (void *)ctx.Pc; rec.ExceptionFlags = EH_NONCONTINUABLE; rec.NumberParameters = 1; rec.ExceptionInformation[0] = ctx.R0; @@ -1262,7 +1272,7 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) return; } case 0xfe: /* breakpoint */ - PC_sig(context) += 2; /* skip the instruction */ + ctx.Pc += 2; /* skip the breakpoint instruction */ rec.ExceptionCode = EXCEPTION_BREAKPOINT; rec.NumberParameters = 1; break; @@ -1294,7 +1304,7 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) break; } if (handle_syscall_fault( context, &rec )) return; - setup_exception( context, &rec ); + setup_raise_exception( context, &rec, &ctx ); } @@ -1306,6 +1316,11 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) static void trap_handler( int signal, siginfo_t *siginfo, void *sigcontext ) { EXCEPTION_RECORD rec = { 0 }; + ucontext_t *context = sigcontext; + CONTEXT ctx; + + rec.ExceptionAddress = (void *)PC_sig(context); + save_context( &ctx, sigcontext ); switch (siginfo->si_code) { @@ -1314,11 +1329,12 @@ static void trap_handler( int signal, siginfo_t *siginfo, void *sigcontext ) break; case TRAP_BRKPT: default: + ctx.Pc += 2; /* skip the breakpoint instruction */ rec.ExceptionCode = EXCEPTION_BREAKPOINT; rec.NumberParameters = 1; break; } - setup_exception( sigcontext, &rec ); + setup_raise_exception( sigcontext, &rec, &ctx ); } diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index 3b05f556e8e..bc5b8f0b88a 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -688,33 +688,27 @@ NTSTATUS get_thread_wow64_context( HANDLE handle, void *ctx, ULONG size ) /*********************************************************************** - * setup_exception - * - * Modify the signal context to call the exception raise function. + * setup_raise_exception */ -static void setup_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec ) +static void setup_raise_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec, CONTEXT *context ) { struct exc_stack_layout *stack; void *stack_ptr = (void *)(SP_sig(sigcontext) & ~15); - CONTEXT context; NTSTATUS status; - rec->ExceptionAddress = (void *)PC_sig(sigcontext); - save_context( &context, sigcontext ); - - status = send_debug_event( rec, &context, TRUE ); + status = send_debug_event( rec, context, TRUE ); if (status == DBG_CONTINUE || status == DBG_EXCEPTION_HANDLED) { - restore_context( &context, sigcontext ); + restore_context( context, sigcontext ); return; } /* fix up instruction pointer in context for EXCEPTION_BREAKPOINT */ - if (rec->ExceptionCode == EXCEPTION_BREAKPOINT) context.Pc -= 4; + if (rec->ExceptionCode == EXCEPTION_BREAKPOINT) context->Pc -= 4; stack = virtual_setup_exception( stack_ptr, sizeof(*stack), rec ); stack->rec = *rec; - stack->context = context; + stack->context = *context; SP_sig(sigcontext) = (ULONG_PTR)stack; PC_sig(sigcontext) = (ULONG_PTR)pKiUserExceptionDispatcher; @@ -722,6 +716,21 @@ static void setup_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec ) } +/*********************************************************************** + * setup_exception + * + * Modify the signal context to call the exception raise function. + */ +static void setup_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec ) +{ + CONTEXT context; + + rec->ExceptionAddress = (void *)PC_sig(sigcontext); + save_context( &context, sigcontext ); + setup_raise_exception( sigcontext, rec, &context ); +} + + /*********************************************************************** * call_user_apc_dispatcher */ @@ -1069,6 +1078,10 @@ static void trap_handler( int signal, siginfo_t *siginfo, void *sigcontext ) { EXCEPTION_RECORD rec = { 0 }; ucontext_t *context = sigcontext; + CONTEXT ctx; + + rec.ExceptionAddress = (void *)PC_sig(context); + save_context( &ctx, sigcontext ); switch (siginfo->si_code) { @@ -1082,22 +1095,20 @@ static void trap_handler( int signal, siginfo_t *siginfo, void *sigcontext ) !(PC_sig( context ) & 3) && *(ULONG *)PC_sig( context ) == 0xd43e0060UL) /* brk #0xf003 -> __fastfail */ { - CONTEXT ctx; - save_context( &ctx, sigcontext ); rec.ExceptionCode = STATUS_STACK_BUFFER_OVERRUN; - rec.ExceptionAddress = (void *)ctx.Pc; rec.ExceptionFlags = EH_NONCONTINUABLE; rec.NumberParameters = 1; rec.ExceptionInformation[0] = ctx.X[0]; NtRaiseException( &rec, &ctx, FALSE ); return; } - PC_sig( context ) += 4; /* skip the brk instruction */ + ctx.Pc += 4; /* skip the brk instruction */ rec.ExceptionCode = EXCEPTION_BREAKPOINT; rec.NumberParameters = 1; break; } - setup_exception( sigcontext, &rec ); + + setup_raise_exception( sigcontext, &rec, &ctx ); }

1 0

Alexandre Julliard : kernel32/tests: Fix some test failures on ARM platforms.
by Alexandre Julliard 30 Jan '24

30 Jan '24

Module: wine Branch: master Commit: d0e02b67eb8af4d9cac691267c05819a62dd3fa7 URL: https://gitlab.winehq.org/wine/wine/-/commit/d0e02b67eb8af4d9cac691267c0581… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 30 15:45:57 2024 +0100 kernel32/tests: Fix some test failures on ARM platforms. --- dlls/kernel32/tests/debugger.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index 5dc6ca77d48..9fb953f281a 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -1151,7 +1151,7 @@ static void test_debug_loop_wow64(void) if (!pGetMappedFileNameW( pi.hProcess, ev.u.LoadDll.lpBaseOfDll, buffer, ARRAY_SIZE(buffer) )) buffer[0] = L'\0'; if ((p = wcsrchr( buffer, '\\' ))) p++; else p = buffer; - if (!memcmp( p, L"wow64", 5 * sizeof(WCHAR) )) + if (!wcsnicmp( p, L"wow64", 5 ) || !wcsicmp( p, L"xtajit.dll" )) { /* on Win10, wow64cpu's load dll event is received after first exception */ ok(bpwx_order == 0, "loaddll for wow64 DLLs should appear before exception\n"); @@ -1700,7 +1700,7 @@ static void test_debugger(const char *argv0) expect_event(&ctx, EXIT_THREAD_DEBUG_EVENT); } - else win_skip("loop_code not supported on this architecture\n"); + else todo_wine win_skip("loop_code not supported on this architecture\n"); if (sizeof(call_debug_service_code) > 1) { @@ -1726,7 +1726,7 @@ static void test_debugger(const char *argv0) if (sizeof(void *) == 4 && ctx.ev.dwDebugEventCode == EXCEPTION_DEBUG_EVENT) next_event(&ctx, WAIT_EVENT_TIMEOUT); ok(ctx.ev.dwDebugEventCode == EXIT_THREAD_DEBUG_EVENT, "unexpected debug event %lu\n", ctx.ev.dwDebugEventCode); } - else win_skip("call_debug_service_code not supported on this architecture\n"); + else todo_wine win_skip("call_debug_service_code not supported on this architecture\n"); if (skip_reply_later) win_skip("Skipping unsupported DBG_REPLY_LATER tests\n"); @@ -2411,6 +2411,11 @@ START_TEST(debugger) pDbgUiGetThreadDebugObject = (void*)GetProcAddress(ntdll, "DbgUiGetThreadDebugObject"); pDbgUiSetThreadDebugObject = (void*)GetProcAddress(ntdll, "DbgUiSetThreadDebugObject"); +#ifdef __arm__ + /* mask thumb bit for address comparisons */ + pDbgBreakPoint = (void *)((ULONG_PTR)pDbgBreakPoint & ~1); +#endif + if (pIsWow64Process) pIsWow64Process( GetCurrentProcess(), &is_wow64 ); myARGC=winetest_get_mainargs(&myARGV);

1 0

Alexandre Julliard : ntdll: Use a .seh handler for DbgUiRemoteBreakin().
by Alexandre Julliard 30 Jan '24

30 Jan '24

Module: wine Branch: master Commit: 08f4705e4416c55ba9b941cc7c380d5e61a4715a URL: https://gitlab.winehq.org/wine/wine/-/commit/08f4705e4416c55ba9b941cc7c380d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 30 15:51:01 2024 +0100 ntdll: Use a .seh handler for DbgUiRemoteBreakin(). --- dlls/ntdll/signal_arm.c | 16 ++++++++++++++++ dlls/ntdll/signal_arm64.c | 30 ++++++++++++++---------------- dlls/ntdll/signal_x86_64.c | 19 ++++++++++++++++++- 3 files changed, 48 insertions(+), 17 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 80d722ccacb..0e6c36e3340 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -1688,6 +1688,21 @@ void WINAPI process_breakpoint(void) /*********************************************************************** * DbgUiRemoteBreakin (NTDLL.@) */ +#ifdef __WINE_PE_BUILD +__ASM_GLOBAL_FUNC( DbgUiRemoteBreakin, + ".seh_endprologue\n\t" + ".seh_handler DbgUiRemoteBreakin_handler, %except\n\t" + "mrc p15, 0, r0, c13, c0, 2\n\t" /* NtCurrentTeb() */ + "ldr r0, [r0, #0x30]\n\t" /* NtCurrentTeb()->Peb */ + "ldrb r0, [r0, 0x02]\n\t" /* peb->BeingDebugged */ + "cbz r0, 1f\n\t" + "bl " __ASM_NAME("DbgBreakPoint") "\n" + "1:\tmov r0, #0\n\t" + "bl " __ASM_NAME("RtlExitUserThread") "\n" + "DbgUiRemoteBreakin_handler:\n\t" + "mov sp, r1\n\t" /* frame */ + "b 1b" ) +#else void WINAPI DbgUiRemoteBreakin( void *arg ) { if (NtCurrentTeb()->Peb->BeingDebugged) @@ -1704,6 +1719,7 @@ void WINAPI DbgUiRemoteBreakin( void *arg ) } RtlExitUserThread( STATUS_SUCCESS ); } +#endif /********************************************************************** * DbgBreakPoint (NTDLL.@) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 477f22029bd..82466e926c2 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -1585,22 +1585,20 @@ __ASM_GLOBAL_FUNC( process_breakpoint, /*********************************************************************** * DbgUiRemoteBreakin (NTDLL.@) */ -void WINAPI DbgUiRemoteBreakin( void *arg ) -{ - if (NtCurrentTeb()->Peb->BeingDebugged) - { - __TRY - { - DbgBreakPoint(); - } - __EXCEPT_ALL - { - /* do nothing */ - } - __ENDTRY - } - RtlExitUserThread( STATUS_SUCCESS ); -} +__ASM_GLOBAL_FUNC( DbgUiRemoteBreakin, + "stp x29, x30, [sp, #-16]!\n\t" + ".seh_save_fplr_x 16\n\t" + ".seh_endprologue\n\t" + ".seh_handler DbgUiRemoteBreakin_handler, @except\n\t" + "ldr x0, [x18, #0x60]\n\t" /* NtCurrentTeb()->Peb */ + "ldrb w0, [x0, 0x02]\n\t" /* peb->BeingDebugged */ + "cbz w0, 1f\n\t" + "bl " __ASM_NAME("DbgBreakPoint") "\n" + "1:\tmov w0, #0\n\t" + "bl " __ASM_NAME("RtlExitUserThread") "\n" + "DbgUiRemoteBreakin_handler:\n\t" + "mov sp, x1\n\t" /* frame */ + "b 1b" ) /********************************************************************** * DbgBreakPoint (NTDLL.@) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index be5851b8c31..e63837d3eac 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -1748,6 +1748,23 @@ void WINAPI process_breakpoint(void) /*********************************************************************** * DbgUiRemoteBreakin (NTDLL.@) */ +#ifdef __WINE_PE_BUILD +__ASM_GLOBAL_FUNC( DbgUiRemoteBreakin, + "subq $0x28,%rsp\n\t" + ".seh_stackalloc 0x28\n\t" + ".seh_endprologue\n\t" + ".seh_handler DbgUiRemoteBreakin_handler, @except\n\t" + "mov %gs:0x30,%rax\n\t" + "mov 0x60(%rax),%rax\n\t" + "cmpb $0,2(%rax)\n\t" + "je 1f\n\t" + "call " __ASM_NAME("DbgBreakPoint") "\n" + "1:\txorl %ecx,%ecx\n\t" + "call " __ASM_NAME("RtlExitUserThread") "\n" + "DbgUiRemoteBreakin_handler:\n\t" + "movq %rdx,%rsp\n\t" /* frame */ + "jmp 1b" ) +#else void WINAPI DbgUiRemoteBreakin( void *arg ) { if (NtCurrentTeb()->Peb->BeingDebugged) @@ -1764,7 +1781,7 @@ void WINAPI DbgUiRemoteBreakin( void *arg ) } RtlExitUserThread( STATUS_SUCCESS ); } - +#endif /********************************************************************** * DbgBreakPoint (NTDLL.@)

1 0

Alexandre Julliard : dbghelp/tests: Mark failing tests as todo.
by Alexandre Julliard 30 Jan '24

30 Jan '24

Module: wine Branch: master Commit: 87a21586a86fbc3b19ad5a1c2e87c9dbb720bc36 URL: https://gitlab.winehq.org/wine/wine/-/commit/87a21586a86fbc3b19ad5a1c2e87c9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 30 17:19:55 2024 +0100 dbghelp/tests: Mark failing tests as todo. --- dlls/dbghelp/tests/dbghelp.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/dbghelp/tests/dbghelp.c b/dlls/dbghelp/tests/dbghelp.c index e41dd5f94a0..d1c2f219533 100644 --- a/dlls/dbghelp/tests/dbghelp.c +++ b/dlls/dbghelp/tests/dbghelp.c @@ -876,6 +876,7 @@ static void test_loaded_modules(void) aggregation.count_systemdir, aggregation.count_wowdir); break; case PCSKIND_WINE_OLD_WOW64: + todo_wine ok(aggregation.count_systemdir == 1 && aggregation.count_wowdir > 2, "Wrong directory aggregation count %u %u\n", aggregation.count_systemdir, aggregation.count_wowdir); break; @@ -1353,6 +1354,7 @@ static void test_live_modules_proc(WCHAR* exename, BOOL with_32) ok(aggregation_event.count_exe == 1, "Unexpected event.count_exe %u\n", aggregation_event.count_exe); ok(aggregation_event.count_32bit >= MODCOUNT, "Unexpected event.count_32bit %u\n", aggregation_event.count_32bit); ok(aggregation_event.count_64bit == 0, "Unexpected event.count_64bit %u\n", aggregation_event.count_64bit); + todo_wine ok(aggregation_event.count_systemdir == 0, "Unexpected event.count_systemdir %u\n", aggregation_event.count_systemdir); ok(aggregation_event.count_wowdir >= MODCOUNT, "Unexpected event.count_wowdir %u\n", aggregation_event.count_wowdir); ok(aggregation_event.count_ntdll == 1, "Unexpected event.count_ntdll %u\n", aggregation_event.count_ntdll); @@ -1418,6 +1420,7 @@ static void test_live_modules_proc(WCHAR* exename, BOOL with_32) ok(aggregation_event.count_exe == 1, "Unexpected event.count_exe %u\n", aggregation_event.count_exe); ok(aggregation_event.count_32bit >= MODCOUNT, "Unexpected event.count_32bit %u\n", aggregation_event.count_32bit); ok(aggregation_event.count_64bit == 0, "Unexpected event.count_64bit %u\n", aggregation_event.count_64bit); + todo_wine ok(aggregation_event.count_systemdir == 1, "Unexpected event.count_systemdir %u\n", aggregation_event.count_systemdir); ok(aggregation_event.count_wowdir >= MODCOUNT, "Unexpected event.count_wowdir %u\n", aggregation_event.count_wowdir); ok(aggregation_event.count_ntdll == 1, "Unexpected event.count_ntdll %u\n", aggregation_event.count_ntdll);

1 0

Alexandre Julliard : Revert "loader: Associate folder with explorer".
by Alexandre Julliard 30 Jan '24

30 Jan '24

Module: wine Branch: master Commit: 5a26d87babd98a776954f7dc8d4a36e36d7a87d4 URL: https://gitlab.winehq.org/wine/wine/-/commit/5a26d87babd98a776954f7dc8d4a36… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 30 17:29:48 2024 +0100 Revert "loader: Associate folder with explorer". This reverts commit 7a941fd59af6377c1e30012e4a0eaea711dd61f4. It doesn't work properly since explorer fails to launch, and it breaks the tests. --- loader/wine.inf.in | 1 - 1 file changed, 1 deletion(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 9a8865698ea..06551152f3a 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -289,7 +289,6 @@ HKCR,exefile,,2,"Application" HKCR,exefile\DefaultIcon,,2,"%1" HKCR,exefile\shell\open\command,,2,"""%1"" %*" HKCR,exefile\shell\runas\command,,2,"""%1"" %*" -HKCR,folder\shell\explore\command,,2,"explorer ""%1""" HKCR,folder\shell\open\ddeexec,,2,"[ViewFolder("%l", %I, %S)]" HKCR,folder\shell\open\ddeexec,"NoActivateHandler",2,"" HKCR,folder\shell\open\ddeexec\application,,2,"Folders"

1 0

Jacek Caban : windowscodecs: Pass result as void pointer to ComponentInfo_GetUINTValue.
by Alexandre Julliard 30 Jan '24

30 Jan '24

Module: wine Branch: master Commit: 6e49ff99ebebc7ccc0dc5600ad16292dc6f0bf4e URL: https://gitlab.winehq.org/wine/wine/-/commit/6e49ff99ebebc7ccc0dc5600ad1629… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 29 15:08:24 2024 +0100 windowscodecs: Pass result as void pointer to ComponentInfo_GetUINTValue. --- dlls/windowscodecs/info.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index 689d2e26314..4edfaa69d77 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -101,7 +101,7 @@ static HRESULT ComponentInfo_GetGUIDValue(HKEY classkey, LPCWSTR value, } static HRESULT ComponentInfo_GetUINTValue(HKEY classkey, LPCWSTR value, - UINT *result) + void *result) { LONG ret; DWORD cbdata = sizeof(DWORD); @@ -110,11 +110,11 @@ static HRESULT ComponentInfo_GetUINTValue(HKEY classkey, LPCWSTR value, return E_INVALIDARG; ret = RegGetValueW(classkey, NULL, value, RRF_RT_DWORD, NULL, - (DWORD *)result, &cbdata); + result, &cbdata); if (ret == ERROR_FILE_NOT_FOUND) { - *result = 0; + *(UINT *)result = 0; return S_OK; } @@ -1413,7 +1413,7 @@ static HRESULT WINAPI PixelFormatInfo_SupportsTransparency(IWICPixelFormatInfo2 TRACE("(%p,%p)\n", iface, pfSupportsTransparency); - return ComponentInfo_GetUINTValue(This->classkey, L"SupportsTransparency", (UINT *)pfSupportsTransparency); + return ComponentInfo_GetUINTValue(This->classkey, L"SupportsTransparency", pfSupportsTransparency); } static HRESULT WINAPI PixelFormatInfo_GetNumericRepresentation(IWICPixelFormatInfo2 *iface, @@ -1682,7 +1682,7 @@ static HRESULT WINAPI MetadataReaderInfo_DoesRequireFullStream(IWICMetadataReade { MetadataReaderInfo *This = impl_from_IWICMetadataReaderInfo(iface); TRACE("(%p,%p)\n", iface, param); - return ComponentInfo_GetUINTValue(This->classkey, L"RequiresFullStream", (UINT *)param); + return ComponentInfo_GetUINTValue(This->classkey, L"RequiresFullStream", param); } static HRESULT WINAPI MetadataReaderInfo_DoesSupportPadding(IWICMetadataReaderInfo *iface, @@ -1690,7 +1690,7 @@ static HRESULT WINAPI MetadataReaderInfo_DoesSupportPadding(IWICMetadataReaderIn { MetadataReaderInfo *This = impl_from_IWICMetadataReaderInfo(iface); TRACE("(%p,%p)\n", iface, param); - return ComponentInfo_GetUINTValue(This->classkey, L"SupportsPadding", (UINT *)param); + return ComponentInfo_GetUINTValue(This->classkey, L"SupportsPadding", param); } static HRESULT WINAPI MetadataReaderInfo_DoesRequireFixedSize(IWICMetadataReaderInfo *iface,

1 0

Rémi Bernon : explorer: Restore a per-desktop ShowSystray registry setting.
by Alexandre Julliard 29 Jan '24

29 Jan '24

Module: wine Branch: master Commit: 852c4d0a8a39da4df72358d6e30773a93bc8778d URL: https://gitlab.winehq.org/wine/wine/-/commit/852c4d0a8a39da4df72358d6e30773… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jan 29 12:02:14 2024 +0100 explorer: Restore a per-desktop ShowSystray registry setting. With a global fallback setting under HKCU\Software\Wine\Explorer. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56243 --- programs/explorer/desktop.c | 37 ++++++++++++++++++++++++++++++++---- programs/explorer/explorer_private.h | 2 +- programs/explorer/systray.c | 4 +++- 3 files changed, 37 insertions(+), 6 deletions(-) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 9a58f13d887..65a89862190 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -841,6 +841,35 @@ static BOOL get_default_enable_shell( const WCHAR *name ) return result; } +static BOOL get_default_show_systray( const WCHAR *name ) +{ + HKEY hkey; + BOOL found = FALSE; + BOOL result; + DWORD size = sizeof(result); + + /* @@ Wine registry key: HKCU\Software\Wine\Explorer\Desktops */ + if (name && !RegOpenKeyW( HKEY_CURRENT_USER, L"Software\\Wine\\Explorer\\Desktops", &hkey )) + { + if (!RegGetValueW( hkey, name, L"ShowSystray", RRF_RT_REG_DWORD, NULL, &result, &size )) + found = TRUE; + RegCloseKey( hkey ); + } + + /* Try again with a global Explorer setting */ + /* @@ Wine registry key: HKCU\Software\Wine\Explorer */ + if (!found && !RegOpenKeyW( HKEY_CURRENT_USER, L"Software\\Wine\\Explorer", &hkey )) + { + if (!RegGetValueW( hkey, NULL, L"ShowSystray", RRF_RT_REG_DWORD, NULL, &result, &size )) + found = TRUE; + RegCloseKey( hkey ); + } + + /* Default on */ + if (!found) result = TRUE; + return result; +} + 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"; @@ -1020,7 +1049,7 @@ void manage_desktop( WCHAR *arg ) WCHAR *cmdline = NULL, *driver = NULL; WCHAR *p = arg; const WCHAR *name = NULL; - BOOL enable_shell = FALSE; + BOOL enable_shell = FALSE, show_systray = TRUE; void (WINAPI *pShellDDEInit)( BOOL ) = NULL; HMODULE shell32; HANDLE thread; @@ -1054,8 +1083,8 @@ void manage_desktop( WCHAR *arg ) if (!get_default_desktop_size( name, &width, &height )) width = height = 0; } - if (name) - enable_shell = get_default_enable_shell( name ); + if (name) enable_shell = get_default_enable_shell( name ); + show_systray = get_default_show_systray( name ); UuidCreate( &guid ); TRACE( "display guid %s\n", debugstr_guid(&guid) ); @@ -1101,7 +1130,7 @@ void manage_desktop( WCHAR *arg ) if (using_root) enable_shell = FALSE; - initialize_systray( using_root, enable_shell ); + initialize_systray( using_root, enable_shell, show_systray ); 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 34aa1cf046b..0639e41c9c6 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( BOOL using_root, BOOL enable_shell ); +extern void initialize_systray( BOOL using_root, BOOL enable_shell, BOOL show_systray ); 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 b012d3ffe72..3b4e5bdc8ac 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -249,6 +249,7 @@ static void balloon_create_timer( struct icon *icon ) static BOOL show_balloon( struct icon *icon ) { + if (!show_systray) return FALSE; /* systray has been hidden */ if (icon->display == ICON_DISPLAY_HIDDEN) return FALSE; /* not displayed */ if (!icon->info_text[0]) return FALSE; /* no balloon */ balloon_icon = icon; @@ -1114,7 +1115,7 @@ void handle_parent_notify( HWND hwnd, WPARAM wp ) } /* this function creates the listener window */ -void initialize_systray( BOOL using_root, BOOL arg_enable_shell ) +void initialize_systray( BOOL using_root, BOOL arg_enable_shell, BOOL arg_show_systray ) { RECT work_rect, primary_rect, taskbar_rect; @@ -1125,6 +1126,7 @@ void initialize_systray( BOOL using_root, BOOL arg_enable_shell ) icon_cx = GetSystemMetrics( SM_CXSMICON ) + 2*ICON_BORDER; icon_cy = GetSystemMetrics( SM_CYSMICON ) + 2*ICON_BORDER; + show_systray = arg_show_systray; enable_shell = arg_enable_shell; enable_taskbar = enable_shell || !using_root;

1 0