Jacek Caban : mshtml: Use DISPATCH_* macros instead of INVOKE_*.
Alexandre Julliard
julliard at winehq.org
Wed Oct 14 09:01:58 CDT 2009
Module: wine
Branch: master
Commit: d43ab58efb1a27dbbe1511c4d9d5a039aa4b9ecd
URL: http://source.winehq.org/git/wine.git/?a=commit;h=d43ab58efb1a27dbbe1511c4d9d5a039aa4b9ecd
Author: Jacek Caban <jacek at codeweavers.com>
Date: Tue Oct 13 20:50:02 2009 +0200
mshtml: Use DISPATCH_* macros instead of INVOKE_*.
---
dlls/mshtml/dispex.c | 9 +++++----
dlls/mshtml/htmlelemcol.c | 2 +-
dlls/mshtml/htmlnode.c | 2 +-
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c
index 210c3ae..4079242 100644
--- a/dlls/mshtml/dispex.c
+++ b/dlls/mshtml/dispex.c
@@ -221,7 +221,7 @@ static void add_func_info(dispex_data_t *data, DWORD *size, tid_t tid, const FUN
data->funcs[data->func_cnt].id = desc->memid;
data->funcs[data->func_cnt].tid = tid;
- data->funcs[data->func_cnt].func_disp_idx = desc->invkind == INVOKE_FUNC ? data->func_disp_cnt++ : -1;
+ data->funcs[data->func_cnt].func_disp_idx = desc->invkind == DISPATCH_METHOD ? data->func_disp_cnt++ : -1;
data->func_cnt++;
}
@@ -572,6 +572,7 @@ static HRESULT function_invoke(DispatchEx *This, func_info_t *func, WORD flags,
switch(flags) {
case DISPATCH_METHOD:
+ case DISPATCH_METHOD|DISPATCH_PROPERTYGET:
hres = typeinfo_invoke(This, func, flags, dp, res, ei);
break;
case DISPATCH_PROPERTYGET: {
@@ -809,7 +810,7 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc
var = &This->dynamic_data->props[idx].var;
switch(wFlags) {
- case INVOKE_FUNC: {
+ case DISPATCH_METHOD: {
DISPID named_arg = DISPID_THIS;
DISPPARAMS dp = {NULL, &named_arg, 0, 1};
IDispatchEx *dispex;
@@ -848,9 +849,9 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc
heap_free(dp.rgvarg);
return hres;
}
- case INVOKE_PROPERTYGET:
+ case DISPATCH_PROPERTYGET:
return VariantCopy(pvarRes, var);
- case INVOKE_PROPERTYPUT:
+ case DISPATCH_PROPERTYPUT:
VariantClear(var);
return VariantCopy(var, pdp->rgvarg);
default:
diff --git a/dlls/mshtml/htmlelemcol.c b/dlls/mshtml/htmlelemcol.c
index 743cc06..70827bc 100644
--- a/dlls/mshtml/htmlelemcol.c
+++ b/dlls/mshtml/htmlelemcol.c
@@ -397,7 +397,7 @@ static HRESULT HTMLElementCollection_invoke(IUnknown *iface, DISPID id, LCID lci
return DISP_E_UNKNOWNNAME;
switch(flags) {
- case INVOKE_PROPERTYGET:
+ case DISPATCH_PROPERTYGET:
V_VT(res) = VT_DISPATCH;
V_DISPATCH(res) = (IDispatch*)HTMLELEM(This->elems[idx]);
IHTMLElement_AddRef(HTMLELEM(This->elems[idx]));
diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c
index 1c7b7cb..9227899 100644
--- a/dlls/mshtml/htmlnode.c
+++ b/dlls/mshtml/htmlnode.c
@@ -208,7 +208,7 @@ static HRESULT HTMLDOMChildrenCollection_invoke(IUnknown *iface, DISPID id, LCID
TRACE("(%p)->(%x %x %x %p %p %p %p)\n", This, id, lcid, flags, params, res, ei, caller);
switch(flags) {
- case INVOKE_PROPERTYGET: {
+ case DISPATCH_PROPERTYGET: {
IDispatch *disp = NULL;
HRESULT hres;
More information about the wine-cvs
mailing list