March 2012 - Wine-commits - list.winehq.org

Christian Costa : amstream: Add support for AMMSF_ADDDEFAULTRENDERER for audio stream.
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: 91cc9ad585534044baa9cc0400122f23c156e723 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91cc9ad585534044baa9cc040… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Mar 26 10:09:18 2012 +0200 amstream: Add support for AMMSF_ADDDEFAULTRENDERER for audio stream. --- dlls/amstream/amstream.c | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/dlls/amstream/amstream.c b/dlls/amstream/amstream.c index afcdb59..54d57fe 100644 --- a/dlls/amstream/amstream.c +++ b/dlls/amstream/amstream.c @@ -339,6 +339,31 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_AddMediaStream(IAMMultiMediaStream This->pStreams[This->nbStreams] = pStream; This->nbStreams++; + if (dwFlags & AMMSF_ADDDEFAULTRENDERER) + { + if (IsEqualGUID(PurposeId, &MSPID_PrimaryAudio)) + { + IBaseFilter* dsoundrender_filter; + + hr = CoCreateInstance(&CLSID_DSoundRender, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (LPVOID*)&dsoundrender_filter); + if (SUCCEEDED(hr)) + { + hr = IGraphBuilder_AddFilter(This->pFilterGraph, dsoundrender_filter, NULL); + IBaseFilter_Release(dsoundrender_filter); + } + if (FAILED(hr)) + { + IMediaStream_Release(pStream); + pStream = NULL; + This->nbStreams--; + } + } + else + { + FIXME("Default renderer only supported for audio\n"); + } + } + if (ppNewStream) *ppNewStream = pStream; }

1 0

Christian Costa : amstream/tests: Make test. avi filename an unicode string and test the file presence once for all.
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: 34a1917fb3326f179e42c8c4c61bf188bd88983e URL: http://source.winehq.org/git/wine.git/?a=commit;h=34a1917fb3326f179e42c8c4c… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Mar 26 10:09:33 2012 +0200 amstream/tests: Make test.avi filename an unicode string and test the file presence once for all. --- dlls/amstream/tests/amstream.c | 56 +++++++++++++++------------------------- 1 files changed, 21 insertions(+), 35 deletions(-) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 4798967..a4d4834 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -1,7 +1,7 @@ /* * Unit tests for MultiMedia Stream functions * - * Copyright (C) 2009 Christian Costa + * Copyright (C) 2009, 2012 Christian Costa * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -24,8 +24,7 @@ #include "initguid.h" #include "amstream.h" -#define FILE_LEN 9 -static const char fileA[FILE_LEN] = "test.avi"; +static const WCHAR filenameW[] = {'t','e','s','t','.','a','v','i',0}; static IAMMultiMediaStream* pams; static IDirectDraw7* pdd7; @@ -88,22 +87,12 @@ static void release_directdraw(void) static void test_openfile(void) { - HANDLE h; HRESULT hr; - WCHAR fileW[FILE_LEN]; IGraphBuilder* pgraph; if (!create_ammultimediastream()) return; - h = CreateFileA(fileA, 0, 0, NULL, OPEN_EXISTING, 0, NULL); - if (h == INVALID_HANDLE_VALUE) { - release_ammultimediastream(); - return; - } - - MultiByteToWideChar(CP_ACP, 0, fileA, -1, fileW, FILE_LEN); - hr = IAMMultiMediaStream_GetFilterGraph(pams, &pgraph); ok(hr==S_OK, "IAMMultiMediaStream_GetFilterGraph returned: %x\n", hr); ok(pgraph==NULL, "Filtergraph should not be created yet\n"); @@ -111,7 +100,7 @@ static void test_openfile(void) if (pgraph) IGraphBuilder_Release(pgraph); - hr = IAMMultiMediaStream_OpenFile(pams, fileW, 0); + hr = IAMMultiMediaStream_OpenFile(pams, filenameW, 0); ok(hr==S_OK, "IAMMultiMediaStream_OpenFile returned: %x\n", hr); hr = IAMMultiMediaStream_GetFilterGraph(pams, &pgraph); @@ -124,18 +113,20 @@ static void test_openfile(void) release_ammultimediastream(); } -static void renderfile(const char * fileA) +static void test_renderfile(void) { HRESULT hr; - WCHAR fileW[FILE_LEN]; IMediaStream *pvidstream = NULL; IDirectDrawMediaStream *pddstream = NULL; IDirectDrawStreamSample *pddsample = NULL; + if (!create_ammultimediastream()) + return; if (!create_directdraw()) + { + release_ammultimediastream(); return; - - MultiByteToWideChar(CP_ACP, 0, fileA, -1, fileW, FILE_LEN); + } hr = IAMMultiMediaStream_Initialize(pams, STREAMTYPE_READ, 0, NULL); ok(hr==S_OK, "IAMMultiMediaStream_Initialize returned: %x\n", hr); @@ -146,7 +137,7 @@ static void renderfile(const char * fileA) hr = IAMMultiMediaStream_AddMediaStream(pams, NULL, &MSPID_PrimaryAudio, AMMSF_ADDDEFAULTRENDERER, NULL); ok(hr==S_OK, "IAMMultiMediaStream_AddMediaStream returned: %x\n", hr); - hr = IAMMultiMediaStream_OpenFile(pams, fileW, 0); + hr = IAMMultiMediaStream_OpenFile(pams, filenameW, 0); ok(hr==S_OK, "IAMMultiMediaStream_OpenFile returned: %x\n", hr); hr = IAMMultiMediaStream_GetMediaStream(pams, &MSPID_PrimaryVideo, &pvidstream); @@ -169,28 +160,23 @@ error: IMediaStream_Release(pvidstream); release_directdraw(); + release_ammultimediastream(); } -static void test_render(void) +START_TEST(amstream) { - HANDLE h; + HANDLE file; - if (!create_ammultimediastream()) - return; + CoInitializeEx(NULL, COINIT_MULTITHREADED); - h = CreateFileA(fileA, 0, 0, NULL, OPEN_EXISTING, 0, NULL); - if (h != INVALID_HANDLE_VALUE) { - CloseHandle(h); - renderfile(fileA); - } + file = CreateFileW(filenameW, 0, 0, NULL, OPEN_EXISTING, 0, NULL); + if (file != INVALID_HANDLE_VALUE) + { + CloseHandle(file); - release_ammultimediastream(); -} + test_openfile(); + test_renderfile(); + } -START_TEST(amstream) -{ - CoInitializeEx(NULL, COINIT_MULTITHREADED); - test_openfile(); - test_render(); CoUninitialize(); }

1 0

Christian Costa : amstream/tests: Add media streams tests.
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: 872b5153041188c32edface4a994b44b08ab1f90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=872b5153041188c32edface4a… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Mar 26 10:09:41 2012 +0200 amstream/tests: Add media streams tests. --- dlls/amstream/tests/amstream.c | 90 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 90 insertions(+), 0 deletions(-) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index a4d4834..97fc7f1 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -23,6 +23,7 @@ #include "wine/test.h" #include "initguid.h" #include "amstream.h" +#include "vfwmsgs.h" static const WCHAR filenameW[] = {'t','e','s','t','.','a','v','i',0}; @@ -163,12 +164,101 @@ error: release_ammultimediastream(); } +static void test_media_streams(void) +{ + HRESULT hr; + IMediaStream *video_stream = NULL; + IMediaStream *audio_stream = NULL; + IMediaStream *dummy_stream; + IDirectDrawMediaStream *ddraw_stream = NULL; + IDirectDrawStreamSample *ddraw_sample = NULL; + + if (!create_ammultimediastream()) + return; + if (!create_directdraw()) + { + release_ammultimediastream(); + return; + } + + hr = IAMMultiMediaStream_Initialize(pams, STREAMTYPE_READ, 0, NULL); + ok(hr == S_OK, "IAMMultiMediaStream_Initialize returned: %x\n", hr); + + /* Verify there is no video media stream */ + hr = IAMMultiMediaStream_GetMediaStream(pams, &MSPID_PrimaryVideo, &video_stream); + ok(hr == MS_E_NOSTREAM, "IAMMultiMediaStream_GetMediaStream returned: %x\n", hr); + + /* Verify there is no default renderer for video stream */ + hr = IAMMultiMediaStream_AddMediaStream(pams, (IUnknown*)pdd7, &MSPID_PrimaryVideo, AMMSF_ADDDEFAULTRENDERER, NULL); + todo_wine ok(hr == MS_E_PURPOSEID, "IAMMultiMediaStream_AddMediaStream returned: %x\n", hr); + hr = IAMMultiMediaStream_GetMediaStream(pams, &MSPID_PrimaryVideo, &video_stream); + todo_wine ok(hr == MS_E_NOSTREAM, "IAMMultiMediaStream_GetMediaStream returned: %x\n", hr); + hr = IAMMultiMediaStream_AddMediaStream(pams, NULL, &MSPID_PrimaryVideo, AMMSF_ADDDEFAULTRENDERER, NULL); + todo_wine ok(hr == MS_E_PURPOSEID, "IAMMultiMediaStream_AddMediaStream returned: %x\n", hr); + hr = IAMMultiMediaStream_GetMediaStream(pams, &MSPID_PrimaryVideo, &video_stream); + todo_wine ok(hr == MS_E_NOSTREAM, "IAMMultiMediaStream_GetMediaStream returned: %x\n", hr); + + /* Verify normal case for video stream */ + hr = IAMMultiMediaStream_AddMediaStream(pams, NULL, &MSPID_PrimaryVideo, 0, NULL); + ok(hr == S_OK, "IAMMultiMediaStream_AddMediaStream returned: %x\n", hr); + hr = IAMMultiMediaStream_GetMediaStream(pams, &MSPID_PrimaryVideo, &video_stream); + ok(hr == S_OK, "IAMMultiMediaStream_GetMediaStream returned: %x\n", hr); + + /* Verify there is no audio media stream */ + hr = IAMMultiMediaStream_GetMediaStream(pams, &MSPID_PrimaryAudio, &audio_stream); + ok(hr == MS_E_NOSTREAM, "IAMMultiMediaStream_GetMediaStream returned: %x\n", hr); + + /* Verify no stream is created when using the default renderer for audio stream */ + hr = IAMMultiMediaStream_AddMediaStream(pams, NULL, &MSPID_PrimaryAudio, AMMSF_ADDDEFAULTRENDERER, NULL); + ok((hr == S_OK) || (hr == VFW_E_NO_AUDIO_HARDWARE), "IAMMultiMediaStream_AddMediaStream returned: %x\n", hr); + hr = IAMMultiMediaStream_GetMediaStream(pams, &MSPID_PrimaryAudio, &audio_stream); + todo_wine ok(hr == MS_E_NOSTREAM, "IAMMultiMediaStream_GetMediaStream returned: %x\n", hr); + + /* Verify a stream is created when no default renderer is used */ + hr = IAMMultiMediaStream_AddMediaStream(pams, NULL, &MSPID_PrimaryAudio, 0, NULL); + ok(hr == S_OK, "IAMMultiMediaStream_AddMediaStream returned: %x\n", hr); + hr = IAMMultiMediaStream_GetMediaStream(pams, &MSPID_PrimaryAudio, &audio_stream); + ok(hr == S_OK, "IAMMultiMediaStream_GetMediaStream returned: %x\n", hr); + + /* Verify behaviour with invalid purpose id */ + hr = IAMMultiMediaStream_GetMediaStream(pams, &IID_IUnknown, &dummy_stream); + ok(hr == MS_E_NOSTREAM, "IAMMultiMediaStream_GetMediaStream returned: %x\n", hr); + hr = IAMMultiMediaStream_AddMediaStream(pams, NULL, &IID_IUnknown, 0, NULL); + todo_wine ok(hr == MS_E_PURPOSEID, "IAMMultiMediaStream_AddMediaStream returned: %x\n", hr); + + if (video_stream) + { + hr = IMediaStream_QueryInterface(video_stream, &IID_IDirectDrawMediaStream, (LPVOID*)&ddraw_stream); + ok(hr == S_OK, "IMediaStream_QueryInterface returned: %x\n", hr); + + if (SUCCEEDED(hr)) + { + hr = IDirectDrawMediaStream_CreateSample(ddraw_stream, NULL, NULL, 0, &ddraw_sample); + todo_wine ok(hr==S_OK, "IDirectDrawMediaStream_CreateSample returned: %x\n", hr); + } + } + + if (ddraw_sample) + IDirectDrawMediaSample_Release(ddraw_sample); + if (ddraw_stream) + IDirectDrawMediaStream_Release(ddraw_stream); + if (video_stream) + IMediaStream_Release(video_stream); + if (audio_stream) + IMediaStream_Release(audio_stream); + + release_directdraw(); + release_ammultimediastream(); +} + START_TEST(amstream) { HANDLE file; CoInitializeEx(NULL, COINIT_MULTITHREADED); + test_media_streams(); + file = CreateFileW(filenameW, 0, 0, NULL, OPEN_EXISTING, 0, NULL); if (file != INVALID_HANDLE_VALUE) {

1 0

Christian Costa : amstream: Check purpose id in AddMediaStream.
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: f5ee1304ef7586ca5f22721f33f8f329eab8035d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5ee1304ef7586ca5f22721f3… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Mar 26 10:09:49 2012 +0200 amstream: Check purpose id in AddMediaStream. --- dlls/amstream/amstream.c | 3 +++ dlls/amstream/tests/amstream.c | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/amstream/amstream.c b/dlls/amstream/amstream.c index 54d57fe..6fdfb0d 100644 --- a/dlls/amstream/amstream.c +++ b/dlls/amstream/amstream.c @@ -326,6 +326,9 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_AddMediaStream(IAMMultiMediaStream FIXME("(%p/%p)->(%p,%s,%x,%p) partial stub!\n", This, iface, pStreamObject, debugstr_guid(PurposeId), dwFlags, ppNewStream); + if (!IsEqualGUID(PurposeId, &MSPID_PrimaryVideo) && !IsEqualGUID(PurposeId, &MSPID_PrimaryAudio)) + return MS_E_PURPOSEID; + hr = mediastream_create((IMultiMediaStream*)iface, PurposeId, This->StreamType, &pStream); if (SUCCEEDED(hr)) { diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 97fc7f1..69a9de8 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -224,7 +224,7 @@ static void test_media_streams(void) hr = IAMMultiMediaStream_GetMediaStream(pams, &IID_IUnknown, &dummy_stream); ok(hr == MS_E_NOSTREAM, "IAMMultiMediaStream_GetMediaStream returned: %x\n", hr); hr = IAMMultiMediaStream_AddMediaStream(pams, NULL, &IID_IUnknown, 0, NULL); - todo_wine ok(hr == MS_E_PURPOSEID, "IAMMultiMediaStream_AddMediaStream returned: %x\n", hr); + ok(hr == MS_E_PURPOSEID, "IAMMultiMediaStream_AddMediaStream returned: %x\n", hr); if (video_stream) {

1 0

Christian Costa : amstream: Video streams do not support default renderer.
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: 5512d8e700e5d67c8a7950babb4d0daa2a07d482 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5512d8e700e5d67c8a7950bab… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Mar 26 10:09:57 2012 +0200 amstream: Video streams do not support default renderer. --- dlls/amstream/amstream.c | 3 +++ dlls/amstream/tests/amstream.c | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/amstream/amstream.c b/dlls/amstream/amstream.c index 6fdfb0d..0ff2904 100644 --- a/dlls/amstream/amstream.c +++ b/dlls/amstream/amstream.c @@ -329,6 +329,9 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_AddMediaStream(IAMMultiMediaStream if (!IsEqualGUID(PurposeId, &MSPID_PrimaryVideo) && !IsEqualGUID(PurposeId, &MSPID_PrimaryAudio)) return MS_E_PURPOSEID; + if (IsEqualGUID(PurposeId, &MSPID_PrimaryVideo) && (dwFlags & AMMSF_ADDDEFAULTRENDERER)) + return MS_E_PURPOSEID; + hr = mediastream_create((IMultiMediaStream*)iface, PurposeId, This->StreamType, &pStream); if (SUCCEEDED(hr)) { diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 69a9de8..6030c23 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -190,13 +190,13 @@ static void test_media_streams(void) /* Verify there is no default renderer for video stream */ hr = IAMMultiMediaStream_AddMediaStream(pams, (IUnknown*)pdd7, &MSPID_PrimaryVideo, AMMSF_ADDDEFAULTRENDERER, NULL); - todo_wine ok(hr == MS_E_PURPOSEID, "IAMMultiMediaStream_AddMediaStream returned: %x\n", hr); + ok(hr == MS_E_PURPOSEID, "IAMMultiMediaStream_AddMediaStream returned: %x\n", hr); hr = IAMMultiMediaStream_GetMediaStream(pams, &MSPID_PrimaryVideo, &video_stream); - todo_wine ok(hr == MS_E_NOSTREAM, "IAMMultiMediaStream_GetMediaStream returned: %x\n", hr); + ok(hr == MS_E_NOSTREAM, "IAMMultiMediaStream_GetMediaStream returned: %x\n", hr); hr = IAMMultiMediaStream_AddMediaStream(pams, NULL, &MSPID_PrimaryVideo, AMMSF_ADDDEFAULTRENDERER, NULL); - todo_wine ok(hr == MS_E_PURPOSEID, "IAMMultiMediaStream_AddMediaStream returned: %x\n", hr); + ok(hr == MS_E_PURPOSEID, "IAMMultiMediaStream_AddMediaStream returned: %x\n", hr); hr = IAMMultiMediaStream_GetMediaStream(pams, &MSPID_PrimaryVideo, &video_stream); - todo_wine ok(hr == MS_E_NOSTREAM, "IAMMultiMediaStream_GetMediaStream returned: %x\n", hr); + ok(hr == MS_E_NOSTREAM, "IAMMultiMediaStream_GetMediaStream returned: %x\n", hr); /* Verify normal case for video stream */ hr = IAMMultiMediaStream_AddMediaStream(pams, NULL, &MSPID_PrimaryVideo, 0, NULL);

1 0

Christian Costa : amstream: No media stream is created when the defaut renderer is used.
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: aae32fd4fd9f67562fdc056c11301f3ab37e790f URL: http://source.winehq.org/git/wine.git/?a=commit;h=aae32fd4fd9f67562fdc056c1… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Mar 26 10:10:05 2012 +0200 amstream: No media stream is created when the defaut renderer is used. --- dlls/amstream/amstream.c | 50 ++++++++++++++++++--------------------- dlls/amstream/tests/amstream.c | 2 +- 2 files changed, 24 insertions(+), 28 deletions(-) diff --git a/dlls/amstream/amstream.c b/dlls/amstream/amstream.c index 0ff2904..7185f52 100644 --- a/dlls/amstream/amstream.c +++ b/dlls/amstream/amstream.c @@ -329,8 +329,29 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_AddMediaStream(IAMMultiMediaStream if (!IsEqualGUID(PurposeId, &MSPID_PrimaryVideo) && !IsEqualGUID(PurposeId, &MSPID_PrimaryAudio)) return MS_E_PURPOSEID; - if (IsEqualGUID(PurposeId, &MSPID_PrimaryVideo) && (dwFlags & AMMSF_ADDDEFAULTRENDERER)) - return MS_E_PURPOSEID; + if (dwFlags & AMMSF_ADDDEFAULTRENDERER) + { + if (IsEqualGUID(PurposeId, &MSPID_PrimaryVideo)) + { + /* Default renderer not supported by video stream */ + return MS_E_PURPOSEID; + } + else + { + IBaseFilter* dsoundrender_filter; + + /* Create the default renderer for audio */ + hr = CoCreateInstance(&CLSID_DSoundRender, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (LPVOID*)&dsoundrender_filter); + if (SUCCEEDED(hr)) + { + hr = IGraphBuilder_AddFilter(This->pFilterGraph, dsoundrender_filter, NULL); + IBaseFilter_Release(dsoundrender_filter); + } + + /* No media stream created when the default renderer is used */ + return hr; + } + } hr = mediastream_create((IMultiMediaStream*)iface, PurposeId, This->StreamType, &pStream); if (SUCCEEDED(hr)) @@ -345,31 +366,6 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_AddMediaStream(IAMMultiMediaStream This->pStreams[This->nbStreams] = pStream; This->nbStreams++; - if (dwFlags & AMMSF_ADDDEFAULTRENDERER) - { - if (IsEqualGUID(PurposeId, &MSPID_PrimaryAudio)) - { - IBaseFilter* dsoundrender_filter; - - hr = CoCreateInstance(&CLSID_DSoundRender, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (LPVOID*)&dsoundrender_filter); - if (SUCCEEDED(hr)) - { - hr = IGraphBuilder_AddFilter(This->pFilterGraph, dsoundrender_filter, NULL); - IBaseFilter_Release(dsoundrender_filter); - } - if (FAILED(hr)) - { - IMediaStream_Release(pStream); - pStream = NULL; - This->nbStreams--; - } - } - else - { - FIXME("Default renderer only supported for audio\n"); - } - } - if (ppNewStream) *ppNewStream = pStream; } diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 6030c23..234df41 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -212,7 +212,7 @@ static void test_media_streams(void) hr = IAMMultiMediaStream_AddMediaStream(pams, NULL, &MSPID_PrimaryAudio, AMMSF_ADDDEFAULTRENDERER, NULL); ok((hr == S_OK) || (hr == VFW_E_NO_AUDIO_HARDWARE), "IAMMultiMediaStream_AddMediaStream returned: %x\n", hr); hr = IAMMultiMediaStream_GetMediaStream(pams, &MSPID_PrimaryAudio, &audio_stream); - todo_wine ok(hr == MS_E_NOSTREAM, "IAMMultiMediaStream_GetMediaStream returned: %x\n", hr); + ok(hr == MS_E_NOSTREAM, "IAMMultiMediaStream_GetMediaStream returned: %x\n", hr); /* Verify a stream is created when no default renderer is used */ hr = IAMMultiMediaStream_AddMediaStream(pams, NULL, &MSPID_PrimaryAudio, 0, NULL);

1 0

Christian Costa : amstream: Implement IAMMultiMediaStreamImpl_AddMediaStream + add tests.
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: 6db90e0e9e5252530119acd30ea720c47fa1f406 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6db90e0e9e5252530119acd30… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Mar 26 10:10:13 2012 +0200 amstream: Implement IAMMultiMediaStreamImpl_AddMediaStream + add tests. --- dlls/amstream/amstream.c | 13 +++++++++++-- dlls/amstream/tests/amstream.c | 9 +++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/amstream/amstream.c b/dlls/amstream/amstream.c index 7185f52..b599bb6 100644 --- a/dlls/amstream/amstream.c +++ b/dlls/amstream/amstream.c @@ -310,10 +310,19 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_GetFilterGraph(IAMMultiMediaStream static HRESULT WINAPI IAMMultiMediaStreamImpl_GetFilter(IAMMultiMediaStream* iface, IMediaStreamFilter** ppFilter) { IAMMultiMediaStreamImpl *This = impl_from_IAMMultiMediaStream(iface); + HRESULT hr = S_OK; - FIXME("(%p/%p)->(%p) stub!\n", This, iface, ppFilter); + TRACE("(%p/%p)->(%p)\n", This, iface, ppFilter); - return E_NOTIMPL; + if (!ppFilter) + return E_POINTER; + + *ppFilter = NULL; + + if (This->media_stream_filter) + hr = IBaseFilter_QueryInterface(This->media_stream_filter, &IID_IMediaStreamFilter, (LPVOID*)ppFilter); + + return hr; } static HRESULT WINAPI IAMMultiMediaStreamImpl_AddMediaStream(IAMMultiMediaStream* iface, IUnknown* pStreamObject, const MSPID* PurposeId, diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 234df41..ab58da2 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -172,6 +172,7 @@ static void test_media_streams(void) IMediaStream *dummy_stream; IDirectDrawMediaStream *ddraw_stream = NULL; IDirectDrawStreamSample *ddraw_sample = NULL; + IMediaStreamFilter* media_stream_filter = NULL; if (!create_ammultimediastream()) return; @@ -184,6 +185,12 @@ static void test_media_streams(void) hr = IAMMultiMediaStream_Initialize(pams, STREAMTYPE_READ, 0, NULL); ok(hr == S_OK, "IAMMultiMediaStream_Initialize returned: %x\n", hr); + /* Retreive media stream filter */ + hr = IAMMultiMediaStream_GetFilter(pams, NULL); + ok(hr == E_POINTER, "IAMMultiMediaStream_GetFilter returned: %x\n", hr); + hr = IAMMultiMediaStream_GetFilter(pams, &media_stream_filter); + ok(hr == S_OK, "IAMMultiMediaStream_GetFilter returned: %x\n", hr); + /* Verify there is no video media stream */ hr = IAMMultiMediaStream_GetMediaStream(pams, &MSPID_PrimaryVideo, &video_stream); ok(hr == MS_E_NOSTREAM, "IAMMultiMediaStream_GetMediaStream returned: %x\n", hr); @@ -246,6 +253,8 @@ static void test_media_streams(void) IMediaStream_Release(video_stream); if (audio_stream) IMediaStream_Release(audio_stream); + if (media_stream_filter) + IMediaStreamFilter_Release(media_stream_filter); release_directdraw(); release_ammultimediastream();

1 0

Christian Costa : amstream/tests: Add some tests to retreive media streams to media stream filter.
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: 7fe02c47f393dbd0be720ec6a6548fecf3e31f28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fe02c47f393dbd0be720ec6a… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Mar 26 10:10:21 2012 +0200 amstream/tests: Add some tests to retreive media streams to media stream filter. --- dlls/amstream/tests/amstream.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index ab58da2..81a7565 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -211,6 +211,16 @@ static void test_media_streams(void) hr = IAMMultiMediaStream_GetMediaStream(pams, &MSPID_PrimaryVideo, &video_stream); ok(hr == S_OK, "IAMMultiMediaStream_GetMediaStream returned: %x\n", hr); + /* Verify the video stream has been added to the media stream filter */ + if (media_stream_filter) + { + hr = IMediaStreamFilter_GetMediaStream(media_stream_filter, &MSPID_PrimaryVideo, &dummy_stream); + todo_wine ok(hr == S_OK, "IMediaStreamFilter_GetMediaStream returned: %x\n", hr); + todo_wine ok(dummy_stream == video_stream, "Got wrong returned pointer %p, expected %p\n", dummy_stream, video_stream); + if (SUCCEEDED(hr)) + IMediaStream_Release(dummy_stream); + } + /* Verify there is no audio media stream */ hr = IAMMultiMediaStream_GetMediaStream(pams, &MSPID_PrimaryAudio, &audio_stream); ok(hr == MS_E_NOSTREAM, "IAMMultiMediaStream_GetMediaStream returned: %x\n", hr); @@ -227,6 +237,16 @@ static void test_media_streams(void) hr = IAMMultiMediaStream_GetMediaStream(pams, &MSPID_PrimaryAudio, &audio_stream); ok(hr == S_OK, "IAMMultiMediaStream_GetMediaStream returned: %x\n", hr); + /* verify the audio stream has been added to the media stream filter */ + if (media_stream_filter) + { + hr = IMediaStreamFilter_GetMediaStream(media_stream_filter, &MSPID_PrimaryAudio, &dummy_stream); + todo_wine ok(hr == S_OK, "IAMMultiMediaStream_GetMediaStream returned: %x\n", hr); + todo_wine ok(dummy_stream == audio_stream, "Got wrong returned pointer %p, expected %p\n", dummy_stream, audio_stream); + if (SUCCEEDED(hr)) + IMediaStream_Release(dummy_stream); + } + /* Verify behaviour with invalid purpose id */ hr = IAMMultiMediaStream_GetMediaStream(pams, &IID_IUnknown, &dummy_stream); ok(hr == MS_E_NOSTREAM, "IAMMultiMediaStream_GetMediaStream returned: %x\n", hr);

1 0

Akihiro Sagawa : msvcrt: Fix _mbcjistojms off by one error.
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: 7535b367dd4f5ae1b22fcb068eaaf4e2b428b98f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7535b367dd4f5ae1b22fcb068… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Mar 21 23:02:16 2012 +0900 msvcrt: Fix _mbcjistojms off by one error. --- dlls/msvcrt/mbcs.c | 2 +- dlls/msvcrt/tests/string.c | 5 ----- 2 files changed, 1 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index c61311b..37b72a3 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -461,7 +461,7 @@ unsigned int CDECL _mbcjistojms(unsigned int c) else c += 0x7d; - if(LOBYTE(c) > 0x7F) + if(LOBYTE(c) >= 0x7F) c += 0x1; c = (((HIBYTE(c) - 0x21)/2 + 0x81) << 8) | LOBYTE(c); diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 6f9ce0f..9f0d8be 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -877,11 +877,6 @@ static void test_mbcjisjms(void) unsigned int ret, exp; ret = _mbcjistojms(jisjms[j][0]); exp = (cp[i] == 932) ? jisjms[j][1] : jisjms[j][0]; - if (LOBYTE(exp) == 0x80 && cp[i] == 932) { - todo_wine ok(ret == exp, "Expected 0x%x, got 0x%x (0x%x, codepage=%d)\n", - exp, ret, jisjms[j][0], cp[i]); - continue; - } ok(ret == exp, "Expected 0x%x, got 0x%x (0x%x, codepage=%d)\n", exp, ret, jisjms[j][0], cp[i]); }

1 0

Akihiro Sagawa : msvcrt: Fix _mbsnbcmp and _mbsnbicmp implementation.
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: ece5d712f6e1719c173289d18631159f7badc8cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ece5d712f6e1719c173289d18… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Mar 21 23:02:17 2012 +0900 msvcrt: Fix _mbsnbcmp and _mbsnbicmp implementation. --- dlls/msvcrt/mbcs.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 37b72a3..0f15cb1 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -896,7 +896,7 @@ int CDECL _mbsnbcmp(const unsigned char* str, const unsigned char* cmp, MSVCRT_s if (_ismbblead(*cmp)) cmpc=(len>=2)?_mbsnextc(cmp):0; else - cmpc=*str; + cmpc=*cmp; if(strc != cmpc) return strc < cmpc ? -1 : 1; len -= clen; @@ -967,7 +967,7 @@ int CDECL _mbsnbicmp(const unsigned char* str, const unsigned char* cmp, MSVCRT_ if (_ismbblead(*cmp)) cmpc=(len>=2)?_mbsnextc(cmp):0; else - cmpc=*str; + cmpc=*cmp; strc = _mbctolower(strc); cmpc = _mbctolower(cmpc); if(strc != cmpc)

1 0