October 2012 - Wine-Commits

Jacek Caban : vbscript: Allow specifying simple builtin constants without proper getter.
by Alexandre Julliard Oct. 17, 2012

Oct. 17, 2012

Module: wine Branch: master Commit: 789f295efbb1c91e58103b1c67a2c02fc788a848 URL: http://source.winehq.org/git/wine.git/?a=commit;h=789f295efbb1c91e58103b1c6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 17 09:54:27 2012 +0200 vbscript: Allow specifying simple builtin constants without proper getter. --- dlls/vbscript/global.c | 56 ++++++------------------------------------------ dlls/vbscript/vbdisp.c | 6 +++++ 2 files changed, 13 insertions(+), 49 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 69686f5..87d2736 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1560,48 +1560,6 @@ static HRESULT Global_vbUseSystemDayOfWeek(vbdisp_t *This, VARIANT *arg, unsigne return E_NOTIMPL; } -static HRESULT Global_vbSunday(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - TRACE("\n"); - return return_short(res, 1); -} - -static HRESULT Global_vbMonday(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - TRACE("\n"); - return return_short(res, 2); -} - -static HRESULT Global_vbTuesday(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - TRACE("\n"); - return return_short(res, 3); -} - -static HRESULT Global_vbWednesday(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - TRACE("\n"); - return return_short(res, 4); -} - -static HRESULT Global_vbThursday(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - TRACE("\n"); - return return_short(res, 5); -} - -static HRESULT Global_vbFriday(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - TRACE("\n"); - return return_short(res, 6); -} - -static HRESULT Global_vbSaturday(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - TRACE("\n"); - return return_short(res, 7); -} - static HRESULT Global_vbFirstJan1(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { FIXME("\n"); @@ -2061,13 +2019,13 @@ static HRESULT Global_vbMsgBoxRtlReading(vbdisp_t *This, VARIANT *arg, unsigned static const builtin_prop_t global_props[] = { {DISPID_GLOBAL_VBUSESYSTEM, Global_vbUseSystem, BP_GET}, {DISPID_GLOBAL_USESYSTEMDAYOFWEEK, Global_vbUseSystemDayOfWeek, BP_GET}, - {DISPID_GLOBAL_VBSUNDAY, Global_vbSunday, BP_GET}, - {DISPID_GLOBAL_VBMONDAY, Global_vbMonday, BP_GET}, - {DISPID_GLOBAL_VBTUESDAY, Global_vbTuesday, BP_GET}, - {DISPID_GLOBAL_VBWEDNESDAY, Global_vbWednesday, BP_GET}, - {DISPID_GLOBAL_VBTHURSDAY, Global_vbThursday, BP_GET}, - {DISPID_GLOBAL_VBFRIDAY, Global_vbFriday, BP_GET}, - {DISPID_GLOBAL_VBSATURDAY, Global_vbSaturday, BP_GET}, + {DISPID_GLOBAL_VBSUNDAY, NULL, BP_GET, 1}, + {DISPID_GLOBAL_VBMONDAY, NULL, BP_GET, 2}, + {DISPID_GLOBAL_VBTUESDAY, NULL, BP_GET, 3}, + {DISPID_GLOBAL_VBWEDNESDAY, NULL, BP_GET, 4}, + {DISPID_GLOBAL_VBTHURSDAY, NULL, BP_GET, 5}, + {DISPID_GLOBAL_VBFRIDAY, NULL, BP_GET, 6}, + {DISPID_GLOBAL_VBSATURDAY, NULL, BP_GET, 7}, {DISPID_GLOBAL_VBFIRSTJAN1, Global_vbFirstJan1, BP_GET}, {DISPID_GLOBAL_VBFIRSTFOURDAYS, Global_vbFirstFourDays, BP_GET}, {DISPID_GLOBAL_VBFIRSTFULLWEEK, Global_vbFirstFullWeek, BP_GET}, diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index aff9361..b37caf6 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -149,6 +149,12 @@ static HRESULT invoke_builtin(vbdisp_t *This, const builtin_prop_t *prop, WORD f } break; case DISPATCH_PROPERTYGET|DISPATCH_METHOD: + if(!prop->proc && prop->flags == BP_GET) { + assert((INT16)prop->min_args == prop->min_args); + V_VT(res) = VT_I2; + V_I2(res) = prop->min_args; + return S_OK; + } break; case DISPATCH_METHOD: if(prop->flags & (BP_GET|BP_GETPUT)) {

1 0

Hans Leidekker : wbemprox: The last parameter to IWbemClassObject:: GetMethod is optional.
by Alexandre Julliard Oct. 17, 2012

Oct. 17, 2012

Module: wine Branch: master Commit: 64a7f2ea7fddb3934e13818cc24aad650358235b URL: http://source.winehq.org/git/wine.git/?a=commit;h=64a7f2ea7fddb3934e13818cc… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 17 11:06:59 2012 +0200 wbemprox: The last parameter to IWbemClassObject::GetMethod is optional. --- dlls/wbemprox/class.c | 2 +- dlls/wbemprox/tests/query.c | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index a3a06e1..75bd612 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -848,7 +848,7 @@ static HRESULT WINAPI class_object_GetMethod( TRACE("%p, %s, %08x, %p, %p\n", iface, debugstr_w(wszName), lFlags, ppInSignature, ppOutSignature); hr = create_signature( co->name, wszName, PARAM_IN, ppInSignature ); - if (hr != S_OK) return hr; + if (hr != S_OK || !ppOutSignature) return hr; hr = create_signature( co->name, wszName, PARAM_OUT, ppOutSignature ); if (hr != S_OK) IWbemClassObject_Release( *ppInSignature ); diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 15fad8c..e531b3c 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -143,7 +143,7 @@ static void test_StdRegProv( IWbemServices *services ) {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', 'W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n',0}; BSTR class = SysAllocString( stdregprovW ), method; - IWbemClassObject *reg, *sig_in, *sig_out, *in, *out; + IWbemClassObject *reg, *sig_in, *in, *out; VARIANT defkey, subkey, retval, names, types, value, valuename; CIMTYPE type; HRESULT hr; @@ -154,7 +154,7 @@ static void test_StdRegProv( IWbemServices *services ) win_skip( "StdRegProv not available\n" ); return; } - hr = IWbemClassObject_GetMethod( reg, enumkeyW, 0, &sig_in, &sig_out ); + hr = IWbemClassObject_GetMethod( reg, enumkeyW, 0, &sig_in, NULL ); ok( hr == S_OK, "failed to get EnumKey method %08x\n", hr ); hr = IWbemClassObject_SpawnInstance( sig_in, 0, &in ); @@ -196,9 +196,8 @@ static void test_StdRegProv( IWbemServices *services ) IWbemClassObject_Release( in ); IWbemClassObject_Release( out ); IWbemClassObject_Release( sig_in ); - IWbemClassObject_Release( sig_out ); - hr = IWbemClassObject_GetMethod( reg, enumvaluesW, 0, &sig_in, &sig_out ); + hr = IWbemClassObject_GetMethod( reg, enumvaluesW, 0, &sig_in, NULL ); ok( hr == S_OK, "failed to get EnumValues method %08x\n", hr ); hr = IWbemClassObject_SpawnInstance( sig_in, 0, &in ); @@ -248,9 +247,8 @@ static void test_StdRegProv( IWbemServices *services ) IWbemClassObject_Release( in ); IWbemClassObject_Release( out ); IWbemClassObject_Release( sig_in ); - IWbemClassObject_Release( sig_out ); - hr = IWbemClassObject_GetMethod( reg, getstringvalueW, 0, &sig_in, &sig_out ); + hr = IWbemClassObject_GetMethod( reg, getstringvalueW, 0, &sig_in, NULL ); ok( hr == S_OK, "failed to get GetStringValue method %08x\n", hr ); hr = IWbemClassObject_SpawnInstance( sig_in, 0, &in ); @@ -298,7 +296,6 @@ static void test_StdRegProv( IWbemServices *services ) IWbemClassObject_Release( in ); IWbemClassObject_Release( out ); IWbemClassObject_Release( sig_in ); - IWbemClassObject_Release( sig_out ); IWbemClassObject_Release( reg ); SysFreeString( class );

1 0

Matteo Bruni : wined3d: Improve a Nvidia GPU recognition fallback.
by Alexandre Julliard Oct. 16, 2012

Oct. 16, 2012

Module: wine Branch: master Commit: 37ff45cca2210d03355b881e62688e1ac45a7fbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=37ff45cca2210d03355b881e6… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Oct 16 16:33:00 2012 +0200 wined3d: Improve a Nvidia GPU recognition fallback. --- dlls/wined3d/directx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 4406d70..3eb5eb0 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2136,7 +2136,7 @@ static enum wined3d_pci_device select_card_fallback_nvidia(const struct wined3d_ if (d3d_level >= 10) return CARD_NVIDIA_GEFORCE_8800GTX; if (d3d_level >= 9 && gl_info->supported[NV_VERTEX_PROGRAM3]) - return CARD_NVIDIA_GEFORCE_6200; + return CARD_NVIDIA_GEFORCE_6800; if (d3d_level >= 9) return CARD_NVIDIA_GEFORCEFX_5800; if (d3d_level >= 8)

1 0

Jacek Caban : mshtml: Fixed tests on old IEs.
by Alexandre Julliard Oct. 16, 2012

Oct. 16, 2012

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 Oct. 16, 2012

Oct. 16, 2012

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: Return early from BindToDocument if possible.
by Alexandre Julliard Oct. 16, 2012

Oct. 16, 2012

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

Christian Costa : amstream: Specifying a stream object in params is not yet supported.
by Alexandre Julliard Oct. 16, 2012

Oct. 16, 2012

Module: wine Branch: master Commit: 7d128ea8993c708d5bb6a4a31f9bc1b6635287d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d128ea8993c708d5bb6a4a31… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Oct 16 20:12:19 2012 +0200 amstream: Specifying a stream object in params is not yet supported. --- dlls/amstream/amstream.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/amstream/amstream.c b/dlls/amstream/amstream.c index 833d360..94066a1 100644 --- a/dlls/amstream/amstream.c +++ b/dlls/amstream/amstream.c @@ -331,7 +331,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_GetFilter(IAMMultiMediaStream* ifa return hr; } -static HRESULT WINAPI IAMMultiMediaStreamImpl_AddMediaStream(IAMMultiMediaStream* iface, IUnknown* pStreamObject, const MSPID* PurposeId, +static HRESULT WINAPI IAMMultiMediaStreamImpl_AddMediaStream(IAMMultiMediaStream* iface, IUnknown* stream_object, const MSPID* PurposeId, DWORD dwFlags, IMediaStream** ppNewStream) { IAMMultiMediaStreamImpl *This = impl_from_IAMMultiMediaStream(iface); @@ -339,11 +339,14 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_AddMediaStream(IAMMultiMediaStream IMediaStream* pStream; IMediaStream** pNewStreams; - TRACE("(%p/%p)->(%p,%s,%x,%p)\n", This, iface, pStreamObject, debugstr_guid(PurposeId), dwFlags, ppNewStream); + TRACE("(%p/%p)->(%p,%s,%x,%p)\n", This, iface, stream_object, debugstr_guid(PurposeId), dwFlags, ppNewStream); if (!IsEqualGUID(PurposeId, &MSPID_PrimaryVideo) && !IsEqualGUID(PurposeId, &MSPID_PrimaryAudio)) return MS_E_PURPOSEID; + if (stream_object) + FIXME("Specifying a stream object in params is not yet supported\n"); + if (dwFlags & AMMSF_ADDDEFAULTRENDERER) { if (IsEqualGUID(PurposeId, &MSPID_PrimaryVideo))

1 0

Jacek Caban : mshtml: Added IHTMLBodyElement:: onload property implementation.
by Alexandre Julliard Oct. 16, 2012

Oct. 16, 2012

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

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

Oct. 16, 2012

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 support for IHTMLScriptElement:: put_src on detached elements.
by Alexandre Julliard Oct. 16, 2012

Oct. 16, 2012

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