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

Rémi Bernon : mf/tests: Add missing line end in test message.
by Alexandre Julliard July 24, 2023

July 24, 2023

Module: wine Branch: master Commit: f18516123512be7949e5b7a39f6da8a01ccd120a URL: https://gitlab.winehq.org/wine/wine/-/commit/f18516123512be7949e5b7a39f6da8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jul 5 23:03:10 2023 +0200 mf/tests: Add missing line end in test message. --- dlls/mf/tests/mf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 72170b6be5f..743946f7fba 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -2939,7 +2939,7 @@ static HRESULT WINAPI test_grabber_callback_OnProcessSample(IMFSampleGrabberSink SetEvent(grabber->ready_event); res = WaitForSingleObject(grabber->done_event, 1000); - ok(!res, "WaitForSingleObject returned %#lx", res); + ok(!res, "WaitForSingleObject returned %#lx\n", res); return S_OK; }

1 0

Jeff Smith : gdiplus: Return GIF frame property only if set.
by Alexandre Julliard July 24, 2023

July 24, 2023

Module: wine Branch: master Commit: 8c6e578864bdcd4750c96a9f9b8b2632a346e9e1 URL: https://gitlab.winehq.org/wine/wine/-/commit/8c6e578864bdcd4750c96a9f9b8b26… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Wed Jul 19 22:28:29 2023 -0500 gdiplus: Return GIF frame property only if set. --- dlls/gdiplus/image.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 7a25b1f0928..1cbad7742b5 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -3250,14 +3250,13 @@ static PropertyItem *get_gif_transparent_idx(IWICMetadataReader *reader) return index; } -static LONG get_gif_frame_property(IWICBitmapFrameDecode *frame, const GUID *format, const WCHAR *property) +static void get_gif_frame_property(IWICBitmapFrameDecode *frame, const GUID *format, const WCHAR *property, LONG *value) { HRESULT hr; IWICMetadataBlockReader *block_reader; IWICMetadataReader *reader; UINT block_count, i; PropertyItem *prop; - LONG value = 0; hr = IWICBitmapFrameDecode_QueryInterface(frame, &IID_IWICMetadataBlockReader, (void **)&block_reader); if (hr == S_OK) @@ -3274,9 +3273,9 @@ static LONG get_gif_frame_property(IWICBitmapFrameDecode *frame, const GUID *for if (prop) { if (prop->type == PropertyTagTypeByte && prop->length == 1) - value = *(BYTE *)prop->value; + *value = *(BYTE *)prop->value; else if (prop->type == PropertyTagTypeShort && prop->length == 2) - value = *(SHORT *)prop->value; + *value = *(SHORT *)prop->value; heap_free(prop); } @@ -3286,8 +3285,6 @@ static LONG get_gif_frame_property(IWICBitmapFrameDecode *frame, const GUID *for } IWICMetadataBlockReader_Release(block_reader); } - - return value; } static void gif_metadata_reader(GpBitmap *bitmap, IWICBitmapDecoder *decoder, UINT active_frame) @@ -3318,7 +3315,7 @@ static void gif_metadata_reader(GpBitmap *bitmap, IWICBitmapDecoder *decoder, UI hr = IWICBitmapDecoder_GetFrame(decoder, i, &frame); if (hr == S_OK) { - value[i] = get_gif_frame_property(frame, &GUID_MetadataFormatGCE, L"Delay"); + get_gif_frame_property(frame, &GUID_MetadataFormatGCE, L"Delay", &value[i]); IWICBitmapFrameDecode_Release(frame); } } @@ -3832,8 +3829,11 @@ static GpStatus select_frame_wic(GpImage *image, UINT active_frame) static HRESULT get_gif_frame_rect(IWICBitmapFrameDecode *frame, UINT *left, UINT *top, UINT *width, UINT *height) { - *left = get_gif_frame_property(frame, &GUID_MetadataFormatIMD, L"Left"); - *top = get_gif_frame_property(frame, &GUID_MetadataFormatIMD, L"Top"); + LONG frame_left = 0, frame_top = 0; + get_gif_frame_property(frame, &GUID_MetadataFormatIMD, L"Left", &frame_left); + get_gif_frame_property(frame, &GUID_MetadataFormatIMD, L"Top", &frame_top); + *left = frame_left; + *top = frame_top; return IWICBitmapFrameDecode_GetSize(frame, width, height); } @@ -3907,7 +3907,8 @@ static GpStatus select_frame_gif(GpImage* image, UINT active_frame) { GpBitmap *bitmap = (GpBitmap*)image; IWICBitmapFrameDecode *frame; - int cur_frame=0, disposal; + int cur_frame=0; + LONG disposal; BOOL bgcolor_set = FALSE; DWORD bgcolor = 0; HRESULT hr; @@ -3916,7 +3917,8 @@ static GpStatus select_frame_gif(GpImage* image, UINT active_frame) hr = IWICBitmapDecoder_GetFrame(bitmap->image.decoder, image->current_frame, &frame); if(FAILED(hr)) return hresult_to_status(hr); - disposal = get_gif_frame_property(frame, &GUID_MetadataFormatGCE, L"Disposal"); + disposal = 0; + get_gif_frame_property(frame, &GUID_MetadataFormatGCE, L"Disposal", &disposal); IWICBitmapFrameDecode_Release(frame); if(disposal == GIF_DISPOSE_RESTORE_TO_BKGND) @@ -3929,7 +3931,8 @@ static GpStatus select_frame_gif(GpImage* image, UINT active_frame) hr = IWICBitmapDecoder_GetFrame(bitmap->image.decoder, cur_frame, &frame); if(FAILED(hr)) return hresult_to_status(hr); - disposal = get_gif_frame_property(frame, &GUID_MetadataFormatGCE, L"Disposal"); + disposal = 0; + get_gif_frame_property(frame, &GUID_MetadataFormatGCE, L"Disposal", &disposal); if(disposal==GIF_DISPOSE_UNSPECIFIED || disposal==GIF_DISPOSE_DO_NOT_DISPOSE) { hr = blit_gif_frame(bitmap, frame, cur_frame==0);

1 0

Jeff Smith : gdiplus: Expose GIF background index property only when global color table present.
by Alexandre Julliard July 24, 2023

July 24, 2023

Module: wine Branch: master Commit: ba564e2abaafcb4bcc3428b67bab5e7f9091cb4d URL: https://gitlab.winehq.org/wine/wine/-/commit/ba564e2abaafcb4bcc3428b67bab5e… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Sat Jul 15 14:44:24 2023 -0500 gdiplus: Expose GIF background index property only when global color table present. --- dlls/gdiplus/image.c | 11 +++++++---- dlls/gdiplus/tests/image.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 4ba6b1efd95..a1ad60ecce3 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -3171,11 +3171,14 @@ static PropertyItem *get_gif_loopcount(IWICMetadataReader *reader) static PropertyItem *get_gif_background(IWICMetadataReader *reader) { - PropertyItem *background; + PropertyItem *background = NULL; - background = get_property(reader, &GUID_MetadataFormatLSD, L"BackgroundColorIndex"); - if (background) - background->id = PropertyTagIndexBackground; + if (get_bool_property(reader, &GUID_MetadataFormatLSD, L"GlobalColorTableFlag")) + { + background = get_property(reader, &GUID_MetadataFormatLSD, L"BackgroundColorIndex"); + if (background) + background->id = PropertyTagIndexBackground; + } return background; } diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 750042bb5c3..4dd39f914b9 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -4838,6 +4838,27 @@ static const BYTE animatedgif[] = { 0x21,0x01,0x0C,'p','l','a','i','n','t','e','x','t',' ','#','2',0x00,0x3B }; +static const BYTE gif_2frame_global_pal[] = { +'G','I','F','8','7','a', 0x01,0x00, 0x01,0x00, 0xa1, 0x02, 0x00, +0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c, +0x21,0xF9,0x04, 0x00,0x0A,0x00,0x08, 0x00, +0x2c, 0x00,0x00, 0x00,0x00, 0x01,0x00, 0x01,0x00, 0x01, +0x02,0x02,0x44,0x01,0x00, +0x21,0xF9,0x04, 0x00,0x14,0x00,0x08, 0x00, +0x2c, 0x00,0x00, 0x00,0x00, 0x01,0x00, 0x01,0x00, 0x01, +0x02,0x02,0x44,0x01,0x00, 0x3b +}; + +static const BYTE gif_2frame_no_pal[] = { +'G','I','F','8','7','a', 0x01,0x00, 0x01,0x00, 0x21, 0x02, 0x00, +0x21,0xF9,0x04, 0x00,0x0A,0x00,0x08, 0x00, +0x2c, 0x00,0x00, 0x00,0x00, 0x01,0x00, 0x01,0x00, 0x01, +0x02,0x02,0x44,0x01,0x00, +0x21,0xF9,0x04, 0x00,0x14,0x00,0x08, 0x00, +0x2c, 0x00,0x00, 0x00,0x00, 0x01,0x00, 0x01,0x00, 0x01, +0x02,0x02,0x44,0x01,0x00, 0x3b +}; + static void test_gif_properties(void) { static const struct property_test_data animatedgif_props[] = @@ -4849,6 +4870,18 @@ static void test_gif_properties(void) { PropertyTagTypeByte, PropertyTagIndexBackground, 1, { 2 } }, { PropertyTagTypeByte, PropertyTagIndexTransparent, 1, { 8 } } }; + static const struct property_test_data gif_2frame_global_pal_props[] = + { + { PropertyTagTypeLong, PropertyTagFrameDelay, 8, { 10,0,0,0,20,0,0,0 } }, + { PropertyTagTypeShort, PropertyTagLoopCount, 2, { 1,0 } }, + { PropertyTagTypeByte, PropertyTagGlobalPalette, 12, { 0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c } }, + { PropertyTagTypeByte, PropertyTagIndexBackground, 1, { 2 } }, + }; + static const struct property_test_data gif_2frame_no_pal_props[] = + { + { PropertyTagTypeLong, PropertyTagFrameDelay, 8, { 10,0,0,0,20,0,0,0 } }, + { PropertyTagTypeShort, PropertyTagLoopCount, 2, { 1,0 } }, + }; static const struct test_data { const BYTE *image_data; @@ -4860,6 +4893,8 @@ static void test_gif_properties(void) { #define giftest(img, prop, frames) { img, sizeof(img), prop, ARRAY_SIZE(prop), frames } giftest(animatedgif, animatedgif_props, 2), + giftest(gif_2frame_global_pal, gif_2frame_global_pal_props, 2), + giftest(gif_2frame_no_pal, gif_2frame_no_pal_props, 2), #undef giftest };

1 0

Jeff Smith : gdiplus: Set GIF frame delay and loop count properties correctly.
by Alexandre Julliard July 24, 2023

July 24, 2023

Module: wine Branch: master Commit: f6ef0205b8457bcede5fd4c44e9f1b08d1fa930d URL: https://gitlab.winehq.org/wine/wine/-/commit/f6ef0205b8457bcede5fd4c44e9f1b… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Tue Jul 11 21:08:07 2023 -0500 gdiplus: Set GIF frame delay and loop count properties correctly. These properties are expected to be present even if frame count is 1. --- dlls/gdiplus/image.c | 36 ++++++++++++++++-------------------- dlls/gdiplus/tests/image.c | 14 +++++++++++++- 2 files changed, 29 insertions(+), 21 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index a1ad60ecce3..7a25b1f0928 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -3301,29 +3301,25 @@ static void gif_metadata_reader(GpBitmap *bitmap, IWICBitmapDecoder *decoder, UI PropertyItem *transparent_idx = NULL, *loop = NULL, *palette = NULL; IWICBitmapDecoder_GetFrameCount(decoder, &frame_count); - if (frame_count > 1) + delay = heap_alloc_zero(sizeof(*delay) + frame_count * sizeof(LONG)); + if (delay) { - delay = heap_alloc_zero(sizeof(*delay) + frame_count * sizeof(LONG)); - if (delay) - { - LONG *value; + LONG *value; - delay->type = PropertyTagTypeLong; - delay->id = PropertyTagFrameDelay; - delay->length = frame_count * sizeof(LONG); - delay->value = delay + 1; + delay->type = PropertyTagTypeLong; + delay->id = PropertyTagFrameDelay; + delay->length = frame_count * sizeof(LONG); + delay->value = delay + 1; - value = delay->value; + value = delay->value; - for (i = 0; i < frame_count; i++) + for (i = 0; i < frame_count; i++) + { + hr = IWICBitmapDecoder_GetFrame(decoder, i, &frame); + if (hr == S_OK) { - hr = IWICBitmapDecoder_GetFrame(decoder, i, &frame); - if (hr == S_OK) - { - value[i] = get_gif_frame_property(frame, &GUID_MetadataFormatGCE, L"Delay"); - IWICBitmapFrameDecode_Release(frame); - } - else value[i] = 0; + value[i] = get_gif_frame_property(frame, &GUID_MetadataFormatGCE, L"Delay"); + IWICBitmapFrameDecode_Release(frame); } } } @@ -3342,7 +3338,7 @@ static void gif_metadata_reader(GpBitmap *bitmap, IWICBitmapDecoder *decoder, UI if (!comment) comment = get_gif_comment(reader); - if (frame_count > 1 && !loop) + if (!loop) loop = get_gif_loopcount(reader); if (!background) @@ -3358,7 +3354,7 @@ static void gif_metadata_reader(GpBitmap *bitmap, IWICBitmapDecoder *decoder, UI IWICMetadataBlockReader_Release(block_reader); } - if (frame_count > 1 && !loop) + if (!loop) { loop = heap_alloc_zero(sizeof(*loop) + sizeof(SHORT)); if (loop) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 4dd39f914b9..aa1e3e4eb35 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -3726,7 +3726,7 @@ static void test_image_properties(void) status = GdipGetPropertyCount(image, &prop_count); ok(status == Ok, "GdipGetPropertyCount error %d\n", status); - todo_wine_if(td[i].image_data == pngimage || td[i].image_data == jpgimage || td[i].image_data == gifimage) + todo_wine_if(td[i].image_data == pngimage || td[i].image_data == jpgimage) ok(td[i].prop_count == prop_count || (td[i].prop_count2 != ~0 && td[i].prop_count2 == prop_count), "expected property count %u or %u, got %u\n", td[i].prop_count, td[i].prop_count2, prop_count); @@ -4859,6 +4859,12 @@ static const BYTE gif_2frame_no_pal[] = { 0x02,0x02,0x44,0x01,0x00, 0x3b }; +static const BYTE gif_no_pal[] = { +'G','I','F','8','7','a', 0x01,0x00, 0x01,0x00, 0x27, 0x02, 0x00, +0x2c, 0x00,0x00, 0x00,0x00, 0x01,0x00, 0x01,0x00, 0x01, +0x02,0x02,0x44,0x01,0x00, 0x3b +}; + static void test_gif_properties(void) { static const struct property_test_data animatedgif_props[] = @@ -4882,6 +4888,11 @@ static void test_gif_properties(void) { PropertyTagTypeLong, PropertyTagFrameDelay, 8, { 10,0,0,0,20,0,0,0 } }, { PropertyTagTypeShort, PropertyTagLoopCount, 2, { 1,0 } }, }; + static const struct property_test_data gif_no_pal_props[] = + { + { PropertyTagTypeLong, PropertyTagFrameDelay, 4, { 0,0,0,0 } }, + { PropertyTagTypeShort, PropertyTagLoopCount, 2, { 1,0 } }, + }; static const struct test_data { const BYTE *image_data; @@ -4895,6 +4906,7 @@ static void test_gif_properties(void) giftest(animatedgif, animatedgif_props, 2), giftest(gif_2frame_global_pal, gif_2frame_global_pal_props, 2), giftest(gif_2frame_no_pal, gif_2frame_no_pal_props, 2), + giftest(gif_no_pal, gif_no_pal_props, 1), #undef giftest };

1 0

Jeff Smith : gdiplus/tests: Allow for testing properties of multiple GIF samples.
by Alexandre Julliard July 24, 2023

July 24, 2023

Module: wine Branch: master Commit: 07fa0082bb85c1b4b27e6b1084639e2ca4635559 URL: https://gitlab.winehq.org/wine/wine/-/commit/07fa0082bb85c1b4b27e6b1084639e… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Sun Jul 16 22:26:54 2023 -0500 gdiplus/tests: Allow for testing properties of multiple GIF samples. --- dlls/gdiplus/tests/image.c | 208 ++++++++++++++++++++++++++------------------- 1 file changed, 121 insertions(+), 87 deletions(-)

1 0

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