Jacek Caban : jscript: Code clean up.

[Alexandre Julliard]

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

Author: Jacek Caban 
Date:   Tue Sep  1 13:26:08 2009 +0200

jscript: Code clean up.

---

dlls/jscript/array.c   |    2 +-
 dlls/jscript/dispex.c  |    8 ++++----
 dlls/jscript/engine.c  |    4 ++--
 dlls/jscript/error.c   |    6 +++---
 dlls/jscript/jscript.c |    4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c
index 6b7a58f..04f3dde 100644
--- a/dlls/jscript/array.c
+++ b/dlls/jscript/array.c
@@ -924,7 +924,7 @@ HRESULT create_array_constr(script_ctx_t *ctx, DispatchEx *object_prototype, Dis

hres = create_builtin_function(ctx, ArrayConstr_value, NULL, PROPF_CONSTR, &array->dispex, ret);

-    IDispatchEx_Release(_IDispatchEx_(&array->dispex));
+    jsdisp_release(&array->dispex);
     return hres;
 }

diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c
index 12fcb3a..5e90e22 100644
--- a/dlls/jscript/dispex.c
+++ b/dlls/jscript/dispex.c
@@ -788,7 +788,7 @@ HRESULT init_dispex_from_constr(DispatchEx *dispex, script_ctx_t *ctx, const bui
     hres = init_dispex(dispex, ctx, builtin_info, prot);

if(prot)
-        IDispatchEx_Release(_IDispatchEx_(prot));
+        jsdisp_release(prot);
     return hres;
 }

@@ -871,7 +871,7 @@ HRESULT disp_call(IDispatch *disp, DISPID id, LCID lcid, WORD flags, DISPPARAMS
     jsdisp = iface_to_jsdisp((IUnknown*)disp);
     if(jsdisp) {
         hres = jsdisp_call(jsdisp, id, lcid, flags, dp, retv, ei, caller);
-        IDispatchEx_Release(_IDispatchEx_(jsdisp));
+        jsdisp_release(jsdisp);
         return hres;
     }

@@ -940,7 +940,7 @@ HRESULT disp_propput(IDispatch *disp, DISPID id, LCID lcid, VARIANT *val, jsexce
         else
             hres = DISP_E_MEMBERNOTFOUND;

-        IDispatchEx_Release(_IDispatchEx_(jsdisp));
+        jsdisp_release(jsdisp);
         return hres;
     }

@@ -1010,7 +1010,7 @@ HRESULT disp_propget(IDispatch *disp, DISPID id, LCID lcid, VARIANT *val, jsexce
     jsdisp = iface_to_jsdisp((IUnknown*)disp);
     if(jsdisp) {
         hres = jsdisp_propget(jsdisp, id, lcid, val, ei, caller);
-        IDispatchEx_Release(_IDispatchEx_(jsdisp));
+        jsdisp_release(jsdisp);
         return hres;
     }

diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c
index 43b422c..cbd2797 100644
--- a/dlls/jscript/engine.c
+++ b/dlls/jscript/engine.c
@@ -174,7 +174,7 @@ void scope_release(scope_chain_t *scope)
     if(scope->next)
         scope_release(scope->next);

-    IDispatchEx_Release(_IDispatchEx_(scope->obj));
+    jsdisp_release(scope->obj);
     heap_free(scope);
 }

@@ -211,7 +211,7 @@ void exec_release(exec_ctx_t *ctx)
     if(ctx->scope_chain)
         scope_release(ctx->scope_chain);
     if(ctx->var_disp)
-        IDispatchEx_Release(_IDispatchEx_(ctx->var_disp));
+        jsdisp_release(ctx->var_disp);
     if(ctx->this_obj)
         IDispatch_Release(ctx->this_obj);
     heap_free(ctx);
diff --git a/dlls/jscript/error.c b/dlls/jscript/error.c
index 70fd008..f3da405 100644
--- a/dlls/jscript/error.c
+++ b/dlls/jscript/error.c
@@ -268,7 +268,7 @@ static HRESULT error_constr(DispatchEx *dispex, WORD flags, DISPPARAMS *dp,
             V_DISPATCH(retv) = (IDispatch*)_IDispatchEx_(err);
         }
         else
-            IDispatchEx_Release(_IDispatchEx_(err));
+            jsdisp_release(err);

return S_OK;

@@ -367,7 +367,7 @@ HRESULT init_error_constr(script_ctx_t *ctx, DispatchEx *object_prototype)
         V_VT(&v) = VT_BSTR;
         V_BSTR(&v) = SysAllocString(names[i]);
         if(!V_BSTR(&v)) {
-            IDispatchEx_Release(_IDispatchEx_(&err->dispex));
+            jsdisp_release(&err->dispex);
             return E_OUTOFMEMORY;
         }

@@ -377,7 +377,7 @@ HRESULT init_error_constr(script_ctx_t *ctx, DispatchEx *object_prototype)
             hres = create_builtin_function(ctx, constr_val[i], NULL,
                     PROPF_CONSTR, &err->dispex, constr_addr[i]);

-        IDispatchEx_Release(_IDispatchEx_(&err->dispex));
+        jsdisp_release(&err->dispex);
         VariantClear(&v);
         if(FAILED(hres))
             return hres;
diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c
index b536014..0771e9b 100644
--- a/dlls/jscript/jscript.c
+++ b/dlls/jscript/jscript.c
@@ -361,12 +361,12 @@ static HRESULT WINAPI JScript_Close(IActiveScript *iface)
             change_state(This, SCRIPTSTATE_CLOSED);

if(This->ctx->script_disp) {
-            IDispatchEx_Release(_IDispatchEx_(This->ctx->script_disp));
+            jsdisp_release(This->ctx->script_disp);
             This->ctx->script_disp = NULL;
         }

if(This->ctx->global) {
-            IDispatchEx_Release(_IDispatchEx_(This->ctx->global));
+            jsdisp_release(This->ctx->global);
             This->ctx->global = NULL;
         }
     }