November 2020 - Wine-commits

Alexandre Julliard : msvcrt: Use the msvcrt allocation functions internally.
by Alexandre Julliard 18 Nov '20

18 Nov '20

Module: wine Branch: master Commit: 871d9863bc2d1c9406b47aa644974768d5c6d2c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=871d9863bc2d1c9406b47aa6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 18 16:02:06 2020 +0100 msvcrt: Use the msvcrt allocation functions internally. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/locale.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index fda3d11b86d..37c4afcf786 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -708,7 +708,7 @@ int CDECL __crtLCMapStringA( if (!in_len) return 0; if (in_len > ARRAY_SIZE(buf_in)) { - in = malloc(in_len * sizeof(WCHAR)); + in = MSVCRT_malloc(in_len * sizeof(WCHAR)); if (!in) return 0; } @@ -726,7 +726,7 @@ int CDECL __crtLCMapStringA( out_len = r; if (r > ARRAY_SIZE(buf_out)) { - out = malloc(r * sizeof(WCHAR)); + out = MSVCRT_malloc(r * sizeof(WCHAR)); if (!out) { r = 0; @@ -740,8 +740,8 @@ int CDECL __crtLCMapStringA( r = WideCharToMultiByte(codepage, 0, out, out_len, dst, dstlen, NULL, NULL); done: - if (in != buf_in) free(in); - if (out != buf_out) free(out); + if (in != buf_in) MSVCRT_free(in); + if (out != buf_out) MSVCRT_free(out); return r; }

1 0

Alexandre Julliard : msvcrt: Use the msvcrt ctype functions internally.
by Alexandre Julliard 18 Nov '20

18 Nov '20

Module: wine Branch: master Commit: b7fe06d0fa6dbad7d2c3ae380557adcaa10b89f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7fe06d0fa6dbad7d2c3ae38… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 18 16:03:27 2020 +0100 msvcrt: Use the msvcrt ctype functions internally. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/ctype.c | 6 +++--- dlls/msvcrt/file.c | 2 +- dlls/msvcrt/msvcrt.h | 3 +++ dlls/msvcrt/printf.h | 6 +++--- dlls/msvcrt/scanf.h | 7 ++----- dlls/msvcrt/undname.c | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/msvcrt/ctype.c b/dlls/msvcrt/ctype.c index 772357826eb..1334a514788 100644 --- a/dlls/msvcrt/ctype.c +++ b/dlls/msvcrt/ctype.c @@ -396,7 +396,7 @@ int CDECL MSVCRT_isblank(int c) */ int CDECL MSVCRT___isascii(int c) { - return isascii((unsigned)c); + return ((unsigned)c < 0x80); } /********************************************************************* @@ -421,7 +421,7 @@ int CDECL MSVCRT_iswascii(MSVCRT_wchar_t c) */ int CDECL MSVCRT___iscsym(int c) { - return (c < 127 && (isalnum(c) || c == '_')); + return (c < 127 && (MSVCRT_isalnum(c) || c == '_')); } /********************************************************************* @@ -429,7 +429,7 @@ int CDECL MSVCRT___iscsym(int c) */ int CDECL MSVCRT___iscsymf(int c) { - return (c < 127 && (isalpha(c) || c == '_')); + return (c < 127 && (MSVCRT_isalpha(c) || c == '_')); } /********************************************************************* diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 9d5f19cfbc0..090aa913589 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3013,7 +3013,7 @@ int CDECL MSVCRT_stat64(const char* path, struct MSVCRT__stat64 * buf) Also a letter as first char isn't enough to be classified as a drive letter */ - if (isalpha(*path)&& (*(path+1)==':')) + if (MSVCRT_isalpha(*path)&& (*(path+1)==':')) buf->st_dev = buf->st_rdev = MSVCRT__toupper_l(*path, NULL) - 'A'; /* drive num */ else buf->st_dev = buf->st_rdev = MSVCRT__getdrive() - 1; diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 65956c9b2e5..ab5b4c13f85 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -1072,6 +1072,9 @@ void* __cdecl MSVCRT_malloc(MSVCRT_size_t); void* __cdecl MSVCRT_calloc(MSVCRT_size_t,MSVCRT_size_t); void* __cdecl MSVCRT_realloc(void*,MSVCRT_size_t); +int __cdecl MSVCRT_isalpha(int c); +int __cdecl MSVCRT_isdigit(int c); +int __cdecl MSVCRT_isspace(int c); int __cdecl MSVCRT_iswalpha(MSVCRT_wint_t); int __cdecl MSVCRT_iswspace(MSVCRT_wint_t); int __cdecl MSVCRT_iswdigit(MSVCRT_wint_t); diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index cb83c05ff9f..f8b200c7e54 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -57,7 +57,7 @@ static inline const APICHAR* FUNC_NAME(pf_parse_int)(const APICHAR *fmt, int *va { *val = 0; - while(isdigit(*fmt)) { + while (*fmt >= '0' && *fmt <= '9') { *val *= 10; *val += *fmt++ - '0'; } @@ -1041,7 +1041,7 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API flags.LeftAlign = TRUE; flags.FieldLength = -flags.FieldLength; } - } else while(isdigit(*p)) { + } else while (*p >= '0' && *p <= '9') { flags.FieldLength *= 10; flags.FieldLength += *p++ - '0'; } @@ -1059,7 +1059,7 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API i = -1; flags.Precision = pf_args(args_ctx, i, VT_INT, valist).get_int; - } else while(isdigit(*p)) { + } else while (*p >= '0' && *p <= '9') { flags.Precision *= 10; flags.Precision += *p++ - '0'; } diff --git a/dlls/msvcrt/scanf.h b/dlls/msvcrt/scanf.h index e1a194e39fa..4750fae0f4a 100644 --- a/dlls/msvcrt/scanf.h +++ b/dlls/msvcrt/scanf.h @@ -28,7 +28,6 @@ #define _EOF_ MSVCRT_WEOF #define _EOF_RET (short)MSVCRT_WEOF #define _ISSPACE_(c) MSVCRT_iswspace(c) -#define _ISDIGIT_(c) MSVCRT_iswdigit(c) #define _WIDE2SUPPORTED_(c) c /* No conversion needed (wide to wide) */ #define _CHAR2SUPPORTED_(c) c /* FIXME: convert char to wide char */ #define _CHAR2DIGIT_(c, base) wchar2digit((c), (base)) @@ -37,8 +36,7 @@ #define _CHAR_ char #define _EOF_ MSVCRT_EOF #define _EOF_RET MSVCRT_EOF -#define _ISSPACE_(c) isspace(c) -#define _ISDIGIT_(c) isdigit(c) +#define _ISSPACE_(c) MSVCRT_isspace(c) #define _WIDE2SUPPORTED_(c) c /* FIXME: convert wide char to char */ #define _CHAR2SUPPORTED_(c) c /* No conversion needed (char to char) */ #define _CHAR2DIGIT_(c, base) char2digit((c), (base)) @@ -260,7 +258,7 @@ _FUNCTION_ { /* read prefix (if any) */ while (!prefix_finished) { /* look for width specification */ - while (_ISDIGIT_(*format)) { + while (*format >= '0' && *format <= '9') { width *= 10; width += *format++ - '0'; } @@ -721,7 +719,6 @@ _FUNCTION_ { #undef _EOF_ #undef _EOF_RET #undef _ISSPACE_ -#undef _ISDIGIT_ #undef _CHAR2SUPPORTED_ #undef _WIDE2SUPPORTED_ #undef _CHAR2DIGIT_ diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index 69eef44654e..23317f49605 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -857,7 +857,7 @@ static BOOL demangle_datatype(struct parsed_symbol* sym, struct datatype_t* ct, if (!get_modified_type(ct, sym, pmt_ref, in_args ? dt : 'P', in_args)) goto done; break; case 'P': /* Pointer */ - if (isdigit(*sym->current)) + if (MSVCRT_isdigit(*sym->current)) { /* FIXME: * P6 = Function pointer

1 0

Anton Baskanov : amstream: Factor out the common code of MediaStreamFilter seeking tests.
by Alexandre Julliard 18 Nov '20

18 Nov '20

Module: wine Branch: master Commit: 826164c1272650a25242e14fcade5eab1ab84393 URL: https://source.winehq.org/git/wine.git/?a=commit;h=826164c1272650a25242e14f… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Wed Nov 18 00:48:21 2020 +0700 amstream: Factor out the common code of MediaStreamFilter seeking tests. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/tests/amstream.c | 412 +++++++---------------------------------- 1 file changed, 67 insertions(+), 345 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=826164c1272650a25242…

1 0

Anton Baskanov : amstream: Implement MediaStreamFilter::IsFormatSupported.
by Alexandre Julliard 18 Nov '20

18 Nov '20

Module: wine Branch: master Commit: 16874608d6ba65029a1e72672c35e4e576a39e84 URL: https://source.winehq.org/git/wine.git/?a=commit;h=16874608d6ba65029a1e7267… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Wed Nov 18 00:48:22 2020 +0700 amstream: Implement MediaStreamFilter::IsFormatSupported. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/filter.c | 20 ++++++++++++++++++-- dlls/amstream/tests/amstream.c | 20 ++++++++++++++++++-- 2 files changed, 36 insertions(+), 4 deletions(-) diff --git a/dlls/amstream/filter.c b/dlls/amstream/filter.c index 5fd5b2afdbc..3c0436a294f 100644 --- a/dlls/amstream/filter.c +++ b/dlls/amstream/filter.c @@ -848,9 +848,25 @@ static HRESULT WINAPI filter_seeking_CheckCapabilities(IMediaSeeking *iface, DWO static HRESULT WINAPI filter_seeking_IsFormatSupported(IMediaSeeking *iface, const GUID *format) { - FIXME("iface %p, format %s, stub!\n", iface, debugstr_guid(format)); + struct filter *filter = impl_from_IMediaSeeking(iface); + IMediaSeeking *seeking; + HRESULT hr; - return E_NOTIMPL; + TRACE("filter %p, format %s.\n", filter, debugstr_guid(format)); + + EnterCriticalSection(&filter->cs); + + seeking = get_seeking(filter->seekable_stream); + + LeaveCriticalSection(&filter->cs); + + if (!seeking) + return E_NOTIMPL; + + hr = IMediaSeeking_IsFormatSupported(seeking, format); + IMediaSeeking_Release(seeking); + + return hr; } static HRESULT WINAPI filter_seeking_QueryPreferredFormat(IMediaSeeking *iface, GUID *format) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 9a4d5066714..47b92cc8a1a 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -981,6 +981,7 @@ struct testfilter HRESULT init_stream_hr; HRESULT cleanup_stream_hr; HRESULT wait_state_hr; + HRESULT is_format_supported_hr; }; static inline struct testfilter *impl_from_BaseFilter(struct strmbase_filter *iface) @@ -1168,8 +1169,12 @@ static HRESULT WINAPI testsource_seeking_CheckCapabilities(IMediaSeeking *iface, static HRESULT WINAPI testsource_seeking_IsFormatSupported(IMediaSeeking *iface, const GUID *format) { - ok(0, "Unexpected call.\n"); - return E_NOTIMPL; + struct testfilter *filter = impl_from_IMediaSeeking(iface); + + ok(IsEqualGUID(format, &TIME_FORMAT_MEDIA_TIME), + "Got format %s.\n", wine_dbgstr_guid(format)); + + return filter->is_format_supported_hr; } static HRESULT WINAPI testsource_seeking_QueryPreferredFormat(IMediaSeeking *iface, GUID *format) @@ -6409,11 +6414,22 @@ static void check_mediastreamfilter_get_stop_position(IMediaSeeking *seeking, st ok(stop == 0xdeadbeefdeadbeefULL, "Got stop position %s.\n", wine_dbgstr_longlong(stop)); } +static void check_mediastreamfilter_is_format_supported(IMediaSeeking *seeking, struct testfilter *source1, + struct testfilter *source2, struct testfilter *source3, HRESULT source2_hr, HRESULT expected_hr) +{ + HRESULT hr; + + source2->is_format_supported_hr = source2_hr; + hr = IMediaSeeking_IsFormatSupported(seeking, &TIME_FORMAT_MEDIA_TIME); + ok(hr == expected_hr, "Got hr %#x.\n", hr); +} + static void test_mediastreamfilter_seeking(void) { check_mediastreamfilter_seeking(check_mediastreamfilter_set_positions); check_mediastreamfilter_seeking(check_mediastreamfilter_get_duration); check_mediastreamfilter_seeking(check_mediastreamfilter_get_stop_position); + check_mediastreamfilter_seeking(check_mediastreamfilter_is_format_supported); } static void test_mediastreamfilter_get_current_stream_time(void)

1 0

Anton Baskanov : amstream: Implement AMMultiMediaStream::GetState.
by Alexandre Julliard 18 Nov '20

18 Nov '20

Module: wine Branch: master Commit: 23cbd7f591caef0dd74919bac4bc58dc82011363 URL: https://source.winehq.org/git/wine.git/?a=commit;h=23cbd7f591caef0dd74919ba… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Wed Nov 18 00:48:23 2020 +0700 amstream: Implement AMMultiMediaStream::GetState. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/multimedia.c | 14 +++++++---- dlls/amstream/tests/amstream.c | 53 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 4 deletions(-) diff --git a/dlls/amstream/multimedia.c b/dlls/amstream/multimedia.c index f927cd106a0..5c04c771535 100644 --- a/dlls/amstream/multimedia.c +++ b/dlls/amstream/multimedia.c @@ -42,6 +42,7 @@ struct multimedia_stream BOOL initialized; STREAM_TYPE type; OAEVENT event; + STREAM_STATE state; }; static inline struct multimedia_stream *impl_from_IAMMultiMediaStream(IAMMultiMediaStream *iface) @@ -136,13 +137,15 @@ static HRESULT WINAPI multimedia_stream_EnumMediaStreams(IAMMultiMediaStream *if return IMediaStreamFilter_EnumMediaStreams(mmstream->filter, index, stream); } -static HRESULT WINAPI multimedia_stream_GetState(IAMMultiMediaStream *iface, STREAM_STATE *pCurrentState) +static HRESULT WINAPI multimedia_stream_GetState(IAMMultiMediaStream *iface, STREAM_STATE *state) { - struct multimedia_stream *This = impl_from_IAMMultiMediaStream(iface); + struct multimedia_stream *mmstream = impl_from_IAMMultiMediaStream(iface); - FIXME("(%p/%p)->(%p) stub!\n", This, iface, pCurrentState); + TRACE("mmstream %p, state %p.\n", mmstream, state); - return E_NOTIMPL; + *state = mmstream->state; + + return S_OK; } static HRESULT WINAPI multimedia_stream_SetState(IAMMultiMediaStream *iface, STREAM_STATE new_state) @@ -165,6 +168,9 @@ static HRESULT WINAPI multimedia_stream_SetState(IAMMultiMediaStream *iface, STR else if (new_state == STREAMSTATE_STOP) hr = IMediaControl_Stop(This->media_control); + if (SUCCEEDED(hr)) + This->state = new_state; + return hr; } diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 47b92cc8a1a..b69e6070a35 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -2409,8 +2409,10 @@ static DWORD CALLBACK mmstream_set_state(void *param) static void test_set_state(void) { IAMMultiMediaStream *mmstream = create_ammultimediastream(); + IMediaControl *media_control; struct testfilter source; IGraphBuilder *graph; + STREAM_STATE state; HANDLE thread; HRESULT hr; ULONG ref; @@ -2422,6 +2424,8 @@ static void test_set_state(void) hr = IAMMultiMediaStream_GetFilterGraph(mmstream, &graph); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(graph != NULL, "Expected non-NULL graph.\n"); + hr = IGraphBuilder_QueryInterface(graph, &IID_IMediaControl, (void **)&media_control); + ok(hr == S_OK, "Got hr %#x.\n", hr); testfilter_init(&source); hr = IGraphBuilder_AddFilter(graph, &source.filter.IBaseFilter_iface, NULL); @@ -2500,8 +2504,57 @@ static void test_set_state(void) ok(hr == S_OK, "Got hr %#x.\n", hr); source.wait_state_hr = S_OK; + /* Crashes on native. */ + if (0) + { + hr = IAMMultiMediaStream_GetState(mmstream, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + } + + state = 0xdeadbeef; + hr = IAMMultiMediaStream_GetState(mmstream, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == STREAMSTATE_STOP, "Got state %#x.\n", state); + + hr = IMediaControl_Run(media_control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + state = 0xdeadbeef; + hr = IAMMultiMediaStream_GetState(mmstream, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == STREAMSTATE_STOP, "Got state %#x.\n", state); + + hr = IMediaControl_Stop(media_control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_RUN); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + state = 0xdeadbeef; + hr = IAMMultiMediaStream_GetState(mmstream, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == STREAMSTATE_RUN, "Got state %#x.\n", state); + + hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_STOP); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + state = 0xdeadbeef; + hr = IAMMultiMediaStream_GetState(mmstream, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == STREAMSTATE_STOP, "Got state %#x.\n", state); + + source.init_stream_hr = E_FAIL; + hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_RUN); + ok(hr == E_FAIL, "Got hr %#x.\n", hr); + + state = 0xdeadbeef; + hr = IAMMultiMediaStream_GetState(mmstream, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == STREAMSTATE_STOP, "Got state %#x.\n", state); + ref = IAMMultiMediaStream_Release(mmstream); ok(!ref, "Got outstanding refcount %d.\n", ref); + IMediaControl_Release(media_control); ref = IGraphBuilder_Release(graph); ok(!ref, "Got outstanding refcount %d.\n", ref); }

1 0

Anton Baskanov : amstream: Implement AMMultiMediaStream::GetTime.
by Alexandre Julliard 18 Nov '20

18 Nov '20

Module: wine Branch: master Commit: a103368917cd85795b3a49b3c8bbecdc2b20cdb1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a103368917cd85795b3a49b3… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Wed Nov 18 00:48:24 2020 +0700 amstream: Implement AMMultiMediaStream::GetTime. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/multimedia.c | 8 +++---- dlls/amstream/tests/amstream.c | 52 ++++++++++++++++++++++++++++++++++-------- 2 files changed, 46 insertions(+), 14 deletions(-) diff --git a/dlls/amstream/multimedia.c b/dlls/amstream/multimedia.c index 5c04c771535..b34634d89d2 100644 --- a/dlls/amstream/multimedia.c +++ b/dlls/amstream/multimedia.c @@ -174,13 +174,13 @@ static HRESULT WINAPI multimedia_stream_SetState(IAMMultiMediaStream *iface, STR return hr; } -static HRESULT WINAPI multimedia_stream_GetTime(IAMMultiMediaStream *iface, STREAM_TIME *pCurrentTime) +static HRESULT WINAPI multimedia_stream_GetTime(IAMMultiMediaStream *iface, STREAM_TIME *time) { - struct multimedia_stream *This = impl_from_IAMMultiMediaStream(iface); + struct multimedia_stream *stream = impl_from_IAMMultiMediaStream(iface); - FIXME("(%p/%p)->(%p) stub!\n", This, iface, pCurrentTime); + TRACE("stream %p, time %p.\n", stream, time); - return E_NOTIMPL; + return IMediaStreamFilter_GetCurrentStreamTime(stream->filter, time); } static HRESULT WINAPI multimedia_stream_GetDuration(IAMMultiMediaStream *iface, STREAM_TIME *duration) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index b69e6070a35..3027226848a 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -6487,14 +6487,27 @@ static void test_mediastreamfilter_seeking(void) static void test_mediastreamfilter_get_current_stream_time(void) { + IAMMultiMediaStream *mmstream = create_ammultimediastream(); + STREAM_TIME filter_start_time; IMediaStreamFilter *filter; + IMediaFilter *media_filter; struct testclock clock; - REFERENCE_TIME time; + IGraphBuilder *graph; + STREAM_TIME time; HRESULT hr; ULONG ref; - hr = CoCreateInstance(&CLSID_MediaStreamFilter, NULL, CLSCTX_INPROC_SERVER, - &IID_IMediaStreamFilter, (void **)&filter); + hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_READ, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_GetFilter(mmstream, &filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!!filter, "Expected non-null filter.\n"); + hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &MSPID_PrimaryAudio, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_GetFilterGraph(mmstream, &graph); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(graph != NULL, "Expected non-NULL graph.\n"); + hr = IGraphBuilder_QueryInterface(graph, &IID_IMediaFilter, (void **)&media_filter); ok(hr == S_OK, "Got hr %#x.\n", hr); testclock_init(&clock); @@ -6503,14 +6516,20 @@ static void test_mediastreamfilter_get_current_stream_time(void) { hr = IMediaStreamFilter_GetCurrentStreamTime(filter, NULL); ok(hr == E_POINTER, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_GetTime(mmstream, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); } time = 0xdeadbeefdeadbeef; hr = IMediaStreamFilter_GetCurrentStreamTime(filter, &time); ok(hr == S_FALSE, "Got hr %#x.\n", hr); ok(time == 0, "Got time %s.\n", wine_dbgstr_longlong(time)); + time = 0xdeadbeefdeadbeef; + hr = IAMMultiMediaStream_GetTime(mmstream, &time); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(time == 0, "Got time %s.\n", wine_dbgstr_longlong(time)); - hr = IMediaStreamFilter_SetSyncSource(filter, &clock.IReferenceClock_iface); + hr = IMediaFilter_SetSyncSource(media_filter, &clock.IReferenceClock_iface); ok(hr == S_OK, "Got hr %#x.\n", hr); clock.get_time_hr = E_FAIL; @@ -6519,23 +6538,36 @@ static void test_mediastreamfilter_get_current_stream_time(void) hr = IMediaStreamFilter_GetCurrentStreamTime(filter, &time); ok(hr == S_FALSE, "Got hr %#x.\n", hr); ok(time == 0, "Got time %s.\n", wine_dbgstr_longlong(time)); + time = 0xdeadbeefdeadbeef; + hr = IAMMultiMediaStream_GetTime(mmstream, &time); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(time == 0, "Got time %s.\n", wine_dbgstr_longlong(time)); - hr = IMediaStreamFilter_Run(filter, 23456789); + clock.time = 23456789; + clock.get_time_hr = S_OK; + + hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_RUN); ok(hr == S_OK, "Got hr %#x.\n", hr); - time = 0xdeadbeefdeadbeef; - hr = IMediaStreamFilter_GetCurrentStreamTime(filter, &time); + hr = IMediaStreamFilter_GetCurrentStreamTime(filter, &filter_start_time); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(time == 0xdeadbeefdd47d2da, "Got time %s.\n", wine_dbgstr_longlong(time)); clock.time = 34567890; - clock.get_time_hr = S_OK; time = 0xdeadbeefdeadbeef; hr = IMediaStreamFilter_GetCurrentStreamTime(filter, &time); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(time == 11111101, "Got time %s.\n", wine_dbgstr_longlong(time)); + ok(time == 11111101 + filter_start_time, "Got time %s.\n", wine_dbgstr_longlong(time)); + time = 0xdeadbeefdeadbeef; + hr = IAMMultiMediaStream_GetTime(mmstream, &time); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(time == 11111101 + filter_start_time, "Got time %s.\n", wine_dbgstr_longlong(time)); + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IMediaFilter_Release(media_filter); + ref = IGraphBuilder_Release(graph); + ok(!ref, "Got outstanding refcount %d.\n", ref); ref = IMediaStreamFilter_Release(filter); ok(!ref, "Got outstanding refcount %d.\n", ref); }

1 0

Zebediah Figura : quartz: Commit the allocator directly.
by Alexandre Julliard 18 Nov '20

18 Nov '20

Module: wine Branch: master Commit: 9685f12d7cbe83104bfb19162b39d60e7c307f48 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9685f12d7cbe83104bfb1916… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Nov 17 16:30:54 2020 -0600 quartz: Commit the allocator directly. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/acmwrapper.c | 7 +++++-- dlls/quartz/avidec.c | 9 +++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index 6df04595bb5..23ad235327a 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -500,8 +500,10 @@ static void acm_wrapper_destroy(struct strmbase_filter *iface) static HRESULT acm_wrapper_init_stream(struct strmbase_filter *iface) { struct acm_wrapper *filter = impl_from_strmbase_filter(iface); + HRESULT hr; - BaseOutputPinImpl_Active(&filter->source); + if (filter->source.pin.peer && FAILED(hr = IMemAllocator_Commit(filter->source.pAllocator))) + ERR("Failed to commit allocator, hr %#x.\n", hr); return S_OK; } @@ -509,7 +511,8 @@ static HRESULT acm_wrapper_cleanup_stream(struct strmbase_filter *iface) { struct acm_wrapper *filter = impl_from_strmbase_filter(iface); - BaseOutputPinImpl_Inactive(&filter->source); + if (filter->source.pin.peer) + IMemAllocator_Decommit(filter->source.pAllocator); return S_OK; } diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index ada3a1c7e62..ef232673e56 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -564,6 +564,7 @@ static HRESULT avi_decompressor_init_stream(struct strmbase_filter *iface) struct avi_decompressor *filter = impl_from_strmbase_filter(iface); VIDEOINFOHEADER *source_format; LRESULT res; + HRESULT hr; filter->late = -1; @@ -574,7 +575,9 @@ static HRESULT avi_decompressor_init_stream(struct strmbase_filter *iface) return E_FAIL; } - BaseOutputPinImpl_Active(&filter->source); + if (filter->source.pin.peer && FAILED(hr = IMemAllocator_Commit(filter->source.pAllocator))) + ERR("Failed to commit allocator, hr %#x.\n", hr); + return S_OK; } @@ -589,7 +592,9 @@ static HRESULT avi_decompressor_cleanup_stream(struct strmbase_filter *iface) return E_FAIL; } - BaseOutputPinImpl_Inactive(&filter->source); + if (filter->source.pin.peer) + IMemAllocator_Decommit(filter->source.pAllocator); + return S_OK; }

1 0

Zebediah Figura : amstream/tests: Commit the allocator directly.
by Alexandre Julliard 18 Nov '20

18 Nov '20

Module: wine Branch: master Commit: 6e6d73b8187a548046cb9c3346a075e4e4ad6836 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e6d73b8187a548046cb9c33… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Nov 17 16:30:55 2020 -0600 amstream/tests: Commit the allocator directly. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/tests/amstream.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 3027226848a..279b040339c 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -1008,9 +1008,13 @@ static void testfilter_destroy(struct strmbase_filter *iface) static HRESULT testfilter_init_stream(struct strmbase_filter *iface) { struct testfilter *filter = impl_from_BaseFilter(iface); + HRESULT hr; - if (SUCCEEDED(filter->init_stream_hr)) - BaseOutputPinImpl_Active(&filter->source); + if (SUCCEEDED(filter->init_stream_hr) && filter->source.pin.peer) + { + hr = IMemAllocator_Commit(filter->source.pAllocator); + ok(hr == S_OK, "Got hr %#x.\n", hr); + } return filter->init_stream_hr; } @@ -1018,9 +1022,13 @@ static HRESULT testfilter_init_stream(struct strmbase_filter *iface) static HRESULT testfilter_cleanup_stream(struct strmbase_filter *iface) { struct testfilter *filter = impl_from_BaseFilter(iface); + HRESULT hr; - if (SUCCEEDED(filter->cleanup_stream_hr)) - BaseOutputPinImpl_Inactive(&filter->source); + if (SUCCEEDED(filter->cleanup_stream_hr) && filter->source.pin.peer) + { + hr = IMemAllocator_Decommit(filter->source.pAllocator); + ok(hr == S_OK, "Got hr %#x.\n", hr); + } return filter->cleanup_stream_hr; }

1 0

Zebediah Figura : strmbase: Remove no longer used allocator commit helpers.
by Alexandre Julliard 18 Nov '20

18 Nov '20

Module: wine Branch: master Commit: 35cfa11ccd62d1516bef32070933ada9069293a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=35cfa11ccd62d1516bef3207… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Nov 17 16:30:56 2020 -0600 strmbase: Remove no longer used allocator commit helpers. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/pin.c | 40 ---------------------------------------- include/wine/strmbase.h | 2 -- 2 files changed, 42 deletions(-) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index e5017c2ff98..406fba4165d 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -702,46 +702,6 @@ HRESULT WINAPI BaseOutputPinImpl_GetDeliveryBuffer(struct strmbase_source *This, return hr; } -/* replaces OutputPin_CommitAllocator */ -HRESULT WINAPI BaseOutputPinImpl_Active(struct strmbase_source *This) -{ - HRESULT hr; - - TRACE("(%p)->()\n", This); - - EnterCriticalSection(&This->pin.filter->csFilter); - { - if (!This->pin.peer || !This->pMemInputPin) - hr = VFW_E_NOT_CONNECTED; - else - hr = IMemAllocator_Commit(This->pAllocator); - } - LeaveCriticalSection(&This->pin.filter->csFilter); - - TRACE("--> %08x\n", hr); - return hr; -} - -/* replaces OutputPin_DecommitAllocator */ -HRESULT WINAPI BaseOutputPinImpl_Inactive(struct strmbase_source *This) -{ - HRESULT hr; - - TRACE("(%p)->()\n", This); - - EnterCriticalSection(&This->pin.filter->csFilter); - { - if (!This->pin.peer || !This->pMemInputPin) - hr = VFW_E_NOT_CONNECTED; - else - hr = IMemAllocator_Decommit(This->pAllocator); - } - LeaveCriticalSection(&This->pin.filter->csFilter); - - TRACE("--> %08x\n", hr); - return hr; -} - HRESULT WINAPI BaseOutputPinImpl_InitAllocator(struct strmbase_source *This, IMemAllocator **pMemAlloc) { return CoCreateInstance(&CLSID_MemoryAllocator, NULL, CLSCTX_INPROC_SERVER, &IID_IMemAllocator, (LPVOID*)pMemAlloc); diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 24bb97702b5..39c556193ac 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -110,8 +110,6 @@ HRESULT strmbase_pin_get_media_type(struct strmbase_pin *pin, unsigned int index HRESULT WINAPI BaseOutputPinImpl_GetDeliveryBuffer(struct strmbase_source *pin, IMediaSample **sample, REFERENCE_TIME *start, REFERENCE_TIME *stop, DWORD flags); -HRESULT WINAPI BaseOutputPinImpl_Active(struct strmbase_source *pin); -HRESULT WINAPI BaseOutputPinImpl_Inactive(struct strmbase_source *pin); HRESULT WINAPI BaseOutputPinImpl_InitAllocator(struct strmbase_source *pin, IMemAllocator **allocator); HRESULT WINAPI BaseOutputPinImpl_DecideAllocator(struct strmbase_source *pin, IMemInputPin *peer, IMemAllocator **allocator); HRESULT WINAPI BaseOutputPinImpl_AttemptConnection(struct strmbase_source *pin, IPin *peer, const AM_MEDIA_TYPE *mt);

1 0

Zebediah Figura : strmbase: Get rid of strmbase_pin_get_media_type().
by Alexandre Julliard 18 Nov '20

18 Nov '20

Module: wine Branch: master Commit: 4fe604a2baba629c980ac27b52cca904ff895cba URL: https://source.winehq.org/git/wine.git/?a=commit;h=4fe604a2baba629c980ac27b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Nov 17 16:30:57 2020 -0600 strmbase: Get rid of strmbase_pin_get_media_type(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/avico.c | 1 - dlls/qcap/avimux.c | 1 - dlls/quartz/acmwrapper.c | 1 - dlls/quartz/avidec.c | 1 - dlls/quartz/dsoundrender.c | 1 - dlls/strmbase/pin.c | 5 ----- include/wine/strmbase.h | 2 -- 7 files changed, 12 deletions(-) diff --git a/dlls/qcap/avico.c b/dlls/qcap/avico.c index 7b3c1ea3697..01a43c9577d 100644 --- a/dlls/qcap/avico.c +++ b/dlls/qcap/avico.c @@ -410,7 +410,6 @@ static void sink_disconnect(struct strmbase_sink *iface) static const struct strmbase_sink_ops sink_ops = { .base.pin_query_accept = sink_query_accept, - .base.pin_get_media_type = strmbase_pin_get_media_type, .base.pin_query_interface = sink_query_interface, .pfnReceive = AVICompressorIn_Receive, .sink_connect = sink_connect, diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index 3f4d0f2cd6e..7ae2d673676 100644 --- a/dlls/qcap/avimux.c +++ b/dlls/qcap/avimux.c @@ -1475,7 +1475,6 @@ static const struct strmbase_sink_ops sink_ops = { .base.pin_query_interface = sink_query_interface, .base.pin_query_accept = sink_query_accept, - .base.pin_get_media_type = strmbase_pin_get_media_type, .pfnReceive = AviMuxIn_Receive, .sink_connect = avi_mux_sink_connect, .sink_disconnect = avi_mux_sink_disconnect, diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index 23ad235327a..ada8c474640 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -324,7 +324,6 @@ static const struct strmbase_sink_ops sink_ops = { .base.pin_query_interface = acm_wrapper_sink_query_interface, .base.pin_query_accept = acm_wrapper_sink_query_accept, - .base.pin_get_media_type = strmbase_pin_get_media_type, .pfnReceive = acm_wrapper_sink_Receive, .sink_connect = acm_wrapper_sink_connect, .sink_disconnect = acm_wrapper_sink_disconnect, diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index ef232673e56..72f69ef7c5a 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -287,7 +287,6 @@ static const struct strmbase_sink_ops sink_ops = { .base.pin_query_interface = avi_decompressor_sink_query_interface, .base.pin_query_accept = avi_decompressor_sink_query_accept, - .base.pin_get_media_type = strmbase_pin_get_media_type, .pfnReceive = avi_decompressor_sink_Receive, .sink_connect = avi_decompressor_sink_connect, .sink_disconnect = avi_decompressor_sink_disconnect, diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 8b914751e15..1c6b28512b0 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -542,7 +542,6 @@ static const struct strmbase_sink_ops sink_ops = { .base.pin_query_interface = dsound_render_sink_query_interface, .base.pin_query_accept = dsound_render_sink_query_accept, - .base.pin_get_media_type = strmbase_pin_get_media_type, .pfnReceive = dsound_render_sink_Receive, .sink_connect = dsound_render_sink_connect, .sink_disconnect = dsound_render_sink_disconnect, diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index 406fba4165d..c08f04730e7 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -265,11 +265,6 @@ static HRESULT SendFurther(struct strmbase_sink *sink, SendPinFunc func, void *a return hr; } -HRESULT strmbase_pin_get_media_type(struct strmbase_pin *iface, unsigned int index, AM_MEDIA_TYPE *mt) -{ - return VFW_S_NO_MORE_ITEMS; -} - static HRESULT WINAPI pin_QueryInterface(IPin *iface, REFIID iid, void **out) { struct strmbase_pin *pin = impl_from_IPin(iface); diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 39c556193ac..5bd181746a1 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -106,8 +106,6 @@ struct strmbase_sink_ops }; /* Base Pin */ -HRESULT strmbase_pin_get_media_type(struct strmbase_pin *pin, unsigned int index, AM_MEDIA_TYPE *mt); - HRESULT WINAPI BaseOutputPinImpl_GetDeliveryBuffer(struct strmbase_source *pin, IMediaSample **sample, REFERENCE_TIME *start, REFERENCE_TIME *stop, DWORD flags); HRESULT WINAPI BaseOutputPinImpl_InitAllocator(struct strmbase_source *pin, IMemAllocator **allocator);

1 0