September 2009 - Wine-commits

Dmitry Timoshkov : user32: Send the same lParam with WM_SYSCOMMAND/ SC_CLOSE as was received with WM_NCLBUTTONDOWN.
by Alexandre Julliard 09 Sep '09

09 Sep '09

Module: wine Branch: master Commit: 07a002f3b4d4d8c3aeac4721c76f97d104c3ac5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=07a002f3b4d4d8c3aeac4721c… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Sep 9 17:22:33 2009 +0900 user32: Send the same lParam with WM_SYSCOMMAND/SC_CLOSE as was received with WM_NCLBUTTONDOWN. --- dlls/user32/nonclient.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index 708ed80..3353126 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -1316,7 +1316,7 @@ static void NC_TrackMinMaxBox( HWND hwnd, WORD wParam ) * * Track a mouse button press on the Win95 close button. */ -static void NC_TrackCloseButton (HWND hwnd, WORD wParam) +static void NC_TrackCloseButton (HWND hwnd, WPARAM wParam, LPARAM lParam) { MSG msg; HDC hdc; @@ -1364,7 +1364,7 @@ static void NC_TrackCloseButton (HWND hwnd, WORD wParam) ReleaseDC( hwnd, hdc ); if (!pressed) return; - SendMessageW( hwnd, WM_SYSCOMMAND, SC_CLOSE, MAKELONG(msg.pt.x,msg.pt.y) ); + SendMessageW( hwnd, WM_SYSCOMMAND, SC_CLOSE, lParam ); } @@ -1442,7 +1442,7 @@ LRESULT NC_HandleNCLButtonDown( HWND hwnd, WPARAM wParam, LPARAM lParam ) break; case HTCLOSE: - NC_TrackCloseButton (hwnd, wParam); + NC_TrackCloseButton (hwnd, wParam, lParam); break; case HTLEFT:

1 0

Dmitry Timoshkov : winex11.drv: Handle WM_DELETE_WINDOW by simulating clicking the caption Close button.
by Alexandre Julliard 09 Sep '09

09 Sep '09

Module: wine Branch: master Commit: 9dbdd708e3530ace523bd3dc047bee6d17b65871 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9dbdd708e3530ace523bd3dc0… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Sep 9 17:21:52 2009 +0900 winex11.drv: Handle WM_DELETE_WINDOW by simulating clicking the caption Close button. --- dlls/winex11.drv/event.c | 8 ++++++-- dlls/winex11.drv/window.c | 2 -- dlls/winex11.drv/x11drv.h | 1 - 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 9a489cd..542fce8 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -511,6 +511,7 @@ static void handle_wm_protocols( HWND hwnd, XClientMessageEvent *event ) if (IsWindowEnabled(hwnd)) { HMENU hSysMenu; + POINT pt; if (GetClassLongW(hwnd, GCL_STYLE) & CS_NOCLOSE) return; hSysMenu = GetSystemMenu(hwnd, FALSE); @@ -524,7 +525,7 @@ static void handle_wm_protocols( HWND hwnd, XClientMessageEvent *event ) { LRESULT ma = SendMessageW( hwnd, WM_MOUSEACTIVATE, (WPARAM)GetAncestor( hwnd, GA_ROOT ), - MAKELONG(HTCLOSE,WM_LBUTTONDOWN) ); + MAKELPARAM( HTCLOSE, WM_NCLBUTTONDOWN ) ); switch(ma) { case MA_NOACTIVATEANDEAT: @@ -541,7 +542,10 @@ static void handle_wm_protocols( HWND hwnd, XClientMessageEvent *event ) break; } } - PostMessageW( hwnd, WM_X11DRV_DELETE_WINDOW, 0, 0 ); + /* Simulate clicking the caption Close button */ + GetCursorPos( &pt ); + PostMessageW( hwnd, WM_NCLBUTTONDOWN, HTCLOSE, MAKELPARAM( pt.x, pt.y ) ); + PostMessageW( hwnd, WM_LBUTTONUP, HTCLOSE, MAKELPARAM( pt.x, pt.y ) ); } } else if (protocol == x11drv_atom(WM_TAKE_FOCUS)) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 19551fa..4bbd5de 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2308,8 +2308,6 @@ LRESULT CDECL X11DRV_WindowMessage( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) { case WM_X11DRV_ACQUIRE_SELECTION: return X11DRV_AcquireClipboard( hwnd ); - case WM_X11DRV_DELETE_WINDOW: - return SendMessageW( hwnd, WM_SYSCOMMAND, SC_CLOSE, 0 ); case WM_X11DRV_SET_WIN_FORMAT: return set_win_format( hwnd, (XID)wp ); case WM_X11DRV_SET_WIN_REGION: diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 404be34..eb84089 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -700,7 +700,6 @@ extern DWORD EVENT_x11_time_to_win32_time(Time time); enum x11drv_window_messages { WM_X11DRV_ACQUIRE_SELECTION = 0x80001000, - WM_X11DRV_DELETE_WINDOW, WM_X11DRV_SET_WIN_FORMAT, WM_X11DRV_SET_WIN_REGION, WM_X11DRV_RESIZE_DESKTOP

1 0

Jacek Caban : mshtml: Added IHTMLElement::dblclick property implementation.
by Alexandre Julliard 09 Sep '09

09 Sep '09

Module: wine Branch: master Commit: c89b4aec9914d18f469746075906dd79cb8570fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=c89b4aec9914d18f469746075… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 8 22:32:47 2009 +0200 mshtml: Added IHTMLElement::dblclick property implementation. --- dlls/mshtml/htmlelem.c | 12 ++++++++---- dlls/mshtml/htmlevent.c | 4 ++++ dlls/mshtml/htmlevent.h | 1 + 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 84f6309..c2be17e 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -431,15 +431,19 @@ static HRESULT WINAPI HTMLElement_get_onclick(IHTMLElement *iface, VARIANT *p) static HRESULT WINAPI HTMLElement_put_ondblclick(IHTMLElement *iface, VARIANT v) { HTMLElement *This = HTMLELEM_THIS(iface); - FIXME("(%p)->()\n", This); - return E_NOTIMPL; + + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_node_event(&This->node, EVENTID_DBLCLICK, &v); } static HRESULT WINAPI HTMLElement_get_ondblclick(IHTMLElement *iface, VARIANT *p) { HTMLElement *This = HTMLELEM_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_node_event(&This->node, EVENTID_DBLCLICK, p); } static HRESULT WINAPI HTMLElement_put_onkeydown(IHTMLElement *iface, VARIANT v) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index c18104b..59fa6ff 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -54,6 +54,9 @@ static const WCHAR onchangeW[] = {'o','n','c','h','a','n','g','e',0}; static const WCHAR clickW[] = {'c','l','i','c','k',0}; static const WCHAR onclickW[] = {'o','n','c','l','i','c','k',0}; +static const WCHAR dblclickW[] = {'d','b','l','c','l','i','c','k',0}; +static const WCHAR ondblclickW[] = {'o','n','d','b','l','c','l','i','c','k',0}; + static const WCHAR dragW[] = {'d','r','a','g',0}; static const WCHAR ondragW[] = {'o','n','d','r','a','g',0}; @@ -105,6 +108,7 @@ static const event_info_t event_info[] = { {blurW, onblurW, EVENT_DEFAULTLISTENER}, {changeW, onchangeW, EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, {clickW, onclickW, EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, + {dblclickW, ondblclickW, EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, {dragW, ondragW, 0}, {dragstartW, ondragstartW, 0}, {focusW, onfocusW, EVENT_DEFAULTLISTENER}, diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 89d9526..c2f541d 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -21,6 +21,7 @@ typedef enum { EVENTID_BLUR, EVENTID_CHANGE, EVENTID_CLICK, + EVENTID_DBLCLICK, EVENTID_DRAG, EVENTID_DRAGSTART, EVENTID_FOCUS,

1 0

Jacek Caban : mshtml: Fire beforeunload event on body element.
by Alexandre Julliard 09 Sep '09

09 Sep '09

Module: wine Branch: master Commit: e79e4098195676fa1ea7ae59efa49fb875f26075 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e79e4098195676fa1ea7ae59e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 8 22:32:08 2009 +0200 mshtml: Fire beforeunload event on body element. --- dlls/mshtml/htmlevent.c | 18 +++++++++++++++++- 1 files changed, 17 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 3ba45da..c18104b 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -98,9 +98,10 @@ typedef struct { #define EVENT_DEFAULTLISTENER 0x0001 #define EVENT_BUBBLE 0x0002 +#define EVENT_FORWARDBODY 0x0004 static const event_info_t event_info[] = { - {beforeunloadW, onbeforeunloadW, EVENT_DEFAULTLISTENER}, + {beforeunloadW, onbeforeunloadW, EVENT_DEFAULTLISTENER|EVENT_FORWARDBODY}, {blurW, onblurW, EVENT_DEFAULTLISTENER}, {changeW, onchangeW, EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, {clickW, onclickW, EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, @@ -771,6 +772,21 @@ void fire_event(HTMLDocument *doc, eventid_t eid, nsIDOMNode *target, nsIDOMEven break; case DOCUMENT_NODE: + if(event_info[eid].flags & EVENT_FORWARDBODY) { + nsIDOMHTMLElement *nsbody; + nsresult nsres; + + nsres = nsIDOMHTMLDocument_GetBody(doc->nsdoc, &nsbody); + if(NS_SUCCEEDED(nsres) && nsbody) { + node = get_node(doc, (nsIDOMNode*)nsbody, FALSE); + if(node) + call_event_handlers(doc, event_obj, *get_node_event_target(node), eid, (IDispatch*)HTMLDOMNODE(node)); + nsIDOMHTMLElement_Release(nsbody); + }else { + ERR("Could not get body: %08x\n", nsres); + } + } + call_event_handlers(doc, event_obj, doc->event_target, eid, (IDispatch*)HTMLDOC(doc)); break;

1 0

Jacek Caban : mshtml: Added support for document events in fire_event.
by Alexandre Julliard 09 Sep '09

09 Sep '09

Module: wine Branch: master Commit: 603d8ed926f7396a542032067111d79c2083fe07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=603d8ed926f7396a542032067… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 8 22:31:35 2009 +0200 mshtml: Added support for document events in fire_event. --- dlls/mshtml/htmlevent.c | 45 +++++++++++++++++++++++++-------------------- 1 files changed, 25 insertions(+), 20 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 22043ed..3ba45da 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -739,43 +739,48 @@ void fire_event(HTMLDocument *doc, eventid_t eid, nsIDOMNode *target, nsIDOMEven HTMLDOMNode *node; PRUint16 node_type; - nsIDOMNode_GetNodeType(target, &node_type); - if(node_type != ELEMENT_NODE) { - FIXME("node type %d node supported\n", node_type); - return; - } + TRACE("(%p) %s\n", doc, debugstr_w(event_info[eid].name)); prev_event = doc->window->event; event_obj = doc->window->event = create_event(get_node(doc, target, TRUE), eid, nsevent); + + nsIDOMNode_GetNodeType(target, &node_type); nsnode = target; nsIDOMNode_AddRef(nsnode); - while(1) { - node = get_node(doc, nsnode, FALSE); + switch(node_type) { + case ELEMENT_NODE: + do { + node = get_node(doc, nsnode, FALSE); + if(node) + call_event_handlers(doc, event_obj, *get_node_event_target(node), eid, (IDispatch*)HTMLDOMNODE(node)); + + if(!(event_info[eid].flags & EVENT_BUBBLE)) + break; - if(node) - call_event_handlers(doc, event_obj, *get_node_event_target(node), eid, (IDispatch*)HTMLDOMNODE(node)); + nsIDOMNode_GetParentNode(nsnode, &parent); + nsIDOMNode_Release(nsnode); + nsnode = parent; + if(!nsnode) + break; + + nsIDOMNode_GetNodeType(nsnode, &node_type); + }while(node_type == ELEMENT_NODE); if(!(event_info[eid].flags & EVENT_BUBBLE)) break; - nsIDOMNode_GetParentNode(nsnode, &parent); - nsIDOMNode_Release(nsnode); - nsnode = parent; - if(!nsnode) - break; + case DOCUMENT_NODE: + call_event_handlers(doc, event_obj, doc->event_target, eid, (IDispatch*)HTMLDOC(doc)); + break; - nsIDOMNode_GetNodeType(nsnode, &node_type); - if(node_type != ELEMENT_NODE) - break; + default: + FIXME("unimplemented node type %d\n", node_type); } if(nsnode) nsIDOMNode_Release(nsnode); - if(event_info[eid].flags & EVENT_BUBBLE) - call_event_handlers(doc, event_obj, doc->event_target, eid, (IDispatch*)HTMLDOC(doc)); - IHTMLEventObj_Release(event_obj); doc->window->event = prev_event; }

1 0

Jacek Caban : mshtml: Added IHTMLWindow3::attachEvent implementation.
by Alexandre Julliard 09 Sep '09

09 Sep '09

Module: wine Branch: master Commit: dfc27cd720f5fa248e26e5f4f92e22fe9096bc71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfc27cd720f5fa248e26e5f4f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 8 22:31:10 2009 +0200 mshtml: Added IHTMLWindow3::attachEvent implementation. --- dlls/mshtml/htmlwindow.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 91b56f0..869b13c 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -995,8 +995,10 @@ static HRESULT WINAPI HTMLWindow3_get_screenTop(IHTMLWindow3 *iface, LONG *p) static HRESULT WINAPI HTMLWindow3_attachEvent(IHTMLWindow3 *iface, BSTR event, IDispatch *pDisp, VARIANT_BOOL *pfResult) { HTMLWindow *This = HTMLWINDOW3_THIS(iface); - FIXME("(%p)->(%s %p %p)\n", This, debugstr_w(event), pDisp, pfResult); - return E_NOTIMPL; + + TRACE("(%p)->(%s %p %p)\n", This, debugstr_w(event), pDisp, pfResult); + + return attach_event(&This->event_target, This->doc, event, pDisp, pfResult); } static HRESULT WINAPI HTMLWindow3_detachEvent(IHTMLWindow3 *iface, BSTR event, IDispatch *pDisp)

1 0

Jacek Caban : mshtml: Added IHTMLWindow2::onload property.
by Alexandre Julliard 09 Sep '09

09 Sep '09

Module: wine Branch: master Commit: eb5660284a6459184246b130d14adb5bb63aff1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb5660284a6459184246b130d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 8 22:30:38 2009 +0200 mshtml: Added IHTMLWindow2::onload property. --- dlls/mshtml/htmlwindow.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 7827d51..91b56f0 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -498,15 +498,19 @@ static HRESULT WINAPI HTMLWindow2_get_onblur(IHTMLWindow2 *iface, VARIANT *p) static HRESULT WINAPI HTMLWindow2_put_onload(IHTMLWindow2 *iface, VARIANT v) { HTMLWindow *This = HTMLWINDOW2_THIS(iface); - FIXME("(%p)->(v(%d))\n", This, V_VT(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_window_event(This, EVENTID_LOAD, &v); } static HRESULT WINAPI HTMLWindow2_get_onload(IHTMLWindow2 *iface, VARIANT *p) { HTMLWindow *This = HTMLWINDOW2_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_window_event(This, EVENTID_LOAD, p); } static HRESULT WINAPI HTMLWindow2_put_onbeforeunload(IHTMLWindow2 *iface, VARIANT v)

1 0

Jacek Caban : mshtml: Added IHTMLWindow2:: onbeforeunload property implementation.
by Alexandre Julliard 09 Sep '09

09 Sep '09

Module: wine Branch: master Commit: c7496aee8f33b1e22276804ab5a8bc44aa11615d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7496aee8f33b1e22276804ab… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 8 22:30:14 2009 +0200 mshtml: Added IHTMLWindow2::onbeforeunload property implementation. --- dlls/mshtml/htmlevent.c | 4 ++++ dlls/mshtml/htmlevent.h | 11 +++++++++++ dlls/mshtml/htmlwindow.c | 12 ++++++++---- 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 5804615..22043ed 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -42,6 +42,9 @@ struct event_target_t { handler_vector_t *event_table[EVENTID_LAST]; }; +static const WCHAR beforeunloadW[] = {'b','e','f','o','r','e','u','n','l','o','a','d',0}; +static const WCHAR onbeforeunloadW[] = {'o','n','b','e','f','o','r','e','u','n','l','o','a','d',0}; + static const WCHAR blurW[] = {'b','l','u','r',0}; static const WCHAR onblurW[] = {'o','n','b','l','u','r',0}; @@ -97,6 +100,7 @@ typedef struct { #define EVENT_BUBBLE 0x0002 static const event_info_t event_info[] = { + {beforeunloadW, onbeforeunloadW, EVENT_DEFAULTLISTENER}, {blurW, onblurW, EVENT_DEFAULTLISTENER}, {changeW, onchangeW, EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, {clickW, onclickW, EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index f1d208c..89d9526 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -17,6 +17,7 @@ */ typedef enum { + EVENTID_BEFOREUNLOAD, EVENTID_BLUR, EVENTID_CHANGE, EVENTID_CLICK, @@ -67,3 +68,13 @@ static inline HRESULT get_doc_event(HTMLDocument *doc, eventid_t eid, VARIANT *v { return get_event_handler(&doc->event_target, eid, var); } + +static inline HRESULT set_window_event(HTMLWindow *window, eventid_t eid, VARIANT *var) +{ + return set_event_handler(&window->event_target, window->doc, eid, var); +} + +static inline HRESULT get_window_event(HTMLWindow *window, eventid_t eid, VARIANT *var) +{ + return get_event_handler(&window->event_target, eid, var); +} diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 3a52db6..7827d51 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -512,15 +512,19 @@ static HRESULT WINAPI HTMLWindow2_get_onload(IHTMLWindow2 *iface, VARIANT *p) static HRESULT WINAPI HTMLWindow2_put_onbeforeunload(IHTMLWindow2 *iface, VARIANT v) { HTMLWindow *This = HTMLWINDOW2_THIS(iface); - FIXME("(%p)->(v(%d))\n", This, V_VT(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(v(%d))\n", This, V_VT(&v)); + + return set_window_event(This, EVENTID_BEFOREUNLOAD, &v); } static HRESULT WINAPI HTMLWindow2_get_onbeforeunload(IHTMLWindow2 *iface, VARIANT *p) { HTMLWindow *This = HTMLWINDOW2_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_window_event(This, EVENTID_BEFOREUNLOAD, p); } static HRESULT WINAPI HTMLWindow2_put_onunload(IHTMLWindow2 *iface, VARIANT v)

1 0

Jacek Caban : mshtml: Store body event target in window object.
by Alexandre Julliard 09 Sep '09

09 Sep '09

Module: wine Branch: master Commit: b481b09248cae25d3f771161d32ad403a5e0aaa9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b481b09248cae25d3f771161d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 8 22:29:39 2009 +0200 mshtml: Store body event target in window object. --- dlls/mshtml/htmlbody.c | 12 +++++++++++- dlls/mshtml/htmlelem2.c | 2 +- dlls/mshtml/htmlevent.c | 4 ++-- dlls/mshtml/htmlevent.h | 9 +++++++-- dlls/mshtml/htmlinput.c | 1 + dlls/mshtml/htmlselect.c | 1 + dlls/mshtml/htmltextarea.c | 1 + dlls/mshtml/htmlwindow.c | 3 +++ dlls/mshtml/mshtml_private.h | 2 ++ 9 files changed, 29 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index b8e0f95..da5d70a 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -718,11 +718,21 @@ static void HTMLBodyElement_destructor(HTMLDOMNode *iface) HTMLElement_destructor(&This->textcont.element.node); } +static event_target_t **HTMLBodyElement_get_event_target(HTMLDOMNode *iface) +{ + HTMLBodyElement *This = HTMLBODY_NODE_THIS(iface); + + return This->textcont.element.node.doc && This->textcont.element.node.doc->window + ? &This->textcont.element.node.doc->window->event_target + : &This->textcont.element.node.event_target; +} + #undef HTMLBODY_NODE_THIS static const NodeImplVtbl HTMLBodyElementImplVtbl = { HTMLBodyElement_QI, - HTMLBodyElement_destructor + HTMLBodyElement_destructor, + HTMLBodyElement_get_event_target }; static const tid_t HTMLBodyElement_iface_tids[] = { diff --git a/dlls/mshtml/htmlelem2.c b/dlls/mshtml/htmlelem2.c index 542baa7..1120c79 100644 --- a/dlls/mshtml/htmlelem2.c +++ b/dlls/mshtml/htmlelem2.c @@ -608,7 +608,7 @@ static HRESULT WINAPI HTMLElement2_attachEvent(IHTMLElement2 *iface, BSTR event, TRACE("(%p)->(%s %p %p)\n", This, debugstr_w(event), pDisp, pfResult); - return attach_event(&This->node.event_target, This->node.doc, event, pDisp, pfResult); + return attach_event(get_node_event_target(&This->node), This->node.doc, event, pDisp, pfResult); } static HRESULT WINAPI HTMLElement2_detachEvent(IHTMLElement2 *iface, BSTR event, IDispatch *pDisp) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 4bde49a..5804615 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -750,7 +750,7 @@ void fire_event(HTMLDocument *doc, eventid_t eid, nsIDOMNode *target, nsIDOMEven node = get_node(doc, nsnode, FALSE); if(node) - call_event_handlers(doc, event_obj, node->event_target, eid, (IDispatch*)HTMLDOMNODE(node)); + call_event_handlers(doc, event_obj, *get_node_event_target(node), eid, (IDispatch*)HTMLDOMNODE(node)); if(!(event_info[eid].flags & EVENT_BUBBLE)) break; @@ -931,7 +931,7 @@ void check_event_attr(HTMLDocument *doc, nsIDOMElement *nselem) disp = script_parse_event(doc, attr_value); if(disp) { node = get_node(doc, (nsIDOMNode*)nselem, TRUE); - set_event_handler_disp(&node->event_target, node->doc, i, disp); + set_event_handler_disp(get_node_event_target(node), node->doc, i, disp); IDispatch_Release(disp); } } diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 3ea3d9d..f1d208c 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -43,14 +43,19 @@ HRESULT set_event_handler(event_target_t**,HTMLDocument*,eventid_t,VARIANT*); HRESULT get_event_handler(event_target_t**,eventid_t,VARIANT*); HRESULT attach_event(event_target_t**,HTMLDocument*,BSTR,IDispatch*,VARIANT_BOOL*); +static inline event_target_t **get_node_event_target(HTMLDOMNode *node) +{ + return node->vtbl->get_event_target ? node->vtbl->get_event_target(node) : &node->event_target; +} + static inline HRESULT set_node_event(HTMLDOMNode *node, eventid_t eid, VARIANT *var) { - return set_event_handler(&node->event_target, node->doc, eid, var); + return set_event_handler(get_node_event_target(node), node->doc, eid, var); } static inline HRESULT get_node_event(HTMLDOMNode *node, eventid_t eid, VARIANT *var) { - return get_event_handler(&node->event_target, eid, var); + return get_event_handler(get_node_event_target(node), eid, var); } static inline HRESULT set_doc_event(HTMLDocument *doc, eventid_t eid, VARIANT *var) diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index df7cb5f..48f19c8 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -1119,6 +1119,7 @@ static HRESULT HTMLInputElementImpl_get_disabled(HTMLDOMNode *iface, VARIANT_BOO static const NodeImplVtbl HTMLInputElementImplVtbl = { HTMLInputElement_QI, HTMLInputElement_destructor, + NULL, HTMLInputElementImpl_put_disabled, HTMLInputElementImpl_get_disabled, }; diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index 2264dfa..21afc92 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -480,6 +480,7 @@ static HRESULT HTMLSelectElementImpl_get_disabled(HTMLDOMNode *iface, VARIANT_BO static const NodeImplVtbl HTMLSelectElementImplVtbl = { HTMLSelectElement_QI, HTMLSelectElement_destructor, + NULL, HTMLSelectElementImpl_put_disabled, HTMLSelectElementImpl_get_disabled }; diff --git a/dlls/mshtml/htmltextarea.c b/dlls/mshtml/htmltextarea.c index e72a761..bec4a2f 100644 --- a/dlls/mshtml/htmltextarea.c +++ b/dlls/mshtml/htmltextarea.c @@ -405,6 +405,7 @@ static HRESULT HTMLTextAreaElementImpl_get_disabled(HTMLDOMNode *iface, VARIANT_ static const NodeImplVtbl HTMLTextAreaElementImplVtbl = { HTMLTextAreaElement_QI, HTMLTextAreaElement_destructor, + NULL, HTMLTextAreaElementImpl_put_disabled, HTMLTextAreaElementImpl_get_disabled }; diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index d50eca1..3a52db6 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -29,6 +29,7 @@ #include "wine/unicode.h" #include "mshtml_private.h" +#include "htmlevent.h" #include "resource.h" WINE_DEFAULT_DEBUG_CHANNEL(mshtml); @@ -92,6 +93,8 @@ static ULONG WINAPI HTMLWindow2_Release(IHTMLWindow2 *iface) TRACE("(%p) ref=%d\n", This, ref); if(!ref) { + if(This->event_target) + release_event_target(This->event_target); list_remove(&This->entry); release_dispex(&This->dispex); heap_free(This); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index d2b0ef8..4cf12b0 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -164,6 +164,7 @@ typedef struct { HTMLDocument *doc; nsIDOMWindow *nswindow; + event_target_t *event_target; IHTMLEventObj *event; struct list entry; @@ -382,6 +383,7 @@ typedef struct { typedef struct { HRESULT (*qi)(HTMLDOMNode*,REFIID,void**); void (*destructor)(HTMLDOMNode*); + event_target_t **(*get_event_target)(HTMLDOMNode*); HRESULT (*put_disabled)(HTMLDOMNode*,VARIANT_BOOL); HRESULT (*get_disabled)(HTMLDOMNode*,VARIANT_BOOL*); } NodeImplVtbl;

1 0

Jacek Caban : mshtml: Added javascript protocol tests.
by Alexandre Julliard 09 Sep '09

09 Sep '09

Module: wine Branch: master Commit: 284796e4bc678c13c5828859f9484adfd6f847ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=284796e4bc678c13c5828859f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 8 22:29:01 2009 +0200 mshtml: Added javascript protocol tests. --- dlls/mshtml/tests/protocol.c | 117 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 117 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/protocol.c b/dlls/mshtml/tests/protocol.c index 6898742..1369ff7 100644 --- a/dlls/mshtml/tests/protocol.c +++ b/dlls/mshtml/tests/protocol.c @@ -20,6 +20,7 @@ #include <wine/test.h> #include <stdarg.h> +#include <stdio.h> #include "windef.h" #include "winbase.h" @@ -56,6 +57,7 @@ DEFINE_GUID(CLSID_ResProtocol, 0x3050F3BC, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B); DEFINE_GUID(CLSID_AboutProtocol, 0x3050F406, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B); +DEFINE_GUID(CLSID_JSProtocol, 0x3050F3B2, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B); DEFINE_EXPECT(GetBindInfo); DEFINE_EXPECT(ReportProgress); @@ -69,6 +71,19 @@ static DWORD bindf; static const WCHAR about_blank_url[] = {'a','b','o','u','t',':','b','l','a','n','k',0}; static const WCHAR about_test_url[] = {'a','b','o','u','t',':','t','e','s','t',0}; static const WCHAR about_res_url[] = {'r','e','s',':','b','l','a','n','k',0}; +static const WCHAR javascript_test_url[] = {'j','a','v','a','s','c','r','i','p','t',':','t','e','s','t','(',')',0}; + +static const char *debugstr_guid(REFIID riid) +{ + static char buf[50]; + + sprintf(buf, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", + riid->Data1, riid->Data2, riid->Data3, riid->Data4[0], + riid->Data4[1], riid->Data4[2], riid->Data4[3], riid->Data4[4], + riid->Data4[5], riid->Data4[6], riid->Data4[7]); + + return buf; +} static HRESULT WINAPI ProtocolSink_QueryInterface(IInternetProtocolSink *iface, REFIID riid, void **ppv) { @@ -76,6 +91,9 @@ static HRESULT WINAPI ProtocolSink_QueryInterface(IInternetProtocolSink *iface, *ppv = iface; return S_OK; } + + *ppv = NULL; + ok(0, "unexpected riid %s\n", debugstr_guid(riid)); return E_NOINTERFACE; } @@ -160,6 +178,9 @@ static HRESULT WINAPI BindInfo_QueryInterface(IInternetBindInfo *iface, REFIID r *ppv = iface; return S_OK; } + + *ppv = NULL; + ok(0, "unexpected riid %s\n", debugstr_guid(riid)); return E_NOINTERFACE; } @@ -773,12 +794,108 @@ static void test_about_protocol(void) IUnknown_Release(unk); } +static void test_javascript_protocol(void) +{ + IInternetProtocolInfo *protocol_info; + IUnknown *unk; + IClassFactory *factory; + HRESULT hres; + + hres = CoGetClassObject(&CLSID_JSProtocol, CLSCTX_INPROC_SERVER, NULL, &IID_IUnknown, (void**)&unk); + ok(hres == S_OK, "CoGetClassObject failed: %08x\n", hres); + if(FAILED(hres)) + return; + + hres = IUnknown_QueryInterface(unk, &IID_IInternetProtocolInfo, (void**)&protocol_info); + ok(hres == S_OK, "Could not get IInternetProtocolInfo interface: %08x\n", hres); + if(SUCCEEDED(hres)) { + WCHAR buf[128]; + DWORD size; + int i; + + for(i = PARSE_CANONICALIZE; i <= PARSE_UNESCAPE; i++) { + if(i != PARSE_SECURITY_URL && i != PARSE_DOMAIN) { + hres = IInternetProtocolInfo_ParseUrl(protocol_info, javascript_test_url, i, 0, buf, + sizeof(buf)/sizeof(buf[0]), &size, 0); + ok(hres == INET_E_DEFAULT_ACTION, + "[%d] failed: %08x, expected INET_E_DEFAULT_ACTION\n", i, hres); + } + } + + hres = IInternetProtocolInfo_ParseUrl(protocol_info, javascript_test_url, PARSE_UNESCAPE+1, 0, buf, + sizeof(buf)/sizeof(buf[0]), &size, 0); + ok(hres == INET_E_DEFAULT_ACTION, + "ParseUrl failed: %08x, expected INET_E_DEFAULT_ACTION\n", hres); + + size = 0xdeadbeef; + hres = IInternetProtocolInfo_CombineUrl(protocol_info, javascript_test_url, javascript_test_url, + 0, buf, sizeof(buf)/sizeof(buf[0]), &size, 0); + ok(hres == INET_E_USE_DEFAULT_PROTOCOLHANDLER, "CombineUrl failed: %08x\n", hres); + ok(size == 0xdeadbeef, "size=%d\n", size); + + hres = IInternetProtocolInfo_CompareUrl(protocol_info, javascript_test_url, javascript_test_url, 0); + ok(hres == E_NOTIMPL, "CompareUrl failed: %08x\n", hres); + + for(i=0; i<30; i++) { + switch(i) { + case QUERY_USES_NETWORK: + case QUERY_IS_SECURE: + break; + default: + hres = IInternetProtocolInfo_QueryInfo(protocol_info, javascript_test_url, i, 0, + buf, sizeof(buf), &size, 0); + ok(hres == INET_E_USE_DEFAULT_PROTOCOLHANDLER, + "QueryInfo(%d) returned: %08x, expected INET_E_USE_DEFAULT_PROTOCOLHANDLER\n", i, hres); + } + } + + + memset(buf, '?', sizeof(buf)); + hres = IInternetProtocolInfo_QueryInfo(protocol_info, javascript_test_url, QUERY_USES_NETWORK, 0, + buf, sizeof(buf), &size, 0); + ok(hres == S_OK, "QueryInfo(QUERY_USES_NETWORK) failed: %08x\n", hres); + ok(size == sizeof(DWORD), "size=%d\n", size); + ok(!*(DWORD*)buf, "buf=%d\n", *(DWORD*)buf); + + memset(buf, '?', sizeof(buf)); + hres = IInternetProtocolInfo_QueryInfo(protocol_info, javascript_test_url, QUERY_USES_NETWORK, 0, + buf, sizeof(buf), NULL, 0); + ok(hres == S_OK, "QueryInfo(QUERY_USES_NETWORK) failed: %08x\n", hres); + ok(!*(DWORD*)buf, "buf=%d\n", *(DWORD*)buf); + + hres = IInternetProtocolInfo_QueryInfo(protocol_info, javascript_test_url, QUERY_USES_NETWORK, 0, + buf, 3, &size, 0); + ok(hres == E_FAIL, "QueryInfo(QUERY_USES_NETWORK) failed: %08x, expected E_FAIL\n", hres); + + hres = IInternetProtocolInfo_QueryInfo(protocol_info, javascript_test_url, QUERY_USES_NETWORK, 0, + NULL, sizeof(buf), &size, 0); + ok(hres == E_FAIL, "QueryInfo(QUERY_USES_NETWORK) failed: %08x, expected E_FAIL\n", hres); + + hres = IInternetProtocolInfo_QueryInfo(protocol_info, javascript_test_url, 60, 0, + NULL, sizeof(buf), &size, 0); + ok(hres == INET_E_USE_DEFAULT_PROTOCOLHANDLER, + "QueryInfo failed: %08x, expected INET_E_USE_DEFAULT_PROTOCOLHANDLER\n", hres); + + /* FIXME: test QUERY_IS_SECURE */ + + IInternetProtocolInfo_Release(protocol_info); + } + + hres = IUnknown_QueryInterface(unk, &IID_IClassFactory, (void**)&factory); + ok(hres == S_OK, "Could not get IClassFactory interface\n"); + if(SUCCEEDED(hres)) + IClassFactory_Release(factory); + + IUnknown_Release(unk); +} + START_TEST(protocol) { OleInitialize(NULL); test_res_protocol(); test_about_protocol(); + test_javascript_protocol(); OleUninitialize(); }

1 0