wine-commits February 2020

wine-commits@winehq.org

2 participants
874 discussions

Olivier F. R. Dierick : shell32: Add a helper function to create a shell folder from CSIDL and return its unix path.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: a08d3fe10e38fb7e2e3916797216a6a266c6f1f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a08d3fe10e38fb7e2e391679… Author: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> Date: Wed Feb 19 00:16:39 2020 +0100 shell32: Add a helper function to create a shell folder from CSIDL and return its unix path. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=22974 Signed-off-by: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shellpath.c | 38 ++++++++++++++++++++++++-------------- 1 file changed, 24 insertions(+), 14 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 0a31ee76d7..428b3be24f 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -4050,6 +4050,26 @@ static inline BOOL _SHAppendToUnixPath(char *szBasePath, LPCWSTR pwszSubPath) { return TRUE; } +/****************************************************************************** + * _SHGetFolderUnixPath [Internal] + * + * Create a shell folder and get its unix path. + * + * PARAMS + * nFolder [I] CSIDL identifying the folder. + */ +static inline char * _SHGetFolderUnixPath(const int nFolder) +{ + WCHAR wszTempPath[MAX_PATH]; + HRESULT hr; + + hr = SHGetFolderPathW(NULL, nFolder, NULL, + SHGFP_TYPE_DEFAULT, wszTempPath); + if (FAILED(hr)) return NULL; + + return wine_get_unix_file_name(wszTempPath); +} + /****************************************************************************** * _SHCreateMyDocumentsSubDirs [Internal] * @@ -4115,22 +4135,17 @@ static void _SHCreateSymbolicLinks(void) "PICTURES", "VIDEOS", "MUSIC", "DOWNLOAD", "TEMPLATES", "DOCUMENTS", "DESKTOP" }; static const unsigned int num = ARRAY_SIZE(xdg_dirs); - WCHAR wszTempPath[MAX_PATH]; char szPersonalTarget[FILENAME_MAX], *pszPersonal; char szMyStuffTarget[FILENAME_MAX], *pszMyStuff; char szDesktopTarget[FILENAME_MAX], *pszDesktop; struct stat statFolder; const char *pszHome; - HRESULT hr; char ** xdg_results; char * xdg_desktop_dir; UINT i; /* Create all necessary profile sub-dirs up to 'My Documents' and get the unix path. */ - hr = SHGetFolderPathW(NULL, CSIDL_PERSONAL|CSIDL_FLAG_CREATE, NULL, - SHGFP_TYPE_DEFAULT, wszTempPath); - if (FAILED(hr)) return; - pszPersonal = wine_get_unix_file_name(wszTempPath); + pszPersonal = _SHGetFolderUnixPath(CSIDL_PERSONAL|CSIDL_FLAG_CREATE); if (!pszPersonal) return; _SHGetXDGUserDirs(xdg_dirs, num, &xdg_results); @@ -4192,11 +4207,7 @@ static void _SHCreateSymbolicLinks(void) for (i=0; i < ARRAY_SIZE(aidsMyStuff); i++) { /* Create the current 'My Whatever' folder and get its unix path. */ - hr = SHGetFolderPathW(NULL, acsidlMyStuff[i]|CSIDL_FLAG_CREATE, NULL, - SHGFP_TYPE_DEFAULT, wszTempPath); - if (FAILED(hr)) continue; - - pszMyStuff = wine_get_unix_file_name(wszTempPath); + pszMyStuff = _SHGetFolderUnixPath(acsidlMyStuff[i]|CSIDL_FLAG_CREATE); if (!pszMyStuff) continue; while (1) @@ -4245,9 +4256,8 @@ static void _SHCreateSymbolicLinks(void) (_SHAppendToUnixPath(szDesktopTarget, DesktopW) && !stat(szDesktopTarget, &statFolder) && S_ISDIR(statFolder.st_mode))) { - hr = SHGetFolderPathW(NULL, CSIDL_DESKTOPDIRECTORY|CSIDL_FLAG_CREATE, NULL, - SHGFP_TYPE_DEFAULT, wszTempPath); - if (SUCCEEDED(hr) && (pszDesktop = wine_get_unix_file_name(wszTempPath))) + pszDesktop = _SHGetFolderUnixPath(CSIDL_DESKTOPDIRECTORY|CSIDL_FLAG_CREATE); + if (pszDesktop) { remove(pszDesktop); if (xdg_desktop_dir)

1 0

Olivier F. R. Dierick : shell32: Add a helper function to create 'My Stuff' sub dirs in 'My Documents'.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: 7642388153992fc7f1efbe5688397ff2607d4c37 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7642388153992fc7f1efbe56… Author: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> Date: Wed Feb 19 00:16:38 2020 +0100 shell32: Add a helper function to create 'My Stuff' sub dirs in 'My Documents'. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=22974 Signed-off-by: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shellpath.c | 40 +++++++++++++++++++++++++++++----------- 1 file changed, 29 insertions(+), 11 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 8caf68dc55..0a31ee76d7 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -4050,6 +4050,33 @@ static inline BOOL _SHAppendToUnixPath(char *szBasePath, LPCWSTR pwszSubPath) { return TRUE; } +/****************************************************************************** + * _SHCreateMyDocumentsSubDirs [Internal] + * + * Create real directories for various shell folders under 'My Documents'. For + * Windows and homeless styles. Fails silently for already existing sub dirs. + * + * PARAMS + * aidsMyStuff [I] Array of IDS_* resources to create sub dirs for. + * num [I] Number of elements in aidsMyStuff. + * szPersonalTarget [I] Unix path to 'My Documents' directory. + */ +static void _SHCreateMyDocumentsSubDirs(const UINT * aidsMyStuff, const UINT num, const char * szPersonalTarget) +{ + char szMyStuffTarget[FILENAME_MAX]; + UINT i; + + if (aidsMyStuff && szPersonalTarget) + { + for (i = 0; i < num; i++) + { + strcpy(szMyStuffTarget, szPersonalTarget); + if (_SHAppendToUnixPath(szMyStuffTarget, MAKEINTRESOURCEW(aidsMyStuff[i]))) + mkdir(szMyStuffTarget, 0777); + } + } +} + /****************************************************************************** * _SHCreateSymbolicLinks [Internal] * @@ -4122,12 +4149,7 @@ static void _SHCreateSymbolicLinks(void) * 'My Pictures', 'My Videos', 'My Music' etc. or fail silently * if they already exist. */ - for (i = 0; i < ARRAY_SIZE(aidsMyStuff); i++) - { - strcpy(szMyStuffTarget, szPersonalTarget); - if (_SHAppendToUnixPath(szMyStuffTarget, MAKEINTRESOURCEW(aidsMyStuff[i]))) - mkdir(szMyStuffTarget, 0777); - } + _SHCreateMyDocumentsSubDirs(aidsMyStuff, ARRAY_SIZE(aidsMyStuff), szPersonalTarget); break; } @@ -4163,11 +4185,7 @@ static void _SHCreateSymbolicLinks(void) * they already exist. */ pszHome = NULL; strcpy(szPersonalTarget, pszPersonal); - for (i = 0; i < ARRAY_SIZE(aidsMyStuff); i++) { - strcpy(szMyStuffTarget, szPersonalTarget); - if (_SHAppendToUnixPath(szMyStuffTarget, MAKEINTRESOURCEW(aidsMyStuff[i]))) - mkdir(szMyStuffTarget, 0777); - } + _SHCreateMyDocumentsSubDirs(aidsMyStuff, ARRAY_SIZE(aidsMyStuff), szPersonalTarget); } /* Create symbolic links for 'My Pictures', 'My Videos', 'My Music' etc. */

1 0

Olivier F. R. Dierick : shell32: Add helper functions for XDG directories lookup and resource deallocation.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: 8c7c6e9b79c0818a5c0da0a3af812d28053bbf40 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c7c6e9b79c0818a5c0da0a3… Author: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> Date: Wed Feb 19 00:16:37 2020 +0100 shell32: Add helper functions for XDG directories lookup and resource deallocation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=22974 Signed-off-by: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shellpath.c | 48 +++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 39 insertions(+), 9 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 9bec7091ae..8caf68dc55 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -3948,6 +3948,43 @@ end: return hr; } +/************************************************************************* + * _SHGetXDGUserDirs [Internal] + * + * Get XDG directories paths from XDG configuration. + * + * PARAMS + * xdg_dirs [I] Array of XDG directories to look for. + * num_dirs [I] Number of elements in xdg_dirs. + * xdg_results [O] An array of the XDG directories paths. + */ +static inline void _SHGetXDGUserDirs(const char * const *xdg_dirs, const unsigned int num_dirs, char *** xdg_results) { + HRESULT hr; + + hr = XDG_UserDirLookup(xdg_dirs, num_dirs, xdg_results); + if (FAILED(hr)) *xdg_results = NULL; +} + +/************************************************************************* + * _SHFreeXDGUserDirs [Internal] + * + * Free resources allocated by XDG_UserDirLookup(). + * + * PARAMS + * num_dirs [I] Number of elements in xdg_results. + * xdg_results [I] An array of the XDG directories paths. + */ +static inline void _SHFreeXDGUserDirs(const unsigned int num_dirs, char ** xdg_results) { + UINT i; + + if (xdg_results) + { + for (i = 0; i < num_dirs; i++) + heap_free(xdg_results[i]); + heap_free(xdg_results); + } +} + /************************************************************************* * _SHAppendToUnixPath [Internal] * @@ -4069,8 +4106,7 @@ static void _SHCreateSymbolicLinks(void) pszPersonal = wine_get_unix_file_name(wszTempPath); if (!pszPersonal) return; - hr = XDG_UserDirLookup(xdg_dirs, num, &xdg_results); - if (FAILED(hr)) xdg_results = NULL; + _SHGetXDGUserDirs(xdg_dirs, num, &xdg_results); pszHome = getenv("HOME"); if (pszHome && !stat(pszHome, &statFolder) && S_ISDIR(statFolder.st_mode)) @@ -4204,13 +4240,7 @@ static void _SHCreateSymbolicLinks(void) } } - /* Free resources allocated by XDG_UserDirLookup() */ - if (xdg_results) - { - for (i = 0; i < num; i++) - heap_free(xdg_results[i]); - heap_free(xdg_results); - } + _SHFreeXDGUserDirs(num, xdg_results); } /******************************************************************************

1 0

Olivier F. R. Dierick : shell32: Move _SHCreateSymbolicLinks() above shell folders lookup functions.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: 81b4dba58a241af77dc1a3dcde5092e6b1c0bd39 URL: https://source.winehq.org/git/wine.git/?a=commit;h=81b4dba58a241af77dc1a3dc… Author: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> Date: Wed Feb 19 00:16:36 2020 +0100 shell32: Move _SHCreateSymbolicLinks() above shell folders lookup functions. Looking up shell folders creates real directories when the folder is inexistant, but the intended behavior for some folders is to create symbolic links by default. Prepare that change by moving the helper function above shell folders lookup functions. Also fix whitespace issues in the moved code. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=22974 Signed-off-by: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shellpath.c | 534 +++++++++++++++++++++++------------------------ 1 file changed, 267 insertions(+), 267 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=81b4dba58a241af77dc1…

1 0

Zebediah Figura : quartz/filtergraph: Iterate over all filters in state change methods.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: 05a8d45e8a0c401f7b6b008ae62212115bce4bb6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=05a8d45e8a0c401f7b6b008a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 19 20:44:58 2020 -0600 quartz/filtergraph: Iterate over all filters in state change methods. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qasf/tests/dmowrapper.c | 12 +- dlls/quartz/filtergraph.c | 310 ++++++++++++++------------------------ dlls/quartz/tests/avisplit.c | 8 +- dlls/quartz/tests/filtergraph.c | 42 +++--- dlls/quartz/tests/videorenderer.c | 32 ++-- dlls/quartz/tests/vmr7.c | 20 +-- dlls/quartz/tests/vmr9.c | 20 +-- 7 files changed, 178 insertions(+), 266 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=05a8d45e8a0c401f7b6b…

1 0

Zebediah Figura : quartz/filtergraph: Don't check for cyclic connections in IFilterGraph2::Connect().
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: e0d5e16d7ea5d6fc60f776b663060ed0e0519d95 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0d5e16d7ea5d6fc60f776b6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 19 20:44:57 2020 -0600 quartz/filtergraph: Don't check for cyclic connections in IFilterGraph2::Connect(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 4 ---- dlls/quartz/tests/filtergraph.c | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 9e56822480..1e87f81858 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1200,10 +1200,6 @@ static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, IPin *ppinOut, ppinOut = temp; } - hr = CheckCircularConnection(This, ppinOut, ppinIn); - if (FAILED(hr)) - goto out; - /* Try direct connection first */ hr = IFilterGraph2_ConnectDirect(iface, ppinOut, ppinIn, NULL); diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index fd73a9ad83..65fa4dac3b 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -2318,7 +2318,7 @@ todo_wine IFilterGraph2_Disconnect(graph, &sink_pin.IPin_iface); hr = IFilterGraph2_Connect(graph, &parser1_pins[1].IPin_iface, &parser1_pins[0].IPin_iface); - todo_wine ok(hr == VFW_E_CANNOT_CONNECT, "Got hr %#x.\n", hr); + ok(hr == VFW_E_CANNOT_CONNECT, "Got hr %#x.\n", hr); parser1_pins[0].QueryInternalConnections_hr = S_OK; hr = IFilterGraph2_Connect(graph, &parser1_pins[1].IPin_iface, &parser1_pins[0].IPin_iface);

1 0

Zebediah Figura : quartz/filtergraph: Maintain a topologically sorted list of filters.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: 98a0c1dac1ee111c6e4ecbd621b44cd4d1556ef7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=98a0c1dac1ee111c6e4ecbd6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 19 20:44:56 2020 -0600 quartz/filtergraph: Maintain a topologically sorted list of filters. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 87 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 85 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 46ae113a4b..9e56822480 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <assert.h> #include <stdarg.h> #define COBJMACROS @@ -150,9 +151,10 @@ typedef struct _ITF_CACHE_ENTRY { struct filter { - struct list entry; + struct list entry, sorted_entry; IBaseFilter *filter; WCHAR *name; + BOOL sorting; }; typedef struct _IFilterGraphImpl { @@ -183,8 +185,18 @@ typedef struct _IFilterGraphImpl { IUnknown *outer_unk; LONG ref; IUnknown *punkFilterMapper2; - struct list filters; + /* We keep two lists of filters, one unsorted and one topologically sorted. + * The former is necessary for functions like IGraphBuilder::Connect() and + * IGraphBuilder::Render() that iterate through the filter list but may + * add to it while doing so; the latter is for functions like + * IMediaControl::Run() that should propagate messages to all filters + * (including unconnected ones) but must do so in topological order from + * sinks to sources. We can easily guarantee that the loop in Connect() will + * touch each filter exactly once so long as we aren't reordering it, but + * using the sorted filters list there would be hard. This seems to be the + * easiest and clearest solution. */ + struct list filters, sorted_filters; unsigned int name_index; IReferenceClock *refClock; @@ -617,6 +629,8 @@ static HRESULT WINAPI FilterGraph2_AddFilter(IFilterGraph2 *iface, IBaseFilter_AddRef(entry->filter = filter); list_add_head(&graph->filters, &entry->entry); + list_add_head(&graph->sorted_filters, &entry->sorted_entry); + entry->sorting = FALSE; ++graph->version; return duplicate_name ? VFW_S_DUPLICATE_NAME : hr; @@ -694,6 +708,7 @@ static HRESULT WINAPI FilterGraph2_RemoveFilter(IFilterGraph2 *iface, IBaseFilte IBaseFilter_SetSyncSource(pFilter, NULL); IBaseFilter_Release(pFilter); list_remove(&entry->entry); + list_remove(&entry->sorted_entry); CoTaskMemFree(entry->name); heap_free(entry); This->version++; @@ -818,6 +833,70 @@ out: #endif } +static struct filter *find_sorted_filter(IFilterGraphImpl *graph, IBaseFilter *iface) +{ + struct filter *filter; + + LIST_FOR_EACH_ENTRY(filter, &graph->sorted_filters, struct filter, sorted_entry) + { + if (filter->filter == iface) + return filter; + } + + return NULL; +} + +static void sort_filter_recurse(IFilterGraphImpl *graph, struct filter *filter, struct list *sorted) +{ + struct filter *peer_filter; + IEnumPins *enumpins; + PIN_DIRECTION dir; + IPin *pin, *peer; + PIN_INFO info; + + TRACE("Sorting filter %p.\n", filter->filter); + + /* Cyclic connections should be caught by CheckCircularConnection(). */ + assert(!filter->sorting); + + filter->sorting = TRUE; + + IBaseFilter_EnumPins(filter->filter, &enumpins); + while (IEnumPins_Next(enumpins, 1, &pin, NULL) == S_OK) + { + IPin_QueryDirection(pin, &dir); + + if (dir == PINDIR_INPUT && IPin_ConnectedTo(pin, &peer) == S_OK) + { + IPin_QueryPinInfo(peer, &info); + /* Note that the filter may have already been sorted. */ + if ((peer_filter = find_sorted_filter(graph, info.pFilter))) + sort_filter_recurse(graph, peer_filter, sorted); + IBaseFilter_Release(info.pFilter); + IPin_Release(peer); + } + IPin_Release(pin); + } + IEnumPins_Release(enumpins); + + filter->sorting = FALSE; + + list_remove(&filter->sorted_entry); + list_add_head(sorted, &filter->sorted_entry); +} + +static void sort_filters(IFilterGraphImpl *graph) +{ + struct list sorted = LIST_INIT(sorted), *cursor; + + while ((cursor = list_head(&graph->sorted_filters))) + { + struct filter *filter = LIST_ENTRY(cursor, struct filter, sorted_entry); + sort_filter_recurse(graph, filter, &sorted); + } + + list_move_tail(&graph->sorted_filters, &sorted); +} /* NOTE: despite the implication, it doesn't matter which * way round you put in the input and output pins */ @@ -869,6 +948,9 @@ static HRESULT WINAPI FilterGraph2_ConnectDirect(IFilterGraph2 *iface, IPin *ppi } } + if (SUCCEEDED(hr)) + sort_filters(This); + return hr; } @@ -5702,6 +5784,7 @@ static HRESULT filter_graph_common_create(IUnknown *outer, void **out, BOOL thre fimpl->IGraphVersion_iface.lpVtbl = &IGraphVersion_VTable; fimpl->ref = 1; list_init(&fimpl->filters); + list_init(&fimpl->sorted_filters); fimpl->name_index = 1; fimpl->refClock = NULL; fimpl->hEventCompletion = CreateEventW(0, TRUE, FALSE, 0);

1 0

Zebediah Figura : quartz/filtergraph: Use IFilterGraph2::ConnectDirect() instead of calling IPin::Connect().
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: 7a392c55d64e55363acb94d9da0be780193b4add URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a392c55d64e55363acb94d9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 19 20:44:55 2020 -0600 quartz/filtergraph: Use IFilterGraph2::ConnectDirect() instead of calling IPin::Connect(). It will need to do some bookkeeping. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 60bea5542f..46ae113a4b 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1123,7 +1123,7 @@ static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, IPin *ppinOut, goto out; /* Try direct connection first */ - hr = IPin_Connect(ppinOut, ppinIn, NULL); + hr = IFilterGraph2_ConnectDirect(iface, ppinOut, ppinIn, NULL); /* If direct connection succeeded, we should propagate that return value. * If it returned VFW_E_NOT_CONNECTED or VFW_E_NO_AUDIO_HARDWARE, then don't @@ -1279,7 +1279,7 @@ static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, IPin *ppinOut, goto error; } - hr = IPin_Connect(ppinOut, ppinfilter, NULL); + hr = IFilterGraph2_ConnectDirect(iface, ppinOut, ppinfilter, NULL); if (FAILED(hr)) { TRACE("Cannot connect to filter (%x), trying next one\n", hr); goto error; @@ -1591,7 +1591,7 @@ static HRESULT WINAPI FilterGraph2_Render(IFilterGraph2 *iface, IPin *ppinOut) } /* Connect the pin to the "Renderer" */ - hr = IPin_Connect(ppinOut, ppinfilter, NULL); + hr = IFilterGraph2_ConnectDirect(iface, ppinOut, ppinfilter, NULL); IPin_Release(ppinfilter); if (FAILED(hr)) {

1 0

Zebediah Figura : quartz/tests: Add a test for cyclic connections.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: 436dbfd939d44e053a0bea6f289eaa9609b49cf3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=436dbfd939d44e053a0bea6f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 19 20:44:54 2020 -0600 quartz/tests: Add a test for cyclic connections. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 62 ++++++++++++++++++++++++++++++++++++----- 1 file changed, 55 insertions(+), 7 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index b36605f396..fd73a9ad83 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -2286,6 +2286,7 @@ todo_wine IFilterGraph2_Disconnect(graph, &source_pin.IPin_iface); IFilterGraph2_Disconnect(graph, sink_pin.peer); IFilterGraph2_Disconnect(graph, &sink_pin.IPin_iface); + parser1_pins[1].QueryInternalConnections_hr = E_NOTIMPL; /* A pin whose name (not ID) begins with a tilde is not connected. */ @@ -2316,6 +2317,14 @@ todo_wine IFilterGraph2_Disconnect(graph, sink_pin.peer); IFilterGraph2_Disconnect(graph, &sink_pin.IPin_iface); + hr = IFilterGraph2_Connect(graph, &parser1_pins[1].IPin_iface, &parser1_pins[0].IPin_iface); + todo_wine ok(hr == VFW_E_CANNOT_CONNECT, "Got hr %#x.\n", hr); + + parser1_pins[0].QueryInternalConnections_hr = S_OK; + hr = IFilterGraph2_Connect(graph, &parser1_pins[1].IPin_iface, &parser1_pins[0].IPin_iface); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + parser1_pins[0].QueryInternalConnections_hr = E_NOTIMPL; + ref = IFilterGraph2_Release(graph); ok(!ref, "Got outstanding refcount %d.\n", ref); @@ -2763,25 +2772,28 @@ static const IPinVtbl test_connect_direct_vtbl = static void test_connect_direct_init(struct testpin *pin, PIN_DIRECTION dir) { - memset(pin, 0, sizeof(*pin)); - pin->IPin_iface.lpVtbl = &test_connect_direct_vtbl; - pin->ref = 1; - pin->dir = dir; + testpin_init(pin, &test_connect_direct_vtbl, dir); } static void test_connect_direct(void) { - struct testpin source_pin, sink_pin; - struct testfilter source, sink; + struct testpin source_pin, sink_pin, parser1_pins[2], parser2_pins[2]; + struct testfilter source, sink, parser1, parser2; IFilterGraph2 *graph = create_graph(); AM_MEDIA_TYPE mt; HRESULT hr; test_connect_direct_init(&source_pin, PINDIR_OUTPUT); - test_connect_direct_init(&sink_pin, PINDIR_INPUT); testfilter_init(&source, &source_pin, 1); + test_connect_direct_init(&sink_pin, PINDIR_INPUT); testfilter_init(&sink, &sink_pin, 1); + test_connect_direct_init(&parser1_pins[0], PINDIR_INPUT); + test_connect_direct_init(&parser1_pins[1], PINDIR_OUTPUT); + testfilter_init(&parser1, parser1_pins, 2); + test_connect_direct_init(&parser2_pins[0], PINDIR_INPUT); + test_connect_direct_init(&parser2_pins[1], PINDIR_OUTPUT); + testfilter_init(&parser2, parser2_pins, 2); hr = IFilterGraph2_AddFilter(graph, &source.IBaseFilter_iface, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -2935,6 +2947,42 @@ todo_wine hr = IFilterGraph2_Disconnect(graph, &source_pin.IPin_iface); ok(hr == S_OK, "Got hr %#x.\n", hr); + /* ConnectDirect() protects against cyclical connections. */ + hr = IFilterGraph2_AddFilter(graph, &parser1.IBaseFilter_iface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFilterGraph2_AddFilter(graph, &parser2.IBaseFilter_iface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IFilterGraph2_ConnectDirect(graph, &parser1_pins[1].IPin_iface, &parser1_pins[0].IPin_iface, NULL); + ok(hr == VFW_E_CIRCULAR_GRAPH, "Got hr %#x.\n", hr); + + hr = IFilterGraph2_ConnectDirect(graph, &parser1_pins[1].IPin_iface, &parser2_pins[0].IPin_iface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFilterGraph2_ConnectDirect(graph, &parser2_pins[1].IPin_iface, &parser1_pins[0].IPin_iface, NULL); + todo_wine ok(hr == VFW_E_CIRCULAR_GRAPH, "Got hr %#x.\n", hr); + IFilterGraph2_Disconnect(graph, &parser1_pins[1].IPin_iface); + IFilterGraph2_Disconnect(graph, &parser2_pins[0].IPin_iface); + + parser1_pins[0].QueryInternalConnections_hr = S_OK; + hr = IFilterGraph2_ConnectDirect(graph, &parser1_pins[1].IPin_iface, &parser1_pins[0].IPin_iface, NULL); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!parser1_pins[0].peer, "Got peer %p.\n", parser1_pins[0].peer); + todo_wine ok(parser1_pins[1].peer == &parser1_pins[0].IPin_iface, "Got peer %p.\n", parser1_pins[1].peer); + IFilterGraph2_Disconnect(graph, &parser1_pins[0].IPin_iface); + IFilterGraph2_Disconnect(graph, &parser1_pins[1].IPin_iface); + + hr = IFilterGraph2_ConnectDirect(graph, &parser1_pins[1].IPin_iface, &parser2_pins[0].IPin_iface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFilterGraph2_ConnectDirect(graph, &parser2_pins[1].IPin_iface, &parser1_pins[0].IPin_iface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IFilterGraph2_Disconnect(graph, &parser1_pins[1].IPin_iface); + IFilterGraph2_Disconnect(graph, &parser2_pins[0].IPin_iface); + + hr = IFilterGraph2_RemoveFilter(graph, &parser1.IBaseFilter_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFilterGraph2_RemoveFilter(graph, &parser2.IBaseFilter_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + /* Both pins are disconnected when a filter is removed. */ hr = IFilterGraph2_ConnectDirect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface, &mt); ok(hr == S_OK, "Got hr %#x.\n", hr);

1 0

Zebediah Figura : strmbase/renderer: Return S_FALSE when pausing the stream if approprate.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: fb45f9a8061271acad445af3037496156643569e URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb45f9a8061271acad445af3… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Feb 19 20:44:53 2020 -0600 strmbase/renderer: Return S_FALSE when pausing the stream if approprate. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/renderer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 1f2154393d..6b5a5e80e3 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -88,7 +88,7 @@ static HRESULT renderer_init_stream(struct strmbase_filter *iface) if (filter->pFuncsTable->renderer_init_stream) filter->pFuncsTable->renderer_init_stream(filter); - return S_OK; + return filter->sink.pin.peer ? S_FALSE : S_OK; } static HRESULT renderer_start_stream(struct strmbase_filter *iface, REFERENCE_TIME start)

1 0

← Newer
1
...
21
22
23
24
25
26
27
...
88
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2020