July 2023 - Wine-Commits - list.winehq.org

Mohamad Al-Jaf : windows.networking.hostname/tests: Check if passed HSTRING is duplicated.
by Alexandre Julliard July 24, 2023

July 24, 2023

Module: wine Branch: master Commit: 95bfbdc87f13f6f38b81e5cce84632a9eee5a207 URL: https://gitlab.winehq.org/wine/wine/-/commit/95bfbdc87f13f6f38b81e5cce84632… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Sat Jul 8 00:40:57 2023 -0400 windows.networking.hostname/tests: Check if passed HSTRING is duplicated. --- dlls/windows.networking.hostname/tests/hostname.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/windows.networking.hostname/tests/hostname.c b/dlls/windows.networking.hostname/tests/hostname.c index 7c6cfd559ea..ad5440a9f65 100644 --- a/dlls/windows.networking.hostname/tests/hostname.c +++ b/dlls/windows.networking.hostname/tests/hostname.c @@ -51,6 +51,7 @@ static void test_HostnameStatics(void) static const WCHAR *ip = L"192.168.0.0"; IHostNameFactory *hostnamefactory; IActivationFactory *factory; + HSTRING_HEADER header; HSTRING str, rawname; IHostName *hostname; HRESULT hr; @@ -75,7 +76,7 @@ static void test_HostnameStatics(void) hr = IActivationFactory_QueryInterface( factory, &IID_IHostNameFactory, (void **)&hostnamefactory ); ok( hr == S_OK, "got hr %#lx.\n", hr ); - hr = WindowsCreateString( ip, wcslen( ip ), &str ); + hr = WindowsCreateStringReference( ip, wcslen( ip ), &header, &str ); ok( hr == S_OK, "got hr %#lx.\n", hr ); hr = IHostNameFactory_CreateHostName( hostnamefactory, NULL, &hostname ); @@ -100,6 +101,7 @@ static void test_HostnameStatics(void) hr = WindowsCompareStringOrdinal( str, rawname, &res ); ok( hr == S_OK, "got hr %#lx.\n", hr ); ok( !res, "got unexpected string %s.\n", debugstr_hstring(rawname) ); + todo_wine ok( str != rawname, "got same HSTRINGs %p, %p.\n", str, rawname ); WindowsDeleteString( str ); WindowsDeleteString( rawname );

1 0

Mohamad Al-Jaf : windows.devices.usb: Implement IUsbDeviceStatics::GetDeviceSelectorVidPidOnly().
by Alexandre Julliard July 24, 2023

July 24, 2023

Module: wine Branch: master Commit: d78579a24b709ec438454c15201a0743cd9b5c78 URL: https://gitlab.winehq.org/wine/wine/-/commit/d78579a24b709ec438454c15201a07… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Wed Jul 5 23:02:16 2023 -0400 windows.devices.usb: Implement IUsbDeviceStatics::GetDeviceSelectorVidPidOnly(). Needed for Lenovo Ready for Assistant. --- dlls/windows.devices.usb/usbdevice.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/windows.devices.usb/usbdevice.c b/dlls/windows.devices.usb/usbdevice.c index 62c12d7c3e7..a42281fbe48 100644 --- a/dlls/windows.devices.usb/usbdevice.c +++ b/dlls/windows.devices.usb/usbdevice.c @@ -133,8 +133,22 @@ static HRESULT WINAPI usb_device_statics_GetDeviceSelectorGuidOnly( IUsbDeviceSt static HRESULT WINAPI usb_device_statics_GetDeviceSelectorVidPidOnly( IUsbDeviceStatics *iface, UINT32 vendor, UINT32 product, HSTRING *value ) { - FIXME( "iface %p, vendor %d, product %d, value %p stub!\n", iface, vendor, product, value ); - return E_NOTIMPL; + static const WCHAR *format = L"System.Devices.InterfaceClassGuid:=\"{DEE824EF-729B-4A0E-9C14-B7117D33A817}\"" + L" AND System.Devices.InterfaceEnabled:=System.StructuredQueryType.Boolean#True" + L" AND System.DeviceInterface.WinUsb.UsbVendorId:=%d" + L" AND System.DeviceInterface.WinUsb.UsbProductId:=%d"; + WCHAR buffer[254 + 20]; + HRESULT hr; + + TRACE( "iface %p, vendor %d, product %d, value %p.\n", iface, vendor, product, value ); + + if (!value) return E_INVALIDARG; + + swprintf( buffer, ARRAYSIZE(buffer), format, (INT32)vendor, (INT32)product ); + hr = WindowsCreateString( buffer, wcslen(buffer), value ); + + TRACE( "Returning value = %s\n", debugstr_hstring(*value) ); + return hr; } static HRESULT WINAPI usb_device_statics_GetDeviceClassSelector( IUsbDeviceStatics *iface, IUsbDeviceClass *class, HSTRING *value )

1 0

Mohamad Al-Jaf : windows.networking.hostname: Duplicate passed HSTRING in IHostNameFactory::CreateHostName().
by Alexandre Julliard July 24, 2023

July 24, 2023

Module: wine Branch: master Commit: ce3ccccb2c29c49daf46a223e0800ba9be77804e URL: https://gitlab.winehq.org/wine/wine/-/commit/ce3ccccb2c29c49daf46a223e0800b… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Sat Jul 8 00:49:25 2023 -0400 windows.networking.hostname: Duplicate passed HSTRING in IHostNameFactory::CreateHostName(). --- dlls/windows.networking.hostname/hostname.c | 14 +++++++++++--- dlls/windows.networking.hostname/tests/hostname.c | 2 +- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/windows.networking.hostname/hostname.c b/dlls/windows.networking.hostname/hostname.c index c941e7ada89..6f0d3fb9032 100644 --- a/dlls/windows.networking.hostname/hostname.c +++ b/dlls/windows.networking.hostname/hostname.c @@ -120,7 +120,7 @@ struct hostname IHostName IHostName_iface; LONG ref; - HSTRING rawname; + HSTRING raw_name; }; static inline struct hostname *impl_from_IHostName( IHostName *iface ) @@ -161,7 +161,15 @@ static ULONG WINAPI hostname_Release( IHostName *iface ) { struct hostname *impl = impl_from_IHostName( iface ); ULONG ref = InterlockedDecrement( &impl->ref ); + TRACE( "iface %p decreasing refcount to %lu.\n", iface, ref ); + + if (!ref) + { + WindowsDeleteString( impl->raw_name ); + free( impl ); + } + return ref; } @@ -196,7 +204,7 @@ static HRESULT WINAPI hostname_get_RawName( IHostName *iface, HSTRING *value ) TRACE( "iface %p, value %p.\n", iface, value ); if (!value) return E_INVALIDARG; - return WindowsDuplicateString( impl->rawname, value ); + return WindowsDuplicateString( impl->raw_name, value ); } static HRESULT WINAPI hostname_get_DisplayName( IHostName *iface, HSTRING *value ) @@ -255,7 +263,7 @@ static HRESULT WINAPI hostname_factory_CreateHostName( IHostNameFactory *iface, impl->IHostName_iface.lpVtbl = &hostname_vtbl; impl->ref = 1; - impl->rawname = name; + WindowsDuplicateString( name, &impl->raw_name ); *value = &impl->IHostName_iface; TRACE( "created IHostName %p.\n", *value ); diff --git a/dlls/windows.networking.hostname/tests/hostname.c b/dlls/windows.networking.hostname/tests/hostname.c index ad5440a9f65..e7ecc22cbc9 100644 --- a/dlls/windows.networking.hostname/tests/hostname.c +++ b/dlls/windows.networking.hostname/tests/hostname.c @@ -101,7 +101,7 @@ static void test_HostnameStatics(void) hr = WindowsCompareStringOrdinal( str, rawname, &res ); ok( hr == S_OK, "got hr %#lx.\n", hr ); ok( !res, "got unexpected string %s.\n", debugstr_hstring(rawname) ); - todo_wine ok( str != rawname, "got same HSTRINGs %p, %p.\n", str, rawname ); + ok( str != rawname, "got same HSTRINGs %p, %p.\n", str, rawname ); WindowsDeleteString( str ); WindowsDeleteString( rawname );

1 0

Mohamad Al-Jaf : windows.devices.usb: Add IUsbDeviceStatics stub interface.
by Alexandre Julliard July 24, 2023

July 24, 2023

Module: wine Branch: master Commit: 1450dd791e19954e3455bc67a04c619e81d165de URL: https://gitlab.winehq.org/wine/wine/-/commit/1450dd791e19954e3455bc67a04c61… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Mon Jul 3 04:48:26 2023 -0400 windows.devices.usb: Add IUsbDeviceStatics stub interface. --- dlls/windows.devices.usb/private.h | 38 +++++++++++++++++++++++ dlls/windows.devices.usb/tests/usb.c | 6 ++++ dlls/windows.devices.usb/usbdevice.c | 60 ++++++++++++++++++++++++++++++++++++ 3 files changed, 104 insertions(+) diff --git a/dlls/windows.devices.usb/private.h b/dlls/windows.devices.usb/private.h index e650a1d138d..ad1af114737 100644 --- a/dlls/windows.devices.usb/private.h +++ b/dlls/windows.devices.usb/private.h @@ -37,4 +37,42 @@ extern IActivationFactory *usb_device_factory; +#define DEFINE_IINSPECTABLE_( pfx, iface_type, impl_type, impl_from, iface_mem, expr ) \ + static inline impl_type *impl_from( iface_type *iface ) \ + { \ + return CONTAINING_RECORD( iface, impl_type, iface_mem ); \ + } \ + static HRESULT WINAPI pfx##_QueryInterface( iface_type *iface, REFIID iid, void **out ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_QueryInterface( (IInspectable *)(expr), iid, out ); \ + } \ + static ULONG WINAPI pfx##_AddRef( iface_type *iface ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_AddRef( (IInspectable *)(expr) ); \ + } \ + static ULONG WINAPI pfx##_Release( iface_type *iface ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_Release( (IInspectable *)(expr) ); \ + } \ + static HRESULT WINAPI pfx##_GetIids( iface_type *iface, ULONG *iid_count, IID **iids ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_GetIids( (IInspectable *)(expr), iid_count, iids ); \ + } \ + static HRESULT WINAPI pfx##_GetRuntimeClassName( iface_type *iface, HSTRING *class_name ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_GetRuntimeClassName( (IInspectable *)(expr), class_name ); \ + } \ + static HRESULT WINAPI pfx##_GetTrustLevel( iface_type *iface, TrustLevel *trust_level ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_GetTrustLevel( (IInspectable *)(expr), trust_level ); \ + } +#define DEFINE_IINSPECTABLE( pfx, iface_type, impl_type, base_iface ) \ + DEFINE_IINSPECTABLE_( pfx, iface_type, impl_type, impl_from_##iface_type, iface_type##_iface, &impl->base_iface ) + #endif diff --git a/dlls/windows.devices.usb/tests/usb.c b/dlls/windows.devices.usb/tests/usb.c index 938014ae8fe..5e6f3be6d31 100644 --- a/dlls/windows.devices.usb/tests/usb.c +++ b/dlls/windows.devices.usb/tests/usb.c @@ -48,6 +48,7 @@ static void check_interface_( unsigned int line, void *obj, const IID *iid ) static void test_UsbDevicesStatics(void) { static const WCHAR *usb_device_statics_name = L"Windows.Devices.Usb.UsbDevice"; + IUsbDeviceStatics *usb_device_statics; IActivationFactory *factory; HSTRING str; HRESULT hr; @@ -69,6 +70,11 @@ static void test_UsbDevicesStatics(void) check_interface( factory, &IID_IInspectable ); check_interface( factory, &IID_IAgileObject ); + hr = IActivationFactory_QueryInterface( factory, &IID_IUsbDeviceStatics, (void **)&usb_device_statics ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + + ref = IUsbDeviceStatics_Release( usb_device_statics ); + ok( ref == 2, "got ref %ld.\n", ref ); ref = IActivationFactory_Release( factory ); ok( ref == 1, "got ref %ld.\n", ref ); } diff --git a/dlls/windows.devices.usb/usbdevice.c b/dlls/windows.devices.usb/usbdevice.c index e137055cf9c..62c12d7c3e7 100644 --- a/dlls/windows.devices.usb/usbdevice.c +++ b/dlls/windows.devices.usb/usbdevice.c @@ -25,6 +25,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(usb); struct usb_device_statics { IActivationFactory IActivationFactory_iface; + IUsbDeviceStatics IUsbDeviceStatics_iface; LONG ref; }; @@ -49,6 +50,13 @@ static HRESULT WINAPI factory_QueryInterface( IActivationFactory *iface, REFIID return S_OK; } + if (IsEqualGUID( iid, &IID_IUsbDeviceStatics )) + { + *out = &impl->IUsbDeviceStatics_iface; + IInspectable_AddRef( *out ); + return S_OK; + } + FIXME( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); *out = NULL; return E_NOINTERFACE; @@ -107,9 +115,61 @@ static const struct IActivationFactoryVtbl factory_vtbl = factory_ActivateInstance, }; +DEFINE_IINSPECTABLE( usb_device_statics, IUsbDeviceStatics, struct usb_device_statics, IActivationFactory_iface ) + +static HRESULT WINAPI usb_device_statics_GetDeviceSelector( IUsbDeviceStatics *iface, UINT32 vendor, + UINT32 product, GUID class, HSTRING *value ) +{ + FIXME( "iface %p, vendor %d, product %d, class %s, value %p stub!\n", iface, vendor, product, debugstr_guid(&class), value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI usb_device_statics_GetDeviceSelectorGuidOnly( IUsbDeviceStatics *iface, GUID class, HSTRING *value ) +{ + FIXME( "iface %p, class %s, value %p stub!\n", iface, debugstr_guid(&class), value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI usb_device_statics_GetDeviceSelectorVidPidOnly( IUsbDeviceStatics *iface, UINT32 vendor, + UINT32 product, HSTRING *value ) +{ + FIXME( "iface %p, vendor %d, product %d, value %p stub!\n", iface, vendor, product, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI usb_device_statics_GetDeviceClassSelector( IUsbDeviceStatics *iface, IUsbDeviceClass *class, HSTRING *value ) +{ + FIXME( "iface %p, class %p, value %p stub!\n", iface, class, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI usb_device_statics_FromIdAsync( IUsbDeviceStatics *iface, HSTRING id, IAsyncOperation_UsbDevice **operation ) +{ + FIXME( "iface %p, id %s, operation %p stub!\n", iface, debugstr_hstring(id), operation ); + return E_NOTIMPL; +} + +static const struct IUsbDeviceStaticsVtbl usb_device_statics_vtbl = +{ + usb_device_statics_QueryInterface, + usb_device_statics_AddRef, + usb_device_statics_Release, + /* IInspectable methods */ + usb_device_statics_GetIids, + usb_device_statics_GetRuntimeClassName, + usb_device_statics_GetTrustLevel, + /* IUsbDeviceStatics methods */ + usb_device_statics_GetDeviceSelector, + usb_device_statics_GetDeviceSelectorGuidOnly, + usb_device_statics_GetDeviceSelectorVidPidOnly, + usb_device_statics_GetDeviceClassSelector, + usb_device_statics_FromIdAsync, +}; + static struct usb_device_statics usb_device_statics = { {&factory_vtbl}, + {&usb_device_statics_vtbl}, 1, };

1 0

Mohamad Al-Jaf : include: Add support for IAsyncOperation parameterized type IBuffer.
by Alexandre Julliard July 24, 2023

July 24, 2023

Module: wine Branch: master Commit: 4871777b780a04e0a4e07ed2b58a3c37af655a05 URL: https://gitlab.winehq.org/wine/wine/-/commit/4871777b780a04e0a4e07ed2b58a3c… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Mon Jul 3 03:43:32 2023 -0400 include: Add support for IAsyncOperation parameterized type IBuffer. Needed by windows.devices.usb.idl. --- include/windows.storage.streams.idl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/windows.storage.streams.idl b/include/windows.storage.streams.idl index bb107b25976..9255fb43ff3 100644 --- a/include/windows.storage.streams.idl +++ b/include/windows.storage.streams.idl @@ -35,6 +35,11 @@ namespace Windows.Storage.Streams { interface IRandomAccessStreamWithContentType; runtimeclass Buffer; + declare { + interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Storage.Streams.IBuffer *>; + interface Windows.Foundation.IAsyncOperation<Windows.Storage.Streams.IBuffer *>; + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), uuid(905a0fe0-bc53-11df-8c49-001e4fc686da)

1 0

Mohamad Al-Jaf : windows.devices.usb: Add stub DLL.
by Alexandre Julliard July 24, 2023

July 24, 2023

Module: wine Branch: master Commit: 701a0506411040b50cf49eda2eabd7f98dd73ffd URL: https://gitlab.winehq.org/wine/wine/-/commit/701a0506411040b50cf49eda2eabd7… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Mon Jul 3 03:59:31 2023 -0400 windows.devices.usb: Add stub DLL. --- configure | 3 + configure.ac | 2 + dlls/windows.devices.usb/Makefile.in | 9 ++ dlls/windows.devices.usb/classes.idl | 23 +++++ dlls/windows.devices.usb/main.c | 46 +++++++++ dlls/windows.devices.usb/private.h | 40 ++++++++ dlls/windows.devices.usb/tests/Makefile.in | 5 + dlls/windows.devices.usb/tests/usb.c | 86 ++++++++++++++++ dlls/windows.devices.usb/usbdevice.c | 116 ++++++++++++++++++++++ dlls/windows.devices.usb/windows.devices.usb.spec | 3 + 10 files changed, 333 insertions(+)

1 0

Mohamad Al-Jaf : include: Add windows.devices.usb.idl file.
by Alexandre Julliard July 24, 2023

July 24, 2023

Module: wine Branch: master Commit: 08d05121130a01f6a55fb2532dea340d20de1849 URL: https://gitlab.winehq.org/wine/wine/-/commit/08d05121130a01f6a55fb2532dea34… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Mon Jul 3 03:45:14 2023 -0400 include: Add windows.devices.usb.idl file. --- include/Makefile.in | 1 + include/windows.devices.usb.idl | 177 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 178 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 53d4d0fe3fb..b810f7e8442 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -816,6 +816,7 @@ SOURCES = \ windows.devices.haptics.idl \ windows.devices.power.idl \ windows.devices.radios.idl \ + windows.devices.usb.idl \ windows.foundation.collections.idl \ windows.foundation.idl \ windows.foundation.metadata.idl \ diff --git a/include/windows.devices.usb.idl b/include/windows.devices.usb.idl new file mode 100644 index 00000000000..40d4312d9de --- /dev/null +++ b/include/windows.devices.usb.idl @@ -0,0 +1,177 @@ +/* + * Copyright (C) 2023 Mohamad Al-Jaf + * + * 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 + */ + +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + +import "inspectable.idl"; +import "asyncinfo.idl"; +import "eventtoken.idl"; +import "windowscontracts.idl"; +import "windows.foundation.idl"; +import "windows.storage.streams.idl"; + +namespace Windows.Devices.Usb { + interface IUsbDevice; + interface IUsbDeviceClass; + interface IUsbConfiguration; + interface IUsbDeviceDescriptor; + interface IUsbDeviceStatics; + interface IUsbInterface; + interface IUsbSetupPacket; + interface IUsbSetupPacketFactory; + + runtimeclass UsbConfiguration; + runtimeclass UsbDevice; + runtimeclass UsbDeviceClass; + runtimeclass UsbDeviceDescriptor; + runtimeclass UsbInterface; + runtimeclass UsbSetupPacket; + + declare { + interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Devices.Usb.UsbDevice *>; + interface Windows.Foundation.IAsyncOperation<Windows.Devices.Usb.UsbDevice *>; + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Devices.Usb.UsbDevice), + uuid(5249b992-c456-44d5-ad5e-24f5a089f63b) + ] + interface IUsbDevice : IInspectable + requires Windows.Foundation.IClosable + { + [overload("SendControlOutTransferAsync")] + HRESULT SendControlOutTransferAsync( + [in] Windows.Devices.Usb.UsbSetupPacket *packet, + [in] Windows.Storage.Streams.IBuffer *buffer, + [out, retval] Windows.Foundation.IAsyncOperation<UINT32> **operation + ); + [overload("SendControlOutTransferAsync")] + HRESULT SendControlOutTransferAsyncNoBuffer( + [in] Windows.Devices.Usb.UsbSetupPacket *packet, + [out, retval] Windows.Foundation.IAsyncOperation<UINT32> **operation + ); + [overload("SendControlInTransferAsync")] + HRESULT SendControlInTransferAsync( + [in] Windows.Devices.Usb.UsbSetupPacket *packet, + [in] Windows.Storage.Streams.IBuffer *buffer, + [out, retval] Windows.Foundation.IAsyncOperation<Windows.Storage.Streams.IBuffer *> **operation + ); + [overload("SendControlInTransferAsync")] + HRESULT SendControlInTransferAsyncNoBuffer( + [in] Windows.Devices.Usb.UsbSetupPacket *packet, + [out, retval] Windows.Foundation.IAsyncOperation<Windows.Storage.Streams.IBuffer *> **operation + ); + [propget] HRESULT DefaultInterface([out, retval] Windows.Devices.Usb.UsbInterface **value); + [propget] HRESULT DeviceDescriptor([out, retval] Windows.Devices.Usb.UsbDeviceDescriptor **value); + [propget] HRESULT Configuration([out, retval] Windows.Devices.Usb.UsbConfiguration **value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Devices.Usb.UsbDeviceClass), + uuid(051942f9-845e-47eb-b12a-38f2f617afe7) + ] + interface IUsbDeviceClass : IInspectable + { + [propget] HRESULT ClassCode([out, retval] BYTE *value); + [propput] HRESULT ClassCode([in] BYTE value); + [propget] HRESULT SubclassCode([out, retval] Windows.Foundation.IReference<BYTE> **value); + [propput] HRESULT SubclassCode([in] Windows.Foundation.IReference<BYTE> *value); + [propget] HRESULT ProtocolCode([out, retval] Windows.Foundation.IReference<BYTE> **value); + [propput] HRESULT ProtocolCode([in] Windows.Foundation.IReference<BYTE> *value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Devices.Usb.UsbDevice), + uuid(066b85a2-09b7-4446-8502-6fe6dcaa7309) + ] + interface IUsbDeviceStatics : IInspectable + { + [overload("GetDeviceSelector")] + HRESULT GetDeviceSelector([in] UINT32 vendor, [in] UINT32 product, [in] GUID class, [out, retval] HSTRING *value); + [overload("GetDeviceSelector")] + HRESULT GetDeviceSelectorGuidOnly([in] GUID class, [out, retval] HSTRING *value); + [overload("GetDeviceSelector")] + HRESULT GetDeviceSelectorVidPidOnly([in] UINT32 vendor, [in] UINT32 product, [out, retval] HSTRING *value); + HRESULT GetDeviceClassSelector([in] Windows.Devices.Usb.UsbDeviceClass *class, [out, retval] HSTRING *value); + HRESULT FromIdAsync([in] HSTRING id, [out, retval] Windows.Foundation.IAsyncOperation<Windows.Devices.Usb.UsbDevice *> **operation); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile) + ] + runtimeclass UsbConfiguration + { + [default] interface Windows.Devices.Usb.IUsbConfiguration; + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile), + static(Windows.Devices.Usb.IUsbDeviceStatics, Windows.Foundation.UniversalApiContract, 1.0) + ] + runtimeclass UsbDevice + { + [default] interface Windows.Devices.Usb.IUsbDevice; + interface Windows.Foundation.IClosable; + } + + [ + activatable(Windows.Foundation.UniversalApiContract, 1.0), + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile) + ] + runtimeclass UsbDeviceClass + { + [default] interface Windows.Devices.Usb.IUsbDeviceClass; + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile) + ] + runtimeclass UsbDeviceDescriptor + { + [default] interface Windows.Devices.Usb.IUsbDeviceDescriptor; + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile) + ] + runtimeclass UsbInterface + { + [default] interface Windows.Devices.Usb.IUsbInterface; + } + + [ + activatable(Windows.Devices.Usb.IUsbSetupPacketFactory, Windows.Foundation.UniversalApiContract, 1.0), + activatable(Windows.Foundation.UniversalApiContract, 1.0), + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile) + ] + runtimeclass UsbSetupPacket + { + [default] interface Windows.Devices.Usb.IUsbSetupPacket; + } +}

1 0

Mohamad Al-Jaf : include: Add support for IAsyncOperation UINT32.
by Alexandre Julliard July 24, 2023

July 24, 2023

Module: wine Branch: master Commit: 36e31223294b594f6b207fbc65062254de30eb1d URL: https://gitlab.winehq.org/wine/wine/-/commit/36e31223294b594f6b207fbc650622… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Mon Jul 3 03:41:57 2023 -0400 include: Add support for IAsyncOperation UINT32. Needed by windows.devices.usb.idl. --- include/windows.foundation.idl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/windows.foundation.idl b/include/windows.foundation.idl index 11679367eca..d4475adc807 100644 --- a/include/windows.foundation.idl +++ b/include/windows.foundation.idl @@ -100,8 +100,10 @@ namespace Windows.Foundation { interface Windows.Foundation.EventHandler<IInspectable *>; interface Windows.Foundation.AsyncOperationCompletedHandler<IInspectable *>; interface Windows.Foundation.AsyncOperationCompletedHandler<boolean>; + interface Windows.Foundation.AsyncOperationCompletedHandler<UINT32>; interface Windows.Foundation.IAsyncOperation<IInspectable *>; interface Windows.Foundation.IAsyncOperation<boolean>; + interface Windows.Foundation.IAsyncOperation<UINT32>; interface Windows.Foundation.IReference<BYTE>; interface Windows.Foundation.IReference<INT32>; interface Windows.Foundation.IReference<DOUBLE>;

1 0

Jacek Caban : win32u: Pack messages in WH_CALLWNDPROC hooks.
by Alexandre Julliard July 24, 2023

July 24, 2023

Module: wine Branch: master Commit: 7cc06fb9999adfb79baea9348d5132e2b42d483d URL: https://gitlab.winehq.org/wine/wine/-/commit/7cc06fb9999adfb79baea9348d5132… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 19 16:22:32 2023 +0200 win32u: Pack messages in WH_CALLWNDPROC hooks. --- dlls/user32/hook.c | 12 ++++++++++++ dlls/win32u/hook.c | 26 ++++++++++++++++++++------ dlls/win32u/message.c | 6 ++++-- dlls/win32u/win32u_private.h | 2 ++ dlls/wow64win/user.c | 9 +++++++++ 5 files changed, 47 insertions(+), 8 deletions(-) diff --git a/dlls/user32/hook.c b/dlls/user32/hook.c index 1465712adb2..1ae49587688 100644 --- a/dlls/user32/hook.c +++ b/dlls/user32/hook.c @@ -483,6 +483,18 @@ BOOL WINAPI User32CallWindowsHook( struct win_hook_params *params, ULONG size ) ret_size = sizeof(*cbtc.lpcs); } break; + case WH_CALLWNDPROC: + if (ret_size > sizeof(CWPSTRUCT)) + { + CWPSTRUCT *cwp = (CWPSTRUCT *)params->lparam; + size_t offset = (lparam_offset + sizeof(*cwp) + 15) & ~15; + void *buffer = (char *)params + offset; + + unpack_message( cwp->hwnd, cwp->message, &cwp->wParam, &cwp->lParam, + &buffer, size - offset, !params->prev_unicode ); + ret_size = 0; + break; + } } } if (params->module[0] && !(proc = get_hook_proc( proc, params->module, &free_module ))) diff --git a/dlls/win32u/hook.c b/dlls/win32u/hook.c index b880c8d37e0..27b109ce545 100644 --- a/dlls/win32u/hook.c +++ b/dlls/win32u/hook.c @@ -195,7 +195,8 @@ static UINT get_ll_hook_timeout(void) * Call hook either in current thread or send message to the destination * thread. */ -static LRESULT call_hook( struct win_hook_params *info, const WCHAR *module, size_t lparam_size ) +static LRESULT call_hook( struct win_hook_params *info, const WCHAR *module, size_t lparam_size, + size_t message_size, BOOL ansi ) { DWORD_PTR ret = 0; @@ -230,7 +231,7 @@ static LRESULT call_hook( struct win_hook_params *info, const WCHAR *module, siz else if (info->proc) { struct user_thread_info *thread_info = get_user_thread_info(); - size_t size, lparam_offset = 0, message_offset = 0, message_size = 0; + size_t size, lparam_offset = 0, message_offset = 0; size_t lparam_ret_size = lparam_size; HHOOK prev = thread_info->hook; BOOL prev_unicode = thread_info->hook_unicode; @@ -287,6 +288,13 @@ static LRESULT call_hook( struct win_hook_params *info, const WCHAR *module, siz WM_CREATE, lp, FALSE ); } break; + case WH_CALLWNDPROC: + { + CWPSTRUCT *cwp = (CWPSTRUCT *)((char *)params + lparam_offset); + pack_user_message( (char *)params + message_offset, message_size, + cwp->message, cwp->lParam, ansi ); + } + break; } } @@ -357,7 +365,7 @@ LRESULT WINAPI NtUserCallNextHookEx( HHOOK hhook, INT code, WPARAM wparam, LPARA info.wparam = wparam; info.lparam = lparam; info.prev_unicode = thread_info->hook_unicode; - return call_hook( &info, module, 0 ); + return call_hook( &info, module, 0, 0, FALSE ); } LRESULT call_current_hook( HHOOK hhook, INT code, WPARAM wparam, LPARAM lparam ) @@ -390,10 +398,11 @@ LRESULT call_current_hook( HHOOK hhook, INT code, WPARAM wparam, LPARAM lparam ) info.wparam = wparam; info.lparam = lparam; info.prev_unicode = TRUE; /* assume Unicode for this function */ - return call_hook( &info, module, 0 ); + return call_hook( &info, module, 0, 0, FALSE ); } -LRESULT call_hooks( INT id, INT code, WPARAM wparam, LPARAM lparam, size_t lparam_size ) +LRESULT call_message_hooks( INT id, INT code, WPARAM wparam, LPARAM lparam, size_t lparam_size, + size_t message_size, BOOL ansi ) { struct user_thread_info *thread_info = get_user_thread_info(); struct win_hook_params info; @@ -434,7 +443,7 @@ LRESULT call_hooks( INT id, INT code, WPARAM wparam, LPARAM lparam, size_t lpara info.code = code; info.wparam = wparam; info.lparam = lparam; - ret = call_hook( &info, module, lparam_size ); + ret = call_hook( &info, module, lparam_size, message_size, ansi ); SERVER_START_REQ( finish_hook_chain ) { @@ -445,6 +454,11 @@ LRESULT call_hooks( INT id, INT code, WPARAM wparam, LPARAM lparam, size_t lpara return ret; } +LRESULT call_hooks( INT id, INT code, WPARAM wparam, LPARAM lparam, size_t lparam_size ) +{ + return call_message_hooks( id, code, wparam, lparam, lparam_size, 0, FALSE ); +} + /*********************************************************************** * NtUserSetWinEventHook (win32u.@) */ diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index fe048e0ee38..5aec4c5eb95 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -1530,7 +1530,8 @@ static LRESULT call_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpar cwp.wParam = wparam; cwp.message = msg; cwp.hwnd = hwnd = get_full_window_handle( hwnd ); - call_hooks( WH_CALLWNDPROC, HC_ACTION, same_thread, (LPARAM)&cwp, sizeof(cwp) ); + call_message_hooks( WH_CALLWNDPROC, HC_ACTION, same_thread, (LPARAM)&cwp, sizeof(cwp), + packed_size, ansi ); if (size && !(params = malloc( sizeof(*params) + size ))) return 0; if (!init_window_call_params( params, hwnd, msg, wparam, lparam, !unicode, mapping )) @@ -1557,7 +1558,8 @@ static LRESULT call_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpar cwpret.wParam = wparam; cwpret.message = msg; cwpret.hwnd = hwnd; - call_hooks( WH_CALLWNDPROCRET, HC_ACTION, same_thread, (LPARAM)&cwpret, sizeof(cwpret) ); + call_message_hooks( WH_CALLWNDPROCRET, HC_ACTION, same_thread, (LPARAM)&cwpret, sizeof(cwpret), + packed_size, ansi ); return result; } diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 8d6fb34776d..b27ba7fab14 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -75,6 +75,8 @@ extern LRESULT handle_nc_hit_test( HWND hwnd, POINT pt ) DECLSPEC_HIDDEN; extern LRESULT call_current_hook( HHOOK hhook, INT code, WPARAM wparam, LPARAM lparam ) DECLSPEC_HIDDEN; extern LRESULT call_hooks( INT id, INT code, WPARAM wparam, LPARAM lparam, size_t lparam_size ) DECLSPEC_HIDDEN; +extern LRESULT call_message_hooks( INT id, INT code, WPARAM wparam, LPARAM lparam, + size_t lparam_size, size_t message_size, BOOL ansi ) DECLSPEC_HIDDEN; extern BOOL is_hooked( INT id ) DECLSPEC_HIDDEN; extern BOOL unhook_windows_hook( INT id, HOOKPROC proc ) DECLSPEC_HIDDEN; diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 1fad0f566fd..94df46cbb90 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -744,6 +744,15 @@ static UINT hook_lparam_64to32( int id, int code, const void *lp, size_t size, v cwp32.message = cwp->message; cwp32.hwnd = HandleToUlong( cwp->hwnd ); memcpy( lp32, &cwp32, sizeof(cwp32) ); + if (size > sizeof(*cwp)) + { + const size_t offset64 = (sizeof(*cwp) + 15) & ~15; + const size_t offset32 = (sizeof(cwp32) + 15) & ~15; + size = packed_message_64to32( cwp32.message, + (const char *)lp + offset64, + (char *)lp32 + offset32, size - offset64 ); + return offset32 + size; + } return sizeof(cwp32); }

1 0

Jacek Caban : win32u: Pack messages in WH_CALLWNDPROCRET hooks.
by Alexandre Julliard July 24, 2023

July 24, 2023

Module: wine Branch: master Commit: 9b3aa968992a53686b38b7b5ecdb0bf3f5f9059e URL: https://gitlab.winehq.org/wine/wine/-/commit/9b3aa968992a53686b38b7b5ecdb0b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 19 17:04:30 2023 +0200 win32u: Pack messages in WH_CALLWNDPROCRET hooks. --- dlls/user32/hook.c | 12 ++++++++++++ dlls/win32u/hook.c | 7 +++++++ dlls/wow64win/user.c | 9 +++++++++ 3 files changed, 28 insertions(+) diff --git a/dlls/user32/hook.c b/dlls/user32/hook.c index 1ae49587688..a21b11735ab 100644 --- a/dlls/user32/hook.c +++ b/dlls/user32/hook.c @@ -495,6 +495,18 @@ BOOL WINAPI User32CallWindowsHook( struct win_hook_params *params, ULONG size ) ret_size = 0; break; } + case WH_CALLWNDPROCRET: + if (ret_size > sizeof(CWPRETSTRUCT)) + { + CWPRETSTRUCT *cwpret = (CWPRETSTRUCT *)params->lparam; + size_t offset = (lparam_offset + sizeof(*cwpret) + 15) & ~15; + void *buffer = (char *)params + offset; + + unpack_message( cwpret->hwnd, cwpret->message, &cwpret->wParam, &cwpret->lParam, + &buffer, size - offset, !params->prev_unicode ); + ret_size = 0; + break; + } } } if (params->module[0] && !(proc = get_hook_proc( proc, params->module, &free_module ))) diff --git a/dlls/win32u/hook.c b/dlls/win32u/hook.c index 27b109ce545..e3c3a0ce5ba 100644 --- a/dlls/win32u/hook.c +++ b/dlls/win32u/hook.c @@ -295,6 +295,13 @@ static LRESULT call_hook( struct win_hook_params *info, const WCHAR *module, siz cwp->message, cwp->lParam, ansi ); } break; + case WH_CALLWNDPROCRET: + { + CWPRETSTRUCT *cwpret = (CWPRETSTRUCT *)((char *)params + lparam_offset); + pack_user_message( (char *)params + message_offset, message_size, + cwpret->message, cwpret->lParam, ansi ); + } + break; } } diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 94df46cbb90..7e77e5a2f73 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -766,6 +766,15 @@ static UINT hook_lparam_64to32( int id, int code, const void *lp, size_t size, v cwpret32.message = cwpret->message; cwpret32.hwnd = HandleToUlong( cwpret->hwnd ); memcpy( lp32, &cwpret32, sizeof(cwpret32) ); + if (size > sizeof(*cwpret)) + { + const size_t offset64 = (sizeof(*cwpret) + 15) & ~15; + const size_t offset32 = (sizeof(cwpret32) + 15) & ~15; + size = packed_message_64to32( cwpret32.message, + (const char *)lp + offset64, + (char *)lp32 + offset32, size - offset64 ); + return offset32 + size; + } return sizeof(cwpret32); }

1 0