November 2009 - Wine-Commits

Jacek Caban : mshtml: Added support for accessing elements id by global properties.
by Alexandre Julliard Nov. 3, 2009

Nov. 3, 2009

Module: wine Branch: master Commit: 82c8e7c68489581e6a42038b1fc46d58d978f59a URL: http://source.winehq.org/git/wine.git/?a=commit;h=82c8e7c68489581e6a42038b1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Nov 1 19:21:57 2009 +0100 mshtml: Added support for accessing elements id by global properties. --- dlls/mshtml/htmlwindow.c | 91 ++++++++++++++++++++++++++++++++---------- dlls/mshtml/mshtml_private.h | 6 +++ dlls/mshtml/tests/script.c | 39 +++++++++++++++++- 3 files changed, 114 insertions(+), 22 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index a14fe5c..6158b32 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -1005,8 +1005,7 @@ static HRESULT HTMLWindow_invoke(IUnknown *iface, DISPID id, LCID lcid, WORD fla VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller) { HTMLWindow *This = HTMLWINDOW2_THIS(iface); - IDispatchEx *dispex; - IDispatch *disp; + global_prop_t *prop; DWORD idx; HRESULT hres; @@ -1014,24 +1013,51 @@ static HRESULT HTMLWindow_invoke(IUnknown *iface, DISPID id, LCID lcid, WORD fla if(idx >= This->global_prop_cnt) return DISP_E_MEMBERNOTFOUND; - disp = get_script_disp(This->global_props[idx].script_host); - if(!disp) - return E_UNEXPECTED; - - hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); - if(SUCCEEDED(hres)) { - TRACE("%s >>>\n", debugstr_w(This->global_props[idx].name)); - hres = IDispatchEx_InvokeEx(dispex, This->global_props[idx].id, lcid, flags, params, res, ei, caller); - if(hres == S_OK) - TRACE("%s <<<\n", debugstr_w(This->global_props[idx].name)); - else - WARN("%s <<< %08x\n", debugstr_w(This->global_props[idx].name), hres); - IDispatchEx_Release(dispex); - }else { - FIXME("No IDispatchEx\n"); + prop = This->global_props+idx; + + switch(prop->type) { + case GLOBAL_SCRIPTVAR: { + IDispatchEx *dispex; + IDispatch *disp; + + disp = get_script_disp(prop->script_host); + if(!disp) + return E_UNEXPECTED; + + hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); + if(SUCCEEDED(hres)) { + TRACE("%s >>>\n", debugstr_w(prop->name)); + hres = IDispatchEx_InvokeEx(dispex, prop->id, lcid, flags, params, res, ei, caller); + if(hres == S_OK) + TRACE("%s <<<\n", debugstr_w(prop->name)); + else + WARN("%s <<< %08x\n", debugstr_w(prop->name), hres); + IDispatchEx_Release(dispex); + }else { + FIXME("No IDispatchEx\n"); + } + IDispatch_Release(disp); + break; + } + case GLOBAL_ELEMENTVAR: { + IHTMLElement *elem; + + hres = IHTMLDocument3_getElementById(HTMLDOC3(&This->doc->basedoc), prop->name, &elem); + if(FAILED(hres)) + return hres; + + if(!elem) + return DISP_E_MEMBERNOTFOUND; + + V_VT(res) = VT_DISPATCH; + V_DISPATCH(res) = (IDispatch*)elem; + break; + } + default: + ERR("invalid type %d\n", prop->type); + hres = DISP_E_MEMBERNOTFOUND; } - IDispatch_Release(disp); return hres; } @@ -1399,7 +1425,7 @@ static HRESULT WINAPI WindowDispEx_Invoke(IDispatchEx *iface, DISPID dispIdMembe pVarResult, pExcepInfo, puArgErr); } -static global_prop_t *alloc_global_prop(HTMLWindow *This, BSTR name) +static global_prop_t *alloc_global_prop(HTMLWindow *This, global_prop_type_t type, BSTR name) { if(This->global_prop_cnt == This->global_prop_size) { global_prop_t *new_props; @@ -1422,6 +1448,7 @@ static global_prop_t *alloc_global_prop(HTMLWindow *This, BSTR name) if(!This->global_props[This->global_prop_cnt].name) return NULL; + This->global_props[This->global_prop_cnt].type = type; return This->global_props + This->global_prop_cnt++; } @@ -1436,6 +1463,7 @@ static HRESULT WINAPI WindowDispEx_GetDispID(IDispatchEx *iface, BSTR bstrName, ScriptHost *script_host; DISPID id; DWORD i; + HRESULT hres; TRACE("(%p)->(%s %x %p)\n", This, debugstr_w(bstrName), grfdex, pid); @@ -1450,7 +1478,7 @@ static HRESULT WINAPI WindowDispEx_GetDispID(IDispatchEx *iface, BSTR bstrName, if(find_global_prop(This, bstrName, grfdex, &script_host, &id)) { global_prop_t *prop; - prop = alloc_global_prop(This, bstrName); + prop = alloc_global_prop(This, GLOBAL_SCRIPTVAR, bstrName); if(!prop) return E_OUTOFMEMORY; @@ -1461,7 +1489,28 @@ static HRESULT WINAPI WindowDispEx_GetDispID(IDispatchEx *iface, BSTR bstrName, return S_OK; } - return IDispatchEx_GetDispID(DISPATCHEX(&This->dispex), bstrName, grfdex, pid); + hres = IDispatchEx_GetDispID(DISPATCHEX(&This->dispex), bstrName, grfdex, pid); + if(hres != DISP_E_UNKNOWNNAME) + return hres; + + if(This->doc) { + global_prop_t *prop; + IHTMLElement *elem; + + hres = IHTMLDocument3_getElementById(HTMLDOC3(&This->doc->basedoc), bstrName, &elem); + if(SUCCEEDED(hres) && elem) { + IHTMLElement_Release(elem); + + prop = alloc_global_prop(This, GLOBAL_ELEMENTVAR, bstrName); + if(!prop) + return E_OUTOFMEMORY; + + *pid = prop_to_dispid(This, prop); + return S_OK; + } + } + + return DISP_E_UNKNOWNNAME; } static HRESULT WINAPI WindowDispEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index a6a8396..89acf46 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -168,7 +168,13 @@ typedef enum { typedef struct ScriptHost ScriptHost; +typedef enum { + GLOBAL_SCRIPTVAR, + GLOBAL_ELEMENTVAR +} global_prop_type_t; + typedef struct { + global_prop_type_t type; WCHAR *name; ScriptHost *script_host; DISPID id; diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index 16c7811..05f2e4e 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -112,6 +112,7 @@ DEFINE_EXPECT(AddNamedItem); DEFINE_EXPECT(ParseScriptText); DEFINE_EXPECT(GetScriptDispatch); DEFINE_EXPECT(funcDisp); +DEFINE_EXPECT(script_divid_d); DEFINE_EXPECT(script_testprop_d); DEFINE_EXPECT(script_testprop_i); DEFINE_EXPECT(AXQueryInterface_IActiveScript); @@ -369,7 +370,13 @@ static HRESULT WINAPI scriptDisp_GetDispID(IDispatchEx *iface, BSTR bstrName, DW return S_OK; } - ok(0, "unexpected call\n"); + if(!strcmp_wa(bstrName, "divid")) { + CHECK_EXPECT(script_divid_d); + ok(grfdex == fdexNameCaseSensitive, "grfdex = %x\n", grfdex); + return E_FAIL; + } + + ok(0, "unexpected call\b"); return E_NOTIMPL; } @@ -915,6 +922,33 @@ static void test_nextdispid(IDispatchEx *dispex) ok(id == DISPID_STARTENUM, "id != DISPID_STARTENUM\n"); } +static void test_global_id(void) +{ + VARIANT var; + DISPPARAMS dp; + EXCEPINFO ei; + BSTR tmp; + DISPID id; + HRESULT hres; + + SET_EXPECT(GetScriptDispatch); + SET_EXPECT(script_divid_d); + tmp = a2bstr("divid"); + hres = IDispatchEx_GetDispID(window_dispex, tmp, fdexNameCaseSensitive, &id); + ok(hres == S_OK, "GetDispID failed: %08x\n", hres); + SysFreeString(tmp); + CHECK_CALLED(GetScriptDispatch); + CHECK_CALLED(script_divid_d); + + VariantInit(&var); + memset(&ei, 0, sizeof(ei)); + memset(&dp, 0, sizeof(dp)); + hres = IDispatchEx_InvokeEx(window_dispex, id, 0, DISPATCH_PROPERTYGET, &dp, &var, &ei, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + ok(V_VT(&var) == VT_DISPATCH, "V_VT(var) = %d\n", V_VT(&var)); + VariantClear(&var); +} + static HRESULT WINAPI ActiveScriptParse_ParseScriptText(IActiveScriptParse *iface, LPCOLESTR pstrCode, LPCOLESTR pstrItemName, IUnknown *punkContext, LPCOLESTR pstrDelimiter, CTXARG_T dwSourceContextCookie, ULONG ulStartingLine, @@ -1104,6 +1138,8 @@ static HRESULT WINAPI ActiveScriptParse_ParseScriptText(IActiveScriptParse *ifac CHECK_CALLED(GetScriptDispatch); CHECK_CALLED(script_testprop_i); + test_global_id(); + test_security(); return S_OK; @@ -1421,6 +1457,7 @@ static IClassFactory script_cf = { &ClassFactoryVtbl }; static const char simple_script_str[] = "<html><head></head><body>" + "<div id=\"divid\"></div>" "<script language=\"TestScript\">simple script</script>" "</body></html>";

1 0

Jacek Caban : mshtml: Return NS_OK for empty aRef in nsIURL::SetRef.
by Alexandre Julliard Nov. 3, 2009

Nov. 3, 2009

Module: wine Branch: master Commit: 007b398215c770d35d4ca515de815697acfc68eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=007b398215c770d35d4ca515d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Nov 1 19:20:04 2009 +0100 mshtml: Return NS_OK for empty aRef in nsIURL::SetRef. --- dlls/mshtml/nsio.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index b36f3fc..9792747 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -2000,12 +2000,17 @@ static nsresult NSAPI nsURL_GetRef(nsIWineURI *iface, nsACString *aRef) static nsresult NSAPI nsURL_SetRef(nsIWineURI *iface, const nsACString *aRef) { nsURI *This = NSURI_THIS(iface); + const char *refa; TRACE("(%p)->(%s)\n", This, debugstr_nsacstr(aRef)); if(This->nsurl) return nsIURL_SetRef(This->nsurl, aRef); + nsACString_GetData(aRef, &refa); + if(!*refa) + return NS_OK; + FIXME("default action not implemented\n"); return NS_ERROR_NOT_IMPLEMENTED; }

1 0

Jacek Caban : mshtml: Associate HTMLWindow with HTMLIFrame.
by Alexandre Julliard Nov. 3, 2009

Nov. 3, 2009

Module: wine Branch: master Commit: 9d6af171e5486f555ac8adc4834054a36265b922 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d6af171e5486f555ac8adc48… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Nov 1 19:19:19 2009 +0100 mshtml: Associate HTMLWindow with HTMLIFrame. --- dlls/mshtml/htmlframebase.c | 8 ++++++-- dlls/mshtml/mshtml_private.h | 6 ++++-- dlls/mshtml/mutation.c | 20 +++++++++++++++----- 3 files changed, 25 insertions(+), 9 deletions(-) diff --git a/dlls/mshtml/htmlframebase.c b/dlls/mshtml/htmlframebase.c index 83817be..b1d53e3 100644 --- a/dlls/mshtml/htmlframebase.c +++ b/dlls/mshtml/htmlframebase.c @@ -257,8 +257,10 @@ HRESULT HTMLFrameBase_QI(HTMLFrameBase *This, REFIID riid, void **ppv) void HTMLFrameBase_destructor(HTMLFrameBase *This) { - if(This->content_window) + if(This->content_window) { + This->content_window->frame_element = NULL; IHTMLWindow2_Release(HTMLWINDOW2(This->content_window)); + } HTMLElement_destructor(&This->element.node); } @@ -270,7 +272,9 @@ void HTMLFrameBase_Init(HTMLFrameBase *This, HTMLDocumentNode *doc, nsIDOMHTMLEl HTMLElement_Init(&This->element, doc, nselem, dispex_data); - if(content_window) + if(content_window) { IHTMLWindow2_AddRef(HTMLWINDOW2(content_window)); + content_window->frame_element = This; + } This->content_window = content_window; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 340fefe..570f0b1 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -159,6 +159,7 @@ HRESULT dispex_get_dprop_ref(DispatchEx*,const WCHAR*,BOOL,VARIANT**); typedef struct HTMLDocumentNode HTMLDocumentNode; typedef struct HTMLDocumentObj HTMLDocumentObj; +typedef struct HTMLFrameBase HTMLFrameBase; typedef enum { SCRIPTMODE_GECKO, @@ -219,6 +220,7 @@ struct HTMLWindow { HTMLDocumentObj *doc_obj; nsIDOMWindow *nswindow; HTMLWindow *parent; + HTMLFrameBase *frame_element; nsChannelBSC *bscallback; IMoniker *mon; @@ -460,13 +462,13 @@ typedef struct { ConnectionPoint cp; } HTMLTextContainer; -typedef struct { +struct HTMLFrameBase { HTMLElement element; const IHTMLFrameBaseVtbl *lpIHTMLFrameBaseVtbl; HTMLWindow *content_window; -} HTMLFrameBase; +}; typedef struct _mutation_queue_t { DWORD type; diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index 4999e26..edcbbd7 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -246,7 +246,7 @@ static void pop_mutation_queue(HTMLDocumentNode *doc) heap_free(tmp); } -static nsresult init_nsdoc_window(HTMLDocumentNode *doc, nsIDOMDocument *nsdoc) +static nsresult init_nsdoc_window(HTMLDocumentNode *doc, nsIDOMDocument *nsdoc, HTMLWindow **ret) { nsIDOMWindow *nswindow; @@ -259,8 +259,12 @@ static nsresult init_nsdoc_window(HTMLDocumentNode *doc, nsIDOMDocument *nsdoc) HRESULT hres; hres = HTMLWindow_Create(doc->basedoc.doc_obj, nswindow, doc->basedoc.window, &window); - if(SUCCEEDED(hres)) - IHTMLWindow2_Release(HTMLWINDOW2(window)); + if(SUCCEEDED(hres)) { + if(ret) + *ret = window; + else + IHTMLWindow2_Release(HTMLWINDOW2(window)); + } } nsIDOMWindow_Release(nswindow); @@ -270,6 +274,7 @@ static nsresult init_nsdoc_window(HTMLDocumentNode *doc, nsIDOMDocument *nsdoc) static nsresult init_iframe_window(HTMLDocumentNode *doc, nsISupports *nsunk) { nsIDOMHTMLIFrameElement *nsiframe; + HTMLWindow *window = NULL; nsIDOMDocument *nsdoc; nsresult nsres; @@ -286,7 +291,12 @@ static nsresult init_iframe_window(HTMLDocumentNode *doc, nsISupports *nsunk) return nsres; } - nsres = init_nsdoc_window(doc, nsdoc); + nsres = init_nsdoc_window(doc, nsdoc, &window); + + if(window) { + HTMLIFrame_Create(doc, (nsIDOMHTMLElement*)nsiframe, window); + IHTMLWindow2_Release(HTMLWINDOW2(window)); + } nsIDOMDocument_Release(nsdoc); return nsres; @@ -311,7 +321,7 @@ static nsresult init_frame_window(HTMLDocumentNode *doc, nsISupports *nsunk) return nsres; } - nsres = init_nsdoc_window(doc, nsdoc); + nsres = init_nsdoc_window(doc, nsdoc, NULL); nsIDOMDocument_Release(nsdoc); return nsres;

1 0

Jacek Caban : mshtml: Moved readystate changes to separated function.
by Alexandre Julliard Nov. 3, 2009

Nov. 3, 2009

Module: wine Branch: master Commit: 67c8d4b405439dbc2a50861fe946a70cf3fc28f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67c8d4b405439dbc2a50861fe… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Nov 1 19:24:19 2009 +0100 mshtml: Moved readystate changes to separated function. --- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/persist.c | 10 ++++++++-- dlls/mshtml/task.c | 6 ++---- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 89acf46..175dce7 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -684,6 +684,7 @@ void channelbsc_set_channel(nsChannelBSC*,nsChannel*,nsIStreamListener*,nsISuppo IMoniker *get_channelbsc_mon(nsChannelBSC*); void parse_complete(HTMLDocumentObj*); +void set_ready_state(HTMLWindow*,READYSTATE); HRESULT HTMLSelectionObject_Create(HTMLDocumentNode*,nsISelection*,IHTMLSelectionObject**); HRESULT HTMLTxtRange_Create(HTMLDocumentNode*,nsIDOMRange*,IHTMLTxtRange**); diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 9781481..ec2c830 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -190,8 +190,7 @@ static HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc, BO } } - This->doc_obj->readystate = READYSTATE_LOADING; - call_property_onchanged(&This->cp_propnotif, DISPID_READYSTATE); + set_ready_state(This->window, READYSTATE_LOADING); update_doc(This, UPDATE_TITLE); HTMLDocument_LockContainer(This->doc_obj, TRUE); @@ -274,6 +273,13 @@ static HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc, BO return S_OK; } +void set_ready_state(HTMLWindow *window, READYSTATE readystate) +{ + window->doc_obj->readystate = readystate; + if(window->doc_obj->basedoc.window == window) + call_property_onchanged(&window->doc_obj->basedoc.cp_propnotif, DISPID_READYSTATE); +} + static HRESULT get_doc_string(HTMLDocumentNode *This, char **str) { nsIDOMNode *nsnode; diff --git a/dlls/mshtml/task.c b/dlls/mshtml/task.c index 2706523..08f5534 100644 --- a/dlls/mshtml/task.c +++ b/dlls/mshtml/task.c @@ -237,8 +237,7 @@ void parse_complete(HTMLDocumentObj *doc) /* FIXME: IE7 calls EnableModelless(TRUE), EnableModelless(FALSE) and sets interactive state here */ - doc->readystate = READYSTATE_INTERACTIVE; - call_property_onchanged(&doc->basedoc.cp_propnotif, DISPID_READYSTATE); + set_ready_state(doc->basedoc.window, READYSTATE_INTERACTIVE); if(doc->client) IOleClientSite_QueryInterface(doc->client, &IID_IOleCommandTarget, (void**)&olecmd); @@ -263,8 +262,7 @@ void parse_complete(HTMLDocumentObj *doc) IOleCommandTarget_Release(olecmd); } - doc->readystate = READYSTATE_COMPLETE; - call_property_onchanged(&doc->basedoc.cp_propnotif, DISPID_READYSTATE); + set_ready_state(doc->basedoc.window, READYSTATE_COMPLETE); if(doc->frame) { static const WCHAR wszDone[] = {'D','o','n','e',0};

1 0

Jacek Caban : mshtml: Added HTMLFrameElement object and associate it with frame window.
by Alexandre Julliard Nov. 3, 2009

Nov. 3, 2009

Module: wine Branch: master Commit: fa3ac0a3d9f01022b880b68fc003babbcd13e4a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa3ac0a3d9f01022b880b68fc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Nov 1 19:19:41 2009 +0100 mshtml: Added HTMLFrameElement object and associate it with frame window. --- dlls/mshtml/htmlframebase.c | 46 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/mutation.c | 16 ++++++++------ 3 files changed, 56 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/htmlframebase.c b/dlls/mshtml/htmlframebase.c index b1d53e3..6c0dd40 100644 --- a/dlls/mshtml/htmlframebase.c +++ b/dlls/mshtml/htmlframebase.c @@ -278,3 +278,49 @@ void HTMLFrameBase_Init(HTMLFrameBase *This, HTMLDocumentNode *doc, nsIDOMHTMLEl } This->content_window = content_window; } + +typedef struct { + HTMLFrameBase framebase; +} HTMLFrameElement; + +#define HTMLFRAME_NODE_THIS(iface) DEFINE_THIS2(HTMLFrameElement, framebase.element.node, iface) + +static HRESULT HTMLFrameElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) +{ + HTMLFrameElement *This = HTMLFRAME_NODE_THIS(iface); + + return HTMLFrameBase_QI(&This->framebase, riid, ppv); +} + +static void HTMLFrameElement_destructor(HTMLDOMNode *iface) +{ + HTMLFrameElement *This = HTMLFRAME_NODE_THIS(iface); + + HTMLFrameBase_destructor(&This->framebase); +} + +#undef HTMLFRAME_NODE_THIS + +static const NodeImplVtbl HTMLFrameElementImplVtbl = { + HTMLFrameElement_QI, + HTMLFrameElement_destructor +}; + +HTMLElement *HTMLFrameElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem, HTMLWindow *content_window) +{ + nsIDOMHTMLFrameElement *nsframe; + HTMLFrameElement *ret; + nsresult nsres; + + ret = heap_alloc_zero(sizeof(HTMLFrameElement)); + + ret->framebase.element.node.vtbl = &HTMLFrameElementImplVtbl; + + nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLFrameElement, (void**)&nsframe); + if(NS_FAILED(nsres)) + ERR("Could not get nsIDOMHTMLFrameElement iface: %08x\n", nsres); + + HTMLFrameBase_Init(&ret->framebase, doc, nselem, content_window, NULL); + + return &ret->framebase.element; +} diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 570f0b1..a6a8396 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -697,6 +697,7 @@ HTMLElement *HTMLElement_Create(HTMLDocumentNode*,nsIDOMNode*,BOOL); HTMLElement *HTMLCommentElement_Create(HTMLDocumentNode*,nsIDOMNode*); HTMLElement *HTMLAnchorElement_Create(HTMLDocumentNode*,nsIDOMHTMLElement*); HTMLElement *HTMLBodyElement_Create(HTMLDocumentNode*,nsIDOMHTMLElement*); +HTMLElement *HTMLFrameElement_Create(HTMLDocumentNode*,nsIDOMHTMLElement*,HTMLWindow*); HTMLElement *HTMLIFrame_Create(HTMLDocumentNode*,nsIDOMHTMLElement*,HTMLWindow*); HTMLElement *HTMLImgElement_Create(HTMLDocumentNode*,nsIDOMHTMLElement*); HTMLElement *HTMLInputElement_Create(HTMLDocumentNode*,nsIDOMHTMLElement*); diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index edcbbd7..f550809 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -259,12 +259,8 @@ static nsresult init_nsdoc_window(HTMLDocumentNode *doc, nsIDOMDocument *nsdoc, HRESULT hres; hres = HTMLWindow_Create(doc->basedoc.doc_obj, nswindow, doc->basedoc.window, &window); - if(SUCCEEDED(hres)) { - if(ret) - *ret = window; - else - IHTMLWindow2_Release(HTMLWINDOW2(window)); - } + if(SUCCEEDED(hres)) + *ret = window; } nsIDOMWindow_Release(nswindow); @@ -305,6 +301,7 @@ static nsresult init_iframe_window(HTMLDocumentNode *doc, nsISupports *nsunk) static nsresult init_frame_window(HTMLDocumentNode *doc, nsISupports *nsunk) { nsIDOMHTMLFrameElement *nsframe; + HTMLWindow *window = NULL; nsIDOMDocument *nsdoc; nsresult nsres; @@ -321,7 +318,12 @@ static nsresult init_frame_window(HTMLDocumentNode *doc, nsISupports *nsunk) return nsres; } - nsres = init_nsdoc_window(doc, nsdoc, NULL); + nsres = init_nsdoc_window(doc, nsdoc, &window); + + if(window) { + HTMLFrameElement_Create(doc, (nsIDOMHTMLElement*)nsframe, window); + IHTMLWindow2_Release(HTMLWINDOW2(window)); + } nsIDOMDocument_Release(nsdoc); return nsres;

1 0

Jacek Caban : mshtml: Don't create dynamic property if alloc arg is false.
by Alexandre Julliard Nov. 3, 2009

Nov. 3, 2009

Module: wine Branch: master Commit: ed1065047234c6c8c17072e0644bb026f02b64fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed1065047234c6c8c17072e06… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Nov 1 19:21:19 2009 +0100 mshtml: Don't create dynamic property if alloc arg is false. --- dlls/mshtml/dispex.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 0a0f6c6..980b13b 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -390,6 +390,9 @@ static HRESULT get_dynamic_prop(DispatchEx *This, const WCHAR *name, DWORD flags } } + if(!alloc) + return DISP_E_UNKNOWNNAME; + TRACE("creating dynamic prop %s\n", debugstr_w(name)); if(!data->buf_size) {

1 0

Jacek Caban : mshtml: Moved add_script_runner call to push_mutation_queue.
by Alexandre Julliard Nov. 3, 2009

Nov. 3, 2009

Module: wine Branch: master Commit: ccaa3c463194e52de229a655437e1b1cf0ed6d07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccaa3c463194e52de229a6554… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Nov 1 19:24:55 2009 +0100 mshtml: Moved add_script_runner call to push_mutation_queue. --- dlls/mshtml/mutation.c | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index 03f3e90..ba636dd 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -246,10 +246,12 @@ static void push_mutation_queue(HTMLDocumentNode *doc, DWORD type, nsISupports * if(nsiface) nsISupports_AddRef(nsiface); - if(doc->mutation_queue_tail) + if(doc->mutation_queue_tail) { doc->mutation_queue_tail = doc->mutation_queue_tail->next = elem; - else + }else { doc->mutation_queue = doc->mutation_queue_tail = elem; + add_script_runner(doc); + } } static void pop_mutation_queue(HTMLDocumentNode *doc) @@ -363,8 +365,10 @@ static void handle_end_load(HTMLDocumentNode *This) TRACE("\n"); - if(This != This->basedoc.doc_obj->basedoc.doc_node) + if(This != This->basedoc.doc_obj->basedoc.doc_node) { + set_ready_state(This, READYSTATE_INTERACTIVE); return; + } task = heap_alloc(sizeof(docobj_task_t)); if(!task) @@ -584,7 +588,6 @@ static void NSAPI nsDocumentObserver_EndLoad(nsIDocumentObserver *iface, nsIDocu This->content_ready = TRUE; push_mutation_queue(This, MUTATION_ENDLOAD, NULL); - add_script_runner(This); } static void NSAPI nsDocumentObserver_ContentStatesChanged(nsIDocumentObserver *iface, nsIDocument *aDocument, @@ -646,7 +649,6 @@ static void NSAPI nsDocumentObserver_BindToDocument(nsIDocumentObserver *iface, push_mutation_queue(This, MUTATION_COMMENT, (nsISupports*)nscomment); nsIDOMComment_Release(nscomment); - add_script_runner(This); } nsres = nsISupports_QueryInterface(aContent, &IID_nsIDOMHTMLIFrameElement, (void**)&nsiframe); @@ -655,7 +657,6 @@ static void NSAPI nsDocumentObserver_BindToDocument(nsIDocumentObserver *iface, push_mutation_queue(This, MUTATION_IFRAME, (nsISupports*)nsiframe); nsIDOMHTMLIFrameElement_Release(nsiframe); - add_script_runner(This); } nsres = nsISupports_QueryInterface(aContent, &IID_nsIDOMHTMLFrameElement, (void**)&nsframe); @@ -664,7 +665,6 @@ static void NSAPI nsDocumentObserver_BindToDocument(nsIDocumentObserver *iface, push_mutation_queue(This, MUTATION_FRAME, (nsISupports*)nsframe); nsIDOMHTMLFrameElement_Release(nsframe); - add_script_runner(This); } } @@ -683,7 +683,6 @@ static void NSAPI nsDocumentObserver_DoneAddingChildren(nsIDocumentObserver *ifa push_mutation_queue(This, MUTATION_SCRIPT, (nsISupports*)nsscript); nsIDOMHTMLScriptElement_Release(nsscript); - add_script_runner(This); } }

1 0

Jacek Caban : mshtml: Handle EndLoad via script runner.
by Alexandre Julliard Nov. 3, 2009

Nov. 3, 2009

Module: wine Branch: master Commit: 73bf0d8f9a315810194dee87939484233c68febb URL: http://source.winehq.org/git/wine.git/?a=commit;h=73bf0d8f9a315810194dee879… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Nov 1 19:24:34 2009 +0100 mshtml: Handle EndLoad via script runner. --- dlls/mshtml/mutation.c | 99 +++++++++++++++++++++++++++-------------------- 1 files changed, 57 insertions(+), 42 deletions(-) diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index f550809..03f3e90 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -37,6 +37,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); enum { MUTATION_COMMENT, + MUTATION_ENDLOAD, MUTATION_FRAME, MUTATION_IFRAME, MUTATION_SCRIPT @@ -231,6 +232,26 @@ static nsrefcnt NSAPI nsRunnable_Release(nsIRunnable *iface) return htmldoc_release(&This->basedoc); } +static void push_mutation_queue(HTMLDocumentNode *doc, DWORD type, nsISupports *nsiface) +{ + mutation_queue_t *elem; + + elem = heap_alloc(sizeof(mutation_queue_t)); + if(!elem) + return; + + elem->next = NULL; + elem->type = type; + elem->nsiface = nsiface; + if(nsiface) + nsISupports_AddRef(nsiface); + + if(doc->mutation_queue_tail) + doc->mutation_queue_tail = doc->mutation_queue_tail->next = elem; + else + doc->mutation_queue = doc->mutation_queue_tail = elem; +} + static void pop_mutation_queue(HTMLDocumentNode *doc) { mutation_queue_t *tmp = doc->mutation_queue; @@ -242,7 +263,8 @@ static void pop_mutation_queue(HTMLDocumentNode *doc) if(!tmp->next) doc->mutation_queue_tail = NULL; - nsISupports_Release(tmp->nsiface); + if(tmp->nsiface) + nsISupports_Release(tmp->nsiface); heap_free(tmp); } @@ -329,6 +351,34 @@ static nsresult init_frame_window(HTMLDocumentNode *doc, nsISupports *nsunk) return nsres; } +static void parse_complete_proc(task_t *_task) +{ + docobj_task_t *task = (docobj_task_t*)_task; + parse_complete(task->doc); +} + +static void handle_end_load(HTMLDocumentNode *This) +{ + docobj_task_t *task; + + TRACE("\n"); + + if(This != This->basedoc.doc_obj->basedoc.doc_node) + return; + + task = heap_alloc(sizeof(docobj_task_t)); + if(!task) + return; + + task->doc = This->basedoc.doc_obj; + + /* + * This should be done in the worker thread that parses HTML, + * but we don't have such thread (Gecko parses HTML for us). + */ + push_task(&task->header, &parse_complete_proc, This->basedoc.doc_obj->basedoc.task_magic); +} + static nsresult NSAPI nsRunnable_Run(nsIRunnable *iface) { HTMLDocumentNode *This = NSRUNNABLE_THIS(iface); @@ -385,6 +435,10 @@ static nsresult NSAPI nsRunnable_Run(nsIRunnable *iface) break; } + case MUTATION_ENDLOAD: + handle_end_load(This); + break; + case MUTATION_FRAME: init_frame_window(This, This->mutation_queue->nsiface); break; @@ -522,12 +576,6 @@ static void NSAPI nsDocumentObserver_BeginLoad(nsIDocumentObserver *iface, nsIDo { } -static void parse_complete_proc(task_t *_task) -{ - docobj_task_t *task = (docobj_task_t*)_task; - parse_complete(task->doc); -} - static void NSAPI nsDocumentObserver_EndLoad(nsIDocumentObserver *iface, nsIDocument *aDocument) { HTMLDocumentNode *This = NSDOCOBS_THIS(iface); @@ -535,22 +583,8 @@ static void NSAPI nsDocumentObserver_EndLoad(nsIDocumentObserver *iface, nsIDocu TRACE("\n"); This->content_ready = TRUE; - - if(This == This->basedoc.doc_obj->basedoc.doc_node) { - docobj_task_t *task; - - task = heap_alloc(sizeof(docobj_task_t)); - if(!task) - return; - - task->doc = This->basedoc.doc_obj; - - /* - * This should be done in the worker thread that parses HTML, - * but we don't have such thread (Gecko parses HTML for us). - */ - push_task(&task->header, &parse_complete_proc, This->basedoc.doc_obj->basedoc.task_magic); - } + push_mutation_queue(This, MUTATION_ENDLOAD, NULL); + add_script_runner(This); } static void NSAPI nsDocumentObserver_ContentStatesChanged(nsIDocumentObserver *iface, nsIDocument *aDocument, @@ -588,25 +622,6 @@ static void NSAPI nsDocumentObserver_StyleRuleRemoved(nsIDocumentObserver *iface { } -static void push_mutation_queue(HTMLDocumentNode *doc, DWORD type, nsISupports *nsiface) -{ - mutation_queue_t *elem; - - elem = heap_alloc(sizeof(mutation_queue_t)); - if(!elem) - return; - - elem->next = NULL; - elem->type = type; - elem->nsiface = nsiface; - nsISupports_AddRef(nsiface); - - if(doc->mutation_queue_tail) - doc->mutation_queue_tail = doc->mutation_queue_tail->next = elem; - else - doc->mutation_queue = doc->mutation_queue_tail = elem; -} - static void NSAPI nsDocumentObserver_BindToDocument(nsIDocumentObserver *iface, nsIDocument *aDocument, nsIContent *aContent) {

1 0

Jacek Caban : mshtml: Return NULL ownerDocument for document node.
by Alexandre Julliard Nov. 3, 2009

Nov. 3, 2009

Module: wine Branch: master Commit: dca249833bed3a757309a2c58379240235e85f8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=dca249833bed3a757309a2c58… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Nov 1 19:24:03 2009 +0100 mshtml: Return NULL ownerDocument for document node. --- dlls/mshtml/htmlnode.c | 9 +++++++-- dlls/mshtml/tests/dom.c | 24 +++++++++++++++--------- 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 597108f..b8cecf0 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -836,8 +836,13 @@ static HRESULT WINAPI HTMLDOMNode2_get_ownerDocument(IHTMLDOMNode2 *iface, IDisp TRACE("(%p)->(%p)\n", This, p); - *p = (IDispatch*)HTMLDOC(&This->doc->basedoc); - IDispatch_AddRef(*p); + /* FIXME: Better check for document node */ + if(This == &This->doc->node) { + *p = NULL; + }else { + *p = (IDispatch*)HTMLDOC(&This->doc->basedoc); + IDispatch_AddRef(*p); + } return S_OK; } diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 97ad221..2559fdc 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -652,17 +652,18 @@ static IHTMLDocument2 *_get_owner_doc(unsigned line, IUnknown *unk) { IHTMLDOMNode2 *node = _get_node2_iface(line, unk); IDispatch *disp = (void*)0xdeadbeef; - IHTMLDocument2 *doc; + IHTMLDocument2 *doc = NULL; HRESULT hres; hres = IHTMLDOMNode2_get_ownerDocument(node, &disp); IHTMLDOMNode2_Release(node); ok_(__FILE__,line)(hres == S_OK, "get_ownerDocument failed: %08x\n", hres); - ok_(__FILE__,line)(disp != NULL, "disp = NULL\n"); - hres = IDispatch_QueryInterface(disp, &IID_IHTMLDocument2, (void**)&doc); - IDispatch_Release(disp); - ok_(__FILE__,line)(hres == S_OK, "Could not get IHTMLDocument2 iface: %08x\n", hres); + if(disp) { + hres = IDispatch_QueryInterface(disp, &IID_IHTMLDocument2, (void**)&doc); + IDispatch_Release(disp); + ok_(__FILE__,line)(hres == S_OK, "Could not get IHTMLDocument2 iface: %08x\n", hres); + } return doc; } @@ -940,8 +941,7 @@ static void test_get_set_attr(IHTMLDocument2 *doc) hres = IHTMLElement_getAttribute(elem, bstr, 0, &val); ok(hres == S_OK, "getAttribute failed: %08x\n", hres); ok(V_VT(&val) == VT_BOOL, "variant type should have been VT_BOOL (0x%x), was: 0x%x\n", VT_BOOL, V_VT(&val)); - ok(V_BOOL(&val) == VARIANT_TRUE, "variant value should have been VARIANT_TRUE (0x%x), was %d\n", - VARIANT_TRUE, V_BOOL(&val)); + ok(V_BOOL(&val) == VARIANT_TRUE, "variant value should have been VARIANT_TRUE (0x%x), was %d\n", VARIANT_TRUE, V_BOOL(&val)); VariantClear(&val); SysFreeString(bstr); @@ -4417,9 +4417,12 @@ static void test_doc_elem(IHTMLDocument2 *doc) doc_node = get_doc_node(doc); owner_doc = get_owner_doc((IUnknown*)elem); ok(iface_cmp((IUnknown *)doc_node, (IUnknown *)owner_doc), "doc_node != owner_doc\n"); - IHTMLDocument2_Release(doc_node); IHTMLDocument2_Release(owner_doc); + owner_doc = get_owner_doc((IUnknown*)doc_node); + ok(!owner_doc, "owner_doc = %p\n", owner_doc); + IHTMLDocument2_Release(doc_node); + test_elem_client_rect((IUnknown*)elem); IHTMLElement_Release(elem); @@ -4781,8 +4784,8 @@ static void doc_write(IHTMLDocument2 *doc, BOOL ln, const char *text) static void test_iframe_elem(IHTMLElement *elem) { + IHTMLDocument2 *content_doc, *owner_doc; IHTMLElementCollection *col; - IHTMLDocument2 *content_doc; IHTMLWindow2 *content_window; IHTMLFrameBase2 *base2; IDispatch *disp; @@ -4837,6 +4840,9 @@ static void test_iframe_elem(IHTMLElement *elem) hres = IHTMLDocument2_close(content_doc); ok(hres == S_OK, "close failed: %08x\n", hres); + owner_doc = get_owner_doc((IUnknown*)content_doc); + ok(!owner_doc, "owner_doc = %p\n", owner_doc); + IHTMLDocument2_Release(content_doc); }

1 0

Jacek Caban : mshtml: Moved global property allocation to separated function.
by Alexandre Julliard Nov. 3, 2009

Nov. 3, 2009

Module: wine Branch: master Commit: 9195e1b7568711ea502c9f9b0bc555acd6ee1e72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9195e1b7568711ea502c9f9b0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Nov 1 19:21:37 2009 +0100 mshtml: Moved global property allocation to separated function. --- dlls/mshtml/htmlwindow.c | 58 +++++++++++++++++++++++++++++---------------- 1 files changed, 37 insertions(+), 21 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index b278a5c..a14fe5c 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -1399,6 +1399,37 @@ static HRESULT WINAPI WindowDispEx_Invoke(IDispatchEx *iface, DISPID dispIdMembe pVarResult, pExcepInfo, puArgErr); } +static global_prop_t *alloc_global_prop(HTMLWindow *This, BSTR name) +{ + if(This->global_prop_cnt == This->global_prop_size) { + global_prop_t *new_props; + DWORD new_size; + + if(This->global_props) { + new_size = This->global_prop_size*2; + new_props = heap_realloc(This->global_props, new_size*sizeof(global_prop_t)); + }else { + new_size = 16; + new_props = heap_alloc(new_size*sizeof(global_prop_t)); + } + if(!new_props) + return NULL; + This->global_props = new_props; + This->global_prop_size = new_size; + } + + This->global_props[This->global_prop_cnt].name = heap_strdupW(name); + if(!This->global_props[This->global_prop_cnt].name) + return NULL; + + return This->global_props + This->global_prop_cnt++; +} + +static inline DWORD prop_to_dispid(HTMLWindow *This, global_prop_t *prop) +{ + return MSHTML_DISPID_CUSTOM_MIN + (prop-This->global_props); +} + static HRESULT WINAPI WindowDispEx_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD grfdex, DISPID *pid) { HTMLWindow *This = DISPEX_THIS(iface); @@ -1417,31 +1448,16 @@ static HRESULT WINAPI WindowDispEx_GetDispID(IDispatchEx *iface, BSTR bstrName, } if(find_global_prop(This, bstrName, grfdex, &script_host, &id)) { - if(This->global_prop_cnt == This->global_prop_size) { - global_prop_t *new_props; - DWORD new_size; - - if(This->global_props) { - new_size = This->global_prop_size*2; - new_props = heap_realloc(This->global_props, new_size*sizeof(global_prop_t)); - }else { - new_size = 16; - new_props = heap_alloc(new_size*sizeof(global_prop_t)); - } - if(!new_props) - return E_OUTOFMEMORY; - This->global_props = new_props; - This->global_prop_size = new_size; - } + global_prop_t *prop; - This->global_props[This->global_prop_cnt].name = heap_strdupW(bstrName); - if(!This->global_props[This->global_prop_cnt].name) + prop = alloc_global_prop(This, bstrName); + if(!prop) return E_OUTOFMEMORY; - This->global_props[This->global_prop_cnt].script_host = script_host; - This->global_props[This->global_prop_cnt].id = id; + prop->script_host = script_host; + prop->id = id; - *pid = MSHTML_DISPID_CUSTOM_MIN + (This->global_prop_cnt++); + *pid = prop_to_dispid(This, prop); return S_OK; }

1 0