Paul Gofman : d3dx9: Implement d3dx_effect_DeleteParameterBlock().

[Alexandre Julliard]

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

Author: Paul Gofman 
Date:   Mon Nov 18 16:59:46 2019 +0100

d3dx9: Implement d3dx_effect_DeleteParameterBlock().

Signed-off-by: Paul Gofman 
Signed-off-by: Matteo Bruni 
Signed-off-by: Alexandre Julliard

---

dlls/d3dx9_36/effect.c       | 32 +++++++++++++++++++++++++++++---
 dlls/d3dx9_36/tests/effect.c | 12 ++++++------
 2 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c
index 8317d7112c..5657f61157 100644
--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
@@ -509,6 +509,16 @@ static struct d3dx_parameter *get_valid_parameter(struct d3dx_effect *effect, D3
     return effect->flags & D3DXFX_LARGEADDRESSAWARE ? NULL : get_parameter_by_name(effect, NULL, parameter);
 }

+#if D3DX_SDK_VERSION >= 26
+static struct d3dx_parameter_block *get_valid_parameter_block(D3DXHANDLE handle)
+{
+    struct d3dx_parameter_block *block = (struct d3dx_parameter_block *)handle;
+
+    return block && !strncmp(block->magic_string, parameter_block_magic_string,
+            sizeof(parameter_block_magic_string)) ? block : NULL;
+}
+#endif
+
 static void free_state(struct d3dx_state *state)
 {
     free_parameter(&state->parameter, FALSE, FALSE);
@@ -4119,11 +4129,27 @@ static HRESULT WINAPI d3dx_effect_ApplyParameterBlock(ID3DXEffect *iface, D3DXHA
 #if D3DX_SDK_VERSION >= 26
 static HRESULT WINAPI d3dx_effect_DeleteParameterBlock(ID3DXEffect *iface, D3DXHANDLE parameter_block)
 {
-    struct d3dx_effect *This = impl_from_ID3DXEffect(iface);
+    struct d3dx_parameter_block *block = get_valid_parameter_block(parameter_block);
+    struct d3dx_effect *effect = impl_from_ID3DXEffect(iface);
+    struct d3dx_parameter_block *b;

-    FIXME("(%p)->(%p): stub\n", This, parameter_block);
+    TRACE("iface %p, parameter_block %p.\n", iface, parameter_block);

-    return E_NOTIMPL;
+    if (!block)
+        return D3DERR_INVALIDCALL;
+
+    LIST_FOR_EACH_ENTRY(b, &effect->parameter_block_list, struct d3dx_parameter_block, entry)
+    {
+        if (b == block)
+        {
+            list_remove(&b->entry);
+            free_parameter_block(b);
+            return D3D_OK;
+        }
+    }
+
+    WARN("Block is not found in issued block list, not freeing memory.\n");
+    return D3DERR_INVALIDCALL;
 }
 #endif

diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c
index 7b6c1f00d6..f1cbe49287 100644
--- a/dlls/d3dx9_36/tests/effect.c
+++ b/dlls/d3dx9_36/tests/effect.c
@@ -8081,7 +8081,7 @@ static void test_effect_parameter_block(void)
     hr = effect->lpVtbl->ApplyParameterBlock(effect, block);
     todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr);
     hr = effect->lpVtbl->DeleteParameterBlock(effect, block);
-    todo_wine ok(hr == D3D_OK, "Got result %#x.\n", hr);
+    ok(hr == D3D_OK, "Got result %#x.\n", hr);

hr = effect->lpVtbl->BeginParameterBlock(effect);
     ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
@@ -8095,9 +8095,9 @@ static void test_effect_parameter_block(void)
     todo_wine ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);

hr = effect->lpVtbl->DeleteParameterBlock(effect2, block);
-    todo_wine ok(hr == D3DERR_INVALIDCALL, "Got result %#x.\n", hr);
+    ok(hr == D3DERR_INVALIDCALL, "Got result %#x.\n", hr);
     hr = effect->lpVtbl->DeleteParameterBlock(effect, block);
-    todo_wine ok(hr == D3D_OK, "Got result %#x.\n", hr);
+    ok(hr == D3D_OK, "Got result %#x.\n", hr);

hr = effect->lpVtbl->ApplyParameterBlock(effect, NULL);
     todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr);
@@ -8167,7 +8167,7 @@ static void test_effect_parameter_block(void)
     ok(refcount == 2, "Got unexpected refcount %u.\n", refcount);

hr = effect->lpVtbl->DeleteParameterBlock(effect2, block);
-    todo_wine ok(hr == D3DERR_INVALIDCALL, "Got result %#x.\n", hr);
+    ok(hr == D3DERR_INVALIDCALL, "Got result %#x.\n", hr);

IDirect3DTexture9_AddRef(texture);
     refcount = IDirect3DTexture9_Release(texture);
@@ -8303,9 +8303,9 @@ static void test_effect_parameter_block(void)
             float_array[0], float_array[1], float_array[2], float_array[3]);

hr = effect->lpVtbl->DeleteParameterBlock(effect, block);
-    todo_wine ok(hr == D3D_OK, "Got result %#x.\n", hr);
+    ok(hr == D3D_OK, "Got result %#x.\n", hr);
     hr = effect->lpVtbl->DeleteParameterBlock(effect, block2);
-    todo_wine ok(hr == D3D_OK, "Got result %#x.\n", hr);
+    ok(hr == D3D_OK, "Got result %#x.\n", hr);

hr = effect->lpVtbl->SetTexture(effect, "tex1", NULL);
     ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);