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

Dmitry Timoshkov : windowscodecs: Implement TiffDecoder_GetPreview.
by Alexandre Julliard 26 Jun '12

26 Jun '12

Module: wine Branch: master Commit: a7190c7dc7c82d0ba0d0be9db6774a1f354c9e6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7190c7dc7c82d0ba0d0be9db… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jun 25 12:27:12 2012 +0900 windowscodecs: Implement TiffDecoder_GetPreview. --- dlls/windowscodecs/tiffformat.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index d12729f..a64d65f 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -628,8 +628,12 @@ static HRESULT WINAPI TiffDecoder_GetMetadataQueryReader(IWICBitmapDecoder *ifac static HRESULT WINAPI TiffDecoder_GetPreview(IWICBitmapDecoder *iface, IWICBitmapSource **ppIBitmapSource) { - FIXME("(%p,%p): stub\n", iface, ppIBitmapSource); - return E_NOTIMPL; + TRACE("(%p,%p)\n", iface, ppIBitmapSource); + + if (!ppIBitmapSource) return E_INVALIDARG; + + *ppIBitmapSource = NULL; + return WINCODEC_ERR_UNSUPPORTEDOPERATION; } static HRESULT WINAPI TiffDecoder_GetColorContexts(IWICBitmapDecoder *iface,

1 0

Dmitry Timoshkov : windowscodecs: Implement TiffFrameDecode_GetThumbnail.
by Alexandre Julliard 26 Jun '12

26 Jun '12

Module: wine Branch: master Commit: 2d3cf48300cbb731d0be9b0f5fbb9fc3df29109a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d3cf48300cbb731d0be9b0f5… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jun 25 12:27:22 2012 +0900 windowscodecs: Implement TiffFrameDecode_GetThumbnail. --- dlls/windowscodecs/tiffformat.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index a64d65f..5351098 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -1096,8 +1096,12 @@ static HRESULT WINAPI TiffFrameDecode_GetColorContexts(IWICBitmapFrameDecode *if static HRESULT WINAPI TiffFrameDecode_GetThumbnail(IWICBitmapFrameDecode *iface, IWICBitmapSource **ppIThumbnail) { - FIXME("(%p,%p): stub\n", iface, ppIThumbnail); - return E_NOTIMPL; + TRACE("(%p,%p)\n", iface, ppIThumbnail); + + if (!ppIThumbnail) return E_INVALIDARG; + + *ppIThumbnail = NULL; + return WINCODEC_ERR_CODECNOTHUMBNAIL; } static const IWICBitmapFrameDecodeVtbl TiffFrameDecode_Vtbl = {

1 0

Dmitry Timoshkov : windowscodecs: Implement MetadataReaderInfo_GetVendorGUID.
by Alexandre Julliard 26 Jun '12

26 Jun '12

Module: wine Branch: master Commit: 58387fca692f2940f9150ab29d0fffab20c465d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58387fca692f2940f9150ab29… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jun 25 12:54:21 2012 +0900 windowscodecs: Implement MetadataReaderInfo_GetVendorGUID. --- dlls/windowscodecs/info.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index 1b650d6..980dfc4 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -1485,8 +1485,11 @@ static HRESULT WINAPI MetadataReaderInfo_GetAuthor(IWICMetadataReaderInfo *iface static HRESULT WINAPI MetadataReaderInfo_GetVendorGUID(IWICMetadataReaderInfo *iface, GUID *vendor) { - FIXME("(%p,%p): stub\n", iface, vendor); - return E_NOTIMPL; + MetadataReaderInfo *This = impl_from_IWICMetadataReaderInfo(iface); + + TRACE("(%p,%p)\n", iface, vendor); + + return ComponentInfo_GetGUIDValue(This->classkey, vendor_valuename, vendor); } static HRESULT WINAPI MetadataReaderInfo_GetVersion(IWICMetadataReaderInfo *iface,

1 0

Józef Kucia : wined3d: Use the system memory pool for the logo surface.
by Alexandre Julliard 25 Jun '12

25 Jun '12

Module: wine Branch: master Commit: d760b21ab611f5ef51af7f147d60db846cdd3433 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d760b21ab611f5ef51af7f147… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Thu Jun 21 14:15:39 2012 +0200 wined3d: Use the system memory pool for the logo surface. --- dlls/wined3d/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4c3282c..ed1ebbd 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -944,7 +944,7 @@ static void device_load_logo(struct wined3d_device *device, const char *filename } hr = wined3d_surface_create(device, bm.bmWidth, bm.bmHeight, WINED3DFMT_B5G6R5_UNORM, 0, 0, - WINED3D_POOL_DEFAULT, WINED3D_MULTISAMPLE_NONE, 0, WINED3D_SURFACE_TYPE_OPENGL, WINED3D_SURFACE_MAPPABLE, + WINED3D_POOL_SYSTEM_MEM, WINED3D_MULTISAMPLE_NONE, 0, WINED3D_SURFACE_TYPE_OPENGL, WINED3D_SURFACE_MAPPABLE, NULL, &wined3d_null_parent_ops, &device->logo_surface); if (FAILED(hr)) {

1 0

Vincent Povirk : windowscodecs: Implement PixelFormatInfo_GetBitsPerPixel.
by Alexandre Julliard 25 Jun '12

25 Jun '12

Module: wine Branch: master Commit: 9dbd0833bc822edda2832be27ffda8f6ef58441d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9dbd0833bc822edda2832be27… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Apr 16 15:40:35 2012 -0500 windowscodecs: Implement PixelFormatInfo_GetBitsPerPixel. --- dlls/windowscodecs/info.c | 29 +++++++++++++++++++++++++++-- 1 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index b67eddd..815c775 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 bitsperpixel_valuename[] = {'B','i','t','L','e','n','g','t','h',0}; static HRESULT ComponentInfo_GetStringValue(HKEY classkey, LPCWSTR value, UINT buffer_size, WCHAR *buffer, UINT *actual_size) @@ -106,6 +107,27 @@ static HRESULT ComponentInfo_GetGUIDValue(HKEY classkey, LPCWSTR value, return hr; } +static HRESULT ComponentInfo_GetDWORDValue(HKEY classkey, LPCWSTR value, + DWORD *result) +{ + LONG ret; + DWORD cbdata = sizeof(DWORD); + + if (!result) + return E_INVALIDARG; + + ret = RegGetValueW(classkey, NULL, value, RRF_RT_DWORD, NULL, + result, &cbdata); + + if (ret == ERROR_FILE_NOT_FOUND) + { + *result = 0; + return S_OK; + } + + return HRESULT_FROM_WIN32(ret); +} + typedef struct { IWICBitmapDecoderInfo IWICBitmapDecoderInfo_iface; LONG ref; @@ -1231,8 +1253,11 @@ static HRESULT WINAPI PixelFormatInfo_GetColorContext(IWICPixelFormatInfo2 *ifac static HRESULT WINAPI PixelFormatInfo_GetBitsPerPixel(IWICPixelFormatInfo2 *iface, UINT *puiBitsPerPixel) { - FIXME("(%p,%p): stub\n", iface, puiBitsPerPixel); - return E_NOTIMPL; + PixelFormatInfo *This = impl_from_IWICPixelFormatInfo2(iface); + + TRACE("(%p,%p)\n", iface, puiBitsPerPixel); + + return ComponentInfo_GetDWORDValue(This->classkey, bitsperpixel_valuename, puiBitsPerPixel); } static HRESULT WINAPI PixelFormatInfo_GetChannelCount(IWICPixelFormatInfo2 *iface,

1 0

Vincent Povirk : windowscodecs: Implement PixelFormatInfo_GetChannelCount.
by Alexandre Julliard 25 Jun '12

25 Jun '12

Module: wine Branch: master Commit: 80f6890616a833ab81453fd79f4a5837b2888123 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80f6890616a833ab81453fd79… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Apr 16 16:03:57 2012 -0500 windowscodecs: Implement PixelFormatInfo_GetChannelCount. --- 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 815c775..b520f82 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -47,6 +47,7 @@ static const WCHAR metadataformat_valuename[] = {'M','e','t','a','d','a','t','a' 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 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 HRESULT ComponentInfo_GetStringValue(HKEY classkey, LPCWSTR value, UINT buffer_size, WCHAR *buffer, UINT *actual_size) @@ -1263,8 +1264,11 @@ static HRESULT WINAPI PixelFormatInfo_GetBitsPerPixel(IWICPixelFormatInfo2 *ifac static HRESULT WINAPI PixelFormatInfo_GetChannelCount(IWICPixelFormatInfo2 *iface, UINT *puiChannelCount) { - FIXME("(%p,%p): stub\n", iface, puiChannelCount); - return E_NOTIMPL; + PixelFormatInfo *This = impl_from_IWICPixelFormatInfo2(iface); + + TRACE("(%p,%p)\n", iface, puiChannelCount); + + return ComponentInfo_GetDWORDValue(This->classkey, channelcount_valuename, puiChannelCount); } static HRESULT WINAPI PixelFormatInfo_GetChannelMask(IWICPixelFormatInfo2 *iface,

1 0

Vincent Povirk : windowscodecs: Implement IWICPixelFormatInfo:: GetChannelMask.
by Alexandre Julliard 25 Jun '12

25 Jun '12

Module: wine Branch: master Commit: 0648e09f3c8cc5d8a2661dc17817b12ac8738005 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0648e09f3c8cc5d8a2661dc17… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Jun 13 10:11:53 2012 -0500 windowscodecs: Implement IWICPixelFormatInfo::GetChannelMask. --- dlls/windowscodecs/info.c | 39 +++++++++++++++++++++++++++++++++++++-- 1 files changed, 37 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index b520f82..f6c7fd0 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -48,6 +48,7 @@ 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 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}; static HRESULT ComponentInfo_GetStringValue(HKEY classkey, LPCWSTR value, UINT buffer_size, WCHAR *buffer, UINT *actual_size) @@ -1274,8 +1275,42 @@ static HRESULT WINAPI PixelFormatInfo_GetChannelCount(IWICPixelFormatInfo2 *ifac static HRESULT WINAPI PixelFormatInfo_GetChannelMask(IWICPixelFormatInfo2 *iface, UINT uiChannelIndex, UINT cbMaskBuffer, BYTE *pbMaskBuffer, UINT *pcbActual) { - FIXME("(%p,%u,%u,%p,%p): stub\n", iface, uiChannelIndex, cbMaskBuffer, pbMaskBuffer, pcbActual); - return E_NOTIMPL; + static const WCHAR uintformatW[] = {'%','u',0}; + PixelFormatInfo *This = impl_from_IWICPixelFormatInfo2(iface); + UINT channel_count; + HRESULT hr; + LONG ret; + WCHAR valuename[11]; + DWORD cbData; + + TRACE("(%p,%u,%u,%p,%p)\n", iface, uiChannelIndex, cbMaskBuffer, pbMaskBuffer, pcbActual); + + if (!pcbActual) + return E_INVALIDARG; + + hr = PixelFormatInfo_GetChannelCount(iface, &channel_count); + + if (SUCCEEDED(hr) && uiChannelIndex >= channel_count) + hr = E_INVALIDARG; + + if (SUCCEEDED(hr)) + { + snprintfW(valuename, 11, uintformatW, uiChannelIndex); + + cbData = cbMaskBuffer; + + ret = RegGetValueW(This->classkey, channelmasks_keyname, valuename, RRF_RT_REG_BINARY, NULL, pbMaskBuffer, &cbData); + + if (ret == ERROR_SUCCESS || ret == ERROR_MORE_DATA) + *pcbActual = cbData; + + if (ret == ERROR_MORE_DATA) + hr = E_INVALIDARG; + else + hr = HRESULT_FROM_WIN32(ret); + } + + return hr; } static HRESULT WINAPI PixelFormatInfo_SupportsTransparency(IWICPixelFormatInfo2 *iface,

1 0

Vincent Povirk : windowscodecs: Implement IWICPixelFormatInfo:: GetFormatGUID.
by Alexandre Julliard 25 Jun '12

25 Jun '12

Module: wine Branch: master Commit: c8fea25a33cbf1e29386ca484ad897d247fc32d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8fea25a33cbf1e29386ca484… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Jun 13 10:20:48 2012 -0500 windowscodecs: Implement IWICPixelFormatInfo::GetFormatGUID. --- dlls/windowscodecs/info.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index f6c7fd0..21c291b 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -1241,8 +1241,15 @@ static HRESULT WINAPI PixelFormatInfo_GetFriendlyName(IWICPixelFormatInfo2 *ifac static HRESULT WINAPI PixelFormatInfo_GetFormatGUID(IWICPixelFormatInfo2 *iface, GUID *pFormat) { - FIXME("(%p,%p): stub\n", iface, pFormat); - return E_NOTIMPL; + PixelFormatInfo *This = impl_from_IWICPixelFormatInfo2(iface); + TRACE("(%p,%p)\n", iface, pFormat); + + if (!pFormat) + return E_INVALIDARG; + + *pFormat = This->clsid; + + return S_OK; } static HRESULT WINAPI PixelFormatInfo_GetColorContext(IWICPixelFormatInfo2 *iface,

1 0

Vincent Povirk : windowscodecs: Implement IWICPixelFormatInfo2:: GetNumericRepresentation.
by Alexandre Julliard 25 Jun '12

25 Jun '12

Module: wine Branch: master Commit: 9ceb1fc188de4c0138e363e72d478e7d31dee8c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ceb1fc188de4c0138e363e72… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Jun 13 10:22:33 2012 -0500 windowscodecs: Implement IWICPixelFormatInfo2::GetNumericRepresentation. --- 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 21c291b..1b650d6 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -49,6 +49,7 @@ static const WCHAR version_valuename[] = {'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}; +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 HRESULT ComponentInfo_GetStringValue(HKEY classkey, LPCWSTR value, UINT buffer_size, WCHAR *buffer, UINT *actual_size) @@ -1330,8 +1331,11 @@ static HRESULT WINAPI PixelFormatInfo_SupportsTransparency(IWICPixelFormatInfo2 static HRESULT WINAPI PixelFormatInfo_GetNumericRepresentation(IWICPixelFormatInfo2 *iface, WICPixelFormatNumericRepresentation *pNumericRepresentation) { - FIXME("(%p,%p): stub\n", iface, pNumericRepresentation); - return E_NOTIMPL; + PixelFormatInfo *This = impl_from_IWICPixelFormatInfo2(iface); + + TRACE("(%p,%p)\n", iface, pNumericRepresentation); + + return ComponentInfo_GetDWORDValue(This->classkey, numericrepresentation_valuename, pNumericRepresentation); } static const IWICPixelFormatInfo2Vtbl PixelFormatInfo_Vtbl = {

1 0

Piotr Caban : msvcp90: Added num_get<wchar>::_Getffld implementation.
by Alexandre Julliard 25 Jun '12

25 Jun '12

Module: wine Branch: master Commit: 9afd07be92aaaff1ebdeecdf000e233978eaecc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9afd07be92aaaff1ebdeecdf0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jun 25 15:48:59 2012 +0200 msvcp90: Added num_get<wchar>::_Getffld implementation. --- dlls/msvcp90/locale.c | 224 +++++++++++++++++++++++++++++++++++++++++++++--- dlls/msvcp90/msvcp90.h | 8 ++ 2 files changed, 219 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9afd07be92aaaff1ebdee…

1 0