[PATCH 6/6] jscript: Always free jsdisp_t in jsdisp_free.

[Jacek Caban]

From: Jacek Caban

Instead of class-specific destructors.
---
 dlls/jscript/arraybuf.c   | 1 -
 dlls/jscript/dispex.c     | 3 +--
 dlls/jscript/engine.c     | 1 -
 dlls/jscript/enumerator.c | 1 -
 dlls/jscript/function.c   | 3 ---
 dlls/jscript/jsregexp.c   | 1 -
 dlls/jscript/set.c        | 4 ----
 dlls/jscript/string.c     | 1 -
 dlls/jscript/vbarray.c    | 1 -
 9 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/dlls/jscript/arraybuf.c b/dlls/jscript/arraybuf.c
index f12720d42b0..fc01773338f 100644
--- a/dlls/jscript/arraybuf.c
+++ b/dlls/jscript/arraybuf.c
@@ -592,7 +592,6 @@ static void DataView_destructor(jsdisp_t *dispex)
     DataViewInstance *view = dataview_from_jsdisp(dispex);
     if(view->buffer)
         jsdisp_release(&view->buffer->dispex);
-    free(view);
 }

static HRESULT DataView_gc_traverse(struct gc_ctx *gc_ctx, enum gc_traverse_op op, jsdisp_t *dispex)
diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c
index cc4ff85b508..a678421f0a3 100644
--- a/dlls/jscript/dispex.c
+++ b/dlls/jscript/dispex.c
@@ -2263,8 +2263,7 @@ void jsdisp_free(jsdisp_t *obj)

if(obj->builtin_info->destructor)
         obj->builtin_info->destructor(obj);
-    else
-        free(obj);
+    free(obj);
 }

#ifdef TRACE_REFCNT
diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c
index 5bc9f4de20e..60b479fb83b 100644
--- a/dlls/jscript/engine.c
+++ b/dlls/jscript/engine.c
@@ -476,7 +476,6 @@ static void scope_destructor(jsdisp_t *dispex)

if(scope->obj)
         IDispatch_Release(scope->obj);
-    free(scope);
 }

static unsigned scope_idx_length(jsdisp_t *dispex)
diff --git a/dlls/jscript/enumerator.c b/dlls/jscript/enumerator.c
index ed671f5cbbe..203bfa8b8e0 100644
--- a/dlls/jscript/enumerator.c
+++ b/dlls/jscript/enumerator.c
@@ -87,7 +87,6 @@ static void Enumerator_destructor(jsdisp_t *dispex)
     if(This->enumvar)
         IEnumVARIANT_Release(This->enumvar);
     jsval_release(This->item);
-    free(dispex);
 }

static HRESULT Enumerator_gc_traverse(struct gc_ctx *gc_ctx, enum gc_traverse_op op, jsdisp_t *dispex)
diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c
index 75f313b0975..9c339b807f7 100644
--- a/dlls/jscript/function.c
+++ b/dlls/jscript/function.c
@@ -115,8 +115,6 @@ static void Arguments_destructor(jsdisp_t *jsdisp)

if(arguments->scope)
         scope_release(arguments->scope);
-
-    free(arguments);
 }

static unsigned Arguments_idx_length(jsdisp_t *jsdisp)
@@ -580,7 +578,6 @@ static void Function_destructor(jsdisp_t *dispex)
 {
     FunctionInstance *function = function_from_jsdisp(dispex);
     function->vtbl->destructor(function);
-    free(function);
 }

static HRESULT Function_gc_traverse(struct gc_ctx *gc_ctx, enum gc_traverse_op op, jsdisp_t *dispex)
diff --git a/dlls/jscript/jsregexp.c b/dlls/jscript/jsregexp.c
index d184f2f2685..e3a707b1f6b 100644
--- a/dlls/jscript/jsregexp.c
+++ b/dlls/jscript/jsregexp.c
@@ -550,7 +550,6 @@ static void RegExp_destructor(jsdisp_t *dispex)
         regexp_destroy(This->jsregexp);
     jsval_release(This->last_index_val);
     jsstr_release(This->str);
-    free(This);
 }

static HRESULT RegExp_gc_traverse(struct gc_ctx *gc_ctx, enum gc_traverse_op op, jsdisp_t *dispex)
diff --git a/dlls/jscript/set.c b/dlls/jscript/set.c
index f2fe562e519..5a568607a43 100644
--- a/dlls/jscript/set.c
+++ b/dlls/jscript/set.c
@@ -359,8 +359,6 @@ static void Map_destructor(jsdisp_t *dispex)
         assert(!entry->deleted);
         release_map_entry(entry);
     }
-
-    free(map);
 }

static HRESULT Map_gc_traverse(struct gc_ctx *gc_ctx, enum gc_traverse_op op, jsdisp_t *dispex)
@@ -806,8 +804,6 @@ static void WeakMap_destructor(jsdisp_t *dispex)

while(weakmap->map.root)
         remove_weakmap_entry(RB_ENTRY_VALUE(weakmap->map.root, struct weakmap_entry, entry));
-
-    free(weakmap);
 }

static HRESULT WeakMap_gc_traverse(struct gc_ctx *gc_ctx, enum gc_traverse_op op, jsdisp_t *dispex)
diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c
index 38a80eecb2a..ab7497912f2 100644
--- a/dlls/jscript/string.c
+++ b/dlls/jscript/string.c
@@ -1499,7 +1499,6 @@ static void String_destructor(jsdisp_t *dispex)
     StringInstance *This = string_from_jsdisp(dispex);

jsstr_release(This->str);
-    free(This);
 }

static unsigned String_idx_length(jsdisp_t *jsdisp)
diff --git a/dlls/jscript/vbarray.c b/dlls/jscript/vbarray.c
index c46b331e787..55500c86769 100644
--- a/dlls/jscript/vbarray.c
+++ b/dlls/jscript/vbarray.c
@@ -235,7 +235,6 @@ static void VBArray_destructor(jsdisp_t *dispex)
     VBArrayInstance *vbarray = vbarray_from_jsdisp(dispex);

SafeArrayDestroy(vbarray->safearray);
-    free(vbarray);
 }

static const builtin_prop_t VBArray_props[] = {