September 2022 - Wine-commits

Georg Lehmann : winevulkan: Fixup 64bit enum aliases later to avoid using not yet defined values.
by Alexandre Julliard 01 Sep '22

01 Sep '22

Module: wine Branch: master Commit: 5ac5e2876ab7cef316dfcb1cf34da2dc88cec9de URL: https://gitlab.winehq.org/wine/wine/-/commit/5ac5e2876ab7cef316dfcb1cf34da2… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Thu Sep 1 14:28:24 2022 +0200 winevulkan: Fixup 64bit enum aliases later to avoid using not yet defined values. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> --- dlls/winevulkan/make_vulkan | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 2e89acd8efb..0b51ff95f12 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -435,13 +435,7 @@ class VkEnum(object): def create_alias(self, name, alias_name): """ Create an aliased value for this enum """ - # Older GCC versions need a literal to initialize a static const uint64_t - # which is what we use for 64bit bitmasks. - if self.bitwidth == 64: - alias = next(x for x in self.values if x.name == alias_name) - self.add(VkEnumValue(name, self.bitwidth, value=alias.value, hex=alias.hex, alias=alias_name)) - else: - self.add(VkEnumValue(name, self.bitwidth, alias=alias_name)) + self.add(VkEnumValue(name, self.bitwidth, alias=alias_name)) def create_value(self, name, value): """ Create a new value for this enum """ @@ -469,6 +463,19 @@ class VkEnum(object): if not any(x.name == value.name for x in self.values): self.values.append(value) + def fixup_64bit_aliases(self): + """ Replace 64bit aliases with literal values """ + # Older GCC versions need a literal to initialize a static const uint64_t + # which is what we use for 64bit bitmasks. + if self.bitwidth != 64: + return + for value in self.values: + if not value.is_alias(): + continue + alias = next(x for x in self.values if x.name == value.alias) + value.hex = alias.hex + value.value = alias.value + def definition(self): if self.is_alias(): return "" @@ -3310,6 +3317,9 @@ class VkRegistry(object): self._parse_features(root) self._parse_extensions(root) + for enum in self.enums.values(): + enum.fixup_64bit_aliases() + self._match_object_types() self.copyright = root.find('./comment').text

1 0

Georg Lehmann : winevulkan: Update to VK spec version 1.3.226.
by Alexandre Julliard 01 Sep '22

01 Sep '22

Module: wine Branch: master Commit: 74e6ec1eab9afb3672eab53b4637253ca0f1a429 URL: https://gitlab.winehq.org/wine/wine/-/commit/74e6ec1eab9afb3672eab53b463725… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Thu Sep 1 14:29:07 2022 +0200 winevulkan: Update to VK spec version 1.3.226. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> --- dlls/winevulkan/loader_thunks.c | 37 ++++++++++++ dlls/winevulkan/loader_thunks.h | 31 ++++++++++ dlls/winevulkan/make_vulkan | 2 +- dlls/winevulkan/vulkan_thunks.c | 72 +++++++++++++++++++++- dlls/winevulkan/vulkan_thunks.h | 6 ++ dlls/winevulkan/winevulkan.json | 2 +- include/wine/vulkan.h | 129 ++++++++++++++++++++++++++++++++++------ 7 files changed, 256 insertions(+), 23 deletions(-)

1 0

Gabriel Ivăncescu : mshtml: Implement props for Storage by forwarding to the underlying storage.
by Alexandre Julliard 01 Sep '22

01 Sep '22

Module: wine Branch: master Commit: e28cc104c1280b3d8f23bcc7522de57822ae5899 URL: https://gitlab.winehq.org/wine/wine/-/commit/e28cc104c1280b3d8f23bcc7522de5… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Sep 1 16:49:45 2022 +0300 mshtml: Implement props for Storage by forwarding to the underlying storage. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlstorage.c | 159 ++++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/mshtml_private.h | 5 ++ dlls/mshtml/tests/dom.js | 22 +++++- 3 files changed, 184 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlstorage.c b/dlls/mshtml/htmlstorage.c index f4413ba2a3a..716a306ee6b 100644 --- a/dlls/mshtml/htmlstorage.c +++ b/dlls/mshtml/htmlstorage.c @@ -39,6 +39,8 @@ typedef struct { DispatchEx dispex; IHTMLStorage IHTMLStorage_iface; LONG ref; + unsigned num_props; + BSTR *props; struct session_map_entry *session_storage; WCHAR *filename; HANDLE mutex; @@ -178,6 +180,16 @@ void destroy_session_storage(thread_data_t *thread_data) } } +static void release_props(HTMLStorage *This) +{ + BSTR *prop = This->props, *end = prop + This->num_props; + while(prop != end) { + SysFreeString(*prop); + prop++; + } + heap_free(This->props); +} + static inline HTMLStorage *impl_from_IHTMLStorage(IHTMLStorage *iface) { return CONTAINING_RECORD(iface, HTMLStorage, IHTMLStorage_iface); @@ -227,6 +239,7 @@ static ULONG WINAPI HTMLStorage_Release(IHTMLStorage *iface) release_dispex(&This->dispex); heap_free(This->filename); CloseHandle(This->mutex); + release_props(This); heap_free(This); } @@ -835,13 +848,157 @@ static const IHTMLStorageVtbl HTMLStorageVtbl = { HTMLStorage_clear }; +static inline HTMLStorage *impl_from_DispatchEx(DispatchEx *iface) +{ + return CONTAINING_RECORD(iface, HTMLStorage, dispex); +} + +static HRESULT check_item(HTMLStorage *This, const WCHAR *key) +{ + struct session_entry *session_entry; + IXMLDOMNode *root, *node; + IXMLDOMDocument *doc; + HRESULT hres; + BSTR query; + + if(!This->filename) { + hres = get_session_entry(This->session_storage, key, FALSE, &session_entry); + if(SUCCEEDED(hres)) + hres = (session_entry && session_entry->value) ? S_OK : S_FALSE; + return hres; + } + + WaitForSingleObject(This->mutex, INFINITE); + + hres = open_document(This->filename, &doc); + if(hres == S_OK) { + hres = get_root_node(doc, &root); + IXMLDOMDocument_Release(doc); + if(hres == S_OK) { + if(!(query = build_query(key))) + hres = E_OUTOFMEMORY; + else { + hres = IXMLDOMNode_selectSingleNode(root, query, &node); + SysFreeString(query); + if(hres == S_OK) + IXMLDOMNode_Release(node); + } + IXMLDOMNode_Release(root); + } + } + + ReleaseMutex(This->mutex); + + return hres; +} + +static HRESULT get_prop(HTMLStorage *This, const WCHAR *name, DISPID *dispid) +{ + UINT name_len = wcslen(name); + BSTR p, *prop, *end; + + for(prop = This->props, end = prop + This->num_props; prop != end; prop++) { + if(SysStringLen(*prop) == name_len && !memcmp(*prop, name, name_len * sizeof(WCHAR))) { + *dispid = MSHTML_DISPID_CUSTOM_MIN + (prop - This->props); + return S_OK; + } + } + + if(is_power_of_2(This->num_props)) { + BSTR *new_props = heap_realloc(This->props, max(This->num_props * 2 * sizeof(BSTR*), 1)); + if(!new_props) + return E_OUTOFMEMORY; + This->props = new_props; + } + + if(!(p = SysAllocStringLen(name, name_len))) + return E_OUTOFMEMORY; + + This->props[This->num_props] = p; + *dispid = MSHTML_DISPID_CUSTOM_MIN + This->num_props++; + return S_OK; +} + +static HRESULT HTMLStorage_get_dispid(DispatchEx *dispex, BSTR name, DWORD flags, DISPID *dispid) +{ + HTMLStorage *This = impl_from_DispatchEx(dispex); + HRESULT hres; + + if(flags & fdexNameCaseInsensitive) + FIXME("case insensitive not supported\n"); + + if(!(flags & fdexNameEnsure)) { + hres = check_item(This, name); + if(hres != S_OK) + return FAILED(hres) ? hres : DISP_E_UNKNOWNNAME; + } + + return get_prop(This, name, dispid); +} + +static HRESULT HTMLStorage_invoke(DispatchEx *dispex, DISPID id, LCID lcid, WORD flags, DISPPARAMS *params, + VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller) +{ + HTMLStorage *This = impl_from_DispatchEx(dispex); + DWORD idx = id - MSHTML_DISPID_CUSTOM_MIN; + HRESULT hres; + BSTR bstr; + + if(idx >= This->num_props) + return DISP_E_MEMBERNOTFOUND; + + switch(flags) { + case DISPATCH_PROPERTYGET: + hres = HTMLStorage_getItem(&This->IHTMLStorage_iface, This->props[idx], res); + if(FAILED(hres)) + return hres; + if(V_VT(res) == VT_NULL) + return DISP_E_MEMBERNOTFOUND; + break; + case DISPATCH_PROPERTYPUTREF: + case DISPATCH_PROPERTYPUT: + if(params->cArgs != 1 || (params->cNamedArgs && params->rgdispidNamedArgs[0] != DISPID_PROPERTYPUT)) { + FIXME("unimplemented args %u %u\n", params->cArgs, params->cNamedArgs); + return E_NOTIMPL; + } + + bstr = V_BSTR(params->rgvarg); + if(V_VT(params->rgvarg) != VT_BSTR) { + VARIANT var; + hres = change_type(&var, params->rgvarg, VT_BSTR, caller); + if(FAILED(hres)) + return hres; + bstr = V_BSTR(&var); + } + + hres = HTMLStorage_setItem(&This->IHTMLStorage_iface, This->props[idx], bstr); + + if(V_VT(params->rgvarg) != VT_BSTR) + SysFreeString(bstr); + return hres; + + default: + FIXME("unimplemented flags %x\n", flags); + return E_NOTIMPL; + } + + return S_OK; +} + +static const dispex_static_data_vtbl_t HTMLStorage_dispex_vtbl = { + NULL, + HTMLStorage_get_dispid, + HTMLStorage_invoke, + NULL +}; + static const tid_t HTMLStorage_iface_tids[] = { IHTMLStorage_tid, 0 }; static dispex_static_data_t HTMLStorage_dispex = { L"Storage", - NULL, + &HTMLStorage_dispex_vtbl, IHTMLStorage_tid, HTMLStorage_iface_tids }; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index cbaa3f15232..aee57456c3a 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1423,6 +1423,11 @@ static inline BOOL is_digit(WCHAR c) return '0' <= c && c <= '9'; } +static inline BOOL is_power_of_2(unsigned x) +{ + return !(x & (x - 1)); +} + #ifdef __i386__ extern void *call_thiscall_func; #endif diff --git a/dlls/mshtml/tests/dom.js b/dlls/mshtml/tests/dom.js index fcbca0f4b2f..e82424e5c55 100644 --- a/dlls/mshtml/tests/dom.js +++ b/dlls/mshtml/tests/dom.js @@ -473,7 +473,27 @@ sync_test("storage", function() { "typeof(window.localStorage) = " + typeof(window.localStorage)); var item = sessionStorage.getItem("nonexisting"); - ok(item === null, "item = " + item); + ok(item === null, "'nonexisting' item = " + item); + item = sessionStorage["nonexisting"]; + ok(item === undefined, "[nonexisting] item = " + item); + ok(!("nonexisting" in sessionStorage), "nonexisting in sessionStorage"); + + sessionStorage.setItem("foobar", 42); + ok("foobar" in sessionStorage, "foobar not in sessionStorage"); + item = sessionStorage.getItem("foobar"); + ok(item === "42", "'foobar' item = " + item); + item = sessionStorage["foobar"]; + ok(item === "42", "[foobar] item = " + item); + sessionStorage.removeItem("foobar"); + item = sessionStorage["foobar"]; + ok(item === undefined, "[foobar] item after removal = " + item); + + sessionStorage["barfoo"] = true; + ok("barfoo" in sessionStorage, "barfoo not in sessionStorage"); + item = sessionStorage["barfoo"]; + ok(item === "true", "[barfoo] item = " + item); + item = sessionStorage.getItem("barfoo"); + ok(item === "true", "'barfoo' item = " + item); }); async_test("animation", function() {

1 0

Gabriel Ivăncescu : mshtml: Implement deleting props for Storage.
by Alexandre Julliard 01 Sep '22

01 Sep '22

Module: wine Branch: master Commit: f8bb1d7e4a180cd343ad109ee315b4e2b4455e5a URL: https://gitlab.winehq.org/wine/wine/-/commit/f8bb1d7e4a180cd343ad109ee315b4… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Sep 1 16:49:46 2022 +0300 mshtml: Implement deleting props for Storage. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/dispex.c | 12 ++++++------ dlls/mshtml/htmldoc.c | 1 + dlls/mshtml/htmlelem.c | 1 + dlls/mshtml/htmlstorage.c | 15 +++++++++++++++ dlls/mshtml/htmlwindow.c | 1 + dlls/mshtml/mshtml_private.h | 4 +++- dlls/mshtml/tests/documentmode.js | 25 +++++++++++++++++++++++++ 7 files changed, 52 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 3f5d4bbce76..cd6a81f4659 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -1763,15 +1763,12 @@ static HRESULT WINAPI DispatchEx_DeleteMemberByName(IDispatchEx *iface, BSTR nam TRACE("(%p)->(%s %lx)\n", This, debugstr_w(name), grfdex); - if(dispex_compat_mode(This) < COMPAT_MODE_IE8) { - /* Not implemented by IE */ - 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); TRACE("property %s not found\n", debugstr_w(name)); - return dispex_compat_mode(This) < COMPAT_MODE_IE9 ? hres : S_OK; + return compat_mode < COMPAT_MODE_IE8 ? E_NOTIMPL : + compat_mode < COMPAT_MODE_IE9 ? hres : S_OK; } return IDispatchEx_DeleteMemberByDispID(&This->IDispatchEx_iface, id); @@ -1783,6 +1780,9 @@ static HRESULT WINAPI DispatchEx_DeleteMemberByDispID(IDispatchEx *iface, DISPID TRACE("(%p)->(%lx)\n", This, id); + if(is_custom_dispid(id) && This->info->desc->vtbl && This->info->desc->vtbl->delete) + return This->info->desc->vtbl->delete(This, id); + if(dispex_compat_mode(This) < COMPAT_MODE_IE8) { /* Not implemented by IE */ return E_NOTIMPL; diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index e7074952983..0c7a074ca35 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -5921,6 +5921,7 @@ static const event_target_vtbl_t HTMLDocumentNode_event_target_vtbl = { NULL, NULL, HTMLDocumentNode_invoke, + NULL, HTMLDocumentNode_get_compat_mode, NULL }, diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index d341623d4d5..165db9dedfc 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -7183,6 +7183,7 @@ static event_target_vtbl_t HTMLElement_event_target_vtbl = { HTMLElement_get_dispid, HTMLElement_invoke, NULL, + NULL, HTMLElement_populate_props }, HTMLElement_get_gecko_target, diff --git a/dlls/mshtml/htmlstorage.c b/dlls/mshtml/htmlstorage.c index 716a306ee6b..365a7bd34f3 100644 --- a/dlls/mshtml/htmlstorage.c +++ b/dlls/mshtml/htmlstorage.c @@ -985,10 +985,25 @@ static HRESULT HTMLStorage_invoke(DispatchEx *dispex, DISPID id, LCID lcid, WORD return S_OK; } +static HRESULT HTMLStorage_delete(DispatchEx *dispex, DISPID id) +{ + HTMLStorage *This = impl_from_DispatchEx(dispex); + DWORD idx = id - MSHTML_DISPID_CUSTOM_MIN; + + if(idx >= This->num_props) + return DISP_E_MEMBERNOTFOUND; + + if(dispex_compat_mode(dispex) < COMPAT_MODE_IE8) + return MSHTML_E_INVALID_ACTION; + + return HTMLStorage_removeItem(&This->IHTMLStorage_iface, This->props[idx]); +} + static const dispex_static_data_vtbl_t HTMLStorage_dispex_vtbl = { NULL, HTMLStorage_get_dispid, HTMLStorage_invoke, + HTMLStorage_delete, NULL }; diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index b9dcfa6e913..1a7ae479321 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -3954,6 +3954,7 @@ static const event_target_vtbl_t HTMLWindow_event_target_vtbl = { NULL, NULL, HTMLWindow_invoke, + NULL, HTMLWindow_get_compat_mode, NULL }, diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index aee57456c3a..97715c45b93 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -72,7 +72,8 @@ #define NSAPI WINAPI -#define MSHTML_E_NODOC 0x800a025c +#define MSHTML_E_INVALID_ACTION 0x800a01bd +#define MSHTML_E_NODOC 0x800a025c typedef struct HTMLDOMNode HTMLDOMNode; typedef struct ConnectionPoint ConnectionPoint; @@ -333,6 +334,7 @@ typedef struct { HRESULT (*value)(DispatchEx*,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,IServiceProvider*); HRESULT (*get_dispid)(DispatchEx*,BSTR,DWORD,DISPID*); HRESULT (*invoke)(DispatchEx*,DISPID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,IServiceProvider*); + HRESULT (*delete)(DispatchEx*,DISPID); compat_mode_t (*get_compat_mode)(DispatchEx*); HRESULT (*populate_props)(DispatchEx*); } dispex_static_data_vtbl_t; diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 5b746598dba..24adb08005c 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -1201,6 +1201,31 @@ sync_test("map_obj", function() { ok(r === 1, "r = " + r); }); +sync_test("storage", function() { + var v = document.documentMode, r; + + sessionStorage.setItem("foobar", "1234"); + ok("foobar" in sessionStorage, "foobar not in sessionStorage"); + r = sessionStorage.foobar; + ok(r === "1234", "sessionStorage.foobar = " + r); + sessionStorage.barfoo = 4321; + r = sessionStorage.getItem("barfoo"); + ok(r === "4321", "sessionStorage.barfoo = " + r); + + try { + delete sessionStorage.foobar; + ok(v >= 8, "expected exception deleting sessionStorage.foobar"); + ok(!("foobar" in sessionStorage), "foobar in sessionStorage after deletion"); + r = sessionStorage.getItem("foobar"); + ok(r === null, "sessionStorage.foobar after deletion = " + r); + }catch(e) { + ok(v < 8, "did not expect exception deleting sessionStorage.foobar"); + ok(e.number === 0xa01bd - 0x80000000, "deleting sessionStorage.foobar threw = " + e.number); + } + + sessionStorage.clear(); +}); + sync_test("elem_attr", function() { var v = document.documentMode; var elem = document.createElement("div"), r;

1 0

Gabriel Ivăncescu : mshtml: Do not enumerate hidden builtin props.
by Alexandre Julliard 01 Sep '22

01 Sep '22

Module: wine Branch: master Commit: 3ea5a3197e47378bfc2ac70aa69393121104f730 URL: https://gitlab.winehq.org/wine/wine/-/commit/3ea5a3197e47378bfc2ac70aa69393… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Sep 1 16:49:46 2022 +0300 mshtml: Do not enumerate hidden builtin props. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/dispex.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index cd6a81f4659..d14ab5a13d4 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -396,6 +396,9 @@ static void add_func_info(dispex_data_t *data, tid_t tid, const FUNCDESC *desc, }else if(desc->invkind & (DISPATCH_PROPERTYPUT|DISPATCH_PROPERTYGET)) { VARTYPE vt = VT_EMPTY; + if(desc->wFuncFlags & FUNCFLAG_FHIDDEN) + info->func_disp_idx = -2; + if(desc->invkind & DISPATCH_PROPERTYGET) { vt = desc->elemdescFunc.tdesc.vt; info->get_vtbl_off = desc->oVft/sizeof(void*); @@ -1371,7 +1374,7 @@ static HRESULT invoke_builtin_prop(DispatchEx *This, DISPID id, LCID lcid, WORD if(FAILED(hres)) return hres; - if(func->func_disp_idx != -1) + if(func->func_disp_idx >= 0) return function_invoke(This, func, flags, dp, res, ei, caller); if(func->hook) { @@ -1460,7 +1463,7 @@ HRESULT remove_attribute(DispatchEx *This, DISPID id, VARIANT_BOOL *success) return hres; /* For builtin functions, we set their value to the original function. */ - if(func->func_disp_idx != -1) { + if(func->func_disp_idx >= 0) { func_obj_entry_t *entry; if(!This->dynamic_data || !This->dynamic_data->func_disps @@ -1889,7 +1892,6 @@ static HRESULT WINAPI DispatchEx_GetNextDispID(IDispatchEx *iface, DWORD grfdex, } while(func < This->info->funcs + This->info->func_cnt) { - /* FIXME: Skip hidden properties */ if(func->func_disp_idx == -1) { *pid = func->id; return S_OK;

1 0

Gabriel Ivăncescu : mshtml: Implement GetMemberName for custom props.
by Alexandre Julliard 01 Sep '22

01 Sep '22

Module: wine Branch: master Commit: c3c55c7fb704dc6622d4d229237f240cce1b78cd URL: https://gitlab.winehq.org/wine/wine/-/commit/c3c55c7fb704dc6622d4d229237f24… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Sep 1 16:49:46 2022 +0300 mshtml: Implement GetMemberName for custom props. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/dispex.c | 6 ++++++ dlls/mshtml/htmlanchor.c | 1 + dlls/mshtml/htmlbody.c | 1 + dlls/mshtml/htmldoc.c | 13 ++++++++++++ dlls/mshtml/htmlelem.c | 49 ++++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/htmlelemcol.c | 15 ++++++++++++++ dlls/mshtml/htmlform.c | 26 +++++++++++++++++++++++ dlls/mshtml/htmlframe.c | 28 +++++++++++++++++++++++++ dlls/mshtml/htmlhead.c | 1 + dlls/mshtml/htmlimg.c | 1 + dlls/mshtml/htmlinput.c | 2 ++ dlls/mshtml/htmllink.c | 1 + dlls/mshtml/htmlnode.c | 16 +++++++++++++++ dlls/mshtml/htmlobject.c | 10 +++++++++ dlls/mshtml/htmlscript.c | 1 + dlls/mshtml/htmlselect.c | 15 ++++++++++++++ dlls/mshtml/htmlstorage.c | 12 +++++++++++ dlls/mshtml/htmlstyleelem.c | 1 + dlls/mshtml/htmlstylesheet.c | 32 +++++++++++++++++++++++++++++ dlls/mshtml/htmltable.c | 3 +++ dlls/mshtml/htmltextarea.c | 1 + dlls/mshtml/htmlwindow.c | 12 +++++++++++ dlls/mshtml/mshtml_private.h | 2 ++ 23 files changed, 249 insertions(+)

1 0

Gabriel Ivăncescu : mshtml: Implement props enumeration for Storage.
by Alexandre Julliard 01 Sep '22

01 Sep '22

Module: wine Branch: master Commit: d44a32ba72155136f6ad886d5ecc651c9cec6832 URL: https://gitlab.winehq.org/wine/wine/-/commit/d44a32ba72155136f6ad886d5ecc65… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Sep 1 16:49:46 2022 +0300 mshtml: Implement props enumeration for Storage. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/dispex.c | 34 +++++++++------ dlls/mshtml/htmldoc.c | 1 + dlls/mshtml/htmlelem.c | 1 + dlls/mshtml/htmlstorage.c | 88 +++++++++++++++++++++++++++++++++++++++ dlls/mshtml/htmlwindow.c | 1 + dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/tests/documentmode.js | 28 ++++++++++++- 7 files changed, 140 insertions(+), 14 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 357549698fc..5007f9a5d30 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -1888,21 +1888,29 @@ static HRESULT WINAPI DispatchEx_GetNextDispID(IDispatchEx *iface, DWORD grfdex, return next_dynamic_id(This, idx+1, pid); } - if(id == DISPID_STARTENUM) { - func = This->info->funcs; - }else { - hres = get_builtin_func(This->info, id, &func); - if(FAILED(hres)) - return hres; - func++; - } + if(!is_custom_dispid(id)) { + if(id == DISPID_STARTENUM) { + func = This->info->funcs; + }else { + hres = get_builtin_func(This->info, id, &func); + if(FAILED(hres)) + return hres; + func++; + } - while(func < This->info->funcs + This->info->func_cnt) { - if(func->func_disp_idx == -1) { - *pid = func->id; - return S_OK; + while(func < This->info->funcs + This->info->func_cnt) { + if(func->func_disp_idx == -1) { + *pid = func->id; + return S_OK; + } + func++; } - func++; + } + + if(This->info->desc->vtbl && This->info->desc->vtbl->next_dispid) { + hres = This->info->desc->vtbl->next_dispid(This, id, pid); + if(hres != S_FALSE) + return hres; } if(get_dynamic_data(This) && This->dynamic_data->prop_cnt) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 2537a316500..fe743e666c1 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -5935,6 +5935,7 @@ static const event_target_vtbl_t HTMLDocumentNode_event_target_vtbl = { HTMLDocumentNode_get_name, HTMLDocumentNode_invoke, NULL, + NULL, HTMLDocumentNode_get_compat_mode, NULL }, diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index d3704ccbb5c..856f55da6c7 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -7212,6 +7212,7 @@ static event_target_vtbl_t HTMLElement_event_target_vtbl = { HTMLElement_invoke, NULL, NULL, + NULL, HTMLElement_populate_props }, HTMLElement_get_gecko_target, diff --git a/dlls/mshtml/htmlstorage.c b/dlls/mshtml/htmlstorage.c index 12ad4443e93..5d56037ff04 100644 --- a/dlls/mshtml/htmlstorage.c +++ b/dlls/mshtml/htmlstorage.c @@ -1010,12 +1010,100 @@ static HRESULT HTMLStorage_delete(DispatchEx *dispex, DISPID id) return HTMLStorage_removeItem(&This->IHTMLStorage_iface, This->props[idx]); } +static HRESULT HTMLStorage_next_dispid(DispatchEx *dispex, DISPID id, DISPID *pid) +{ + DWORD idx = (id == DISPID_STARTENUM) ? 0 : id - MSHTML_DISPID_CUSTOM_MIN + 1; + HTMLStorage *This = impl_from_DispatchEx(dispex); + HRESULT hres; + DISPID tmp; + + if(idx > MSHTML_CUSTOM_DISPID_CNT) + return S_FALSE; + + while(idx < This->num_props) { + hres = check_item(This, This->props[idx]); + if(hres == S_OK) { + *pid = idx + MSHTML_DISPID_CUSTOM_MIN; + return S_OK; + } + if(FAILED(hres)) + return hres; + idx++; + } + + /* Populate possibly missing DISPIDs */ + if(!This->filename) { + struct session_entry *session_entry; + + LIST_FOR_EACH_ENTRY(session_entry, &This->session_storage->data_list, struct session_entry, list_entry) { + hres = get_prop(This, session_entry->key, &tmp); + if(FAILED(hres)) + return hres; + } + }else { + IXMLDOMNodeList *node_list; + IXMLDOMElement *elem; + IXMLDOMNode *node; + LONG index = 0; + HRESULT hres; + VARIANT key; + + hres = get_node_list(This->filename, &node_list); + if(FAILED(hres)) + return hres; + + for(;;) { + hres = IXMLDOMNodeList_get_item(node_list, index++, &node); + if(hres != S_OK) { + IXMLDOMNodeList_Release(node_list); + if(FAILED(hres)) + return hres; + break; + } + + hres = IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMElement, (void**)&elem); + IXMLDOMNode_Release(node); + if(hres != S_OK) + continue; + + hres = IXMLDOMElement_getAttribute(elem, (BSTR)L"name", &key); + IXMLDOMElement_Release(elem); + if(hres != S_OK) { + if(SUCCEEDED(hres)) + continue; + IXMLDOMNodeList_Release(node_list); + return hres; + } + + if(V_VT(&key) != VT_BSTR) { + FIXME("non-string key %s\n", debugstr_variant(&key)); + VariantClear(&key); + continue; + } + + hres = get_prop(This, V_BSTR(&key), &tmp); + SysFreeString(V_BSTR(&key)); + if(FAILED(hres)) { + IXMLDOMNodeList_Release(node_list); + return hres; + } + } + } + + if(idx >= This->num_props) + return S_FALSE; + + *pid = idx + MSHTML_DISPID_CUSTOM_MIN; + return S_OK; +} + static const dispex_static_data_vtbl_t HTMLStorage_dispex_vtbl = { NULL, HTMLStorage_get_dispid, HTMLStorage_get_name, HTMLStorage_invoke, HTMLStorage_delete, + HTMLStorage_next_dispid, NULL }; diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 6be61ba3f4f..00eef4d846a 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -3967,6 +3967,7 @@ static const event_target_vtbl_t HTMLWindow_event_target_vtbl = { HTMLWindow_get_name, HTMLWindow_invoke, NULL, + NULL, HTMLWindow_get_compat_mode, NULL }, diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 101dd63d9aa..85f34bb4a9f 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -336,6 +336,7 @@ typedef struct { HRESULT (*get_name)(DispatchEx*,DISPID,BSTR*); HRESULT (*invoke)(DispatchEx*,DISPID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,IServiceProvider*); HRESULT (*delete)(DispatchEx*,DISPID); + HRESULT (*next_dispid)(DispatchEx*,DISPID,DISPID*); compat_mode_t (*get_compat_mode)(DispatchEx*); HRESULT (*populate_props)(DispatchEx*); } dispex_static_data_vtbl_t; diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 24adb08005c..8cc1da534e6 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -1202,7 +1202,10 @@ sync_test("map_obj", function() { }); sync_test("storage", function() { - var v = document.documentMode, r; + var v = document.documentMode, i, r, list; + + sessionStorage["add-at-end"] = 0; + sessionStorage.removeItem("add-at-end"); sessionStorage.setItem("foobar", "1234"); ok("foobar" in sessionStorage, "foobar not in sessionStorage"); @@ -1211,6 +1214,29 @@ sync_test("storage", function() { sessionStorage.barfoo = 4321; r = sessionStorage.getItem("barfoo"); ok(r === "4321", "sessionStorage.barfoo = " + r); + sessionStorage.setItem("abcd", "blah"); + sessionStorage.dcba = "test"; + + // Order isn't consistent, but changes are reflected during the enumeration. + // Elements that were already traversed in DISPID (even if removed before + // the enumeration) are not enumerated, even if re-added during the enum. + i = 0; list = [ "foobar", "barfoo", "abcd", "dcba" ]; + for(r in sessionStorage) { + for(var j = 0; j < list.length; j++) + if(r === list[j]) + break; + ok(j < list.length, "got '" + r + "' enumerating"); + list.splice(j, 1); + if(i === 1) { + sessionStorage.removeItem(list[0]); + sessionStorage.setItem("new", "new"); + list.splice(0, 1, "new"); + } + if(!list.length) + sessionStorage.setItem("add-at-end", "0"); + i++; + } + ok(i === 4, "enum did " + i + " iterations"); try { delete sessionStorage.foobar;

1 0

Nikolay Sivov : wbemdisp: Use wcsdup() instead of internal helper.
by Alexandre Julliard 01 Sep '22

01 Sep '22

Module: wine Branch: master Commit: f9739a59636eda49cf97f1220fa7542b41415710 URL: https://gitlab.winehq.org/wine/wine/-/commit/f9739a59636eda49cf97f1220fa754… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 1 13:02:26 2022 +0300 wbemdisp: Use wcsdup() instead of internal helper. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/wbemdisp/locator.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/dlls/wbemdisp/locator.c b/dlls/wbemdisp/locator.c index 6966e7f356d..6880a503e1d 100644 --- a/dlls/wbemdisp/locator.c +++ b/dlls/wbemdisp/locator.c @@ -50,14 +50,6 @@ static IWbemContext * unsafe_get_context_from_namedvalueset( IDispatch *disp ) return valueset ? valueset->context : NULL; } -static WCHAR *heap_strdupW( const WCHAR *src ) -{ - WCHAR *dst; - if (!src) return NULL; - if ((dst = malloc( (lstrlenW( src ) + 1) * sizeof(WCHAR) ))) lstrcpyW( dst, src ); - return dst; -} - struct services; static HRESULT EnumVARIANT_create( struct services *, IEnumWbemClassObject *, IEnumVARIANT ** ); @@ -784,7 +776,7 @@ static HRESULT SWbemMethod_create( struct methodset *set, const WCHAR *name, ISW method->refs = 1; method->set = set; ISWbemMethodSet_AddRef( &method->set->ISWbemMethodSet_iface ); - if (!(method->name = heap_strdupW( name ))) + if (!(method->name = wcsdup( name ))) { ISWbemMethod_Release( &method->ISWbemMethod_iface ); return E_OUTOFMEMORY;

1 0

Zhiyi Zhang : win32u: Only cache font glyph metrics from GGO_METRICS.
by Alexandre Julliard 01 Sep '22

01 Sep '22

Module: wine Branch: master Commit: bca9df8db26206ddd9c615d274d8ff0c5652e17a URL: https://gitlab.winehq.org/wine/wine/-/commit/bca9df8db26206ddd9c615d274d8ff… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Aug 15 23:13:54 2022 +0800 win32u: Only cache font glyph metrics from GGO_METRICS. Fonts loaded with GGO_BITMAP may report different font metrics than that with GGO_METRICS. If the font metrics from GGO_BITMAP are used and later getting font metrics with GGO_METRICS or vice versa, the font metric difference may cause UI glitchs. Fix Steam installer next button text moving to the left for 1 pixel when hovered on Mac and Wine is built with FreeType > 2.8.0. --- dlls/win32u/font.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/win32u/font.c b/dlls/win32u/font.c index e281db9b0c8..7fc4a01eb64 100644 --- a/dlls/win32u/font.c +++ b/dlls/win32u/font.c @@ -3393,7 +3393,7 @@ static DWORD get_glyph_outline( struct gdi_font *font, UINT glyph, UINT format, ret = font_funcs->get_glyph_outline( font, index, format, &gm, &abc, buflen, buf, mat, tategaki ); if (ret == GDI_ERROR) return ret; - if ((format == GGO_METRICS || format == GGO_BITMAP || format == WINE_GGO_GRAY16_BITMAP) && !mat) + if (format == GGO_METRICS && !mat) set_gdi_font_glyph_metrics( font, index, &gm, &abc ); done:

1 0

Nikolay Sivov : msvcrt: Use size_t for the size in wcsdup().
by Alexandre Julliard 01 Sep '22

01 Sep '22

Module: wine Branch: master Commit: ee7794073b31fccf8f69f6f813781b406fcbdf1e URL: https://gitlab.winehq.org/wine/wine/-/commit/ee7794073b31fccf8f69f6f813781b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 1 13:11:57 2022 +0300 msvcrt: Use size_t for the size in wcsdup(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/msvcrt/wcs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index a438449342e..6942ecf3534 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -79,7 +79,7 @@ wchar_t* CDECL _wcsdup( const wchar_t* str ) wchar_t* ret = NULL; if (str) { - int size = (wcslen(str) + 1) * sizeof(wchar_t); + size_t size = (wcslen(str) + 1) * sizeof(wchar_t); ret = malloc( size ); if (ret) memcpy( ret, str, size ); }

1 0