wine-commits March 2019

wine-commits@winehq.org

2 participants
1097 discussions

Matteo Bruni : d3d9/tests: Fix test_lost_device() D3D9Ex test on Windows 10.
by Alexandre Julliard 09 Mar '19

09 Mar '19

Module: wine Branch: master Commit: b12e967d49a953167befeee2fb5820a19e2ae6bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=b12e967d49a953167befeee2… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Mar 7 21:15:02 2019 +0100 d3d9/tests: Fix test_lost_device() D3D9Ex test on Windows 10. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/d3d9ex.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 81dd591..1d709cb 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -2058,20 +2058,21 @@ static void test_lost_device(void) hr = IDirect3DDevice9Ex_CheckDeviceState(device, window); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9Ex_CheckDeviceState(device, NULL); - ok(hr == S_PRESENT_OCCLUDED, "Got unexpected hr %#x.\n", hr); + ok(hr == S_PRESENT_OCCLUDED || broken(hr == D3D_OK), "Got unexpected hr %#x.\n", hr); ret = SetForegroundWindow(GetDesktopWindow()); ok(ret, "Failed to set foreground window.\n"); hr = IDirect3DDevice9Ex_TestCooperativeLevel(device); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9Ex_Present(device, NULL, NULL, NULL, NULL); - ok(hr == S_PRESENT_OCCLUDED, "Got unexpected hr %#x.\n", hr); + ok(hr == S_PRESENT_OCCLUDED || hr == S_PRESENT_MODE_CHANGED || broken(hr == D3D_OK), + "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9Ex_PresentEx(device, NULL, NULL, NULL, NULL, 0); - ok(hr == S_PRESENT_OCCLUDED, "Got unexpected hr %#x.\n", hr); + ok(hr == S_PRESENT_OCCLUDED || hr == S_PRESENT_MODE_CHANGED, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9Ex_CheckDeviceState(device, window); ok(hr == S_PRESENT_OCCLUDED, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9Ex_CheckDeviceState(device, NULL); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == D3D_OK || hr == S_PRESENT_MODE_CHANGED, "Got unexpected hr %#x.\n", hr); ret = SetForegroundWindow(window); ok(ret, "Failed to set foreground window.\n"); @@ -2084,7 +2085,7 @@ static void test_lost_device(void) hr = IDirect3DDevice9Ex_CheckDeviceState(device, window); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9Ex_CheckDeviceState(device, NULL); - ok(hr == S_PRESENT_OCCLUDED, "Got unexpected hr %#x.\n", hr); + ok(hr == S_PRESENT_OCCLUDED || hr == D3D_OK, "Got unexpected hr %#x.\n", hr); desc.width = 1024; desc.height = 768; @@ -2099,7 +2100,7 @@ static void test_lost_device(void) hr = IDirect3DDevice9Ex_CheckDeviceState(device, window); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9Ex_CheckDeviceState(device, NULL); - ok(hr == S_PRESENT_OCCLUDED, "Got unexpected hr %#x.\n", hr); + ok(hr == S_PRESENT_OCCLUDED || hr == D3D_OK, "Got unexpected hr %#x.\n", hr); desc.flags = 0; hr = reset_device(device, &desc); @@ -2166,24 +2167,24 @@ static void test_lost_device(void) hr = IDirect3DDevice9Ex_CheckDeviceState(device, window); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9Ex_CheckDeviceState(device, NULL); - ok(hr == S_PRESENT_OCCLUDED, "Got unexpected hr %#x.\n", hr); + ok(hr == S_PRESENT_OCCLUDED || hr == D3D_OK, "Got unexpected hr %#x.\n", hr); ret = SetForegroundWindow(GetDesktopWindow()); ok(ret, "Failed to set foreground window.\n"); hr = IDirect3DDevice9Ex_Present(device, NULL, NULL, NULL, NULL); - ok(hr == S_PRESENT_OCCLUDED, "Got unexpected hr %#x.\n", hr); + ok(hr == S_PRESENT_OCCLUDED || broken(hr == D3D_OK), "Got unexpected hr %#x.\n", hr); hr = reset_device(device, &desc); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9Ex_TestCooperativeLevel(device); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9Ex_Present(device, NULL, NULL, NULL, NULL); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == D3D_OK || broken(hr == S_FALSE), "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9Ex_PresentEx(device, NULL, NULL, NULL, NULL, 0); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == D3D_OK || broken(hr == S_FALSE), "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9Ex_CheckDeviceState(device, window); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9Ex_CheckDeviceState(device, NULL); - ok(hr == S_PRESENT_OCCLUDED, "Got unexpected hr %#x.\n", hr); + ok(hr == S_PRESENT_OCCLUDED || hr == D3D_OK, "Got unexpected hr %#x.\n", hr); refcount = IDirect3DDevice9Ex_Release(device); ok(!refcount, "Device has %u references left.\n", refcount);

1 0

Matteo Bruni : d3d9/tests: Fix a CheckDeviceFormat() call.
by Alexandre Julliard 09 Mar '19

09 Mar '19

Module: wine Branch: master Commit: c71469be758b6169cd05688126ae4f722e948bc7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c71469be758b6169cd056881… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Mar 7 21:15:01 2019 +0100 d3d9/tests: Fix a CheckDeviceFormat() call. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 61a6794..9318610 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -1383,7 +1383,7 @@ static void test_clear_different_size_surfaces(void) ok(hr == D3D_OK, "Failed to create render target surface, hr %#x.\n", hr); if (SUCCEEDED(IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, - D3DFMT_A8R8G8B8, D3DUSAGE_DEPTHSTENCIL, D3DRTYPE_SURFACE, D3DFMT_D16_LOCKABLE))) + D3DFMT_X8R8G8B8, D3DUSAGE_DEPTHSTENCIL, D3DRTYPE_SURFACE, D3DFMT_D16_LOCKABLE))) { ds_format = D3DFMT_D16_LOCKABLE; }

1 0

Matteo Bruni : d3d8: Return failure in CheckDeviceFormat() for unsupported adapter formats.
by Alexandre Julliard 09 Mar '19

09 Mar '19

Module: wine Branch: master Commit: ff92a993ad63f6ed94cd1dd873aa578ba46c5979 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff92a993ad63f6ed94cd1dd8… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Mar 7 21:14:59 2019 +0100 d3d8: Return failure in CheckDeviceFormat() for unsupported adapter formats. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/directx.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index 09188cc..f78ff3e 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -242,10 +242,11 @@ static HRESULT WINAPI d3d8_CheckDeviceFormat(IDirect3D8 *iface, UINT adapter, D3 TRACE("iface %p, adapter %u, device_type %#x, adapter_format %#x, usage %#x, resource_type %#x, format %#x.\n", iface, adapter, device_type, adapter_format, usage, resource_type, format); - if (!adapter_format) + if (adapter_format != D3DFMT_X8R8G8B8 && adapter_format != D3DFMT_R5G6B5 + && adapter_format != D3DFMT_X1R5G5B5) { WARN("Invalid adapter format.\n"); - return D3DERR_INVALIDCALL; + return adapter_format ? D3DERR_NOTAVAILABLE : D3DERR_INVALIDCALL; } bind_flags = wined3d_bind_flags_from_d3d8_usage(usage);

1 0

Jacek Caban : mshtml: Simplify handling origin URI charset.
by Alexandre Julliard 09 Mar '19

09 Mar '19

Module: wine Branch: master Commit: e50ab8d6f4ac03a09d7f5765c4f6d1fc2528fb6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=e50ab8d6f4ac03a09d7f5765… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 8 13:49:41 2019 +0100 mshtml: Simplify handling origin URI charset. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/nsio.c | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 436f9bf..4aee21a 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -60,7 +60,6 @@ struct nsWineURI { nsChannelBSC *channel_bsc; IUri *uri; IUriBuilder *uri_builder; - char *origin_charset; BOOL is_mutable; DWORD scheme; }; @@ -154,7 +153,7 @@ static HRESULT combine_url(IUri *base_uri, const WCHAR *rel_url, IUri **ret) return hres; } -static nsresult create_nsuri(IUri*,const char*,nsWineURI**); +static nsresult create_nsuri(IUri*,nsWineURI**); static const char *debugstr_nsacstr(const nsACString *nsstr) { @@ -316,7 +315,7 @@ HRESULT load_nsuri(HTMLOuterWindow *window, nsWineURI *uri, nsIInputStream *post if(window->uri_nofrag) { nsWineURI *referrer_uri; - nsres = create_nsuri(window->uri_nofrag, NULL, &referrer_uri); + nsres = create_nsuri(window->uri_nofrag, &referrer_uri); if(NS_SUCCEEDED(nsres)) { nsres = nsIDocShellLoadInfo_SetReferrer(load_info, (nsIURI*)&referrer_uri->nsIFileURL_iface); assert(nsres == NS_OK); @@ -2265,7 +2264,6 @@ static nsrefcnt NSAPI nsURI_Release(nsIFileURL *iface) IUri_Release(This->uri); if(This->uri_builder) IUriBuilder_Release(This->uri_builder); - heap_free(This->origin_charset); heap_free(This); } @@ -2762,7 +2760,7 @@ static nsresult NSAPI nsURI_Clone(nsIFileURL *iface, nsIURI **_retval) if(!ensure_uri(This)) return NS_ERROR_UNEXPECTED; - nsres = create_nsuri(This->uri, This->origin_charset, &wine_uri); + nsres = create_nsuri(This->uri, &wine_uri); if(NS_FAILED(nsres)) { WARN("create_nsuri failed: %08x\n", nsres); return nsres; @@ -2847,7 +2845,7 @@ static nsresult NSAPI nsURI_GetOriginCharset(nsIFileURL *iface, nsACString *aOri TRACE("(%p)->(%p)\n", This, aOriginCharset); - nsACString_SetData(aOriginCharset, This->origin_charset); + nsACString_SetData(aOriginCharset, NULL); /* assume utf-8, we store URI as utf-16 anyway */ return NS_OK; } @@ -2944,7 +2942,7 @@ static nsresult NSAPI nsURI_CloneIgnoreRef(nsIFileURL *iface, nsIURI **_retval) if(!uri) return NS_ERROR_FAILURE; - nsres = create_nsuri(uri, This->origin_charset, &wine_uri); + nsres = create_nsuri(uri, &wine_uri); IUri_Release(uri); if(NS_FAILED(nsres)) { WARN("create_nsuri failed: %08x\n", nsres); @@ -3339,7 +3337,7 @@ static const nsIStandardURLVtbl nsStandardURLVtbl = { nsStandardURL_SetDefaultPort }; -static nsresult create_nsuri(IUri *iuri, const char *origin_charset, nsWineURI **_retval) +static nsresult create_nsuri(IUri *iuri, nsWineURI **_retval) { nsWineURI *ret; HRESULT hres; @@ -3360,14 +3358,6 @@ static nsresult create_nsuri(IUri *iuri, const char *origin_charset, nsWineURI * if(FAILED(hres)) ret->scheme = URL_SCHEME_UNKNOWN; - if(origin_charset && *origin_charset && strcmp(origin_charset, "UTF-8")) { - ret->origin_charset = heap_strdupA(origin_charset); - if(!ret->origin_charset) { - nsIFileURL_Release(&ret->nsIFileURL_iface); - return NS_ERROR_OUT_OF_MEMORY; - } - } - TRACE("retval=%p\n", ret); *_retval = ret; return NS_OK; @@ -3375,7 +3365,9 @@ static nsresult create_nsuri(IUri *iuri, const char *origin_charset, nsWineURI * HRESULT create_doc_uri(IUri *iuri, nsWineURI **ret) { - return create_nsuri(iuri, NULL, ret); + nsresult nsres; + nsres = create_nsuri(iuri, ret); + return NS_SUCCEEDED(nsres) ? S_OK : E_OUTOFMEMORY; } static nsresult create_nschannel(nsWineURI *uri, nsChannel **ret) @@ -3416,7 +3408,7 @@ HRESULT create_redirect_nschannel(const WCHAR *url, nsChannel *orig_channel, nsC if(FAILED(hres)) return hres; - nsres = create_nsuri(iuri, NULL, &uri); + nsres = create_nsuri(iuri, &uri); IUri_Release(iuri); if(NS_FAILED(nsres)) return E_FAIL; @@ -3789,7 +3781,7 @@ static nsresult NSAPI nsIOServiceHook_NewURI(nsIIOServiceHook *iface, const nsAC if(FAILED(hres)) return NS_SUCCESS_DEFAULT_ACTION; - nsres = create_nsuri(urlmon_uri, NULL, &wine_uri); + nsres = create_nsuri(urlmon_uri, &wine_uri); IUri_Release(urlmon_uri); if(base_wine_uri) nsIFileURL_Release(&base_wine_uri->nsIFileURL_iface);

1 0

Jacek Caban : mshtml: Get rid of no longer needed is_doc_uri from nsWineURI.
by Alexandre Julliard 09 Mar '19

09 Mar '19

Module: wine Branch: master Commit: 9c8162dba22442fdf1e12ceace88a955f43c37e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c8162dba22442fdf1e12cea… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 8 13:49:19 2019 +0100 mshtml: Get rid of no longer needed is_doc_uri from nsWineURI. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/binding.h | 1 - dlls/mshtml/nsembed.c | 7 +------ dlls/mshtml/nsio.c | 31 +------------------------------ 3 files changed, 2 insertions(+), 37 deletions(-) diff --git a/dlls/mshtml/binding.h b/dlls/mshtml/binding.h index b7b6556..accf468 100644 --- a/dlls/mshtml/binding.h +++ b/dlls/mshtml/binding.h @@ -136,7 +136,6 @@ typedef struct { HRESULT set_http_header(struct list*,const WCHAR*,int,const WCHAR*,int) DECLSPEC_HIDDEN; HRESULT create_redirect_nschannel(const WCHAR*,nsChannel*,nsChannel**) DECLSPEC_HIDDEN; -nsresult on_start_uri_open(NSContainer*,nsIURI*,cpp_bool*) DECLSPEC_HIDDEN; HRESULT hlink_frame_navigate(HTMLDocument*,LPCWSTR,nsChannel*,DWORD,BOOL*) DECLSPEC_HIDDEN; HRESULT create_doc_uri(IUri*,nsWineURI**) DECLSPEC_HIDDEN; HRESULT load_nsuri(HTMLOuterWindow*,nsWineURI*,nsIInputStream*,nsChannelBSC*,DWORD) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 5f6c046..aa081ee 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -1612,7 +1612,6 @@ static nsresult NSAPI nsURIContentListener_OnStartURIOpen(nsIURIContentListener NSContainer *This = impl_from_nsIURIContentListener(iface); nsACString spec_str; const char *spec; - nsresult nsres; nsACString_Init(&spec_str, NULL); nsIURI_GetSpec(aURI, &spec_str); @@ -1622,11 +1621,7 @@ static nsresult NSAPI nsURIContentListener_OnStartURIOpen(nsIURIContentListener nsACString_Finish(&spec_str); - nsres = on_start_uri_open(This, aURI, _retval); - if(NS_FAILED(nsres)) - return nsres; - - return !*_retval && This->content_listener + return This->content_listener ? nsIURIContentListener_OnStartURIOpen(This->content_listener, aURI, _retval) : NS_OK; } diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 9bb1892..436f9bf 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -61,7 +61,6 @@ struct nsWineURI { IUri *uri; IUriBuilder *uri_builder; char *origin_charset; - BOOL is_doc_uri; BOOL is_mutable; DWORD scheme; }; @@ -3376,17 +3375,7 @@ static nsresult create_nsuri(IUri *iuri, const char *origin_charset, nsWineURI * HRESULT create_doc_uri(IUri *iuri, nsWineURI **ret) { - nsWineURI *uri; - nsresult nsres; - - nsres = create_nsuri(iuri, NULL, &uri); - if(NS_FAILED(nsres)) - return E_FAIL; - - uri->is_doc_uri = TRUE; - - *ret = uri; - return S_OK; + return create_nsuri(iuri, NULL, ret); } static nsresult create_nschannel(nsWineURI *uri, nsChannel **ret) @@ -3873,24 +3862,6 @@ static const nsIIOServiceHookVtbl nsIOServiceHookVtbl = { static nsIIOServiceHook nsIOServiceHook = { &nsIOServiceHookVtbl }; -nsresult on_start_uri_open(NSContainer *nscontainer, nsIURI *uri, cpp_bool *_retval) -{ - nsWineURI *wine_uri; - nsresult nsres; - - *_retval = FALSE; - - nsres = nsIURI_QueryInterface(uri, &IID_nsWineURI, (void**)&wine_uri); - if(NS_FAILED(nsres)) { - WARN("Could not get nsWineURI: %08x\n", nsres); - return NS_ERROR_NOT_IMPLEMENTED; - } - - wine_uri->is_doc_uri = TRUE; - nsIFileURL_Release(&wine_uri->nsIFileURL_iface); - return NS_OK; -} - void init_nsio(nsIComponentManager *component_manager) { nsIFactory *old_factory = NULL;

1 0

Jacek Caban : mshtml: Move TranslateUrl call to before_async_open.
by Alexandre Julliard 09 Mar '19

09 Mar '19

Module: wine Branch: master Commit: 24603b011a893d27ca6969e98f5eccfa3f2248e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=24603b011a893d27ca6969e9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 8 13:48:53 2019 +0100 mshtml: Move TranslateUrl call to before_async_open. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/nsio.c | 49 +++++++++++++++---------------------------------- 1 file changed, 15 insertions(+), 34 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 0384717..9bb1892 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -252,6 +252,20 @@ static nsresult before_async_open(nsChannel *channel, NSContainer *container, BO if(FAILED(hres)) return NS_ERROR_FAILURE; + if(doc->hostui) { + OLECHAR *new_url; + hres = IDocHostUIHandler_TranslateUrl(doc->hostui, 0, display_uri, &new_url); + if(hres == S_OK && new_url) { + if(strcmpW(display_uri, new_url)) { + FIXME("TranslateUrl returned new URL %s -> %s\n", debugstr_w(display_uri), debugstr_w(new_url)); + CoTaskMemFree(new_url); + *cancel = TRUE; + return NS_OK; + } + CoTaskMemFree(new_url); + } + } + if(!exec_shldocvw_67(doc, display_uri)) { SysFreeString(display_uri); *cancel = FALSE; @@ -3859,33 +3873,6 @@ static const nsIIOServiceHookVtbl nsIOServiceHookVtbl = { static nsIIOServiceHook nsIOServiceHook = { &nsIOServiceHookVtbl }; -static BOOL translate_url(HTMLDocumentObj *doc, nsWineURI *uri) -{ - OLECHAR *new_url = NULL; - WCHAR *url; - BOOL ret = FALSE; - HRESULT hres; - - if(!doc->hostui || !ensure_uri(uri)) - return FALSE; - - hres = IUri_GetDisplayUri(uri->uri, &url); - if(FAILED(hres)) - return FALSE; - - hres = IDocHostUIHandler_TranslateUrl(doc->hostui, 0, url, &new_url); - if(hres == S_OK && new_url) { - if(strcmpW(url, new_url)) { - FIXME("TranslateUrl returned new URL %s -> %s\n", debugstr_w(url), debugstr_w(new_url)); - ret = TRUE; - } - CoTaskMemFree(new_url); - } - - SysFreeString(url); - return ret; -} - nsresult on_start_uri_open(NSContainer *nscontainer, nsIURI *uri, cpp_bool *_retval) { nsWineURI *wine_uri; @@ -3899,13 +3886,7 @@ nsresult on_start_uri_open(NSContainer *nscontainer, nsIURI *uri, cpp_bool *_ret return NS_ERROR_NOT_IMPLEMENTED; } - if(!wine_uri->is_doc_uri) { - wine_uri->is_doc_uri = TRUE; - - if(nscontainer->doc) - *_retval = translate_url(nscontainer->doc, wine_uri); - } - + wine_uri->is_doc_uri = TRUE; nsIFileURL_Release(&wine_uri->nsIFileURL_iface); return NS_OK; }

1 0

Jacek Caban : mshtml: Use channel_bsc from URI for child documents as well.
by Alexandre Julliard 09 Mar '19

09 Mar '19

Module: wine Branch: master Commit: 73cca44bf4fdbe2ed00303b414462052c117118a URL: https://source.winehq.org/git/wine.git/?a=commit;h=73cca44bf4fdbe2ed00303b4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 8 13:48:25 2019 +0100 mshtml: Use channel_bsc from URI for child documents as well. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/nsio.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 22e9086..0384717 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1045,22 +1045,24 @@ static nsresult NSAPI nsChannel_AsyncOpen(nsIHttpChannel *iface, nsIStreamListen is_document_channel = !!(This->load_flags & LOAD_DOCUMENT_URI); - if(is_document_channel && window == window->doc_obj->basedoc.window) { + if(is_document_channel) { if(This->uri->channel_bsc) { channelbsc_set_channel(This->uri->channel_bsc, This, aListener, aContext); + cancel = TRUE; + } - if(window->doc_obj->mime) { + if(window == window->doc_obj->basedoc.window) { + if(!This->uri->channel_bsc) { + /* top window navigation initiated by Gecko */ + nsres = before_async_open(This, window->doc_obj->nscontainer, &cancel); + if(NS_SUCCEEDED(nsres) && cancel) { + TRACE("canceled\n"); + nsres = NS_BINDING_ABORTED; + } + }else if(window->doc_obj->mime) { heap_free(This->content_type); This->content_type = heap_strdupWtoA(window->doc_obj->mime); } - - cancel = TRUE; - }else { - nsres = before_async_open(This, window->doc_obj->nscontainer, &cancel); - if(NS_SUCCEEDED(nsres) && cancel) { - TRACE("canceled\n"); - nsres = NS_BINDING_ABORTED; - } } }

1 0

Jacek Caban : mshtml: Get rid of no longer needed windowref_t.
by Alexandre Julliard 09 Mar '19

09 Mar '19

Module: wine Branch: master Commit: fc66d0ecc322d7b5ba5a04044f27c2ff4c3360ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc66d0ecc322d7b5ba5a0404… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 8 13:48:11 2019 +0100 mshtml: Get rid of no longer needed windowref_t. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/binding.h | 2 +- dlls/mshtml/htmlwindow.c | 12 ----------- dlls/mshtml/mshtml_private.h | 17 --------------- dlls/mshtml/navigate.c | 2 +- dlls/mshtml/nsio.c | 51 ++++++++------------------------------------ dlls/mshtml/persist.c | 2 +- 6 files changed, 12 insertions(+), 74 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fc66d0ecc322d7b5ba5a…

1 0

Jacek Caban : mshtml: Always use get_channel_window to get window in nsIChannel::AsyncOpen.
by Alexandre Julliard 09 Mar '19

09 Mar '19

Module: wine Branch: master Commit: 406d66f8c6ce2f83ced0a87690d9e7c9113cbb55 URL: https://source.winehq.org/git/wine.git/?a=commit;h=406d66f8c6ce2f83ced0a876… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 8 13:47:38 2019 +0100 mshtml: Always use get_channel_window to get window 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 | 74 ++++-------------------------------------------------- 1 file changed, 5 insertions(+), 69 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index b762248..e924434 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -902,53 +902,6 @@ static nsresult NSAPI nsChannel_Open2(nsIHttpChannel *iface, nsIInputStream **_r return NS_ERROR_NOT_IMPLEMENTED; } -static HTMLOuterWindow *get_window_from_load_group(nsChannel *This) -{ - HTMLOuterWindow *window; - nsIChannel *channel; - nsIRequest *req; - nsWineURI *wine_uri; - nsIURI *uri; - nsresult nsres; - - nsres = nsILoadGroup_GetDefaultLoadRequest(This->load_group, &req); - if(NS_FAILED(nsres)) { - ERR("GetDefaultLoadRequest failed: %08x\n", nsres); - return NULL; - } - - if(!req) - return NULL; - - nsres = nsIRequest_QueryInterface(req, &IID_nsIChannel, (void**)&channel); - nsIRequest_Release(req); - if(NS_FAILED(nsres)) { - WARN("Could not get nsIChannel interface: %08x\n", nsres); - return NULL; - } - - nsres = nsIChannel_GetURI(channel, &uri); - nsIChannel_Release(channel); - if(NS_FAILED(nsres)) { - ERR("GetURI failed: %08x\n", nsres); - return NULL; - } - - nsres = nsIURI_QueryInterface(uri, &IID_nsWineURI, (void**)&wine_uri); - nsIURI_Release(uri); - if(NS_FAILED(nsres)) { - TRACE("Could not get nsWineURI: %08x\n", nsres); - return NULL; - } - - window = wine_uri->window_ref ? wine_uri->window_ref->window : NULL; - if(window) - IHTMLWindow2_AddRef(&window->base.IHTMLWindow2_iface); - nsIFileURL_Release(&wine_uri->nsIFileURL_iface); - - return window; -} - static HTMLOuterWindow *get_channel_window(nsChannel *This) { nsIWebProgress *web_progress = NULL; @@ -1102,33 +1055,16 @@ static nsresult NSAPI nsChannel_AsyncOpen(nsIHttpChannel *iface, nsIStreamListen } } - is_document_channel = !!(This->load_flags & LOAD_DOCUMENT_URI); - if(is_document_channel) { - window = get_channel_window(This); - if(window) - set_uri_window(This->uri, window); - } - - if(!window) { - if(This->uri->window_ref && This->uri->window_ref->window) { - window = This->uri->window_ref->window; - IHTMLWindow2_AddRef(&window->base.IHTMLWindow2_iface); - }else { - /* FIXME: Analyze removing get_window_from_load_group call */ - if(This->load_group) - window = get_window_from_load_group(This); - if(!window) - window = get_channel_window(This); - if(window) - set_uri_window(This->uri, window); - } - } - + window = get_channel_window(This); if(!window) { ERR("window = NULL\n"); return NS_ERROR_UNEXPECTED; } + is_document_channel = !!(This->load_flags & LOAD_DOCUMENT_URI); + if(is_document_channel) + set_uri_window(This->uri, window); + if(is_document_channel && window == window->doc_obj->basedoc.window) { if(This->uri->channel_bsc) { channelbsc_set_channel(This->uri->channel_bsc, This, aListener, aContext);

1 0

Jacek Caban : mshtml: Get nsIWebProgress from notification callback if load group has no observer.
by Alexandre Julliard 09 Mar '19

09 Mar '19

Module: wine Branch: master Commit: 4accd13d9209e502931b9b11dd002b6dc2f30891 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4accd13d9209e502931b9b11… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 8 13:47:02 2019 +0100 mshtml: Get nsIWebProgress from notification callback if load group has no observer. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/nsio.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index ca63a98..b762248 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -951,7 +951,7 @@ static HTMLOuterWindow *get_window_from_load_group(nsChannel *This) static HTMLOuterWindow *get_channel_window(nsChannel *This) { - nsIWebProgress *web_progress; + nsIWebProgress *web_progress = NULL; mozIDOMWindowProxy *mozwindow; HTMLOuterWindow *window; nsresult nsres; @@ -960,25 +960,31 @@ static HTMLOuterWindow *get_channel_window(nsChannel *This) nsIRequestObserver *req_observer; nsres = nsILoadGroup_GetGroupObserver(This->load_group, &req_observer); - if(NS_FAILED(nsres) || !req_observer) { + if(NS_FAILED(nsres)) { ERR("GetGroupObserver failed: %08x\n", nsres); return NULL; } - nsres = nsIRequestObserver_QueryInterface(req_observer, &IID_nsIWebProgress, (void**)&web_progress); - nsIRequestObserver_Release(req_observer); - if(NS_FAILED(nsres)) { - ERR("Could not get nsIWebProgress iface: %08x\n", nsres); - return NULL; + if(req_observer) { + nsres = nsIRequestObserver_QueryInterface(req_observer, &IID_nsIWebProgress, (void**)&web_progress); + nsIRequestObserver_Release(req_observer); + if(NS_FAILED(nsres)) { + ERR("Could not get nsIWebProgress iface: %08x\n", nsres); + return NULL; + } } - }else if(This->notif_callback) { + } + + if(!web_progress && This->notif_callback) { nsres = nsIInterfaceRequestor_GetInterface(This->notif_callback, &IID_nsIWebProgress, (void**)&web_progress); if(NS_FAILED(nsres)) { ERR("GetInterface(IID_nsIWebProgress failed: %08x\n", nsres); return NULL; } - }else { - ERR("no load group nor notif callback\n"); + } + + if(!web_progress) { + ERR("Could not find nsIWebProgress\n"); return NULL; }

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 March 2019