[PATCH v2 1/2] windowscodecs: Use IWICComponentFactory_CreateQueryReaderFromBlockReader in GetMetadataQueryReader.
Rémi Bernon
rbernon at codeweavers.com
Mon Jan 25 03:20:15 CST 2021
Instead of MetadataQueryReader_CreateInstance.
Signed-off-by: Rémi Bernon <rbernon at codeweavers.com>
---
Supersedes: 198376-198377
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,
--
2.30.0
More information about the wine-devel
mailing list