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

[Alexandre Julliard]

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

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

jscript: Removed no longer needed disp_propget caller argument.

---

 dlls/jscript/dispex.c  |    4 ++--
 dlls/jscript/engine.c  |   14 +++++++-------
 dlls/jscript/jscript.h |    2 +-
 dlls/jscript/jsutils.c |    2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c
index 07c4cb7..e8cc6e9 100644
--- a/dlls/jscript/dispex.c
+++ b/dlls/jscript/dispex.c
@@ -1184,7 +1184,7 @@ HRESULT jsdisp_propget(jsdisp_t *jsdisp, DISPID id, VARIANT *val, jsexcept_t *ei
     return prop_get(jsdisp, prop, &dp, val, ei, caller);
 }
 
-HRESULT disp_propget(script_ctx_t *ctx, IDispatch *disp, DISPID id, VARIANT *val, jsexcept_t *ei, IServiceProvider *caller)
+HRESULT disp_propget(script_ctx_t *ctx, IDispatch *disp, DISPID id, VARIANT *val, jsexcept_t *ei)
 {
     DISPPARAMS dp  = {NULL,NULL,0,0};
     IDispatchEx *dispex;
@@ -1193,7 +1193,7 @@ HRESULT disp_propget(script_ctx_t *ctx, IDispatch *disp, DISPID id, VARIANT *val
 
     jsdisp = iface_to_jsdisp((IUnknown*)disp);
     if(jsdisp) {
-        hres = jsdisp_propget(jsdisp, id, val, ei, caller);
+        hres = jsdisp_propget(jsdisp, id, val, ei, NULL);
         jsdisp_release(jsdisp);
         return hres;
     }
diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c
index b96c55f..95b2348 100644
--- a/dlls/jscript/engine.c
+++ b/dlls/jscript/engine.c
@@ -230,7 +230,7 @@ static HRESULT exprval_value(script_ctx_t *ctx, exprval_t *val, jsexcept_t *ei,
             return E_FAIL;
         }
 
-        return disp_propget(ctx, val->u.idref.disp, val->u.idref.id, ret, ei, NULL/*FIXME*/);
+        return disp_propget(ctx, val->u.idref.disp, val->u.idref.id, ret, ei);
     case EXPRVAL_INVALID:
         assert(0);
     }
@@ -843,7 +843,7 @@ static HRESULT interp_array(exec_ctx_t *ctx)
     hres = disp_get_id(ctx->parser->script, obj, name, 0, &id);
     SysFreeString(name);
     if(SUCCEEDED(hres)) {
-        hres = disp_propget(ctx->parser->script, obj, id, &v, ctx->ei, NULL/*FIXME*/);
+        hres = disp_propget(ctx->parser->script, obj, id, &v, ctx->ei);
     }else if(hres == DISP_E_UNKNOWNNAME) {
         V_VT(&v) = VT_EMPTY;
         hres = S_OK;
@@ -873,7 +873,7 @@ static HRESULT interp_member(exec_ctx_t *ctx)
     hres = disp_get_id(ctx->parser->script, obj, arg, 0, &id);
     if(SUCCEEDED(hres)) {
         V_VT(&v) = VT_EMPTY;
-        hres = disp_propget(ctx->parser->script, obj, id, &v, ctx->ei, NULL/*FIXME*/);
+        hres = disp_propget(ctx->parser->script, obj, id, &v, ctx->ei);
     }else if(hres == DISP_E_UNKNOWNNAME) {
         V_VT(&v) = VT_EMPTY;
         hres = S_OK;
@@ -940,7 +940,7 @@ static HRESULT interp_refval(exec_ctx_t *ctx)
     if(!disp)
         return throw_reference_error(ctx->parser->script, ctx->ei, JS_E_ILLEGAL_ASSIGN, NULL);
 
-    hres = disp_propget(ctx->parser->script, disp, id, &v, ctx->ei, NULL/*FIXME*/);
+    hres = disp_propget(ctx->parser->script, disp, id, &v, ctx->ei);
     if(FAILED(hres))
         return hres;
 
@@ -1784,7 +1784,7 @@ static HRESULT interp_typeofid(exec_ctx_t *ctx)
         return stack_push_string(ctx, undefinedW);
 
     V_VT(&v) = VT_EMPTY;
-    hres = disp_propget(ctx->parser->script, obj, id, &v, ctx->ei, NULL/*FIXME*/);
+    hres = disp_propget(ctx->parser->script, obj, id, &v, ctx->ei);
     IDispatch_Release(obj);
     if(FAILED(hres))
         return stack_push_string(ctx, unknownW);
@@ -1896,7 +1896,7 @@ static HRESULT interp_postinc(exec_ctx_t *ctx)
     if(!obj)
         return throw_type_error(ctx->parser->script, ctx->ei, JS_E_OBJECT_EXPECTED, NULL);
 
-    hres = disp_propget(ctx->parser->script, obj, id, &v, ctx->ei, NULL/*FIXME*/);
+    hres = disp_propget(ctx->parser->script, obj, id, &v, ctx->ei);
     if(SUCCEEDED(hres)) {
         VARIANT n, inc;
 
@@ -1930,7 +1930,7 @@ static HRESULT interp_preinc(exec_ctx_t *ctx)
     if(!obj)
         return throw_type_error(ctx->parser->script, ctx->ei, JS_E_OBJECT_EXPECTED, NULL);
 
-    hres = disp_propget(ctx->parser->script, obj, id, &v, ctx->ei, NULL/*FIXME*/);
+    hres = disp_propget(ctx->parser->script, obj, id, &v, ctx->ei);
     if(SUCCEEDED(hres)) {
         VARIANT n;
 
diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h
index ed2402d..42537cc 100644
--- a/dlls/jscript/jscript.h
+++ b/dlls/jscript/jscript.h
@@ -210,7 +210,7 @@ HRESULT disp_call(script_ctx_t*,IDispatch*,DISPID,WORD,DISPPARAMS*,VARIANT*,jsex
 HRESULT jsdisp_call_value(jsdisp_t*,WORD,DISPPARAMS*,VARIANT*,jsexcept_t*,IServiceProvider*) DECLSPEC_HIDDEN;
 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*,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 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;
diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c
index 33540d7..2e1030e 100644
--- a/dlls/jscript/jsutils.c
+++ b/dlls/jscript/jsutils.c
@@ -211,7 +211,7 @@ HRESULT to_primitive(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, VARIANT *ret
         jsdisp = iface_to_jsdisp((IUnknown*)V_DISPATCH(v));
         if(!jsdisp) {
             V_VT(ret) = VT_EMPTY;
-            return disp_propget(ctx, V_DISPATCH(v), DISPID_VALUE, ret, ei, NULL /*FIXME*/);
+            return disp_propget(ctx, V_DISPATCH(v), DISPID_VALUE, ret, ei);
         }
 
         if(hint == NO_HINT)