[PATCH v2 1/2] windowscodecs: Use IWICComponentFactory_CreateQueryReaderFromBlockReader in GetMetadataQueryReader.

[Rémi Bernon]

Instead of MetadataQueryReader_CreateInstance.

Signed-off-by: Rémi Bernon 
---

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,

[PATCH v2 2/2] windowscodecs: Move several helpers to new wincodecs_common.c source.

[Rémi Bernon]

Signed-off-by: Rémi Bernon 
---
 dlls/windowscodecs/Makefile.in        |   3 +-
 dlls/windowscodecs/main.c             | 171 ----------------------
 dlls/windowscodecs/wincodecs_common.c | 203 ++++++++++++++++++++++++++
 3 files changed, 205 insertions(+), 172 deletions(-)
 create mode 100644 dlls/windowscodecs/wincodecs_common.c

diff --git a/dlls/windowscodecs/Makefile.in b/dlls/windowscodecs/Makefile.in
index 80e4d16c9d4..440a638e96f 100644
--- a/dlls/windowscodecs/Makefile.in
+++ b/dlls/windowscodecs/Makefile.in
@@ -41,7 +41,8 @@ C_SRCS = \
    ungif.c \
    unix_iface.c \
    unix_lib.c \
-	uuid.c
+	uuid.c \
+	wincodecs_common.c

RC_SRCS = version.rc

diff --git a/dlls/windowscodecs/main.c b/dlls/windowscodecs/main.c
index e78acc3f34f..4908a5f77e1 100644
--- a/dlls/windowscodecs/main.c
+++ b/dlls/windowscodecs/main.c
@@ -30,10 +30,6 @@

#include "wine/debug.h"

-WINE_DEFAULT_DEBUG_CHANNEL(wincodecs);
-
-#include "wincodecs_common.h"
-
 extern BOOL WINAPI WIC_DllMain(HINSTANCE, DWORD, LPVOID) DECLSPEC_HIDDEN;

HMODULE windowscodecs_module = 0;
@@ -60,173 +56,6 @@ HRESULT WINAPI DllCanUnloadNow(void)
     return S_FALSE;
 }

-HRESULT configure_write_source(IWICBitmapFrameEncode *iface,
-    IWICBitmapSource *source, const WICRect *prc,
-    const WICPixelFormatGUID *format,
-    INT width, INT height, double xres, double yres)
-{
-    UINT src_width, src_height;
-    HRESULT hr = S_OK;
-
-    if (width == 0 && height == 0)
-    {
-        if (prc)
-        {
-            if (prc->Width <= 0 || prc->Height <= 0) return E_INVALIDARG;
-            width = prc->Width;
-            height = prc->Height;
-        }
-        else
-        {
-            hr = IWICBitmapSource_GetSize(source, &src_width, &src_height);
-            if (FAILED(hr)) return hr;
-            if (src_width == 0 || src_height == 0) return E_INVALIDARG;
-            width = src_width;
-            height = src_height;
-        }
-        hr = IWICBitmapFrameEncode_SetSize(iface, (UINT)width, (UINT)height);
-        if (FAILED(hr)) return hr;
-    }
-    if (width == 0 || height == 0) return E_INVALIDARG;
-
-    if (!format)
-    {
-        WICPixelFormatGUID src_format;
-
-        hr = IWICBitmapSource_GetPixelFormat(source, &src_format);
-        if (FAILED(hr)) return hr;
-
-        hr = IWICBitmapFrameEncode_SetPixelFormat(iface, &src_format);
-        if (FAILED(hr)) return hr;
-    }
-
-    if (xres == 0.0 || yres == 0.0)
-    {
-        hr = IWICBitmapSource_GetResolution(source, &xres, &yres);
-        if (FAILED(hr)) return hr;
-        hr = IWICBitmapFrameEncode_SetResolution(iface, xres, yres);
-        if (FAILED(hr)) return hr;
-    }
-
-    return hr;
-}
-
-HRESULT write_source(IWICBitmapFrameEncode *iface,
-    IWICBitmapSource *source, const WICRect *prc,
-    const WICPixelFormatGUID *format, UINT bpp, BOOL need_palette,
-    INT width, INT height)
-{
-    IWICBitmapSource *converted_source;
-    HRESULT hr=S_OK;
-    WICRect rc;
-    UINT stride;
-    BYTE* pixeldata;
-
-    if (!prc)
-    {
-        UINT src_width, src_height;
-        hr = IWICBitmapSource_GetSize(source, &src_width, &src_height);
-        if (FAILED(hr)) return hr;
-        rc.X = 0;
-        rc.Y = 0;
-        rc.Width = src_width;
-        rc.Height = src_height;
-        prc = &rc;
-    }
-
-    if (prc->Width != width || prc->Height <= 0)
-        return E_INVALIDARG;
-
-    hr = WICConvertBitmapSource(format, source, &converted_source);
-    if (FAILED(hr))
-    {
-        ERR("Failed to convert source, target format %s, %#x\n", debugstr_guid(format), hr);
-        return E_NOTIMPL;
-    }
-
-    if (need_palette)
-    {
-        IWICPalette *palette;
-
-        hr = PaletteImpl_Create(&palette);
-        if (SUCCEEDED(hr))
-        {
-            hr = IWICBitmapSource_CopyPalette(converted_source, palette);
-
-            if (SUCCEEDED(hr))
-                hr = IWICBitmapFrameEncode_SetPalette(iface, palette);
-
-            IWICPalette_Release(palette);
-        }
-
-        if (FAILED(hr))
-        {
-            IWICBitmapSource_Release(converted_source);
-            return hr;
-        }
-    }
-
-    stride = (bpp * width + 7)/8;
-
-    pixeldata = HeapAlloc(GetProcessHeap(), 0, stride * prc->Height);
-    if (!pixeldata)
-    {
-        IWICBitmapSource_Release(converted_source);
-        return E_OUTOFMEMORY;
-    }
-
-    hr = IWICBitmapSource_CopyPixels(converted_source, prc, stride,
-        stride*prc->Height, pixeldata);
-
-    if (SUCCEEDED(hr))
-    {
-        hr = IWICBitmapFrameEncode_WritePixels(iface, prc->Height, stride,
-            stride*prc->Height, pixeldata);
-    }
-
-    HeapFree(GetProcessHeap(), 0, pixeldata);
-    IWICBitmapSource_Release(converted_source);
-
-    return hr;
-}
-
-HRESULT CDECL stream_getsize(IStream *stream, ULONGLONG *size)
-{
-    STATSTG statstg;
-    HRESULT hr;
-
-    hr = IStream_Stat(stream, &statstg, STATFLAG_NONAME);
-
-    if (SUCCEEDED(hr))
-        *size = statstg.cbSize.QuadPart;
-
-    return hr;
-}
-
-HRESULT CDECL stream_read(IStream *stream, void *buffer, ULONG read, ULONG *bytes_read)
-{
-    return IStream_Read(stream, buffer, read, bytes_read);
-}
-
-HRESULT CDECL stream_seek(IStream *stream, LONGLONG ofs, DWORD origin, ULONGLONG *new_position)
-{
-    HRESULT hr;
-    LARGE_INTEGER ofs_large;
-    ULARGE_INTEGER pos_large;
-
-    ofs_large.QuadPart = ofs;
-    hr = IStream_Seek(stream, ofs_large, origin, &pos_large);
-    if (new_position)
-        *new_position = pos_large.QuadPart;
-
-    return hr;
-}
-
-HRESULT CDECL stream_write(IStream *stream, const void *buffer, ULONG write, ULONG *bytes_written)
-{
-    return IStream_Write(stream, buffer, write, bytes_written);
-}
-
 HRESULT get_pixelformat_bpp(const GUID *pixelformat, UINT *bpp)
 {
     HRESULT hr;
diff --git a/dlls/windowscodecs/wincodecs_common.c b/dlls/windowscodecs/wincodecs_common.c
new file mode 100644
index 00000000000..37ad7128f10
--- /dev/null
+++ b/dlls/windowscodecs/wincodecs_common.c
@@ -0,0 +1,203 @@
+/*
+ * wincodecs_common.c - Functions shared with other WIC libraries.
+ *
+ * Copyright 2020 Esme Povirk
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#define COBJMACROS
+
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "winternl.h"
+#include "objbase.h"
+
+#include "wincodecs_private.h"
+
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(wincodecs);
+
+#include "wincodecs_common.h"
+
+HRESULT configure_write_source(IWICBitmapFrameEncode *iface,
+    IWICBitmapSource *source, const WICRect *prc,
+    const WICPixelFormatGUID *format,
+    INT width, INT height, double xres, double yres)
+{
+    UINT src_width, src_height;
+    HRESULT hr = S_OK;
+
+    if (width == 0 && height == 0)
+    {
+        if (prc)
+        {
+            if (prc->Width <= 0 || prc->Height <= 0) return E_INVALIDARG;
+            width = prc->Width;
+            height = prc->Height;
+        }
+        else
+        {
+            hr = IWICBitmapSource_GetSize(source, &src_width, &src_height);
+            if (FAILED(hr)) return hr;
+            if (src_width == 0 || src_height == 0) return E_INVALIDARG;
+            width = src_width;
+            height = src_height;
+        }
+        hr = IWICBitmapFrameEncode_SetSize(iface, (UINT)width, (UINT)height);
+        if (FAILED(hr)) return hr;
+    }
+    if (width == 0 || height == 0) return E_INVALIDARG;
+
+    if (!format)
+    {
+        WICPixelFormatGUID src_format;
+
+        hr = IWICBitmapSource_GetPixelFormat(source, &src_format);
+        if (FAILED(hr)) return hr;
+
+        hr = IWICBitmapFrameEncode_SetPixelFormat(iface, &src_format);
+        if (FAILED(hr)) return hr;
+    }
+
+    if (xres == 0.0 || yres == 0.0)
+    {
+        hr = IWICBitmapSource_GetResolution(source, &xres, &yres);
+        if (FAILED(hr)) return hr;
+        hr = IWICBitmapFrameEncode_SetResolution(iface, xres, yres);
+        if (FAILED(hr)) return hr;
+    }
+
+    return hr;
+}
+
+HRESULT write_source(IWICBitmapFrameEncode *iface,
+    IWICBitmapSource *source, const WICRect *prc,
+    const WICPixelFormatGUID *format, UINT bpp, BOOL need_palette,
+    INT width, INT height)
+{
+    IWICBitmapSource *converted_source;
+    HRESULT hr=S_OK;
+    WICRect rc;
+    UINT stride;
+    BYTE* pixeldata;
+
+    if (!prc)
+    {
+        UINT src_width, src_height;
+        hr = IWICBitmapSource_GetSize(source, &src_width, &src_height);
+        if (FAILED(hr)) return hr;
+        rc.X = 0;
+        rc.Y = 0;
+        rc.Width = src_width;
+        rc.Height = src_height;
+        prc = &rc;
+    }
+
+    if (prc->Width != width || prc->Height <= 0)
+        return E_INVALIDARG;
+
+    hr = WICConvertBitmapSource(format, source, &converted_source);
+    if (FAILED(hr))
+    {
+        ERR("Failed to convert source, target format %s, %#x\n", debugstr_guid(format), hr);
+        return E_NOTIMPL;
+    }
+
+    if (need_palette)
+    {
+        IWICPalette *palette;
+
+        hr = PaletteImpl_Create(&palette);
+        if (SUCCEEDED(hr))
+        {
+            hr = IWICBitmapSource_CopyPalette(converted_source, palette);
+
+            if (SUCCEEDED(hr))
+                hr = IWICBitmapFrameEncode_SetPalette(iface, palette);
+
+            IWICPalette_Release(palette);
+        }
+
+        if (FAILED(hr))
+        {
+            IWICBitmapSource_Release(converted_source);
+            return hr;
+        }
+    }
+
+    stride = (bpp * width + 7)/8;
+
+    pixeldata = HeapAlloc(GetProcessHeap(), 0, stride * prc->Height);
+    if (!pixeldata)
+    {
+        IWICBitmapSource_Release(converted_source);
+        return E_OUTOFMEMORY;
+    }
+
+    hr = IWICBitmapSource_CopyPixels(converted_source, prc, stride,
+        stride*prc->Height, pixeldata);
+
+    if (SUCCEEDED(hr))
+    {
+        hr = IWICBitmapFrameEncode_WritePixels(iface, prc->Height, stride,
+            stride*prc->Height, pixeldata);
+    }
+
+    HeapFree(GetProcessHeap(), 0, pixeldata);
+    IWICBitmapSource_Release(converted_source);
+
+    return hr;
+}
+
+HRESULT CDECL stream_getsize(IStream *stream, ULONGLONG *size)
+{
+    STATSTG statstg;
+    HRESULT hr;
+
+    hr = IStream_Stat(stream, &statstg, STATFLAG_NONAME);
+
+    if (SUCCEEDED(hr))
+        *size = statstg.cbSize.QuadPart;
+
+    return hr;
+}
+
+HRESULT CDECL stream_read(IStream *stream, void *buffer, ULONG read, ULONG *bytes_read)
+{
+    return IStream_Read(stream, buffer, read, bytes_read);
+}
+
+HRESULT CDECL stream_seek(IStream *stream, LONGLONG ofs, DWORD origin, ULONGLONG *new_position)
+{
+    HRESULT hr;
+    LARGE_INTEGER ofs_large;
+    ULARGE_INTEGER pos_large;
+
+    ofs_large.QuadPart = ofs;
+    hr = IStream_Seek(stream, ofs_large, origin, &pos_large);
+    if (new_position)
+        *new_position = pos_large.QuadPart;
+
+    return hr;
+}
+
+HRESULT CDECL stream_write(IStream *stream, const void *buffer, ULONG write, ULONG *bytes_written)
+{
+    return IStream_Write(stream, buffer, write, bytes_written);
+}

[PATCH v2 2/2] windowscodecs: Move several helpers to new wincodecs_common.c source.

[Esme Povirk (they/them)]

Signed-off-by: Esme Povirk

[Esme Povirk (they/them)]

This will probably take me a few days to review, as my Wine build
started failing on missing vkd3d definitions and I'll need to fix
that.

[Esme Povirk (they/them)]

Signed-off-by: Esme Povirk