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

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

July 24, 2023

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: Increase the timeout on some FD_CLOSE tests.
by Alexandre Julliard July 24, 2023

July 24, 2023

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

Connor McAdams : uiautomationcore: Implement IUIAutomation::{Add/Remove}FocusChangedEventHandler.
by Alexandre Julliard July 24, 2023

July 24, 2023

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

Connor McAdams : uiautomationcore: Use the free threaded marshaler to marshal IUIAutomationElement interfaces.
by Alexandre Julliard July 24, 2023

July 24, 2023

Module: wine Branch: master Commit: 7844a544afc349bc53416b43a301baa564ddc638 URL: https://gitlab.winehq.org/wine/wine/-/commit/7844a544afc349bc53416b43a301ba… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed May 24 10:57:02 2023 -0400 uiautomationcore: Use the free threaded marshaler to marshal IUIAutomationElement interfaces. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 79 ++++++++++++++++++++++++++++++ dlls/uiautomationcore/uia_com_client.c | 13 +++++ 2 files changed, 92 insertions(+) diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index 0dd75ce862f..5bd8e52fddb 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -10620,6 +10620,79 @@ static void test_UiaFind(void) CoUninitialize(); } +struct marshal_thread_data { + IUnknown *iface; + const GUID *iface_iid; + BOOL expect_proxy; + const char *file; + int line; + + IStream *marshal_stream; +}; + +static DWORD WINAPI interface_marshal_proxy_thread(LPVOID param) +{ + struct marshal_thread_data *data = (struct marshal_thread_data *)param; + IUnknown *proxy_iface, *unk, *unk2; + HRESULT hr; + + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + + proxy_iface = unk = unk2 = NULL; + hr = CoGetInterfaceAndReleaseStream(data->marshal_stream, data->iface_iid, (void **)&proxy_iface); + ok_(data->file, data->line)(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = IUnknown_QueryInterface(data->iface, &IID_IUnknown, (void **)&unk); + ok_(data->file, data->line)(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok_(data->file, data->line)(!!unk, "unk == NULL\n"); + + hr = IUnknown_QueryInterface(proxy_iface, &IID_IUnknown, (void **)&unk2); + ok_(data->file, data->line)(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok_(data->file, data->line)(!!unk2, "unk2 == NULL\n"); + + if (data->expect_proxy) + ok_(data->file, data->line)(unk != unk2, "unk == unk2\n"); + else + ok_(data->file, data->line)(unk == unk2, "unk != unk2\n"); + + IUnknown_Release(proxy_iface); + IUnknown_Release(unk); + IUnknown_Release(unk2); + + CoUninitialize(); + return 0; +} + +#define check_interface_marshal_proxy_creation( iface, iid, expect_proxy ) \ + check_interface_marshal_proxy_creation_( (iface), (iid), (expect_proxy), __FILE__, __LINE__) +static void check_interface_marshal_proxy_creation_(IUnknown *iface, REFIID iid, BOOL expect_proxy, const char *file, + int line) +{ + struct marshal_thread_data data = { NULL, iid, expect_proxy, file, line }; + HANDLE thread; + HRESULT hr; + + hr = IUnknown_QueryInterface(iface, data.iface_iid, (void **)&data.iface); + ok_(file, line)(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = CoMarshalInterThreadInterfaceInStream(data.iface_iid, data.iface, &data.marshal_stream); + ok_(file, line)(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + thread = CreateThread(NULL, 0, interface_marshal_proxy_thread, (void *)&data, 0, NULL); + while (MsgWaitForMultipleObjects(1, &thread, FALSE, INFINITE, QS_ALLINPUT) != WAIT_OBJECT_0) + { + MSG msg; + while(PeekMessageW(&msg, 0, 0, 0, PM_REMOVE)) + { + TranslateMessage(&msg); + DispatchMessageW(&msg); + } + } + CloseHandle(thread); + + IUnknown_Release(data.iface); +} + static HWND create_test_hwnd(const char *class_name) { WNDCLASSA cls = { 0 }; @@ -10717,6 +10790,12 @@ static void test_ElementFromHandle(IUIAutomation *uia_iface, BOOL is_cui8) else ok(hr == E_NOINTERFACE, "Unexpected hr %#lx.\n", hr); + /* + * The IUIAutomationElement interface uses the free threaded marshaler, so + * no actual proxy interface will be created. + */ + check_interface_marshal_proxy_creation((IUnknown *)element, &IID_IUIAutomationElement, FALSE); + IUIAutomationElement_Release(element); ok(Provider.ref == 1, "Unexpected refcnt %ld\n", Provider.ref); diff --git a/dlls/uiautomationcore/uia_com_client.c b/dlls/uiautomationcore/uia_com_client.c index 75c722771c3..66326ad9574 100644 --- a/dlls/uiautomationcore/uia_com_client.c +++ b/dlls/uiautomationcore/uia_com_client.c @@ -1186,6 +1186,8 @@ struct uia_element { struct uia_cache_property *cached_props; int cached_props_count; + + IUnknown *marshal; }; static inline struct uia_element *impl_from_IUIAutomationElement9(IUIAutomationElement9 *iface) @@ -1203,6 +1205,8 @@ static HRESULT WINAPI uia_element_QueryInterface(IUIAutomationElement9 *iface, R IsEqualIID(riid, &IID_IUIAutomationElement6) || IsEqualIID(riid, &IID_IUIAutomationElement7) || IsEqualIID(riid, &IID_IUIAutomationElement8) || IsEqualIID(riid, &IID_IUIAutomationElement9)))) *ppv = iface; + else if (IsEqualIID(riid, &IID_IMarshal)) + return IUnknown_QueryInterface(element->marshal, riid, ppv); else return E_NOINTERFACE; @@ -1235,6 +1239,7 @@ static ULONG WINAPI uia_element_Release(IUIAutomationElement9 *iface) VariantClear(&element->cached_props[i].prop_val); } + IUnknown_Release(element->marshal); heap_free(element->cached_props); UiaNodeRelease(element->node); heap_free(element); @@ -2484,6 +2489,7 @@ static const IUIAutomationElement9Vtbl uia_element_vtbl = { static HRESULT create_uia_element(IUIAutomationElement **iface, BOOL from_cui8, HUIANODE node) { struct uia_element *element = heap_alloc_zero(sizeof(*element)); + HRESULT hr; *iface = NULL; if (!element) @@ -2494,6 +2500,13 @@ static HRESULT create_uia_element(IUIAutomationElement **iface, BOOL from_cui8, element->from_cui8 = from_cui8; element->node = node; + hr = CoCreateFreeThreadedMarshaler((IUnknown *)&element->IUIAutomationElement9_iface, &element->marshal); + if (FAILED(hr)) + { + heap_free(element); + return hr; + } + *iface = (IUIAutomationElement *)&element->IUIAutomationElement9_iface; return S_OK; }

1 0

Connor McAdams : uiautomationcore: Introduce custom clientside event callback function.
by Alexandre Julliard July 24, 2023

July 24, 2023

Module: wine Branch: master Commit: 9ab915a7fb60c0a6ac8a8d9f7ac22a99d8355f40 URL: https://gitlab.winehq.org/wine/wine/-/commit/9ab915a7fb60c0a6ac8a8d9f7ac22a… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Tue Jun 27 09:12:17 2023 -0400 uiautomationcore: Introduce custom clientside event callback function. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/uia_event.c | 93 +++++++++++++++++++++++-------------- dlls/uiautomationcore/uia_private.h | 11 ++++- 2 files changed, 69 insertions(+), 35 deletions(-) diff --git a/dlls/uiautomationcore/uia_event.c b/dlls/uiautomationcore/uia_event.c index 801ccf4a705..84120ae90fc 100644 --- a/dlls/uiautomationcore/uia_event.c +++ b/dlls/uiautomationcore/uia_event.c @@ -217,12 +217,6 @@ static void uia_event_map_entry_release(struct uia_event_map_entry *entry) * as they're raised on a background thread after the event raising * function has returned. */ -struct uia_event_args -{ - struct UiaEventArgs simple_args; - LONG ref; -}; - static struct uia_event_args *create_uia_event_args(const struct uia_event_info *event_info) { struct uia_event_args *args = heap_alloc_zero(sizeof(*args)); @@ -733,8 +727,8 @@ static HRESULT create_uia_event(struct uia_event **out_event, LONG event_cookie, return S_OK; } -static HRESULT create_clientside_uia_event(struct uia_event **out_event, int event_id, int scope, UiaEventCallback *cback, - SAFEARRAY *runtime_id) +static HRESULT create_clientside_uia_event(struct uia_event **out_event, int event_id, int scope, + UiaWineEventCallback *cback, void *cback_data, SAFEARRAY *runtime_id) { struct uia_event *event = NULL; static LONG next_event_cookie; @@ -748,7 +742,8 @@ static HRESULT create_clientside_uia_event(struct uia_event **out_event, int eve event->runtime_id = runtime_id; event->event_id = event_id; event->scope = scope; - event->u.clientside.cback = cback; + event->u.clientside.event_callback = cback; + event->u.clientside.callback_data = cback_data; *out_event = event; return S_OK; @@ -1135,38 +1130,29 @@ exit: return hr; } -/*********************************************************************** - * UiaAddEvent (uiautomationcore.@) - */ -HRESULT WINAPI UiaAddEvent(HUIANODE huianode, EVENTID event_id, UiaEventCallback *callback, enum TreeScope scope, - PROPERTYID *prop_ids, int prop_ids_count, struct UiaCacheRequest *cache_req, HUIAEVENT *huiaevent) +static HRESULT uia_clientside_event_callback(struct uia_event *event, struct uia_event_args *args, + SAFEARRAY *cache_req, BSTR tree_struct) { - const struct uia_event_info *event_info = uia_event_info_from_id(event_id); - struct uia_event *event; - SAFEARRAY *sa; - HRESULT hr; + UiaEventCallback *event_callback = (UiaEventCallback *)event->u.clientside.callback_data; - TRACE("(%p, %d, %p, %#x, %p, %d, %p, %p)\n", huianode, event_id, callback, scope, prop_ids, prop_ids_count, - cache_req, huiaevent); - - if (!huianode || !callback || !cache_req || !huiaevent) - return E_INVALIDARG; + event_callback(&args->simple_args, cache_req, tree_struct); - if (!event_info) - WARN("No event information for event ID %d\n", event_id); + return S_OK; +} - *huiaevent = NULL; - if (event_info && (event_info->event_arg_type == EventArgsType_PropertyChanged)) - { - FIXME("Property changed event registration currently unimplemented\n"); - return E_NOTIMPL; - } +static HRESULT uia_add_clientside_event(HUIANODE huianode, EVENTID event_id, enum TreeScope scope, PROPERTYID *prop_ids, + int prop_ids_count, struct UiaCacheRequest *cache_req, SAFEARRAY *rt_id, UiaWineEventCallback *cback, + void *cback_data, HUIAEVENT *huiaevent) +{ + struct uia_event *event; + SAFEARRAY *sa; + HRESULT hr; - hr = UiaGetRuntimeId(huianode, &sa); + hr = SafeArrayCopy(rt_id, &sa); if (FAILED(hr)) return hr; - hr = create_clientside_uia_event(&event, event_id, scope, callback, sa); + hr = create_clientside_uia_event(&event, event_id, scope, cback, cback_data, sa); if (FAILED(hr)) { SafeArrayDestroy(sa); @@ -1198,6 +1184,43 @@ exit: return hr; } +/*********************************************************************** + * UiaAddEvent (uiautomationcore.@) + */ +HRESULT WINAPI UiaAddEvent(HUIANODE huianode, EVENTID event_id, UiaEventCallback *callback, enum TreeScope scope, + PROPERTYID *prop_ids, int prop_ids_count, struct UiaCacheRequest *cache_req, HUIAEVENT *huiaevent) +{ + const struct uia_event_info *event_info = uia_event_info_from_id(event_id); + SAFEARRAY *sa; + HRESULT hr; + + TRACE("(%p, %d, %p, %#x, %p, %d, %p, %p)\n", huianode, event_id, callback, scope, prop_ids, prop_ids_count, + cache_req, huiaevent); + + if (!huianode || !callback || !cache_req || !huiaevent) + return E_INVALIDARG; + + if (!event_info) + WARN("No event information for event ID %d\n", event_id); + + *huiaevent = NULL; + if (event_info && (event_info->event_arg_type == EventArgsType_PropertyChanged)) + { + FIXME("Property changed event registration currently unimplemented\n"); + return E_NOTIMPL; + } + + hr = UiaGetRuntimeId(huianode, &sa); + if (FAILED(hr)) + return hr; + + hr = uia_add_clientside_event(huianode, event_id, scope, prop_ids, prop_ids_count, cache_req, sa, + uia_clientside_event_callback, (void *)callback, huiaevent); + SafeArrayDestroy(sa); + + return hr; +} + /*********************************************************************** * UiaRemoveEvent (uiautomationcore.@) */ @@ -1245,7 +1268,9 @@ static HRESULT uia_event_invoke(HUIANODE node, HUIANODE nav_start_node, struct u &tree_struct); if (SUCCEEDED(hr)) { - event->u.clientside.cback(&args->simple_args, out_req, tree_struct); + hr = event->u.clientside.event_callback(event, args, out_req, tree_struct); + if (FAILED(hr)) + WARN("Event callback failed with hr %#lx\n", hr); SafeArrayDestroy(out_req); SysFreeString(tree_struct); } diff --git a/dlls/uiautomationcore/uia_private.h b/dlls/uiautomationcore/uia_private.h index 11cab86651c..928b36fbae6 100644 --- a/dlls/uiautomationcore/uia_private.h +++ b/dlls/uiautomationcore/uia_private.h @@ -95,6 +95,12 @@ static inline struct uia_provider *impl_from_IWineUiaProvider(IWineUiaProvider * return CONTAINING_RECORD(iface, struct uia_provider, IWineUiaProvider_iface); } +struct uia_event_args +{ + struct UiaEventArgs simple_args; + LONG ref; +}; + enum uia_event_type { EVENT_TYPE_CLIENTSIDE, EVENT_TYPE_SERVERSIDE, @@ -124,7 +130,8 @@ struct uia_event { struct { struct UiaCacheRequest cache_req; - UiaEventCallback *cback; + HRESULT (*event_callback)(struct uia_event *, struct uia_event_args *, SAFEARRAY *, BSTR); + void *callback_data; DWORD git_cookie; } clientside; @@ -137,6 +144,8 @@ struct uia_event } u; }; +typedef HRESULT UiaWineEventCallback(struct uia_event *, struct uia_event_args *, SAFEARRAY *, BSTR); + static inline void variant_init_bool(VARIANT *v, BOOL val) { V_VT(v) = VT_BOOL;

1 0

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