Module: wine Branch: master Commit: a1ac9d661f8fbd9c782fce554b8ba233edaa92d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1ac9d661f8fbd9c782fce554b...
Author: Jacek Caban jacek@codeweavers.com Date: Mon Oct 19 20:40:17 2009 +0200
jscript: Pass invoke version to IDispatchEx functions.
---
dlls/jscript/engine.c | 15 ++++++++------- dlls/jscript/jscript.h | 5 +++++ 2 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 0cb7851..afb5489 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -223,7 +223,7 @@ void exec_release(exec_ctx_t *ctx) heap_free(ctx); }
-static HRESULT disp_get_id(IDispatch *disp, BSTR name, DWORD flags, DISPID *id) +static HRESULT disp_get_id(script_ctx_t *ctx, IDispatch *disp, BSTR name, DWORD flags, DISPID *id) { IDispatchEx *dispex; HRESULT hres; @@ -237,7 +237,7 @@ static HRESULT disp_get_id(IDispatch *disp, BSTR name, DWORD flags, DISPID *id) }
*id = 0; - hres = IDispatchEx_GetDispID(dispex, name, flags|fdexNameCaseSensitive, id); + hres = IDispatchEx_GetDispID(dispex, name, make_grfdex(ctx, flags|fdexNameCaseSensitive), id); IDispatchEx_Release(dispex); return hres; } @@ -402,7 +402,7 @@ static BOOL lookup_global_members(script_ctx_t *ctx, BSTR identifier, exprval_t
for(item = ctx->named_items; item; item = item->next) { if(item->flags & SCRIPTITEM_GLOBALMEMBERS) { - hres = disp_get_id(item->disp, identifier, 0, &id); + hres = disp_get_id(ctx, item->disp, identifier, 0, &id); if(SUCCEEDED(hres)) { if(ret) exprval_set_idref(ret, item->disp, id); @@ -1423,7 +1423,7 @@ HRESULT array_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, return S_OK; }
- hres = disp_get_id(obj, str, flags & EXPR_NEWREF ? fdexNameEnsure : 0, &id); + hres = disp_get_id(ctx->parser->script, obj, str, flags & EXPR_NEWREF ? fdexNameEnsure : 0, &id); }
if(SUCCEEDED(hres)) { @@ -1474,7 +1474,7 @@ HRESULT member_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags return S_OK; }
- hres = disp_get_id(obj, str, flags & EXPR_NEWREF ? fdexNameEnsure : 0, &id); + hres = disp_get_id(ctx->parser->script, obj, str, flags & EXPR_NEWREF ? fdexNameEnsure : 0, &id); SysFreeString(str); if(SUCCEEDED(hres)) { exprval_set_idref(ret, obj, id); @@ -2068,7 +2068,7 @@ static HRESULT in_eval(exec_ctx_t *ctx, VARIANT *lval, VARIANT *obj, jsexcept_t if(FAILED(hres)) return hres;
- hres = disp_get_id(V_DISPATCH(obj), str, 0, &id); + hres = disp_get_id(ctx->parser->script, V_DISPATCH(obj), str, 0, &id); SysFreeString(str); if(SUCCEEDED(hres)) ret = VARIANT_TRUE; @@ -2308,7 +2308,8 @@ HRESULT delete_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags
hres = IDispatch_QueryInterface(exprval.u.nameref.disp, &IID_IDispatchEx, (void**)&dispex); if(SUCCEEDED(hres)) { - hres = IDispatchEx_DeleteMemberByName(dispex, exprval.u.nameref.name, fdexNameCaseSensitive); + hres = IDispatchEx_DeleteMemberByName(dispex, exprval.u.nameref.name, + make_grfdex(ctx->parser->script, fdexNameCaseSensitive)); b = VARIANT_TRUE; IDispatchEx_Release(dispex); } diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 2d7d5d9..4dd340e 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -392,6 +392,11 @@ static inline void num_set_inf(VARIANT *v, BOOL positive) #endif }
+static inline DWORD make_grfdex(script_ctx_t *ctx, DWORD flags) +{ + return (ctx->version << 28) | flags; +} + const char *debugstr_variant(const VARIANT*);
HRESULT WINAPI JScriptFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**);