September 2009 - Wine-Commits

Jacek Caban : mshtml: Added IHTMLEventObj::get_keyCode implementation.
by Alexandre Julliard Sept. 8, 2009

Sept. 8, 2009

Module: wine Branch: master Commit: 7f7ea0e1164c4bd5c3f792ff91e08adcbc7ca948 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f7ea0e1164c4bd5c3f792ff9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 6 18:56:13 2009 +0200 mshtml: Added IHTMLEventObj::get_keyCode implementation. --- dlls/mshtml/htmlevent.c | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index a42098a..96be69e 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -374,8 +374,23 @@ static HRESULT WINAPI HTMLEventObj_put_keyCode(IHTMLEventObj *iface, LONG v) static HRESULT WINAPI HTMLEventObj_get_keyCode(IHTMLEventObj *iface, LONG *p) { HTMLEventObj *This = HTMLEVENTOBJ_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + PRUint32 key_code = 0; + + TRACE("(%p)->(%p)\n", This, p); + + if(This->nsevent) { + nsIDOMKeyEvent *key_event; + nsresult nsres; + + nsres = nsIDOMEvent_QueryInterface(This->nsevent, &IID_nsIDOMKeyEvent, (void**)&key_event); + if(NS_SUCCEEDED(nsres)) { + nsIDOMKeyEvent_GetKeyCode(key_event, &key_code); + nsIDOMKeyEvent_Release(key_event); + } + } + + *p = key_code; + return S_OK; } static HRESULT WINAPI HTMLEventObj_get_button(IHTMLEventObj *iface, LONG *p)

1 0

Jacek Caban : mshtml: Addded IHTMLEventObj::get_shiftKey implementation.
by Alexandre Julliard Sept. 8, 2009

Sept. 8, 2009

Module: wine Branch: master Commit: 63e0b63ff90e6a7a65f3dfa22a337d23fb7ff889 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63e0b63ff90e6a7a65f3dfa22… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 6 18:55:56 2009 +0200 mshtml: Addded IHTMLEventObj::get_shiftKey implementation. --- dlls/mshtml/htmlevent.c | 27 +++++++++++++++++++++++++-- 1 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 180a518..a42098a 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -295,8 +295,31 @@ static HRESULT WINAPI HTMLEventObj_get_ctrlKey(IHTMLEventObj *iface, VARIANT_BOO static HRESULT WINAPI HTMLEventObj_get_shiftKey(IHTMLEventObj *iface, VARIANT_BOOL *p) { HTMLEventObj *This = HTMLEVENTOBJ_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + PRBool ret = FALSE; + + TRACE("(%p)->(%p)\n", This, p); + + if(This->nsevent) { + nsIDOMKeyEvent *key_event; + nsresult nsres; + + nsres = nsIDOMEvent_QueryInterface(This->nsevent, &IID_nsIDOMKeyEvent, (void**)&key_event); + if(NS_SUCCEEDED(nsres)) { + nsIDOMKeyEvent_GetShiftKey(key_event, &ret); + nsIDOMKeyEvent_Release(key_event); + }else { + nsIDOMMouseEvent *mouse_event; + + nsres = nsIDOMEvent_QueryInterface(This->nsevent, &IID_nsIDOMMouseEvent, (void**)&mouse_event); + if(NS_SUCCEEDED(nsres)) { + nsIDOMMouseEvent_GetShiftKey(mouse_event, &ret); + nsIDOMMouseEvent_Release(mouse_event); + } + } + } + + *p = ret ? VARIANT_TRUE : VARIANT_FALSE; + return S_OK; } static HRESULT WINAPI HTMLEventObj_put_returnValue(IHTMLEventObj *iface, VARIANT v)

1 0

Jacek Caban : mshtml: Added IHTMLEventObj::get_ctrKey implementation.
by Alexandre Julliard Sept. 8, 2009

Sept. 8, 2009

Module: wine Branch: master Commit: 066e0812e6ea07aeebe6a5c5b9d0d620df260320 URL: http://source.winehq.org/git/wine.git/?a=commit;h=066e0812e6ea07aeebe6a5c5b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 6 18:55:41 2009 +0200 mshtml: Added IHTMLEventObj::get_ctrKey implementation. --- dlls/mshtml/htmlevent.c | 27 +++++++++++++++++++++++++-- 1 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 69e2bc0..180a518 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -265,8 +265,31 @@ static HRESULT WINAPI HTMLEventObj_get_altKey(IHTMLEventObj *iface, VARIANT_BOOL static HRESULT WINAPI HTMLEventObj_get_ctrlKey(IHTMLEventObj *iface, VARIANT_BOOL *p) { HTMLEventObj *This = HTMLEVENTOBJ_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + PRBool ret = FALSE; + + TRACE("(%p)->(%p)\n", This, p); + + if(This->nsevent) { + nsIDOMKeyEvent *key_event; + nsresult nsres; + + nsres = nsIDOMEvent_QueryInterface(This->nsevent, &IID_nsIDOMKeyEvent, (void**)&key_event); + if(NS_SUCCEEDED(nsres)) { + nsIDOMKeyEvent_GetCtrlKey(key_event, &ret); + nsIDOMKeyEvent_Release(key_event); + }else { + nsIDOMMouseEvent *mouse_event; + + nsres = nsIDOMEvent_QueryInterface(This->nsevent, &IID_nsIDOMMouseEvent, (void**)&mouse_event); + if(NS_SUCCEEDED(nsres)) { + nsIDOMMouseEvent_GetCtrlKey(mouse_event, &ret); + nsIDOMMouseEvent_Release(mouse_event); + } + } + } + + *p = ret ? VARIANT_TRUE : VARIANT_FALSE; + return S_OK; } static HRESULT WINAPI HTMLEventObj_get_shiftKey(IHTMLEventObj *iface, VARIANT_BOOL *p)

1 0

Jacek Caban : mshtml: Added IHTMLEventObj::get_altKey implementation.
by Alexandre Julliard Sept. 8, 2009

Sept. 8, 2009

Module: wine Branch: master Commit: 461b3768d2ebfbc1ad36368a634fce9dc88ba550 URL: http://source.winehq.org/git/wine.git/?a=commit;h=461b3768d2ebfbc1ad36368a6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 6 18:55:25 2009 +0200 mshtml: Added IHTMLEventObj::get_altKey implementation. --- dlls/mshtml/htmlevent.c | 40 +++++++++++++++++++++++++++++++++++----- dlls/mshtml/htmlevent.h | 2 +- dlls/mshtml/nsevents.c | 4 ++-- 3 files changed, 38 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index cce6e64..69e2bc0 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -129,6 +129,7 @@ typedef struct { HTMLDOMNode *target; const event_info_t *type; + nsIDOMEvent *nsevent; } HTMLEventObj; #define HTMLEVENTOBJ(x) ((IHTMLEventObj*) &(x)->lpIHTMLEventObjVtbl) @@ -178,6 +179,8 @@ static ULONG WINAPI HTMLEventObj_Release(IHTMLEventObj *iface) TRACE("(%p) ref=%d\n", This, ref); if(!ref) { + if(This->nsevent) + nsIDOMEvent_Release(This->nsevent); release_dispex(&This->dispex); heap_free(This); } @@ -232,8 +235,31 @@ static HRESULT WINAPI HTMLEventObj_get_srcElement(IHTMLEventObj *iface, IHTMLEle static HRESULT WINAPI HTMLEventObj_get_altKey(IHTMLEventObj *iface, VARIANT_BOOL *p) { HTMLEventObj *This = HTMLEVENTOBJ_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + PRBool ret = FALSE; + + TRACE("(%p)->(%p)\n", This, p); + + if(This->nsevent) { + nsIDOMKeyEvent *key_event; + nsresult nsres; + + nsres = nsIDOMEvent_QueryInterface(This->nsevent, &IID_nsIDOMKeyEvent, (void**)&key_event); + if(NS_SUCCEEDED(nsres)) { + nsIDOMKeyEvent_GetAltKey(key_event, &ret); + nsIDOMKeyEvent_Release(key_event); + }else { + nsIDOMMouseEvent *mouse_event; + + nsres = nsIDOMEvent_QueryInterface(This->nsevent, &IID_nsIDOMMouseEvent, (void**)&mouse_event); + if(NS_SUCCEEDED(nsres)) { + nsIDOMMouseEvent_GetAltKey(mouse_event, &ret); + nsIDOMMouseEvent_Release(mouse_event); + } + } + } + + *p = ret ? VARIANT_TRUE : VARIANT_FALSE; + return S_OK; } static HRESULT WINAPI HTMLEventObj_get_ctrlKey(IHTMLEventObj *iface, VARIANT_BOOL *p) @@ -449,7 +475,7 @@ static dispex_static_data_t HTMLEventObj_dispex = { HTMLEventObj_iface_tids }; -static IHTMLEventObj *create_event(HTMLDOMNode *target, eventid_t eid) +static IHTMLEventObj *create_event(HTMLDOMNode *target, eventid_t eid, nsIDOMEvent *nsevent) { HTMLEventObj *ret; @@ -460,6 +486,10 @@ static IHTMLEventObj *create_event(HTMLDOMNode *target, eventid_t eid) ret->target = target; IHTMLDOMNode_AddRef(HTMLDOMNODE(target)); + ret->nsevent = nsevent; + if(nsevent) + nsIDOMEvent_AddRef(nsevent); + init_dispex(&ret->dispex, (IUnknown*)HTMLEVENTOBJ(ret), &HTMLEventObj_dispex); return HTMLEVENTOBJ(ret); @@ -490,7 +520,7 @@ static void call_event_handlers(HTMLDocument *doc, event_target_t *event_target, } } -void fire_event(HTMLDocument *doc, eventid_t eid, nsIDOMNode *target) +void fire_event(HTMLDocument *doc, eventid_t eid, nsIDOMNode *target, nsIDOMEvent *nsevent) { IHTMLEventObj *prev_event, *event_obj = NULL; nsIDOMNode *parent, *nsnode; @@ -504,7 +534,7 @@ void fire_event(HTMLDocument *doc, eventid_t eid, nsIDOMNode *target) } prev_event = doc->window->event; - event_obj = doc->window->event = create_event(get_node(doc, target, TRUE), eid); + event_obj = doc->window->event = create_event(get_node(doc, target, TRUE), eid, nsevent); nsnode = target; nsIDOMNode_AddRef(nsnode); diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 230450b..8ca4a96 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -38,7 +38,7 @@ typedef enum { eventid_t str_to_eid(LPCWSTR); void check_event_attr(HTMLDocument*,nsIDOMElement*); void release_event_target(event_target_t*); -void fire_event(HTMLDocument*,eventid_t,nsIDOMNode*); +void fire_event(HTMLDocument*,eventid_t,nsIDOMNode*,nsIDOMEvent*); HRESULT set_event_handler(event_target_t**,HTMLDocument*,eventid_t,VARIANT*); HRESULT get_event_handler(event_target_t**,eventid_t,VARIANT*); diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index 0ba11d2..bacc07e 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -155,7 +155,7 @@ static nsresult NSAPI handle_load(nsIDOMEventListener *iface, nsIDOMEvent *event nsIDOMHTMLDocument_GetBody(This->doc->nsdoc, &nsbody); if(nsbody) { - fire_event(This->doc, EVENTID_LOAD, (nsIDOMNode*)nsbody); + fire_event(This->doc, EVENTID_LOAD, (nsIDOMNode*)nsbody, event); nsIDOMHTMLElement_Release(nsbody); } @@ -191,7 +191,7 @@ static nsresult NSAPI handle_htmlevent(nsIDOMEventListener *iface, nsIDOMEvent * return NS_OK; } - fire_event(This->doc, eid, nsnode); + fire_event(This->doc, eid, nsnode, event); nsIDOMNode_Release(nsnode);

1 0

Jacek Caban : mshtml: Added IHTMLEventObj::get_type implementation.
by Alexandre Julliard Sept. 8, 2009

Sept. 8, 2009

Module: wine Branch: master Commit: 145d53e2acf95976f2eceec7a945765f23cb8a54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=145d53e2acf95976f2eceec7a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 6 18:55:06 2009 +0200 mshtml: Added IHTMLEventObj::get_type implementation. --- dlls/mshtml/htmlevent.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index b2a1e01..cce6e64 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -128,6 +128,7 @@ typedef struct { LONG ref; HTMLDOMNode *target; + const event_info_t *type; } HTMLEventObj; #define HTMLEVENTOBJ(x) ((IHTMLEventObj*) &(x)->lpIHTMLEventObjVtbl) @@ -315,8 +316,11 @@ static HRESULT WINAPI HTMLEventObj_get_button(IHTMLEventObj *iface, LONG *p) static HRESULT WINAPI HTMLEventObj_get_type(IHTMLEventObj *iface, BSTR *p) { HTMLEventObj *This = HTMLEVENTOBJ_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + *p = SysAllocString(This->type->name); + return *p ? S_OK : E_OUTOFMEMORY; } static HRESULT WINAPI HTMLEventObj_get_qualifier(IHTMLEventObj *iface, BSTR *p) @@ -445,13 +449,14 @@ static dispex_static_data_t HTMLEventObj_dispex = { HTMLEventObj_iface_tids }; -static IHTMLEventObj *create_event(HTMLDOMNode *target) +static IHTMLEventObj *create_event(HTMLDOMNode *target, eventid_t eid) { HTMLEventObj *ret; ret = heap_alloc(sizeof(*ret)); ret->lpIHTMLEventObjVtbl = &HTMLEventObjVtbl; ret->ref = 1; + ret->type = event_info+eid; ret->target = target; IHTMLDOMNode_AddRef(HTMLDOMNODE(target)); @@ -499,7 +504,7 @@ void fire_event(HTMLDocument *doc, eventid_t eid, nsIDOMNode *target) } prev_event = doc->window->event; - event_obj = doc->window->event = create_event(get_node(doc, target, TRUE)); + event_obj = doc->window->event = create_event(get_node(doc, target, TRUE), eid); nsnode = target; nsIDOMNode_AddRef(nsnode);

1 0

Jacek Caban : mshtml: Always create event object in fire_event.
by Alexandre Julliard Sept. 8, 2009

Sept. 8, 2009

Module: wine Branch: master Commit: a6ee270f0f3f937cff14d0388dbe81c86bea1317 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6ee270f0f3f937cff14d0388… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 6 18:54:49 2009 +0200 mshtml: Always create event object in fire_event. --- dlls/mshtml/htmlevent.c | 19 +++++-------------- 1 files changed, 5 insertions(+), 14 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index df121b0..b2a1e01 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -499,18 +499,15 @@ void fire_event(HTMLDocument *doc, eventid_t eid, nsIDOMNode *target) } prev_event = doc->window->event; + event_obj = doc->window->event = create_event(get_node(doc, target, TRUE)); nsnode = target; nsIDOMNode_AddRef(nsnode); while(1) { node = get_node(doc, nsnode, FALSE); - if(node) { - if(!event_obj) - event_obj = doc->window->event = create_event(get_node(doc, target, TRUE)); - + if(node) call_event_handlers(doc, node->event_target, eid, (IDispatch*)HTMLDOMNODE(node)); - } if(!(event_info[eid].flags & EVENT_BUBBLE)) break; @@ -529,17 +526,11 @@ void fire_event(HTMLDocument *doc, eventid_t eid, nsIDOMNode *target) if(nsnode) nsIDOMNode_Release(nsnode); - if(event_info[eid].flags & EVENT_BUBBLE) { - if(!event_obj) - event_obj = doc->window->event = create_event(get_node(doc, target, TRUE)); - + if(event_info[eid].flags & EVENT_BUBBLE) call_event_handlers(doc, doc->event_target, eid, (IDispatch*)HTMLDOC(doc)); - } - if(event_obj) { - IHTMLEventObj_Release(event_obj); - doc->window->event = prev_event; - } + IHTMLEventObj_Release(event_obj); + doc->window->event = prev_event; } static HRESULT set_event_handler_disp(event_target_t **event_target, HTMLDocument *doc, eventid_t eid, IDispatch *disp)

1 0

Jacek Caban : mshtml: Move event handlers invocation to separated function.
by Alexandre Julliard Sept. 8, 2009

Sept. 8, 2009

Module: wine Branch: master Commit: 50ab5620e84b00cf3baca8da2bfd3b72feb5f2b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50ab5620e84b00cf3baca8da2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 6 18:54:30 2009 +0200 mshtml: Move event handlers invocation to separated function. --- dlls/mshtml/dispex.c | 16 +++++----------- dlls/mshtml/htmlevent.c | 37 +++++++++++++++++++++++++++++-------- dlls/mshtml/mshtml_private.h | 2 +- 3 files changed, 35 insertions(+), 20 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index c58b3ce..a2d3468 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -318,11 +318,8 @@ static dispex_data_t *get_dispex_data(DispatchEx *This) return This->data->data; } -void call_disp_func(HTMLDocument *doc, IDispatch *disp, IDispatch *this_obj) +HRESULT call_disp_func(IDispatch *disp, DISPPARAMS *dp) { - DISPID named_arg = DISPID_THIS; - VARIANTARG arg; - DISPPARAMS params = {&arg, &named_arg, 1, 1}; EXCEPINFO ei; IDispatchEx *dispex; VARIANT res; @@ -331,20 +328,17 @@ void call_disp_func(HTMLDocument *doc, IDispatch *disp, IDispatch *this_obj) hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); if(FAILED(hres)) { FIXME("Could not get IDispatchEx interface: %08x\n", hres); - return; + return hres; } - V_VT(&arg) = VT_DISPATCH; - V_DISPATCH(&arg) = this_obj; VariantInit(&res); memset(&ei, 0, sizeof(ei)); - hres = IDispatchEx_InvokeEx(dispex, 0, GetUserDefaultLCID(), DISPATCH_METHOD, &params, &res, &ei, NULL); - IDispatchEx_Release(dispex); - - TRACE("%p returned %08x\n", disp, hres); + hres = IDispatchEx_InvokeEx(dispex, 0, GetUserDefaultLCID(), DISPATCH_METHOD, dp, &res, &ei, NULL); + IDispatchEx_Release(dispex); VariantClear(&res); + return hres; } static inline BOOL is_custom_dispid(DISPID id) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index ca7166c..df121b0 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -460,6 +460,31 @@ static IHTMLEventObj *create_event(HTMLDOMNode *target) return HTMLEVENTOBJ(ret); } +static void call_event_handlers(HTMLDocument *doc, event_target_t *event_target, + eventid_t eid, IDispatch *this_obj) +{ + HRESULT hres; + + if(!event_target || !event_target->event_table[eid]) + return; + + if(event_target->event_table[eid]) { + DISPID named_arg = DISPID_THIS; + VARIANTARG arg; + DISPPARAMS dp = {&arg, &named_arg, 1, 1}; + + V_VT(&arg) = VT_DISPATCH; + V_DISPATCH(&arg) = this_obj; + + TRACE("%s >>>\n", debugstr_w(event_info[eid].name)); + hres = call_disp_func(event_target->event_table[eid], &dp); + if(hres == S_OK) + TRACE("%s <<<\n", debugstr_w(event_info[eid].name)); + else + WARN("%s <<< %08x\n", debugstr_w(event_info[eid].name), hres); + } +} + void fire_event(HTMLDocument *doc, eventid_t eid, nsIDOMNode *target) { IHTMLEventObj *prev_event, *event_obj = NULL; @@ -480,13 +505,11 @@ void fire_event(HTMLDocument *doc, eventid_t eid, nsIDOMNode *target) while(1) { node = get_node(doc, nsnode, FALSE); - if(node && node->event_target && node->event_target->event_table[eid]) { + if(node) { if(!event_obj) event_obj = doc->window->event = create_event(get_node(doc, target, TRUE)); - TRACE("%s >>>\n", debugstr_w(event_info[eid].name)); - call_disp_func(doc, node->event_target->event_table[eid], (IDispatch*)HTMLDOMNODE(node)); - TRACE("%s <<<\n", debugstr_w(event_info[eid].name)); + call_event_handlers(doc, node->event_target, eid, (IDispatch*)HTMLDOMNODE(node)); } if(!(event_info[eid].flags & EVENT_BUBBLE)) @@ -506,13 +529,11 @@ void fire_event(HTMLDocument *doc, eventid_t eid, nsIDOMNode *target) if(nsnode) nsIDOMNode_Release(nsnode); - if((event_info[eid].flags & EVENT_BUBBLE) && doc->event_target && doc->event_target->event_table[eid]) { + if(event_info[eid].flags & EVENT_BUBBLE) { if(!event_obj) event_obj = doc->window->event = create_event(get_node(doc, target, TRUE)); - TRACE("doc %s >>>\n", debugstr_w(event_info[eid].name)); - call_disp_func(doc, doc->event_target->event_table[eid], (IDispatch*)HTMLDOC(doc)); - TRACE("doc %s <<<\n", debugstr_w(event_info[eid].name)); + call_event_handlers(doc, doc->event_target, eid, (IDispatch*)HTMLDOC(doc)); } if(event_obj) { diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index ecae0a5..e98666b 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -692,7 +692,7 @@ DWORD set_task_timer(HTMLDocument*,DWORD,BOOL,IDispatch*); HRESULT clear_task_timer(HTMLDocument*,BOOL,DWORD); void release_typelib(void); -void call_disp_func(HTMLDocument*,IDispatch*,IDispatch*); +HRESULT call_disp_func(IDispatch*,DISPPARAMS*); const char *debugstr_variant(const VARIANT*);

1 0

Jacek Caban : mshtml.idl: Added missing hidden attributes.
by Alexandre Julliard Sept. 8, 2009

Sept. 8, 2009

Module: wine Branch: master Commit: 872a89436db834e65f0ba93f4d2065643bcf3417 URL: http://source.winehq.org/git/wine.git/?a=commit;h=872a89436db834e65f0ba93f4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 6 18:53:48 2009 +0200 mshtml.idl: Added missing hidden attributes. --- include/mshtml.idl | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/mshtml.idl b/include/mshtml.idl index 740c6c5..8fab91b 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -13172,7 +13172,7 @@ interface IOmNavigator : IDispatch [propget, id(DISPID_IOMNAVIGATOR_SYSTEMLANGUAGE)] HRESULT systemLanguage([retval, out] BSTR *p); - [propget, id(DISPID_IOMNAVIGATOR_BROWSERLANGUAGE)] + [propget, id(DISPID_IOMNAVIGATOR_BROWSERLANGUAGE), hidden] HRESULT browserLanguage([retval, out] BSTR *p); [propget, id(DISPID_IOMNAVIGATOR_USERLANGUAGE)] @@ -13184,7 +13184,7 @@ interface IOmNavigator : IDispatch [propget, id(DISPID_IOMNAVIGATOR_APPMINORVERSION)] HRESULT appMinorVersion([retval, out] BSTR *p); - [propget, id(DISPID_IOMNAVIGATOR_CONNECTIONSPEED)] + [propget, id(DISPID_IOMNAVIGATOR_CONNECTIONSPEED), hidden] HRESULT connectionSpeed([retval, out] LONG *p); [propget, id(DISPID_IOMNAVIGATOR_ONLINE)]

1 0

Jacek Caban : mshtml: Added GetNextDispID and GetMemberName tests.
by Alexandre Julliard Sept. 8, 2009

Sept. 8, 2009

Module: wine Branch: master Commit: 2aee9e3fc28176758d0eac342c18199ee0873613 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2aee9e3fc28176758d0eac342… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 6 18:53:21 2009 +0200 mshtml: Added GetNextDispID and GetMemberName tests. --- dlls/mshtml/tests/script.c | 66 ++++++++++++++++++++++++++++++++++--------- 1 files changed, 52 insertions(+), 14 deletions(-) diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index 877b58a..f197251 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -636,9 +636,18 @@ static HRESULT WINAPI ActiveScriptParse_AddScriptlet(IActiveScriptParse *iface, return E_NOTIMPL; } +static HRESULT dispex_propput(IDispatchEx *obj, DISPID id, VARIANT *var) +{ + DISPID propput_arg = DISPID_PROPERTYPUT; + DISPPARAMS dp = {var, &propput_arg, 1, 1}; + EXCEPINFO ei = {0}; + + return IDispatchEx_InvokeEx(obj, id, LOCALE_NEUTRAL, DISPATCH_PROPERTYPUT, &dp, NULL, &ei, NULL); +} + static void test_func(IDispatchEx *obj) { - DISPID id, propput_arg = DISPID_PROPERTYPUT; + DISPID id; IDispatchEx *dispex; IDispatch *disp; EXCEPINFO ei; @@ -679,18 +688,52 @@ static void test_func(IDispatchEx *obj) VariantClear(&var); } - dp.cArgs = 1; - dp.rgvarg = &var; - dp.cNamedArgs = 1; - dp.rgdispidNamedArgs = &propput_arg; V_VT(&var) = VT_I4; V_I4(&var) = 100; - hres = IDispatchEx_InvokeEx(obj, id, LOCALE_NEUTRAL, DISPATCH_PROPERTYPUT, &dp, NULL, &ei, NULL); + hres = dispex_propput(obj, id, &var); ok(hres == E_NOTIMPL, "InvokeEx failed: %08x\n", hres); IDispatchEx_Release(dispex); } +static void test_nextdispid(IDispatchEx *dispex) +{ + DISPID last_id = DISPID_STARTENUM, id, dyn_id; + BSTR name; + VARIANT var; + HRESULT hres; + + name = a2bstr("dynVal"); + hres = IDispatchEx_GetDispID(dispex, name, fdexNameCaseSensitive|fdexNameEnsure, &dyn_id); + ok(hres == S_OK, "GetDispID failed: %08x\n", hres); + SysFreeString(name); + + V_VT(&var) = VT_EMPTY; + hres = dispex_propput(dispex, dyn_id, &var); + + while(last_id != dyn_id) { + hres = IDispatchEx_GetNextDispID(dispex, fdexEnumAll, last_id, &id); + ok(hres == S_OK, "GetNextDispID returned: %08x\n", hres); + ok(id != DISPID_STARTENUM, "id == DISPID_STARTENUM\n"); + ok(id != DISPID_IOMNAVIGATOR_TOSTRING, "id == DISPID_IOMNAVIGATOR_TOSTRING\n"); + + hres = IDispatchEx_GetMemberName(dispex, id, &name); + ok(hres == S_OK, "GetMemberName failed: %08x\n", hres); + + if(id == dyn_id) + ok(!strcmp_wa(name, "dynVal"), "name = %s\n", wine_dbgstr_w(name)); + else if(id == DISPID_IOMNAVIGATOR_PLATFORM) + ok(!strcmp_wa(name, "platform"), "name = %s\n", wine_dbgstr_w(name)); + + SysFreeString(name); + last_id = id; + } + + hres = IDispatchEx_GetNextDispID(dispex, 0, id, &id); + ok(hres == S_FALSE, "GetNextDispID returned: %08x\n", hres); + ok(id == DISPID_STARTENUM, "id != DISPID_STARTENUM\n"); +} + static HRESULT WINAPI ActiveScriptParse_ParseScriptText(IActiveScriptParse *iface, LPCOLESTR pstrCode, LPCOLESTR pstrItemName, IUnknown *punkContext, LPCOLESTR pstrDelimiter, CTXARG_T dwSourceContextCookie, ULONG ulStartingLine, @@ -703,7 +746,7 @@ static HRESULT WINAPI ActiveScriptParse_ParseScriptText(IActiveScriptParse *ifac VARIANT var, arg; DISPPARAMS dp; EXCEPINFO ei; - DISPID id, named_arg = DISPID_PROPERTYPUT; + DISPID id; BSTR tmp; HRESULT hres; @@ -750,14 +793,9 @@ static HRESULT WINAPI ActiveScriptParse_ParseScriptText(IActiveScriptParse *ifac ok(hres == S_OK, "GetDispID(document) failed: %08x\n", hres); ok(id, "id == 0\n"); - dp.cArgs = 1; - dp.rgvarg = &var; - dp.cNamedArgs = 1; - dp.rgdispidNamedArgs = &named_arg; V_VT(&var) = VT_I4; V_I4(&var) = 100; - - hres = IDispatchEx_InvokeEx(document, id, LOCALE_NEUTRAL, INVOKE_PROPERTYPUT, &dp, NULL, &ei, NULL); + hres = dispex_propput(document, id, &var); ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); tmp = SysAllocString(testW); @@ -791,7 +829,6 @@ static HRESULT WINAPI ActiveScriptParse_ParseScriptText(IActiveScriptParse *ifac dp.rgdispidNamedArgs = NULL; V_VT(&var) = VT_DISPATCH; V_DISPATCH(&var) = (IDispatch*)&funcDisp; - hres = IDispatchEx_InvokeEx(document, id, LOCALE_NEUTRAL, INVOKE_PROPERTYPUT, &dp, NULL, &ei, NULL); ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); @@ -825,6 +862,7 @@ static HRESULT WINAPI ActiveScriptParse_ParseScriptText(IActiveScriptParse *ifac ok(hres == S_OK, "Could not get IDispatchEx iface: %08x\n", hres); test_func(dispex); + test_nextdispid(dispex); IDispatchEx_Release(dispex); return S_OK;

1 0

Jacek Caban : mshtml: Added GetMemberName implementation.
by Alexandre Julliard Sept. 8, 2009

Sept. 8, 2009

Module: wine Branch: master Commit: 00457c7f3dc9bcd2ba1952d77c7cec5001efb2f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00457c7f3dc9bcd2ba1952d77… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 6 18:52:49 2009 +0200 mshtml: Added GetMemberName implementation. --- dlls/mshtml/dispex.c | 33 +++++++++++++++++++++++++++++++-- 1 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index d21d8ee..c58b3ce 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -892,8 +892,37 @@ static HRESULT WINAPI DispatchEx_GetMemberProperties(IDispatchEx *iface, DISPID static HRESULT WINAPI DispatchEx_GetMemberName(IDispatchEx *iface, DISPID id, BSTR *pbstrName) { DispatchEx *This = DISPATCHEX_THIS(iface); - FIXME("(%p)->(%x %p)\n", This, id, pbstrName); - return E_NOTIMPL; + dispex_data_t *data; + func_info_t *func; + HRESULT hres; + + TRACE("(%p)->(%x %p)\n", This, id, pbstrName); + + if(is_dynamic_dispid(id)) { + DWORD idx = id - DISPID_DYNPROP_0; + + if(!This->dynamic_data || This->dynamic_data->prop_cnt <= idx) + return DISP_E_UNKNOWNNAME; + + *pbstrName = SysAllocString(This->dynamic_data->props[idx].name); + if(!*pbstrName) + return E_OUTOFMEMORY; + + return S_OK; + } + + data = get_dispex_data(This); + if(!data) + return E_FAIL; + + hres = get_builtin_func(data, id, &func); + if(FAILED(hres)) + return hres; + + *pbstrName = SysAllocString(func->name); + if(!*pbstrName) + return E_OUTOFMEMORY; + return S_OK; } static HRESULT WINAPI DispatchEx_GetNextDispID(IDispatchEx *iface, DWORD grfdex, DISPID id, DISPID *pid)

1 0