September 2023 - Wine-commits

Henri Verbeet : include: Add a corresponding function pointer type for vkd3d_shader_build_varying_map().
by Alexandre Julliard 19 Sep '23

19 Sep '23

Module: vkd3d Branch: master Commit: 74517de78376731a1b97b114e82dc567564d1305 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/74517de78376731a1b97b114e82dc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 19 13:30:18 2023 +0200 include: Add a corresponding function pointer type for vkd3d_shader_build_varying_map(). --- include/vkd3d_shader.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index d329e205..e7ac3d62 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -2362,6 +2362,10 @@ typedef int (*PFN_vkd3d_shader_parse_dxbc)(const struct vkd3d_shader_code *dxbc, typedef int (*PFN_vkd3d_shader_serialize_dxbc)(size_t section_count, const struct vkd3d_shader_dxbc_section_desc *sections, struct vkd3d_shader_code *dxbc, char **messages); +/** Type of vkd3d_shader_build_varying_map(). \since 1.9 */ +typedef void (*PFN_vkd3d_shader_build_varying_map)(const struct vkd3d_shader_signature *output_signature, + const struct vkd3d_shader_signature *input_signature, + unsigned int *count, struct vkd3d_shader_varying_map *varyings); /** Type of vkd3d_shader_free_scan_signature_info(). \since 1.9 */ typedef void (*PFN_vkd3d_shader_free_scan_signature_info)(struct vkd3d_shader_scan_signature_info *info);

1 0

Henri Verbeet : tests: Add a small test for vkd3d_shader_build_varying_map().
by Alexandre Julliard 19 Sep '23

19 Sep '23

Module: vkd3d Branch: master Commit: 419c6364dba11431b633a426d0d51d3fb09cb85a URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/419c6364dba11431b633a426d0d51… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 19 13:24:41 2023 +0200 tests: Add a small test for vkd3d_shader_build_varying_map(). There's probably room for improvement, but this at least verifies the function can be called. --- tests/vkd3d_shader_api.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/tests/vkd3d_shader_api.c b/tests/vkd3d_shader_api.c index af75e0fd..ea53c81d 100644 --- a/tests/vkd3d_shader_api.c +++ b/tests/vkd3d_shader_api.c @@ -823,6 +823,36 @@ static void test_scan_descriptors(void) } } +static void test_build_varying_map(void) +{ + struct vkd3d_shader_signature_element output_elements[] = + { + {"position", 0, 0, VKD3D_SHADER_SV_POSITION, VKD3D_SHADER_COMPONENT_FLOAT, 0, 0xf, 0xf}, + {"texcoord", 2, 0, VKD3D_SHADER_SV_NONE, VKD3D_SHADER_COMPONENT_FLOAT, 1, 0xf, 0xf}, + {"colour", 0, 0, VKD3D_SHADER_SV_NONE, VKD3D_SHADER_COMPONENT_FLOAT, 2, 0xf, 0xf}, + }; + struct vkd3d_shader_signature_element input_elements[] = + { + {"colour", 0, 0, VKD3D_SHADER_SV_NONE, VKD3D_SHADER_COMPONENT_FLOAT, 3, 0xf, 0xf}, + {"texcoord", 2, 0, VKD3D_SHADER_SV_NONE, VKD3D_SHADER_COMPONENT_FLOAT, 4, 0x3, 0x3}, + }; + struct vkd3d_shader_signature output = {output_elements, ARRAY_SIZE(output_elements)}; + struct vkd3d_shader_signature input = {input_elements, ARRAY_SIZE(input_elements)}; + PFN_vkd3d_shader_build_varying_map pfn_vkd3d_shader_build_varying_map; + struct vkd3d_shader_varying_map map[ARRAY_SIZE(input_elements)]; + unsigned int count; + + pfn_vkd3d_shader_build_varying_map = vkd3d_shader_build_varying_map; + pfn_vkd3d_shader_build_varying_map(&output, &input, &count, map); + ok(count == ARRAY_SIZE(input_elements), "Got count %u.\n", count); + ok(map[0].output_signature_index == 2, "Got map[0].output_signature_index %u.\n", map[0].output_signature_index); + ok(map[0].input_register_index == 3, "Got map[0].input_register_index %u.\n", map[0].input_register_index); + ok(map[0].input_mask == 0xf, "Got map[0].input_mask %#x.\n", map[0].input_mask); + ok(map[1].output_signature_index == 1, "Got map[1].output_signature_index %u.\n", map[1].output_signature_index); + ok(map[1].input_register_index == 4, "Got map[1].input_register_index %u.\n", map[1].input_register_index); + ok(map[1].input_mask == 0x3, "Got map[1].input_mask %#x.\n", map[1].input_mask); +} + START_TEST(vkd3d_shader_api) { setlocale(LC_ALL, ""); @@ -834,4 +864,5 @@ START_TEST(vkd3d_shader_api) run_test(test_dxbc); run_test(test_scan_signatures); run_test(test_scan_descriptors); + run_test(test_build_varying_map); }

1 0

Piotr Caban : msvcr110: Simplify _StructuredTaskCollection finished task counter updating.
by Alexandre Julliard 18 Sep '23

18 Sep '23

Module: wine Branch: master Commit: a035c63912ea45a35729f7f2ab254e32845f6e35 URL: https://gitlab.winehq.org/wine/wine/-/commit/a035c63912ea45a35729f7f2ab254e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 18 16:49:48 2023 +0200 msvcr110: Simplify _StructuredTaskCollection finished task counter updating. --- dlls/msvcrt/concurrency.c | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index 156789a35d6..6f2a9a414cf 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -2120,7 +2120,6 @@ void __thiscall _StructuredTaskCollection__Cancel( struct scheduled_chore *sc, *next; struct beacon *beacon; LONG removed = 0; - LONG prev_finished, new_finished; TRACE("(%p)\n", this); @@ -2162,15 +2161,8 @@ void __thiscall _StructuredTaskCollection__Cancel( if (!removed) return; - new_finished = this->finished; - do { - prev_finished = new_finished; - if (prev_finished == FINISHED_INITIAL) - new_finished = removed; - else - new_finished = prev_finished + removed; - } while ((new_finished = InterlockedCompareExchange(&this->finished, - new_finished, prev_finished)) != prev_finished); + if (InterlockedCompareExchange(&this->finished, removed, FINISHED_INITIAL) != FINISHED_INITIAL) + InterlockedAdd(&this->finished, removed); RtlWakeAddressAll((LONG*)&this->finished); } @@ -2248,7 +2240,7 @@ static void execute_chore(_UnrealizedChore *chore, static void CALLBACK chore_wrapper_finally(BOOL normal, void *data) { _UnrealizedChore *chore = data; - LONG count, prev_finished, new_finished; + LONG count; volatile LONG *ptr; TRACE("(%u %p)\n", normal, data); @@ -2259,15 +2251,9 @@ static void CALLBACK chore_wrapper_finally(BOOL normal, void *data) count = chore->task_collection->count; chore->task_collection = NULL; - do { - prev_finished = *ptr; - if (prev_finished == FINISHED_INITIAL) - new_finished = 1; - else - new_finished = prev_finished + 1; - } while (InterlockedCompareExchange(ptr, new_finished, prev_finished) - != prev_finished); - if (new_finished >= count) + if (InterlockedCompareExchange(ptr, 1, FINISHED_INITIAL) != FINISHED_INITIAL) + InterlockedIncrement(ptr); + if (*ptr >= count) RtlWakeAddressSingle((LONG*)ptr); }

1 0

Piotr Caban : msvcr110: Use Context blocking functions in _StructuredTaskCollection class.
by Alexandre Julliard 18 Sep '23

18 Sep '23

Module: wine Branch: master Commit: a240d38085631d282aa218618aaab28c25b95e73 URL: https://gitlab.winehq.org/wine/wine/-/commit/a240d38085631d282aa218618aaab2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 18 17:32:01 2023 +0200 msvcr110: Use Context blocking functions in _StructuredTaskCollection class. --- dlls/msvcrt/concurrency.c | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index 6f2a9a414cf..fa21a206e79 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -193,7 +193,7 @@ typedef struct _StructuredTaskCollection volatile LONG count; volatile LONG finished; void *exception; - void *event; + Context *event; } _StructuredTaskCollection; bool __thiscall _StructuredTaskCollection__IsCanceling(_StructuredTaskCollection*); @@ -2118,8 +2118,8 @@ void __thiscall _StructuredTaskCollection__Cancel( ThreadScheduler *scheduler; void *prev_exception, *new_exception; struct scheduled_chore *sc, *next; + LONG removed = 0, finished = 1; struct beacon *beacon; - LONG removed = 0; TRACE("(%p)\n", this); @@ -2162,8 +2162,9 @@ void __thiscall _StructuredTaskCollection__Cancel( return; if (InterlockedCompareExchange(&this->finished, removed, FINISHED_INITIAL) != FINISHED_INITIAL) - InterlockedAdd(&this->finished, removed); - RtlWakeAddressAll((LONG*)&this->finished); + finished = InterlockedAdd(&this->finished, removed); + if (!finished) + call_Context_Unblock(this->event); } static LONG CALLBACK execute_chore_except(EXCEPTION_POINTERS *pexc, void *_data) @@ -2240,21 +2241,20 @@ static void execute_chore(_UnrealizedChore *chore, static void CALLBACK chore_wrapper_finally(BOOL normal, void *data) { _UnrealizedChore *chore = data; - LONG count; volatile LONG *ptr; + LONG finished = 1; TRACE("(%u %p)\n", normal, data); if (!chore->task_collection) return; ptr = &chore->task_collection->finished; - count = chore->task_collection->count; - chore->task_collection = NULL; if (InterlockedCompareExchange(ptr, 1, FINISHED_INITIAL) != FINISHED_INITIAL) - InterlockedIncrement(ptr); - if (*ptr >= count) - RtlWakeAddressSingle((LONG*)ptr); + finished = InterlockedIncrement(ptr); + if (!finished) + call_Context_Unblock(chore->task_collection->event); + chore->task_collection = NULL; } static void __cdecl chore_wrapper(_UnrealizedChore *chore) @@ -2393,9 +2393,9 @@ static void CALLBACK exception_ptr_rethrow_finally(BOOL normal, void *data) _TaskCollectionStatus __stdcall _StructuredTaskCollection__RunAndWait( _StructuredTaskCollection *this, _UnrealizedChore *chore) { - LONG expected, val; ULONG_PTR exception; exception_ptr *ep; + LONG count; TRACE("(%p %p)\n", this, chore); @@ -2415,12 +2415,17 @@ _TaskCollectionStatus __stdcall _StructuredTaskCollection__RunAndWait( } } - expected = this->count ? this->count : FINISHED_INITIAL; - while ((val = this->finished) != expected) - RtlWaitOnAddress((LONG*)&this->finished, &val, sizeof(val), NULL); + this->event = get_current_context(); + InterlockedCompareExchange(&this->finished, 0, FINISHED_INITIAL); - this->finished = 0; - this->count = 0; + while (this->count != 0) { + count = this->count; + InterlockedAdd(&this->count, -count); + count = InterlockedAdd(&this->finished, -count); + + if (count < 0) + call_Context_Block(this->event); + } exception = (ULONG_PTR)this->exception; ep = (exception_ptr*)(exception & ~STRUCTURED_TASK_COLLECTION_STATUS_MASK);

1 0

Gabriel Ivăncescu : mshtml: Move some Element methods around.
by Alexandre Julliard 18 Sep '23

18 Sep '23

Module: wine Branch: master Commit: 66fd80baf9eb03837fcf9eff7d0c563f09b316e6 URL: https://gitlab.winehq.org/wine/wine/-/commit/66fd80baf9eb03837fcf9eff7d0c56… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Sep 18 18:00:52 2023 +0300 mshtml: Move some Element methods around. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlelem.c | 162 ++++++++++++++++++++++++------------------------- 1 file changed, 81 insertions(+), 81 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 06966954626..314b85b8a72 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -6780,6 +6780,50 @@ static inline HTMLElement *impl_from_HTMLDOMNode(HTMLDOMNode *iface) return CONTAINING_RECORD(iface, HTMLElement, node); } +HRESULT HTMLElement_clone(HTMLDOMNode *iface, nsIDOMNode *nsnode, HTMLDOMNode **ret) +{ + HTMLElement *This = impl_from_HTMLDOMNode(iface); + HTMLElement *new_elem; + HRESULT hres; + + hres = HTMLElement_Create(This->node.doc, nsnode, FALSE, &new_elem); + if(FAILED(hres)) + return hres; + + if(This->filter) { + new_elem->filter = wcsdup(This->filter); + if(!new_elem->filter) { + IHTMLElement_Release(&This->IHTMLElement_iface); + return E_OUTOFMEMORY; + } + } + + *ret = &new_elem->node; + return S_OK; +} + +cp_static_data_t HTMLElementEvents2_data = { HTMLElementEvents2_tid, NULL /* FIXME */, TRUE }; + +const cpc_entry_t HTMLElement_cpc[] = { + HTMLELEMENT_CPC, + {NULL} +}; + +static const NodeImplVtbl HTMLElementImplVtbl = { + .clsid = &CLSID_HTMLUnknownElement, + .qi = HTMLElement_QI, + .destructor = HTMLElement_destructor, + .cpc_entries = HTMLElement_cpc, + .clone = HTMLElement_clone, + .handle_event = HTMLElement_handle_event, + .get_attr_col = HTMLElement_get_attr_col +}; + +static inline HTMLElement *impl_from_DispatchEx(DispatchEx *iface) +{ + return CONTAINING_RECORD(iface, HTMLElement, node.event_target.dispex); +} + void *HTMLElement_QI(HTMLDOMNode *iface, REFIID riid) { HTMLElement *This = impl_from_HTMLDOMNode(iface); @@ -6847,87 +6891,6 @@ void HTMLElement_destructor(HTMLDOMNode *iface) free(This->filter); } -HRESULT HTMLElement_clone(HTMLDOMNode *iface, nsIDOMNode *nsnode, HTMLDOMNode **ret) -{ - HTMLElement *This = impl_from_HTMLDOMNode(iface); - HTMLElement *new_elem; - HRESULT hres; - - hres = HTMLElement_Create(This->node.doc, nsnode, FALSE, &new_elem); - if(FAILED(hres)) - return hres; - - if(This->filter) { - new_elem->filter = wcsdup(This->filter); - if(!new_elem->filter) { - IHTMLElement_Release(&This->IHTMLElement_iface); - return E_OUTOFMEMORY; - } - } - - *ret = &new_elem->node; - return S_OK; -} - -HRESULT HTMLElement_handle_event(HTMLDOMNode *iface, DWORD eid, nsIDOMEvent *event, BOOL *prevent_default) -{ - HTMLElement *This = impl_from_HTMLDOMNode(iface); - - switch(eid) { - case EVENTID_KEYDOWN: { - nsIDOMKeyEvent *key_event; - nsresult nsres; - - nsres = nsIDOMEvent_QueryInterface(event, &IID_nsIDOMKeyEvent, (void**)&key_event); - if(NS_SUCCEEDED(nsres)) { - UINT32 code = 0; - - nsIDOMKeyEvent_GetKeyCode(key_event, &code); - - if(code == VK_F1 /* DOM_VK_F1 */) { - DOMEvent *help_event; - HRESULT hres; - - TRACE("F1 pressed\n"); - - hres = create_document_event(This->node.doc, EVENTID_HELP, &help_event); - if(SUCCEEDED(hres)) { - dispatch_event(&This->node.event_target, help_event); - IDOMEvent_Release(&help_event->IDOMEvent_iface); - } - *prevent_default = TRUE; - } - - nsIDOMKeyEvent_Release(key_event); - } - } - } - - return S_OK; -} - -cp_static_data_t HTMLElementEvents2_data = { HTMLElementEvents2_tid, NULL /* FIXME */, TRUE }; - -const cpc_entry_t HTMLElement_cpc[] = { - HTMLELEMENT_CPC, - {NULL} -}; - -static const NodeImplVtbl HTMLElementImplVtbl = { - .clsid = &CLSID_HTMLUnknownElement, - .qi = HTMLElement_QI, - .destructor = HTMLElement_destructor, - .cpc_entries = HTMLElement_cpc, - .clone = HTMLElement_clone, - .handle_event = HTMLElement_handle_event, - .get_attr_col = HTMLElement_get_attr_col -}; - -static inline HTMLElement *impl_from_DispatchEx(DispatchEx *iface) -{ - return CONTAINING_RECORD(iface, HTMLElement, node.event_target.dispex); -} - HRESULT HTMLElement_get_dispid(DispatchEx *dispex, BSTR name, DWORD grfdex, DISPID *pid) { HTMLElement *This = impl_from_DispatchEx(dispex); @@ -7068,6 +7031,43 @@ HRESULT HTMLElement_handle_event_default(DispatchEx *dispex, eventid_t eid, nsID return This->node.vtbl->handle_event(&This->node, eid, nsevent, prevent_default); } +HRESULT HTMLElement_handle_event(HTMLDOMNode *iface, DWORD eid, nsIDOMEvent *event, BOOL *prevent_default) +{ + HTMLElement *This = impl_from_HTMLDOMNode(iface); + + switch(eid) { + case EVENTID_KEYDOWN: { + nsIDOMKeyEvent *key_event; + nsresult nsres; + + nsres = nsIDOMEvent_QueryInterface(event, &IID_nsIDOMKeyEvent, (void**)&key_event); + if(NS_SUCCEEDED(nsres)) { + UINT32 code = 0; + + nsIDOMKeyEvent_GetKeyCode(key_event, &code); + + if(code == VK_F1 /* DOM_VK_F1 */) { + DOMEvent *help_event; + HRESULT hres; + + TRACE("F1 pressed\n"); + + hres = create_document_event(This->node.doc, EVENTID_HELP, &help_event); + if(SUCCEEDED(hres)) { + dispatch_event(&This->node.event_target, help_event); + IDOMEvent_Release(&help_event->IDOMEvent_iface); + } + *prevent_default = TRUE; + } + + nsIDOMKeyEvent_Release(key_event); + } + } + } + + return S_OK; +} + EventTarget *HTMLElement_get_parent_event_target(DispatchEx *dispex) { HTMLElement *This = impl_from_DispatchEx(dispex);

1 0

Gabriel Ivăncescu : mshtml: Move some AnchorElement methods up.
by Alexandre Julliard 18 Sep '23

18 Sep '23

Module: wine Branch: master Commit: 65287103e91d88a7ab0c44565b6708f68fde9f0e URL: https://gitlab.winehq.org/wine/wine/-/commit/65287103e91d88a7ab0c44565b6708… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Sep 18 18:00:53 2023 +0300 mshtml: Move some AnchorElement methods up. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlanchor.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index 8986e617492..441934c892f 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -797,6 +797,11 @@ static inline HTMLAnchorElement *impl_from_HTMLDOMNode(HTMLDOMNode *iface) return CONTAINING_RECORD(iface, HTMLAnchorElement, element.node); } +static inline HTMLAnchorElement *impl_from_DispatchEx(DispatchEx *iface) +{ + return CONTAINING_RECORD(iface, HTMLAnchorElement, element.node.event_target.dispex); +} + static void *HTMLAnchorElement_QI(HTMLDOMNode *iface, REFIID riid) { HTMLAnchorElement *This = impl_from_HTMLDOMNode(iface); @@ -811,6 +816,22 @@ static void *HTMLAnchorElement_QI(HTMLDOMNode *iface, REFIID riid) return HTMLElement_QI(&This->element.node, riid); } +static void HTMLAnchorElement_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) +{ + HTMLAnchorElement *This = impl_from_DispatchEx(dispex); + HTMLDOMNode_traverse(dispex, cb); + + if(This->nsanchor) + note_cc_edge((nsISupports*)This->nsanchor, "nsanchor", cb); +} + +static void HTMLAnchorElement_unlink(DispatchEx *dispex) +{ + HTMLAnchorElement *This = impl_from_DispatchEx(dispex); + HTMLDOMNode_unlink(dispex); + unlink_ref(&This->nsanchor); +} + static HRESULT HTMLAnchorElement_handle_event(HTMLDOMNode *iface, DWORD eid, nsIDOMEvent *event, BOOL *prevent_default) { HTMLAnchorElement *This = impl_from_HTMLDOMNode(iface); @@ -842,27 +863,6 @@ fallback: return HTMLElement_handle_event(&This->element.node, eid, event, prevent_default); } -static inline HTMLAnchorElement *impl_from_DispatchEx(DispatchEx *iface) -{ - return CONTAINING_RECORD(iface, HTMLAnchorElement, element.node.event_target.dispex); -} - -static void HTMLAnchorElement_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) -{ - HTMLAnchorElement *This = impl_from_DispatchEx(dispex); - HTMLDOMNode_traverse(dispex, cb); - - if(This->nsanchor) - note_cc_edge((nsISupports*)This->nsanchor, "nsanchor", cb); -} - -static void HTMLAnchorElement_unlink(DispatchEx *dispex) -{ - HTMLAnchorElement *This = impl_from_DispatchEx(dispex); - HTMLDOMNode_unlink(dispex); - unlink_ref(&This->nsanchor); -} - static const NodeImplVtbl HTMLAnchorElementImplVtbl = { .clsid = &CLSID_HTMLAnchorElement, .qi = HTMLAnchorElement_QI,

1 0

Gabriel Ivăncescu : mshtml: Move some AreaElement methods up.
by Alexandre Julliard 18 Sep '23

18 Sep '23

Module: wine Branch: master Commit: 0593b1d27935df77435ffa6be6eaaaa260f86cca URL: https://gitlab.winehq.org/wine/wine/-/commit/0593b1d27935df77435ffa6be6eaaa… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Sep 18 18:00:53 2023 +0300 mshtml: Move some AreaElement methods up. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlarea.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/dlls/mshtml/htmlarea.c b/dlls/mshtml/htmlarea.c index fd810a0baa1..3a3f8c7c57b 100644 --- a/dlls/mshtml/htmlarea.c +++ b/dlls/mshtml/htmlarea.c @@ -413,6 +413,11 @@ static inline HTMLAreaElement *impl_from_HTMLDOMNode(HTMLDOMNode *iface) return CONTAINING_RECORD(iface, HTMLAreaElement, element.node); } +static inline HTMLAreaElement *impl_from_DispatchEx(DispatchEx *iface) +{ + return CONTAINING_RECORD(iface, HTMLAreaElement, element.node.event_target.dispex); +} + static void *HTMLAreaElement_QI(HTMLDOMNode *iface, REFIID riid) { HTMLAreaElement *This = impl_from_HTMLDOMNode(iface); @@ -423,6 +428,22 @@ static void *HTMLAreaElement_QI(HTMLDOMNode *iface, REFIID riid) return HTMLElement_QI(&This->element.node, riid); } +static void HTMLAreaElement_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) +{ + HTMLAreaElement *This = impl_from_DispatchEx(dispex); + HTMLDOMNode_traverse(dispex, cb); + + if(This->nsarea) + note_cc_edge((nsISupports*)This->nsarea, "nsarea", cb); +} + +static void HTMLAreaElement_unlink(DispatchEx *dispex) +{ + HTMLAreaElement *This = impl_from_DispatchEx(dispex); + HTMLDOMNode_unlink(dispex); + unlink_ref(&This->nsarea); +} + static HRESULT HTMLAreaElement_handle_event(HTMLDOMNode *iface, DWORD eid, nsIDOMEvent *event, BOOL *prevent_default) { HTMLAreaElement *This = impl_from_HTMLDOMNode(iface); @@ -454,27 +475,6 @@ fallback: return HTMLElement_handle_event(&This->element.node, eid, event, prevent_default); } -static inline HTMLAreaElement *impl_from_DispatchEx(DispatchEx *iface) -{ - return CONTAINING_RECORD(iface, HTMLAreaElement, element.node.event_target.dispex); -} - -static void HTMLAreaElement_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) -{ - HTMLAreaElement *This = impl_from_DispatchEx(dispex); - HTMLDOMNode_traverse(dispex, cb); - - if(This->nsarea) - note_cc_edge((nsISupports*)This->nsarea, "nsarea", cb); -} - -static void HTMLAreaElement_unlink(DispatchEx *dispex) -{ - HTMLAreaElement *This = impl_from_DispatchEx(dispex); - HTMLDOMNode_unlink(dispex); - unlink_ref(&This->nsarea); -} - static const NodeImplVtbl HTMLAreaElementImplVtbl = { .clsid = &CLSID_HTMLAreaElement, .qi = HTMLAreaElement_QI,

1 0

Gabriel Ivăncescu : mshtml: Move some FormElement methods up.
by Alexandre Julliard 18 Sep '23

18 Sep '23

Module: wine Branch: master Commit: 3ae610ad3220b8e2336e7518b2034b46de8f7a11 URL: https://gitlab.winehq.org/wine/wine/-/commit/3ae610ad3220b8e2336e7518b2034b… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Sep 18 18:00:53 2023 +0300 mshtml: Move some FormElement methods up. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlform.c | 58 ++++++++++++++++++++++++-------------------------- 1 file changed, 28 insertions(+), 30 deletions(-) diff --git a/dlls/mshtml/htmlform.c b/dlls/mshtml/htmlform.c index 39270de11ca..e4cab195954 100644 --- a/dlls/mshtml/htmlform.c +++ b/dlls/mshtml/htmlform.c @@ -773,6 +773,11 @@ static inline HTMLFormElement *impl_from_HTMLDOMNode(HTMLDOMNode *iface) return CONTAINING_RECORD(iface, HTMLFormElement, element.node); } +static inline HTMLFormElement *impl_from_DispatchEx(DispatchEx *iface) +{ + return CONTAINING_RECORD(iface, HTMLFormElement, element.node.event_target.dispex); +} + static void *HTMLFormElement_QI(HTMLDOMNode *iface, REFIID riid) { HTMLFormElement *This = impl_from_HTMLDOMNode(iface); @@ -789,8 +794,23 @@ static void *HTMLFormElement_QI(HTMLDOMNode *iface, REFIID riid) return HTMLElement_QI(&This->element.node, riid); } -static HRESULT HTMLFormElement_get_dispid(HTMLDOMNode *iface, - BSTR name, DWORD grfdex, DISPID *pid) +static void HTMLFormElement_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) +{ + HTMLFormElement *This = impl_from_DispatchEx(dispex); + HTMLDOMNode_traverse(dispex, cb); + + if(This->nsform) + note_cc_edge((nsISupports*)This->nsform, "nsform", cb); +} + +static void HTMLFormElement_unlink(DispatchEx *dispex) +{ + HTMLFormElement *This = impl_from_DispatchEx(dispex); + HTMLDOMNode_unlink(dispex); + unlink_ref(&This->nsform); +} + +static HRESULT HTMLFormElement_get_dispid(HTMLDOMNode *iface, BSTR name, DWORD grfdex, DISPID *dispid) { HTMLFormElement *This = impl_from_HTMLDOMNode(iface); nsIDOMHTMLCollection *elements; @@ -799,7 +819,7 @@ static HRESULT HTMLFormElement_get_dispid(HTMLDOMNode *iface, nsresult nsres; HRESULT hres = DISP_E_UNKNOWNNAME; - TRACE("(%p)->(%s %lx %p)\n", This, wine_dbgstr_w(name), grfdex, pid); + TRACE("(%p)->(%s %lx %p)\n", This, wine_dbgstr_w(name), grfdex, dispid); nsres = nsIDOMHTMLFormElement_GetElements(This->nsform, &elements); if(NS_FAILED(nsres)) { @@ -823,7 +843,7 @@ static HRESULT HTMLFormElement_get_dispid(HTMLDOMNode *iface, i = wcstoul(name, &end_ptr, 10); if(!*end_ptr && i < len) { - *pid = MSHTML_DISPID_CUSTOM_MIN + i; + *dispid = MSHTML_DISPID_CUSTOM_MIN + i; return S_OK; } } @@ -861,7 +881,7 @@ static HRESULT HTMLFormElement_get_dispid(HTMLDOMNode *iface, if(!wcsicmp(str, name)) { nsIDOMElement_Release(elem); /* FIXME: using index for dispid */ - *pid = MSHTML_DISPID_CUSTOM_MIN + i; + *dispid = MSHTML_DISPID_CUSTOM_MIN + i; hres = S_OK; break; } @@ -873,7 +893,7 @@ static HRESULT HTMLFormElement_get_dispid(HTMLDOMNode *iface, if(!wcsicmp(str, name)) { nsAString_Finish(&name_str); /* FIXME: using index for dispid */ - *pid = MSHTML_DISPID_CUSTOM_MIN + i; + *dispid = MSHTML_DISPID_CUSTOM_MIN + i; hres = S_OK; break; } @@ -911,9 +931,8 @@ static HRESULT HTMLFormElement_dispex_get_name(HTMLDOMNode *iface, DISPID id, BS return (*name = SysAllocStringLen(buf, len)) ? S_OK : E_OUTOFMEMORY; } -static HRESULT HTMLFormElement_invoke(HTMLDOMNode *iface, - DISPID id, LCID lcid, WORD flags, DISPPARAMS *params, VARIANT *res, - EXCEPINFO *ei, IServiceProvider *caller) +static HRESULT HTMLFormElement_invoke(HTMLDOMNode *iface, DISPID id, LCID lcid, WORD flags, DISPPARAMS *params, + VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller) { HTMLFormElement *This = impl_from_HTMLDOMNode(iface); IDispatch *ret; @@ -946,27 +965,6 @@ static HRESULT HTMLFormElement_handle_event(HTMLDOMNode *iface, DWORD eid, nsIDO return HTMLElement_handle_event(&This->element.node, eid, event, prevent_default); } -static inline HTMLFormElement *impl_from_DispatchEx(DispatchEx *iface) -{ - return CONTAINING_RECORD(iface, HTMLFormElement, element.node.event_target.dispex); -} - -static void HTMLFormElement_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) -{ - HTMLFormElement *This = impl_from_DispatchEx(dispex); - HTMLDOMNode_traverse(dispex, cb); - - if(This->nsform) - note_cc_edge((nsISupports*)This->nsform, "nsform", cb); -} - -static void HTMLFormElement_unlink(DispatchEx *dispex) -{ - HTMLFormElement *This = impl_from_DispatchEx(dispex); - HTMLDOMNode_unlink(dispex); - unlink_ref(&This->nsform); -} - static const NodeImplVtbl HTMLFormElementImplVtbl = { .clsid = &CLSID_HTMLFormElement, .qi = HTMLFormElement_QI,

1 0

Gabriel Ivăncescu : mshtml: Move some FrameElement methods down.
by Alexandre Julliard 18 Sep '23

18 Sep '23

Module: wine Branch: master Commit: e5dbfad54cc1a57470bea7d1264f4f4f836f13e1 URL: https://gitlab.winehq.org/wine/wine/-/commit/e5dbfad54cc1a57470bea7d1264f4f… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Sep 18 18:00:53 2023 +0300 mshtml: Move some FrameElement methods down. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlframe.c | 109 ++++++++++++++++++++++++------------------------ 1 file changed, 54 insertions(+), 55 deletions(-) diff --git a/dlls/mshtml/htmlframe.c b/dlls/mshtml/htmlframe.c index 991e2ea8ff8..b66e1d91267 100644 --- a/dlls/mshtml/htmlframe.c +++ b/dlls/mshtml/htmlframe.c @@ -887,23 +887,6 @@ static inline HTMLFrameElement *frame_from_HTMLDOMNode(HTMLDOMNode *iface) return CONTAINING_RECORD(iface, HTMLFrameElement, framebase.element.node); } -static void *HTMLFrameElement_QI(HTMLDOMNode *iface, REFIID riid) -{ - HTMLFrameElement *This = frame_from_HTMLDOMNode(iface); - - if(IsEqualGUID(&IID_IHTMLFrameElement3, riid)) - return &This->IHTMLFrameElement3_iface; - - return HTMLFrameBase_QI(&This->framebase, riid); -} - -static void HTMLFrameElement_destructor(HTMLDOMNode *iface) -{ - HTMLFrameElement *This = frame_from_HTMLDOMNode(iface); - - HTMLFrameBase_destructor(&This->framebase); -} - static HRESULT HTMLFrameElement_get_document(HTMLDOMNode *iface, IDispatch **p) { HTMLFrameElement *This = frame_from_HTMLDOMNode(iface); @@ -925,44 +908,6 @@ static HRESULT HTMLFrameElement_get_readystate(HTMLDOMNode *iface, BSTR *p) return IHTMLFrameBase2_get_readyState(&This->framebase.IHTMLFrameBase2_iface, p); } -static HRESULT HTMLFrameElement_get_dispid(HTMLDOMNode *iface, BSTR name, - DWORD grfdex, DISPID *pid) -{ - HTMLFrameElement *This = frame_from_HTMLDOMNode(iface); - - if(!This->framebase.content_window) - return DISP_E_UNKNOWNNAME; - - return search_window_props(This->framebase.content_window->base.inner_window, name, grfdex, pid); -} - -static HRESULT HTMLFrameElement_get_name(HTMLDOMNode *iface, DISPID id, BSTR *name) -{ - HTMLFrameElement *This = frame_from_HTMLDOMNode(iface); - DWORD idx = id - MSHTML_DISPID_CUSTOM_MIN; - - if(!This->framebase.content_window || - idx >= This->framebase.content_window->base.inner_window->global_prop_cnt) - return DISP_E_MEMBERNOTFOUND; - - *name = SysAllocString(This->framebase.content_window->base.inner_window->global_props[idx].name); - return *name ? S_OK : E_OUTOFMEMORY; -} - -static HRESULT HTMLFrameElement_invoke(HTMLDOMNode *iface, DISPID id, LCID lcid, - WORD flags, DISPPARAMS *params, VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller) -{ - HTMLFrameElement *This = frame_from_HTMLDOMNode(iface); - - if(!This->framebase.content_window) { - ERR("no content window to invoke on\n"); - return E_FAIL; - } - - return IDispatchEx_InvokeEx(&This->framebase.content_window->base.IDispatchEx_iface, id, lcid, - flags, params, res, ei, caller); -} - static HRESULT HTMLFrameElement_bind_to_tree(HTMLDOMNode *iface) { HTMLFrameElement *This = frame_from_HTMLDOMNode(iface); @@ -986,6 +931,16 @@ static inline HTMLFrameElement *frame_from_DispatchEx(DispatchEx *iface) return CONTAINING_RECORD(iface, HTMLFrameElement, framebase.element.node.event_target.dispex); } +static void *HTMLFrameElement_QI(HTMLDOMNode *iface, REFIID riid) +{ + HTMLFrameElement *This = frame_from_HTMLDOMNode(iface); + + if(IsEqualGUID(&IID_IHTMLFrameElement3, riid)) + return &This->IHTMLFrameElement3_iface; + + return HTMLFrameBase_QI(&This->framebase, riid); +} + static void HTMLFrameElement_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) { HTMLFrameElement *This = frame_from_DispatchEx(dispex); @@ -1002,6 +957,50 @@ static void HTMLFrameElement_unlink(DispatchEx *dispex) unlink_ref(&This->framebase.nsframe); } +static void HTMLFrameElement_destructor(HTMLDOMNode *iface) +{ + HTMLFrameElement *This = frame_from_HTMLDOMNode(iface); + + HTMLFrameBase_destructor(&This->framebase); +} + +static HRESULT HTMLFrameElement_get_dispid(HTMLDOMNode *iface, BSTR name, DWORD grfdex, DISPID *dispid) +{ + HTMLFrameElement *This = frame_from_HTMLDOMNode(iface); + + if(!This->framebase.content_window) + return DISP_E_UNKNOWNNAME; + + return search_window_props(This->framebase.content_window->base.inner_window, name, grfdex, dispid); +} + +static HRESULT HTMLFrameElement_get_name(HTMLDOMNode *iface, DISPID id, BSTR *name) +{ + HTMLFrameElement *This = frame_from_HTMLDOMNode(iface); + DWORD idx = id - MSHTML_DISPID_CUSTOM_MIN; + + if(!This->framebase.content_window || + idx >= This->framebase.content_window->base.inner_window->global_prop_cnt) + return DISP_E_MEMBERNOTFOUND; + + *name = SysAllocString(This->framebase.content_window->base.inner_window->global_props[idx].name); + return *name ? S_OK : E_OUTOFMEMORY; +} + +static HRESULT HTMLFrameElement_invoke(HTMLDOMNode *iface, DISPID id, LCID lcid, WORD flags, DISPPARAMS *params, + VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller) +{ + HTMLFrameElement *This = frame_from_HTMLDOMNode(iface); + + if(!This->framebase.content_window) { + ERR("no content window to invoke on\n"); + return E_FAIL; + } + + return IDispatchEx_InvokeEx(&This->framebase.content_window->base.IDispatchEx_iface, id, lcid, + flags, params, res, ei, caller); +} + static const NodeImplVtbl HTMLFrameElementImplVtbl = { .clsid = &CLSID_HTMLFrameElement, .qi = HTMLFrameElement_QI,

1 0

Gabriel Ivăncescu : mshtml: Move some IFrame methods down.
by Alexandre Julliard 18 Sep '23

18 Sep '23

Module: wine Branch: master Commit: 3ed71ab58c13fbad1397170e136d14908b07203a URL: https://gitlab.winehq.org/wine/wine/-/commit/3ed71ab58c13fbad1397170e136d14… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Sep 18 18:00:53 2023 +0300 mshtml: Move some IFrame methods down. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlframe.c | 117 ++++++++++++++++++++++++------------------------ 1 file changed, 58 insertions(+), 59 deletions(-) diff --git a/dlls/mshtml/htmlframe.c b/dlls/mshtml/htmlframe.c index b66e1d91267..5229e6635a8 100644 --- a/dlls/mshtml/htmlframe.c +++ b/dlls/mshtml/htmlframe.c @@ -1473,27 +1473,6 @@ static inline HTMLIFrame *iframe_from_HTMLDOMNode(HTMLDOMNode *iface) return CONTAINING_RECORD(iface, HTMLIFrame, framebase.element.node); } -static void *HTMLIFrame_QI(HTMLDOMNode *iface, REFIID riid) -{ - HTMLIFrame *This = iframe_from_HTMLDOMNode(iface); - - if(IsEqualGUID(&IID_IHTMLIFrameElement, riid)) - return &This->IHTMLIFrameElement_iface; - if(IsEqualGUID(&IID_IHTMLIFrameElement2, riid)) - return &This->IHTMLIFrameElement2_iface; - if(IsEqualGUID(&IID_IHTMLIFrameElement3, riid)) - return &This->IHTMLIFrameElement3_iface; - - return HTMLFrameBase_QI(&This->framebase, riid); -} - -static void HTMLIFrame_destructor(HTMLDOMNode *iface) -{ - HTMLIFrame *This = iframe_from_HTMLDOMNode(iface); - - HTMLFrameBase_destructor(&This->framebase); -} - static HRESULT HTMLIFrame_get_document(HTMLDOMNode *iface, IDispatch **p) { HTMLIFrame *This = iframe_from_HTMLDOMNode(iface); @@ -1508,44 +1487,6 @@ static HRESULT HTMLIFrame_get_document(HTMLDOMNode *iface, IDispatch **p) return S_OK; } -static HRESULT HTMLIFrame_get_dispid(HTMLDOMNode *iface, BSTR name, - DWORD grfdex, DISPID *pid) -{ - HTMLIFrame *This = iframe_from_HTMLDOMNode(iface); - - if(!This->framebase.content_window) - return DISP_E_UNKNOWNNAME; - - return search_window_props(This->framebase.content_window->base.inner_window, name, grfdex, pid); -} - -static HRESULT HTMLIFrame_get_name(HTMLDOMNode *iface, DISPID id, BSTR *name) -{ - HTMLIFrame *This = iframe_from_HTMLDOMNode(iface); - DWORD idx = id - MSHTML_DISPID_CUSTOM_MIN; - - if(!This->framebase.content_window || - idx >= This->framebase.content_window->base.inner_window->global_prop_cnt) - return DISP_E_MEMBERNOTFOUND; - - *name = SysAllocString(This->framebase.content_window->base.inner_window->global_props[idx].name); - return *name ? S_OK : E_OUTOFMEMORY; -} - -static HRESULT HTMLIFrame_invoke(HTMLDOMNode *iface, DISPID id, LCID lcid, - WORD flags, DISPPARAMS *params, VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller) -{ - HTMLIFrame *This = iframe_from_HTMLDOMNode(iface); - - if(!This->framebase.content_window) { - ERR("no content window to invoke on\n"); - return E_FAIL; - } - - return IDispatchEx_InvokeEx(&This->framebase.content_window->base.IDispatchEx_iface, id, lcid, - flags, params, res, ei, caller); -} - static HRESULT HTMLIFrame_get_readystate(HTMLDOMNode *iface, BSTR *p) { HTMLIFrame *This = iframe_from_HTMLDOMNode(iface); @@ -1576,6 +1517,20 @@ static inline HTMLIFrame *iframe_from_DispatchEx(DispatchEx *iface) return CONTAINING_RECORD(iface, HTMLIFrame, framebase.element.node.event_target.dispex); } +static void *HTMLIFrame_QI(HTMLDOMNode *iface, REFIID riid) +{ + HTMLIFrame *This = iframe_from_HTMLDOMNode(iface); + + if(IsEqualGUID(&IID_IHTMLIFrameElement, riid)) + return &This->IHTMLIFrameElement_iface; + if(IsEqualGUID(&IID_IHTMLIFrameElement2, riid)) + return &This->IHTMLIFrameElement2_iface; + if(IsEqualGUID(&IID_IHTMLIFrameElement3, riid)) + return &This->IHTMLIFrameElement3_iface; + + return HTMLFrameBase_QI(&This->framebase, riid); +} + static void HTMLIFrame_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) { HTMLIFrame *This = iframe_from_DispatchEx(dispex); @@ -1592,6 +1547,50 @@ static void HTMLIFrame_unlink(DispatchEx *dispex) unlink_ref(&This->framebase.nsiframe); } +static void HTMLIFrame_destructor(HTMLDOMNode *iface) +{ + HTMLIFrame *This = iframe_from_HTMLDOMNode(iface); + + HTMLFrameBase_destructor(&This->framebase); +} + +static HRESULT HTMLIFrame_get_dispid(HTMLDOMNode *iface, BSTR name, DWORD grfdex, DISPID *dispid) +{ + HTMLIFrame *This = iframe_from_HTMLDOMNode(iface); + + if(!This->framebase.content_window) + return DISP_E_UNKNOWNNAME; + + return search_window_props(This->framebase.content_window->base.inner_window, name, grfdex, dispid); +} + +static HRESULT HTMLIFrame_get_name(HTMLDOMNode *iface, DISPID id, BSTR *name) +{ + HTMLIFrame *This = iframe_from_HTMLDOMNode(iface); + DWORD idx = id - MSHTML_DISPID_CUSTOM_MIN; + + if(!This->framebase.content_window || + idx >= This->framebase.content_window->base.inner_window->global_prop_cnt) + return DISP_E_MEMBERNOTFOUND; + + *name = SysAllocString(This->framebase.content_window->base.inner_window->global_props[idx].name); + return *name ? S_OK : E_OUTOFMEMORY; +} + +static HRESULT HTMLIFrame_invoke(HTMLDOMNode *iface, DISPID id, LCID lcid, WORD flags, DISPPARAMS *params, + VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller) +{ + HTMLIFrame *This = iframe_from_HTMLDOMNode(iface); + + if(!This->framebase.content_window) { + ERR("no content window to invoke on\n"); + return E_FAIL; + } + + return IDispatchEx_InvokeEx(&This->framebase.content_window->base.IDispatchEx_iface, id, lcid, + flags, params, res, ei, caller); +} + static const NodeImplVtbl HTMLIFrameImplVtbl = { .clsid = &CLSID_HTMLIFrame, .qi = HTMLIFrame_QI,

1 0