wine-commits December 2009

wine-commits@winehq.org

3 participants
1233 discussions

Andrew Eikum : mshtml.idl: Add DispHTMLFormElement interface.
by Alexandre Julliard 01 Dec '09

01 Dec '09

Module: wine Branch: master Commit: 296eeb6e6ee0f09795d46e059eccc3a8f92d0f1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=296eeb6e6ee0f09795d46e059… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Nov 30 11:40:03 2009 -0600 mshtml.idl: Add DispHTMLFormElement interface. --- include/mshtmdid.h | 8 + include/mshtml.idl | 507 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 515 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=296eeb6e6ee0f09795d46…

1 0

Juan Lang : crypt32: Fix test failures.
by Alexandre Julliard 01 Dec '09

01 Dec '09

Module: wine Branch: master Commit: 6b8c0532180dab0d6cd95ba7e6a6bca334096b7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b8c0532180dab0d6cd95ba7e… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Nov 30 12:56:02 2009 -0800 crypt32: Fix test failures. --- dlls/crypt32/tests/chain.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 2b1069f..e4b70eb 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -3034,7 +3034,8 @@ static const SimpleChainStatusCheck simpleStatus27[] = { static const CERT_TRUST_STATUS elementStatus27Broken[] = { { CERT_TRUST_NO_ERROR, CERT_TRUST_HAS_NAME_MATCH_ISSUER }, { CERT_TRUST_IS_UNTRUSTED_ROOT, - CERT_TRUST_IS_SELF_SIGNED | CERT_TRUST_HAS_NAME_MATCH_ISSUER }, + CERT_TRUST_IS_SELF_SIGNED | CERT_TRUST_HAS_NAME_MATCH_ISSUER | + CERT_TRUST_HAS_VALID_NAME_CONSTRAINTS }, }; static const SimpleChainStatusCheck simpleStatus27Broken[] = { { sizeof(elementStatus27Broken) / sizeof(elementStatus27Broken[0]), @@ -3408,7 +3409,7 @@ static ChainCheck chainCheckEmbeddedNullBroken = { CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT, CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT, - 0 }, + CERT_TRUST_HAS_VALID_NAME_CONSTRAINTS }, 1, simpleStatus27Broken }, 0 };

1 0

Paul Vriens : shell32/tests: Fix test failure on non-English locale.
by Alexandre Julliard 01 Dec '09

01 Dec '09

Module: wine Branch: master Commit: e5d37c8d4aee3e1216074885de5ad9755bc08f58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5d37c8d4aee3e1216074885d… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Nov 30 19:56:32 2009 +0100 shell32/tests: Fix test failure on non-English locale. --- dlls/shell32/tests/progman_dde.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/progman_dde.c b/dlls/shell32/tests/progman_dde.c index 7bc53d4..c3cb1e7 100644 --- a/dlls/shell32/tests/progman_dde.c +++ b/dlls/shell32/tests/progman_dde.c @@ -152,6 +152,10 @@ static void init_strings(void) lstrcpyA(StartupTitle, startup); } + else + { + lstrcpyA(StartupTitle, Startup); + } } static HDDEDATA CALLBACK DdeCallback(UINT type, UINT format, HCONV hConv, HSZ hsz1, HSZ hsz2,

1 0

Maarten Lankhorst : winealsa.drv: Remove wrong calls.
by Alexandre Julliard 01 Dec '09

01 Dec '09

Module: wine Branch: master Commit: 15adb260b2235ce07d51978c730c2ee3f86d4c99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15adb260b2235ce07d51978c7… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Nov 26 12:13:28 2009 +0100 winealsa.drv: Remove wrong calls. snd_pcm_prepare is called below, and snd_pcm_sw_params is called before sw_params is initialized. --- dlls/winealsa.drv/dsoutput.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/winealsa.drv/dsoutput.c b/dlls/winealsa.drv/dsoutput.c index ed2e54f..bb81621 100644 --- a/dlls/winealsa.drv/dsoutput.c +++ b/dlls/winealsa.drv/dsoutput.c @@ -536,8 +536,6 @@ static HRESULT SetFormat(IDsDriverBufferImpl *This, LPWAVEFORMATEX pwfx) } err = snd_pcm_hw_params(pcm, hw_params); - err = snd_pcm_sw_params(pcm, This->sw_params); - snd_pcm_prepare(pcm); /* ALSA needs at least 3 buffers to work successfully */ This->mmap_commitahead = 3 * psize;

1 0

Jacek Caban : mshtml: Added onreadystatechange tests.
by Alexandre Julliard 01 Dec '09

01 Dec '09

Module: wine Branch: master Commit: 368edb73cdfbc1b70942af2b28aca786a162fe78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=368edb73cdfbc1b70942af2b2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 30 18:03:02 2009 +0100 mshtml: Added onreadystatechange tests. --- dlls/mshtml/tests/events.c | 116 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 114 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index 5371f76..46bbd4f 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -63,6 +63,9 @@ DEFINE_EXPECT(div_onclick); DEFINE_EXPECT(div_onclick_attached); DEFINE_EXPECT(timeout); DEFINE_EXPECT(doccp_onclick); +DEFINE_EXPECT(iframe_onreadystatechange_loading); +DEFINE_EXPECT(iframe_onreadystatechange_interactive); +DEFINE_EXPECT(iframe_onreadystatechange_complete); static HWND container_hwnd = NULL; static IHTMLWindow2 *window; @@ -87,6 +90,9 @@ static const char click_doc_str[] = "<div id=\"clickdiv\" style=\"text-align: center; background: red; font-size: 32\">click here</div>" "</body></html>"; +static const char readystate_doc_str[] = + "<<html><body><iframe id=\"iframe\"></iframe></body></html>"; + static const char *debugstr_guid(REFIID riid) { static char buf[50]; @@ -336,8 +342,8 @@ static void _test_attached_event_args(unsigned line, DISPID id, WORD wFlags, DIS IHTMLEventObj_Release(event); } -#define test_event_src(t) _test_event_src(__LINE__,t) -static void _test_event_src(unsigned line, const char *src_tag) +#define get_event_src(t) _get_event_src(__LINE__) +static IHTMLElement *_get_event_src(unsigned line) { IHTMLEventObj *event = _get_event_obj(line); IHTMLElement *src_elem = NULL; @@ -347,6 +353,14 @@ static void _test_event_src(unsigned line, const char *src_tag) IHTMLEventObj_Release(event); ok_(__FILE__,line) (hres == S_OK, "get_srcElement failed: %08x\n", hres); + return src_elem; +} + +#define test_event_src(t) _test_event_src(__LINE__,t) +static void _test_event_src(unsigned line, const char *src_tag) +{ + IHTMLElement *src_elem = _get_event_src(line); + if(src_tag) { ok_(__FILE__,line) (src_elem != NULL, "src_elem = NULL\n"); _test_elem_tag(line, (IUnknown*)src_elem, src_tag); @@ -833,6 +847,54 @@ static HRESULT WINAPI body_onclick(IDispatchEx *iface, DISPID id, LCID lcid, WOR EVENT_HANDLER_FUNC_OBJ(body_onclick); +static HRESULT WINAPI iframe_onreadystatechange(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, + VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) +{ + IHTMLFrameBase2 *iframe; + IHTMLElement2 *elem2; + IHTMLElement *elem; + VARIANT v; + BSTR str; + HRESULT hres; + + test_event_args(&DIID_DispHTMLIFrame, id, wFlags, pdp, pvarRes, pei, pspCaller); + test_event_src("IFRAME"); + + elem = get_event_src(); + elem2 = get_elem2_iface((IUnknown*)elem); + IHTMLElement_Release(elem); + + V_VT(&v) = VT_EMPTY; + hres = IHTMLElement2_get_readyState(elem2, &v); + ok(hres == S_OK, "get_readyState failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(readyState) = %d\n", V_VT(&v)); + + hres = IHTMLElement2_QueryInterface(elem2, &IID_IHTMLFrameBase2, (void**)&iframe); + IHTMLElement2_Release(elem2); + ok(hres == S_OK, "Could not get IHTMLFrameBase2 iface: %08x\n", hres); + + str = NULL; + hres = IHTMLFrameBase2_get_readyState(iframe, &str); + IHTMLFrameBase2_Release(iframe); + ok(hres == S_OK, "get_readyState failed: %08x\n", hres); + ok(str != NULL, "readyState == NULL\n"); + ok(!lstrcmpW(str, V_BSTR(&v)), "ready states differ\n"); + VariantClear(&v); + + if(!strcmp_wa(str, "loading")) + CHECK_EXPECT(iframe_onreadystatechange_loading); + else if(!strcmp_wa(str, "interactive")) + CHECK_EXPECT(iframe_onreadystatechange_interactive); + else if(!strcmp_wa(str, "complete")) + CHECK_EXPECT(iframe_onreadystatechange_complete); + else + ok(0, "unexpected state %s\n", wine_dbgstr_w(str)); + + return S_OK; +} + +EVENT_HANDLER_FUNC_OBJ(iframe_onreadystatechange); + static HRESULT WINAPI nocall(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) { @@ -1119,6 +1181,55 @@ static void test_onclick(IHTMLDocument2 *doc) IHTMLElement_Release(body); } +static void test_onreadystatechange(IHTMLDocument2 *doc) +{ + IHTMLFrameBase *iframe; + IHTMLElement2 *elem2; + IHTMLElement *elem; + VARIANT v; + BSTR str; + HRESULT hres; + + elem = get_elem_id(doc, "iframe"); + elem2 = get_elem2_iface((IUnknown*)elem); + IHTMLElement_Release(elem); + + V_VT(&v) = VT_EMPTY; + hres = IHTMLElement2_get_onreadystatechange(elem2, &v); + ok(hres == S_OK, "get_onreadystatechange failed: %08x\n", hres); + ok(V_VT(&v) == VT_NULL, "V_VT(onreadystatechange) = %d\n", V_VT(&v)); + + V_VT(&v) = VT_DISPATCH; + V_DISPATCH(&v) = (IDispatch*)&iframe_onreadystatechange_obj; + hres = IHTMLElement2_put_onreadystatechange(elem2, v); + ok(hres == S_OK, "put_onreadystatechange failed: %08x\n", hres); + + V_VT(&v) = VT_EMPTY; + hres = IHTMLElement2_get_onreadystatechange(elem2, &v); + ok(hres == S_OK, "get_onreadystatechange failed: %08x\n", hres); + ok(V_VT(&v) == VT_DISPATCH, "V_VT(onreadystatechange) = %d\n", V_VT(&v)); + ok(V_DISPATCH(&v) == (IDispatch*)&iframe_onreadystatechange_obj, "unexpected onreadystatechange value\n"); + + hres = IHTMLElement2_QueryInterface(elem2, &IID_IHTMLFrameBase, (void**)&iframe); + IHTMLElement2_Release(elem2); + ok(hres == S_OK, "Could not get IHTMLFrameBase iface: %08x\n", hres); + + hres = IHTMLFrameBase_put_src(iframe, (str = a2bstr("about:blank"))); + SysFreeString(str); + ok(hres == S_OK, "put_src failed: %08x\n", hres); + + SET_EXPECT(iframe_onreadystatechange_loading); + SET_EXPECT(iframe_onreadystatechange_interactive); + SET_EXPECT(iframe_onreadystatechange_complete); + pump_msgs(&called_iframe_onreadystatechange_complete); + todo_wine + CHECK_CALLED(iframe_onreadystatechange_loading); + CHECK_CALLED(iframe_onreadystatechange_interactive); + CHECK_CALLED(iframe_onreadystatechange_complete); + + IHTMLFrameBase_Release(iframe); +} + static void test_timeout(IHTMLDocument2 *doc) { IHTMLWindow3 *win3; @@ -1746,6 +1857,7 @@ START_TEST(events) run_test(empty_doc_str, test_timeout); run_test(click_doc_str, test_onclick); + run_test(readystate_doc_str, test_onreadystatechange); DestroyWindow(container_hwnd); CoUninitialize();

1 0

Jacek Caban : mshtml: Added onreadystatechange event support.
by Alexandre Julliard 01 Dec '09

01 Dec '09

Module: wine Branch: master Commit: f91e71d7cedae53174ae218accf4b1a3f5b69ab2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f91e71d7cedae53174ae218ac… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 30 18:02:44 2009 +0100 mshtml: Added onreadystatechange event support. --- dlls/mshtml/htmlelem2.c | 2 +- dlls/mshtml/persist.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlelem2.c b/dlls/mshtml/htmlelem2.c index a42b73a..254ebf8 100644 --- a/dlls/mshtml/htmlelem2.c +++ b/dlls/mshtml/htmlelem2.c @@ -689,7 +689,7 @@ static HRESULT WINAPI HTMLElement2_put_onreadystatechange(IHTMLElement2 *iface, { HTMLElement *This = HTMLELEM2_THIS(iface); - FIXME("(%p)->(%s): semi-stub\n", This, debugstr_variant(&v)); + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); return set_node_event(&This->node, EVENTID_READYSTATECHANGE, &v); } diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index f3d23bd..2ea0e5d 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -36,6 +36,7 @@ #include "wine/unicode.h" #include "mshtml_private.h" +#include "htmlevent.h" WINE_DEFAULT_DEBUG_CHANNEL(mshtml); @@ -274,8 +275,11 @@ static HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc) void set_ready_state(HTMLWindow *window, READYSTATE readystate) { window->readystate = readystate; - if(window->doc_obj->basedoc.window == window) + if(window->doc_obj && window->doc_obj->basedoc.window == window) call_property_onchanged(&window->doc_obj->basedoc.cp_propnotif, DISPID_READYSTATE); + if(window->frame_element) + fire_event(window->frame_element->element.node.doc, EVENTID_READYSTATECHANGE, + window->frame_element->element.node.nsnode, NULL); } static HRESULT get_doc_string(HTMLDocumentNode *This, char **str)

1 0

Jacek Caban : mshtml: Added IHTMLFrameBase2::get_readyState implementation.
by Alexandre Julliard 01 Dec '09

01 Dec '09

Module: wine Branch: master Commit: a369d5e733684f30726e657d3d6a7ec0fd8e1673 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a369d5e733684f30726e657d3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 30 18:02:25 2009 +0100 mshtml: Added IHTMLFrameBase2::get_readyState implementation. --- dlls/mshtml/htmlframebase.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlframebase.c b/dlls/mshtml/htmlframebase.c index d209d7b..cda6849 100644 --- a/dlls/mshtml/htmlframebase.c +++ b/dlls/mshtml/htmlframebase.c @@ -351,8 +351,15 @@ static HRESULT WINAPI HTMLFrameBase2_get_onreadystatechange(IHTMLFrameBase2 *ifa static HRESULT WINAPI HTMLFrameBase2_get_readyState(IHTMLFrameBase2 *iface, BSTR *p) { HTMLFrameBase *This = HTMLFRAMEBASE2_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + if(!This->content_window || !This->content_window->doc) { + FIXME("no document associated\n"); + return E_FAIL; + } + + return IHTMLDocument2_get_readyState(HTMLDOC(&This->content_window->doc->basedoc), p); } static HRESULT WINAPI HTMLFrameBase2_put_allowTransparency(IHTMLFrameBase2 *iface, VARIANT_BOOL v)

1 0

Jacek Caban : mshtml: Added IHTMLFrameBase2::put_src implementation.
by Alexandre Julliard 01 Dec '09

01 Dec '09

Module: wine Branch: master Commit: f340e637f70b24fff875834266e4c3b1c35813c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f340e637f70b24fff87583426… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 30 18:02:11 2009 +0100 mshtml: Added IHTMLFrameBase2::put_src implementation. --- dlls/mshtml/htmlframebase.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlframebase.c b/dlls/mshtml/htmlframebase.c index 2526593..d209d7b 100644 --- a/dlls/mshtml/htmlframebase.c +++ b/dlls/mshtml/htmlframebase.c @@ -91,8 +91,15 @@ static HRESULT WINAPI HTMLFrameBase_Invoke(IHTMLFrameBase *iface, DISPID dispIdM static HRESULT WINAPI HTMLFrameBase_put_src(IHTMLFrameBase *iface, BSTR v) { HTMLFrameBase *This = HTMLFRAMEBASE_THIS(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + if(!This->content_window || !This->element.node.doc || !This->element.node.doc->basedoc.window) { + FIXME("detached element\n"); + return E_FAIL; + } + + return navigate_url(This->content_window, v, This->element.node.doc->basedoc.window->url); } static HRESULT WINAPI HTMLFrameBase_get_src(IHTMLFrameBase *iface, BSTR *p)

1 0

Jacek Caban : mshtml: Always return fake scheme in nsIURI:: GetScheme if use_wine_url is set.
by Alexandre Julliard 01 Dec '09

01 Dec '09

Module: wine Branch: master Commit: bb60430de4a48860e018cb8419901eeaf3650526 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb60430de4a48860e018cb841… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 30 18:01:47 2009 +0100 mshtml: Always return fake scheme in nsIURI::GetScheme if use_wine_url is set. --- dlls/mshtml/nsio.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index ec214ca..4328761 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1506,7 +1506,7 @@ static nsresult NSAPI nsURI_GetScheme(nsIWineURI *iface, nsACString *aScheme) TRACE("(%p)->(%p)\n", This, aScheme); - if(This->use_wine_url && strcmpW(This->wine_url, about_blankW)) { + if(This->use_wine_url) { /* * For Gecko we set scheme to unknown so it won't be handled * as any special case.

1 0

Jacek Caban : mshtml: Added support for frames in navigate_url.
by Alexandre Julliard 01 Dec '09

01 Dec '09

Module: wine Branch: master Commit: 050a1372b0e39a9b28b66a4645194f04994eb31b URL: http://source.winehq.org/git/wine.git/?a=commit;h=050a1372b0e39a9b28b66a464… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 30 18:01:31 2009 +0100 mshtml: Added support for frames in navigate_url. --- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/navigate.c | 41 +++++++++++++++++-- dlls/mshtml/nsiface.idl | 90 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/nsio.c | 16 +++++++ 4 files changed, 144 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 5fed4af..2cb22da 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -666,6 +666,7 @@ void release_nsio(void); BOOL install_wine_gecko(BOOL); HRESULT nsuri_to_url(LPCWSTR,BOOL,BSTR*); +HRESULT create_doc_uri(HTMLWindow*,WCHAR*,nsIWineURI**); HRESULT hlink_frame_navigate(HTMLDocument*,LPCWSTR,nsIInputStream*,DWORD); HRESULT navigate_url(HTMLWindow*,const WCHAR*,const WCHAR*); diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 66be2fc..a68987d 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1236,6 +1236,10 @@ HRESULT hlink_frame_navigate(HTMLDocument *doc, LPCWSTR url, HRESULT navigate_url(HTMLWindow *window, const WCHAR *new_url, const WCHAR *base_url) { WCHAR url[INTERNET_MAX_URL_LENGTH]; + nsIWebNavigation *web_navigation; + nsIDocShell *doc_shell; + nsIWineURI *uri; + nsresult nsres; HRESULT hres; if(!new_url) { @@ -1262,9 +1266,38 @@ HRESULT navigate_url(HTMLWindow *window, const WCHAR *new_url, const WCHAR *base } } - hres = hlink_frame_navigate(&window->doc->basedoc, url, NULL, 0); - if(FAILED(hres)) - FIXME("hlink_frame_navigate failed: %08x\n", hres); + if(window->doc_obj && window == window->doc_obj->basedoc.window) { + hres = hlink_frame_navigate(&window->doc->basedoc, url, NULL, 0); + if(SUCCEEDED(hres)) + return S_OK; + TRACE("hlink_frame_navigate failed: %08x\n", hres); + } - return hres; + nsres = get_nsinterface((nsISupports*)window->nswindow, &IID_nsIWebNavigation, (void**)&web_navigation); + if(NS_FAILED(nsres)) { + ERR("Could not get nsIWebNavigation interface: %08x\n", nsres); + return E_FAIL; + } + + nsres = nsIWebNavigation_QueryInterface(web_navigation, &IID_nsIDocShell, (void**)&doc_shell); + nsIWebNavigation_Release(web_navigation); + if(NS_FAILED(nsres)) { + ERR("Could not get nsIDocShell: %08x\n", nsres); + return E_FAIL; + } + + hres = create_doc_uri(window, url, &uri); + if(FAILED(hres)) { + nsIDocShell_Release(doc_shell); + return hres; + } + + nsres = nsIDocShell_LoadURI(doc_shell, (nsIURI*)uri, NULL, 0, FALSE); + nsIDocShell_Release(doc_shell); + if(NS_FAILED(nsres)) { + WARN("LoadURI failed: %08x\n", nsres); + return E_FAIL; + } + + return S_OK; } diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 9d0bb30..3612613 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -142,6 +142,14 @@ typedef nsISupports nsIStyleSheet; typedef nsISupports nsIStyleRule; typedef nsISupports nsIVariant; typedef nsISupports nsIDOMUserDataHandler; +typedef nsISupports nsIDocShellLoadInfo; +typedef nsISupports nsISHEntry; +typedef nsISupports nsIPresShell; +typedef nsISupports nsIContentViewer; +typedef nsISupports nsIDocumentCharsetInfo; +typedef nsISupports nsILayoutHistoryState; +typedef nsISupports nsISecureBrowserUI; +typedef nsISupports nsIDOMStorage; [ object, @@ -2652,6 +2660,88 @@ interface nsIHTMLEditor : nsISupports [ object, + uuid(8adfb831-1053-4a19-884d-bcdad7277b4b), + local + /* NOT_FROZEN */ +] +interface nsIDocShell : nsISupports +{ + nsresult LoadURI(nsIURI *uri, nsIDocShellLoadInfo *loadInfo, PRUint32 aLoadFlags, PRBool firstParty); + nsresult LoadStream(nsIInputStream *aStream, nsIURI *aURI, const nsACString *aContentType, + const nsACString *aContentCharset, nsIDocShellLoadInfo *aLoadInfo); + nsresult InternalLoad(nsIURI *aURI, nsIURI *aReferrer, nsISupports *aOwner, PRUint32 aFlags, const PRUnichar *aWindowTarget, + const char *aTypeHint, nsIInputStream *aPostDataStream, nsIInputStream *aHeadersStream, PRUint32 aLoadFlags, + nsISHEntry *aSHEntry, PRBool firstParty, nsIDocShell **aDocShell, nsIRequest **aRequest); + nsresult CreateLoadInfo(nsIDocShellLoadInfo **loadInfo); + nsresult PrepareForNewContentModel(); + nsresult SetCurrentURI(nsIURI *aURI); + nsresult FirePageHideNotification(PRBool isUnload); + nsresult GetPresContext(void /*nsPresContext*/ **aPresContext); + nsresult GetPresShell(nsIPresShell **aPresShell); + nsresult GetEldestPresShell(nsIPresShell **aEldestPresShell); + nsresult GetContentViewer(nsIContentViewer **aContentViewer); + nsresult GetChromeEventHandler(nsIDOMEventTarget **aChromeEventHandler); + nsresult SetChromeEventHandler(nsIDOMEventTarget *aChromeEventHandler); + nsresult GetDocumentCharsetInfo(nsIDocumentCharsetInfo **aDocumentCharsetInfo); + nsresult SetDocumentCharsetInfo(nsIDocumentCharsetInfo *aDocumentCharsetInfo); + nsresult GetAllowPlugins(PRBool *aAllowPlugins); + nsresult SetAllowPlugins(PRBool aAllowPlugins); + nsresult GetAllowJavascript(PRBool *aAllowJavascript); + nsresult SetAllowJavascript(PRBool aAllowJavascript); + nsresult GetAllowMetaRedirects(PRBool *aAllowMetaRedirects); + nsresult SetAllowMetaRedirects(PRBool aAllowMetaRedirects); + nsresult GetAllowSubframes(PRBool *aAllowSubframes); + nsresult SetAllowSubframes(PRBool aAllowSubframes); + nsresult GetAllowImages(PRBool *aAllowImages); + nsresult SetAllowImages(PRBool aAllowImages); + nsresult GetAllowDNSPrefetch(PRBool *aAllowDNSPrefetch); + nsresult SetAllowDNSPrefetch(PRBool aAllowDNSPrefetch); + nsresult GetDocShellEnumerator(PRInt32 aItemType, PRInt32 aDirection, nsISimpleEnumerator **_retval); + nsresult GetAppType(PRUint32 *aAppType); + nsresult SetAppType(PRUint32 aAppType); + nsresult GetAllowAuth(PRBool *aAllowAuth); + nsresult SetAllowAuth(PRBool aAllowAuth); + nsresult GetZoom(float *aZoom); + nsresult SetZoom(float aZoom); + nsresult GetMarginWidth(PRInt32 *aMarginWidth); + nsresult SetMarginWidth(PRInt32 aMarginWidth); + nsresult GetMarginHeight(PRInt32 *aMarginHeight); + nsresult SetMarginHeight(PRInt32 aMarginHeight); + nsresult TabToTreeOwner(PRBool forward, PRBool *tookFocus); + nsresult GetBusyFlags(PRUint32 *aBusyFlags); + nsresult GetLoadType(PRUint32 *aLoadType); + nsresult SetLoadType(PRUint32 aLoadType); + nsresult IsBeingDestroyed(PRBool *_retval); + nsresult GetIsExecutingOnLoadHandler(PRBool *aIsExecutingOnLoadHandler); + nsresult GetLayoutHistoryState(nsILayoutHistoryState **aLayoutHistoryState); + nsresult SetLayoutHistoryState(nsILayoutHistoryState *aLayoutHistoryState); + nsresult GetShouldSaveLayoutState(PRBool *aShouldSaveLayoutState); + nsresult GetSecurityUI(nsISecureBrowserUI **aSecurityUI); + nsresult SetSecurityUI(nsISecureBrowserUI *aSecurityUI); + nsresult SuspendRefreshURIs(); + nsresult ResumeRefreshURIs(); + nsresult BeginRestore(nsIContentViewer *viewer, PRBool top); + nsresult FinishRestore(); + nsresult GetRestoringDocument(PRBool *aRestoringDocument); + nsresult GetUseErrorPages(PRBool *aUseErrorPages); + nsresult SetUseErrorPages(PRBool aUseErrorPages); + nsresult GetPreviousTransIndex(PRInt32 *aPreviousTransIndex); + nsresult GetLoadedTransIndex(PRInt32 *aLoadedTransIndex); + nsresult HistoryPurged(PRInt32 numEntries); + nsresult GetSessionStorageForURI(nsIURI *uri, nsIDOMStorage **_retval); + nsresult GetSessionStorageForPrincipal(nsIPrincipal *principal, PRBool create, nsIDOMStorage **_retval); + nsresult AddSessionStorage(nsIPrincipal *principal, nsIDOMStorage *storage); + nsresult GetCurrentDocumentChannel(nsIChannel * *aCurrentDocumentChannel); + nsresult SetChildOffset(PRUint32 offset); + nsresult GetIsInUnload(PRBool *aIsInUnload); + nsresult GetChannelIsUnsafe(PRBool *aChannelIsUnsafe); + void DetachEditorFromWindow(); + nsresult GetIsOffScreenBrowser(PRBool *aIsOffScreenBrowser); + nsresult SetIsOffScreenBrowser(PRBool aIsOffScreenBrowser); +} + +[ + object, uuid(365d600b-868a-452a-8de8-f46fad8fee53), local /* NOT_FROZEN */ diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 3772e61..ec214ca 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -2365,6 +2365,22 @@ static nsresult create_uri(nsIURI *uri, HTMLWindow *window, NSContainer *contain return NS_OK; } +HRESULT create_doc_uri(HTMLWindow *window, WCHAR *url, nsIWineURI **ret) +{ + nsIWineURI *uri; + nsresult nsres; + + nsres = create_uri(NULL, window, window->doc_obj->nscontainer, &uri); + if(NS_FAILED(nsres)) + return E_FAIL; + + nsIWineURI_SetWineURL(uri, url); + nsIWineURI_SetIsDocumentURI(uri, TRUE); + + *ret = uri; + return S_OK; +} + typedef struct { const nsIProtocolHandlerVtbl *lpProtocolHandlerVtbl;

1 0

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 December 2009