windowscodecs: Use IWICComponentFactory_CreateQueryReaderFromBlockReader in GetMetadataQueryReader.

Instead of MetadataQueryReader_CreateInstance. Signed-off-by: Rémi Bernon <rbernon@codeweavers.com> Signed-off-by: Esme Povirk <esme@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

windowscodecs: Use IWICComponentFactory_CreateQueryReaderFromBlockReader in GetMetadataQueryReader.
b44fb047 · Rémi Bernon · Alexandre Julliard · 8fad0b14 · b44fb047
Commit b44fb047 authored Jan 25, 2021 by Rémi Bernon Committed by Alexandre Julliard Jan 27, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 1 deletion

decoder.c dlls/windowscodecs/decoder.c +14 -1

No files found.
--- 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,