wine-commits November 2011

wine-commits@winehq.org

2 participants
852 discussions

Jacek Caban : mshtml: Properly handle fragment-only navigation.
by Alexandre Julliard 15 Nov '11

15 Nov '11

Module: wine Branch: master Commit: fbdfec74b04ee4fd627892102da026f90aba9d04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbdfec74b04ee4fd627892102… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 15 13:30:28 2011 +0100 mshtml: Properly handle fragment-only navigation. --- dlls/mshtml/mshtml_private.h | 2 + dlls/mshtml/navigate.c | 44 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/nsiface.idl | 30 +++++++++++++++++++++++++++- dlls/mshtml/nsio.c | 2 +- dlls/mshtml/persist.c | 2 +- 5 files changed, 77 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 0915977..625fc52 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -671,6 +671,7 @@ void release_nsio(void) DECLSPEC_HIDDEN; BOOL is_gecko_path(const char*) DECLSPEC_HIDDEN; HRESULT nsuri_to_url(LPCWSTR,BOOL,BSTR*) DECLSPEC_HIDDEN; +BOOL compare_ignoring_frag(IUri*,IUri*) DECLSPEC_HIDDEN; HRESULT navigate_url(HTMLWindow*,const WCHAR*,const WCHAR*) DECLSPEC_HIDDEN; HRESULT set_frame_doc(HTMLFrameBase*,nsIDOMDocument*) DECLSPEC_HIDDEN; @@ -700,6 +701,7 @@ nsresult get_nsinterface(nsISupports*,REFIID,void**) DECLSPEC_HIDDEN; void set_window_bscallback(HTMLWindow*,nsChannelBSC*) DECLSPEC_HIDDEN; void set_current_mon(HTMLWindow*,IMoniker*) DECLSPEC_HIDDEN; +void set_current_uri(HTMLWindow*,IUri*) DECLSPEC_HIDDEN; HRESULT start_binding(HTMLWindow*,HTMLDocumentNode*,BSCallback*,IBindCtx*) DECLSPEC_HIDDEN; HRESULT async_start_doc_binding(HTMLWindow*,nsChannelBSC*) DECLSPEC_HIDDEN; void abort_document_bindings(HTMLDocumentNode*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index ea1c650..bb97ee1 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1766,6 +1766,45 @@ static void navigate_task_destr(task_t *_task) heap_free(task); } +static HRESULT navigate_fragment(HTMLWindow *window, IUri *uri) +{ + nsIDOMLocation *nslocation; + nsAString nsfrag_str; + BSTR frag; + nsresult nsres; + HRESULT hres; + + set_current_uri(window, uri); + + nsres = nsIDOMWindow_GetLocation(window->nswindow, &nslocation); + if(FAILED(nsres) || !nslocation) + return E_FAIL; + + hres = IUri_GetFragment(uri, &frag); + if(FAILED(hres)) { + nsIDOMLocation_Release(nslocation); + return hres; + } + + nsAString_InitDepend(&nsfrag_str, frag); + nsres = nsIDOMLocation_SetHash(nslocation, &nsfrag_str); + nsAString_Finish(&nsfrag_str); + nsIDOMLocation_Release(nslocation); + SysFreeString(frag); + if(NS_FAILED(nsres)) { + ERR("SetHash failed: %08x\n", nsres); + return E_FAIL; + } + + if(window->doc_obj->doc_object_service) { + IDocObjectService_FireNavigateComplete2(window->doc_obj->doc_object_service, &window->IHTMLWindow2_iface, 0x10); + IDocObjectService_FireDocumentComplete(window->doc_obj->doc_object_service, &window->IHTMLWindow2_iface, 0); + + } + + return S_OK; +} + HRESULT super_navigate(HTMLWindow *window, IUri *uri, const WCHAR *headers, BYTE *post_data, DWORD post_data_size) { nsChannelBSC *bsc; @@ -1796,6 +1835,11 @@ HRESULT super_navigate(HTMLWindow *window, IUri *uri, const WCHAR *headers, BYTE } } + if(window->uri && compare_ignoring_frag(window->uri, uri)) { + TRACE("fragment navigate\n"); + return navigate_fragment(window, uri); + } + hres = CreateURLMonikerEx2(NULL, uri, &mon, URL_MK_UNIFORM); if(FAILED(hres)) return hres; diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 56fefa3..5a1970d 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -130,7 +130,6 @@ typedef nsISupports nsIDOMMediaList; typedef nsISupports nsIDOMHTMLTableCaptionElement; typedef nsISupports nsIDOMHTMLTableSectionElement; typedef nsISupports nsIDOMClientRectList; -typedef nsISupports nsIDOMLocation; typedef nsISupports nsINode; typedef nsISupports nsIStyleSheet; typedef nsISupports nsIStyleRule; @@ -556,6 +555,35 @@ interface nsIChannelEventSink : nsISupports [ object, + uuid(a6cf906d-15b3-11d2-932e-00805f8add32), + local +] +interface nsIDOMLocation : nsISupports +{ + nsresult GetHash(nsAString *aHash); + nsresult SetHash(const nsAString *aHash); + nsresult GetHost(nsAString *aHost); + nsresult SetHost(const nsAString *aHost); + nsresult GetHostname(nsAString *aHostname); + nsresult SetHostname(const nsAString *aHostname); + nsresult GetHref(nsAString *aHref); + nsresult SetHref(const nsAString *aHref); + nsresult GetPathname(nsAString *aPathname); + nsresult SetPathname(const nsAString *aPathname); + nsresult GetPort(nsAString *aPort); + nsresult SetPort(const nsAString *aPort); + nsresult GetProtocol(nsAString *aProtocol); + nsresult SetProtocol(const nsAString *aProtocol); + nsresult GetSearch(nsAString *aSearch); + nsresult SetSearch(const nsAString *aSearch); + nsresult Reload(PRBool forceget); + nsresult Replace(const nsAString *url); + nsresult Assign(const nsAString *url); + nsresult ToString(nsAString *_retval); +} + +[ + object, uuid(2938307a-9d70-4b63-8afc-0197e82318ad), local ] diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index b39453e..b507446 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -113,7 +113,7 @@ static IUri *get_uri_nofrag(IUri *uri) return ret; } -static BOOL compare_ignoring_frag(IUri *uri1, IUri *uri2) +BOOL compare_ignoring_frag(IUri *uri1, IUri *uri2) { IUri *uri_nofrag1, *uri_nofrag2; BOOL ret = FALSE; diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index ad7f4a6..4167659 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -70,7 +70,7 @@ static BOOL use_gecko_script(HTMLWindow *window) return FAILED(hres) || scheme != URL_SCHEME_ABOUT; } -static void set_current_uri(HTMLWindow *window, IUri *uri) +void set_current_uri(HTMLWindow *window, IUri *uri) { if(window->uri) { IUri_Release(window->uri);

1 0

Jacek Caban : mshtml: Properly implement nsIURI::EqualsExceptRef.
by Alexandre Julliard 15 Nov '11

15 Nov '11

Module: wine Branch: master Commit: 7b5125ac02e309dc4ee8f97b2190ae33c68ca42d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b5125ac02e309dc4ee8f97b2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 15 13:31:22 2011 +0100 mshtml: Properly implement nsIURI::EqualsExceptRef. --- dlls/mshtml/nsio.c | 52 +++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 45 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 547f258..b39453e 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -113,6 +113,25 @@ static IUri *get_uri_nofrag(IUri *uri) return ret; } +static BOOL compare_ignoring_frag(IUri *uri1, IUri *uri2) +{ + IUri *uri_nofrag1, *uri_nofrag2; + BOOL ret = FALSE; + + uri_nofrag1 = get_uri_nofrag(uri1); + if(!uri_nofrag1) + return FALSE; + + uri_nofrag2 = get_uri_nofrag(uri2); + if(uri_nofrag2) { + IUri_IsEqual(uri_nofrag1, uri_nofrag2, &ret); + IUri_Release(uri_nofrag2); + } + + IUri_Release(uri_nofrag1); + return ret; +} + static nsresult create_nsuri(IUri*,nsIURI*,HTMLWindow*,NSContainer*,nsWineURI**); static const char *debugstr_nsacstr(const nsACString *nsstr) @@ -2200,13 +2219,6 @@ static nsresult NSAPI nsURI_Equals(nsIURL *iface, nsIURI *other, PRBool *_retval return nsres; } -static nsresult NSAPI nsURI_EqualsExceptRef(nsIURL *iface, nsIURI *other, PRBool *_retval) -{ - nsWineURI *This = impl_from_nsIURL(iface); - FIXME("(%p)->(%p %p)\n", This, other, _retval); - return nsIURL_Equals(&This->nsIURL_iface, other, _retval); -} - static nsresult NSAPI nsURI_SchemeIs(nsIURL *iface, const char *scheme, PRBool *_retval) { nsWineURI *This = impl_from_nsIURL(iface); @@ -2334,6 +2346,32 @@ static nsresult NSAPI nsURI_GetOriginCharset(nsIURL *iface, nsACString *aOriginC return NS_ERROR_NOT_IMPLEMENTED; } +static nsresult NSAPI nsURI_EqualsExceptRef(nsIURL *iface, nsIURI *other, PRBool *_retval) +{ + nsWineURI *This = impl_from_nsIURL(iface); + nsWineURI *other_obj; + nsresult nsres; + + TRACE("(%p)->(%p %p)\n", This, other, _retval); + + nsres = nsIURI_QueryInterface(other, &IID_nsWineURI, (void**)&other_obj); + if(NS_FAILED(nsres)) { + TRACE("Could not get nsWineURI interface\n"); + *_retval = FALSE; + return NS_OK; + } + + if(ensure_uri(This) && ensure_uri(other_obj)) { + *_retval = compare_ignoring_frag(This->uri, other_obj->uri); + nsres = NS_OK; + }else { + nsres = NS_ERROR_UNEXPECTED; + } + + nsIURI_Release(&other_obj->nsIURL_iface); + return nsres; +} + static nsresult NSAPI nsURI_CloneIgnoreRef(nsIURL *iface, nsIURI **_retval) { nsWineURI *This = impl_from_nsIURL(iface);

1 0

Jacek Caban : mshtml: Properly implement nsIURI::CloneIgnoreRef.
by Alexandre Julliard 15 Nov '11

15 Nov '11

Module: wine Branch: master Commit: 9751e3c65f2ba87f52879d8095d395cb71b5f5ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=9751e3c65f2ba87f52879d809… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 15 13:31:12 2011 +0100 mshtml: Properly implement nsIURI::CloneIgnoreRef. --- dlls/mshtml/nsio.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 54 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 7b6bb78..547f258 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -86,6 +86,33 @@ static BOOL ensure_uri(nsWineURI *This) return TRUE; } +static IUri *get_uri_nofrag(IUri *uri) +{ + IUriBuilder *uri_builder; + IUri *ret; + BOOL b; + HRESULT hres; + + hres = IUri_HasProperty(uri, Uri_PROPERTY_FRAGMENT, &b); + if(SUCCEEDED(hres) && !b) { + IUri_AddRef(uri); + return uri; + } + + hres = CreateIUriBuilder(uri, 0, 0, &uri_builder); + if(FAILED(hres)) + return NULL; + + hres = IUriBuilder_RemoveProperties(uri_builder, Uri_HAS_FRAGMENT); + if(SUCCEEDED(hres)) + hres = IUriBuilder_CreateUriSimple(uri_builder, 0, 0, &ret); + IUriBuilder_Release(uri_builder); + if(FAILED(hres)) + return NULL; + + return ret; +} + static nsresult create_nsuri(IUri*,nsIURI*,HTMLWindow*,NSContainer*,nsWineURI**); static const char *debugstr_nsacstr(const nsACString *nsstr) @@ -2232,13 +2259,6 @@ static nsresult NSAPI nsURI_Clone(nsIURL *iface, nsIURI **_retval) return NS_OK; } -static nsresult NSAPI nsURI_CloneIgnoreRef(nsIURL *iface, nsIURI **_retval) -{ - nsWineURI *This = impl_from_nsIURL(iface); - FIXME("(%p)->(%p)\n", This, _retval); - return nsIURL_Clone(&This->nsIURL_iface, _retval); -} - static nsresult NSAPI nsURI_Resolve(nsIURL *iface, const nsACString *aRelativePath, nsACString *_retval) { @@ -2314,6 +2334,33 @@ static nsresult NSAPI nsURI_GetOriginCharset(nsIURL *iface, nsACString *aOriginC return NS_ERROR_NOT_IMPLEMENTED; } +static nsresult NSAPI nsURI_CloneIgnoreRef(nsIURL *iface, nsIURI **_retval) +{ + nsWineURI *This = impl_from_nsIURL(iface); + nsWineURI *wine_uri; + IUri *uri; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, _retval); + + if(!ensure_uri(This)) + return NS_ERROR_UNEXPECTED; + + uri = get_uri_nofrag(This->uri); + if(!uri) + return NS_ERROR_FAILURE; + + nsres = create_nsuri(uri, NULL, This->window_ref ? This->window_ref->window : NULL, This->container, &wine_uri); + IUri_Release(uri); + if(NS_FAILED(nsres)) { + WARN("create_nsuri failed: %08x\n", nsres); + return nsres; + } + + *_retval = (nsIURI*)&wine_uri->nsIURL_iface; + return NS_OK; +} + static nsresult NSAPI nsURI_GetSpecIgnoringRef(nsIURL *iface, nsACString *aSpecIgnoringRef) { nsWineURI *This = impl_from_nsIURL(iface);

1 0

Jacek Caban : mshtml: Split setting window URI from set_current_mon.
by Alexandre Julliard 15 Nov '11

15 Nov '11

Module: wine Branch: master Commit: bc701d59652ccefca78fd67a8255829f570af95c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc701d59652ccefca78fd67a8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 15 13:30:12 2011 +0100 mshtml: Split setting window URI from set_current_mon. --- dlls/mshtml/persist.c | 51 ++++++++++++++++++++++++++++++------------------ 1 files changed, 32 insertions(+), 19 deletions(-) diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 3107e92..ad7f4a6 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -70,9 +70,31 @@ static BOOL use_gecko_script(HTMLWindow *window) return FAILED(hres) || scheme != URL_SCHEME_ABOUT; } +static void set_current_uri(HTMLWindow *window, IUri *uri) +{ + if(window->uri) { + IUri_Release(window->uri); + window->uri = NULL; + } + + if(window->url) { + SysFreeString(window->url); + window->url = NULL; + } + + if(!uri) + return; + + IUri_AddRef(uri); + window->uri = uri; + + IUri_GetDisplayUri(uri, &window->url); +} + void set_current_mon(HTMLWindow *This, IMoniker *mon) { IUriContainer *uri_container; + IUri *uri = NULL; HRESULT hres; if(This->mon) { @@ -80,15 +102,6 @@ void set_current_mon(HTMLWindow *This, IMoniker *mon) This->mon = NULL; } - if(This->uri) { - IUri_Release(This->uri); - This->uri = NULL; - } - - if(This->url) { - SysFreeString(This->url); - This->url = NULL; - } if(!mon) return; @@ -98,23 +111,26 @@ void set_current_mon(HTMLWindow *This, IMoniker *mon) hres = IMoniker_QueryInterface(mon, &IID_IUriContainer, (void**)&uri_container); if(SUCCEEDED(hres)) { - hres = IUriContainer_GetIUri(uri_container, &This->uri); + hres = IUriContainer_GetIUri(uri_container, &uri); IUriContainer_Release(uri_container); if(hres != S_OK) { WARN("GetIUri failed: %08x\n", hres); - This->uri = NULL; + uri = NULL; } } - if(!This->uri) { + if(!uri) { WCHAR *url; hres = IMoniker_GetDisplayName(mon, NULL, NULL, &url); if(SUCCEEDED(hres)) { - hres = CreateUri(url, 0, 0, &This->uri); + hres = CreateUri(url, 0, 0, &uri); if(FAILED(hres)) { WARN("CrateUri failed: %08x\n", hres); + set_current_uri(This, NULL); This->url = SysAllocString(url); + CoTaskMemFree(url); + return; } CoTaskMemFree(url); }else { @@ -122,12 +138,9 @@ void set_current_mon(HTMLWindow *This, IMoniker *mon) } } - if(!This->url && This->uri) { - hres = IUri_GetDisplayUri(This->uri, &This->url); - if(FAILED(hres)) - WARN("GetDisplayUri failed: %08x\n", hres); - } - + set_current_uri(This, uri); + if(uri) + IUri_Release(uri); set_script_mode(This, use_gecko_script(This) ? SCRIPTMODE_GECKO : SCRIPTMODE_ACTIVESCRIPT); }

1 0

Jacek Caban : mshtml: Properly handle navigation in containers supporting IWebBrowserApp.
by Alexandre Julliard 15 Nov '11

15 Nov '11

Module: wine Branch: master Commit: f86abedb40417c358f6ba85f51f6d6544c90bd73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f86abedb40417c358f6ba85f5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 15 13:29:59 2011 +0100 mshtml: Properly handle navigation in containers supporting IWebBrowserApp. --- dlls/ieframe/dochost.c | 7 ++++--- dlls/ieframe/shellbrowser.c | 38 ++++++++++++++++++++++++++++++++++++-- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/mutation.c | 3 +++ dlls/mshtml/navigate.c | 20 ++++++++++++++++++++ dlls/mshtml/oleobj.c | 16 +++++++++++++++- 6 files changed, 79 insertions(+), 6 deletions(-) diff --git a/dlls/ieframe/dochost.c b/dlls/ieframe/dochost.c index 5f60056..9c07cc8 100644 --- a/dlls/ieframe/dochost.c +++ b/dlls/ieframe/dochost.c @@ -192,12 +192,13 @@ void set_doc_state(DocHost *This, READYSTATE doc_state) static void update_ready_state(DocHost *This, READYSTATE ready_state) { - if(ready_state > READYSTATE_LOADING && This->doc_state <= READYSTATE_LOADING) + if(ready_state > READYSTATE_LOADING && This->doc_state <= READYSTATE_LOADING && !This->browser_service /* FIXME */) notif_complete(This, DISPID_NAVIGATECOMPLETE2); if(ready_state == READYSTATE_COMPLETE && This->doc_state < READYSTATE_COMPLETE) { set_doc_state(This, READYSTATE_COMPLETE); - notif_complete(This, DISPID_DOCUMENTCOMPLETE); + if(!This->browser_service) /* FIXME: Not fully correct */ + notif_complete(This, DISPID_DOCUMENTCOMPLETE); }else { set_doc_state(This, ready_state); } @@ -844,7 +845,7 @@ static HRESULT WINAPI PropertyNotifySink_OnChanged(IPropertyNotifySink *iface, D if(ready_state == READYSTATE_COMPLETE && !This->doc_navigate) advise_prop_notif(This, FALSE); - push_ready_state_task(This, ready_state); + update_ready_state(This, ready_state); break; } default: diff --git a/dlls/ieframe/shellbrowser.c b/dlls/ieframe/shellbrowser.c index 65e1cea..00ba786 100644 --- a/dlls/ieframe/shellbrowser.c +++ b/dlls/ieframe/shellbrowser.c @@ -787,8 +787,42 @@ static HRESULT WINAPI DocObjectService_FireDocumentComplete( DWORD dwFlags) { ShellBrowser *This = impl_from_IDocObjectService(iface); - FIXME("%p %p %x\n", This, pHTMLWindow, dwFlags); - return E_NOTIMPL; + IHTMLPrivateWindow *priv_window; + VARIANTARG params[2]; + DISPPARAMS dp = {params, NULL, 2, 0}; + VARIANT url_var; + BSTR url; + HRESULT hres; + + TRACE("%p %p %x\n", This, pHTMLWindow, dwFlags); + + hres = IHTMLWindow2_QueryInterface(pHTMLWindow, &IID_IHTMLPrivateWindow, (void**)&priv_window); + if(FAILED(hres)) + return hres; + + hres = IHTMLPrivateWindow_GetAddressBarUrl(priv_window, &url); + IHTMLPrivateWindow_Release(priv_window); + if(FAILED(hres)) + return hres; + + TRACE("got URL %s\n", debugstr_w(url)); + + V_VT(params) = (VT_BYREF|VT_VARIANT); + V_BYREF(params) = &url; + + V_VT(params+1) = VT_DISPATCH; + V_DISPATCH(params+1) = This->doc_host->disp; + + V_VT(&url_var) = VT_BSTR; + V_BSTR(&url_var) = url; + + TRACE(">>>\n"); + call_sink(This->doc_host->cps.wbe2, DISPID_DOCUMENTCOMPLETE, &dp); + TRACE("<<<\n"); + + SysFreeString(url); + This->doc_host->busy = VARIANT_FALSE; + return S_OK; } static HRESULT WINAPI DocObjectService_UpdateDesktopComponent( diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 90ba6ad..0915977 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -463,6 +463,7 @@ struct HTMLDocumentObj { BOOL ui_active; BOOL window_active; BOOL hostui_setup; + BOOL is_webbrowser; BOOL container_locked; BOOL focus; INT download_state; diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index 0220849..ba98d41 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -265,6 +265,9 @@ static void parse_complete(HTMLDocumentObj *doc) call_property_onchanged(&doc->basedoc.cp_propnotif, 1005); call_explorer_69(doc); + if(doc->is_webbrowser && doc->usermode != EDITMODE) + IDocObjectService_FireNavigateComplete2(doc->doc_object_service, &doc->basedoc.window->IHTMLWindow2_iface, 0); + /* FIXME: IE7 calls EnableModelless(TRUE), EnableModelless(FALSE) and sets interactive state here */ } diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 8f1b334..ea1c650 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1944,6 +1944,26 @@ HRESULT navigate_url(HTMLWindow *window, const WCHAR *new_url, const WCHAR *base } } + if(window->doc_obj->is_webbrowser && window->doc_obj && window == window->doc_obj->basedoc.window) { + BOOL cancel = FALSE; + IUri *uri; + + hres = IDocObjectService_FireBeforeNavigate2(window->doc_obj->doc_object_service, NULL, url, 0x40, + NULL, NULL, 0, NULL, TRUE, &cancel); + if(SUCCEEDED(hres) && cancel) { + TRACE("Navigation canceled\n"); + return S_OK; + } + + hres = CreateUri(url, 0, 0, &uri); + if(FAILED(hres)) + return hres; + + hres = super_navigate(window, uri, NULL, NULL, 0); + IUri_Release(uri); + return hres; + } + if(window->doc_obj && window == window->doc_obj->basedoc.window) { BOOL cancel; diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c index fa2694e..e5c0235 100644 --- a/dlls/mshtml/oleobj.c +++ b/dlls/mshtml/oleobj.c @@ -125,6 +125,7 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite } memset(&This->doc_obj->hostinfo, 0, sizeof(DOCHOSTUIINFO)); + This->doc_obj->is_webbrowser = FALSE; if(!pClientSite) return S_OK; @@ -212,14 +213,27 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite if(SUCCEEDED(hres)) { IDocObjectService *doc_object_service; IBrowserService *browser_service; + IWebBrowser2 *wb; hres = IServiceProvider_QueryService(sp, &IID_IShellBrowser, &IID_IBrowserService, (void**)&browser_service); if(SUCCEEDED(hres)) { hres = IBrowserService_QueryInterface(browser_service, &IID_IDocObjectService, (void**)&doc_object_service); - if(SUCCEEDED(hres)) + if(SUCCEEDED(hres)) { This->doc_obj->doc_object_service = doc_object_service; + + /* + * Some embedding routines, esp. in regards to use of IDocObjectService, differ if + * embedder supports IWebBrowserApp. + */ + hres = IServiceProvider_QueryService(sp, &IID_IWebBrowserApp, &IID_IWebBrowser2, (void**)&wb); + if(SUCCEEDED(hres)) { + This->doc_obj->is_webbrowser = TRUE; + IWebBrowser2_Release(wb); + } + } + IBrowserService_Release(browser_service); }

1 0

Jacek Caban : mshtml: Split IHTMLPrivateWindow:: SuperNavigate implementation.
by Alexandre Julliard 15 Nov '11

15 Nov '11

Module: wine Branch: master Commit: 8ba6514962be951121e1d1cb37334b830ca63ae9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ba6514962be951121e1d1cb3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 15 13:29:43 2011 +0100 mshtml: Split IHTMLPrivateWindow::SuperNavigate implementation. --- dlls/mshtml/binding.h | 3 +- dlls/mshtml/htmlwindow.c | 169 ++------------------------------------------- dlls/mshtml/navigate.c | 162 +++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 171 insertions(+), 163 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8ba6514962be951121e1d…

1 0

Jacek Caban : ieframe: Improved debug traces in IShellBrowser:: QueryInterface.
by Alexandre Julliard 15 Nov '11

15 Nov '11

Module: wine Branch: master Commit: 3548504c8d6f4f78610fe79512d44d2c20066907 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3548504c8d6f4f78610fe7951… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 15 13:29:00 2011 +0100 ieframe: Improved debug traces in IShellBrowser::QueryInterface. --- dlls/ieframe/shellbrowser.c | 41 ++++++++++++++++++++++------------------- 1 files changed, 22 insertions(+), 19 deletions(-) diff --git a/dlls/ieframe/shellbrowser.c b/dlls/ieframe/shellbrowser.c index 79ee378..65e1cea 100644 --- a/dlls/ieframe/shellbrowser.c +++ b/dlls/ieframe/shellbrowser.c @@ -32,30 +32,33 @@ static inline ShellBrowser *impl_from_IShellBrowser(IShellBrowser *iface) return CONTAINING_RECORD(iface, ShellBrowser, IShellBrowser_iface); } -static HRESULT WINAPI ShellBrowser_QueryInterface( - IShellBrowser* iface, - REFIID riid, - void **ppvObject) +static HRESULT WINAPI ShellBrowser_QueryInterface(IShellBrowser* iface, REFIID riid, void **ppv) { ShellBrowser *This = impl_from_IShellBrowser(iface); - *ppvObject = NULL; - - if(IsEqualGUID(&IID_IShellBrowser, riid) || IsEqualGUID(&IID_IOleWindow, riid) - || IsEqualGUID(&IID_IUnknown, riid)) - *ppvObject = &This->IShellBrowser_iface; - else if(IsEqualGUID(&IID_IBrowserService, riid)) - *ppvObject = &This->IBrowserService_iface; - else if(IsEqualGUID(&IID_IDocObjectService, riid)) - *ppvObject = &This->IDocObjectService_iface; - - if(*ppvObject) { - TRACE("%p %s %p\n", This, debugstr_guid(riid), ppvObject); - IUnknown_AddRef((IUnknown*)*ppvObject); - return S_OK; + + if(IsEqualGUID(&IID_IUnknown, riid)) { + TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); + *ppv = &This->IShellBrowser_iface; + }else if(IsEqualGUID(&IID_IOleWindow, riid)) { + TRACE("(%p)->(IID_IOleWindow %p)\n", This, ppv); + *ppv = &This->IShellBrowser_iface; + }else if(IsEqualGUID(&IID_IShellBrowser, riid)) { + TRACE("(%p)->(IID_IShellBrowser %p)\n", This, ppv); + *ppv = &This->IShellBrowser_iface; + }else if(IsEqualGUID(&IID_IBrowserService, riid)) { + TRACE("(%p)->(IID_IBrowserService %p)\n", This, ppv); + *ppv = &This->IBrowserService_iface; + }else if(IsEqualGUID(&IID_IDocObjectService, riid)) { + TRACE("(%p)->(IID_IDocObjectService %p)\n", This, ppv); + *ppv = &This->IDocObjectService_iface; + }else { + FIXME("%p %s %p\n", This, debugstr_guid(riid), ppv); + *ppv = NULL; + return E_NOINTERFACE; } - FIXME("%p %s %p\n", This, debugstr_guid(riid), ppvObject); - return E_NOINTERFACE; + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; } static ULONG WINAPI ShellBrowser_AddRef(

1 0

Jacek Caban : ieframe: Added IDocObjectService:: FireNavigateComplete2 implementation.
by Alexandre Julliard 15 Nov '11

15 Nov '11

Module: wine Branch: master Commit: 60dc3d628025ee5e70c7f0b7775413683ff1160a URL: http://source.winehq.org/git/wine.git/?a=commit;h=60dc3d628025ee5e70c7f0b77… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 15 13:28:47 2011 +0100 ieframe: Added IDocObjectService::FireNavigateComplete2 implementation. --- dlls/ieframe/ieframe.h | 1 + dlls/ieframe/navigate.c | 2 +- dlls/ieframe/shellbrowser.c | 40 ++++++++++++++++++++++++++++++++++++++-- 3 files changed, 40 insertions(+), 3 deletions(-) diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h index d81e166..4c32e52 100644 --- a/dlls/ieframe/ieframe.h +++ b/dlls/ieframe/ieframe.h @@ -237,6 +237,7 @@ void call_sink(ConnectionPoint*,DISPID,DISPPARAMS*) DECLSPEC_HIDDEN; HRESULT navigate_url(DocHost*,LPCWSTR,const VARIANT*,const VARIANT*,VARIANT*,VARIANT*) DECLSPEC_HIDDEN; HRESULT go_home(DocHost*) DECLSPEC_HIDDEN; HRESULT get_location_url(DocHost*,BSTR*) DECLSPEC_HIDDEN; +HRESULT set_dochost_url(DocHost*,const WCHAR*) DECLSPEC_HIDDEN; void handle_navigation_error(DocHost*,HRESULT,BSTR,IHTMLWindow2*) DECLSPEC_HIDDEN; HRESULT dochost_object_available(DocHost*,IUnknown*) DECLSPEC_HIDDEN; void set_doc_state(DocHost*,READYSTATE) DECLSPEC_HIDDEN; diff --git a/dlls/ieframe/navigate.c b/dlls/ieframe/navigate.c index ab009aa..6c0ce41 100644 --- a/dlls/ieframe/navigate.c +++ b/dlls/ieframe/navigate.c @@ -110,7 +110,7 @@ static void set_status_text(BindStatusCallback *This, LPCWSTR str) IOleInPlaceFrame_SetStatusText(This->doc_host->frame, str); } -static HRESULT set_dochost_url(DocHost *This, const WCHAR *url) +HRESULT set_dochost_url(DocHost *This, const WCHAR *url) { WCHAR *new_url; diff --git a/dlls/ieframe/shellbrowser.c b/dlls/ieframe/shellbrowser.c index a81fa16..79ee378 100644 --- a/dlls/ieframe/shellbrowser.c +++ b/dlls/ieframe/shellbrowser.c @@ -722,8 +722,44 @@ static HRESULT WINAPI DocObjectService_FireNavigateComplete2( DWORD dwFlags) { ShellBrowser *This = impl_from_IDocObjectService(iface); - FIXME("%p %p %x\n", This, pHTMLWindow2, dwFlags); - return E_NOTIMPL; + IHTMLPrivateWindow *priv_window; + VARIANTARG params[2]; + DISPPARAMS dp = {params, NULL, 2, 0}; + VARIANT url_var; + BSTR url; + HRESULT hres; + + TRACE("%p %p %x\n", This, pHTMLWindow2, dwFlags); + + hres = IHTMLWindow2_QueryInterface(pHTMLWindow2, &IID_IHTMLPrivateWindow, (void**)&priv_window); + if(FAILED(hres)) + return hres; + + hres = IHTMLPrivateWindow_GetAddressBarUrl(priv_window, &url); + IHTMLPrivateWindow_Release(priv_window); + if(FAILED(hres)) + return hres; + + TRACE("got URL %s\n", debugstr_w(url)); + set_dochost_url(This->doc_host, url); + + V_VT(params) = (VT_BYREF|VT_VARIANT); + V_BYREF(params) = &url; + + V_VT(params+1) = VT_DISPATCH; + V_DISPATCH(params+1) = This->doc_host->disp; + + V_VT(&url_var) = VT_BSTR; + V_BSTR(&url_var) = url; + + TRACE(">>>\n"); + call_sink(This->doc_host->cps.wbe2, DISPID_NAVIGATECOMPLETE2, &dp); + TRACE("<<<\n"); + + SysFreeString(url); + + This->doc_host->busy = VARIANT_FALSE; + return S_OK; } static HRESULT WINAPI DocObjectService_FireDownloadBegin(

1 0

Jacek Caban : ieframe: Added IDocObjectService:: FireBeforeNavigate2 implementation.
by Alexandre Julliard 15 Nov '11

15 Nov '11

Module: wine Branch: master Commit: 4816929cfeb0018d7a3247237ea286f1d10df2be URL: http://source.winehq.org/git/wine.git/?a=commit;h=4816929cfeb0018d7a3247237… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 15 13:28:32 2011 +0100 ieframe: Added IDocObjectService::FireBeforeNavigate2 implementation. --- dlls/ieframe/shellbrowser.c | 68 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 66 insertions(+), 2 deletions(-) diff --git a/dlls/ieframe/shellbrowser.c b/dlls/ieframe/shellbrowser.c index be15613..a81fa16 100644 --- a/dlls/ieframe/shellbrowser.c +++ b/dlls/ieframe/shellbrowser.c @@ -21,6 +21,7 @@ #include <assert.h> #include "ieframe.h" +#include "exdispid.h" #include "wine/debug.h" @@ -646,10 +647,73 @@ static HRESULT WINAPI DocObjectService_FireBeforeNavigate2( BOOL *pfCancel) { ShellBrowser *This = impl_from_IDocObjectService(iface); - FIXME("%p %p %s %x %s %p %d %s %d %p\n", This, pDispatch, debugstr_w(lpszUrl), + VARIANT var_url, var_flags, var_frame_name, var_post_data, var_post_data2, var_headers; + VARIANTARG params[7]; + DISPPARAMS dp = {params, NULL, 7, 0}; + VARIANT_BOOL cancel = VARIANT_FALSE; + SAFEARRAY *post_data; + + TRACE("%p %p %s %x %s %p %d %s %d %p\n", This, pDispatch, debugstr_w(lpszUrl), dwFlags, debugstr_w(lpszFrameName), pPostData, cbPostData, debugstr_w(lpszHeaders), fPlayNavSound, pfCancel); - return E_NOTIMPL; + + if(cbPostData) { + post_data = SafeArrayCreateVector(VT_UI1, 0, cbPostData); + memcpy(post_data->pvData, pPostData, cbPostData); + if(!post_data) + return E_OUTOFMEMORY; + }else { + post_data = NULL; + } + + V_VT(params) = VT_BOOL|VT_BYREF; + V_BOOLREF(params) = &cancel; + + V_VT(params+1) = (VT_BYREF|VT_VARIANT); + V_VARIANTREF(params+1) = &var_headers; + V_VT(&var_headers) = VT_BSTR; + V_BSTR(&var_headers) = lpszHeaders ? SysAllocString(lpszHeaders) : NULL; + + V_VT(params+2) = (VT_BYREF|VT_VARIANT); + V_VARIANTREF(params+2) = &var_post_data2; + V_VT(&var_post_data2) = (VT_BYREF|VT_VARIANT); + V_VARIANTREF(&var_post_data2) = &var_post_data; + + if(post_data) { + V_VT(&var_post_data) = VT_UI1|VT_ARRAY; + V_ARRAY(&var_post_data) = post_data; + }else { + V_VT(&var_post_data) = VT_EMPTY; + } + + V_VT(params+3) = (VT_BYREF|VT_VARIANT); + V_VARIANTREF(params+3) = &var_frame_name; + V_VT(&var_frame_name) = VT_BSTR; + V_BSTR(&var_frame_name) = NULL; + + V_VT(params+4) = (VT_BYREF|VT_VARIANT); + V_VARIANTREF(params+4) = &var_flags; + V_VT(&var_flags) = VT_I4; + V_I4(&var_flags) = 0; + + V_VT(params+5) = (VT_BYREF|VT_VARIANT); + V_VARIANTREF(params+5) = &var_url; + V_VT(&var_url) = VT_BSTR; + V_BSTR(&var_url) = SysAllocString(lpszUrl); + + V_VT(params+6) = (VT_DISPATCH); + V_DISPATCH(params+6) = This->doc_host->disp; + + TRACE(">>>\n"); + call_sink(This->doc_host->cps.wbe2, DISPID_BEFORENAVIGATE2, &dp); + TRACE("<<<\n"); + + SysFreeString(V_BSTR(&var_url)); + SysFreeString(V_BSTR(&var_headers)); + SafeArrayDestroy(post_data); + + *pfCancel = !!cancel; + return S_OK; } static HRESULT WINAPI DocObjectService_FireNavigateComplete2(

1 0

Jacek Caban : ieframe: Store ShellBrowser in DocHost instead of creating it on every QueryService call .
by Alexandre Julliard 15 Nov '11

15 Nov '11

Module: wine Branch: master Commit: c05558a245bb50169b5169195ca573fec70f0588 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c05558a245bb50169b5169195… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 15 13:28:15 2011 +0100 ieframe: Store ShellBrowser in DocHost instead of creating it on every QueryService call. --- dlls/ieframe/client.c | 19 ++++++++++--------- dlls/ieframe/ieframe.h | 17 ++++++++++++++++- dlls/ieframe/shellbrowser.c | 32 ++++++++++++++++---------------- dlls/ieframe/webbrowser.c | 1 - 4 files changed, 42 insertions(+), 27 deletions(-) diff --git a/dlls/ieframe/client.c b/dlls/ieframe/client.c index 970e28d..d74a303 100644 --- a/dlls/ieframe/client.c +++ b/dlls/ieframe/client.c @@ -672,18 +672,17 @@ static HRESULT WINAPI ClServiceProvider_QueryService(IServiceProvider *iface, RE } if(IsEqualGUID(&IID_IShellBrowser, guidService)) { - IShellBrowser *sb; - HRESULT hres; - TRACE("(%p)->(IID_IShellBrowser %s %p)\n", This, debugstr_guid(riid), ppv); - hres = ShellBrowser_Create(&sb); - if(FAILED(hres)) - return hres; + if(!This->browser_service) { + HRESULT hres; - hres = IShellBrowser_QueryInterface(sb, riid, ppv); - IShellBrowser_Release(sb); - return hres; + hres = create_browser_service(This, &This->browser_service); + if(FAILED(hres)) + return hres; + } + + return IShellBrowser_QueryInterface(&This->browser_service->IShellBrowser_iface, riid, ppv); } FIXME("(%p)->(%s %s %p)\n", This, debugstr_guid(guidService), debugstr_guid(riid), ppv); @@ -710,6 +709,8 @@ void DocHost_ClientSite_Init(DocHost *This) void DocHost_ClientSite_Release(DocHost *This) { + if(This->browser_service) + detach_browser_service(This->browser_service); if(This->view) IOleDocumentView_Release(This->view); } diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h index 89f69fa..d81e166 100644 --- a/dlls/ieframe/ieframe.h +++ b/dlls/ieframe/ieframe.h @@ -35,6 +35,8 @@ #include "exdisp.h" #include "hlink.h" #include "htiframe.h" +#include "shdeprecated.h" +#include "docobjectservice.h" #include "wine/unicode.h" #include "wine/list.h" @@ -71,6 +73,16 @@ typedef struct _task_header_t { task_destr_t destr; } task_header_t; +typedef struct { + IShellBrowser IShellBrowser_iface; + IBrowserService IBrowserService_iface; + IDocObjectService IDocObjectService_iface; + + LONG ref; + + DocHost *doc_host; +} ShellBrowser; + typedef struct _IDocHostContainerVtbl { ULONG (*addref)(DocHost*); @@ -123,6 +135,8 @@ struct DocHost { DWORD prop_notif_cookie; BOOL is_prop_notif; + ShellBrowser *browser_service; + ConnectionPointContainer cps; }; @@ -213,7 +227,8 @@ void release_dochost_client(DocHost*) DECLSPEC_HIDDEN; void HlinkFrame_Init(HlinkFrame*,IUnknown*,DocHost*) DECLSPEC_HIDDEN; BOOL HlinkFrame_QI(HlinkFrame*,REFIID,void**) DECLSPEC_HIDDEN; -HRESULT ShellBrowser_Create(IShellBrowser**) DECLSPEC_HIDDEN; +HRESULT create_browser_service(DocHost*,ShellBrowser**) DECLSPEC_HIDDEN; +void detach_browser_service(ShellBrowser*) DECLSPEC_HIDDEN; void ConnectionPointContainer_Init(ConnectionPointContainer*,IUnknown*) DECLSPEC_HIDDEN; void ConnectionPointContainer_Destroy(ConnectionPointContainer*) DECLSPEC_HIDDEN; diff --git a/dlls/ieframe/shellbrowser.c b/dlls/ieframe/shellbrowser.c index c3ff6c8..be15613 100644 --- a/dlls/ieframe/shellbrowser.c +++ b/dlls/ieframe/shellbrowser.c @@ -18,23 +18,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "ieframe.h" +#include <assert.h> -#include "shdeprecated.h" -#include "docobjectservice.h" +#include "ieframe.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(ieframe); -typedef struct { - IShellBrowser IShellBrowser_iface; - IBrowserService IBrowserService_iface; - IDocObjectService IDocObjectService_iface; - - LONG ref; -} ShellBrowser; - static inline ShellBrowser *impl_from_IShellBrowser(IShellBrowser *iface) { return CONTAINING_RECORD(iface, ShellBrowser, IShellBrowser_iface); @@ -77,16 +68,18 @@ static ULONG WINAPI ShellBrowser_AddRef( return ref; } -static ULONG WINAPI ShellBrowser_Release( - IShellBrowser* iface) +static ULONG WINAPI ShellBrowser_Release(IShellBrowser* iface) { ShellBrowser *This = impl_from_IShellBrowser(iface); LONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); - if(!ref) + if(!ref) { + assert(!This->doc_host); heap_free(This); + } + return ref; } @@ -759,7 +752,7 @@ static const IDocObjectServiceVtbl DocObjectServiceVtbl = { DocObjectService_IsErrorUrl }; -HRESULT ShellBrowser_Create(IShellBrowser **ppv) +HRESULT create_browser_service(DocHost *doc_host, ShellBrowser **ret) { ShellBrowser *sb; @@ -772,7 +765,14 @@ HRESULT ShellBrowser_Create(IShellBrowser **ppv) sb->IDocObjectService_iface.lpVtbl = &DocObjectServiceVtbl; sb->ref = 1; + sb->doc_host = doc_host; - *ppv = &sb->IShellBrowser_iface; + *ret = sb; return S_OK; } + +void detach_browser_service(ShellBrowser *sb) +{ + sb->doc_host = NULL; + IShellBrowser_Release(&sb->IShellBrowser_iface); +} diff --git a/dlls/ieframe/webbrowser.c b/dlls/ieframe/webbrowser.c index d1004df..706600d 100644 --- a/dlls/ieframe/webbrowser.c +++ b/dlls/ieframe/webbrowser.c @@ -23,7 +23,6 @@ #include "exdispid.h" #include "mshtml.h" -#include "shdeprecated.h" #include "wine/debug.h"

1 0

← Newer
1
...
45
46
47
48
49
50
51
...
86
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 November 2011