September 2023 - Wine-Commits

Henri Verbeet : tests: Add a small test for vkd3d_shader_build_varying_map().
by Alexandre Julliard Sept. 19, 2023

Sept. 19, 2023

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

Henri Verbeet : vkd3d-shader: Export vkd3d_shader_build_varying_map.
by Alexandre Julliard Sept. 19, 2023

Sept. 19, 2023

Module: vkd3d Branch: master Commit: f796d8668e67b2dcf42fac9b615654fce8c975b9 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/f796d8668e67b2dcf42fac9b61565… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 19 13:29:51 2023 +0200 vkd3d-shader: Export vkd3d_shader_build_varying_map. --- libs/vkd3d-shader/vkd3d_shader.map | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d-shader/vkd3d_shader.map b/libs/vkd3d-shader/vkd3d_shader.map index 8a596a80..a64b98e7 100644 --- a/libs/vkd3d-shader/vkd3d_shader.map +++ b/libs/vkd3d-shader/vkd3d_shader.map @@ -1,6 +1,7 @@ VKD3D_1_0 { global: + vkd3d_shader_build_varying_map; vkd3d_shader_compile; vkd3d_shader_convert_root_signature; vkd3d_shader_find_signature_element;

1 0

Piotr Caban : msvcr110: Use Context blocking functions in _StructuredTaskCollection class.
by Alexandre Julliard Sept. 18, 2023

Sept. 18, 2023

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

Piotr Caban : msvcr110: Simplify _StructuredTaskCollection finished task counter updating.
by Alexandre Julliard Sept. 18, 2023

Sept. 18, 2023

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 : msvcp110: Add _Winerror_map implementation.
by Alexandre Julliard Sept. 18, 2023

Sept. 18, 2023

Module: wine Branch: master Commit: 5833732b9ad66c70b586c8b5f83a90c85cc8782b URL: https://gitlab.winehq.org/wine/wine/-/commit/5833732b9ad66c70b586c8b5f83a90… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 18 10:44:19 2023 +0200 msvcp110: Add _Winerror_map implementation. Based on patch by Myah Caron. --- dlls/msvcp110/msvcp110.spec | 4 ++-- dlls/msvcp120/msvcp120.spec | 4 ++-- dlls/msvcp120_app/msvcp120_app.spec | 4 ++-- dlls/msvcp90/misc.c | 11 +++++++++-- 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 1a100676743..9c61f57a4de 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -1827,8 +1827,8 @@ @ stub -arch=arm ?_W_Gettnames(a)_Locinfo@std@@QBA?AV_Timevec(a)2@XZ @ stub -arch=i386 ?_W_Gettnames(a)_Locinfo@std@@QBE?AV_Timevec(a)2@XZ @ stub -arch=win64 ?_W_Gettnames(a)_Locinfo@std@@QEBA?AV_Timevec(a)2@XZ -@ stub -arch=win32 ?_Winerror_map(a)std@@YAPBDH(a)Z -@ stub -arch=win64 ?_Winerror_map(a)std@@YAPEBDH(a)Z +@ cdecl -arch=win32 ?_Winerror_map(a)std@@YAPBDH(a)Z(long) _Winerror_map_str +@ cdecl -arch=win64 ?_Winerror_map(a)std@@YAPEBDH(a)Z(long) _Winerror_map_str @ cdecl ?_XLgamma(a)std@@YAMM(a)Z(float) std__XLgamma_float @ cdecl ?_XLgamma(a)std@@YANN(a)Z(double) std__XLgamma_double @ cdecl ?_XLgamma(a)std@@YAOO(a)Z(double) std__XLgamma_double diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index b95330179e5..835d37d3bf4 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -1788,8 +1788,8 @@ @ stub -arch=arm ?_W_Gettnames(a)_Locinfo@std@@QBA?AV_Timevec(a)2@XZ @ stub -arch=i386 ?_W_Gettnames(a)_Locinfo@std@@QBE?AV_Timevec(a)2@XZ @ stub -arch=win64 ?_W_Gettnames(a)_Locinfo@std@@QEBA?AV_Timevec(a)2@XZ -@ stub -arch=win32 ?_Winerror_map(a)std@@YAPBDH(a)Z -@ stub -arch=win64 ?_Winerror_map(a)std@@YAPEBDH(a)Z +@ cdecl -arch=win32 ?_Winerror_map(a)std@@YAPBDH(a)Z(long) _Winerror_map_str +@ cdecl -arch=win64 ?_Winerror_map(a)std@@YAPEBDH(a)Z(long) _Winerror_map_str @ cdecl ?_XLgamma(a)std@@YAMM(a)Z(float) std__XLgamma_float @ cdecl ?_XLgamma(a)std@@YANN(a)Z(double) std__XLgamma_double @ cdecl ?_XLgamma(a)std@@YAOO(a)Z(double) std__XLgamma_double diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index 9155a90e554..c6778841ffb 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -1788,8 +1788,8 @@ @ stub -arch=arm ?_W_Gettnames(a)_Locinfo@std@@QBA?AV_Timevec(a)2@XZ @ stub -arch=i386 ?_W_Gettnames(a)_Locinfo@std@@QBE?AV_Timevec(a)2@XZ @ stub -arch=win64 ?_W_Gettnames(a)_Locinfo@std@@QEBA?AV_Timevec(a)2@XZ -@ stub -arch=win32 ?_Winerror_map(a)std@@YAPBDH(a)Z -@ stub -arch=win64 ?_Winerror_map(a)std@@YAPEBDH(a)Z +@ cdecl -arch=win32 ?_Winerror_map(a)std@@YAPBDH(a)Z(long) msvcp120.?_Winerror_map(a)std@@YAPBDH(a)Z +@ cdecl -arch=win64 ?_Winerror_map(a)std@@YAPEBDH(a)Z(long) msvcp120.?_Winerror_map(a)std@@YAPEBDH(a)Z @ cdecl ?_XLgamma(a)std@@YAMM(a)Z(float) msvcp120.?_XLgamma(a)std@@YAMM(a)Z @ cdecl ?_XLgamma(a)std@@YANN(a)Z(double) msvcp120.?_XLgamma(a)std@@YANN(a)Z @ cdecl ?_XLgamma(a)std@@YAOO(a)Z(double) msvcp120.?_XLgamma(a)std@@YAOO(a)Z diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index ada8ee967d8..f82456cbf4b 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -191,9 +191,7 @@ static const struct { {ETXTBSY, str_ETXTBSY}, {EWOULDBLOCK, str_EWOULDBLOCK}, }; -#endif -#if _MSVCP_VER >= 140 static const struct { int winerr; int doserr; @@ -1691,7 +1689,9 @@ ULONG __cdecl _Winerror_message(ULONG err, char *buf, ULONG size) return FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, err, 0, buf, size, NULL); } +#endif +#if _MSVCP_VER >= 110 /* ?_Winerror_map(a)std@@YAHH(a)Z */ int __cdecl _Winerror_map(int err) { @@ -1711,6 +1711,13 @@ int __cdecl _Winerror_map(int err) return 0; } + +/* ?_Winerror_map(a)std@@YAPBDH(a)Z */ +/* ?_Winerror_map(a)std@@YAPEBDH(a)Z */ +const char *_Winerror_map_str(int err) +{ + return _Syserror_map(_Winerror_map(err)); +} #endif #if _MSVCP_VER >= 100

1 0

Gabriel Ivăncescu : mshtml: Move node vtbl destructor methods down.
by Alexandre Julliard Sept. 18, 2023

Sept. 18, 2023

Module: wine Branch: master Commit: 13842950241ff17b310309adab858fdb9b730b8a URL: https://gitlab.winehq.org/wine/wine/-/commit/13842950241ff17b310309adab858f… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Sep 18 18:00:53 2023 +0300 mshtml: Move node vtbl destructor methods down. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlscript.c | 14 +++++++------- dlls/mshtml/htmlstyleelem.c | 16 ++++++++-------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/mshtml/htmlscript.c b/dlls/mshtml/htmlscript.c index dadd31d24a8..262002b07b5 100644 --- a/dlls/mshtml/htmlscript.c +++ b/dlls/mshtml/htmlscript.c @@ -354,13 +354,6 @@ static inline HTMLScriptElement *impl_from_HTMLDOMNode(HTMLDOMNode *iface) return CONTAINING_RECORD(iface, HTMLScriptElement, element.node); } -static void HTMLScriptElement_destructor(HTMLDOMNode *iface) -{ - HTMLScriptElement *This = impl_from_HTMLDOMNode(iface); - free(This->src_text); - HTMLElement_destructor(&This->element.node); -} - static HRESULT HTMLScriptElement_get_readystate(HTMLDOMNode *iface, BSTR *p) { HTMLScriptElement *This = impl_from_HTMLDOMNode(iface); @@ -422,6 +415,13 @@ static void HTMLScriptElement_unlink(DispatchEx *dispex) unlink_ref(&This->nsscript); } +static void HTMLScriptElement_destructor(HTMLDOMNode *iface) +{ + HTMLScriptElement *This = impl_from_HTMLDOMNode(iface); + free(This->src_text); + HTMLElement_destructor(&This->element.node); +} + static const NodeImplVtbl HTMLScriptElementImplVtbl = { .clsid = &CLSID_HTMLScriptElement, .qi = HTMLScriptElement_QI, diff --git a/dlls/mshtml/htmlstyleelem.c b/dlls/mshtml/htmlstyleelem.c index 8ad167a5fe3..f206537f59a 100644 --- a/dlls/mshtml/htmlstyleelem.c +++ b/dlls/mshtml/htmlstyleelem.c @@ -365,14 +365,6 @@ static inline HTMLStyleElement *impl_from_HTMLDOMNode(HTMLDOMNode *iface) return CONTAINING_RECORD(iface, HTMLStyleElement, element.node); } -static void HTMLStyleElement_destructor(HTMLDOMNode *iface) -{ - HTMLStyleElement *This = impl_from_HTMLDOMNode(iface); - - unlink_ref(&This->style_sheet); - HTMLElement_destructor(iface); -} - static inline HTMLStyleElement *impl_from_DispatchEx(DispatchEx *iface) { return CONTAINING_RECORD(iface, HTMLStyleElement, element.node.event_target.dispex); @@ -410,6 +402,14 @@ static void HTMLStyleElement_unlink(DispatchEx *dispex) unlink_ref(&This->nsstyle); } +static void HTMLStyleElement_destructor(HTMLDOMNode *iface) +{ + HTMLStyleElement *This = impl_from_HTMLDOMNode(iface); + + unlink_ref(&This->style_sheet); + HTMLElement_destructor(iface); +} + static void HTMLStyleElement_init_dispex_info(dispex_data_t *info, compat_mode_t mode) { static const dispex_hook_t ie11_hooks[] = {

1 0

Gabriel Ivăncescu : mshtml: Get rid of useless element destructors.
by Alexandre Julliard Sept. 18, 2023

Sept. 18, 2023

Module: wine Branch: master Commit: 912f1a43ded779645e15e4172f972158e8c1e124 URL: https://gitlab.winehq.org/wine/wine/-/commit/912f1a43ded779645e15e4172f9721… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Sep 18 18:00:53 2023 +0300 mshtml: Get rid of useless element destructors. Just use the HTMLElement_destructor directly. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlcomment.c | 9 +-------- dlls/mshtml/htmlgeneric.c | 9 +-------- dlls/mshtml/htmlhead.c | 36 ++++-------------------------------- dlls/mshtml/htmlobject.c | 9 +-------- dlls/mshtml/htmltable.c | 9 +-------- 5 files changed, 8 insertions(+), 64 deletions(-) diff --git a/dlls/mshtml/htmlcomment.c b/dlls/mshtml/htmlcomment.c index 1f08e2ffa5e..9c720d9468e 100644 --- a/dlls/mshtml/htmlcomment.c +++ b/dlls/mshtml/htmlcomment.c @@ -146,13 +146,6 @@ static inline HTMLCommentElement *impl_from_HTMLDOMNode(HTMLDOMNode *iface) return CONTAINING_RECORD(iface, HTMLCommentElement, element.node); } -static void HTMLCommentElement_destructor(HTMLDOMNode *iface) -{ - HTMLCommentElement *This = impl_from_HTMLDOMNode(iface); - - HTMLElement_destructor(&This->element.node); -} - static HRESULT HTMLCommentElement_clone(HTMLDOMNode *iface, nsIDOMNode *nsnode, HTMLDOMNode **ret) { HTMLCommentElement *This = impl_from_HTMLDOMNode(iface); @@ -180,7 +173,7 @@ static void *HTMLCommentElement_QI(HTMLDOMNode *iface, REFIID riid) static const NodeImplVtbl HTMLCommentElementImplVtbl = { .clsid = &CLSID_HTMLCommentElement, .qi = HTMLCommentElement_QI, - .destructor = HTMLCommentElement_destructor, + .destructor = HTMLElement_destructor, .cpc_entries = HTMLElement_cpc, .clone = HTMLCommentElement_clone, .handle_event = HTMLElement_handle_event, diff --git a/dlls/mshtml/htmlgeneric.c b/dlls/mshtml/htmlgeneric.c index 7cae4026c47..5f069e05f67 100644 --- a/dlls/mshtml/htmlgeneric.c +++ b/dlls/mshtml/htmlgeneric.c @@ -138,17 +138,10 @@ static void *HTMLGenericElement_QI(HTMLDOMNode *iface, REFIID riid) return HTMLElement_QI(&This->element.node, riid); } -static void HTMLGenericElement_destructor(HTMLDOMNode *iface) -{ - HTMLGenericElement *This = impl_from_HTMLDOMNode(iface); - - HTMLElement_destructor(&This->element.node); -} - static const NodeImplVtbl HTMLGenericElementImplVtbl = { .clsid = &CLSID_HTMLGenericElement, .qi = HTMLGenericElement_QI, - .destructor = HTMLGenericElement_destructor, + .destructor = HTMLElement_destructor, .cpc_entries = HTMLElement_cpc, .clone = HTMLElement_clone, .handle_event = HTMLElement_handle_event, diff --git a/dlls/mshtml/htmlhead.c b/dlls/mshtml/htmlhead.c index 3449b27e050..af17a35dbb7 100644 --- a/dlls/mshtml/htmlhead.c +++ b/dlls/mshtml/htmlhead.c @@ -156,17 +156,10 @@ static void *HTMLTitleElement_QI(HTMLDOMNode *iface, REFIID riid) return HTMLElement_QI(&This->element.node, riid); } -static void HTMLTitleElement_destructor(HTMLDOMNode *iface) -{ - HTMLTitleElement *This = HTMLTitleElement_from_HTMLDOMNode(iface); - - HTMLElement_destructor(&This->element.node); -} - static const NodeImplVtbl HTMLTitleElementImplVtbl = { .clsid = &CLSID_HTMLTitleElement, .qi = HTMLTitleElement_QI, - .destructor = HTMLTitleElement_destructor, + .destructor = HTMLElement_destructor, .cpc_entries = HTMLElement_cpc, .clone = HTMLElement_clone, .handle_event = HTMLElement_handle_event, @@ -303,13 +296,6 @@ static inline HTMLHtmlElement *HTMLHtmlElement_from_HTMLDOMNode(HTMLDOMNode *ifa return CONTAINING_RECORD(iface, HTMLHtmlElement, element.node); } -static void HTMLHtmlElement_destructor(HTMLDOMNode *iface) -{ - HTMLHtmlElement *This = HTMLHtmlElement_from_HTMLDOMNode(iface); - - HTMLElement_destructor(&This->element.node); -} - static BOOL HTMLHtmlElement_is_settable(HTMLDOMNode *iface, DISPID dispid) { switch(dispid) { @@ -333,7 +319,7 @@ static void *HTMLHtmlElement_QI(HTMLDOMNode *iface, REFIID riid) static const NodeImplVtbl HTMLHtmlElementImplVtbl = { .clsid = &CLSID_HTMLHtmlElement, .qi = HTMLHtmlElement_QI, - .destructor = HTMLHtmlElement_destructor, + .destructor = HTMLElement_destructor, .cpc_entries = HTMLElement_cpc, .clone = HTMLElement_clone, .handle_event = HTMLElement_handle_event, @@ -553,17 +539,10 @@ static void *HTMLMetaElement_QI(HTMLDOMNode *iface, REFIID riid) return HTMLElement_QI(&This->element.node, riid); } -static void HTMLMetaElement_destructor(HTMLDOMNode *iface) -{ - HTMLMetaElement *This = HTMLMetaElement_from_HTMLDOMNode(iface); - - HTMLElement_destructor(&This->element.node); -} - static const NodeImplVtbl HTMLMetaElementImplVtbl = { .clsid = &CLSID_HTMLMetaElement, .qi = HTMLMetaElement_QI, - .destructor = HTMLMetaElement_destructor, + .destructor = HTMLElement_destructor, .cpc_entries = HTMLElement_cpc, .clone = HTMLElement_clone, .handle_event = HTMLElement_handle_event, @@ -713,17 +692,10 @@ static void *HTMLHeadElement_QI(HTMLDOMNode *iface, REFIID riid) return HTMLElement_QI(&This->element.node, riid); } -static void HTMLHeadElement_destructor(HTMLDOMNode *iface) -{ - HTMLHeadElement *This = impl_from_HTMLDOMNode(iface); - - HTMLElement_destructor(&This->element.node); -} - static const NodeImplVtbl HTMLHeadElementImplVtbl = { .clsid = &CLSID_HTMLHeadElement, .qi = HTMLHeadElement_QI, - .destructor = HTMLHeadElement_destructor, + .destructor = HTMLElement_destructor, .cpc_entries = HTMLElement_cpc, .clone = HTMLElement_clone, .handle_event = HTMLElement_handle_event, diff --git a/dlls/mshtml/htmlobject.c b/dlls/mshtml/htmlobject.c index 6c0fc014dad..6e903a0e97e 100644 --- a/dlls/mshtml/htmlobject.c +++ b/dlls/mshtml/htmlobject.c @@ -1006,17 +1006,10 @@ static void *HTMLEmbedElement_QI(HTMLDOMNode *iface, REFIID riid) return HTMLElement_QI(&This->element.node, riid); } -static void HTMLEmbedElement_destructor(HTMLDOMNode *iface) -{ - HTMLEmbed *This = embed_from_HTMLDOMNode(iface); - - HTMLElement_destructor(&This->element.node); -} - static const NodeImplVtbl HTMLEmbedElementImplVtbl = { .clsid = &CLSID_HTMLEmbed, .qi = HTMLEmbedElement_QI, - .destructor = HTMLEmbedElement_destructor, + .destructor = HTMLElement_destructor, .cpc_entries = HTMLElement_cpc, .clone = HTMLElement_clone, .handle_event = HTMLElement_handle_event, diff --git a/dlls/mshtml/htmltable.c b/dlls/mshtml/htmltable.c index 4d5438d165b..aa4e16037e3 100644 --- a/dlls/mshtml/htmltable.c +++ b/dlls/mshtml/htmltable.c @@ -446,13 +446,6 @@ static inline HTMLTableCell *HTMLTableCell_from_HTMLDOMNode(HTMLDOMNode *iface) return CONTAINING_RECORD(iface, HTMLTableCell, element.node); } -static void HTMLTableCell_destructor(HTMLDOMNode *iface) -{ - HTMLTableCell *This = HTMLTableCell_from_HTMLDOMNode(iface); - - HTMLElement_destructor(&This->element.node); -} - static inline HTMLTableCell *HTMLTableCell_from_DispatchEx(DispatchEx *iface) { return CONTAINING_RECORD(iface, HTMLTableCell, element.node.event_target.dispex); @@ -491,7 +484,7 @@ static void HTMLTableCell_unlink(DispatchEx *dispex) static const NodeImplVtbl HTMLTableCellImplVtbl = { .clsid = &CLSID_HTMLTableCell, .qi = HTMLTableCell_QI, - .destructor = HTMLTableCell_destructor, + .destructor = HTMLElement_destructor, .cpc_entries = HTMLElement_cpc, .clone = HTMLElement_clone, .handle_event = HTMLElement_handle_event,

1 0

Gabriel Ivăncescu : mshtml: Move node vtbl QI methods around.
by Alexandre Julliard Sept. 18, 2023

Sept. 18, 2023

Module: wine Branch: master Commit: 6c1c1aaaa1874635b919ed2b4d8e2bae5ced9d66 URL: https://gitlab.winehq.org/wine/wine/-/commit/6c1c1aaaa1874635b919ed2b4d8e2b… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Sep 18 18:00:53 2023 +0300 mshtml: Move node vtbl QI methods around. So they're in a consistent ordering for dispex conversion. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlbody.c | 32 ++++++++++++------------ dlls/mshtml/htmlcomment.c | 20 +++++++-------- dlls/mshtml/htmlhead.c | 20 +++++++-------- dlls/mshtml/htmlimg.c | 20 +++++++-------- dlls/mshtml/htmlinput.c | 60 ++++++++++++++++++++++----------------------- dlls/mshtml/htmllink.c | 20 +++++++-------- dlls/mshtml/htmlnode.c | 32 ++++++++++++------------ dlls/mshtml/htmlscript.c | 28 ++++++++++----------- dlls/mshtml/htmlselect.c | 10 ++++---- dlls/mshtml/htmlstyleelem.c | 26 ++++++++++---------- dlls/mshtml/htmltable.c | 44 ++++++++++++++++----------------- dlls/mshtml/htmltextarea.c | 28 ++++++++++----------- dlls/mshtml/htmltextnode.c | 14 +++++------ 13 files changed, 177 insertions(+), 177 deletions(-)

1 0

Gabriel Ivăncescu : mshtml: Move some SelectElement methods up.
by Alexandre Julliard Sept. 18, 2023

Sept. 18, 2023

Module: wine Branch: master Commit: 6e6cc7e2862d6400174d6c633269ffc2b8f4040b URL: https://gitlab.winehq.org/wine/wine/-/commit/6e6cc7e2862d6400174d6c633269ff… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Sep 18 18:00:53 2023 +0300 mshtml: Move some SelectElement methods up. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlselect.c | 54 ++++++++++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index 5c020ffe089..13b8f14b807 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -1313,6 +1313,23 @@ static inline HTMLSelectElement *impl_from_HTMLDOMNode(HTMLDOMNode *iface) return CONTAINING_RECORD(iface, HTMLSelectElement, element.node); } +static HRESULT HTMLSelectElementImpl_put_disabled(HTMLDOMNode *iface, VARIANT_BOOL v) +{ + HTMLSelectElement *This = impl_from_HTMLDOMNode(iface); + return IHTMLSelectElement_put_disabled(&This->IHTMLSelectElement_iface, v); +} + +static HRESULT HTMLSelectElementImpl_get_disabled(HTMLDOMNode *iface, VARIANT_BOOL *p) +{ + HTMLSelectElement *This = impl_from_HTMLDOMNode(iface); + return IHTMLSelectElement_get_disabled(&This->IHTMLSelectElement_iface, p); +} + +static inline HTMLSelectElement *impl_from_DispatchEx(DispatchEx *iface) +{ + return CONTAINING_RECORD(iface, HTMLSelectElement, element.node.event_target.dispex); +} + static void *HTMLSelectElement_QI(HTMLDOMNode *iface, REFIID riid) { HTMLSelectElement *This = impl_from_HTMLDOMNode(iface); @@ -1327,16 +1344,20 @@ static void *HTMLSelectElement_QI(HTMLDOMNode *iface, REFIID riid) return HTMLElement_QI(&This->element.node, riid); } -static HRESULT HTMLSelectElementImpl_put_disabled(HTMLDOMNode *iface, VARIANT_BOOL v) +static void HTMLSelectElement_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) { - HTMLSelectElement *This = impl_from_HTMLDOMNode(iface); - return IHTMLSelectElement_put_disabled(&This->IHTMLSelectElement_iface, v); + HTMLSelectElement *This = impl_from_DispatchEx(dispex); + HTMLDOMNode_traverse(dispex, cb); + + if(This->nsselect) + note_cc_edge((nsISupports*)This->nsselect, "nsselect", cb); } -static HRESULT HTMLSelectElementImpl_get_disabled(HTMLDOMNode *iface, VARIANT_BOOL *p) +static void HTMLSelectElement_unlink(DispatchEx *dispex) { - HTMLSelectElement *This = impl_from_HTMLDOMNode(iface); - return IHTMLSelectElement_get_disabled(&This->IHTMLSelectElement_iface, p); + HTMLSelectElement *This = impl_from_DispatchEx(dispex); + HTMLDOMNode_unlink(dispex); + unlink_ref(&This->nsselect); } #define DISPID_OPTIONCOL_0 MSHTML_DISPID_CUSTOM_MIN @@ -1406,27 +1427,6 @@ static HRESULT HTMLSelectElement_invoke(HTMLDOMNode *iface, DISPID id, LCID lcid return S_OK; } -static inline HTMLSelectElement *impl_from_DispatchEx(DispatchEx *iface) -{ - return CONTAINING_RECORD(iface, HTMLSelectElement, element.node.event_target.dispex); -} - -static void HTMLSelectElement_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) -{ - HTMLSelectElement *This = impl_from_DispatchEx(dispex); - HTMLDOMNode_traverse(dispex, cb); - - if(This->nsselect) - note_cc_edge((nsISupports*)This->nsselect, "nsselect", cb); -} - -static void HTMLSelectElement_unlink(DispatchEx *dispex) -{ - HTMLSelectElement *This = impl_from_DispatchEx(dispex); - HTMLDOMNode_unlink(dispex); - unlink_ref(&This->nsselect); -} - static const NodeImplVtbl HTMLSelectElementImplVtbl = { .clsid = &CLSID_HTMLSelectElement, .qi = HTMLSelectElement_QI,

1 0

Gabriel Ivăncescu : mshtml: Move some ObjectElement methods up.
by Alexandre Julliard Sept. 18, 2023

Sept. 18, 2023

Module: wine Branch: master Commit: 7977a6bd59bf246f5b677aa07475fdfd58095136 URL: https://gitlab.winehq.org/wine/wine/-/commit/7977a6bd59bf246f5b677aa07475fd… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Sep 18 18:00:53 2023 +0300 mshtml: Move some ObjectElement methods up. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlobject.c | 67 ++++++++++++++++++++++++------------------------ 1 file changed, 33 insertions(+), 34 deletions(-) diff --git a/dlls/mshtml/htmlobject.c b/dlls/mshtml/htmlobject.c index fbaa7d4c7d1..6c0fc014dad 100644 --- a/dlls/mshtml/htmlobject.c +++ b/dlls/mshtml/htmlobject.c @@ -637,6 +637,18 @@ static inline HTMLObjectElement *impl_from_HTMLDOMNode(HTMLDOMNode *iface) return CONTAINING_RECORD(iface, HTMLObjectElement, plugin_container.element.node); } +static HRESULT HTMLObjectElement_get_readystate(HTMLDOMNode *iface, BSTR *p) +{ + HTMLObjectElement *This = impl_from_HTMLDOMNode(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static inline HTMLObjectElement *impl_from_DispatchEx(DispatchEx *iface) +{ + return CONTAINING_RECORD(iface, HTMLObjectElement, plugin_container.element.node.event_target.dispex); +} + static void *HTMLObjectElement_QI(HTMLDOMNode *iface, REFIID riid) { HTMLObjectElement *This = impl_from_HTMLDOMNode(iface); @@ -676,6 +688,22 @@ static void *HTMLObjectElement_QI(HTMLDOMNode *iface, REFIID riid) return elem_iface; } +static void HTMLObjectElement_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) +{ + HTMLObjectElement *This = impl_from_DispatchEx(dispex); + HTMLDOMNode_traverse(dispex, cb); + + if(This->nsobject) + note_cc_edge((nsISupports*)This->nsobject, "nsobject", cb); +} + +static void HTMLObjectElement_unlink(DispatchEx *dispex) +{ + HTMLObjectElement *This = impl_from_DispatchEx(dispex); + HTMLDOMNode_unlink(dispex); + unlink_ref(&This->nsobject); +} + static void HTMLObjectElement_destructor(HTMLDOMNode *iface) { HTMLObjectElement *This = impl_from_HTMLDOMNode(iface); @@ -686,21 +714,13 @@ static void HTMLObjectElement_destructor(HTMLDOMNode *iface) HTMLElement_destructor(&This->plugin_container.element.node); } -static HRESULT HTMLObjectElement_get_readystate(HTMLDOMNode *iface, BSTR *p) -{ - HTMLObjectElement *This = impl_from_HTMLDOMNode(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; -} - -static HRESULT HTMLObjectElement_get_dispid(HTMLDOMNode *iface, BSTR name, - DWORD grfdex, DISPID *pid) +static HRESULT HTMLObjectElement_get_dispid(HTMLDOMNode *iface, BSTR name, DWORD grfdex, DISPID *dispid) { HTMLObjectElement *This = impl_from_HTMLDOMNode(iface); - TRACE("(%p)->(%s %lx %p)\n", This, debugstr_w(name), grfdex, pid); + TRACE("(%p)->(%s %lx %p)\n", This, debugstr_w(name), grfdex, dispid); - return get_plugin_dispid(&This->plugin_container, name, pid); + return get_plugin_dispid(&This->plugin_container, name, dispid); } static HRESULT HTMLObjectElement_dispex_get_name(HTMLDOMNode *iface, DISPID id, BSTR *name) @@ -712,8 +732,8 @@ static HRESULT HTMLObjectElement_dispex_get_name(HTMLDOMNode *iface, DISPID id, return E_NOTIMPL; } -static HRESULT HTMLObjectElement_invoke(HTMLDOMNode *iface, DISPID id, LCID lcid, - WORD flags, DISPPARAMS *params, VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller) +static HRESULT HTMLObjectElement_invoke(HTMLDOMNode *iface, DISPID id, LCID lcid, WORD flags, DISPPARAMS *params, + VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller) { HTMLObjectElement *This = impl_from_HTMLDOMNode(iface); @@ -722,27 +742,6 @@ static HRESULT HTMLObjectElement_invoke(HTMLDOMNode *iface, DISPID id, LCID lcid return invoke_plugin_prop(&This->plugin_container, id, lcid, flags, params, res, ei); } -static inline HTMLObjectElement *impl_from_DispatchEx(DispatchEx *iface) -{ - return CONTAINING_RECORD(iface, HTMLObjectElement, plugin_container.element.node.event_target.dispex); -} - -static void HTMLObjectElement_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) -{ - HTMLObjectElement *This = impl_from_DispatchEx(dispex); - HTMLDOMNode_traverse(dispex, cb); - - if(This->nsobject) - note_cc_edge((nsISupports*)This->nsobject, "nsobject", cb); -} - -static void HTMLObjectElement_unlink(DispatchEx *dispex) -{ - HTMLObjectElement *This = impl_from_DispatchEx(dispex); - HTMLDOMNode_unlink(dispex); - unlink_ref(&This->nsobject); -} - static const NodeImplVtbl HTMLObjectElementImplVtbl = { .clsid = &CLSID_HTMLObjectElement, .qi = HTMLObjectElement_QI,

1 0