ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

jscript: Pass invoke version to IDispatchEx functions.

Browse Source
This commit is contained in:
Jacek Caban 2009-10-19 20:40:17 +02:00 committed by Alexandre Julliard
parent 48eef3bc67
commit a1ac9d661f
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dlls/jscript/engine.c
View File

@ -223,7 +223,7 @@ void exec_release(exec_ctx_t *ctx)
heap_free(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; IDispatchEx *dispex;
HRESULT hres; HRESULT hres;
@ -237,7 +237,7 @@ static HRESULT disp_get_id(IDispatch *disp, BSTR name, DWORD flags, DISPID *id)
} }
*id = 0; *id = 0;
hres = IDispatchEx_GetDispID(dispex, name, flags|fdexNameCaseSensitive, id); hres = IDispatchEx_GetDispID(dispex, name, make_grfdex(ctx, flags|fdexNameCaseSensitive), id);
IDispatchEx_Release(dispex); IDispatchEx_Release(dispex);
return hres; 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) { for(item = ctx->named_items; item; item = item->next) {
if(item->flags & SCRIPTITEM_GLOBALMEMBERS) { 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(SUCCEEDED(hres)) {
if(ret) if(ret)
exprval_set_idref(ret, item->disp, id); 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; 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)) { if(SUCCEEDED(hres)) {
@ -1474,7 +1474,7 @@ HRESULT member_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags
return S_OK; 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); SysFreeString(str);
if(SUCCEEDED(hres)) { if(SUCCEEDED(hres)) {
exprval_set_idref(ret, obj, id); 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)) if(FAILED(hres))
return 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); SysFreeString(str);
if(SUCCEEDED(hres)) if(SUCCEEDED(hres))
ret = VARIANT_TRUE; 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); hres = IDispatch_QueryInterface(exprval.u.nameref.disp, &IID_IDispatchEx, (void**)&dispex);
if(SUCCEEDED(hres)) { 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; b = VARIANT_TRUE;
IDispatchEx_Release(dispex); IDispatchEx_Release(dispex);
} }

5
dlls/jscript/jscript.h
View File

@ -392,6 +392,11 @@ static inline void num_set_inf(VARIANT *v, BOOL positive)
#endif #endif
} }
static inline DWORD make_grfdex(script_ctx_t *ctx, DWORD flags)
{
return (ctx->version << 28) | flags;
}
const char *debugstr_variant(const VARIANT*); const char *debugstr_variant(const VARIANT*);
HRESULT WINAPI JScriptFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**); HRESULT WINAPI JScriptFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**);