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

Christian Costa : amstream/tests: Add some tests to retreive media streams to media stream filter.
by Alexandre Julliard March 26, 2012

March 26, 2012

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

Józef Kucia : d3dx9/tests: Add tests for D3DXCreateVolumeTextureFromFileInMemory.
by Alexandre Julliard March 26, 2012

March 26, 2012

Module: wine Branch: master Commit: f8015cd235954eed0311e42d379d5310abb63407 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8015cd235954eed0311e42d3… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Sun Mar 25 15:40:43 2012 +0200 d3dx9/tests: Add tests for D3DXCreateVolumeTextureFromFileInMemory. --- dlls/d3dx9_36/tests/surface.c | 45 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 45 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index 1a39ed7..87aa03e 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -779,6 +779,50 @@ static void test_D3DXCreateCubeTexture(IDirect3DDevice9 *device) } } +static void test_D3DXCreateVolumeTexture(IDirect3DDevice9 *device) +{ + HRESULT hr; + ULONG ref; + DWORD levelcount; + IDirect3DVolumeTexture9 *volume_texture; + D3DVOLUME_DESC volume_desc; + + todo_wine { + hr = D3DXCreateVolumeTextureFromFileInMemory(NULL, dds_volume_map, sizeof(dds_volume_map), &volume_texture); + ok(hr == D3DERR_INVALIDCALL, "D3DXCreateVolumeTextureFromFileInMemory returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + + hr = D3DXCreateVolumeTextureFromFileInMemory(device, NULL, sizeof(dds_volume_map), &volume_texture); + ok(hr == D3DERR_INVALIDCALL, "D3DXCreateVolumeTextureFromFileInMemory returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + + hr = D3DXCreateVolumeTextureFromFileInMemory(device, dds_volume_map, 0, &volume_texture); + ok(hr == D3DERR_INVALIDCALL, "D3DXCreateVolumeTextureFromFileInMemory returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + + hr = D3DXCreateVolumeTextureFromFileInMemory(device, dds_volume_map, sizeof(dds_volume_map), NULL); + ok(hr == D3DERR_INVALIDCALL, "D3DXCreateVolumeTextureFromFileInMemory returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + + hr = D3DXCreateVolumeTextureFromFileInMemory(device, dds_volume_map, sizeof(dds_volume_map), &volume_texture); + if(SUCCEEDED(hr)) { + levelcount = IDirect3DVolumeTexture9_GetLevelCount(volume_texture); + ok(levelcount == 3, "GetLevelCount returned %u, expected 3\n", levelcount); + + hr = IDirect3DVolumeTexture9_GetLevelDesc(volume_texture, 0, &volume_desc); + ok(hr == D3D_OK, "GetLevelDesc returend %#x, expected %#x\n", hr, D3D_OK); + ok(volume_desc.Width == 4, "Got width %u, expected 4\n", volume_desc.Width); + ok(volume_desc.Height == 4, "Got height %u, expected 4\n", volume_desc.Height); + ok(volume_desc.Depth == 2, "Got depth %u, expected 2\n", volume_desc.Depth); + + hr = IDirect3DVolumeTexture9_GetLevelDesc(volume_texture, 1, &volume_desc); + ok(hr == D3D_OK, "GetLevelDesc returned %#x, expected %#x\n", hr, D3D_OK); + ok(volume_desc.Width == 2, "Got width %u, expected 2\n", volume_desc.Width); + ok(volume_desc.Height == 2, "Got height %u, expected 2\n", volume_desc.Height); + ok(volume_desc.Depth == 1, "Got depth %u, expected 1\n", volume_desc.Depth); + + ref = IDirect3DVolumeTexture9_Release(volume_texture); + ok(ref == 0, "Invalid reference count. Got %u, expected 0\n", ref); + } + } +} + START_TEST(surface) { HWND wnd; @@ -813,6 +857,7 @@ START_TEST(surface) test_D3DXGetImageInfo(); test_D3DXLoadSurface(device); test_D3DXCreateCubeTexture(device); + test_D3DXCreateVolumeTexture(device); check_release((IUnknown*)device, 0); check_release((IUnknown*)d3d, 0);

1 0

André Hentschel : winefile: Remove unused macros.
by Alexandre Julliard March 26, 2012

March 26, 2012

1 0

Christian Costa : amstream: No media stream is created when the defaut renderer is used.
by Alexandre Julliard March 26, 2012

March 26, 2012

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/tests: Add media streams tests.
by Alexandre Julliard March 26, 2012

March 26, 2012

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: Add support for AMMSF_ADDDEFAULTRENDERER for audio stream.
by Alexandre Julliard March 26, 2012

March 26, 2012

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: Implement IAMMultiMediaStreamImpl_AddMediaStream + add tests.
by Alexandre Julliard March 26, 2012

March 26, 2012

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

André Hentschel : winemaker: Handle library search pragmas.
by Alexandre Julliard March 26, 2012

March 26, 2012

Module: wine Branch: master Commit: 37c702b534a49aa2039dba0758c204f6ccc3f55b URL: http://source.winehq.org/git/wine.git/?a=commit;h=37c702b534a49aa2039dba075… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Mar 19 21:02:07 2012 +0100 winemaker: Handle library search pragmas. --- tools/winemaker | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index 91032f0..58d6bfe 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -3,7 +3,7 @@ use strict; # Copyright 2000-2004 Francois Gouget for CodeWeavers # Copyright 2004 Dimitrie O. Paun -# Copyright 2009-2011 André Hentschel +# Copyright 2009-2012 André Hentschel # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -20,7 +20,7 @@ use strict; # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA # -my $version="0.8.2"; +my $version="0.8.3"; use Cwd; use File::Basename; @@ -2109,6 +2109,11 @@ sub fix_file($$$) print FILEO "$1$2$real_include_name$4$'"; $modified|=($real_include_name ne $3); + } elsif (/^(\s*)\#\s*pragma\s+comment\s*$\s*lib\s*,\s*\"(\w+)\.lib\"\s*$/) { + my $pragma_indent=$1; + my $pragma_lib=$2; + push @{@$target[$T_LIBRARIES]},$pragma_lib; + print FILEO "$pragma_indent/* winemaker: Added -l$pragma_lib to the libraries */\n"; } elsif (s/^(\s*)(\#\s*pragma\s+pack\s*\(\s*)//) { # Pragma pack handling # @@ -2658,7 +2663,7 @@ sub print_banner() print "Winemaker $version\n"; print "Copyright 2000-2004 Francois Gouget <fgouget\(a)codeweavers.com> for CodeWeavers\n"; print "Copyright 2004 Dimitrie O. Paun\n"; - print "Copyright 2009-2011 André Hentschel\n"; + print "Copyright 2009-2012 André Hentschel\n"; } sub usage()

1 0

André Hentschel : view: Show the filename in the window title.
by Alexandre Julliard March 26, 2012

March 26, 2012

Module: wine Branch: master Commit: c275fd73fd5046f35709ee1f90f1baaff9a0095f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c275fd73fd5046f35709ee1f9… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Mar 18 19:31:15 2012 +0100 view: Show the filename in the window title. --- programs/view/view.c | 29 ++++++++++++++++++++++++++++- 1 files changed, 28 insertions(+), 1 deletions(-) diff --git a/programs/view/view.c b/programs/view/view.c index c50a0ff..ebd48aa 100644 --- a/programs/view/view.c +++ b/programs/view/view.c @@ -25,7 +25,8 @@ static HINSTANCE hInst; static HWND hMainWnd; static WCHAR szAppName[5] = {'V','i','e','w',0}; -static WCHAR szTitle[80]; +static WCHAR szTitle[MAX_PATH]; +static WCHAR szFileTitle[MAX_PATH]; static HMETAFILE hmf; static HENHMETAFILE enhmf; @@ -204,6 +205,27 @@ static void DoOpenFile(LPCWSTR filename) InvalidateRect( hMainWnd, NULL, TRUE ); } +static void UpdateWindowCaption(void) +{ + WCHAR szCaption[MAX_PATH]; + WCHAR szView[MAX_PATH]; + static const WCHAR hyphenW[] = { ' ','-',' ',0 }; + + LoadStringW(hInst, IDS_DESCRIPTION, szView, sizeof(szView)/sizeof(WCHAR)); + + if (szFileTitle[0] != '\0') + { + lstrcpyW(szCaption, szFileTitle); + LoadStringW(hInst, IDS_DESCRIPTION, szView, sizeof(szView)/sizeof(WCHAR)); + lstrcatW(szCaption, hyphenW); + lstrcatW(szCaption, szView); + } + else + lstrcpyW(szCaption, szView); + + SetWindowTextW(hMainWnd, szCaption); +} + static LRESULT CALLBACK WndProc(HWND hwnd, UINT uMessage, WPARAM wparam, LPARAM lparam) { switch (uMessage) @@ -236,7 +258,12 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT uMessage, WPARAM wparam, LPARAM { WCHAR filename[MAX_PATH]; if (FileOpen(hwnd, filename, sizeof(filename)/sizeof(WCHAR))) + { + szFileTitle[0] = 0; + GetFileTitleW(filename, szFileTitle, sizeof(szFileTitle)); DoOpenFile(filename); + UpdateWindowCaption(); + } } break;

1 0

Christian Costa : amstream: Video streams do not support default renderer.
by Alexandre Julliard March 26, 2012

March 26, 2012

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