December 2021 - Wine-commits

Alexandre Julliard : wow64cpu: Implement BTCpuResetToConsistentState().
by Alexandre Julliard 01 Dec '21

01 Dec '21

Module: wine Branch: master Commit: 3af860743045eb8208619ab8e9874d172d86a208 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3af860743045eb8208619ab8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 1 11:23:14 2021 +0100 wow64cpu: Implement BTCpuResetToConsistentState(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64cpu/cpu.c | 76 ++++++++++++++++++++++++++++++++++++++++++++- dlls/wow64cpu/wow64cpu.spec | 2 +- 2 files changed, 76 insertions(+), 2 deletions(-) diff --git a/dlls/wow64cpu/cpu.c b/dlls/wow64cpu/cpu.c index da6fa42894c..3da5b78f55a 100644 --- a/dlls/wow64cpu/cpu.c +++ b/dlls/wow64cpu/cpu.c @@ -41,6 +41,9 @@ struct thunk_32to64 static BYTE DECLSPEC_ALIGN(4096) code_buffer[0x1000]; +static USHORT cs64_sel; +static USHORT ds64_sel; +static USHORT fs32_sel; BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, void *reserved ) { @@ -48,6 +51,53 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, void *reserved ) return TRUE; } +/********************************************************************** + * copy_context_64to32 + * + * Copy a 64-bit context corresponding to an exception happening in 32-bit mode + * into the corresponding 32-bit context. + */ +static void copy_context_64to32( I386_CONTEXT *ctx32, DWORD flags, AMD64_CONTEXT *ctx64 ) +{ + ctx32->ContextFlags = flags; + flags &= ~CONTEXT_i386; + if (flags & CONTEXT_I386_INTEGER) + { + ctx32->Eax = ctx64->Rax; + ctx32->Ebx = ctx64->Rbx; + ctx32->Ecx = ctx64->Rcx; + ctx32->Edx = ctx64->Rdx; + ctx32->Esi = ctx64->Rsi; + ctx32->Edi = ctx64->Rdi; + } + if (flags & CONTEXT_I386_CONTROL) + { + ctx32->Esp = ctx64->Rsp; + ctx32->Ebp = ctx64->Rbp; + ctx32->Eip = ctx64->Rip; + ctx32->EFlags = ctx64->EFlags; + ctx32->SegCs = ctx64->SegCs; + ctx32->SegSs = ds64_sel; + } + if (flags & CONTEXT_I386_SEGMENTS) + { + ctx32->SegDs = ds64_sel; + ctx32->SegEs = ds64_sel; + ctx32->SegFs = fs32_sel; + ctx32->SegGs = ds64_sel; + } + if (flags & CONTEXT_I386_DEBUG_REGISTERS) + { + ctx32->Dr0 = ctx64->Dr0; + ctx32->Dr1 = ctx64->Dr1; + ctx32->Dr2 = ctx64->Dr2; + ctx32->Dr3 = ctx64->Dr3; + ctx32->Dr6 = ctx64->Dr6; + ctx32->Dr7 = ctx64->Dr7; + } + /* FIXME: floating point + xstate */ +} + /********************************************************************** * syscall_32to64 @@ -141,9 +191,13 @@ NTSTATUS WINAPI BTCpuProcessInit(void) } RtlCaptureContext( &context ); + cs64_sel = context.SegCs; + ds64_sel = context.SegDs; + fs32_sel = context.SegFs; + thunk->ljmp = 0xea; thunk->addr = PtrToUlong( syscall_32to64 ); - thunk->cs = context.SegCs; + thunk->cs = cs64_sel; NtProtectVirtualMemory( GetCurrentProcess(), (void **)&thunk, &size, PAGE_EXECUTE_READ, &old_prot ); return STATUS_SUCCESS; } @@ -174,3 +228,23 @@ NTSTATUS WINAPI BTCpuSetContext( HANDLE thread, HANDLE process, void *unknown, I { return NtSetInformationThread( thread, ThreadWow64Context, ctx, sizeof(*ctx) ); } + + +/********************************************************************** + * BTCpuResetToConsistentState (wow64cpu.@) + */ +NTSTATUS WINAPI BTCpuResetToConsistentState( EXCEPTION_POINTERS *ptrs ) +{ + CONTEXT *context = ptrs->ContextRecord; + I386_CONTEXT wow_context; + + copy_context_64to32( &wow_context, CONTEXT_I386_ALL, context ); + wow_context.EFlags &= ~(0x100|0x40000); + BTCpuSetContext( GetCurrentThread(), GetCurrentProcess(), NULL, &wow_context ); + + /* fixup context to pretend that we jumped to 64-bit mode */ + context->Rip = (ULONG64)syscall_32to64; + context->SegCs = cs64_sel; + context->Rsp = context->R14; + return STATUS_SUCCESS; +} diff --git a/dlls/wow64cpu/wow64cpu.spec b/dlls/wow64cpu/wow64cpu.spec index b86481563f2..d6c5a0bfee3 100644 --- a/dlls/wow64cpu/wow64cpu.spec +++ b/dlls/wow64cpu/wow64cpu.spec @@ -1,7 +1,7 @@ @ stdcall BTCpuGetBopCode() @ stdcall BTCpuGetContext(long long ptr ptr) @ stdcall BTCpuProcessInit() -#@ stub BTCpuResetToConsistentState +@ stdcall BTCpuResetToConsistentState(ptr) @ stdcall BTCpuSetContext(long long ptr ptr) @ stdcall BTCpuSimulate() #@ stub BTCpuTurboThunkControl

1 0

Alexandre Julliard : wow64cpu: Add a stub for BTCpuTurboThunkControl().
by Alexandre Julliard 01 Dec '21

01 Dec '21

Module: wine Branch: master Commit: 8390af0afe7e63f12e1010fc6edbbf779aa51503 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8390af0afe7e63f12e1010fc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 1 11:35:51 2021 +0100 wow64cpu: Add a stub for BTCpuTurboThunkControl(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64cpu/cpu.c | 11 +++++++++++ dlls/wow64cpu/wow64cpu.spec | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/wow64cpu/cpu.c b/dlls/wow64cpu/cpu.c index 3da5b78f55a..a029b251be0 100644 --- a/dlls/wow64cpu/cpu.c +++ b/dlls/wow64cpu/cpu.c @@ -248,3 +248,14 @@ NTSTATUS WINAPI BTCpuResetToConsistentState( EXCEPTION_POINTERS *ptrs ) context->Rsp = context->R14; return STATUS_SUCCESS; } + + +/********************************************************************** + * BTCpuTurboThunkControl (wow64cpu.@) + */ +NTSTATUS WINAPI BTCpuTurboThunkControl( ULONG enable ) +{ + if (enable) return STATUS_NOT_SUPPORTED; + /* we don't have turbo thunks yet */ + return STATUS_SUCCESS; +} diff --git a/dlls/wow64cpu/wow64cpu.spec b/dlls/wow64cpu/wow64cpu.spec index d6c5a0bfee3..0a9e5b16dc8 100644 --- a/dlls/wow64cpu/wow64cpu.spec +++ b/dlls/wow64cpu/wow64cpu.spec @@ -4,6 +4,6 @@ @ stdcall BTCpuResetToConsistentState(ptr) @ stdcall BTCpuSetContext(long long ptr ptr) @ stdcall BTCpuSimulate() -#@ stub BTCpuTurboThunkControl +@ stdcall BTCpuTurboThunkControl(long) #@ stub TurboDispatchJumpAddressEnd #@ stub TurboDispatchJumpAddressStart

1 0

Alexandre Julliard : wow64: Implement Wow64PrepareForException().
by Alexandre Julliard 01 Dec '21

01 Dec '21

Module: wine Branch: master Commit: 971480aaccc3d96bd471f50b23479c6acdf7fe2f URL: https://source.winehq.org/git/wine.git/?a=commit;h=971480aaccc3d96bd471f50b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 1 11:25:00 2021 +0100 wow64: Implement Wow64PrepareForException(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/syscall.c | 13 +++++++++++++ dlls/wow64/wow64.spec | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index 952b862a37d..74fc8d9905e 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -79,6 +79,7 @@ static const SYSTEM_SERVICE_TABLE *psdwhwin32; static void * (WINAPI *pBTCpuGetBopCode)(void); static void (WINAPI *pBTCpuProcessInit)(void); static void (WINAPI *pBTCpuSimulate)(void); +static NTSTATUS (WINAPI *pBTCpuResetToConsistentState)( EXCEPTION_POINTERS * ); void *dummy = RtlUnwind; @@ -534,6 +535,7 @@ static DWORD WINAPI process_init( RTL_RUN_ONCE *once, void *param, void **contex module = load_64bit_module( get_cpu_dll_name() ); GET_PTR( BTCpuGetBopCode ); GET_PTR( BTCpuProcessInit ); + GET_PTR( BTCpuResetToConsistentState ); GET_PTR( BTCpuSimulate ); module = load_64bit_module( L"wow64win.dll" ); @@ -769,3 +771,14 @@ void WINAPI Wow64LdrpInitialize( CONTEXT *context ) thread_init(); pBTCpuSimulate(); } + + +/********************************************************************** + * Wow64PrepareForException (wow64.@) + */ +void WINAPI Wow64PrepareForException( EXCEPTION_RECORD *rec, CONTEXT *context ) +{ + EXCEPTION_POINTERS ptrs = { rec, context }; + + pBTCpuResetToConsistentState( &ptrs ); +} diff --git a/dlls/wow64/wow64.spec b/dlls/wow64/wow64.spec index 69275b2580f..5c3f39c50f1 100644 --- a/dlls/wow64/wow64.spec +++ b/dlls/wow64/wow64.spec @@ -15,7 +15,7 @@ @ stub Wow64NotifyUnsimulateComplete @ stdcall Wow64PassExceptionToGuest(ptr) @ stub Wow64PrepareForDebuggerAttach -@ stub Wow64PrepareForException +@ stdcall Wow64PrepareForException(ptr ptr) @ stub Wow64RaiseException @ stub Wow64ShallowThunkAllocObjectAttributes32TO64_FNC @ stub Wow64ShallowThunkAllocSecurityQualityOfService32TO64_FNC

1 0

Alexandre Julliard : ntdll: Add support for dispatching exception from 32-bit code in Wow64 mode.
by Alexandre Julliard 01 Dec '21

01 Dec '21

Module: wine Branch: master Commit: e5e857c290352f41ce48935c3925aba68e87e873 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5e857c290352f41ce48935c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 1 11:27:51 2021 +0100 ntdll: Add support for dispatching exception from 32-bit code in Wow64 mode. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 3 +++ dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/signal_x86_64.c | 25 ++++++++++++++++++++++++- dlls/ntdll/unix/signal_x86_64.c | 1 + 4 files changed, 29 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 3cc522af4d8..86aec79dbfc 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3855,6 +3855,8 @@ static void load_global_options(void) static void (WINAPI *pWow64LdrpInitialize)( CONTEXT *ctx ); +void (WINAPI *pWow64PrepareForException)( EXCEPTION_RECORD *rec, CONTEXT *context ) = NULL; + static void init_wow64( CONTEXT *context ) { if (!imports_fixup_done) @@ -3874,6 +3876,7 @@ static void init_wow64( CONTEXT *context ) if (!(p ## name = RtlFindExportedRoutineByName( wow64, #name ))) ERR( "failed to load %s\n", #name ) GET_PTR( Wow64LdrpInitialize ); + GET_PTR( Wow64PrepareForException ); #undef GET_PTR imports_fixup_done = TRUE; } diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 34af6b780cf..d7c5ade5bc1 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -52,6 +52,7 @@ extern void WINAPI LdrInitializeThunk(CONTEXT*,ULONG_PTR,ULONG_PTR,ULONG_PTR) DE extern NTSTATUS WINAPI KiUserExceptionDispatcher(EXCEPTION_RECORD*,CONTEXT*) DECLSPEC_HIDDEN; extern void WINAPI KiUserApcDispatcher(CONTEXT*,ULONG_PTR,ULONG_PTR,ULONG_PTR,PNTAPCFUNC) DECLSPEC_HIDDEN; extern void WINAPI KiUserCallbackDispatcher(ULONG,void*,ULONG) DECLSPEC_HIDDEN; +extern void (WINAPI *pWow64PrepareForException)( EXCEPTION_RECORD *rec, CONTEXT *context ) DECLSPEC_HIDDEN; #if defined(__x86_64__) || defined(__arm__) || defined(__aarch64__) extern RUNTIME_FUNCTION *lookup_function_info( ULONG_PTR pc, ULONG_PTR *base, LDR_DATA_TABLE_ENTRY **module ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index ef32eba68b7..e0372b111fd 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -566,12 +566,35 @@ NTSTATUS WINAPI dispatch_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) } +NTSTATUS WINAPI dispatch_wow_exception( EXCEPTION_RECORD *rec_ptr, CONTEXT *context_ptr ) +{ + char buffer[sizeof(CONTEXT) + sizeof(CONTEXT_EX) + sizeof(XSTATE) + 128]; + CONTEXT *context; + CONTEXT_EX *context_ex; + EXCEPTION_RECORD rec = *rec_ptr; + + RtlInitializeExtendedContext( buffer, context_ptr->ContextFlags, &context_ex ); + context = RtlLocateLegacyContext( context_ex, NULL ); + RtlCopyContext( context, context_ptr->ContextFlags, context_ptr ); + pWow64PrepareForException( &rec, context ); + return dispatch_exception( &rec, context ); +} + + /******************************************************************* * KiUserExceptionDispatcher (NTDLL.@) */ __ASM_GLOBAL_FUNC( KiUserExceptionDispatcher, "mov 0x98(%rsp),%rcx\n\t" /* context->Rsp */ - "mov 0xf8(%rsp),%rdx\n\t" /* context->Rip */ + "movw %cs,%ax\n\t" + "cmpw %ax,0x38(%rsp)\n\t" /* context->SegCs */ + "je 1f\n\t" + "mov %rsp,%rdx\n\t" /* context */ + "lea 0x4f0(%rsp),%rcx\n\t" /* rec */ + "movq %r14,%rsp\n\t" /* switch to 64-bit stack */ + "call " __ASM_NAME("dispatch_wow_exception") "\n\t" + "int3\n" + "1:\tmov 0xf8(%rsp),%rdx\n\t" /* context->Rip */ "mov %rdx,-0x8(%rcx)\n\t" "mov %rbp,-0x10(%rcx)\n\t" "mov %rdi,-0x18(%rcx)\n\t" diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 0085bd42410..9972faf799c 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -2171,6 +2171,7 @@ static void setup_raise_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec } } + CS_sig(sigcontext) = cs64_sel; RIP_sig(sigcontext) = (ULONG_PTR)pKiUserExceptionDispatcher; RSP_sig(sigcontext) = (ULONG_PTR)stack; /* clear single-step, direction, and align check flag */

1 0

Alexandre Julliard : ntdll: Don't clear x86-64 registers when receiving a 32-bit context.
by Alexandre Julliard 01 Dec '21

01 Dec '21

Module: wine Branch: master Commit: 47f59be21f4601a5e5014df073d076f76251e59d URL: https://source.winehq.org/git/wine.git/?a=commit;h=47f59be21f4601a5e5014df0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 1 12:06:29 2021 +0100 ntdll: Don't clear x86-64 registers when receiving a 32-bit context. They can still be valid if running in Wow64 mode. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/thread.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 7a32f36920f..57d355e96d2 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -850,14 +850,6 @@ static NTSTATUS context_from_server( void *dst, const context_t *from, USHORT ma to->Rbx = from->integer.i386_regs.ebx; to->Rsi = from->integer.i386_regs.esi; to->Rdi = from->integer.i386_regs.edi; - to->R8 = 0; - to->R9 = 0; - to->R10 = 0; - to->R11 = 0; - to->R12 = 0; - to->R13 = 0; - to->R14 = 0; - to->R15 = 0; } if ((from->flags & SERVER_CTX_SEGMENTS) && (to_flags & CONTEXT_AMD64_SEGMENTS)) {

1 0

Alexandre Julliard : wow64: Add handler for exceptions happening in 32-bit mode.
by Alexandre Julliard 01 Dec '21

01 Dec '21

Module: wine Branch: master Commit: 111398c364c2639432981c32e7af4e39888f2090 URL: https://source.winehq.org/git/wine.git/?a=commit;h=111398c364c2639432981c32… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 1 11:47:03 2021 +0100 wow64: Add handler for exceptions happening in 32-bit mode. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/syscall.c | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index 74fc8d9905e..bee186456cc 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -670,6 +670,39 @@ NTSTATUS WINAPI Wow64SystemServiceEx( UINT num, UINT *args ) } +static void cpu_simulate(void); + +/********************************************************************** + * simulate_filter + */ +static LONG CALLBACK simulate_filter( EXCEPTION_POINTERS *ptrs ) +{ + Wow64PassExceptionToGuest( ptrs ); + cpu_simulate(); /* re-enter simulation to run the exception dispatcher */ + return EXCEPTION_EXECUTE_HANDLER; +} + + +/********************************************************************** + * cpu_simulate + */ +static void cpu_simulate(void) +{ + for (;;) + { + __TRY + { + pBTCpuSimulate(); + } + __EXCEPT( simulate_filter ) + { + /* restart simulation loop */ + } + __ENDTRY + } +} + + /********************************************************************** * Wow64AllocateTemp (wow64.@) * @@ -769,7 +802,7 @@ void WINAPI Wow64LdrpInitialize( CONTEXT *context ) RtlRunOnceExecuteOnce( &init_done, process_init, NULL, NULL ); thread_init(); - pBTCpuSimulate(); + cpu_simulate(); }

1 0

Paul Gofman : ntdll/tests: Fix iret to invalid selector test on x64.
by Alexandre Julliard 01 Dec '21

01 Dec '21

Module: wine Branch: master Commit: 4094767634a29d1c1e392afe923a952d4ceb857d URL: https://source.winehq.org/git/wine.git/?a=commit;h=4094767634a29d1c1e392afe… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Dec 1 13:53:01 2021 +0300 ntdll/tests: Fix iret to invalid selector test on x64. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index a41cc82905c..5ebb6f25f8b 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -2832,8 +2832,8 @@ static const struct exception 0, 1, STATUS_PRIVILEGED_INSTRUCTION, 0 }, /* test iret to invalid selector */ - { { 0x6a, 0x00, 0x6a, 0x00, 0x6a, 0x00, 0xcf, 0x83, 0xc4, 0x18, 0xc3 }, - /* 15: pushq $0; pushq $0; pushq $0; iret; addl $24,%esp; ret */ + { { 0x6a, 0x00, 0x6a, 0x00, 0x6a, 0x00, 0xcf, 0x48, 0x83, 0xc4, 0x18, 0xc3 }, + /* 15: pushq $0; pushq $0; pushq $0; iret; addq $24,%rsp; ret */ 6, 1, STATUS_ACCESS_VIOLATION, 2, { 0, 0xffffffffffffffff } }, /* 15 */ /* test loading an invalid selector */

1 0

Rémi Bernon : dinput8/tests: Provide an explicit test context to the driver.
by Alexandre Julliard 01 Dec '21

01 Dec '21

Module: wine Branch: master Commit: fa08cadc26d2b57f9c6fb12965135cea08dd2d82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa08cadc26d2b57f9c6fb129… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Dec 1 12:44:52 2021 +0100 dinput8/tests: Provide an explicit test context to the driver. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/driver_hid.c | 51 +++++++++++++++++++--------- dlls/dinput8/tests/driver_hid.h | 2 +- dlls/dinput8/tests/hid.c | 73 ++++++++++++++++++++++++----------------- 3 files changed, 80 insertions(+), 46 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fa08cadc26d2b57f9c6f…

1 0

Rémi Bernon : dinput8/tests: Add a check_buffer helper to print buffer data.
by Alexandre Julliard 01 Dec '21

01 Dec '21

Module: wine Branch: master Commit: 9d10c55b946b99636237b36cef4d09fc532c66e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d10c55b946b99636237b36c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Dec 1 12:44:53 2021 +0100 dinput8/tests: Add a check_buffer helper to print buffer data. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/driver_hid.c | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/dlls/dinput8/tests/driver_hid.c b/dlls/dinput8/tests/driver_hid.c index 9a58b1c7d44..545dff0c2dc 100644 --- a/dlls/dinput8/tests/driver_hid.c +++ b/dlls/dinput8/tests/driver_hid.c @@ -467,6 +467,25 @@ static NTSTATUS WINAPI driver_power( DEVICE_OBJECT *device, IRP *irp ) return PoCallDriver( ext->NextDeviceObject, irp ); } +#define check_buffer( a, b ) check_buffer_( __LINE__, a, b ) +static void check_buffer_( int line, HID_XFER_PACKET *packet, struct hid_expect *expect ) +{ + ULONG match_len, i; + + match_len = RtlCompareMemory( packet->reportBuffer, expect->report_buf, expect->report_len ); + ok( match_len == expect->report_len, "unexpected data:\n" ); + if (match_len == expect->report_len) return; + + for (i = 0; i < packet->reportBufferLen;) + { + char buffer[256], *buf = buffer; + buf += sprintf( buf, "%08x ", i ); + do buf += sprintf( buf, " %02x", packet->reportBuffer[i] ); + while (++i % 16 && i < packet->reportBufferLen); + ok( 0, " %s\n", buffer ); + } +} + static NTSTATUS WINAPI driver_internal_ioctl( DEVICE_OBJECT *device, IRP *irp ) { IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation( irp ); @@ -574,8 +593,7 @@ static NTSTATUS WINAPI driver_internal_ioctl( DEVICE_OBJECT *device, IRP *irp ) ok( code == expect.code, "got %#x, expected %#x\n", code, expect.code ); ok( packet->reportId == expect.report_id, "got id %u\n", packet->reportId ); ok( packet->reportBufferLen == expect.report_len, "got len %u\n", packet->reportBufferLen ); - ok( RtlCompareMemory( packet->reportBuffer, expect.report_buf, expect.report_len ) == expect.report_len, - "unexpected data\n" ); + check_buffer( packet, &expect ); winetest_pop_context(); irp->IoStatus.Information = expect.ret_length ? expect.ret_length : expect.report_len; @@ -621,8 +639,7 @@ static NTSTATUS WINAPI driver_internal_ioctl( DEVICE_OBJECT *device, IRP *irp ) ok( code == expect.code, "got %#x, expected %#x\n", code, expect.code ); ok( packet->reportId == expect.report_id, "got id %u\n", packet->reportId ); ok( packet->reportBufferLen == expect.report_len, "got len %u\n", packet->reportBufferLen ); - ok( RtlCompareMemory( packet->reportBuffer, expect.report_buf, expect.report_len ) == expect.report_len, - "unexpected data\n" ); + check_buffer( packet, &expect ); winetest_pop_context(); irp->IoStatus.Information = expect.ret_length ? expect.ret_length : expect.report_len; @@ -668,8 +685,7 @@ static NTSTATUS WINAPI driver_internal_ioctl( DEVICE_OBJECT *device, IRP *irp ) ok( code == expect.code, "got %#x, expected %#x\n", code, expect.code ); ok( packet->reportId == expect.report_id, "got id %u\n", packet->reportId ); ok( packet->reportBufferLen == expect.report_len, "got len %u\n", packet->reportBufferLen ); - ok( RtlCompareMemory( packet->reportBuffer, expect.report_buf, expect.report_len ) == expect.report_len, - "unexpected data\n" ); + check_buffer( packet, &expect ); winetest_pop_context(); irp->IoStatus.Information = expect.ret_length ? expect.ret_length : expect.report_len;

1 0