October 2008 - Wine-commits

Jacek Caban : mshtml: Added open and close implementation.
by Alexandre Julliard 13 Oct '08

13 Oct '08

Module: wine Branch: master Commit: 50393191a133be8fd9015556b1617458bcd41bc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50393191a133be8fd9015556b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 10 15:48:46 2008 -0500 mshtml: Added open and close implementation. --- dlls/mshtml/htmldoc.c | 45 +++++++++++++++++++++++++++--- dlls/mshtml/tests/dom.c | 70 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 111 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 4e8f063..7637c29 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -815,15 +815,52 @@ static HRESULT WINAPI HTMLDocument_open(IHTMLDocument2 *iface, BSTR url, VARIANT VARIANT features, VARIANT replace, IDispatch **pomWindowResult) { HTMLDocument *This = HTMLDOC_THIS(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_w(url), pomWindowResult); - return E_NOTIMPL; + nsresult nsres; + + static const WCHAR text_htmlW[] = {'t','e','x','t','/','h','t','m','l',0}; + + TRACE("(%p)->(%s %s %s %s %p)\n", This, debugstr_w(url), debugstr_variant(&name), + debugstr_variant(&features), debugstr_variant(&replace), pomWindowResult); + + if(!This->nsdoc) { + ERR("!nsdoc\n"); + return E_NOTIMPL; + } + + if(!url || strcmpW(url, text_htmlW) || V_VT(&name) != VT_ERROR + || V_VT(&features) != VT_ERROR || V_VT(&replace) != VT_ERROR) + FIXME("unsupported args\n"); + + nsres = nsIDOMHTMLDocument_Open(This->nsdoc); + if(NS_FAILED(nsres)) { + ERR("Open failed: %08x\n", nsres); + return E_FAIL; + } + + *pomWindowResult = (IDispatch*)HTMLWINDOW2(This->window); + IHTMLWindow2_AddRef(HTMLWINDOW2(This->window)); + return S_OK; } static HRESULT WINAPI HTMLDocument_close(IHTMLDocument2 *iface) { HTMLDocument *This = HTMLDOC_THIS(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + nsresult nsres; + + TRACE("(%p)\n", This); + + if(!This->nsdoc) { + ERR("!nsdoc\n"); + return E_NOTIMPL; + } + + nsres = nsIDOMHTMLDocument_Close(This->nsdoc); + if(NS_FAILED(nsres)) { + ERR("Close failed: %08x\n", nsres); + return E_FAIL; + } + + return S_OK; } static HRESULT WINAPI HTMLDocument_clear(IHTMLDocument2 *iface) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 2f91a1c..87d372d 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -387,6 +387,21 @@ static BSTR a2bstr(const char *str) return ret; } +static BOOL iface_cmp(IUnknown *iface1, IUnknown *iface2) +{ + IUnknown *unk1, *unk2; + + if(iface1 == iface2) + return TRUE; + + IUnknown_QueryInterface(iface1, &IID_IUnknown, (void**)&unk1); + IUnknown_Release(unk1); + IUnknown_QueryInterface(iface1, &IID_IUnknown, (void**)&unk2); + IUnknown_Release(unk2); + + return unk1 == unk2; +} + static IHTMLDocument2 *create_document(void) { IHTMLDocument2 *doc; @@ -2630,13 +2645,48 @@ static void test_table_elem(IHTMLElement *elem) IHTMLTable_Release(table); } +static void doc_write(IHTMLDocument2 *doc, const char *text) +{ + SAFEARRAYBOUND dim; + SAFEARRAY *sa; + VARIANT *var; + BSTR str; + HRESULT hres; + + dim.lLbound = 0; + dim.cElements = 1; + sa = SafeArrayCreate(VT_VARIANT, 1, &dim); + SafeArrayAccessData(sa, (void**)&var); + V_VT(var) = VT_BSTR; + V_BSTR(var) = str = a2bstr(text); + SafeArrayUnaccessData(sa); + + hres = IHTMLDocument2_write(doc, sa); + ok(hres == S_OK, "write failed: %08x\n", hres); + + SysFreeString(str); + SafeArrayDestroy(sa); +} + static void test_iframe_elem(IHTMLElement *elem) { + IHTMLElementCollection *col; IHTMLDocument2 *content_doc; IHTMLWindow2 *content_window; IHTMLFrameBase2 *base2; + IDispatch *disp; + VARIANT errv; + BSTR str; HRESULT hres; + static const elem_type_t all_types[] = { + ET_HTML, + ET_HEAD, + ET_TITLE, + ET_BODY, + ET_BR + }; + hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLFrameBase2, (void**)&base2); ok(hres == S_OK, "Could not get IHTMFrameBase2 iface: %08x\n", hres); @@ -2652,6 +2702,26 @@ static void test_iframe_elem(IHTMLElement *elem) ok(hres == S_OK, "get_document failed: %08x\n", hres); ok(content_doc != NULL, "content_doc = NULL\n"); + str = a2bstr("text/html"); + V_VT(&errv) = VT_ERROR; + disp = NULL; + hres = IHTMLDocument2_open(content_doc, str, errv, errv, errv, &disp); + SysFreeString(str); + ok(hres == S_OK, "open failed: %08x\n", hres); + ok(disp != NULL, "disp == NULL\n"); + ok(iface_cmp((IUnknown*)disp, (IUnknown*)content_window), "disp != content_window\n"); + IDispatch_Release(disp); + + doc_write(content_doc, "<html><head><title>test</title></head><body><br /></body></html>"); + + hres = IHTMLDocument2_get_all(content_doc, &col); + ok(hres == S_OK, "get_all failed: %08x\n", hres); + test_elem_collection((IUnknown*)col, all_types, sizeof(all_types)/sizeof(all_types[0])); + IHTMLElementCollection_Release(col); + + hres = IHTMLDocument2_close(content_doc); + ok(hres == S_OK, "close failed: %08x\n", hres); + IHTMLDocument2_Release(content_doc); }

1 0

Jacek Caban : mshtml: Added IHTMLFrameBase2:: get_contentWidnow implementation.
by Alexandre Julliard 13 Oct '08

13 Oct '08

Module: wine Branch: master Commit: f27386fb815a52a821e1a21adc71b8d4234cf423 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f27386fb815a52a821e1a21ad… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 10 15:48:32 2008 -0500 mshtml: Added IHTMLFrameBase2::get_contentWidnow implementation. --- dlls/mshtml/htmldoc.c | 118 ++++++++++++++++++++++++++++------------- dlls/mshtml/htmliframe.c | 39 +++++++++++++- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/tests/dom.c | 35 ++++++++++++- 4 files changed, 152 insertions(+), 41 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index f39688b..4e8f063 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1549,62 +1549,104 @@ static dispex_static_data_t HTMLDocument_dispex = { HTMLDocument_iface_tids }; -HRESULT HTMLDocument_Create(IUnknown *pUnkOuter, REFIID riid, void** ppvObject) +static HRESULT alloc_doc(HTMLDocument **ret) +{ + HTMLDocument *doc; + + doc = heap_alloc_zero(sizeof(HTMLDocument)); + doc->lpHTMLDocument2Vtbl = &HTMLDocumentVtbl; + doc->lpIDispatchExVtbl = &DocDispatchExVtbl; + doc->ref = 1; + doc->readystate = READYSTATE_UNINITIALIZED; + doc->scriptmode = SCRIPTMODE_GECKO; + + list_init(&doc->bindings); + list_init(&doc->script_hosts); + list_init(&doc->selection_list); + list_init(&doc->range_list); + + HTMLDocument_HTMLDocument3_Init(doc); + HTMLDocument_HTMLDocument5_Init(doc); + HTMLDocument_Persist_Init(doc); + HTMLDocument_OleCmd_Init(doc); + HTMLDocument_OleObj_Init(doc); + HTMLDocument_View_Init(doc); + HTMLDocument_Window_Init(doc); + HTMLDocument_Service_Init(doc); + HTMLDocument_Hlink_Init(doc); + + ConnectionPointContainer_Init(&doc->cp_container, (IUnknown*)HTMLDOC(doc)); + ConnectionPoint_Init(&doc->cp_propnotif, &doc->cp_container, &IID_IPropertyNotifySink); + ConnectionPoint_Init(&doc->cp_htmldocevents, &doc->cp_container, &DIID_HTMLDocumentEvents); + ConnectionPoint_Init(&doc->cp_htmldocevents2, &doc->cp_container, &DIID_HTMLDocumentEvents2); + + init_dispex(&doc->dispex, (IUnknown*)HTMLDOC(doc), &HTMLDocument_dispex); + + *ret = doc; + return S_OK; +} + +HRESULT create_doc_from_nsdoc(nsIDOMHTMLDocument *nsdoc, HTMLDocument **ret) { - nsIDOMWindow *nswindow; - HTMLDocument *ret; + HTMLDocument *doc; HRESULT hres; - TRACE("(%p %s %p)\n", pUnkOuter, debugstr_guid(riid), ppvObject); - - ret = heap_alloc_zero(sizeof(HTMLDocument)); - ret->lpHTMLDocument2Vtbl = &HTMLDocumentVtbl; - ret->lpIDispatchExVtbl = &DocDispatchExVtbl; - ret->ref = 0; - ret->readystate = READYSTATE_UNINITIALIZED; - ret->scriptmode = SCRIPTMODE_GECKO; + hres = alloc_doc(&doc); + if(FAILED(hres)) + return hres; - list_init(&ret->bindings); - list_init(&ret->script_hosts); - list_init(&ret->selection_list); - list_init(&ret->range_list); + nsIDOMHTMLDocument_AddRef(nsdoc); + doc->nsdoc = nsdoc; - hres = IHTMLDocument_QueryInterface(HTMLDOC(ret), riid, ppvObject); + hres = HTMLWindow_Create(doc, NULL, &doc->window); if(FAILED(hres)) { - heap_free(ret); + IHTMLDocument_Release(HTMLDOC(doc)); return hres; } - LOCK_MODULE(); + *ret = doc; + return S_OK; +} - HTMLDocument_HTMLDocument3_Init(ret); - HTMLDocument_HTMLDocument5_Init(ret); - HTMLDocument_Persist_Init(ret); - HTMLDocument_OleCmd_Init(ret); - HTMLDocument_OleObj_Init(ret); - HTMLDocument_View_Init(ret); - HTMLDocument_Window_Init(ret); - HTMLDocument_Service_Init(ret); - HTMLDocument_Hlink_Init(ret); +HRESULT HTMLDocument_Create(IUnknown *pUnkOuter, REFIID riid, void** ppvObject) +{ + HTMLDocument *doc; + nsIDOMWindow *nswindow; + HRESULT hres; + + TRACE("(%p %s %p)\n", pUnkOuter, debugstr_guid(riid), ppvObject); - ConnectionPointContainer_Init(&ret->cp_container, (IUnknown*)HTMLDOC(ret)); - ConnectionPoint_Init(&ret->cp_propnotif, &ret->cp_container, &IID_IPropertyNotifySink); - ConnectionPoint_Init(&ret->cp_htmldocevents, &ret->cp_container, &DIID_HTMLDocumentEvents); - ConnectionPoint_Init(&ret->cp_htmldocevents2, &ret->cp_container, &DIID_HTMLDocumentEvents2); + hres = alloc_doc(&doc); + if(FAILED(hres)) + return hres; - init_dispex(&ret->dispex, (IUnknown*)HTMLDOC(ret), &HTMLDocument_dispex); + hres = IHTMLDocument_QueryInterface(HTMLDOC(doc), riid, ppvObject); + IHTMLDocument_Release(HTMLDOC(doc)); + if(FAILED(hres)) + return hres; + + LOCK_MODULE(); - ret->nscontainer = NSContainer_Create(ret, NULL); - update_nsdocument(ret); + doc->nscontainer = NSContainer_Create(doc, NULL); + update_nsdocument(doc); - if(ret->nscontainer) - nsIWebBrowser_GetContentDOMWindow(ret->nscontainer->webbrowser, &nswindow); + if(doc->nscontainer) { + nsresult nsres; - HTMLWindow_Create(ret, nswindow, &ret->window); + nsres = nsIWebBrowser_GetContentDOMWindow(doc->nscontainer->webbrowser, &nswindow); + if(NS_FAILED(nsres)) + ERR("GetContentDOMWindow failed: %08x\n", nsres); + } + + hres = HTMLWindow_Create(doc, nswindow, &doc->window); if(nswindow) nsIDOMWindow_Release(nswindow); + if(FAILED(hres)) { + IHTMLDocument_Release(HTMLDOC(doc)); + return hres; + } get_thread_hwnd(); - return hres; + return S_OK; } diff --git a/dlls/mshtml/htmliframe.c b/dlls/mshtml/htmliframe.c index 232cbfb..f56bc16 100644 --- a/dlls/mshtml/htmliframe.c +++ b/dlls/mshtml/htmliframe.c @@ -38,6 +38,7 @@ typedef struct { LONG ref; nsIDOMHTMLIFrameElement *nsiframe; + HTMLDocument *content_doc; } HTMLIFrame; #define HTMLFRAMEBASE2(x) ((IHTMLFrameBase2*) &(x)->lpIHTMLFrameBase2Vtbl) @@ -100,8 +101,40 @@ static HRESULT WINAPI HTMLIFrameBase2_Invoke(IHTMLFrameBase2 *iface, DISPID disp static HRESULT WINAPI HTMLIFrameBase2_get_contentWindow(IHTMLFrameBase2 *iface, IHTMLWindow2 **p) { HTMLIFrame *This = HTMLFRAMEBASE2_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + if(!This->content_doc) { + nsIDOMHTMLDocument *nshtmldoc; + nsIDOMDocument *nsdoc; + nsresult nsres; + HRESULT hres; + + nsres = nsIDOMHTMLIFrameElement_GetContentDocument(This->nsiframe, &nsdoc); + if(NS_FAILED(nsres)) { + ERR("GetContentDocument failed: %08x\n", nsres); + return E_FAIL; + } + + if(!nsdoc) { + FIXME("NULL contentDocument\n"); + return E_FAIL; + } + + nsres = nsIDOMDocument_QueryInterface(nsdoc, &IID_nsIDOMHTMLDocument, (void**)&nshtmldoc); + nsIDOMDocument_Release(nsdoc); + if(NS_FAILED(nsres)) { + ERR("Could not get nsIDOMHTMLDocument iface: %08x\n", nsres); + return E_FAIL; + } + + hres = create_doc_from_nsdoc(nshtmldoc, &This->content_doc); + nsIDOMHTMLDocument_Release(nshtmldoc); + if(FAILED(hres)) + return hres; + } + + return IHTMLDocument2_get_parentWindow(HTMLDOC(This->content_doc), p); } static HRESULT WINAPI HTMLIFrameBase2_put_onload(IHTMLFrameBase2 *iface, VARIANT v) @@ -196,6 +229,8 @@ static void HTMLIFrame_destructor(HTMLDOMNode *iface) { HTMLIFrame *This = HTMLIFRAME_NODE_THIS(iface); + if(This->content_doc) + IHTMLDocument2_Release(HTMLDOC(This->content_doc)); if(This->nsiframe) nsIDOMHTMLIFrameElement_Release(This->nsiframe); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index c39d245..cdd4293 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -459,6 +459,7 @@ typedef struct { HRESULT HTMLDocument_Create(IUnknown*,REFIID,void**); HRESULT HTMLLoadOptions_Create(IUnknown*,REFIID,void**); +HRESULT create_doc_from_nsdoc(nsIDOMHTMLDocument*,HTMLDocument**); HRESULT HTMLWindow_Create(HTMLDocument*,nsIDOMWindow*,HTMLWindow**); HTMLWindow *nswindow_to_window(const nsIDOMWindow*); diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index e15b607..2f91a1c 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -49,7 +49,7 @@ static const char elem_test_str[] = "<script id=\"sc\" type=\"text/javascript\"></script>" "<test />" "<img id=\"imgid\"/>" - "<iframe src=\"about:blank\"></iframe>" + "<iframe src=\"about:blank\" id=\"ifr\"></iframe>" "</body></html>"; static const char indent_test_str[] = "<html><head><title>test</title></head><body>abc<br /><a href=\"about:blank\">123</a></body></html>"; @@ -2630,6 +2630,31 @@ static void test_table_elem(IHTMLElement *elem) IHTMLTable_Release(table); } +static void test_iframe_elem(IHTMLElement *elem) +{ + IHTMLDocument2 *content_doc; + IHTMLWindow2 *content_window; + IHTMLFrameBase2 *base2; + HRESULT hres; + + hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLFrameBase2, (void**)&base2); + ok(hres == S_OK, "Could not get IHTMFrameBase2 iface: %08x\n", hres); + + content_window = NULL; + hres = IHTMLFrameBase2_get_contentWindow(base2, &content_window); + IHTMLFrameBase2_Release(base2); + ok(hres == S_OK, "get_contentWindow failed: %08x\n", hres); + ok(content_window != NULL, "contentWindow = NULL\n"); + + content_doc = NULL; + hres = IHTMLWindow2_get_document(content_window, &content_doc); + IHTMLWindow2_Release(content_window); + ok(hres == S_OK, "get_document failed: %08x\n", hres); + ok(content_doc != NULL, "content_doc = NULL\n"); + + IHTMLDocument2_Release(content_doc); +} + static void test_stylesheet(IDispatch *disp) { IHTMLStyleSheetRulesCollection *col = NULL; @@ -2748,6 +2773,7 @@ static void test_elems(IHTMLDocument2 *doc) static const WCHAR xxxW[] = {'x','x','x',0}; static const WCHAR tblW[] = {'t','b','l',0}; static const WCHAR row2W[] = {'r','o','w','2',0}; + static const WCHAR ifrW[] = {'i','f','r',0}; static const elem_type_t all_types[] = { ET_HTML, @@ -2948,6 +2974,13 @@ static void test_elems(IHTMLDocument2 *doc) IHTMLElement_Release(elem); } + elem = get_doc_elem_by_id(doc, ifrW); + ok(elem != NULL, "elem == NULL\n"); + if(elem) { + test_iframe_elem(elem); + IHTMLElement_Release(elem); + } + hres = IHTMLDocument2_get_body(doc, &elem); ok(hres == S_OK, "get_body failed: %08x\n", hres);

1 0

Jacek Caban : mshtml: Don't crash in notif_focus if client is NULL.
by Alexandre Julliard 13 Oct '08

13 Oct '08

Module: wine Branch: master Commit: b5aa4dd8e6b5ee2120a88168b41fe08e95f8c8b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5aa4dd8e6b5ee2120a88168b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 10 15:47:54 2008 -0500 mshtml: Don't crash in notif_focus if client is NULL. --- dlls/mshtml/view.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/view.c b/dlls/mshtml/view.c index bba0f23..6bc5e92 100644 --- a/dlls/mshtml/view.c +++ b/dlls/mshtml/view.c @@ -168,6 +168,9 @@ void notif_focus(HTMLDocument *This) IOleControlSite *site; HRESULT hres; + if(!This->client) + return; + hres = IOleClientSite_QueryInterface(This->client, &IID_IOleControlSite, (void**)&site); if(FAILED(hres)) return;

1 0

Jacek Caban : mshtml: Move GetContentDOMWindow call from HTMLWindow_Create.
by Alexandre Julliard 13 Oct '08

13 Oct '08

Module: wine Branch: master Commit: 676d4af4f6d68ffffcb679646cb8a53b3982b05c URL: http://source.winehq.org/git/wine.git/?a=commit;h=676d4af4f6d68ffffcb679646… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 10 15:48:14 2008 -0500 mshtml: Move GetContentDOMWindow call from HTMLWindow_Create. --- dlls/mshtml/htmldoc.c | 8 +++++++- dlls/mshtml/htmlwindow.c | 32 +++++++++++++++++--------------- dlls/mshtml/mshtml_private.h | 2 +- 3 files changed, 25 insertions(+), 17 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 00bc68c..f39688b 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1551,6 +1551,7 @@ static dispex_static_data_t HTMLDocument_dispex = { HRESULT HTMLDocument_Create(IUnknown *pUnkOuter, REFIID riid, void** ppvObject) { + nsIDOMWindow *nswindow; HTMLDocument *ret; HRESULT hres; @@ -1596,7 +1597,12 @@ HRESULT HTMLDocument_Create(IUnknown *pUnkOuter, REFIID riid, void** ppvObject) ret->nscontainer = NSContainer_Create(ret, NULL); update_nsdocument(ret); - ret->window = HTMLWindow_Create(ret); + if(ret->nscontainer) + nsIWebBrowser_GetContentDOMWindow(ret->nscontainer->webbrowser, &nswindow); + + HTMLWindow_Create(ret, nswindow, &ret->window); + if(nswindow) + nsIDOMWindow_Release(nswindow); get_thread_hwnd(); diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 6e8a8ea..b73811a 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -1182,29 +1182,31 @@ static dispex_static_data_t HTMLWindow_dispex = { HTMLWindow_iface_tids }; -HTMLWindow *HTMLWindow_Create(HTMLDocument *doc) +HRESULT HTMLWindow_Create(HTMLDocument *doc, nsIDOMWindow *nswindow, HTMLWindow **ret) { - HTMLWindow *ret = heap_alloc_zero(sizeof(HTMLWindow)); + HTMLWindow *window; - ret->lpHTMLWindow2Vtbl = &HTMLWindow2Vtbl; - ret->lpHTMLWindow3Vtbl = &HTMLWindow3Vtbl; - ret->lpIDispatchExVtbl = &WindowDispExVtbl; - ret->ref = 1; - ret->doc = doc; + window = heap_alloc_zero(sizeof(HTMLWindow)); + if(!window) + return E_OUTOFMEMORY; - init_dispex(&ret->dispex, (IUnknown*)HTMLWINDOW2(ret), &HTMLWindow_dispex); + window->lpHTMLWindow2Vtbl = &HTMLWindow2Vtbl; + window->lpHTMLWindow3Vtbl = &HTMLWindow3Vtbl; + window->lpIDispatchExVtbl = &WindowDispExVtbl; + window->ref = 1; + window->doc = doc; - if(doc->nscontainer) { - nsresult nsres; + init_dispex(&window->dispex, (IUnknown*)HTMLWINDOW2(window), &HTMLWindow_dispex); - nsres = nsIWebBrowser_GetContentDOMWindow(doc->nscontainer->webbrowser, &ret->nswindow); - if(NS_FAILED(nsres)) - ERR("GetContentDOMWindow failed: %08x\n", nsres); + if(nswindow) { + nsIDOMWindow_AddRef(nswindow); + window->nswindow = nswindow; } - list_add_head(&window_list, &ret->entry); + list_add_head(&window_list, &window->entry); - return ret; + *ret = window; + return S_OK; } HTMLWindow *nswindow_to_window(const nsIDOMWindow *nswindow) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 79c954d..c39d245 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -460,7 +460,7 @@ typedef struct { HRESULT HTMLDocument_Create(IUnknown*,REFIID,void**); HRESULT HTMLLoadOptions_Create(IUnknown*,REFIID,void**); -HTMLWindow *HTMLWindow_Create(HTMLDocument*); +HRESULT HTMLWindow_Create(HTMLDocument*,nsIDOMWindow*,HTMLWindow**); HTMLWindow *nswindow_to_window(const nsIDOMWindow*); HTMLOptionElementFactory *HTMLOptionElementFactory_Create(HTMLDocument*); HTMLLocation *HTMLLocation_Create(HTMLDocument*);

1 0

Jacek Caban : mshtml: Don't crash in UIActivate if hostui is NULL.
by Alexandre Julliard 13 Oct '08

13 Oct '08

Module: wine Branch: master Commit: 5e7cf7987f41a1d6c52651d678082d9f9704048e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e7cf7987f41a1d6c52651d67… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 10 15:47:47 2008 -0500 mshtml: Don't crash in UIActivate if hostui is NULL. --- dlls/mshtml/view.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/view.c b/dlls/mshtml/view.c index 4c0d0c5..bba0f23 100644 --- a/dlls/mshtml/view.c +++ b/dlls/mshtml/view.c @@ -605,11 +605,13 @@ static HRESULT WINAPI OleDocumentView_UIActivate(IOleDocumentView *iface, BOOL f return hres; } - hres = IDocHostUIHandler_ShowUI(This->hostui, - This->usermode == EDITMODE ? DOCHOSTUITYPE_AUTHOR : DOCHOSTUITYPE_BROWSE, - ACTOBJ(This), CMDTARGET(This), This->frame, This->ip_window); - if(FAILED(hres)) - IDocHostUIHandler_HideUI(This->hostui); + if(This->hostui) { + hres = IDocHostUIHandler_ShowUI(This->hostui, + This->usermode == EDITMODE ? DOCHOSTUITYPE_AUTHOR : DOCHOSTUITYPE_BROWSE, + ACTOBJ(This), CMDTARGET(This), This->frame, This->ip_window); + if(FAILED(hres)) + IDocHostUIHandler_HideUI(This->hostui); + } if(This->ip_window) call_set_active_object(This->ip_window, ACTOBJ(This));

1 0

Jacek Caban : mshtml: Added IHTMLEventObj::get_srcElement implementation.
by Alexandre Julliard 13 Oct '08

13 Oct '08

Module: wine Branch: master Commit: 8db98e9eb6731c5cd27709fbeb4fec35b89d131b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8db98e9eb6731c5cd27709fbe… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 10 15:47:38 2008 -0500 mshtml: Added IHTMLEventObj::get_srcElement implementation. --- dlls/mshtml/htmlevent.c | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index d6d5fa8..9995544 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -84,7 +84,10 @@ eventid_t str_to_eid(LPCWSTR str) typedef struct { DispatchEx dispex; const IHTMLEventObjVtbl *lpIHTMLEventObjVtbl; + LONG ref; + + HTMLDOMNode *target; } HTMLEventObj; #define HTMLEVENTOBJ(x) ((IHTMLEventObj*) &(x)->lpIHTMLEventObjVtbl) @@ -177,8 +180,10 @@ static HRESULT WINAPI HTMLEventObj_Invoke(IHTMLEventObj *iface, DISPID dispIdMem static HRESULT WINAPI HTMLEventObj_get_srcElement(IHTMLEventObj *iface, IHTMLElement **p) { HTMLEventObj *This = HTMLEVENTOBJ_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return IHTMLDOMNode_QueryInterface(HTMLDOMNODE(This->target), &IID_IHTMLElement, (void**)p); } static HRESULT WINAPI HTMLEventObj_get_altKey(IHTMLEventObj *iface, VARIANT_BOOL *p) @@ -398,13 +403,15 @@ static dispex_static_data_t HTMLEventObj_dispex = { HTMLEventObj_iface_tids }; -static IHTMLEventObj *create_event(void) +static IHTMLEventObj *create_event(HTMLDOMNode *target) { HTMLEventObj *ret; ret = heap_alloc(sizeof(*ret)); ret->lpIHTMLEventObjVtbl = &HTMLEventObjVtbl; ret->ref = 1; + ret->target = target; + IHTMLDOMNode_AddRef(HTMLDOMNODE(target)); init_dispex(&ret->dispex, (IUnknown*)HTMLEVENTOBJ(ret), &HTMLEventObj_dispex); @@ -433,7 +440,7 @@ void fire_event(HTMLDocument *doc, eventid_t eid, nsIDOMNode *target) if(node && node->event_target && node->event_target->event_table[eid]) { if(!event_obj) - event_obj = doc->window->event = create_event(); + 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)); @@ -459,7 +466,7 @@ void fire_event(HTMLDocument *doc, eventid_t eid, nsIDOMNode *target) if((event_info[eid].flags & EVENT_BUBBLE) && doc->event_target && doc->event_target->event_table[eid]) { if(!event_obj) - event_obj = doc->window->event = create_event(); + 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));

1 0

Jacek Caban : mshtml: Added set_event_handler(VT_NULL) implementation.
by Alexandre Julliard 13 Oct '08

13 Oct '08

Module: wine Branch: master Commit: a9bebdf5f8dc111a119e6d19882e8ca33054f3f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9bebdf5f8dc111a119e6d198… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 10 15:47:27 2008 -0500 mshtml: Added set_event_handler(VT_NULL) implementation. --- dlls/mshtml/htmlevent.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index f14e0e6..d6d5fa8 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -503,14 +503,22 @@ static HRESULT set_event_handler_disp(event_target_t **event_target, HTMLDocumen HRESULT set_event_handler(event_target_t **event_target, HTMLDocument *doc, eventid_t eid, VARIANT *var) { switch(V_VT(var)) { + case VT_NULL: + if(*event_target && (*event_target)->event_table[eid]) { + IDispatch_Release((*event_target)->event_table[eid]); + (*event_target)->event_table[eid] = NULL; + } + break; + case VT_DISPATCH: return set_event_handler_disp(event_target, doc, eid, V_DISPATCH(var)); default: FIXME("not supported vt=%d\n", V_VT(var)); + return E_NOTIMPL; } - return E_NOTIMPL; + return S_OK; } HRESULT get_event_handler(event_target_t **event_target, eventid_t eid, VARIANT *var)

1 0

Jacek Caban : mshtml: Pass the right 'this' argument to event handlers.
by Alexandre Julliard 13 Oct '08

13 Oct '08

Module: wine Branch: master Commit: 3d3574eba07a83ead1785bbb04cee0b8fbe6ecda URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d3574eba07a83ead1785bbb0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 10 15:47:15 2008 -0500 mshtml: Pass the right 'this' argument to event handlers. --- dlls/mshtml/dispex.c | 4 ++-- dlls/mshtml/htmlevent.c | 4 ++-- dlls/mshtml/mshtml_private.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 7ddbe5b..6bc27bc 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -296,7 +296,7 @@ static dispex_data_t *get_dispex_data(DispatchEx *This) return This->data->data; } -void call_disp_func(HTMLDocument *doc, IDispatch *disp) +void call_disp_func(HTMLDocument *doc, IDispatch *disp, IDispatch *this_obj) { DISPID named_arg = DISPID_THIS; VARIANTARG arg; @@ -313,7 +313,7 @@ void call_disp_func(HTMLDocument *doc, IDispatch *disp) } V_VT(&arg) = VT_DISPATCH; - V_DISPATCH(&arg) = (IDispatch*)HTMLWINDOW2(doc->window); + V_DISPATCH(&arg) = this_obj; VariantInit(&res); memset(&ei, 0, sizeof(ei)); diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 5942990..f14e0e6 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -436,7 +436,7 @@ void fire_event(HTMLDocument *doc, eventid_t eid, nsIDOMNode *target) event_obj = doc->window->event = create_event(); TRACE("%s >>>\n", debugstr_w(event_info[eid].name)); - call_disp_func(doc, node->event_target->event_table[eid]); + call_disp_func(doc, node->event_target->event_table[eid], (IDispatch*)HTMLDOMNODE(node)); TRACE("%s <<<\n", debugstr_w(event_info[eid].name)); } @@ -462,7 +462,7 @@ void fire_event(HTMLDocument *doc, eventid_t eid, nsIDOMNode *target) event_obj = doc->window->event = create_event(); TRACE("doc %s >>>\n", debugstr_w(event_info[eid].name)); - call_disp_func(doc, doc->event_target->event_table[eid]); + call_disp_func(doc, doc->event_target->event_table[eid], (IDispatch*)HTMLDOC(doc)); TRACE("doc %s <<<\n", debugstr_w(event_info[eid].name)); } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 09a5d60..79c954d 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -655,7 +655,7 @@ HRESULT clear_task_timer(HTMLDocument*,BOOL,DWORD); HRESULT get_typeinfo(tid_t,ITypeInfo**); void release_typelib(void); -void call_disp_func(HTMLDocument*,IDispatch*); +void call_disp_func(HTMLDocument*,IDispatch*,IDispatch*); const char *debugstr_variant(const VARIANT*);

1 0

Jacek Caban : mshtml: Added IHTMLWindow2::get_event implementation.
by Alexandre Julliard 13 Oct '08

13 Oct '08

Module: wine Branch: master Commit: 28d918f58102b47842fb62ddd5187f78fb291cdc URL: http://source.winehq.org/git/wine.git/?a=commit;h=28d918f58102b47842fb62ddd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 10 15:47:02 2008 -0500 mshtml: Added IHTMLWindow2::get_event implementation. --- dlls/mshtml/htmlwindow.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 1027399..6e8a8ea 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -504,8 +504,13 @@ static HRESULT WINAPI HTMLWindow2_get_document(IHTMLWindow2 *iface, IHTMLDocumen static HRESULT WINAPI HTMLWindow2_get_event(IHTMLWindow2 *iface, IHTMLEventObj **p) { HTMLWindow *This = HTMLWINDOW2_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + if(This->event) + IHTMLEventObj_AddRef(This->event); + *p = This->event; + return S_OK; } static HRESULT WINAPI HTMLWindow2_get__newEnum(IHTMLWindow2 *iface, IUnknown **p)

1 0

Jacek Caban : mshtml: Added event bubbling implementation.
by Alexandre Julliard 13 Oct '08

13 Oct '08

Module: wine Branch: master Commit: a0c162cc4aa1cff4a7a38260735c0e26ddfae16e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0c162cc4aa1cff4a7a382607… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 10 15:46:47 2008 -0500 mshtml: Added event bubbling implementation. --- dlls/mshtml/htmlevent.c | 68 ++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 55 insertions(+), 13 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 4c8e2a2..5942990 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -58,13 +58,14 @@ typedef struct { } event_info_t; #define EVENT_DEFAULTLISTENER 0x0001 +#define EVENT_BUBBLE 0x0002 static const event_info_t event_info[] = { - {changeW, onchangeW, EVENT_DEFAULTLISTENER}, - {clickW, onclickW, EVENT_DEFAULTLISTENER}, - {keyupW, onkeyupW, EVENT_DEFAULTLISTENER}, + {changeW, onchangeW, EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, + {clickW, onclickW, EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, + {keyupW, onkeyupW, EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, {loadW, onloadW, 0}, - {mouseoverW, onmouseoverW, EVENT_DEFAULTLISTENER} + {mouseoverW, onmouseoverW, EVENT_DEFAULTLISTENER|EVENT_BUBBLE} }; eventid_t str_to_eid(LPCWSTR str) @@ -412,21 +413,62 @@ static IHTMLEventObj *create_event(void) void fire_event(HTMLDocument *doc, eventid_t eid, nsIDOMNode *target) { + IHTMLEventObj *prev_event, *event_obj = NULL; + nsIDOMNode *parent, *nsnode; HTMLDOMNode *node; + PRUint16 node_type; - node = get_node(doc, target, FALSE); - if(!node) + nsIDOMNode_GetNodeType(target, &node_type); + if(node_type != ELEMENT_NODE) { + FIXME("node type %d node supported\n", node_type); return; + } + + prev_event = doc->window->event; + nsnode = target; + nsIDOMNode_AddRef(nsnode); + + while(1) { + node = get_node(doc, nsnode, FALSE); + + if(node && node->event_target && node->event_target->event_table[eid]) { + if(!event_obj) + event_obj = doc->window->event = create_event(); + + TRACE("%s >>>\n", debugstr_w(event_info[eid].name)); + call_disp_func(doc, node->event_target->event_table[eid]); + TRACE("%s <<<\n", debugstr_w(event_info[eid].name)); + } - if(node->event_target && node->event_target->event_table[eid]) { - doc->window->event = create_event(); + if(!(event_info[eid].flags & EVENT_BUBBLE)) + break; - TRACE("%s >>>\n", debugstr_w(event_info[eid].name)); - call_disp_func(doc, node->event_target->event_table[eid]); - TRACE("%s <<<\n", debugstr_w(event_info[eid].name)); + nsIDOMNode_GetParentNode(nsnode, &parent); + nsIDOMNode_Release(nsnode); + nsnode = parent; + if(!nsnode) + break; + + nsIDOMNode_GetNodeType(nsnode, &node_type); + if(node_type != ELEMENT_NODE) + break; + } + + if(nsnode) + nsIDOMNode_Release(nsnode); + + if((event_info[eid].flags & EVENT_BUBBLE) && doc->event_target && doc->event_target->event_table[eid]) { + if(!event_obj) + event_obj = doc->window->event = create_event(); + + TRACE("doc %s >>>\n", debugstr_w(event_info[eid].name)); + call_disp_func(doc, doc->event_target->event_table[eid]); + TRACE("doc %s <<<\n", debugstr_w(event_info[eid].name)); + } - IHTMLEventObj_Release(doc->window->event); - doc->window->event = NULL; + if(event_obj) { + IHTMLEventObj_Release(event_obj); + doc->window->event = prev_event; } }

1 0