September 2018 - Wine-Devel

Re: [PATCH] wincodecs: Add IWICImagingFactory2 stub.

by Dmitry Timoshkov

Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > static const classinfo wic_classes[] = { > {&CLSID_WICImagingFactory, ComponentFactory_CreateInstance}, > + {&CLSID_WICImagingFactory2, ComponentFactory_CreateInstance}, > {&CLSID_WICBmpDecoder, BmpDecoder_CreateInstance}, > {&CLSID_WICPngDecoder, PngDecoder_CreateInstance}, > {&CLSID_WICPngEncoder, PngEncoder_CreateInstance}, > diff --git a/dlls/windowscodecs/imgfactory.c b/dlls/windowscodecs/imgfactory.c > index 06e3f6aceb..f23c824473 100644 > --- a/dlls/windowscodecs/imgfactory.c > +++ b/dlls/windowscodecs/imgfactory.c > @@ -37,6 +37,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); > > typedef struct { > IWICComponentFactory IWICComponentFactory_iface; > + IWICImagingFactory2 IWICImagingFactory2_iface; > LONG ref; > } ComponentFactory; IWICImagingFactory2 just extends IWICImagingFactory by one element, this approach seems to be a bit strange. -- Dmitry.

Sept. 30, 2018

[PATCH] wincodecs: Add IWICPixelFormatInfo exports.

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/windowscodecs/proxy.c | 15 +++++++++++++++ dlls/windowscodecs/windowscodecs.spec | 6 +++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/windowscodecs/proxy.c b/dlls/windowscodecs/proxy.c index a28b38681e..5fd38724b5 100644 --- a/dlls/windowscodecs/proxy.c +++ b/dlls/windowscodecs/proxy.c @@ -626,6 +626,21 @@ HRESULT WINAPI IWICStream_InitializeFromMemory_Proxy_W(IWICStream *iface, return IWICStream_InitializeFromMemory(iface, pbBuffer, cbBufferSize); } +HRESULT WINAPI IWICPixelFormatInfo_GetBitsPerPixel_Proxy_W(IWICPixelFormatInfo *iface, UINT *bpp) +{ + return IWICPixelFormatInfo_GetBitsPerPixel(iface, bpp); +} + +HRESULT WINAPI IWICPixelFormatInfo_GetChannelCount_Proxy_W(IWICPixelFormatInfo *iface, UINT *count) +{ + return IWICPixelFormatInfo_GetChannelCount(iface, count); +} + +HRESULT WINAPI IWICPixelFormatInfo_GetChannelMask_Proxy_W(IWICPixelFormatInfo *iface, UINT channel, UINT buffer_size, BYTE *buffer, UINT *actual) +{ + return IWICPixelFormatInfo_GetChannelMask(iface, channel, buffer_size, buffer, actual); +} + HRESULT WINAPI WICCreateColorContext_Proxy(IWICImagingFactory *iface, IWICColorContext **ppIWICColorContext) { TRACE("%p, %p\n", iface, ppIWICColorContext); diff --git a/dlls/windowscodecs/windowscodecs.spec b/dlls/windowscodecs/windowscodecs.spec index 905ef835af..ae3660c6f3 100644 --- a/dlls/windowscodecs/windowscodecs.spec +++ b/dlls/windowscodecs/windowscodecs.spec @@ -99,9 +99,9 @@ @ stdcall IWICPalette_InitializeFromBitmap_Proxy(ptr ptr long long) IWICPalette_InitializeFromBitmap_Proxy_W @ stdcall IWICPalette_InitializeFromPalette_Proxy(ptr ptr) IWICPalette_InitializeFromPalette_Proxy_W @ stdcall IWICPalette_InitializePredefined_Proxy(ptr long long) IWICPalette_InitializePredefined_Proxy_W -@ stub IWICPixelFormatInfo_GetBitsPerPixel_Proxy -@ stub IWICPixelFormatInfo_GetChannelCount_Proxy -@ stub IWICPixelFormatInfo_GetChannelMask_Proxy +@ stdcall IWICPixelFormatInfo_GetBitsPerPixel_Proxy(ptr ptr) IWICPixelFormatInfo_GetBitsPerPixel_Proxy_W +@ stdcall IWICPixelFormatInfo_GetChannelCount_Proxy(ptr ptr) IWICPixelFormatInfo_GetChannelCount_Proxy_W +@ stdcall IWICPixelFormatInfo_GetChannelMask_Proxy(ptr long long ptr ptr) IWICPixelFormatInfo_GetChannelMask_Proxy_W @ stdcall IWICStream_InitializeFromIStream_Proxy(ptr ptr) IWICStream_InitializeFromIStream_Proxy_W @ stdcall IWICStream_InitializeFromMemory_Proxy(ptr ptr long) IWICStream_InitializeFromMemory_Proxy_W @ stdcall WICConvertBitmapSource(ptr ptr ptr) -- 2.19.0

Sept. 29, 2018

[PATCH 4/4] opcservices/tests: Add missing return value test (Coverity)

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/opcservices/tests/opcservices.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/opcservices/tests/opcservices.c b/dlls/opcservices/tests/opcservices.c index 6bb0c54c62..9792302f7e 100644 --- a/dlls/opcservices/tests/opcservices.c +++ b/dlls/opcservices/tests/opcservices.c @@ -1115,6 +1115,7 @@ static void test_combine_uri(void) hr = IOpcFactory_CreatePackageRootUri(factory, &uri); else hr = IOpcFactory_CreatePartUri(factory, uriW, (IOpcPartUri **)&uri); + ok(SUCCEEDED(hr), "%u: failed to create uri, hr %#x.\n", i, hr); hr = CreateUri(relativeW, Uri_CREATE_ALLOW_RELATIVE, 0, &relative_uri); ok(SUCCEEDED(hr), "%u: failed to create relative uri, hr %#x.\n", i, hr); -- 2.19.0

Sept. 29, 2018

[PATCH 3/4] opcservices: Fix potential uninitialized memory access (Coverity)

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/opcservices/package.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/opcservices/package.c b/dlls/opcservices/package.c index 5f4f955253..9bdd4b1f15 100644 --- a/dlls/opcservices/package.c +++ b/dlls/opcservices/package.c @@ -1891,8 +1891,8 @@ static HRESULT opc_package_write_rels(struct zip_archive *archive, IOpcRelations 'p','a','c','k','a','g','e','/','2','0','0','6','/','r','e','l','a','t','i','o','n','s','h','i','p','s',0}; static const WCHAR relationshipsW[] = {'R','e','l','a','t','i','o','n','s','h','i','p','s',0}; IOpcRelationshipEnumerator *enumerator; + BSTR rels_part_uri = NULL; IOpcPartUri *rels_uri; - BSTR rels_part_uri; IStream *content; BOOL has_next; HRESULT hr; -- 2.19.0

Sept. 29, 2018

[PATCH 2/4] opcservices: Add missing error check (Coverity)

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/opcservices/package.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/opcservices/package.c b/dlls/opcservices/package.c index 06bbb3d37c..5f4f955253 100644 --- a/dlls/opcservices/package.c +++ b/dlls/opcservices/package.c @@ -1941,7 +1941,8 @@ static HRESULT opc_package_write_rels(struct zip_archive *archive, IOpcRelations if (SUCCEEDED(hr)) hr = IXmlWriter_Flush(writer); - hr = IOpcUri_GetRelationshipsPartUri(uri, &rels_uri); + if (SUCCEEDED(hr)) + hr = IOpcUri_GetRelationshipsPartUri(uri, &rels_uri); if (SUCCEEDED(hr)) hr = IOpcPartUri_GetRawUri(rels_uri, &rels_part_uri); if (SUCCEEDED(hr)) -- 2.19.0

Sept. 29, 2018

[PATCH 1/4] opcservices: Improve error handling (Coverity)

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/opcservices/package.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/opcservices/package.c b/dlls/opcservices/package.c index 5534fe6783..06bbb3d37c 100644 --- a/dlls/opcservices/package.c +++ b/dlls/opcservices/package.c @@ -1723,7 +1723,8 @@ static HRESULT opc_package_collect_content_types(IOpcPackage *package, struct co if (FAILED(hr)) break; - IOpcPartEnumerator_MoveNext(enumerator, &has_next); + if (FAILED(hr = IOpcPartEnumerator_MoveNext(enumerator, &has_next))) + break; } IOpcPartEnumerator_Release(enumerator); -- 2.19.0

Sept. 29, 2018

[PATCH] wincodecs: Add IWICImagingFactory2 stub.

by Nikolay Sivov

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45709 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/windowscodecs/clsfactory.c | 1 + dlls/windowscodecs/imgfactory.c | 239 ++++++++++++++++++++++++++++++++ dlls/windowscodecs/tests/info.c | 33 +++++ 3 files changed, 273 insertions(+) diff --git a/dlls/windowscodecs/clsfactory.c b/dlls/windowscodecs/clsfactory.c index 77eeedc428..2e8cc8e22d 100644 --- a/dlls/windowscodecs/clsfactory.c +++ b/dlls/windowscodecs/clsfactory.c @@ -44,6 +44,7 @@ typedef struct { static const classinfo wic_classes[] = { {&CLSID_WICImagingFactory, ComponentFactory_CreateInstance}, + {&CLSID_WICImagingFactory2, ComponentFactory_CreateInstance}, {&CLSID_WICBmpDecoder, BmpDecoder_CreateInstance}, {&CLSID_WICPngDecoder, PngDecoder_CreateInstance}, {&CLSID_WICPngEncoder, PngEncoder_CreateInstance}, diff --git a/dlls/windowscodecs/imgfactory.c b/dlls/windowscodecs/imgfactory.c index 06e3f6aceb..f23c824473 100644 --- a/dlls/windowscodecs/imgfactory.c +++ b/dlls/windowscodecs/imgfactory.c @@ -37,6 +37,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); typedef struct { IWICComponentFactory IWICComponentFactory_iface; + IWICImagingFactory2 IWICImagingFactory2_iface; LONG ref; } ComponentFactory; @@ -45,6 +46,11 @@ static inline ComponentFactory *impl_from_IWICComponentFactory(IWICComponentFact return CONTAINING_RECORD(iface, ComponentFactory, IWICComponentFactory_iface); } +static inline ComponentFactory *impl_from_IWICImagingFactory2(IWICImagingFactory2 *iface) +{ + return CONTAINING_RECORD(iface, ComponentFactory, IWICImagingFactory2_iface); +} + static HRESULT WINAPI ComponentFactory_QueryInterface(IWICComponentFactory *iface, REFIID iid, void **ppv) { @@ -59,6 +65,10 @@ static HRESULT WINAPI ComponentFactory_QueryInterface(IWICComponentFactory *ifac { *ppv = &This->IWICComponentFactory_iface; } + else if (IsEqualIID(&IID_IWICImagingFactory2, iid)) + { + *ppv = &This->IWICImagingFactory2_iface; + } else { *ppv = NULL; @@ -1181,6 +1191,234 @@ static const IWICComponentFactoryVtbl ComponentFactory_Vtbl = { ComponentFactory_CreateEncoderPropertyBag }; +static HRESULT WINAPI ImagingFactory_QueryInterface(IWICImagingFactory2 *iface, REFIID iid, void **ppv) +{ + ComponentFactory *This = impl_from_IWICImagingFactory2(iface); + return IWICComponentFactory_QueryInterface(&This->IWICComponentFactory_iface, iid, ppv); +} + +static ULONG WINAPI ImagingFactory_AddRef(IWICImagingFactory2 *iface) +{ + ComponentFactory *This = impl_from_IWICImagingFactory2(iface); + return IWICComponentFactory_AddRef(&This->IWICComponentFactory_iface); +} + +static ULONG WINAPI ImagingFactory_Release(IWICImagingFactory2 *iface) +{ + ComponentFactory *This = impl_from_IWICImagingFactory2(iface); + return IWICComponentFactory_Release(&This->IWICComponentFactory_iface); +} + +static HRESULT WINAPI ImagingFactory_CreateDecoderFromFilename(IWICImagingFactory2 *iface, LPCWSTR filename, + const GUID *vendor, DWORD desired_access, WICDecodeOptions options, IWICBitmapDecoder **decoder) +{ + ComponentFactory *This = impl_from_IWICImagingFactory2(iface); + return IWICComponentFactory_CreateDecoderFromFilename(&This->IWICComponentFactory_iface, filename, vendor, + desired_access, options, decoder); +} + +static HRESULT WINAPI ImagingFactory_CreateDecoderFromStream(IWICImagingFactory2 *iface, IStream *stream, + const GUID *vendor, WICDecodeOptions options, IWICBitmapDecoder **decoder) +{ + ComponentFactory *This = impl_from_IWICImagingFactory2(iface); + return IWICComponentFactory_CreateDecoderFromStream(&This->IWICComponentFactory_iface, stream, vendor, + options, decoder); +} + +static HRESULT WINAPI ImagingFactory_CreateDecoderFromFileHandle(IWICImagingFactory2 *iface, ULONG_PTR hFile, + const GUID *vendor, WICDecodeOptions options, IWICBitmapDecoder **decoder) +{ + ComponentFactory *This = impl_from_IWICImagingFactory2(iface); + return IWICComponentFactory_CreateDecoderFromFileHandle(&This->IWICComponentFactory_iface, hFile, vendor, + options, decoder); +} + +static HRESULT WINAPI ImagingFactory_CreateComponentInfo(IWICImagingFactory2 *iface, REFCLSID component, + IWICComponentInfo **info) +{ + ComponentFactory *This = impl_from_IWICImagingFactory2(iface); + return IWICComponentFactory_CreateComponentInfo(&This->IWICComponentFactory_iface, component, info); +} + +static HRESULT WINAPI ImagingFactory_CreateDecoder(IWICImagingFactory2 *iface, REFGUID format, const GUID *vendor, + IWICBitmapDecoder **decoder) +{ + ComponentFactory *This = impl_from_IWICImagingFactory2(iface); + return IWICComponentFactory_CreateDecoder(&This->IWICComponentFactory_iface, format, vendor, decoder); +} + +static HRESULT WINAPI ImagingFactory_CreateEncoder(IWICImagingFactory2 *iface, REFGUID format, const GUID *vendor, + IWICBitmapEncoder **encoder) +{ + ComponentFactory *This = impl_from_IWICImagingFactory2(iface); + return IWICComponentFactory_CreateEncoder(&This->IWICComponentFactory_iface, format, vendor, encoder); +} + +static HRESULT WINAPI ImagingFactory_CreatePalette(IWICImagingFactory2 *iface, IWICPalette **palette) +{ + ComponentFactory *This = impl_from_IWICImagingFactory2(iface); + return IWICComponentFactory_CreatePalette(&This->IWICComponentFactory_iface, palette); +} + +static HRESULT WINAPI ImagingFactory_CreateFormatConverter(IWICImagingFactory2 *iface, IWICFormatConverter **converter) +{ + ComponentFactory *This = impl_from_IWICImagingFactory2(iface); + return IWICComponentFactory_CreateFormatConverter(&This->IWICComponentFactory_iface, converter); +} + +static HRESULT WINAPI ImagingFactory_CreateBitmapScaler(IWICImagingFactory2 *iface, IWICBitmapScaler **scaler) +{ + ComponentFactory *This = impl_from_IWICImagingFactory2(iface); + return IWICComponentFactory_CreateBitmapScaler(&This->IWICComponentFactory_iface, scaler); +} + +static HRESULT WINAPI ImagingFactory_CreateBitmapClipper(IWICImagingFactory2 *iface, IWICBitmapClipper **clipper) +{ + ComponentFactory *This = impl_from_IWICImagingFactory2(iface); + return IWICComponentFactory_CreateBitmapClipper(&This->IWICComponentFactory_iface, clipper); +} + +static HRESULT WINAPI ImagingFactory_CreateBitmapFlipRotator(IWICImagingFactory2 *iface, IWICBitmapFlipRotator **fliprotator) +{ + ComponentFactory *This = impl_from_IWICImagingFactory2(iface); + return IWICComponentFactory_CreateBitmapFlipRotator(&This->IWICComponentFactory_iface, fliprotator); +} + +static HRESULT WINAPI ImagingFactory_CreateStream(IWICImagingFactory2 *iface, IWICStream **stream) +{ + ComponentFactory *This = impl_from_IWICImagingFactory2(iface); + return IWICComponentFactory_CreateStream(&This->IWICComponentFactory_iface, stream); +} + +static HRESULT WINAPI ImagingFactory_CreateColorContext(IWICImagingFactory2 *iface, IWICColorContext **context) +{ + ComponentFactory *This = impl_from_IWICImagingFactory2(iface); + return IWICComponentFactory_CreateColorContext(&This->IWICComponentFactory_iface, context); +} + +static HRESULT WINAPI ImagingFactory_CreateColorTransformer(IWICImagingFactory2 *iface, IWICColorTransform **transformer) +{ + ComponentFactory *This = impl_from_IWICImagingFactory2(iface); + return IWICComponentFactory_CreateColorTransformer(&This->IWICComponentFactory_iface, transformer); +} + +static HRESULT WINAPI ImagingFactory_CreateBitmap(IWICImagingFactory2 *iface, UINT width, UINT height, REFWICPixelFormatGUID pixel_format, + WICBitmapCreateCacheOption option, IWICBitmap **bitmap) +{ + ComponentFactory *This = impl_from_IWICImagingFactory2(iface); + return IWICComponentFactory_CreateBitmap(&This->IWICComponentFactory_iface, width, height, pixel_format, option, bitmap); +} + +static HRESULT WINAPI ImagingFactory_CreateBitmapFromSource(IWICImagingFactory2 *iface, IWICBitmapSource *source, + WICBitmapCreateCacheOption option, IWICBitmap **bitmap) +{ + ComponentFactory *This = impl_from_IWICImagingFactory2(iface); + return IWICComponentFactory_CreateBitmapFromSource(&This->IWICComponentFactory_iface, source, option, bitmap); +} + +static HRESULT WINAPI ImagingFactory_CreateBitmapFromSourceRect(IWICImagingFactory2 *iface, IWICBitmapSource *source, + UINT x, UINT y, UINT width, UINT height, IWICBitmap **bitmap) +{ + ComponentFactory *This = impl_from_IWICImagingFactory2(iface); + return IWICComponentFactory_CreateBitmapFromSourceRect(&This->IWICComponentFactory_iface, source, x, y, width, height, bitmap); +} + +static HRESULT WINAPI ImagingFactory_CreateBitmapFromMemory(IWICImagingFactory2 *iface, UINT width, UINT height, + REFWICPixelFormatGUID format, UINT stride, UINT size, BYTE *buffer, IWICBitmap **bitmap) +{ + ComponentFactory *This = impl_from_IWICImagingFactory2(iface); + return IWICComponentFactory_CreateBitmapFromMemory(&This->IWICComponentFactory_iface, width, height, format, stride, + size, buffer, bitmap); +} + +static HRESULT WINAPI ImagingFactory_CreateBitmapFromHBITMAP(IWICImagingFactory2 *iface, HBITMAP hbm, HPALETTE hpal, + WICBitmapAlphaChannelOption option, IWICBitmap **bitmap) +{ + ComponentFactory *This = impl_from_IWICImagingFactory2(iface); + return IWICComponentFactory_CreateBitmapFromHBITMAP(&This->IWICComponentFactory_iface, hbm, hpal, option, bitmap); +} + +static HRESULT WINAPI ImagingFactory_CreateBitmapFromHICON(IWICImagingFactory2 *iface, HICON hicon, IWICBitmap **bitmap) +{ + ComponentFactory *This = impl_from_IWICImagingFactory2(iface); + return IWICComponentFactory_CreateBitmapFromHICON(&This->IWICComponentFactory_iface, hicon, bitmap); +} + +static HRESULT WINAPI ImagingFactory_CreateComponentEnumerator(IWICImagingFactory2 *iface, DWORD component_types, + DWORD options, IEnumUnknown **enumerator) +{ + ComponentFactory *This = impl_from_IWICImagingFactory2(iface); + return IWICComponentFactory_CreateComponentEnumerator(&This->IWICComponentFactory_iface, component_types, + options, enumerator); +} + +static HRESULT WINAPI ImagingFactory_CreateFastMetadataEncoderFromDecoder(IWICImagingFactory2 *iface, IWICBitmapDecoder *decoder, + IWICFastMetadataEncoder **encoder) +{ + ComponentFactory *This = impl_from_IWICImagingFactory2(iface); + return IWICComponentFactory_CreateFastMetadataEncoderFromDecoder(&This->IWICComponentFactory_iface, decoder, encoder); +} + +static HRESULT WINAPI ImagingFactory_CreateFastMetadataEncoderFromFrameDecode(IWICImagingFactory2 *iface, + IWICBitmapFrameDecode *frame_decode, IWICFastMetadataEncoder **encoder) +{ + ComponentFactory *This = impl_from_IWICImagingFactory2(iface); + return IWICComponentFactory_CreateFastMetadataEncoderFromFrameDecode(&This->IWICComponentFactory_iface, frame_decode, encoder); +} + +static HRESULT WINAPI ImagingFactory_CreateQueryWriter(IWICImagingFactory2 *iface, REFGUID format, const GUID *vendor, + IWICMetadataQueryWriter **writer) +{ + ComponentFactory *This = impl_from_IWICImagingFactory2(iface); + return IWICComponentFactory_CreateQueryWriter(&This->IWICComponentFactory_iface, format, vendor, writer); +} + +static HRESULT WINAPI ImagingFactory_CreateQueryWriterFromReader(IWICImagingFactory2 *iface, IWICMetadataQueryReader *reader, + const GUID *vendor, IWICMetadataQueryWriter **writer) +{ + ComponentFactory *This = impl_from_IWICImagingFactory2(iface); + return IWICComponentFactory_CreateQueryWriterFromReader(&This->IWICComponentFactory_iface, reader, vendor, writer); +} + +static HRESULT WINAPI ImagingFactory_CreateImageEncoder(IWICImagingFactory2 *iface, ID2D1Device *device, IWICImageEncoder **encoder) +{ + FIXME("%p,%p,%p stub.\n", iface, device, encoder); + + return E_NOTIMPL; +} + +static const IWICImagingFactory2Vtbl ImagingFactory_Vtbl = { + ImagingFactory_QueryInterface, + ImagingFactory_AddRef, + ImagingFactory_Release, + ImagingFactory_CreateDecoderFromFilename, + ImagingFactory_CreateDecoderFromStream, + ImagingFactory_CreateDecoderFromFileHandle, + ImagingFactory_CreateComponentInfo, + ImagingFactory_CreateDecoder, + ImagingFactory_CreateEncoder, + ImagingFactory_CreatePalette, + ImagingFactory_CreateFormatConverter, + ImagingFactory_CreateBitmapScaler, + ImagingFactory_CreateBitmapClipper, + ImagingFactory_CreateBitmapFlipRotator, + ImagingFactory_CreateStream, + ImagingFactory_CreateColorContext, + ImagingFactory_CreateColorTransformer, + ImagingFactory_CreateBitmap, + ImagingFactory_CreateBitmapFromSource, + ImagingFactory_CreateBitmapFromSourceRect, + ImagingFactory_CreateBitmapFromMemory, + ImagingFactory_CreateBitmapFromHBITMAP, + ImagingFactory_CreateBitmapFromHICON, + ImagingFactory_CreateComponentEnumerator, + ImagingFactory_CreateFastMetadataEncoderFromDecoder, + ImagingFactory_CreateFastMetadataEncoderFromFrameDecode, + ImagingFactory_CreateQueryWriter, + ImagingFactory_CreateQueryWriterFromReader, + ImagingFactory_CreateImageEncoder, +}; + HRESULT ComponentFactory_CreateInstance(REFIID iid, void** ppv) { ComponentFactory *This; @@ -1194,6 +1432,7 @@ HRESULT ComponentFactory_CreateInstance(REFIID iid, void** ppv) if (!This) return E_OUTOFMEMORY; This->IWICComponentFactory_iface.lpVtbl = &ComponentFactory_Vtbl; + This->IWICImagingFactory2_iface.lpVtbl = &ImagingFactory_Vtbl; This->ref = 1; ret = IWICComponentFactory_QueryInterface(&This->IWICComponentFactory_iface, iid, ppv); diff --git a/dlls/windowscodecs/tests/info.c b/dlls/windowscodecs/tests/info.c index b647601495..ee95784166 100644 --- a/dlls/windowscodecs/tests/info.c +++ b/dlls/windowscodecs/tests/info.c @@ -637,6 +637,38 @@ todo_wine IWICImagingFactory_Release(factory); } +static void test_imagingfactory_interfaces(void) +{ + IWICComponentFactory *component_factory; + IWICImagingFactory2 *factory2; + IWICImagingFactory *factory; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICImagingFactory2, (void **)&factory2); + if (FAILED(hr)) + { + win_skip("IWICImagingFactory2 is not supported.\n"); + return; + } + + hr = IWICImagingFactory2_QueryInterface(factory2, &IID_IWICComponentFactory, (void **)&component_factory); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IWICComponentFactory_QueryInterface(component_factory, &IID_IWICImagingFactory, (void **)&factory); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(factory == (IWICImagingFactory *)component_factory, "Unexpected factory pointer.\n"); + IWICImagingFactory_Release(factory); + + hr = IWICImagingFactory2_QueryInterface(factory2, &IID_IWICImagingFactory, (void **)&factory); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(factory == (IWICImagingFactory *)component_factory, "Unexpected factory pointer.\n"); + + IWICComponentFactory_Release(component_factory); + IWICImagingFactory2_Release(factory2); + IWICImagingFactory_Release(factory); +} + START_TEST(info) { CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); @@ -644,6 +676,7 @@ START_TEST(info) test_decoder_info(); test_reader_info(); test_pixelformat_info(); + test_imagingfactory_interfaces(); CoUninitialize(); } -- 2.19.0

Sept. 29, 2018

Re: [PATCH] dxgi: fixed typo in width/height (Coverity)

by Marvin

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=42682 Your paranoid android. === wvistau64_zh_CN (32 bit Windows report) === dxgi: dxgi.c:2587: Test failed: Got window rect (0,0)-(1024,768), expected (10,10)-(410,210). dxgi.c:2587: Test failed: Got client rect (0,0)-(1024,768), expected (0,0)-(394,174). dxgi.c:2589: Test failed: Got window rect (0,0)-(1024,768), expected (10,10)-(410,210). dxgi.c:2589: Test failed: Got client rect (0,0)-(1024,768), expected (0,0)-(394,174). dxgi.c:2601: Test failed: Got window rect (0,0)-(1024,768), expected (10,10)-(410,210). dxgi.c:2601: Test failed: Got client rect (0,0)-(1024,768), expected (0,0)-(394,174). === debian9 (build log) === X Error of failed request: BadValue (integer parameter out of range for operation) Major opcode of failed request: 140 (RANDR) Minor opcode of failed request: 21 (RRSetCrtcConfig)

Sept. 29, 2018

[PATCH] dxgi: fixed typo in width/height (Coverity)

by Marcus Meissner

CID 1439782 Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> --- dlls/dxgi/tests/dxgi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index d1908ac1c2..f2bc9ed229 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -4392,7 +4392,7 @@ static void test_swapchain_window_messages(void) expect_messages = resize_target_messages; memset(&mode_desc, 0, sizeof(mode_desc)); mode_desc.Width = 800; - mode_desc.Width = 600; + mode_desc.Height = 600; hr = IDXGISwapChain_ResizeTarget(swapchain, &mode_desc); ok(hr == S_OK, "Failed to resize target, hr %#x.\n", hr); flush_events(); @@ -4401,7 +4401,7 @@ static void test_swapchain_window_messages(void) expect_messages = resize_target_messages; memset(&mode_desc, 0, sizeof(mode_desc)); mode_desc.Width = 400; - mode_desc.Width = 200; + mode_desc.Height = 200; hr = IDXGISwapChain_ResizeTarget(swapchain, &mode_desc); ok(hr == S_OK, "Failed to resize target, hr %#x.\n", hr); flush_events(); -- 2.19.0

Sept. 29, 2018

[PATCH] devenum: fixed size to capGetDriverDescriptionW (Coverity)

by Marcus Meissner

CID 1439780 Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> --- dlls/devenum/createdevenum.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c index 9b7ee3f053..e44e6ecda4 100644 --- a/dlls/devenum/createdevenum.c +++ b/dlls/devenum/createdevenum.c @@ -791,7 +791,7 @@ static void register_avicap_devices(void) for (i = 0; i < 10; ++i) { - if (!capGetDriverDescriptionW(i, name, sizeof(name), version, sizeof(version))) + if (!capGetDriverDescriptionW(i, name, ARRAY_SIZE(name), version, ARRAY_SIZE(version))) break; friendlyname[5] = '0' + i; -- 2.19.0

Sept. 29, 2018