- Wine-Commits - list.winehq.org

Connor McAdams : uiautomationcore: Add support for calling COM event handlers.
by Alexandre Julliard July 24, 2023

July 24, 2023

Module: wine Branch: master Commit: 53376c5568c49f738645fbb0e4705709ea1b899d URL: https://gitlab.winehq.org/wine/wine/-/commit/53376c5568c49f738645fbb0e47057… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Thu Jul 20 10:26:58 2023 -0400 uiautomationcore: Add support for calling COM event handlers. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 8 +- dlls/uiautomationcore/uia_com_client.c | 113 +++++++++++++++++++++++------ dlls/uiautomationcore/uia_event.c | 2 +- dlls/uiautomationcore/uia_private.h | 3 + 4 files changed, 99 insertions(+), 27 deletions(-)

1 0

David Kahurani : gdiplus/font: Fix GdipGetLogFontW/A with gdi_transform.
by Alexandre Julliard July 24, 2023

July 24, 2023

Module: wine Branch: master Commit: cfc50b28870ca026c002cbd41780530c9af15753 URL: https://gitlab.winehq.org/wine/wine/-/commit/cfc50b28870ca026c002cbd4178053… Author: David Kahurani <k.kahurani(a)gmail.com> Date: Sun Jul 23 10:11:48 2023 +0300 gdiplus/font: Fix GdipGetLogFontW/A with gdi_transform. Signed-off-by: David Kahurani <k.kahurani(a)gmail.com> --- dlls/gdiplus/font.c | 2 ++ dlls/gdiplus/tests/font.c | 14 ++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 8b85f567aab..024d27c1ce7 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -485,6 +485,8 @@ GpStatus WINGDIPAPI GdipGetLogFontW(GpFont *font, GpGraphics *graphics, LOGFONTW pt[1].Y = 0.0; pt[2].X = 0.0; pt[2].Y = 1.0; + + GdipMultiplyMatrix(&matrix, &graphics->gdi_transform, MatrixOrderAppend); GdipTransformMatrixPoints(&matrix, pt, 3); angle = -gdiplus_atan2((pt[1].Y - pt[0].Y), (pt[1].X - pt[0].X)); rel_height = sqrt((pt[2].Y - pt[0].Y) * (pt[2].Y - pt[0].Y)+ diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index a2aea904bb1..30cf159e140 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -1239,6 +1239,20 @@ static void test_font_transform(void) todo_wine expectf_(1532.984985, bounds.Height, 0.05); + GdipDeleteGraphics(graphics); + + SetMapMode( hdc, MM_ISOTROPIC); + SetWindowExtEx(hdc, 200, 200, NULL); + SetViewportExtEx(hdc, 100, 100, NULL); + status = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, status); + status = GdipGetLogFontA(font, graphics, &lf); + expect(Ok, status); + expect(-50, lf.lfHeight); + expect(0, lf.lfWidth); + expect(0, lf.lfEscapement); + expect(0, lf.lfOrientation); + GdipDeleteMatrix(matrix); GdipDeleteFont(font); GdipDeleteGraphics(graphics);

1 0

Rémi Bernon : mf/tests: Shutdown MF if MP4 source isn't supported.
by Alexandre Julliard July 24, 2023

July 24, 2023

Module: wine Branch: master Commit: 495cf276d0788e487ce6f6e069f40068dd0ea409 URL: https://gitlab.winehq.org/wine/wine/-/commit/495cf276d0788e487ce6f6e069f400… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jun 28 14:49:34 2023 +0200 mf/tests: Shutdown MF if MP4 source isn't supported. --- dlls/mf/tests/mf.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index fa538e8ad9f..72170b6be5f 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -4951,7 +4951,7 @@ static void test_sample_grabber_orientation(GUID subtype) if (!(source = create_media_source(L"test.mp4", L"video/mp4"))) { win_skip("MP4 media source is not supported, skipping tests.\n"); - return; + goto done; } callback = create_test_callback(TRUE); @@ -5064,10 +5064,11 @@ static void test_sample_grabber_orientation(GUID subtype) IMFMediaSession_Release(session); IMFMediaSource_Release(source); + IMFSampleGrabberSinkCallback_Release(&grabber_callback->IMFSampleGrabberSinkCallback_iface); + +done: hr = MFShutdown(); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - - IMFSampleGrabberSinkCallback_Release(&grabber_callback->IMFSampleGrabberSinkCallback_iface); } static void test_quality_manager(void)

1 0

Jeff Smith : gdiplus: Set correct frame delay when GCE is missing.
by Alexandre Julliard July 24, 2023

July 24, 2023

Module: wine Branch: master Commit: 4245b1199c36fd42dcefb24ede94dd7c5af983fc URL: https://gitlab.winehq.org/wine/wine/-/commit/4245b1199c36fd42dcefb24ede94dd… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Wed Jul 19 22:35:52 2023 -0500 gdiplus: Set correct frame delay when GCE is missing. --- dlls/gdiplus/image.c | 4 +++- dlls/gdiplus/tests/image.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 1cbad7742b5..56a3cfa1d18 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -3302,6 +3302,7 @@ static void gif_metadata_reader(GpBitmap *bitmap, IWICBitmapDecoder *decoder, UI if (delay) { LONG *value; + LONG frame_delay = 0; delay->type = PropertyTagTypeLong; delay->id = PropertyTagFrameDelay; @@ -3315,9 +3316,10 @@ static void gif_metadata_reader(GpBitmap *bitmap, IWICBitmapDecoder *decoder, UI hr = IWICBitmapDecoder_GetFrame(decoder, i, &frame); if (hr == S_OK) { - get_gif_frame_property(frame, &GUID_MetadataFormatGCE, L"Delay", &value[i]); + get_gif_frame_property(frame, &GUID_MetadataFormatGCE, L"Delay", &frame_delay); IWICBitmapFrameDecode_Release(frame); } + value[i] = frame_delay; } } diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index aa1e3e4eb35..bced4e0ca39 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -4859,6 +4859,24 @@ static const BYTE gif_2frame_no_pal[] = { 0x02,0x02,0x44,0x01,0x00, 0x3b }; +static const BYTE gif_2frame_missing_gce1[] = { +'G','I','F','8','7','a', 0x01,0x00, 0x01,0x00, 0x21, 0x02, 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_missing_gce2[] = { +'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, +0x2c, 0x00,0x00, 0x00,0x00, 0x01,0x00, 0x01,0x00, 0x01, +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, @@ -4888,6 +4906,16 @@ 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_2frame_missing_gce1_props[] = + { + { PropertyTagTypeLong, PropertyTagFrameDelay, 8, { 0,0,0,0,20,0,0,0 } }, + { PropertyTagTypeShort, PropertyTagLoopCount, 2, { 1,0 } }, + }; + static const struct property_test_data gif_2frame_missing_gce2_props[] = + { + { PropertyTagTypeLong, PropertyTagFrameDelay, 8, { 10,0,0,0,10,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 } }, @@ -4906,6 +4934,8 @@ 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_2frame_missing_gce1, gif_2frame_missing_gce1_props, 2), + giftest(gif_2frame_missing_gce2, gif_2frame_missing_gce2_props, 2), giftest(gif_no_pal, gif_no_pal_props, 1), #undef giftest };

1 0

Jinoh Kang : xmllite: Eliminate DECLSPEC_HIDDEN.
by Alexandre Julliard July 24, 2023

July 24, 2023

Module: wine Branch: master Commit: 062ef22c45af6e7c27caa26c0f92d7e6366e0be3 URL: https://gitlab.winehq.org/wine/wine/-/commit/062ef22c45af6e7c27caa26c0f92d7… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Sat Jul 1 16:02:49 2023 +0900 xmllite: Eliminate DECLSPEC_HIDDEN. --- dlls/xmllite/xmllite_private.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/xmllite/xmllite_private.h b/dlls/xmllite/xmllite_private.h index f4e2d92fe26..fc3e6d264e1 100644 --- a/dlls/xmllite/xmllite_private.h +++ b/dlls/xmllite/xmllite_private.h @@ -53,15 +53,15 @@ typedef enum XmlEncoding_Unknown } xml_encoding; -xml_encoding parse_encoding_name(const WCHAR*,int) DECLSPEC_HIDDEN; -HRESULT get_code_page(xml_encoding,UINT*) DECLSPEC_HIDDEN; -const WCHAR *get_encoding_name(xml_encoding) DECLSPEC_HIDDEN; -xml_encoding get_encoding_from_codepage(UINT) DECLSPEC_HIDDEN; +xml_encoding parse_encoding_name(const WCHAR*,int); +HRESULT get_code_page(xml_encoding,UINT*); +const WCHAR *get_encoding_name(xml_encoding); +xml_encoding get_encoding_from_codepage(UINT); -BOOL is_ncnamechar(WCHAR ch) DECLSPEC_HIDDEN; -BOOL is_pubchar(WCHAR ch) DECLSPEC_HIDDEN; -BOOL is_namestartchar(WCHAR ch) DECLSPEC_HIDDEN; -BOOL is_namechar(WCHAR ch) DECLSPEC_HIDDEN; +BOOL is_ncnamechar(WCHAR ch); +BOOL is_pubchar(WCHAR ch); +BOOL is_namestartchar(WCHAR ch); +BOOL is_namechar(WCHAR ch); /* [2] Char ::= #x9 | #xA | #xD | [#x20-#xD7FF] | [#xE000-#xFFFD] | [#x10000-#x10FFFF] */ static inline BOOL is_char(WCHAR ch)

1 0

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