wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-01-28 22:04:43 -08:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against bf4d0982fd88f9c8848b9e27bb1391d45d18b68e

Browse Source
This commit is contained in:
Alistair Leslie-Hughes 2018-05-24 10:15:30 +10:00
parent 1121536608
commit 51557bbf6e
3 changed files with 31 additions and 707 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
patches/d2d1-ID2D1Factory1/0001-d2d1-Add-d2d1_1.idl-for-drawing-ID2D1Bitmap1.patch
View File

@ -1,18 +1,18 @@
From b9218f8580e217d01bbef80ff78b21c877fd4a3f Mon Sep 17 00:00:00 2001
From 9eee499bc9b042041d32d0350b02f7ada9b89548 Mon Sep 17 00:00:00 2001
From: Lucian Poston <lucian.poston@gmail.com>
Date: Wed, 2 May 2018 22:38:33 -0700
Subject: d2d1: Add d2d1_1.idl for drawing ID2D1Bitmap1
Subject: [PATCH] d2d1: Add d2d1_1.idl for drawing ID2D1Bitmap1
https://bugs.winehq.org/show_bug.cgi?id=44052
Signed-off-by: Lucian Poston <lucian.poston@gmail.com>
---
include/d2d1_1.idl | 462 ++++++++++++++++++++++++++++++++++++++++++++++++++++
include/d2d1_1.idl | 436 ++++++++++++++++++++++++++++++++++++++++++++++++++--
include/dcommon.idl | 15 ++
2 files changed, 477 insertions(+)
2 files changed, 441 insertions(+), 10 deletions(-)
diff --git a/include/d2d1_1.idl b/include/d2d1_1.idl
index 2b1ef2e..33a661c 100644
index 4b6224a..26c6e70 100644
--- a/include/d2d1_1.idl
+++ b/include/d2d1_1.idl
@@ -18,6 +18,11 @@
@ -27,10 +27,27 @@ index 2b1ef2e..33a661c 100644
interface ID2D1DeviceContext;
interface ID2D1StrokeStyle1;
interface ID2D1PathGeometry1;
@@ -76,6 +81,82 @@ typedef enum D2D1_COLOR_SPACE
@@ -77,16 +82,6 @@ typedef enum D2D1_COLOR_SPACE
D2D1_COLOR_SPACE_FORCE_DWORD = 0xffffffff,
} D2D1_COLOR_SPACE;
-typedef enum D2D1_BITMAP_OPTIONS
-{
- D2D1_BITMAP_OPTIONS_NONE = 0x0,
- D2D1_BITMAP_OPTIONS_TARGET = 0x1,
- D2D1_BITMAP_OPTIONS_CANNOT_DRAW = 0x2,
- D2D1_BITMAP_OPTIONS_CPU_READ = 0x4,
- D2D1_BITMAP_OPTIONS_GDI_COMPATIBLE = 0x8,
- D2D1_BITMAP_OPTIONS_FORCE_DWORD = 0xffffffff,
-} D2D1_BITMAP_OPTIONS;
-
typedef enum D2D1_MAP_OPTIONS
{
D2D1_MAP_OPTIONS_NONE = 0x0,
@@ -96,6 +91,73 @@ typedef enum D2D1_MAP_OPTIONS
D2D1_MAP_OPTIONS_FORCE_DWORD = 0xffffffff,
} D2D1_MAP_OPTIONS;
+typedef enum D2D1_BITMAP_OPTIONS
+{
+ D2D1_BITMAP_OPTIONS_NONE = 0,
@ -96,30 +113,15 @@ index 2b1ef2e..33a661c 100644
+ D2D1_LAYER_OPTIONS1_FORCE_DWORD = 0xffffffff,
+} D2D1_LAYER_OPTIONS1;
+
+typedef enum D2D1_MAP_OPTIONS
+{
+ D2D1_MAP_OPTIONS_NONE = 0,
+ D2D1_MAP_OPTIONS_READ = 1,
+ D2D1_MAP_OPTIONS_WRITE = 2,
+ D2D1_MAP_OPTIONS_DISCARD = 4,
+ D2D1_MAP_OPTIONS_FORCE_DWORD = 0xffffffff,
+} D2D1_MAP_OPTIONS;
+
+typedef D2D_MATRIX_4X4_F D2D1_MATRIX_4X4_F;
+typedef struct DWRITE_GLYPH_RUN_DESCRIPTION DWRITE_GLYPH_RUN_DESCRIPTION;
typedef struct D2D1_PROPERTY_BINDING D2D1_PROPERTY_BINDING;
typedef struct D2D1_STROKE_STYLE_PROPERTIES1
@@ -108,6 +189,69 @@ typedef struct D2D1_PRINT_CONTROL_PROPERTIES
D2D1_COLOR_SPACE colorSpace;
} D2D1_PRINT_CONTROL_PROPERTIES;
@@ -134,6 +196,63 @@ typedef struct D2D1_MAPPED_RECT
BYTE *bits;
} D2D1_MAPPED_RECT;
+typedef struct D2D1_MAPPED_RECT
+{
+ UINT32 pitch;
+ BYTE *bits;
+} D2D1_MAPPED_RECT;
+
+typedef struct D2D1_LAYER_PARAMETERS1
+{
+ D2D1_RECT_F contentBounds;
@ -180,7 +182,7 @@ index 2b1ef2e..33a661c 100644
typedef HRESULT (__stdcall *PD2D1_EFFECT_FACTORY)(IUnknown **effect);
[
@@ -193,3 +337,321 @@ interface ID2D1Factory1 : ID2D1Factory
@@ -240,3 +359,300 @@ interface ID2D1Factory1 : ID2D1Factory
[out] ID2D1Properties **props
);
}
@ -188,27 +190,6 @@ index 2b1ef2e..33a661c 100644
+[
+ local,
+ object,
+ uuid(a898a84c-3873-4588-b08b-ebbf978df041)
+]
+interface ID2D1Bitmap1 : ID2D1Bitmap
+{
+ void GetColorContext(
+ [out] ID2D1ColorContext **color_context
+ );
+ D2D1_BITMAP_OPTIONS GetOptions();
+ HRESULT GetSurface(
+ [out] IDXGISurface **surface
+ );
+ HRESULT Map(
+ D2D1_MAP_OPTIONS options,
+ [out] D2D1_MAPPED_RECT *mapped_rect
+ );
+ HRESULT Unmap();
+}
+
+[
+ local,
+ object,
+ uuid(ae1572f4-5dd0-4777-998b-9279472ae63b)
+]
+interface ID2D1GradientStopCollection1 : ID2D1GradientStopCollection
@ -526,5 +507,5 @@ index db5055d..18f2fbe 100644
+ };
+} D2D_MATRIX_4X4_F;
--
2.7.4
1.9.1

655
patches/d2d1-ID2D1Factory1/0007-d2d1-Implement-ID2D1Bitmap1.patch
View File

@ -1,655 +0,0 @@
From 4da54c6040345f0a4d2f9d11e1d24461dec69e77 Mon Sep 17 00:00:00 2001
From: Lucian Poston <lucian.poston@gmail.com>
Date: Thu, 3 May 2018 04:36:13 -0700
Subject: d2d1: Implement ID2D1Bitmap1
https://bugs.winehq.org/show_bug.cgi?id=44052
Signed-off-by: Lucian Poston <lucian.poston@gmail.com>
---
dlls/d2d1/bitmap.c | 277 +++++++++++++++++++++++++++++++++------------
dlls/d2d1/brush.c | 8 +-
dlls/d2d1/d2d1_private.h | 8 +-
dlls/d2d1/device.c | 6 +-
dlls/d2d1/device_context.c | 24 +++-
5 files changed, 243 insertions(+), 80 deletions(-)
diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c
index 0d4098f..32e6085 100644
--- a/dlls/d2d1/bitmap.c
+++ b/dlls/d2d1/bitmap.c
@@ -24,21 +24,46 @@
WINE_DEFAULT_DEBUG_CHANNEL(d2d);
-static inline struct d2d_bitmap *impl_from_ID2D1Bitmap(ID2D1Bitmap *iface)
+static inline struct d2d_bitmap *impl_from_ID2D1Bitmap(ID2D1Bitmap1 *iface)
{
return CONTAINING_RECORD(iface, struct d2d_bitmap, ID2D1Bitmap_iface);
}
-static HRESULT STDMETHODCALLTYPE d2d_bitmap_QueryInterface(ID2D1Bitmap *iface, REFIID iid, void **out)
+static D2D1_BITMAP_PROPERTIES1 bitmap_properties_to_properties1(
+ const D2D1_BITMAP_PROPERTIES *desc)
+{
+ D2D1_BITMAP_PROPERTIES1 d;
+ d.bitmapOptions = D2D1_BITMAP_OPTIONS_NONE;
+ d.colorContext = NULL;
+ if (desc == NULL)
+ {
+ d.pixelFormat.format = DXGI_FORMAT_UNKNOWN;
+ d.pixelFormat.alphaMode = D2D1_ALPHA_MODE_UNKNOWN;
+ d.dpiX = 96.0f;
+ d.dpiY = 96.0f;
+ }
+ else
+ {
+ d.pixelFormat.format = desc->pixelFormat.format;
+ d.pixelFormat.alphaMode = desc->pixelFormat.alphaMode;
+ d.dpiX = desc->dpiX;
+ d.dpiY = desc->dpiY;
+ }
+
+ return d;
+}
+
+static HRESULT STDMETHODCALLTYPE d2d_bitmap_QueryInterface(ID2D1Bitmap1 *iface, REFIID iid, void **out)
{
TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out);
- if (IsEqualGUID(iid, &IID_ID2D1Bitmap)
+ if (IsEqualGUID(iid, &IID_ID2D1Bitmap1)
+ || IsEqualGUID(iid, &IID_ID2D1Bitmap)
|| IsEqualGUID(iid, &IID_ID2D1Image)
|| IsEqualGUID(iid, &IID_ID2D1Resource)
|| IsEqualGUID(iid, &IID_IUnknown))
{
- ID2D1Bitmap_AddRef(iface);
+ ID2D1Bitmap1_AddRef(iface);
*out = iface;
return S_OK;
}
@@ -49,7 +74,7 @@ static HRESULT STDMETHODCALLTYPE d2d_bitmap_QueryInterface(ID2D1Bitmap *iface, R
return E_NOINTERFACE;
}
-static ULONG STDMETHODCALLTYPE d2d_bitmap_AddRef(ID2D1Bitmap *iface)
+static ULONG STDMETHODCALLTYPE d2d_bitmap_AddRef(ID2D1Bitmap1 *iface)
{
struct d2d_bitmap *bitmap = impl_from_ID2D1Bitmap(iface);
ULONG refcount = InterlockedIncrement(&bitmap->refcount);
@@ -59,7 +84,7 @@ static ULONG STDMETHODCALLTYPE d2d_bitmap_AddRef(ID2D1Bitmap *iface)
return refcount;
}
-static ULONG STDMETHODCALLTYPE d2d_bitmap_Release(ID2D1Bitmap *iface)
+static ULONG STDMETHODCALLTYPE d2d_bitmap_Release(ID2D1Bitmap1 *iface)
{
struct d2d_bitmap *bitmap = impl_from_ID2D1Bitmap(iface);
ULONG refcount = InterlockedDecrement(&bitmap->refcount);
@@ -68,6 +93,10 @@ static ULONG STDMETHODCALLTYPE d2d_bitmap_Release(ID2D1Bitmap *iface)
if (!refcount)
{
+ if (bitmap->color_context)
+ ID2D1ColorContext_Release(bitmap->color_context);
+ if (bitmap->surface)
+ IDXGISurface_Release(bitmap->surface);
ID3D10ShaderResourceView_Release(bitmap->view);
ID2D1Factory_Release(bitmap->factory);
heap_free(bitmap);
@@ -76,7 +105,7 @@ static ULONG STDMETHODCALLTYPE d2d_bitmap_Release(ID2D1Bitmap *iface)
return refcount;
}
-static void STDMETHODCALLTYPE d2d_bitmap_GetFactory(ID2D1Bitmap *iface, ID2D1Factory **factory)
+static void STDMETHODCALLTYPE d2d_bitmap_GetFactory(ID2D1Bitmap1 *iface, ID2D1Factory **factory)
{
struct d2d_bitmap *bitmap = impl_from_ID2D1Bitmap(iface);
@@ -85,7 +114,7 @@ static void STDMETHODCALLTYPE d2d_bitmap_GetFactory(ID2D1Bitmap *iface, ID2D1Fac
ID2D1Factory_AddRef(*factory = bitmap->factory);
}
-static D2D1_SIZE_F * STDMETHODCALLTYPE d2d_bitmap_GetSize(ID2D1Bitmap *iface, D2D1_SIZE_F *size)
+static D2D1_SIZE_F * STDMETHODCALLTYPE d2d_bitmap_GetSize(ID2D1Bitmap1 *iface, D2D1_SIZE_F *size)
{
struct d2d_bitmap *bitmap = impl_from_ID2D1Bitmap(iface);
@@ -96,7 +125,7 @@ static D2D1_SIZE_F * STDMETHODCALLTYPE d2d_bitmap_GetSize(ID2D1Bitmap *iface, D2
return size;
}
-static D2D1_SIZE_U * STDMETHODCALLTYPE d2d_bitmap_GetPixelSize(ID2D1Bitmap *iface, D2D1_SIZE_U *pixel_size)
+static D2D1_SIZE_U * STDMETHODCALLTYPE d2d_bitmap_GetPixelSize(ID2D1Bitmap1 *iface, D2D1_SIZE_U *pixel_size)
{
struct d2d_bitmap *bitmap = impl_from_ID2D1Bitmap(iface);
@@ -106,7 +135,7 @@ static D2D1_SIZE_U * STDMETHODCALLTYPE d2d_bitmap_GetPixelSize(ID2D1Bitmap *ifac
return pixel_size;
}
-static D2D1_PIXEL_FORMAT * STDMETHODCALLTYPE d2d_bitmap_GetPixelFormat(ID2D1Bitmap *iface, D2D1_PIXEL_FORMAT *format)
+static D2D1_PIXEL_FORMAT * STDMETHODCALLTYPE d2d_bitmap_GetPixelFormat(ID2D1Bitmap1 *iface, D2D1_PIXEL_FORMAT *format)
{
struct d2d_bitmap *bitmap = impl_from_ID2D1Bitmap(iface);
@@ -116,7 +145,7 @@ static D2D1_PIXEL_FORMAT * STDMETHODCALLTYPE d2d_bitmap_GetPixelFormat(ID2D1Bitm
return format;
}
-static void STDMETHODCALLTYPE d2d_bitmap_GetDpi(ID2D1Bitmap *iface, float *dpi_x, float *dpi_y)
+static void STDMETHODCALLTYPE d2d_bitmap_GetDpi(ID2D1Bitmap1 *iface, float *dpi_x, float *dpi_y)
{
struct d2d_bitmap *bitmap = impl_from_ID2D1Bitmap(iface);
@@ -126,7 +155,7 @@ static void STDMETHODCALLTYPE d2d_bitmap_GetDpi(ID2D1Bitmap *iface, float *dpi_x
*dpi_y = bitmap->dpi_y;
}
-static HRESULT STDMETHODCALLTYPE d2d_bitmap_CopyFromBitmap(ID2D1Bitmap *iface,
+static HRESULT STDMETHODCALLTYPE d2d_bitmap_CopyFromBitmap(ID2D1Bitmap1 *iface,
const D2D1_POINT_2U *dst_point, ID2D1Bitmap *bitmap, const D2D1_RECT_U *src_rect)
{
FIXME("iface %p, dst_point %p, bitmap %p, src_rect %p stub!\n", iface, dst_point, bitmap, src_rect);
@@ -134,7 +163,7 @@ static HRESULT STDMETHODCALLTYPE d2d_bitmap_CopyFromBitmap(ID2D1Bitmap *iface,
return E_NOTIMPL;
}
-static HRESULT STDMETHODCALLTYPE d2d_bitmap_CopyFromRenderTarget(ID2D1Bitmap *iface,
+static HRESULT STDMETHODCALLTYPE d2d_bitmap_CopyFromRenderTarget(ID2D1Bitmap1 *iface,
const D2D1_POINT_2U *dst_point, ID2D1RenderTarget *render_target, const D2D1_RECT_U *src_rect)
{
FIXME("iface %p, dst_point %p, render_target %p, src_rect %p stub!\n", iface, dst_point, render_target, src_rect);
@@ -142,7 +171,7 @@ static HRESULT STDMETHODCALLTYPE d2d_bitmap_CopyFromRenderTarget(ID2D1Bitmap *if
return E_NOTIMPL;
}
-static HRESULT STDMETHODCALLTYPE d2d_bitmap_CopyFromMemory(ID2D1Bitmap *iface,
+static HRESULT STDMETHODCALLTYPE d2d_bitmap_CopyFromMemory(ID2D1Bitmap1 *iface,
const D2D1_RECT_U *dst_rect, const void *src_data, UINT32 pitch)
{
struct d2d_bitmap *bitmap = impl_from_ID2D1Bitmap(iface);
@@ -171,7 +200,61 @@ static HRESULT STDMETHODCALLTYPE d2d_bitmap_CopyFromMemory(ID2D1Bitmap *iface,
return S_OK;
}
-static const struct ID2D1BitmapVtbl d2d_bitmap_vtbl =
+static void WINAPI d2d_bitmap1_GetColorContext(
+ ID2D1Bitmap1 *iface,
+ ID2D1ColorContext **colorContext)
+{
+ struct d2d_bitmap *This = impl_from_ID2D1Bitmap(iface);
+ FIXME("%p stub!\n", This);
+}
+
+static D2D1_BITMAP_OPTIONS WINAPI d2d_bitmap1_GetOptions(
+ ID2D1Bitmap1 *iface)
+{
+ struct d2d_bitmap *This = impl_from_ID2D1Bitmap(iface);
+ FIXME("%p stub!\n", This);
+ return D2D1_BITMAP_OPTIONS_NONE;
+}
+
+static HRESULT WINAPI d2d_bitmap1_GetSurface(
+ ID2D1Bitmap1 *iface,
+ IDXGISurface **dxgiSurface)
+{
+ struct d2d_bitmap *This = impl_from_ID2D1Bitmap(iface);
+
+ TRACE("This %p, dxgiSurface %p.\n", This, dxgiSurface);
+ if (dxgiSurface == NULL)
+ return E_POINTER;
+
+ if (This->surface)
+ {
+ IDXGISurface_AddRef(This->surface);
+ }
+
+ *dxgiSurface = This->surface;
+
+ return S_OK;
+}
+
+static HRESULT WINAPI d2d_bitmap1_Map(
+ ID2D1Bitmap1 *iface,
+ D2D1_MAP_OPTIONS Options,
+ D2D1_MAPPED_RECT *mappedRect)
+{
+ struct d2d_bitmap *This = impl_from_ID2D1Bitmap(iface);
+ FIXME("%p stub!\n", This);
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI d2d_bitmap1_Unmap(
+ ID2D1Bitmap1 *iface)
+{
+ struct d2d_bitmap *This = impl_from_ID2D1Bitmap(iface);
+ FIXME("%p stub!\n", This);
+ return E_NOTIMPL;
+}
+
+static const struct ID2D1Bitmap1Vtbl d2d_bitmap_vtbl =
{
d2d_bitmap_QueryInterface,
d2d_bitmap_AddRef,
@@ -184,6 +267,11 @@ static const struct ID2D1BitmapVtbl d2d_bitmap_vtbl =
d2d_bitmap_CopyFromBitmap,
d2d_bitmap_CopyFromRenderTarget,
d2d_bitmap_CopyFromMemory,
+ d2d_bitmap1_GetColorContext,
+ d2d_bitmap1_GetOptions,
+ d2d_bitmap1_GetSurface,
+ d2d_bitmap1_Map,
+ d2d_bitmap1_Unmap,
};
static BOOL format_supported(const D2D1_PIXEL_FORMAT *format)
@@ -222,7 +310,8 @@ static BOOL format_supported(const D2D1_PIXEL_FORMAT *format)
}
static void d2d_bitmap_init(struct d2d_bitmap *bitmap, ID2D1Factory *factory,
- ID3D10ShaderResourceView *view, D2D1_SIZE_U size, const D2D1_BITMAP_PROPERTIES *desc)
+ ID3D10ShaderResourceView *view, D2D1_SIZE_U size, const D2D1_BITMAP_PROPERTIES1 *desc,
+ IDXGISurface *surface)
{
bitmap->ID2D1Bitmap_iface.lpVtbl = &d2d_bitmap_vtbl;
bitmap->refcount = 1;
@@ -232,6 +321,12 @@ static void d2d_bitmap_init(struct d2d_bitmap *bitmap, ID2D1Factory *factory,
bitmap->format = desc->pixelFormat;
bitmap->dpi_x = desc->dpiX;
bitmap->dpi_y = desc->dpiY;
+ bitmap->options = desc->bitmapOptions;
+ if (surface)
+ IDXGISurface_AddRef(bitmap->surface = surface);
+
+ if (desc->colorContext)
+ FIXME("Ignoring ID2D1ColorContext");
if (bitmap->dpi_x == 0.0f && bitmap->dpi_y == 0.0f)
{
@@ -243,16 +338,18 @@ static void d2d_bitmap_init(struct d2d_bitmap *bitmap, ID2D1Factory *factory,
HRESULT d2d_bitmap_create(ID2D1Factory *factory, ID3D10Device *device, D2D1_SIZE_U size, const void *src_data,
UINT32 pitch, const D2D1_BITMAP_PROPERTIES *desc, struct d2d_bitmap **bitmap)
{
+ D2D1_BITMAP_PROPERTIES1 d = bitmap_properties_to_properties1(desc);
D3D10_SUBRESOURCE_DATA resource_data;
D3D10_TEXTURE2D_DESC texture_desc;
ID3D10ShaderResourceView *view;
ID3D10Texture2D *texture;
+ IDXGISurface *surface;
HRESULT hr;
- if (!format_supported(&desc->pixelFormat))
+ if (!format_supported(&d.pixelFormat))
{
WARN("Tried to create bitmap with unsupported format {%#x / %#x}.\n",
- desc->pixelFormat.format, desc->pixelFormat.alphaMode);
+ d.pixelFormat.format, d.pixelFormat.alphaMode);
return D2DERR_UNSUPPORTED_PIXEL_FORMAT;
}
@@ -260,7 +357,7 @@ HRESULT d2d_bitmap_create(ID2D1Factory *factory, ID3D10Device *device, D2D1_SIZE
texture_desc.Height = size.height;
texture_desc.MipLevels = 1;
texture_desc.ArraySize = 1;
- texture_desc.Format = desc->pixelFormat.format;
+ texture_desc.Format = d.pixelFormat.format;
texture_desc.SampleDesc.Count = 1;
texture_desc.SampleDesc.Quality = 0;
texture_desc.Usage = D3D10_USAGE_DEFAULT;
@@ -278,29 +375,109 @@ HRESULT d2d_bitmap_create(ID2D1Factory *factory, ID3D10Device *device, D2D1_SIZE
return hr;
}
+ if (FAILED(hr = ID3D10Texture2D_QueryInterface(texture, &IID_IDXGISurface, (void **)&surface)))
+ {
+ surface = NULL;
+ WARN("Texture2D had no underlying DXGISurface");
+ }
+
hr = ID3D10Device_CreateShaderResourceView(device, (ID3D10Resource *)texture, NULL, &view);
ID3D10Texture2D_Release(texture);
if (FAILED(hr))
{
+ if (surface) IDXGISurface_Release(surface);
ERR("Failed to create view, hr %#x.\n", hr);
return hr;
}
if ((*bitmap = heap_alloc_zero(sizeof(**bitmap))))
{
- d2d_bitmap_init(*bitmap, factory, view, size, desc);
+ d2d_bitmap_init(*bitmap, factory, view, size, &d, surface);
TRACE("Created bitmap %p.\n", *bitmap);
}
ID3D10ShaderResourceView_Release(view);
+ if (surface) IDXGISurface_Release(surface);
return *bitmap ? S_OK : E_OUTOFMEMORY;
}
+HRESULT d2d_bitmap_create_shared_from_dxgi_surface(ID2D1Factory *factory,
+ IDXGISurface *surface, const D2D1_BITMAP_PROPERTIES1 *requested_properties,
+ ID3D10Device *target_device, struct d2d_bitmap **bitmap)
+{
+ ID3D10ShaderResourceView *view;
+ D2D1_BITMAP_PROPERTIES1 desc;
+ DXGI_SURFACE_DESC surface_desc;
+ ID3D10Resource *resource;
+ D2D1_SIZE_U pixel_size;
+ ID3D10Device *device;
+ HRESULT hr;
+
+ if (FAILED(hr = IDXGISurface_GetDesc(surface, &surface_desc)))
+ {
+ WARN("Failed to get surface desc, hr %#x.\n", hr);
+ return hr;
+ }
+
+ if (requested_properties == NULL)
+ {
+ desc.pixelFormat.format = surface_desc.Format;
+ desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_PREMULTIPLIED;
+ desc.dpiX = 96.0f;
+ desc.dpiY = 96.0f;
+ desc.bitmapOptions = D2D1_BITMAP_OPTIONS_NONE;
+ desc.colorContext = NULL;
+ }
+ else
+ {
+ desc = *requested_properties;
+ }
+
+ pixel_size.width = surface_desc.Width;
+ pixel_size.height = surface_desc.Height;
+
+ if (FAILED(IDXGISurface_QueryInterface(surface, &IID_ID3D10Resource,
+ (void **)&resource)))
+ {
+ WARN("Failed to get d3d10 resource from dxgi surface.\n");
+ return E_FAIL;
+ }
+
+ ID3D10Resource_GetDevice(resource, &device);
+ if (target_device && device != target_device)
+ {
+ ID3D10Device_Release(device);
+ ID3D10Resource_Release(resource);
+ return D2DERR_UNSUPPORTED_OPERATION;
+ }
+
+ hr = ID3D10Device_CreateShaderResourceView(device, resource, NULL, &view);
+ ID3D10Device_Release(device);
+ ID3D10Resource_Release(resource);
+ if (FAILED(hr))
+ {
+ WARN("Failed to create shader resource view, hr %#x.\n", hr);
+ return hr;
+ }
+
+ if (!(*bitmap = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(**bitmap))))
+ {
+ ID3D10ShaderResourceView_Release(view);
+ return E_OUTOFMEMORY;
+ }
+
+ d2d_bitmap_init(*bitmap, factory, view, pixel_size, &desc, surface);
+ ID3D10ShaderResourceView_Release(view);
+ TRACE("Created bitmap (%p) from surface (%p).\n", *bitmap, surface);
+
+ return S_OK;
+}
+
HRESULT d2d_bitmap_create_shared(ID2D1RenderTarget *render_target, ID3D10Device *target_device,
REFIID iid, void *data, const D2D1_BITMAP_PROPERTIES *desc, struct d2d_bitmap **bitmap)
{
- D2D1_BITMAP_PROPERTIES d;
+ D2D1_BITMAP_PROPERTIES1 d = bitmap_properties_to_properties1(desc);
ID2D1Factory *factory;
if (IsEqualGUID(iid, &IID_ID2D1Bitmap))
@@ -329,13 +506,12 @@ HRESULT d2d_bitmap_create_shared(ID2D1RenderTarget *render_target, ID3D10Device
d.pixelFormat = src_impl->format;
d.dpiX = src_impl->dpi_x;
d.dpiY = src_impl->dpi_y;
- desc = &d;
}
- if (!format_supported(&desc->pixelFormat))
+ if (!format_supported(&d.pixelFormat))
{
WARN("Tried to create bitmap with unsupported format {%#x / %#x}.\n",
- desc->pixelFormat.format, desc->pixelFormat.alphaMode);
+ d.pixelFormat.format, d.pixelFormat.alphaMode);
hr = D2DERR_UNSUPPORTED_PIXEL_FORMAT;
goto failed;
}
@@ -346,7 +522,7 @@ HRESULT d2d_bitmap_create_shared(ID2D1RenderTarget *render_target, ID3D10Device
goto failed;
}
- d2d_bitmap_init(*bitmap, factory, src_impl->view, src_impl->pixel_size, desc);
+ d2d_bitmap_init(*bitmap, factory, src_impl->view, src_impl->pixel_size, &d, src_impl->surface);
TRACE("Created bitmap %p.\n", *bitmap);
failed:
@@ -356,43 +532,9 @@ HRESULT d2d_bitmap_create_shared(ID2D1RenderTarget *render_target, ID3D10Device
if (IsEqualGUID(iid, &IID_IDXGISurface) || IsEqualGUID(iid, &IID_IDXGISurface1))
{
- ID3D10ShaderResourceView *view;
- DXGI_SURFACE_DESC surface_desc;
IDXGISurface *surface = data;
- ID3D10Resource *resource;
- D2D1_SIZE_U pixel_size;
- ID3D10Device *device;
HRESULT hr;
- if (FAILED(IDXGISurface_QueryInterface(surface, &IID_ID3D10Resource, (void **)&resource)))
- {
- WARN("Failed to get d3d resource from dxgi surface.\n");
- return E_FAIL;
- }
-
- ID3D10Resource_GetDevice(resource, &device);
- ID3D10Device_Release(device);
- if (device != target_device)
- {
- ID3D10Resource_Release(resource);
- return D2DERR_UNSUPPORTED_OPERATION;
- }
-
- hr = ID3D10Device_CreateShaderResourceView(target_device, resource, NULL, &view);
- ID3D10Resource_Release(resource);
- if (FAILED(hr))
- {
- WARN("Failed to create shader resource view, hr %#x.\n", hr);
- return hr;
- }
-
- if (!(*bitmap = heap_alloc_zero(sizeof(**bitmap))))
- {
- ID3D10ShaderResourceView_Release(view);
- return E_OUTOFMEMORY;
- }
-
- d = *desc;
if (d.dpiX == 0.0f || d.dpiY == 0.0f)
{
float dpi_x, dpi_y;
@@ -404,21 +546,16 @@ HRESULT d2d_bitmap_create_shared(ID2D1RenderTarget *render_target, ID3D10Device
d.dpiY = dpi_y;
}
- if (FAILED(hr = IDXGISurface_GetDesc(surface, &surface_desc)))
+ ID2D1RenderTarget_GetFactory(render_target, &factory);
+ if (FAILED(hr = d2d_bitmap_create_shared_from_dxgi_surface(factory, surface,
+ &d, target_device, bitmap)))
{
- WARN("Failed to get surface desc, hr %#x.\n", hr);
- ID3D10ShaderResourceView_Release(view);
+ WARN("Failed to create bitmap from surface, hr %#x.\n", hr);
+ ID2D1Factory_Release(factory);
return hr;
}
- pixel_size.width = surface_desc.Width;
- pixel_size.height = surface_desc.Height;
-
- ID2D1RenderTarget_GetFactory(render_target, &factory);
- d2d_bitmap_init(*bitmap, factory, view, pixel_size, &d);
- ID3D10ShaderResourceView_Release(view);
ID2D1Factory_Release(factory);
- TRACE("Created bitmap %p.\n", *bitmap);
return S_OK;
}
@@ -537,6 +674,6 @@ struct d2d_bitmap *unsafe_impl_from_ID2D1Bitmap(ID2D1Bitmap *iface)
{
if (!iface)
return NULL;
- assert(iface->lpVtbl == &d2d_bitmap_vtbl);
+ assert(((ID2D1Bitmap1 *)iface)->lpVtbl == &d2d_bitmap_vtbl);
return CONTAINING_RECORD(iface, struct d2d_bitmap, ID2D1Bitmap_iface);
}
diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c
index c46d940..b00629f 100644
--- a/dlls/d2d1/brush.c
+++ b/dlls/d2d1/brush.c
@@ -864,7 +864,7 @@ static ULONG STDMETHODCALLTYPE d2d_bitmap_brush_Release(ID2D1BitmapBrush *iface)
if (brush->u.bitmap.sampler_state)
ID3D10SamplerState_Release(brush->u.bitmap.sampler_state);
if (brush->u.bitmap.bitmap)
- ID2D1Bitmap_Release(&brush->u.bitmap.bitmap->ID2D1Bitmap_iface);
+ ID2D1Bitmap1_Release(&brush->u.bitmap.bitmap->ID2D1Bitmap_iface);
d2d_brush_destroy(brush);
}
@@ -971,7 +971,7 @@ static void STDMETHODCALLTYPE d2d_bitmap_brush_SetBitmap(ID2D1BitmapBrush *iface
if (bitmap)
ID2D1Bitmap_AddRef(bitmap);
if (brush->u.bitmap.bitmap)
- ID2D1Bitmap_Release(&brush->u.bitmap.bitmap->ID2D1Bitmap_iface);
+ ID2D1Bitmap1_Release(&brush->u.bitmap.bitmap->ID2D1Bitmap_iface);
brush->u.bitmap.bitmap = unsafe_impl_from_ID2D1Bitmap(bitmap);
}
@@ -1008,7 +1008,7 @@ static void STDMETHODCALLTYPE d2d_bitmap_brush_GetBitmap(ID2D1BitmapBrush *iface
TRACE("iface %p, bitmap %p.\n", iface, bitmap);
- if ((*bitmap = &brush->u.bitmap.bitmap->ID2D1Bitmap_iface))
+ if ((*bitmap = (ID2D1Bitmap *)&brush->u.bitmap.bitmap->ID2D1Bitmap_iface))
ID2D1Bitmap_AddRef(*bitmap);
}
@@ -1041,7 +1041,7 @@ HRESULT d2d_bitmap_brush_create(ID2D1Factory *factory, ID2D1Bitmap *bitmap, cons
d2d_brush_init(*brush, factory, D2D_BRUSH_TYPE_BITMAP,
brush_desc, (ID2D1BrushVtbl *)&d2d_bitmap_brush_vtbl);
if (((*brush)->u.bitmap.bitmap = unsafe_impl_from_ID2D1Bitmap(bitmap)))
- ID2D1Bitmap_AddRef(&(*brush)->u.bitmap.bitmap->ID2D1Bitmap_iface);
+ ID2D1Bitmap1_AddRef(&(*brush)->u.bitmap.bitmap->ID2D1Bitmap_iface);
if (bitmap_brush_desc)
{
(*brush)->u.bitmap.extend_mode_x = bitmap_brush_desc->extendModeX;
diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h
index 1958aa0..9db671e 100644
--- a/dlls/d2d1/d2d1_private.h
+++ b/dlls/d2d1/d2d1_private.h
@@ -330,7 +330,8 @@ HRESULT d2d_mesh_create(ID2D1Factory *factory, struct d2d_mesh **mesh) DECLSPEC_
struct d2d_bitmap
{
- ID2D1Bitmap ID2D1Bitmap_iface;
+ ID2D1Bitmap1 ID2D1Bitmap_iface;
+
LONG refcount;
ID2D1Factory *factory;
@@ -339,10 +340,15 @@ struct d2d_bitmap
D2D1_PIXEL_FORMAT format;
float dpi_x;
float dpi_y;
+ D2D1_BITMAP_OPTIONS options;
+ ID2D1ColorContext *color_context;
+ IDXGISurface *surface;
};
HRESULT d2d_bitmap_create(ID2D1Factory *factory, ID3D10Device *device, D2D1_SIZE_U size, const void *src_data,
UINT32 pitch, const D2D1_BITMAP_PROPERTIES *desc, struct d2d_bitmap **bitmap) DECLSPEC_HIDDEN;
+HRESULT d2d_bitmap_create_shared_from_dxgi_surface(ID2D1Factory *factory, IDXGISurface *surface,
+ const D2D1_BITMAP_PROPERTIES1 *desc, ID3D10Device *target_device, struct d2d_bitmap **bitmap) DECLSPEC_HIDDEN;
HRESULT d2d_bitmap_create_shared(ID2D1RenderTarget *render_target, ID3D10Device *device, REFIID iid, void *data,
const D2D1_BITMAP_PROPERTIES *desc, struct d2d_bitmap **bitmap) DECLSPEC_HIDDEN;
HRESULT d2d_bitmap_create_from_wic_bitmap(ID2D1Factory *factory, ID3D10Device *device, IWICBitmapSource *bitmap_source,
diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c
index 24fb3c9..5ba3d07 100644
--- a/dlls/d2d1/device.c
+++ b/dlls/d2d1/device.c
@@ -291,7 +291,7 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateBitmap(ID2D1RenderT
iface, size.width, size.height, src_data, pitch, desc, bitmap);
if (SUCCEEDED(hr = d2d_bitmap_create(render_target->factory, render_target->device, size, src_data, pitch, desc, &object)))
- *bitmap = &object->ID2D1Bitmap_iface;
+ *bitmap = (ID2D1Bitmap *)&object->ID2D1Bitmap_iface;
return hr;
}
@@ -308,7 +308,7 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateBitmapFromWicBitmap
if (SUCCEEDED(hr = d2d_bitmap_create_from_wic_bitmap(render_target->factory, render_target->device, bitmap_source,
desc, &object)))
- *bitmap = &object->ID2D1Bitmap_iface;
+ *bitmap = (ID2D1Bitmap *)&object->ID2D1Bitmap_iface;
return hr;
}
@@ -324,7 +324,7 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateSharedBitmap(ID2D1R
iface, debugstr_guid(iid), data, desc, bitmap);
if (SUCCEEDED(hr = d2d_bitmap_create_shared(iface, render_target->device, iid, data, desc, &object)))
- *bitmap = &object->ID2D1Bitmap_iface;
+ *bitmap = (ID2D1Bitmap *)&object->ID2D1Bitmap_iface;
return hr;
}
diff --git a/dlls/d2d1/device_context.c b/dlls/d2d1/device_context.c
index 75d163c..e5577b0 100644
--- a/dlls/d2d1/device_context.c
+++ b/dlls/d2d1/device_context.c
@@ -718,8 +718,28 @@ static HRESULT WINAPI d2d_device_context_CreateBitmapFromDxgiSurface(
ID2D1Bitmap1 **bitmap)
{
struct d2d_device_context *This = impl_from_ID2D1DeviceContext(iface);
- FIXME("%p stub!\n", This);
- return E_NOTIMPL;
+ struct d2d_bitmap *bitmap_impl;
+ HRESULT hr;
+ ID2D1Factory *factory;
+
+ TRACE("This %p, surface %p, bitmapProperties %p, bitmap %p.\n",
+ This, surface, bitmapProperties, bitmap);
+ if (surface == NULL || bitmap == NULL)
+ return E_POINTER;
+
+ ID2D1Device_GetFactory(This->device, &factory);
+ hr = d2d_bitmap_create_shared_from_dxgi_surface(factory, surface,
+ bitmapProperties, NULL, &bitmap_impl);
+ ID2D1Factory_Release(factory);
+ if (FAILED(hr))
+ {
+ WARN("Failed to create bitmap, hr %#x.\n", hr);
+ return hr;
+ }
+
+ *bitmap = &bitmap_impl->ID2D1Bitmap_iface;
+
+ return S_OK;
}
static HRESULT WINAPI d2d_device_context_CreateEffect(
--
2.7.4

8
patches/patchinstall.sh
View File

@ -52,7 +52,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "da5112c74313b5236183135204cab38a8b0169ed"
echo "bf4d0982fd88f9c8848b9e27bb1391d45d18b68e"
}
# Show version information
@ -2886,21 +2886,19 @@ fi
# | * [#44052] - Add ID2D1Bitmap1/ID2D1Factory1 support
# |
# | Modified files:
# | * dlls/d2d1/Makefile.in, dlls/d2d1/bitmap.c, dlls/d2d1/brush.c, dlls/d2d1/d2d1_private.h, dlls/d2d1/device.c,
# | dlls/d2d1/device_context.c, dlls/d2d1/factory.c, dlls/d2d1/geometry.c, include/d2d1_1.idl, include/dcommon.idl
# | * dlls/d2d1/Makefile.in, dlls/d2d1/d2d1_private.h, dlls/d2d1/device.c, dlls/d2d1/device_context.c, dlls/d2d1/factory.c,
# | dlls/d2d1/geometry.c, include/d2d1_1.idl, include/dcommon.idl
# |
if test "$enable_d2d1_ID2D1Factory1" -eq 1; then
patch_apply d2d1-ID2D1Factory1/0001-d2d1-Add-d2d1_1.idl-for-drawing-ID2D1Bitmap1.patch
patch_apply d2d1-ID2D1Factory1/0003-d2d1-Use-ID2D1Factory1-in-d2d_geometry.patch
patch_apply d2d1-ID2D1Factory1/0005-d2d1-Stub-ID2D1DeviceContext.patch
patch_apply d2d1-ID2D1Factory1/0006-d2d1-Implement-ID2D1DeviceContext.patch
patch_apply d2d1-ID2D1Factory1/0007-d2d1-Implement-ID2D1Bitmap1.patch
(
printf '%s\n' '+ { "Lucian Poston", "d2d1: Add d2d1_1.idl for drawing ID2D1Bitmap1.", 1 },';
printf '%s\n' '+ { "Lucian Poston", "d2d1: Use ID2D1Factory1 in d2d_geometry.", 1 },';
printf '%s\n' '+ { "Lucian Poston", "d2d1: Stub ID2D1DeviceContext.", 1 },';
printf '%s\n' '+ { "Lucian Poston", "d2d1: Implement ID2D1DeviceContext.", 1 },';
printf '%s\n' '+ { "Lucian Poston", "d2d1: Implement ID2D1Bitmap1.", 1 },';
) >> "$patchlist"
fi