From 0d9cc454065b12c98fd177fce97f1b9d1fc5dfb4 Mon Sep 17 00:00:00 2001
From: Jacek Caban <jacek@codeweavers.com>
Date: Mon, 12 Mar 2012 12:14:38 +0100
Subject: [PATCH] jscript: Removed no longer needed caller argument from
 jsdisp_propget_name.

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

diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c
index 0591154491c..4cba6343e8d 100644
--- a/dlls/jscript/array.c
+++ b/dlls/jscript/array.c
@@ -72,7 +72,7 @@ static HRESULT get_length(script_ctx_t *ctx, vdisp_t *vdisp, jsexcept_t *ei, jsd
     if(!is_jsdisp(vdisp))
         return throw_type_error(ctx, ei, JS_E_JSCRIPT_EXPECTED, NULL);
 
-    hres = jsdisp_propget_name(vdisp->u.jsdisp, lengthW, &var, ei, NULL/*FIXME*/);
+    hres = jsdisp_propget_name(vdisp->u.jsdisp, lengthW, &var, ei);
     if(FAILED(hres))
         return hres;
 
diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c
index 6ce585a0ba6..1de1dd0bdcc 100644
--- a/dlls/jscript/dispex.c
+++ b/dlls/jscript/dispex.c
@@ -1131,7 +1131,7 @@ HRESULT disp_propput(script_ctx_t *ctx, IDispatch *disp, DISPID id, VARIANT *val
     return hres;
 }
 
-HRESULT jsdisp_propget_name(jsdisp_t *obj, const WCHAR *name, VARIANT *var, jsexcept_t *ei, IServiceProvider *caller)
+HRESULT jsdisp_propget_name(jsdisp_t *obj, const WCHAR *name, VARIANT *var, jsexcept_t *ei)
 {
     DISPPARAMS dp = {NULL, NULL, 0, 0};
     dispex_prop_t *prop;
@@ -1145,7 +1145,7 @@ HRESULT jsdisp_propget_name(jsdisp_t *obj, const WCHAR *name, VARIANT *var, jsex
     if(!prop || prop->type==PROP_DELETED)
         return S_OK;
 
-    return prop_get(obj, prop, &dp, var, ei, caller);
+    return prop_get(obj, prop, &dp, var, ei, NULL);
 }
 
 HRESULT jsdisp_get_idx(jsdisp_t *obj, DWORD idx, VARIANT *var, jsexcept_t *ei, IServiceProvider *caller)
diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c
index 72626d5daec..2fa6b04719b 100644
--- a/dlls/jscript/engine.c
+++ b/dlls/jscript/engine.c
@@ -1396,7 +1396,7 @@ static HRESULT interp_instanceof(exec_ctx_t *ctx)
     }
 
     if(is_class(obj, JSCLASS_FUNCTION)) {
-        hres = jsdisp_propget_name(obj, prototypeW, &prot, ctx->ei, NULL/*FIXME*/);
+        hres = jsdisp_propget_name(obj, prototypeW, &prot, ctx->ei);
     }else {
         hres = throw_type_error(ctx->parser->script, ctx->ei, JS_E_FUNCTION_EXPECTED, NULL);
     }
diff --git a/dlls/jscript/error.c b/dlls/jscript/error.c
index 498aef2c65a..bb50c3ec83a 100644
--- a/dlls/jscript/error.c
+++ b/dlls/jscript/error.c
@@ -56,7 +56,7 @@ static HRESULT Error_toString(script_ctx_t *ctx, vdisp_t *vthis, WORD flags,
         return S_OK;
     }
 
-    hres = jsdisp_propget_name(jsthis, nameW, &v, ei, caller);
+    hres = jsdisp_propget_name(jsthis, nameW, &v, ei);
     if(FAILED(hres))
         return hres;
 
@@ -71,7 +71,7 @@ static HRESULT Error_toString(script_ctx_t *ctx, vdisp_t *vthis, WORD flags,
         }
     }
 
-    hres = jsdisp_propget_name(jsthis, messageW, &v, ei, caller);
+    hres = jsdisp_propget_name(jsthis, messageW, &v, ei);
     if(SUCCEEDED(hres)) {
         if(V_VT(&v) != VT_EMPTY) {
             hres = to_string(ctx, &v, ei, &msg);
diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c
index aeef2b28535..23e7033b5e0 100644
--- a/dlls/jscript/function.c
+++ b/dlls/jscript/function.c
@@ -364,7 +364,7 @@ static HRESULT array_to_args(script_ctx_t *ctx, jsdisp_t *arg_array, jsexcept_t
     DWORD length, i;
     HRESULT hres;
 
-    hres = jsdisp_propget_name(arg_array, lengthW, &var, ei, NULL/*FIXME*/);
+    hres = jsdisp_propget_name(arg_array, lengthW, &var, ei);
     if(FAILED(hres))
         return hres;
 
diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h
index 4b71bf79d11..a4b7e199545 100644
--- a/dlls/jscript/jscript.h
+++ b/dlls/jscript/jscript.h
@@ -216,7 +216,7 @@ HRESULT jsdisp_propget(jsdisp_t*,DISPID,VARIANT*,jsexcept_t*) DECLSPEC_HIDDEN;
 HRESULT jsdisp_propput_name(jsdisp_t*,const WCHAR*,VARIANT*,jsexcept_t*) DECLSPEC_HIDDEN;
 HRESULT jsdisp_propput_const(jsdisp_t*,const WCHAR*,VARIANT*) DECLSPEC_HIDDEN;
 HRESULT jsdisp_propput_idx(jsdisp_t*,DWORD,VARIANT*,jsexcept_t*) DECLSPEC_HIDDEN;
-HRESULT jsdisp_propget_name(jsdisp_t*,LPCWSTR,VARIANT*,jsexcept_t*,IServiceProvider*) DECLSPEC_HIDDEN;
+HRESULT jsdisp_propget_name(jsdisp_t*,LPCWSTR,VARIANT*,jsexcept_t*) DECLSPEC_HIDDEN;
 HRESULT jsdisp_get_idx(jsdisp_t*,DWORD,VARIANT*,jsexcept_t*,IServiceProvider*) DECLSPEC_HIDDEN;
 HRESULT jsdisp_get_id(jsdisp_t*,const WCHAR*,DWORD,DISPID*) DECLSPEC_HIDDEN;
 HRESULT jsdisp_delete_idx(jsdisp_t*,DWORD) DECLSPEC_HIDDEN;
-- 
2.11.4.GIT