- Wine-Commits - list.winehq.org

Alexandre Julliard : ntdll: Move the process breakpoint to the CPU backends.
by Alexandre Julliard Jan. 23, 2024

Jan. 23, 2024

Module: wine Branch: master Commit: 1414adfa4644f2cb3b0754aa6a4a54274a9c0310 URL: https://gitlab.winehq.org/wine/wine/-/commit/1414adfa4644f2cb3b0754aa6a4a54… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 23 15:53:58 2024 +0100 ntdll: Move the process breakpoint to the CPU backends. --- dlls/ntdll/loader.c | 30 ++++-------------------------- dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/process.c | 13 +------------ dlls/ntdll/signal_arm.c | 16 ++++++++++++++++ dlls/ntdll/signal_arm64.c | 18 ++++++++++++++++++ dlls/ntdll/signal_arm64ec.c | 17 +++++++++++++++++ dlls/ntdll/signal_i386.c | 17 +++++++++++++++++ dlls/ntdll/signal_x86_64.c | 17 +++++++++++++++++ 8 files changed, 91 insertions(+), 38 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 59624bc70f8..021f7941969 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -4076,30 +4076,6 @@ PIMAGE_NT_HEADERS WINAPI RtlImageNtHeader(HMODULE hModule) return ret; } -/*********************************************************************** - * process_breakpoint - * - * Trigger a debug breakpoint if the process is being debugged. - */ -static void process_breakpoint(void) -{ - DWORD_PTR port = 0; - - NtQueryInformationProcess( GetCurrentProcess(), ProcessDebugPort, &port, sizeof(port), NULL ); - if (!port) return; - - __TRY - { - DbgBreakPoint(); - } - __EXCEPT_ALL - { - /* do nothing */ - } - __ENDTRY -} - - /*********************************************************************** * load_global_options */ @@ -4270,7 +4246,7 @@ void loader_init( CONTEXT *context, void **entry ) { static int attach_done; NTSTATUS status; - ULONG_PTR cookie; + ULONG_PTR cookie, port = 0; WINE_MODREF *wm; if (process_detaching) NtTerminateThread( GetCurrentThread(), 0 ); @@ -4380,7 +4356,9 @@ void loader_init( CONTEXT *context, void **entry ) release_address_space(); if (wm->ldr.TlsIndex == -1) call_tls_callbacks( wm->ldr.DllBase, DLL_PROCESS_ATTACH ); if (wm->ldr.ActivationContext) RtlDeactivateActivationContext( 0, cookie ); - process_breakpoint(); + + NtQueryInformationProcess( GetCurrentProcess(), ProcessDebugPort, &port, sizeof(port), NULL ); + if (port) process_breakpoint(); } else { diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index da49c14e682..299363d7363 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -54,6 +54,7 @@ extern EXCEPTION_DISPOSITION WINAPI user_callback_handler( EXCEPTION_RECORD *rec CONTEXT *context, void *dispatch ); extern void DECLSPEC_NORETURN raise_status( NTSTATUS status, EXCEPTION_RECORD *rec ); extern LONG WINAPI call_unhandled_exception_filter( PEXCEPTION_POINTERS eptr ); +extern void WINAPI process_breakpoint(void); extern void WINAPI LdrInitializeThunk(CONTEXT*,ULONG_PTR,ULONG_PTR,ULONG_PTR); extern NTSTATUS WINAPI KiUserExceptionDispatcher(EXCEPTION_RECORD*,CONTEXT*); diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index 02e31ea7f4b..87090781bbd 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -708,18 +708,7 @@ NTSTATUS WINAPI DbgUiConvertStateChangeStructure( DBGUI_WAIT_STATE_CHANGE *state void WINAPI DbgUiRemoteBreakin( void *arg ) { TRACE( "\n" ); - if (NtCurrentTeb()->Peb->BeingDebugged) - { - __TRY - { - DbgBreakPoint(); - } - __EXCEPT_ALL - { - /* do nothing */ - } - __ENDTRY - } + if (NtCurrentTeb()->Peb->BeingDebugged) process_breakpoint(); RtlExitUserThread( STATUS_SUCCESS ); } diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 428742b116b..0ce63932919 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -1616,6 +1616,22 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unk2, ULONG_PTR unk3 NtContinue( context, TRUE ); } +/*********************************************************************** + * process_breakpoint + */ +void WINAPI process_breakpoint(void) +{ + __TRY + { + DbgBreakPoint(); + } + __EXCEPT_ALL + { + /* do nothing */ + } + __ENDTRY +} + /********************************************************************** * DbgBreakPoint (NTDLL.@) */ diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 2d150528610..34cbffbd3cc 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -1585,6 +1585,24 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unk2, ULONG_PTR unk3 NtContinue( context, TRUE ); } + +/*********************************************************************** + * process_breakpoint + */ +void WINAPI process_breakpoint(void) +{ + __TRY + { + DbgBreakPoint(); + } + __EXCEPT_ALL + { + /* do nothing */ + } + __ENDTRY +} + + /********************************************************************** * DbgBreakPoint (NTDLL.@) */ diff --git a/dlls/ntdll/signal_arm64ec.c b/dlls/ntdll/signal_arm64ec.c index a54a5eeaceb..f45381c89c0 100644 --- a/dlls/ntdll/signal_arm64ec.c +++ b/dlls/ntdll/signal_arm64ec.c @@ -2001,6 +2001,23 @@ void WINAPI LdrInitializeThunk( CONTEXT *arm_context, ULONG_PTR unk2, ULONG_PTR } +/*********************************************************************** + * process_breakpoint + */ +void WINAPI process_breakpoint(void) +{ + __TRY + { + DbgBreakPoint(); + } + __EXCEPT_ALL + { + /* do nothing */ + } + __ENDTRY +} + + /********************************************************************** * DbgBreakPoint (NTDLL.@) */ diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 865faa93ea9..95efec5122c 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -629,6 +629,23 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unk2, ULONG_PTR unk3 } +/*********************************************************************** + * process_breakpoint + */ +void WINAPI process_breakpoint(void) +{ + __TRY + { + DbgBreakPoint(); + } + __EXCEPT_ALL + { + /* do nothing */ + } + __ENDTRY +} + + /********************************************************************** * DbgBreakPoint (NTDLL.@) */ diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index b253c0b4f17..fbab26a7bf4 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -1725,6 +1725,23 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unk2, ULONG_PTR unk3 } +/*********************************************************************** + * process_breakpoint + */ +void WINAPI process_breakpoint(void) +{ + __TRY + { + DbgBreakPoint(); + } + __EXCEPT_ALL + { + /* do nothing */ + } + __ENDTRY +} + + /********************************************************************** * DbgBreakPoint (NTDLL.@) */

1 0

Alexandre Julliard : ntdll: Use a .seh handler for the process breakpoint.
by Alexandre Julliard Jan. 23, 2024

Jan. 23, 2024

Module: wine Branch: master Commit: 6085ab882240fe210d5749eff1d289a44e9245ff URL: https://gitlab.winehq.org/wine/wine/-/commit/6085ab882240fe210d5749eff1d289… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 23 15:55:47 2024 +0100 ntdll: Use a .seh handler for the process breakpoint. --- dlls/ntdll/signal_arm.c | 14 ++++++++++++++ dlls/ntdll/signal_arm64.c | 24 +++++++++++------------- dlls/ntdll/signal_arm64ec.c | 24 +++++++++++------------- dlls/ntdll/signal_x86_64.c | 12 ++++++++++++ 4 files changed, 48 insertions(+), 26 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 0ce63932919..17a2b8caa08 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -1619,6 +1619,19 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unk2, ULONG_PTR unk3 /*********************************************************************** * process_breakpoint */ +#ifdef __WINE_PE_BUILD +__ASM_GLOBAL_FUNC( process_breakpoint, + ".seh_endprologue\n\t" + ".seh_handler process_breakpoint_handler, %except\n\t" + "udf #0xfe\n\t" + "bx lr\n" + "process_breakpoint_handler:\n\t" + "ldr r0, [r2, #0x40]\n\t" /* context->Pc */ + "add r0, r0, #2\n\t" + "str r0, [r2, #0x40]\n\t" + "mov r0, #0\n\t" /* ExceptionContinueExecution */ + "bx lr" ) +#else void WINAPI process_breakpoint(void) { __TRY @@ -1631,6 +1644,7 @@ void WINAPI process_breakpoint(void) } __ENDTRY } +#endif /********************************************************************** * DbgBreakPoint (NTDLL.@) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 34cbffbd3cc..2cf7e5fd855 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -1589,19 +1589,17 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unk2, ULONG_PTR unk3 /*********************************************************************** * process_breakpoint */ -void WINAPI process_breakpoint(void) -{ - __TRY - { - DbgBreakPoint(); - } - __EXCEPT_ALL - { - /* do nothing */ - } - __ENDTRY -} - +__ASM_GLOBAL_FUNC( process_breakpoint, + ".seh_endprologue\n\t" + ".seh_handler process_breakpoint_handler, @except\n\t" + "brk #0xf000\n\t" + "ret\n" + "process_breakpoint_handler:\n\t" + "ldr x4, [x2, #0x108]\n\t" /* context->Pc */ + "add x4, x4, #4\n\t" + "str x4, [x2, #0x108]\n\t" + "mov w0, #0\n\t" /* ExceptionContinueExecution */ + "ret" ) /********************************************************************** * DbgBreakPoint (NTDLL.@) diff --git a/dlls/ntdll/signal_arm64ec.c b/dlls/ntdll/signal_arm64ec.c index f45381c89c0..97507d34c4f 100644 --- a/dlls/ntdll/signal_arm64ec.c +++ b/dlls/ntdll/signal_arm64ec.c @@ -2004,19 +2004,17 @@ void WINAPI LdrInitializeThunk( CONTEXT *arm_context, ULONG_PTR unk2, ULONG_PTR /*********************************************************************** * process_breakpoint */ -void WINAPI process_breakpoint(void) -{ - __TRY - { - DbgBreakPoint(); - } - __EXCEPT_ALL - { - /* do nothing */ - } - __ENDTRY -} - +__ASM_GLOBAL_FUNC( "#process_breakpoint", + ".seh_endprologue\n\t" + ".seh_handler process_breakpoint_handler, @except\n\t" + "brk #0xf000\n\t" + "ret\n" + "process_breakpoint_handler:\n\t" + "ldr x4, [x2, #0x108]\n\t" /* context->Pc */ + "add x4, x4, #4\n\t" + "str x4, [x2, #0x108]\n\t" + "mov w0, #0\n\t" /* ExceptionContinueExecution */ + "ret" ) /********************************************************************** * DbgBreakPoint (NTDLL.@) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index fbab26a7bf4..1344b89a9ca 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -1728,6 +1728,17 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unk2, ULONG_PTR unk3 /*********************************************************************** * process_breakpoint */ +#ifdef __WINE_PE_BUILD +__ASM_GLOBAL_FUNC( process_breakpoint, + ".seh_endprologue\n\t" + ".seh_handler process_breakpoint_handler, @except\n\t" + "int $3\n\t" + "ret\n" + "process_breakpoint_handler:\n\t" + "incq 0xf8(%r8)\n\t" /* context->Rip */ + "xorl %eax,%eax\n\t" /* ExceptionContinueExecution */ + "ret" ) +#else void WINAPI process_breakpoint(void) { __TRY @@ -1740,6 +1751,7 @@ void WINAPI process_breakpoint(void) } __ENDTRY } +#endif /**********************************************************************

1 0

Alexandre Julliard : ntdll/tests: Update todos in context tests for new wow64 mode.
by Alexandre Julliard Jan. 23, 2024

Jan. 23, 2024

Module: wine Branch: master Commit: 5113e551396049d574bd3d246887dd4229188b88 URL: https://gitlab.winehq.org/wine/wine/-/commit/5113e551396049d574bd3d246887dd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 23 22:44:33 2024 +0100 ntdll/tests: Update todos in context tests for new wow64 mode. --- dlls/ntdll/tests/exception.c | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 5917196a0cf..a183980895a 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -1270,7 +1270,7 @@ static void test_debugger(DWORD cont_status, BOOL with_WaitForDebugEventEx) __asm__( "movw %%ss,%0" : "=r" (ss) ); ok( ctx.SegSs == ss, "wrong ss %04lx / %04x\n", ctx.SegSs, ss ); ok( ctx.SegFs != ctx.SegSs, "wrong fs %04lx / %04lx\n", ctx.SegFs, ctx.SegSs ); - if (is_wow64) todo_wine + if (is_wow64) todo_wine_if( !ctx.SegDs ) /* old wow64 */ { ok( ctx.SegDs == ctx.SegSs, "wrong ds %04lx / %04lx\n", ctx.SegDs, ctx.SegSs ); ok( ctx.SegEs == ctx.SegSs, "wrong es %04lx / %04lx\n", ctx.SegEs, ctx.SegSs ); @@ -4547,10 +4547,6 @@ static void test_wow64_context(void) ret = pNtGetContextThread( pi.hThread, &context ); ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); ok( context.ContextFlags == CONTEXT_ALL, "got context flags %#lx\n", context.ContextFlags ); - todo_wine - ok( !context.Rax, "rax is not zero %Ix\n", context.Rax ); - todo_wine - ok( !context.Rbx, "rbx is not zero %Ix\n", context.Rbx ); ok( !context.Rsi, "rsi is not zero %Ix\n", context.Rsi ); ok( !context.Rdi, "rdi is not zero %Ix\n", context.Rdi ); ok( !context.Rbp, "rbp is not zero %Ix\n", context.Rbp ); @@ -4562,15 +4558,8 @@ static void test_wow64_context(void) ok( !context.R13, "r13 is not zero %Ix\n", context.R13 ); ok( !context.R14, "r14 is not zero %Ix\n", context.R14 ); ok( !context.R15, "r15 is not zero %Ix\n", context.R15 ); - todo_wine - ok( ((ULONG_PTR)context.Rsp & ~0xfff) == ((ULONG_PTR)teb.Tib.StackBase & ~0xfff), - "rsp is not at top of stack %p / %p\n", (void *)context.Rsp, teb.Tib.StackBase ); - todo_wine - ok( context.EFlags == 0x200, "wrong flags %08lx\n", context.EFlags ); ok( context.MxCsr == 0x1f80, "wrong mxcsr %08lx\n", context.MxCsr ); ok( context.FltSave.ControlWord == 0x27f, "wrong control %08x\n", context.FltSave.ControlWord ); - todo_wine - ok( context.SegCs != ctx.SegCs, "wrong cs %04x\n", context.SegCs ); ok( context.SegDs == ctx.SegDs, "wrong ds %04x / %04lx\n", context.SegDs, ctx.SegDs ); ok( context.SegEs == ctx.SegEs, "wrong es %04x / %04lx\n", context.SegEs, ctx.SegEs ); ok( context.SegFs == ctx.SegFs, "wrong fs %04x / %04lx\n", context.SegFs, ctx.SegFs ); @@ -4585,6 +4574,12 @@ static void test_wow64_context(void) goto done; } + ok( !context.Rax, "rax is not zero %Ix\n", context.Rax ); + ok( !context.Rbx, "rbx is not zero %Ix\n", context.Rbx ); + ok( ((ULONG_PTR)context.Rsp & ~0xfff) == ((ULONG_PTR)teb.Tib.StackBase & ~0xfff), + "rsp is not at top of stack %p / %p\n", (void *)context.Rsp, teb.Tib.StackBase ); + ok( context.EFlags == 0x200, "wrong flags %08lx\n", context.EFlags ); + for (i = 0, got32 = got64 = FALSE; i < 10000 && !(got32 && got64); i++) { ResumeThread( pi.hThread ); @@ -4661,21 +4656,23 @@ static void test_wow64_context(void) memset( &ctx, 0x55, sizeof(ctx) ); ctx.ContextFlags = WOW64_CONTEXT_ALL; pRtlWow64GetThreadContext( pi.hThread, &ctx ); - ok( ctx.Ecx == 0x87654321, "cs64: ecx set to %08lx\n", ctx.Ecx ); + todo_wine + ok( ctx.Ecx == 0x87654321, "cs32: ecx set to %08lx\n", ctx.Ecx ); ReadProcessMemory( pi.hProcess, teb.TlsSlots[WOW64_TLS_CPURESERVED], cpu, cpu_size, &res ); - ok( ctx_ptr->Ecx == ecx, "cs64: ecx set to %08lx\n", ctx_ptr->Ecx ); + ok( ctx_ptr->Ecx == ecx, "cs32: ecx set to %08lx\n", ctx_ptr->Ecx ); ctx.Ecx = 0x33334444; pRtlWow64SetThreadContext( pi.hThread, &ctx ); memset( &ctx, 0x55, sizeof(ctx) ); ctx.ContextFlags = WOW64_CONTEXT_ALL; pRtlWow64GetThreadContext( pi.hThread, &ctx ); - ok( ctx.Ecx == 0x33334444, "cs64: ecx set to %08lx\n", ctx.Ecx ); + ok( ctx.Ecx == 0x33334444, "cs32: ecx set to %08lx\n", ctx.Ecx ); ReadProcessMemory( pi.hProcess, teb.TlsSlots[WOW64_TLS_CPURESERVED], cpu, cpu_size, &res ); - ok( ctx_ptr->Ecx == ecx, "cs64: ecx set to %08lx\n", ctx_ptr->Ecx ); + ok( ctx_ptr->Ecx == ecx, "cs32: ecx set to %08lx\n", ctx_ptr->Ecx ); memset( &context, 0x55, sizeof(context) ); context.ContextFlags = CONTEXT_ALL; pNtGetContextThread( pi.hThread, &context ); - ok( context.Rcx == 0x33334444, "cs64: rcx set to %p\n", (void *)context.Rcx ); + todo_wine + ok( context.Rcx == 0x33334444, "cs32: rcx set to %p\n", (void *)context.Rcx ); /* restore everything */ context.Rcx = rcx; pNtSetContextThread( pi.hThread, &context ); @@ -4738,6 +4735,7 @@ static void test_wow64_context(void) pRtlWow64GetThreadContext( pi.hThread, &ctx ); ok( ctx.Ecx == 0x22223333, "cs64: ecx set to %08lx\n", ctx.Ecx ); ReadProcessMemory( pi.hProcess, teb.TlsSlots[WOW64_TLS_CPURESERVED], cpu, cpu_size, &res ); + todo_wine ok( ctx_ptr->Ecx == 0x22223333, "cs64: ecx set to %08lx\n", ctx_ptr->Ecx ); memset( &context, 0x55, sizeof(context) ); context.ContextFlags = CONTEXT_ALL;

1 0

Brendan McGrath : gdi32: Ignore Datatype when StartDoc is called.
by Alexandre Julliard Jan. 23, 2024

Jan. 23, 2024

Module: wine Branch: master Commit: 9b02ac6d42d4aea5300e228c799b329d505088fb URL: https://gitlab.winehq.org/wine/wine/-/commit/9b02ac6d42d4aea5300e228c799b32… Author: Brendan McGrath <bmcgrath(a)codeweavers.com> Date: Thu Jan 18 12:43:28 2024 +1100 gdi32: Ignore Datatype when StartDoc is called. --- dlls/gdi32/dc.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 5f79150cb93..87335469b9b 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -2444,8 +2444,8 @@ INT WINAPI StartDocW( HDC hdc, const DOCINFOW *doc ) info.cbSize = sizeof(info); } - TRACE("DocName %s, Output %s, Datatype %s, fwType %#lx\n", - debugstr_w(info.lpszDocName), debugstr_w(info.lpszOutput), + TRACE("Size: %d, DocName %s, Output %s, Datatype %s, fwType %#lx\n", + info.cbSize, debugstr_w(info.lpszDocName), debugstr_w(info.lpszOutput), debugstr_w(info.lpszDatatype), info.fwType); if (!(dc_attr = get_dc_attr( hdc ))) return SP_ERROR; @@ -2461,22 +2461,22 @@ INT WINAPI StartDocW( HDC hdc, const DOCINFOW *doc ) output = StartDocDlgW( print->printer, &info ); if (output) info.lpszOutput = output; - if (!info.lpszDatatype || !wcsicmp(info.lpszDatatype, L"EMF")) + if (info.lpszDatatype && wcsicmp(info.lpszDatatype, L"EMF")) + FIXME("Ignoring DataType %s and forcing EMF\n", debugstr_w(info.lpszDatatype)); + + spool_info.pDocName = (WCHAR *)info.lpszDocName; + spool_info.pOutputFile = (WCHAR *)info.lpszOutput; + spool_info.pDatatype = (WCHAR *)L"NT EMF 1.003"; + if ((ret = StartDocPrinterW( print->printer, 1, (BYTE *)&spool_info ))) { - spool_info.pDocName = (WCHAR *)info.lpszDocName; - spool_info.pOutputFile = (WCHAR *)info.lpszOutput; - spool_info.pDatatype = (WCHAR *)L"NT EMF 1.003"; - if ((ret = StartDocPrinterW( print->printer, 1, (BYTE *)&spool_info ))) + if (!spool_start_doc( dc_attr, print->printer, &info )) { - if (!spool_start_doc( dc_attr, print->printer, &info )) - { - AbortDoc( hdc ); - ret = 0; - } - HeapFree( GetProcessHeap(), 0, output ); - print->flags |= CALL_START_PAGE; - return ret; + AbortDoc( hdc ); + ret = 0; } + HeapFree( GetProcessHeap(), 0, output ); + print->flags |= CALL_START_PAGE; + return ret; } }

1 0

Martin Storsjö : ntdll: Fix KiUserCallbackDispatcher on arm.
by Alexandre Julliard Jan. 23, 2024

Jan. 23, 2024

Module: wine Branch: master Commit: f6b66e4f87649740f91805f11277fb3c4d172e94 URL: https://gitlab.winehq.org/wine/wine/-/commit/f6b66e4f87649740f91805f11277fb… Author: Martin Storsjö <martin(a)martin.st> Date: Tue Jan 23 15:21:20 2024 +0200 ntdll: Fix KiUserCallbackDispatcher on arm. This was broken in 78c2b7dfe2f2d5d76400564be547fd8287d62d67. Signed-off-by: Martin Storsjö <martin(a)martin.st> --- dlls/ntdll/signal_arm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 78db61fc764..428742b116b 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -592,7 +592,7 @@ __ASM_GLOBAL_FUNC( KiUserCallbackDispatcher, "mrc p15, 0, r3, c13, c0, 2\n\t" /* NtCurrentTeb() */ "ldr r3, [r3, 0x30]\n\t" /* peb */ "ldr r3, [r3, 0x2c]\n\t" /* peb->KernelCallbackTable */ - "ldr ip, [r3, r2, lsl #3]\n\t" + "ldr ip, [r3, r2, lsl #2]\n\t" "blx ip\n\t" ".seh_handler " __ASM_NAME("user_callback_handler") ", %except\n\t" #else

1 0

Rémi Bernon : include: Add more HID digitizer usage definitions.
by Alexandre Julliard Jan. 23, 2024

Jan. 23, 2024

Module: wine Branch: master Commit: aaf34e3f7e34be54e5645de97f8318071a620ded URL: https://gitlab.winehq.org/wine/wine/-/commit/aaf34e3f7e34be54e5645de97f8318… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 31 22:07:02 2022 +0200 include: Add more HID digitizer usage definitions. --- include/hidusage.h | 2 ++ include/wine/hid.h | 12 ++++++++++++ 2 files changed, 14 insertions(+) diff --git a/include/hidusage.h b/include/hidusage.h index 2ea3784d626..58ae5aab3e6 100644 --- a/include/hidusage.h +++ b/include/hidusage.h @@ -31,6 +31,7 @@ typedef USHORT USAGE, *PUSAGE; #define HID_USAGE_DIGITIZER_PEN ((USAGE) 0x02) #define HID_USAGE_DIGITIZER_TOUCH_SCREEN ((USAGE) 0x04) #define HID_USAGE_DIGITIZER_TOUCH_PAD ((USAGE) 0x05) +#define HID_USAGE_DIGITIZER_FINGER ((USAGE) 0x22) #define HID_USAGE_DIGITIZER_TIP_PRESSURE ((USAGE) 0x30) #define HID_USAGE_DIGITIZER_IN_RANGE ((USAGE) 0x32) #define HID_USAGE_DIGITIZER_X_TILT ((USAGE) 0x3D) @@ -38,6 +39,7 @@ typedef USHORT USAGE, *PUSAGE; #define HID_USAGE_DIGITIZER_AZIMUTH ((USAGE) 0x3F) #define HID_USAGE_DIGITIZER_TIP_SWITCH ((USAGE) 0x42) #define HID_USAGE_DIGITIZER_BARREL_SWITCH ((USAGE) 0x44) +#define HID_USAGE_DIGITIZER_CONFIDENCE ((USAGE) 0x47) #define HID_USAGE_GENERIC_POINTER ((USAGE) 0x01) #define HID_USAGE_GENERIC_MOUSE ((USAGE) 0x02) diff --git a/include/wine/hid.h b/include/wine/hid.h index 6a92317551f..8200ca9beec 100644 --- a/include/wine/hid.h +++ b/include/wine/hid.h @@ -117,6 +117,18 @@ struct hid_preparsed_data #define HID_FEATURE_VALUE_CAPS(d) ((d)->value_caps + (d)->feature_caps_start) #define HID_COLLECTION_NODES(d) (struct hid_collection_node *)((char *)(d)->value_caps + (d)->caps_size) + +/* Wine-specific Digitizer page usages, not declared in hidusage.h */ +/* From HID Usage Tables */ +/* https://usb.org/sites/default/files/hut1_22.pdf */ +#define HID_USAGE_DIGITIZER_WIDTH ((USAGE) 0x48) +#define HID_USAGE_DIGITIZER_HEIGHT ((USAGE) 0x49) +#define HID_USAGE_DIGITIZER_CONTACT_ID ((USAGE) 0x51) +#define HID_USAGE_DIGITIZER_CONTACT_COUNT ((USAGE) 0x54) +#define HID_USAGE_DIGITIZER_CONTACT_COUNT_MAX ((USAGE) 0x55) +#define HID_USAGE_DIGITIZER_SCAN_TIME ((USAGE) 0x56) + + /* Wine-specific Physical Interface Device usages */ /* From USB Device Class Definition for Physical Interface Devices */ /* https://www.usb.org/sites/default/files/documents/pid1_01.pdf */

1 0

Rémi Bernon : dinput/tests: Add a test with a virtual HID mouse.
by Alexandre Julliard Jan. 23, 2024

Jan. 23, 2024

Module: wine Branch: master Commit: e2f2f680d464a7d7d48b3c3be1d32e3ea1b2d541 URL: https://gitlab.winehq.org/wine/wine/-/commit/e2f2f680d464a7d7d48b3c3be1d32e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 2 13:30:25 2022 +0200 dinput/tests: Add a test with a virtual HID mouse. --- dlls/dinput/tests/device8.c | 149 ++++++++++++++++++++++++++++++++++++++++ dlls/dinput/tests/dinput_test.h | 4 +- dlls/dinput/tests/hid.c | 6 +- 3 files changed, 155 insertions(+), 4 deletions(-) diff --git a/dlls/dinput/tests/device8.c b/dlls/dinput/tests/device8.c index 7423d6c6ae7..e3cd75f7c08 100644 --- a/dlls/dinput/tests/device8.c +++ b/dlls/dinput/tests/device8.c @@ -1618,6 +1618,149 @@ cleanup: localized = old_localized; } +static UINT mouse_move_count; + +static LRESULT CALLBACK mouse_wndproc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) +{ + if (msg == WM_MOUSEMOVE) + { + ok( wparam == 0, "got wparam %#Ix\n", wparam ); + ok( LOWORD(lparam) - 107 <= 2, "got LOWORD(lparam) %u\n", LOWORD(lparam) ); + ok( HIWORD(lparam) - 107 <= 2, "got HIWORD(lparam) %u\n", HIWORD(lparam) ); + mouse_move_count++; + } + return DefWindowProcA( hwnd, msg, wparam, lparam ); +} + +static void test_hid_mouse(void) +{ +#include "psh_hid_macros.h" + const unsigned char report_desc[] = + { + USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), + USAGE(1, HID_USAGE_GENERIC_MOUSE), + COLLECTION(1, Application), + USAGE(1, HID_USAGE_GENERIC_POINTER), + COLLECTION(1, Physical), + REPORT_ID(1, 1), + + USAGE_PAGE(1, HID_USAGE_PAGE_BUTTON), + USAGE_MINIMUM(1, 1), + USAGE_MAXIMUM(1, 2), + LOGICAL_MINIMUM(1, 0), + LOGICAL_MAXIMUM(1, 1), + REPORT_SIZE(1, 1), + REPORT_COUNT(1, 8), + INPUT(1, Data|Var|Abs), + + USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), + USAGE(1, HID_USAGE_GENERIC_X), + USAGE(1, HID_USAGE_GENERIC_Y), + REPORT_SIZE(1, 16), + REPORT_COUNT(1, 2), + LOGICAL_MINIMUM(2, -10), + LOGICAL_MAXIMUM(2, +10), + INPUT(1, Data|Var|Rel), + END_COLLECTION, + END_COLLECTION, + }; + C_ASSERT(sizeof(report_desc) < MAX_HID_DESCRIPTOR_LEN); +#include "pop_hid_macros.h" + + const HID_DEVICE_ATTRIBUTES attributes = + { + .Size = sizeof(HID_DEVICE_ATTRIBUTES), + .VendorID = LOWORD(EXPECT_VIDPID), + .ProductID = 0x0002, + .VersionNumber = 0x0100, + }; + struct hid_device_desc desc = + { + .caps = { .InputReportByteLength = 6 }, + .attributes = attributes, + .use_report_id = 1, + }; + struct hid_expect single_move[] = + { + { + .code = IOCTL_HID_READ_REPORT, + .report_buf = {1,0x00,0x08,0x00,0x08,0x00}, + }, + }; + + WCHAR device_path[MAX_PATH]; + HANDLE file; + POINT pos; + DWORD res; + HWND hwnd; + BOOL ret; + + winetest_push_context( "mouse "); + + desc.report_descriptor_len = sizeof(report_desc); + memcpy( desc.report_descriptor_buf, report_desc, sizeof(report_desc) ); + fill_context( desc.context, ARRAY_SIZE(desc.context) ); + + if (!hid_device_start_( &desc, 1, 5000 /* needs a long timeout on Win7 */ )) goto done; + + swprintf( device_path, MAX_PATH, L"\\\\?\\hid#vid_%04x&pid_%04x", desc.attributes.VendorID, + desc.attributes.ProductID ); + ret = find_hid_device_path( device_path ); + ok( ret, "Failed to find HID device matching %s\n", debugstr_w( device_path ) ); + + + /* windows doesn't let us open HID mouse devices */ + + file = CreateFileW( device_path, FILE_READ_ACCESS | FILE_WRITE_ACCESS, + FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL ); + todo_wine + ok( file == INVALID_HANDLE_VALUE, "CreateFileW succeeded\n" ); + todo_wine + ok( GetLastError() == ERROR_ACCESS_DENIED, "got error %lu\n", GetLastError() ); + CloseHandle( file ); + + file = CreateFileW( L"\\\\?\\root#winetest#0#{deadbeef-29ef-4538-a5fd-b69573a362c0}", 0, 0, + NULL, OPEN_EXISTING, 0, NULL ); + ok( file != INVALID_HANDLE_VALUE, "CreateFile failed, error %lu\n", GetLastError() ); + + + /* check basic mouse input injection to window message */ + + SetCursorPos( 100, 100 ); + hwnd = create_foreground_window( TRUE ); + SetWindowLongPtrW( hwnd, GWLP_WNDPROC, (LONG_PTR)mouse_wndproc ); + + GetCursorPos( &pos ); + ok( pos.x == 100, "got x %lu\n", pos.x ); + ok( pos.y == 100, "got y %lu\n", pos.y ); + + mouse_move_count = 0; + bus_send_hid_input( file, &desc, single_move, sizeof(single_move) ); + + res = MsgWaitForMultipleObjects( 0, NULL, FALSE, 500, QS_MOUSEMOVE ); + todo_wine + ok( !res, "MsgWaitForMultipleObjects returned %#lx\n", res ); + msg_wait_for_events( 0, NULL, 5 ); /* process pending messages */ + todo_wine + ok( mouse_move_count == 1, "got mouse_move_count %u\n", mouse_move_count ); + + GetCursorPos( &pos ); + todo_wine + ok( (ULONG)pos.x - 107 <= 2, "got x %lu\n", pos.x ); + todo_wine + ok( (ULONG)pos.y - 107 <= 2, "got y %lu\n", pos.y ); + + DestroyWindow( hwnd ); + + + CloseHandle( file ); + +done: + hid_device_stop( &desc, 1 ); + + winetest_pop_context(); +} + static void test_dik_codes( IDirectInputDevice8W *device, HANDLE event, HWND hwnd, DWORD version ) { static const struct key2dik @@ -2371,5 +2514,11 @@ START_TEST(device8) test_keyboard_events(); test_appdata_property(); + if (!bus_device_start()) goto done; + + test_hid_mouse(); + +done: + bus_device_stop(); dinput_test_exit(); } diff --git a/dlls/dinput/tests/dinput_test.h b/dlls/dinput/tests/dinput_test.h index b53978bbe97..e13ba2421d2 100644 --- a/dlls/dinput/tests/dinput_test.h +++ b/dlls/dinput/tests/dinput_test.h @@ -51,11 +51,13 @@ extern const WCHAR expect_path_end[]; extern HINSTANCE instance; extern BOOL localized; /* object names get translated */ -BOOL hid_device_start( struct hid_device_desc *desc, UINT count ); +#define hid_device_start( a, b ) hid_device_start_( a, b, 1000 ) +BOOL hid_device_start_( struct hid_device_desc *desc, UINT count, DWORD timeout ); void hid_device_stop( struct hid_device_desc *desc, UINT count ); BOOL bus_device_start(void); void bus_device_stop(void); +BOOL find_hid_device_path( WCHAR *device_path ); void cleanup_registry_keys(void); #define dinput_test_init() dinput_test_init_( __FILE__, __LINE__ ) diff --git a/dlls/dinput/tests/hid.c b/dlls/dinput/tests/hid.c index 0a28fda6f99..e5f6ea4640d 100644 --- a/dlls/dinput/tests/hid.c +++ b/dlls/dinput/tests/hid.c @@ -553,7 +553,7 @@ void bus_device_stop(void) ok( ret || GetLastError() == ERROR_FILE_NOT_FOUND, "Failed to delete file, error %lu\n", GetLastError() ); } -static BOOL find_hid_device_path( WCHAR *device_path ) +BOOL find_hid_device_path( WCHAR *device_path ) { char buffer[FIELD_OFFSET( SP_DEVICE_INTERFACE_DETAIL_DATA_W, DevicePath[MAX_PATH] )] = {0}; SP_DEVICE_INTERFACE_DATA iface = {sizeof(SP_DEVICE_INTERFACE_DATA)}; @@ -735,7 +735,7 @@ void hid_device_stop( struct hid_device_desc *desc, UINT count ) } } -BOOL hid_device_start( struct hid_device_desc *desc, UINT count ) +BOOL hid_device_start_( struct hid_device_desc *desc, UINT count, DWORD timeout ) { HANDLE control; DWORD ret, i; @@ -754,7 +754,7 @@ BOOL hid_device_start( struct hid_device_desc *desc, UINT count ) for (i = 0; i < count; ++i) { - ret = WaitForSingleObject( device_added, 1000 ); + ret = WaitForSingleObject( device_added, timeout ); todo_wine_if(i > 0) ok( !ret, "WaitForSingleObject returned %#lx\n", ret ); }

1 0

Rémi Bernon : dinput/tests: Enforce ordering of concurrent read IRPs.
by Alexandre Julliard Jan. 23, 2024

Jan. 23, 2024

Module: wine Branch: master Commit: 3e79b8d6ebdb3372749aed67e5ee19eb5fd40586 URL: https://gitlab.winehq.org/wine/wine/-/commit/3e79b8d6ebdb3372749aed67e5ee19… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Jan 20 22:01:11 2024 +0100 dinput/tests: Enforce ordering of concurrent read IRPs. --- dlls/dinput/tests/driver_bus.c | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/dlls/dinput/tests/driver_bus.c b/dlls/dinput/tests/driver_bus.c index c0d181c58a5..e0943c35294 100644 --- a/dlls/dinput/tests/driver_bus.c +++ b/dlls/dinput/tests/driver_bus.c @@ -348,13 +348,13 @@ static void irp_queue_push( struct irp_queue *queue, IRP *irp ) KeReleaseSpinLock( &queue->lock, irql ); } -static void irp_queue_clear( struct irp_queue *queue ) +static void irp_queue_complete( struct irp_queue *queue, BOOL delete ) { IRP *irp; while ((irp = irp_queue_pop( queue ))) { - irp->IoStatus.Status = STATUS_DELETE_PENDING; + if (delete) irp->IoStatus.Status = STATUS_DELETE_PENDING; IoCompleteRequest( irp, IO_NO_INCREMENT ); } } @@ -373,6 +373,7 @@ struct input_queue struct hid_expect *end; struct hid_expect *buffer; struct irp_queue pending; + struct irp_queue completed; }; static void input_queue_init( struct input_queue *queue, BOOL is_polled ) @@ -384,6 +385,7 @@ static void input_queue_init( struct input_queue *queue, BOOL is_polled ) queue->pos = queue->buffer; queue->end = queue->buffer; irp_queue_init( &queue->pending ); + irp_queue_init( &queue->completed ); } static void input_queue_cleanup( struct input_queue *queue ) @@ -416,7 +418,11 @@ static NTSTATUS input_queue_read( struct input_queue *queue, IRP *irp ) KIRQL irql; KeAcquireSpinLock( &queue->lock, &irql ); - if (input_queue_read_locked( queue, irp )) status = STATUS_SUCCESS; + if (input_queue_read_locked( queue, irp )) + { + irp_queue_push( &queue->completed, irp ); + status = STATUS_SUCCESS; + } else { IoMarkIrpPending( irp ); @@ -430,13 +436,10 @@ static NTSTATUS input_queue_read( struct input_queue *queue, IRP *irp ) static void input_queue_reset( struct input_queue *queue, void *in_buf, ULONG in_size ) { - struct irp_queue completed; ULONG remaining; KIRQL irql; IRP *irp; - irp_queue_init( &completed ); - KeAcquireSpinLock( &queue->lock, &irql ); remaining = queue->end - queue->pos; queue->pos = queue->buffer; @@ -447,13 +450,13 @@ static void input_queue_reset( struct input_queue *queue, void *in_buf, ULONG in while (!queue->is_polled && queue->pos < queue->end && (irp = irp_queue_pop( &queue->pending ))) { input_queue_read_locked( queue, irp ); - irp_queue_push( &completed, irp ); + irp_queue_push( &queue->completed, irp ); } KeReleaseSpinLock( &queue->lock, irql ); if (!queue->is_polled) ok( !remaining, "unread input\n" ); - while ((irp = irp_queue_pop( &completed ))) IoCompleteRequest( irp, IO_NO_INCREMENT ); + irp_queue_complete( &queue->completed, FALSE ); } struct device @@ -721,7 +724,8 @@ static NTSTATUS pdo_pnp( DEVICE_OBJECT *device, IRP *irp ) state = (code == IRP_MN_START_DEVICE || code == IRP_MN_CANCEL_REMOVE_DEVICE) ? 0 : PNP_DEVICE_REMOVED; KeAcquireSpinLock( &impl->base.lock, &irql ); impl->base.state = state; - irp_queue_clear( &impl->input_queue.pending ); + irp_queue_complete( &impl->input_queue.pending, TRUE ); + irp_queue_complete( &impl->input_queue.completed, TRUE ); KeReleaseSpinLock( &impl->base.lock, irql ); if (code != IRP_MN_REMOVE_DEVICE) status = STATUS_SUCCESS; else @@ -1087,7 +1091,10 @@ static NTSTATUS pdo_internal_ioctl( DEVICE_OBJECT *device, IRP *irp ) ok( !in_size, "got input size %lu\n", in_size ); ok( out_size == expected_size, "got output size %lu\n", out_size ); status = input_queue_read( &impl->input_queue, irp ); - break; + irp_queue_complete( &impl->input_queue.completed, FALSE ); + + winetest_pop_context(); + return status; } case IOCTL_HID_WRITE_REPORT: @@ -1277,7 +1284,8 @@ static NTSTATUS pdo_handle_ioctl( struct phys_device *impl, IRP *irp, ULONG code case IOCTL_WINETEST_REMOVE_DEVICE: KeAcquireSpinLock( &impl->base.lock, &irql ); impl->base.state = PNP_DEVICE_REMOVED; - irp_queue_clear( &impl->input_queue.pending ); + irp_queue_complete( &impl->input_queue.pending, TRUE ); + irp_queue_complete( &impl->input_queue.completed, TRUE ); KeReleaseSpinLock( &impl->base.lock, irql ); impl->pending_remove = irp; IoMarkIrpPending( irp );

1 0

Rémi Bernon : dinput/tests: Introduce a new helper to create a foreground window.
by Alexandre Julliard Jan. 23, 2024

Jan. 23, 2024

Module: wine Branch: master Commit: e2dffb8eb0b68cbd2115d67f970fe38f6fb698eb URL: https://gitlab.winehq.org/wine/wine/-/commit/e2dffb8eb0b68cbd2115d67f970fe3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Jan 20 19:05:18 2024 +0100 dinput/tests: Introduce a new helper to create a foreground window. --- dlls/dinput/tests/device8.c | 65 +++++++++++++++++++++++++------------- dlls/dinput/tests/dinput_test.h | 3 ++ dlls/dinput/tests/force_feedback.c | 6 ++-- dlls/dinput/tests/joystick8.c | 18 ++--------- 4 files changed, 51 insertions(+), 41 deletions(-)

1 0

Hans Leidekker : dssenh: Finalize the hash if necessary in CPVerifySignature().
by Alexandre Julliard Jan. 23, 2024

Jan. 23, 2024

Module: wine Branch: master Commit: 1d0551ca49fdff68364f7cac42415cea0f586b16 URL: https://gitlab.winehq.org/wine/wine/-/commit/1d0551ca49fdff68364f7cac42415c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 12 13:14:08 2023 +0100 dssenh: Finalize the hash if necessary in CPVerifySignature(). --- dlls/dssenh/main.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/dssenh/main.c b/dlls/dssenh/main.c index 6772d062fc5..365b365f53f 100644 --- a/dlls/dssenh/main.c +++ b/dlls/dssenh/main.c @@ -1012,5 +1012,11 @@ BOOL WINAPI CPVerifySignature( HCRYPTPROV hprov, HCRYPTHASH hhash, const BYTE *s return FALSE; } + if (!hash->finished) + { + if (BCryptFinishHash( hash->handle, hash->value, hash->len, 0 )) return FALSE; + hash->finished = TRUE; + } + return !BCryptVerifySignature( key->handle, NULL, hash->value, hash->len, (UCHAR *)sig, siglen, 0 ); }

1 0