August 2021 - Wine-Commits - list.winehq.org

Rémi Bernon : hidclass.sys: Adjust buffer length according to report IDs usage.
by Alexandre Julliard Aug. 5, 2021

Aug. 5, 2021

Module: wine Branch: master Commit: 1f3fdb3cb637d0fffc5034e6362d2f191c5edf80 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f3fdb3cb637d0fffc5034e6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Aug 5 10:36:06 2021 +0200 hidclass.sys: Adjust buffer length according to report IDs usage. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 117 ++++++++++++++++++++--------------- dlls/ntoskrnl.exe/tests/driver_hid.c | 4 +- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 10 +-- 3 files changed, 72 insertions(+), 59 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1f3fdb3cb637d0fffc50…

1 0

Rémi Bernon : hidclass.sys: Rename IO_STATUS_BLOCK irp_status to io.
by Alexandre Julliard Aug. 5, 2021

Aug. 5, 2021

Module: wine Branch: master Commit: 88bc48fbac52e5f6c20f1ed0c57ce597baa0dacb URL: https://source.winehq.org/git/wine.git/?a=commit;h=88bc48fbac52e5f6c20f1ed0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Aug 5 10:36:04 2021 +0200 hidclass.sys: Rename IO_STATUS_BLOCK irp_status to io. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index ab449b9b0d9..f1b0083fffd 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -177,9 +177,8 @@ static void HID_Device_processQueue(DEVICE_OBJECT *device) static DWORD CALLBACK hid_device_thread(void *args) { DEVICE_OBJECT *device = (DEVICE_OBJECT*)args; - - IO_STATUS_BLOCK irp_status; HID_XFER_PACKET *packet; + IO_STATUS_BLOCK io; DWORD rc; BASE_DEVICE_EXTENSION *ext = device->DeviceExtension; @@ -196,9 +195,9 @@ static DWORD CALLBACK hid_device_thread(void *args) packet->reportId = 0; call_minidriver( IOCTL_HID_GET_INPUT_REPORT, ext->u.pdo.parent_fdo, NULL, 0, packet, - sizeof(*packet), &irp_status ); + sizeof(*packet), &io ); - if (irp_status.Status == STATUS_SUCCESS) + if (io.Status == STATUS_SUCCESS) { RingBuffer_Write(ext->u.pdo.ring_buffer, packet); hid_device_send_input(device, packet); @@ -221,15 +220,15 @@ static DWORD CALLBACK hid_device_thread(void *args) while(1) { call_minidriver( IOCTL_HID_READ_REPORT, ext->u.pdo.parent_fdo, NULL, 0, - packet->reportBuffer, report_size, &irp_status ); + packet->reportBuffer, report_size, &io ); rc = WaitForSingleObject(ext->u.pdo.halt_event, 0); if (rc == WAIT_OBJECT_0) exit_now = TRUE; - if (!exit_now && irp_status.Status == STATUS_SUCCESS) + if (!exit_now && io.Status == STATUS_SUCCESS) { - packet->reportBufferLen = irp_status.Information; + packet->reportBufferLen = io.Information; if (ext->u.pdo.preparsed_data->reports[0].reportID) packet->reportId = packet->reportBuffer[0]; else

1 0

Rémi Bernon : hidclass.sys: Use call_minidriver for IOCTL_HID_READ_REPORT.
by Alexandre Julliard Aug. 5, 2021

Aug. 5, 2021

Module: wine Branch: master Commit: b87b6a96e06fee490f430d1e01a9eab57b1dd630 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b87b6a96e06fee490f430d1e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Aug 5 10:36:03 2021 +0200 hidclass.sys: Use call_minidriver for IOCTL_HID_READ_REPORT. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 3a577aabfbd..ab449b9b0d9 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -178,7 +178,6 @@ static DWORD CALLBACK hid_device_thread(void *args) { DEVICE_OBJECT *device = (DEVICE_OBJECT*)args; - IRP *irp; IO_STATUS_BLOCK irp_status; HID_XFER_PACKET *packet; DWORD rc; @@ -221,15 +220,8 @@ static DWORD CALLBACK hid_device_thread(void *args) while(1) { - KEVENT event; - - KeInitializeEvent(&event, NotificationEvent, FALSE); - - irp = IoBuildDeviceIoControlRequest(IOCTL_HID_READ_REPORT, ext->u.pdo.parent_fdo, - NULL, 0, packet->reportBuffer, report_size, TRUE, &event, &irp_status); - - if (IoCallDriver(ext->u.pdo.parent_fdo, irp) == STATUS_PENDING) - KeWaitForSingleObject(&event, Executive, KernelMode, FALSE, NULL); + call_minidriver( IOCTL_HID_READ_REPORT, ext->u.pdo.parent_fdo, NULL, 0, + packet->reportBuffer, report_size, &irp_status ); rc = WaitForSingleObject(ext->u.pdo.halt_event, 0); if (rc == WAIT_OBJECT_0)

1 0

Zebediah Figura : ws2_32: Move getnameinfo() to the Unix library.
by Alexandre Julliard Aug. 5, 2021

Aug. 5, 2021

Module: wine Branch: master Commit: 01885acd5dc169df880f60f3358934864eed2d53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=01885acd5dc169df880f60f3… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Aug 4 21:20:44 2021 -0500 ws2_32: Move getnameinfo() to the Unix library. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/protocol.c | 89 +------------------ dlls/ws2_32/socket.c | 205 ------------------------------------------- dlls/ws2_32/unixlib.c | 139 +++++++++++++++++++++++++++++ dlls/ws2_32/ws2_32_private.h | 14 +-- 4 files changed, 142 insertions(+), 305 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=01885acd5dc169df880f…

1 0

Alexandre Julliard : wow64: Add thunks for ioctl/fsctl syscalls.
by Alexandre Julliard Aug. 5, 2021

Aug. 5, 2021

Module: wine Branch: master Commit: 2aea3368377f4322d93e5d3a4506af5a5da3c473 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2aea3368377f4322d93e5d3a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 5 15:39:05 2021 +0200 wow64: Add thunks for ioctl/fsctl syscalls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/file.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/wow64/syscall.h | 2 ++ 2 files changed, 54 insertions(+) diff --git a/dlls/wow64/file.c b/dlls/wow64/file.c index c8590437254..7d1c736e48c 100644 --- a/dlls/wow64/file.c +++ b/dlls/wow64/file.c @@ -352,6 +352,32 @@ NTSTATUS WINAPI wow64_NtDeleteFile( UINT *args ) } +/********************************************************************** + * wow64_NtDeviceIoControlFile + */ +NTSTATUS WINAPI wow64_NtDeviceIoControlFile( UINT *args ) +{ + HANDLE handle = get_handle( &args ); + HANDLE event = get_handle( &args ); + ULONG apc = get_ulong( &args ); + ULONG apc_param = get_ulong( &args ); + IO_STATUS_BLOCK32 *io32 = get_ptr( &args ); + ULONG code = get_ulong( &args ); + void *in_buf = get_ptr( &args ); + ULONG in_len = get_ulong( &args ); + void *out_buf = get_ptr( &args ); + ULONG out_len = get_ulong( &args ); + + IO_STATUS_BLOCK io; + NTSTATUS status; + + status = NtDeviceIoControlFile( handle, event, apc_32to64( apc ), apc_param_32to64( apc, apc_param ), + iosb_32to64( &io, io32 ), code, in_buf, in_len, out_buf, out_len ); + put_iosb( io32, &io ); + return status; +} + + /********************************************************************** * wow64_NtFlushBuffersFile */ @@ -369,6 +395,32 @@ NTSTATUS WINAPI wow64_NtFlushBuffersFile( UINT *args ) } +/********************************************************************** + * wow64_NtFsControlFile + */ +NTSTATUS WINAPI wow64_NtFsControlFile( UINT *args ) +{ + HANDLE handle = get_handle( &args ); + HANDLE event = get_handle( &args ); + ULONG apc = get_ulong( &args ); + ULONG apc_param = get_ulong( &args ); + IO_STATUS_BLOCK32 *io32 = get_ptr( &args ); + ULONG code = get_ulong( &args ); + void *in_buf = get_ptr( &args ); + ULONG in_len = get_ulong( &args ); + void *out_buf = get_ptr( &args ); + ULONG out_len = get_ulong( &args ); + + IO_STATUS_BLOCK io; + NTSTATUS status; + + status = NtFsControlFile( handle, event, apc_32to64( apc ), apc_param_32to64( apc, apc_param ), + iosb_32to64( &io, io32 ), code, in_buf, in_len, out_buf, out_len ); + put_iosb( io32, &io ); + return status; +} + + /********************************************************************** * wow64_NtLockFile */ diff --git a/dlls/wow64/syscall.h b/dlls/wow64/syscall.h index f0b5b2ed668..6ae43e0e8ef 100644 --- a/dlls/wow64/syscall.h +++ b/dlls/wow64/syscall.h @@ -75,6 +75,7 @@ SYSCALL_ENTRY( NtDeleteFile ) \ SYSCALL_ENTRY( NtDeleteKey ) \ SYSCALL_ENTRY( NtDeleteValueKey ) \ + SYSCALL_ENTRY( NtDeviceIoControlFile ) \ SYSCALL_ENTRY( NtDisplayString ) \ SYSCALL_ENTRY( NtDuplicateObject ) \ SYSCALL_ENTRY( NtDuplicateToken ) \ @@ -88,6 +89,7 @@ SYSCALL_ENTRY( NtFlushProcessWriteBuffers ) \ SYSCALL_ENTRY( NtFlushVirtualMemory ) \ SYSCALL_ENTRY( NtFreeVirtualMemory ) \ + SYSCALL_ENTRY( NtFsControlFile ) \ SYSCALL_ENTRY( NtGetContextThread ) \ SYSCALL_ENTRY( NtGetCurrentProcessorNumber ) \ SYSCALL_ENTRY( NtGetNextThread ) \

1 0

Alex Henrie : wlanapi: Add WlanHostedNetworkQueryStatus stub.
by Alexandre Julliard Aug. 5, 2021

Aug. 5, 2021

Module: wine Branch: master Commit: d1b2097390c13fe241b978f82944084a1e9b4ab7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1b2097390c13fe241b978f8… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Aug 4 23:56:51 2021 -0600 wlanapi: Add WlanHostedNetworkQueryStatus stub. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wlanapi/main.c | 7 +++++++ dlls/wlanapi/wlanapi.spec | 1 + include/windot11.h | 3 +++ include/wlanapi.h | 30 ++++++++++++++++++++++++++++++ 4 files changed, 41 insertions(+) diff --git a/dlls/wlanapi/main.c b/dlls/wlanapi/main.c index a865d39f40d..07264c9e136 100644 --- a/dlls/wlanapi/main.c +++ b/dlls/wlanapi/main.c @@ -193,6 +193,13 @@ DWORD WINAPI WlanHostedNetworkQuerySecondaryKey(HANDLE handle, DWORD *key_size, return ERROR_CALL_NOT_IMPLEMENTED; } +DWORD WINAPI WlanHostedNetworkQueryStatus(HANDLE handle, WLAN_HOSTED_NETWORK_STATUS *status, void *reserved) +{ + FIXME("(%p, %p, %p) stub\n", handle, status, reserved); + + return ERROR_CALL_NOT_IMPLEMENTED; +} + void WINAPI WlanFreeMemory(void *ptr) { TRACE("(%p)\n", ptr); diff --git a/dlls/wlanapi/wlanapi.spec b/dlls/wlanapi/wlanapi.spec index c0ea019ba58..45d83c80b0f 100644 --- a/dlls/wlanapi/wlanapi.spec +++ b/dlls/wlanapi/wlanapi.spec @@ -16,6 +16,7 @@ @ stub WlanGetSecuritySettings @ stdcall WlanHostedNetworkQueryProperty(ptr long ptr ptr ptr ptr) @ stdcall WlanHostedNetworkQuerySecondaryKey(ptr ptr ptr ptr ptr ptr ptr) +@ stdcall WlanHostedNetworkQueryStatus(ptr ptr ptr) @ stub WlanIhvControl @ stdcall WlanOpenHandle(long ptr ptr ptr) @ stub WlanQueryAutoConfigParameter diff --git a/include/windot11.h b/include/windot11.h index e14ed738213..39effeb93ec 100644 --- a/include/windot11.h +++ b/include/windot11.h @@ -35,4 +35,7 @@ typedef enum _DOT11_PHY_TYPE dot11_phy_type_IHV_end = 0xFFFFFFFF } DOT11_PHY_TYPE, *PDOT11_PHY_TYPE; +typedef UCHAR DOT11_MAC_ADDRESS[6]; +typedef DOT11_MAC_ADDRESS *PDOT11_MAC_ADDRESS; + #endif /* _WINDOT11_H */ diff --git a/include/wlanapi.h b/include/wlanapi.h index 02b787e09a1..13118cbf303 100644 --- a/include/wlanapi.h +++ b/include/wlanapi.h @@ -214,6 +214,36 @@ typedef enum _WLAN_HOSTED_NETWORK_REASON wlan_hosted_network_reason_service_available_on_virtual_station } WLAN_HOSTED_NETWORK_REASON, *PWLAN_HOSTED_NETWORK_REASON; +typedef enum _WLAN_HOSTED_NETWORK_STATE +{ + wlan_hosted_network_unavailable, + wlan_hosted_network_idle, + wlan_hosted_network_active +} WLAN_HOSTED_NETWORK_STATE, *PWLAN_HOSTED_NETWORK_STATE; + +typedef enum _WLAN_HOSTED_NETWORK_PEER_AUTH_STATE +{ + wlan_hosted_network_peer_state_invalid, + wlan_hosted_network_peer_state_authenticated +} WLAN_HOSTED_NETWORK_PEER_AUTH_STATE, *PWLAN_HOSTED_NETWORK_PEER_AUTH_STATE; + +typedef struct _WLAN_HOSTED_NETWORK_PEER_STATE +{ + DOT11_MAC_ADDRESS PeerMacAddress; + WLAN_HOSTED_NETWORK_PEER_AUTH_STATE PeerAuthState; +} WLAN_HOSTED_NETWORK_PEER_STATE, *PWLAN_HOSTED_NETWORK_PEER_STATE; + +typedef struct _WLAN_HOSTED_NETWORK_STATUS +{ + WLAN_HOSTED_NETWORK_STATE HostedNetworkState; + GUID IPDeviceID; + DOT11_MAC_ADDRESS wlanHostedNetworkBSSID; + DOT11_PHY_TYPE dot11PhyType; + ULONG ulChannelFrequency; + DWORD dwNumberOfPeers; + WLAN_HOSTED_NETWORK_PEER_STATE PeerList[1]; +} WLAN_HOSTED_NETWORK_STATUS, *PWLAN_HOSTED_NETWORK_STATUS; + DWORD WINAPI WlanCloseHandle(HANDLE, void *); DWORD WINAPI WlanEnumInterfaces(HANDLE, void *, WLAN_INTERFACE_INFO_LIST **); DWORD WINAPI WlanOpenHandle(DWORD, void *, DWORD *, HANDLE *);

1 0

Francois Gouget : oleaut32: Remove caching from VARIANT_GetLocalisedNumberChars().
by Alexandre Julliard Aug. 5, 2021

Aug. 5, 2021

Module: wine Branch: master Commit: d8656b47676a3448a19d9ee2da0c337e3cb64e94 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d8656b47676a3448a19d9ee2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Aug 5 15:20:45 2021 +0200 oleaut32: Remove caching from VARIANT_GetLocalisedNumberChars(). GetLocaleInfoW() already caches the registry information and is fast enough. This also avoids using out-of-date information after a SetLocaleInfoW() call. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/vartest.c | 12 +++--------- dlls/oleaut32/variant.c | 28 ---------------------------- 2 files changed, 3 insertions(+), 37 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index bed4de469df..89859988f1f 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -2198,7 +2198,7 @@ static void test_VarParseNumFromStrMisc(void) /* But SMONDECIMALSEP has no default! */ SetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SMONDECIMALSEP, L""); hres = wconvert_str(L"3.9", ARRAY_SIZE(rgb), NUMPRS_DECIMAL|NUMPRS_CURRENCY|NUMPRS_USE_ALL, &np, rgb, LOCALE_USER_DEFAULT, 0); - todo_wine EXPECTFAIL; + EXPECTFAIL; SetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, L"."); SetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SMONDECIMALSEP, L"."); @@ -2206,9 +2206,7 @@ static void test_VarParseNumFromStrMisc(void) SetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_STHOUSAND, L" "); hres = wconvert_str(L"1 000", ARRAY_SIZE(rgb), NUMPRS_THOUSANDS, &np, rgb, LOCALE_USER_DEFAULT, 0); - if (broken(1)) /* FIXME Reenable once Wine is less broken */ EXPECT(1,NUMPRS_THOUSANDS,NUMPRS_THOUSANDS,5,0,3); - todo_wine ok(np.dwOutFlags == NUMPRS_THOUSANDS, "Got dwOutFlags=%08x\n", np.dwOutFlags); EXPECTRGB(0,1); /* Don't test extra digits, see "1,000" test */ EXPECTRGB(4,FAILDIG); @@ -2225,9 +2223,7 @@ static void test_VarParseNumFromStrMisc(void) SetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SMONTHOUSANDSEP, L" "); hres = wconvert_str(L"1|000", ARRAY_SIZE(rgb), NUMPRS_THOUSANDS, &np, rgb, LOCALE_USER_DEFAULT, 0); - if (broken(1)) /* FIXME Reenable once Wine is less broken */ EXPECT(1,NUMPRS_THOUSANDS,NUMPRS_THOUSANDS,5,0,3); - todo_wine ok(np.dwOutFlags == NUMPRS_THOUSANDS, "Got dwOutFlags=%08x\n", np.dwOutFlags); EXPECTRGB(0,1); /* Don't test extra digits, see "1,000" test */ EXPECTRGB(4,FAILDIG); @@ -2235,9 +2231,7 @@ static void test_VarParseNumFromStrMisc(void) EXPECTFAIL; hres = wconvert_str(L"1|000", ARRAY_SIZE(rgb), NUMPRS_THOUSANDS|NUMPRS_CURRENCY, &np, rgb, LOCALE_USER_DEFAULT, 0); - if (broken(1)) /* FIXME Reenable once Wine is less broken */ EXPECT(1,NUMPRS_THOUSANDS|NUMPRS_CURRENCY,NUMPRS_THOUSANDS,5,0,3); - todo_wine ok(np.dwOutFlags == NUMPRS_THOUSANDS, "Got dwOutFlags=%08x\n", np.dwOutFlags); EXPECTRGB(0,1); /* Don't test extra digits, see "1,000" test */ EXPECTRGB(4,FAILDIG); @@ -2298,14 +2292,14 @@ static void test_VarParseNumFromStrMisc(void) SetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_STHOUSAND, L"\xa0"); hres = wconvert_str(L"1 000", ARRAY_SIZE(rgb), NUMPRS_THOUSANDS|NUMPRS_CURRENCY|NUMPRS_USE_ALL, &np, rgb, LOCALE_USER_DEFAULT, 0); - todo_wine EXPECT(1,NUMPRS_THOUSANDS|NUMPRS_CURRENCY|NUMPRS_USE_ALL,NUMPRS_THOUSANDS,5,0,3); + EXPECT(1,NUMPRS_THOUSANDS|NUMPRS_CURRENCY|NUMPRS_USE_ALL,NUMPRS_THOUSANDS,5,0,3); EXPECTRGB(0,1); /* Don't test extra digits, see "1,000" test */ EXPECTRGB(4,FAILDIG); /* Regular thousands separators also have precedence over the currency ones */ hres = wconvert_str(L"1\xa0\x30\x30\x30", ARRAY_SIZE(rgb), NUMPRS_THOUSANDS|NUMPRS_CURRENCY|NUMPRS_USE_ALL, &np, rgb, LOCALE_USER_DEFAULT, 0); - todo_wine EXPECT(1,NUMPRS_THOUSANDS|NUMPRS_CURRENCY|NUMPRS_USE_ALL,NUMPRS_THOUSANDS,5,0,3); + EXPECT(1,NUMPRS_THOUSANDS|NUMPRS_CURRENCY|NUMPRS_USE_ALL,NUMPRS_THOUSANDS,5,0,3); EXPECTRGB(0,1); /* Don't test extra digits, see "1,000" test */ EXPECTRGB(4,FAILDIG); diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index e4993de75a5..14ba63b9b2e 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -42,14 +42,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(variant); -static CRITICAL_SECTION cache_cs; -static CRITICAL_SECTION_DEBUG critsect_debug = -{ - 0, 0, &cache_cs, - { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": cache_cs") } -}; -static CRITICAL_SECTION cache_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; /* Convert a variant from one type to another */ static inline HRESULT VARIANT_Coerce(VARIANTARG* pd, LCID lcid, USHORT wFlags, @@ -1519,24 +1511,9 @@ HRESULT WINAPI VarUdateFromDate(DATE dateIn, ULONG dwFlags, UDATE *lpUdate) static void VARIANT_GetLocalisedNumberChars(VARIANT_NUMBER_CHARS *lpChars, LCID lcid, DWORD dwFlags) { static const VARIANT_NUMBER_CHARS defaultChars = { '-','+','.',',','$',0,'.',',' }; - static VARIANT_NUMBER_CHARS lastChars; - static LCID lastLcid = -1; - static DWORD lastFlags = 0; LCTYPE lctype = dwFlags & LOCALE_NOUSEROVERRIDE; WCHAR buff[4]; - /* To make caching thread-safe, a critical section is needed */ - EnterCriticalSection(&cache_cs); - - /* Asking for default locale entries is very expensive: It is a registry - server call. So cache one locally, as Microsoft does it too */ - if(lcid == lastLcid && dwFlags == lastFlags) - { - memcpy(lpChars, &lastChars, sizeof(defaultChars)); - LeaveCriticalSection(&cache_cs); - return; - } - memcpy(lpChars, &defaultChars, sizeof(defaultChars)); GET_NUMBER_TEXT(LOCALE_SNEGATIVESIGN, cNegativeSymbol); GET_NUMBER_TEXT(LOCALE_SPOSITIVESIGN, cPositiveSymbol); @@ -1556,11 +1533,6 @@ static void VARIANT_GetLocalisedNumberChars(VARIANT_NUMBER_CHARS *lpChars, LCID } TRACE("lcid 0x%x, cCurrencyLocal=%d,%d %s\n", lcid, lpChars->cCurrencyLocal, lpChars->cCurrencyLocal2, wine_dbgstr_w(buff)); - - memcpy(&lastChars, lpChars, sizeof(defaultChars)); - lastLcid = lcid; - lastFlags = dwFlags; - LeaveCriticalSection(&cache_cs); } /* Number Parsing States */

1 0

Alex Henrie : dxtrans: Add stub DLL.
by Alexandre Julliard Aug. 5, 2021

Aug. 5, 2021

Module: wine Branch: master Commit: 7e07d00d29738d7ddb78f0ea27a1cfa11397175b URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e07d00d29738d7ddb78f0ea… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Aug 5 00:13:21 2021 -0600 dxtrans: Add stub DLL. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50419 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/dxtrans/Makefile.in | 1 + dlls/dxtrans/dxtrans.spec | 11 +++++++++++ 4 files changed, 15 insertions(+) diff --git a/configure b/configure index 8b1cbf407b1..d3c60b4ff4c 100755 --- a/configure +++ b/configure @@ -1305,6 +1305,7 @@ enable_dxerr8 enable_dxerr9 enable_dxgi enable_dxguid +enable_dxtrans enable_dxva2 enable_esent enable_evr @@ -20544,6 +20545,7 @@ wine_fn_config_makefile dlls/dxerr9 enable_dxerr9 wine_fn_config_makefile dlls/dxgi enable_dxgi wine_fn_config_makefile dlls/dxgi/tests enable_tests wine_fn_config_makefile dlls/dxguid enable_dxguid +wine_fn_config_makefile dlls/dxtrans enable_dxtrans wine_fn_config_makefile dlls/dxva2 enable_dxva2 wine_fn_config_makefile dlls/dxva2/tests enable_tests wine_fn_config_makefile dlls/esent enable_esent diff --git a/configure.ac b/configure.ac index a42c2aff272..5d9ca31099e 100644 --- a/configure.ac +++ b/configure.ac @@ -3205,6 +3205,7 @@ WINE_CONFIG_MAKEFILE(dlls/dxerr9) WINE_CONFIG_MAKEFILE(dlls/dxgi) WINE_CONFIG_MAKEFILE(dlls/dxgi/tests) WINE_CONFIG_MAKEFILE(dlls/dxguid) +WINE_CONFIG_MAKEFILE(dlls/dxtrans) WINE_CONFIG_MAKEFILE(dlls/dxva2) WINE_CONFIG_MAKEFILE(dlls/dxva2/tests) WINE_CONFIG_MAKEFILE(dlls/esent) diff --git a/dlls/dxtrans/Makefile.in b/dlls/dxtrans/Makefile.in new file mode 100644 index 00000000000..b5c1602917f --- /dev/null +++ b/dlls/dxtrans/Makefile.in @@ -0,0 +1 @@ +MODULE = dxtrans.dll diff --git a/dlls/dxtrans/dxtrans.spec b/dlls/dxtrans/dxtrans.spec new file mode 100644 index 00000000000..7c2d605e534 --- /dev/null +++ b/dlls/dxtrans/dxtrans.spec @@ -0,0 +1,11 @@ +@ stub ?DXConstOverArray@@YGXPAVDXPMSAMPLE@@ABV1(a)K@Z +@ stub ?DXConstUnderArray@@YGXPAVDXPMSAMPLE@@ABV1(a)K@Z +@ stub ?DXDitherArray@@YGXPBUDXDITHERDESC@@@Z +@ stub ?DXLinearInterpolateArray@@YGXPBVDXBASESAMPLE@@PAUDXLIMAPINFO@@PAV1(a)K@Z +@ stub ?DXOverArray@@YGXPAVDXPMSAMPLE@@PBV1(a)K@Z +@ stub ?DXOverArrayMMX@@YGXPAVDXPMSAMPLE@@PBV1(a)K@Z +@ stdcall -private DllCanUnloadNow() +@ stub DllEnumClassObjects +@ stub DllGetClassObject +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer()

1 0

Rémi Bernon : hidclass.sys: Always copy InputReportByteLength bytes into read buffer.
by Alexandre Julliard Aug. 5, 2021

Aug. 5, 2021

Module: wine Branch: master Commit: e8c6f130714a96783c684f51e031bb062aba73cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=e8c6f130714a96783c684f51… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Aug 5 10:36:05 2021 +0200 hidclass.sys: Always copy InputReportByteLength bytes into read buffer. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 60 +++++++++++--------------------------- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 15 +++++----- 2 files changed, 25 insertions(+), 50 deletions(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index f1b0083fffd..a465cc53369 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -77,32 +77,6 @@ static void WINAPI read_cancel_routine(DEVICE_OBJECT *device, IRP *irp) IoCompleteRequest(irp, IO_NO_INCREMENT); } -static NTSTATUS copy_packet_into_buffer(HID_XFER_PACKET *packet, BYTE* buffer, ULONG buffer_length, ULONG *out_length) -{ - BOOL zero_id = (packet->reportId == 0); - - *out_length = 0; - - if ((zero_id && buffer_length > packet->reportBufferLen) || - (!zero_id && buffer_length >= packet->reportBufferLen)) - { - if (packet->reportId != 0) - { - memcpy(buffer, packet->reportBuffer, packet->reportBufferLen); - *out_length = packet->reportBufferLen; - } - else - { - buffer[0] = 0; - memcpy(&buffer[1], packet->reportBuffer, packet->reportBufferLen); - *out_length = packet->reportBufferLen + 1; - } - return STATUS_SUCCESS; - } - else - return STATUS_BUFFER_OVERFLOW; -} - static void hid_device_send_input(DEVICE_OBJECT *device, HID_XFER_PACKET *packet) { BASE_DEVICE_EXTENSION *ext = device->DeviceExtension; @@ -145,24 +119,24 @@ static void HID_Device_processQueue(DEVICE_OBJECT *device) IRP *irp; BASE_DEVICE_EXTENSION *ext = device->DeviceExtension; UINT buffer_size = RingBuffer_GetBufferSize(ext->u.pdo.ring_buffer); + const WINE_HIDP_PREPARSED_DATA *data = ext->u.pdo.preparsed_data; HID_XFER_PACKET *packet; packet = malloc(buffer_size); while((irp = pop_irp_from_queue(ext))) { - int ptr; - ptr = PtrToUlong( irp->Tail.Overlay.OriginalFileObject->FsContext ); + BYTE *buffer = irp->AssociatedIrp.SystemBuffer, *dst = buffer; + int ptr = PtrToUlong( irp->Tail.Overlay.OriginalFileObject->FsContext ); RingBuffer_Read(ext->u.pdo.ring_buffer, ptr, packet, &buffer_size); if (buffer_size) { - ULONG out_length; - IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation(irp); - packet->reportBuffer = (BYTE *)packet + sizeof(*packet); TRACE_(hid_report)("Processing Request (%i)\n",ptr); - irp->IoStatus.Status = copy_packet_into_buffer( packet, irp->AssociatedIrp.SystemBuffer, irpsp->Parameters.Read.Length, &out_length ); - irp->IoStatus.Information = out_length; + if (!data->reports[0].reportID) *dst++ = 0; + memcpy( dst, packet + 1, data->caps.InputReportByteLength - (dst - buffer) ); + irp->IoStatus.Information = packet->reportBufferLen; + irp->IoStatus.Status = STATUS_SUCCESS; } else { @@ -483,8 +457,7 @@ NTSTATUS WINAPI pdo_ioctl(DEVICE_OBJECT *device, IRP *irp) HID_XFER_PACKET *packet; ULONG buffer_len = irpsp->Parameters.DeviceIoControl.OutputBufferLength; UINT packet_size = sizeof(*packet) + buffer_len; - BYTE *buffer = MmGetSystemAddressForMdlSafe(irp->MdlAddress, NormalPagePriority); - ULONG out_length; + BYTE *buffer = MmGetSystemAddressForMdlSafe( irp->MdlAddress, NormalPagePriority ), *dst = buffer; if (!buffer) { @@ -510,7 +483,10 @@ NTSTATUS WINAPI pdo_ioctl(DEVICE_OBJECT *device, IRP *irp) sizeof(*packet), &irp->IoStatus ); if (irp->IoStatus.Status == STATUS_SUCCESS) - irp->IoStatus.Status = copy_packet_into_buffer( packet, buffer, buffer_len, &out_length ); + { + if (!data->reports[0].reportID) *dst++ = 0; + memcpy( dst, packet + 1, data->caps.InputReportByteLength - (dst - buffer) ); + } free(packet); break; } @@ -568,6 +544,7 @@ NTSTATUS WINAPI pdo_read(DEVICE_OBJECT *device, IRP *irp) const WINE_HIDP_PREPARSED_DATA *data = ext->u.pdo.preparsed_data; UINT buffer_size = RingBuffer_GetBufferSize(ext->u.pdo.ring_buffer); IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation(irp); + BYTE *buffer = irp->AssociatedIrp.SystemBuffer, *dst = buffer; NTSTATUS status; int ptr = -1; BOOL removed; @@ -599,13 +576,10 @@ NTSTATUS WINAPI pdo_read(DEVICE_OBJECT *device, IRP *irp) if (buffer_size) { - IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); - ULONG out_length; - packet->reportBuffer = (BYTE *)packet + sizeof(*packet); - TRACE_(hid_report)("Got Packet %p %i\n", packet->reportBuffer, packet->reportBufferLen); - - irp->IoStatus.Status = copy_packet_into_buffer( packet, irp->AssociatedIrp.SystemBuffer, irpsp->Parameters.Read.Length, &out_length ); - irp->IoStatus.Information = out_length; + if (!data->reports[0].reportID) *dst++ = 0; + memcpy( dst, packet + 1, data->caps.InputReportByteLength - (dst - buffer) ); + irp->IoStatus.Information = packet->reportBufferLen; + irp->IoStatus.Status = STATUS_SUCCESS; } else { diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 02f37773c67..aa22d72828c 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -2684,9 +2684,9 @@ static void test_hidp(HANDLE file, HANDLE async_file, int report_id, BOOL polled memset(report, 0xcd, sizeof(report)); SetLastError(0xdeadbeef); ret = ReadFile(file, report, caps.InputReportByteLength, &value, NULL); - todo_wine ok(ret, "ReadFile failed, last error %u\n", GetLastError()); + ok(ret, "ReadFile failed, last error %u\n", GetLastError()); todo_wine ok(value == (report_id ? 3 : 4), "ReadFile returned %x\n", value); - todo_wine ok(report[0] == report_id, "unexpected report data\n"); + ok(report[0] == report_id, "unexpected report data\n"); overlapped.hEvent = CreateEventA(NULL, FALSE, FALSE, NULL); overlapped2.hEvent = CreateEventA(NULL, FALSE, FALSE, NULL); @@ -2695,9 +2695,9 @@ static void test_hidp(HANDLE file, HANDLE async_file, int report_id, BOOL polled SetLastError(0xdeadbeef); while (ReadFile(async_file, report, caps.InputReportByteLength, NULL, &overlapped)) ResetEvent(overlapped.hEvent); - todo_wine ok(GetLastError() == ERROR_IO_PENDING, "ReadFile returned error %u\n", GetLastError()); + ok(GetLastError() == ERROR_IO_PENDING, "ReadFile returned error %u\n", GetLastError()); ret = GetOverlappedResult(async_file, &overlapped, &value, TRUE); - todo_wine ok(ret, "GetOverlappedResult failed, last error %u\n", GetLastError()); + ok(ret, "GetOverlappedResult failed, last error %u\n", GetLastError()); todo_wine ok(value == (report_id ? 3 : 4), "GetOverlappedResult returned length %u, expected 3\n", value); ResetEvent(overlapped.hEvent); @@ -2716,13 +2716,14 @@ static void test_hidp(HANDLE file, HANDLE async_file, int report_id, BOOL polled /* wait for first report to be ready */ ret = GetOverlappedResult(async_file, &overlapped, &value, TRUE); - todo_wine ok(ret, "GetOverlappedResult failed, last error %u\n", GetLastError()); + ok(ret, "GetOverlappedResult failed, last error %u\n", GetLastError()); todo_wine ok(value == (report_id ? 3 : 4), "GetOverlappedResult returned length %u, expected 3\n", value); /* second report should be ready and the same */ ret = GetOverlappedResult(async_file, &overlapped2, &value, FALSE); - todo_wine ok(ret, "GetOverlappedResult failed, last error %u\n", GetLastError()); + ok(ret, "GetOverlappedResult failed, last error %u\n", GetLastError()); todo_wine ok(value == (report_id ? 3 : 4), "GetOverlappedResult returned length %u, expected 3\n", value); - todo_wine ok(memcmp(report, buffer + caps.InputReportByteLength, caps.InputReportByteLength), "expected different report\n"); + ok(memcmp(report, buffer + caps.InputReportByteLength, caps.InputReportByteLength), + "expected different report\n"); ok(!memcmp(report, buffer, caps.InputReportByteLength), "expected identical reports\n"); CloseHandle(overlapped.hEvent);

1 0

Alex Henrie : include: Move DOT11_PHY_TYPE to windot11.h.
by Alexandre Julliard Aug. 5, 2021

Aug. 5, 2021

Module: wine Branch: master Commit: 946c128bc2ab035d2d61f7683b7361e6ac864218 URL: https://source.winehq.org/git/wine.git/?a=commit;h=946c128bc2ab035d2d61f768… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Aug 4 23:56:50 2021 -0600 include: Move DOT11_PHY_TYPE to windot11.h. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/windot11.h | 38 ++++++++++++++++++++++++++++++++++++++ include/wlanapi.h | 18 ++---------------- 3 files changed, 41 insertions(+), 16 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 9b397ffa183..3dbfe6561f2 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -759,6 +759,7 @@ SOURCES = \ wincrypt.h \ windef.h \ windns.h \ + windot11.h \ windows.foundation.collections.idl \ windows.foundation.idl \ windows.gaming.input.forcefeedback.idl \ diff --git a/include/windot11.h b/include/windot11.h new file mode 100644 index 00000000000..e14ed738213 --- /dev/null +++ b/include/windot11.h @@ -0,0 +1,38 @@ +/* + * Copyright (C) 2021 Alex Henrie + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _WINDOT11_H +#define _WINDOT11_H + +typedef enum _DOT11_PHY_TYPE +{ + dot11_phy_type_unknown = 0x00, + dot11_phy_type_any = 0x00, + dot11_phy_type_fhss = 0x01, + dot11_phy_type_dsss = 0x02, + dot11_phy_type_irbaseband = 0x03, + dot11_phy_type_ofdm = 0x04, + dot11_phy_type_hrdsss = 0x05, + dot11_phy_type_erp = 0x06, + dot11_phy_type_ht = 0x07, + dot11_phy_type_vht = 0x08, + dot11_phy_type_IHV_start = 0x80000000, + dot11_phy_type_IHV_end = 0xFFFFFFFF +} DOT11_PHY_TYPE, *PDOT11_PHY_TYPE; + +#endif /* _WINDOT11_H */ diff --git a/include/wlanapi.h b/include/wlanapi.h index 80de128a60f..02b787e09a1 100644 --- a/include/wlanapi.h +++ b/include/wlanapi.h @@ -19,6 +19,8 @@ #ifndef _WLAN_WLANAPI_H #define _WLAN_WLANAPI_H +#include <windot11.h> + typedef enum _WLAN_INTERFACE_STATE { wlan_interface_state_not_ready, @@ -105,22 +107,6 @@ typedef enum _DOT11_CIPHER_ALGORITHM DOT11_CIPHER_ALGO_IHV_END = 0xFFFFFFFF } DOT11_CIPHER_ALGORITHM, *PDOT11_CIPHER_ALGORITHM; -typedef enum _DOT11_PHY_TYPE -{ - dot11_phy_type_unknown = 0x00, - dot11_phy_type_any = 0x00, - dot11_phy_type_fhss = 0x01, - dot11_phy_type_dsss = 0x02, - dot11_phy_type_irbaseband = 0x03, - dot11_phy_type_ofdm = 0x04, - dot11_phy_type_hrdsss = 0x05, - dot11_phy_type_erp = 0x06, - dot11_phy_type_ht = 0x07, - dot11_phy_type_vht = 0x08, - dot11_phy_type_IHV_start = 0x80000000, - dot11_phy_type_IHV_end = 0xFFFFFFFF -} DOT11_PHY_TYPE, *PDOT11_PHY_TYPE; - #define WLAN_MAX_PHY_TYPE_NUMBER 8 typedef struct _WLAN_AVAILABLE_NETWORK

1 0