July 2022 - Wine-commits - list.winehq.org

Claire Girka : ntoskrnl/tests: Add test for getting SPDRP_BASE_CONTAINERID from PnP driver.
by Alexandre Julliard 25 Jul '22

25 Jul '22

Module: wine Branch: master Commit: d930a0cc5ee1c0468b5955e8d312ed035c35559e URL: https://gitlab.winehq.org/wine/wine/-/commit/d930a0cc5ee1c0468b5955e8d312ed… Author: Claire Girka <claire(a)sitedethib.com> Date: Tue Jul 12 20:00:54 2022 +0200 ntoskrnl/tests: Add test for getting SPDRP_BASE_CONTAINERID from PnP driver. --- dlls/ntoskrnl.exe/tests/driver_pnp.c | 5 ++++- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 6 ++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/tests/driver_pnp.c b/dlls/ntoskrnl.exe/tests/driver_pnp.c index 1f22c4b9997..9a965f584cd 100644 --- a/dlls/ntoskrnl.exe/tests/driver_pnp.c +++ b/dlls/ntoskrnl.exe/tests/driver_pnp.c @@ -228,7 +228,10 @@ static NTSTATUS query_id(struct device *device, IRP *irp, BUS_QUERY_ID_TYPE type } case BusQueryContainerID: - return STATUS_NOT_SUPPORTED; + if (!(id = ExAllocatePool(PagedPool, 39 * sizeof(WCHAR)))) + return STATUS_NO_MEMORY; + wcscpy(id, L"{12345678-1234-1234-1234-123456789123}"); + break; default: ok(0, "Unexpected ID query type %#x.\n", type); diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 64debcbebbf..6d1185301eb 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -1462,6 +1462,7 @@ static void test_pnp_devices(void) static const char expect_compat_id[] = "winetest_compat\0winetest_compat_1\0"; char buffer[200]; + WCHAR buffer_w[200]; SP_DEVICE_INTERFACE_DETAIL_DATA_A *iface_detail = (void *)buffer; SP_DEVICE_INTERFACE_DATA iface = {sizeof(iface)}; SP_DEVINFO_DATA device = {sizeof(device)}; @@ -1646,6 +1647,11 @@ static void test_pnp_devices(void) ok(size == sizeof(expect_hardware_id), "got size %lu\n", size); ok(!memcmp(buffer, expect_hardware_id, size), "got hardware IDs %s\n", debugstr_an(buffer, size)); + /* Using the WCHAR variant because Windows returns a WCHAR for this property even when using SetupDiGetDeviceRegistryPropertyA */ + ret = SetupDiGetDeviceRegistryPropertyW(set, &device, SPDRP_BASE_CONTAINERID, + &type, (BYTE *)buffer_w, sizeof(buffer_w), &size); + todo_wine ok(ret, "got error %#lx\n", GetLastError()); + ret = SetupDiGetDeviceRegistryPropertyA(set, &device, SPDRP_COMPATIBLEIDS, &type, (BYTE *)buffer, sizeof(buffer), &size); ok(ret, "got error %#lx\n", GetLastError());

1 0

Claire Girka : hidclass: Improve error handling in get_device_id.
by Alexandre Julliard 25 Jul '22

25 Jul '22

Module: wine Branch: master Commit: 8ed6b1609cb028ee82c01152e3330f1a4036976b URL: https://gitlab.winehq.org/wine/wine/-/commit/8ed6b1609cb028ee82c01152e3330f… Author: Claire Girka <claire(a)sitedethib.com> Date: Tue Jul 12 12:22:43 2022 +0200 hidclass: Improve error handling in get_device_id. Do not assume the underlying driver will return meaningful data, as it may not support BusQueryContainerID which will be queried in a next commit. --- dlls/hidclass.sys/pnp.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index 873c55c4a67..d2d3dc25b95 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -84,11 +84,16 @@ static NTSTATUS get_device_id(DEVICE_OBJECT *device, BUS_QUERY_ID_TYPE type, WCH irpsp->MinorFunction = IRP_MN_QUERY_ID; irpsp->Parameters.QueryId.IdType = type; + irp->IoStatus.Status = STATUS_NOT_SUPPORTED; if (IoCallDriver(device, irp) == STATUS_PENDING) KeWaitForSingleObject(&event, Executive, KernelMode, FALSE, NULL); - wcscpy(id, (WCHAR *)irp_status.Information); - ExFreePool((WCHAR *)irp_status.Information); + if (!irp_status.Status) + { + wcscpy(id, (WCHAR *)irp_status.Information); + ExFreePool((WCHAR *)irp_status.Information); + } + return irp_status.Status; }

1 0

Claire Girka : hidclass: Expose ContainerID from underlying driver.
by Alexandre Julliard 25 Jul '22

25 Jul '22

Module: wine Branch: master Commit: bfb7fe4bfb050ca59dc0dec74a29e70b43b5f74a URL: https://gitlab.winehq.org/wine/wine/-/commit/bfb7fe4bfb050ca59dc0dec74a29e7… Author: Claire Girka <claire(a)sitedethib.com> Date: Tue Jul 12 12:44:39 2022 +0200 hidclass: Expose ContainerID from underlying driver. --- dlls/hidclass.sys/hid.h | 1 + dlls/hidclass.sys/pnp.c | 17 ++++++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/hidclass.sys/hid.h b/dlls/hidclass.sys/hid.h index e20f12809eb..b8cec55fb7c 100644 --- a/dlls/hidclass.sys/hid.h +++ b/dlls/hidclass.sys/hid.h @@ -81,6 +81,7 @@ typedef struct _BASE_DEVICE_EXTENSION * for convenience. */ WCHAR device_id[MAX_DEVICE_ID_LEN]; WCHAR instance_id[MAX_DEVICE_ID_LEN]; + WCHAR container_id[MAX_GUID_STRING_LEN]; const GUID *class_guid; BOOL is_fdo; diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index d2d3dc25b95..91624b40eff 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -173,6 +173,9 @@ static NTSTATUS WINAPI driver_add_device(DRIVER_OBJECT *driver, DEVICE_OBJECT *b swprintf(ext->device_id, ARRAY_SIZE(ext->device_id), L"HID\\%s", wcsrchr(device_id, '\\') + 1); wcscpy(ext->instance_id, instance_id); + if (get_device_id(bus_pdo, BusQueryContainerID, ext->container_id)) + ext->container_id[0] = 0; + is_xinput_class = !wcsncmp(device_id, L"WINEXINPUT\\", 7) && wcsstr(device_id, L"&XI_") != NULL; if (is_xinput_class) ext->class_guid = &GUID_DEVINTERFACE_WINEXINPUT; else ext->class_guid = &GUID_DEVINTERFACE_HID; @@ -229,6 +232,7 @@ static void create_child(minidriver *minidriver, DEVICE_OBJECT *fdo) KeInitializeSpinLock( &pdo_ext->u.pdo.queues_lock ); wcscpy(pdo_ext->device_id, fdo_ext->device_id); wcscpy(pdo_ext->instance_id, fdo_ext->instance_id); + wcscpy(pdo_ext->container_id, fdo_ext->container_id); pdo_ext->class_guid = fdo_ext->class_guid; pdo_ext->u.pdo.information.VendorID = attr.VendorID; @@ -416,8 +420,19 @@ static NTSTATUS pdo_pnp(DEVICE_OBJECT *device, IRP *irp) irp->IoStatus.Information = (ULONG_PTR)id; status = STATUS_SUCCESS; break; - case BusQueryContainerID: + if (ext->container_id[0]) + { + lstrcpyW(id, ext->container_id); + irp->IoStatus.Information = (ULONG_PTR)id; + status = STATUS_SUCCESS; + } + else + { + ExFreePool(id); + } + break; + case BusQueryDeviceSerialNumber: FIXME("unimplemented id type %#x\n", irpsp->Parameters.QueryId.IdType); ExFreePool(id);

1 0

Claire Girka : ntoskrnl: Set device ContainerID from driver.
by Alexandre Julliard 25 Jul '22

25 Jul '22

Module: wine Branch: master Commit: 3d25202eafccc728b25db89783f8afabd1b81f6a URL: https://gitlab.winehq.org/wine/wine/-/commit/3d25202eafccc728b25db89783f8af… Author: Claire Girka <claire(a)sitedethib.com> Date: Tue Jul 12 12:50:59 2022 +0200 ntoskrnl: Set device ContainerID from driver. Using SetupDiGetDeviceRegistryPropertyW rather than SetupDiGetDeviceRegistryPropertyA in the test, because games use the former, and Windows returns the Container ID as a WCHAR string either way. --- dlls/ntoskrnl.exe/pnp.c | 8 ++++++++ dlls/ntoskrnl.exe/tests/ntoskrnl.c | 6 +++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c index 71c03586897..a70190db7ce 100644 --- a/dlls/ntoskrnl.exe/pnp.c +++ b/dlls/ntoskrnl.exe/pnp.c @@ -318,6 +318,7 @@ static void enumerate_new_device( DEVICE_OBJECT *device, HDEVINFO set ) BOOL need_driver = TRUE; NTSTATUS status; HKEY key; + WCHAR *id; if (get_device_instance_id( device, device_instance_id )) return; @@ -347,6 +348,13 @@ static void enumerate_new_device( DEVICE_OBJECT *device, HDEVINFO set ) return; } + if (!get_device_id(device, BusQueryContainerID, &id) && id) + { + SetupDiSetDeviceRegistryPropertyW( set, &sp_device, SPDRP_BASE_CONTAINERID, (BYTE *)id, + (lstrlenW( id ) + 1) * sizeof(WCHAR) ); + ExFreePool( id ); + } + if (need_driver && !install_device_driver( device, set, &sp_device ) && !caps.RawDeviceOK) { ERR("Unable to install a function driver for device %s.\n", debugstr_w(device_instance_id)); diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 6d1185301eb..6d8513ffa35 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -1460,6 +1460,7 @@ static void test_pnp_devices(void) { static const char expect_hardware_id[] = "winetest_hardware\0winetest_hardware_1\0"; static const char expect_compat_id[] = "winetest_compat\0winetest_compat_1\0"; + static const WCHAR expect_container_id_w[] = L"{12345678-1234-1234-1234-123456789123}"; char buffer[200]; WCHAR buffer_w[200]; @@ -1650,7 +1651,10 @@ static void test_pnp_devices(void) /* Using the WCHAR variant because Windows returns a WCHAR for this property even when using SetupDiGetDeviceRegistryPropertyA */ ret = SetupDiGetDeviceRegistryPropertyW(set, &device, SPDRP_BASE_CONTAINERID, &type, (BYTE *)buffer_w, sizeof(buffer_w), &size); - todo_wine ok(ret, "got error %#lx\n", GetLastError()); + ok(ret, "got error %#lx\n", GetLastError()); + ok(type == REG_SZ, "got type %lu\n", type); + ok(size == sizeof(expect_container_id_w), "got size %lu\n", size); + ok(!memcmp(buffer_w, expect_container_id_w, size), "got container ID %s\n", debugstr_w(buffer_w)); ret = SetupDiGetDeviceRegistryPropertyA(set, &device, SPDRP_COMPATIBLEIDS, &type, (BYTE *)buffer, sizeof(buffer), &size);

1 0

Alistair Leslie-Hughes : xactengine3_7: Remove entry after FAudio Destroyed call.
by Alexandre Julliard 25 Jul '22

25 Jul '22

Module: wine Branch: master Commit: 5f6425f0efa74a44bdeb65f065a9db3a19e9628c URL: https://gitlab.winehq.org/wine/wine/-/commit/5f6425f0efa74a44bdeb65f065a9db… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jul 22 12:34:27 2022 +1000 xactengine3_7: Remove entry after FAudio Destroyed call. FACTWaveBank_Destroy will invoke the callback which we attempt to lookup the wavebank. The callback must have a pointer, help states it isn't valid but still points to the wavebank that was destroyed. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/xactengine3_7/tests/xact3.c | 6 ++-- dlls/xactengine3_7/xact_dll.c | 70 ++++++++++++++++++++++------------------ 2 files changed, 42 insertions(+), 34 deletions(-) diff --git a/dlls/xactengine3_7/tests/xact3.c b/dlls/xactengine3_7/tests/xact3.c index 5daa18ca81b..6b66af59ff0 100644 --- a/dlls/xactengine3_7/tests/xact3.c +++ b/dlls/xactengine3_7/tests/xact3.c @@ -172,9 +172,11 @@ static void WINAPI notification_cb(const XACT_NOTIFICATION *notification) data->received = TRUE; ok(notification->type == data->type, "Unexpected notification type %u\n", notification->type); - todo_wine_if(notification->type == XACTNOTIFICATIONTYPE_WAVEBANKDESTROYED) - ok(notification->waveBank.pWaveBank == data->wave_bank, "Unexpected wave bank %p instead of %p\n", + if(notification->type == XACTNOTIFICATIONTYPE_WAVEBANKDESTROYED) + { + ok(notification->waveBank.pWaveBank == data->wave_bank, "Unexpected wave bank %p instead of %p\n", notification->waveBank.pWaveBank, data->wave_bank); + } ok(thread_id == data->thread_id, "Unexpected thread id %#lx instead of %#lx\n", thread_id, data->thread_id); } diff --git a/dlls/xactengine3_7/xact_dll.c b/dlls/xactengine3_7/xact_dll.c index f7be480656d..ee559dd4b07 100644 --- a/dlls/xactengine3_7/xact_dll.c +++ b/dlls/xactengine3_7/xact_dll.c @@ -60,6 +60,21 @@ struct wrapper_lookup void *xact; }; +typedef struct _XACT3EngineImpl { + IXACT3Engine IXACT3Engine_iface; + + FACTAudioEngine *fact_engine; + + XACT_READFILE_CALLBACK pReadFile; + XACT_GETOVERLAPPEDRESULT_CALLBACK pGetOverlappedResult; + XACT_NOTIFICATION_CALLBACK notification_callback; + + void *wb_prepared_context; + void *wb_destroyed_context; + struct wine_rb_tree wb_wrapper_lookup; + CRITICAL_SECTION wb_wrapper_lookup_cs; +} XACT3EngineImpl; + static int wrapper_lookup_compare(const void *key, const struct wine_rb_entry *entry) { struct wrapper_lookup *lookup = WINE_RB_ENTRY_VALUE(entry, struct wrapper_lookup, entry); @@ -74,20 +89,30 @@ static void wrapper_lookup_destroy(struct wine_rb_entry *entry, void *context) HeapFree(GetProcessHeap(), 0, lookup); } -typedef struct _XACT3EngineImpl { - IXACT3Engine IXACT3Engine_iface; +static void wrapper_remove_entry(XACT3EngineImpl *engine, void *key) +{ + struct wrapper_lookup *lookup; + struct wine_rb_entry *entry; - FACTAudioEngine *fact_engine; + EnterCriticalSection(&engine->wb_wrapper_lookup_cs); - XACT_READFILE_CALLBACK pReadFile; - XACT_GETOVERLAPPEDRESULT_CALLBACK pGetOverlappedResult; - XACT_NOTIFICATION_CALLBACK notification_callback; + entry = wine_rb_get(&engine->wb_wrapper_lookup, key); + if (!entry) + { + LeaveCriticalSection(&engine->wb_wrapper_lookup_cs); - void *wb_prepared_context; - void *wb_destroyed_context; - struct wine_rb_tree wb_wrapper_lookup; - CRITICAL_SECTION wb_wrapper_lookup_cs; -} XACT3EngineImpl; + WARN("cannot find key in wrapper lookup\n"); + } + else + { + wine_rb_remove(&engine->wb_wrapper_lookup, entry); + + LeaveCriticalSection(&engine->wb_wrapper_lookup_cs); + + lookup = WINE_RB_ENTRY_VALUE(entry, struct wrapper_lookup, entry); + HeapFree(GetProcessHeap(), 0, lookup); + } +} typedef struct _XACT3CueImpl { IXACT3Cue IXACT3Cue_iface; @@ -591,33 +616,14 @@ static inline XACT3WaveBankImpl *impl_from_IXACT3WaveBank(IXACT3WaveBank *iface) static HRESULT WINAPI IXACT3WaveBankImpl_Destroy(IXACT3WaveBank *iface) { XACT3WaveBankImpl *This = impl_from_IXACT3WaveBank(iface); - struct wrapper_lookup *lookup; - struct wine_rb_entry *entry; HRESULT hr; TRACE("(%p)\n", This); - EnterCriticalSection(&This->engine->wb_wrapper_lookup_cs); - - entry = wine_rb_get(&This->engine->wb_wrapper_lookup, This->fact_wavebank); - - if (!entry) - { - LeaveCriticalSection(&This->engine->wb_wrapper_lookup_cs); - - WARN("cannot find wave bank in wrapper lookup\n"); - } - else - { - wine_rb_remove(&This->engine->wb_wrapper_lookup, entry); + hr = FACTWaveBank_Destroy(This->fact_wavebank); - LeaveCriticalSection(&This->engine->wb_wrapper_lookup_cs); + wrapper_remove_entry(This->engine, This->fact_wavebank); - lookup = WINE_RB_ENTRY_VALUE(entry, struct wrapper_lookup, entry); - HeapFree(GetProcessHeap(), 0, lookup); - } - - hr = FACTWaveBank_Destroy(This->fact_wavebank); HeapFree(GetProcessHeap(), 0, This); return hr; }

1 0

Francois Gouget : ws2_32/tests: Add comments to help identify the hint test indices.
by Alexandre Julliard 25 Jul '22

25 Jul '22

Module: wine Branch: master Commit: 5d8d9cd63d46380a74dd7fc09b38fb6e80d44b48 URL: https://gitlab.winehq.org/wine/wine/-/commit/5d8d9cd63d46380a74dd7fc09b38fb… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jul 9 16:01:11 2022 +0200 ws2_32/tests: Add comments to help identify the hint test indices. Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/ws2_32/tests/protocol.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/tests/protocol.c b/dlls/ws2_32/tests/protocol.c index 0b14543606a..fac3cf57077 100644 --- a/dlls/ws2_32/tests/protocol.c +++ b/dlls/ws2_32/tests/protocol.c @@ -1572,7 +1572,7 @@ static const struct addr_hint_tests } hinttests[] = { - {AF_UNSPEC, SOCK_STREAM, IPPROTO_TCP, 0}, + {AF_UNSPEC, SOCK_STREAM, IPPROTO_TCP, 0}, /* 0 */ {AF_UNSPEC, SOCK_STREAM, IPPROTO_UDP, 0}, {AF_UNSPEC, SOCK_STREAM, IPPROTO_IPV6,0}, {AF_UNSPEC, SOCK_DGRAM, IPPROTO_TCP, 0}, @@ -1582,7 +1582,7 @@ hinttests[] = {AF_INET, SOCK_STREAM, IPPROTO_UDP, 0}, {AF_INET, SOCK_STREAM, IPPROTO_IPV6,0}, {AF_INET, SOCK_DGRAM, IPPROTO_TCP, 0}, - {AF_INET, SOCK_DGRAM, IPPROTO_UDP, 0}, + {AF_INET, SOCK_DGRAM, IPPROTO_UDP, 0}, /* 10 */ {AF_INET, SOCK_DGRAM, IPPROTO_IPV6,0}, {AF_UNSPEC, 0, IPPROTO_TCP, 0}, {AF_UNSPEC, 0, IPPROTO_UDP, 0}, @@ -1592,7 +1592,7 @@ hinttests[] = {AF_INET, 0, IPPROTO_TCP, 0}, {AF_INET, 0, IPPROTO_UDP, 0}, {AF_INET, 0, IPPROTO_IPV6,0}, - {AF_INET, SOCK_STREAM, 0, 0}, + {AF_INET, SOCK_STREAM, 0, 0}, /* 20 */ {AF_INET, SOCK_DGRAM, 0, 0}, {AF_UNSPEC, 999, IPPROTO_TCP, WSAESOCKTNOSUPPORT}, {AF_UNSPEC, 999, IPPROTO_UDP, WSAESOCKTNOSUPPORT}, @@ -1602,7 +1602,7 @@ hinttests[] = {AF_INET, 999, IPPROTO_IPV6,WSAESOCKTNOSUPPORT}, {AF_UNSPEC, SOCK_STREAM, 999, 0}, {AF_UNSPEC, SOCK_STREAM, 999, 0}, - {AF_INET, SOCK_DGRAM, 999, 0}, + {AF_INET, SOCK_DGRAM, 999, 0}, /* 30 */ {AF_INET, SOCK_DGRAM, 999, 0}, };

1 0

Francois Gouget : include: Add some SPI_ constants.
by Alexandre Julliard 25 Jul '22

25 Jul '22

Module: wine Branch: master Commit: 04c7ff2c2f0d611ef37c125b554c993605794847 URL: https://gitlab.winehq.org/wine/wine/-/commit/04c7ff2c2f0d611ef37c125b554c99… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jul 9 16:04:12 2022 +0200 include: Add some SPI_ constants. They pop up in some failure messages. Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- include/winuser.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/winuser.h b/include/winuser.h index d2262b6d70a..b17f30debd3 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -2502,6 +2502,10 @@ typedef struct tagDROPSTRUCT #define SPI_SETPENVISUALIZATION 0x201F #define SPI_GETPENARBITRATIONTYPE 0x2020 #define SPI_SETPENARBITRATIONTYPE 0x2021 +#define SPI_GETCARETTIMEOUT 0x2022 +#define SPI_SETCARETTIMEOUT 0x2023 +#define SPI_GETHANDEDNESS 0x2024 +#define SPI_SETHANDEDNESS 0x2025 #define FE_FONTSMOOTHINGSTANDARD 0x0001 #define FE_FONTSMOOTHINGCLEARTYPE 0x0002

1 0

Francois Gouget : dinput/tests: Add a trailing linefeed to some ok() calls.
by Alexandre Julliard 25 Jul '22

25 Jul '22

Module: wine Branch: master Commit: 1bf88f860e4eb5cd91a9280d173bc58ac9888824 URL: https://gitlab.winehq.org/wine/wine/-/commit/1bf88f860e4eb5cd91a9280d173bc5… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jul 9 16:08:54 2022 +0200 dinput/tests: Add a trailing linefeed to some ok() calls. Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/dinput/tests/joystick8.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c index e73330815a0..90d7182a1fa 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -1682,8 +1682,8 @@ static void test_simple_joystick( DWORD version ) hr = IDirectInputDevice8_GetDeviceState( device, sizeof(DIJOYSTATE2), &state ); ok( hr == DI_OK, "GetDeviceState returned: %#lx\n", hr ); - ok( state.lX == expect_state_abs[1].lX || broken( state.lX == 16853 ) /* w8 */, "got lX %ld", state.lX ); - ok( state.lY == expect_state_abs[1].lY || broken( state.lY == 16853 ) /* w8 */, "got lY %ld", state.lY ); + ok( state.lX == expect_state_abs[1].lX || broken( state.lX == 16853 ) /* w8 */, "got lX %ld\n", state.lX ); + ok( state.lY == expect_state_abs[1].lY || broken( state.lY == 16853 ) /* w8 */, "got lY %ld\n", state.lY ); check_member( state, expect_state_abs[1], "%ld", lZ ); check_member( state, expect_state_abs[1], "%ld", lRx ); check_member( state, expect_state_abs[1], "%ld", rgdwPOV[0] );

1 0

Jacek Caban : win32u: Use syscall interface for clipboard functions.
by Alexandre Julliard 25 Jul '22

25 Jul '22

Module: wine Branch: master Commit: b1ffc6ca74e40d9d0f6e258572b5177cb469d249 URL: https://gitlab.winehq.org/wine/wine/-/commit/b1ffc6ca74e40d9d0f6e258572b517… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 22 13:05:00 2022 +0200 win32u: Use syscall interface for clipboard functions. --- dlls/win32u/gdiobj.c | 11 ----- dlls/win32u/syscall.c | 11 +++++ dlls/win32u/win32u.spec | 22 ++++----- dlls/win32u/win32u_private.h | 12 ----- dlls/win32u/wrappers.c | 67 -------------------------- dlls/wow64win/syscall.h | 11 +++++ dlls/wow64win/user.c | 109 +++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 142 insertions(+), 101 deletions(-)

1 0

Jacek Caban : win32u: Use syscall interface for more sysparams functions.
by Alexandre Julliard 25 Jul '22

25 Jul '22

Module: wine Branch: master Commit: b20f39858c0eaf8300681637b6eab1055aa2c48a URL: https://gitlab.winehq.org/wine/wine/-/commit/b20f39858c0eaf8300681637b6eab1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jul 10 17:24:44 2022 +0200 win32u: Use syscall interface for more sysparams functions. --- dlls/win32u/gdiobj.c | 6 ---- dlls/win32u/syscall.c | 6 ++++ dlls/win32u/sysparams.c | 5 +++- dlls/win32u/win32u.spec | 12 ++++---- dlls/win32u/win32u_private.h | 17 ----------- dlls/win32u/wrappers.c | 40 -------------------------- dlls/wow64win/syscall.h | 6 ++++ dlls/wow64win/user.c | 67 ++++++++++++++++++++++++++++++++++++++++++++ 8 files changed, 89 insertions(+), 70 deletions(-)

1 0