February 2021 - Wine-commits

Alexandre Julliard : server: Use TEB->ArbitraryUserPointer to store the loaded dll names.
by Alexandre Julliard 11 Feb '21

11 Feb '21

Module: wine Branch: master Commit: 4f2ed66a5ff55a98b3f9ed05c4f15b64dd96d558 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f2ed66a5ff55a98b3f9ed05… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 11 11:37:00 2021 +0100 server: Use TEB->ArbitraryUserPointer to store the loaded dll names. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 5 +++++ server/debugger.c | 9 ++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 40efd46d3c7..378b812868c 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2641,6 +2641,7 @@ static NTSTATUS load_dll( const WCHAR *load_path, const WCHAR *libname, const WC HANDLE mapping = 0; SECTION_IMAGE_INFORMATION image_info; NTSTATUS nts; + void *prev; TRACE( "looking for %s in %s\n", debugstr_w(libname), debugstr_w(load_path) ); @@ -2662,6 +2663,9 @@ static NTSTATUS load_dll( const WCHAR *load_path, const WCHAR *libname, const WC main_exe = get_modref( NtCurrentTeb()->Peb->ImageBaseAddress ); loadorder = get_load_order( main_exe ? main_exe->ldr.BaseDllName.Buffer : NULL, &nt_name ); + prev = NtCurrentTeb()->Tib.ArbitraryUserPointer; + NtCurrentTeb()->Tib.ArbitraryUserPointer = nt_name.Buffer + 4; + switch (nts) { case STATUS_INVALID_IMAGE_NOT_MZ: /* not in PE format, maybe it's a .so file */ @@ -2748,6 +2752,7 @@ static NTSTATUS load_dll( const WCHAR *load_path, const WCHAR *libname, const WC } break; } + NtCurrentTeb()->Tib.ArbitraryUserPointer = prev; done: if (nts == STATUS_SUCCESS) diff --git a/server/debugger.c b/server/debugger.c index 2e3de0d41ab..9f389075b92 100644 --- a/server/debugger.c +++ b/server/debugger.c @@ -131,6 +131,13 @@ static const struct object_ops debug_obj_ops = debug_obj_destroy /* destroy */ }; +/* get a pointer to TEB->ArbitraryUserPointer in the client address space */ +static client_ptr_t get_teb_user_ptr( struct thread *thread ) +{ + unsigned int ptr_size = (CPU_FLAG( thread->process->cpu ) & CPU_64BIT_MASK) ? 8 : 4; + return thread->teb + 5 * ptr_size; +} + /* routines to build an event according to its type */ @@ -181,7 +188,7 @@ static void fill_load_dll_event( struct debug_event *event, const void *arg ) event->data.load_dll.dbg_offset = image_info->dbg_offset; event->data.load_dll.dbg_size = image_info->dbg_size; - event->data.load_dll.name = dll->name; + event->data.load_dll.name = get_teb_user_ptr( event->sender ); event->file = get_view_file( view, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE ); }

1 0

Alexandre Julliard : server: Report load dll events upon mapping a SEC_IMAGE view.
by Alexandre Julliard 11 Feb '21

11 Feb '21

Module: wine Branch: master Commit: ea33192660e867e8389666c0f8255f88c979c1ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea33192660e867e8389666c0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 11 11:49:06 2021 +0100 server: Report load dll events upon mapping a SEC_IMAGE view. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/debugger.c | 48 ++++++++++++++++++++++++++++++++- server/debugger.c | 41 +++-------------------------- server/mapping.c | 60 +++++++++++++++++++++++++++++++++++------- server/process.c | 4 --- 4 files changed, 100 insertions(+), 53 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ea33192660e867e83896…

1 0

Alexandre Julliard : ntdll: Close the debug port on thread exit.
by Alexandre Julliard 11 Feb '21

11 Feb '21

Module: wine Branch: master Commit: 7163c78234ecce7e2b5aa531927f573c7d4e5d54 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7163c78234ecce7e2b5aa531… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 11 14:17:03 2021 +0100 ntdll: Close the debug port on thread exit. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/debugger.c | 95 ++++++++++++++++++++++++++++++++++++++---- dlls/ntdll/loader.c | 2 + dlls/ntdll/thread.c | 1 - 3 files changed, 90 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index 55bcd62f379..118984eec75 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -1779,12 +1779,49 @@ static char *cmd; static DWORD WINAPI debug_and_exit(void *arg) { STARTUPINFOA si = { sizeof(si) }; + HANDLE debug; + ULONG val = 0; + NTSTATUS status; BOOL ret; ret = CreateProcessA(NULL, cmd, NULL, NULL, TRUE, DEBUG_PROCESS, NULL, NULL, &si, &pi); ok(ret, "CreateProcess failed, last error %#x.\n", GetLastError()); + debug = pDbgUiGetThreadDebugObject(); + status = pNtSetInformationDebugObject( debug, DebugObjectKillProcessOnExitInformation, + &val, sizeof(val), NULL ); + ok( !status, "NtSetInformationDebugObject failed %x\n", status ); + *(HANDLE *)arg = debug; Sleep(200); + ExitThread(0); +} + +static DWORD WINAPI debug_and_wait(void *arg) +{ + STARTUPINFOA si = { sizeof(si) }; + HANDLE debug = *(HANDLE *)arg; + ULONG val = 0; + NTSTATUS status; + BOOL ret; + + pDbgUiSetThreadDebugObject( debug ); + ret = CreateProcessA(NULL, cmd, NULL, NULL, TRUE, DEBUG_PROCESS, NULL, NULL, &si, &pi); + ok(ret, "CreateProcess failed, last error %#x.\n", GetLastError()); + debug = pDbgUiGetThreadDebugObject(); + status = pNtSetInformationDebugObject( debug, DebugObjectKillProcessOnExitInformation, + &val, sizeof(val), NULL ); + ok( !status, "NtSetInformationDebugObject failed %x\n", status ); + Sleep(INFINITE); + ExitThread(0); +} + +static DWORD WINAPI create_debug_port(void *arg) +{ + STARTUPINFOA si = { sizeof(si) }; + NTSTATUS status = pDbgUiConnectToDbg(); + + ok( !status, "DbgUiConnectToDbg failed %x\n", status ); *(HANDLE *)arg = pDbgUiGetThreadDebugObject(); + Sleep( INFINITE ); ExitThread(0); } @@ -1844,19 +1881,23 @@ static void test_kill_on_exit(const char *argv0) exit_code = run_child_wait( cmd, event ); ok( exit_code == STATUS_DEBUGGER_INACTIVE, "exit code = %08x\n", exit_code); - /* test that threads don't close the debug port on exit */ + /* test that threads close the debug port on exit */ thread = CreateThread(NULL, 0, debug_and_exit, &debug, 0, &tid); WaitForSingleObject( thread, 1000 ); ok( debug != 0, "no debug port\n" ); - SetEvent( event ); - WaitForSingleObject( pi.hProcess, 100 ); - GetExitCodeProcess( pi.hProcess, &exit_code ); - ok( exit_code == STILL_ACTIVE, "exit code = %08x\n", exit_code); val = 0; status = pNtSetInformationDebugObject( debug, DebugObjectKillProcessOnExitInformation, &val, sizeof(val), NULL ); - ok( !status, "NtSetInformationDebugObject failed %x\n", status ); - CloseHandle( debug ); + ok( status == STATUS_INVALID_HANDLE || broken(status == STATUS_SUCCESS), /* wow64 */ + "NtSetInformationDebugObject failed %x\n", status ); + SetEvent( event ); + if (!status) + { + WaitForSingleObject( pi.hProcess, 100 ); + GetExitCodeProcess( pi.hProcess, &exit_code ); + ok( exit_code == STILL_ACTIVE, "exit code = %08x\n", exit_code); + CloseHandle( debug ); + } WaitForSingleObject( pi.hProcess, 1000 ); GetExitCodeProcess( pi.hProcess, &exit_code ); ok( exit_code == 0, "exit code = %08x\n", exit_code); @@ -1864,6 +1905,46 @@ static void test_kill_on_exit(const char *argv0) CloseHandle( pi.hThread ); CloseHandle( thread ); + /* but not on forced exit */ + status = pNtCreateDebugObject( &debug, DEBUG_ALL_ACCESS, &attr, DEBUG_KILL_ON_CLOSE ); + ok( !status, "NtCreateDebugObject failed %x\n", status ); + thread = CreateThread(NULL, 0, debug_and_wait, &debug, 0, &tid); + Sleep( 100 ); + ok( debug != 0, "no debug port\n" ); + val = 1; + status = pNtSetInformationDebugObject( debug, DebugObjectKillProcessOnExitInformation, + &val, sizeof(val), NULL ); + ok( status == STATUS_SUCCESS, "NtSetInformationDebugObject failed %x\n", status ); + TerminateThread( thread, 0 ); + status = pNtSetInformationDebugObject( debug, DebugObjectKillProcessOnExitInformation, + &val, sizeof(val), NULL ); + ok( status == STATUS_SUCCESS, "NtSetInformationDebugObject failed %x\n", status ); + WaitForSingleObject( pi.hProcess, 300 ); + GetExitCodeProcess( pi.hProcess, &exit_code ); + todo_wine + ok( exit_code == STATUS_DEBUGGER_INACTIVE || broken(exit_code == STILL_ACTIVE), /* wow64 */ + "exit code = %08x\n", exit_code); + CloseHandle( pi.hProcess ); + CloseHandle( pi.hThread ); + CloseHandle( thread ); + CloseHandle( debug ); + + debug = 0; + thread = CreateThread(NULL, 0, create_debug_port, &debug, 0, &tid); + Sleep(100); + ok( debug != 0, "no debug port\n" ); + val = 0; + status = pNtSetInformationDebugObject( debug, DebugObjectKillProcessOnExitInformation, + &val, sizeof(val), NULL ); + ok( status == STATUS_SUCCESS, "NtSetInformationDebugObject failed %x\n", status ); + TerminateThread( thread, 0 ); + status = pNtSetInformationDebugObject( debug, DebugObjectKillProcessOnExitInformation, + &val, sizeof(val), NULL ); + ok( status == STATUS_SUCCESS, "NtSetInformationDebugObject failed %x\n", status ); + CloseHandle( debug ); + CloseHandle( thread ); + + CloseHandle( event ); heap_free(cmd); } diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 378b812868c..84cb7a04ba0 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3278,6 +3278,8 @@ void WINAPI LdrShutdownThread(void) RtlReleasePebLock(); RtlLeaveCriticalSection( &loader_section ); + if (DbgUiGetThreadDebugObject()) NtClose( DbgUiGetThreadDebugObject() ); + RtlFreeThreadActivationContextStack(); } diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 8e5a3a3a3a3..425e8770294 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -85,7 +85,6 @@ void WINAPI RtlExitUserThread( ULONG status ) NtQueryInformationThread( GetCurrentThread(), ThreadAmILastThread, &last, sizeof(last), NULL ); if (last) RtlExitUserProcess( status ); LdrShutdownThread(); - RtlFreeThreadActivationContextStack(); for (;;) NtTerminateThread( GetCurrentThread(), status ); }

1 0

Alexandre Julliard : ntdll/tests: Relax a broken result on Windows.
by Alexandre Julliard 11 Feb '21

11 Feb '21

Module: wine Branch: master Commit: 7c85b365d109dfe7dcb947b9377e96d3e78724c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c85b365d109dfe7dcb947b9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 11 15:27:58 2021 +0100 ntdll/tests: Relax a broken result on Windows. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/om.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 1878a480cb8..e93f11e1126 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -2500,7 +2500,7 @@ static void test_object_types(void) memset( info, 0xcc, sizeof(*info) ); status = pNtQueryObject( NULL, ObjectTypesInformation, info, len, &retlen ); ok( retlen <= len + 16, "wrong len %x/%x\n", len, retlen ); - ok( len == retlen || broken( retlen == len + 16 || retlen == len - 16 ), /* wow64 */ + ok( len == retlen || broken( retlen >= len - 32 && retlen <= len + 32 ), /* wow64 */ "wrong len %x/%x\n", len, retlen ); ok( !status, "NtQueryObject failed %x\n", status ); if (!status)

1 0

Alexandre Julliard : server: Remove the load/unload_dll requests and the dll list.
by Alexandre Julliard 11 Feb '21

11 Feb '21

Module: wine Branch: master Commit: e7fa4fd14702d008431bed68a548037d606ef7a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7fa4fd14702d008431bed68… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 11 16:19:40 2021 +0100 server: Remove the load/unload_dll requests and the dll list. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 19 --------- include/wine/server_protocol.h | 36 +---------------- server/process.c | 87 ------------------------------------------ server/process.h | 10 ----- server/protocol.def | 14 ------- server/request.h | 9 ----- server/trace.c | 19 +-------- 7 files changed, 2 insertions(+), 192 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e7fa4fd14702d008431b…

1 0

Henri Verbeet : wined3d: Create the backbuffer rendertarget view only after calling adapter_init_3d().
by Alexandre Julliard 11 Feb '21

11 Feb '21

Module: wine Branch: master Commit: b9a440d15d84e7967f70b38291d2f85767fb7a6f URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9a440d15d84e7967f70b382… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 11 11:52:15 2021 +0100 wined3d: Create the backbuffer rendertarget view only after calling adapter_init_3d(). Otherwise we may not be able to acquire a context to create the view. In practice, this is only an issue for d3d9 and earlier in combination with the Vulkan backend. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 45 +++++++++++++++++++++------------------------ 1 file changed, 21 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a400221ee30..f61708219ac 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1088,6 +1088,24 @@ HRESULT wined3d_device_set_implicit_swapchain(struct wined3d_device *device, str if (device->d3d_initialized) return WINED3DERR_INVALIDCALL; + device->swapchain_count = 1; + if (!(device->swapchains = heap_calloc(device->swapchain_count, sizeof(*device->swapchains)))) + { + ERR("Failed to allocate swapchain array.\n"); + hr = E_OUTOFMEMORY; + goto err_out; + } + device->swapchains[0] = swapchain; + + for (i = 0; i < ARRAY_SIZE(device->state.fb.render_targets); ++i) + if (device->state.fb.render_targets[i]) + wined3d_rtv_bind_count_dec(device->state.fb.render_targets[i]); + + memset(device->state.fb.render_targets, 0, sizeof(device->state.fb.render_targets)); + if (FAILED(hr = device->adapter->adapter_ops->adapter_init_3d(device))) + goto err_out; + device->d3d_initialized = TRUE; + swapchain_desc = &swapchain->state.desc; if (swapchain_desc->backbuffer_count && swapchain_desc->backbuffer_bind_flags & WINED3D_BIND_RENDER_TARGET) { @@ -1104,28 +1122,12 @@ HRESULT wined3d_device_set_implicit_swapchain(struct wined3d_device *device, str NULL, &wined3d_null_parent_ops, &device->back_buffer_view))) { ERR("Failed to create rendertarget view, hr %#x.\n", hr); - return hr; + device->adapter->adapter_ops->adapter_uninit_3d(device); + device->d3d_initialized = FALSE; + goto err_out; } } - device->swapchain_count = 1; - if (!(device->swapchains = heap_calloc(device->swapchain_count, sizeof(*device->swapchains)))) - { - ERR("Failed to allocate swapchain array.\n"); - hr = E_OUTOFMEMORY; - goto err_out; - } - device->swapchains[0] = swapchain; - - for (i = 0; i < ARRAY_SIZE(device->state.fb.render_targets); ++i) - if (device->state.fb.render_targets[i]) - wined3d_rtv_bind_count_dec(device->state.fb.render_targets[i]); - - memset(device->state.fb.render_targets, 0, sizeof(device->state.fb.render_targets)); - if (FAILED(hr = device->adapter->adapter_ops->adapter_init_3d(device))) - goto err_out; - device->d3d_initialized = TRUE; - device_init_swapchain_state(device, swapchain); TRACE("All defaults now set up.\n"); @@ -1147,11 +1149,6 @@ err_out: heap_free(device->swapchains); device->swapchains = NULL; device->swapchain_count = 0; - if (device->back_buffer_view) - { - wined3d_rendertarget_view_decref(device->back_buffer_view); - device->back_buffer_view = NULL; - } return hr; }

1 0

Henri Verbeet : wined3d: Add some TRACEs to command stream callbacks.
by Alexandre Julliard 11 Feb '21

11 Feb '21

Module: wine Branch: master Commit: 7ba0cc908506b821abef10ea2748e55d9de10787 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ba0cc908506b821abef10ea… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 11 11:52:16 2021 +0100 wined3d: Add some TRACEs to command stream callbacks. I.e., those used with wined3d_cs_init_object() and wined3d_cs_destroy_object(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 6 ++++++ dlls/wined3d/adapter_vk.c | 6 ++++++ dlls/wined3d/buffer.c | 2 ++ dlls/wined3d/device.c | 4 ++++ dlls/wined3d/palette.c | 2 ++ dlls/wined3d/query.c | 2 ++ dlls/wined3d/resource.c | 2 ++ dlls/wined3d/sampler.c | 4 ++++ dlls/wined3d/shader.c | 4 ++++ dlls/wined3d/state.c | 6 ++++++ dlls/wined3d/swapchain.c | 2 ++ dlls/wined3d/texture.c | 2 ++ dlls/wined3d/vertexdeclaration.c | 2 ++ dlls/wined3d/view.c | 12 ++++++++++++ 14 files changed, 56 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7ba0cc908506b821abef…

1 0

Brendan Shanks : dinput: On Mac, always use both HID usage page and usage for comparisons.
by Alexandre Julliard 11 Feb '21

11 Feb '21

Module: wine Branch: master Commit: e8332dece8209d331285622f4e960f27e328bd3e URL: https://source.winehq.org/git/wine.git/?a=commit;h=e8332dece8209d331285622f… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Feb 11 11:21:20 2021 -0800 dinput: On Mac, always use both HID usage page and usage for comparisons. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_osx.c | 77 ++++++++++++++++++++++++---------------------- 1 file changed, 40 insertions(+), 37 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e8332dece8209d331285…

1 0

Brendan Shanks : dinput: Map Xbox One controller triggers (accelerator/brake) to Rx/Ry on Mac.
by Alexandre Julliard 11 Feb '21

11 Feb '21

Module: wine Branch: master Commit: e9dda86273ed0e6946f6c0048ded372b60836fdd URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9dda86273ed0e6946f6c004… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Feb 11 11:21:21 2021 -0800 dinput: Map Xbox One controller triggers (accelerator/brake) to Rx/Ry on Mac. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_osx.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index bd39ca41b51..805b75639fe 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -621,6 +621,7 @@ static void get_osx_device_elements(JoystickImpl *device, uint64_t axis_map[8]) IOHIDElementRef device_main_element; CFMutableArrayRef elements; DWORD sliders = 0; + BOOL use_accel_brake_for_rx_ry = TRUE; TRACE("device %p device->id %d\n", device, device->id); @@ -644,6 +645,23 @@ static void get_osx_device_elements(JoystickImpl *device, uint64_t axis_map[8]) CFMutableArrayRef buttons = CFArrayCreateMutable(kCFAllocatorDefault, 0, &kCFTypeArrayCallBacks); CFMutableArrayRef povs = CFArrayCreateMutable(kCFAllocatorDefault, 0, &kCFTypeArrayCallBacks); + /* Scan the elements to see if Rx/Ry is present, if not then Accelerator/Brake can be mapped to it. + * (Xbox One controller triggers use accelerator/brake) + */ + for ( idx = 0; idx < cnt; idx++ ) + { + IOHIDElementRef element = ( IOHIDElementRef ) CFArrayGetValueAtIndex( elements, idx ); + IOHIDElementType type = IOHIDElementGetType( element ); + uint32_t usage_page = IOHIDElementGetUsagePage( element ); + uint32_t usage = IOHIDElementGetUsage( element ); + + if (type == kIOHIDElementTypeInput_Misc && usage_page == kHIDPage_GenericDesktop && + (usage == kHIDUsage_GD_Rx || usage == kHIDUsage_GD_Ry)) + { + use_accel_brake_for_rx_ry = FALSE; + } + } + for ( idx = 0; idx < cnt; idx++ ) { IOHIDElementRef element = ( IOHIDElementRef ) CFArrayGetValueAtIndex( elements, idx ); @@ -701,7 +719,17 @@ static void get_osx_device_elements(JoystickImpl *device, uint64_t axis_map[8]) case MAKEUINT64(kHIDPage_GenericDesktop, kHIDUsage_GD_Rx): case MAKEUINT64(kHIDPage_GenericDesktop, kHIDUsage_GD_Ry): case MAKEUINT64(kHIDPage_GenericDesktop, kHIDUsage_GD_Rz): + case MAKEUINT64(kHIDPage_Simulation, kHIDUsage_Sim_Accelerator): + case MAKEUINT64(kHIDPage_Simulation, kHIDUsage_Sim_Brake): { + if (usage == kHIDUsage_Sim_Accelerator || usage == kHIDUsage_Sim_Brake) + { + if (use_accel_brake_for_rx_ry) + TRACE("Using Sim_Accelerator/Brake for GD_Rx/Ry\n"); + else + break; + } + TRACE("kIOHIDElementTypeInput_Misc / kHIDUsage_GD_* (%d)\n", usage); axis_map[CFArrayGetCount(axes)]=MAKEUINT64(usage_page, usage); CFArrayAppendValue(axes, element); @@ -864,6 +892,8 @@ static void poll_osx_device_state(LPDIRECTINPUTDEVICE8A iface) case MAKEUINT64(kHIDPage_GenericDesktop, kHIDUsage_GD_Ry): case MAKEUINT64(kHIDPage_GenericDesktop, kHIDUsage_GD_Rz): case MAKEUINT64(kHIDPage_GenericDesktop, kHIDUsage_GD_Slider): + case MAKEUINT64(kHIDPage_Simulation, kHIDUsage_Sim_Accelerator): + case MAKEUINT64(kHIDPage_Simulation, kHIDUsage_Sim_Brake): { int wine_obj = -1; @@ -895,12 +925,14 @@ static void poll_osx_device_state(LPDIRECTINPUTDEVICE8A iface) device->generic.js.lZ = newVal; break; case MAKEUINT64(kHIDPage_GenericDesktop, kHIDUsage_GD_Rx): + case MAKEUINT64(kHIDPage_Simulation, kHIDUsage_Sim_Accelerator): TRACE("kIOHIDElementTypeInput_Misc / kHIDUsage_GD_Rx\n"); wine_obj = 3; oldVal = device->generic.js.lRx; device->generic.js.lRx = newVal; break; case MAKEUINT64(kHIDPage_GenericDesktop, kHIDUsage_GD_Ry): + case MAKEUINT64(kHIDPage_Simulation, kHIDUsage_Sim_Brake): TRACE("kIOHIDElementTypeInput_Misc / kHIDUsage_GD_Ry\n"); wine_obj = 4; oldVal = device->generic.js.lRy; @@ -1200,10 +1232,12 @@ static HRESULT alloc_device(REFGUID rguid, IDirectInputImpl *dinput, has_ff = (newDevice->ff != 0) && osx_axis_has_ff(&ffcaps, FFJOFS_Z); break; case MAKEUINT64(kHIDPage_GenericDesktop, kHIDUsage_GD_Rx): + case MAKEUINT64(kHIDPage_Simulation, kHIDUsage_Sim_Accelerator): wine_obj = 3; has_ff = (newDevice->ff != 0) && osx_axis_has_ff(&ffcaps, FFJOFS_RX); break; case MAKEUINT64(kHIDPage_GenericDesktop, kHIDUsage_GD_Ry): + case MAKEUINT64(kHIDPage_Simulation, kHIDUsage_Sim_Brake): wine_obj = 4; has_ff = (newDevice->ff != 0) && osx_axis_has_ff(&ffcaps, FFJOFS_RY); break;

1 0

Zebediah Figura : ntoskrnl/tests: Test the contents of the user IO_STATUS_BLOCK.
by Alexandre Julliard 11 Feb '21

11 Feb '21

Module: wine Branch: master Commit: eb5d94953a0717629cbca8211b561fda1e30e0b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb5d94953a0717629cbca821… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 10 21:42:35 2021 -0600 ntoskrnl/tests: Test the contents of the user IO_STATUS_BLOCK. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/driver.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 5617342d803..eb4620ad25d 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -846,6 +846,8 @@ static void test_call_driver(DEVICE_OBJECT *device) KEVENT event; NTSTATUS status; + iosb.Status = 0xdeadbeef; + iosb.Information = 0xdeadbeef; irp = IoBuildAsynchronousFsdRequest(IRP_MJ_FLUSH_BUFFERS, device, NULL, 0, NULL, &iosb); ok(irp->UserIosb == &iosb, "unexpected UserIosb\n"); ok(!irp->Cancel, "Cancel = %x\n", irp->Cancel); @@ -854,6 +856,10 @@ static void test_call_driver(DEVICE_OBJECT *device) ok(irp->CurrentLocation == 2, "CurrentLocation = %u\n", irp->CurrentLocation); ok(irp->Tail.Overlay.Thread == (PETHREAD)KeGetCurrentThread(), "IRP thread is not the current thread\n"); + ok(!irp->IoStatus.Status, "got status %#x\n", irp->IoStatus.Status); + ok(!irp->IoStatus.Information, "got information %#x\n", irp->IoStatus.Information); + ok(iosb.Status == 0xdeadbeef, "got status %#x\n", iosb.Status); + ok(iosb.Information == 0xdeadbeef, "got information %#x\n", iosb.Information); irpsp = IoGetNextIrpStackLocation(irp); ok(irpsp->MajorFunction == IRP_MJ_FLUSH_BUFFERS, "MajorFunction = %u\n", irpsp->MajorFunction); @@ -863,10 +869,16 @@ static void test_call_driver(DEVICE_OBJECT *device) status = IoCallDriver(device, irp); ok(status == STATUS_PENDING, "IoCallDriver returned %#x\n", status); + ok(!irp->IoStatus.Status, "got status %#x\n", irp->IoStatus.Status); + ok(!irp->IoStatus.Information, "got information %#x\n", irp->IoStatus.Information); + ok(iosb.Status == 0xdeadbeef, "got status %#x\n", iosb.Status); + ok(iosb.Information == 0xdeadbeef, "got information %#x\n", iosb.Information); irp->IoStatus.Status = STATUS_SUCCESS; - irp->IoStatus.Information = 0; + irp->IoStatus.Information = 123; IoCompleteRequest(irp, IO_NO_INCREMENT); + todo_wine ok(iosb.Status == STATUS_SUCCESS, "got status %#x\n", iosb.Status); + todo_wine ok(iosb.Information == 123, "got information %#x\n", iosb.Information); KeInitializeEvent(&event, NotificationEvent, FALSE);

1 0