November 2021 - Wine-Commits

Michael Stefaniuc : vbscript: Avoid negating SUCCEEDED().
by Alexandre Julliard Nov. 1, 2021

Nov. 1, 2021

Module: wine Branch: master Commit: 34884b83ada12274699e0e1177fa2b23707af960 URL: https://source.winehq.org/git/wine.git/?a=commit;h=34884b83ada12274699e0e11… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Oct 19 22:54:34 2021 +0200 vbscript: Avoid negating SUCCEEDED(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/lex.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/vbscript/lex.c b/dlls/vbscript/lex.c index 09b073fb773..5e81deab6ca 100644 --- a/dlls/vbscript/lex.c +++ b/dlls/vbscript/lex.c @@ -237,7 +237,7 @@ static int parse_date_literal(parser_ctx_t *ctx, DATE *ret) rptr[len] = 0; res = VarDateFromStr(rptr, ctx->lcid, 0, ret); heap_free(rptr); - if (!SUCCEEDED(res)) { + if (FAILED(res)) { FIXME("Invalid date literal\n"); return 0; }

1 0

Rémi Bernon : mshtml: Only treat resource://gre(-resources)/ as special.
by Alexandre Julliard Nov. 1, 2021

Nov. 1, 2021

Module: wine Branch: master Commit: 25184137e8fa892a7ee349f6880cf9ceb31cd648 URL: https://source.winehq.org/git/wine.git/?a=commit;h=25184137e8fa892a7ee349f6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Oct 27 15:35:51 2021 +0200 mshtml: Only treat resource://gre(-resources)/ as special. Instead of everything starting with resource:, some application use the resource: prefix for their internal resources, and we fail to load them. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46213 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/nsio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index abf05aaa41b..f921acf4dce 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -3799,7 +3799,7 @@ static nsresult NSAPI nsIOServiceHook_GetProtocolHandler(nsIIOServiceHook *iface static BOOL is_gecko_special_uri(const char *spec) { - static const char *special_schemes[] = {"chrome:", "data:", "jar:", "moz-safe-about", "resource:", "javascript:", "wyciwyg:"}; + static const char *special_schemes[] = {"chrome:", "data:", "jar:", "moz-safe-about", "resource://gre/", "resource://gre-resources/", "javascript:", "wyciwyg:"}; unsigned int i; for(i=0; i < ARRAY_SIZE(special_schemes); i++) {

1 0

Zebediah Figura : evr/tests: Test receiving EC_COMPLETE when not connected.
by Alexandre Julliard Nov. 1, 2021

Nov. 1, 2021

Module: wine Branch: master Commit: 8ef3c68f5f7712005b0e2e292ba27dfb561ed33b URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ef3c68f5f7712005b0e2e29… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Oct 31 19:04:05 2021 -0500 evr/tests: Test receiving EC_COMPLETE when not connected. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/tests/evr.c | 106 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 106 insertions(+) diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 6a711e30581..8bfeb987352 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -84,6 +84,16 @@ static IBaseFilter *create_evr(void) return filter; } +static IFilterGraph2 *create_graph(void) +{ + IFilterGraph2 *ret; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_FilterGraph, NULL, CLSCTX_INPROC_SERVER, &IID_IFilterGraph2, (void **)&ret); + ok(hr == S_OK, "Failed to create FilterGraph: %#x\n", hr); + return ret; +} + static ULONG get_refcount(void *iface) { IUnknown *unknown = iface; @@ -438,6 +448,100 @@ static void test_pin_info(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static unsigned int check_event_code(IMediaEvent *eventsrc, DWORD timeout, LONG expected_code, LONG_PTR expected1, LONG_PTR expected2) +{ + LONG_PTR param1, param2; + unsigned int ret = 0; + HRESULT hr; + LONG code; + + while ((hr = IMediaEvent_GetEvent(eventsrc, &code, &param1, &param2, timeout)) == S_OK) + { + if (code == expected_code) + { + ok(param1 == expected1, "Got param1 %#lx.\n", param1); + ok(param2 == expected2, "Got param2 %#lx.\n", param2); + ret++; + } + IMediaEvent_FreeEventParams(eventsrc, code, param1, param2); + timeout = 0; + } + ok(hr == E_ABORT, "Got hr %#x.\n", hr); + + return ret; +} + +static unsigned int check_ec_complete(IMediaEvent *eventsrc, DWORD timeout) +{ + return check_event_code(eventsrc, timeout, EC_COMPLETE, S_OK, 0); +} + +static void test_unconnected_eos(void) +{ + IBaseFilter *filter = create_evr(); + IFilterGraph2 *graph = create_graph(); + IMediaControl *control; + IMediaEvent *eventsrc; + unsigned int ret; + HRESULT hr; + ULONG ref; + + hr = IFilterGraph2_AddFilter(graph, filter, L"renderer"); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IFilterGraph2_QueryInterface(graph, &IID_IMediaEvent, (void **)&eventsrc); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got %u EC_COMPLETE events.\n", ret); + + hr = IMediaControl_Pause(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got %u EC_COMPLETE events.\n", ret); + + hr = IMediaControl_Run(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret = check_ec_complete(eventsrc, 0); + todo_wine ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret); + + hr = IMediaControl_Pause(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got %u EC_COMPLETE events.\n", ret); + + hr = IMediaControl_Run(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret = check_ec_complete(eventsrc, 0); + todo_wine ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got %u EC_COMPLETE events.\n", ret); + + hr = IMediaControl_Run(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret = check_ec_complete(eventsrc, 0); + todo_wine ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret); + + IMediaControl_Release(control); + IMediaEvent_Release(eventsrc); + ref = IFilterGraph2_Release(graph); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + static IMFMediaType * create_video_type(const GUID *subtype) { IMFMediaType *video_type; @@ -2952,6 +3056,8 @@ START_TEST(evr) test_enum_pins(); test_find_pin(); test_pin_info(); + test_unconnected_eos(); + test_default_mixer(); test_default_mixer_type_negotiation(); test_surface_sample();

1 0

Jan Sikorski : d3d9: Don't grab wined3d lock for wined3d_query_issue().
by Alexandre Julliard Nov. 1, 2021

Nov. 1, 2021

Module: wine Branch: master Commit: 64b7ba3d653f2ed2d51b55c1909724ae63134c01 URL: https://source.winehq.org/git/wine.git/?a=commit;h=64b7ba3d653f2ed2d51b55c1… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Fri Oct 15 14:26:30 2021 +0200 d3d9: Don't grab wined3d lock for wined3d_query_issue(). Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/query.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/dlls/d3d9/query.c b/dlls/d3d9/query.c index 450a58091fa..b539e22b957 100644 --- a/dlls/d3d9/query.c +++ b/dlls/d3d9/query.c @@ -123,15 +123,8 @@ static DWORD WINAPI d3d9_query_GetDataSize(IDirect3DQuery9 *iface) static HRESULT WINAPI d3d9_query_Issue(IDirect3DQuery9 *iface, DWORD flags) { struct d3d9_query *query = impl_from_IDirect3DQuery9(iface); - HRESULT hr; - TRACE("iface %p, flags %#x.\n", iface, flags); - - wined3d_mutex_lock(); - hr = wined3d_query_issue(query->wined3d_query, flags); - wined3d_mutex_unlock(); - - return hr; + return wined3d_query_issue(query->wined3d_query, flags); } static HRESULT WINAPI d3d9_query_GetData(IDirect3DQuery9 *iface, void *data, DWORD size, DWORD flags)

1 0

Alistair Leslie-Hughes : msdasql: Add ICommandPrepare interface for ICommandText.
by Alexandre Julliard Nov. 1, 2021

Nov. 1, 2021

Module: wine Branch: master Commit: 22689f6f8a0865622465c8ea72e42c3a607356b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=22689f6f8a0865622465c8ea… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Oct 31 19:51:15 2021 +1100 msdasql: Add ICommandPrepare interface for ICommandText. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdasql/session.c | 52 +++++++++++++++++++++++++++++++++++++++++++ dlls/msdasql/tests/provider.c | 5 ++--- 2 files changed, 54 insertions(+), 3 deletions(-) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index 3ee4b72a1d1..da148fd7ca6 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -281,6 +281,7 @@ struct command ICommandProperties ICommandProperties_iface; IColumnsInfo IColumnsInfo_iface; IConvertType IConvertType_iface; + ICommandPrepare ICommandPrepare_iface; LONG refs; }; @@ -304,6 +305,11 @@ static inline struct command *impl_from_IConvertType( IConvertType *iface ) return CONTAINING_RECORD( iface, struct command, IConvertType_iface ); } +static inline struct command *impl_from_ICommandPrepare( ICommandPrepare *iface ) +{ + return CONTAINING_RECORD( iface, struct command, ICommandPrepare_iface ); +} + static HRESULT WINAPI command_QueryInterface(ICommandText *iface, REFIID riid, void **ppv) { struct command *command = impl_from_ICommandText( iface ); @@ -329,6 +335,10 @@ static HRESULT WINAPI command_QueryInterface(ICommandText *iface, REFIID riid, v { *ppv = &command->IConvertType_iface; } + else if(IsEqualGUID(&IID_ICommandPrepare, riid)) + { + *ppv = &command->ICommandPrepare_iface; + } if(*ppv) { @@ -553,6 +563,47 @@ static struct IConvertTypeVtbl converttypeVtbl = converttype_CanConvert }; +static HRESULT WINAPI commandprepare_QueryInterface(ICommandPrepare *iface, REFIID riid, void **out) +{ + struct command *command = impl_from_ICommandPrepare( iface ); + return ICommandText_QueryInterface(&command->ICommandText_iface, riid, out); +} + +static ULONG WINAPI commandprepare_AddRef(ICommandPrepare *iface) +{ + struct command *command = impl_from_ICommandPrepare( iface ); + return ICommandText_AddRef(&command->ICommandText_iface); +} + +static ULONG WINAPI commandprepare_Release(ICommandPrepare *iface) +{ + struct command *command = impl_from_ICommandPrepare( iface ); + return ICommandText_Release(&command->ICommandText_iface); +} + +static HRESULT WINAPI commandprepare_Prepare(ICommandPrepare *iface, ULONG runs) +{ + struct command *command = impl_from_ICommandPrepare( iface ); + FIXME("%p, %u\n", command, runs); + return E_NOTIMPL; +} + +static HRESULT WINAPI commandprepare_Unprepare(ICommandPrepare *iface) +{ + struct command *command = impl_from_ICommandPrepare( iface ); + FIXME("%p\n", command); + return E_NOTIMPL; +} + +struct ICommandPrepareVtbl commandprepareVtbl = +{ + commandprepare_QueryInterface, + commandprepare_AddRef, + commandprepare_Release, + commandprepare_Prepare, + commandprepare_Unprepare +}; + static HRESULT WINAPI createcommand_CreateCommand(IDBCreateCommand *iface, IUnknown *outer, REFIID riid, IUnknown **out) { @@ -573,6 +624,7 @@ static HRESULT WINAPI createcommand_CreateCommand(IDBCreateCommand *iface, IUnkn command->ICommandProperties_iface.lpVtbl = &commonpropsVtbl; command->IColumnsInfo_iface.lpVtbl = &columninfoVtbl; command->IConvertType_iface.lpVtbl = &converttypeVtbl; + command->ICommandPrepare_iface.lpVtbl = &commandprepareVtbl; command->refs = 1; hr = ICommandText_QueryInterface(&command->ICommandText_iface, riid, (void**)out); diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index 7d14928e50b..bb624bd9848 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -134,9 +134,8 @@ static void test_command_interfaces(IUnknown *cmd) IConvertType_Release(convertype); hr = IUnknown_QueryInterface(cmd, &IID_ICommandPrepare, (void**)&commandprepare); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); - if (hr == S_OK) - ICommandPrepare_Release(commandprepare); + ok(hr == S_OK, "got 0x%08x\n", hr); + ICommandPrepare_Release(commandprepare); hr = IUnknown_QueryInterface(cmd, &IID_IColumnsInfo, (void**)&colinfo); ok(hr == S_OK, "got 0x%08x\n", hr);

1 0

Zebediah Figura : winegstreamer: Implement IWMSyncReader::SetRange().
by Alexandre Julliard Nov. 1, 2021

Nov. 1, 2021

Module: wine Branch: master Commit: 74c2e9020f04b26e7ccf217d956ead740566e991 URL: https://source.winehq.org/git/wine.git/?a=commit;h=74c2e9020f04b26e7ccf217d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Oct 31 19:03:36 2021 -0500 winegstreamer: Implement IWMSyncReader::SetRange(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_private.h | 1 + dlls/winegstreamer/wm_reader.c | 15 +++++++++++++++ dlls/winegstreamer/wm_syncreader.c | 9 ++++++--- dlls/wmvcore/tests/wmvcore.c | 17 +++++++---------- 4 files changed, 29 insertions(+), 13 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index a9c361366b3..d330716b8f9 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -166,6 +166,7 @@ HRESULT wm_reader_get_stream_sample(struct wm_stream *stream, INSSBuffer **sample, QWORD *pts, QWORD *duration, DWORD *flags); void wm_reader_init(struct wm_reader *reader, const struct wm_reader_ops *ops); HRESULT wm_reader_open_stream(struct wm_reader *reader, IStream *stream); +void wm_reader_seek(struct wm_reader *reader, QWORD start, LONGLONG duration); HRESULT wm_reader_set_output_props(struct wm_reader *reader, DWORD output, IWMOutputMediaProps *props); diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index e708ed4bfa6..24fd11f652d 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -1637,6 +1637,21 @@ HRESULT wm_reader_get_stream_sample(struct wm_stream *stream, } } +void wm_reader_seek(struct wm_reader *reader, QWORD start, LONGLONG duration) +{ + WORD i; + + EnterCriticalSection(&reader->cs); + + wg_parser_stream_seek(reader->streams[0].wg_stream, 1.0, start, start + duration, + AM_SEEKING_AbsolutePositioning, duration ? AM_SEEKING_AbsolutePositioning : AM_SEEKING_NoPositioning); + + for (i = 0; i < reader->stream_count; ++i) + reader->streams[i].eos = false; + + LeaveCriticalSection(&reader->cs); +} + void wm_reader_init(struct wm_reader *reader, const struct wm_reader_ops *ops) { reader->IWMHeaderInfo3_iface.lpVtbl = &header_info_vtbl; diff --git a/dlls/winegstreamer/wm_syncreader.c b/dlls/winegstreamer/wm_syncreader.c index 063be2a94ab..1f5827cf244 100644 --- a/dlls/winegstreamer/wm_syncreader.c +++ b/dlls/winegstreamer/wm_syncreader.c @@ -259,9 +259,12 @@ static HRESULT WINAPI WMSyncReader_SetOutputSetting(IWMSyncReader2 *iface, DWORD static HRESULT WINAPI WMSyncReader_SetRange(IWMSyncReader2 *iface, QWORD start, LONGLONG duration) { - struct sync_reader *This = impl_from_IWMSyncReader2(iface); - FIXME("(%p)->(%s %s): stub!\n", This, wine_dbgstr_longlong(start), wine_dbgstr_longlong(duration)); - return E_NOTIMPL; + struct sync_reader *reader = impl_from_IWMSyncReader2(iface); + + TRACE("reader %p, start %I64u, duration %I64d.\n", reader, start, duration); + + wm_reader_seek(&reader->reader, start, duration); + return S_OK; } static HRESULT WINAPI WMSyncReader_SetRangeByFrame(IWMSyncReader2 *iface, WORD stream_num, QWORD frame_num, diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index 48d585e73c0..6e196234208 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -542,25 +542,22 @@ static void test_sync_reader_streaming(void) ok(hr == NS_E_NO_MORE_SAMPLES, "Got hr %#x.\n", hr); hr = IWMSyncReader_SetRange(reader, 0, 0); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IWMSyncReader_GetNextSample(reader, stream_numbers[0], &sample, &pts, &duration, &flags, NULL, NULL); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); - if (hr == S_OK) - INSSBuffer_Release(sample); + ok(hr == S_OK, "Got hr %#x.\n", hr); + INSSBuffer_Release(sample); hr = IWMSyncReader_GetNextSample(reader, 0, &sample, &pts, &duration, &flags, NULL, NULL); ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); hr = IWMSyncReader_GetNextSample(reader, 0, &sample, &pts, &duration, &flags, &output_number, NULL); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); - if (hr == S_OK) - INSSBuffer_Release(sample); + ok(hr == S_OK, "Got hr %#x.\n", hr); + INSSBuffer_Release(sample); hr = IWMSyncReader_GetNextSample(reader, 0, &sample, &pts, &duration, &flags, NULL, &stream_number); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); - if (hr == S_OK) - INSSBuffer_Release(sample); + ok(hr == S_OK, "Got hr %#x.\n", hr); + INSSBuffer_Release(sample); for (;;) {

1 0

Zebediah Figura : winegstreamer: Implement reading from all streams in IWMSyncReader::GetNextSample().
by Alexandre Julliard Nov. 1, 2021

Nov. 1, 2021

Module: wine Branch: master Commit: 04d94e3c092bbbaee5ec1331930b11af58ced629 URL: https://source.winehq.org/git/wine.git/?a=commit;h=04d94e3c092bbbaee5ec1331… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Oct 31 19:03:35 2021 -0500 winegstreamer: Implement reading from all streams in IWMSyncReader::GetNextSample(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/wm_syncreader.c | 29 +++++++++++++++++++++++++++-- dlls/wmvcore/tests/wmvcore.c | 6 +++--- 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/dlls/winegstreamer/wm_syncreader.c b/dlls/winegstreamer/wm_syncreader.c index a2cc747e9bf..063be2a94ab 100644 --- a/dlls/winegstreamer/wm_syncreader.c +++ b/dlls/winegstreamer/wm_syncreader.c @@ -25,6 +25,8 @@ struct sync_reader struct wm_reader reader; IWMSyncReader2 IWMSyncReader2_iface; + + WORD last_read_stream; }; static struct sync_reader *impl_from_IWMSyncReader2(IWMSyncReader2 *iface) @@ -83,6 +85,7 @@ static HRESULT WINAPI WMSyncReader_GetNextSample(IWMSyncReader2 *iface, struct sync_reader *reader = impl_from_IWMSyncReader2(iface); struct wm_stream *stream; HRESULT hr; + WORD i; TRACE("reader %p, stream_number %u, sample %p, pts %p, duration %p," " flags %p, output_number %p, ret_stream_number %p.\n", @@ -92,8 +95,30 @@ static HRESULT WINAPI WMSyncReader_GetNextSample(IWMSyncReader2 *iface, if (!stream_number) { - FIXME("Reading from all streams is not implemented yet.\n"); - hr = E_NOTIMPL; + if (!output_number && !ret_stream_number) + { + LeaveCriticalSection(&reader->reader.cs); + return E_INVALIDARG; + } + + for (i = 0; i < reader->reader.stream_count; ++i) + { + WORD index = (i + reader->last_read_stream + 1) % reader->reader.stream_count; + + hr = wm_reader_get_stream_sample(&reader->reader.streams[index], sample, pts, duration, flags); + if (hr == S_OK) + { + if (output_number) + *output_number = index; + if (ret_stream_number) + *ret_stream_number = index + 1; + } + if (hr != NS_E_NO_MORE_SAMPLES) + { + reader->last_read_stream = index; + break; + } + } } else { diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index 419dea2f68d..48d585e73c0 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -550,7 +550,7 @@ static void test_sync_reader_streaming(void) INSSBuffer_Release(sample); hr = IWMSyncReader_GetNextSample(reader, 0, &sample, &pts, &duration, &flags, NULL, NULL); - todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); hr = IWMSyncReader_GetNextSample(reader, 0, &sample, &pts, &duration, &flags, &output_number, NULL); todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -567,7 +567,7 @@ static void test_sync_reader_streaming(void) stream_number = pts = duration = flags = output_number = 0xdeadbeef; hr = IWMSyncReader_GetNextSample(reader, 0, &sample, &pts, &duration, &flags, &output_number, &stream_number); - todo_wine ok(hr == S_OK || hr == NS_E_NO_MORE_SAMPLES, "Got hr %#x.\n", hr); + ok(hr == S_OK || hr == NS_E_NO_MORE_SAMPLES, "Got hr %#x.\n", hr); if (hr == S_OK) { @@ -589,7 +589,7 @@ static void test_sync_reader_streaming(void) hr = IWMSyncReader_GetNextSample(reader, 0, &sample, &pts, &duration, &flags, NULL, &stream_number); - todo_wine ok(hr == NS_E_NO_MORE_SAMPLES, "Got hr %#x.\n", hr); + ok(hr == NS_E_NO_MORE_SAMPLES, "Got hr %#x.\n", hr); hr = IWMSyncReader_GetNextSample(reader, stream_numbers[0], &sample, &pts, &duration, &flags, NULL, NULL);

1 0

Zebediah Figura : winegstreamer: Seek to the beginning of the range in wm_reader_set_output_props().
by Alexandre Julliard Nov. 1, 2021

Nov. 1, 2021

Module: wine Branch: master Commit: 6f8d366b57e662981c68ba0bd29465f391167de9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f8d366b57e662981c68ba0b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Oct 31 19:03:37 2021 -0500 winegstreamer: Seek to the beginning of the range in wm_reader_set_output_props(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_private.h | 2 ++ dlls/winegstreamer/wm_reader.c | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index d330716b8f9..109ce6ab28f 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -136,6 +136,8 @@ struct wm_reader LONG refcount; CRITICAL_SECTION cs; + QWORD start_time; + IStream *source_stream; HANDLE read_thread; bool read_thread_shutdown; diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index 24fd11f652d..82f74318062 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -1543,6 +1543,22 @@ HRESULT wm_reader_set_output_props(struct wm_reader *reader, DWORD output, stream->format = format; wg_parser_stream_enable(stream->wg_stream, &format); + /* Re-decode any buffers that might have been generated with the old format. + * + * FIXME: Seeking in-place will cause some buffers to be dropped. + * Unfortunately, we can't really store the last received PTS and seek there + * either: since seeks are inexact and we aren't guaranteed to receive + * samples in order, some buffers might be duplicated or dropped anyway. + * In order to really seamlessly allow for format changes, we need + * cooperation from each individual GStreamer stream, to be able to tell + * upstream exactly which buffers they need resent... + * + * In all likelihood this function is being called not mid-stream but rather + * while setting the stream up, before consuming any events. Accordingly + * let's just seek back to the beginning. */ + wg_parser_stream_seek(reader->streams[0].wg_stream, 1.0, reader->start_time, 0, + AM_SEEKING_AbsolutePositioning, AM_SEEKING_NoPositioning); + LeaveCriticalSection(&reader->cs); return S_OK; } @@ -1643,6 +1659,8 @@ void wm_reader_seek(struct wm_reader *reader, QWORD start, LONGLONG duration) EnterCriticalSection(&reader->cs); + reader->start_time = start; + wg_parser_stream_seek(reader->streams[0].wg_stream, 1.0, start, start + duration, AM_SEEKING_AbsolutePositioning, duration ? AM_SEEKING_AbsolutePositioning : AM_SEEKING_NoPositioning);

1 0

Piotr Caban : msvcrt: Don't use GetDaylightFlag function in _ftime64.
by Alexandre Julliard Nov. 1, 2021

Nov. 1, 2021

Module: wine Branch: master Commit: 00824a94f02340c2725f494f04f7f1f8ca311033 URL: https://source.winehq.org/git/wine.git/?a=commit;h=00824a94f02340c2725f494f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Nov 1 15:07:17 2021 +0100 msvcrt: Don't use GetDaylightFlag function in _ftime64. The function is not available on current Windows releases. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51959 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/time.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 327d8e086e0..9abd1f5555b 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -44,8 +44,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); #undef _time32 #undef _wctime32 -BOOL WINAPI GetDaylightFlag(void); - static LONGLONG init_time; void msvcrt_init_clock(void) @@ -691,6 +689,7 @@ double CDECL _difftime32(__time32_t time1, __time32_t time2) */ void CDECL _ftime64(struct __timeb64 *buf) { + TIME_ZONE_INFORMATION tzinfo; FILETIME ft; ULONGLONG time; @@ -703,7 +702,7 @@ void CDECL _ftime64(struct __timeb64 *buf) buf->time = time / TICKSPERSEC - SECS_1601_TO_1970; buf->millitm = (time % TICKSPERSEC) / TICKSPERMSEC; buf->timezone = MSVCRT___timezone / 60; - buf->dstflag = GetDaylightFlag(); + buf->dstflag = GetTimeZoneInformation( &tzinfo) == TIME_ZONE_ID_DAYLIGHT; } /*********************************************************************

1 0

Zebediah Figura : winegstreamer: Implement IWMSyncReader::GetNextSample().
by Alexandre Julliard Nov. 1, 2021

Nov. 1, 2021

Module: wine Branch: master Commit: 3b8579d8a570eeeaf0d4e0667e748d484df138aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b8579d8a570eeeaf0d4e066… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Oct 31 19:03:33 2021 -0500 winegstreamer: Implement IWMSyncReader::GetNextSample(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_private.h | 5 + dlls/winegstreamer/wm_reader.c | 192 +++++++++++++++++++++++++++++++++++++ dlls/winegstreamer/wm_syncreader.c | 41 ++++++-- dlls/wmvcore/tests/wmvcore.c | 12 +-- include/wmsdkidl.idl | 7 ++ 5 files changed, 245 insertions(+), 12 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3b8579d8a570eeeaf0d4…

1 0