February 2020 - Wine-Commits

Jacek Caban : stdio.h: Add ucrt _vsnprintf_s declaration.
by Alexandre Julliard Feb. 20, 2020

Feb. 20, 2020

Module: wine Branch: master Commit: a3f973c4345053e45c734dab1a60631d8f30907d URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3f973c4345053e45c734dab… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 20 15:21:40 2020 +0100 stdio.h: Add ucrt _vsnprintf_s declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/stdio.h | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index 6db7ebe50b..9a7e4b69eb 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -89,7 +89,6 @@ char* __cdecl _tempnam(const char*,const char*); int __cdecl _unlink(const char*); int WINAPIV _scprintf(const char*,...); int __cdecl _vscprintf(const char*,__ms_va_list); -int __cdecl _vsnprintf_s(char*,size_t,size_t,const char*,__ms_va_list); int __cdecl _vsprintf_p_l(char*,size_t,const char*,_locale_t,__ms_va_list); size_t __cdecl _fread_nolock(void*,size_t,size_t,FILE*); @@ -169,6 +168,7 @@ unsigned int __cdecl _set_output_format(void); #ifdef _UCRT _ACRTIMP int __cdecl __stdio_common_vsprintf(unsigned __int64,char*,size_t,const char*,_locale_t,__ms_va_list); +_ACRTIMP int __cdecl __stdio_common_vsnprintf_s(unsigned __int64,char*,size_t,size_t,const char*,_locale_t,__ms_va_list); static inline int __cdecl vsnprintf(char *buffer, size_t size, const char *format, __ms_va_list args) { @@ -184,8 +184,16 @@ static inline int __cdecl _vsnprintf(char *buffer, size_t size, const char *form return ret < 0 ? -1 : ret; } +static inline int __cdecl _vsnprintf_s(char *buffer, size_t size, size_t count, const char *format, __ms_va_list args) +{ + int ret = __stdio_common_vsnprintf_s(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, buffer, size, count, format, NULL, args); + return ret < 0 ? -1 : ret; +} + #else /* _UCRT */ +_ACRTIMP int __cdecl _vsnprintf_s(char*,size_t,size_t,const char*,__ms_va_list); + int __cdecl _vsnprintf(char*,size_t,const char*,__ms_va_list); static inline int vsnprintf(char *buffer, size_t size, const char *format, __ms_va_list args) { return _vsnprintf(buffer,size,format,args); }

1 0

Jacek Caban : stdio.h: Add ucrt vfprintf declaration.
by Alexandre Julliard Feb. 20, 2020

Feb. 20, 2020

Module: wine Branch: master Commit: 567b9ac093c7b741e04ae136c6a31e09732c2bb1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=567b9ac093c7b741e04ae136… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 20 15:22:24 2020 +0100 stdio.h: Add ucrt vfprintf declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/stdio.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index 9f3b43b570..a31eada276 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -154,7 +154,6 @@ int WINAPIV _snscanf_l(const char*,size_t,const char*,_locale_t,...); FILE* __cdecl tmpfile(void); char* __cdecl tmpnam(char*); int __cdecl ungetc(int,FILE*); -int __cdecl vfprintf(FILE*,const char*,__ms_va_list); int __cdecl vfprintf_s(FILE*,const char*,__ms_va_list); int __cdecl vprintf(const char*,__ms_va_list); int __cdecl vprintf_s(const char*,__ms_va_list); @@ -163,6 +162,7 @@ unsigned int __cdecl _set_output_format(void); #ifdef _UCRT +_ACRTIMP int __cdecl __stdio_common_vfprintf(unsigned __int64,FILE*,const char*,_locale_t,__ms_va_list); _ACRTIMP int __cdecl __stdio_common_vsprintf(unsigned __int64,char*,size_t,const char*,_locale_t,__ms_va_list); _ACRTIMP int __cdecl __stdio_common_vsprintf_p(unsigned __int64,char*,size_t,const char*,_locale_t,__ms_va_list); _ACRTIMP int __cdecl __stdio_common_vsprintf_s(unsigned __int64,char*,size_t,const char*,_locale_t,__ms_va_list); @@ -214,11 +214,17 @@ static inline int __cdecl _vsprintf_p_l(char *buffer, size_t size, const char *f return ret < 0 ? -1 : ret; } +static inline int __cdecl vfprintf(FILE *file, const char *format, __ms_va_list args) +{ + return __stdio_common_vfprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, file, format, NULL, args); +} + #else /* _UCRT */ _ACRTIMP int __cdecl _vscprintf(const char*,__ms_va_list); _ACRTIMP int __cdecl _vsnprintf_s(char*,size_t,size_t,const char*,__ms_va_list); _ACRTIMP int __cdecl _vsprintf_p_l(char*,size_t,const char*,_locale_t,__ms_va_list); +_ACRTIMP int __cdecl vfprintf(FILE*,const char*,__ms_va_list); _ACRTIMP int __cdecl vsprintf(char*,const char*,__ms_va_list); _ACRTIMP int __cdecl vsprintf_s(char*,size_t,const char*,__ms_va_list);

1 0

Jacek Caban : stdio.h: Add ucrt vsprintf declaration.
by Alexandre Julliard Feb. 20, 2020

Feb. 20, 2020

Module: wine Branch: master Commit: a68c92d45a61427698e1b901dac3c9e97c5de495 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a68c92d45a61427698e1b901… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 20 15:21:55 2020 +0100 stdio.h: Add ucrt vsprintf declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/stdio.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index 8eef90bbf6..5fe472ef3c 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -159,7 +159,6 @@ int __cdecl vfprintf(FILE*,const char*,__ms_va_list); int __cdecl vfprintf_s(FILE*,const char*,__ms_va_list); int __cdecl vprintf(const char*,__ms_va_list); int __cdecl vprintf_s(const char*,__ms_va_list); -int __cdecl vsprintf(char*,const char*,__ms_va_list); int __cdecl vsprintf_s(char*,size_t,const char*,__ms_va_list); unsigned int __cdecl _get_output_format(void); unsigned int __cdecl _set_output_format(void); @@ -196,10 +195,18 @@ static inline int __cdecl _vscprintf(const char *format, __ms_va_list args) return ret < 0 ? -1 : ret; } +static inline int __cdecl vsprintf(char *buffer, const char *format, __ms_va_list args) +{ + int ret = __stdio_common_vsprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS | _CRT_INTERNAL_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION, + buffer, -1, format, NULL, args); + return ret < 0 ? -1 : ret; +} + #else /* _UCRT */ _ACRTIMP int __cdecl _vscprintf(const char*,__ms_va_list); _ACRTIMP int __cdecl _vsnprintf_s(char*,size_t,size_t,const char*,__ms_va_list); +_ACRTIMP int __cdecl vsprintf(char*,const char*,__ms_va_list); int __cdecl _vsnprintf(char*,size_t,const char*,__ms_va_list); static inline int vsnprintf(char *buffer, size_t size, const char *format, __ms_va_list args) { return _vsnprintf(buffer,size,format,args); }

1 0

Jacek Caban : stdio.h: Add ucrt vsprintf_s declaration.
by Alexandre Julliard Feb. 20, 2020

Feb. 20, 2020

Module: wine Branch: master Commit: 84778f154a9efaa4398492c9ea4a4ce1616dbb26 URL: https://source.winehq.org/git/wine.git/?a=commit;h=84778f154a9efaa4398492c9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 20 15:22:05 2020 +0100 stdio.h: Add ucrt vsprintf_s declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/stdio.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index 5fe472ef3c..36c52a7388 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -159,13 +159,13 @@ int __cdecl vfprintf(FILE*,const char*,__ms_va_list); int __cdecl vfprintf_s(FILE*,const char*,__ms_va_list); int __cdecl vprintf(const char*,__ms_va_list); int __cdecl vprintf_s(const char*,__ms_va_list); -int __cdecl vsprintf_s(char*,size_t,const char*,__ms_va_list); unsigned int __cdecl _get_output_format(void); unsigned int __cdecl _set_output_format(void); #ifdef _UCRT _ACRTIMP int __cdecl __stdio_common_vsprintf(unsigned __int64,char*,size_t,const char*,_locale_t,__ms_va_list); +_ACRTIMP int __cdecl __stdio_common_vsprintf_s(unsigned __int64,char*,size_t,const char*,_locale_t,__ms_va_list); _ACRTIMP int __cdecl __stdio_common_vsnprintf_s(unsigned __int64,char*,size_t,size_t,const char*,_locale_t,__ms_va_list); static inline int __cdecl vsnprintf(char *buffer, size_t size, const char *format, __ms_va_list args) @@ -202,11 +202,18 @@ static inline int __cdecl vsprintf(char *buffer, const char *format, __ms_va_lis return ret < 0 ? -1 : ret; } +static inline int __cdecl vsprintf_s(char *buffer, const char *format, __ms_va_list args) +{ + int ret = __stdio_common_vsprintf_s(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, buffer, -1, format, NULL, args); + return ret < 0 ? -1 : ret; +} + #else /* _UCRT */ _ACRTIMP int __cdecl _vscprintf(const char*,__ms_va_list); _ACRTIMP int __cdecl _vsnprintf_s(char*,size_t,size_t,const char*,__ms_va_list); _ACRTIMP int __cdecl vsprintf(char*,const char*,__ms_va_list); +_ACRTIMP int __cdecl vsprintf_s(char*,size_t,const char*,__ms_va_list); int __cdecl _vsnprintf(char*,size_t,const char*,__ms_va_list); static inline int vsnprintf(char *buffer, size_t size, const char *format, __ms_va_list args) { return _vsnprintf(buffer,size,format,args); }

1 0

Jacek Caban : include: Move __acrt_iob_func declaration to corecrt_wstdio.h.
by Alexandre Julliard Feb. 20, 2020

Feb. 20, 2020

Module: wine Branch: master Commit: 6017d33339ce49587467951c68b435dc9c77e41c URL: https://source.winehq.org/git/wine.git/?a=commit;h=6017d33339ce49587467951c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 20 15:21:30 2020 +0100 include: Move __acrt_iob_func declaration to corecrt_wstdio.h. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/corecrt_wstdio.h | 6 ++++++ include/msvcrt/stdio.h | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/msvcrt/corecrt_wstdio.h b/include/msvcrt/corecrt_wstdio.h index 1480d32bf6..87f74916c5 100644 --- a/include/msvcrt/corecrt_wstdio.h +++ b/include/msvcrt/corecrt_wstdio.h @@ -41,6 +41,12 @@ typedef struct _iobuf #define WEOF (wint_t)(0xFFFF) #endif +FILE *__cdecl __acrt_iob_func(unsigned index); + +#define stdin (__acrt_iob_func(0)) +#define stdout (__acrt_iob_func(1)) +#define stderr (__acrt_iob_func(2)) + wint_t __cdecl _fgetwc_nolock(FILE*); wint_t __cdecl _fgetwchar(void); wint_t __cdecl _fputwc_nolock(wint_t,FILE*); diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index 7477ac171a..6db7ebe50b 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -61,12 +61,6 @@ FILE* __cdecl __iob_func(void); # endif #endif /* _STDIO_DEFINED */ -FILE *__cdecl __acrt_iob_func(unsigned index); - -#define stdin (__acrt_iob_func(0)) -#define stdout (__acrt_iob_func(1)) -#define stderr (__acrt_iob_func(2)) - /* return value for _get_output_format */ #define _TWO_DIGIT_EXPONENT 0x1

1 0

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

Feb. 20, 2020

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 : quartz/filtergraph: Don't check for cyclic connections in IFilterGraph2::Connect().
by Alexandre Julliard Feb. 20, 2020

Feb. 20, 2020

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 Feb. 20, 2020

Feb. 20, 2020

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

Jacek Caban : stdio.h: Add ucrt _vsprintf_p_l declaration.
by Alexandre Julliard Feb. 20, 2020

Feb. 20, 2020

Module: wine Branch: master Commit: add7409c0a9a3c6bf8bcad90a09e846d2c4e9559 URL: https://source.winehq.org/git/wine.git/?a=commit;h=add7409c0a9a3c6bf8bcad90… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 20 15:22:13 2020 +0100 stdio.h: Add ucrt _vsprintf_p_l declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/stdio.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index 36c52a7388..9f3b43b570 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -88,7 +88,6 @@ int WINAPIV _snprintf_s(char*,size_t,size_t,const char*,...); char* __cdecl _tempnam(const char*,const char*); int __cdecl _unlink(const char*); int WINAPIV _scprintf(const char*,...); -int __cdecl _vsprintf_p_l(char*,size_t,const char*,_locale_t,__ms_va_list); size_t __cdecl _fread_nolock(void*,size_t,size_t,FILE*); size_t __cdecl _fread_nolock_s(void*,size_t,size_t,size_t,FILE*); @@ -165,6 +164,7 @@ unsigned int __cdecl _set_output_format(void); #ifdef _UCRT _ACRTIMP int __cdecl __stdio_common_vsprintf(unsigned __int64,char*,size_t,const char*,_locale_t,__ms_va_list); +_ACRTIMP int __cdecl __stdio_common_vsprintf_p(unsigned __int64,char*,size_t,const char*,_locale_t,__ms_va_list); _ACRTIMP int __cdecl __stdio_common_vsprintf_s(unsigned __int64,char*,size_t,const char*,_locale_t,__ms_va_list); _ACRTIMP int __cdecl __stdio_common_vsnprintf_s(unsigned __int64,char*,size_t,size_t,const char*,_locale_t,__ms_va_list); @@ -208,10 +208,17 @@ static inline int __cdecl vsprintf_s(char *buffer, const char *format, __ms_va_l return ret < 0 ? -1 : ret; } +static inline int __cdecl _vsprintf_p_l(char *buffer, size_t size, const char *format, _locale_t locale, __ms_va_list args) +{ + int ret = __stdio_common_vsprintf_p(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, buffer, size, format, locale, args); + return ret < 0 ? -1 : ret; +} + #else /* _UCRT */ _ACRTIMP int __cdecl _vscprintf(const char*,__ms_va_list); _ACRTIMP int __cdecl _vsnprintf_s(char*,size_t,size_t,const char*,__ms_va_list); +_ACRTIMP int __cdecl _vsprintf_p_l(char*,size_t,const char*,_locale_t,__ms_va_list); _ACRTIMP int __cdecl vsprintf(char*,const char*,__ms_va_list); _ACRTIMP int __cdecl vsprintf_s(char*,size_t,const char*,__ms_va_list);

1 0

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

Feb. 20, 2020

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