July 2016 - Wine-commits - list.winehq.org

Michael Stefaniuc : msctf: Avoid a cast from IEnumTfLanguageProfiles to the COM object.
by Alexandre Julliard 20 Jul '16

20 Jul '16

Module: wine Branch: master Commit: a944b4eed97d7f69d664aa1f960c5c620908a311 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a944b4eed97d7f69d664aa1f9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 19 09:47:24 2016 +0200 msctf: Avoid a cast from IEnumTfLanguageProfiles to the COM object. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/inputprocessor.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/msctf/inputprocessor.c b/dlls/msctf/inputprocessor.c index fca78e4..fdeba38 100644 --- a/dlls/msctf/inputprocessor.c +++ b/dlls/msctf/inputprocessor.c @@ -93,7 +93,7 @@ typedef struct { } EnumTfInputProcessorProfiles; static HRESULT ProfilesEnumGuid_Constructor(IEnumGUID **ppOut); -static HRESULT EnumTfLanguageProfiles_Constructor(LANGID langid, IEnumTfLanguageProfiles **ppOut); +static HRESULT EnumTfLanguageProfiles_Constructor(LANGID langid, EnumTfLanguageProfiles **out); static inline EnumTfInputProcessorProfiles *impl_from_IEnumTfInputProcessorProfiles(IEnumTfInputProcessorProfiles *iface) { @@ -616,12 +616,17 @@ static HRESULT WINAPI InputProcessorProfiles_EnumLanguageProfiles( IEnumTfLanguageProfiles **ppEnum) { InputProcessorProfiles *This = impl_from_ITfInputProcessorProfiles(iface); + EnumTfLanguageProfiles *profenum; + HRESULT hr; + TRACE("(%p) %x %p\n",This,langid,ppEnum); if (!ppEnum) return E_INVALIDARG; + hr = EnumTfLanguageProfiles_Constructor(langid, &profenum); + *ppEnum = &profenum->IEnumTfLanguageProfiles_iface; - return EnumTfLanguageProfiles_Constructor(langid, ppEnum); + return hr; } static HRESULT WINAPI InputProcessorProfiles_EnableLanguageProfile( @@ -1292,16 +1297,16 @@ static HRESULT WINAPI EnumTfLanguageProfiles_Clone( IEnumTfLanguageProfiles *ifa IEnumTfLanguageProfiles **ppenum) { EnumTfLanguageProfiles *This = impl_from_IEnumTfLanguageProfiles(iface); + EnumTfLanguageProfiles *new_This; HRESULT res; TRACE("(%p)\n",This); if (ppenum == NULL) return E_POINTER; - res = EnumTfLanguageProfiles_Constructor(This->langid, ppenum); + res = EnumTfLanguageProfiles_Constructor(This->langid, &new_This); if (SUCCEEDED(res)) { - EnumTfLanguageProfiles *new_This = (EnumTfLanguageProfiles *)*ppenum; new_This->tip_index = This->tip_index; lstrcpynW(new_This->szwCurrentClsid,This->szwCurrentClsid,39); @@ -1314,6 +1319,7 @@ static HRESULT WINAPI EnumTfLanguageProfiles_Clone( IEnumTfLanguageProfiles *ifa res = RegOpenKeyExW(new_This->tipkey, fullkey, 0, KEY_READ | KEY_WRITE, &This->langkey); new_This->lang_index = This->lang_index; } + *ppenum = &new_This->IEnumTfLanguageProfiles_iface; } return res; } @@ -1329,7 +1335,7 @@ static const IEnumTfLanguageProfilesVtbl EnumTfLanguageProfilesVtbl = EnumTfLanguageProfiles_Skip }; -static HRESULT EnumTfLanguageProfiles_Constructor(LANGID langid, IEnumTfLanguageProfiles **ppOut) +static HRESULT EnumTfLanguageProfiles_Constructor(LANGID langid, EnumTfLanguageProfiles **out) { HRESULT hr; EnumTfLanguageProfiles *This; @@ -1356,7 +1362,7 @@ static HRESULT EnumTfLanguageProfiles_Constructor(LANGID langid, IEnumTfLanguage return E_FAIL; } - *ppOut = &This->IEnumTfLanguageProfiles_iface; - TRACE("returning %p\n", *ppOut); + *out = This; + TRACE("returning %p\n", *out); return S_OK; }

1 0

Jacek Caban : mshtml/tests: Use relative URLs in navigation.js.
by Alexandre Julliard 20 Jul '16

20 Jul '16

Module: wine Branch: master Commit: acef7258abce77e8729a9ef7d326923a3256091e URL: http://source.winehq.org/git/wine.git/?a=commit;h=acef7258abce77e8729a9ef7d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 19 18:36:04 2016 +0200 mshtml/tests: Use relative URLs in navigation.js. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/navigation.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/tests/navigation.js b/dlls/mshtml/tests/navigation.js index 63f3d57..ea91a56 100644 --- a/dlls/mshtml/tests/navigation.js +++ b/dlls/mshtml/tests/navigation.js @@ -24,7 +24,7 @@ function nav_parent_test() { subframe.onload = function() { var doc = subframe.contentWindow.document; - doc.body.innerHTML = '<a href="http://winetest.org/blank2.html" id="aid" target="_parent">test</a>'; + doc.body.innerHTML = '<a href="blank2.html" id="aid" target="_parent">test</a>'; doc.getElementById("aid").click(); }

1 0

Jacek Caban : mshtml: Use bind_to_tree callback to parse dynamically added scripts.
by Alexandre Julliard 20 Jul '16

20 Jul '16

Module: wine Branch: master Commit: 339ebdb11d9ef42e488715453b4003dbd460933c URL: http://source.winehq.org/git/wine.git/?a=commit;h=339ebdb11d9ef42e488715453… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 19 18:36:27 2016 +0200 mshtml: Use bind_to_tree callback to parse dynamically added scripts. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlscript.c | 21 ++++++++++++++++++++- dlls/mshtml/mutation.c | 12 +----------- dlls/mshtml/tests/exectest.html | 7 +++++-- 3 files changed, 26 insertions(+), 14 deletions(-) diff --git a/dlls/mshtml/htmlscript.c b/dlls/mshtml/htmlscript.c index 6c89206..9feb551 100644 --- a/dlls/mshtml/htmlscript.c +++ b/dlls/mshtml/htmlscript.c @@ -398,6 +398,25 @@ static HRESULT HTMLScriptElement_get_readystate(HTMLDOMNode *iface, BSTR *p) return IHTMLScriptElement_get_readyState(&This->IHTMLScriptElement_iface, p); } +static HRESULT HTMLScriptElement_bind_to_tree(HTMLDOMNode *iface) +{ + HTMLScriptElement *This = impl_from_HTMLDOMNode(iface); + + TRACE("(%p)\n", This); + + if(!This->parse_on_bind) + return S_OK; + + if(!This->element.node.doc || !This->element.node.doc->window) { + ERR("No window\n"); + return E_UNEXPECTED; + } + + This->parse_on_bind = FALSE; + doc_insert_script(This->element.node.doc->window, This); + return S_OK; +} + static void HTMLScriptElement_traverse(HTMLDOMNode *iface, nsCycleCollectionTraversalCallback *cb) { HTMLScriptElement *This = impl_from_HTMLDOMNode(iface); @@ -433,7 +452,7 @@ static const NodeImplVtbl HTMLScriptElementImplVtbl = { HTMLScriptElement_get_readystate, NULL, NULL, - NULL, + HTMLScriptElement_bind_to_tree, HTMLScriptElement_traverse, HTMLScriptElement_unlink }; diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index a298ecb..e2fa084 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -767,20 +767,10 @@ static void NSAPI nsDocumentObserver_BindToDocument(nsIDocumentObserver *iface, nsres = nsIContent_QueryInterface(aContent, &IID_nsIDOMHTMLScriptElement, (void**)&nsscript); if(NS_SUCCEEDED(nsres)) { - HTMLScriptElement *script_elem; - HRESULT hres; - TRACE("script element\n"); - hres = script_elem_from_nsscript(This, nsscript, &script_elem); + add_script_runner(This, run_bind_to_tree, (nsISupports*)nsscript, NULL); nsIDOMHTMLScriptElement_Release(nsscript); - if(FAILED(hres)) - return; - - if(script_elem->parse_on_bind) - add_script_runner(This, run_insert_script, (nsISupports*)nsscript, NULL); - - IHTMLScriptElement_Release(&script_elem->IHTMLScriptElement_iface); return; } diff --git a/dlls/mshtml/tests/exectest.html b/dlls/mshtml/tests/exectest.html index 6bf5e8e..18c6a48 100644 --- a/dlls/mshtml/tests/exectest.html +++ b/dlls/mshtml/tests/exectest.html @@ -104,17 +104,20 @@ function testPutText2() { elem.text = "exec_cnt++;"; /* forces evaluation, but src will be executed */ ok(exec_cnt === 0, "script exec_cnt " + exec_cnt); ok(extern_cnt === 6, "< extern_cnt = " + extern_cnt + " expected 6"); + elem.text = "exec_cnt++;"; /* forces evaluation, but src will be executed */ + ok(exec_cnt === 0, "script exec_cnt " + exec_cnt); + ok(extern_cnt === 7, "< extern_cnt = " + extern_cnt + " expected 6"); elem = document.createElement("script"); exec_cnt = 0; elem.text = "exec_cnt++;"; ok(exec_cnt === 0, "script exec_cnt " + exec_cnt); elem.src = "externscr.js"; - ok(extern_cnt === 6, "extern_cnt = " + extern_cnt + " expected 6"); + ok(extern_cnt === 7, "extern_cnt = " + extern_cnt + " expected 7"); document.body.appendChild(elem); ok(exec_cnt === 0, "script exec_cnt " + exec_cnt); - ok(extern_cnt === 7, "extern_cnt = " + extern_cnt + " expected 7"); + ok(extern_cnt === 8, "extern_cnt = " + extern_cnt + " expected 8"); } document.body.onload = function() {

1 0

Jacek Caban : mshtml: Moved getting text from ScriptBSC to separated function.
by Alexandre Julliard 20 Jul '16

20 Jul '16

Module: wine Branch: master Commit: 2dd15b59d141f0cc23938b7c6ccf189502f9085b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2dd15b59d141f0cc23938b7c6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 19 18:36:47 2016 +0200 mshtml: Moved getting text from ScriptBSC to separated function. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/script.c | 107 ++++++++++++++++++++++++++------------------------- 1 file changed, 54 insertions(+), 53 deletions(-) diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index f6eb7ea..773fb48 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -810,6 +810,57 @@ typedef struct { HRESULT hres; } ScriptBSC; +static HRESULT get_binding_text(ScriptBSC *bsc, WCHAR **ret) +{ + UINT cp = CP_UTF8; + WCHAR *text; + + if(!bsc->bsc.readed) { + text = heap_alloc(sizeof(WCHAR)); + if(!text) + return E_OUTOFMEMORY; + *text = 0; + *ret = text; + return S_OK; + } + + switch(bsc->bsc.bom) { + case BOM_UTF16: + if(bsc->bsc.readed % sizeof(WCHAR)) { + FIXME("The buffer is not a valid utf16 string\n"); + return E_FAIL; + } + + text = heap_alloc(bsc->bsc.readed+sizeof(WCHAR)); + if(!text) + return E_OUTOFMEMORY; + + memcpy(text, bsc->buf, bsc->bsc.readed); + text[bsc->bsc.readed/sizeof(WCHAR)] = 0; + break; + + default: + /* FIXME: Try to use charset from HTTP headers first */ + if(bsc->script_elem) + cp = get_document_charset(bsc->script_elem->element.node.doc); + /* fall through */ + case BOM_UTF8: { + DWORD len; + + len = MultiByteToWideChar(cp, 0, bsc->buf, bsc->bsc.readed, NULL, 0); + text = heap_alloc((len+1)*sizeof(WCHAR)); + if(!text) + return E_OUTOFMEMORY; + + MultiByteToWideChar(cp, 0, bsc->buf, bsc->bsc.readed, text, len); + text[len] = 0; + } + } + + *ret = text; + return S_OK; +} + static inline ScriptBSC *impl_from_BSCallback(BSCallback *iface) { return CONTAINING_RECORD(iface, ScriptBSC, bsc); @@ -924,10 +975,8 @@ static const BSCallbackVtbl ScriptBSCVtbl = { static HRESULT bind_script_to_text(HTMLInnerWindow *window, IUri *uri, HTMLScriptElement *script_elem, WCHAR **ret) { - UINT cp = CP_UTF8; ScriptBSC *bsc; IMoniker *mon; - WCHAR *text; HRESULT hres; hres = CreateURLMonikerEx2(NULL, uri, &mon, URL_MK_UNIFORM); @@ -954,59 +1003,11 @@ static HRESULT bind_script_to_text(HTMLInnerWindow *window, IUri *uri, HTMLScrip hres = start_binding(window, &bsc->bsc, NULL); if(SUCCEEDED(hres)) hres = bsc->hres; - if(FAILED(hres)) { - IBindStatusCallback_Release(&bsc->bsc.IBindStatusCallback_iface); - return hres; - } - - if(!bsc->bsc.readed) { - *ret = NULL; - return S_OK; - } - - switch(bsc->bsc.bom) { - case BOM_UTF16: - if(bsc->bsc.readed % sizeof(WCHAR)) { - FIXME("The buffer is not a valid utf16 string\n"); - hres = E_FAIL; - break; - } - - text = heap_alloc(bsc->bsc.readed+sizeof(WCHAR)); - if(!text) { - hres = E_OUTOFMEMORY; - break; - } - - memcpy(text, bsc->buf, bsc->bsc.readed); - text[bsc->bsc.readed/sizeof(WCHAR)] = 0; - break; - - default: - /* FIXME: Try to use charset from HTTP headers first */ - cp = get_document_charset(window->doc); - /* fall through */ - case BOM_UTF8: { - DWORD len; - - len = MultiByteToWideChar(cp, 0, bsc->buf, bsc->bsc.readed, NULL, 0); - text = heap_alloc((len+1)*sizeof(WCHAR)); - if(!text) { - hres = E_OUTOFMEMORY; - break; - } - - MultiByteToWideChar(cp, 0, bsc->buf, bsc->bsc.readed, text, len); - text[len] = 0; - } - } + if(SUCCEEDED(hres)) + hres = get_binding_text(bsc, ret); IBindStatusCallback_Release(&bsc->bsc.IBindStatusCallback_iface); - if(FAILED(hres)) - return hres; - - *ret = text; - return S_OK; + return hres; } static void parse_extern_script(ScriptHost *script_host, HTMLScriptElement *script_elem, LPCWSTR src)

1 0

Jacek Caban : mshtml: Moved parsing external script to OnStopBinding callback.
by Alexandre Julliard 20 Jul '16

20 Jul '16

Module: wine Branch: master Commit: 718a415aa1ade2ec0b5fdedbfabd55d31021b6d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=718a415aa1ade2ec0b5fdedbf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 19 18:37:11 2016 +0200 mshtml: Moved parsing external script to OnStopBinding callback. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/script.c | 51 ++++++++++++++++++++++++++++++++------------------- 1 file changed, 32 insertions(+), 19 deletions(-) diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 773fb48..582c9af 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -92,6 +92,8 @@ struct ScriptHost { struct list entry; }; +static ScriptHost *get_elem_script_host(HTMLInnerWindow*,HTMLScriptElement*); + static void set_script_prop(ScriptHost *script_host, DWORD property, VARIANT *val) { IActiveScriptProperty *script_prop; @@ -807,7 +809,6 @@ typedef struct { DWORD size; char *buf; - HRESULT hres; } ScriptBSC; static HRESULT get_binding_text(ScriptBSC *bsc, WCHAR **ret) @@ -841,8 +842,7 @@ static HRESULT get_binding_text(ScriptBSC *bsc, WCHAR **ret) default: /* FIXME: Try to use charset from HTTP headers first */ - if(bsc->script_elem) - cp = get_document_charset(bsc->script_elem->element.node.doc); + cp = get_document_charset(bsc->script_elem->element.node.doc); /* fall through */ case BOM_UTF8: { DWORD len; @@ -861,6 +861,29 @@ static HRESULT get_binding_text(ScriptBSC *bsc, WCHAR **ret) return S_OK; } +static void script_file_available(ScriptBSC *bsc) +{ + HTMLScriptElement *script_elem = bsc->script_elem; + HTMLInnerWindow *window = bsc->bsc.window; + ScriptHost *script_host; + WCHAR *text; + HRESULT hres; + + hres = get_binding_text(bsc, &text); + if(FAILED(hres)) + return; + + script_host = get_elem_script_host(window, script_elem); + if(!script_host) { + heap_free(text); + return; + } + + script_elem->parsed = TRUE; + parse_elem_text(script_host, script_elem, text); + heap_free(text); +} + static inline ScriptBSC *impl_from_BSCallback(BSCallback *iface) { return CONTAINING_RECORD(iface, ScriptBSC, bsc); @@ -899,11 +922,14 @@ static HRESULT ScriptBSC_stop_binding(BSCallback *bsc, HRESULT result) { ScriptBSC *This = impl_from_BSCallback(bsc); - This->hres = result; + if(SUCCEEDED(result) && !This->script_elem) + result = E_UNEXPECTED; if(SUCCEEDED(result)) { if(This->script_elem->readystate == READYSTATE_LOADING) set_script_elem_readystate(This->script_elem, READYSTATE_LOADED); + + script_file_available(This); }else { FIXME("binding failed %08x\n", result); heap_free(This->buf); @@ -973,7 +999,7 @@ static const BSCallbackVtbl ScriptBSCVtbl = { }; -static HRESULT bind_script_to_text(HTMLInnerWindow *window, IUri *uri, HTMLScriptElement *script_elem, WCHAR **ret) +static HRESULT bind_script(HTMLInnerWindow *window, IUri *uri, HTMLScriptElement *script_elem) { ScriptBSC *bsc; IMoniker *mon; @@ -991,7 +1017,6 @@ static HRESULT bind_script_to_text(HTMLInnerWindow *window, IUri *uri, HTMLScrip init_bscallback(&bsc->bsc, &ScriptBSCVtbl, mon, 0); IMoniker_Release(mon); - bsc->hres = E_FAIL; hres = IUri_GetScheme(uri, &bsc->scheme); if(FAILED(hres)) @@ -1001,10 +1026,6 @@ static HRESULT bind_script_to_text(HTMLInnerWindow *window, IUri *uri, HTMLScrip bsc->script_elem = script_elem; hres = start_binding(window, &bsc->bsc, NULL); - if(SUCCEEDED(hres)) - hres = bsc->hres; - if(SUCCEEDED(hres)) - hres = get_binding_text(bsc, ret); IBindStatusCallback_Release(&bsc->bsc.IBindStatusCallback_iface); return hres; @@ -1012,7 +1033,6 @@ static HRESULT bind_script_to_text(HTMLInnerWindow *window, IUri *uri, HTMLScrip static void parse_extern_script(ScriptHost *script_host, HTMLScriptElement *script_elem, LPCWSTR src) { - WCHAR *text; IUri *uri; HRESULT hres; @@ -1025,14 +1045,8 @@ static void parse_extern_script(ScriptHost *script_host, HTMLScriptElement *scri if(FAILED(hres)) return; - hres = bind_script_to_text(script_host->window, uri, script_elem, &text); + hres = bind_script(script_host->window, uri, script_elem); IUri_Release(uri); - if(FAILED(hres) || !text) - return; - - parse_elem_text(script_host, script_elem, text); - - heap_free(text); } static void parse_inline_script(ScriptHost *script_host, HTMLScriptElement *script_elem) @@ -1083,7 +1097,6 @@ static void parse_script_elem(ScriptHost *script_host, HTMLScriptElement *script if(NS_FAILED(nsres)) { ERR("GetSrc failed: %08x\n", nsres); }else if(*src) { - script_elem->parsed = TRUE; parse_extern_script(script_host, script_elem, src); }else { parse_inline_script(script_host, script_elem);

1 0

Jacek Caban : mshtml: Store external script text in HTMLScriptElement object.
by Alexandre Julliard 20 Jul '16

20 Jul '16

Module: wine Branch: master Commit: f73f884884b74d20f6068a99c5e8c53ef91ce276 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f73f884884b74d20f6068a99c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 19 18:39:47 2016 +0200 mshtml: Store external script text in HTMLScriptElement object. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlscript.c | 9 ++++++++- dlls/mshtml/htmlscript.h | 1 + dlls/mshtml/script.c | 12 +++++------- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmlscript.c b/dlls/mshtml/htmlscript.c index 9feb551..0a2d67a 100644 --- a/dlls/mshtml/htmlscript.c +++ b/dlls/mshtml/htmlscript.c @@ -391,6 +391,13 @@ static HRESULT HTMLScriptElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) return HTMLElement_QI(&This->element.node, riid, ppv); } +static void HTMLScriptElement_destructor(HTMLDOMNode *iface) +{ + HTMLScriptElement *This = impl_from_HTMLDOMNode(iface); + heap_free(This->src_text); + HTMLElement_destructor(&This->element.node); +} + static HRESULT HTMLScriptElement_get_readystate(HTMLDOMNode *iface, BSTR *p) { HTMLScriptElement *This = impl_from_HTMLDOMNode(iface); @@ -439,7 +446,7 @@ static void HTMLScriptElement_unlink(HTMLDOMNode *iface) static const NodeImplVtbl HTMLScriptElementImplVtbl = { HTMLScriptElement_QI, - HTMLElement_destructor, + HTMLScriptElement_destructor, HTMLElement_cpc, HTMLElement_clone, HTMLElement_handle_event, diff --git a/dlls/mshtml/htmlscript.h b/dlls/mshtml/htmlscript.h index ad493c9..4e40f63 100644 --- a/dlls/mshtml/htmlscript.h +++ b/dlls/mshtml/htmlscript.h @@ -26,6 +26,7 @@ typedef struct { BOOL parse_on_bind; BOOL pending_readystatechange_event; READYSTATE readystate; + WCHAR *src_text; /* sctipt text downloaded from src */ } HTMLScriptElement; typedef struct { diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 582c9af..3503e69 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -866,22 +866,20 @@ static void script_file_available(ScriptBSC *bsc) HTMLScriptElement *script_elem = bsc->script_elem; HTMLInnerWindow *window = bsc->bsc.window; ScriptHost *script_host; - WCHAR *text; HRESULT hres; - hres = get_binding_text(bsc, &text); + assert(window != NULL); + + hres = get_binding_text(bsc, &script_elem->src_text); if(FAILED(hres)) return; script_host = get_elem_script_host(window, script_elem); - if(!script_host) { - heap_free(text); + if(!script_host) return; - } script_elem->parsed = TRUE; - parse_elem_text(script_host, script_elem, text); - heap_free(text); + parse_elem_text(script_host, script_elem, script_elem->src_text); } static inline ScriptBSC *impl_from_BSCallback(BSCallback *iface)

1 0

Jacek Caban : mshtml: Merge parse_extern_script and bind_script.
by Alexandre Julliard 20 Jul '16

20 Jul '16

Module: wine Branch: master Commit: eeb075dd0e38615f2e1ac9e62adf11f3b3105a82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eeb075dd0e38615f2e1ac9e62… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 19 18:40:04 2016 +0200 mshtml: Merge parse_extern_script and bind_script. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/script.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 3503e69..ab9be3b 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -997,12 +997,30 @@ static const BSCallbackVtbl ScriptBSCVtbl = { }; -static HRESULT bind_script(HTMLInnerWindow *window, IUri *uri, HTMLScriptElement *script_elem) +static HRESULT load_script(HTMLScriptElement *script_elem, const WCHAR *src) { + HTMLInnerWindow *window; ScriptBSC *bsc; IMoniker *mon; + IUri *uri; HRESULT hres; + static const WCHAR wine_schemaW[] = {'w','i','n','e',':'}; + + if(strlenW(src) > sizeof(wine_schemaW)/sizeof(WCHAR) && !memcmp(src, wine_schemaW, sizeof(wine_schemaW))) + src += sizeof(wine_schemaW)/sizeof(WCHAR); + + TRACE("(%p %s)\n", script_elem, debugstr_w(src)); + + if(!script_elem->element.node.doc || !(window = script_elem->element.node.doc->window)) { + ERR("no window\n"); + return E_UNEXPECTED; + } + + hres = create_uri(src, 0, &uri); + if(FAILED(hres)) + return hres; + hres = CreateURLMonikerEx2(NULL, uri, &mon, URL_MK_UNIFORM); if(FAILED(hres)) return hres; @@ -1029,24 +1047,6 @@ static HRESULT bind_script(HTMLInnerWindow *window, IUri *uri, HTMLScriptElement return hres; } -static void parse_extern_script(ScriptHost *script_host, HTMLScriptElement *script_elem, LPCWSTR src) -{ - IUri *uri; - HRESULT hres; - - static const WCHAR wine_schemaW[] = {'w','i','n','e',':'}; - - if(strlenW(src) > sizeof(wine_schemaW)/sizeof(WCHAR) && !memcmp(src, wine_schemaW, sizeof(wine_schemaW))) - src += sizeof(wine_schemaW)/sizeof(WCHAR); - - hres = create_uri(src, 0, &uri); - if(FAILED(hres)) - return; - - hres = bind_script(script_host->window, uri, script_elem); - IUri_Release(uri); -} - static void parse_inline_script(ScriptHost *script_host, HTMLScriptElement *script_elem) { const PRUnichar *text; @@ -1095,7 +1095,7 @@ static void parse_script_elem(ScriptHost *script_host, HTMLScriptElement *script if(NS_FAILED(nsres)) { ERR("GetSrc failed: %08x\n", nsres); }else if(*src) { - parse_extern_script(script_host, script_elem, src); + load_script(script_elem, src); }else { parse_inline_script(script_host, script_elem); }

1 0

Jacek Caban : mshtml: Moved script execution logic from HTMLScriptElement: :put_src to script BSC.
by Alexandre Julliard 20 Jul '16

20 Jul '16

Module: wine Branch: master Commit: 5b1affa44641ac9c600d905e54cadc098659bec0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b1affa44641ac9c600d905e5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 19 18:40:36 2016 +0200 mshtml: Moved script execution logic from HTMLScriptElement::put_src to script BSC. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlscript.c | 44 ++++++++++------------------------- dlls/mshtml/htmlscript.h | 1 + dlls/mshtml/script.c | 60 ++++++++++++++++++++++++++++++++++++++++++------ 3 files changed, 66 insertions(+), 39 deletions(-) diff --git a/dlls/mshtml/htmlscript.c b/dlls/mshtml/htmlscript.c index 0a2d67a..0d6dddf 100644 --- a/dlls/mshtml/htmlscript.c +++ b/dlls/mshtml/htmlscript.c @@ -96,20 +96,12 @@ static HRESULT WINAPI HTMLScriptElement_Invoke(IHTMLScriptElement *iface, DISPID static HRESULT WINAPI HTMLScriptElement_put_src(IHTMLScriptElement *iface, BSTR v) { HTMLScriptElement *This = impl_from_IHTMLScriptElement(iface); - HTMLInnerWindow *window; - nsIDOMNode *parent; nsAString src_str; nsresult nsres; + HRESULT hres; TRACE("(%p)->(%s)\n", This, debugstr_w(v)); - if(!This->element.node.doc || !This->element.node.doc->window) { - WARN("no windoow\n"); - return E_UNEXPECTED; - } - - window = This->element.node.doc->window; - nsAString_InitDepend(&src_str, v); nsres = nsIDOMHTMLScriptElement_SetSrc(This->nsscript, &src_str); nsAString_Finish(&src_str); @@ -123,30 +115,18 @@ static HRESULT WINAPI HTMLScriptElement_put_src(IHTMLScriptElement *iface, BSTR return S_OK; } - if(window->parser_callback_cnt) { - script_queue_entry_t *queue; - - queue = heap_alloc(sizeof(*queue)); - if(!queue) - return E_OUTOFMEMORY; - - IHTMLScriptElement_AddRef(&This->IHTMLScriptElement_iface); - queue->script = This; - - list_add_tail(&window->script_queue, &queue->entry); - return S_OK; - } - - nsres = nsIDOMHTMLElement_GetParentNode(This->element.nselem, &parent); - if(NS_FAILED(nsres) || !parent) { - TRACE("No parent, not executing\n"); - This->parse_on_bind = TRUE; - return S_OK; + nsAString_Init(&src_str, NULL); + nsres = nsIDOMHTMLScriptElement_GetSrc(This->nsscript, &src_str); + if(NS_SUCCEEDED(nsres)) { + const PRUnichar *src; + nsAString_GetData(&src_str, &src); + hres = load_script(This, src); + }else { + ERR("SetSrc failed: %08x\n", nsres); + hres = E_FAIL; } - - nsIDOMNode_Release(parent); - doc_insert_script(window, This); - return S_OK; + nsAString_Finish(&src_str); + return hres; } static HRESULT WINAPI HTMLScriptElement_get_src(IHTMLScriptElement *iface, BSTR *p) diff --git a/dlls/mshtml/htmlscript.h b/dlls/mshtml/htmlscript.h index 4e40f63..efa392d 100644 --- a/dlls/mshtml/htmlscript.h +++ b/dlls/mshtml/htmlscript.h @@ -36,6 +36,7 @@ typedef struct { HRESULT script_elem_from_nsscript(HTMLDocumentNode*,nsIDOMHTMLScriptElement*,HTMLScriptElement**) DECLSPEC_HIDDEN; void bind_event_scripts(HTMLDocumentNode*) DECLSPEC_HIDDEN; +HRESULT load_script(HTMLScriptElement*,const WCHAR*) DECLSPEC_HIDDEN; void release_script_hosts(HTMLInnerWindow*) DECLSPEC_HIDDEN; void connect_scripts(HTMLInnerWindow*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index ab9be3b..fa1a681 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -866,6 +866,8 @@ static void script_file_available(ScriptBSC *bsc) HTMLScriptElement *script_elem = bsc->script_elem; HTMLInnerWindow *window = bsc->bsc.window; ScriptHost *script_host; + nsIDOMNode *parent; + nsresult nsres; HRESULT hres; assert(window != NULL); @@ -878,8 +880,38 @@ static void script_file_available(ScriptBSC *bsc) if(!script_host) return; + if(window->parser_callback_cnt) { + script_queue_entry_t *queue; + + TRACE("Adding to queue\n"); + + queue = heap_alloc(sizeof(*queue)); + if(!queue) + return; + + IHTMLScriptElement_AddRef(&script_elem->IHTMLScriptElement_iface); + queue->script = script_elem; + + list_add_tail(&window->script_queue, &queue->entry); + return; + } + + nsres = nsIDOMHTMLElement_GetParentNode(script_elem->element.nselem, &parent); + if(NS_FAILED(nsres) || !parent) { + TRACE("No parent, not executing\n"); + script_elem->parse_on_bind = TRUE; + return; + } + + nsIDOMNode_Release(parent); + + script_host = get_elem_script_host(window, script_elem); + if(!script_host) + return; + script_elem->parsed = TRUE; - parse_elem_text(script_host, script_elem, script_elem->src_text); + if(script_host->parse) + parse_elem_text(script_host, script_elem, script_elem->src_text); } static inline ScriptBSC *impl_from_BSCallback(BSCallback *iface) @@ -997,7 +1029,7 @@ static const BSCallbackVtbl ScriptBSCVtbl = { }; -static HRESULT load_script(HTMLScriptElement *script_elem, const WCHAR *src) +HRESULT load_script(HTMLScriptElement *script_elem, const WCHAR *src) { HTMLInnerWindow *window; ScriptBSC *bsc; @@ -1066,9 +1098,10 @@ static void parse_inline_script(ScriptHost *script_host, HTMLScriptElement *scri nsAString_Finish(&text_str); } -static void parse_script_elem(ScriptHost *script_host, HTMLScriptElement *script_elem) +static BOOL parse_script_elem(ScriptHost *script_host, HTMLScriptElement *script_elem) { nsAString src_str, event_str; + BOOL is_complete = FALSE; const PRUnichar *src; nsresult nsres; @@ -1081,7 +1114,7 @@ static void parse_script_elem(ScriptHost *script_host, HTMLScriptElement *script if(*event) { TRACE("deferring event %s script evaluation\n", debugstr_w(event)); nsAString_Finish(&event_str); - return; + return FALSE; } }else { ERR("GetEvent failed: %08x\n", nsres); @@ -1096,13 +1129,15 @@ static void parse_script_elem(ScriptHost *script_host, HTMLScriptElement *script ERR("GetSrc failed: %08x\n", nsres); }else if(*src) { load_script(script_elem, src); + is_complete = script_elem->parsed; }else { parse_inline_script(script_host, script_elem); + is_complete = TRUE; } nsAString_Finish(&src_str); - set_script_elem_readystate(script_elem, READYSTATE_COMPLETE); + return is_complete; } static GUID get_default_script_guid(HTMLInnerWindow *window) @@ -1225,13 +1260,24 @@ static ScriptHost *get_elem_script_host(HTMLInnerWindow *window, HTMLScriptEleme void doc_insert_script(HTMLInnerWindow *window, HTMLScriptElement *script_elem) { ScriptHost *script_host; + BOOL is_complete = FALSE; script_host = get_elem_script_host(window, script_elem); if(!script_host) return; - if(script_host->parse) - parse_script_elem(script_host, script_elem); + if(script_host->parse) { + if(script_elem->src_text) { + script_elem->parsed = TRUE; + parse_elem_text(script_host, script_elem, script_elem->src_text); + is_complete = TRUE; + }else { + is_complete = parse_script_elem(script_host, script_elem); + } + } + + if(is_complete) + set_script_elem_readystate(script_elem, READYSTATE_COMPLETE); } IDispatch *script_parse_event(HTMLInnerWindow *window, LPCWSTR text)

1 0

Jacek Caban : mshtml: Set loaded script ready state if binding failed.
by Alexandre Julliard 20 Jul '16

20 Jul '16

Module: wine Branch: master Commit: 3a85711a988ed792aed5aff71b53ff2db55d8488 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a85711a988ed792aed5aff71… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 19 18:40:47 2016 +0200 mshtml: Set loaded script ready state if binding failed. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/script.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index fa1a681..4be6e3d 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -955,10 +955,10 @@ static HRESULT ScriptBSC_stop_binding(BSCallback *bsc, HRESULT result) if(SUCCEEDED(result) && !This->script_elem) result = E_UNEXPECTED; - if(SUCCEEDED(result)) { - if(This->script_elem->readystate == READYSTATE_LOADING) - set_script_elem_readystate(This->script_elem, READYSTATE_LOADED); + if(This->script_elem->readystate == READYSTATE_LOADING) + set_script_elem_readystate(This->script_elem, READYSTATE_LOADED); + if(SUCCEEDED(result)) { script_file_available(This); }else { FIXME("binding failed %08x\n", result);

1 0

Jacek Caban : mshtml: Set interactive script ready state change in the right places.
by Alexandre Julliard 20 Jul '16

20 Jul '16

Module: wine Branch: master Commit: 8ccc38cb5580a7cc58c9bf6420262d391beb2459 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ccc38cb5580a7cc58c9bf642… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 19 18:41:06 2016 +0200 mshtml: Set interactive script ready state change in the right places. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlscript.c | 4 ++-- dlls/mshtml/htmlscript.h | 2 +- dlls/mshtml/mutation.c | 4 ++-- dlls/mshtml/script.c | 8 +++++--- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmlscript.c b/dlls/mshtml/htmlscript.c index 0d6dddf..d266276 100644 --- a/dlls/mshtml/htmlscript.c +++ b/dlls/mshtml/htmlscript.c @@ -203,7 +203,7 @@ static HRESULT WINAPI HTMLScriptElement_put_text(IHTMLScriptElement *iface, BSTR } nsIDOMNode_Release(parent); - doc_insert_script(window, This); + doc_insert_script(window, This, FALSE); return S_OK; } @@ -400,7 +400,7 @@ static HRESULT HTMLScriptElement_bind_to_tree(HTMLDOMNode *iface) } This->parse_on_bind = FALSE; - doc_insert_script(This->element.node.doc->window, This); + doc_insert_script(This->element.node.doc->window, This, FALSE); return S_OK; } diff --git a/dlls/mshtml/htmlscript.h b/dlls/mshtml/htmlscript.h index efa392d..f5053ee 100644 --- a/dlls/mshtml/htmlscript.h +++ b/dlls/mshtml/htmlscript.h @@ -40,7 +40,7 @@ HRESULT load_script(HTMLScriptElement*,const WCHAR*) DECLSPEC_HIDDEN; void release_script_hosts(HTMLInnerWindow*) DECLSPEC_HIDDEN; void connect_scripts(HTMLInnerWindow*) DECLSPEC_HIDDEN; -void doc_insert_script(HTMLInnerWindow*,HTMLScriptElement*) DECLSPEC_HIDDEN; +void doc_insert_script(HTMLInnerWindow*,HTMLScriptElement*,BOOL) DECLSPEC_HIDDEN; IDispatch *script_parse_event(HTMLInnerWindow*,LPCWSTR) DECLSPEC_HIDDEN; HRESULT exec_script(HTMLInnerWindow*,const WCHAR*,const WCHAR*,VARIANT*) DECLSPEC_HIDDEN; void set_script_mode(HTMLOuterWindow*,SCRIPTMODE) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index e2fa084..8c4fc67 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -337,13 +337,13 @@ static nsresult run_insert_script(HTMLDocumentNode *doc, nsISupports *script_ifa IHTMLWindow2_AddRef(&window->base.IHTMLWindow2_iface); - doc_insert_script(window, script_elem); + doc_insert_script(window, script_elem, TRUE); while(!list_empty(&window->script_queue)) { iter = LIST_ENTRY(list_head(&window->script_queue), script_queue_entry_t, entry); list_remove(&iter->entry); if(!iter->script->parsed) - doc_insert_script(window, iter->script); + doc_insert_script(window, iter->script, TRUE); IHTMLScriptElement_Release(&iter->script->IHTMLScriptElement_iface); heap_free(iter); } diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 4be6e3d..bd0f8d4 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -786,8 +786,6 @@ static void parse_elem_text(ScriptHost *script_host, HTMLScriptElement *script_e TRACE("%s\n", debugstr_w(text)); - set_script_elem_readystate(script_elem, READYSTATE_INTERACTIVE); - VariantInit(&var); memset(&excepinfo, 0, sizeof(excepinfo)); TRACE(">>>\n"); @@ -1089,6 +1087,8 @@ static void parse_inline_script(ScriptHost *script_host, HTMLScriptElement *scri nsres = nsIDOMHTMLScriptElement_GetText(script_elem->nsscript, &text_str); nsAString_GetData(&text_str, &text); + set_script_elem_readystate(script_elem, READYSTATE_INTERACTIVE); + if(NS_FAILED(nsres)) { ERR("GetText failed: %08x\n", nsres); }else if(*text) { @@ -1257,7 +1257,7 @@ static ScriptHost *get_elem_script_host(HTMLInnerWindow *window, HTMLScriptEleme return get_script_host(window, &guid); } -void doc_insert_script(HTMLInnerWindow *window, HTMLScriptElement *script_elem) +void doc_insert_script(HTMLInnerWindow *window, HTMLScriptElement *script_elem, BOOL from_parser) { ScriptHost *script_host; BOOL is_complete = FALSE; @@ -1268,6 +1268,8 @@ void doc_insert_script(HTMLInnerWindow *window, HTMLScriptElement *script_elem) if(script_host->parse) { if(script_elem->src_text) { + if(from_parser) + set_script_elem_readystate(script_elem, READYSTATE_INTERACTIVE); script_elem->parsed = TRUE; parse_elem_text(script_host, script_elem, script_elem->src_text); is_complete = TRUE;

1 0