wine-commits September 2019

wine-commits@winehq.org

2 participants
629 discussions

Akihiro Sagawa : msvcrt: Reimplement _mbsspnp using _mbsspn.
by Alexandre Julliard 02 Sep '19

02 Sep '19

Module: wine Branch: master Commit: ab525d3f6f813e23af8164ed2d6023f3eeb3e018 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab525d3f6f813e23af8164ed… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Sep 2 19:50:29 2019 +0200 msvcrt: Reimplement _mbsspnp using _mbsspn. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47693 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/mbcs.c | 47 +++++++++++++++------------------------------- dlls/msvcrt/tests/string.c | 4 ++-- 2 files changed, 17 insertions(+), 34 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index cc2a9f2..6f965f5 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -2028,19 +2028,26 @@ int CDECL _mbsupr_s(unsigned char* s, MSVCRT_size_t len) MSVCRT_size_t CDECL _mbsspn(const unsigned char* string, const unsigned char* set) { const unsigned char *p, *q; - unsigned int pc, qc; for (p = string; *p; p++) { - pc = _mbsnextc(p); for (q = set; *q; q++) { - qc = _mbsnextc(q); - if (pc == qc) break; - if (qc > 255 && q[1]) q++; + if (_ismbblead(*q)) + { + if (p[0] == q[0] && p[1] == q[1]) + { + p++; + break; + } + q++; + } + else + { + if (p[0] == q[0]) break; + } } if (!*q) break; - if (pc > 255 && p[1]) p++; } return p - string; } @@ -2050,32 +2057,8 @@ MSVCRT_size_t CDECL _mbsspn(const unsigned char* string, const unsigned char* se */ unsigned char* CDECL _mbsspnp(const unsigned char* string, const unsigned char* set) { - const unsigned char *p, *q; - - for (p = string; *p; p++) - { - if (_ismbblead(*p)) - { - for (q = set; *q; q += 2) - { - if (!q[1]) - break; - if ((*p == *q) && (p[1] == q[1])) - break; - } - if (!q[0] || !q[1]) break; - } - else - { - for (q = set; *q; q++) - if (*p == *q) - break; - if (!*q) break; - } - } - if (*p == '\0') - return NULL; - return (unsigned char *)p; + string += _mbsspn( string, set ); + return *string ? (unsigned char*)string : NULL; } /********************************************************************* diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index ed459bc..b937f17 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -565,13 +565,13 @@ static void test_mbsspnp( void) _setmbcp( 932); ret=_mbsspnp( mbstr, mbset1); - todo_wine ok( ret==mbstr+8, "_mbsspnp returns %p should be %p\n", ret, mbstr+8); + ok( ret==mbstr+8, "_mbsspnp returns %p should be %p\n", ret, mbstr+8); ret=_mbsspnp( mbstr, mbset2); ok( ret==mbstr+1, "_mbsspnp returns %p should be %p\n", ret, mbstr+1); ret=_mbsspnp( mbstr+8, mbset1); ok( ret==mbstr+8, "_mbsspnp returns %p should be %p\n", ret, mbstr+8); ret=_mbsspnp( mbstr+8, mbset2); - todo_wine ok( ret==mbstr+10, "_mbsspnp returns %p should be %p\n", ret, mbstr+10); + ok( ret==mbstr+10, "_mbsspnp returns %p should be %p\n", ret, mbstr+10); _setmbcp( cp); }

1 0

Akihiro Sagawa : msvcrt: Fix _mbsspn implementation.
by Alexandre Julliard 02 Sep '19

02 Sep '19

Module: wine Branch: master Commit: f0f93c791f2bf79a2ea750f89dcd168bb20e529f URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0f93c791f2bf79a2ea750f8… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Sep 2 19:50:24 2019 +0200 msvcrt: Fix _mbsspn implementation. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/mbcs.c | 24 ++++++++---------------- dlls/msvcrt/tests/string.c | 4 ++-- 2 files changed, 10 insertions(+), 18 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 95b4f2b..cc2a9f2 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -2028,27 +2028,19 @@ int CDECL _mbsupr_s(unsigned char* s, MSVCRT_size_t len) MSVCRT_size_t CDECL _mbsspn(const unsigned char* string, const unsigned char* set) { const unsigned char *p, *q; + unsigned int pc, qc; for (p = string; *p; p++) { - if (_ismbblead(*p)) - { - for (q = set; *q; q += 2) - { - if (!q[1]) - break; - if ((*p == *q) && (p[1] == q[1])) - break; - } - if (!q[0] || !q[1]) break; - } - else + pc = _mbsnextc(p); + for (q = set; *q; q++) { - for (q = set; *q; q++) - if (*p == *q) - break; - if (!*q) break; + qc = _mbsnextc(q); + if (pc == qc) break; + if (qc > 255 && q[1]) q++; } + if (!*q) break; + if (pc > 255 && p[1]) p++; } return p - string; } diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 1b0a52b..ed459bc 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -530,13 +530,13 @@ static void test_mbsspn( void) _setmbcp( 932); ret=_mbsspn( mbstr, mbset1); - todo_wine ok( ret==8, "_mbsspn returns %d should be 8\n", ret); + ok( ret==8, "_mbsspn returns %d should be 8\n", ret); ret=_mbsspn( mbstr, mbset2); ok( ret==1, "_mbsspn returns %d should be 1\n", ret); ret=_mbsspn( mbstr+8, mbset1); ok( ret==0, "_mbsspn returns %d should be 0\n", ret); ret=_mbsspn( mbstr+8, mbset2); - todo_wine ok( ret==2, "_mbsspn returns %d should be 2\n", ret); + ok( ret==2, "_mbsspn returns %d should be 2\n", ret); _setmbcp( cp); }

1 0

Akihiro Sagawa : msvcrt/tests: Add more tests for _mbsspn and _mbsspnp.
by Alexandre Julliard 02 Sep '19

02 Sep '19

Module: wine Branch: master Commit: c62c51c04ae22f1d9d85f76caf200c625c2e2ad0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c62c51c04ae22f1d9d85f76c… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Sep 2 19:50:19 2019 +0200 msvcrt/tests: Add more tests for _mbsspn and _mbsspnp. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/string.c | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 53e76f1..1b0a52b 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -516,13 +516,29 @@ static void test_mbsspn( void) unsigned char str2[]="shiraz"; unsigned char set[]="abc"; unsigned char empty[]=""; - int ret; + unsigned char mbstr[]=" 2019\x94\x4e" "6\x8c\x8e" "29\x93\xfa"; + unsigned char mbset1[]="0123456789 \x94\x4e"; + unsigned char mbset2[]=" \x94\x4e\x8c\x8e"; + int ret, cp = _getmbcp(); + ret=_mbsspn( str1, set); ok( ret==3, "_mbsspn returns %d should be 3\n", ret); ret=_mbsspn( str2, set); ok( ret==0, "_mbsspn returns %d should be 0\n", ret); ret=_mbsspn( str1, empty); ok( ret==0, "_mbsspn returns %d should be 0\n", ret); + + _setmbcp( 932); + ret=_mbsspn( mbstr, mbset1); + todo_wine ok( ret==8, "_mbsspn returns %d should be 8\n", ret); + ret=_mbsspn( mbstr, mbset2); + ok( ret==1, "_mbsspn returns %d should be 1\n", ret); + ret=_mbsspn( mbstr+8, mbset1); + ok( ret==0, "_mbsspn returns %d should be 0\n", ret); + ret=_mbsspn( mbstr+8, mbset2); + todo_wine ok( ret==2, "_mbsspn returns %d should be 2\n", ret); + + _setmbcp( cp); } static void test_mbsspnp( void) @@ -532,7 +548,12 @@ static void test_mbsspnp( void) unsigned char set[]="abc"; unsigned char empty[]=""; unsigned char full[]="abcenrt"; + unsigned char mbstr[]=" 2019\x94\x4e" "6\x8c\x8e" "29\x93\xfa"; + unsigned char mbset1[]="0123456789 \x94\x4e"; + unsigned char mbset2[]=" \x94\x4e\x8c\x8e"; unsigned char* ret; + int cp = _getmbcp(); + ret=_mbsspnp( str1, set); ok( ret[0]=='e', "_mbsspnp returns %c should be e\n", ret[0]); ret=_mbsspnp( str2, set); @@ -541,6 +562,18 @@ static void test_mbsspnp( void) ok( ret[0]=='c', "_mbsspnp returns %c should be c\n", ret[0]); ret=_mbsspnp( str1, full); ok( ret==NULL, "_mbsspnp returns %p should be NULL\n", ret); + + _setmbcp( 932); + ret=_mbsspnp( mbstr, mbset1); + todo_wine ok( ret==mbstr+8, "_mbsspnp returns %p should be %p\n", ret, mbstr+8); + ret=_mbsspnp( mbstr, mbset2); + ok( ret==mbstr+1, "_mbsspnp returns %p should be %p\n", ret, mbstr+1); + ret=_mbsspnp( mbstr+8, mbset1); + ok( ret==mbstr+8, "_mbsspnp returns %p should be %p\n", ret, mbstr+8); + ret=_mbsspnp( mbstr+8, mbset2); + todo_wine ok( ret==mbstr+10, "_mbsspnp returns %p should be %p\n", ret, mbstr+10); + + _setmbcp( cp); } static void test_strdup(void)

1 0

Akihiro Sagawa : msvcrt/tests: Restore the multibyte codepage after the tests.
by Alexandre Julliard 02 Sep '19

02 Sep '19

Module: wine Branch: master Commit: 996cb72c8e654d2421fcdc7ca70651f68d2f7db5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=996cb72c8e654d2421fcdc7c… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Sep 2 19:50:12 2019 +0200 msvcrt/tests: Restore the multibyte codepage after the tests. N.B. _setmbcp() doesn't return the previous codepage. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/string.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 59f9e1d..53e76f1 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -2707,7 +2707,7 @@ static void test__ultoa_s(void) static void test_wctob(void) { - int ret; + int ret, cp = _getmbcp(); if(!p_wctob || !setlocale(LC_ALL, "chinese-traditional")) { win_skip("Skipping wctob tests\n"); @@ -2739,7 +2739,10 @@ static void test_wctob(void) ret = p_wctob(0xe0); ok(ret == (int)(char)0xe0, "ret = %x\n", ret); + + _setmbcp(cp); } + static void test_wctomb(void) { mbstate_t state; @@ -3337,7 +3340,7 @@ static void test__mbscmp(void) static void test__ismbclx(void) { - int cp, ret; + int ret, cp = _getmbcp(); ret = _ismbcl0(0); ok(!ret, "got %d\n", ret); @@ -3348,7 +3351,7 @@ static void test__ismbclx(void) ret = _ismbcl2(0); ok(!ret, "got %d\n", ret); - cp = _setmbcp(1252); + _setmbcp(1252); ret = _ismbcl0(0x8140); ok(!ret, "got %d\n", ret);

1 0

Zebediah Figura : amstream/tests: Add some tests for IEnumMediaTypes.
by Alexandre Julliard 02 Sep '19

02 Sep '19

Module: wine Branch: master Commit: be8111f627772aab206f6478b186f7bb3e30eae1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be8111f627772aab206f6478… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Sep 1 19:48:08 2019 -0500 amstream/tests: Add some tests for IEnumMediaTypes. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/tests/amstream.c | 132 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 132 insertions(+) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 24c48ec..000bb40 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -1649,6 +1649,137 @@ static void test_initialize(void) IUnknown_Release(graph_inner_unk); } +static void test_enum_media_types(void) +{ + IAMMultiMediaStream *mmstream = create_ammultimediastream(); + IEnumMediaTypes *enum1, *enum2; + AM_MEDIA_TYPE *mts[2]; + IMediaStream *stream; + ULONG ref, count; + HRESULT hr; + IPin *pin; + + /* FIXME: This call should not be necessary. */ + hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_READ, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &MSPID_PrimaryVideo, 0, &stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaStream_QueryInterface(stream, &IID_IPin, (void **)&pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_EnumMediaTypes(pin, &enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enum1, 1, mts, NULL); + todo_wine ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enum1, 0, mts, &count); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!count, "Got count %u.\n", count); + + hr = IEnumMediaTypes_Next(enum1, 1, mts, &count); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(count == 1, "Got count %u.\n", count); + CoTaskMemFree(mts[0]); + + hr = IEnumMediaTypes_Next(enum1, 1, mts, &count); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + todo_wine ok(!count, "Got count %u.\n", count); + + hr = IEnumMediaTypes_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enum1, 2, mts, &count); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + todo_wine ok(count == 1, "Got count %u.\n", count); + CoTaskMemFree(mts[0]); + + hr = IEnumMediaTypes_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Clone(enum1, &enum2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Skip(enum1, 2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enum1, 1, mts, &count); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + todo_wine ok(!count, "Got count %u.\n", count); + + hr = IEnumMediaTypes_Next(enum2, 1, mts, &count); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(count == 1, "Got count %u.\n", count); + CoTaskMemFree(mts[0]); + + IEnumMediaTypes_Release(enum2); + IEnumMediaTypes_Release(enum1); + IPin_Release(pin); + IMediaStream_Release(stream); + + hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &MSPID_PrimaryAudio, 0, &stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaStream_QueryInterface(stream, &IID_IPin, (void **)&pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_EnumMediaTypes(pin, &enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enum1, 1, mts, NULL); + todo_wine ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enum1, 0, mts, &count); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!count, "Got count %u.\n", count); + + hr = IEnumMediaTypes_Next(enum1, 1, mts, &count); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(count == 1, "Got count %u.\n", count); + if (hr == S_OK) CoTaskMemFree(mts[0]->pbFormat); + if (hr == S_OK) CoTaskMemFree(mts[0]); + + hr = IEnumMediaTypes_Next(enum1, 1, mts, &count); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(!count, "Got count %u.\n", count); + + hr = IEnumMediaTypes_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enum1, 2, mts, &count); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(count == 1, "Got count %u.\n", count); + CoTaskMemFree(mts[0]->pbFormat); + CoTaskMemFree(mts[0]); + + hr = IEnumMediaTypes_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Clone(enum1, &enum2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Skip(enum1, 2); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enum1, 1, mts, &count); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(!count, "Got count %u.\n", count); + + hr = IEnumMediaTypes_Next(enum2, 1, mts, &count); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(count == 1, "Got count %u.\n", count); + CoTaskMemFree(mts[0]->pbFormat); + CoTaskMemFree(mts[0]); + + IEnumMediaTypes_Release(enum2); + IEnumMediaTypes_Release(enum1); + IPin_Release(pin); + IMediaStream_Release(stream); + + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + static void test_IDirectDrawStreamSample(void) { DDSURFACEDESC desc = { sizeof(desc) }; @@ -2026,6 +2157,7 @@ START_TEST(amstream) test_find_pin(); test_pin_info(); test_initialize(); + test_enum_media_types(); test_IDirectDrawStreamSample(); file = CreateFileW(filenameW, 0, 0, NULL, OPEN_EXISTING, 0, NULL);

1 0

Zebediah Figura : amstream: Don' t keep track of streams in the multimedia stream object.
by Alexandre Julliard 02 Sep '19

02 Sep '19

Module: wine Branch: master Commit: d15c23b30a680aa03c8ab6be62623178408cfb6e URL: https://source.winehq.org/git/wine.git/?a=commit;h=d15c23b30a680aa03c8ab6be… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Sep 1 19:48:07 2019 -0500 amstream: Don't keep track of streams in the multimedia stream object. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/multimedia.c | 33 +++++++-------------------------- dlls/amstream/tests/amstream.c | 4 ++-- 2 files changed, 9 insertions(+), 28 deletions(-) diff --git a/dlls/amstream/multimedia.c b/dlls/amstream/multimedia.c index 1449c45..55c1328 100644 --- a/dlls/amstream/multimedia.c +++ b/dlls/amstream/multimedia.c @@ -39,8 +39,6 @@ struct multimedia_stream IMediaControl* media_control; IMediaStreamFilter *filter; IPin* ipin; - ULONG nbStreams; - IAMMediaStream **pStreams; STREAM_TYPE StreamType; OAEVENT event; }; @@ -85,15 +83,11 @@ static ULONG WINAPI multimedia_stream_Release(IAMMultiMediaStream *iface) { struct multimedia_stream *This = impl_from_IAMMultiMediaStream(iface); ULONG ref = InterlockedDecrement(&This->ref); - ULONG i; TRACE("(%p/%p)\n", iface, This); if (!ref) { - for(i = 0; i < This->nbStreams; i++) - IAMMediaStream_Release(This->pStreams[i]); - CoTaskMemFree(This->pStreams); if (This->ipin) IPin_Release(This->ipin); IMediaStreamFilter_Release(This->filter); @@ -291,14 +285,14 @@ static HRESULT WINAPI multimedia_stream_GetFilter(IAMMultiMediaStream *iface, } static HRESULT WINAPI multimedia_stream_AddMediaStream(IAMMultiMediaStream *iface, - IUnknown *stream_object, const MSPID *PurposeId, DWORD dwFlags, IMediaStream **ppNewStream) + IUnknown *stream_object, const MSPID *PurposeId, DWORD dwFlags, IMediaStream **ret_stream) { struct multimedia_stream *This = impl_from_IAMMultiMediaStream(iface); HRESULT hr; IAMMediaStream* pStream; - IAMMediaStream** pNewStreams; - TRACE("(%p/%p)->(%p,%s,%x,%p)\n", This, iface, stream_object, debugstr_guid(PurposeId), dwFlags, ppNewStream); + TRACE("mmstream %p, stream_object %p, id %s, flags %#x, ret_stream %p.\n", + This, stream_object, debugstr_guid(PurposeId), dwFlags, ret_stream); if (!IsEqualGUID(PurposeId, &MSPID_PrimaryVideo) && !IsEqualGUID(PurposeId, &MSPID_PrimaryAudio)) return MS_E_PURPOSEID; @@ -331,28 +325,15 @@ static HRESULT WINAPI multimedia_stream_AddMediaStream(IAMMultiMediaStream *ifac hr = ddrawmediastream_create((IMultiMediaStream*)iface, PurposeId, stream_object, This->StreamType, &pStream); else hr = audiomediastream_create((IMultiMediaStream*)iface, PurposeId, stream_object, This->StreamType, &pStream); - if (SUCCEEDED(hr)) - { - pNewStreams = CoTaskMemRealloc(This->pStreams, (This->nbStreams+1) * sizeof(IAMMediaStream*)); - if (!pNewStreams) - { - IAMMediaStream_Release(pStream); - return E_OUTOFMEMORY; - } - This->pStreams = pNewStreams; - This->pStreams[This->nbStreams] = pStream; - This->nbStreams++; - - if (ppNewStream) - { - IMediaStream_AddRef(*ppNewStream = (IMediaStream*)pStream); - } - } if (SUCCEEDED(hr)) { /* Add stream to the media stream filter */ IMediaStreamFilter_AddMediaStream(This->filter, pStream); + if (ret_stream) + *ret_stream = (IMediaStream *)pStream; + else + IAMMediaStream_Release(pStream); } return hr; diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index b83e7bc..24c48ec 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -1152,7 +1152,7 @@ static void test_enum_pins(void) ref = get_refcount(enum1); ok(ref == 1, "Got unexpected refcount %d.\n", ref); ref = get_refcount(pin); - todo_wine ok(ref == 4, "Got unexpected refcount %d.\n", ref); + ok(ref == 4, "Got unexpected refcount %d.\n", ref); hr = IEnumPins_Next(enum1, 1, pins, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -1162,7 +1162,7 @@ static void test_enum_pins(void) ref = get_refcount(enum1); ok(ref == 1, "Got unexpected refcount %d.\n", ref); ref = get_refcount(pin); - todo_wine ok(ref == 5, "Got unexpected refcount %d.\n", ref); + ok(ref == 5, "Got unexpected refcount %d.\n", ref); IPin_Release(pins[0]); hr = IEnumPins_Next(enum1, 1, pins, NULL);

1 0

Zebediah Figura : amstream: Forward IMultiMediaStream::GetMediaStream() to the stream filter.
by Alexandre Julliard 02 Sep '19

02 Sep '19

Module: wine Branch: master Commit: 6d6ea5dc7db57c1b458aeb71804d7bea10c1b6ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d6ea5dc7db57c1b458aeb71… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Sep 1 19:48:06 2019 -0500 amstream: Forward IMultiMediaStream::GetMediaStream() to the stream filter. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/multimedia.c | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/dlls/amstream/multimedia.c b/dlls/amstream/multimedia.c index 7b0b6ae..1449c45 100644 --- a/dlls/amstream/multimedia.c +++ b/dlls/amstream/multimedia.c @@ -121,26 +121,13 @@ static HRESULT WINAPI multimedia_stream_GetInformation(IAMMultiMediaStream *ifac } static HRESULT WINAPI multimedia_stream_GetMediaStream(IAMMultiMediaStream *iface, - REFMSPID idPurpose, IMediaStream **ppMediaStream) + REFMSPID id, IMediaStream **stream) { - struct multimedia_stream *This = impl_from_IAMMultiMediaStream(iface); - MSPID PurposeId; - unsigned int i; - - TRACE("(%p/%p)->(%s,%p)\n", This, iface, debugstr_guid(idPurpose), ppMediaStream); + struct multimedia_stream *mmstream = impl_from_IAMMultiMediaStream(iface); - for (i = 0; i < This->nbStreams; i++) - { - IAMMediaStream_GetInformation(This->pStreams[i], &PurposeId, NULL); - if (IsEqualIID(&PurposeId, idPurpose)) - { - *ppMediaStream = (IMediaStream*)This->pStreams[i]; - IMediaStream_AddRef(*ppMediaStream); - return S_OK; - } - } + TRACE("mmstream %p, id %s, stream %p.\n", mmstream, debugstr_guid(id), stream); - return MS_E_NOSTREAM; + return IMediaStreamFilter_GetMediaStream(mmstream->filter, id, stream); } static HRESULT WINAPI multimedia_stream_EnumMediaStreams(IAMMultiMediaStream *iface,

1 0

Zebediah Figura : amstream: Move multimedia_stream_create() to avoid forward declarations.
by Alexandre Julliard 02 Sep '19

02 Sep '19

Module: wine Branch: master Commit: 6c55e734bda42ed6264a52af7212b7d7dde4a2d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c55e734bda42ed6264a52af… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Sep 1 19:48:05 2019 -0500 amstream: Move multimedia_stream_create() to avoid forward declarations. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/multimedia.c | 59 ++++++++++++++++++++++------------------------ 1 file changed, 28 insertions(+), 31 deletions(-) diff --git a/dlls/amstream/multimedia.c b/dlls/amstream/multimedia.c index 7f0fb34..7b0b6ae 100644 --- a/dlls/amstream/multimedia.c +++ b/dlls/amstream/multimedia.c @@ -50,37 +50,6 @@ static inline struct multimedia_stream *impl_from_IAMMultiMediaStream(IAMMultiMe return CONTAINING_RECORD(iface, struct multimedia_stream, IAMMultiMediaStream_iface); } -static const struct IAMMultiMediaStreamVtbl multimedia_stream_vtbl; - -HRESULT multimedia_stream_create(IUnknown *pUnkOuter, LPVOID *ppObj) -{ - struct multimedia_stream *object; - HRESULT hr; - - TRACE("(%p,%p)\n", pUnkOuter, ppObj); - - if( pUnkOuter ) - return CLASS_E_NOAGGREGATION; - - if (!(object = heap_alloc_zero(sizeof(*object)))) - return E_OUTOFMEMORY; - - object->IAMMultiMediaStream_iface.lpVtbl = &multimedia_stream_vtbl; - object->ref = 1; - - if (FAILED(hr = CoCreateInstance(&CLSID_MediaStreamFilter, NULL, - CLSCTX_INPROC_SERVER, &IID_IMediaStreamFilter, (void **)&object->filter))) - { - ERR("Failed to create stream filter, hr %#x.\n", hr); - heap_free(object); - return hr; - } - - *ppObj = &object->IAMMultiMediaStream_iface; - - return S_OK; -} - /*** IUnknown methods ***/ static HRESULT WINAPI multimedia_stream_QueryInterface(IAMMultiMediaStream *iface, REFIID riid, void **ppvObject) @@ -492,3 +461,31 @@ static const IAMMultiMediaStreamVtbl multimedia_stream_vtbl = multimedia_stream_OpenMoniker, multimedia_stream_Render }; + +HRESULT multimedia_stream_create(IUnknown *outer, void **out) +{ + struct multimedia_stream *object; + HRESULT hr; + + if (outer) + return CLASS_E_NOAGGREGATION; + + if (!(object = heap_alloc_zero(sizeof(*object)))) + return E_OUTOFMEMORY; + + object->IAMMultiMediaStream_iface.lpVtbl = &multimedia_stream_vtbl; + object->ref = 1; + + if (FAILED(hr = CoCreateInstance(&CLSID_MediaStreamFilter, NULL, + CLSCTX_INPROC_SERVER, &IID_IMediaStreamFilter, (void **)&object->filter))) + { + ERR("Failed to create stream filter, hr %#x.\n", hr); + heap_free(object); + return hr; + } + + TRACE("Created multimedia stream %p.\n", object); + *out = &object->IAMMultiMediaStream_iface; + + return S_OK; +}

1 0

Zebediah Figura : amstream: Use shorter method names for the multimedia stream.
by Alexandre Julliard 02 Sep '19

02 Sep '19

Module: wine Branch: master Commit: 0d7d1ba210e14ef4727a74fed13deb0e7e1a5d9a URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d7d1ba210e14ef4727a74fe… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Sep 1 19:48:04 2019 -0500 amstream: Use shorter method names for the multimedia stream. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/amstream_private.h | 2 +- dlls/amstream/main.c | 4 +- dlls/amstream/multimedia.c | 95 ++++++++++++++++++++++------------------ 3 files changed, 55 insertions(+), 46 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0d7d1ba210e14ef4727a…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2019