Henri Verbeet : d3d10core: Implement d3d10_blend_state_GetDevice().

[Alexandre Julliard]

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

Author: Henri Verbeet 
Date:   Mon Feb 17 11:24:30 2014 +0100

d3d10core: Implement d3d10_blend_state_GetDevice().

---

dlls/d3d10core/d3d10core_private.h |    2 +-
 dlls/d3d10core/state.c             |   15 ++++++++++++---
 dlls/d3d10core/tests/device.c      |   14 ++++++++++++--
 3 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h
index 4f5abad..3cf3293 100644
--- a/dlls/d3d10core/d3d10core_private.h
+++ b/dlls/d3d10core/d3d10core_private.h
@@ -226,9 +226,9 @@ struct d3d10_blend_state
     ID3D10BlendState ID3D10BlendState_iface;
     LONG refcount;

-    struct d3d10_device *device;
     D3D10_BLEND_DESC desc;
     struct wine_rb_entry entry;
+    ID3D10Device1 *device;
 };

HRESULT d3d10_blend_state_init(struct d3d10_blend_state *state, struct d3d10_device *device,
diff --git a/dlls/d3d10core/state.c b/dlls/d3d10core/state.c
index 3e4e8ef..376bf0b 100644
--- a/dlls/d3d10core/state.c
+++ b/dlls/d3d10core/state.c
@@ -70,7 +70,9 @@ static ULONG STDMETHODCALLTYPE d3d10_blend_state_Release(ID3D10BlendState *iface

if (!refcount)
     {
-        wine_rb_remove(&state->device->blend_states, &state->desc);
+        struct d3d10_device *device = impl_from_ID3D10Device(state->device);
+        wine_rb_remove(&device->blend_states, &state->desc);
+        ID3D10Device1_Release(state->device);
         HeapFree(GetProcessHeap(), 0, state);
     }

@@ -81,7 +83,12 @@ static ULONG STDMETHODCALLTYPE d3d10_blend_state_Release(ID3D10BlendState *iface

static void STDMETHODCALLTYPE d3d10_blend_state_GetDevice(ID3D10BlendState *iface, ID3D10Device **device)
 {
-    FIXME("iface %p, device %p stub!\n", iface, device);
+    struct d3d10_blend_state *state = impl_from_ID3D10BlendState(iface);
+
+    TRACE("iface %p, device %p.\n", iface, device);
+
+    *device = (ID3D10Device *)state->device;
+    ID3D10Device_AddRef(*device);
 }

static HRESULT STDMETHODCALLTYPE d3d10_blend_state_GetPrivateData(ID3D10BlendState *iface,
@@ -142,7 +149,6 @@ HRESULT d3d10_blend_state_init(struct d3d10_blend_state *state, struct d3d10_dev
 {
     state->ID3D10BlendState_iface.lpVtbl = &d3d10_blend_state_vtbl;
     state->refcount = 1;
-    state->device = device;
     state->desc = *desc;

if (wine_rb_put(&device->blend_states, desc, &state->entry) == -1)
@@ -151,6 +157,9 @@ HRESULT d3d10_blend_state_init(struct d3d10_blend_state *state, struct d3d10_dev
         return E_FAIL;
     }

+    state->device = &device->ID3D10Device1_iface;
+    ID3D10Device1_AddRef(state->device);
+
     return S_OK;
 }

diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c
index d0ad0c4..d23c24d 100644
--- a/dlls/d3d10core/tests/device.c
+++ b/dlls/d3d10core/tests/device.c
@@ -661,9 +661,9 @@ static void test_create_sampler_state(void)
 static void test_create_blend_state(void)
 {
     ID3D10BlendState *blend_state1, *blend_state2;
+    ULONG refcount, expected_refcount;
     D3D10_BLEND_DESC blend_desc;
-    ID3D10Device *device;
-    ULONG refcount;
+    ID3D10Device *device, *tmp;
     HRESULT hr;

if (!(device = create_device()))
@@ -699,11 +699,21 @@ static void test_create_blend_state(void)
     blend_desc.RenderTargetWriteMask[6] = D3D10_COLOR_WRITE_ENABLE_ALL;
     blend_desc.RenderTargetWriteMask[7] = D3D10_COLOR_WRITE_ENABLE_ALL;

+    expected_refcount = get_refcount((IUnknown *)device) + 1;
     hr = ID3D10Device_CreateBlendState(device, &blend_desc, &blend_state1);
     ok(SUCCEEDED(hr), "Failed to create blend state, hr %#x.\n", hr);
     hr = ID3D10Device_CreateBlendState(device, &blend_desc, &blend_state2);
     ok(SUCCEEDED(hr), "Failed to create blend state, hr %#x.\n", hr);
     ok(blend_state1 == blend_state2, "Got different blend state objects.\n");
+    refcount = get_refcount((IUnknown *)device);
+    ok(refcount >= expected_refcount, "Got unexpected refcount %u, expected >= %u.\n", refcount, expected_refcount);
+    tmp = NULL;
+    expected_refcount = refcount + 1;
+    ID3D10BlendState_GetDevice(blend_state1, &tmp);
+    ok(tmp == device, "Got unexpected device %p, expected %p.\n", tmp, device);
+    refcount = get_refcount((IUnknown *)device);
+    ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount);
+    ID3D10Device_Release(tmp);

refcount = ID3D10BlendState_Release(blend_state2);
     ok(refcount == 1, "Got unexpected refcount %u.\n", refcount);