- Wine-Commits - list.winehq.org

Jeff Smith : gdiplus/tests: Factor out property_test_data struct.
by Alexandre Julliard July 24, 2023

July 24, 2023

Module: wine Branch: master Commit: 96540638e78c68cbd73e8f51d70d5f54900f9122 URL: https://gitlab.winehq.org/wine/wine/-/commit/96540638e78c68cbd73e8f51d70d5f… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Sun Jul 16 21:15:51 2023 -0500 gdiplus/tests: Factor out property_test_data struct. --- dlls/gdiplus/tests/image.c | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 3723dc6544e..8430578fd05 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -3974,13 +3974,15 @@ static const struct tiff_data }; #include "poppack.h" +struct property_test_data +{ + ULONG type, id, length; + const BYTE value[32]; +}; + static void test_tiff_properties(void) { - static const struct test_data - { - ULONG type, id, length; - const BYTE value[24]; - } td[31] = + static const struct property_test_data td[31] = { { PropertyTagTypeShort, 0xff, 2, { 0 } }, { PropertyTagTypeLong, 0x100, 4, { 1 } }, @@ -4098,11 +4100,7 @@ static void test_tiff_properties(void) static void test_GdipGetAllPropertyItems(void) { - static const struct test_data - { - ULONG type, id, length; - BYTE value[32]; - } td[16] = + static const struct property_test_data td[16] = { { PropertyTagTypeLong, 0xfe, 4, { 0 } }, { PropertyTagTypeShort, 0x100, 2, { 1 } }, @@ -4842,11 +4840,7 @@ static const BYTE animatedgif[] = { static void test_gif_properties(void) { - static const struct test_data - { - ULONG type, id, length; - const BYTE value[13]; - } td[] = + static const struct property_test_data td[] = { { PropertyTagTypeLong, PropertyTagFrameDelay, 8, { 10,0,0,0,20,0,0,0 } }, { PropertyTagTypeASCII, PropertyTagExifUserComment, 13, { 'H','e','l','l','o',' ','W','o','r','l','d','!',0 } },

1 0

Zebediah Figura : amstream/tests: Fix a leak in test_ddrawstream_begin_flush_end_flush().
by Alexandre Julliard July 24, 2023

July 24, 2023

Module: wine Branch: master Commit: 70dc4a6a1d9e96a2d94f8fa99e7a89640325af96 URL: https://gitlab.winehq.org/wine/wine/-/commit/70dc4a6a1d9e96a2d94f8fa99e7a89… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Jul 22 21:07:11 2023 -0500 amstream/tests: Fix a leak in test_ddrawstream_begin_flush_end_flush(). --- dlls/amstream/tests/amstream.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index f15584f8948..a2f27c1b557 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -5991,6 +5991,9 @@ static void test_ddrawstream_begin_flush_end_flush(void) IDirectDrawMediaStream_Release(ddraw_stream); ref = IMediaStream_Release(stream); ok(!ref, "Got outstanding refcount %ld.\n", ref); + IPin_Release(pin2); + ref = IAMMediaStream_Release(stream2); + ok(!ref, "Got outstanding refcount %ld.\n", ref); } static void test_ddrawstream_new_segment(void)

1 0

Zebediah Figura : amstream: Release the previous ddraw in ddraw_IAMMediaStream_Initialize().
by Alexandre Julliard July 24, 2023

July 24, 2023

Module: wine Branch: master Commit: 97d7d321919e95c06c356fd3c32ae24d6fd0a362 URL: https://gitlab.winehq.org/wine/wine/-/commit/97d7d321919e95c06c356fd3c32ae2… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Jul 22 21:06:53 2023 -0500 amstream: Release the previous ddraw in ddraw_IAMMediaStream_Initialize(). --- dlls/amstream/ddrawstream.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c index 77795be47fa..b31466803f4 100644 --- a/dlls/amstream/ddrawstream.c +++ b/dlls/amstream/ddrawstream.c @@ -324,6 +324,10 @@ static HRESULT WINAPI ddraw_IAMMediaStream_Initialize(IAMMediaStream *iface, IUn stream->purpose_id = *purpose_id; stream->stream_type = stream_type; + if (stream->ddraw) + IDirectDraw_Release(stream->ddraw); + stream->ddraw = NULL; + if (source_object && FAILED(hr = IUnknown_QueryInterface(source_object, &IID_IDirectDraw, (void **)&stream->ddraw))) FIXME("Stream object doesn't implement IDirectDraw interface, hr %#lx.\n", hr);

1 0

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

July 24, 2023

Module: wine Branch: master Commit: fc4813ff2f9416e6a7a83171b47a2df63d9347f6 URL: https://gitlab.winehq.org/wine/wine/-/commit/fc4813ff2f9416e6a7a83171b47a2d… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Wed Jul 5 23:05:05 2023 -0400 windows.devices.usb/tests: Add IUsbDeviceStatics::GetDeviceSelectorVidPidOnly() tests. --- dlls/windows.devices.usb/tests/usb.c | 38 +++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/dlls/windows.devices.usb/tests/usb.c b/dlls/windows.devices.usb/tests/usb.c index 5e6f3be6d31..bf6e759e14d 100644 --- a/dlls/windows.devices.usb/tests/usb.c +++ b/dlls/windows.devices.usb/tests/usb.c @@ -47,11 +47,18 @@ static void check_interface_( unsigned int line, void *obj, const IID *iid ) static void test_UsbDevicesStatics(void) { + 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"; static const WCHAR *usb_device_statics_name = L"Windows.Devices.Usb.UsbDevice"; IUsbDeviceStatics *usb_device_statics; IActivationFactory *factory; - HSTRING str; + UINT32 vendor, product; + WCHAR buffer[254 + 20]; + HSTRING str, wine_str; HRESULT hr; + INT32 res; LONG ref; hr = WindowsCreateString( usb_device_statics_name, wcslen( usb_device_statics_name ), &str ); @@ -73,6 +80,35 @@ static void test_UsbDevicesStatics(void) hr = IActivationFactory_QueryInterface( factory, &IID_IUsbDeviceStatics, (void **)&usb_device_statics ); ok( hr == S_OK, "got hr %#lx.\n", hr ); + hr = IUsbDeviceStatics_GetDeviceSelectorVidPidOnly( usb_device_statics, 5, 10, NULL ); + ok( hr == E_INVALIDARG, "got hr %#lx.\n", hr ); + + vendor = 20; + product = 23; + hr = IUsbDeviceStatics_GetDeviceSelectorVidPidOnly( usb_device_statics, vendor, product, &str ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + swprintf( buffer, ARRAYSIZE(buffer), format, (INT32)vendor, (INT32)product ); + hr = WindowsCreateString( buffer, wcslen(buffer), &wine_str ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + hr = WindowsCompareStringOrdinal( str, wine_str, &res ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + ok( !res, "got string %s.\n", debugstr_hstring(str) ); + WindowsDeleteString( str ); + WindowsDeleteString( wine_str ); + + vendor = 4294967195; /* Vendor = -101 */ + product = -1294967195; + hr = IUsbDeviceStatics_GetDeviceSelectorVidPidOnly( usb_device_statics, vendor, product, &str ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + swprintf( buffer, ARRAYSIZE(buffer), format, (INT32)vendor, (INT32)product ); + hr = WindowsCreateString( buffer, wcslen(buffer), &wine_str ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + hr = WindowsCompareStringOrdinal( str, wine_str, &res ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + ok( !res, "got string %s.\n", debugstr_hstring(str) ); + WindowsDeleteString( str ); + WindowsDeleteString( wine_str ); + ref = IUsbDeviceStatics_Release( usb_device_statics ); ok( ref == 2, "got ref %ld.\n", ref ); ref = IActivationFactory_Release( factory );

1 0

Zebediah Figura : quartz: Call EnumMatchingFilters() once in autoplug().
by Alexandre Julliard July 24, 2023

July 24, 2023

Module: wine Branch: master Commit: e6cc4ae4b488ab1870681ed1747a185e4302aca2 URL: https://gitlab.winehq.org/wine/wine/-/commit/e6cc4ae4b488ab1870681ed1747a18… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Jul 22 19:52:12 2023 -0500 quartz: Call EnumMatchingFilters() once in autoplug(). Instead of iterating through types one by one and calling EnumMatchingFilters() on each one, build a list of all media types exposed by the pin and call the function once. This avoids trying to pointless autoplug the same filter multiple times, which speeds up autoplugging greatly for cases when a given filter connects less than instantaneously. The most prominent example of such a filter is the AVI decompressor, which has to call ICLocate() on connection. ICLocate() is not a fast API on Wine, and it is even slower on Windows; this reduces the number of times we try to call it greatly. --- dlls/quartz/filtergraph.c | 189 +++++++++++++++++++++++++--------------- dlls/quartz/tests/filtergraph.c | 2 +- 2 files changed, 122 insertions(+), 69 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 8c8f89ce2ac..e0e126d8ef0 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1195,16 +1195,79 @@ static HRESULT autoplug_through_filter(struct filter_graph *graph, IPin *source, return VFW_E_CANNOT_CONNECT; } +static HRESULT get_autoplug_types(IPin *source, unsigned int *ret_count, GUID **ret_types) +{ + unsigned int i, mt_count = 0, mt_capacity = 16; + AM_MEDIA_TYPE **mts = NULL; + IEnumMediaTypes *enummt; + GUID *types = NULL; + HRESULT hr; + + if (FAILED(hr = IPin_EnumMediaTypes(source, &enummt))) + { + ERR("Failed to enumerate media types, hr %#lx.\n", hr); + return hr; + } + + for (;;) + { + ULONG count; + + if (!(mts = realloc(mts, mt_capacity * sizeof(*mts)))) + { + hr = E_OUTOFMEMORY; + goto out; + } + + if (FAILED(hr = IEnumMediaTypes_Next(enummt, mt_capacity - mt_count, mts + mt_count, &count))) + { + ERR("Failed to get media types, hr %#lx.\n", hr); + goto out; + } + + mt_count += count; + if (hr == S_FALSE) + break; + + mt_capacity *= 2; + } + + if (!(types = malloc(mt_count * 2 * sizeof(*types)))) + { + hr = E_OUTOFMEMORY; + goto out; + } + + for (i = 0; i < mt_count; ++i) + { + types[i * 2] = mts[i]->majortype; + types[i * 2 + 1] = mts[i]->subtype; + DeleteMediaType(mts[i]); + } + + *ret_count = mt_count; + *ret_types = types; + + hr = S_OK; +out: + free(mts); + IEnumMediaTypes_Release(enummt); + return hr; +} + /* Common helper for IGraphBuilder::Connect() and IGraphBuilder::Render(), which * share most of the same code. Render() calls this with a NULL sink. */ static HRESULT autoplug(struct filter_graph *graph, IPin *source, IPin *sink, BOOL render_to_existing, unsigned int recursion_depth) { IAMGraphBuilderCallback *callback = NULL; - IEnumMediaTypes *enummt; + struct filter *graph_filter; + IEnumMoniker *enummoniker; + unsigned int type_count; IFilterMapper2 *mapper; - struct filter *filter; - AM_MEDIA_TYPE *mt; + IBaseFilter *filter; + GUID *types = NULL; + IMoniker *moniker; HRESULT hr; TRACE("Trying to autoplug %p to %p, recursion depth %u.\n", source, sink, recursion_depth); @@ -1228,16 +1291,16 @@ static HRESULT autoplug(struct filter_graph *graph, IPin *source, IPin *sink, } /* Always prefer filters in the graph. */ - LIST_FOR_EACH_ENTRY(filter, &graph->filters, struct filter, entry) + LIST_FOR_EACH_ENTRY(graph_filter, &graph->filters, struct filter, entry) { - if (SUCCEEDED(hr = autoplug_through_filter(graph, source, filter->filter, + if (SUCCEEDED(hr = autoplug_through_filter(graph, source, graph_filter->filter, sink, render_to_existing, recursion_depth))) return hr; } IUnknown_QueryInterface(graph->punkFilterMapper2, &IID_IFilterMapper2, (void **)&mapper); - if (FAILED(hr = IPin_EnumMediaTypes(source, &enummt))) + if (FAILED(hr = get_autoplug_types(source, &type_count, &types))) { IFilterMapper2_Release(mapper); return hr; @@ -1246,85 +1309,75 @@ static HRESULT autoplug(struct filter_graph *graph, IPin *source, IPin *sink, if (graph->pSite) IUnknown_QueryInterface(graph->pSite, &IID_IAMGraphBuilderCallback, (void **)&callback); - while (IEnumMediaTypes_Next(enummt, 1, &mt, NULL) == S_OK) - { - GUID types[2] = {mt->majortype, mt->subtype}; - IEnumMoniker *enummoniker; - IBaseFilter *filter; - IMoniker *moniker; - - DeleteMediaType(mt); + if (FAILED(hr = IFilterMapper2_EnumMatchingFilters(mapper, &enummoniker, + 0, FALSE, MERIT_UNLIKELY, TRUE, type_count, types, NULL, NULL, FALSE, + render_to_existing, 0, NULL, NULL, NULL))) + goto out; - if (FAILED(hr = IFilterMapper2_EnumMatchingFilters(mapper, &enummoniker, - 0, FALSE, MERIT_UNLIKELY, TRUE, 1, types, NULL, NULL, FALSE, - render_to_existing, 0, NULL, NULL, NULL))) - goto out; + while (IEnumMoniker_Next(enummoniker, 1, &moniker, NULL) == S_OK) + { + IPropertyBag *bag; + VARIANT var; - while (IEnumMoniker_Next(enummoniker, 1, &moniker, NULL) == S_OK) + VariantInit(&var); + IMoniker_BindToStorage(moniker, NULL, NULL, &IID_IPropertyBag, (void **)&bag); + hr = IPropertyBag_Read(bag, L"FriendlyName", &var, NULL); + IPropertyBag_Release(bag); + if (FAILED(hr)) { - IPropertyBag *bag; - VARIANT var; - - VariantInit(&var); - IMoniker_BindToStorage(moniker, NULL, NULL, &IID_IPropertyBag, (void **)&bag); - hr = IPropertyBag_Read(bag, L"FriendlyName", &var, NULL); - IPropertyBag_Release(bag); - if (FAILED(hr)) - { - IMoniker_Release(moniker); - continue; - } - - if (callback && FAILED(hr = IAMGraphBuilderCallback_SelectedFilter(callback, moniker))) - { - TRACE("Filter rejected by IAMGraphBuilderCallback::SelectedFilter(), hr %#lx.\n", hr); - IMoniker_Release(moniker); - continue; - } - - hr = create_filter(graph, moniker, &filter); IMoniker_Release(moniker); - if (FAILED(hr)) - { - ERR("Failed to create filter for %s, hr %#lx.\n", debugstr_w(V_BSTR(&var)), hr); - VariantClear(&var); - continue; - } + continue; + } - if (callback && FAILED(hr = IAMGraphBuilderCallback_CreatedFilter(callback, filter))) - { - TRACE("Filter rejected by IAMGraphBuilderCallback::CreatedFilter(), hr %#lx.\n", hr); - IBaseFilter_Release(filter); - continue; - } + if (callback && FAILED(hr = IAMGraphBuilderCallback_SelectedFilter(callback, moniker))) + { + TRACE("Filter rejected by IAMGraphBuilderCallback::SelectedFilter(), hr %#lx.\n", hr); + IMoniker_Release(moniker); + continue; + } - hr = IFilterGraph2_AddFilter(&graph->IFilterGraph2_iface, filter, V_BSTR(&var)); + hr = create_filter(graph, moniker, &filter); + IMoniker_Release(moniker); + if (FAILED(hr)) + { + ERR("Failed to create filter for %s, hr %#lx.\n", debugstr_w(V_BSTR(&var)), hr); VariantClear(&var); - if (FAILED(hr)) - { - ERR("Failed to add filter, hr %#lx.\n", hr); - IBaseFilter_Release(filter); - continue; - } + continue; + } - hr = autoplug_through_filter(graph, source, filter, sink, render_to_existing, recursion_depth); - if (SUCCEEDED(hr)) - { - IBaseFilter_Release(filter); - goto out; - } + if (callback && FAILED(hr = IAMGraphBuilderCallback_CreatedFilter(callback, filter))) + { + TRACE("Filter rejected by IAMGraphBuilderCallback::CreatedFilter(), hr %#lx.\n", hr); + IBaseFilter_Release(filter); + continue; + } - IFilterGraph2_RemoveFilter(&graph->IFilterGraph2_iface, filter); + hr = IFilterGraph2_AddFilter(&graph->IFilterGraph2_iface, filter, V_BSTR(&var)); + VariantClear(&var); + if (FAILED(hr)) + { + ERR("Failed to add filter, hr %#lx.\n", hr); IBaseFilter_Release(filter); + continue; } - IEnumMoniker_Release(enummoniker); + + hr = autoplug_through_filter(graph, source, filter, sink, render_to_existing, recursion_depth); + if (SUCCEEDED(hr)) + { + IBaseFilter_Release(filter); + goto out; + } + + IFilterGraph2_RemoveFilter(&graph->IFilterGraph2_iface, filter); + IBaseFilter_Release(filter); } + IEnumMoniker_Release(enummoniker); hr = VFW_E_CANNOT_CONNECT; out: + free(types); if (callback) IAMGraphBuilderCallback_Release(callback); - IEnumMediaTypes_Release(enummt); IFilterMapper2_Release(mapper); return hr; } diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 391f9777175..00232ea7a52 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -5344,7 +5344,7 @@ static void test_autoplug_uyvy(void) * failure to decode up to missing audio hardware, even though we're not * trying to render audio. */ hr = IFilterGraph2_Render(graph, &source_pin.IPin_iface); - todo_wine ok(hr == S_OK || hr == VFW_E_NO_AUDIO_HARDWARE, "Got hr %#lx.\n", hr); + ok(hr == S_OK || hr == VFW_E_NO_AUDIO_HARDWARE, "Got hr %#lx.\n", hr); ref = IFilterGraph2_Release(graph); ok(!ref, "Got outstanding refcount %ld.\n", ref);

1 0

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