September 2012 - Wine-commits

Henri Verbeet : wined3d: Take the data type of immediates into account in shader_glsl_get_register_name ().
by Alexandre Julliard 24 Sep '12

24 Sep '12

Module: wine Branch: master Commit: eb4d20ef3181c42741bad790e4ac87fa39f0b6b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb4d20ef3181c42741bad790e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Sep 23 22:14:49 2012 +0200 wined3d: Take the data type of immediates into account in shader_glsl_get_register_name(). --- dlls/wined3d/glsl_shader.c | 44 ++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 40 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 5c0cdfb..14d165b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1478,13 +1478,49 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * switch (reg->immconst_type) { case WINED3D_IMMCONST_SCALAR: - sprintf(register_name, "%.8e", *(const float *)reg->immconst_data); + switch (reg->data_type) + { + case WINED3D_DATA_FLOAT: + sprintf(register_name, "%.8e", *(const float *)reg->immconst_data); + break; + case WINED3D_DATA_INT: + sprintf(register_name, "%#x", reg->immconst_data[0]); + break; + case WINED3D_DATA_RESOURCE: + case WINED3D_DATA_SAMPLER: + case WINED3D_DATA_UINT: + sprintf(register_name, "%#xu", reg->immconst_data[0]); + break; + default: + sprintf(register_name, "<unhandled data type %#x>", reg->data_type); + break; + } break; case WINED3D_IMMCONST_VEC4: - sprintf(register_name, "vec4(%.8e, %.8e, %.8e, %.8e)", - *(const float *)&reg->immconst_data[0], *(const float *)&reg->immconst_data[1], - *(const float *)&reg->immconst_data[2], *(const float *)&reg->immconst_data[3]); + switch (reg->data_type) + { + case WINED3D_DATA_FLOAT: + sprintf(register_name, "vec4(%.8e, %.8e, %.8e, %.8e)", + *(const float *)&reg->immconst_data[0], *(const float *)&reg->immconst_data[1], + *(const float *)&reg->immconst_data[2], *(const float *)&reg->immconst_data[3]); + break; + case WINED3D_DATA_INT: + sprintf(register_name, "ivec4(%#x, %#x, %#x, %#x)", + reg->immconst_data[0], reg->immconst_data[1], + reg->immconst_data[2], reg->immconst_data[3]); + break; + case WINED3D_DATA_RESOURCE: + case WINED3D_DATA_SAMPLER: + case WINED3D_DATA_UINT: + sprintf(register_name, "uvec4(%#xu, %#xu, %#xu, %#xu)", + reg->immconst_data[0], reg->immconst_data[1], + reg->immconst_data[2], reg->immconst_data[3]); + break; + default: + sprintf(register_name, "<unhandled data type %#x>", reg->data_type); + break; + } break; default:

1 0

Christian Costa : amstream: Rename media stream objects and their method names for multi interfaces support .
by Alexandre Julliard 24 Sep '12

24 Sep '12

Module: wine Branch: master Commit: b74bcb61f9fa97c0c7179996b56c070778bd73c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b74bcb61f9fa97c0c7179996b… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sun Sep 23 20:43:31 2012 +0200 amstream: Rename media stream objects and their method names for multi interfaces support. --- dlls/amstream/mediastream.c | 178 +++++++++++++++++++++--------------------- 1 files changed, 89 insertions(+), 89 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b74bcb61f9fa97c0c7179…

1 0

Christian Costa : amstream: Add IAMMediaStream interface to DirectDrawMediaStream object.
by Alexandre Julliard 24 Sep '12

24 Sep '12

Module: wine Branch: master Commit: 6b73c61c63aec72f2635f4b1080693e623d2bb09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b73c61c63aec72f2635f4b10… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sun Sep 23 20:43:40 2012 +0200 amstream: Add IAMMediaStream interface to DirectDrawMediaStream object. --- dlls/amstream/mediastream.c | 236 ++++++++++++++++++++++++++++++++++++---- dlls/amstream/tests/amstream.c | 4 +- 2 files changed, 218 insertions(+), 22 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6b73c61c63aec72f2635f…

1 0

Christian Costa : amstream: Add IAMMediaStream interface to AudioMediaStream object.
by Alexandre Julliard 24 Sep '12

24 Sep '12

Module: wine Branch: master Commit: e8c256b185fe07bcc835c58a26186839f5acd11b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8c256b185fe07bcc835c58a2… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sun Sep 23 20:43:48 2012 +0200 amstream: Add IAMMediaStream interface to AudioMediaStream object. --- dlls/amstream/mediastream.c | 203 +++++++++++++++++++++++++++++++++++++++- dlls/amstream/tests/amstream.c | 4 +- 2 files changed, 202 insertions(+), 5 deletions(-) diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c index 0657893..dd037fc 100644 --- a/dlls/amstream/mediastream.c +++ b/dlls/amstream/mediastream.c @@ -455,6 +455,7 @@ HRESULT ddrawmediastream_create(IMultiMediaStream *parent, const MSPID *purpose_ } typedef struct { + IAMMediaStream IAMMediaStream_iface; IAudioMediaStream IAudioMediaStream_iface; LONG ref; IMultiMediaStream* parent; @@ -462,6 +463,194 @@ typedef struct { STREAM_TYPE stream_type; } AudioMediaStreamImpl; +static inline AudioMediaStreamImpl *impl_from_AudioMediaStream_IAMMediaStream(IAMMediaStream *iface) +{ + return CONTAINING_RECORD(iface, AudioMediaStreamImpl, IAMMediaStream_iface); +} + +/*** IUnknown methods ***/ +static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_QueryInterface(IAMMediaStream *iface, + REFIID riid, void **ret_iface) +{ + AudioMediaStreamImpl *This = impl_from_AudioMediaStream_IAMMediaStream(iface); + + TRACE("(%p/%p)->(%s,%p)\n", iface, This, debugstr_guid(riid), ret_iface); + + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IMediaStream) || + IsEqualGUID(riid, &IID_IAMMediaStream)) + { + IAMMediaStream_AddRef(iface); + *ret_iface = iface; + return S_OK; + } + else if (IsEqualGUID(riid, &IID_IAudioMediaStream)) + { + IAMMediaStream_AddRef(iface); + *ret_iface = &This->IAudioMediaStream_iface; + return S_OK; + } + + ERR("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), ret_iface); + return E_NOINTERFACE; +} + +static ULONG WINAPI AudioMediaStreamImpl_IAMMediaStream_AddRef(IAMMediaStream *iface) +{ + AudioMediaStreamImpl *This = impl_from_AudioMediaStream_IAMMediaStream(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p/%p)->(): new ref = %u\n", iface, This, ref); + + return ref; +} + +static ULONG WINAPI AudioMediaStreamImpl_IAMMediaStream_Release(IAMMediaStream *iface) +{ + AudioMediaStreamImpl *This = impl_from_AudioMediaStream_IAMMediaStream(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p/%p)->(): new ref = %u\n", iface, This, ref); + + if (!ref) + HeapFree(GetProcessHeap(), 0, This); + + return ref; +} + +/*** IMediaStream methods ***/ +static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_GetMultiMediaStream(IAMMediaStream *iface, + IMultiMediaStream** multi_media_stream) +{ + AudioMediaStreamImpl *This = impl_from_AudioMediaStream_IAMMediaStream(iface); + + FIXME("(%p/%p)->(%p) stub!\n", This, iface, multi_media_stream); + + return S_FALSE; +} + +static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_GetInformation(IAMMediaStream *iface, + MSPID *purpose_id, STREAM_TYPE *type) +{ + AudioMediaStreamImpl *This = impl_from_AudioMediaStream_IAMMediaStream(iface); + + TRACE("(%p/%p)->(%p,%p)\n", This, iface, purpose_id, type); + + if (purpose_id) + *purpose_id = This->purpose_id; + if (type) + *type = This->stream_type; + + return S_OK; +} + +static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_SetSameFormat(IAMMediaStream *iface, + IMediaStream *pStreamThatHasDesiredFormat, DWORD flags) +{ + AudioMediaStreamImpl *This = impl_from_AudioMediaStream_IAMMediaStream(iface); + + FIXME("(%p/%p)->(%p,%x) stub!\n", This, iface, pStreamThatHasDesiredFormat, flags); + + return S_FALSE; +} + +static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_AllocateSample(IAMMediaStream *iface, + DWORD flags, IStreamSample **sample) +{ + AudioMediaStreamImpl *This = impl_from_AudioMediaStream_IAMMediaStream(iface); + + FIXME("(%p/%p)->(%x,%p) stub!\n", This, iface, flags, sample); + + return S_FALSE; +} + +static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_CreateSharedSample(IAMMediaStream *iface, + IStreamSample *existing_sample, DWORD flags, IStreamSample **sample) +{ + AudioMediaStreamImpl *This = impl_from_AudioMediaStream_IAMMediaStream(iface); + + FIXME("(%p/%p)->(%p,%x,%p) stub!\n", This, iface, existing_sample, flags, sample); + + return S_FALSE; +} + +static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_SendEndOfStream(IAMMediaStream *iface, DWORD flags) +{ + AudioMediaStreamImpl *This = impl_from_AudioMediaStream_IAMMediaStream(iface); + + FIXME("(%p/%p)->(%x) stub!\n", This, iface, flags); + + return S_FALSE; +} + +/*** IAMMediaStream methods ***/ +static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_Initialize(IAMMediaStream *iface, IUnknown *source_object, DWORD flags, + REFMSPID purpose_id, const STREAM_TYPE stream_type) +{ + AudioMediaStreamImpl *This = impl_from_AudioMediaStream_IAMMediaStream(iface); + + FIXME("(%p/%p)->(%p,%x,%p,%u) stub!\n", This, iface, source_object, flags, purpose_id, stream_type); + + return S_FALSE; +} + +static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_SetState(IAMMediaStream *iface, FILTER_STATE state) +{ + AudioMediaStreamImpl *This = impl_from_AudioMediaStream_IAMMediaStream(iface); + + FIXME("(%p/%p)->(%u) stub!\n", This, iface, state); + + return S_FALSE; +} + +static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_JoinAMMultiMediaStream(IAMMediaStream *iface, IAMMultiMediaStream *am_multi_media_stream) +{ + AudioMediaStreamImpl *This = impl_from_AudioMediaStream_IAMMediaStream(iface); + + FIXME("(%p/%p)->(%p) stub!\n", This, iface, am_multi_media_stream); + + return S_FALSE; +} + +static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_JoinFilter(IAMMediaStream *iface, IMediaStreamFilter *media_stream_filter) +{ + AudioMediaStreamImpl *This = impl_from_AudioMediaStream_IAMMediaStream(iface); + + FIXME("(%p/%p)->(%p) stub!\n", This, iface, media_stream_filter); + + return S_FALSE; +} + +static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_JoinFilterGraph(IAMMediaStream *iface, IFilterGraph *filtergraph) +{ + AudioMediaStreamImpl *This = impl_from_AudioMediaStream_IAMMediaStream(iface); + + FIXME("(%p/%p)->(%p) stub!\n", This, iface, filtergraph); + + return S_FALSE; +} + +static const struct IAMMediaStreamVtbl AudioMediaStreamImpl_IAMMediaStream_Vtbl = +{ + /*** IUnknown methods ***/ + AudioMediaStreamImpl_IAMMediaStream_QueryInterface, + AudioMediaStreamImpl_IAMMediaStream_AddRef, + AudioMediaStreamImpl_IAMMediaStream_Release, + /*** IMediaStream methods ***/ + AudioMediaStreamImpl_IAMMediaStream_GetMultiMediaStream, + AudioMediaStreamImpl_IAMMediaStream_GetInformation, + AudioMediaStreamImpl_IAMMediaStream_SetSameFormat, + AudioMediaStreamImpl_IAMMediaStream_AllocateSample, + AudioMediaStreamImpl_IAMMediaStream_CreateSharedSample, + AudioMediaStreamImpl_IAMMediaStream_SendEndOfStream, + /*** IAMMediaStream methods ***/ + AudioMediaStreamImpl_IAMMediaStream_Initialize, + AudioMediaStreamImpl_IAMMediaStream_SetState, + AudioMediaStreamImpl_IAMMediaStream_JoinAMMultiMediaStream, + AudioMediaStreamImpl_IAMMediaStream_JoinFilter, + AudioMediaStreamImpl_IAMMediaStream_JoinFilterGraph +}; + static inline AudioMediaStreamImpl *impl_from_IAudioMediaStream(IAudioMediaStream *iface) { return CONTAINING_RECORD(iface, AudioMediaStreamImpl, IAudioMediaStream_iface); @@ -483,6 +672,13 @@ static HRESULT WINAPI AudioMediaStreamImpl_IAudioMediaStream_QueryInterface(IAud *ret_iface = iface; return S_OK; } + else if (IsEqualGUID(riid, &IID_IAMMediaStream)) + { + IAudioMediaStream_AddRef(iface); + *ret_iface = &This->IAMMediaStream_iface; + return S_OK; + } + *ret_iface = NULL; @@ -615,7 +811,7 @@ static HRESULT WINAPI AudioMediaStreamImpl_IAudioMediaStream_CreateSample(IAudio return audiostreamsample_create(iface, audio_data, sample); } -static const struct IAudioMediaStreamVtbl AudioMediaStreamImpl_AudioMediaStream_Vtbl = +static const struct IAudioMediaStreamVtbl AudioMediaStreamImpl_IAudioMediaStream_Vtbl = { /*** IUnknown methods ***/ AudioMediaStreamImpl_IAudioMediaStream_QueryInterface, @@ -648,14 +844,15 @@ HRESULT audiomediastream_create(IMultiMediaStream *parent, const MSPID *purpose_ return E_OUTOFMEMORY; } - object->IAudioMediaStream_iface.lpVtbl = &AudioMediaStreamImpl_AudioMediaStream_Vtbl; + object->IAMMediaStream_iface.lpVtbl = &AudioMediaStreamImpl_IAMMediaStream_Vtbl; + object->IAudioMediaStream_iface.lpVtbl = &AudioMediaStreamImpl_IAudioMediaStream_Vtbl; object->ref = 1; object->parent = parent; object->purpose_id = *purpose_id; object->stream_type = stream_type; - *media_stream = (IMediaStream*)&object->IAudioMediaStream_iface; + *media_stream = (IMediaStream*)&object->IAMMediaStream_iface; return S_OK; } diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index fa9d0e4..6a198e0 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -326,8 +326,8 @@ static void test_media_streams(void) IAudioStreamSample *audio_sample = NULL; hr = IMediaStream_QueryInterface(audio_stream, &IID_IAMMediaStream, (LPVOID*)&am_media_stream); - todo_wine ok(hr == S_OK, "IMediaStream_QueryInterface returned: %x\n", hr); - todo_wine ok((void*)am_media_stream == (void*)audio_stream, "Not same interface, got %p expected %p\n", am_media_stream, video_stream); + ok(hr == S_OK, "IMediaStream_QueryInterface returned: %x\n", hr); + ok((void*)am_media_stream == (void*)audio_stream, "Not same interface, got %p expected %p\n", am_media_stream, audio_stream); if (hr == S_OK) IAMMediaStream_Release(am_media_stream);

1 0

Dmitry Timoshkov : windowscodecs: Add some tests for GIF palette.
by Alexandre Julliard 24 Sep '12

24 Sep '12

Module: wine Branch: master Commit: 51242a3f18ddf75a8da241d2098e5f1cd70e6da6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51242a3f18ddf75a8da241d20… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Sep 24 13:22:33 2012 +0900 windowscodecs: Add some tests for GIF palette. --- dlls/windowscodecs/tests/Makefile.in | 1 + dlls/windowscodecs/tests/gifformat.c | 146 ++++++++++++++++++++++++++++++++++ 2 files changed, 147 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/tests/Makefile.in b/dlls/windowscodecs/tests/Makefile.in index 325c28e..d4b75ae 100644 --- a/dlls/windowscodecs/tests/Makefile.in +++ b/dlls/windowscodecs/tests/Makefile.in @@ -5,6 +5,7 @@ C_SRCS = \ bitmap.c \ bmpformat.c \ converter.c \ + gifformat.c \ icoformat.c \ info.c \ metadata.c \ diff --git a/dlls/windowscodecs/tests/gifformat.c b/dlls/windowscodecs/tests/gifformat.c new file mode 100644 index 0000000..4c78ebb --- /dev/null +++ b/dlls/windowscodecs/tests/gifformat.c @@ -0,0 +1,146 @@ +/* + * Copyright 2012 Dmitry Timoshkov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include <stdio.h> + +#define COBJMACROS + +#include "windef.h" +#include "wincodec.h" +#include "wine/test.h" + +static const char gif_local_palette[] = { +/* LSD */'G','I','F','8','7','a',0x01,0x00,0x01,0x00,0x27,0x02,0x00, +/* GCE */0x21,0xf9,0x04,0x01,0x05,0x00,0x01,0x00, /* index 1 */ +/* IMD */0x2c,0x00,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0x81, +/* palette */0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c, +0x02,0x02,0x44,0x01,0x00,0x3b +}; + +static IWICImagingFactory *factory; + +static const char *debugstr_guid(const GUID *guid) +{ + static char buf[50]; + + if (!guid) return "(null)"; + sprintf(buf, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", + guid->Data1, guid->Data2, guid->Data3, guid->Data4[0], + guid->Data4[1], guid->Data4[2], guid->Data4[3], guid->Data4[4], + guid->Data4[5], guid->Data4[6], guid->Data4[7]); + return buf; +} + +static IWICBitmapDecoder *create_decoder(const void *image_data, UINT image_size) +{ + HGLOBAL hmem; + BYTE *data; + HRESULT hr; + IWICBitmapDecoder *decoder = NULL; + IStream *stream; + GUID format; + + hmem = GlobalAlloc(0, image_size); + data = GlobalLock(hmem); + memcpy(data, image_data, image_size); + GlobalUnlock(hmem); + + hr = CreateStreamOnHGlobal(hmem, TRUE, &stream); + ok(hr == S_OK, "CreateStreamOnHGlobal error %#x\n", hr); + + hr = IWICImagingFactory_CreateDecoderFromStream(factory, stream, NULL, 0, &decoder); + ok(hr == S_OK, "CreateDecoderFromStream error %#x\n", hr); + + hr = IWICBitmapDecoder_GetContainerFormat(decoder, &format); + ok(hr == S_OK, "GetContainerFormat error %#x\n", hr); + ok(IsEqualGUID(&format, &GUID_ContainerFormatGif), + "wrong container format %s\n", debugstr_guid(&format)); + + IStream_Release(stream); + + return decoder; +} + +static void test_local_gif_palette(void) +{ + HRESULT hr; + IWICBitmapDecoder *decoder; + IWICBitmapFrameDecode *frame; + IWICPalette *palette; + GUID format; + UINT count, ret; + WICColor color[256]; + + decoder = create_decoder(gif_local_palette, sizeof(gif_local_palette)); + ok(decoder != 0, "Failed to load GIF image data\n"); + + hr = IWICImagingFactory_CreatePalette(factory, &palette); + ok(hr == S_OK, "CreatePalette error %#x\n", hr); + + /* global palette */ + hr = IWICBitmapDecoder_CopyPalette(decoder, palette); +todo_wine + ok(hr == WINCODEC_ERR_FRAMEMISSING, + "expected WINCODEC_ERR_FRAMEMISSING, got %#x\n", hr); + + /* frame palette */ + hr = IWICBitmapDecoder_GetFrame(decoder, 0, &frame); + ok(hr == S_OK, "GetFrame error %#x\n", hr); + + hr = IWICBitmapFrameDecode_GetPixelFormat(frame, &format); + ok(hr == S_OK, "GetPixelFormat error %#x\n", hr); + ok(IsEqualGUID(&format, &GUID_WICPixelFormat8bppIndexed), + "wrong pixel format %s\n", debugstr_guid(&format)); + + hr = IWICBitmapFrameDecode_CopyPalette(frame, palette); + ok(hr == S_OK, "CopyPalette error %#x\n", hr); + + hr = IWICPalette_GetColorCount(palette, &count); + ok(hr == S_OK, "GetColorCount error %#x\n", hr); + ok(count == 4, "expected 4, got %u\n", count); + + hr = IWICPalette_GetColors(palette, count, color, &ret); + ok(hr == S_OK, "GetColors error %#x\n", hr); + ok(ret == count, "expected %u, got %u\n", count, ret); + ok(color[0] == 0xff010203, "expected 0xff010203, got %#x\n", color[0]); +todo_wine + ok(color[1] == 0x00040506, "expected 0x00040506, got %#x\n", color[1]); + ok(color[2] == 0xff070809, "expected 0xff070809, got %#x\n", color[2]); + ok(color[3] == 0xff0a0b0c, "expected 0xff0a0b0c, got %#x\n", color[3]); + + IWICPalette_Release(palette); + IWICBitmapFrameDecode_Release(frame); + IWICBitmapDecoder_Release(decoder); +} + +START_TEST(gifformat) +{ + HRESULT hr; + + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICImagingFactory, (void **)&factory); + ok(hr == S_OK, "CoCreateInstance error %#x\n", hr); + if (FAILED(hr)) return; + + test_local_gif_palette(); + + IWICImagingFactory_Release(factory); + CoUninitialize(); +}

1 0

Dmitry Timoshkov : windowscodecs: Return WINCODEC_ERR_FRAMEMISSING if there is no global GIF palette.
by Alexandre Julliard 24 Sep '12

24 Sep '12

Module: wine Branch: master Commit: 56f37637b8dd5a9a8096c2711cd1d680c12d95d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56f37637b8dd5a9a8096c2711… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Sep 24 13:22:42 2012 +0900 windowscodecs: Return WINCODEC_ERR_FRAMEMISSING if there is no global GIF palette. --- dlls/windowscodecs/gifformat.c | 2 +- dlls/windowscodecs/tests/gifformat.c | 1 - 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/gifformat.c b/dlls/windowscodecs/gifformat.c index 81bde20..c378348 100644 --- a/dlls/windowscodecs/gifformat.c +++ b/dlls/windowscodecs/gifformat.c @@ -1169,7 +1169,7 @@ static HRESULT WINAPI GifDecoder_CopyPalette(IWICBitmapDecoder *iface, IWICPalette *pIPalette) { TRACE("(%p,%p)\n", iface, pIPalette); - return WINCODEC_ERR_PALETTEUNAVAILABLE; + return WINCODEC_ERR_FRAMEMISSING; } static HRESULT WINAPI GifDecoder_GetMetadataQueryReader(IWICBitmapDecoder *iface, diff --git a/dlls/windowscodecs/tests/gifformat.c b/dlls/windowscodecs/tests/gifformat.c index 4c78ebb..8788696 100644 --- a/dlls/windowscodecs/tests/gifformat.c +++ b/dlls/windowscodecs/tests/gifformat.c @@ -95,7 +95,6 @@ static void test_local_gif_palette(void) /* global palette */ hr = IWICBitmapDecoder_CopyPalette(decoder, palette); -todo_wine ok(hr == WINCODEC_ERR_FRAMEMISSING, "expected WINCODEC_ERR_FRAMEMISSING, got %#x\n", hr);

1 0

Dmitry Timoshkov : windowscodecs: Fix calculation of transparent GIF color index.
by Alexandre Julliard 24 Sep '12

24 Sep '12

Module: wine Branch: master Commit: 507abc41ca0fb9fe82cef393d77d021a14596867 URL: http://source.winehq.org/git/wine.git/?a=commit;h=507abc41ca0fb9fe82cef393d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Sep 24 13:22:49 2012 +0900 windowscodecs: Fix calculation of transparent GIF color index. --- dlls/windowscodecs/gifformat.c | 6 +++--- dlls/windowscodecs/tests/gifformat.c | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/gifformat.c b/dlls/windowscodecs/gifformat.c index c378348..fc6909b 100644 --- a/dlls/windowscodecs/gifformat.c +++ b/dlls/windowscodecs/gifformat.c @@ -729,9 +729,9 @@ static HRESULT WINAPI GifFrameDecode_CopyPalette(IWICBitmapFrameDecode *iface, /* look for the transparent color extension */ for (i = 0; i < This->frame->Extensions.ExtensionBlockCount; ++i) { eb = This->frame->Extensions.ExtensionBlocks + i; - if (eb->Function == 0xF9 && eb->ByteCount == 4) { - if ((eb->Bytes[0] & 1) == 1) { - trans = (unsigned char)eb->Bytes[3]; + if (eb->Function == GRAPHICS_EXT_FUNC_CODE && eb->ByteCount == 8) { + if (eb->Bytes[3] & 1) { + trans = (unsigned char)eb->Bytes[6]; colors[trans] &= 0xffffff; /* set alpha to 0 */ break; } diff --git a/dlls/windowscodecs/tests/gifformat.c b/dlls/windowscodecs/tests/gifformat.c index 8788696..b9c1059 100644 --- a/dlls/windowscodecs/tests/gifformat.c +++ b/dlls/windowscodecs/tests/gifformat.c @@ -118,7 +118,6 @@ static void test_local_gif_palette(void) ok(hr == S_OK, "GetColors error %#x\n", hr); ok(ret == count, "expected %u, got %u\n", count, ret); ok(color[0] == 0xff010203, "expected 0xff010203, got %#x\n", color[0]); -todo_wine ok(color[1] == 0x00040506, "expected 0x00040506, got %#x\n", color[1]); ok(color[2] == 0xff070809, "expected 0xff070809, got %#x\n", color[2]); ok(color[3] == 0xff0a0b0c, "expected 0xff0a0b0c, got %#x\n", color[3]);

1 0

Dmitry Timoshkov : windowscodecs: Add some tests for GIF global palette.
by Alexandre Julliard 24 Sep '12

24 Sep '12

Module: wine Branch: master Commit: af8b90c1062544f398409ce61fa24917cb554623 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af8b90c1062544f398409ce61… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Sep 24 13:22:57 2012 +0900 windowscodecs: Add some tests for GIF global palette. --- dlls/windowscodecs/tests/gifformat.c | 73 ++++++++++++++++++++++++++++++++++ 1 files changed, 73 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/tests/gifformat.c b/dlls/windowscodecs/tests/gifformat.c index b9c1059..b633ad0 100644 --- a/dlls/windowscodecs/tests/gifformat.c +++ b/dlls/windowscodecs/tests/gifformat.c @@ -25,6 +25,14 @@ #include "wincodec.h" #include "wine/test.h" +static const char gif_global_palette[] = { +/* LSD */'G','I','F','8','7','a',0x01,0x00,0x01,0x00,0xa1,0x02,0x00, +/* palette */0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c, +/* GCE */0x21,0xf9,0x04,0x01,0x05,0x00,0x01,0x00, /* index 1 */ +/* IMD */0x2c,0x00,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0x00, +0x02,0x02,0x44,0x01,0x00,0x3b +}; + static const char gif_local_palette[] = { /* LSD */'G','I','F','8','7','a',0x01,0x00,0x01,0x00,0x27,0x02,0x00, /* GCE */0x21,0xf9,0x04,0x01,0x05,0x00,0x01,0x00, /* index 1 */ @@ -77,6 +85,70 @@ static IWICBitmapDecoder *create_decoder(const void *image_data, UINT image_size return decoder; } +static void test_global_gif_palette(void) +{ + HRESULT hr; + IWICBitmapDecoder *decoder; + IWICBitmapFrameDecode *frame; + IWICPalette *palette; + GUID format; + UINT count, ret; + WICColor color[256]; + + decoder = create_decoder(gif_global_palette, sizeof(gif_global_palette)); + ok(decoder != 0, "Failed to load GIF image data\n"); + + hr = IWICImagingFactory_CreatePalette(factory, &palette); + ok(hr == S_OK, "CreatePalette error %#x\n", hr); + + /* global palette */ + hr = IWICBitmapDecoder_CopyPalette(decoder, palette); +todo_wine + ok(hr == S_OK, "CopyPalette error %#x\n", hr); + + hr = IWICPalette_GetColorCount(palette, &count); + ok(hr == S_OK, "GetColorCount error %#x\n", hr); +todo_wine + ok(count == 4, "expected 4, got %u\n", count); + + hr = IWICPalette_GetColors(palette, count, color, &ret); + ok(hr == S_OK, "GetColors error %#x\n", hr); + ok(ret == count, "expected %u, got %u\n", count, ret); +todo_wine { + ok(color[0] == 0xff010203, "expected 0xff010203, got %#x\n", color[0]); + ok(color[1] == 0x00040506, "expected 0x00040506, got %#x\n", color[1]); + ok(color[2] == 0xff070809, "expected 0xff070809, got %#x\n", color[2]); + ok(color[3] == 0xff0a0b0c, "expected 0xff0a0b0c, got %#x\n", color[3]); +} + /* frame palette */ + hr = IWICBitmapDecoder_GetFrame(decoder, 0, &frame); + ok(hr == S_OK, "GetFrame error %#x\n", hr); + + hr = IWICBitmapFrameDecode_GetPixelFormat(frame, &format); + ok(hr == S_OK, "GetPixelFormat error %#x\n", hr); + ok(IsEqualGUID(&format, &GUID_WICPixelFormat8bppIndexed), + "wrong pixel format %s\n", debugstr_guid(&format)); + + hr = IWICBitmapFrameDecode_CopyPalette(frame, palette); + ok(hr == S_OK, "CopyPalette error %#x\n", hr); + + hr = IWICPalette_GetColorCount(palette, &count); + ok(hr == S_OK, "GetColorCount error %#x\n", hr); + ok(count == 4, "expected 4, got %u\n", count); + + hr = IWICPalette_GetColors(palette, count, color, &ret); + ok(hr == S_OK, "GetColors error %#x\n", hr); + ok(ret == count, "expected %u, got %u\n", count, ret); + ok(color[0] == 0xff010203, "expected 0xff010203, got %#x\n", color[0]); + ok(color[1] == 0x00040506, "expected 0x00040506, got %#x\n", color[1]); + ok(color[2] == 0xff070809, "expected 0xff070809, got %#x\n", color[2]); + ok(color[3] == 0xff0a0b0c, "expected 0xff0a0b0c, got %#x\n", color[3]); + + IWICPalette_Release(palette); + IWICBitmapFrameDecode_Release(frame); + IWICBitmapDecoder_Release(decoder); +} + static void test_local_gif_palette(void) { HRESULT hr; @@ -137,6 +209,7 @@ START_TEST(gifformat) ok(hr == S_OK, "CoCreateInstance error %#x\n", hr); if (FAILED(hr)) return; + test_global_gif_palette(); test_local_gif_palette(); IWICImagingFactory_Release(factory);

1 0

Christian Costa : dmsynth: Implement IKsControl_KsProperty for Synth and SynthSink objects.
by Alexandre Julliard 21 Sep '12

21 Sep '12

Module: wine Branch: master Commit: b3b7616f79c30b846e4ce7a30ceba88543eb6683 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3b7616f79c30b846e4ce7a30… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Sep 21 15:44:37 2012 +0200 dmsynth: Implement IKsControl_KsProperty for Synth and SynthSink objects. --- dlls/dmsynth/synth.c | 48 ++++++++++++++++++++++++++++++++++++++++- dlls/dmsynth/synthsink.c | 28 ++++++++++++++++++++++- dlls/dmsynth/tests/dmsynth.c | 39 ++++++++++++++++++++++++++++++++++ 3 files changed, 111 insertions(+), 4 deletions(-) diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index 29761d7..f34594d 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -2,6 +2,7 @@ * IDirectMusicSynth8 Implementation * * Copyright (C) 2003-2004 Rok Mandeljc + * Copyright (C) 2012 Christian Costa * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -415,9 +416,52 @@ static ULONG WINAPI DMSynthImpl_IKsControl_Release(IKsControl* iface) static HRESULT WINAPI DMSynthImpl_IKsControl_KsProperty(IKsControl* iface, PKSPROPERTY Property, ULONG PropertyLength, LPVOID PropertyData, ULONG DataLength, ULONG* BytesReturned) { - FIXME("(%p)->(%p, %u, %p, %u, %p): stub\n", iface, Property, PropertyLength, PropertyData, DataLength, BytesReturned); + TRACE("(%p)->(%p, %u, %p, %u, %p)\n", iface, Property, PropertyLength, PropertyData, DataLength, BytesReturned); - return E_NOTIMPL; + TRACE("Property = %s - %u - %u\n", debugstr_guid(&Property->Set), Property->Id, Property->Flags); + + if (Property->Flags != KSPROPERTY_TYPE_GET) + { + FIXME("Property flags %u not yet supported\n", Property->Flags); + return S_FALSE; + } + + if (DataLength < sizeof(DWORD)) + return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + + if (IsEqualGUID(&Property->Set, &GUID_DMUS_PROP_INSTRUMENT2)) + { + *(DWORD*)PropertyData = TRUE; + *BytesReturned = sizeof(DWORD); + } + else if (IsEqualGUID(&Property->Set, &GUID_DMUS_PROP_DLS2)) + { + *(DWORD*)PropertyData = TRUE; + *BytesReturned = sizeof(DWORD); + } + else if (IsEqualGUID(&Property->Set, &GUID_DMUS_PROP_GM_Hardware)) + { + *(DWORD*)PropertyData = FALSE; + *BytesReturned = sizeof(DWORD); + } + else if (IsEqualGUID(&Property->Set, &GUID_DMUS_PROP_GS_Hardware)) + { + *(DWORD*)PropertyData = FALSE; + *BytesReturned = sizeof(DWORD); + } + else if (IsEqualGUID(&Property->Set, &GUID_DMUS_PROP_XG_Hardware)) + { + *(DWORD*)PropertyData = FALSE; + *BytesReturned = sizeof(DWORD); + } + else + { + FIXME("Unknown property %s\n", debugstr_guid(&Property->Set)); + *(DWORD*)PropertyData = FALSE; + *BytesReturned = sizeof(DWORD); + } + + return S_OK; } static HRESULT WINAPI DMSynthImpl_IKsControl_KsMethod(IKsControl* iface, PKSMETHOD Method, ULONG MethodLength, LPVOID MethodData, diff --git a/dlls/dmsynth/synthsink.c b/dlls/dmsynth/synthsink.c index a63f36c..4d2001c 100644 --- a/dlls/dmsynth/synthsink.c +++ b/dlls/dmsynth/synthsink.c @@ -2,6 +2,7 @@ * IDirectMusicSynthSink Implementation * * Copyright (C) 2003-2004 Rok Mandeljc + * Copyright (C) 2012 Christian Costa * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -209,9 +210,32 @@ static ULONG WINAPI DMSynthSinkImpl_IKsControl_Release(IKsControl* iface) static HRESULT WINAPI DMSynthSinkImpl_IKsControl_KsProperty(IKsControl* iface, PKSPROPERTY Property, ULONG PropertyLength, LPVOID PropertyData, ULONG DataLength, ULONG* BytesReturned) { - FIXME("(%p)->(%p, %u, %p, %u, %p): stub\n", iface, Property, PropertyLength, PropertyData, DataLength, BytesReturned); + TRACE("(%p)->(%p, %u, %p, %u, %p)\n", iface, Property, PropertyLength, PropertyData, DataLength, BytesReturned); - return E_NOTIMPL; + TRACE("Property = %s - %u - %u\n", debugstr_guid(&Property->Set), Property->Id, Property->Flags); + + if (Property->Flags != KSPROPERTY_TYPE_GET) + { + FIXME("Property flags %u not yet supported\n", Property->Flags); + return S_FALSE; + } + + if (DataLength < sizeof(DWORD)) + return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + + if (IsEqualGUID(&Property->Set, &GUID_DMUS_PROP_SinkUsesDSound)) + { + *(DWORD*)PropertyData = TRUE; + *BytesReturned = sizeof(DWORD); + } + else + { + FIXME("Unknown property %s\n", debugstr_guid(&Property->Set)); + *(DWORD*)PropertyData = FALSE; + *BytesReturned = sizeof(DWORD); + } + + return S_OK; } static HRESULT WINAPI DMSynthSinkImpl_IKsControl_KsMethod(IKsControl* iface, PKSMETHOD Method, ULONG MethodLength, LPVOID MethodData, diff --git a/dlls/dmsynth/tests/dmsynth.c b/dlls/dmsynth/tests/dmsynth.c index 4ffc90c..83a0bca 100644 --- a/dlls/dmsynth/tests/dmsynth.c +++ b/dlls/dmsynth/tests/dmsynth.c @@ -39,6 +39,9 @@ static void test_dmsynth(void) IKsControl* control_synth = NULL; IKsControl* control_sink = NULL; HRESULT hr; + KSPROPERTY property; + ULONG value; + ULONG bytes; hr = CoCreateInstance(&CLSID_DirectMusicSynth, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicSynth, (LPVOID*)&dmsynth); if (hr != S_OK) @@ -52,9 +55,45 @@ static void test_dmsynth(void) hr = IDirectMusicSynth_QueryInterface(dmsynth, &IID_IKsControl, (LPVOID*)&control_synth); ok(hr == S_OK, "IDirectMusicSynth_QueryInterface returned: %x\n", hr); + + property.Id = 0; + property.Flags = KSPROPERTY_TYPE_GET; + + property.Set = GUID_DMUS_PROP_INSTRUMENT2; + hr = IKsControl_KsProperty(control_synth, &property, sizeof(property), &value, sizeof(value), &bytes); + ok(hr == S_OK, "IKsControl_KsProperty returned: %x\n", hr); + ok(bytes == sizeof(DWORD), "Returned bytes: %u, should be 4\n", bytes); + ok(value == TRUE, "Return value: %u, should be 1\n", value); + property.Set = GUID_DMUS_PROP_DLS2; + hr = IKsControl_KsProperty(control_synth, &property, sizeof(property), &value, sizeof(value), &bytes); + ok(hr == S_OK, "IKsControl_KsProperty returned: %x\n", hr); + ok(bytes == sizeof(DWORD), "Returned bytes: %u, should be 4\n", bytes); + ok(value == TRUE, "Return value: %u, should be 1\n", value); + property.Set = GUID_DMUS_PROP_GM_Hardware; + hr = IKsControl_KsProperty(control_synth, &property, sizeof(property), &value, sizeof(value), &bytes); + ok(hr == S_OK, "IKsControl_KsProperty returned: %x\n", hr); + ok(bytes == sizeof(DWORD), "Returned bytes: %u, should be 4\n", bytes); + ok(value == FALSE, "Return value: %u, should be 0\n", value); + property.Set = GUID_DMUS_PROP_GS_Hardware; + hr = IKsControl_KsProperty(control_synth, &property, sizeof(property), &value, sizeof(value), &bytes); + ok(hr == S_OK, "IKsControl_KsProperty returned: %x\n", hr); + ok(bytes == sizeof(DWORD), "Returned bytes: %u, should be 4\n", bytes); + ok(value == FALSE, "Return value: %u, should be 0\n", value); + property.Set = GUID_DMUS_PROP_XG_Hardware; + hr = IKsControl_KsProperty(control_synth, &property, sizeof(property), &value, sizeof(value), &bytes); + ok(hr == S_OK, "IKsControl_KsProperty returned: %x\n", hr); + ok(bytes == sizeof(DWORD), "Returned bytes: %u, should be 4\n", bytes); + ok(value == FALSE, "Return value: %u, should be 0\n", value); + hr = IDirectMusicSynthSink_QueryInterface(dmsynth_sink, &IID_IKsControl, (LPVOID*)&control_sink); ok(hr == S_OK, "IDirectMusicSynthSink_QueryInterface returned: %x\n", hr); + property.Set = GUID_DMUS_PROP_SinkUsesDSound; + hr = IKsControl_KsProperty(control_sink, &property, sizeof(property), &value, sizeof(value), &bytes); + ok(hr == S_OK, "IKsControl_KsProperty returned: %x\n", hr); + ok(bytes == sizeof(DWORD), "Returned bytes: %u, should be 4\n", bytes); + ok(value == TRUE, "Return value: %u, should be 1\n", value); + /* Synth has no default clock */ hr = IDirectMusicSynth_GetLatencyClock(dmsynth, &clock_synth); ok(hr == DMUS_E_NOSYNTHSINK, "IDirectMusicSynth_GetLatencyClock returned: %x\n", hr);

1 0

Christian Costa : dmime: Rename params in IDirectMusicPerformance8Impl_AssignPChannel & IDirectMusicPerformance8Impl_PChannelInfo .
by Alexandre Julliard 21 Sep '12

21 Sep '12

Module: wine Branch: master Commit: 1acf5a0401e48012104a6888d643668b8ded195d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1acf5a0401e48012104a6888d… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Sep 21 16:02:10 2012 +0200 dmime: Rename params in IDirectMusicPerformance8Impl_AssignPChannel & IDirectMusicPerformance8Impl_PChannelInfo. --- dlls/dmime/performance.c | 39 +++++++++++++++++++++------------------ 1 files changed, 21 insertions(+), 18 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 0f76e36..dfa1b77 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -684,34 +684,37 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_AssignPChannelBlock(IDirectMu } static HRESULT WINAPI IDirectMusicPerformance8Impl_AssignPChannel(IDirectMusicPerformance8 *iface, - DWORD dwPChannel, IDirectMusicPort *pPort, DWORD dwGroup, DWORD dwMChannel) + DWORD PChannel, IDirectMusicPort *port, DWORD group, DWORD MChannel) { - IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); + IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); - TRACE("(%p, %d, %p, %d, %d)\n", This, dwPChannel, pPort, dwGroup, dwMChannel); - if (NULL == pPort) return E_POINTER; - This->PChannel[dwPChannel].port = pPort; - This->PChannel[dwPChannel].group = dwGroup; - This->PChannel[dwPChannel].channel = dwMChannel; + TRACE("(%p)->(%d, %p, %d, %d)\n", This, PChannel, port, group, MChannel); - return S_OK; + if (!port) + return E_POINTER; + + This->PChannel[PChannel].port = port; + This->PChannel[PChannel].group = group; + This->PChannel[PChannel].channel = MChannel; + + return S_OK; } static HRESULT WINAPI IDirectMusicPerformance8Impl_PChannelInfo(IDirectMusicPerformance8 *iface, - DWORD dwPChannel, IDirectMusicPort **ppPort, DWORD *pdwGroup, DWORD *pdwMChannel) + DWORD PChannel, IDirectMusicPort **port, DWORD *group, DWORD *MChannel) { - IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); - DMUS_PORTPARAMS8 dmusportparams; - GUID def; + IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); + DMUS_PORTPARAMS8 port_params; + GUID default_port; - FIXME("(%p, %d, %p, %p, %p): stub\n", This, dwPChannel, ppPort, pdwGroup, pdwMChannel); + FIXME("(%p)->(%d, %p, %p, %p): stub\n", This, PChannel, port, group, MChannel); - dmusportparams.dwSize = sizeof(DMUS_PORTPARAMS8); - dmusportparams.dwValidParams = 0; - IDirectMusic8_GetDefaultPort(This->pDirectMusic, &def); - IDirectMusic8_CreatePort(This->pDirectMusic, &def, &dmusportparams, ppPort, NULL); + port_params.dwSize = sizeof(DMUS_PORTPARAMS8); + port_params.dwValidParams = 0; + IDirectMusic8_GetDefaultPort(This->pDirectMusic, &default_port); + IDirectMusic8_CreatePort(This->pDirectMusic, &default_port, &port_params, port, NULL); - return S_OK; + return S_OK; } static HRESULT WINAPI IDirectMusicPerformance8Impl_DownloadInstrument(IDirectMusicPerformance8 *iface,

1 0