[PATCH 1/3] include: Add defines for D2D1YCbCr effect.

[Ziqing Hui]

Signed-off-by: Ziqing Hui 
---
 include/Makefile.in       |  1 +
 include/d2d1_2.idl        |  1 +
 include/d2d1effects_1.idl | 50 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 52 insertions(+)
 create mode 100644 include/d2d1effects_1.idl

diff --git a/include/Makefile.in b/include/Makefile.in
index 40d6c00fb7b..c69194ef127 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -104,6 +104,7 @@ SOURCES = \
    d2d1_2.idl \
    d2d1_3.idl \
    d2d1effects.idl \
+	d2d1effects_1.idl \
    d2dbasetypes.h \
    d2derr.h \
    d3d.h \
diff --git a/include/d2d1_2.idl b/include/d2d1_2.idl
index 39e285dc221..1fc9111151c 100644
--- a/include/d2d1_2.idl
+++ b/include/d2d1_2.idl
@@ -17,6 +17,7 @@
  */

import "d2d1_1.idl";
+import "d2d1effects_1.idl";

typedef enum D2D1_RENDERING_PRIORITY
 {
diff --git a/include/d2d1effects_1.idl b/include/d2d1effects_1.idl
new file mode 100644
index 00000000000..03616b770e6
--- /dev/null
+++ b/include/d2d1effects_1.idl
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2022 Ziqing Hui for CodeWeavers
+ *
+ * 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
+ */
+
+import "d2d1effects.idl";
+
+cpp_quote("DEFINE_GUID(CLSID_D2D1YCbCr, 0x99503cc1,0x66c7,0x45c9,0xa8,0x75,0x8a,0xd8,0xa7,0x91,0x44,0x01);")
+
+typedef enum D2D1_YCBCR_PROP
+{
+    D2D1_YCBCR_PROP_CHROMA_SUBSAMPLING = 0x0,
+    D2D1_YCBCR_PROP_TRANSFORM_MATRIX   = 0x1,
+    D2D1_YCBCR_PROP_INTERPOLATION_MODE = 0x2,
+    D2D1_YCBCR_PROP_FORCE_DWORD = 0xffffffff
+} D2D1_YCBCR_PROP;
+
+typedef enum D2D1_YCBCR_CHROMA_SUBSAMPLING
+{
+    D2D1_YCBCR_CHROMA_SUBSAMPLING_AUTO = 0x0,
+    D2D1_YCBCR_CHROMA_SUBSAMPLING_420  = 0x1,
+    D2D1_YCBCR_CHROMA_SUBSAMPLING_422  = 0x2,
+    D2D1_YCBCR_CHROMA_SUBSAMPLING_444  = 0x3,
+    D2D1_YCBCR_CHROMA_SUBSAMPLING_440  = 0x4,
+    D2D1_YCBCR_CHROMA_SUBSAMPLING_FORCE_DWORD = 0xffffffff
+} D2D1_YCBCR_CHROMA_SUBSAMPLING;
+
+typedef enum D2D1_YCBCR_INTERPOLATION_MODE
+{
+    D2D1_YCBCR_INTERPOLATION_MODE_NEAREST_NEIGHBOR    = 0x0,
+    D2D1_YCBCR_INTERPOLATION_MODE_LINEAR              = 0x1,
+    D2D1_YCBCR_INTERPOLATION_MODE_CUBIC               = 0x2,
+    D2D1_YCBCR_INTERPOLATION_MODE_MULTI_SAMPLE_LINEAR = 0x3,
+    D2D1_YCBCR_INTERPOLATION_MODE_ANISOTROPIC         = 0x4,
+    D2D1_YCBCR_INTERPOLATION_MODE_HIGH_QUALITY_CUBIC  = 0x5,
+    D2D1_YCBCR_INTERPOLATION_MODE_FORCE_DWORD = 0xffffffff
+} D2D1_YCBCR_INTERPOLATION_MODE;

[PATCH 2/3] include: Add defines for D2D1HighlightsShadows effect.

[Ziqing Hui]

Signed-off-by: Ziqing Hui 
---
 include/Makefile.in       |  1 +
 include/d2d1_3.idl        |  1 +
 include/d2d1effects_2.idl | 38 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 40 insertions(+)
 create mode 100644 include/d2d1effects_2.idl

diff --git a/include/Makefile.in b/include/Makefile.in
index c69194ef127..047e7ff9146 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -105,6 +105,7 @@ SOURCES = \
    d2d1_3.idl \
    d2d1effects.idl \
    d2d1effects_1.idl \
+	d2d1effects_2.idl \
    d2dbasetypes.h \
    d2derr.h \
    d3d.h \
diff --git a/include/d2d1_3.idl b/include/d2d1_3.idl
index b51adfdffdb..91835ee1a77 100644
--- a/include/d2d1_3.idl
+++ b/include/d2d1_3.idl
@@ -17,6 +17,7 @@
  */

import "d2d1_2.idl";
+import "d2d1effects_2.idl";

typedef enum D2D1_INK_NIB_SHAPE
 {
diff --git a/include/d2d1effects_2.idl b/include/d2d1effects_2.idl
new file mode 100644
index 00000000000..79895361118
--- /dev/null
+++ b/include/d2d1effects_2.idl
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2022 Ziqing Hui for CodeWeavers
+ *
+ * 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
+ */
+
+import "d2d1effects_1.idl";
+
+cpp_quote("DEFINE_GUID(CLSID_D2D1HighlightsShadows, 0xcadc8384,0x323f,0x4c7e,0xa3,0x61,0x2e,0x2b,0x24,0xdf,0x6e,0xe4);")
+
+typedef enum D2D1_HIGHLIGHTSANDSHADOWS_PROP
+{
+    D2D1_HIGHLIGHTSANDSHADOWS_PROP_HIGHLIGHTS       = 0x0,
+    D2D1_HIGHLIGHTSANDSHADOWS_PROP_SHADOWS          = 0x1,
+    D2D1_HIGHLIGHTSANDSHADOWS_PROP_CLARITY          = 0x2,
+    D2D1_HIGHLIGHTSANDSHADOWS_PROP_INPUT_GAMMA      = 0x3,
+    D2D1_HIGHLIGHTSANDSHADOWS_PROP_MASK_BLUR_RADIUS = 0x4,
+    D2D1_HIGHLIGHTSANDSHADOWS_PROP_FORCE_DWORD = 0xffffffff
+} D2D1_HIGHLIGHTSANDSHADOWS_PROP;
+
+typedef enum D2D1_HIGHLIGHTSANDSHADOWS_INPUT_GAMMA
+{
+    D2D1_HIGHLIGHTSANDSHADOWS_INPUT_GAMMA_LINEAR = 0x0,
+    D2D1_HIGHLIGHTSANDSHADOWS_INPUT_GAMMA_SRGB   = 0x1,
+    D2D1_HIGHLIGHTSANDSHADOWS_INPUT_GAMMA_FORCE_DWORD = 0xffffffff
+} D2D1_HIGHLIGHTSANDSHADOWS_INPUT_GAMMA;

[PATCH 2/3] include: Add defines for D2D1HighlightsShadows effect.

[Henri Verbeet]

Signed-off-by: Henri Verbeet

[PATCH 3/3] d2d1: Add stubs for ID2D1Factory3.

[Ziqing Hui]

Signed-off-by: Ziqing Hui 
---
 dlls/d2d1/factory.c | 108 ++++++++++++++++++++++++--------------------
 1 file changed, 59 insertions(+), 49 deletions(-)

diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c
index 3d3393e5f0c..f0f61674889 100644
--- a/dlls/d2d1/factory.c
+++ b/dlls/d2d1/factory.c
@@ -29,7 +29,7 @@ struct d2d_settings d2d_settings =

struct d2d_factory
 {
-    ID2D1Factory2 ID2D1Factory2_iface;
+    ID2D1Factory3 ID2D1Factory3_iface;
     ID2D1Multithread ID2D1Multithread_iface;
     LONG refcount;

@@ -41,9 +41,9 @@ struct d2d_factory
     CRITICAL_SECTION cs;
 };

-static inline struct d2d_factory *impl_from_ID2D1Factory2(ID2D1Factory2 *iface)
+static inline struct d2d_factory *impl_from_ID2D1Factory3(ID2D1Factory3 *iface)
 {
-    return CONTAINING_RECORD(iface, struct d2d_factory, ID2D1Factory2_iface);
+    return CONTAINING_RECORD(iface, struct d2d_factory, ID2D1Factory3_iface);
 }

static inline struct d2d_factory *impl_from_ID2D1Multithread(ID2D1Multithread *iface)
@@ -69,24 +69,25 @@ static HRESULT d2d_factory_reload_sysmetrics(struct d2d_factory *factory)
     return S_OK;
 }

-static HRESULT STDMETHODCALLTYPE d2d_factory_QueryInterface(ID2D1Factory2 *iface, REFIID iid, void **out)
+static HRESULT STDMETHODCALLTYPE d2d_factory_QueryInterface(ID2D1Factory3 *iface, REFIID iid, void **out)
 {
-    struct d2d_factory *factory = impl_from_ID2D1Factory2(iface);
+    struct d2d_factory *factory = impl_from_ID2D1Factory3(iface);

TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out);

-    if ((IsEqualGUID(iid, &IID_ID2D1Factory2) && d2d_settings.max_version_factory >= 2)
+    if ((IsEqualGUID(iid, &IID_ID2D1Factory3) && d2d_settings.max_version_factory >= 3)
+            || (IsEqualGUID(iid, &IID_ID2D1Factory2) && d2d_settings.max_version_factory >= 2)
             || (IsEqualGUID(iid, &IID_ID2D1Factory1) && d2d_settings.max_version_factory >= 1)
             || IsEqualGUID(iid, &IID_ID2D1Factory)
             || IsEqualGUID(iid, &IID_IUnknown))
     {
-        ID2D1Factory2_AddRef(iface);
+        ID2D1Factory3_AddRef(iface);
         *out = iface;
         return S_OK;
     }
     else if (IsEqualGUID(iid, &IID_ID2D1Multithread))
     {
-        ID2D1Factory2_AddRef(iface);
+        ID2D1Factory3_AddRef(iface);
         *out = &factory->ID2D1Multithread_iface;
         return S_OK;
     }
@@ -97,9 +98,9 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_QueryInterface(ID2D1Factory2 *iface
     return E_NOINTERFACE;
 }

-static ULONG STDMETHODCALLTYPE d2d_factory_AddRef(ID2D1Factory2 *iface)
+static ULONG STDMETHODCALLTYPE d2d_factory_AddRef(ID2D1Factory3 *iface)
 {
-    struct d2d_factory *factory = impl_from_ID2D1Factory2(iface);
+    struct d2d_factory *factory = impl_from_ID2D1Factory3(iface);
     ULONG refcount = InterlockedIncrement(&factory->refcount);

TRACE("%p increasing refcount to %lu.\n", iface, refcount);
@@ -107,9 +108,9 @@ static ULONG STDMETHODCALLTYPE d2d_factory_AddRef(ID2D1Factory2 *iface)
     return refcount;
 }

-static ULONG STDMETHODCALLTYPE d2d_factory_Release(ID2D1Factory2 *iface)
+static ULONG STDMETHODCALLTYPE d2d_factory_Release(ID2D1Factory3 *iface)
 {
-    struct d2d_factory *factory = impl_from_ID2D1Factory2(iface);
+    struct d2d_factory *factory = impl_from_ID2D1Factory3(iface);
     ULONG refcount = InterlockedDecrement(&factory->refcount);

TRACE("%p decreasing refcount to %lu.\n", iface, refcount);
@@ -125,18 +126,18 @@ static ULONG STDMETHODCALLTYPE d2d_factory_Release(ID2D1Factory2 *iface)
     return refcount;
 }

-static HRESULT STDMETHODCALLTYPE d2d_factory_ReloadSystemMetrics(ID2D1Factory2 *iface)
+static HRESULT STDMETHODCALLTYPE d2d_factory_ReloadSystemMetrics(ID2D1Factory3 *iface)
 {
-    struct d2d_factory *factory = impl_from_ID2D1Factory2(iface);
+    struct d2d_factory *factory = impl_from_ID2D1Factory3(iface);

TRACE("iface %p.\n", iface);

return d2d_factory_reload_sysmetrics(factory);
 }

-static void STDMETHODCALLTYPE d2d_factory_GetDesktopDpi(ID2D1Factory2 *iface, float *dpi_x, float *dpi_y)
+static void STDMETHODCALLTYPE d2d_factory_GetDesktopDpi(ID2D1Factory3 *iface, float *dpi_x, float *dpi_y)
 {
-    struct d2d_factory *factory = impl_from_ID2D1Factory2(iface);
+    struct d2d_factory *factory = impl_from_ID2D1Factory3(iface);

TRACE("iface %p, dpi_x %p, dpi_y %p.\n", iface, dpi_x, dpi_y);

@@ -144,7 +145,7 @@ static void STDMETHODCALLTYPE d2d_factory_GetDesktopDpi(ID2D1Factory2 *iface, fl
     *dpi_y = factory->dpi_y;
 }

-static HRESULT STDMETHODCALLTYPE d2d_factory_CreateRectangleGeometry(ID2D1Factory2 *iface,
+static HRESULT STDMETHODCALLTYPE d2d_factory_CreateRectangleGeometry(ID2D1Factory3 *iface,
         const D2D1_RECT_F *rect, ID2D1RectangleGeometry **geometry)
 {
     struct d2d_geometry *object;
@@ -168,7 +169,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateRectangleGeometry(ID2D1Factor
     return S_OK;
 }

-static HRESULT STDMETHODCALLTYPE d2d_factory_CreateRoundedRectangleGeometry(ID2D1Factory2 *iface,
+static HRESULT STDMETHODCALLTYPE d2d_factory_CreateRoundedRectangleGeometry(ID2D1Factory3 *iface,
         const D2D1_ROUNDED_RECT *rounded_rect, ID2D1RoundedRectangleGeometry **geometry)
 {
     struct d2d_geometry *object;
@@ -192,7 +193,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateRoundedRectangleGeometry(ID2D
     return S_OK;
 }

-static HRESULT STDMETHODCALLTYPE d2d_factory_CreateEllipseGeometry(ID2D1Factory2 *iface,
+static HRESULT STDMETHODCALLTYPE d2d_factory_CreateEllipseGeometry(ID2D1Factory3 *iface,
         const D2D1_ELLIPSE *ellipse, ID2D1EllipseGeometry **geometry)
 {
     struct d2d_geometry *object;
@@ -216,7 +217,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateEllipseGeometry(ID2D1Factory2
     return S_OK;
 }

-static HRESULT STDMETHODCALLTYPE d2d_factory_CreateGeometryGroup(ID2D1Factory2 *iface,
+static HRESULT STDMETHODCALLTYPE d2d_factory_CreateGeometryGroup(ID2D1Factory3 *iface,
         D2D1_FILL_MODE fill_mode, ID2D1Geometry **geometries, UINT32 geometry_count, ID2D1GeometryGroup **group)
 {
     struct d2d_geometry *object;
@@ -241,7 +242,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateGeometryGroup(ID2D1Factory2 *
     return S_OK;
 }

-static HRESULT STDMETHODCALLTYPE d2d_factory_CreateTransformedGeometry(ID2D1Factory2 *iface,
+static HRESULT STDMETHODCALLTYPE d2d_factory_CreateTransformedGeometry(ID2D1Factory3 *iface,
         ID2D1Geometry *src_geometry, const D2D1_MATRIX_3X2_F *transform,
         ID2D1TransformedGeometry **transformed_geometry)
 {
@@ -261,7 +262,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateTransformedGeometry(ID2D1Fact
     return S_OK;
 }

-static HRESULT STDMETHODCALLTYPE d2d_factory_CreatePathGeometry(ID2D1Factory2 *iface, ID2D1PathGeometry **geometry)
+static HRESULT STDMETHODCALLTYPE d2d_factory_CreatePathGeometry(ID2D1Factory3 *iface, ID2D1PathGeometry **geometry)
 {
     struct d2d_geometry *object;

@@ -278,7 +279,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreatePathGeometry(ID2D1Factory2 *i
     return S_OK;
 }

-static HRESULT STDMETHODCALLTYPE d2d_factory_CreateStrokeStyle(ID2D1Factory2 *iface,
+static HRESULT STDMETHODCALLTYPE d2d_factory_CreateStrokeStyle(ID2D1Factory3 *iface,
         const D2D1_STROKE_STYLE_PROPERTIES *desc, const float *dashes, UINT32 dash_count,
         ID2D1StrokeStyle **stroke_style)
 {
@@ -314,7 +315,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateStrokeStyle(ID2D1Factory2 *if
     return S_OK;
 }

-static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDrawingStateBlock(ID2D1Factory2 *iface,
+static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDrawingStateBlock(ID2D1Factory3 *iface,
         const D2D1_DRAWING_STATE_DESCRIPTION *desc, IDWriteRenderingParams *text_rendering_params,
         ID2D1DrawingStateBlock **state_block)
 {
@@ -354,10 +355,10 @@ static HRESULT d2d_factory_get_device(struct d2d_factory *factory, ID3D10Device1
     return hr;
 }

-static HRESULT STDMETHODCALLTYPE d2d_factory_CreateWicBitmapRenderTarget(ID2D1Factory2 *iface,
+static HRESULT STDMETHODCALLTYPE d2d_factory_CreateWicBitmapRenderTarget(ID2D1Factory3 *iface,
         IWICBitmap *target, const D2D1_RENDER_TARGET_PROPERTIES *desc, ID2D1RenderTarget **render_target)
 {
-    struct d2d_factory *factory = impl_from_ID2D1Factory2(iface);
+    struct d2d_factory *factory = impl_from_ID2D1Factory3(iface);
     struct d2d_wic_render_target *object;
     ID3D10Device1 *device;
     HRESULT hr;
@@ -386,11 +387,11 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateWicBitmapRenderTarget(ID2D1Fa
     return S_OK;
 }

-static HRESULT STDMETHODCALLTYPE d2d_factory_CreateHwndRenderTarget(ID2D1Factory2 *iface,
+static HRESULT STDMETHODCALLTYPE d2d_factory_CreateHwndRenderTarget(ID2D1Factory3 *iface,
         const D2D1_RENDER_TARGET_PROPERTIES *desc, const D2D1_HWND_RENDER_TARGET_PROPERTIES *hwnd_rt_desc,
         ID2D1HwndRenderTarget **render_target)
 {
-    struct d2d_factory *factory = impl_from_ID2D1Factory2(iface);
+    struct d2d_factory *factory = impl_from_ID2D1Factory3(iface);
     struct d2d_hwnd_render_target *object;
     ID3D10Device1 *device;
     HRESULT hr;
@@ -416,7 +417,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateHwndRenderTarget(ID2D1Factory
     return S_OK;
 }

-static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDxgiSurfaceRenderTarget(ID2D1Factory2 *iface,
+static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDxgiSurfaceRenderTarget(ID2D1Factory3 *iface,
         IDXGISurface *surface, const D2D1_RENDER_TARGET_PROPERTIES *desc, ID2D1RenderTarget **render_target)
 {
     IDXGIDevice *dxgi_device;
@@ -444,10 +445,10 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDxgiSurfaceRenderTarget(ID2D1
     return hr;
 }

-static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDCRenderTarget(ID2D1Factory2 *iface,
+static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDCRenderTarget(ID2D1Factory3 *iface,
         const D2D1_RENDER_TARGET_PROPERTIES *desc, ID2D1DCRenderTarget **render_target)
 {
-    struct d2d_factory *factory = impl_from_ID2D1Factory2(iface);
+    struct d2d_factory *factory = impl_from_ID2D1Factory3(iface);
     struct d2d_dc_render_target *object;
     ID3D10Device1 *device;
     HRESULT hr;
@@ -473,7 +474,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDCRenderTarget(ID2D1Factory2
     return S_OK;
 }

-static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDevice(ID2D1Factory2 *iface,
+static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDevice(ID2D1Factory3 *iface,
         IDXGIDevice *dxgi_device, ID2D1Device **device)
 {
     struct d2d_device *object;
@@ -491,7 +492,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDevice(ID2D1Factory2 *iface,
     return S_OK;
 }

-static HRESULT STDMETHODCALLTYPE d2d_factory_CreateStrokeStyle1(ID2D1Factory2 *iface,
+static HRESULT STDMETHODCALLTYPE d2d_factory_CreateStrokeStyle1(ID2D1Factory3 *iface,
         const D2D1_STROKE_STYLE_PROPERTIES1 *desc, const float *dashes, UINT32 dash_count,
         ID2D1StrokeStyle1 **stroke_style)
 {
@@ -518,14 +519,14 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateStrokeStyle1(ID2D1Factory2 *i
     return S_OK;
 }

-static HRESULT STDMETHODCALLTYPE d2d_factory_CreatePathGeometry1(ID2D1Factory2 *iface, ID2D1PathGeometry1 **geometry)
+static HRESULT STDMETHODCALLTYPE d2d_factory_CreatePathGeometry1(ID2D1Factory3 *iface, ID2D1PathGeometry1 **geometry)
 {
     FIXME("iface %p, geometry %p stub!\n", iface, geometry);

return E_NOTIMPL;
 }

-static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDrawingStateBlock1(ID2D1Factory2 *iface,
+static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDrawingStateBlock1(ID2D1Factory3 *iface,
         const D2D1_DRAWING_STATE_DESCRIPTION1 *desc, IDWriteRenderingParams *text_rendering_params,
         ID2D1DrawingStateBlock1 **state_block)
 {
@@ -545,7 +546,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDrawingStateBlock1(ID2D1Facto
     return S_OK;
 }

-static HRESULT STDMETHODCALLTYPE d2d_factory_CreateGdiMetafile(ID2D1Factory2 *iface,
+static HRESULT STDMETHODCALLTYPE d2d_factory_CreateGdiMetafile(ID2D1Factory3 *iface,
         IStream *stream, ID2D1GdiMetafile **metafile)
 {
     FIXME("iface %p, stream %p, metafile %p stub!\n", iface, stream, metafile);
@@ -553,7 +554,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateGdiMetafile(ID2D1Factory2 *if
     return E_NOTIMPL;
 }

-static HRESULT STDMETHODCALLTYPE d2d_factory_RegisterEffectFromStream(ID2D1Factory2 *iface,
+static HRESULT STDMETHODCALLTYPE d2d_factory_RegisterEffectFromStream(ID2D1Factory3 *iface,
         REFCLSID effect_id, IStream *property_xml, const D2D1_PROPERTY_BINDING *bindings,
         UINT32 binding_count, PD2D1_EFFECT_FACTORY effect_factory)
 {
@@ -563,7 +564,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_RegisterEffectFromStream(ID2D1Facto
     return E_NOTIMPL;
 }

-static HRESULT STDMETHODCALLTYPE d2d_factory_RegisterEffectFromString(ID2D1Factory2 *iface,
+static HRESULT STDMETHODCALLTYPE d2d_factory_RegisterEffectFromString(ID2D1Factory3 *iface,
         REFCLSID effect_id, const WCHAR *property_xml, const D2D1_PROPERTY_BINDING *bindings,
         UINT32 binding_count, PD2D1_EFFECT_FACTORY effect_factory)
 {
@@ -573,14 +574,14 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_RegisterEffectFromString(ID2D1Facto
     return S_OK;
 }

-static HRESULT STDMETHODCALLTYPE d2d_factory_UnregisterEffect(ID2D1Factory2 *iface, REFCLSID effect_id)
+static HRESULT STDMETHODCALLTYPE d2d_factory_UnregisterEffect(ID2D1Factory3 *iface, REFCLSID effect_id)
 {
     FIXME("iface %p, effect_id %s stub!\n", iface, debugstr_guid(effect_id));

return E_NOTIMPL;
 }

-static HRESULT STDMETHODCALLTYPE d2d_factory_GetRegisteredEffects(ID2D1Factory2 *iface,
+static HRESULT STDMETHODCALLTYPE d2d_factory_GetRegisteredEffects(ID2D1Factory3 *iface,
         CLSID *effects, UINT32 effect_count, UINT32 *returned, UINT32 *registered)
 {
     FIXME("iface %p, effects %p, effect_count %u, returned %p, registered %p stub!\n",
@@ -589,7 +590,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_GetRegisteredEffects(ID2D1Factory2
     return E_NOTIMPL;
 }

-static HRESULT STDMETHODCALLTYPE d2d_factory_GetEffectProperties(ID2D1Factory2 *iface,
+static HRESULT STDMETHODCALLTYPE d2d_factory_GetEffectProperties(ID2D1Factory3 *iface,
         REFCLSID effect_id, ID2D1Properties **props)
 {
     FIXME("iface %p, effect_id %s, props %p stub!\n", iface, debugstr_guid(effect_id), props);
@@ -597,7 +598,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_GetEffectProperties(ID2D1Factory2 *
     return E_NOTIMPL;
 }

-static HRESULT STDMETHODCALLTYPE d2d_factory_ID2D1Factory2_CreateDevice(ID2D1Factory2 *iface, IDXGIDevice *dxgi_device,
+static HRESULT STDMETHODCALLTYPE d2d_factory_ID2D1Factory2_CreateDevice(ID2D1Factory3 *iface, IDXGIDevice *dxgi_device,
         ID2D1Device1 **device)
 {
     FIXME("iface %p, dxgi_device %p, device %p stub!\n", iface, dxgi_device, device);
@@ -605,7 +606,15 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_ID2D1Factory2_CreateDevice(ID2D1Fac
     return E_NOTIMPL;
 }

-static const struct ID2D1Factory2Vtbl d2d_factory_vtbl =
+static HRESULT STDMETHODCALLTYPE d2d_factory_ID2D1Factory3_CreateDevice(ID2D1Factory3 *iface, IDXGIDevice *dxgi_device,
+        ID2D1Device2 **device)
+{
+    FIXME("iface %p, dxgi_device %p, device %p stub!\n", iface, dxgi_device, device);
+
+    return E_NOTIMPL;
+}
+
+static const struct ID2D1Factory3Vtbl d2d_factory_vtbl =
 {
     d2d_factory_QueryInterface,
     d2d_factory_AddRef,
@@ -635,24 +644,25 @@ static const struct ID2D1Factory2Vtbl d2d_factory_vtbl =
     d2d_factory_GetRegisteredEffects,
     d2d_factory_GetEffectProperties,
     d2d_factory_ID2D1Factory2_CreateDevice,
+    d2d_factory_ID2D1Factory3_CreateDevice,
 };

static HRESULT STDMETHODCALLTYPE d2d_factory_mt_QueryInterface(ID2D1Multithread *iface, REFIID iid, void **out)
 {
     struct d2d_factory *factory = impl_from_ID2D1Multithread(iface);
-    return d2d_factory_QueryInterface(&factory->ID2D1Factory2_iface, iid, out);
+    return d2d_factory_QueryInterface(&factory->ID2D1Factory3_iface, iid, out);
 }

static ULONG STDMETHODCALLTYPE d2d_factory_mt_AddRef(ID2D1Multithread *iface)
 {
     struct d2d_factory *factory = impl_from_ID2D1Multithread(iface);
-    return d2d_factory_AddRef(&factory->ID2D1Factory2_iface);
+    return d2d_factory_AddRef(&factory->ID2D1Factory3_iface);
 }

static ULONG STDMETHODCALLTYPE d2d_factory_mt_Release(ID2D1Multithread *iface)
 {
     struct d2d_factory *factory = impl_from_ID2D1Multithread(iface);
-    return d2d_factory_Release(&factory->ID2D1Factory2_iface);
+    return d2d_factory_Release(&factory->ID2D1Factory3_iface);
 }

static BOOL STDMETHODCALLTYPE d2d_factory_mt_GetMultithreadProtected(ID2D1Multithread *iface)
@@ -717,7 +727,7 @@ static void d2d_factory_init(struct d2d_factory *factory, D2D1_FACTORY_TYPE fact
     if (factory_options && factory_options->debugLevel != D2D1_DEBUG_LEVEL_NONE)
         WARN("Ignoring debug level %#x.\n", factory_options->debugLevel);

-    factory->ID2D1Factory2_iface.lpVtbl = &d2d_factory_vtbl;
+    factory->ID2D1Factory3_iface.lpVtbl = &d2d_factory_vtbl;
     factory->ID2D1Multithread_iface.lpVtbl = factory_type == D2D1_FACTORY_TYPE_SINGLE_THREADED ?
             &d2d_factory_multithread_noop_vtbl : &d2d_factory_multithread_vtbl;
     factory->refcount = 1;
@@ -747,8 +757,8 @@ HRESULT WINAPI D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid,

TRACE("Created factory %p.\n", object);

-    hr = ID2D1Factory2_QueryInterface(&object->ID2D1Factory2_iface, iid, factory);
-    ID2D1Factory2_Release(&object->ID2D1Factory2_iface);
+    hr = ID2D1Factory3_QueryInterface(&object->ID2D1Factory3_iface, iid, factory);
+    ID2D1Factory3_Release(&object->ID2D1Factory3_iface);

return hr;
 }

[PATCH 3/3] d2d1: Add stubs for ID2D1Factory3.

[Henri Verbeet]

Signed-off-by: Henri Verbeet

[Henri Verbeet]

Signed-off-by: Henri Verbeet