May 2024 - Wine-commits - list.winehq.org

Jacek Caban : mshtml: Factor out alloc_dynamic_prop.
by Alexandre Julliard 31 May '24

31 May '24

Module: wine Branch: master Commit: 16271ac208ea82cde1777a72d412fad407906309 URL: https://gitlab.winehq.org/wine/wine/-/commit/16271ac208ea82cde1777a72d412fa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 29 23:33:24 2024 +0200 mshtml: Factor out alloc_dynamic_prop. --- dlls/mshtml/dispex.c | 70 ++++++++++++++++++++++++++++++++-------------------- 1 file changed, 43 insertions(+), 27 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 07c26e2e762..3c5f00e35b7 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -646,33 +646,16 @@ static inline dispex_dynamic_data_t *get_dynamic_data(DispatchEx *This) return This->dynamic_data; } -static HRESULT get_dynamic_prop(DispatchEx *This, const WCHAR *name, DWORD flags, dynamic_prop_t **ret) +static HRESULT alloc_dynamic_prop(DispatchEx *This, const WCHAR *name, dynamic_prop_t *prop, dynamic_prop_t **ret) { - const BOOL alloc = flags & fdexNameEnsure; - dispex_dynamic_data_t *data; - dynamic_prop_t *prop; - - data = get_dynamic_data(This); - if(!data) - return E_OUTOFMEMORY; + dispex_dynamic_data_t *data = This->dynamic_data; - for(prop = data->props; prop < data->props+data->prop_cnt; prop++) { - if(flags & fdexNameCaseInsensitive ? !wcsicmp(prop->name, name) : !wcscmp(prop->name, name)) { - if(prop->flags & DYNPROP_DELETED) { - if(!alloc) - return DISP_E_UNKNOWNNAME; - prop->flags &= ~DYNPROP_DELETED; - } - *ret = prop; - return S_OK; - } + if(prop) { + prop->flags &= ~DYNPROP_DELETED; + *ret = prop; + return S_OK; } - if(!alloc) - return DISP_E_UNKNOWNNAME; - - TRACE("creating dynamic prop %s\n", debugstr_w(name)); - if(!data->buf_size) { data->props = malloc(sizeof(dynamic_prop_t) * 4); if(!data->props) @@ -702,6 +685,35 @@ static HRESULT get_dynamic_prop(DispatchEx *This, const WCHAR *name, DWORD flags return S_OK; } +static HRESULT get_dynamic_prop(DispatchEx *This, const WCHAR *name, DWORD flags, dynamic_prop_t **ret) +{ + const BOOL alloc = flags & fdexNameEnsure; + dispex_dynamic_data_t *data; + dynamic_prop_t *prop; + + data = get_dynamic_data(This); + if(!data) + return E_OUTOFMEMORY; + + for(prop = data->props; prop < data->props+data->prop_cnt; prop++) { + if(flags & fdexNameCaseInsensitive ? !wcsicmp(prop->name, name) : !wcscmp(prop->name, name)) { + *ret = prop; + if(prop->flags & DYNPROP_DELETED) { + if(!alloc) + return DISP_E_UNKNOWNNAME; + prop->flags &= ~DYNPROP_DELETED; + } + return S_OK; + } + } + + if(!alloc) + return DISP_E_UNKNOWNNAME; + + TRACE("creating dynamic prop %s\n", debugstr_w(name)); + return alloc_dynamic_prop(This, name, NULL, ret); +} + HRESULT dispex_get_dprop_ref(DispatchEx *This, const WCHAR *name, BOOL alloc, VARIANT **ret) { dynamic_prop_t *prop; @@ -1662,7 +1674,7 @@ static HRESULT WINAPI DispatchEx_Invoke(IDispatchEx *iface, DISPID dispIdMember, static HRESULT WINAPI DispatchEx_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD grfdex, DISPID *pid) { DispatchEx *This = impl_from_IDispatchEx(iface); - dynamic_prop_t *dprop; + dynamic_prop_t *dprop = NULL; HRESULT hres; TRACE("%s (%p)->(%s %lx %p)\n", This->info->desc->name, This, debugstr_w(bstrName), grfdex, pid); @@ -1677,9 +1689,13 @@ static HRESULT WINAPI DispatchEx_GetDispID(IDispatchEx *iface, BSTR bstrName, DW if(hres != DISP_E_UNKNOWNNAME) return hres; - hres = get_dynamic_prop(This, bstrName, grfdex, &dprop); - if(FAILED(hres)) - return hres; + hres = get_dynamic_prop(This, bstrName, grfdex & ~fdexNameEnsure, &dprop); + if(FAILED(hres)) { + if(grfdex & fdexNameEnsure) + hres = alloc_dynamic_prop(This, bstrName, dprop, &dprop); + if(FAILED(hres)) + return hres; + } *pid = DISPID_DYNPROP_0 + (dprop - This->dynamic_data->props); return S_OK;

1 0

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

31 May '24

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 31 May '24

31 May '24

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: Use macro for window object IDispatch functions implementation.
by Alexandre Julliard 31 May '24

31 May '24

Module: wine Branch: master Commit: ec9ecc51eba7591586c11c74b4bc1a0cfba18dc9 URL: https://gitlab.winehq.org/wine/wine/-/commit/ec9ecc51eba7591586c11c74b4bc1a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 30 02:19:39 2024 +0200 mshtml: Use macro for window object IDispatch functions implementation. --- dlls/mshtml/htmlwindow.c | 392 +++---------------------------------------- dlls/mshtml/mshtml_private.h | 29 ++-- 2 files changed, 36 insertions(+), 385 deletions(-)

1 0

Jacek Caban : mshtml: Move IDispatchEx forwarding implementation to outer window object.
by Alexandre Julliard 31 May '24

31 May '24

Module: wine Branch: master Commit: 5ef4bb1d48e7313466135946ec8399bcd4fec995 URL: https://gitlab.winehq.org/wine/wine/-/commit/5ef4bb1d48e7313466135946ec8399… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 30 02:33:18 2024 +0200 mshtml: Move IDispatchEx forwarding implementation to outer window object. --- dlls/mshtml/htmldoc.c | 2 +- dlls/mshtml/htmlframe.c | 4 +-- dlls/mshtml/htmlwindow.c | 80 +++++++++++++++++++++----------------------- dlls/mshtml/mshtml_private.h | 2 +- 4 files changed, 42 insertions(+), 46 deletions(-)

1 0

Eric Pouech : winedump: Dump correct handle information for minidump.
by Alexandre Julliard 31 May '24

31 May '24

Module: wine Branch: master Commit: 0327b00d10f966da0a659cc57380d326a9ff576c URL: https://gitlab.winehq.org/wine/wine/-/commit/0327b00d10f966da0a659cc57380d3… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Sun Apr 14 09:44:15 2024 +0200 winedump: Dump correct handle information for minidump. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- include/minidumpapiset.h | 7 +++++++ tools/winedump/minidump.c | 20 +++++++++++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/include/minidumpapiset.h b/include/minidumpapiset.h index 2d13c6f6a67..c3cd43310ae 100644 --- a/include/minidumpapiset.h +++ b/include/minidumpapiset.h @@ -392,6 +392,13 @@ typedef struct _MINIDUMP_HANDLE_DESCRIPTOR ULONG32 PointerCount; } MINIDUMP_HANDLE_DESCRIPTOR, *PMINIDUMP_HANDLE_DESCRIPTOR; +typedef struct _MINIDUMP_HANDLE_OBJECT_INFORMATION +{ + RVA NextInfoRva; + ULONG32 InfoType; + ULONG32 SizeOfInfo; +} MINIDUMP_HANDLE_OBJECT_INFORMATION; + typedef struct _MINIDUMP_HANDLE_DESCRIPTOR_2 { ULONG64 Handle; diff --git a/tools/winedump/minidump.c b/tools/winedump/minidump.c index 80900e3eb33..0a5ee15412b 100644 --- a/tools/winedump/minidump.c +++ b/tools/winedump/minidump.c @@ -499,8 +499,26 @@ void mdmp_dump(void) if (mhd->SizeOfDescriptor >= sizeof(MINIDUMP_HANDLE_DESCRIPTOR_2)) { - printf(" ObjectInfo: %s\n", get_mdmp_str(hd->ObjectInfoRva)); + MINIDUMP_HANDLE_OBJECT_INFORMATION *obj_info; + unsigned link_count = 0; + + printf(" ObjectInfo: %#x\n", (UINT)hd->ObjectInfoRva); printf(" Reserved0: %#x\n", hd->Reserved0); + + if (hd->ObjectInfoRva) + { + for (obj_info = (void*)PRD(hd->ObjectInfoRva, sizeof(*obj_info)); + obj_info; + obj_info = obj_info->NextInfoRva ? (void*)PRD(obj_info->NextInfoRva, sizeof(*obj_info)) : NULL) + { + printf(" Information[%u]\n", link_count++); + printf(" NextInfoRva: %#x\n", (UINT)obj_info->NextInfoRva); + printf(" InfoType: %u\n", obj_info->InfoType); + printf(" SizeOfInfo: %u\n", obj_info->SizeOfInfo); + if (globals_dump_sect("content")) + dump_data((const BYTE*)(obj_info + 1), obj_info->SizeOfInfo, " "); + } + } } ptr += mhd->SizeOfDescriptor;

1 0

Eric Pouech : winedump: Don't dump twice.
by Alexandre Julliard 31 May '24

31 May '24

Module: wine Branch: master Commit: ec61ad8b154b9d9970cdfb428dafb3e0cb6c192c URL: https://gitlab.winehq.org/wine/wine/-/commit/ec61ad8b154b9d9970cdfb428dafb3… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Tue Apr 16 09:23:08 2024 +0200 winedump: Don't dump twice. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- tools/winedump/minidump.c | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/winedump/minidump.c b/tools/winedump/minidump.c index 0a5ee15412b..df7885bc86b 100644 --- a/tools/winedump/minidump.c +++ b/tools/winedump/minidump.c @@ -226,7 +226,6 @@ void mdmp_dump(void) for (i = 0; i < mml->NumberOfMemoryRanges; i++, mmd++) { printf(" Memory Range #%d:\n", i); - dump_mdmp_data(&mmd->Memory, " "); printf(" Range: %s +%#x\n", get_hexint64_str(mmd->StartOfMemoryRange), mmd->Memory.DataSize); if (globals_dump_sect("content")) dump_mdmp_data(&mmd->Memory, " ");

1 0

Eric Pouech : winedump: Dump Memory64List streams in minidumps.
by Alexandre Julliard 31 May '24

31 May '24

Module: wine Branch: master Commit: 95e6302e82eefab31355a6d2f2febf6ecdde9e96 URL: https://gitlab.winehq.org/wine/wine/-/commit/95e6302e82eefab31355a6d2f2febf… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Fri May 10 16:18:04 2024 +0200 winedump: Dump Memory64List streams in minidumps. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- tools/winedump/minidump.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/tools/winedump/minidump.c b/tools/winedump/minidump.c index df7885bc86b..80057a21829 100644 --- a/tools/winedump/minidump.c +++ b/tools/winedump/minidump.c @@ -232,6 +232,25 @@ void mdmp_dump(void) } } break; + case Memory64ListStream: + if (globals_dump_sect("memory")) + { + const MINIDUMP_MEMORY64_LIST *mml = stream; + const MINIDUMP_MEMORY_DESCRIPTOR64 *mmd = mml->MemoryRanges; + ULONG64 i64, base_rva; + printf("Stream [%u]: Memory64 Ranges:\n", idx); + printf(" NumberOfMemoryRanges: %s\n", get_uint64_str(mml->NumberOfMemoryRanges)); + base_rva = mml->BaseRva; + for (i64 = 0; i64 < mml->NumberOfMemoryRanges; i64++, mmd++) + { + printf(" Memory Range #%s:\n", get_uint64_str(i64)); + printf(" Range: %s +%s\n", get_hexint64_str(mmd->StartOfMemoryRange), get_hexint64_str(mmd->DataSize)); + if (globals_dump_sect("content")) + dump_data(PRD(base_rva, mmd->DataSize), mmd->DataSize, " "); + base_rva += mmd->DataSize; + } + } + break; case SystemInfoStream: if (globals_dump_sect("info")) {

1 0

Alexandros Frantzis : user32/tests: Add more test for unicode input with vkey.
by Alexandre Julliard 31 May '24

31 May '24

Module: wine Branch: master Commit: e38286759955492df033fe3096cb33816af8906d URL: https://gitlab.winehq.org/wine/wine/-/commit/e38286759955492df033fe3096cb33… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Thu May 30 18:38:30 2024 +0300 user32/tests: Add more test for unicode input with vkey. --- dlls/user32/tests/input.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index c123f8fa439..f21b9e24555 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1169,6 +1169,25 @@ static void test_SendInput_keyboard_messages( WORD vkey, WORD scan, WCHAR wch, W {0}, }; + struct send_input_keyboard_test unicode_vkey_ctrl[] = + { + {.scan = 0x3c0, .vkey = VK_CONTROL, .flags = KEYEVENTF_UNICODE, + .expect_state = {[VK_CONTROL] = 0x80, [VK_LCONTROL] = 0x80}, .todo_state = {[VK_LCONTROL] = TRUE}, + .expect = {KEY_HOOK(WM_KEYDOWN, 0xc0, VK_LCONTROL, .todo_value = TRUE), KEY_MSG(WM_KEYDOWN, 0xc0, VK_CONTROL), {0}}}, + {.scan = 0x3c0, .vkey = VK_CONTROL, .flags = KEYEVENTF_UNICODE | KEYEVENTF_KEYUP, + .expect = {KEY_HOOK(WM_KEYUP, 0xc0, VK_LCONTROL, .todo_value = TRUE), KEY_MSG(WM_KEYUP, 0xc0, VK_CONTROL), {0}}}, + {0}, + }; + + struct send_input_keyboard_test unicode_vkey_packet[] = + { + {.scan = 0x3c0, .vkey = VK_PACKET, .flags = KEYEVENTF_UNICODE, .expect_state = {[VK_PACKET] = 0x80}, + .expect = {KEY_HOOK(WM_KEYDOWN, 0xc0, VK_PACKET), KEY_MSG(WM_KEYDOWN, 0, VK_PACKET, .todo_value = TRUE), WIN_MSG(WM_CHAR, 0xc0, 1), {0}}}, + {.scan = 0x3c0, .vkey = VK_PACKET, .flags = KEYEVENTF_UNICODE | KEYEVENTF_KEYUP, + .expect = {KEY_HOOK(WM_KEYUP, 0xc0, VK_PACKET), KEY_MSG(WM_KEYUP, 0, VK_PACKET, .todo_value = TRUE), {0}}}, + {0}, + }; + struct send_input_keyboard_test numpad_scan[] = { {.scan = 0x4b, .flags = KEYEVENTF_SCANCODE, .expect_state = {[VK_LEFT] = 0x80}, @@ -1288,6 +1307,8 @@ static void test_SendInput_keyboard_messages( WORD vkey, WORD scan, WCHAR wch, W check_send_input_keyboard_test( unicode, TRUE ); check_send_input_keyboard_test( lmenu_unicode_peeked, TRUE ); check_send_input_keyboard_test( unicode_vkey, TRUE ); + check_send_input_keyboard_test( unicode_vkey_ctrl, TRUE ); + check_send_input_keyboard_test( unicode_vkey_packet, TRUE ); check_send_input_keyboard_test( numpad_scan, TRUE ); check_send_input_keyboard_test( numpad_scan_numlock, TRUE ); winetest_pop_context(); @@ -1333,6 +1354,8 @@ static void test_SendInput_keyboard_messages( WORD vkey, WORD scan, WCHAR wch, W check_send_input_keyboard_test( unicode, FALSE ); check_send_input_keyboard_test( lmenu_unicode, FALSE ); check_send_input_keyboard_test( unicode_vkey, FALSE ); + check_send_input_keyboard_test( unicode_vkey_ctrl, FALSE ); + check_send_input_keyboard_test( unicode_vkey_packet, FALSE ); check_send_input_keyboard_test( numpad_scan, FALSE ); check_send_input_keyboard_test( numpad_scan_numlock, FALSE ); winetest_pop_context();

1 0

Alexandros Frantzis : user32/tests: Add tests for raw keyboard messages.
by Alexandre Julliard 31 May '24

31 May '24

Module: wine Branch: master Commit: 2e0facb19c902365a2ab96d7b8695bd1b97a1d2c URL: https://gitlab.winehq.org/wine/wine/-/commit/2e0facb19c902365a2ab96d7b8695b… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Wed May 29 16:20:02 2024 +0300 user32/tests: Add tests for raw keyboard messages. --- dlls/user32/tests/input.c | 161 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 160 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index f21b9e24555..382e15b9ed2 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -111,6 +111,7 @@ enum user_function MSG_TEST_WIN = 1, LL_HOOK_KEYBD, LL_HOOK_MOUSE, + RAW_INPUT_KEYBOARD, }; struct user_call @@ -143,6 +144,12 @@ struct user_call UINT time; UINT_PTR extra; } ll_hook_ms; + struct + { + HWND hwnd; + BYTE code; + RAWKEYBOARD kbd; + } raw_input; }; BOOL todo; @@ -225,6 +232,15 @@ static int ok_call_( const char *file, int line, const struct user_call *expecte if (0 && (ret = expected->ll_hook_ms.time - received->ll_hook_ms.time)) goto done; if ((ret = (expected->ll_hook_ms.extra - received->ll_hook_ms.extra))) goto done; break; + case RAW_INPUT_KEYBOARD: + if ((ret = expected->raw_input.hwnd - received->raw_input.hwnd)) goto done; + if ((ret = expected->raw_input.code - received->raw_input.code)) goto done; + if ((ret = expected->raw_input.kbd.MakeCode - received->raw_input.kbd.MakeCode)) goto done; + if ((ret = expected->raw_input.kbd.Flags - received->raw_input.kbd.Flags)) goto done; + if ((ret = expected->raw_input.kbd.VKey - received->raw_input.kbd.VKey)) goto done; + if ((ret = expected->raw_input.kbd.Message - received->raw_input.kbd.Message)) goto done; + if ((ret = expected->raw_input.kbd.ExtraInformation - received->raw_input.kbd.ExtraInformation)) goto done; + break; } done: @@ -249,6 +265,13 @@ done: wine_dbgstr_point(&received->ll_hook_ms.point), received->ll_hook_ms.data, received->ll_hook_ms.flags, received->ll_hook_ms.time, received->ll_hook_ms.extra ); return ret; + case RAW_INPUT_KEYBOARD: + todo_wine_if( expected->todo || expected->todo_value ) + ok_(file, line)( !ret, "got WM_INPUT key hwnd %p, code %d, make_code %#x, flags %#x, vkey %s, message %s, extra %#lx\n", + received->raw_input.hwnd, received->raw_input.code, received->raw_input.kbd.MakeCode, + received->raw_input.kbd.Flags, debugstr_vk(received->raw_input.kbd.VKey), + debugstr_wm(received->raw_input.kbd.Message), received->raw_input.kbd.ExtraInformation ); + return ret; } switch (expected->func) @@ -270,6 +293,13 @@ done: wine_dbgstr_point(&received->ll_hook_ms.point), received->ll_hook_ms.data, received->ll_hook_ms.flags, received->ll_hook_ms.time, received->ll_hook_ms.extra ); return ret; + case RAW_INPUT_KEYBOARD: + todo_wine_if( expected->todo || expected->todo_value ) + ok_(file, line)( !ret, "got WM_INPUT key hwnd %p, code %d, make_code %#x, flags %#x, vkey %s, message %s, extra %#lx\n", + expected->raw_input.hwnd, expected->raw_input.code, expected->raw_input.kbd.MakeCode, + expected->raw_input.kbd.Flags, debugstr_vk(expected->raw_input.kbd.VKey), + debugstr_wm(expected->raw_input.kbd.Message), expected->raw_input.kbd.ExtraInformation ); + return ret; } return 0; @@ -342,9 +372,32 @@ static void append_ll_hook_ms( UINT msg, const MSLLHOOKSTRUCT *info ) } } +static void append_rawinput_message( HWND hwnd, WPARAM wparam, HRAWINPUT handle ) +{ + RAWINPUT rawinput; + UINT size = sizeof(rawinput), ret; + + ret = GetRawInputData( handle, RID_INPUT, &rawinput, &size, sizeof(RAWINPUTHEADER) ); + ok_ne( ret, (UINT)-1, UINT, "%u" ); + + if (rawinput.header.dwType == RIM_TYPEKEYBOARD) + { + struct user_call call = + { + .func = RAW_INPUT_KEYBOARD, + .raw_input = {.hwnd = hwnd, .code = GET_RAWINPUT_CODE_WPARAM(wparam), .kbd = rawinput.data.keyboard} + }; + ULONG index = InterlockedIncrement( &current_sequence_len ) - 1; + ok( index < ARRAY_SIZE(current_sequence), "got %lu calls\n", index ); + if (!append_message_hwnd) call.message.hwnd = 0; + current_sequence[index] = call; + } +} + static void append_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) { - if (!p_accept_message || p_accept_message( msg )) + if (msg == WM_INPUT) append_rawinput_message( hwnd, wparam, (HRAWINPUT)lparam ); + else if (!p_accept_message || p_accept_message( msg )) { struct user_call call = {.func = MSG_TEST_WIN, .message = {.hwnd = hwnd, .msg = msg, .wparam = wparam, .lparam = lparam}}; ULONG index = InterlockedIncrement( &current_sequence_len ) - 1; @@ -1381,6 +1434,111 @@ static void test_keynames(void) } } +static BOOL accept_keyboard_messages_raw( UINT msg ) +{ + return is_keyboard_message( msg ) || msg == WM_INPUT; +} + +static void test_SendInput_raw_key_messages( WORD vkey, WORD wch, HKL hkl ) +{ +#define WIN_MSG(m, w, l, ...) {.func = MSG_TEST_WIN, .message = {.msg = m, .wparam = w, .lparam = l}, ## __VA_ARGS__} +#define RAW_KEY(s, f, v, m, ...) {.func = RAW_INPUT_KEYBOARD, .raw_input.kbd = {.MakeCode = s, .Flags = f, .VKey = v, .Message = m}, ## __VA_ARGS__} +#define KEY_MSG(m, s, v, ...) WIN_MSG( m, v, MAKELONG(1, (s) | (m == WM_KEYUP || m == WM_SYSKEYUP ? (KF_UP | KF_REPEAT) : 0)), ## __VA_ARGS__ ) + struct send_input_keyboard_test raw_legacy[] = + { + {.vkey = vkey, + .expect = {RAW_KEY(1, RI_KEY_MAKE, vkey, WM_KEYDOWN), KEY_MSG(WM_KEYDOWN, 1, vkey), WIN_MSG(WM_CHAR, wch, MAKELONG(1, 1)), {0}}}, + {.vkey = vkey, .flags = KEYEVENTF_KEYUP, + .expect = {RAW_KEY(2, RI_KEY_BREAK, vkey, WM_KEYUP), KEY_MSG(WM_KEYUP, 2, vkey), {0}}}, + {0}, + }; + struct send_input_keyboard_test raw_nolegacy[] = + { + {.vkey = vkey, .expect = {RAW_KEY(1, RI_KEY_MAKE, vkey, WM_KEYDOWN), {0}}}, + {.vkey = vkey, .flags = KEYEVENTF_KEYUP, .expect = {RAW_KEY(2, RI_KEY_BREAK, vkey, WM_KEYUP), {0}}}, + {0}, + }; + struct send_input_keyboard_test raw_vk_packet_legacy[] = + { + {.vkey = VK_PACKET, .expect_state = {[VK_PACKET] = 0x80}, + .expect = {RAW_KEY(1, RI_KEY_MAKE, VK_PACKET, WM_KEYDOWN), KEY_MSG(WM_KEYDOWN, 1, VK_PACKET), {0, .todo = TRUE}}}, + {.vkey = VK_PACKET, .flags = KEYEVENTF_KEYUP, + .expect = {RAW_KEY(2, RI_KEY_BREAK, VK_PACKET, WM_KEYUP), KEY_MSG(WM_KEYUP, 2, VK_PACKET), {0}}}, + {0}, + }; + struct send_input_keyboard_test raw_vk_packet_nolegacy[] = + { + {.vkey = VK_PACKET, .expect = {RAW_KEY(1, RI_KEY_MAKE, VK_PACKET, WM_KEYDOWN), {0}}}, + {.vkey = VK_PACKET, .flags = KEYEVENTF_KEYUP, .expect = {RAW_KEY(2, RI_KEY_BREAK, VK_PACKET, WM_KEYUP), {0}}}, + {0}, + }; +#undef WIN_MSG +#undef RAW_KEY +#undef KEY_MSG + RAWINPUTDEVICE rid = {.usUsagePage = HID_USAGE_PAGE_GENERIC, .usUsage = HID_USAGE_GENERIC_KEYBOARD}; + int receive; + HWND hwnd; + + raw_legacy[0].expect_state[vkey] = 0x80; + + hwnd = CreateWindowW( L"static", NULL, WS_POPUP | WS_VISIBLE, 0, 0, 100, 100, NULL, NULL, NULL, NULL ); + ok_ne( NULL, hwnd, HWND, "%p" ); + wait_messages( 100, FALSE ); + + /* If we have had a spurious layout change, wch may be incorrect. */ + if (GetKeyboardLayout( 0 ) != hkl) + { + win_skip( "Spurious keyboard layout changed detected (expected: %p got: %p)\n", + hkl, GetKeyboardLayout( 0 ) ); + ok_ret( 1, DestroyWindow( hwnd ) ); + wait_messages( 100, FALSE ); + ok_seq( empty_sequence ); + return; + } + + p_accept_message = accept_keyboard_messages_raw; + + for (receive = 0; receive <= 1; receive++) + { + winetest_push_context( receive ? "receive" : "peek" ); + + if (receive) + { + /* test received messages */ + LONG_PTR old_proc = SetWindowLongPtrW( hwnd, GWLP_WNDPROC, (LONG_PTR)append_message_wndproc ); + ok_ne( 0, old_proc, LONG_PTR, "%#Ix" ); + } + + rid.dwFlags = 0; + ok_ret( 1, RegisterRawInputDevices( &rid, 1, sizeof(rid) ) ); + + /* get both WM_INPUT and legacy messages */ + check_send_input_keyboard_test( raw_legacy, !receive ); + check_send_input_keyboard_test( raw_vk_packet_legacy, !receive ); + + rid.dwFlags = RIDEV_REMOVE; + ok_ret( 1, RegisterRawInputDevices( &rid, 1, sizeof(rid) ) ); + + rid.dwFlags = RIDEV_NOLEGACY; + ok_ret( 1, RegisterRawInputDevices( &rid, 1, sizeof(rid) ) ); + + /* get only WM_INPUT messages */ + check_send_input_keyboard_test( raw_nolegacy, !receive ); + check_send_input_keyboard_test( raw_vk_packet_nolegacy, !receive ); + + rid.dwFlags = RIDEV_REMOVE; + ok_ret( 1, RegisterRawInputDevices( &rid, 1, sizeof(rid) ) ); + + winetest_pop_context(); + } + + ok_ret( 1, DestroyWindow( hwnd ) ); + wait_messages( 100, FALSE ); + ok_seq( empty_sequence ); + + p_accept_message = NULL; +} + static void test_GetMouseMovePointsEx( char **argv ) { #define BUFLIM 64 @@ -5896,6 +6054,7 @@ static void test_input_desktop( char **argv ) test_RegisterRawInputDevices(); test_GetRawInputData(); test_GetRawInputBuffer(); + test_SendInput_raw_key_messages( 'F', wch, hkl ); test_LoadKeyboardLayoutEx( hkl );

1 0