September 2019 - Wine-Commits

Dmitry Timoshkov : rpcrt4: Return an exception code from NdrAsyncClientCall.
by Alexandre Julliard Sept. 2, 2019

Sept. 2, 2019

Module: wine Branch: master Commit: 0c2f5f8b15a4f7bb7008c3efb12b4cd3c774a3a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c2f5f8b15a4f7bb7008c3ef… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Sep 2 15:45:42 2019 +0800 rpcrt4: Return an exception code from NdrAsyncClientCall. Otherwise the caller may decide to wait for the call termination which will never happen. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/ndr_stubless.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index de58a9f..9053751 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -1773,6 +1773,7 @@ static void do_ndr_async_client_call( const MIDL_STUB_DESC *pStubDesc, PFORMAT_S LONG_PTR CDECL DECLSPEC_HIDDEN ndr_async_client_call( PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pFormat, void **stack_top ) { + LONG_PTR ret = 0; const NDR_PROC_HEADER *pProcHeader = (const NDR_PROC_HEADER *)&pFormat[0]; TRACE("pStubDesc %p, pFormat %p, ...\n", pStubDesc, pFormat); @@ -1786,14 +1787,15 @@ LONG_PTR CDECL DECLSPEC_HIDDEN ndr_async_client_call( PMIDL_STUB_DESC pStubDesc, __EXCEPT_ALL { FIXME("exception %x during ndr_async_client_call()\n", GetExceptionCode()); + ret = GetExceptionCode(); } __ENDTRY } else do_ndr_async_client_call( pStubDesc, pFormat, stack_top); - TRACE("returning 0\n"); - return 0; + TRACE("returning %ld\n", ret); + return ret; } RPC_STATUS NdrpCompleteAsyncClientCall(RPC_ASYNC_STATE *pAsync, void *Reply)

1 0

Francois Gouget : widl: Fix a variable name in a comment.
by Alexandre Julliard Sept. 2, 2019

Sept. 2, 2019

Module: wine Branch: master Commit: 2814409990f2e16becfe46476d4ff7818f955ded URL: https://source.winehq.org/git/wine.git/?a=commit;h=2814409990f2e16becfe4647… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 2 04:31:20 2019 +0200 widl: Fix a variable name in a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/typelib_struct.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/widl/typelib_struct.h b/tools/widl/typelib_struct.h index 0d9f8eb..58dd95e 100644 --- a/tools/widl/typelib_struct.h +++ b/tools/widl/typelib_struct.h @@ -327,7 +327,7 @@ typedef struct { } SLTG_BlkEntry; /* The order of the blocks in the file is given by starting at Block - entry firt_blk and stepping through using the next pointer */ + entry first_blk and stepping through using the next pointer */ /* These then get followed by this magic */ typedef struct {

1 0

Akihiro Sagawa : msvcrt/tests: Restore the multibyte codepage after the tests.
by Alexandre Julliard Sept. 2, 2019

Sept. 2, 2019

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

Andrey Gusev : winhttp/tests: Remove LPVOID casts.
by Alexandre Julliard Sept. 2, 2019

Sept. 2, 2019

Module: wine Branch: master Commit: 69e5f90940bc2cb13fbc629a25f0fcd4b87333cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=69e5f90940bc2cb13fbc629a… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Sep 2 16:34:53 2019 +0300 winhttp/tests: Remove LPVOID casts. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/tests/notification.c | 2 +- dlls/winhttp/tests/winhttp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c index 510d9e7..e2bbb71 100644 --- a/dlls/winhttp/tests/notification.c +++ b/dlls/winhttp/tests/notification.c @@ -1023,7 +1023,7 @@ START_TEST (notification) si.event = CreateEventW( NULL, 0, 0, NULL ); si.port = 7533; - thread = CreateThread( NULL, 0, server_thread, (LPVOID)&si, 0, NULL ); + thread = CreateThread( NULL, 0, server_thread, &si, 0, NULL ); ok(thread != NULL, "failed to create thread %u\n", GetLastError()); server_socket_available = CreateEventW( NULL, 0, 0, NULL ); diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index eb7c7b5..b005514 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -4842,7 +4842,7 @@ START_TEST (winhttp) si.event = CreateEventW(NULL, 0, 0, NULL); si.port = 7532; - thread = CreateThread(NULL, 0, server_thread, (LPVOID)&si, 0, NULL); + thread = CreateThread(NULL, 0, server_thread, &si, 0, NULL); ok(thread != NULL, "failed to create thread %u\n", GetLastError()); ret = WaitForSingleObject(si.event, 10000);

1 0

Piotr Caban : msvcrt: Match broken multi-byte character with everything in _mbsspn.
by Alexandre Julliard Sept. 2, 2019

Sept. 2, 2019

Module: wine Branch: master Commit: 702b1e29d51ba4a903d20df85e2254d444d43ce0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=702b1e29d51ba4a903d20df8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 2 19:50:37 2019 +0200 msvcrt: Match broken multi-byte character with everything in _mbsspn. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/mbcs.c | 3 +++ dlls/msvcrt/tests/string.c | 3 +++ dlls/ucrtbase/tests/string.c | 41 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 47 insertions(+) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 6f965f5..fe47e55 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -2035,6 +2035,9 @@ MSVCRT_size_t CDECL _mbsspn(const unsigned char* string, const unsigned char* se { if (_ismbblead(*q)) { + /* duplicate a bug in native implementation */ + if (!q[1]) break; + if (p[0] == q[0] && p[1] == q[1]) { p++; diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index b937f17..3ecafbd 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -519,6 +519,7 @@ static void test_mbsspn( void) 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 mbset3[]="\x8e"; int ret, cp = _getmbcp(); ret=_mbsspn( str1, set); @@ -537,6 +538,8 @@ static void test_mbsspn( void) ok( ret==0, "_mbsspn returns %d should be 0\n", ret); ret=_mbsspn( mbstr+8, mbset2); ok( ret==2, "_mbsspn returns %d should be 2\n", ret); + ret=_mbsspn( mbstr, mbset3); + ok( ret==14, "_mbsspn returns %d should be 14\n", ret); _setmbcp( cp); } diff --git a/dlls/ucrtbase/tests/string.c b/dlls/ucrtbase/tests/string.c index e968431..e4146c6 100644 --- a/dlls/ucrtbase/tests/string.c +++ b/dlls/ucrtbase/tests/string.c @@ -80,6 +80,9 @@ static int (__cdecl *p__towupper_l)(wint_t, _locale_t); static char* (__cdecl *p_setlocale)(int, const char*); static _locale_t (__cdecl *p__create_locale)(int, const char*); static void (__cdecl *p__free_locale)(_locale_t); +static int (__cdecl *p__getmbcp)(void); +static int (__cdecl *p__setmbcp)(int); +static size_t (__cdecl *p__mbsspn)(const unsigned char*, const unsigned char*); static BOOL init(void) { @@ -104,6 +107,9 @@ static BOOL init(void) p_setlocale = (void*)GetProcAddress(module, "setlocale"); p__create_locale = (void*)GetProcAddress(module, "_create_locale"); p__free_locale = (void*)GetProcAddress(module, "_free_locale"); + p__getmbcp = (void*)GetProcAddress(module, "_getmbcp"); + p__setmbcp = (void*)GetProcAddress(module, "_setmbcp"); + p__mbsspn = (void*)GetProcAddress(module, "_mbsspn"); return TRUE; } @@ -339,6 +345,40 @@ static void test_C_locale(void) } } +static void test_mbsspn( void) +{ + unsigned char str1[] = "cabernet"; + unsigned char str2[] = "shiraz"; + unsigned char set[] = "abc"; + unsigned char empty[] = ""; + 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 mbset3[] = "\x8e"; + int ret, cp = p__getmbcp(); + + ret = p__mbsspn(str1, set); + ok(ret == 3, "_mbsspn returns %d should be 3\n", ret); + ret = p__mbsspn(str2, set); + ok(ret == 0, "_mbsspn returns %d should be 0\n", ret); + ret = p__mbsspn(str1, empty); + ok(ret == 0, "_mbsspn returns %d should be 0\n", ret); + + p__setmbcp(932); + ret = p__mbsspn(mbstr, mbset1); + ok(ret == 8, "_mbsspn returns %d should be 8\n", ret); + ret = p__mbsspn(mbstr, mbset2); + ok(ret == 1, "_mbsspn returns %d should be 1\n", ret); + ret = p__mbsspn(mbstr+8, mbset1); + ok(ret == 0, "_mbsspn returns %d should be 0\n", ret); + ret = p__mbsspn(mbstr+8, mbset2); + ok(ret == 2, "_mbsspn returns %d should be 2\n", ret); + ret = p__mbsspn(mbstr, mbset3); + ok(ret == 14, "_mbsspn returns %d should be 14\n", ret); + + p__setmbcp(cp); +} + START_TEST(string) { if (!init()) return; @@ -347,4 +387,5 @@ START_TEST(string) test__memicmp_l(); test___strncnt(); test_C_locale(); + test_mbsspn(); }

1 0

Zebediah Figura : amstream: Move multimedia_stream_create() to avoid forward declarations.
by Alexandre Julliard Sept. 2, 2019

Sept. 2, 2019

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 Sept. 2, 2019

Sept. 2, 2019

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

Zebediah Figura : amstream: Don' t keep track of streams in the multimedia stream object.
by Alexandre Julliard Sept. 2, 2019

Sept. 2, 2019

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/tests: Add some tests for IEnumMediaTypes.
by Alexandre Julliard Sept. 2, 2019

Sept. 2, 2019

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

Andrey Gusev : wininet/tests: Remove LPVOID cast.
by Alexandre Julliard Sept. 2, 2019

Sept. 2, 2019

Module: wine Branch: master Commit: a1d966e49454dc3d3d24276d938b6218e117a440 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1d966e49454dc3d3d24276d… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Sep 2 21:13:33 2019 +0300 wininet/tests: Remove LPVOID cast. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/http.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 6db33e4..cb96abe 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -5524,7 +5524,7 @@ static void test_http_connection(void) si.hEvent = CreateEventW(NULL, 0, 0, NULL); si.port = 7531; - hThread = CreateThread(NULL, 0, server_thread, (LPVOID) &si, 0, &id); + hThread = CreateThread(NULL, 0, server_thread, &si, 0, &id); ok( hThread != NULL, "create thread failed\n"); r = WaitForSingleObject(si.hEvent, 10000);

1 0