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

Dmitry Timoshkov : gdiplus: Add parameter checks to GdipSetPropertyItem, print item contents in the trace.
by Alexandre Julliard 03 Jul '12

03 Jul '12

Module: wine Branch: master Commit: 56621638dfd00736ec5ae2879e6dc5ea7e220c38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56621638dfd00736ec5ae2879… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jul 3 11:58:21 2012 +0900 gdiplus: Add parameter checks to GdipSetPropertyItem, print item contents in the trace. --- dlls/gdiplus/image.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index a4dade8..db79eca 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -3348,7 +3348,9 @@ GpStatus WINGDIPAPI GdipSetPropertyItem(GpImage *image, GDIPCONST PropertyItem* { static int calls; - TRACE("(%p,%p)\n", image, item); + if (!image || !item) return InvalidParameter; + + TRACE("(%p,%p:%#x,%u,%u,%p)\n", image, item, item->id, item->type, item->length, item->value); if(!(calls++)) FIXME("not implemented\n");

1 0

Dmitry Timoshkov : gdiplus: Fix the convert_unit() comment to reflect its functionality.
by Alexandre Julliard 03 Jul '12

03 Jul '12

Module: wine Branch: master Commit: 1f3b53c5d826fa5de4c10642cf6f2416de54dc67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f3b53c5d826fa5de4c10642c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jul 3 17:33:41 2012 +0900 gdiplus: Fix the convert_unit() comment to reflect its functionality. --- dlls/gdiplus/gdiplus.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.c b/dlls/gdiplus/gdiplus.c index 56d8330..11ae2d8 100644 --- a/dlls/gdiplus/gdiplus.c +++ b/dlls/gdiplus/gdiplus.c @@ -317,7 +317,7 @@ GpStatus hresult_to_status(HRESULT res) } } -/* converts a given unit to its value in pixels */ +/* converts a given unit to its value in inches */ REAL convert_unit(REAL logpixels, GpUnit unit) { switch(unit)

1 0

Rico Schüller : d3dx9: Implement ID3DXBaseEffect:: SetMatrixPointerArray().
by Alexandre Julliard 03 Jul '12

03 Jul '12

Module: wine Branch: master Commit: e5953b6b17b14b5e50b981acc209a2b385dc20aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5953b6b17b14b5e50b981acc… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Jul 3 12:27:46 2012 +0200 d3dx9: Implement ID3DXBaseEffect::SetMatrixPointerArray(). --- dlls/d3dx9_36/effect.c | 31 +++++++++++++++++++++++++++++-- 1 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 5ac79d1..08ae633 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -2389,10 +2389,37 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetMatrixArray(ID3DXBaseEffect *iface, static HRESULT WINAPI ID3DXBaseEffectImpl_SetMatrixPointerArray(ID3DXBaseEffect *iface, D3DXHANDLE parameter, CONST D3DXMATRIX **matrix, UINT count) { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(This, parameter); - FIXME("iface %p, parameter %p, matrix %p, count %u stub\n", This, parameter, matrix, count); + TRACE("iface %p, parameter %p, matrix %p, count %u\n", This, parameter, matrix, count); - return E_NOTIMPL; + if (param && count <= param->element_count) + { + UINT i; + + switch (param->class) + { + case D3DXPC_MATRIX_ROWS: + for (i = 0; i < count; ++i) + { + set_matrix(get_parameter_struct(param->member_handles[i]), matrix[i]); + } + return D3D_OK; + + case D3DXPC_SCALAR: + case D3DXPC_VECTOR: + case D3DXPC_OBJECT: + break; + + default: + FIXME("Unhandled class %s\n", debug_d3dxparameter_class(param->class)); + break; + } + } + + WARN("Invalid argument specified\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI ID3DXBaseEffectImpl_GetMatrixPointerArray(ID3DXBaseEffect *iface, D3DXHANDLE parameter, D3DXMATRIX **matrix, UINT count)

1 0

Dmitry Timoshkov : windowscodecs: Implement BitmapDecoderInfo_GetSpecVersion.
by Alexandre Julliard 03 Jul '12

03 Jul '12

Module: wine Branch: master Commit: 67fc1a49e18280a5f4a6727eb1a4e295f6dc6c66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67fc1a49e18280a5f4a6727eb… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jul 2 16:11:16 2012 +0900 windowscodecs: Implement BitmapDecoderInfo_GetSpecVersion. --- dlls/windowscodecs/info.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index b403310..debbf78 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -46,6 +46,7 @@ static const WCHAR containerformat_valuename[] = {'C','o','n','t','a','i','n','e static const WCHAR metadataformat_valuename[] = {'M','e','t','a','d','a','t','a','F','o','r','m','a','t',0}; static const WCHAR vendor_valuename[] = {'V','e','n','d','o','r',0}; static const WCHAR version_valuename[] = {'V','e','r','s','i','o','n',0}; +static const WCHAR specversion_valuename[] = {'S','p','e','c','V','e','r','s','i','o','n',0}; static const WCHAR bitsperpixel_valuename[] = {'B','i','t','L','e','n','g','t','h',0}; static const WCHAR channelcount_valuename[] = {'C','h','a','n','n','e','l','C','o','u','n','t',0}; static const WCHAR channelmasks_keyname[] = {'C','h','a','n','n','e','l','M','a','s','k','s',0}; @@ -257,8 +258,12 @@ static HRESULT WINAPI BitmapDecoderInfo_GetVersion(IWICBitmapDecoderInfo *iface, static HRESULT WINAPI BitmapDecoderInfo_GetSpecVersion(IWICBitmapDecoderInfo *iface, UINT cchSpecVersion, WCHAR *wzSpecVersion, UINT *pcchActual) { - FIXME("(%p,%u,%p,%p): stub\n", iface, cchSpecVersion, wzSpecVersion, pcchActual); - return E_NOTIMPL; + BitmapDecoderInfo *This = impl_from_IWICBitmapDecoderInfo(iface); + + TRACE("(%p,%u,%p,%p)\n", iface, cchSpecVersion, wzSpecVersion, pcchActual); + + return ComponentInfo_GetStringValue(This->classkey, specversion_valuename, + cchSpecVersion, wzSpecVersion, pcchActual); } static HRESULT WINAPI BitmapDecoderInfo_GetFriendlyName(IWICBitmapDecoderInfo *iface, UINT cchFriendlyName,

1 0

Dmitry Timoshkov : windowscodecs: Implement BitmapEncoderInfo_GetSpecVersion.
by Alexandre Julliard 03 Jul '12

03 Jul '12

Module: wine Branch: master Commit: 3dd73e90b55ad8029b9e0694511e271f65d2837d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3dd73e90b55ad8029b9e06945… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jul 2 17:45:05 2012 +0900 windowscodecs: Implement BitmapEncoderInfo_GetSpecVersion. --- dlls/windowscodecs/info.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index debbf78..bd277b8 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -723,8 +723,12 @@ static HRESULT WINAPI BitmapEncoderInfo_GetVersion(IWICBitmapEncoderInfo *iface, static HRESULT WINAPI BitmapEncoderInfo_GetSpecVersion(IWICBitmapEncoderInfo *iface, UINT cchSpecVersion, WCHAR *wzSpecVersion, UINT *pcchActual) { - FIXME("(%p,%u,%p,%p): stub\n", iface, cchSpecVersion, wzSpecVersion, pcchActual); - return E_NOTIMPL; + BitmapEncoderInfo *This = impl_from_IWICBitmapEncoderInfo(iface); + + TRACE("(%p,%u,%p,%p)\n", iface, cchSpecVersion, wzSpecVersion, pcchActual); + + return ComponentInfo_GetStringValue(This->classkey, specversion_valuename, + cchSpecVersion, wzSpecVersion, pcchActual); } static HRESULT WINAPI BitmapEncoderInfo_GetFriendlyName(IWICBitmapEncoderInfo *iface, UINT cchFriendlyName,

1 0

Dmitry Timoshkov : windowscodecs: Implement FormatConverterInfo_GetSpecVersion.
by Alexandre Julliard 03 Jul '12

03 Jul '12

Module: wine Branch: master Commit: 7c191379963647f1ec734e237048731b83613a7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c191379963647f1ec734e237… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jul 2 17:46:17 2012 +0900 windowscodecs: Implement FormatConverterInfo_GetSpecVersion. --- dlls/windowscodecs/info.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index bd277b8..4c7fcc2 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -1013,8 +1013,12 @@ static HRESULT WINAPI FormatConverterInfo_GetVersion(IWICFormatConverterInfo *if static HRESULT WINAPI FormatConverterInfo_GetSpecVersion(IWICFormatConverterInfo *iface, UINT cchSpecVersion, WCHAR *wzSpecVersion, UINT *pcchActual) { - FIXME("(%p,%u,%p,%p): stub\n", iface, cchSpecVersion, wzSpecVersion, pcchActual); - return E_NOTIMPL; + FormatConverterInfo *This = impl_from_IWICFormatConverterInfo(iface); + + TRACE("(%p,%u,%p,%p)\n", iface, cchSpecVersion, wzSpecVersion, pcchActual); + + return ComponentInfo_GetStringValue(This->classkey, specversion_valuename, + cchSpecVersion, wzSpecVersion, pcchActual); } static HRESULT WINAPI FormatConverterInfo_GetFriendlyName(IWICFormatConverterInfo *iface, UINT cchFriendlyName,

1 0

Dmitry Timoshkov : windowscodecs: Implement PixelFormatInfo_GetSpecVersion.
by Alexandre Julliard 03 Jul '12

03 Jul '12

Module: wine Branch: master Commit: 497e8840ca5b30c94e6406ded3217d5c33779a6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=497e8840ca5b30c94e6406ded… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jul 2 16:13:21 2012 +0900 windowscodecs: Implement PixelFormatInfo_GetSpecVersion. --- dlls/windowscodecs/info.c | 8 ++++++-- dlls/windowscodecs/tests/info.c | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index 4c7fcc2..1bfbfc7 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -1238,8 +1238,12 @@ static HRESULT WINAPI PixelFormatInfo_GetVersion(IWICPixelFormatInfo2 *iface, UI static HRESULT WINAPI PixelFormatInfo_GetSpecVersion(IWICPixelFormatInfo2 *iface, UINT cchSpecVersion, WCHAR *wzSpecVersion, UINT *pcchActual) { - FIXME("(%p,%u,%p,%p): stub\n", iface, cchSpecVersion, wzSpecVersion, pcchActual); - return E_NOTIMPL; + PixelFormatInfo *This = impl_from_IWICPixelFormatInfo2(iface); + + TRACE("(%p,%u,%p,%p)\n", iface, cchSpecVersion, wzSpecVersion, pcchActual); + + return ComponentInfo_GetStringValue(This->classkey, specversion_valuename, + cchSpecVersion, wzSpecVersion, pcchActual); } static HRESULT WINAPI PixelFormatInfo_GetFriendlyName(IWICPixelFormatInfo2 *iface, UINT cchFriendlyName, diff --git a/dlls/windowscodecs/tests/info.c b/dlls/windowscodecs/tests/info.c index 1cd84c1..cae64ff 100644 --- a/dlls/windowscodecs/tests/info.c +++ b/dlls/windowscodecs/tests/info.c @@ -209,8 +209,8 @@ static void test_pixelformat_info(void) len = 0xdeadbeef; hr = IWICComponentInfo_GetSpecVersion(info, 0, NULL, &len); - todo_wine ok(hr == S_OK, "GetSpecVersion failed, hr=%x\n", hr); - todo_wine ok(len == 0, "invalid length 0x%x\n", len); /* spec version does not apply to pixel formats */ + ok(hr == S_OK, "GetSpecVersion failed, hr=%x\n", hr); + ok(len == 0, "invalid length 0x%x\n", len); /* spec version does not apply to pixel formats */ memset(&guid, 0xaa, sizeof(guid)); hr = IWICComponentInfo_GetVendorGUID(info, &guid);

1 0

Dmitry Timoshkov : windowscodecs: Implement MetadataReaderInfo_GetSpecVersion.
by Alexandre Julliard 03 Jul '12

03 Jul '12

Module: wine Branch: master Commit: bae3f2afede3f582e6349b0937e2e47b9f8c3a80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bae3f2afede3f582e6349b093… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jul 2 16:14:06 2012 +0900 windowscodecs: Implement MetadataReaderInfo_GetSpecVersion. --- dlls/windowscodecs/info.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index 1bfbfc7..36d2e87 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -1527,8 +1527,12 @@ static HRESULT WINAPI MetadataReaderInfo_GetVersion(IWICMetadataReaderInfo *ifac static HRESULT WINAPI MetadataReaderInfo_GetSpecVersion(IWICMetadataReaderInfo *iface, UINT length, WCHAR *version, UINT *actual_length) { - FIXME("(%p,%u,%p,%p): stub\n", iface, length, version, actual_length); - return E_NOTIMPL; + MetadataReaderInfo *This = impl_from_IWICMetadataReaderInfo(iface); + + TRACE("(%p,%u,%p,%p)\n", iface, length, version, actual_length); + + return ComponentInfo_GetStringValue(This->classkey, specversion_valuename, + length, version, actual_length); } static HRESULT WINAPI MetadataReaderInfo_GetFriendlyName(IWICMetadataReaderInfo *iface,

1 0

Dmitry Timoshkov : windowscodecs: Implement MetadataReaderInfo_DoesRequireFullStream.
by Alexandre Julliard 03 Jul '12

03 Jul '12

Module: wine Branch: master Commit: 10f897894989e6b16e7b7586a1330b5ecf7ba459 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10f897894989e6b16e7b7586a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jul 2 16:14:51 2012 +0900 windowscodecs: Implement MetadataReaderInfo_DoesRequireFullStream. --- dlls/windowscodecs/info.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index 36d2e87..b45a1af 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -52,6 +52,7 @@ static const WCHAR channelcount_valuename[] = {'C','h','a','n','n','e','l','C',' static const WCHAR channelmasks_keyname[] = {'C','h','a','n','n','e','l','M','a','s','k','s',0}; static const WCHAR numericrepresentation_valuename[] = {'N','u','m','e','r','i','c','R','e','p','r','e','s','e','n','t','a','t','i','o','n',0}; static const WCHAR supportstransparency_valuename[] = {'S','u','p','p','o','r','t','s','T','r','a','n','s','p','a','r','e','n','c','y',0}; +static const WCHAR requiresfullstream_valuename[] = {'R','e','q','u','i','r','e','s','F','u','l','l','S','t','r','e','a','m',0}; static HRESULT ComponentInfo_GetStringValue(HKEY classkey, LPCWSTR value, UINT buffer_size, WCHAR *buffer, UINT *actual_size) @@ -1580,8 +1581,9 @@ static HRESULT WINAPI MetadataReaderInfo_GetDeviceModels(IWICMetadataReaderInfo static HRESULT WINAPI MetadataReaderInfo_DoesRequireFullStream(IWICMetadataReaderInfo *iface, BOOL *param) { - FIXME("(%p,%p): stub\n", iface, param); - return E_NOTIMPL; + MetadataReaderInfo *This = impl_from_IWICMetadataReaderInfo(iface); + TRACE("(%p,%p)\n", iface, param); + return ComponentInfo_GetDWORDValue(This->classkey, requiresfullstream_valuename, (DWORD *)param); } static HRESULT WINAPI MetadataReaderInfo_DoesSupportPadding(IWICMetadataReaderInfo *iface,

1 0

Dmitry Timoshkov : windowscodecs: Implement MetadataReaderInfo_DoesSupportPadding.
by Alexandre Julliard 03 Jul '12

03 Jul '12

Module: wine Branch: master Commit: 8dad0435060cc492e4b29ea9850ef2971ed80a88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dad0435060cc492e4b29ea98… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jul 2 16:15:26 2012 +0900 windowscodecs: Implement MetadataReaderInfo_DoesSupportPadding. --- dlls/windowscodecs/info.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index b45a1af..9921efc 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -53,6 +53,7 @@ static const WCHAR channelmasks_keyname[] = {'C','h','a','n','n','e','l','M','a' static const WCHAR numericrepresentation_valuename[] = {'N','u','m','e','r','i','c','R','e','p','r','e','s','e','n','t','a','t','i','o','n',0}; static const WCHAR supportstransparency_valuename[] = {'S','u','p','p','o','r','t','s','T','r','a','n','s','p','a','r','e','n','c','y',0}; static const WCHAR requiresfullstream_valuename[] = {'R','e','q','u','i','r','e','s','F','u','l','l','S','t','r','e','a','m',0}; +static const WCHAR supportspadding_valuename[] = {'S','u','p','p','o','r','t','s','P','a','d','d','i','n','g',0}; static HRESULT ComponentInfo_GetStringValue(HKEY classkey, LPCWSTR value, UINT buffer_size, WCHAR *buffer, UINT *actual_size) @@ -1589,8 +1590,9 @@ static HRESULT WINAPI MetadataReaderInfo_DoesRequireFullStream(IWICMetadataReade static HRESULT WINAPI MetadataReaderInfo_DoesSupportPadding(IWICMetadataReaderInfo *iface, BOOL *param) { - FIXME("(%p,%p): stub\n", iface, param); - return E_NOTIMPL; + MetadataReaderInfo *This = impl_from_IWICMetadataReaderInfo(iface); + TRACE("(%p,%p)\n", iface, param); + return ComponentInfo_GetDWORDValue(This->classkey, supportspadding_valuename, (DWORD *)param); } static HRESULT WINAPI MetadataReaderInfo_DoesRequireFixedSize(IWICMetadataReaderInfo *iface,

1 0