- Wine-Devel - list.winehq.org

[PATCH 1/4] hidclass.sys: Expose an ioctl to retrieve the raw input handle.
by Zebediah Figura June 6, 2022

June 6, 2022

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/hidclass.sys/device.c | 14 ++++++++++++++ include/ddk/hidclass.h | 5 +++++ 2 files changed, 19 insertions(+) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 9d917bbc674..db645495987 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -655,6 +655,20 @@ NTSTATUS WINAPI pdo_ioctl(DEVICE_OBJECT *device, IRP *irp) case IOCTL_HID_SET_OUTPUT_REPORT: status = hid_device_xfer_report( ext, code, irp ); break; + + case IOCTL_HID_GET_RAWINPUT_HANDLE: + if (irpsp->Parameters.DeviceIoControl.OutputBufferLength < sizeof(ULONG)) + { + status = STATUS_BUFFER_OVERFLOW; + } + else + { + *(ULONG *)irp->AssociatedIrp.SystemBuffer = ext->u.pdo.rawinput_handle; + irp->IoStatus.Information = sizeof(ULONG); + status = STATUS_SUCCESS; + } + break; + default: { ULONG code = irpsp->Parameters.DeviceIoControl.IoControlCode; diff --git a/include/ddk/hidclass.h b/include/ddk/hidclass.h index f5439ac8e95..253f309474d 100644 --- a/include/ddk/hidclass.h +++ b/include/ddk/hidclass.h @@ -58,6 +58,11 @@ DEFINE_GUID (GUID_DEVINTERFACE_HID, \ #define IOCTL_HID_SET_DRIVER_CONFIG HID_BUFFER_CTL_CODE(101) #define IOCTL_HID_GET_MS_GENRE_DESCRIPTOR HID_OUT_CTL_CODE(121) +/* Wine extension */ +#ifdef __WINESRC__ +#define IOCTL_HID_GET_RAWINPUT_HANDLE HID_BUFFER_CTL_CODE(300) +#endif + typedef struct _HID_COLLECTION_INFORMATION { ULONG DescriptorSize; BOOLEAN Polled; -- 2.35.1

2 4

[PATCH v2 0/9] MR180: misc: Fixes and workarounds for UAF warnings. (GCC12)
by Rémi Bernon June 6, 2022

June 6, 2022

The mscoree one is a genuine UAF bug, other are more arguably false positive but GCC doesn't like freed pointer value to be used in any way. -- v2: server: Avoid using pointer value after realloc. d3drm: Avoid using pointer value after free. dsound: Avoid using pointer value after free. notepad: Avoid using pointer value after free. msi: Avoid using pointer value after free. user32/tests: Workaround use after free warnings. oleaut32/tests: Workaround use after free warnings. mshtml/tests: Avoid using pointer value after free. mscoree: Avoid using pointer after free. https://gitlab.winehq.org/wine/wine/-/merge_requests/180

4 13

[PATCH] include: Allow making Wine Server requests from C++ code
by Mahdi Tayarani June 6, 2022

June 6, 2022

Using SERVER_START_REQ/SERVER_END_REQ in C++ code calls helper methods which need an explicit cast from a void* to __server_request_info*. Signed-off-by: Mahdi Tayarani <tayarani(a)google.com> --- include/wine/server.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/wine/server.h b/include/wine/server.h index b05271b7522..477868c5854 100644 --- a/include/wine/server.h +++ b/include/wine/server.h @@ -70,7 +70,7 @@ static inline data_size_t wine_server_reply_size( const void *reply ) /* add some data to be sent along with the request */ static inline void wine_server_add_data( void *req_ptr, const void *ptr, data_size_t size ) { - struct __server_request_info * const req = req_ptr; + struct __server_request_info * const req = (struct __server_request_info *)req_ptr; if (size) { req->data[req->data_count].ptr = ptr; @@ -82,7 +82,7 @@ static inline void wine_server_add_data( void *req_ptr, const void *ptr, data_si /* set the pointer and max size for the reply var data */ static inline void wine_server_set_reply( void *req_ptr, void *ptr, data_size_t max_size ) { - struct __server_request_info * const req = req_ptr; + struct __server_request_info * const req = (struct __server_request_info *)req_ptr; req->reply_data = ptr; req->u.req.request_header.reply_size = max_size; } -- 2.36.1.255.ge46751e96f-goog

4 7

TestBot News
by Francois Gouget June 6, 2022

June 6, 2022

New hardware ------------ The TestBot is getting two new VM hosts, gpu1 and gpu2. * Thanks to their i9-12900K processor they have much better multi-threaded performance: compiling Wine from scratch went from about 920 seconds on the old boxes to 220 seconds with 16 threads, and 190 seconds with 24 threads [1] (all numbers include the configure step). That should help with patches that touch Wine headers. * They also have much better single-thread performance. The first results indicate that they can run WineTest in Wine in about 20 minutes instead of 36 minutes. * They should support PCI-passthrough and each has an AMD RX 6600 and an Nvidia RTX 3050 graphics card. That means it should be possible to test every patch against these graphics cards (unlike the cw-rx460 and cw-gtx560 machines which only ran WineTest and were not fully part of the TestBot). * They should also be able to run Windows 11 in a VM. The sad news is that they literally replace cw-rx460 and cw-gtx560 so those two are no more. So PCI-passthrough is needed to provide continued tests against real GPUs. The current status: * gpu1 is in place and part of the TestBot but only runs 'vanilla' VMs. * gpu2 has now replaced cw-gtx560 but is not set up yet. I will first use it as a testbed to set up the PCI-passthrough and Windows 11 VMs. That way I'll be able to reboot gpu2 without impacting the TestBot. I will also document the result on the WineTestBot VMs page [2] in case anyone wants to do the same at home. VM updates ---------- * I updated debian11 and installed the fonts-arphic-uming package for the Chinese tests. I suspect the debian11 update caused a lot of new ddraw[12] failures. (950 failures / crash instead of 1 failure, qualitatively it makes no difference but it still needs to be investigated...) * I did a Windows Update on the w8 and w864 VMs. They are now fully updated and while going through the check list [2] I found items that probably were missing (e.g. not disabling defragmentation). * I changed the w8 CPU from kvm32 to core2duo because Windows would not boot otherwise; seemingly due to the lack of support for the NX bit. I suspect that's because the host CPU went from AMD to Intel and QEmu failed to insulate the guest from that despite the kvm32 virtual CPU type. w864 was already running with the QEmu CPU set to core2duo so that should be ok. VM reshuffling -------------- I moved the VMs around to take advantage of the new gpu1 box. * vm3 and vm4 are now dedicated to running w1064* and w10pro64* respectively (before they had one additional VM each). This should help reduce the period of time during which the TestBot is less responsive due to the nightly WineTest runs. * I moved debian11 and debiant to gpu1 so they benefit from the faster compilations and faster WineTest runs. (WineTest is much slower in Wine than on Windows so maximum benefit there) * I moved w864 to gpu1. The good thing is that this confirmed the old VMs work on the new boxes too (see the kvm32 issue above). * I moved all the other Windows VMs to vm1. * Next the plan is to move the build VM somewhere and to retire the vm2 host. There will be one more reshuffling once gpu2 is in place but what happens then will depend very much on how many test configurations use the PCI-passthrough, Windows 11, and GitLab. [1] Note: when building a Wine build server it seems one needs between 350 and 400 MB per compilation thread. For now I have allocated 16 threads to the VMs but, given that they currently still only run one VM at a time, giving them access to all 24 thread may make more sense. There is also the issue of performance vs efficiency cores. But making sure the VMs only use performance cores would require CPU-pinning and I don't want to go there unless proven necessary. [2] https://wiki.winehq.org/Wine_TestBot_VMs#Windows_configuration -- Francois Gouget <fgouget(a)codeweavers.com>

1 0

[PATCH v2] vbscript: Implement IsDate().
by Robert Wilhelm June 6, 2022

June 6, 2022

Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> --- dlls/vbscript/global.c | 9 +++++++-- dlls/vbscript/tests/api.vbs | 14 ++++++++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 90cfd557038..731a062dea2 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -935,8 +935,13 @@ static HRESULT Global_VarType(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt static HRESULT Global_IsDate(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("%s\n", debugstr_variant(arg)); + + if(res) { + V_VT(res) = VT_BOOL; + V_BOOL(res) = V_VT(arg) == VT_DATE ? VARIANT_TRUE : VARIANT_FALSE; + } + return S_OK; } static HRESULT Global_IsEmpty(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index be1d4a806c0..b9c2149aa56 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -181,6 +181,20 @@ Call ok(not isObject(4), "isObject(4) is true?") Call ok(not isObject("x"), "isObject(""x"") is true?") Call ok(not isObject(Null), "isObject(Null) is true?") +Call ok(not isDate(new EmptyClass), "isDate(new EmptyClass) is true?") +Set x = new EmptyClass +Call ok(not isDate(x), "isDate(x) is true?") +x = CDate(1) +Call ok(isDate(x), "isDate(x) is not true?") +Call ok(isDate(#1/1/2000#), "isDate(#1/1/2000#) is not true?") +Call ok(not isDate(empty), "isDate(empty) is true?") +Call ok(not isDate(Nothing), "isDate(Nothing) is true?") +Call ok(not isDate(true), "isDate(true) is true?") +Call ok(not isDate(4), "isDate(4) is true?") +Call ok(not isDate("4"), "isDate(""4"") is true?") +Call ok(not isDate("x"), "isDate(""x"") is true?") +Call ok(not isDate(Null), "isDate(Null) is true?") + Call ok(not isEmpty(new EmptyClass), "isEmpty(new EmptyClass) is true?") Set x = new EmptyClass Call ok(not isEmpty(x), "isEmpty(x) is true?") -- 2.36.1

2 1

[PATCH 1/2] jscript: Only remove one reference to each entry when clearing the Map.
by Gabriel Ivăncescu June 6, 2022

June 6, 2022

Checking for list_empty doesn't stop until all entries have been removed, no matter their ref count. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/set.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/set.c b/dlls/jscript/set.c index d1ea663..951c5ba 100644 --- a/dlls/jscript/set.c +++ b/dlls/jscript/set.c @@ -223,6 +223,7 @@ static HRESULT iterate_map(MapInstance *map, script_ctx_t *ctx, unsigned argc, j static HRESULT Map_clear(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { + struct jsval_map_entry *entry, *entry2; MapInstance *map; HRESULT hres; @@ -232,10 +233,8 @@ static HRESULT Map_clear(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned TRACE("%p\n", map); - while(!list_empty(&map->entries)) { - struct jsval_map_entry *entry = LIST_ENTRY(list_head(&map->entries), struct jsval_map_entry, list_entry); + LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &map->entries, struct jsval_map_entry, list_entry) delete_map_entry(map, entry); - } if(r) *r = jsval_undefined(); return S_OK; -- 2.34.1

1 1

[PATCH v2 0/6] MR173: preparation for sharing code in d3dx10/d3dx11
by Piotr Caban (＠piotr) June 6, 2022

June 6, 2022

- use CRT allocators - share data loading code - implement D3DX10CreateAsyncTextureInfoProcessor -- v2: d3dx10/tests: Add D3DX10CreateAsyncTextureInfoProcessor tests. d3dx10: Add D3DX10CreateAsyncTextureInfoProcessor implementation. d3dx10: Share code for resource data loading. d3dx10: Share code for file data loading. d3dx11: Use CRT memory allocators. d3dx10: Use CRT memory allocators. https://gitlab.winehq.org/wine/wine/-/merge_requests/173

3 7

[PATCH] cryptnet: Resolve object id to algorithm id when verifying OCSP response.
by Torge Matthies June 6, 2022

June 6, 2022

From: Torge Matthies <tmatthies(a)codeweavers.com> Instead of only allowing the SHA256RSA algorithm. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53102 Signed-off-by: Torge Matthies <tmatthies(a)codeweavers.com> --- dlls/cryptnet/cryptnet_main.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index e8c17407a9b..ac282f5aa82 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -1918,6 +1918,7 @@ static DWORD verify_signed_ocsp_response_info(const CERT_INFO *cert, const CERT_ HCRYPTPROV prov = 0; HCRYPTHASH hash = 0; HCRYPTKEY key = 0; + DWORD algid; if (!CryptDecodeObjectEx(X509_ASN_ENCODING, OCSP_BASIC_SIGNED_RESPONSE, blob->pbData, blob->cbData, CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &size)) return GetLastError(); @@ -1925,7 +1926,7 @@ static DWORD verify_signed_ocsp_response_info(const CERT_INFO *cert, const CERT_ if ((error = check_ocsp_response_info(cert, issuer, &info->ToBeSigned, &status))) goto done; alg = &info->SignatureInfo.SignatureAlgorithm; - if (!alg->pszObjId || strcmp(alg->pszObjId, szOID_RSA_SHA256RSA)) + if (!alg->pszObjId || !(algid = CertOIDToAlgId(alg->pszObjId))) { FIXME("unhandled signature algorithm %s\n", debugstr_a(alg->pszObjId)); error = CRYPT_E_NO_REVOCATION_CHECK; @@ -1933,7 +1934,7 @@ static DWORD verify_signed_ocsp_response_info(const CERT_INFO *cert, const CERT_ } if (!CryptAcquireContextW(&prov, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT)) goto done; - if (!CryptCreateHash(prov, CALG_SHA_256, 0, 0, &hash)) goto done; + if (!CryptCreateHash(prov, algid, 0, 0, &hash)) goto done; if (!CryptHashData(hash, info->ToBeSigned.pbData, info->ToBeSigned.cbData, 0)) goto done; sig = &info->SignatureInfo.Signature; -- 2.36.1

2 1

[PATCH 0/1] MR186: secur32/schannel: Avoid use-after-free in AcquireClientCredentials() (Coverity).
by Nikolay Sivov (＠nsivov) June 6, 2022

June 6, 2022

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/186

3 2

[PATCH v2] include: Define atomic read/write helpers for 32-bit integers.
by Jinoh Kang June 6, 2022

June 6, 2022

Based on the corresponding functions from Windows SDK header files. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- v1 -> v2: Remove *ULong* wrappers (not needed immediately) include/winnt.h | 92 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) diff --git a/include/winnt.h b/include/winnt.h index 87c4b4da92d..370ed3adce6 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6475,6 +6475,61 @@ static FORCEINLINE void MemoryBarrier(void) #endif /* __i386__ */ +/* Since Visual Studio 2012, volatile accesses do not always imply acquire and + * release semantics. We explicitly use ISO volatile semantics, manually + * placing barriers as appropriate. + */ +#if _MSC_VER >= 1700 +#pragma intrinsic(__iso_volatile_load32) +#pragma intrinsic(__iso_volatile_store32) +#define __WINE_ISO_VOLATILE_LOAD_32(src) (__iso_volatile_load32(src)) +#define __WINE_ISO_VOLATILE_STORE_32(dest, value) (__iso_volatile_store32(dest, value)) +#else /* _MSC_VER >= 1700 */ +#define __WINE_ISO_VOLATILE_LOAD_32(src) (*(src)) +#define __WINE_ISO_VOLATILE_STORE_32(dest, value) ((void)(*(dest) = (value))) +#endif /* _MSC_VER >= 1700 */ + +#if defined(__i386__) || defined(__x86_64__) +#pragma intrinsic(_ReadWriteBarrier) +void _ReadWriteBarrier(void); +#endif /* defined(__i386__) || defined(__x86_64__) */ + +static void __wine_memory_barrier_acq_rel(void) +{ +#if defined(__i386__) || defined(__x86_64__) +#pragma warning(suppress:4996) + _ReadWriteBarrier(); +#elif defined(__arm__) + __dmb(_ARM_BARRIER_ISH); +#elif defined(__aarch64__) + __dmb(_ARM64_BARRIER_ISH); +#endif /* defined(__i386__) || defined(__x86_64__) */ +} + +static FORCEINLINE LONG ReadAcquire( LONG const volatile *src ) +{ + LONG value = __WINE_ISO_VOLATILE_LOAD_32( (int const volatile *)src ); + __wine_memory_barrier_acq_rel(); + return value; +} + +static FORCEINLINE LONG ReadNoFence( LONG const volatile *src ) +{ + LONG value = __WINE_ISO_VOLATILE_LOAD_32( (int const volatile *)src ); + return value; +} + +static FORCEINLINE void WriteRelease( LONG volatile *dest, LONG value ) +{ + __wine_memory_barrier_acq_rel(); + __WINE_ISO_VOLATILE_STORE_32( (int volatile *)dest, value ); +} + +static FORCEINLINE void WriteNoFence( LONG volatile *dest, LONG value ) +{ + __WINE_ISO_VOLATILE_STORE_32( (int volatile *)dest, value ); +} + #elif defined(__GNUC__) static FORCEINLINE BOOLEAN WINAPI BitScanForward(DWORD *index, DWORD mask) @@ -6588,6 +6643,43 @@ static FORCEINLINE void MemoryBarrier(void) __sync_synchronize(); } +#if defined(__x86_64__) || defined(__i386__) +/* On x86, Support old GCC with either no or buggy (GCC BZ#81316) __atomic_* support */ +#define __WINE_ATOMIC_LOAD_ACQUIRE(ptr, ret) do { *(ret) = *(ptr); __asm__ __volatile__( "" ::: "memory" ); } while (0) +#define __WINE_ATOMIC_LOAD_RELAXED(ptr, ret) do { *(ret) = *(ptr); } while (0) +#define __WINE_ATOMIC_STORE_RELEASE(ptr, val) do { __asm__ __volatile__( "" ::: "memory" ); *(ptr) = *(val); } while (0) +#define __WINE_ATOMIC_STORE_RELAXED(ptr, val) do { *(ptr) = *(val); } while (0) +#else +#define __WINE_ATOMIC_LOAD_ACQUIRE(ptr, ret) __atomic_load(ptr, ret, __ATOMIC_ACQUIRE) +#define __WINE_ATOMIC_LOAD_RELAXED(ptr, ret) __atomic_load(ptr, ret, __ATOMIC_RELAXED) +#define __WINE_ATOMIC_STORE_RELEASE(ptr, val) __atomic_store(ptr, val, __ATOMIC_RELEASE) +#define __WINE_ATOMIC_STORE_RELAXED(ptr, val) __atomic_store(ptr, val, __ATOMIC_RELAXED) +#endif /* defined(__x86_64__) || defined(__i386__) */ + +static FORCEINLINE LONG ReadAcquire( LONG const volatile *src ) +{ + LONG value; + __WINE_ATOMIC_LOAD_ACQUIRE( src, &value ); + return value; +} + +static FORCEINLINE LONG ReadNoFence( LONG const volatile *src ) +{ + LONG value; + __WINE_ATOMIC_LOAD_RELAXED( src, &value ); + return value; +} + +static FORCEINLINE void WriteRelease( LONG volatile *dest, LONG value ) +{ + __WINE_ATOMIC_STORE_RELEASE( dest, &value ); +} + +static FORCEINLINE void WriteNoFence( LONG volatile *dest, LONG value ) +{ + __WINE_ATOMIC_STORE_RELAXED( dest, &value ); +} + static FORCEINLINE DECLSPEC_NORETURN void __fastfail(unsigned int code) { #if defined(__x86_64__) || defined(__i386__) -- 2.35.3

1 0