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

Vincent Povirk : windowscodecs: Implement IWICComponentInfo::GetAuthor.
by Alexandre Julliard June 14, 2012

June 14, 2012

Module: wine Branch: master Commit: 387d1e9790278325757061b95f90059ae5e5c269 URL: http://source.winehq.org/git/wine.git/?a=commit;h=387d1e9790278325757061b95… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Apr 16 14:55:30 2012 -0500 windowscodecs: Implement IWICComponentInfo::GetAuthor. --- dlls/windowscodecs/info.c | 33 +++++++++++++++++++++++++-------- 1 files changed, 25 insertions(+), 8 deletions(-) diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index 5eab27e..2677ca7 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -37,6 +37,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); static const WCHAR mimetypes_valuename[] = {'M','i','m','e','T','y','p','e','s',0}; +static const WCHAR author_valuename[] = {'A','u','t','h','o','r',0}; static const WCHAR pixelformats_keyname[] = {'P','i','x','e','l','F','o','r','m','a','t','s',0}; static const WCHAR containerformat_valuename[] = {'C','o','n','t','a','i','n','e','r','F','o','r','m','a','t',0}; @@ -186,8 +187,12 @@ static HRESULT WINAPI BitmapDecoderInfo_GetSigningStatus(IWICBitmapDecoderInfo * static HRESULT WINAPI BitmapDecoderInfo_GetAuthor(IWICBitmapDecoderInfo *iface, UINT cchAuthor, WCHAR *wzAuthor, UINT *pcchActual) { - FIXME("(%p,%u,%p,%p): stub\n", iface, cchAuthor, wzAuthor, pcchActual); - return E_NOTIMPL; + BitmapDecoderInfo *This = impl_from_IWICBitmapDecoderInfo(iface); + + TRACE("(%p,%u,%p,%p)\n", iface, cchAuthor, wzAuthor, pcchActual); + + return ComponentInfo_GetStringValue(This->classkey, author_valuename, + cchAuthor, wzAuthor, pcchActual); } static HRESULT WINAPI BitmapDecoderInfo_GetVendorGUID(IWICBitmapDecoderInfo *iface, GUID *pguidVendor) @@ -631,8 +636,12 @@ static HRESULT WINAPI BitmapEncoderInfo_GetSigningStatus(IWICBitmapEncoderInfo * static HRESULT WINAPI BitmapEncoderInfo_GetAuthor(IWICBitmapEncoderInfo *iface, UINT cchAuthor, WCHAR *wzAuthor, UINT *pcchActual) { - FIXME("(%p,%u,%p,%p): stub\n", iface, cchAuthor, wzAuthor, pcchActual); - return E_NOTIMPL; + BitmapEncoderInfo *This = impl_from_IWICBitmapEncoderInfo(iface); + + TRACE("(%p,%u,%p,%p)\n", iface, cchAuthor, wzAuthor, pcchActual); + + return ComponentInfo_GetStringValue(This->classkey, author_valuename, + cchAuthor, wzAuthor, pcchActual); } static HRESULT WINAPI BitmapEncoderInfo_GetVendorGUID(IWICBitmapEncoderInfo *iface, GUID *pguidVendor) @@ -901,8 +910,12 @@ static HRESULT WINAPI FormatConverterInfo_GetSigningStatus(IWICFormatConverterIn static HRESULT WINAPI FormatConverterInfo_GetAuthor(IWICFormatConverterInfo *iface, UINT cchAuthor, WCHAR *wzAuthor, UINT *pcchActual) { - FIXME("(%p,%u,%p,%p): stub\n", iface, cchAuthor, wzAuthor, pcchActual); - return E_NOTIMPL; + FormatConverterInfo *This = impl_from_IWICFormatConverterInfo(iface); + + TRACE("(%p,%u,%p,%p)\n", iface, cchAuthor, wzAuthor, pcchActual); + + return ComponentInfo_GetStringValue(This->classkey, author_valuename, + cchAuthor, wzAuthor, pcchActual); } static HRESULT WINAPI FormatConverterInfo_GetVendorGUID(IWICFormatConverterInfo *iface, GUID *pguidVendor) @@ -1099,8 +1112,12 @@ static HRESULT WINAPI PixelFormatInfo_GetSigningStatus(IWICPixelFormatInfo2 *ifa static HRESULT WINAPI PixelFormatInfo_GetAuthor(IWICPixelFormatInfo2 *iface, UINT cchAuthor, WCHAR *wzAuthor, UINT *pcchActual) { - FIXME("(%p,%u,%p,%p): stub\n", iface, cchAuthor, wzAuthor, pcchActual); - return E_NOTIMPL; + PixelFormatInfo *This = impl_from_IWICPixelFormatInfo2(iface); + + TRACE("(%p,%u,%p,%p)\n", iface, cchAuthor, wzAuthor, pcchActual); + + return ComponentInfo_GetStringValue(This->classkey, author_valuename, + cchAuthor, wzAuthor, pcchActual); } static HRESULT WINAPI PixelFormatInfo_GetVendorGUID(IWICPixelFormatInfo2 *iface, GUID *pguidVendor)

1 0

Vincent Povirk : gdiplus: Check for NULL image in GdipImageRotateFlip.
by Alexandre Julliard June 14, 2012

June 14, 2012

Module: wine Branch: master Commit: b5ef70c5836b33a9d469c71e20bff516eed45b14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5ef70c5836b33a9d469c71e2… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Jun 13 13:39:35 2012 -0500 gdiplus: Check for NULL image in GdipImageRotateFlip. --- dlls/gdiplus/image.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index ce04c72..dd4dcea 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -3889,6 +3889,9 @@ GpStatus WINGDIPAPI GdipImageRotateFlip(GpImage *image, RotateFlipType type) TRACE("(%p, %u)\n", image, type); + if (!image) + return InvalidParameter; + rotate_90 = type&1; flip_x = (type&6) == 2 || (type&6) == 4; flip_y = (type&3) == 1 || (type&3) == 2;

1 0

Vincent Povirk : windowscodecs: Add stub IWICPixelFormatInfo implementation .
by Alexandre Julliard June 14, 2012

June 14, 2012

Module: wine Branch: master Commit: 1ceb2f2a48ba43d0893374d7b0c7ee264dec4463 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ceb2f2a48ba43d0893374d7b… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Apr 16 14:50:00 2012 -0500 windowscodecs: Add stub IWICPixelFormatInfo implementation. --- dlls/windowscodecs/info.c | 215 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 215 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index 86f0adb..5eab27e 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -1006,6 +1006,220 @@ static HRESULT FormatConverterInfo_Constructor(HKEY classkey, REFCLSID clsid, IW return S_OK; } +typedef struct { + IWICPixelFormatInfo2 IWICPixelFormatInfo2_iface; + LONG ref; + HKEY classkey; + CLSID clsid; +} PixelFormatInfo; + +static inline PixelFormatInfo *impl_from_IWICPixelFormatInfo2(IWICPixelFormatInfo2 *iface) +{ + return CONTAINING_RECORD(iface, PixelFormatInfo, IWICPixelFormatInfo2_iface); +} + +static HRESULT WINAPI PixelFormatInfo_QueryInterface(IWICPixelFormatInfo2 *iface, REFIID iid, + void **ppv) +{ + PixelFormatInfo *This = impl_from_IWICPixelFormatInfo2(iface); + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); + + if (!ppv) return E_INVALIDARG; + + if (IsEqualIID(&IID_IUnknown, iid) || + IsEqualIID(&IID_IWICComponentInfo, iid) || + IsEqualIID(&IID_IWICPixelFormatInfo, iid) || + IsEqualIID(&IID_IWICPixelFormatInfo2 ,iid)) + { + *ppv = This; + } + else + { + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI PixelFormatInfo_AddRef(IWICPixelFormatInfo2 *iface) +{ + PixelFormatInfo *This = impl_from_IWICPixelFormatInfo2(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + return ref; +} + +static ULONG WINAPI PixelFormatInfo_Release(IWICPixelFormatInfo2 *iface) +{ + PixelFormatInfo *This = impl_from_IWICPixelFormatInfo2(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + if (ref == 0) + { + RegCloseKey(This->classkey); + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI PixelFormatInfo_GetComponentType(IWICPixelFormatInfo2 *iface, + WICComponentType *pType) +{ + TRACE("(%p,%p)\n", iface, pType); + *pType = WICPixelFormat; + return S_OK; +} + +static HRESULT WINAPI PixelFormatInfo_GetCLSID(IWICPixelFormatInfo2 *iface, CLSID *pclsid) +{ + PixelFormatInfo *This = impl_from_IWICPixelFormatInfo2(iface); + TRACE("(%p,%p)\n", iface, pclsid); + + if (!pclsid) + return E_INVALIDARG; + + memcpy(pclsid, &This->clsid, sizeof(CLSID)); + + return S_OK; +} + +static HRESULT WINAPI PixelFormatInfo_GetSigningStatus(IWICPixelFormatInfo2 *iface, DWORD *pStatus) +{ + FIXME("(%p,%p): stub\n", iface, pStatus); + return E_NOTIMPL; +} + +static HRESULT WINAPI PixelFormatInfo_GetAuthor(IWICPixelFormatInfo2 *iface, UINT cchAuthor, + WCHAR *wzAuthor, UINT *pcchActual) +{ + FIXME("(%p,%u,%p,%p): stub\n", iface, cchAuthor, wzAuthor, pcchActual); + return E_NOTIMPL; +} + +static HRESULT WINAPI PixelFormatInfo_GetVendorGUID(IWICPixelFormatInfo2 *iface, GUID *pguidVendor) +{ + FIXME("(%p,%p): stub\n", iface, pguidVendor); + return E_NOTIMPL; +} + +static HRESULT WINAPI PixelFormatInfo_GetVersion(IWICPixelFormatInfo2 *iface, UINT cchVersion, + WCHAR *wzVersion, UINT *pcchActual) +{ + FIXME("(%p,%u,%p,%p): stub\n", iface, cchVersion, wzVersion, pcchActual); + return E_NOTIMPL; +} + +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; +} + +static HRESULT WINAPI PixelFormatInfo_GetFriendlyName(IWICPixelFormatInfo2 *iface, UINT cchFriendlyName, + WCHAR *wzFriendlyName, UINT *pcchActual) +{ + FIXME("(%p,%u,%p,%p): stub\n", iface, cchFriendlyName, wzFriendlyName, pcchActual); + return E_NOTIMPL; +} + +static HRESULT WINAPI PixelFormatInfo_GetFormatGUID(IWICPixelFormatInfo2 *iface, + GUID *pFormat) +{ + FIXME("(%p,%p): stub\n", iface, pFormat); + return E_NOTIMPL; +} + +static HRESULT WINAPI PixelFormatInfo_GetColorContext(IWICPixelFormatInfo2 *iface, + IWICColorContext **ppIColorContext) +{ + FIXME("(%p,%p): stub\n", iface, ppIColorContext); + return E_NOTIMPL; +} + +static HRESULT WINAPI PixelFormatInfo_GetBitsPerPixel(IWICPixelFormatInfo2 *iface, + UINT *puiBitsPerPixel) +{ + FIXME("(%p,%p): stub\n", iface, puiBitsPerPixel); + return E_NOTIMPL; +} + +static HRESULT WINAPI PixelFormatInfo_GetChannelCount(IWICPixelFormatInfo2 *iface, + UINT *puiChannelCount) +{ + FIXME("(%p,%p): stub\n", iface, puiChannelCount); + return E_NOTIMPL; +} + +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 HRESULT WINAPI PixelFormatInfo_SupportsTransparency(IWICPixelFormatInfo2 *iface, + BOOL *pfSupportsTransparency) +{ + FIXME("(%p,%p): stub\n", iface, pfSupportsTransparency); + return E_NOTIMPL; +} + +static HRESULT WINAPI PixelFormatInfo_GetNumericRepresentation(IWICPixelFormatInfo2 *iface, + WICPixelFormatNumericRepresentation *pNumericRepresentation) +{ + FIXME("(%p,%p): stub\n", iface, pNumericRepresentation); + return E_NOTIMPL; +} + +static const IWICPixelFormatInfo2Vtbl PixelFormatInfo_Vtbl = { + PixelFormatInfo_QueryInterface, + PixelFormatInfo_AddRef, + PixelFormatInfo_Release, + PixelFormatInfo_GetComponentType, + PixelFormatInfo_GetCLSID, + PixelFormatInfo_GetSigningStatus, + PixelFormatInfo_GetAuthor, + PixelFormatInfo_GetVendorGUID, + PixelFormatInfo_GetVersion, + PixelFormatInfo_GetSpecVersion, + PixelFormatInfo_GetFriendlyName, + PixelFormatInfo_GetFormatGUID, + PixelFormatInfo_GetColorContext, + PixelFormatInfo_GetBitsPerPixel, + PixelFormatInfo_GetChannelCount, + PixelFormatInfo_GetChannelMask, + PixelFormatInfo_SupportsTransparency, + PixelFormatInfo_GetNumericRepresentation +}; + +static HRESULT PixelFormatInfo_Constructor(HKEY classkey, REFCLSID clsid, IWICComponentInfo **ppIInfo) +{ + PixelFormatInfo *This; + + This = HeapAlloc(GetProcessHeap(), 0, sizeof(PixelFormatInfo)); + if (!This) + { + RegCloseKey(classkey); + return E_OUTOFMEMORY; + } + + This->IWICPixelFormatInfo2_iface.lpVtbl = &PixelFormatInfo_Vtbl; + This->ref = 1; + This->classkey = classkey; + memcpy(&This->clsid, clsid, sizeof(CLSID)); + + *ppIInfo = (IWICComponentInfo*)This; + return S_OK; +} + static const WCHAR clsid_keyname[] = {'C','L','S','I','D',0}; static const WCHAR instance_keyname[] = {'I','n','s','t','a','n','c','e',0}; @@ -1019,6 +1233,7 @@ static const struct category categories[] = { {WICDecoder, &CATID_WICBitmapDecoders, BitmapDecoderInfo_Constructor}, {WICEncoder, &CATID_WICBitmapEncoders, BitmapEncoderInfo_Constructor}, {WICPixelFormatConverter, &CATID_WICFormatConverters, FormatConverterInfo_Constructor}, + {WICPixelFormat, &CATID_WICPixelFormats, PixelFormatInfo_Constructor}, {0} };

1 0

Vincent Povirk : windowscodecs: Add test for IWICComponentInfo.
by Alexandre Julliard June 14, 2012

June 14, 2012

Module: wine Branch: master Commit: f557fa692bc64e6044395876eff0386ef213c6c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f557fa692bc64e6044395876e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Mar 24 13:17:33 2012 -0500 windowscodecs: Add test for IWICComponentInfo. --- dlls/windowscodecs/tests/info.c | 147 ++++++++++++++++++++++++++++++++++++--- 1 files changed, 138 insertions(+), 9 deletions(-) diff --git a/dlls/windowscodecs/tests/info.c b/dlls/windowscodecs/tests/info.c index cd89a40..3d7ecc8 100644 --- a/dlls/windowscodecs/tests/info.c +++ b/dlls/windowscodecs/tests/info.c @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stdio.h> #include <stdarg.h> #include <math.h> @@ -27,9 +28,43 @@ #include "wincodecsdk.h" #include "wine/test.h" -static void test_decoder_info(void) +#include "initguid.h" +DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); + +static const char *debugstr_guid(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 HRESULT get_component_info(const GUID *clsid, IWICComponentInfo **result) { IWICImagingFactory *factory; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICImagingFactory, (void**)&factory); + ok(hr == S_OK, "CoCreateInstance failed, hr=%x\n", hr); + if (FAILED(hr)) return hr; + + hr = IWICImagingFactory_CreateComponentInfo(factory, clsid, result); + + IWICImagingFactory_Release(factory); + + return hr; +} + +static void test_decoder_info(void) +{ IWICComponentInfo *info; IWICBitmapDecoderInfo *decoder_info; HRESULT hr; @@ -38,13 +73,7 @@ static void test_decoder_info(void) const WCHAR expected_mimetype[] = {'i','m','a','g','e','/','b','m','p',0}; CLSID clsid; - hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, - &IID_IWICImagingFactory, (void**)&factory); - ok(hr == S_OK, "CoCreateInstance failed, hr=%x\n", hr); - if (FAILED(hr)) return; - - hr = IWICImagingFactory_CreateComponentInfo(factory, &CLSID_WICBmpDecoder, &info); - ok(hr == S_OK, "CreateComponentInfo failed, hr=%x\n", hr); + hr = get_component_info(&CLSID_WICBmpDecoder, &info); hr = IWICComponentInfo_QueryInterface(info, &IID_IWICBitmapDecoderInfo, (void**)&decoder_info); ok(hr == S_OK, "QueryInterface failed, hr=%x\n", hr); @@ -88,8 +117,107 @@ static void test_decoder_info(void) IWICBitmapDecoderInfo_Release(decoder_info); IWICComponentInfo_Release(info); +} - IWICImagingFactory_Release(factory); +static void test_pixelformat_info(void) +{ + IWICComponentInfo *info; + HRESULT hr; + ULONG len, known_len; + WCHAR value[256]; + GUID guid; + WICComponentType componenttype; + DWORD signing; + + hr = get_component_info(&GUID_WICPixelFormat32bppBGRA, &info); + todo_wine ok(hr == S_OK, "CreateComponentInfo failed, hr=%x\n", hr); + + if (FAILED(hr)) + return; + + hr = IWICComponentInfo_GetAuthor(info, 0, NULL, 0); + ok(hr == E_INVALIDARG, "GetAuthor failed, hr=%x\n", hr); + + len = 0xdeadbeef; + hr = IWICComponentInfo_GetAuthor(info, 0, NULL, &len); + ok(hr == S_OK, "GetAuthor failed, hr=%x\n", hr); + ok(len < 255 && len > 0, "invalid length 0x%x\n", len); + known_len = len; + + memset(value, 0xaa, 256 * sizeof(WCHAR)); + hr = IWICComponentInfo_GetAuthor(info, len-1, value, NULL); + ok(hr == E_INVALIDARG, "GetAuthor failed, hr=%x\n", hr); + ok(value[0] = 0xaaaa, "string modified\n"); + + len = 0xdeadbeef; + memset(value, 0xaa, 256 * sizeof(WCHAR)); + hr = IWICComponentInfo_GetAuthor(info, known_len-1, value, &len); + ok(hr == WINCODEC_ERR_INSUFFICIENTBUFFER, "GetAuthor failed, hr=%x\n", hr); + ok(len == known_len, "got length of 0x%x, expected 0x%x\n", len, known_len); + ok(value[known_len-1] == 0xaaaa, "string modified past given length\n"); + ok(value[0] == 0xaaaa, "string modified\n"); + + len = 0xdeadbeef; + memset(value, 0xaa, 256 * sizeof(WCHAR)); + hr = IWICComponentInfo_GetAuthor(info, known_len, value, &len); + ok(hr == S_OK, "GetAuthor failed, hr=%x\n", hr); + ok(len == known_len, "got length of 0x%x, expected 0x%x\n", len, known_len); + ok(value[known_len-1] == 0, "string not terminated at expected length\n"); + ok(value[known_len-2] != 0xaaaa, "string not modified at given length\n"); + + len = 0xdeadbeef; + memset(value, 0xaa, 256 * sizeof(WCHAR)); + hr = IWICComponentInfo_GetAuthor(info, known_len+1, value, &len); + ok(hr == S_OK, "GetAuthor failed, hr=%x\n", hr); + ok(len == known_len, "got length of 0x%x, expected 0x%x\n", len, known_len); + ok(value[known_len] == 0xaaaa, "string modified past end\n"); + ok(value[known_len-1] == 0, "string not terminated at expected length\n"); + ok(value[known_len-2] != 0xaaaa, "string not modified at given length\n"); + + hr = IWICComponentInfo_GetCLSID(info, NULL); + ok(hr == E_INVALIDARG, "GetCLSID failed, hr=%x\n", hr); + + memset(&guid, 0xaa, sizeof(guid)); + hr = IWICComponentInfo_GetCLSID(info, &guid); + ok(hr == S_OK, "GetCLSID failed, hr=%x\n", hr); + ok(IsEqualGUID(&guid, &GUID_WICPixelFormat32bppBGRA), "unexpected CLSID %s\n", debugstr_guid(&guid)); + + hr = IWICComponentInfo_GetComponentType(info, NULL); + ok(hr == E_INVALIDARG, "GetComponentType failed, hr=%x\n", hr); + + hr = IWICComponentInfo_GetComponentType(info, &componenttype); + ok(hr == S_OK, "GetComponentType failed, hr=%x\n", hr); + ok(componenttype == WICPixelFormat, "unexpected component type 0x%x\n", componenttype); + + len = 0xdeadbeef; + hr = IWICComponentInfo_GetFriendlyName(info, 0, NULL, &len); + ok(hr == S_OK, "GetFriendlyName failed, hr=%x\n", hr); + ok(len < 255 && len > 0, "invalid length 0x%x\n", len); + + hr = IWICComponentInfo_GetSigningStatus(info, NULL); + ok(hr == E_INVALIDARG, "GetSigningStatus failed, hr=%x\n", hr); + + hr = IWICComponentInfo_GetSigningStatus(info, &signing); + ok(hr == S_OK, "GetSigningStatus failed, hr=%x\n", hr); + ok(signing == WICComponentSigned, "unexpected signing status 0x%x\n", signing); + + len = 0xdeadbeef; + hr = IWICComponentInfo_GetSpecVersion(info, 0, NULL, &len); + 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); + ok(hr == S_OK, "GetVendorGUID failed, hr=%x\n", hr); + ok(IsEqualGUID(&guid, &GUID_VendorMicrosoft) || + broken(IsEqualGUID(&guid, &GUID_NULL)) /* XP */, "unexpected GUID %s\n", debugstr_guid(&guid)); + + len = 0xdeadbeef; + hr = IWICComponentInfo_GetVersion(info, 0, NULL, &len); + ok(hr == S_OK, "GetVersion failed, hr=%x\n", hr); + ok(len == 0, "invalid length 0x%x\n", len); /* version does not apply to pixel formats */ + + IWICComponentInfo_Release(info); } static void test_reader_info(void) @@ -239,6 +367,7 @@ START_TEST(info) test_decoder_info(); test_reader_info(); + test_pixelformat_info(); CoUninitialize(); }

1 0

Piotr Caban : msvcp: Sync spec files.
by Alexandre Julliard June 14, 2012

June 14, 2012

Module: wine Branch: master Commit: 9588617d616242eec5714958a6e9f02b6b06e7dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=9588617d616242eec5714958a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 14 15:37:54 2012 +0200 msvcp: Sync spec files. --- dlls/msvcp100/msvcp100.spec | 22 +++--- dlls/msvcp70/msvcp70.spec | 130 ++++++++++++++++---------------- dlls/msvcp71/msvcp71.spec | 158 ++++++++++++++++++++-------------------- dlls/msvcp80/msvcp80.spec | 170 +++++++++++++++++++++--------------------- 4 files changed, 240 insertions(+), 240 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9588617d616242eec5714…

1 0

Vincent Povirk : windowscodecs: Register pixel formats.
by Alexandre Julliard June 14, 2012

June 14, 2012

Module: wine Branch: master Commit: 9b7dca84536481d2b13cfdfbce77292278c0a41f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b7dca84536481d2b13cfdfbc… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Apr 16 14:31:09 2012 -0500 windowscodecs: Register pixel formats. --- dlls/windowscodecs/regsvr.c | 461 +++++++++++++++++++++++++++++++++++++++++++ include/wincodec.idl | 1 + 2 files changed, 462 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9b7dca84536481d2b13cf…

1 0

Piotr Caban : msvcp90: Added operator>>(basic_istream<char>, basic_string< char>) implementation.
by Alexandre Julliard June 14, 2012

June 14, 2012

Module: wine Branch: master Commit: aa2733e833d644e5e87005ee04132a0617911a97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa2733e833d644e5e87005ee0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 14 15:37:36 2012 +0200 msvcp90: Added operator>>(basic_istream<char>, basic_string<char>) implementation. --- dlls/msvcp90/ios.c | 41 ++++++++++++++++++++++++++++++++++++----- dlls/msvcp90/msvcp90.spec | 12 ++++++------ 2 files changed, 42 insertions(+), 11 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 7102639..9cb3a59 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -4705,11 +4705,11 @@ basic_istream_char* __thiscall basic_istream_char_read_bool(basic_istream_char * /* ??$getline(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@AAV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0(a)D@Z */ /* ??$getline(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEAV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0(a)D@Z */ -basic_istream_char* __cdecl basic_istream_char_getline_str_delim( +basic_istream_char* __cdecl basic_istream_char_getline_bstr_delim( basic_istream_char *istream, basic_string_char *str, char delim) { IOSB_iostate state = IOSTATE_failbit; - int c; + int c = delim; TRACE("(%p %p %c)\n", istream, str, delim); @@ -4724,16 +4724,47 @@ basic_istream_char* __cdecl basic_istream_char_getline_str_delim( } basic_istream_char_sentry_destroy(istream); - basic_ios_char_setstate(basic_istream_char_get_basic_ios(istream), state); + basic_ios_char_setstate(basic_istream_char_get_basic_ios(istream), + state | (c==EOF ? IOSTATE_eofbit : IOSTATE_goodbit)); return istream; } /* ??$getline(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@AAV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0@@Z */ /* ??$getline(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEAV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0@@Z */ -basic_istream_char* __cdecl basic_istream_char_getline_str( +basic_istream_char* __cdecl basic_istream_char_getline_bstr( basic_istream_char *istream, basic_string_char *str) { - return basic_istream_char_getline_str_delim(istream, str, '\n'); + return basic_istream_char_getline_bstr_delim(istream, str, '\n'); +} + +/* ??$?5DU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@AAV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0@@Z */ +/* ??$?5DU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEAV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0@@Z */ +basic_istream_char* __cdecl basic_istream_char_get_bstr( + basic_istream_char *istream, basic_string_char *str) +{ + IOSB_iostate state = IOSTATE_failbit; + int c = '\n'; + + TRACE("(%p %p)\n", istream, str); + + if(basic_istream_char_sentry_create(istream, FALSE)) { + basic_ios_char *base = basic_istream_char_get_basic_ios(istream); + const ctype_char *ctype = ctype_char_use_facet(base->strbuf->loc); + + MSVCP_basic_string_char_clear(str); + + for(c = basic_streambuf_char_sgetc(basic_ios_char_rdbuf_get(base)); + c!=EOF && !ctype_char_is_ch(ctype, _SPACE|_BLANK, c); + c = basic_streambuf_char_snextc(basic_ios_char_rdbuf_get(base))) { + state = IOSTATE_goodbit; + MSVCP_basic_string_char_append_ch(str, c); + } + } + basic_istream_char_sentry_destroy(istream); + + basic_ios_char_setstate(basic_istream_char_get_basic_ios(istream), + state | (c==EOF ? IOSTATE_eofbit : IOSTATE_goodbit)); + return istream; } /* ??0?$basic_iostream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)PAV?$basic_streambuf(a)DU?$char_traits(a)D@std@@@1@@Z */ diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index f4c3783..5c2477a 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -2,8 +2,8 @@ @ stub -arch=win64 ??$?5DU?$char_traits(a)D@std@@@std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEAD(a)Z @ stub -arch=win32 ??$?5DU?$char_traits(a)D@std@@@std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@PAD(a)Z @ stub -arch=win64 ??$?5DU?$char_traits(a)D@std@@@std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@PEAD(a)Z -@ stub -arch=win32 ??$?5DU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@AAV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0@@Z -@ stub -arch=win64 ??$?5DU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEAV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0@@Z +@ cdecl -arch=win32 ??$?5DU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@AAV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0@@Z(ptr ptr) basic_istream_char_get_bstr +@ cdecl -arch=win64 ??$?5DU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEAV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0@@Z(ptr ptr) basic_istream_char_get_bstr @ stub -arch=win32 ??$?5GU?$char_traits(a)G@std@@@std@@YAAAV?$basic_istream(a)GU?$char_traits(a)G@std@@@0(a)AAV10@AAG(a)Z @ stub -arch=win64 ??$?5GU?$char_traits(a)G@std@@@std@@YAAEAV?$basic_istream(a)GU?$char_traits(a)G@std@@@0(a)AEAV10@AEAG(a)Z @ stub -arch=win32 ??$?5GU?$char_traits(a)G@std@@@std@@YAAAV?$basic_istream(a)GU?$char_traits(a)G@std@@@0(a)AAV10@PAG(a)Z @@ -386,10 +386,10 @@ @ stub -arch=win64 ??$exp(a)N@std@@YA?AV?$complex(a)N@0(a)AEBV10@@Z @ stub -arch=win32 ??$exp(a)O@std@@YA?AV?$complex(a)O@0(a)ABV10@@Z @ stub -arch=win64 ??$exp(a)O@std@@YA?AV?$complex(a)O@0(a)AEBV10@@Z -@ cdecl -arch=win32 ??$getline(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@AAV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0@@Z(ptr ptr) basic_istream_char_getline_str -@ cdecl -arch=win64 ??$getline(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEAV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0@@Z(ptr ptr) basic_istream_char_getline_str -@ cdecl -arch=win32 ??$getline(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@AAV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0(a)D@Z(ptr ptr long) basic_istream_char_getline_str_delim -@ cdecl -arch=win64 ??$getline(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEAV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0(a)D@Z(ptr ptr long) basic_istream_char_getline_str_delim +@ cdecl -arch=win32 ??$getline(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@AAV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0@@Z(ptr ptr) basic_istream_char_getline_bstr +@ cdecl -arch=win64 ??$getline(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEAV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0@@Z(ptr ptr) basic_istream_char_getline_bstr +@ cdecl -arch=win32 ??$getline(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@AAV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0(a)D@Z(ptr ptr long) basic_istream_char_getline_bstr_delim +@ cdecl -arch=win64 ??$getline(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEAV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0(a)D@Z(ptr ptr long) basic_istream_char_getline_bstr_delim @ stub -arch=win32 ??$getline(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@YAAAV?$basic_istream(a)GU?$char_traits(a)G@std@@@0(a)AAV10@AAV?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@0@@Z @ stub -arch=win64 ??$getline(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@YAAEAV?$basic_istream(a)GU?$char_traits(a)G@std@@@0(a)AEAV10@AEAV?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@0@@Z @ stub -arch=win32 ??$getline(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@YAAAV?$basic_istream(a)GU?$char_traits(a)G@std@@@0(a)AAV10@AAV?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@0(a)G@Z

1 0

Piotr Caban : msvcp80: Added _Getcat implementation for supported facets.
by Alexandre Julliard June 14, 2012

June 14, 2012

Module: wine Branch: master Commit: 2929a0e774cb61102ba7bf15d55a7ee15448e2f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2929a0e774cb61102ba7bf15d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 14 15:36:39 2012 +0200 msvcp80: Added _Getcat implementation for supported facets. --- dlls/msvcp80/msvcp80.c | 123 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp80/msvcp80.spec | 40 +++++++------- 2 files changed, 143 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2929a0e774cb61102ba7b…

1 0

Piotr Caban : msvcp90: Export locale::facet vtable.
by Alexandre Julliard June 14, 2012

June 14, 2012

Module: wine Branch: master Commit: 49c6e430d5a9742c5ea0b1dde3d3f5c7c984176a URL: http://source.winehq.org/git/wine.git/?a=commit;h=49c6e430d5a9742c5ea0b1dde… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 14 15:36:04 2012 +0200 msvcp90: Export locale::facet vtable. --- dlls/msvcp90/locale.c | 2 ++ dlls/msvcp90/msvcp90.spec | 1 + 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 55ec5aa..1d04bcb 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -202,6 +202,8 @@ static void locale_facet_register(locale_facet *add) list_add_head(&lazy_facets, &head->entry); } +/* Not exported from msvcp90 */ +/* ??_7facet(a)locale@std@@6B@ */ extern const vtable_ptr MSVCP_locale_facet_vtable; /* ??0id(a)locale@std@@QAE(a)I@Z */ diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index a7014bf..6751118 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -5814,3 +5814,4 @@ #Functions not exported in native dll: @ thiscall -arch=win32 ?_Tidy@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@AAEX_N(a)Z(ptr long) basic_string_char_tidy_built @ cdecl -arch=win64 ?_Tidy@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@AEAAX_N(a)Z(ptr long) basic_string_char_tidy_built +@ extern ??_7facet(a)locale@std@@6B@ MSVCP_locale_facet_vtable

1 0

Piotr Caban : msvcp90: Added basic_fstream<char> implementation.
by Alexandre Julliard June 14, 2012

June 14, 2012

Module: wine Branch: master Commit: 38c7a46c5e33c5c50f83b62ea5ac7764c8523426 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38c7a46c5e33c5c50f83b62ea… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 14 15:35:45 2012 +0200 msvcp90: Added basic_fstream<char> implementation. --- dlls/msvcp90/ios.c | 233 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.h | 19 ++-- dlls/msvcp90/msvcp90.spec | 70 +++++++------- 3 files changed, 279 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=38c7a46c5e33c5c50f83b…

1 0