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

Connor McAdams : uiautomationcore: Implement IUIAutomation::{Add/Remove}FocusChangedEventHandler.
by Alexandre Julliard 24 Jul '23

24 Jul '23

Module: wine Branch: master Commit: a8697c43a73883ce795028f9aa2d90f8d1c970ec URL: https://gitlab.winehq.org/wine/wine/-/commit/a8697c43a73883ce795028f9aa2d90… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Thu Jul 20 10:51:11 2023 -0400 uiautomationcore: Implement IUIAutomation::{Add/Remove}FocusChangedEventHandler. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 14 +-- dlls/uiautomationcore/uia_com_client.c | 175 +++++++++++++++++++++-------- 2 files changed, 137 insertions(+), 52 deletions(-)

1 0

Fabian Maurer : gdiplus: Make flatten_bezier_add iterative.
by Alexandre Julliard 24 Jul '23

24 Jul '23

Module: wine Branch: master Commit: 7da5dff88ce6d1cb77e855bf91697252f703c12f URL: https://gitlab.winehq.org/wine/wine/-/commit/7da5dff88ce6d1cb77e855bf916972… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Mon Jul 24 16:47:55 2023 +0200 gdiplus: Make flatten_bezier_add iterative. --- dlls/gdiplus/graphicspath.c | 139 ++++++++++++++++++++++++++++++-------------- 1 file changed, 94 insertions(+), 45 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 6cdc2a58059..06e17d4b98a 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -103,6 +103,28 @@ static INT path_list_count(path_list_node_t *node) return count; } +struct flatten_bezier_job +{ + path_list_node_t *start; + REAL x2; + REAL y2; + REAL x3; + REAL y3; + path_list_node_t *end; + struct list entry; +}; + +static BOOL flatten_bezier_add(struct list *jobs, path_list_node_t *start, REAL x2, REAL y2, REAL x3, REAL y3, path_list_node_t *end) +{ + struct flatten_bezier_job *job = malloc(sizeof(struct flatten_bezier_job)); + struct flatten_bezier_job temp = { start, x2, y2, x3, y3, end }; + if (!job) + return FALSE; + *job = temp; + list_add_after(jobs, &job->entry); + return TRUE; +} + /* GdipFlattenPath helper */ /* * Used to recursively flatten single Bezier curve @@ -128,55 +150,82 @@ static BOOL flatten_bezier(path_list_node_t *start, REAL x2, REAL y2, REAL x3, R GpPointF pt, pt_st; path_list_node_t *node; REAL area_triangle, distance_start_end; + BOOL ret = TRUE; + struct list jobs; + struct flatten_bezier_job *current, *next; + + list_init( &jobs ); + flatten_bezier_add(&jobs, start, x2, y2, x3, y3, end); + LIST_FOR_EACH_ENTRY( current, &jobs, struct flatten_bezier_job, entry ) + { + start = current->start; + x2 = current->x2; + y2 = current->y2; + x3 = current->x3; + y3 = current->y3; + end = current->end; + + /* middle point between control points */ + pt.X = (x2 + x3) / 2.0; + pt.Y = (y2 + y3) / 2.0; + + /* calculate bezier curve middle points == new control points */ + mp[0].X = (start->pt.X + x2) / 2.0; + mp[0].Y = (start->pt.Y + y2) / 2.0; + mp[1].X = (mp[0].X + pt.X) / 2.0; + mp[1].Y = (mp[0].Y + pt.Y) / 2.0; + mp[4].X = (end->pt.X + x3) / 2.0; + mp[4].Y = (end->pt.Y + y3) / 2.0; + mp[3].X = (mp[4].X + pt.X) / 2.0; + mp[3].Y = (mp[4].Y + pt.Y) / 2.0; + + /* middle point between new control points */ + mp[2].X = (mp[1].X + mp[3].X) / 2.0; + mp[2].Y = (mp[1].Y + mp[3].Y) / 2.0; + + /* Is one pair of the new control points equal to the old control points? */ + if ((x2 == mp[0].X && y2 == mp[0].Y && x3 == mp[1].X && y3 == mp[1].Y) || + (x2 == mp[3].X && y2 == mp[3].Y && x3 == mp[4].X && y3 == mp[4].Y)) + continue; + + pt = end->pt; + pt_st = start->pt; + + /* check flatness as a half of distance between middle point and a linearized path + * formula for distance point from line for point (x0, y0) and line (x1, y1) (x2, y2) + * is defined as (area_triangle / distance_start_end): + * | (x2 - x1) * (y1 - y0) - (x1 - x0) * (y2 - y1) / sqrt( (x2 - x1)^2 + (y2 - y1)^2 ) | + * Here rearranged to avoid division and simplified: + * x0(y2 - y1) + y0(x1 - x2) + (x2*y1 - x1*y2) + */ + area_triangle = (pt.Y - pt_st.Y)*mp[2].X + (pt_st.X - pt.X)*mp[2].Y + (pt_st.Y*pt.X - pt_st.X*pt.Y); + distance_start_end = sqrtf(powf(pt.Y - pt_st.Y, 2.0) + powf(pt_st.X - pt.X, 2.0)); + if(fabs(area_triangle) <= (0.5 * flatness * distance_start_end)){ + continue; + } + else + /* add a middle point */ + if(!(node = add_path_list_node(start, mp[2].X, mp[2].Y, PathPointTypeLine))) + { + ret = FALSE; + break; + }; - /* middle point between control points */ - pt.X = (x2 + x3) / 2.0; - pt.Y = (y2 + y3) / 2.0; - - /* calculate bezier curve middle points == new control points */ - mp[0].X = (start->pt.X + x2) / 2.0; - mp[0].Y = (start->pt.Y + y2) / 2.0; - mp[1].X = (mp[0].X + pt.X) / 2.0; - mp[1].Y = (mp[0].Y + pt.Y) / 2.0; - mp[4].X = (end->pt.X + x3) / 2.0; - mp[4].Y = (end->pt.Y + y3) / 2.0; - mp[3].X = (mp[4].X + pt.X) / 2.0; - mp[3].Y = (mp[4].Y + pt.Y) / 2.0; - - /* middle point between new control points */ - mp[2].X = (mp[1].X + mp[3].X) / 2.0; - mp[2].Y = (mp[1].Y + mp[3].Y) / 2.0; - - /* Is one pair of the new control points equal to the old control points? */ - if ((x2 == mp[0].X && y2 == mp[0].Y && x3 == mp[1].X && y3 == mp[1].Y) || - (x2 == mp[3].X && y2 == mp[3].Y && x3 == mp[4].X && y3 == mp[4].Y)) - return TRUE; - - pt = end->pt; - pt_st = start->pt; - - /* check flatness as a half of distance between middle point and a linearized path - * formula for distance point from line for point (x0, y0) and line (x1, y1) (x2, y2) - * is defined as (area_triangle / distance_start_end): - * | (x2 - x1) * (y1 - y0) - (x1 - x0) * (y2 - y1) / sqrt( (x2 - x1)^2 + (y2 - y1)^2 ) | - * Here rearranged to avoid division and simplified: - * x0(y2 - y1) + y0(x1 - x2) + (x2*y1 - x1*y2) - */ - area_triangle = (pt.Y - pt_st.Y)*mp[2].X + (pt_st.X - pt.X)*mp[2].Y + (pt_st.Y*pt.X - pt_st.X*pt.Y); - distance_start_end = sqrtf(powf(pt.Y - pt_st.Y, 2.0) + powf(pt_st.X - pt.X, 2.0)); - if(fabs(area_triangle) <= (0.5 * flatness * distance_start_end)){ - return TRUE; + /* do the same with halves */ + if (!flatten_bezier_add(&current->entry, node, mp[3].X, mp[3].Y, mp[4].X, mp[4].Y, end)) + break; + if (!flatten_bezier_add(&current->entry, start, mp[0].X, mp[0].Y, mp[1].X, mp[1].Y, node)) + break; } - else - /* add a middle point */ - if(!(node = add_path_list_node(start, mp[2].X, mp[2].Y, PathPointTypeLine))) - return FALSE; - /* do the same with halves */ - flatten_bezier(start, mp[0].X, mp[0].Y, mp[1].X, mp[1].Y, node, flatness); - flatten_bezier(node, mp[3].X, mp[3].Y, mp[4].X, mp[4].Y, end, flatness); + /* Cleanup */ + LIST_FOR_EACH_ENTRY_SAFE( current, next, &jobs, struct flatten_bezier_job, entry ) + { + list_remove(&current->entry); + free(current); + } - return TRUE; + return ret; } /* GdipAddPath* helper

1 0

Zebediah Figura : ws2_32/tests: Increase the timeout on some FD_CLOSE tests.
by Alexandre Julliard 24 Jul '23

24 Jul '23

Module: wine Branch: master Commit: f523609219e8d6e2a543d769e1704302b62a0d6e URL: https://gitlab.winehq.org/wine/wine/-/commit/f523609219e8d6e2a543d769e17043… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jul 21 21:43:04 2023 -0500 ws2_32/tests: Increase the timeout on some FD_CLOSE tests. Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=54073 --- dlls/ws2_32/tests/sock.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index e6ab5065cfe..9d0f8e0e820 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -6842,7 +6842,7 @@ static void test_close_events(struct event_test_ctx *ctx) closesocket(client); - check_events(ctx, FD_CLOSE, 0, 200); + check_events(ctx, FD_CLOSE, 0, 1000); check_events(ctx, 0, 0, 0); select_events(ctx, server, FD_ACCEPT | FD_CLOSE | FD_CONNECT | FD_OOB | FD_READ); if (ctx->is_message) @@ -6869,7 +6869,7 @@ static void test_close_events(struct event_test_ctx *ctx) shutdown(client, SD_SEND); - check_events(ctx, FD_CLOSE, 0, 200); + check_events(ctx, FD_CLOSE, 0, 1000); check_events(ctx, 0, 0, 0); closesocket(client);

1 0

Zebediah Figura : ws2_32/tests: Give an event test marked todo a bit more time to fail on Wine.
by Alexandre Julliard 24 Jul '23

24 Jul '23

Module: wine Branch: master Commit: 9a43d51e06b9f52a4c4feefe8c8ab5aa31d8873f URL: https://gitlab.winehq.org/wine/wine/-/commit/9a43d51e06b9f52a4c4feefe8c8ab5… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jul 21 21:48:16 2023 -0500 ws2_32/tests: Give an event test marked todo a bit more time to fail on Wine. We are testing that FD_CLOSE isn't generated, but Wine currently generates FD_CLOSE anyway. However, sometimes Wine does not generate FD_CLOSE immediately, causing the test to intermittently succeed inside the todo block. This test is difficult to fix properly—it would involve either (arbitrary?) buffering in the server, or support from the host OS. However, we also don't want to make the Windows tests take longer, so add the 200 ms of leeway only on Wine. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54073 --- dlls/ws2_32/tests/sock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 9d0f8e0e820..9881540319b 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -6920,7 +6920,7 @@ static void test_close_events(struct event_test_ctx *ctx) ret = recv(server, buffer, 5, 0); ok(ret == 2, "got %d\n", ret); - check_events_todo(ctx, 0, 0, 0); + check_events_todo(ctx, 0, 0, !strcmp(winetest_platform, "wine") ? 200 : 0); closesocket(server);

1 0

Zebediah Figura : ws2_32/tests: Update test_write_watch() for Windows 11.
by Alexandre Julliard 24 Jul '23

24 Jul '23

Module: wine Branch: master Commit: 5dc0b0ef88216062a9e9fdb44a6205199475d750 URL: https://gitlab.winehq.org/wine/wine/-/commit/5dc0b0ef88216062a9e9fdb44a6205… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Jul 22 13:05:54 2023 -0500 ws2_32/tests: Update test_write_watch() for Windows 11. Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=54546 --- dlls/ws2_32/tests/sock.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 9881540319b..3b115672acb 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -7700,6 +7700,8 @@ static void test_write_watch(void) return; } + /* Windows 11 no longer triggers write watches anymore. */ + tcp_socketpair(&src, &dest); memset(&ov, 0, sizeof(ov)); @@ -7730,7 +7732,7 @@ static void test_write_watch(void) count = 64; ret = pGetWriteWatch( WRITE_WATCH_FLAG_RESET, base, size, results, &count, &pagesize ); ok( !ret, "GetWriteWatch failed %lu\n", GetLastError() ); - ok( count == 9, "wrong count %Iu\n", count ); + ok( count == 9 || !count /* Win 11 */, "wrong count %Iu\n", count ); ok( !base[0], "data set\n" ); send(src, "test message", sizeof("test message"), 0); @@ -7761,7 +7763,7 @@ static void test_write_watch(void) count = 64; ret = pGetWriteWatch( WRITE_WATCH_FLAG_RESET, base, size, results, &count, &pagesize ); ok( !ret, "GetWriteWatch failed %lu\n", GetLastError() ); - ok( count == 5, "wrong count %Iu\n", count ); + ok( count == 5 || !count /* Win 11 */, "wrong count %Iu\n", count ); ok( !base[0], "data set\n" ); send(src, "test message", sizeof("test message"), 0); @@ -7795,7 +7797,7 @@ static void test_write_watch(void) count = 64; ret = pGetWriteWatch( WRITE_WATCH_FLAG_RESET, base, size, results, &count, &pagesize ); ok( !ret, "GetWriteWatch failed %lu\n", GetLastError() ); - ok( count == 8, "wrong count %Iu\n", count ); + ok( count == 8 || !count /* Win 11 */, "wrong count %Iu\n", count ); send(src, "test message", sizeof("test message"), 0); WaitForSingleObject( thread, 10000 );

1 0

Zebediah Figura : ws2_32/tests: Use closesocket(), not close().
by Alexandre Julliard 24 Jul '23

24 Jul '23

Module: wine Branch: master Commit: ca02b8e4bc1ec224f0000bc6d4a66be38c1719a3 URL: https://gitlab.winehq.org/wine/wine/-/commit/ca02b8e4bc1ec224f0000bc6d4a66b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Jul 22 13:45:51 2023 -0500 ws2_32/tests: Use closesocket(), not close(). --- dlls/ws2_32/tests/sock.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 3b115672acb..ac104400104 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4904,9 +4904,9 @@ static void test_accept_inheritance(void) ok(linger.l_onoff == 1, "got on/off %u\n", linger.l_onoff); ok(linger.l_linger == 555, "got linger %u\n", linger.l_onoff); - close(server); - close(client); - close(listener); + closesocket(server); + closesocket(client); + closesocket(listener); } static void test_extendedSocketOptions(void)

1 0

Zebediah Figura : ws2_32/tests: Execute test_iocp() near the end.
by Alexandre Julliard 24 Jul '23

24 Jul '23

Module: wine Branch: master Commit: 8ab7120badb68519eb3a76ad6768c3109454e2b0 URL: https://gitlab.winehq.org/wine/wine/-/commit/8ab7120badb68519eb3a76ad6768c3… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Jul 22 13:46:55 2023 -0500 ws2_32/tests: Execute test_iocp() near the end. Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=54413 --- dlls/ws2_32/tests/sock.c | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index ac104400104..e53d9991e56 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -13877,7 +13877,6 @@ START_TEST( sock ) test_WSARecv(); test_WSAPoll(); test_write_watch(); - test_iocp(); test_events(); @@ -13903,6 +13902,31 @@ START_TEST( sock ) test_connect_udp(); test_tcp_sendto_recvfrom(); + /* There is apparently an obscure interaction between this test and + * test_WSAGetOverlappedResult(). + * + * One thing this test does is to close socket handles through CloseHandle() + * and NtClose(), to prove that that is sufficient to cancel I/O on the + * socket. This has the obscure side effect that ws2_32.dll's internal + * per-process list of sockets never has that socket removed. + * + * test_WSAGetOverlappedResult() effectively proves that the per-process + * list of sockets exists, by calling DuplicateHandle() on a socket and then + * passing it to a function which cares about socket handle validity, which + * checks that handle against the internal list, finds it invalid, and + * returns WSAENOTSOCK. + * + * The problem is that if we close an NT handle without removing it from the + * ws2_32 list, then duplicate another handle, it *may* end up allocated to + * the same handle value, and thus re-validate that handle right under the + * nose of ws2_32. This causes the test_WSAGetOverlappedResult() test to + * sometimes succeed where it's expected to fail with ENOTSOCK. + * + * In order to avoid this, make sure that this test—which is evidently + * destructive to ws2_32 internal state in obscure ways—is executed last. + */ + test_iocp(); + /* this is an io heavy test, do it at the end so the kernel doesn't start dropping packets */ test_send();

1 0

Jeff Smith : gdiplus: Set correct frame delay when GCE is missing.
by Alexandre Julliard 24 Jul '23

24 Jul '23

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

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

24 Jul '23

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

Rémi Bernon : mf/tests: Add missing line end in test message.
by Alexandre Julliard 24 Jul '23

24 Jul '23

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