Nikolay Sivov : d2d1: Don' t use render target pointer directly in bitmap initialization helpers.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 9cc6a6e5d6bc2b6fa3aee456e34a1e584679b80f
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=9cc6a6e5d6bc2b6fa3aee456e3...

Author: Nikolay Sivov 
Date:   Tue Mar 29 02:21:43 2016 +0300

d2d1: Don't use render target pointer directly in bitmap initialization helpers.

Signed-off-by: Nikolay Sivov 
Signed-off-by: Henri Verbeet 
Signed-off-by: Alexandre Julliard

---

dlls/d2d1/bitmap.c        | 16 ++++++++--------
 dlls/d2d1/d2d1_private.h  |  4 ++--
 dlls/d2d1/render_target.c |  4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c
index 8d22eac..8f430e2 100644
--- a/dlls/d2d1/bitmap.c
+++ b/dlls/d2d1/bitmap.c
@@ -238,7 +238,7 @@ static void d2d_bitmap_init(struct d2d_bitmap *bitmap, ID2D1Factory *factory,
     }
 }

-HRESULT d2d_bitmap_init_memory(struct d2d_bitmap *bitmap, struct d2d_d3d_render_target *render_target,
+HRESULT d2d_bitmap_init_memory(struct d2d_bitmap *bitmap, ID2D1Factory *factory, ID3D10Device *device,
         D2D1_SIZE_U size, const void *src_data, UINT32 pitch, const D2D1_BITMAP_PROPERTIES *desc)
 {
     D3D10_SUBRESOURCE_DATA resource_data;
@@ -269,14 +269,14 @@ HRESULT d2d_bitmap_init_memory(struct d2d_bitmap *bitmap, struct d2d_d3d_render_
     resource_data.pSysMem = src_data;
     resource_data.SysMemPitch = pitch;

-    if (FAILED(hr = ID3D10Device_CreateTexture2D(render_target->device, &texture_desc,
+    if (FAILED(hr = ID3D10Device_CreateTexture2D(device, &texture_desc,
             src_data ? &resource_data : NULL, &texture)))
     {
         ERR("Failed to create texture, hr %#x.\n", hr);
         return hr;
     }

-    hr = ID3D10Device_CreateShaderResourceView(render_target->device, (ID3D10Resource *)texture, NULL, &view);
+    hr = ID3D10Device_CreateShaderResourceView(device, (ID3D10Resource *)texture, NULL, &view);
     ID3D10Texture2D_Release(texture);
     if (FAILED(hr))
     {
@@ -284,13 +284,13 @@ HRESULT d2d_bitmap_init_memory(struct d2d_bitmap *bitmap, struct d2d_d3d_render_
         return hr;
     }

-    d2d_bitmap_init(bitmap, render_target->factory, view, size, desc);
+    d2d_bitmap_init(bitmap, factory, view, size, desc);
     ID3D10ShaderResourceView_Release(view);

return S_OK;
 }

-HRESULT d2d_bitmap_init_shared(struct d2d_bitmap *bitmap, struct d2d_d3d_render_target *render_target,
+HRESULT d2d_bitmap_init_shared(struct d2d_bitmap *bitmap, ID2D1Factory *factory, ID3D10Device *target_device,
         REFIID iid, void *data, const D2D1_BITMAP_PROPERTIES *desc)
 {
     if (IsEqualGUID(iid, &IID_ID2D1Bitmap))
@@ -299,12 +299,12 @@ HRESULT d2d_bitmap_init_shared(struct d2d_bitmap *bitmap, struct d2d_d3d_render_
         D2D1_BITMAP_PROPERTIES d;
         ID3D10Device *device;

-        if (src_impl->factory != render_target->factory)
+        if (src_impl->factory != factory)
             return D2DERR_WRONG_FACTORY;

ID3D10ShaderResourceView_GetDevice(src_impl->view, &device);
         ID3D10Device_Release(device);
-        if (device != render_target->device)
+        if (device != target_device)
             return D2DERR_UNSUPPORTED_OPERATION;

if (!desc)
@@ -322,7 +322,7 @@ HRESULT d2d_bitmap_init_shared(struct d2d_bitmap *bitmap, struct d2d_d3d_render_
             return D2DERR_UNSUPPORTED_PIXEL_FORMAT;
         }

-        d2d_bitmap_init(bitmap, render_target->factory, src_impl->view, src_impl->pixel_size, desc);
+        d2d_bitmap_init(bitmap, factory, src_impl->view, src_impl->pixel_size, desc);

return S_OK;
     }
diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h
index 7834e0a..e55c220 100644
--- a/dlls/d2d1/d2d1_private.h
+++ b/dlls/d2d1/d2d1_private.h
@@ -204,9 +204,9 @@ struct d2d_bitmap
     float dpi_y;
 };

-HRESULT d2d_bitmap_init_memory(struct d2d_bitmap *bitmap, struct d2d_d3d_render_target *render_target,
+HRESULT d2d_bitmap_init_memory(struct d2d_bitmap *bitmap, ID2D1Factory *factory, ID3D10Device *device,
         D2D1_SIZE_U size, const void *src_data, UINT32 pitch, const D2D1_BITMAP_PROPERTIES *desc) DECLSPEC_HIDDEN;
-HRESULT d2d_bitmap_init_shared(struct d2d_bitmap *bitmap, struct d2d_d3d_render_target *render_target,
+HRESULT d2d_bitmap_init_shared(struct d2d_bitmap *bitmap, ID2D1Factory *factory, ID3D10Device *device,
         REFIID iid, void *data, const D2D1_BITMAP_PROPERTIES *desc) DECLSPEC_HIDDEN;
 struct d2d_bitmap *unsafe_impl_from_ID2D1Bitmap(ID2D1Bitmap *iface) DECLSPEC_HIDDEN;

diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c
index 8353c09..90e064f 100644
--- a/dlls/d2d1/render_target.c
+++ b/dlls/d2d1/render_target.c
@@ -312,7 +312,7 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateBitmap(ID2D1RenderT
     if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object))))
         return E_OUTOFMEMORY;

-    if (FAILED(hr = d2d_bitmap_init_memory(object, render_target, size, src_data, pitch, desc)))
+    if (FAILED(hr = d2d_bitmap_init_memory(object, render_target->factory, render_target->device, size, src_data, pitch, desc)))
     {
         WARN("Failed to initialize bitmap, hr %#x.\n", hr);
         HeapFree(GetProcessHeap(), 0, object);
@@ -444,7 +444,7 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateSharedBitmap(ID2D1R
     if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object))))
         return E_OUTOFMEMORY;

-    if (FAILED(hr = d2d_bitmap_init_shared(object, render_target, iid, data, desc)))
+    if (FAILED(hr = d2d_bitmap_init_shared(object, render_target->factory, render_target->device, iid, data, desc)))
     {
         WARN("Failed to initialize bitmap, hr %#x.\n", hr);
         HeapFree(GetProcessHeap(), 0, object);