August 2009 - Wine-commits - list.winehq.org

Vincent Povirk : windowscodecs: Implement IWICImagingFactory:: CreateDecoderFromStream.
by Alexandre Julliard 05 Aug '09

05 Aug '09

Module: wine Branch: master Commit: 219b8c64ac92b08fb3ffb5d226812d6640f90975 URL: http://source.winehq.org/git/wine.git/?a=commit;h=219b8c64ac92b08fb3ffb5d22… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Aug 4 17:31:15 2009 -0500 windowscodecs: Implement IWICImagingFactory::CreateDecoderFromStream. --- dlls/windowscodecs/imgfactory.c | 70 +++++++++++++++++++++++++++++++++++++- 1 files changed, 68 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/imgfactory.c b/dlls/windowscodecs/imgfactory.c index e7bca4c..ab85bca 100644 --- a/dlls/windowscodecs/imgfactory.c +++ b/dlls/windowscodecs/imgfactory.c @@ -98,9 +98,75 @@ static HRESULT WINAPI ImagingFactory_CreateDecoderFromStream( IWICImagingFactory *iface, IStream *pIStream, const GUID *pguidVendor, WICDecodeOptions metadataOptions, IWICBitmapDecoder **ppIDecoder) { - FIXME("(%p,%p,%s,%u,%p): stub\n", iface, pIStream, debugstr_guid(pguidVendor), + static int fixme=0; + IEnumUnknown *enumdecoders; + IUnknown *unkdecoderinfo; + IWICBitmapDecoderInfo *decoderinfo; + IWICBitmapDecoder *decoder=NULL; + HRESULT res=S_OK; + ULONG num_fetched; + BOOL matches; + + TRACE("(%p,%p,%s,%u,%p)\n", iface, pIStream, debugstr_guid(pguidVendor), metadataOptions, ppIDecoder); - return E_NOTIMPL; + + if (pguidVendor && !fixme++) + FIXME("ignoring vendor GUID\n"); + + res = CreateComponentEnumerator(WICDecoder, WICComponentEnumerateDefault, &enumdecoders); + if (FAILED(res)) return res; + + while (!decoder) + { + res = IEnumUnknown_Next(enumdecoders, 1, &unkdecoderinfo, &num_fetched); + + if (res == S_OK) + { + res = IUnknown_QueryInterface(unkdecoderinfo, &IID_IWICBitmapDecoderInfo, (void**)&decoderinfo); + + if (SUCCEEDED(res)) + { + res = IWICBitmapDecoderInfo_MatchesPattern(decoderinfo, pIStream, &matches); + + if (SUCCEEDED(res) && matches) + { + res = IWICBitmapDecoderInfo_CreateInstance(decoderinfo, &decoder); + + /* FIXME: should use QueryCapability to choose a decoder */ + + if (SUCCEEDED(res)) + { + res = IWICBitmapDecoder_Initialize(decoder, pIStream, metadataOptions); + + if (FAILED(res)) + { + IWICBitmapDecoder_Release(decoder); + decoder = NULL; + } + } + } + + IWICBitmapDecoderInfo_Release(decoderinfo); + } + + IUnknown_Release(unkdecoderinfo); + } + else + break; + } + + IEnumUnknown_Release(enumdecoders); + + if (decoder) + { + *ppIDecoder = decoder; + return S_OK; + } + else + { + *ppIDecoder = NULL; + return WINCODEC_ERR_COMPONENTNOTFOUND; + } } static HRESULT WINAPI ImagingFactory_CreateDecoderFromFileHandle(

1 0

Vincent Povirk : include: Add definitions for CreateDecoderFromStream.
by Alexandre Julliard 05 Aug '09

05 Aug '09

Module: wine Branch: master Commit: 9dd3c209c6185d0870eee384021e522d07f74049 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9dd3c209c6185d0870eee3840… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Aug 4 17:31:43 2009 -0500 include: Add definitions for CreateDecoderFromStream. --- include/wincodec.idl | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/include/wincodec.idl b/include/wincodec.idl index 8e411a6..6c868f4 100644 --- a/include/wincodec.idl +++ b/include/wincodec.idl @@ -86,6 +86,14 @@ typedef enum WICComponentSigning { WICComponentDisabled = 0x80000000 } WICComponentSigning; +typedef enum WICComponentEnumerateOptions { + WICComponentEnumerateDefault = 0x00000000, + WICComponentEnumerateRefresh = 0x00000001, + WICComponentEnumerateBuiltInOnly = 0x20000000, + WICComponentEnumerateUnsigned = 0x40000000, + WICComponentEnumerateDisabled = 0x80000000 +} WICComponentEnumerateOptions; + typedef GUID WICPixelFormatGUID; typedef REFGUID REFWICPixelFormatGUID; @@ -121,6 +129,7 @@ typedef UINT32 WICColor; cpp_quote("#define WINCODEC_ERR_WRONGSTATE 0x88982f04") cpp_quote("#define WINCODEC_ERR_CODECNOTHUMBNAIL 0x88982f44") cpp_quote("#define WINCODEC_ERR_PALETTEUNAVAILABLE 0x88982f45") +cpp_quote("#define WINCODEC_ERR_COMPONENTNOTFOUND 0x88982f50") cpp_quote("#define WINCODEC_ERR_UNSUPPORTEDOPERATION 0x88982f81") cpp_quote("#define WINCODEC_ERR_INSUFFICIENTBUFFER 0x88982f8c")

1 0

Vincent Povirk : windowscodecs: Implement IWICImagingFactory:: CreateComponentEnumerator.
by Alexandre Julliard 05 Aug '09

05 Aug '09

Module: wine Branch: master Commit: cd4fdb95875a835fdc2868f7bb943cbdcd048d0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd4fdb95875a835fdc2868f7b… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Jul 28 19:08:42 2009 -0500 windowscodecs: Implement IWICImagingFactory::CreateComponentEnumerator. --- dlls/windowscodecs/imgfactory.c | 4 +- dlls/windowscodecs/info.c | 261 ++++++++++++++++++++++++++++++++ dlls/windowscodecs/wincodecs_private.h | 1 + 3 files changed, 264 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/imgfactory.c b/dlls/windowscodecs/imgfactory.c index bdc2c45..e7bca4c 100644 --- a/dlls/windowscodecs/imgfactory.c +++ b/dlls/windowscodecs/imgfactory.c @@ -246,8 +246,8 @@ static HRESULT WINAPI ImagingFactory_CreateBitmapFromHICON(IWICImagingFactory *i static HRESULT WINAPI ImagingFactory_CreateComponentEnumerator(IWICImagingFactory *iface, DWORD componentTypes, DWORD options, IEnumUnknown **ppIEnumUnknown) { - FIXME("(%p,%u,%u,%p): stub\n", iface, componentTypes, options, ppIEnumUnknown); - return E_NOTIMPL; + TRACE("(%p,%u,%u,%p)\n", iface, componentTypes, options, ppIEnumUnknown); + return CreateComponentEnumerator(componentTypes, options, ppIEnumUnknown); } static HRESULT WINAPI ImagingFactory_CreateFastMetadataEncoderFromDecoder( diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index 12eb4f0..e8a70c3 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -32,6 +32,7 @@ #include "wine/debug.h" #include "wine/unicode.h" +#include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); @@ -531,3 +532,263 @@ HRESULT CreateComponentInfo(REFCLSID clsid, IWICComponentInfo **ppIInfo) return hr; } + +typedef struct { + const IEnumUnknownVtbl *IEnumUnknown_Vtbl; + LONG ref; + struct list objects; + struct list *cursor; +} ComponentEnum; + +typedef struct { + struct list entry; + IUnknown *unk; +} ComponentEnumItem; + +static const IEnumUnknownVtbl ComponentEnumVtbl; + +static HRESULT WINAPI ComponentEnum_QueryInterface(IEnumUnknown *iface, REFIID iid, + void **ppv) +{ + ComponentEnum *This = (ComponentEnum*)iface; + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); + + if (!ppv) return E_INVALIDARG; + + if (IsEqualIID(&IID_IUnknown, iid) || IsEqualIID(&IID_IEnumUnknown, iid)) + { + *ppv = This; + } + else + { + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI ComponentEnum_AddRef(IEnumUnknown *iface) +{ + ComponentEnum *This = (ComponentEnum*)iface; + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + return ref; +} + +static ULONG WINAPI ComponentEnum_Release(IEnumUnknown *iface) +{ + ComponentEnum *This = (ComponentEnum*)iface; + ULONG ref = InterlockedDecrement(&This->ref); + ComponentEnumItem *cursor, *cursor2; + + TRACE("(%p) refcount=%u\n", iface, ref); + + if (ref == 0) + { + LIST_FOR_EACH_ENTRY_SAFE(cursor, cursor2, &This->objects, ComponentEnumItem, entry) + { + IUnknown_Release(cursor->unk); + list_remove(&cursor->entry); + HeapFree(GetProcessHeap(), 0, cursor); + } + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI ComponentEnum_Next(IEnumUnknown *iface, ULONG celt, + IUnknown **rgelt, ULONG *pceltFetched) +{ + ComponentEnum *This = (ComponentEnum*)iface; + int num_fetched=0; + ComponentEnumItem *item; + + TRACE("(%p,%u,%p,%p)\n", iface, celt, rgelt, pceltFetched); + + while (num_fetched<celt) + { + if (!This->cursor) + { + *pceltFetched = num_fetched; + return S_FALSE; + } + item = LIST_ENTRY(This->cursor, ComponentEnumItem, entry); + IUnknown_AddRef(item->unk); + rgelt[num_fetched] = item->unk; + num_fetched++; + This->cursor = list_next(&This->objects, This->cursor); + } + *pceltFetched = num_fetched; + return S_OK; +} + +static HRESULT WINAPI ComponentEnum_Skip(IEnumUnknown *iface, ULONG celt) +{ + ComponentEnum *This = (ComponentEnum*)iface; + int i; + + TRACE("(%p,%u)\n", iface, celt); + + for (i=0; i<celt; i++) + { + if (!This->cursor) + return S_FALSE; + This->cursor = list_next(&This->objects, This->cursor); + } + return S_OK; +} + +static HRESULT WINAPI ComponentEnum_Reset(IEnumUnknown *iface) +{ + ComponentEnum *This = (ComponentEnum*)iface; + + TRACE("(%p)\n", iface); + + This->cursor = list_head(&This->objects); + return S_OK; +} + +static HRESULT WINAPI ComponentEnum_Clone(IEnumUnknown *iface, IEnumUnknown **ppenum) +{ + ComponentEnum *This = (ComponentEnum*)iface; + ComponentEnum *new_enum; + ComponentEnumItem *old_item, *new_item; + HRESULT ret=S_OK; + + new_enum = HeapAlloc(GetProcessHeap(), 0, sizeof(ComponentEnum)); + if (!new_enum) + { + *ppenum = NULL; + return E_OUTOFMEMORY; + } + + new_enum->IEnumUnknown_Vtbl = &ComponentEnumVtbl; + new_enum->ref = 1; + new_enum->cursor = NULL; + + list_init(&new_enum->objects); + LIST_FOR_EACH_ENTRY(old_item, &This->objects, ComponentEnumItem, entry) + { + new_item = HeapAlloc(GetProcessHeap(), 0, sizeof(ComponentEnumItem)); + if (!new_item) + { + ret = E_OUTOFMEMORY; + break; + } + new_item->unk = old_item->unk; + list_add_tail(&new_enum->objects, &new_item->entry); + IUnknown_AddRef(new_item->unk); + if (&old_item->entry == This->cursor) new_enum->cursor = &new_item->entry; + } + + if (FAILED(ret)) + { + IUnknown_Release((IUnknown*)new_enum); + *ppenum = NULL; + } + else + *ppenum = (IEnumUnknown*)new_enum; + + return ret; +} + +static const IEnumUnknownVtbl ComponentEnumVtbl = { + ComponentEnum_QueryInterface, + ComponentEnum_AddRef, + ComponentEnum_Release, + ComponentEnum_Next, + ComponentEnum_Skip, + ComponentEnum_Reset, + ComponentEnum_Clone +}; + +HRESULT CreateComponentEnumerator(DWORD componentTypes, DWORD options, IEnumUnknown **ppIEnumUnknown) +{ + ComponentEnum *This; + ComponentEnumItem *item; + const struct category *category; + HKEY clsidkey, catidkey, instancekey; + WCHAR guidstring[39]; + LONG res; + int i; + HRESULT hr=S_OK; + CLSID clsid; + + if (options) FIXME("ignoring flags %x\n", options); + + res = RegOpenKeyExW(HKEY_CLASSES_ROOT, clsid_keyname, 0, KEY_READ, &clsidkey); + if (res != ERROR_SUCCESS) + return HRESULT_FROM_WIN32(res); + + This = HeapAlloc(GetProcessHeap(), 0, sizeof(ComponentEnum)); + if (!This) + { + RegCloseKey(clsidkey); + return E_OUTOFMEMORY; + } + + This->IEnumUnknown_Vtbl = &ComponentEnumVtbl; + This->ref = 1; + list_init(&This->objects); + + for (category=categories; category->type && hr == S_OK; category++) + { + if ((category->type & componentTypes) == 0) continue; + StringFromGUID2(category->catid, guidstring, 39); + res = RegOpenKeyExW(clsidkey, guidstring, 0, KEY_READ, &catidkey); + if (res == ERROR_SUCCESS) + { + res = RegOpenKeyExW(catidkey, instance_keyname, 0, KEY_READ, &instancekey); + if (res == ERROR_SUCCESS) + { + i=0; + for (;;i++) + { + DWORD guidstring_size = 39; + res = RegEnumKeyExW(instancekey, i, guidstring, &guidstring_size, NULL, NULL, NULL, NULL); + if (res != ERROR_SUCCESS) break; + + item = HeapAlloc(GetProcessHeap(), 0, sizeof(ComponentEnumItem)); + if (!item) { hr = E_OUTOFMEMORY; break; } + + hr = CLSIDFromString(guidstring, &clsid); + if (SUCCEEDED(hr)) + { + hr = CreateComponentInfo(&clsid, (IWICComponentInfo**)&item->unk); + if (SUCCEEDED(hr)) + list_add_tail(&This->objects, &item->entry); + } + + if (!SUCCEEDED(hr)) + { + HeapFree(GetProcessHeap(), 0, item); + hr = S_OK; + } + } + RegCloseKey(instancekey); + } + RegCloseKey(catidkey); + } + if (res != ERROR_SUCCESS && res != ERROR_NO_MORE_ITEMS) + hr = HRESULT_FROM_WIN32(res); + } + RegCloseKey(clsidkey); + + if (SUCCEEDED(hr)) + { + IEnumUnknown_Reset((IEnumUnknown*)This); + *ppIEnumUnknown = (IEnumUnknown*)This; + } + else + { + *ppIEnumUnknown = NULL; + IUnknown_Release((IUnknown*)This); + } + + return hr; +} diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h index 9e9e9e0..6e4e752 100644 --- a/dlls/windowscodecs/wincodecs_private.h +++ b/dlls/windowscodecs/wincodecs_private.h @@ -29,5 +29,6 @@ extern HRESULT copy_pixels(UINT bpp, const BYTE *srcbuffer, const WICRect *rc, UINT dststride, UINT dstbuffersize, BYTE *dstbuffer); extern HRESULT CreateComponentInfo(REFCLSID clsid, IWICComponentInfo **ppIInfo); +extern HRESULT CreateComponentEnumerator(DWORD componentTypes, DWORD options, IEnumUnknown **ppIEnumUnknown); #endif /* WINCODECS_PRIVATE_H */

1 0

Vincent Povirk : windowscodecs: Implement GetDecoderInfo for BMP decoder.
by Alexandre Julliard 05 Aug '09

05 Aug '09

Module: wine Branch: master Commit: d8c926d79e6a4078fab39abce71ecc1c91bb1cbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8c926d79e6a4078fab39abce… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Jul 28 17:05:26 2009 -0500 windowscodecs: Implement GetDecoderInfo for BMP decoder. --- dlls/windowscodecs/bmpdecode.c | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/bmpdecode.c b/dlls/windowscodecs/bmpdecode.c index 0064e9d..1c63253 100644 --- a/dlls/windowscodecs/bmpdecode.c +++ b/dlls/windowscodecs/bmpdecode.c @@ -860,8 +860,20 @@ static HRESULT WINAPI BmpDecoder_GetContainerFormat(IWICBitmapDecoder *iface, static HRESULT WINAPI BmpDecoder_GetDecoderInfo(IWICBitmapDecoder *iface, IWICBitmapDecoderInfo **ppIDecoderInfo) { - FIXME("(%p,%p): stub\n", iface, ppIDecoderInfo); - return E_NOTIMPL; + HRESULT hr; + IWICComponentInfo *compinfo; + + TRACE("(%p,%p)\n", iface, ppIDecoderInfo); + + hr = CreateComponentInfo(&CLSID_WICBmpDecoder, &compinfo); + if (FAILED(hr)) return hr; + + hr = IWICComponentInfo_QueryInterface(compinfo, &IID_IWICBitmapDecoderInfo, + (void**)ppIDecoderInfo); + + IWICComponentInfo_Release(compinfo); + + return hr; } static HRESULT WINAPI BmpDecoder_CopyPalette(IWICBitmapDecoder *iface,

1 0

Vincent Povirk : windowscodecs: Add tests for IWICBitmapDecoderInfo.
by Alexandre Julliard 05 Aug '09

05 Aug '09

Module: wine Branch: master Commit: 220edb7900b422cae91d31e0e50310c09dba0781 URL: http://source.winehq.org/git/wine.git/?a=commit;h=220edb7900b422cae91d31e0e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Jul 21 16:23:09 2009 -0500 windowscodecs: Add tests for IWICBitmapDecoderInfo. --- dlls/windowscodecs/tests/bmpformat.c | 100 ++++++++++++++++++++++++++++++++++ 1 files changed, 100 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/tests/bmpformat.c b/dlls/windowscodecs/tests/bmpformat.c index 5dc9cae..6f6b83a 100644 --- a/dlls/windowscodecs/tests/bmpformat.c +++ b/dlls/windowscodecs/tests/bmpformat.c @@ -887,6 +887,105 @@ static void test_decode_rle4(void) IWICBitmapDecoder_Release(decoder); } +static void test_componentinfo(void) +{ + IWICImagingFactory *factory; + IWICComponentInfo *info; + IWICBitmapDecoderInfo *decoderinfo; + IWICBitmapDecoder *decoder; + HRESULT hr; + WICBitmapPattern *patterns; + UINT pattern_count, pattern_size; + WICComponentType type; + GUID guidresult; + HGLOBAL hbmpdata; + char *bmpdata; + IStream *bmpstream; + BOOL boolresult; + + hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICImagingFactory, (void**)&factory); + ok(SUCCEEDED(hr), "CoCreateInstance failed, hr=%x\n", hr); + if (SUCCEEDED(hr)) + { + hr = IWICImagingFactory_CreateComponentInfo(factory, &CLSID_WICBmpDecoder, &info); + ok(SUCCEEDED(hr), "CreateComponentInfo failed, hr=%x\n", hr); + if (SUCCEEDED(hr)) + { + hr = IWICComponentInfo_GetComponentType(info, &type); + ok(SUCCEEDED(hr), "GetComponentType failed, hr=%x\n", hr); + ok(type == WICDecoder, "got %i, expected WICDecoder\n", type); + + hr = IWICComponentInfo_QueryInterface(info, &IID_IWICBitmapDecoderInfo, (void**)&decoderinfo); + ok(SUCCEEDED(hr), "QueryInterface failed, hr=%x\n", hr); + if (SUCCEEDED(hr)) + { + pattern_count = 0; + pattern_size = 0; + hr = IWICBitmapDecoderInfo_GetPatterns(decoderinfo, 0, NULL, &pattern_count, &pattern_size); + ok(SUCCEEDED(hr), "GetPatterns failed, hr=%x\n", hr); + ok(pattern_count != 0, "pattern count is 0\n"); + ok(pattern_size > pattern_count * sizeof(WICBitmapPattern), "size=%i, count=%i\n", pattern_size, pattern_count); + + patterns = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, pattern_size); + hr = IWICBitmapDecoderInfo_GetPatterns(decoderinfo, pattern_size, patterns, &pattern_count, &pattern_size); + ok(SUCCEEDED(hr), "GetPatterns failed, hr=%x\n", hr); + ok(pattern_count != 0, "pattern count is 0\n"); + ok(pattern_size > pattern_count * sizeof(WICBitmapPattern), "size=%i, count=%i\n", pattern_size, pattern_count); + ok(patterns[0].Length != 0, "pattern length is 0\n"); + ok(patterns[0].Pattern != NULL, "pattern is NULL\n"); + ok(patterns[0].Mask != NULL, "mask is NULL\n"); + + pattern_size -= 1; + hr = IWICBitmapDecoderInfo_GetPatterns(decoderinfo, pattern_size, patterns, &pattern_count, &pattern_size); + ok(hr == WINCODEC_ERR_INSUFFICIENTBUFFER, "GetPatterns returned %x, expected WINCODEC_ERR_INSUFFICIENTBUFFER\n", hr); + + HeapFree(GetProcessHeap(), 0, patterns); + + hr = IWICBitmapDecoderInfo_CreateInstance(decoderinfo, &decoder); + ok(SUCCEEDED(hr), "CreateInstance failed, hr=%x\n", hr); + if (SUCCEEDED(hr)) + { + hr = IWICBitmapDecoder_GetContainerFormat(decoder, &guidresult); + ok(SUCCEEDED(hr), "GetContainerFormat failed, hr=%x\n", hr); + ok(IsEqualGUID(&guidresult, &GUID_ContainerFormatBmp), "unexpected container format\n"); + + IWICBitmapDecoder_Release(decoder); + } + + hbmpdata = GlobalAlloc(GMEM_MOVEABLE, sizeof(testbmp_rle4)); + ok(hbmpdata != 0, "GlobalAlloc failed\n"); + if (hbmpdata) + { + bmpdata = GlobalLock(hbmpdata); + memcpy(bmpdata, testbmp_rle4, sizeof(testbmp_rle4)); + GlobalUnlock(hbmpdata); + + hr = CreateStreamOnHGlobal(hbmpdata, FALSE, &bmpstream); + ok(SUCCEEDED(hr), "CreateStreamOnHGlobal failed, hr=%x\n", hr); + if (SUCCEEDED(hr)) + { + boolresult = 0; + hr = IWICBitmapDecoderInfo_MatchesPattern(decoderinfo, bmpstream, &boolresult); + ok(SUCCEEDED(hr), "MatchesPattern failed, hr=%x\n", hr); + ok(boolresult, "pattern not matched\n"); + + IStream_Release(bmpstream); + } + + GlobalFree(hbmpdata); + } + + IWICBitmapDecoderInfo_Release(decoderinfo); + } + + IWICComponentInfo_Release(info); + } + + IWICImagingFactory_Release(factory); + } +} + START_TEST(bmpformat) { CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); @@ -896,6 +995,7 @@ START_TEST(bmpformat) test_decode_4bpp(); test_decode_rle8(); test_decode_rle4(); + test_componentinfo(); CoUninitialize(); }

1 0

Vincent Povirk : windowscodecs: Implement IWICBitmapDecoderInfo:: MatchesPattern.
by Alexandre Julliard 05 Aug '09

05 Aug '09

Module: wine Branch: master Commit: a13899cc90ad5f0823d952f4c998c26feffed142 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a13899cc90ad5f0823d952f4c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Jul 28 16:58:47 2009 -0500 windowscodecs: Implement IWICBitmapDecoderInfo::MatchesPattern. --- dlls/windowscodecs/info.c | 73 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 71 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index 39b522f..12eb4f0 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -330,8 +330,77 @@ static HRESULT WINAPI BitmapDecoderInfo_GetPatterns(IWICBitmapDecoderInfo *iface static HRESULT WINAPI BitmapDecoderInfo_MatchesPattern(IWICBitmapDecoderInfo *iface, IStream *pIStream, BOOL *pfMatches) { - FIXME("(%p,%p,%p): stub\n", iface, pIStream, pfMatches); - return E_NOTIMPL; + WICBitmapPattern *patterns; + UINT pattern_count=0, patterns_size=0; + HRESULT hr; + int i, pos; + BYTE *data=NULL; + ULONG datasize=0; + ULONG bytesread; + LARGE_INTEGER seekpos; + + TRACE("(%p,%p,%p)\n", iface, pIStream, pfMatches); + + hr = BitmapDecoderInfo_GetPatterns(iface, 0, NULL, &pattern_count, &patterns_size); + if (FAILED(hr)) return hr; + + patterns = HeapAlloc(GetProcessHeap(), 0, patterns_size); + if (!patterns) return E_OUTOFMEMORY; + + hr = BitmapDecoderInfo_GetPatterns(iface, patterns_size, patterns, &pattern_count, &patterns_size); + if (FAILED(hr)) goto end; + + for (i=0; i<pattern_count; i++) + { + if (datasize < patterns[i].Length) + { + HeapFree(GetProcessHeap(), 0, data); + datasize = patterns[i].Length; + data = HeapAlloc(GetProcessHeap(), 0, patterns[i].Length); + if (!data) + { + hr = E_OUTOFMEMORY; + break; + } + } + + if (patterns[i].EndOfStream) + seekpos.QuadPart = -patterns[i].Position.QuadPart; + else + seekpos.QuadPart = patterns[i].Position.QuadPart; + hr = IStream_Seek(pIStream, seekpos, patterns[i].EndOfStream ? STREAM_SEEK_END : STREAM_SEEK_SET, NULL); + if (hr == STG_E_INVALIDFUNCTION) continue; /* before start of stream */ + if (FAILED(hr)) break; + + hr = IStream_Read(pIStream, data, patterns[i].Length, &bytesread); + if (hr == S_FALSE || (hr == S_OK && bytesread != patterns[i].Length)) /* past end of stream */ + continue; + if (FAILED(hr)) break; + + for (pos=0; pos<patterns[i].Length; pos++) + { + if ((data[pos] & patterns[i].Mask[pos]) != patterns[i].Pattern[pos]) + break; + } + if (pos == patterns[i].Length) /* matches pattern */ + { + hr = S_OK; + *pfMatches = TRUE; + break; + } + } + + if (i == pattern_count) /* does not match any pattern */ + { + hr = S_OK; + *pfMatches = FALSE; + } + +end: + HeapFree(GetProcessHeap(), 0, patterns); + HeapFree(GetProcessHeap(), 0, data); + + return hr; } static HRESULT WINAPI BitmapDecoderInfo_CreateInstance(IWICBitmapDecoderInfo *iface,

1 0

Vincent Povirk : windowscodecs: Implement IWICBitmapDecoderInfo:: CreateInstance.
by Alexandre Julliard 05 Aug '09

05 Aug '09

Module: wine Branch: master Commit: 4e5ee3699f6abc6fffe9deb5e02e85e0f159a817 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e5ee3699f6abc6fffe9deb5e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Jul 28 16:28:53 2009 -0500 windowscodecs: Implement IWICBitmapDecoderInfo::CreateInstance. --- 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 db77232..39b522f 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -337,8 +337,12 @@ static HRESULT WINAPI BitmapDecoderInfo_MatchesPattern(IWICBitmapDecoderInfo *if static HRESULT WINAPI BitmapDecoderInfo_CreateInstance(IWICBitmapDecoderInfo *iface, IWICBitmapDecoder **ppIBitmapDecoder) { - FIXME("(%p,%p): stub\n", iface, ppIBitmapDecoder); - return E_NOTIMPL; + BitmapDecoderInfo *This = (BitmapDecoderInfo*)iface; + + TRACE("(%p,%p)\n", iface, ppIBitmapDecoder); + + return CoCreateInstance(&This->clsid, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICBitmapDecoder, (void**)ppIBitmapDecoder); } static const IWICBitmapDecoderInfoVtbl BitmapDecoderInfo_Vtbl = {

1 0

Vincent Povirk : windowscodecs: Implement IWICBitmapDecoderInfo:: GetPatterns.
by Alexandre Julliard 05 Aug '09

05 Aug '09

Module: wine Branch: master Commit: 6c5d1b2f6337fde154e97321e365115390d76141 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c5d1b2f6337fde154e97321e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Jul 28 16:21:12 2009 -0500 windowscodecs: Implement IWICBitmapDecoderInfo::GetPatterns. --- dlls/windowscodecs/info.c | 94 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 92 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index c3895da..db77232 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -31,6 +31,7 @@ #include "wincodecs_private.h" #include "wine/debug.h" +#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); @@ -233,8 +234,97 @@ static HRESULT WINAPI BitmapDecoderInfo_MatchesMimeType(IWICBitmapDecoderInfo *i static HRESULT WINAPI BitmapDecoderInfo_GetPatterns(IWICBitmapDecoderInfo *iface, UINT cbSizePatterns, WICBitmapPattern *pPatterns, UINT *pcPatterns, UINT *pcbPatternsActual) { - FIXME("(%p,%i,%p,%p,%p): stub\n", iface, cbSizePatterns, pPatterns, pcPatterns, pcbPatternsActual); - return E_NOTIMPL; + BitmapDecoderInfo *This = (BitmapDecoderInfo*)iface; + UINT pattern_count=0, patterns_size=0; + WCHAR subkeyname[11]; + LONG res; + HKEY patternskey, patternkey; + static const WCHAR uintformatW[] = {'%','u',0}; + static const WCHAR patternsW[] = {'P','a','t','t','e','r','n','s',0}; + static const WCHAR positionW[] = {'P','o','s','i','t','i','o','n',0}; + static const WCHAR lengthW[] = {'L','e','n','g','t','h',0}; + static const WCHAR patternW[] = {'P','a','t','t','e','r','n',0}; + static const WCHAR maskW[] = {'M','a','s','k',0}; + static const WCHAR endofstreamW[] = {'E','n','d','O','f','S','t','r','e','a','m',0}; + HRESULT hr=S_OK; + UINT i; + BYTE *bPatterns=(BYTE*)pPatterns; + DWORD length, valuesize; + + TRACE("(%p,%i,%p,%p,%p)\n", iface, cbSizePatterns, pPatterns, pcPatterns, pcbPatternsActual); + + res = RegOpenKeyExW(This->classkey, patternsW, 0, KEY_READ, &patternskey); + if (res != ERROR_SUCCESS) return HRESULT_FROM_WIN32(res); + + res = RegQueryInfoKeyW(patternskey, NULL, NULL, NULL, &pattern_count, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + if (res == ERROR_SUCCESS) + { + patterns_size = pattern_count * sizeof(WICBitmapPattern); + + for (i=0; i<pattern_count; i++) + { + snprintfW(subkeyname, 11, uintformatW, i); + res = RegOpenKeyExW(patternskey, subkeyname, 0, KEY_READ, &patternkey); + if (res == ERROR_SUCCESS) + { + valuesize = sizeof(ULONG); + res = RegGetValueW(patternkey, NULL, lengthW, RRF_RT_DWORD, NULL, + &length, &valuesize); + patterns_size += length*2; + + if ((cbSizePatterns >= patterns_size) && (res == ERROR_SUCCESS)) + { + pPatterns[i].Length = length; + + pPatterns[i].EndOfStream = 0; + valuesize = sizeof(BOOL); + RegGetValueW(patternkey, NULL, endofstreamW, RRF_RT_DWORD, NULL, + &pPatterns[i].EndOfStream, &valuesize); + + pPatterns[i].Position.QuadPart = 0; + valuesize = sizeof(ULARGE_INTEGER); + res = RegGetValueW(patternkey, NULL, positionW, RRF_RT_DWORD|RRF_RT_QWORD, NULL, + &pPatterns[i].Position, &valuesize); + + if (res == ERROR_SUCCESS) + { + pPatterns[i].Pattern = bPatterns+patterns_size-length*2; + valuesize = length; + res = RegGetValueW(patternkey, NULL, patternW, RRF_RT_REG_BINARY, NULL, + pPatterns[i].Pattern, &valuesize); + } + + if (res == ERROR_SUCCESS) + { + pPatterns[i].Mask = bPatterns+patterns_size-length; + valuesize = length; + res = RegGetValueW(patternkey, NULL, maskW, RRF_RT_REG_BINARY, NULL, + pPatterns[i].Mask, &valuesize); + } + } + + RegCloseKey(patternkey); + } + if (res != ERROR_SUCCESS) + { + hr = HRESULT_FROM_WIN32(res); + break; + } + } + } + else hr = HRESULT_FROM_WIN32(res); + + RegCloseKey(patternskey); + + if (hr == S_OK) + { + *pcPatterns = pattern_count; + *pcbPatternsActual = patterns_size; + if (pPatterns && cbSizePatterns < patterns_size) + hr = WINCODEC_ERR_INSUFFICIENTBUFFER; + } + + return hr; } static HRESULT WINAPI BitmapDecoderInfo_MatchesPattern(IWICBitmapDecoderInfo *iface,

1 0

Vincent Povirk : windowscodecs: Implement IWICBitmapDecoderInfo:: GetComponentType.
by Alexandre Julliard 05 Aug '09

05 Aug '09

Module: wine Branch: master Commit: 3f2ff08803a5c426618cceeebdf260da4db8b7a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f2ff08803a5c426618cceeeb… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Jul 28 15:04:46 2009 -0500 windowscodecs: Implement IWICBitmapDecoderInfo::GetComponentType. --- dlls/windowscodecs/info.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index 3db3d2d..c3895da 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -95,8 +95,9 @@ static ULONG WINAPI BitmapDecoderInfo_Release(IWICBitmapDecoderInfo *iface) static HRESULT WINAPI BitmapDecoderInfo_GetComponentType(IWICBitmapDecoderInfo *iface, WICComponentType *pType) { - FIXME("(%p,%p): stub\n", iface, pType); - return E_NOTIMPL; + TRACE("(%p,%p)\n", iface, pType); + *pType = WICDecoder; + return S_OK; } static HRESULT WINAPI BitmapDecoderInfo_GetCLSID(IWICBitmapDecoderInfo *iface, CLSID *pclsid)

1 0

Vincent Povirk : windowscodecs: Add stub implementation of IWICBitmapDecoderInfo.
by Alexandre Julliard 05 Aug '09

05 Aug '09

Module: wine Branch: master Commit: f24834f486c6e38a5e21e823cfc39a53f2d2d7a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f24834f486c6e38a5e21e823c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Jul 14 17:50:28 2009 -0500 windowscodecs: Add stub implementation of IWICBitmapDecoderInfo. --- dlls/windowscodecs/Makefile.in | 1 + dlls/windowscodecs/imgfactory.c | 4 +- dlls/windowscodecs/info.c | 369 ++++++++++++++++++++++++++++++++ dlls/windowscodecs/wincodecs_private.h | 2 + 4 files changed, 374 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f24834f486c6e38a5e21e…

1 0