Henri Verbeet : d3d10: Simply use d3d10_effect_type_destroy() in d3d10_effect_local_buffer_destroy().

[Alexandre Julliard]

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

Author: Henri Verbeet 
Date:   Thu May 26 19:36:53 2016 +0200

d3d10: Simply use d3d10_effect_type_destroy() in d3d10_effect_local_buffer_destroy().

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

---

dlls/d3d10/effect.c | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c
index a684ee5..1f5772e 100644
--- a/dlls/d3d10/effect.c
+++ b/dlls/d3d10/effect.c
@@ -2517,18 +2517,8 @@ static void d3d10_effect_local_buffer_destroy(struct d3d10_effect_variable *l)
         HeapFree(GetProcessHeap(), 0, l->members);
     }

-    if (l->type->members)
-    {
-        for (i = 0; i < l->type->member_count; ++i)
-        {
-            /* Do not release l->type->members[i].type, it will be covered by d3d10_effect_type_destroy(). */
-            HeapFree(GetProcessHeap(), 0, l->type->members[i].semantic);
-            HeapFree(GetProcessHeap(), 0, l->type->members[i].name);
-        }
-        HeapFree(GetProcessHeap(), 0, l->type->members);
-    }
-    HeapFree(GetProcessHeap(), 0, l->type->name);
-    HeapFree(GetProcessHeap(), 0, l->type);
+    if (l->type)
+        d3d10_effect_type_destroy(&l->type->entry, NULL);

if (l->annotations)
     {