wine-commits October 2012

wine-commits@winehq.org

2 participants
960 discussions

Matteo Bruni : wined3d: Split GPU vendor and GL vendor handling in GPU recognition.
by Alexandre Julliard 16 Oct '12

16 Oct '12

Module: wine Branch: master Commit: fe81c61804fdf307e26722b0bad61d3eb4843142 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe81c61804fdf307e26722b0b… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Oct 16 16:32:59 2012 +0200 wined3d: Split GPU vendor and GL vendor handling in GPU recognition. --- dlls/wined3d/directx.c | 190 +++++++++++++++++++++++++++-------------------- 1 files changed, 109 insertions(+), 81 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fe81c61804fdf307e2672…

1 0

Jacek Caban : mshtml: Fixed tests on old IEs.
by Alexandre Julliard 16 Oct '12

16 Oct '12

Module: wine Branch: master Commit: 282b2608c4352928377e9d461e410b5900e08f34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=282b2608c4352928377e9d461… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 16 17:10:29 2012 +0200 mshtml: Fixed tests on old IEs. --- dlls/mshtml/tests/script.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index ddf3613..2f8b8ec 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -2091,6 +2091,10 @@ static void test_ui(void) HRESULT hres; hres = IActiveScriptSite_QueryInterface(site, &IID_IActiveScriptSiteUIControl, (void**)&ui_control); + if(hres == E_NOINTERFACE) { + win_skip("IActiveScriptSiteUIControl not supported\n"); + return; + } ok(hres == S_OK, "Could not get IActiveScriptSiteUIControl: %08x\n", hres); hres = IActiveScriptSiteUIControl_GetUIBehavior(ui_control, SCRIPTUICITEM_MSGBOX, &uic_handling);

1 0

Jacek Caban : mshtml: Added IHTMLScriptElement::put_src tests.
by Alexandre Julliard 16 Oct '12

16 Oct '12

Module: wine Branch: master Commit: bfd25b4f50ade3ce56eabdfc3bc6617f7dc2bc52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfd25b4f50ade3ce56eabdfc3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 16 17:10:11 2012 +0200 mshtml: Added IHTMLScriptElement::put_src tests. --- dlls/mshtml/tests/exectest.html | 78 +++++++++++++++++++++++++++++++++----- dlls/mshtml/tests/externscr.js | 1 + dlls/mshtml/tests/rsrc.rc | 3 + 3 files changed, 71 insertions(+), 11 deletions(-) diff --git a/dlls/mshtml/tests/exectest.html b/dlls/mshtml/tests/exectest.html index ad94f42..e1e73f6 100644 --- a/dlls/mshtml/tests/exectest.html +++ b/dlls/mshtml/tests/exectest.html @@ -4,26 +4,82 @@ Script execution test <div id="b1"></div> <div id="b2"></div> <div id="b3"></div> +<script id="emptyscript"></script> <script> function ok(b, msg) { return external.ok(b, msg); } var executed = false; -var len = document.getElementsByTagName('div').length; -ok(len === 3, "init length = " + len); +var extern_cnt = 0; -document.write("<script>" - + "var len = document.getElementsByTagName('div').length;" - + "ok(len === 3, 'unexpected length ' + len);" - + "executed = true;" - + "<" + "/script>"); +function testWriteScript() { + var len = document.getElementsByTagName('div').length; + ok(len === 3, "init length = " + len); -len = document.getElementsByTagName('script').length; -ok(len === 2, "script col length = " + len); -ok(executed, "written script not executed"); + document.write("<script>" + + "var len = document.getElementsByTagName('div').length;" + + "ok(len === 3, 'unexpected length ' + len);" + + "executed = true;" + + "<" + "/script>"); -external.reportSuccess(); + len = document.getElementsByTagName('script').length; + ok(len === 3, "script col length = " + len); + ok(executed, "written script not executed"); +} + +function testPutSrc() { + var elem = document.getElementById("emptyscript"); + + ok(extern_cnt === 0, "extern_cnt = " + extern_cnt + " expected 0"); + elem.src = "externscr.js"; + ok(extern_cnt === 0, "extern_cnt = " + extern_cnt + " expected 0"); +} + +try { + testWriteScript(); + testPutSrc(); +}catch(e) { + ok(false, "Got an exception"); +} + +function testPutSrc2() { + var elem, elem2; + + elem = document.createElement("script"); + elem.src = "externscr.js"; + ok(extern_cnt === 1, "extern_cnt = " + extern_cnt + " expected 1"); + document.body.appendChild(elem); + ok(extern_cnt === 2, "extern_cnt = " + extern_cnt + " expected 2"); + + elem = document.createElement("script"); + document.body.appendChild(elem); + ok(extern_cnt === 2, "extern_cnt = " + extern_cnt + " expected 2"); + elem.src = "externscr.js"; + ok(extern_cnt === 3, "extern_cnt = " + extern_cnt + " expected 3"); + + elem2 = document.createElement("div"); + elem = document.createElement("script"); + elem.src = "externscr.js"; + ok(extern_cnt === 3, "extern_cnt = " + extern_cnt + " expected 3"); + elem2.appendChild(elem); + document.body.appendChild(elem2); + ok(extern_cnt === 4, "extern_cnt = " + extern_cnt + " expected 4"); +} + +document.body.onload = function() { + ok(extern_cnt === 1, "extern_cnt = " + extern_cnt); + try { + testPutSrc2(); + }catch(e) { + ok(false, "got an exception"); + } + + external.reportSuccess(); +} +</script> +<script> + ok(extern_cnt === 1, "extern_cnt = " + extern_cnt); </script> <div id="a1"></div> <div id="a2"></div> diff --git a/dlls/mshtml/tests/externscr.js b/dlls/mshtml/tests/externscr.js new file mode 100644 index 0000000..5861363 --- /dev/null +++ b/dlls/mshtml/tests/externscr.js @@ -0,0 +1 @@ +extern_cnt++; diff --git a/dlls/mshtml/tests/rsrc.rc b/dlls/mshtml/tests/rsrc.rc index 2b91edf..49aecdf 100644 --- a/dlls/mshtml/tests/rsrc.rc +++ b/dlls/mshtml/tests/rsrc.rc @@ -28,5 +28,8 @@ vbtest.html HTML "vbtest.html" /* @makedep: events.html */ events.html HTML "events.html" +/* @makedep: externscr.js */ +externscr.js HTML "externscr.js" + /* @makedep: test_tlb.tlb */ 1 TYPELIB test_tlb.tlb

1 0

Jacek Caban : mshtml: Added support for IHTMLScriptElement:: put_src calls during parser callback.
by Alexandre Julliard 16 Oct '12

16 Oct '12

Module: wine Branch: master Commit: ccbee09f7ea340d3b2185cd2c4e6a470f8dab656 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccbee09f7ea340d3b2185cd2c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 16 17:08:25 2012 +0200 mshtml: Added support for IHTMLScriptElement::put_src calls during parser callback. --- dlls/mshtml/htmlscript.c | 13 +++++++++++-- dlls/mshtml/htmlscript.h | 5 +++++ dlls/mshtml/htmlwindow.c | 1 + dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/mutation.c | 14 ++++++++++++++ dlls/mshtml/script.c | 12 ++++++++++++ 6 files changed, 44 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlscript.c b/dlls/mshtml/htmlscript.c index a256663..75e65f1 100644 --- a/dlls/mshtml/htmlscript.c +++ b/dlls/mshtml/htmlscript.c @@ -123,8 +123,17 @@ static HRESULT WINAPI HTMLScriptElement_put_src(IHTMLScriptElement *iface, BSTR } if(window->parser_callback_cnt) { - FIXME("execution inside parser not supported\n"); - return E_NOTIMPL; + 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 = nsIDOMHTMLScriptElement_GetParentNode(This->nsscript, &parent); diff --git a/dlls/mshtml/htmlscript.h b/dlls/mshtml/htmlscript.h index d6031bd..4540d4c 100644 --- a/dlls/mshtml/htmlscript.h +++ b/dlls/mshtml/htmlscript.h @@ -25,6 +25,11 @@ typedef struct { BOOL parsed; } HTMLScriptElement; +typedef struct { + struct list entry; + HTMLScriptElement *script; +} script_queue_entry_t; + HRESULT script_elem_from_nsscript(HTMLDocumentNode*,nsIDOMHTMLScriptElement*,HTMLScriptElement**) DECLSPEC_HIDDEN; void bind_event_scripts(HTMLDocumentNode*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 740ac55..92659cf 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -2720,6 +2720,7 @@ static HRESULT create_inner_window(HTMLOuterWindow *outer_window, IMoniker *mon, list_init(&window->script_hosts); list_init(&window->bindings); + list_init(&window->script_queue); window->base.outer_window = outer_window; window->base.inner_window = window; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index d5f4ce3..737731f 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -400,6 +400,7 @@ struct HTMLInnerWindow { IHTMLStorage *session_storage; unsigned parser_callback_cnt; + struct list script_queue; global_prop_t *global_props; DWORD global_prop_cnt; diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index 3ab7a07..5e54158 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -298,6 +298,7 @@ static nsresult run_insert_script(HTMLDocumentNode *doc, nsISupports *script_ifa nsIDOMHTMLScriptElement *nsscript; HTMLScriptElement *script_elem; nsIParser *nsparser = NULL; + script_queue_entry_t *iter; HTMLInnerWindow *window; nsresult nsres; HRESULT hres; @@ -332,8 +333,20 @@ static nsresult run_insert_script(HTMLDocumentNode *doc, nsISupports *script_ifa window->parser_callback_cnt++; } + IHTMLWindow2_AddRef(&window->base.IHTMLWindow2_iface); + doc_insert_script(window, script_elem); + while(!list_empty(&window->script_queue)) { + iter = LIST_ENTRY(list_head(&window->script_queue), script_queue_entry_t, entry); + list_remove(&iter->entry); + doc_insert_script(window, iter->script); + IHTMLScriptElement_Release(&iter->script->IHTMLScriptElement_iface); + heap_free(iter); + } + + IHTMLWindow2_Release(&window->base.IHTMLWindow2_iface); + if(nsparser) { window->parser_callback_cnt--; nsIParser_EndEvaluatingParserInsertedScript(nsparser); @@ -341,6 +354,7 @@ static nsresult run_insert_script(HTMLDocumentNode *doc, nsISupports *script_ifa } IHTMLScriptElement_Release(&script_elem->IHTMLScriptElement_iface); + return NS_OK; } diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 730881b..d99269a 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -915,6 +915,9 @@ void doc_insert_script(HTMLInnerWindow *window, HTMLScriptElement *script_elem) { ScriptHost *script_host; + if(script_elem->parsed) + return; + script_host = get_elem_script_host(window, script_elem); if(!script_host) return; @@ -1309,8 +1312,17 @@ void set_script_mode(HTMLOuterWindow *window, SCRIPTMODE mode) void release_script_hosts(HTMLInnerWindow *window) { + script_queue_entry_t *queue_iter; ScriptHost *iter; + while(!list_empty(&window->script_queue)) { + queue_iter = LIST_ENTRY(list_head(&window->script_queue), script_queue_entry_t, entry); + + list_remove(&queue_iter->entry); + IHTMLScriptElement_Release(&queue_iter->script->IHTMLScriptElement_iface); + heap_free(queue_iter); + } + while(!list_empty(&window->script_hosts)) { iter = LIST_ENTRY(list_head(&window->script_hosts), ScriptHost, entry);

1 0

Jacek Caban : mshtml: Added support for IHTMLScriptElement:: put_src on detached elements.
by Alexandre Julliard 16 Oct '12

16 Oct '12

Module: wine Branch: master Commit: b882b18402aeafd22501602969bc096145517b57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b882b18402aeafd2250160296… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 16 17:09:52 2012 +0200 mshtml: Added support for IHTMLScriptElement::put_src on detached elements. --- dlls/mshtml/htmlscript.c | 5 +++-- dlls/mshtml/htmlscript.h | 1 + dlls/mshtml/mutation.c | 19 +++++++++++++++++++ 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlscript.c b/dlls/mshtml/htmlscript.c index 75e65f1..befc577 100644 --- a/dlls/mshtml/htmlscript.c +++ b/dlls/mshtml/htmlscript.c @@ -138,8 +138,9 @@ static HRESULT WINAPI HTMLScriptElement_put_src(IHTMLScriptElement *iface, BSTR nsres = nsIDOMHTMLScriptElement_GetParentNode(This->nsscript, &parent); if(NS_FAILED(nsres) || !parent) { - FIXME("No parent, not supported detached elements\n"); - return E_NOTIMPL; + TRACE("No parent, not executing\n"); + This->parse_on_bind = TRUE; + return S_OK; } nsIDOMNode_Release(parent); diff --git a/dlls/mshtml/htmlscript.h b/dlls/mshtml/htmlscript.h index 4540d4c..8a0c1e5 100644 --- a/dlls/mshtml/htmlscript.h +++ b/dlls/mshtml/htmlscript.h @@ -23,6 +23,7 @@ typedef struct { nsIDOMHTMLScriptElement *nsscript; BOOL parsed; + BOOL parse_on_bind; } HTMLScriptElement; typedef struct { diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index 5e54158..fcae9ff 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -629,6 +629,7 @@ static void NSAPI nsDocumentObserver_BindToDocument(nsIDocumentObserver *iface, HTMLDocumentNode *This = impl_from_nsIDocumentObserver(iface); nsIDOMHTMLIFrameElement *nsiframe; nsIDOMHTMLFrameElement *nsframe; + nsIDOMHTMLScriptElement *nsscript; nsIDOMComment *nscomment; nsIDOMElement *nselem; nsresult nsres; @@ -667,6 +668,24 @@ static void NSAPI nsDocumentObserver_BindToDocument(nsIDocumentObserver *iface, nsIDOMHTMLFrameElement_Release(nsframe); return; } + + 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); + 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); + } } static void NSAPI nsDocumentObserver_AttemptToExecuteScript(nsIDocumentObserver *iface, nsIContent *aContent,

1 0

Jacek Caban : mshtml: Return early from BindToDocument if possible.
by Alexandre Julliard 16 Oct '12

16 Oct '12

Module: wine Branch: master Commit: fdbbaa1ff565ac0cff22b1ae4abe5bfd1e8bbab8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdbbaa1ff565ac0cff22b1ae4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 16 17:08:05 2012 +0200 mshtml: Return early from BindToDocument if possible. --- dlls/mshtml/mutation.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index da691de..3ab7a07 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -633,6 +633,7 @@ static void NSAPI nsDocumentObserver_BindToDocument(nsIDocumentObserver *iface, add_script_runner(This, run_insert_comment, (nsISupports*)nscomment, NULL); nsIDOMComment_Release(nscomment); + return; } nsres = nsIContent_QueryInterface(aContent, &IID_nsIDOMHTMLIFrameElement, (void**)&nsiframe); @@ -641,6 +642,7 @@ static void NSAPI nsDocumentObserver_BindToDocument(nsIDocumentObserver *iface, add_script_runner(This, run_bind_to_tree, (nsISupports*)nsiframe, NULL); nsIDOMHTMLIFrameElement_Release(nsiframe); + return; } nsres = nsIContent_QueryInterface(aContent, &IID_nsIDOMHTMLFrameElement, (void**)&nsframe); @@ -649,6 +651,7 @@ static void NSAPI nsDocumentObserver_BindToDocument(nsIDocumentObserver *iface, add_script_runner(This, run_bind_to_tree, (nsISupports*)nsframe, NULL); nsIDOMHTMLFrameElement_Release(nsframe); + return; } }

1 0

Jacek Caban : mshtml: Added beginning IHTMLScriptElement:: put_src implementation.
by Alexandre Julliard 16 Oct '12

16 Oct '12

Module: wine Branch: master Commit: 680aca56efab0610ab5b4c698da481a82acaf5c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=680aca56efab0610ab5b4c698… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 16 17:07:48 2012 +0200 mshtml: Added beginning IHTMLScriptElement::put_src implementation. --- dlls/mshtml/htmlscript.c | 41 ++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/mutation.c | 12 ++++++++++-- 3 files changed, 52 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlscript.c b/dlls/mshtml/htmlscript.c index d5ae39d..a256663 100644 --- a/dlls/mshtml/htmlscript.c +++ b/dlls/mshtml/htmlscript.c @@ -95,8 +95,47 @@ 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; + FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + + 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); + if(NS_FAILED(nsres)) { + ERR("SetSrc failed: %08x\n", nsres); + return E_FAIL; + } + + if(This->parsed) { + WARN("already parsed\n"); + return S_OK; + } + + if(window->parser_callback_cnt) { + FIXME("execution inside parser not supported\n"); + return E_NOTIMPL; + } + + nsres = nsIDOMHTMLScriptElement_GetParentNode(This->nsscript, &parent); + if(NS_FAILED(nsres) || !parent) { + FIXME("No parent, not supported detached elements\n"); + return E_NOTIMPL; + } + + nsIDOMNode_Release(parent); + doc_insert_script(window, This); + return S_OK; } static HRESULT WINAPI HTMLScriptElement_get_src(IHTMLScriptElement *iface, BSTR *p) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index d78e6ab..d5f4ce3 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -399,6 +399,8 @@ struct HTMLInnerWindow { IOmHistory *history; IHTMLStorage *session_storage; + unsigned parser_callback_cnt; + global_prop_t *global_props; DWORD global_prop_cnt; DWORD global_prop_size; diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index 8c45621..da691de 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -298,11 +298,16 @@ static nsresult run_insert_script(HTMLDocumentNode *doc, nsISupports *script_ifa nsIDOMHTMLScriptElement *nsscript; HTMLScriptElement *script_elem; nsIParser *nsparser = NULL; + HTMLInnerWindow *window; nsresult nsres; HRESULT hres; TRACE("(%p)->(%p)\n", doc, script_iface); + window = doc->window; + if(!window) + return NS_OK; + nsres = nsISupports_QueryInterface(script_iface, &IID_nsIDOMHTMLScriptElement, (void**)&nsscript); if(NS_FAILED(nsres)) { ERR("Could not get nsIDOMHTMLScriptElement: %08x\n", nsres); @@ -322,12 +327,15 @@ static nsresult run_insert_script(HTMLDocumentNode *doc, nsISupports *script_ifa if(FAILED(hres)) return NS_ERROR_FAILURE; - if(nsparser) + if(nsparser) { nsIParser_BeginEvaluatingParserInsertedScript(nsparser); + window->parser_callback_cnt++; + } - doc_insert_script(doc->window, script_elem); + doc_insert_script(window, script_elem); if(nsparser) { + window->parser_callback_cnt--; nsIParser_EndEvaluatingParserInsertedScript(nsparser); nsIParser_Release(nsparser); }

1 0

Jacek Caban : mshtml: Moved HTMLScriptElement declaration to separated header.
by Alexandre Julliard 16 Oct '12

16 Oct '12

Module: wine Branch: master Commit: 51b701c3adb19811b2d6bbe45b959f4982c29754 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51b701c3adb19811b2d6bbe45… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 16 17:07:29 2012 +0200 mshtml: Moved HTMLScriptElement declaration to separated header. --- dlls/mshtml/htmlevent.c | 1 + dlls/mshtml/htmlscript.c | 1 + dlls/mshtml/htmlscript.h | 38 ++++++++++++++++++++++++++++++++++++++ dlls/mshtml/htmlwindow.c | 1 + dlls/mshtml/mshtml_private.h | 20 -------------------- dlls/mshtml/mutation.c | 1 + dlls/mshtml/navigate.c | 1 + dlls/mshtml/nsevents.c | 1 + dlls/mshtml/persist.c | 1 + dlls/mshtml/script.c | 1 + 10 files changed, 46 insertions(+), 20 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 53f8cff..94a9e7e 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -28,6 +28,7 @@ #include "mshtml_private.h" #include "htmlevent.h" +#include "htmlscript.h" #include "wine/debug.h" diff --git a/dlls/mshtml/htmlscript.c b/dlls/mshtml/htmlscript.c index d6241ae..d5ae39d 100644 --- a/dlls/mshtml/htmlscript.c +++ b/dlls/mshtml/htmlscript.c @@ -29,6 +29,7 @@ #include "wine/debug.h" #include "mshtml_private.h" +#include "htmlscript.h" WINE_DEFAULT_DEBUG_CHANNEL(mshtml); diff --git a/dlls/mshtml/htmlscript.h b/dlls/mshtml/htmlscript.h new file mode 100644 index 0000000..d6031bd --- /dev/null +++ b/dlls/mshtml/htmlscript.h @@ -0,0 +1,38 @@ +/* + * Copyright 2012 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +typedef struct { + HTMLElement element; + + IHTMLScriptElement IHTMLScriptElement_iface; + + nsIDOMHTMLScriptElement *nsscript; + BOOL parsed; +} HTMLScriptElement; + +HRESULT script_elem_from_nsscript(HTMLDocumentNode*,nsIDOMHTMLScriptElement*,HTMLScriptElement**) DECLSPEC_HIDDEN; +void bind_event_scripts(HTMLDocumentNode*) DECLSPEC_HIDDEN; + +void release_script_hosts(HTMLInnerWindow*) DECLSPEC_HIDDEN; +void connect_scripts(HTMLInnerWindow*) DECLSPEC_HIDDEN; +void doc_insert_script(HTMLInnerWindow*,HTMLScriptElement*) 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; +BOOL find_global_prop(HTMLInnerWindow*,BSTR,DWORD,ScriptHost**,DISPID*) DECLSPEC_HIDDEN; +IDispatch *get_script_disp(ScriptHost*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 7122b4b..740ac55 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -36,6 +36,7 @@ #include "mshtml_private.h" #include "htmlevent.h" +#include "htmlscript.h" #include "binding.h" #include "resource.h" diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index dc51565..d78e6ab 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -743,18 +743,6 @@ void init_binding_ui(HTMLDocumentObj*) DECLSPEC_HIDDEN; void HTMLDocumentNode_SecMgr_Init(HTMLDocumentNode*) DECLSPEC_HIDDEN; -typedef struct { - HTMLElement element; - - IHTMLScriptElement IHTMLScriptElement_iface; - - nsIDOMHTMLScriptElement *nsscript; - BOOL parsed; -} HTMLScriptElement; - -HRESULT script_elem_from_nsscript(HTMLDocumentNode*,nsIDOMHTMLScriptElement*,HTMLScriptElement**) DECLSPEC_HIDDEN; -void bind_event_scripts(HTMLDocumentNode*) DECLSPEC_HIDDEN; - HRESULT HTMLCurrentStyle_Create(HTMLElement*,IHTMLCurrentStyle**) DECLSPEC_HIDDEN; void ConnectionPoint_Init(ConnectionPoint*,ConnectionPointContainer*,REFIID,cp_static_data_t*) DECLSPEC_HIDDEN; @@ -918,14 +906,6 @@ HRESULT get_elem(HTMLDocumentNode*,nsIDOMElement*,HTMLElement**) DECLSPEC_HIDDEN HTMLElement *unsafe_impl_from_IHTMLElement(IHTMLElement*) DECLSPEC_HIDDEN; -void release_script_hosts(HTMLInnerWindow*) DECLSPEC_HIDDEN; -void connect_scripts(HTMLInnerWindow*) DECLSPEC_HIDDEN; -void doc_insert_script(HTMLInnerWindow*,HTMLScriptElement*) 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; -BOOL find_global_prop(HTMLInnerWindow*,BSTR,DWORD,ScriptHost**,DISPID*) DECLSPEC_HIDDEN; -IDispatch *get_script_disp(ScriptHost*) DECLSPEC_HIDDEN; HRESULT search_window_props(HTMLInnerWindow*,BSTR,DWORD,DISPID*) DECLSPEC_HIDDEN; HRESULT get_frame_by_name(HTMLOuterWindow*,const WCHAR*,BOOL,HTMLOuterWindow**) DECLSPEC_HIDDEN; HRESULT get_doc_elem_by_id(HTMLDocumentNode*,const WCHAR*,HTMLElement**) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index d765b02..8c45621 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -30,6 +30,7 @@ #include "shlguid.h" #include "mshtml_private.h" +#include "htmlscript.h" #include "htmlevent.h" #include "wine/debug.h" diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index bec5ed6..8554ddb 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -40,6 +40,7 @@ #include "wine/debug.h" #include "mshtml_private.h" +#include "htmlscript.h" #include "binding.h" WINE_DEFAULT_DEBUG_CHANNEL(mshtml); diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index 4f970df..7f66f17 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -32,6 +32,7 @@ #include "wine/debug.h" #include "mshtml_private.h" +#include "htmlscript.h" #include "htmlevent.h" #include "resource.h" diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 72711ca..b518b56 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -38,6 +38,7 @@ #include "wine/debug.h" #include "mshtml_private.h" +#include "htmlscript.h" #include "htmlevent.h" #include "binding.h" #include "resource.h" diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index dca0b57..730881b 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -33,6 +33,7 @@ #include "wine/debug.h" #include "mshtml_private.h" +#include "htmlscript.h" #include "pluginhost.h" #include "htmlevent.h" #include "binding.h"

1 0

Jacek Caban : mshtml: Added IHTMLBodyElement:: onload property implementation.
by Alexandre Julliard 16 Oct '12

16 Oct '12

Module: wine Branch: master Commit: c26b63560e64d529b70396cb6eee45534cb3984a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c26b63560e64d529b70396cb6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 16 17:07:10 2012 +0200 mshtml: Added IHTMLBodyElement::onload property implementation. --- dlls/mshtml/htmlbody.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index ea0f11b..e427fc0 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -29,6 +29,7 @@ #include "wine/debug.h" #include "mshtml_private.h" +#include "htmlevent.h" WINE_DEFAULT_DEBUG_CHANNEL(mshtml); @@ -573,15 +574,19 @@ static HRESULT WINAPI HTMLBodyElement_get_aLink(IHTMLBodyElement *iface, VARIANT static HRESULT WINAPI HTMLBodyElement_put_onload(IHTMLBodyElement *iface, VARIANT v) { HTMLBodyElement *This = impl_from_IHTMLBodyElement(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_node_event(&This->textcont.element.node, EVENTID_LOAD, &v); } static HRESULT WINAPI HTMLBodyElement_get_onload(IHTMLBodyElement *iface, VARIANT *p) { HTMLBodyElement *This = impl_from_IHTMLBodyElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_node_event(&This->textcont.element.node, EVENTID_LOAD, p); } static HRESULT WINAPI HTMLBodyElement_put_onunload(IHTMLBodyElement *iface, VARIANT v)

1 0

Francois Gouget : shell32/tests: Fix a test_argify() check that fails on NT4 and Windows 2000.
by Alexandre Julliard 16 Oct '12

16 Oct '12

Module: wine Branch: master Commit: 47d4041dc18aa536fbf3d0f49c159b87c4e2a2f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47d4041dc18aa536fbf3d0f49… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Oct 16 16:07:08 2012 +0200 shell32/tests: Fix a test_argify() check that fails on NT4 and Windows 2000. --- dlls/shell32/tests/shlexec.c | 26 ++++++++++++++++++-------- 1 files changed, 18 insertions(+), 8 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index e3d5676..3c630ef 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -704,7 +704,7 @@ static int StrCmpPath(const char* s1, const char* s2) return 0; } -static void _okChildString(const char* file, int line, const char* key, const char* expected) +static void _okChildString(const char* file, int line, const char* key, const char* expected, const char* bad) { char* result; result=getChildString("Arguments", key); @@ -713,7 +713,8 @@ static void _okChildString(const char* file, int line, const char* key, const ch ok_(file, line)(FALSE, "%s expected '%s', but key not found or empty\n", key, expected); return; } - ok_(file, line)(lstrcmpiA(result, expected) == 0, + ok_(file, line)(lstrcmpiA(result, expected) == 0 || + broken(lstrcmpiA(result, bad) == 0), "%s expected '%s', got '%s'\n", key, expected, result); } @@ -738,7 +739,8 @@ static void _okChildInt(const char* file, int line, const char* key, int expecte "%s expected %d, but got %d\n", key, expected, result); } -#define okChildString(key, expected) _okChildString(__FILE__, __LINE__, (key), (expected)) +#define okChildString(key, expected) _okChildString(__FILE__, __LINE__, (key), (expected), (expected)) +#define okChildStringBroken(key, expected, broken) _okChildString(__FILE__, __LINE__, (key), (expected), (broken)) #define okChildPath(key, expected) _okChildPath(__FILE__, __LINE__, (key), (expected)) #define okChildInt(key, expected) _okChildInt(__FILE__, __LINE__, (key), (expected)) @@ -1219,6 +1221,7 @@ typedef struct const char* params; int todo; cmdline_tests_t cmd; + cmdline_tests_t broken; } argify_tests_t; static const argify_tests_t argify_tests[] = @@ -1324,7 +1327,9 @@ static const argify_tests_t argify_tests[] = /* An unclosed quoted string gets lost! */ {"Params23456", "p2 \"p3\" \"p4 is lost", 0x1c3, {" \"p2\" \"p3\" \"\" \"\" \"\"", - {"", "p2", "p3", "", "", "", NULL}, 0}}, + {"", "p2", "p3", "", "", "", NULL}, 0}, + {" \"p2\" \"p3\" \"p3\" \"\" \"\"", + {"", "p2", "p3", "p3", "", "", NULL}, 0}}, /* Backslashes have no special meaning even when preceding quotes. All * they do is start an unquoted string. @@ -1376,6 +1381,7 @@ static void test_argify(void) char fileA[MAX_PATH], params[2*MAX_PATH+12]; INT_PTR rc; const argify_tests_t* test; + const cmdline_tests_t *bad; const char* cmd; unsigned i, count; @@ -1392,6 +1398,8 @@ static void test_argify(void) test = argify_tests; while (test->params) { + bad = test->broken.cmd ? &test->broken : &test->cmd; + /* trace("***** verb='%s' params='%s'\n", test->verb, test->params); */ rc = shell_execute_ex(SEE_MASK_DOENVSUBST, test->verb, fileA, test->params, NULL, NULL); ok(rc > 32, "%s failed: rc=%lu\n", shell_call, rc); @@ -1415,18 +1423,20 @@ static void test_argify(void) if (cmd) cmd += strlen(test->verb); if (!cmd) cmd = "(null)"; if ((test->todo & 0x2) == 0) - ok(!strcmp(cmd, test->cmd.cmd), "%s: the cmdline is '%s' instead of '%s'\n", shell_call, cmd, test->cmd.cmd); + ok(!strcmp(cmd, test->cmd.cmd) || broken(!strcmp(cmd, bad->cmd)), + "%s: the cmdline is '%s' instead of '%s'\n", shell_call, cmd, test->cmd.cmd); else todo_wine - ok(!strcmp(cmd, test->cmd.cmd), "%s: the cmdline is '%s' instead of '%s'\n", shell_call, cmd, test->cmd.cmd); + ok(!strcmp(cmd, test->cmd.cmd) || broken(!strcmp(cmd, bad->cmd)), + "%s: the cmdline is '%s' instead of '%s'\n", shell_call, cmd, test->cmd.cmd); for (i = 0; i < count - 1; i++) { char argname[18]; sprintf(argname, "argvA%d", 4 + i); if ((test->todo & (1 << (i+4))) == 0) - okChildString(argname, test->cmd.args[i+1]); + okChildStringBroken(argname, test->cmd.args[i+1], bad->args[i+1]); else todo_wine - okChildString(argname, test->cmd.args[i+1]); + okChildStringBroken(argname, test->cmd.args[i+1], bad->args[i+1]); } if (has_cl2a)

1 0

← Newer
1
...
44
45
46
47
48
49
50
...
96
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2012