Rémi Bernon : d2d1: Use D3D11 interfaces in CopyFromMemory.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 6211eda12c2d1d6a12c23f56e17a5d0040ac7f64
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=6211eda12c2d1d6a12c23f56e...

Author: Rémi Bernon 
Date:   Mon Jun 21 09:57:45 2021 +0200

d2d1: Use D3D11 interfaces in CopyFromMemory.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49395
Signed-off-by: Rémi Bernon 
Signed-off-by: Henri Verbeet 
Signed-off-by: Alexandre Julliard

---

dlls/d2d1/bitmap.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c
index d91b9740f2c..4ace617ece1 100644
--- a/dlls/d2d1/bitmap.c
+++ b/dlls/d2d1/bitmap.c
@@ -152,8 +152,9 @@ 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_ID2D1Bitmap1(iface);
-    ID3D10Device *device;
-    D3D10_BOX box;
+    ID3D11DeviceContext *context;
+    ID3D11Device *device;
+    D3D11_BOX box;

TRACE("iface %p, dst_rect %p, src_data %p, pitch %u.\n", iface, dst_rect, src_data, pitch);

@@ -167,9 +168,11 @@ static HRESULT STDMETHODCALLTYPE d2d_bitmap_CopyFromMemory(ID2D1Bitmap1 *iface,
         box.back = 1;
     }

-    ID3D10Resource_GetDevice(bitmap->resource, &device);
-    ID3D10Device_UpdateSubresource(device, bitmap->resource, 0, dst_rect ? &box : NULL, src_data, pitch, 0);
-    ID3D10Device_Release(device);
+    ID3D11Resource_GetDevice(bitmap->d3d11_resource, &device);
+    ID3D11Device_GetImmediateContext(device, &context);
+    ID3D11DeviceContext_UpdateSubresource(context, bitmap->d3d11_resource, 0, dst_rect ? &box : NULL, src_data, pitch, 0);
+    ID3D11DeviceContext_Release(context);
+    ID3D11Device_Release(device);

return S_OK;
 }