Rémi Bernon : windowscodecs: Use IWICComponentFactory_CreateQueryReaderFromBlockReader in GetMetadataQueryReader.
Alexandre Julliard
julliard at winehq.org
Wed Jan 27 15:35:04 CST 2021
Module: wine
Branch: master
Commit: b44fb04759b17f60f85f395ad3ad537e423e8d89
URL: https://source.winehq.org/git/wine.git/?a=commit;h=b44fb04759b17f60f85f395ad3ad537e423e8d89
Author: Rémi Bernon <rbernon at codeweavers.com>
Date: Mon Jan 25 10:20:15 2021 +0100
windowscodecs: Use IWICComponentFactory_CreateQueryReaderFromBlockReader in GetMetadataQueryReader.
Instead of MetadataQueryReader_CreateInstance.
Signed-off-by: Rémi Bernon <rbernon at codeweavers.com>
Signed-off-by: Esme Povirk <esme at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/windowscodecs/decoder.c | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/dlls/windowscodecs/decoder.c b/dlls/windowscodecs/decoder.c
index b05d50dfea9..b0fcd34c742 100644
--- a/dlls/windowscodecs/decoder.c
+++ b/dlls/windowscodecs/decoder.c
@@ -433,6 +433,8 @@ static HRESULT WINAPI CommonDecoderFrame_GetMetadataQueryReader(IWICBitmapFrameD
IWICMetadataQueryReader **ppIMetadataQueryReader)
{
CommonDecoderFrame *This = impl_from_IWICBitmapFrameDecode(iface);
+ IWICComponentFactory* factory;
+ HRESULT hr;
TRACE("(%p,%p)\n", iface, ppIMetadataQueryReader);
@@ -442,7 +444,18 @@ static HRESULT WINAPI CommonDecoderFrame_GetMetadataQueryReader(IWICBitmapFrameD
if (!(This->parent->file_info.flags & WICBitmapDecoderCapabilityCanEnumerateMetadata))
return WINCODEC_ERR_UNSUPPORTEDOPERATION;
- return MetadataQueryReader_CreateInstance(&This->IWICMetadataBlockReader_iface, NULL, ppIMetadataQueryReader);
+ hr = create_instance(&CLSID_WICImagingFactory, &IID_IWICComponentFactory, (void**)&factory);
+
+ if (SUCCEEDED(hr))
+ {
+ hr = IWICComponentFactory_CreateQueryReaderFromBlockReader(factory, &This->IWICMetadataBlockReader_iface, ppIMetadataQueryReader);
+ IWICComponentFactory_Release(factory);
+ }
+
+ if (FAILED(hr))
+ *ppIMetadataQueryReader = NULL;
+
+ return hr;
}
static HRESULT WINAPI CommonDecoderFrame_GetColorContexts(IWICBitmapFrameDecode *iface,
More information about the wine-cvs
mailing list