August 2016 - Wine-Commits - list.winehq.org

Jacek Caban : mshtml: Set referer HTTP header in nsIHttpChannel:: SetReferrerWithPolicy.
by Alexandre Julliard Aug. 3, 2016

Aug. 3, 2016

Module: wine Branch: master Commit: 0ff1b0c382f6e5cd9f63a64d5dabcd8dfcec261a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ff1b0c382f6e5cd9f63a64d5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 3 15:53:20 2016 +0200 mshtml: Set referer HTTP header in nsIHttpChannel::SetReferrerWithPolicy. 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, 8 insertions(+) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index cd6c21f..88164d0 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1303,7 +1303,11 @@ static nsresult NSAPI nsChannel_SetReferrerWithPolicy(nsIHttpChannel *iface, nsI nsChannel *This = impl_from_nsIHttpChannel(iface); DWORD channel_scheme, referrer_scheme; nsWineURI *referrer; + BSTR referrer_uri; nsresult nsres; + HRESULT hres; + + static const WCHAR refererW[] = {'R','e','f','e','r','e','r'}; TRACE("(%p)->(%p %d)\n", This, aReferrer, aReferrerPolicy); @@ -1338,6 +1342,10 @@ static nsresult NSAPI nsChannel_SetReferrerWithPolicy(nsIHttpChannel *iface, nsI return NS_OK; } + hres = IUri_GetDisplayUri(referrer->uri, &referrer_uri); + if(SUCCEEDED(hres) ) + set_http_header(&This->request_headers, refererW, sizeof(refererW)/sizeof(WCHAR), referrer_uri, SysStringLen(referrer_uri)); + This->referrer = (nsIURI*)&referrer->nsIFileURL_iface; return NS_OK; }

1 0

Jacek Caban : mshtml: Forward nsIHttpChannel:: SetReferrer to SetReferrerWithPolicy.
by Alexandre Julliard Aug. 3, 2016

Aug. 3, 2016

Module: wine Branch: master Commit: ed7dc73ca5825812542439708498b2e5addc4173 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed7dc73ca5825812542439708… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 3 15:52:51 2016 +0200 mshtml: Forward nsIHttpChannel::SetReferrer to SetReferrerWithPolicy. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/nsio.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index cc59d0c..2d6b5d7 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1288,12 +1288,7 @@ static nsresult NSAPI nsChannel_SetReferrer(nsIHttpChannel *iface, nsIURI *aRefe TRACE("(%p)->(%p)\n", This, aReferrer); - if(aReferrer) - nsIURI_AddRef(aReferrer); - if(This->referrer) - nsIURI_Release(This->referrer); - This->referrer = aReferrer; - return NS_OK; + return nsIHttpChannel_SetReferrerWithPolicy(&This->nsIHttpChannel_iface, aReferrer, 0); } static nsresult NSAPI nsChannel_GetReferrerPolicy(nsIHttpChannel *iface, UINT32 *aReferrerPolicy) @@ -1306,8 +1301,18 @@ static nsresult NSAPI nsChannel_GetReferrerPolicy(nsIHttpChannel *iface, UINT32 static nsresult NSAPI nsChannel_SetReferrerWithPolicy(nsIHttpChannel *iface, nsIURI *aReferrer, UINT32 aReferrerPolicy) { nsChannel *This = impl_from_nsIHttpChannel(iface); - FIXME("(%p)->(%p %x)\n", This, aReferrer, aReferrerPolicy); - return NS_ERROR_NOT_IMPLEMENTED; + + TRACE("(%p)->(%p %d)\n", This, aReferrer, aReferrerPolicy); + + if(aReferrerPolicy) + FIXME("refferer policy %d not implemented\n", aReferrerPolicy); + + if(aReferrer) + nsIURI_AddRef(aReferrer); + if(This->referrer) + nsIURI_Release(This->referrer); + This->referrer = aReferrer; + return NS_OK; } static nsresult NSAPI nsHttpChannel_GetProtocolVersion(nsIHttpChannel *iface, nsACString *aProtocolVersion)

1 0

Józef Kucia : dxgi/tests: Add tests for IDXGISwapChain_GetFullscreenState() to test_create_swapchain().
by Alexandre Julliard Aug. 3, 2016

Aug. 3, 2016

Module: wine Branch: master Commit: 587a4d9810764db22b9c547dd89c016b32bfb1a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=587a4d9810764db22b9c547dd… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 3 09:41:44 2016 +0200 dxgi/tests: Add tests for IDXGISwapChain_GetFullscreenState() to test_create_swapchain(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/device.c | 141 ++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 120 insertions(+), 21 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=587a4d9810764db22b9c5…

1 0

Józef Kucia : dxgi: Implement dxgi_swapchain_SetFullscreenState().
by Alexandre Julliard Aug. 3, 2016

Aug. 3, 2016

Module: wine Branch: master Commit: bbc2d604ce156da4947d00f4cc64b9bd5e917138 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbc2d604ce156da4947d00f4c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 3 09:41:41 2016 +0200 dxgi: Implement dxgi_swapchain_SetFullscreenState(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/swapchain.c | 38 ++++++++++++++++++++++++++++++++++++-- dlls/dxgi/tests/device.c | 6 +++--- 2 files changed, 39 insertions(+), 5 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 6b80ead..cdb28e4 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -204,9 +204,43 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetBuffer(IDXGISwapChain *iface, static HRESULT STDMETHODCALLTYPE DECLSPEC_HOTPATCH dxgi_swapchain_SetFullscreenState(IDXGISwapChain *iface, BOOL fullscreen, IDXGIOutput *target) { - FIXME("iface %p, fullscreen %#x, target %p stub!\n", iface, fullscreen, target); + struct dxgi_swapchain *swapchain = impl_from_IDXGISwapChain(iface); + struct wined3d_swapchain_desc swapchain_desc; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, fullscreen %#x, target %p.\n", iface, fullscreen, target); + + if (!fullscreen && target) + { + WARN("Invalid call.\n"); + return DXGI_ERROR_INVALID_CALL; + } + + if (fullscreen) + { + if (target) + { + IDXGIOutput_AddRef(target); + } + else if (FAILED(hr = IDXGISwapChain_GetContainingOutput(iface, &target))) + { + WARN("Failed to get default target output for swapchain, hr %#x.\n", hr); + return hr; + } + } + + swapchain->fullscreen = fullscreen; + if (swapchain->target) + IDXGIOutput_Release(swapchain->target); + swapchain->target = target; + + wined3d_mutex_lock(); + wined3d_swapchain_get_desc(swapchain->wined3d_swapchain, &swapchain_desc); + swapchain_desc.windowed = !fullscreen; + hr = wined3d_swapchain_set_fullscreen(swapchain->wined3d_swapchain, &swapchain_desc, NULL); + wined3d_mutex_unlock(); + + return hr; } static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetFullscreenState(IDXGISwapChain *iface, diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index 3c43895..9c0aa9d 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -545,7 +545,7 @@ static void test_create_swapchain(void) "Denominator %u is %u.\n", i ,result_desc.BufferDesc.RefreshRate.Denominator); hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); - todo_wine ok(SUCCEEDED(hr), "SetFullscreenState failed, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "SetFullscreenState failed, hr %#x.\n", hr); IDXGISwapChain_Release(swapchain); } @@ -1301,7 +1301,7 @@ static void test_swapchain_parameters(void) if (FAILED(hr)) { hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); - todo_wine ok(SUCCEEDED(hr), "SetFullscreenState failed, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "SetFullscreenState failed, hr %#x.\n", hr); IDXGISwapChain_Release(swapchain); continue; @@ -1357,7 +1357,7 @@ static void test_swapchain_parameters(void) ok(hr == DXGI_ERROR_INVALID_CALL, "GetBuffer(%u) returned unexpected hr %#x, test %u.\n", j, hr, i); hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); - todo_wine ok(SUCCEEDED(hr), "SetFullscreenState failed, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "SetFullscreenState failed, hr %#x.\n", hr); IDXGISwapChain_Release(swapchain); }

1 0

Józef Kucia : wined3d: Add WINED3D_SWAPCHAIN_RESTORE_WINDOW_RECT flag.
by Alexandre Julliard Aug. 3, 2016

Aug. 3, 2016

Module: wine Branch: master Commit: 2f5850c56a0e487520327665afe7ad4794909996 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f5850c56a0e487520327665a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 3 09:41:39 2016 +0200 wined3d: Add WINED3D_SWAPCHAIN_RESTORE_WINDOW_RECT flag. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 2 +- dlls/dxgi/utils.c | 4 +++- dlls/wined3d/device.c | 15 ++++++++++++--- dlls/wined3d/swapchain.c | 13 ++++++++++++- dlls/wined3d/wined3d.spec | 2 +- dlls/wined3d/wined3d_private.h | 1 + include/wine/wined3d.h | 4 +++- 7 files changed, 33 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index aa4ac5c..c9efba6 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -890,7 +890,7 @@ static HRESULT ddraw_set_cooperative_level(struct ddraw *ddraw, HWND window, if ((cooplevel & DDSCL_FULLSCREEN) != (ddraw->cooperative_level & DDSCL_FULLSCREEN) || window != ddraw->dest_window) { if (ddraw->cooperative_level & DDSCL_FULLSCREEN) - wined3d_device_restore_fullscreen_window(ddraw->wined3d_device, ddraw->dest_window); + wined3d_device_restore_fullscreen_window(ddraw->wined3d_device, ddraw->dest_window, NULL); if (cooplevel & DDSCL_FULLSCREEN) { diff --git a/dlls/dxgi/utils.c b/dlls/dxgi/utils.c index f671e30..5c6c5bd 100644 --- a/dlls/dxgi/utils.c +++ b/dlls/dxgi/utils.c @@ -405,6 +405,8 @@ unsigned int dxgi_swapchain_flags_from_wined3d(unsigned int wined3d_flags) { unsigned int flags = 0; + wined3d_flags &= ~WINED3D_SWAPCHAIN_RESTORE_WINDOW_RECT; + if (wined3d_flags & WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH) { wined3d_flags &= ~WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH; @@ -419,7 +421,7 @@ unsigned int dxgi_swapchain_flags_from_wined3d(unsigned int wined3d_flags) unsigned int wined3d_swapchain_flags_from_dxgi(unsigned int flags) { - unsigned int wined3d_flags = 0; /* WINED3D_SWAPCHAIN_DISCARD_DEPTHSTENCIL? */ + unsigned int wined3d_flags = WINED3D_SWAPCHAIN_RESTORE_WINDOW_RECT; /* WINED3D_SWAPCHAIN_DISCARD_DEPTHSTENCIL? */ if (flags & DXGI_SWAP_CHAIN_FLAG_ALLOW_MODE_SWITCH) { diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 34ce224..9a4f0d3 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -911,12 +911,16 @@ void CDECL wined3d_device_setup_fullscreen_window(struct wined3d_device *device, device->filter_messages = filter_messages; } -void CDECL wined3d_device_restore_fullscreen_window(struct wined3d_device *device, HWND window) +void CDECL wined3d_device_restore_fullscreen_window(struct wined3d_device *device, HWND window, + const RECT *window_rect) { + unsigned int window_pos_flags = SWP_FRAMECHANGED | SWP_NOZORDER | SWP_NOACTIVATE; BOOL filter_messages; LONG style, exstyle; + RECT rect = {0}; - if (!device->style && !device->exStyle) return; + if (!device->style && !device->exStyle) + return; style = GetWindowLongW(window, GWL_STYLE); exstyle = GetWindowLongW(window, GWL_EXSTYLE); @@ -945,7 +949,12 @@ void CDECL wined3d_device_restore_fullscreen_window(struct wined3d_device *devic SetWindowLongW(window, GWL_STYLE, device->style); SetWindowLongW(window, GWL_EXSTYLE, device->exStyle); } - SetWindowPos(window, 0, 0, 0, 0, 0, SWP_FRAMECHANGED | SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE); + + if (window_rect) + rect = *window_rect; + else + window_pos_flags |= (SWP_NOMOVE | SWP_NOSIZE); + SetWindowPos(window, 0, rect.left, rect.top, rect.right, rect.bottom, window_pos_flags); device->filter_messages = filter_messages; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 1adf8eb..e3d6259 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -77,6 +77,13 @@ static void swapchain_cleanup(struct wined3d_swapchain *swapchain) if (FAILED(hr = wined3d_set_adapter_display_mode(swapchain->device->wined3d, swapchain->device->adapter->ordinal, &swapchain->original_mode))) ERR("Failed to restore display mode, hr %#x.\n", hr); + + if (swapchain->desc.flags & WINED3D_SWAPCHAIN_RESTORE_WINDOW_RECT) + { + wined3d_device_restore_fullscreen_window(swapchain->device, swapchain->device_window, + &swapchain->original_window_rect); + wined3d_device_release_focus_window(swapchain->device); + } } if (swapchain->backup_dc) @@ -839,6 +846,7 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 ERR("Failed to get current display mode, hr %#x.\n", hr); goto err; } + GetWindowRect(window, &swapchain->original_window_rect); GetClientRect(window, &client_rect); if (desc->windowed) @@ -1472,8 +1480,11 @@ HRESULT CDECL wined3d_swapchain_set_fullscreen(struct wined3d_swapchain *swapcha } else if (!swapchain->desc.windowed) { + RECT *window_rect = NULL; /* Fullscreen -> windowed switch */ - wined3d_device_restore_fullscreen_window(device, swapchain->device_window); + if (swapchain->desc.flags & WINED3D_SWAPCHAIN_RESTORE_WINDOW_RECT) + window_rect = &swapchain->original_window_rect; + wined3d_device_restore_fullscreen_window(device, swapchain->device_window, window_rect); wined3d_device_release_focus_window(device); } diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index bdf3916..e0cc501 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -107,7 +107,7 @@ @ cdecl wined3d_device_process_vertices(ptr long long long ptr ptr long long) @ cdecl wined3d_device_release_focus_window(ptr) @ cdecl wined3d_device_reset(ptr ptr ptr ptr long) -@ cdecl wined3d_device_restore_fullscreen_window(ptr ptr) +@ cdecl wined3d_device_restore_fullscreen_window(ptr ptr ptr) @ cdecl wined3d_device_set_base_vertex_index(ptr long) @ cdecl wined3d_device_set_clip_plane(ptr long ptr) @ cdecl wined3d_device_set_clip_status(ptr ptr) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index abb950c..f300e4b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3228,6 +3228,7 @@ struct wined3d_swapchain struct wined3d_texture *front_buffer; struct wined3d_swapchain_desc desc; struct wined3d_display_mode original_mode, d3d_mode; + RECT original_window_rect; struct wined3d_gamma_ramp orig_gamma; BOOL render_to_fbo, reapply_mode; const struct wined3d_format *ds_format; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 4f26f2e..661191d 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -825,6 +825,7 @@ enum wined3d_display_rotation #define WINED3D_SWAPCHAIN_NOAUTOROTATE 0x00000020u #define WINED3D_SWAPCHAIN_UNPRUNEDMODE 0x00000040u #define WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH 0x00001000u +#define WINED3D_SWAPCHAIN_RESTORE_WINDOW_RECT 0x00002000u #define WINED3DDP_MAXTEXCOORD 8 @@ -2252,7 +2253,8 @@ void __cdecl wined3d_device_release_focus_window(struct wined3d_device *device); HRESULT __cdecl wined3d_device_reset(struct wined3d_device *device, const struct wined3d_swapchain_desc *swapchain_desc, const struct wined3d_display_mode *mode, wined3d_device_reset_cb callback, BOOL reset_state); -void __cdecl wined3d_device_restore_fullscreen_window(struct wined3d_device *device, HWND window); +void __cdecl wined3d_device_restore_fullscreen_window(struct wined3d_device *device, HWND window, + const RECT *window_rect); void __cdecl wined3d_device_set_base_vertex_index(struct wined3d_device *device, INT base_index); HRESULT __cdecl wined3d_device_set_clip_plane(struct wined3d_device *device, UINT plane_idx, const struct wined3d_vec4 *plane);

1 0

Nikolay Sivov : krnl386: Fix its vs it's typo.
by Alexandre Julliard Aug. 3, 2016

Aug. 3, 2016

Module: wine Branch: master Commit: ccce887eb2b4fdd7dc26f21edb1e577a4f69d8c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccce887eb2b4fdd7dc26f21ed… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 3 14:19:04 2016 +0300 krnl386: Fix its vs it's typo. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/local.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/krnl386.exe16/local.c b/dlls/krnl386.exe16/local.c index a39316a..46a336e 100644 --- a/dlls/krnl386.exe16/local.c +++ b/dlls/krnl386.exe16/local.c @@ -814,7 +814,7 @@ static UINT16 LOCAL_Compact( HANDLE16 ds, UINT16 minfree, UINT16 flags ) size = pFinalArena->size; LOCAL_RemoveFreeBlock(ptr, finalarena); LOCAL_ShrinkArena( ds, finalarena, movesize ); - /* Copy the arena to it's new location */ + /* Copy the arena to its new location */ memcpy((char *)pFinalArena + ARENA_HEADER_SIZE, (char *)pMoveArena + ARENA_HEADER_SIZE, movesize - ARENA_HEADER_SIZE );

1 0

Nikolay Sivov : dplayx: Fix its vs it's typo.
by Alexandre Julliard Aug. 3, 2016

Aug. 3, 2016

Module: wine Branch: master Commit: 6d4a07077df1f17abf940251f8deddf9449a45cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d4a07077df1f17abf940251f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 3 14:19:03 2016 +0300 dplayx: Fix its vs it's typo. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dplayx/dplayx_global.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dplayx/dplayx_global.c b/dlls/dplayx/dplayx_global.c index 8351f66..14c53a0 100644 --- a/dlls/dplayx/dplayx_global.c +++ b/dlls/dplayx/dplayx_global.c @@ -182,7 +182,7 @@ static void DPLAYX_InitializeLobbyDataEntry( LPDPLAYX_LOBBYDATA lpData ) } /* NOTE: This must be called with the semaphore acquired. - * TRUE/FALSE with a pointer to it's data returned. Pointer data is + * TRUE/FALSE with a pointer to its data returned. Pointer data is * is only valid if TRUE is returned. */ static BOOL DPLAYX_IsAppIdLobbied( DWORD dwAppID, LPDPLAYX_LOBBYDATA* lplpDplData )

1 0

Nikolay Sivov : dinput: Fix its vs it's typo.
by Alexandre Julliard Aug. 3, 2016

Aug. 3, 2016

Module: wine Branch: master Commit: b610e422b381da3ecb83fcf93f64f60ee5ea80e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b610e422b381da3ecb83fcf93… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 3 14:19:02 2016 +0300 dinput: Fix its vs it's typo. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 0b08e15..db4507d 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -526,7 +526,7 @@ failed: return DIERR_OUTOFMEMORY; } -/* find an object by it's offset in a data format */ +/* find an object by its offset in a data format */ static int offset_to_object(const DataFormat *df, int offset) { int i;

1 0

Jacek Caban : mshtml: Use correct principal to create in create_nsxhr.
by Alexandre Julliard Aug. 3, 2016

Aug. 3, 2016

Module: wine Branch: master Commit: 3d4dbd3c143fde871f5a433b24cd5c422f91ad61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d4dbd3c143fde871f5a433b2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 3 15:53:28 2016 +0200 mshtml: Use correct principal to create in create_nsxhr. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/nsembed.c | 62 ++++++++++++++++++++++++------------------------- dlls/mshtml/nsiface.idl | 46 ++++++++---------------------------- 2 files changed, 41 insertions(+), 67 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 22f37af..958b619 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -49,7 +49,6 @@ WINE_DECLARE_DEBUG_CHANNEL(gecko); #define NS_VARIANT_CONTRACTID "@mozilla.org/variant;1" #define NS_CATEGORYMANAGER_CONTRACTID "@mozilla.org/categorymanager;1" #define NS_XMLHTTPREQUEST_CONTRACTID "@mozilla.org/xmlextras/xmlhttprequest;1" -#define NS_SCRIPTSECURITYMANAGER_CONTRACTID "@mozilla.org/scriptsecuritymanager;1" #define PR_UINT32_MAX 0xffffffff @@ -2159,34 +2158,33 @@ void NSContainer_Release(NSContainer *This) nsIWebBrowserChrome_Release(&This->nsIWebBrowserChrome_iface); } +/* + * FIXME: nsIScriptObjectPrincipal uses thiscall calling convention, so we need this hack on i386. + * This will be removed after the next Gecko update, that will change calling convention on Gecko side. + */ +#ifdef __i386__ +extern void *call_thiscall_func; +__ASM_GLOBAL_FUNC(call_thiscall_func, + "popl %eax\n\t" + "popl %edx\n\t" + "popl %ecx\n\t" + "pushl %eax\n\t" + "jmp *%edx\n\t") +#define nsIScriptObjectPrincipal_GetPrincipal(this) ((void* (WINAPI*)(void*,void*))&call_thiscall_func)((this)->lpVtbl->GetPrincipal,this) +#endif + nsIXMLHttpRequest *create_nsxhr(nsIDOMWindow *nswindow) { + nsIScriptObjectPrincipal *sop; mozIDOMWindow *inner_window; - nsIScriptSecurityManager *secman; - nsIPrincipal *nspri; - nsIGlobalObject *nsglo; - nsIXMLHttpRequest *nsxhr; - nsresult nsres; - - nsres = nsIServiceManager_GetServiceByContractID(pServMgr, - NS_SCRIPTSECURITYMANAGER_CONTRACTID, - &IID_nsIScriptSecurityManager, (void**)&secman); - if(NS_FAILED(nsres)) { - ERR("Could not get sec manager service: %08x\n", nsres); - return NULL; - } - - nsres = nsIScriptSecurityManager_GetSystemPrincipal(secman, &nspri); - nsIScriptSecurityManager_Release(secman); - if(NS_FAILED(nsres)) { - ERR("GetSystemPrincipal failed: %08x\n", nsres); - return NULL; - } + nsIPrincipal *nspri; + nsIGlobalObject *nsglo; + nsIXMLHttpRequest *nsxhr; + nsresult nsres; nsres = nsIDOMWindow_GetInnerWindow(nswindow, &inner_window); if(NS_FAILED(nsres)) { ERR("Could not get inner window: %08x\n", nsres); - nsISupports_Release(nspri); return NULL; } @@ -2194,24 +2192,26 @@ nsIXMLHttpRequest *create_nsxhr(nsIDOMWindow *nswindow) mozIDOMWindow_Release(inner_window); assert(nsres == NS_OK); + nsres = nsIGlobalObject_QueryInterface(nsglo, &IID_nsIScriptObjectPrincipal, (void**)&sop); + assert(nsres == NS_OK); + + nspri = nsIScriptObjectPrincipal_GetPrincipal(sop); + nsIScriptObjectPrincipal_Release(sop); + nsres = nsIComponentManager_CreateInstanceByContractID(pCompMgr, NS_XMLHTTPREQUEST_CONTRACTID, NULL, &IID_nsIXMLHttpRequest, (void**)&nsxhr); - if(NS_FAILED(nsres)) { - ERR("Could not get nsIXMLHttpRequest: %08x\n", nsres); - nsISupports_Release(nspri); - nsIGlobalObject_Release(nsglo); - return NULL; + if(NS_SUCCEEDED(nsres)) { + nsres = nsIXMLHttpRequest_Init(nsxhr, nspri, NULL, nsglo, NULL, NULL); + if(NS_FAILED(nsres)) + nsIXMLHttpRequest_Release(nsxhr); } - - nsres = nsIXMLHttpRequest_Init(nsxhr, nspri, NULL, nsglo, NULL, NULL); - nsISupports_Release(nspri); nsIGlobalObject_Release(nsglo); if(NS_FAILED(nsres)) { ERR("nsIXMLHttpRequest_Init failed: %08x\n", nsres); - nsIXMLHttpRequest_Release(nsxhr); return NULL; } + return nsxhr; } diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index e9c717d..83b91a7 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -4146,6 +4146,16 @@ interface nsIGlobalObject : nsISupports [ object, + uuid(3eedba38-8d22-41e1-817a-0e43e165b664), + local +] +interface nsIScriptObjectPrincipal : nsISupports +{ + nsIPrincipal* /* thiscall */ GetPrincipal(); +} + +[ + object, uuid(6f54214c-7175-498d-9d2d-0429e38c2869), local ] @@ -4181,40 +4191,4 @@ interface nsIXMLHttpRequest : nsISupports nsresult GetMozSystem(bool *aMozSystem); } -[ - object, - uuid(b7ae2310-576e-11e5-a837-0800200c9a66), - local -] -interface nsIScriptSecurityManager : nsISupports { - nsresult CanCreateWrapper(JSContext *aJSContext, const nsIID *aIID, nsISupports *aObj, nsIClassInfo *aClassInfo); - nsresult CanCreateInstance(JSContext *aJSContext, const nsCID *aCID); - nsresult CanGetService(JSContext *aJSContext, const nsCID *aCID); - nsresult CheckLoadURIFromScript(JSContext *cx, nsIURI *uri); - nsresult CheckLoadURIWithPrincipal(nsIPrincipal *aPrincipal, nsIURI *uri, uint32_t flags); - nsresult CheckLoadURIStrWithPrincipal(nsIPrincipal *aPrincipal, const nsACString *uri, uint32_t flags); - bool ScriptAllowed(JSObject *aGlobal); - nsresult GetSystemPrincipal(nsIPrincipal **_retval); - nsresult GetSimpleCodebasePrincipal(nsIURI *aURI, nsIPrincipal **_retval); - nsresult GetAppCodebasePrincipal(nsIURI *uri, uint32_t appId, bool inMozBrowser, nsIPrincipal **_retval); - nsresult GetLoadContextCodebasePrincipal(nsIURI *uri, nsILoadContext *loadContext, nsIPrincipal **_retval); - nsresult GetDocShellCodebasePrincipal(nsIURI *uri, nsIDocShell *docShell, nsIPrincipal **_retval); - nsresult GetNoAppCodebasePrincipal(nsIURI *uri, nsIPrincipal **_retval); - nsresult GetCodebasePrincipal(nsIURI *uri, nsIPrincipal **_retval); - nsresult CreateCodebasePrincipal(nsIURI *uri, int /*JS::HandleValue*/ originAttributes, JSContext* cx, nsIPrincipal **_retval); - nsresult CreateCodebasePrincipalFromOrigin(const nsACString *origin, nsIPrincipal **_retval); - nsresult CreateNullPrincipal(int /*JS::HandleValue*/ originAttributes, JSContext *cx, nsIPrincipal **_retval); - nsresult CreateExpandedPrincipal(nsIPrincipal **aPrincipalArray, uint32_t aLength, nsIPrincipal **_retval); - nsresult CheckSameOriginURI(nsIURI *aSourceURI, nsIURI *aTargetURI, bool reportError); - nsresult GetChannelResultPrincipal(nsIChannel *aChannel, nsIPrincipal **_retval); - nsresult GetChannelURIPrincipal(nsIChannel *aChannel, nsIPrincipal **_retval); - nsresult IsSystemPrincipal(nsIPrincipal *aPrincipal, bool *_retval); - nsresult GetJarPrefix(uint32_t appId, bool inMozBrowser, nsACString *_retval); - nsresult ActivateDomainPolicy(nsIDomainPolicy **_retval); - nsresult GetDomainPolicyActive(bool *aDomainPolicyActive); - nsresult ActivateDomainPolicyInternal(nsIDomainPolicy **_retval); - void CloneDomainPolicy(int /*mozilla::dom::DomainPolicyClone*/ *aClone); - nsresult PolicyAllowsScript(nsIURI *aDomain, bool *_retval); -} - cpp_quote("DEFINE_GUID(IID_nsCycleCollectionISupports, 0xc61eac14,0x5f7a,0x4481,0x96,0x5e,0x7e,0xaa,0x6e,0xff,0xa8,0x5f);")

1 0

Jacek Caban : mshtml: Don't send https referrer to non-https channel.
by Alexandre Julliard Aug. 3, 2016

Aug. 3, 2016

Module: wine Branch: master Commit: 3cb45c4c8dd18fbade48b86d4f2657043b85e119 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cb45c4c8dd18fbade48b86d4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 3 15:53:13 2016 +0200 mshtml: Don't send https referrer to non-https channel. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/nsio.c | 35 +++++++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 2d6b5d7..cd6c21f 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1301,17 +1301,44 @@ static nsresult NSAPI nsChannel_GetReferrerPolicy(nsIHttpChannel *iface, UINT32 static nsresult NSAPI nsChannel_SetReferrerWithPolicy(nsIHttpChannel *iface, nsIURI *aReferrer, UINT32 aReferrerPolicy) { nsChannel *This = impl_from_nsIHttpChannel(iface); + DWORD channel_scheme, referrer_scheme; + nsWineURI *referrer; + nsresult nsres; TRACE("(%p)->(%p %d)\n", This, aReferrer, aReferrerPolicy); if(aReferrerPolicy) FIXME("refferer policy %d not implemented\n", aReferrerPolicy); - if(aReferrer) - nsIURI_AddRef(aReferrer); - if(This->referrer) + if(This->referrer) { nsIURI_Release(This->referrer); - This->referrer = aReferrer; + This->referrer = NULL; + } + if(!aReferrer) + return NS_OK; + + nsres = nsIURI_QueryInterface(aReferrer, &IID_nsWineURI, (void**)&referrer); + if(NS_FAILED(nsres)) + return NS_OK; + + if(!ensure_uri(referrer)) { + nsIFileURL_Release(&referrer->nsIFileURL_iface); + return NS_ERROR_UNEXPECTED; + } + + if(!ensure_uri(This->uri) || FAILED(IUri_GetScheme(This->uri->uri, &channel_scheme))) + channel_scheme = INTERNET_SCHEME_UNKNOWN; + + if(FAILED(IUri_GetScheme(referrer->uri, &referrer_scheme))) + referrer_scheme = INTERNET_SCHEME_UNKNOWN; + + if(referrer_scheme == INTERNET_SCHEME_HTTPS && channel_scheme != INTERNET_SCHEME_HTTPS) { + TRACE("Ignoring https referrer on non-https channel\n"); + nsIFileURL_Release(&referrer->nsIFileURL_iface); + return NS_OK; + } + + This->referrer = (nsIURI*)&referrer->nsIFileURL_iface; return NS_OK; }

1 0