November 2022 - Wine-commits

Dmitry Timoshkov : uxtheme: Protect CloseThemeData() from invalid input.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: master Commit: 2ae7ecb9367a1a5a407c293a8e2529eb4db813f4 URL: https://gitlab.winehq.org/wine/wine/-/commit/2ae7ecb9367a1a5a407c293a8e2529… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Aug 12 11:32:54 2022 +0800 uxtheme: Protect CloseThemeData() from invalid input. With test case by Michael Müller <michael(a)fds-team.de>. Zhiyi Zhang's comments: Some applications close the same HTHEME handle more than once, causing use-after-free. HTHEME is a handle rather than a pointer. Some testing shows that it's a handle starting from 0x10000 or 0x20000. Each new handle increments from the first handle and closing handles decrements it. I prefer not to implement this handle to data map for now because it will likely hurt performance. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=29974 --- dlls/uxtheme/msstyles.c | 22 ++++++++++++++++++++++ dlls/uxtheme/msstyles.h | 1 + dlls/uxtheme/tests/system.c | 2 ++ 3 files changed, 25 insertions(+) diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c index 9e5a79a1c69..d871f213b05 100644 --- a/dlls/uxtheme/msstyles.c +++ b/dlls/uxtheme/msstyles.c @@ -32,6 +32,7 @@ #include "msstyles.h" +#include "wine/exception.h" #include "wine/debug.h" #include "wine/heap.h" @@ -49,6 +50,8 @@ static HRESULT MSSTYLES_GetFont (LPCWSTR lpStringStart, LPCWSTR lpStringEnd, LPC #define MSSTYLES_VERSION 0x0003 +#define THEME_CLASS_SIGNATURE 0x12bc6d83 + static PTHEME_FILE tfActiveTheme; /***********************************************************************/ @@ -204,6 +207,7 @@ void MSSTYLES_CloseThemeFile(PTHEME_FILE tf) pcls->partstate = ps->next; heap_free(ps); } + pcls->signature = 0; heap_free(pcls); } } @@ -442,6 +446,7 @@ static PTHEME_CLASS MSSTYLES_AddClass(PTHEME_FILE tf, LPCWSTR pszAppName, LPCWST if(cur) return cur; cur = heap_alloc(sizeof(*cur)); + cur->signature = THEME_CLASS_SIGNATURE; cur->hTheme = tf->hTheme; lstrcpyW(cur->szAppName, pszAppName); lstrcpyW(cur->szClassName, pszClassName); @@ -1075,6 +1080,23 @@ PTHEME_CLASS MSSTYLES_OpenThemeClass(LPCWSTR pszAppName, LPCWSTR pszClassList, U */ HRESULT MSSTYLES_CloseThemeClass(PTHEME_CLASS tc) { + __TRY + { + if (tc->signature != THEME_CLASS_SIGNATURE) + tc = NULL; + } + __EXCEPT_PAGE_FAULT + { + tc = NULL; + } + __ENDTRY + + if (!tc) + { + WARN("Invalid theme class handle\n"); + return E_HANDLE; + } + MSSTYLES_CloseThemeFile (tc->tf); return S_OK; } diff --git a/dlls/uxtheme/msstyles.h b/dlls/uxtheme/msstyles.h index 67f81315d7a..a1918314341 100644 --- a/dlls/uxtheme/msstyles.h +++ b/dlls/uxtheme/msstyles.h @@ -49,6 +49,7 @@ typedef struct _THEME_PARTSTATE { struct _THEME_FILE; typedef struct _THEME_CLASS { + DWORD signature; HMODULE hTheme; struct _THEME_FILE* tf; WCHAR szAppName[MAX_THEME_APP_NAME]; diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index a90c512091f..f8253c6a983 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -835,6 +835,8 @@ static void test_CloseThemeData(void) ok( hRes == E_HANDLE, "Expected E_HANDLE, got 0x%08lx\n", hRes); hRes = CloseThemeData(INVALID_HANDLE_VALUE); ok( hRes == E_HANDLE, "Expected E_HANDLE, got 0x%08lx\n", hRes); + hRes = CloseThemeData((HTHEME)0xdeadbeef); + ok(hRes == E_HANDLE, "Expected E_HANDLE, got 0x%08lx\n", hRes); } static void test_buffer_dc_props(HDC hdc, const RECT *rect)

1 0

Zhiyi Zhang : uxtheme: Reference count theme classes.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: master Commit: 113eca095a33693c18323275c7bd420888914837 URL: https://gitlab.winehq.org/wine/wine/-/commit/113eca095a33693c18323275c7bd42… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Aug 12 11:32:54 2022 +0800 uxtheme: Reference count theme classes. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=29974 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/msstyles.c | 9 ++++++++- dlls/uxtheme/msstyles.h | 1 + 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c index d871f213b05..529a280b2e5 100644 --- a/dlls/uxtheme/msstyles.c +++ b/dlls/uxtheme/msstyles.c @@ -447,6 +447,7 @@ static PTHEME_CLASS MSSTYLES_AddClass(PTHEME_FILE tf, LPCWSTR pszAppName, LPCWST cur = heap_alloc(sizeof(*cur)); cur->signature = THEME_CLASS_SIGNATURE; + cur->refcount = 0; cur->hTheme = tf->hTheme; lstrcpyW(cur->szAppName, pszAppName); lstrcpyW(cur->szClassName, pszClassName); @@ -1061,6 +1062,7 @@ PTHEME_CLASS MSSTYLES_OpenThemeClass(LPCWSTR pszAppName, LPCWSTR pszClassList, U TRACE("Opened app %s, class %s from list %s\n", debugstr_w(cls->szAppName), debugstr_w(cls->szClassName), debugstr_w(pszClassList)); cls->tf = tfActiveTheme; cls->tf->dwRefCount++; + InterlockedIncrement(&cls->refcount); cls->dpi = dpi; } return cls; @@ -1080,6 +1082,8 @@ PTHEME_CLASS MSSTYLES_OpenThemeClass(LPCWSTR pszAppName, LPCWSTR pszClassList, U */ HRESULT MSSTYLES_CloseThemeClass(PTHEME_CLASS tc) { + LONG refcount; + __TRY { if (tc->signature != THEME_CLASS_SIGNATURE) @@ -1097,7 +1101,10 @@ HRESULT MSSTYLES_CloseThemeClass(PTHEME_CLASS tc) return E_HANDLE; } - MSSTYLES_CloseThemeFile (tc->tf); + refcount = InterlockedDecrement(&tc->refcount); + /* Some buggy apps may double free HTHEME handles */ + if (refcount >= 0) + MSSTYLES_CloseThemeFile(tc->tf); return S_OK; } diff --git a/dlls/uxtheme/msstyles.h b/dlls/uxtheme/msstyles.h index a1918314341..9fe99784838 100644 --- a/dlls/uxtheme/msstyles.h +++ b/dlls/uxtheme/msstyles.h @@ -50,6 +50,7 @@ struct _THEME_FILE; typedef struct _THEME_CLASS { DWORD signature; + LONG refcount; HMODULE hTheme; struct _THEME_FILE* tf; WCHAR szAppName[MAX_THEME_APP_NAME];

1 0

Zhiyi Zhang : uxtheme: Use atomic functions for reference counting.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: master Commit: bbb5fb7e250d31538554d111753f3698782cc796 URL: https://gitlab.winehq.org/wine/wine/-/commit/bbb5fb7e250d31538554d111753f36… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Aug 12 11:32:54 2022 +0800 uxtheme: Use atomic functions for reference counting. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/msstyles.c | 13 ++++++++----- dlls/uxtheme/msstyles.h | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c index 529a280b2e5..cfd21a48989 100644 --- a/dlls/uxtheme/msstyles.c +++ b/dlls/uxtheme/msstyles.c @@ -171,7 +171,7 @@ HRESULT MSSTYLES_OpenThemeFile(LPCWSTR lpThemeFile, LPCWSTR pszColorName, LPCWST (*tf)->pszAvailSizes = pszSizes; (*tf)->pszSelectedColor = pszSelectedColor; (*tf)->pszSelectedSize = pszSelectedSize; - (*tf)->dwRefCount = 1; + (*tf)->refcount = 1; return S_OK; invalid_theme: @@ -187,9 +187,12 @@ invalid_theme: */ void MSSTYLES_CloseThemeFile(PTHEME_FILE tf) { + LONG refcount; + if(tf) { - tf->dwRefCount--; - if(!tf->dwRefCount) { + refcount = InterlockedDecrement(&tf->refcount); + if (!refcount) + { if(tf->hTheme) FreeLibrary(tf->hTheme); if(tf->classes) { while(tf->classes) { @@ -235,7 +238,7 @@ HRESULT MSSTYLES_SetActiveTheme(PTHEME_FILE tf, BOOL setMetrics) tfActiveTheme = tf; if (tfActiveTheme) { - tfActiveTheme->dwRefCount++; + InterlockedIncrement(&tfActiveTheme->refcount); if(!tfActiveTheme->classes) MSSTYLES_ParseThemeIni(tfActiveTheme, setMetrics); } @@ -1061,7 +1064,7 @@ PTHEME_CLASS MSSTYLES_OpenThemeClass(LPCWSTR pszAppName, LPCWSTR pszClassList, U if(cls) { TRACE("Opened app %s, class %s from list %s\n", debugstr_w(cls->szAppName), debugstr_w(cls->szClassName), debugstr_w(pszClassList)); cls->tf = tfActiveTheme; - cls->tf->dwRefCount++; + InterlockedIncrement(&cls->tf->refcount); InterlockedIncrement(&cls->refcount); cls->dpi = dpi; } diff --git a/dlls/uxtheme/msstyles.h b/dlls/uxtheme/msstyles.h index 9fe99784838..98e1aa045d6 100644 --- a/dlls/uxtheme/msstyles.h +++ b/dlls/uxtheme/msstyles.h @@ -71,7 +71,7 @@ typedef struct _THEME_IMAGE { } THEME_IMAGE, *PTHEME_IMAGE; typedef struct _THEME_FILE { - DWORD dwRefCount; + LONG refcount; HMODULE hTheme; WCHAR szThemeFile[MAX_PATH]; LPWSTR pszAvailColors;

1 0

Hans Leidekker : netprofm: Store a list manager pointer in the network object instead of creating a new list manager.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: master Commit: 3c9e955f2b899822f392e747ee5422b931d9c5a7 URL: https://gitlab.winehq.org/wine/wine/-/commit/3c9e955f2b899822f392e747ee5422… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 8 11:50:32 2022 +0100 netprofm: Store a list manager pointer in the network object instead of creating a new list manager. --- dlls/netprofm/list.c | 86 ++++++++++++++++++---------------------------------- 1 file changed, 30 insertions(+), 56 deletions(-) diff --git a/dlls/netprofm/list.c b/dlls/netprofm/list.c index db4f13f532e..eec1f2225d4 100644 --- a/dlls/netprofm/list.c +++ b/dlls/netprofm/list.c @@ -44,12 +44,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(netprofm); struct network { - INetwork INetwork_iface; - LONG refs; - struct list entry; - GUID id; - VARIANT_BOOL connected_to_internet; - VARIANT_BOOL connected; + INetwork INetwork_iface; + LONG refs; + struct list entry; + GUID id; + INetworkListManager *mgr; + VARIANT_BOOL connected_to_internet; + VARIANT_BOOL connected; }; struct connection @@ -94,9 +95,6 @@ struct sink_entry IUnknown *unk; }; -static HRESULT create_connections_enum( - struct list_manager *, IEnumNetworkConnections** ); - static inline struct list_manager *impl_from_IConnectionPointContainer(IConnectionPointContainer *iface) { return CONTAINING_RECORD(iface, struct list_manager, IConnectionPointContainer_iface); @@ -114,12 +112,6 @@ static inline struct connection_point *impl_from_IConnectionPoint( return CONTAINING_RECORD( iface, struct connection_point, IConnectionPoint_iface ); } -static inline struct list_manager *impl_from_INetworkListManager( - INetworkListManager *iface ) -{ - return CONTAINING_RECORD( iface, struct list_manager, INetworkListManager_iface ); -} - static HRESULT WINAPI connection_point_QueryInterface( IConnectionPoint *iface, REFIID riid, @@ -337,6 +329,7 @@ static ULONG WINAPI network_Release( if (!(refs = InterlockedDecrement( &network->refs ))) { list_remove( &network->entry ); + INetworkListManager_Release( network->mgr ); heap_free( network ); } return refs; @@ -441,42 +434,24 @@ static HRESULT WINAPI network_GetDomainType( return S_OK; } -static ULONG WINAPI connection_Release( - INetworkConnection *iface ); +static inline struct list_manager *impl_from_INetworkListManager( + INetworkListManager *iface ) +{ + return CONTAINING_RECORD( iface, struct list_manager, INetworkListManager_iface ); +} + +static HRESULT create_connections_enum( + struct list_manager *, IEnumNetworkConnections** ); static HRESULT WINAPI network_GetNetworkConnections( INetwork *iface, - IEnumNetworkConnections **ppEnumNetworkConnection ) + IEnumNetworkConnections **ppEnum ) { - HRESULT hr; - INetworkListManager *network_list_mgr = NULL; - struct list_manager *mgr = NULL; - struct network *current_network = impl_from_INetwork( iface ); - - struct connection *connection, *next; - struct network *network; - - if (FAILED(hr = list_manager_create((void**)&network_list_mgr))) - return hr; - - mgr = impl_from_INetworkListManager(network_list_mgr); - - if (FAILED(hr = create_connections_enum(mgr, ppEnumNetworkConnection))) - return hr; - - TRACE("%p, %s\n", iface, debugstr_guid(&current_network->id)); - - LIST_FOR_EACH_ENTRY_SAFE(connection, next, &mgr->connections, struct connection, entry) - { - network = impl_from_INetwork(connection->network); - if (!IsEqualGUID(&network->id, &current_network->id)) - { - TRACE("Filtering %s\n", debugstr_guid(&network->id)); - list_remove(&connection->entry); - } - } + struct network *network = impl_from_INetwork( iface ); + struct list_manager *mgr = impl_from_INetworkListManager( network->mgr ); - return S_OK; + TRACE( "%p, %p\n", iface, ppEnum ); + return create_connections_enum( mgr, ppEnum ); } static HRESULT WINAPI network_GetTimeCreatedAndConnected( @@ -1147,7 +1122,8 @@ static ULONG WINAPI list_manager_Release( LONG refs = InterlockedDecrement( &mgr->refs ); if (!refs) { - struct list *ptr; + struct network *network, *next_network; + struct connection *connection, *next_connection; TRACE( "destroying %p\n", mgr ); @@ -1155,17 +1131,13 @@ static ULONG WINAPI list_manager_Release( connection_point_release( &mgr->conn_mgr_cp ); connection_point_release( &mgr->cost_mgr_cp ); connection_point_release( &mgr->list_mgr_cp ); - while ((ptr = list_head( &mgr->networks ))) + LIST_FOR_EACH_ENTRY_SAFE( connection, next_connection, &mgr->connections, struct connection, entry ) { - struct network *network = LIST_ENTRY( ptr, struct network, entry ); - list_remove( &network->entry ); - INetwork_Release( &network->INetwork_iface ); + INetworkConnection_Release( &connection->INetworkConnection_iface ); } - while ((ptr = list_head( &mgr->connections ))) + LIST_FOR_EACH_ENTRY_SAFE( network, next_network, &mgr->networks, struct network, entry ) { - struct connection *connection = LIST_ENTRY( ptr, struct connection, entry ); - list_remove( &connection->entry ); - INetworkConnection_Release( &connection->INetworkConnection_iface ); + INetwork_Release( &network->INetwork_iface ); } heap_free( mgr ); } @@ -1522,8 +1494,8 @@ static ULONG WINAPI connection_Release( if (!(refs = InterlockedDecrement( &connection->refs ))) { - INetwork_Release( connection->network ); list_remove( &connection->entry ); + INetwork_Release( connection->network ); heap_free( connection ); } return refs; @@ -1820,6 +1792,8 @@ static void init_networks( struct list_manager *mgr ) connection->connected_to_internet = VARIANT_TRUE; } + network->mgr = &mgr->INetworkListManager_iface; + INetworkListManager_AddRef( network->mgr ); connection->network = &network->INetwork_iface; INetwork_AddRef( connection->network );

1 0

Eric Pouech : shell32/tests: Improve timeout detection in shlexec tests.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: master Commit: f4b52f796abb9bb7b3648a8aea256f39c7f6ac93 URL: https://gitlab.winehq.org/wine/wine/-/commit/f4b52f796abb9bb7b3648a8aea256f… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Nov 8 10:44:56 2022 +0100 shell32/tests: Improve timeout detection in shlexec tests. Some shlexec tests timeout on Windows10 (and generate errors as no action has been executed). Improve detection of timeout in child program (so that existing workaround in shell_execute_ex can be triggered). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/shell32/tests/shlexec.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 5096eef380f..b84a96a2434 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -194,6 +194,7 @@ static void init_event(const char* child_file) hEvent=CreateEventA(NULL, FALSE, FALSE, event_name); } +static HANDLE hChildFile; /* * This is just to make sure the child won't run forever stuck in a * GetMessage() loop when DDE fails for some reason. @@ -201,6 +202,7 @@ static void init_event(const char* child_file) static void CALLBACK childTimeout(HWND wnd, UINT msg, UINT_PTR timer, DWORD time) { trace("childTimeout called\n"); + childPrintf(hChildFile, "Timeout=1\r\n"); PostQuitMessage(0); } @@ -217,6 +219,7 @@ static void doChild(int argc, char** argv) if (hFile == INVALID_HANDLE_VALUE) return; + hChildFile = hFile; /* Arguments */ childPrintf(hFile, "[Child]\r\n"); if (winetest_debug > 2) @@ -654,10 +657,20 @@ static INT_PTR shell_execute_ex_(const char* file, int line, c = GetPrivateProfileIntA("Child", "Failures", -1, child_file); if (c > 0) winetest_add_failures(c); + c = GetPrivateProfileIntA("Child", "Timeout", -1, child_file); + if (c > 0) + { + /* Inform caller of the timeout... these two following bits + * are directly returned by some Windows10 versions. + * Return the same bits when we detect a timeout in child. + */ + SetLastError(ERROR_FILE_NOT_FOUND); + rc = SE_ERR_DDEFAIL; + } /* When NOZONECHECKS is specified the environment variables are not * inherited if the process does not have elevated privileges. */ - if ((mask & SEE_MASK_NOZONECHECKS) && skip_shlexec_tests) + else if ((mask & SEE_MASK_NOZONECHECKS) && skip_shlexec_tests) { okChildInt_(file, line, "ShlexecVarLE", 203); okChildString_(file, line, "ShlexecVar", "", "");

1 0

Paul Gofman : mf: Handle timer time behind clock time in present_clock_schedule_timer().
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: master Commit: dd13bbb57bd2cdf874d3d6d1cb941ba3bd4860c3 URL: https://gitlab.winehq.org/wine/wine/-/commit/dd13bbb57bd2cdf874d3d6d1cb941b… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Aug 1 17:59:11 2022 -0500 mf: Handle timer time behind clock time in present_clock_schedule_timer(). --- dlls/mf/clock.c | 5 ++++- dlls/mf/tests/mf.c | 61 ++++++++++++++++++++++++++++++++++++++++++------------ 2 files changed, 52 insertions(+), 14 deletions(-) diff --git a/dlls/mf/clock.c b/dlls/mf/clock.c index e9877533a5a..aef4366c6d9 100644 --- a/dlls/mf/clock.c +++ b/dlls/mf/clock.c @@ -819,7 +819,10 @@ static HRESULT present_clock_schedule_timer(struct presentation_clock *clock, DW WARN("Failed to get clock time, hr %#lx.\n", hr); return hr; } - time -= clocktime; + if (time > clocktime) + time -= clocktime; + else + time = 0; } frequency = clock->frequency / 1000; diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 8dd3b35251d..399f983983f 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1775,6 +1775,7 @@ struct test_callback HANDLE event; IMFMediaEvent *media_event; + BOOL check_media_event; }; static struct test_callback *impl_from_IMFAsyncCallback(IMFAsyncCallback *iface) @@ -1835,15 +1836,18 @@ static HRESULT WINAPI testcallback_Invoke(IMFAsyncCallback *iface, IMFAsyncResul if (callback->media_event) IMFMediaEvent_Release(callback->media_event); - hr = IMFAsyncResult_GetObject(result, &object); - ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); + if (callback->check_media_event) + { + hr = IMFAsyncResult_GetObject(result, &object); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); - hr = IMFAsyncResult_GetState(result, &object); - ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - hr = IMFMediaEventGenerator_EndGetEvent((IMFMediaEventGenerator *)object, - result, &callback->media_event); - ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - IUnknown_Release(object); + hr = IMFAsyncResult_GetState(result, &object); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFMediaEventGenerator_EndGetEvent((IMFMediaEventGenerator *)object, + result, &callback->media_event); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + IUnknown_Release(object); + } SetEvent(callback->event); @@ -1859,7 +1863,7 @@ static const IMFAsyncCallbackVtbl testcallbackvtbl = testcallback_Invoke, }; -static IMFAsyncCallback *create_test_callback(void) +static IMFAsyncCallback *create_test_callback(BOOL check_media_event) { struct test_callback *callback; @@ -1867,6 +1871,7 @@ static IMFAsyncCallback *create_test_callback(void) return NULL; callback->refcount = 1; + callback->check_media_event = check_media_event; callback->IMFAsyncCallback_iface.lpVtbl = &testcallbackvtbl; callback->event = CreateEventW(NULL, FALSE, FALSE, NULL); ok(!!callback->event, "CreateEventW failed, error %lu\n", GetLastError()); @@ -2000,8 +2005,8 @@ static void test_media_session_events(void) hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); ok(hr == S_OK, "Startup failure, hr %#lx.\n", hr); - callback = create_test_callback(); - callback2 = create_test_callback(); + callback = create_test_callback(TRUE); + callback2 = create_test_callback(TRUE); hr = MFCreateMediaSession(NULL, &session); ok(hr == S_OK, "Failed to create media session, hr %#lx.\n", hr); @@ -2056,7 +2061,7 @@ static void test_media_session_events(void) IMFAsyncCallback_Release(callback2); - callback = create_test_callback(); + callback = create_test_callback(TRUE); hr = MFCreateMediaSession(NULL, &session); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); @@ -3810,15 +3815,20 @@ static void test_presentation_clock(void) }; IMFClockStateSink test_sink = { &test_clock_sink_vtbl }; IMFPresentationTimeSource *time_source; + struct test_callback *timer_callback; MFCLOCK_PROPERTIES props, props2; IMFRateControl *rate_control; IMFPresentationClock *clock; + IMFAsyncCallback *callback; + IUnknown *timer_cancel_key; MFSHUTDOWN_STATUS status; IMFShutdown *shutdown; MFTIME systime, time; LONGLONG clock_time; MFCLOCK_STATE state; + IMFTimer *timer; unsigned int i; + DWORD t1, t2; DWORD value; float rate; HRESULT hr; @@ -4042,6 +4052,31 @@ static void test_presentation_clock(void) IMFRateControl_Release(rate_control); + + hr = IMFPresentationClock_QueryInterface(clock, &IID_IMFTimer, (void **)&timer); + ok(hr == S_OK, "got hr %#lx.\n", hr); + + hr = IMFPresentationClock_Start(clock, 200000); + ok(hr == S_OK, "got hr %#lx.\n", hr); + + hr = IMFPresentationClock_GetCorrelatedTime(clock, 0, &time, &systime); + ok(hr == S_OK, "got hr %#lx.\n", hr); + + callback = create_test_callback(FALSE); + timer_callback = impl_from_IMFAsyncCallback(callback); + hr = IMFTimer_SetTimer(timer, 0, 100000, callback, NULL, &timer_cancel_key); + ok(hr == S_OK, "got hr %#lx.\n", hr); + + t1 = GetTickCount(); + ok(WaitForSingleObject(timer_callback->event, 4000) == WAIT_OBJECT_0, "WaitForSingleObject failed.\n"); + t2 = GetTickCount(); + + ok(t2 - t1 < 200, "unexpected time difference %lu.\n", t2 - t1); + + IUnknown_Release(timer_cancel_key); + IMFTimer_Release(timer); + IMFAsyncCallback_Release(callback); + hr = IMFPresentationClock_QueryInterface(clock, &IID_IMFShutdown, (void **)&shutdown); ok(hr == S_OK, "Failed to get shutdown interface, hr %#lx.\n", hr); @@ -4693,7 +4728,7 @@ static void test_sample_grabber_orientation(GUID subtype) return; } - callback = create_test_callback(); + callback = create_test_callback(TRUE); grabber_callback = impl_from_IMFSampleGrabberSinkCallback(create_test_grabber_callback()); grabber_callback->ready_event = CreateEventW(NULL, FALSE, FALSE, NULL);

1 0

Paul Gofman : mf/samplegrabber: Process samples in paused state in ignore_clock mode.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: master Commit: af9f2e8b2ebd530e42c7042a6bc613bda17d42e4 URL: https://gitlab.winehq.org/wine/wine/-/commit/af9f2e8b2ebd530e42c7042a6bc613… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Aug 15 12:55:26 2022 -0500 mf/samplegrabber: Process samples in paused state in ignore_clock mode. --- dlls/mf/samplegrabber.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index e41e74d35ac..c0c92143b6d 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -425,7 +425,7 @@ static HRESULT WINAPI sample_grabber_stream_ProcessSample(IMFStreamSink *iface, if (grabber->is_shut_down) hr = MF_E_STREAMSINK_REMOVED; - else if (grabber->state == SINK_STATE_RUNNING) + else if (grabber->state == SINK_STATE_RUNNING || (grabber->state == SINK_STATE_PAUSED && grabber->ignore_clock)) { hr = IMFSample_GetSampleTime(sample, &sampletime);

1 0

Paul Gofman : mf/samplegrabber: Handle samples receieved in paused state.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: master Commit: f94177deadb9b64fae15c9f34428eac9a46d88f4 URL: https://gitlab.winehq.org/wine/wine/-/commit/f94177deadb9b64fae15c9f34428ea… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Aug 2 15:16:55 2022 -0500 mf/samplegrabber: Handle samples receieved in paused state. --- dlls/mf/samplegrabber.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 49 insertions(+), 3 deletions(-) diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index c0c92143b6d..deb1ce09a55 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -19,6 +19,7 @@ #define COBJMACROS #include <float.h> +#include <assert.h> #include "mfidl.h" #include "mf_private.h" @@ -58,6 +59,8 @@ struct scheduled_item } u; }; +#define MAX_SAMPLE_QUEUE_LENGTH 4 + struct sample_grabber { IMFMediaSink IMFMediaSink_iface; @@ -86,6 +89,8 @@ struct sample_grabber float rate; enum sink_state state; CRITICAL_SECTION cs; + UINT32 sample_count; + IMFSample *samples[MAX_SAMPLE_QUEUE_LENGTH]; }; static IMFSampleGrabberSinkCallback *sample_grabber_get_callback(const struct sample_grabber *sink) @@ -443,6 +448,14 @@ static HRESULT WINAPI sample_grabber_stream_ProcessSample(IMFStreamSink *iface, hr = stream_queue_sample(grabber, sample); } } + else if (grabber->state == SINK_STATE_PAUSED) + { + if (grabber->sample_count < MAX_SAMPLE_QUEUE_LENGTH) + { + IMFSample_AddRef(sample); + grabber->samples[grabber->sample_count++] = sample; + } + } LeaveCriticalSection(&grabber->cs); @@ -827,6 +840,20 @@ static void sample_grabber_release_pending_items(struct sample_grabber *grabber) } } +static void release_samples(struct sample_grabber *grabber) +{ + unsigned int i; + + for (i = 0; i < MAX_SAMPLE_QUEUE_LENGTH; ++i) + { + if (grabber->samples[i]) + { + IMFSample_Release(grabber->samples[i]); + grabber->samples[i] = NULL; + } + } +} + static ULONG WINAPI sample_grabber_sink_Release(IMFMediaSink *iface) { struct sample_grabber *grabber = impl_from_IMFMediaSink(iface); @@ -858,6 +885,7 @@ static ULONG WINAPI sample_grabber_sink_Release(IMFMediaSink *iface) if (grabber->sample_attributes) IMFAttributes_Release(grabber->sample_attributes); sample_grabber_release_pending_items(grabber); + release_samples(grabber); DeleteCriticalSection(&grabber->cs); free(grabber); } @@ -1129,14 +1157,31 @@ static HRESULT sample_grabber_set_state(struct sample_grabber *grabber, enum sin else { if (state == SINK_STATE_STOPPED) + { sample_grabber_cancel_timer(grabber); + release_samples(grabber); + grabber->sample_count = MAX_SAMPLE_QUEUE_LENGTH; + } - if (state == SINK_STATE_RUNNING && grabber->state == SINK_STATE_STOPPED) + if (state == SINK_STATE_RUNNING && grabber->state != SINK_STATE_RUNNING) { /* Every transition to running state sends a bunch requests to build up initial queue. */ - for (i = 0; i < 4; ++i) - sample_grabber_stream_request_sample(grabber); + for (i = 0; i < grabber->sample_count; ++i) + { + if (grabber->state == SINK_STATE_PAUSED && offset == PRESENTATION_CURRENT_POSITION) + { + assert(grabber->samples[i]); + stream_queue_sample(grabber, grabber->samples[i]); + } + else + { + sample_grabber_stream_request_sample(grabber); + } + } + release_samples(grabber); + grabber->sample_count = 0; } + do_callback = state != grabber->state || state != SINK_STATE_PAUSED; if (do_callback) { @@ -1442,6 +1487,7 @@ static HRESULT sample_grabber_create_object(IMFAttributes *attributes, void *use object->IMFStreamSink_iface.lpVtbl = &sample_grabber_stream_vtbl; object->IMFMediaTypeHandler_iface.lpVtbl = &sample_grabber_stream_type_handler_vtbl; object->timer_callback.lpVtbl = &sample_grabber_stream_timer_callback_vtbl; + object->sample_count = MAX_SAMPLE_QUEUE_LENGTH; object->refcount = 1; object->rate = 1.0f; if (FAILED(IMFSampleGrabberSinkCallback_QueryInterface(context->callback, &IID_IMFSampleGrabberSinkCallback2,

1 0

Alex Henrie : uuid: Add propkey.h.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: master Commit: 08ec06da5423498ff0515d1659eb774b7731e36c URL: https://gitlab.winehq.org/wine/wine/-/commit/08ec06da5423498ff0515d1659eb77… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Nov 7 21:32:00 2022 -0700 uuid: Add propkey.h. Needed to compile Tera Term. --- dlls/dsound/dsound_main.c | 3 ++- dlls/winealsa.drv/mmdevdrv.c | 2 +- dlls/winepulse.drv/mmdevdrv.c | 2 +- libs/uuid/uuid.c | 1 + programs/winecfg/audio.c | 3 ++- 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c index 215588393d8..69cbec72ea3 100644 --- a/dlls/dsound/dsound_main.c +++ b/dlls/dsound/dsound_main.c @@ -55,10 +55,11 @@ #include "oleidl.h" #include "shobjidl.h" #include "strmif.h" +#include "propkey.h" #include "initguid.h" +#include "propkeydef.h" #include "ksmedia.h" -#include "propkey.h" #include "devpkey.h" #include "dsound_private.h" diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 99dd45c7638..20a27d501d3 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -28,9 +28,9 @@ #include "winreg.h" #include "winternl.h" #include "propsys.h" +#include "propkey.h" #include "initguid.h" #include "ole2.h" -#include "propkey.h" #include "mmdeviceapi.h" #include "devpkey.h" #include "mmsystem.h" diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index d8bfdc80cd8..6e138ac4529 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -36,11 +36,11 @@ #include "dshow.h" #include "dsound.h" #include "propsys.h" +#include "propkey.h" #include "initguid.h" #include "ks.h" #include "ksmedia.h" -#include "propkey.h" #include "mmdeviceapi.h" #include "audioclient.h" #include "endpointvolume.h" diff --git a/libs/uuid/uuid.c b/libs/uuid/uuid.c index 1ba0397414e..ce97520eee0 100644 --- a/libs/uuid/uuid.c +++ b/libs/uuid/uuid.c @@ -92,6 +92,7 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); #include "comsvcs.h" #include "directmanipulation.h" #include "devguid.h" +#include "propkey.h" #define __WINE_INIT_NPI_MODULEID #include "netiodef.h" diff --git a/programs/winecfg/audio.c b/programs/winecfg/audio.c index cd73703a0dd..3387e5843a0 100644 --- a/programs/winecfg/audio.c +++ b/programs/winecfg/audio.c @@ -40,8 +40,9 @@ #include <mmddk.h> #include "ole2.h" -#include "initguid.h" #include "propkey.h" +#include "initguid.h" +#include "propkeydef.h" #include "devpkey.h" #include "mmdeviceapi.h" #include "audioclient.h"

1 0

Rémi Bernon : mf: Always enumerate branch source types for transform nodes.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: master Commit: 616ae1e38d15672a0ab59a35c1578713718d3229 URL: https://gitlab.winehq.org/wine/wine/-/commit/616ae1e38d15672a0ab59a35c15787… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Sep 3 17:34:14 2022 +0200 mf: Always enumerate branch source types for transform nodes. --- dlls/mf/tests/mf.c | 6 +++--- dlls/mf/topology_loader.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index c9f8fe96f8b..004f7b50f59 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -2986,13 +2986,13 @@ static void test_topology_loader(void) /* Float -> PCM, refuse input type, add converter */ .input_type = &audio_float_44100, .output_type = &audio_pcm_48000, .sink_method = MF_CONNECT_DIRECT, .source_method = -1, .expected_result = MF_E_NO_MORE_TYPES, - .flags = LOADER_SET_INVALID_INPUT | LOADER_ADD_RESAMPLER_MFT | LOADER_EXPECTED_CONVERTER | LOADER_TODO, + .flags = LOADER_SET_INVALID_INPUT | LOADER_ADD_RESAMPLER_MFT | LOADER_EXPECTED_CONVERTER, }, { /* Float -> PCM, refuse input type, add converter, allow resampler output type */ .input_type = &audio_float_44100, .output_type = &audio_pcm_48000_resampler, .sink_method = MF_CONNECT_DIRECT, .source_method = -1, .expected_result = S_OK, - .flags = LOADER_SET_INVALID_INPUT | LOADER_ADD_RESAMPLER_MFT | LOADER_EXPECTED_CONVERTER | LOADER_TODO, + .flags = LOADER_SET_INVALID_INPUT | LOADER_ADD_RESAMPLER_MFT | LOADER_EXPECTED_CONVERTER, }, { @@ -3449,7 +3449,7 @@ todo_wine { else ok(!handler.enum_count, "got %lu GetMediaTypeByIndex\n", handler.enum_count); - todo_wine_if((test->flags & LOADER_NO_CURRENT_OUTPUT) && !(test->flags & LOADER_SET_MEDIA_TYPES)) + todo_wine_if(test->flags & LOADER_NO_CURRENT_OUTPUT) ok(!handler.set_current_count, "got %lu SetCurrentMediaType\n", handler.set_current_count); if (handler.current_type) diff --git a/dlls/mf/topology_loader.c b/dlls/mf/topology_loader.c index ab694379237..0c42a93511b 100644 --- a/dlls/mf/topology_loader.c +++ b/dlls/mf/topology_loader.c @@ -498,7 +498,7 @@ static HRESULT topology_loader_resolve_branches(struct topoloader_context *conte WARN("Failed to clone nodes for branch %s\n", debugstr_topology_branch(branch)); else hr = topology_branch_connect(context->output_topology, MF_CONNECT_ALLOW_DECODER, - branch, enumerate_source_types); + branch, enumerate_source_types || node_type == MF_TOPOLOGY_TRANSFORM_NODE); topology_branch_destroy(branch); if (FAILED(hr))

1 0