March 2019 - Wine-Commits - list.winehq.org

Jacek Caban : mshtml: Access document object via browser object in handle_navigation_error and handle_extern_mime_navigation.
by Alexandre Julliard March 14, 2019

March 14, 2019

Module: wine Branch: master Commit: 5ba17254916a891cc0b33a5cd4bdf25afcd0c847 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ba17254916a891cc0b33a5c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 14 14:13:54 2019 +0100 mshtml: Access document object via browser object in handle_navigation_error and handle_extern_mime_navigation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/navigate.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 05b8ec0..be83c81 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1394,13 +1394,13 @@ static void handle_navigation_error(nsChannelBSC *This, DWORD result) BSTR unk; HRESULT hres; - if(!This->is_doc_channel || !This->bsc.window) + if(!This->is_doc_channel || !This->bsc.window || !This->bsc.window->base.outer_window + || !This->bsc.window->base.outer_window->browser) return; outer_window = This->bsc.window->base.outer_window; - - doc = outer_window->doc_obj; - if(!doc || !doc->doc_object_service || !doc->client) + doc = outer_window->browser->doc; + if(!doc->doc_object_service || !doc->client) return; hres = IDocObjectService_IsErrorUrl(doc->doc_object_service, @@ -1590,10 +1590,10 @@ static void handle_extern_mime_navigation(nsChannelBSC *This) VARIANT flags; HRESULT hres; - if(!This->bsc.window || !This->bsc.window->base.outer_window || !This->bsc.window->base.outer_window->doc_obj) + if(!This->bsc.window || !This->bsc.window->base.outer_window || !This->bsc.window->base.outer_window->browser) return; - doc_obj = This->bsc.window->base.outer_window->doc_obj; + doc_obj = This->bsc.window->base.outer_window->browser->doc; hres = IOleClientSite_QueryInterface(doc_obj->client, &IID_IOleCommandTarget, (void**)&cmdtrg); if(SUCCEEDED(hres)) {

1 0

Jacek Caban : mshtml: Access document object via browser object in update_window_doc.
by Alexandre Julliard March 14, 2019

March 14, 2019

Module: wine Branch: master Commit: aa96a8de36d9f4c82c13f0756c931b15a49acde4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa96a8de36d9f4c82c13f075… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 14 14:13:29 2019 +0100 mshtml: Access document object via browser object in update_window_doc. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlwindow.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index dc3f24a..fd18ce0 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -3672,10 +3672,11 @@ HRESULT update_window_doc(HTMLInnerWindow *window) outer_window->base.inner_window = window; outer_window->pending_window = NULL; - if(outer_window->doc_obj->basedoc.window == outer_window || !outer_window->doc_obj->basedoc.window) { - if(outer_window->doc_obj->basedoc.doc_node) - htmldoc_release(&outer_window->doc_obj->basedoc.doc_node->basedoc); - outer_window->doc_obj->basedoc.doc_node = window->doc; + if(is_main_content_window(outer_window) || !outer_window->browser->content_window) { + HTMLDocumentObj *doc_obj = outer_window->browser->doc; + if(doc_obj->basedoc.doc_node) + htmldoc_release(&doc_obj->basedoc.doc_node->basedoc); + doc_obj->basedoc.doc_node = window->doc; htmldoc_addref(&window->doc->basedoc); }

1 0

Jacek Caban : mshtml: Access document object via browser object in window QueryService implementation.
by Alexandre Julliard March 14, 2019

March 14, 2019

Module: wine Branch: master Commit: f75d1e68550b9bc890c9f6a99efb3315840fd5d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f75d1e68550b9bc890c9f6a9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 14 14:13:24 2019 +0100 mshtml: Access document object via browser object in window QueryService implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlwindow.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 8c0a605..dc3f24a 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -3306,10 +3306,10 @@ static HRESULT WINAPI HTMLWindowSP_QueryService(IServiceProvider *iface, REFGUID TRACE("(%p)->(%s %s %p)\n", This, debugstr_mshtml_guid(guidService), debugstr_mshtml_guid(riid), ppv); - if(!This->outer_window->doc_obj) + if(!This->outer_window || !This->outer_window->browser) return E_NOINTERFACE; - return IServiceProvider_QueryService(&This->outer_window->doc_obj->basedoc.IServiceProvider_iface, + return IServiceProvider_QueryService(&This->outer_window->browser->doc->basedoc.IServiceProvider_iface, guidService, riid, ppv); }

1 0

Jacek Caban : mshtml: Access document object via browser object in navigate_new_window.
by Alexandre Julliard March 14, 2019

March 14, 2019

Module: wine Branch: master Commit: da055b64569632d16749066496c479d72eee67dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=da055b64569632d167490664… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 14 14:14:15 2019 +0100 mshtml: Access document object via browser object in navigate_new_window. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/navigate.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 19dda29..81c9db5 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -2253,8 +2253,11 @@ HRESULT navigate_new_window(HTMLOuterWindow *window, IUri *uri, const WCHAR *nam nsChannelBSC *bsc; HRESULT hres; - if (window->doc_obj->client) { - hres = do_query_service((IUnknown*)window->doc_obj->client, &SID_SNewWindowManager, + if(!window->browser) + return E_UNEXPECTED; + + if (window->browser->doc->client) { + hres = do_query_service((IUnknown*)window->browser->doc->client, &SID_SNewWindowManager, &IID_INewWindowManager, (void**)&new_window_mgr); if (FAILED(hres)) { FIXME("No INewWindowManager\n"); @@ -2272,8 +2275,8 @@ HRESULT navigate_new_window(HTMLOuterWindow *window, IUri *uri, const WCHAR *nam } hres = INewWindowManager_EvaluateNewWindow(new_window_mgr, display_uri, name, context_url, - NULL, FALSE, window->doc_obj->has_popup ? 0 : NWMF_FIRST, 0); - window->doc_obj->has_popup = TRUE; + NULL, FALSE, window->browser->doc->has_popup ? 0 : NWMF_FIRST, 0); + window->browser->doc->has_popup = TRUE; SysFreeString(display_uri); SysFreeString(context_url); INewWindowManager_Release(new_window_mgr);

1 0

Jacek Caban : mshtml: Access document object via browser object in refresh_proc.
by Alexandre Julliard March 14, 2019

March 14, 2019

Module: wine Branch: master Commit: b0ffd08ae1c5435a1ea3546c2d5da6c62eb715ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=b0ffd08ae1c5435a1ea3546c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 14 14:13:00 2019 +0100 mshtml: Access document object via browser object in refresh_proc. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/olecmd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index 8d337f6..82fbea2 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -427,12 +427,12 @@ static void refresh_proc(task_t *_task) window->readystate = READYSTATE_UNINITIALIZED; - if(window->doc_obj && window->doc_obj->client_cmdtrg) { + if(window->browser && window->browser->doc->client_cmdtrg) { VARIANT var; V_VT(&var) = VT_I4; V_I4(&var) = 0; - IOleCommandTarget_Exec(window->doc_obj->client_cmdtrg, &CGID_ShellDocView, 37, 0, &var, NULL); + IOleCommandTarget_Exec(window->browser->doc->client_cmdtrg, &CGID_ShellDocView, 37, 0, &var, NULL); } load_uri(task->window, task->window->uri, BINDING_REFRESH|BINDING_NOFRAG);

1 0

Jacek Caban : mshtml: Access document object via browser object in IHTMLWindow2 implementation.
by Alexandre Julliard March 14, 2019

March 14, 2019

Module: wine Branch: master Commit: 1a85cb93689d4c6fd2cff55a0439203fdbe6453b URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a85cb93689d4c6fd2cff55a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 14 14:13:13 2019 +0100 mshtml: Access document object via browser object in IHTMLWindow2 implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlwindow.c | 36 +++++++++++++++++++++++++----------- 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 568a590..8246d17 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -621,6 +621,9 @@ static HRESULT WINAPI HTMLWindow2_alert(IHTMLWindow2 *iface, BSTR message) TRACE("(%p)->(%s)\n", This, debugstr_w(message)); + if(!This->outer_window || !This->outer_window->browser) + return E_UNEXPECTED; + if(!LoadStringW(get_shdoclc(), IDS_MESSAGE_BOX_TITLE, title, ARRAY_SIZE(title))) { WARN("Could not load message box title: %d\n", GetLastError()); return S_OK; @@ -635,7 +638,7 @@ static HRESULT WINAPI HTMLWindow2_alert(IHTMLWindow2 *iface, BSTR message) msg[MAX_MESSAGE_LEN] = 0; } - MessageBoxW(This->outer_window->doc_obj->hwnd, msg, title, MB_ICONWARNING); + MessageBoxW(This->outer_window->browser->doc->hwnd, msg, title, MB_ICONWARNING); if(msg != message) heap_free(msg); return S_OK; @@ -649,7 +652,10 @@ static HRESULT WINAPI HTMLWindow2_confirm(IHTMLWindow2 *iface, BSTR message, TRACE("(%p)->(%s %p)\n", This, debugstr_w(message), confirmed); - if(!confirmed) return E_INVALIDARG; + if(!confirmed) + return E_INVALIDARG; + if(!This->outer_window || !This->outer_window->browser) + return E_UNEXPECTED; if(!LoadStringW(get_shdoclc(), IDS_MESSAGE_BOX_TITLE, wszTitle, ARRAY_SIZE(wszTitle))) { WARN("Could not load message box title: %d\n", GetLastError()); @@ -657,7 +663,7 @@ static HRESULT WINAPI HTMLWindow2_confirm(IHTMLWindow2 *iface, BSTR message, return S_OK; } - if(MessageBoxW(This->outer_window->doc_obj->hwnd, message, wszTitle, + if(MessageBoxW(This->outer_window->browser->doc->hwnd, message, wszTitle, MB_OKCANCEL|MB_ICONQUESTION)==IDOK) *confirmed = VARIANT_TRUE; else *confirmed = VARIANT_FALSE; @@ -742,6 +748,9 @@ static HRESULT WINAPI HTMLWindow2_prompt(IHTMLWindow2 *iface, BSTR message, TRACE("(%p)->(%s %s %p)\n", This, debugstr_w(message), debugstr_w(dststr), textdata); + if(!This->outer_window || !This->outer_window->browser) + return E_UNEXPECTED; + if(textdata) V_VT(textdata) = VT_NULL; arg.message = message; @@ -749,7 +758,7 @@ static HRESULT WINAPI HTMLWindow2_prompt(IHTMLWindow2 *iface, BSTR message, arg.textdata = textdata; DialogBoxParamW(hInst, MAKEINTRESOURCEW(ID_PROMPT_DIALOG), - This->outer_window->doc_obj->hwnd, prompt_dlgproc, (LPARAM)&arg); + This->outer_window->browser->doc->hwnd, prompt_dlgproc, (LPARAM)&arg); return S_OK; } @@ -874,12 +883,12 @@ static HRESULT WINAPI HTMLWindow2_close(IHTMLWindow2 *iface) TRACE("(%p)\n", This); - if(!window->doc_obj) { + if(!window || !window->browser) { FIXME("No document object\n"); return E_FAIL; } - if(!notify_webbrowser_close(window, window->doc_obj)) + if(!notify_webbrowser_close(window, window->browser->doc)) return S_OK; FIXME("default action not implemented\n"); @@ -975,7 +984,7 @@ static HRESULT WINAPI HTMLWindow2_open(IHTMLWindow2 *iface, BSTR url, BSTR name, if(replace) FIXME("unsupported relace argument\n"); - if(!window->browser || !window->uri_nofrag) + if(!window || !window->browser || !window->uri_nofrag) return E_UNEXPECTED; if(name && *name == '_') { @@ -1332,8 +1341,10 @@ static HRESULT WINAPI HTMLWindow2_focus(IHTMLWindow2 *iface) TRACE("(%p)->()\n", This); - if(This->outer_window->doc_obj) - SetFocus(This->outer_window->doc_obj->hwnd); + if(!This->outer_window || !This->outer_window->browser) + return E_UNEXPECTED; + + SetFocus(This->outer_window->browser->doc->hwnd); return S_OK; } @@ -1499,12 +1510,15 @@ static HRESULT WINAPI HTMLWindow2_get_external(IHTMLWindow2 *iface, IDispatch ** TRACE("(%p)->(%p)\n", This, p); + if(!This->outer_window || !This->outer_window->browser) + return E_UNEXPECTED; + *p = NULL; - if(!This->outer_window->doc_obj->hostui) + if(!This->outer_window->browser->doc->hostui) return S_OK; - return IDocHostUIHandler_GetExternal(This->outer_window->doc_obj->hostui, p); + return IDocHostUIHandler_GetExternal(This->outer_window->browser->doc->hostui, p); } static const IHTMLWindow2Vtbl HTMLWindow2Vtbl = {

1 0

Jacek Caban : mshtml: Access document object via browser object in IActiveScriptSiteWindow:: GetWindow.
by Alexandre Julliard March 14, 2019

March 14, 2019

Module: wine Branch: master Commit: d95da5f24923b794b8586b17f837d26c583032b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d95da5f24923b794b8586b17… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 14 14:12:48 2019 +0100 mshtml: Access document object via browser object in IActiveScriptSiteWindow::GetWindow. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/script.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 6ad5c48..a357176 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -506,10 +506,10 @@ static HRESULT WINAPI ActiveScriptSiteWindow_GetWindow(IActiveScriptSiteWindow * TRACE("(%p)->(%p)\n", This, phwnd); - if(!This->window || !This->window->base.outer_window || !This->window->base.outer_window->doc_obj) + if(!This->window || !This->window->base.outer_window) return E_UNEXPECTED; - *phwnd = This->window->base.outer_window->doc_obj->hwnd; + *phwnd = This->window->base.outer_window->browser->doc->hwnd; return S_OK; }

1 0

Francois Gouget : comsvcs/tests: Fix a typo in an ok() message.
by Alexandre Julliard March 14, 2019

March 14, 2019

Module: wine Branch: master Commit: 93e1a5f270659e9089fc6f44df0e5e84c8328c09 URL: https://source.winehq.org/git/wine.git/?a=commit;h=93e1a5f270659e9089fc6f44… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 14 02:41:15 2019 +0100 comsvcs/tests: Fix a typo in an ok() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comsvcs/tests/dispenser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comsvcs/tests/dispenser.c b/dlls/comsvcs/tests/dispenser.c index 7af38d0..98d2a91 100644 --- a/dlls/comsvcs/tests/dispenser.c +++ b/dlls/comsvcs/tests/dispenser.c @@ -70,7 +70,7 @@ static HRESULT WINAPI driver_QueryInterface(IDispenserDriver *iface, REFIID riid return S_OK; } - ok(0, "Unknown iterface %s\n", wine_dbgstr_guid(riid)); + ok(0, "Unknown interface %s\n", wine_dbgstr_guid(riid)); return E_NOINTERFACE; }

1 0

Jacek Caban : mshtml: Access document object via browser object in IBindCallbackRedirect:: Redirect.
by Alexandre Julliard March 14, 2019

March 14, 2019

Module: wine Branch: master Commit: 70a964d4f9e194cddb44c10f3791c69b13a59346 URL: https://source.winehq.org/git/wine.git/?a=commit;h=70a964d4f9e194cddb44c10f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 14 14:13:36 2019 +0100 mshtml: Access document object via browser object in IBindCallbackRedirect::Redirect. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/navigate.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 4715cbc..49549b9 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -590,22 +590,22 @@ static ULONG WINAPI BindCallbackRedirect_Release(IBindCallbackRedirect *iface) static HRESULT WINAPI BindCallbackRedirect_Redirect(IBindCallbackRedirect *iface, const WCHAR *url, VARIANT_BOOL *vbCancel) { BSCallback *This = impl_from_IBindCallbackRedirect(iface); - HTMLDocumentObj *doc_obj; + GeckoBrowser *browser; BOOL cancel = FALSE; BSTR frame_name = NULL; HRESULT hres = S_OK; TRACE("(%p)->(%s %p)\n", This, debugstr_w(url), vbCancel); - if(This->window && This->window->base.outer_window && (doc_obj = This->window->base.outer_window->doc_obj) - && doc_obj->doc_object_service) { - if(This->window->base.outer_window != doc_obj->basedoc.window) { + if(This->window && This->window->base.outer_window && (browser = This->window->base.outer_window->browser) + && browser->doc->doc_object_service) { + if(is_main_content_window(This->window->base.outer_window)) { hres = IHTMLWindow2_get_name(&This->window->base.IHTMLWindow2_iface, &frame_name); if(FAILED(hres)) return hres; } - hres = IDocObjectService_FireBeforeNavigate2(doc_obj->doc_object_service, NULL, url, 0x40, + hres = IDocObjectService_FireBeforeNavigate2(browser->doc->doc_object_service, NULL, url, 0x40, frame_name, NULL, 0, NULL, TRUE, &cancel); SysFreeString(frame_name); }

1 0

Jacek Caban : mshtml: Access document object via browser object in IHTMLPrivateWindow implementation.
by Alexandre Julliard March 14, 2019

March 14, 2019

Module: wine Branch: master Commit: 23b8df55f6464392bc3987d91ee5731b18657218 URL: https://source.winehq.org/git/wine.git/?a=commit;h=23b8df55f6464392bc3987d9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 14 14:13:18 2019 +0100 mshtml: Access document object via browser object in IHTMLPrivateWindow implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlwindow.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 8246d17..8c0a605 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -2686,8 +2686,11 @@ static HRESULT WINAPI HTMLPrivateWindow_SuperNavigate(IHTMLPrivateWindow *iface, TRACE("(%p)->(%s %s %s %s %s %s %x)\n", This, debugstr_w(url), debugstr_w(arg2), debugstr_w(arg3), debugstr_w(arg4), debugstr_variant(post_data_var), debugstr_variant(headers_var), flags); - if(window->doc_obj->hostui) { - hres = IDocHostUIHandler_TranslateUrl(window->doc_obj->hostui, 0, url, &translated_url); + if(!window || !window->browser) + return E_UNEXPECTED; + + if(window->browser->doc->hostui) { + hres = IDocHostUIHandler_TranslateUrl(window->browser->doc->hostui, 0, url, &translated_url); if(hres != S_OK) translated_url = NULL; }

1 0