September 2019 - Wine-Commits

Nikolay Sivov : mf: Fix stream IID loader should be testing for.
by Alexandre Julliard Sept. 27, 2019

Sept. 27, 2019

Module: wine Branch: master Commit: e578ee3b0ad4d75ea486c6146b5d261bf88afbf9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e578ee3b0ad4d75ea486c614… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 27 17:00:44 2019 +0300 mf: Fix stream IID loader should be testing for. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/topology.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index e48792eab6..926fd48747 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -1726,7 +1726,7 @@ static HRESULT WINAPI topology_loader_Load(IMFTopoLoader *iface, IMFTopology *in IMFTopology **output_topology, IMFTopology *current_topology) { struct topology *topology = unsafe_impl_from_IMFTopology(input_topology); - IMFMediaSink *sink; + IMFStreamSink *sink; HRESULT hr; size_t i; @@ -1745,9 +1745,9 @@ static HRESULT WINAPI topology_loader_Load(IMFTopoLoader *iface, IMFTopology *in if (node->object) { /* Sinks must be bound beforehand. */ - if (FAILED(IUnknown_QueryInterface(node->object, &IID_IMFMediaSink, (void **)&sink))) + if (FAILED(IUnknown_QueryInterface(node->object, &IID_IMFStreamSink, (void **)&sink))) return MF_E_TOPO_SINK_ACTIVATES_UNSUPPORTED; - IMFMediaSink_Release(sink); + IMFStreamSink_Release(sink); } break; case MF_TOPOLOGY_SOURCESTREAM_NODE:

1 0

Sven Baars : httpapi/tests: Use CancelIo to avoid a test failure on Windows XP.
by Alexandre Julliard Sept. 27, 2019

Sept. 27, 2019

Module: wine Branch: master Commit: 5df86351f0f42a654fe4eb70fde5eb7faa5d71c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5df86351f0f42a654fe4eb70… Author: Sven Baars <sven.wine(a)gmail.com> Date: Fri Sep 27 17:13:51 2019 +0200 httpapi/tests: Use CancelIo to avoid a test failure on Windows XP. Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/httpapi/tests/httpapi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/httpapi/tests/httpapi.c b/dlls/httpapi/tests/httpapi.c index abc5c95f0c..5c3b4ec13c 100644 --- a/dlls/httpapi/tests/httpapi.c +++ b/dlls/httpapi/tests/httpapi.c @@ -534,7 +534,7 @@ static void test_v1_short_buffer(void) ok(!ret, "Got error %u.\n", ret); ok(req->RequestId == req_id, "Got request ID %s.\n", wine_dbgstr_longlong(req->RequestId)); - CancelIoEx(queue, &ovl); + CancelIo(queue); ret = HttpRemoveUrl(queue, localhost_urlW); ok(!ret, "Got error %u.\n", ret);

1 0

Tag wine-4.17 : Alexandre Julliard : Release 4.17
by Alexandre Julliard Sept. 27, 2019

Sept. 27, 2019

Module: wine Branch: refs/tags/wine-4.17 Tag: 662cffca4b7f6c3f300043192a6041e5b65a92ce URL: https://source.winehq.org/git/wine.git/?a=tag;h=662cffca4b7f6c3f300043192a6… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 27 22:54:58 2019 +0200 Release 4.17

1 0

Zebediah Figura : strmbase: Rename "pConnectedTo" to "peer".
by Alexandre Julliard Sept. 27, 2019

Sept. 27, 2019

Module: wine Branch: master Commit: c7a447b67afa3992405cd6b585310b606edc9ac6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7a447b67afa3992405cd6b5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 26 21:40:53 2019 -0500 strmbase: Rename "pConnectedTo" to "peer". Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/avimux.c | 16 ++++++++-------- dlls/qcap/smartteefilter.c | 8 ++++---- dlls/qcap/vfwcapture.c | 10 +++++----- dlls/quartz/dsoundrender.c | 2 +- dlls/quartz/filesource.c | 10 +++++----- dlls/quartz/videorenderer.c | 2 +- dlls/quartz/vmr9.c | 4 ++-- dlls/strmbase/outputqueue.c | 4 ++-- dlls/strmbase/pin.c | 38 +++++++++++++++++++------------------- dlls/strmbase/renderer.c | 14 +++++++------- dlls/strmbase/transform.c | 12 ++++++------ dlls/strmbase/video.c | 6 +++--- dlls/winegstreamer/gstdemux.c | 38 +++++++++++++++++++------------------- dlls/wineqtdecoder/qtsplitter.c | 20 ++++++++++---------- include/wine/strmbase.h | 2 +- 15 files changed, 93 insertions(+), 93 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c7a447b67afa3992405c…

1 0

Alexandre Julliard : winegcc: Centralize argument parsing into the main switch.
by Alexandre Julliard Sept. 27, 2019

Sept. 27, 2019

Module: wine Branch: master Commit: 0bfee2c6eb3aa9a688e9493eff7565b5cdafb8f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0bfee2c6eb3aa9a688e9493e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 27 13:25:59 2019 +0200 winegcc: Centralize argument parsing into the main switch. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 90 ++++++++++++++++++------------------------------- 1 file changed, 33 insertions(+), 57 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 6f26f60709..0ca553318e 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1304,7 +1304,6 @@ static int is_linker_arg(const char* arg) { case 'R': case 'z': - case 'l': case 'u': return 1; case 'W': @@ -1324,43 +1323,6 @@ static int is_linker_arg(const char* arg) return 0; } -/* - * Target Options - * -b machine -V version - */ -static int is_target_arg(const char* arg) -{ - return arg[1] == 'b' || arg[1] == 'V'; -} - - -/* - * Directory Options - * -Bprefix -Idir -I- -Ldir -specs=file - */ -static int is_directory_arg(const char* arg) -{ - return arg[1] == 'B' || arg[1] == 'L' || arg[1] == 'I' || strncmp("-specs=", arg, 7) == 0; -} - -/* - * MinGW Options - * -mno-cygwin -mwindows -mconsole -mthreads -municode - */ -static int is_mingw_arg(const char* arg) -{ - static const char* mingw_switches[] = - { - "-mno-cygwin", "-mwindows", "-mconsole", "-mthreads", "-municode" - }; - unsigned int j; - - for (j = 0; j < ARRAY_SIZE(mingw_switches); j++) - if (strcmp(mingw_switches[j], arg) == 0) return 1; - - return 0; -} - static void parse_target_option( struct options *opts, const char *target ) { char *p, *platform, *spec = xstrdup( target ); @@ -1524,25 +1486,8 @@ int main(int argc, char **argv) } /* determine what options go 'as is' to the linker & the compiler */ - raw_compiler_arg = raw_linker_arg = 0; - if (is_linker_arg(argv[i])) - { - raw_linker_arg = 1; - } - else - { - if (is_directory_arg(argv[i]) || is_target_arg(argv[i])) - raw_linker_arg = 1; - raw_compiler_arg = !is_mingw_arg(argv[i]); - } - - /* these things we handle explicitly so we don't pass them 'as is' */ - if (argv[i][1] == 'l' || argv[i][1] == 'I' || argv[i][1] == 'L') - raw_linker_arg = 0; - if (argv[i][1] == 'c' || argv[i][1] == 'L') - raw_compiler_arg = 0; - if (argv[i][1] == 'o' || argv[i][1] == 'b' || argv[i][1] == 'V') - raw_compiler_arg = raw_linker_arg = 0; + raw_linker_arg = is_linker_arg(argv[i]); + raw_compiler_arg = !raw_linker_arg; /* do a bit of semantic analysis */ switch (argv[i][1]) @@ -1552,14 +1497,18 @@ int main(int argc, char **argv) if (strendswith(str, "/")) str[strlen(str) - 1] = 0; if (!opts.prefix) opts.prefix = strarray_alloc(); strarray_add(opts.prefix, str); + raw_linker_arg = 1; break; case 'b': parse_target_option( &opts, option_arg ); + raw_compiler_arg = 0; break; case 'V': opts.version = xstrdup( option_arg ); + raw_compiler_arg = 0; break; case 'c': /* compile or assemble */ + raw_compiler_arg = 0; if (argv[i][2] == 0) opts.compile_only = 1; /* fall through */ case 'S': /* generate assembler code */ @@ -1583,24 +1532,45 @@ int main(int argc, char **argv) break; case 'l': strarray_add(opts.files, strmake("-l%s", option_arg)); + raw_compiler_arg = 0; break; case 'L': strarray_add(opts.lib_dirs, option_arg); + raw_compiler_arg = 0; break; case 'M': /* map file generation */ linking = 0; break; case 'm': if (strcmp("-mno-cygwin", argv[i]) == 0) + { opts.use_msvcrt = 1; + raw_compiler_arg = 0; + } else if (strcmp("-mwindows", argv[i]) == 0) + { opts.gui_app = 1; + raw_compiler_arg = 0; + } else if (strcmp("-mconsole", argv[i]) == 0) + { opts.gui_app = 0; + raw_compiler_arg = 0; + } else if (strcmp("-municode", argv[i]) == 0) + { opts.unicode_app = 1; + raw_compiler_arg = 0; + } + else if (strcmp("-mthreads", argv[i]) == 0) + { + raw_compiler_arg = 0; + } else if (strcmp("-m16", argv[i]) == 0) + { opts.win16_app = 1; + raw_compiler_arg = 0; + } else if (strcmp("-m32", argv[i]) == 0) { if (opts.target_cpu == CPU_x86_64) @@ -1642,12 +1612,15 @@ int main(int argc, char **argv) break; case 'o': opts.output_name = option_arg; + raw_compiler_arg = 0; break; case 's': if (strcmp("-static", argv[i]) == 0) linking = -1; else if(strcmp("-save-temps", argv[i]) == 0) keep_generated = 1; + else if (strncmp("-specs=", argv[i], 7) == 0) + raw_linker_arg = 1; else if(strcmp("-shared", argv[i]) == 0) { opts.shared = 1; @@ -1723,7 +1696,10 @@ int main(int argc, char **argv) if (strcmp("-static", argv[i]+1) == 0) linking = -1; else if (is_option( argv, i, "--sysroot", &option_arg )) + { opts.sysroot = option_arg; + raw_linker_arg = 1; + } else if (is_option( argv, i, "--target", &option_arg )) { parse_target_option( &opts, option_arg );

1 0

Zebediah Figura : strmbase: Don't execute OnStartStreaming() or OnStopStreaming() callbacks if the sink is unconnected.
by Alexandre Julliard Sept. 27, 2019

Sept. 27, 2019

Module: wine Branch: master Commit: 802ebaf9dbe781db73ac1b9373b659aad687fd45 URL: https://source.winehq.org/git/wine.git/?a=commit;h=802ebaf9dbe781db73ac1b93… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 26 21:40:48 2019 -0500 strmbase: Don't execute OnStartStreaming() or OnStopStreaming() callbacks if the sink is unconnected. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/renderer.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 5634ab1905..051230186d 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -407,7 +407,7 @@ HRESULT WINAPI BaseRendererImpl_Stop(IBaseFilter * iface) EnterCriticalSection(&This->csRenderLock); { RendererPosPassThru_ResetMediaTime(This->pPosition); - if (This->pFuncsTable->renderer_stop_stream) + if (This->sink.pin.pConnectedTo && This->pFuncsTable->renderer_stop_stream) This->pFuncsTable->renderer_stop_stream(This); This->filter.state = State_Stopped; SetEvent(This->state_event); @@ -449,7 +449,7 @@ HRESULT WINAPI BaseRendererImpl_Run(IBaseFilter * iface, REFERENCE_TIME tStart) if (SUCCEEDED(hr)) { QualityControlRender_Start(This->qcimpl, This->filter.rtStreamStart); - if (This->pFuncsTable->renderer_start_stream) + if (This->sink.pin.pConnectedTo && This->pFuncsTable->renderer_start_stream) This->pFuncsTable->renderer_start_stream(This); if (This->filter.state == State_Stopped) BaseRendererImpl_ClearPendingSample(This); @@ -477,7 +477,7 @@ HRESULT WINAPI BaseRendererImpl_Pause(IBaseFilter * iface) ResetEvent(This->state_event); This->sink.end_of_stream = FALSE; } - else if (This->pFuncsTable->renderer_stop_stream) + else if (This->sink.pin.pConnectedTo && This->pFuncsTable->renderer_stop_stream) This->pFuncsTable->renderer_stop_stream(This); if (This->filter.state == State_Stopped)

1 0

Zebediah Figura : quartz/tests: Add some tests for unconnected filter state change.
by Alexandre Julliard Sept. 27, 2019

Sept. 27, 2019

Module: wine Branch: master Commit: c08ab0b941db2cf47a9e93311bfa690f020cb32d URL: https://source.winehq.org/git/wine.git/?a=commit;h=c08ab0b941db2cf47a9e9331… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 26 21:40:49 2019 -0500 quartz/tests: Add some tests for unconnected filter state change. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/acmwrapper.c | 58 +++++++++++++++++++++++++++++++++++++ dlls/quartz/tests/avidec.c | 58 +++++++++++++++++++++++++++++++++++++ dlls/quartz/tests/avisplit.c | 58 +++++++++++++++++++++++++++++++++++++ dlls/quartz/tests/dsoundrender.c | 58 +++++++++++++++++++++++++++++++++++++ dlls/quartz/tests/filesource.c | 61 +++++++++++++++++---------------------- dlls/quartz/tests/mpegsplit.c | 58 +++++++++++++++++++++++++++++++++++++ dlls/quartz/tests/videorenderer.c | 58 +++++++++++++++++++++++++++++++++++++ dlls/quartz/tests/vmr7.c | 58 +++++++++++++++++++++++++++++++++++++ dlls/quartz/tests/vmr9.c | 58 +++++++++++++++++++++++++++++++++++++ dlls/quartz/tests/waveparser.c | 58 +++++++++++++++++++++++++++++++++++++ 10 files changed, 549 insertions(+), 34 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c08ab0b941db2cf47a9e…

1 0

Zebediah Figura : qcap/avico: Don't try to commit a NULL allocator in AVICompressor_Run().
by Alexandre Julliard Sept. 27, 2019

Sept. 27, 2019

Module: wine Branch: master Commit: 084cb90f5834aa6dbdf69c7e24b6f0f72b0707de URL: https://source.winehq.org/git/wine.git/?a=commit;h=084cb90f5834aa6dbdf69c7e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 26 21:40:50 2019 -0500 qcap/avico: Don't try to commit a NULL allocator in AVICompressor_Run(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/avico.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/qcap/avico.c b/dlls/qcap/avico.c index 89e8dda08f..ea98b2a655 100644 --- a/dlls/qcap/avico.c +++ b/dlls/qcap/avico.c @@ -148,8 +148,8 @@ static HRESULT WINAPI AVICompressor_Run(IBaseFilter *iface, REFERENCE_TIME tStar if(This->filter.state == State_Running) return S_OK; - hres = IMemAllocator_Commit(This->source.pAllocator); - if(FAILED(hres)) { + if (This->source.pAllocator && FAILED(hres = IMemAllocator_Commit(This->source.pAllocator))) + { FIXME("Commit failed: %08x\n", hres); return hres; }

1 0

Zebediah Figura : qcap/tests: Add some tests for unconnected filter state change.
by Alexandre Julliard Sept. 27, 2019

Sept. 27, 2019

Module: wine Branch: master Commit: 4f29ddf7fbceb71ed209177089ce309736c046e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f29ddf7fbceb71ed2091770… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 26 21:40:51 2019 -0500 qcap/tests: Add some tests for unconnected filter state change. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/audiorecord.c | 53 ++++++++++++++++++++++++++++++++++++ dlls/qcap/tests/avico.c | 53 ++++++++++++++++++++++++++++++++++++ dlls/qcap/tests/avimux.c | 58 ++++++++++++++++++++++++++++++++++++++++ dlls/qcap/tests/smartteefilter.c | 58 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 222 insertions(+) diff --git a/dlls/qcap/tests/audiorecord.c b/dlls/qcap/tests/audiorecord.c index e599165d19..11ef690b99 100644 --- a/dlls/qcap/tests/audiorecord.c +++ b/dlls/qcap/tests/audiorecord.c @@ -245,6 +245,58 @@ static void test_property_bag(IMoniker *mon) IPropertyBag_Release(devenum_bag); } +static void test_unconnected_filter_state(IBaseFilter *filter) +{ + FILTER_STATE state; + HRESULT hr; + + hr = IBaseFilter_GetState(filter, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == State_Stopped, "Got state %u.\n", state); + + hr = IBaseFilter_Pause(filter); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_GetState(filter, 0, &state); + todo_wine ok(hr == VFW_S_CANT_CUE, "Got hr %#x.\n", hr); + todo_wine ok(state == State_Paused, "Got state %u.\n", state); + + hr = IBaseFilter_Run(filter, 0); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_GetState(filter, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(state == State_Running, "Got state %u.\n", state); + + hr = IBaseFilter_Pause(filter); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_GetState(filter, 0, &state); + todo_wine ok(hr == VFW_S_CANT_CUE, "Got hr %#x.\n", hr); + todo_wine ok(state == State_Paused, "Got state %u.\n", state); + + hr = IBaseFilter_Stop(filter); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_GetState(filter, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == State_Stopped, "Got state %u.\n", state); + + hr = IBaseFilter_Run(filter, 0); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_GetState(filter, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(state == State_Running, "Got state %u.\n", state); + + hr = IBaseFilter_Stop(filter); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_GetState(filter, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == State_Stopped, "Got state %u.\n", state); +} + START_TEST(audiorecord) { ICreateDevEnum *devenum; @@ -285,6 +337,7 @@ START_TEST(audiorecord) ok(hr == S_OK, "Got hr %#x.\n", hr); test_interfaces(filter); + test_unconnected_filter_state(filter); ref = IBaseFilter_Release(filter); ok(!ref, "Got outstanding refcount %d.\n", ref); diff --git a/dlls/qcap/tests/avico.c b/dlls/qcap/tests/avico.c index dbc15e3f15..5c6d4aa54f 100644 --- a/dlls/qcap/tests/avico.c +++ b/dlls/qcap/tests/avico.c @@ -655,6 +655,58 @@ static void test_enum_media_types(IBaseFilter *filter) IPin_Release(pin); } +static void test_unconnected_filter_state(IBaseFilter *filter) +{ + FILTER_STATE state; + HRESULT hr; + + hr = IBaseFilter_GetState(filter, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == State_Stopped, "Got state %u.\n", state); + + hr = IBaseFilter_Pause(filter); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_GetState(filter, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(state == State_Paused, "Got state %u.\n", state); + + hr = IBaseFilter_Run(filter, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_GetState(filter, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == State_Running, "Got state %u.\n", state); + + hr = IBaseFilter_Pause(filter); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_GetState(filter, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(state == State_Paused, "Got state %u.\n", state); + + hr = IBaseFilter_Stop(filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_GetState(filter, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == State_Stopped, "Got state %u.\n", state); + + hr = IBaseFilter_Run(filter, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_GetState(filter, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == State_Running, "Got state %u.\n", state); + + hr = IBaseFilter_Stop(filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_GetState(filter, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == State_Stopped, "Got state %u.\n", state); +} + START_TEST(avico) { static const WCHAR test_display_name[] = {'@','d','e','v','i','c','e',':', @@ -697,6 +749,7 @@ START_TEST(avico) test_pin_info(filter); test_media_types(filter); test_enum_media_types(filter); + test_unconnected_filter_state(filter); ref = IBaseFilter_Release(filter); ok(!ref, "Got outstanding refcount %d.\n", ref); diff --git a/dlls/qcap/tests/avimux.c b/dlls/qcap/tests/avimux.c index 85ebd5c82c..572314f8ab 100644 --- a/dlls/qcap/tests/avimux.c +++ b/dlls/qcap/tests/avimux.c @@ -798,6 +798,63 @@ static void test_seeking(void) ok(!ref, "Got unexpected refcount %d.\n", ref); } +static void test_unconnected_filter_state(void) +{ + IBaseFilter *filter = create_avi_mux(); + FILTER_STATE state; + HRESULT hr; + ULONG ref; + + hr = IBaseFilter_GetState(filter, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == State_Stopped, "Got state %u.\n", state); + + hr = IBaseFilter_Pause(filter); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_GetState(filter, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(state == State_Paused, "Got state %u.\n", state); + + hr = IBaseFilter_Run(filter, 0); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_GetState(filter, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(state == State_Running, "Got state %u.\n", state); + + hr = IBaseFilter_Pause(filter); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_GetState(filter, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(state == State_Paused, "Got state %u.\n", state); + + hr = IBaseFilter_Stop(filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_GetState(filter, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == State_Stopped, "Got state %u.\n", state); + + hr = IBaseFilter_Run(filter, 0); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_GetState(filter, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(state == State_Running, "Got state %u.\n", state); + + hr = IBaseFilter_Stop(filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_GetState(filter, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == State_Stopped, "Got state %u.\n", state); + + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(avimux) { CoInitialize(NULL); @@ -810,6 +867,7 @@ START_TEST(avimux) test_media_types(); test_enum_media_types(); test_seeking(); + test_unconnected_filter_state(); CoUninitialize(); } diff --git a/dlls/qcap/tests/smartteefilter.c b/dlls/qcap/tests/smartteefilter.c index 487c8eca3c..437f3f4a7f 100644 --- a/dlls/qcap/tests/smartteefilter.c +++ b/dlls/qcap/tests/smartteefilter.c @@ -2154,6 +2154,63 @@ end: IEnumMediaTypes_Release(enumMediaTypes); } +static void test_unconnected_filter_state(void) +{ + IBaseFilter *filter = create_smart_tee(); + FILTER_STATE state; + HRESULT hr; + ULONG ref; + + hr = IBaseFilter_GetState(filter, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == State_Stopped, "Got state %u.\n", state); + + hr = IBaseFilter_Pause(filter); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_GetState(filter, 0, &state); + todo_wine ok(hr == VFW_S_CANT_CUE, "Got hr %#x.\n", hr); + todo_wine ok(state == State_Paused, "Got state %u.\n", state); + + hr = IBaseFilter_Run(filter, 0); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_GetState(filter, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(state == State_Running, "Got state %u.\n", state); + + hr = IBaseFilter_Pause(filter); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_GetState(filter, 0, &state); + todo_wine ok(hr == VFW_S_CANT_CUE, "Got hr %#x.\n", hr); + todo_wine ok(state == State_Paused, "Got state %u.\n", state); + + hr = IBaseFilter_Stop(filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_GetState(filter, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == State_Stopped, "Got state %u.\n", state); + + hr = IBaseFilter_Run(filter, 0); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_GetState(filter, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(state == State_Running, "Got state %u.\n", state); + + hr = IBaseFilter_Stop(filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_GetState(filter, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == State_Stopped, "Got state %u.\n", state); + + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + static void test_smart_tee_filter_aggregation(void) { SourceFilter *sourceFilter = create_video_SourceFilter(); @@ -2381,6 +2438,7 @@ START_TEST(smartteefilter) test_find_pin(); test_pin_info(); test_enum_media_types(); + test_unconnected_filter_state(); test_smart_tee_filter_aggregation(); test_smart_tee_filter();

1 0

Alexandre Julliard : msvcrt: Move vtbl wrappers together with the other functions.
by Alexandre Julliard Sept. 27, 2019

Sept. 27, 2019

Module: wine Branch: master Commit: 0c853f026578dd7c8aede2f716c8e55d816ccf40 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c853f026578dd7c8aede2f7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 27 13:57:06 2019 +0200 msvcrt: Move vtbl wrappers together with the other functions. The .text directive can mess up the variable definitions. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47751 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/scheduler.c | 52 ++++++++++++++++++++++++------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/dlls/msvcrt/scheduler.c b/dlls/msvcrt/scheduler.c index 9e0de95740..53a9669fea 100644 --- a/dlls/msvcrt/scheduler.c +++ b/dlls/msvcrt/scheduler.c @@ -36,32 +36,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); static int context_id = -1; static int scheduler_id = -1; -#if defined(__i386__) && !defined(__MINGW32__) - -#define DEFINE_VTBL_WRAPPER(off) \ - __ASM_GLOBAL_FUNC(vtbl_wrapper_ ## off, \ - "popl %eax\n\t" \ - "popl %ecx\n\t" \ - "pushl %eax\n\t" \ - "movl 0(%ecx), %eax\n\t" \ - "jmp *" #off "(%eax)\n\t") - -DEFINE_VTBL_WRAPPER(0); -DEFINE_VTBL_WRAPPER(4); -DEFINE_VTBL_WRAPPER(8); -DEFINE_VTBL_WRAPPER(12); -DEFINE_VTBL_WRAPPER(16); -DEFINE_VTBL_WRAPPER(20); -DEFINE_VTBL_WRAPPER(24); -DEFINE_VTBL_WRAPPER(28); -DEFINE_VTBL_WRAPPER(32); -DEFINE_VTBL_WRAPPER(36); -DEFINE_VTBL_WRAPPER(40); -DEFINE_VTBL_WRAPPER(44); -DEFINE_VTBL_WRAPPER(48); - -#endif - typedef enum { SchedulerKind, MaxConcurrency, @@ -1083,6 +1057,32 @@ void __cdecl _CurrentScheduler__ScheduleTask(void (__cdecl *proc)(void*), void * CurrentScheduler_ScheduleTask(proc, data); } +#if defined(__i386__) && !defined(__MINGW32__) + +#define DEFINE_VTBL_WRAPPER(off) \ + __ASM_GLOBAL_FUNC(vtbl_wrapper_ ## off, \ + "popl %eax\n\t" \ + "popl %ecx\n\t" \ + "pushl %eax\n\t" \ + "movl 0(%ecx), %eax\n\t" \ + "jmp *" #off "(%eax)\n\t") + +DEFINE_VTBL_WRAPPER(0); +DEFINE_VTBL_WRAPPER(4); +DEFINE_VTBL_WRAPPER(8); +DEFINE_VTBL_WRAPPER(12); +DEFINE_VTBL_WRAPPER(16); +DEFINE_VTBL_WRAPPER(20); +DEFINE_VTBL_WRAPPER(24); +DEFINE_VTBL_WRAPPER(28); +DEFINE_VTBL_WRAPPER(32); +DEFINE_VTBL_WRAPPER(36); +DEFINE_VTBL_WRAPPER(40); +DEFINE_VTBL_WRAPPER(44); +DEFINE_VTBL_WRAPPER(48); + +#endif + extern const vtable_ptr MSVCRT_type_info_vtable; DEFINE_RTTI_DATA0(Context, 0, ".?AVContext(a)Concurrency@@") DEFINE_RTTI_DATA1(ContextBase, 0, &Context_rtti_base_descriptor, ".?AVContextBase(a)details@Concurrency@@")

1 0