- Wine-Commits - list.winehq.org

Jacek Caban : mshtml: Use DispatchEx vtbl for elements as window property lookups.
by Alexandre Julliard May 31, 2024

May 31, 2024

Module: wine Branch: master Commit: 3108a405e3d0e7c88ce6552ae7552ae1c91eb959 URL: https://gitlab.winehq.org/wine/wine/-/commit/3108a405e3d0e7c88ce6552ae7552a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 29 23:45:53 2024 +0200 mshtml: Use DispatchEx vtbl for elements as window property lookups. --- dlls/mshtml/dispex.c | 5 ++++ dlls/mshtml/htmlwindow.c | 66 +++++++++++++++++++++++--------------------- dlls/mshtml/mshtml_private.h | 3 ++ 3 files changed, 43 insertions(+), 31 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 3c5f00e35b7..8517ccac554 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -1691,6 +1691,11 @@ static HRESULT WINAPI DispatchEx_GetDispID(IDispatchEx *iface, BSTR bstrName, DW hres = get_dynamic_prop(This, bstrName, grfdex & ~fdexNameEnsure, &dprop); if(FAILED(hres)) { + if(This->info->desc->vtbl->find_dispid) { + hres = This->info->desc->vtbl->find_dispid(This, bstrName, grfdex, pid); + if(SUCCEEDED(hres)) + return hres; + } if(grfdex & fdexNameEnsure) hres = alloc_dynamic_prop(This, bstrName, dprop, &dprop); if(FAILED(hres)) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 59a0f6d023d..be07072600c 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -3700,9 +3700,6 @@ static HRESULT WINAPI WindowDispEx_GetDispID(IDispatchEx *iface, BSTR bstrName, { HTMLWindow *This = impl_from_IDispatchEx(iface); HTMLInnerWindow *window = This->inner_window; - HTMLOuterWindow *frame; - global_prop_t *prop; - IHTMLElement *elem; HRESULT hres; TRACE("(%p)->(%s %lx %p)\n", This, debugstr_w(bstrName), grfdex, pid); @@ -3711,34 +3708,7 @@ static HRESULT WINAPI WindowDispEx_GetDispID(IDispatchEx *iface, BSTR bstrName, if(hres != DISP_E_UNKNOWNNAME) return hres; - hres = IDispatchEx_GetDispID(&window->base.inner_window->event_target.dispex.IDispatchEx_iface, bstrName, grfdex, pid); - if(hres != DISP_E_UNKNOWNNAME) - return hres; - - hres = get_frame_by_name(This->outer_window, bstrName, FALSE, &frame); - if(SUCCEEDED(hres) && frame) { - prop = alloc_global_prop(window, GLOBAL_FRAMEVAR, bstrName); - if(!prop) - return E_OUTOFMEMORY; - - *pid = prop_to_dispid(window, prop); - return S_OK; - } - - hres = IHTMLDocument3_getElementById(&window->base.inner_window->doc->IHTMLDocument3_iface, - bstrName, &elem); - if(SUCCEEDED(hres) && elem) { - IHTMLElement_Release(elem); - - prop = alloc_global_prop(window, GLOBAL_ELEMENTVAR, bstrName); - if(!prop) - return E_OUTOFMEMORY; - - *pid = prop_to_dispid(window, prop); - return S_OK; - } - - return DISP_E_UNKNOWNNAME; + return IDispatchEx_GetDispID(&window->base.inner_window->event_target.dispex.IDispatchEx_iface, bstrName, grfdex, pid); } static HRESULT WINAPI WindowDispEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, @@ -4099,6 +4069,39 @@ static HRESULT HTMLWindow_get_name(DispatchEx *dispex, DISPID id, BSTR *name) return (*name = SysAllocString(This->global_props[idx].name)) ? S_OK : E_OUTOFMEMORY; } +static HRESULT HTMLWindow_find_dispid(DispatchEx *dispex, BSTR name, DWORD grfdex, DISPID *dispid) +{ + HTMLInnerWindow *This = impl_from_DispatchEx(dispex); + HTMLOuterWindow *frame; + global_prop_t *prop; + IHTMLElement *elem; + HRESULT hres; + + hres = get_frame_by_name(This->base.outer_window, name, FALSE, &frame); + if(SUCCEEDED(hres) && frame) { + prop = alloc_global_prop(This, GLOBAL_FRAMEVAR, name); + if(!prop) + return E_OUTOFMEMORY; + + *dispid = prop_to_dispid(This, prop); + return S_OK; + } + + hres = IHTMLDocument3_getElementById(&This->doc->IHTMLDocument3_iface, name, &elem); + if(SUCCEEDED(hres) && elem) { + IHTMLElement_Release(elem); + + prop = alloc_global_prop(This, GLOBAL_ELEMENTVAR, name); + if(!prop) + return E_OUTOFMEMORY; + + *dispid = prop_to_dispid(This, prop); + return S_OK; + } + + return DISP_E_UNKNOWNNAME; +} + static HRESULT HTMLWindow_invoke(DispatchEx *dispex, DISPID id, LCID lcid, WORD flags, DISPPARAMS *params, VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller) { @@ -4398,6 +4401,7 @@ static const event_target_vtbl_t HTMLWindow_event_target_vtbl = { .unlink = HTMLWindow_unlink, .last_release = HTMLWindow_last_release, .get_name = HTMLWindow_get_name, + .find_dispid = HTMLWindow_find_dispid, .invoke = HTMLWindow_invoke, .next_dispid = HTMLWindow_next_dispid, .get_compat_mode = HTMLWindow_get_compat_mode, diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 1d4f005ba11..52d53ca9e00 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -371,6 +371,9 @@ typedef struct { /* Used when the object has custom props, and this returns DISPIDs for them */ HRESULT (*get_dispid)(DispatchEx*,BSTR,DWORD,DISPID*); + /* Similar to get_dispid, but called only when a dynamic property can't be found */ + HRESULT (*find_dispid)(DispatchEx*,BSTR,DWORD,DISPID*); + /* These are called when the object implements GetMemberName, InvokeEx, DeleteMemberByDispID and GetNextDispID for custom props */ HRESULT (*get_name)(DispatchEx*,DISPID,BSTR*); HRESULT (*invoke)(DispatchEx*,DISPID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,IServiceProvider*);

1 0

Jacek Caban : mshtml: Use DispatchEx vtbl for all window properties.
by Alexandre Julliard May 31, 2024

May 31, 2024

Module: wine Branch: master Commit: b133812b63db6e39978d232e29ec81b64521bd2a URL: https://gitlab.winehq.org/wine/wine/-/commit/b133812b63db6e39978d232e29ec81… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 30 00:08:34 2024 +0200 mshtml: Use DispatchEx vtbl for all window properties. --- dlls/mshtml/dispex.c | 12 ++++++++++-- dlls/mshtml/htmlwindow.c | 18 +++++++++--------- dlls/mshtml/mshtml_private.h | 3 +++ 3 files changed, 22 insertions(+), 11 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 8517ccac554..152d2d4cb66 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -994,6 +994,13 @@ static HRESULT get_builtin_func(dispex_data_t *data, DISPID id, func_info_t **re static HRESULT get_builtin_id(DispatchEx *This, BSTR name, DWORD grfdex, DISPID *ret) { int min, max, n, c; + HRESULT hres; + + if(This->info->desc->vtbl->lookup_dispid) { + hres = This->info->desc->vtbl->lookup_dispid(This, name, grfdex, ret); + if(hres != DISP_E_UNKNOWNNAME) + return hres; + } min = 0; max = This->info->func_cnt-1; @@ -1017,8 +1024,6 @@ static HRESULT get_builtin_id(DispatchEx *This, BSTR name, DWORD grfdex, DISPID } if(This->info->desc->vtbl->get_dispid) { - HRESULT hres; - hres = This->info->desc->vtbl->get_dispid(This, name, grfdex, ret); if(hres != DISP_E_UNKNOWNNAME) return hres; @@ -1800,6 +1805,9 @@ static HRESULT WINAPI DispatchEx_DeleteMemberByName(IDispatchEx *iface, BSTR nam TRACE("%s (%p)->(%s %lx)\n", This->info->desc->name, This, debugstr_w(name), grfdex); + if(dispex_compat_mode(This) < COMPAT_MODE_IE8 && !This->info->desc->vtbl->delete) + return E_NOTIMPL; + hres = IDispatchEx_GetDispID(&This->IDispatchEx_iface, name, grfdex & ~fdexNameEnsure, &id); if(FAILED(hres)) { compat_mode_t compat_mode = dispex_compat_mode(This); diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index be07072600c..0230cca86e5 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -3699,16 +3699,8 @@ HRESULT search_window_props(HTMLInnerWindow *This, BSTR bstrName, DWORD grfdex, static HRESULT WINAPI WindowDispEx_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD grfdex, DISPID *pid) { HTMLWindow *This = impl_from_IDispatchEx(iface); - HTMLInnerWindow *window = This->inner_window; - HRESULT hres; - - TRACE("(%p)->(%s %lx %p)\n", This, debugstr_w(bstrName), grfdex, pid); - - hres = search_window_props(window, bstrName, grfdex, pid); - if(hres != DISP_E_UNKNOWNNAME) - return hres; - return IDispatchEx_GetDispID(&window->base.inner_window->event_target.dispex.IDispatchEx_iface, bstrName, grfdex, pid); + return IDispatchEx_GetDispID(&This->inner_window->event_target.dispex.IDispatchEx_iface, bstrName, grfdex, pid); } static HRESULT WINAPI WindowDispEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, @@ -4069,6 +4061,13 @@ static HRESULT HTMLWindow_get_name(DispatchEx *dispex, DISPID id, BSTR *name) return (*name = SysAllocString(This->global_props[idx].name)) ? S_OK : E_OUTOFMEMORY; } +static HRESULT HTMLWindow_lookup_dispid(DispatchEx *dispex, BSTR name, DWORD grfdex, DISPID *dispid) +{ + HTMLInnerWindow *This = impl_from_DispatchEx(dispex); + + return search_window_props(This, name, grfdex, dispid); +} + static HRESULT HTMLWindow_find_dispid(DispatchEx *dispex, BSTR name, DWORD grfdex, DISPID *dispid) { HTMLInnerWindow *This = impl_from_DispatchEx(dispex); @@ -4401,6 +4400,7 @@ static const event_target_vtbl_t HTMLWindow_event_target_vtbl = { .unlink = HTMLWindow_unlink, .last_release = HTMLWindow_last_release, .get_name = HTMLWindow_get_name, + .lookup_dispid = HTMLWindow_lookup_dispid, .find_dispid = HTMLWindow_find_dispid, .invoke = HTMLWindow_invoke, .next_dispid = HTMLWindow_next_dispid, diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 52d53ca9e00..98a417726f2 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -374,6 +374,9 @@ typedef struct { /* Similar to get_dispid, but called only when a dynamic property can't be found */ HRESULT (*find_dispid)(DispatchEx*,BSTR,DWORD,DISPID*); + /* Similar to get_dispid, but called before any other lookup */ + HRESULT (*lookup_dispid)(DispatchEx*,BSTR,DWORD,DISPID*); + /* These are called when the object implements GetMemberName, InvokeEx, DeleteMemberByDispID and GetNextDispID for custom props */ HRESULT (*get_name)(DispatchEx*,DISPID,BSTR*); HRESULT (*invoke)(DispatchEx*,DISPID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,IServiceProvider*);

1 0

Jacek Caban : mshtml/tests: Add more custom properties tests.
by Alexandre Julliard May 31, 2024

May 31, 2024

Module: wine Branch: master Commit: 984178cdb0ad9275520f21ead1756d98fc69ec04 URL: https://gitlab.winehq.org/wine/wine/-/commit/984178cdb0ad9275520f21ead1756d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 29 22:41:22 2024 +0200 mshtml/tests: Add more custom properties tests. --- dlls/mshtml/tests/documentmode.js | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 5249e042182..2eed3bb1aff 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -950,6 +950,30 @@ sync_test("elem_by_id", function() { ok(v < 9 && e.number === 0xa01b6 - 0x80000000, "Setting document.testid threw = " + e.number); } + window.testid2 = 1; + document.testid2 = 2; + document.body.innerHTML = '<form id="testid2" name="testname"></form>'; + ok(window.testid2 == 1, "window.testid2 = " + window.testid2); + id_elem = document.body.firstChild; + todo_wine_if(v < 9). + ok(document.testid2 == (v < 9 ? id_elem : 2), "document.testid2 = " + document.testid2); + document.body.innerHTML = ''; + ok(window.testid2 == 1, "window.testid2 = " + window.testid2); + ok(document.testid2 == 2, "document.testid2 = " + document.testid2 + " expected 2"); + + ok(document.title === "", "document.title = " + document.title); + document.body.innerHTML = '<form id="title" name="testname"></form>'; + id_elem = document.body.firstChild; + todo_wine_if(v < 9). + ok(document.title === (v < 9 ? id_elem : ""), "document.title = " + document.title); + document.body.innerHTML = ''; + ok(document.title === "", "document.title = " + document.title); + + ok(window.closed === false, "window.closed = " + window.closed); + document.body.innerHTML = '<form id="closed" name="testname"></form>'; + id_elem = document.body.firstChild; + ok(window.closed === false, "window.closed = " + window.closed); + // these tags expose name as props, and id only if they have a name var tags = [ "embed", "form", "iframe", "img" ]; for(i in tags) { @@ -3011,3 +3035,17 @@ async_test("postMessage", function() { ok(onmessage_called == (v < 9 ? true : false), "onmessage not called"); if(v < 9) next_test(); }); + +sync_test("form", function() { + document.body.innerHTML = ""; + var form = document.createElement("form"); + document.body.appendChild(form); + + form[0] = "test"; + form.innerHTML = "<input type=\"text\" id = \"i1\" /><input type=\"text\" id = \"i2\" />"; + ok(form.length === 2, "form.length = " + form.length); + ok(typeof(form[0]) === "object", "form[0] = " + form[0]); + ok(typeof(form[1]) === "object", "form[1] = " + form[1]); + form.innerHTML = ""; + ok(form[0] === "test", "form[0] = " + form[0]); +});

1 0

Nikolay Sivov : d3dcompiler: Enable D3DCOMPILE_EFFECT_CHILD_EFFECT option.
by Alexandre Julliard May 31, 2024

May 31, 2024

Module: wine Branch: master Commit: 7eeddc3bea26a5eaaf1c5d509dea64be344b8a8b URL: https://gitlab.winehq.org/wine/wine/-/commit/7eeddc3bea26a5eaaf1c5d509dea64… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 31 01:09:40 2024 +0200 d3dcompiler: Enable D3DCOMPILE_EFFECT_CHILD_EFFECT option. --- dlls/d3dcompiler_43/compiler.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index 6a829ae43d7..6fffcfb82ab 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -457,7 +457,7 @@ HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filen struct d3dcompiler_include_from_file include_from_file; struct vkd3d_shader_preprocess_info preprocess_info; struct vkd3d_shader_hlsl_source_info hlsl_info; - struct vkd3d_shader_compile_option options[5]; + struct vkd3d_shader_compile_option options[6]; struct vkd3d_shader_compile_info compile_info; struct vkd3d_shader_compile_option *option; struct vkd3d_shader_code byte_code; @@ -485,8 +485,8 @@ HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filen { FIXME("Ignoring flags %#x.\n", flags); } - if (effect_flags) - FIXME("Ignoring effect flags %#x.\n", effect_flags); + if (effect_flags & ~D3DCOMPILE_EFFECT_CHILD_EFFECT) + FIXME("Ignoring effect flags %#x.\n", effect_flags & ~D3DCOMPILE_EFFECT_CHILD_EFFECT); if (secondary_flags) FIXME("Ignoring secondary flags %#x.\n", secondary_flags); @@ -557,6 +557,13 @@ HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filen option->value = VKD3D_SHADER_COMPILE_OPTION_BACKCOMPAT_MAP_SEMANTIC_NAMES; } + if (effect_flags & D3DCOMPILE_EFFECT_CHILD_EFFECT) + { + option = &options[compile_info.option_count++]; + option->name = VKD3D_SHADER_COMPILE_OPTION_CHILD_EFFECT; + option->value = true; + } + #if D3D_COMPILER_VERSION <= 39 option = &options[compile_info.option_count++]; option->name = VKD3D_SHADER_COMPILE_OPTION_INCLUDE_EMPTY_BUFFERS_IN_EFFECTS;

1 0

Nikolay Sivov : d3dcompiler/fx: Write empty buffers for compiler versions 33-39.
by Alexandre Julliard May 31, 2024

May 31, 2024

Module: wine Branch: master Commit: adb1f54c0291f3378ac2b4dd8b6c517ad5c2fea8 URL: https://gitlab.winehq.org/wine/wine/-/commit/adb1f54c0291f3378ac2b4dd8b6c51… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 31 01:04:53 2024 +0200 d3dcompiler/fx: Write empty buffers for compiler versions 33-39. --- dlls/d3d10/tests/effect.c | 12 +++--------- dlls/d3dcompiler_43/compiler.c | 8 +++++++- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 534ea00fa17..572493e3a40 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -9912,10 +9912,8 @@ static void test_effect_compiler(void) cb = effect->lpVtbl->GetConstantBufferByIndex(effect, 0); hr = cb->lpVtbl->GetDesc(cb, &var_desc); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - if (hr == S_OK) - ok(!strcmp(var_desc.Name, "$Globals"), "Unexpected variable name %s.\n", var_desc.Name); + ok(!strcmp(var_desc.Name, "$Globals"), "Unexpected variable name %s.\n", var_desc.Name); ID3D10Effect_Release(effect); ID3D10Blob_Release(blob); @@ -9936,21 +9934,17 @@ static void test_effect_compiler(void) cb = effect->lpVtbl->GetConstantBufferByIndex(effect, 0); hr = cb->lpVtbl->GetDesc(cb, &var_desc); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine ok(!strcmp(var_desc.Name, "$Globals"), "Unexpected variable name %s.\n", var_desc.Name); cb = effect->lpVtbl->GetConstantBufferByIndex(effect, 1); hr = cb->lpVtbl->GetDesc(cb, &var_desc); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - if (hr == S_OK) - ok(!strcmp(var_desc.Name, "cb1"), "Unexpected variable name %s.\n", var_desc.Name); + ok(!strcmp(var_desc.Name, "cb1"), "Unexpected variable name %s.\n", var_desc.Name); cb = effect->lpVtbl->GetConstantBufferByIndex(effect, 2); hr = cb->lpVtbl->GetDesc(cb, &var_desc); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - if (hr == S_OK) - ok(!strcmp(var_desc.Name, "cb2"), "Unexpected variable name %s.\n", var_desc.Name); + ok(!strcmp(var_desc.Name, "cb2"), "Unexpected variable name %s.\n", var_desc.Name); ID3D10Effect_Release(effect); ID3D10Blob_Release(blob); diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index 4b2b05df917..6a829ae43d7 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -457,7 +457,7 @@ HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filen struct d3dcompiler_include_from_file include_from_file; struct vkd3d_shader_preprocess_info preprocess_info; struct vkd3d_shader_hlsl_source_info hlsl_info; - struct vkd3d_shader_compile_option options[4]; + struct vkd3d_shader_compile_option options[5]; struct vkd3d_shader_compile_info compile_info; struct vkd3d_shader_compile_option *option; struct vkd3d_shader_code byte_code; @@ -557,6 +557,12 @@ HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filen option->value = VKD3D_SHADER_COMPILE_OPTION_BACKCOMPAT_MAP_SEMANTIC_NAMES; } +#if D3D_COMPILER_VERSION <= 39 + option = &options[compile_info.option_count++]; + option->name = VKD3D_SHADER_COMPILE_OPTION_INCLUDE_EMPTY_BUFFERS_IN_EFFECTS; + option->value = true; +#endif + ret = vkd3d_shader_compile(&compile_info, &byte_code, &messages); if (ret)

1 0

Nikolay Sivov : gdi32/text: Make GetTextExtentExPointW() return sizes consistent with ExtTextOutW().
by Alexandre Julliard May 31, 2024

May 31, 2024

Module: wine Branch: master Commit: 3c1462afa0acee45127fe610db1c8258016e8bec URL: https://gitlab.winehq.org/wine/wine/-/commit/3c1462afa0acee45127fe610db1c82… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 28 02:21:29 2024 +0200 gdi32/text: Make GetTextExtentExPointW() return sizes consistent with ExtTextOutW(). Observable issue before this change is that text extent does not match size of ExtTextOutW() output. The fix is to shape text in similar way before measuring. Individual extents returned in this case are arguably useless, they do not match visual output order, and only give an idea on how much each input character contributed to overall width. To match input character order all intra-line and intra-item reordering is disabled. --- dlls/gdi32/text.c | 126 +++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 119 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/text.c b/dlls/gdi32/text.c index b61c8ed4542..085c5e3afbe 100644 --- a/dlls/gdi32/text.c +++ b/dlls/gdi32/text.c @@ -71,6 +71,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(bidi); #define WINE_GCPW_LOOSE_RTL 3 #define WINE_GCPW_DIR_MASK 3 #define WINE_GCPW_LOOSE_MASK 2 +#define WINE_GCPW_DISABLE_REORDERING 0x10000000 #define odd(x) ((x) & 1) @@ -350,7 +351,8 @@ static BOOL BIDI_Reorder( HDC hDC, /* [in] Display DC */ INT uCountOut, /* [in] Size of output buffer */ UINT *lpOrder, /* [out] Logical -> Visual order map */ WORD **lpGlyphs, /* [out] reordered, mirrored, shaped glyphs to display */ - INT *cGlyphs ) /* [out] number of glyphs generated */ + INT *cGlyphs, /* [out] number of glyphs generated */ + WORD **cluster_map ) /* [out] cluster map for returned glyphs */ { WORD *chartype = NULL; BYTE *levels = NULL; @@ -588,19 +590,30 @@ static BOOL BIDI_Reorder( HDC hDC, /* [in] Display DC */ } for (j = 0; j < nItems; j++) + { runOrder[j] = pItems[j].a.s.uBidiLevel; + visOrder[j] = j; + if (dwWineGCP_Flags & WINE_GCPW_DISABLE_REORDERING) + pItems[j].a.fLogicalOrder = TRUE; + } - ScriptLayout(nItems, runOrder, visOrder, NULL); + if (!(dwWineGCP_Flags & WINE_GCPW_DISABLE_REORDERING)) + ScriptLayout(nItems, runOrder, visOrder, NULL); for (j = 0; j < nItems; j++) { + const WCHAR *text; + WORD *cluster_map; int k; int cChars,cOutGlyphs; + curItem = &pItems[visOrder[j]]; cChars = pItems[visOrder[j]+1].iCharPos - curItem->iCharPos; - res = ScriptShape(hDC, &psc, lpString + done + curItem->iCharPos, cChars, cMaxGlyphs, &curItem->a, run_glyphs, pwLogClust, psva, &cOutGlyphs); + text = lpString + done + curItem->iCharPos; + cluster_map = pwLogClust + done + curItem->iCharPos; + res = ScriptShape(hDC, &psc, text, cChars, cMaxGlyphs, &curItem->a, run_glyphs, cluster_map, psva, &cOutGlyphs); while (res == E_OUTOFMEMORY) { WORD *new_run_glyphs = HeapReAlloc(GetProcessHeap(), 0, run_glyphs, sizeof(*run_glyphs) * cMaxGlyphs * 2); @@ -621,7 +634,7 @@ static BOOL BIDI_Reorder( HDC hDC, /* [in] Display DC */ run_glyphs = new_run_glyphs; psva = new_psva; cMaxGlyphs *= 2; - res = ScriptShape(hDC, &psc, lpString + done + curItem->iCharPos, cChars, cMaxGlyphs, &curItem->a, run_glyphs, pwLogClust, psva, &cOutGlyphs); + res = ScriptShape(hDC, &psc, text, cChars, cMaxGlyphs, &curItem->a, run_glyphs, cluster_map, psva, &cOutGlyphs); } if (res) { @@ -653,6 +666,11 @@ static BOOL BIDI_Reorder( HDC hDC, /* [in] Display DC */ *lpGlyphs = new_glyphs; for (k = 0; k < cOutGlyphs; k++) (*lpGlyphs)[glyph_i+k] = run_glyphs[k]; + + /* Fix item cluster map indices to be usable with returned glyph array. */ + for (k = 0; k < cChars; ++k) + cluster_map[k] += glyph_i; + glyph_i += cOutGlyphs; } } @@ -664,6 +682,11 @@ static BOOL BIDI_Reorder( HDC hDC, /* [in] Display DC */ } if (cGlyphs) *cGlyphs = glyph_i; + if (cluster_map) + { + *cluster_map = pwLogClust; + pwLogClust = NULL; + } ret = TRUE; cleanup: @@ -952,7 +975,7 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags, const RECT *rect, ? WINE_GCPW_FORCE_RTL : WINE_GCPW_FORCE_LTR; BIDI_Reorder( hdc, str, count, GCP_REORDER, bidi_flags, NULL, 0, NULL, - &glyphs, &glyphs_count ); + &glyphs, &glyphs_count, NULL ); flags |= ETO_IGNORELANGUAGE; if (glyphs) @@ -1185,7 +1208,7 @@ DWORD WINAPI GetCharacterPlacementW( HDC hdc, const WCHAR *str, INT count, INT m else { BIDI_Reorder( NULL, str, count, flags, WINE_GCPW_FORCE_LTR, result->lpOutString, - set_cnt, result->lpOrder, NULL, NULL ); + set_cnt, result->lpOrder, NULL, NULL, NULL ); } if (flags & GCP_USEKERNING) @@ -1317,13 +1340,102 @@ INT WINAPI GetTextFaceW( HDC hdc, INT count, WCHAR *name ) return NtGdiGetTextFaceW( hdc, count, name, FALSE ); } +static unsigned int get_char_cluster_size(unsigned int start, unsigned int count, const WORD *cluster_map, + WORD *first_glyph, WORD *last_glyph) +{ + unsigned int i, size = 1; + + *first_glyph = cluster_map[start]; + *last_glyph = *first_glyph; + + for (i = start + 1; i < count; ++i) + { + if (cluster_map[i] != *first_glyph) + { + *last_glyph = cluster_map[i] - 1; + break; + } + size++; + } + + return size; +} + +static int get_cluster_extent(const INT *dxs, WORD first_glyph, WORD last_glyph) +{ + int extent = dxs[last_glyph]; + + if (first_glyph) + extent -= dxs[first_glyph - 1]; + return extent; +} + /*********************************************************************** * GetTextExtentExPointW (GDI32.@) */ BOOL WINAPI GetTextExtentExPointW( HDC hdc, const WCHAR *str, INT count, INT max_ext, INT *nfit, INT *dxs, SIZE *size ) { - return NtGdiGetTextExtentExW( hdc, str, count, max_ext, nfit, dxs, size, 0 ); + WORD *glyphs = NULL, *cluster_map = NULL; + unsigned int i, j; + DC_ATTR *dc_attr; + int glyphs_count; + UINT bidi_flags; + BOOL ret = TRUE; + + if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; + + bidi_flags = dc_attr->text_align & TA_RTLREADING ? WINE_GCPW_FORCE_RTL : WINE_GCPW_FORCE_LTR; + bidi_flags |= WINE_GCPW_DISABLE_REORDERING; + + if (nfit) *nfit = 0; + + BIDI_Reorder( hdc, str, count, GCP_REORDER, bidi_flags, NULL, 0, NULL, + &glyphs, &glyphs_count, &cluster_map ); + + if (glyphs) + { + BOOL need_extents = dxs || nfit; + INT *glyph_dxs = NULL; + + if (need_extents) + { + if (!(glyph_dxs = HeapAlloc( GetProcessHeap(), 0, glyphs_count * sizeof(*glyph_dxs) ))) + ret = FALSE; + } + + if (ret) + ret = NtGdiGetTextExtentExW( hdc, glyphs, glyphs_count, 0, NULL, glyph_dxs, size, 1 ); + + if (ret && need_extents) + { + unsigned int cluster_size, cluster_extent; + WORD first_glyph, last_glyph; + int extents = 0; + + for (i = 0; i < count; i += cluster_size) + { + cluster_size = get_char_cluster_size(i, count, cluster_map, &first_glyph, &last_glyph); + cluster_extent = get_cluster_extent(glyph_dxs, first_glyph, last_glyph); + + if (extents + cluster_extent > max_ext) break; + if (nfit) *nfit += cluster_size; + + for (j = 0; j < cluster_size; ++j) + dxs[i + j] = extents + cluster_extent / cluster_size; + + extents += cluster_extent; + } + } + + HeapFree( GetProcessHeap(), 0, glyphs ); + HeapFree( GetProcessHeap(), 0, glyph_dxs ); + HeapFree( GetProcessHeap(), 0, cluster_map ); + } + else + ret = NtGdiGetTextExtentExW( hdc, str, count, max_ext, nfit, dxs, size, 0 ); + + return ret; } /***********************************************************************

1 0

Alexandre Julliard : msvcrt: Share a helper to find a catch block handler.
by Alexandre Julliard May 31, 2024

May 31, 2024

Module: wine Branch: master Commit: b4d6270a51aa654f1f7fd7de3a12f565ec5cc97a URL: https://gitlab.winehq.org/wine/wine/-/commit/b4d6270a51aa654f1f7fd7de3a12f5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 31 12:09:39 2024 +0200 msvcrt: Share a helper to find a catch block handler. --- dlls/msvcrt/cppexcept.h | 4 +++ dlls/msvcrt/except.c | 34 +++++++++++++++++++ dlls/msvcrt/except_i386.c | 81 ++++++++++++++++----------------------------- dlls/msvcrt/except_x86_64.c | 64 +++++++++++------------------------ 4 files changed, 85 insertions(+), 98 deletions(-)

1 0

Alexandre Julliard : msvcrt: Share the copy_exception() helper between platforms.
by Alexandre Julliard May 31, 2024

May 31, 2024

Module: wine Branch: master Commit: 8ed3d661e1d18e503b4916be65bbcf2f28e42872 URL: https://gitlab.winehq.org/wine/wine/-/commit/8ed3d661e1d18e503b4916be65bbcf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 31 12:08:59 2024 +0200 msvcrt: Share the copy_exception() helper between platforms. --- dlls/msvcrt/cppexcept.h | 31 +++++++++++++++++++++++++ dlls/msvcrt/except_i386.c | 33 ++------------------------ dlls/msvcrt/except_x86_64.c | 56 ++++++--------------------------------------- dlls/msvcrt/handler4.c | 54 ++++++------------------------------------- 4 files changed, 47 insertions(+), 127 deletions(-)

1 0

Connor McAdams : uiautomationcore: NULL initialize SAFEARRAY variable passed to IRawElementProviderFragment::GetRuntimeId().
by Alexandre Julliard May 31, 2024

May 31, 2024

Module: wine Branch: master Commit: 81057913cd6073bfbd9665d0d96f453c3dd5e995 URL: https://gitlab.winehq.org/wine/wine/-/commit/81057913cd6073bfbd9665d0d96f45… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Fri May 31 12:06:54 2024 -0400 uiautomationcore: NULL initialize SAFEARRAY variable passed to IRawElementProviderFragment::GetRuntimeId(). Fixes a crash in Battle.net setup where success is returned but the variable is not set. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/uia_client.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/uiautomationcore/uia_client.c b/dlls/uiautomationcore/uia_client.c index df9b2b283e0..8d1e3c8c7dc 100644 --- a/dlls/uiautomationcore/uia_client.c +++ b/dlls/uiautomationcore/uia_client.c @@ -1542,7 +1542,7 @@ static HRESULT uia_provider_get_special_prop_val(struct uia_provider *prov, case UIA_RuntimeIdPropertyId: { IRawElementProviderFragment *elfrag; - SAFEARRAY *sa; + SAFEARRAY *sa = NULL; LONG lbound; int val;

1 0

Jacek Caban : mshtml: Return success in IHTMLWindow2::get_closed stub.
by Alexandre Julliard May 31, 2024

May 31, 2024

Module: wine Branch: master Commit: 0fb56a84b75bcb1bb8000a0d6570f08195fee5ed URL: https://gitlab.winehq.org/wine/wine/-/commit/0fb56a84b75bcb1bb8000a0d6570f0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 29 22:40:43 2024 +0200 mshtml: Return success in IHTMLWindow2::get_closed stub. --- 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 5a4707153e5..59a0f6d023d 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -1321,8 +1321,11 @@ static HRESULT WINAPI HTMLWindow2_focus(IHTMLWindow2 *iface) static HRESULT WINAPI HTMLWindow2_get_closed(IHTMLWindow2 *iface, VARIANT_BOOL *p) { HTMLWindow *This = impl_from_IHTMLWindow2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p) semi-stub\n", This, p); + + *p = VARIANT_FALSE; + return S_OK; } static HRESULT WINAPI HTMLWindow2_blur(IHTMLWindow2 *iface)

1 0