Jacek Caban : jscript: Removed no longer needed disp_propput caller argument.

Alexandre Julliard julliard at winehq.org
Fri Mar 9 12:34:19 CST 2012


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

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Thu Mar  8 14:29:01 2012 +0100

jscript: Removed no longer needed disp_propput caller argument.

---

 dlls/jscript/dispex.c  |    4 ++--
 dlls/jscript/engine.c  |    8 ++++----
 dlls/jscript/jscript.h |    2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c
index e8cc6e9..5ce98e7 100644
--- a/dlls/jscript/dispex.c
+++ b/dlls/jscript/dispex.c
@@ -1095,7 +1095,7 @@ HRESULT jsdisp_propput_idx(jsdisp_t *obj, DWORD idx, VARIANT *val, jsexcept_t *e
     return jsdisp_propput_name(obj, buf, val, ei, caller);
 }
 
-HRESULT disp_propput(script_ctx_t *ctx, IDispatch *disp, DISPID id, VARIANT *val, jsexcept_t *ei, IServiceProvider *caller)
+HRESULT disp_propput(script_ctx_t *ctx, IDispatch *disp, DISPID id, VARIANT *val, jsexcept_t *ei)
 {
     jsdisp_t *jsdisp;
     HRESULT hres;
@@ -1106,7 +1106,7 @@ HRESULT disp_propput(script_ctx_t *ctx, IDispatch *disp, DISPID id, VARIANT *val
 
         prop = get_prop(jsdisp, id);
         if(prop)
-            hres = prop_put(jsdisp, prop, val, ei, caller);
+            hres = prop_put(jsdisp, prop, val, ei, NULL);
         else
             hres = DISP_E_MEMBERNOTFOUND;
 
diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c
index 95b2348..fdea876 100644
--- a/dlls/jscript/engine.c
+++ b/dlls/jscript/engine.c
@@ -617,7 +617,7 @@ static HRESULT interp_forin(exec_ctx_t *ctx)
 
         V_VT(&v) = VT_BSTR;
         V_BSTR(&v) = name;
-        hres = disp_propput(ctx->parser->script, var_obj, var_id, &v, ctx->ei, NULL/*FIXME*/);
+        hres = disp_propput(ctx->parser->script, var_obj, var_id, &v, ctx->ei);
         SysFreeString(name);
         if(FAILED(hres))
             return hres;
@@ -1903,7 +1903,7 @@ static HRESULT interp_postinc(exec_ctx_t *ctx)
         hres = to_number(ctx->parser->script, &v, ctx->ei, &n);
         if(SUCCEEDED(hres)) {
             num_set_val(&inc, num_val(&n)+(double)arg);
-            hres = disp_propput(ctx->parser->script, obj, id, &inc, ctx->ei, NULL/*FIXME*/);
+            hres = disp_propput(ctx->parser->script, obj, id, &inc, ctx->ei);
         }
         if(FAILED(hres))
             VariantClear(&v);
@@ -1938,7 +1938,7 @@ static HRESULT interp_preinc(exec_ctx_t *ctx)
         VariantClear(&v);
         if(SUCCEEDED(hres)) {
             num_set_val(&v, num_val(&n)+(double)arg);
-            hres = disp_propput(ctx->parser->script, obj, id, &v, ctx->ei, NULL/*FIXME*/);
+            hres = disp_propput(ctx->parser->script, obj, id, &v, ctx->ei);
         }
     }
     IDispatch_Release(obj);
@@ -2364,7 +2364,7 @@ static HRESULT interp_assign(exec_ctx_t *ctx)
     if(!disp)
         return throw_reference_error(ctx->parser->script, ctx->ei, JS_E_ILLEGAL_ASSIGN, NULL);
 
-    hres = disp_propput(ctx->parser->script, disp, id, v, ctx->ei, NULL/*FIXME*/);
+    hres = disp_propput(ctx->parser->script, disp, id, v, ctx->ei);
     IDispatch_Release(disp);
     if(FAILED(hres)) {
         VariantClear(v);
diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h
index 42537cc..2e2d57b 100644
--- a/dlls/jscript/jscript.h
+++ b/dlls/jscript/jscript.h
@@ -211,7 +211,7 @@ HRESULT jsdisp_call_value(jsdisp_t*,WORD,DISPPARAMS*,VARIANT*,jsexcept_t*,IServi
 HRESULT jsdisp_call(jsdisp_t*,DISPID,WORD,DISPPARAMS*,VARIANT*,jsexcept_t*) DECLSPEC_HIDDEN;
 HRESULT jsdisp_call_name(jsdisp_t*,const WCHAR*,WORD,DISPPARAMS*,VARIANT*,jsexcept_t*,IServiceProvider*) DECLSPEC_HIDDEN;
 HRESULT disp_propget(script_ctx_t*,IDispatch*,DISPID,VARIANT*,jsexcept_t*) DECLSPEC_HIDDEN;
-HRESULT disp_propput(script_ctx_t*,IDispatch*,DISPID,VARIANT*,jsexcept_t*,IServiceProvider*) DECLSPEC_HIDDEN;
+HRESULT disp_propput(script_ctx_t*,IDispatch*,DISPID,VARIANT*,jsexcept_t*) DECLSPEC_HIDDEN;
 HRESULT jsdisp_propget(jsdisp_t*,DISPID,VARIANT*,jsexcept_t*,IServiceProvider*) DECLSPEC_HIDDEN;
 HRESULT jsdisp_propput_name(jsdisp_t*,const WCHAR*,VARIANT*,jsexcept_t*,IServiceProvider*) DECLSPEC_HIDDEN;
 HRESULT jsdisp_propput_const(jsdisp_t*,const WCHAR*,VARIANT*) DECLSPEC_HIDDEN;




More information about the wine-cvs mailing list