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

Julian Rüger : po: Update German translation.
by Alexandre Julliard July 3, 2012

July 3, 2012

Module: wine Branch: master Commit: 665f1eee16196f92806d4ee0610c1b10222cb594 URL: http://source.winehq.org/git/wine.git/?a=commit;h=665f1eee16196f92806d4ee06… Author: Julian Rüger <jr98(a)gmx.net> Date: Tue Jul 3 04:23:14 2012 +0200 po: Update German translation. --- po/de.po | 28 +++++++++++++++++++++++++++- 1 files changed, 27 insertions(+), 1 deletions(-) diff --git a/po/de.po b/po/de.po index 649488f..7463643 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-06-20 21:55+0200\n" +"PO-Revision-Date: 2012-07-03 01:38+0200\n" "Last-Translator: Julian Rüger\n" "Language-Team: none\n" "Language: German\n" @@ -9719,6 +9719,32 @@ msgid "" "/ProgIDOpen Open a document using the specified progID.\n" "/? Display this help and exit.\n" msgstr "" +"Startet ein Programm, oder öffnet ein Dokument in dem Programm, das " +"normalerweise für Dateien mit dieser Dateiendung benutzt wird.\n" +"Aufruf:\n" +"start [Optionen] Dateiname_Programm [...]\n" +"start [Optionen] Dateiname_Dokument\n" +"\n" +"Optionen:\n" +"\"titel\" Spezifiziert den Titel für Kindfenster.\n" +"/d Ordner Startet das Programm im angegebenen Verzeichnis.\n" +"/b Für dieses Programm wird keine neue Konsole erstellt.\n" +"/i Startet das Programm mit einem neuen Satz Umgebungsvariablen.\n" +"/min Startet das Programm minimiert.\n" +"/max Startet das Programm maximiert.\n" +"/low Startet das Programm in der Leerlauf-Prioritätsklasse.\n" +"/normal Startet das Programm in der normalen Prioritätsklasse.\n" +"/high Startet das Programm in der hohen Prioritätsklasse.\n" +"/realtime Startet das Programm in der Echtzeit-Prioritätsklasse.\n" +"/abovenormal Startet das Programm in der gehobenen Prioritätsklasse.\n" +"/belownormal Startet das Programm in der abgesenkten Prioritätsklasse.\n" +"/node Startet das Programm auf dem angegebenen NUMA-Knoten.\n" +"/affinity Maske Startet das Programm mit der angegebenen Affinitätsmaske.\n" +"/wait Wartet, bis das Programm endet und beendet sich selbst mit " +"dessen Exitcode.\n" +"/unix Öffnet einen Unix-Dateinamen wie mit dem Windows-Explorer.\n" +"/ProgIDOpen Öffnet ein Dokument mit der angegebenen progID.\n" +"/? Zeigt diese Hilfe an und beendet sich.\n" #: cmd.rc:211 msgid "TIME sets or shows the current system time.\n"

1 0

Michael Stefaniuc : quartz: Use StdMemAllocator_from_IMemAllocator() instead of casts.
by Alexandre Julliard July 3, 2012

July 3, 2012

Module: wine Branch: master Commit: 56e3b22f6cef4a3874a80c2ddfaae0bfb4c14fa2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56e3b22f6cef4a3874a80c2dd… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 3 00:21:28 2012 +0200 quartz: Use StdMemAllocator_from_IMemAllocator() instead of casts. --- dlls/quartz/memallocator.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/memallocator.c b/dlls/quartz/memallocator.c index cc700c2..f1903f9 100644 --- a/dlls/quartz/memallocator.c +++ b/dlls/quartz/memallocator.c @@ -809,9 +809,14 @@ typedef struct StdMemAllocator LPVOID pMemory; } StdMemAllocator; +static inline StdMemAllocator *StdMemAllocator_from_IMemAllocator(IMemAllocator * iface) +{ + return CONTAINING_RECORD(iface, StdMemAllocator, base.IMemAllocator_iface); +} + static HRESULT StdMemAllocator_Alloc(IMemAllocator * iface) { - StdMemAllocator *This = (StdMemAllocator *)iface; + StdMemAllocator *This = StdMemAllocator_from_IMemAllocator(iface); StdMediaSample2 * pSample = NULL; SYSTEM_INFO si; LONG i; @@ -849,7 +854,7 @@ static HRESULT StdMemAllocator_Alloc(IMemAllocator * iface) static HRESULT StdMemAllocator_Free(IMemAllocator * iface) { - StdMemAllocator *This = (StdMemAllocator *)iface; + StdMemAllocator *This = StdMemAllocator_from_IMemAllocator(iface); struct list * cursor; if (!list_empty(&This->base.used_list)) @@ -882,7 +887,7 @@ static HRESULT StdMemAllocator_Free(IMemAllocator * iface) static void StdMemAllocator_Destroy(IMemAllocator *iface) { - StdMemAllocator *This = (StdMemAllocator *)iface; + StdMemAllocator *This = StdMemAllocator_from_IMemAllocator(iface); This->csState.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->csState);

1 0

Dmitry Timoshkov : gdiplus: Fix the convert_unit() comment to reflect its functionality.
by Alexandre Julliard July 3, 2012

July 3, 2012

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

Michael Stefaniuc : quartz: Use unsafe_impl_from_IMediaSample() instead of a cast.
by Alexandre Julliard July 3, 2012

July 3, 2012

Module: wine Branch: master Commit: 9262c55a2ecf834b98ccd5b8f2794e74d5b39e69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9262c55a2ecf834b98ccd5b8f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 3 00:19:52 2012 +0200 quartz: Use unsafe_impl_from_IMediaSample() instead of a cast. --- dlls/quartz/memallocator.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/memallocator.c b/dlls/quartz/memallocator.c index df4cf63..cc700c2 100644 --- a/dlls/quartz/memallocator.c +++ b/dlls/quartz/memallocator.c @@ -70,6 +70,7 @@ static inline BaseMemAllocator *impl_from_IMemAllocator(IMemAllocator *iface) static const IMemAllocatorVtbl BaseMemAllocator_VTable; static const IMediaSample2Vtbl StdMediaSample2_VTable; +static inline StdMediaSample2 *unsafe_impl_from_IMediaSample(IMediaSample * iface); #define AM_SAMPLE2_PROP_SIZE_WRITABLE FIELD_OFFSET(AM_SAMPLE2_PROPERTIES, pbBuffer) @@ -356,9 +357,9 @@ static HRESULT WINAPI BaseMemAllocator_GetBuffer(IMemAllocator * iface, IMediaSa static HRESULT WINAPI BaseMemAllocator_ReleaseBuffer(IMemAllocator * iface, IMediaSample * pSample) { BaseMemAllocator *This = impl_from_IMemAllocator(iface); - StdMediaSample2 * pStdSample = (StdMediaSample2 *)pSample; + StdMediaSample2 * pStdSample = unsafe_impl_from_IMediaSample(pSample); HRESULT hr = S_OK; - + TRACE("(%p)->(%p)\n", This, pSample); /* FIXME: make sure that sample is currently on the used list */ @@ -791,6 +792,16 @@ static const IMediaSample2Vtbl StdMediaSample2_VTable = StdMediaSample2_SetProperties }; +static inline StdMediaSample2 *unsafe_impl_from_IMediaSample(IMediaSample * iface) +{ + IMediaSample2 *iface2 = (IMediaSample2 *)iface; + + if (!iface) + return NULL; + assert(iface2->lpVtbl == &StdMediaSample2_VTable); + return impl_from_IMediaSample2(iface2); +} + typedef struct StdMemAllocator { BaseMemAllocator base;

1 0

Detlef Riekenberg : shell32/tests: Fix a failure on w2k.
by Alexandre Julliard July 3, 2012

July 3, 2012

Module: wine Branch: master Commit: bb684aaba74dfb252138dea4eac4be28983e7517 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb684aaba74dfb252138dea4e… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Jul 2 21:22:10 2012 +0200 shell32/tests: Fix a failure on w2k. --- dlls/shell32/tests/shlfolder.c | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index bee6cb5..f34bb70 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -73,6 +73,18 @@ static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); static UINT (WINAPI *pGetSystemWow64DirectoryW)(LPWSTR, UINT); static HRESULT (WINAPI *pSHCreateDefaultContextMenu)(const DEFCONTEXTMENU*,REFIID,void**); +static const char *debugstr_guid(REFIID riid) +{ + static char buf[50]; + + sprintf(buf, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", + riid->Data1, riid->Data2, riid->Data3, riid->Data4[0], + riid->Data4[1], riid->Data4[2], riid->Data4[3], riid->Data4[4], + riid->Data4[5], riid->Data4[6], riid->Data4[7]); + + return buf; +} + static WCHAR *make_wstr(const char *str) { WCHAR *ret; @@ -566,7 +578,9 @@ if (0) CLSID id; hr = IPersist_GetClassID(pp, &id); ok(hr == S_OK, "Got 0x%08x\n", hr); - ok(IsEqualIID(&id, &CLSID_ShellDocObjView), "Unexpected classid\n"); + /* CLSID_ShellFSFolder on some w2k systems */ + ok(IsEqualIID(&id, &CLSID_ShellDocObjView) || broken(IsEqualIID(&id, &CLSID_ShellFSFolder)), + "Unexpected classid %s\n", debugstr_guid(&id)); IPersist_Release(pp); }

1 0

Dmitry Timoshkov : windowscodecs: Implement BitmapDecoderInfo_GetSpecVersion.
by Alexandre Julliard July 3, 2012

July 3, 2012

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

Michael Stefaniuc : quartz: Avoid a COM object => iface => object round trip.
by Alexandre Julliard July 3, 2012

July 3, 2012

Module: wine Branch: master Commit: f557ed6f944226f0f8b6ef03ee3d66bcb3abc07b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f557ed6f944226f0f8b6ef03e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 3 00:17:23 2012 +0200 quartz: Avoid a COM object => iface => object round trip. --- dlls/quartz/memallocator.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/memallocator.c b/dlls/quartz/memallocator.c index f74a2fd..df4cf63 100644 --- a/dlls/quartz/memallocator.c +++ b/dlls/quartz/memallocator.c @@ -335,14 +335,14 @@ static HRESULT WINAPI BaseMemAllocator_GetBuffer(IMemAllocator * iface, IMediaSa hr = VFW_E_TIMEOUT; else { + StdMediaSample2 *ms; struct list * free = list_head(&This->free_list); list_remove(free); list_add_head(&This->used_list, free); - *pSample = (IMediaSample *)LIST_ENTRY(free, StdMediaSample2, listentry); - - assert(((StdMediaSample2 *)*pSample)->ref == 0); - + ms = LIST_ENTRY(free, StdMediaSample2, listentry); + assert(ms->ref == 0); + *pSample = (IMediaSample *)&ms->IMediaSample2_iface; IMediaSample_AddRef(*pSample); } }

1 0

Dmitry Timoshkov : windowscodecs: Implement MetadataReaderInfo_GetSpecVersion.
by Alexandre Julliard July 3, 2012

July 3, 2012

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

Michael Stefaniuc : quartz: COM cleanup for IMediaSample2.
by Alexandre Julliard July 3, 2012

July 3, 2012

Module: wine Branch: master Commit: b904b6949ebff5449273e15403025d5ab25650ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=b904b6949ebff5449273e1540… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 3 00:15:01 2012 +0200 quartz: COM cleanup for IMediaSample2. --- dlls/quartz/memallocator.c | 80 +++++++++++++++++++++++------------------- dlls/quartz/quartz_private.h | 12 ------ 2 files changed, 44 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b904b6949ebff5449273e…

1 0

Vincent Povirk : windowscodecs: Implement IWICBitmapCodecInfo:: GetPixelFormats.
by Alexandre Julliard July 3, 2012

July 3, 2012

Module: wine Branch: master Commit: 5c4ed986c0933945295dc45e56876cdb81168d6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c4ed986c0933945295dc45e5… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Jul 2 13:48:05 2012 -0500 windowscodecs: Implement IWICBitmapCodecInfo::GetPixelFormats. --- dlls/windowscodecs/info.c | 73 ++++++++++++++++++++++++++++++++++++-- dlls/windowscodecs/tests/info.c | 54 ++++++++++++++++++++++++++++ 2 files changed, 123 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index 9921efc..f1eaf4c 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -42,6 +42,7 @@ static const WCHAR mimetypes_valuename[] = {'M','i','m','e','T','y','p','e','s', static const WCHAR author_valuename[] = {'A','u','t','h','o','r',0}; static const WCHAR friendlyname_valuename[] = {'F','r','i','e','n','d','l','y','N','a','m','e',0}; static const WCHAR pixelformats_keyname[] = {'P','i','x','e','l','F','o','r','m','a','t','s',0}; +static const WCHAR formats_keyname[] = {'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}; 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}; @@ -135,6 +136,68 @@ static HRESULT ComponentInfo_GetDWORDValue(HKEY classkey, LPCWSTR value, return HRESULT_FROM_WIN32(ret); } +static HRESULT ComponentInfo_GetGuidList(HKEY classkey, LPCWSTR subkeyname, + UINT buffersize, GUID *buffer, UINT *actual_size) +{ + LONG ret; + HKEY subkey; + UINT items_returned; + WCHAR guid_string[39]; + DWORD guid_string_size; + HRESULT hr=S_OK; + + if (!actual_size) + return E_INVALIDARG; + + ret = RegOpenKeyExW(classkey, subkeyname, 0, KEY_READ, &subkey); + if (ret != ERROR_SUCCESS) return HRESULT_FROM_WIN32(ret); + + if (buffer) + { + items_returned = 0; + guid_string_size = 39; + while (items_returned < buffersize) + { + ret = RegEnumKeyExW(subkey, items_returned, guid_string, + &guid_string_size, NULL, NULL, NULL, NULL); + + if (ret != ERROR_SUCCESS) + { + hr = HRESULT_FROM_WIN32(ret); + break; + } + + if (guid_string_size != 38) + { + hr = E_FAIL; + break; + } + + hr = CLSIDFromString(guid_string, &buffer[items_returned]); + if (FAILED(hr)) + break; + + items_returned++; + guid_string_size = 39; + } + + if (ret == ERROR_NO_MORE_ITEMS) + hr = S_OK; + + *actual_size = items_returned; + } + else + { + ret = RegQueryInfoKeyW(subkey, NULL, NULL, NULL, actual_size, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + if (ret != ERROR_SUCCESS) + hr = HRESULT_FROM_WIN32(ret); + } + + RegCloseKey(subkey); + + return hr; +} + typedef struct { IWICBitmapDecoderInfo IWICBitmapDecoderInfo_iface; LONG ref; @@ -290,8 +353,9 @@ static HRESULT WINAPI BitmapDecoderInfo_GetContainerFormat(IWICBitmapDecoderInfo static HRESULT WINAPI BitmapDecoderInfo_GetPixelFormats(IWICBitmapDecoderInfo *iface, UINT cFormats, GUID *pguidPixelFormats, UINT *pcActual) { - FIXME("(%p,%u,%p,%p): stub\n", iface, cFormats, pguidPixelFormats, pcActual); - return E_NOTIMPL; + BitmapDecoderInfo *This = impl_from_IWICBitmapDecoderInfo(iface); + TRACE("(%p,%u,%p,%p)\n", iface, cFormats, pguidPixelFormats, pcActual); + return ComponentInfo_GetGuidList(This->classkey, formats_keyname, cFormats, pguidPixelFormats, pcActual); } static HRESULT WINAPI BitmapDecoderInfo_GetColorManagementVersion(IWICBitmapDecoderInfo *iface, @@ -755,8 +819,9 @@ static HRESULT WINAPI BitmapEncoderInfo_GetContainerFormat(IWICBitmapEncoderInfo static HRESULT WINAPI BitmapEncoderInfo_GetPixelFormats(IWICBitmapEncoderInfo *iface, UINT cFormats, GUID *pguidPixelFormats, UINT *pcActual) { - FIXME("(%p,%u,%p,%p): stub\n", iface, cFormats, pguidPixelFormats, pcActual); - return E_NOTIMPL; + BitmapEncoderInfo *This = impl_from_IWICBitmapEncoderInfo(iface); + TRACE("(%p,%u,%p,%p)\n", iface, cFormats, pguidPixelFormats, pcActual); + return ComponentInfo_GetGuidList(This->classkey, formats_keyname, cFormats, pguidPixelFormats, pcActual); } static HRESULT WINAPI BitmapEncoderInfo_GetColorManagementVersion(IWICBitmapEncoderInfo *iface, diff --git a/dlls/windowscodecs/tests/info.c b/dlls/windowscodecs/tests/info.c index cae64ff..6eb20cb 100644 --- a/dlls/windowscodecs/tests/info.c +++ b/dlls/windowscodecs/tests/info.c @@ -63,6 +63,23 @@ static HRESULT get_component_info(const GUID *clsid, IWICComponentInfo **result) return hr; } +static int is_pixelformat(GUID *format) +{ + IWICComponentInfo *info; + HRESULT hr; + WICComponentType componenttype; + + hr = get_component_info(format, &info); + if (FAILED(hr)) + return FALSE; + + hr = IWICComponentInfo_GetComponentType(info, &componenttype); + + IWICComponentInfo_Release(info); + + return SUCCEEDED(hr) && componenttype == WICPixelFormat; +} + static void test_decoder_info(void) { IWICComponentInfo *info; @@ -72,6 +89,9 @@ static void test_decoder_info(void) WCHAR value[256]; const WCHAR expected_mimetype[] = {'i','m','a','g','e','/','b','m','p',0}; CLSID clsid; + GUID pixelformats[20]; + UINT num_formats, count; + int i; hr = get_component_info(&CLSID_WICBmpDecoder, &info); @@ -114,6 +134,40 @@ static void test_decoder_info(void) ok(lstrcmpW(value, expected_mimetype) == 0, "GetMimeType returned wrong value %s\n", wine_dbgstr_w(value)); ok(len == lstrlenW(expected_mimetype)+1, "GetMimeType returned wrong len %i\n", len); + num_formats = 0xdeadbeef; + hr = IWICBitmapDecoderInfo_GetPixelFormats(decoder_info, 0, NULL, &num_formats); + ok(hr == S_OK, "GetPixelFormats failed, hr=%x\n", hr); + ok(num_formats < 20 && num_formats > 1, "got %d formats\n", num_formats); + + hr = IWICBitmapDecoderInfo_GetPixelFormats(decoder_info, 0, NULL, NULL); + ok(hr == E_INVALIDARG, "GetPixelFormats failed, hr=%x\n", hr); + + count = 0xdeadbeef; + hr = IWICBitmapDecoderInfo_GetPixelFormats(decoder_info, 0, pixelformats, &count); + ok(hr == S_OK, "GetPixelFormats failed, hr=%x\n", hr); + ok(count == 0, "got %d formats\n", count); + + count = 0xdeadbeef; + hr = IWICBitmapDecoderInfo_GetPixelFormats(decoder_info, 1, pixelformats, &count); + ok(hr == S_OK, "GetPixelFormats failed, hr=%x\n", hr); + ok(count == 1, "got %d formats\n", count); + ok(is_pixelformat(&pixelformats[0]), "got invalid pixel format\n"); + + count = 0xdeadbeef; + hr = IWICBitmapDecoderInfo_GetPixelFormats(decoder_info, num_formats, pixelformats, &count); + ok(hr == S_OK, "GetPixelFormats failed, hr=%x\n", hr); + ok(count == num_formats, "got %d formats, expected %d\n", count, num_formats); + for (i=0; i<num_formats; i++) + ok(is_pixelformat(&pixelformats[i]), "got invalid pixel format\n"); + + hr = IWICBitmapDecoderInfo_GetPixelFormats(decoder_info, num_formats, pixelformats, NULL); + ok(hr == E_INVALIDARG, "GetPixelFormats failed, hr=%x\n", hr); + + count = 0xdeadbeef; + hr = IWICBitmapDecoderInfo_GetPixelFormats(decoder_info, 20, pixelformats, &count); + ok(hr == S_OK, "GetPixelFormats failed, hr=%x\n", hr); + ok(count == num_formats, "got %d formats, expected %d\n", count, num_formats); + IWICBitmapDecoderInfo_Release(decoder_info); IWICComponentInfo_Release(info);

1 0