- Wine-Commits - list.winehq.org

Gabriel Ivăncescu : mshtml: Return failure in IHTMLDocument2::documentElement for detached documents.
by Alexandre Julliard Dec. 6, 2023

Dec. 6, 2023

Module: wine Branch: master Commit: cb14ca2a291fef2a4449787afa22808e9be98eaf URL: https://gitlab.winehq.org/wine/wine/-/commit/cb14ca2a291fef2a4449787afa2280… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Dec 5 19:42:19 2023 +0200 mshtml: Return failure in IHTMLDocument2::documentElement for detached documents. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmldoc.c | 10 +++++++--- dlls/mshtml/tests/navigation.js | 1 + 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index ebdb887fd64..a8edc3d0251 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -2364,9 +2364,13 @@ static HRESULT WINAPI HTMLDocument3_get_documentElement(IHTMLDocument3 *iface, I TRACE("(%p)->(%p)\n", This, p); - if(This->outer_window && This->outer_window->readystate == READYSTATE_UNINITIALIZED) { - *p = NULL; - return S_OK; + if(This->window) { + if(!This->window->base.outer_window) + return E_FAIL; + if(This->window->base.outer_window->readystate == READYSTATE_UNINITIALIZED) { + *p = NULL; + return S_OK; + } } if(!This->dom_document) { diff --git a/dlls/mshtml/tests/navigation.js b/dlls/mshtml/tests/navigation.js index 23bca192f2d..59ca6ce948b 100644 --- a/dlls/mshtml/tests/navigation.js +++ b/dlls/mshtml/tests/navigation.js @@ -121,6 +121,7 @@ function detached_iframe_doc() { expect_exception(function() { origDoc.toString(); }, true); expect_exception(function() { origDoc.cookie; }); expect_exception(function() { origDoc.cookie = "test=val"; }); + expect_exception(function() { origDoc.documentElement; }); expect_exception(function() { origDoc.domain; }); expect_exception(function() { origDoc.frames; }); expect_exception(function() { origDoc.readyState; }, true);

1 0

Gabriel Ivăncescu : mshtml: Return failure in IHTMLDocument2::open() for detached documents.
by Alexandre Julliard Dec. 6, 2023

Dec. 6, 2023

Module: wine Branch: master Commit: 1f0517689dd40320498c6f23d50983ef48758e0a URL: https://gitlab.winehq.org/wine/wine/-/commit/1f0517689dd40320498c6f23d50983… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Dec 5 19:42:19 2023 +0200 mshtml: Return failure in IHTMLDocument2::open() for detached documents. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmldoc.c | 6 +++--- dlls/mshtml/tests/navigation.js | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index e7ff2771050..ebdb887fd64 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1463,7 +1463,7 @@ static HRESULT WINAPI HTMLDocument_open(IHTMLDocument2 *iface, BSTR url, VARIANT *pomWindowResult = NULL; - if(!This->outer_window) + if(!This->window || !This->window->base.outer_window) return E_FAIL; if(!This->dom_document) { @@ -1490,8 +1490,8 @@ static HRESULT WINAPI HTMLDocument_open(IHTMLDocument2 *iface, BSTR url, VARIANT if(tmp) nsISupports_Release(tmp); - *pomWindowResult = (IDispatch*)&This->outer_window->base.IHTMLWindow2_iface; - IHTMLWindow2_AddRef(&This->outer_window->base.IHTMLWindow2_iface); + *pomWindowResult = (IDispatch*)&This->window->base.outer_window->base.IHTMLWindow2_iface; + IHTMLWindow2_AddRef(&This->window->base.outer_window->base.IHTMLWindow2_iface); return S_OK; } diff --git a/dlls/mshtml/tests/navigation.js b/dlls/mshtml/tests/navigation.js index bc24fa646d3..23bca192f2d 100644 --- a/dlls/mshtml/tests/navigation.js +++ b/dlls/mshtml/tests/navigation.js @@ -126,6 +126,7 @@ function detached_iframe_doc() { expect_exception(function() { origDoc.readyState; }, true); expect_exception(function() { origDoc.URL; }); expect_exception(function() { origDoc.URL = "blank.html"; }); + expect_exception(function() { origDoc.open("blank.html", "_self"); }); next_test(); });

1 0

Gabriel Ivăncescu : mshtml: Return failure in IHTMLDocument2::cookie for detached documents.
by Alexandre Julliard Dec. 6, 2023

Dec. 6, 2023

Module: wine Branch: master Commit: 5e873c48be1f3e18de20f78e4246129da8f40707 URL: https://gitlab.winehq.org/wine/wine/-/commit/5e873c48be1f3e18de20f78e424612… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Dec 5 19:42:19 2023 +0200 mshtml: Return failure in IHTMLDocument2::cookie for detached documents. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmldoc.c | 14 +++++++++----- dlls/mshtml/tests/navigation.js | 2 ++ 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index b0872207819..e7ff2771050 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1188,10 +1188,12 @@ static HRESULT WINAPI HTMLDocument_put_cookie(IHTMLDocument2 *iface, BSTR v) TRACE("(%p)->(%s)\n", This, debugstr_w(v)); - if(!This->outer_window) + if(!This->window) return S_OK; + if(!This->window->base.outer_window) + return E_FAIL; - bret = InternetSetCookieExW(This->outer_window->url, NULL, v, 0, 0); + bret = InternetSetCookieExW(This->window->base.outer_window->url, NULL, v, 0, 0); if(!bret) { FIXME("InternetSetCookieExW failed: %lu\n", GetLastError()); return HRESULT_FROM_WIN32(GetLastError()); @@ -1208,13 +1210,15 @@ static HRESULT WINAPI HTMLDocument_get_cookie(IHTMLDocument2 *iface, BSTR *p) TRACE("(%p)->(%p)\n", This, p); - if(!This->outer_window) { + if(!This->window) { *p = NULL; return S_OK; } + if(!This->window->base.outer_window) + return E_FAIL; size = 0; - bret = InternetGetCookieExW(This->outer_window->url, NULL, NULL, &size, 0, NULL); + bret = InternetGetCookieExW(This->window->base.outer_window->url, NULL, NULL, &size, 0, NULL); if(!bret && GetLastError() != ERROR_INSUFFICIENT_BUFFER) { WARN("InternetGetCookieExW failed: %lu\n", GetLastError()); *p = NULL; @@ -1230,7 +1234,7 @@ static HRESULT WINAPI HTMLDocument_get_cookie(IHTMLDocument2 *iface, BSTR *p) if(!*p) return E_OUTOFMEMORY; - bret = InternetGetCookieExW(This->outer_window->url, NULL, *p, &size, 0, NULL); + bret = InternetGetCookieExW(This->window->base.outer_window->url, NULL, *p, &size, 0, NULL); if(!bret) { ERR("InternetGetCookieExW failed: %lu\n", GetLastError()); return E_FAIL; diff --git a/dlls/mshtml/tests/navigation.js b/dlls/mshtml/tests/navigation.js index ad10372b4c6..bc24fa646d3 100644 --- a/dlls/mshtml/tests/navigation.js +++ b/dlls/mshtml/tests/navigation.js @@ -119,6 +119,8 @@ function detached_iframe_doc() { expect_exception(function() { origDoc.onclick; }, true); expect_exception(function() { origDoc.toString; }, true); expect_exception(function() { origDoc.toString(); }, true); + expect_exception(function() { origDoc.cookie; }); + expect_exception(function() { origDoc.cookie = "test=val"; }); expect_exception(function() { origDoc.domain; }); expect_exception(function() { origDoc.frames; }); expect_exception(function() { origDoc.readyState; }, true);

1 0

Gabriel Ivăncescu : mshtml: Use inner window's outer_window when checking if it's interactive for edit mode.
by Alexandre Julliard Dec. 6, 2023

Dec. 6, 2023

Module: wine Branch: master Commit: ff617c838fb5ef26fc0a6ed13f74953157c90219 URL: https://gitlab.winehq.org/wine/wine/-/commit/ff617c838fb5ef26fc0a6ed13f7495… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Dec 5 19:42:19 2023 +0200 mshtml: Use inner window's outer_window when checking if it's interactive for edit mode. We can't rely on dom_interactive_time either because setup_edit_mode can reload the page (and sets it uninitialized). Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/editor.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index e4a16956e46..7d1c55dc56f 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -146,7 +146,7 @@ static DWORD query_ns_edit_status(HTMLDocumentNode *doc, const char *nscmd) nsICommandParams *nsparam; cpp_bool b = FALSE; - if(doc->browser->usermode != EDITMODE || doc->outer_window->readystate < READYSTATE_INTERACTIVE) + if(doc->browser->usermode != EDITMODE || !doc->window->base.outer_window || doc->window->base.outer_window->readystate < READYSTATE_INTERACTIVE) return OLECMDF_SUPPORTED; if(nscmd) { @@ -180,7 +180,7 @@ static DWORD query_align_status(HTMLDocumentNode *doc, const WCHAR *align) cpp_bool b; nsresult nsres; - if(doc->browser->usermode != EDITMODE || doc->outer_window->readystate < READYSTATE_INTERACTIVE) + if(doc->browser->usermode != EDITMODE || !doc->window->base.outer_window || doc->window->base.outer_window->readystate < READYSTATE_INTERACTIVE) return OLECMDF_SUPPORTED; if(!doc->html_document) { @@ -669,7 +669,7 @@ static HRESULT query_justify(HTMLDocumentNode *doc, OLECMD *cmd) case IDM_JUSTIFYLEFT: TRACE("(%p) IDM_JUSTIFYLEFT\n", doc); /* FIXME: We should set OLECMDF_LATCHED only if it's set explicitly. */ - if(doc->browser->usermode != EDITMODE || doc->outer_window->readystate < READYSTATE_INTERACTIVE) + if(doc->browser->usermode != EDITMODE || !doc->window->base.outer_window || doc->window->base.outer_window->readystate < READYSTATE_INTERACTIVE) cmd->cmdf = OLECMDF_SUPPORTED; else cmd->cmdf = OLECMDF_SUPPORTED | OLECMDF_ENABLED;

1 0

Gabriel Ivăncescu : mshtml: Return failure when setting IHTMLDocument2::location for detached documents.
by Alexandre Julliard Dec. 6, 2023

Dec. 6, 2023

Module: wine Branch: master Commit: dffb5e0538ece9a1c08d15e63fe0f64254a9037a URL: https://gitlab.winehq.org/wine/wine/-/commit/dffb5e0538ece9a1c08d15e63fe0f6… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Dec 5 19:42:19 2023 +0200 mshtml: Return failure when setting IHTMLDocument2::location for detached documents. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmldoc.c | 6 ++++-- dlls/mshtml/tests/navigation.js | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index a8edc3d0251..bc3782d54cc 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -6089,10 +6089,12 @@ static HRESULT HTMLDocumentNode_location_hook(DispatchEx *dispex, WORD flags, DI { HTMLDocumentNode *This = impl_from_DispatchEx(dispex); - if(!(flags & DISPATCH_PROPERTYPUT) || !This->outer_window) + if(!(flags & DISPATCH_PROPERTYPUT) || !This->window) return S_FALSE; + if(!This->window->base.outer_window) + return E_FAIL; - return IDispatchEx_InvokeEx(&This->outer_window->base.IDispatchEx_iface, DISPID_IHTMLWINDOW2_LOCATION, + return IDispatchEx_InvokeEx(&This->window->base.outer_window->base.IDispatchEx_iface, DISPID_IHTMLWINDOW2_LOCATION, 0, flags, dp, res, ei, caller); } diff --git a/dlls/mshtml/tests/navigation.js b/dlls/mshtml/tests/navigation.js index 59ca6ce948b..2b32903abdb 100644 --- a/dlls/mshtml/tests/navigation.js +++ b/dlls/mshtml/tests/navigation.js @@ -124,6 +124,7 @@ function detached_iframe_doc() { expect_exception(function() { origDoc.documentElement; }); expect_exception(function() { origDoc.domain; }); expect_exception(function() { origDoc.frames; }); + expect_exception(function() { origDoc.location = "blank.html"; }); expect_exception(function() { origDoc.readyState; }, true); expect_exception(function() { origDoc.URL; }); expect_exception(function() { origDoc.URL = "blank.html"; });

1 0

Gabriel Ivăncescu : mshtml: Return failure in IHTMLDocument2::frames for detached documents.
by Alexandre Julliard Dec. 6, 2023

Dec. 6, 2023

Module: wine Branch: master Commit: 2e77a62f1d21a7f20f2b241a1761ac29362f06d3 URL: https://gitlab.winehq.org/wine/wine/-/commit/2e77a62f1d21a7f20f2b241a1761ac… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Dec 5 19:42:19 2023 +0200 mshtml: Return failure in IHTMLDocument2::frames for detached documents. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmldoc.c | 6 ++++-- dlls/mshtml/tests/navigation.js | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 3f844fddf8d..45618ad3eba 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -914,11 +914,13 @@ static HRESULT WINAPI HTMLDocument_get_frames(IHTMLDocument2 *iface, IHTMLFrames TRACE("(%p)->(%p)\n", This, p); - if(!This->outer_window) { + if(!This->window) { /* Not implemented by IE */ return E_NOTIMPL; } - return IHTMLWindow2_get_frames(&This->outer_window->base.IHTMLWindow2_iface, p); + if(!This->window->base.outer_window) + return E_FAIL; + return IHTMLWindow2_get_frames(&This->window->base.outer_window->base.IHTMLWindow2_iface, p); } static HRESULT WINAPI HTMLDocument_get_embeds(IHTMLDocument2 *iface, IHTMLElementCollection **p) diff --git a/dlls/mshtml/tests/navigation.js b/dlls/mshtml/tests/navigation.js index 84a0bbdcb5d..fb8d1d5de5b 100644 --- a/dlls/mshtml/tests/navigation.js +++ b/dlls/mshtml/tests/navigation.js @@ -119,6 +119,7 @@ function detached_iframe_doc() { expect_exception(function() { origDoc.onclick; }, true); expect_exception(function() { origDoc.toString; }, true); expect_exception(function() { origDoc.toString(); }, true); + expect_exception(function() { origDoc.frames; }); expect_exception(function() { origDoc.readyState; }, true); expect_exception(function() { origDoc.URL; }); expect_exception(function() { origDoc.URL = "blank.html"; });

1 0

Gabriel Ivăncescu : mshtml: Use inner window's outer_window in IHTMLDocument2::readyState.
by Alexandre Julliard Dec. 6, 2023

Dec. 6, 2023

Module: wine Branch: master Commit: ffb7ace4dfdd7741270a545082d5b35d33760ceb URL: https://gitlab.winehq.org/wine/wine/-/commit/ffb7ace4dfdd7741270a545082d5b3… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Dec 5 19:42:19 2023 +0200 mshtml: Use inner window's outer_window in IHTMLDocument2::readyState. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmldoc.c | 2 +- dlls/mshtml/tests/navigation.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index e37f04fee0b..3f844fddf8d 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -905,7 +905,7 @@ static HRESULT WINAPI HTMLDocument_get_readyState(IHTMLDocument2 *iface, BSTR *p if(!p) return E_POINTER; - return get_readystate_string(This->outer_window ? This->outer_window->readystate : 0, p); + return get_readystate_string(This->window && This->window->base.outer_window ? This->window->base.outer_window->readystate : 0, p); } static HRESULT WINAPI HTMLDocument_get_frames(IHTMLDocument2 *iface, IHTMLFramesCollection2 **p) diff --git a/dlls/mshtml/tests/navigation.js b/dlls/mshtml/tests/navigation.js index 402d933a54a..84a0bbdcb5d 100644 --- a/dlls/mshtml/tests/navigation.js +++ b/dlls/mshtml/tests/navigation.js @@ -119,6 +119,7 @@ function detached_iframe_doc() { expect_exception(function() { origDoc.onclick; }, true); expect_exception(function() { origDoc.toString; }, true); expect_exception(function() { origDoc.toString(); }, true); + expect_exception(function() { origDoc.readyState; }, true); expect_exception(function() { origDoc.URL; }); expect_exception(function() { origDoc.URL = "blank.html"; });

1 0

Henri Verbeet : Release 1.10.
by Alexandre Julliard Dec. 6, 2023

Dec. 6, 2023

Module: vkd3d Branch: master Commit: 0c33f82f72c800f5925a55910e06a35de8197473 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/0c33f82f72c800f5925a55910e06a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 6 12:00:00 2023 +0100 Release 1.10. --- ANNOUNCE | 226 ++++++++++++++++++++++-------------- AUTHORS | 3 + Makefile.am | 6 +- configure.ac | 2 +- demos/demo_xcb.h | 2 +- include/vkd3d.h | 1 + include/vkd3d_shader.h | 1 + libs/vkd3d-shader/spirv.c | 2 +- libs/vkd3d-utils/vkd3d_utils_main.c | 4 +- libs/vkd3d/state.c | 6 +- programs/vkd3d-compiler/main.c | 2 +- tests/shader_runner_gl.c | 2 +- 12 files changed, 157 insertions(+), 100 deletions(-)

1 0

Tag vkd3d-1.10 : Alexandre Julliard : Release 1.10
by Alexandre Julliard Dec. 6, 2023

Dec. 6, 2023

Module: vkd3d Branch: refs/tags/vkd3d-1.10 Tag: b30a44682e8842845fc112578789679ee5a7422d URL: https://gitlab.winehq.org/wine/vkd3d/-/tags/b30a44682e8842845fc112578789679… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 6 23:23:32 2023 +0100 Release 1.10

1 0

Conor McCarthy : vkd3d-shader/spirv: Always emit clip/cull builtins as an array.
by Alexandre Julliard Dec. 6, 2023

Dec. 6, 2023

Module: vkd3d Branch: master Commit: 9fcc90483490ad8a717ef5f3e07a39f2c906ee42 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/9fcc90483490ad8a717ef5f3e07a3… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Dec 6 15:07:18 2023 +1000 vkd3d-shader/spirv: Always emit clip/cull builtins as an array. Clip/cull distance can appear as input in pixel shaders, and the array size must not be forced to zero. --- libs/vkd3d-shader/spirv.c | 5 ++++- libs/vkd3d-shader/vkd3d_shader_private.h | 5 +++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 2197b74d..f72875e1 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4714,8 +4714,11 @@ static uint32_t spirv_compiler_emit_input(struct spirv_compiler *compiler, array_sizes[0] = (reg->type == VKD3DSPR_PATCHCONST ? 0 : compiler->input_control_point_count); array_sizes[1] = signature_element->register_count; - if (array_sizes[1] == 1 && !vsir_sysval_semantic_is_tess_factor(signature_element->sysval_semantic)) + if (array_sizes[1] == 1 && !vsir_sysval_semantic_is_tess_factor(signature_element->sysval_semantic) + && (!vsir_sysval_semantic_is_clip_cull(signature_element->sysval_semantic) || array_sizes[0])) + { array_sizes[1] = 0; + } write_mask = signature_element->mask; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index d3989672..267b467e 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -980,6 +980,11 @@ static inline bool vsir_sysval_semantic_is_tess_factor(enum vkd3d_shader_sysval_ && sysval_semantic <= VKD3D_SHADER_SV_TESS_FACTOR_LINEDEN; } +static inline bool vsir_sysval_semantic_is_clip_cull(enum vkd3d_shader_sysval_semantic sysval_semantic) +{ + return sysval_semantic == VKD3D_SHADER_SV_CLIP_DISTANCE || sysval_semantic == VKD3D_SHADER_SV_CULL_DISTANCE; +} + struct signature_element *vsir_signature_find_element_for_reg(const struct shader_signature *signature, unsigned int reg_idx, unsigned int write_mask); void shader_signature_cleanup(struct shader_signature *signature);

1 0