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

Francois Gouget : comsvcs/tests: Fix a typo in an ok() message.
by Alexandre Julliard 14 Mar '19

14 Mar '19

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

Louis Lenders : gdi32: Add D3DKMTCloseAdapter() stub.
by Alexandre Julliard 14 Mar '19

14 Mar '19

Module: wine Branch: master Commit: d150cc192e9877037b78b89c6449ad2f5b9b6761 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d150cc192e9877037b78b89c… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Thu Mar 14 08:49:14 2019 +0000 gdi32: Add D3DKMTCloseAdapter() stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46571 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-dx-d3dkmt-l1-1-0.spec | 2 +- dlls/gdi32/driver.c | 13 +++++++++++++ dlls/gdi32/gdi32.spec | 1 + include/d3dukmdt.h | 2 ++ include/ddk/d3dkmthk.h | 6 ++++++ 5 files changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec b/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec index 405afb9..e8aa38e 100644 --- a/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec +++ b/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec @@ -6,7 +6,7 @@ @ stub D3DKMTCheckOcclusion @ stub D3DKMTCheckSharedResourceAccess @ stub D3DKMTCheckVidPnExclusiveOwnership -@ stub D3DKMTCloseAdapter +@ stdcall D3DKMTCloseAdapter(ptr) gdi32.D3DKMTCloseAdapter @ stub D3DKMTConfigureSharedResource @ stub D3DKMTCreateAllocation @ stub D3DKMTCreateAllocation2 diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 8920b73..054d7cf 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -26,12 +26,16 @@ #include <stdarg.h> #include <string.h> #include <stdio.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" +#include "wingdi.h" #include "ddrawgdi.h" #include "wine/winbase16.h" #include "winuser.h" #include "winternl.h" +#include "ddk/d3dkmthk.h" #include "gdi_private.h" #include "wine/unicode.h" @@ -1253,3 +1257,12 @@ NTSTATUS WINAPI D3DKMTEscape( const void *pData ) FIXME("(%p): stub\n", pData); return STATUS_NO_MEMORY; } + +/****************************************************************************** + * D3DKMTCloseAdapter [GDI32.@] + */ +NTSTATUS WINAPI D3DKMTCloseAdapter( const D3DKMT_CLOSEADAPTER *desc ) +{ + FIXME("(%p): stub\n", desc); + return STATUS_SUCCESS; +} diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 2dc8f0e..6e8f028 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -80,6 +80,7 @@ @ stdcall CreateScalableFontResourceA(long str str str) @ stdcall CreateScalableFontResourceW(long wstr wstr wstr) @ stdcall CreateSolidBrush(long) +@ stdcall D3DKMTCloseAdapter(ptr) @ stdcall D3DKMTCreateDCFromMemory(ptr) @ stdcall D3DKMTDestroyDCFromMemory(ptr) @ stdcall D3DKMTEscape(ptr) diff --git a/include/d3dukmdt.h b/include/d3dukmdt.h index a7be710..ce2b0c2 100644 --- a/include/d3dukmdt.h +++ b/include/d3dukmdt.h @@ -25,6 +25,8 @@ ((DWORD)(BYTE)(ch2) << 16) | ((DWORD)(BYTE)(ch3) << 24)) #endif /* MAKEFOURCC */ +typedef UINT D3DKMT_HANDLE; + typedef enum _D3DDDIFORMAT { D3DDDIFMT_UNKNOWN = 0, diff --git a/include/ddk/d3dkmthk.h b/include/ddk/d3dkmthk.h index 80c0c8a..0000b2f 100644 --- a/include/ddk/d3dkmthk.h +++ b/include/ddk/d3dkmthk.h @@ -21,6 +21,11 @@ #include <d3dukmdt.h> +typedef struct _D3DKMT_CLOSEADAPTER +{ + D3DKMT_HANDLE hAdapter; +} D3DKMT_CLOSEADAPTER; + typedef struct _D3DKMT_CREATEDCFROMMEMORY { void *pMemory; @@ -45,6 +50,7 @@ extern "C" { #endif /* __cplusplus */ +NTSTATUS WINAPI D3DKMTCloseAdapter(const D3DKMT_CLOSEADAPTER *desc); NTSTATUS WINAPI D3DKMTCreateDCFromMemory(D3DKMT_CREATEDCFROMMEMORY *desc); NTSTATUS WINAPI D3DKMTDestroyDCFromMemory(const D3DKMT_DESTROYDCFROMMEMORY *desc);

1 0

Jacek Caban : mshtml: Use is_main_content_window in a few more places.
by Alexandre Julliard 14 Mar '19

14 Mar '19

Module: wine Branch: master Commit: 2b8c553cc98edd319bcae7a1bb3e2a8572930de2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b8c553cc98edd319bcae7a1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 14 14:12:42 2019 +0100 mshtml: Use is_main_content_window in a few more places. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlwindow.c | 2 +- dlls/mshtml/persist.c | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 5d4721e..568a590 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -127,7 +127,7 @@ static void detach_inner_window(HTMLInnerWindow *window) IHTMLWindow2_Release(&child->base.IHTMLWindow2_iface); } - if(outer_window && outer_window->doc_obj && outer_window == outer_window->doc_obj->basedoc.window) + if(outer_window && is_main_content_window(outer_window)) window->doc->basedoc.cp_container.forward_container = NULL; if(doc) diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index a798650..cb6aab3 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -115,9 +115,9 @@ void set_current_mon(HTMLOuterWindow *This, IMoniker *mon, DWORD flags) HRESULT hres; if(This->mon) { - if(This->doc_obj && !(flags & (BINDING_REPLACE|BINDING_REFRESH))) { - if(This == This->doc_obj->basedoc.window) - notify_travellog_update(This->doc_obj); + if(This->browser && !(flags & (BINDING_REPLACE|BINDING_REFRESH))) { + if(is_main_content_window(This)) + notify_travellog_update(This->browser->doc); else TRACE("Skipping travellog update for frame navigation.\n"); } @@ -351,8 +351,8 @@ HRESULT set_moniker(HTMLOuterWindow *window, IMoniker *mon, IUri *nav_uri, IBind IUri *uri; HRESULT hres; - if(window->doc_obj && window->doc_obj->basedoc.window == window) - doc_obj = window->doc_obj; + if(is_main_content_window(window)) + doc_obj = window->browser->doc; hres = IMoniker_GetDisplayName(mon, pibc, NULL, &url); if(FAILED(hres)) { @@ -436,8 +436,8 @@ static void notif_readystate(HTMLOuterWindow *window) window->readystate_pending = FALSE; - if(window->doc_obj && window->doc_obj->basedoc.window == window) - call_property_onchanged(&window->doc_obj->basedoc.cp_container, DISPID_READYSTATE); + if(is_main_content_window(window)) + call_property_onchanged(&window->browser->doc->basedoc.cp_container, DISPID_READYSTATE); hres = create_document_event(window->base.inner_window->doc, EVENTID_READYSTATECHANGE, &event); if(SUCCEEDED(hres)) {

1 0

Jacek Caban : mshtml: Access document object via browser object in IActiveScriptSiteWindow:: GetWindow.
by Alexandre Julliard 14 Mar '19

14 Mar '19

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

Jacek Caban : mshtml: Access document object via browser object in IOmHistory::get_length.
by Alexandre Julliard 14 Mar '19

14 Mar '19

Module: wine Branch: master Commit: d8cff0dc6f1b2837cb3b6444d9704c0d20c1f958 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d8cff0dc6f1b2837cb3b6444… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 14 14:12:55 2019 +0100 mshtml: Access document object via browser object in IOmHistory::get_length. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/omnavigator.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index 533afd0..cc4ea5a 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -666,16 +666,16 @@ static HRESULT WINAPI OmHistory_Invoke(IOmHistory *iface, DISPID dispIdMember, R static HRESULT WINAPI OmHistory_get_length(IOmHistory *iface, short *p) { OmHistory *This = impl_from_IOmHistory(iface); + GeckoBrowser *browser = NULL; TRACE("(%p)->(%p)\n", This, p); - if(!This->window || !This->window->base.outer_window->doc_obj - || !This->window->base.outer_window->doc_obj->travel_log) { - *p = 0; - }else { - *p = ITravelLog_CountEntries(This->window->base.outer_window->doc_obj->travel_log, - This->window->base.outer_window->doc_obj->browser_service); - } + if(This->window && This->window->base.outer_window) + browser = This->window->base.outer_window->browser; + + *p = browser->doc->travel_log + ? ITravelLog_CountEntries(browser->doc->travel_log, browser->doc->browser_service) + : 0; return S_OK; }

1 0

Jacek Caban : mshtml: Access document object via browser object in refresh_proc.
by Alexandre Julliard 14 Mar '19

14 Mar '19

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 nsIChannel::AsyncOpen.
by Alexandre Julliard 14 Mar '19

14 Mar '19

Module: wine Branch: master Commit: 892be572cbf3724b92e6a4d2545b6fd0f94d258c URL: https://source.winehq.org/git/wine.git/?a=commit;h=892be572cbf3724b92e6a4d2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 14 14:13:06 2019 +0100 mshtml: Access document object via browser object in nsIChannel::AsyncOpen. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/nsio.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 7a1d204..9b9e575 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1063,17 +1063,17 @@ static nsresult NSAPI nsChannel_AsyncOpen(nsIHttpChannel *iface, nsIStreamListen cancel = TRUE; } - if(window == window->doc_obj->basedoc.window) { + if(is_main_content_window(window)) { if(!This->uri->channel_bsc) { /* top window navigation initiated by Gecko */ - nsres = before_async_open(This, window->doc_obj->nscontainer, &cancel); + nsres = before_async_open(This, window->browser, &cancel); if(NS_SUCCEEDED(nsres) && cancel) { TRACE("canceled\n"); nsres = NS_BINDING_ABORTED; } - }else if(window->doc_obj->mime) { + }else if(window->browser->doc->mime) { heap_free(This->content_type); - This->content_type = heap_strdupWtoA(window->doc_obj->mime); + This->content_type = heap_strdupWtoA(window->browser->doc->mime); } } }

1 0

Jacek Caban : mshtml: Access document object via browser object in IHTMLWindow2 implementation.
by Alexandre Julliard 14 Mar '19

14 Mar '19

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 IHTMLPrivateWindow implementation.
by Alexandre Julliard 14 Mar '19

14 Mar '19

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

Jacek Caban : mshtml: Access document object via browser object in window QueryService implementation.
by Alexandre Julliard 14 Mar '19

14 Mar '19

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