[PATCH v2 0/1] MR463: msvcr100: Implement invalid_multiple_scheduling exception.
- Moved from mailing list to GitLab - Compile warnings are fixed @piotr -- v2: msvcr100: Implement invalid_multiple_scheduling exception. https://gitlab.winehq.org/wine/wine/-/merge_requests/463
From: Torge Matthies <tmatthies(a)codeweavers.com> Signed-off-by: Torge Matthies <tmatthies(a)codeweavers.com> --- dlls/concrt140/concrt140.spec | 12 ++++----- dlls/msvcr100/msvcr100.spec | 8 +++--- dlls/msvcr110/msvcr110.spec | 12 ++++----- dlls/msvcr120/msvcr120.spec | 12 ++++----- dlls/msvcr120_app/msvcr120_app.spec | 12 ++++----- dlls/msvcrt/concurrency.c | 42 +++++++++++++++++++++++++++++ 6 files changed, 70 insertions(+), 28 deletions(-) diff --git a/dlls/concrt140/concrt140.spec b/dlls/concrt140/concrt140.spec index 9370566bb2c..64da684f415 100644 --- a/dlls/concrt140/concrt140.spec +++ b/dlls/concrt140/concrt140.spec @@ -144,12 +144,12 @@ @ stub -arch=arm ??0invalid_link_target(a)Concurrency@@QAA(a)XZ @ stub -arch=i386 ??0invalid_link_target(a)Concurrency@@QAE(a)XZ @ stub -arch=win64 ??0invalid_link_target(a)Concurrency@@QEAA(a)XZ -@ stub -arch=arm ??0invalid_multiple_scheduling(a)Concurrency@@QAA(a)PBD@Z -@ stub -arch=i386 ??0invalid_multiple_scheduling(a)Concurrency@@QAE(a)PBD@Z -@ stub -arch=win64 ??0invalid_multiple_scheduling(a)Concurrency@@QEAA(a)PEBD@Z -@ stub -arch=arm ??0invalid_multiple_scheduling(a)Concurrency@@QAA(a)XZ -@ stub -arch=i386 ??0invalid_multiple_scheduling(a)Concurrency@@QAE(a)XZ -@ stub -arch=win64 ??0invalid_multiple_scheduling(a)Concurrency@@QEAA(a)XZ +@ cdecl -arch=arm ??0invalid_multiple_scheduling(a)Concurrency@@QAA(a)PBD@Z(ptr ptr) invalid_multiple_scheduling_ctor_str +@ thiscall -arch=i386 ??0invalid_multiple_scheduling(a)Concurrency@@QAE(a)PBD@Z(ptr ptr) invalid_multiple_scheduling_ctor_str +@ cdecl -arch=win64 ??0invalid_multiple_scheduling(a)Concurrency@@QEAA(a)PEBD@Z(ptr ptr) invalid_multiple_scheduling_ctor_str +@ cdecl -arch=arm ??0invalid_multiple_scheduling(a)Concurrency@@QAA(a)XZ(ptr) invalid_multiple_scheduling_ctor +@ thiscall -arch=i386 ??0invalid_multiple_scheduling(a)Concurrency@@QAE(a)XZ(ptr) invalid_multiple_scheduling_ctor +@ cdecl -arch=win64 ??0invalid_multiple_scheduling(a)Concurrency@@QEAA(a)XZ(ptr) invalid_multiple_scheduling_ctor @ stub -arch=arm ??0invalid_oversubscribe_operation(a)Concurrency@@QAA(a)PBD@Z @ stub -arch=i386 ??0invalid_oversubscribe_operation(a)Concurrency@@QAE(a)PBD@Z @ stub -arch=win64 ??0invalid_oversubscribe_operation(a)Concurrency@@QEAA(a)PEBD@Z diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 0d38005c13a..c0bbbc5b86d 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -94,10 +94,10 @@ @ stub -arch=win64 ??0invalid_link_target(a)Concurrency@@QEAA(a)PEBD@Z @ stub -arch=win32 ??0invalid_link_target(a)Concurrency@@QAE(a)XZ @ stub -arch=win64 ??0invalid_link_target(a)Concurrency@@QEAA(a)XZ -@ stub -arch=win32 ??0invalid_multiple_scheduling(a)Concurrency@@QAE(a)PBD@Z -@ stub -arch=win64 ??0invalid_multiple_scheduling(a)Concurrency@@QEAA(a)PEBD@Z -@ stub -arch=win32 ??0invalid_multiple_scheduling(a)Concurrency@@QAE(a)XZ -@ stub -arch=win64 ??0invalid_multiple_scheduling(a)Concurrency@@QEAA(a)XZ +@ thiscall -arch=win32 ??0invalid_multiple_scheduling(a)Concurrency@@QAE(a)PBD@Z(ptr ptr) invalid_multiple_scheduling_ctor_str +@ cdecl -arch=win64 ??0invalid_multiple_scheduling(a)Concurrency@@QEAA(a)PEBD@Z(ptr ptr) invalid_multiple_scheduling_ctor_str +@ thiscall -arch=win32 ??0invalid_multiple_scheduling(a)Concurrency@@QAE(a)XZ(ptr) invalid_multiple_scheduling_ctor +@ cdecl -arch=win64 ??0invalid_multiple_scheduling(a)Concurrency@@QEAA(a)XZ(ptr) invalid_multiple_scheduling_ctor @ stub -arch=win32 ??0invalid_operation(a)Concurrency@@QAE(a)PBD@Z @ stub -arch=win64 ??0invalid_operation(a)Concurrency@@QEAA(a)PEBD@Z @ stub -arch=win32 ??0invalid_operation(a)Concurrency@@QAE(a)XZ diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 24e7630194c..a272ae98a1c 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -167,12 +167,12 @@ @ stub -arch=arm ??0invalid_link_target(a)Concurrency@@QAA(a)XZ @ stub -arch=i386 ??0invalid_link_target(a)Concurrency@@QAE(a)XZ @ stub -arch=win64 ??0invalid_link_target(a)Concurrency@@QEAA(a)XZ -@ stub -arch=arm ??0invalid_multiple_scheduling(a)Concurrency@@QAA(a)PBD@Z -@ stub -arch=i386 ??0invalid_multiple_scheduling(a)Concurrency@@QAE(a)PBD@Z -@ stub -arch=win64 ??0invalid_multiple_scheduling(a)Concurrency@@QEAA(a)PEBD@Z -@ stub -arch=arm ??0invalid_multiple_scheduling(a)Concurrency@@QAA(a)XZ -@ stub -arch=i386 ??0invalid_multiple_scheduling(a)Concurrency@@QAE(a)XZ -@ stub -arch=win64 ??0invalid_multiple_scheduling(a)Concurrency@@QEAA(a)XZ +@ cdecl -arch=arm ??0invalid_multiple_scheduling(a)Concurrency@@QAA(a)PBD@Z(ptr ptr) invalid_multiple_scheduling_ctor_str +@ thiscall -arch=i386 ??0invalid_multiple_scheduling(a)Concurrency@@QAE(a)PBD@Z(ptr ptr) invalid_multiple_scheduling_ctor_str +@ cdecl -arch=win64 ??0invalid_multiple_scheduling(a)Concurrency@@QEAA(a)PEBD@Z(ptr ptr) invalid_multiple_scheduling_ctor_str +@ cdecl -arch=arm ??0invalid_multiple_scheduling(a)Concurrency@@QAA(a)XZ(ptr) invalid_multiple_scheduling_ctor +@ thiscall -arch=i386 ??0invalid_multiple_scheduling(a)Concurrency@@QAE(a)XZ(ptr) invalid_multiple_scheduling_ctor +@ cdecl -arch=win64 ??0invalid_multiple_scheduling(a)Concurrency@@QEAA(a)XZ(ptr) invalid_multiple_scheduling_ctor @ stub -arch=arm ??0invalid_operation(a)Concurrency@@QAA(a)PBD@Z @ stub -arch=i386 ??0invalid_operation(a)Concurrency@@QAE(a)PBD@Z @ stub -arch=win64 ??0invalid_operation(a)Concurrency@@QEAA(a)PEBD@Z diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index b1258dad5de..d16316e7e05 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -164,12 +164,12 @@ @ stub -arch=arm ??0invalid_link_target(a)Concurrency@@QAA(a)XZ @ stub -arch=i386 ??0invalid_link_target(a)Concurrency@@QAE(a)XZ @ stub -arch=win64 ??0invalid_link_target(a)Concurrency@@QEAA(a)XZ -@ stub -arch=arm ??0invalid_multiple_scheduling(a)Concurrency@@QAA(a)PBD@Z -@ stub -arch=i386 ??0invalid_multiple_scheduling(a)Concurrency@@QAE(a)PBD@Z -@ stub -arch=win64 ??0invalid_multiple_scheduling(a)Concurrency@@QEAA(a)PEBD@Z -@ stub -arch=arm ??0invalid_multiple_scheduling(a)Concurrency@@QAA(a)XZ -@ stub -arch=i386 ??0invalid_multiple_scheduling(a)Concurrency@@QAE(a)XZ -@ stub -arch=win64 ??0invalid_multiple_scheduling(a)Concurrency@@QEAA(a)XZ +@ cdecl -arch=arm ??0invalid_multiple_scheduling(a)Concurrency@@QAA(a)PBD@Z(ptr ptr) invalid_multiple_scheduling_ctor_str +@ thiscall -arch=i386 ??0invalid_multiple_scheduling(a)Concurrency@@QAE(a)PBD@Z(ptr ptr) invalid_multiple_scheduling_ctor_str +@ cdecl -arch=win64 ??0invalid_multiple_scheduling(a)Concurrency@@QEAA(a)PEBD@Z(ptr ptr) invalid_multiple_scheduling_ctor_str +@ cdecl -arch=arm ??0invalid_multiple_scheduling(a)Concurrency@@QAA(a)XZ(ptr) invalid_multiple_scheduling_ctor +@ thiscall -arch=i386 ??0invalid_multiple_scheduling(a)Concurrency@@QAE(a)XZ(ptr) invalid_multiple_scheduling_ctor +@ cdecl -arch=win64 ??0invalid_multiple_scheduling(a)Concurrency@@QEAA(a)XZ(ptr) invalid_multiple_scheduling_ctor @ stub -arch=arm ??0invalid_operation(a)Concurrency@@QAA(a)PBD@Z @ stub -arch=i386 ??0invalid_operation(a)Concurrency@@QAE(a)PBD@Z @ stub -arch=win64 ??0invalid_operation(a)Concurrency@@QEAA(a)PEBD@Z diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 93ce779ea69..aa5d8ccf968 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -162,12 +162,12 @@ @ stub -arch=arm ??0invalid_link_target(a)Concurrency@@QAA(a)XZ @ stub -arch=i386 ??0invalid_link_target(a)Concurrency@@QAE(a)XZ @ stub -arch=win64 ??0invalid_link_target(a)Concurrency@@QEAA(a)XZ -@ stub -arch=arm ??0invalid_multiple_scheduling(a)Concurrency@@QAA(a)PBD@Z -@ stub -arch=i386 ??0invalid_multiple_scheduling(a)Concurrency@@QAE(a)PBD@Z -@ stub -arch=win64 ??0invalid_multiple_scheduling(a)Concurrency@@QEAA(a)PEBD@Z -@ stub -arch=arm ??0invalid_multiple_scheduling(a)Concurrency@@QAA(a)XZ -@ stub -arch=i386 ??0invalid_multiple_scheduling(a)Concurrency@@QAE(a)XZ -@ stub -arch=win64 ??0invalid_multiple_scheduling(a)Concurrency@@QEAA(a)XZ +@ cdecl -arch=arm ??0invalid_multiple_scheduling(a)Concurrency@@QAA(a)PBD@Z(ptr ptr) msvcr120.??0invalid_multiple_scheduling(a)Concurrency@@QAA(a)PBD@Z +@ thiscall -arch=i386 ??0invalid_multiple_scheduling(a)Concurrency@@QAE(a)PBD@Z(ptr ptr) msvcr120.??0invalid_multiple_scheduling(a)Concurrency@@QAE(a)PBD@Z +@ cdecl -arch=win64 ??0invalid_multiple_scheduling(a)Concurrency@@QEAA(a)PEBD@Z(ptr ptr) msvcr120.??0invalid_multiple_scheduling(a)Concurrency@@QEAA(a)PEBD@Z +@ cdecl -arch=arm ??0invalid_multiple_scheduling(a)Concurrency@@QAA(a)XZ(ptr) msvcr120.??0invalid_multiple_scheduling(a)Concurrency@@QAA(a)XZ +@ thiscall -arch=i386 ??0invalid_multiple_scheduling(a)Concurrency@@QAE(a)XZ(ptr) msvcr120.??0invalid_multiple_scheduling(a)Concurrency@@QAE(a)XZ +@ cdecl -arch=win64 ??0invalid_multiple_scheduling(a)Concurrency@@QEAA(a)XZ(ptr) msvcr120.??0invalid_multiple_scheduling(a)Concurrency@@QEAA(a)XZ @ stub -arch=arm ??0invalid_operation(a)Concurrency@@QAA(a)PBD@Z @ stub -arch=i386 ??0invalid_operation(a)Concurrency@@QAE(a)PBD@Z @ stub -arch=win64 ??0invalid_operation(a)Concurrency@@QEAA(a)PEBD@Z diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index c982e367749..06348173eef 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -329,6 +329,9 @@ extern const vtable_ptr improper_scheduler_attach_vtable; typedef exception improper_scheduler_detach; extern const vtable_ptr improper_scheduler_detach_vtable; +typedef exception invalid_multiple_scheduling; +extern const vtable_ptr invalid_multiple_scheduling_vtable; + typedef exception invalid_scheduler_policy_key; extern const vtable_ptr invalid_scheduler_policy_key_vtable; @@ -451,6 +454,35 @@ improper_scheduler_detach * __thiscall improper_scheduler_detach_copy_ctor( return __exception_copy_ctor(_this, rhs, &improper_scheduler_detach_vtable); } +/* ??0invalid_multiple_scheduling(a)Concurrency@@QAA(a)PBD@Z */ +/* ??0invalid_multiple_scheduling(a)Concurrency@@QAE(a)PBD@Z */ +/* ??0invalid_multiple_scheduling(a)Concurrency@@QEAA(a)PEBD@Z */ +DEFINE_THISCALL_WRAPPER(invalid_multiple_scheduling_ctor_str, 8) +invalid_multiple_scheduling* __thiscall invalid_multiple_scheduling_ctor_str( + invalid_multiple_scheduling *this, const char *str) +{ + TRACE("(%p %p)\n", this, str); + return __exception_ctor(this, str, &invalid_multiple_scheduling_vtable); +} + +/* ??0invalid_multiple_scheduling(a)Concurrency@@QAA(a)XZ */ +/* ??0invalid_multiple_scheduling(a)Concurrency@@QAE(a)XZ */ +/* ??0invalid_multiple_scheduling(a)Concurrency@@QEAA(a)XZ */ +DEFINE_THISCALL_WRAPPER(invalid_multiple_scheduling_ctor, 4) +invalid_multiple_scheduling* __thiscall invalid_multiple_scheduling_ctor( + invalid_multiple_scheduling *this) +{ + return invalid_multiple_scheduling_ctor_str(this, NULL); +} + +DEFINE_THISCALL_WRAPPER(invalid_multiple_scheduling_copy_ctor,8) +invalid_multiple_scheduling * __thiscall invalid_multiple_scheduling_copy_ctor( + invalid_multiple_scheduling * _this, const invalid_multiple_scheduling * rhs) +{ + TRACE("(%p %p)\n", _this, rhs); + return __exception_copy_ctor(_this, rhs, &invalid_multiple_scheduling_vtable); +} + /* ??0invalid_scheduler_policy_key(a)Concurrency@@QAE(a)PBD@Z */ /* ??0invalid_scheduler_policy_key(a)Concurrency@@QEAA(a)PEBD@Z */ DEFINE_THISCALL_WRAPPER(invalid_scheduler_policy_key_ctor_str, 8) @@ -583,6 +615,8 @@ DEFINE_RTTI_DATA1(improper_scheduler_attach, 0, &cexception_rtti_base_descriptor ".?AVimproper_scheduler_attach(a)Concurrency@@") DEFINE_RTTI_DATA1(improper_scheduler_detach, 0, &cexception_rtti_base_descriptor, ".?AVimproper_scheduler_detach(a)Concurrency@@") +DEFINE_RTTI_DATA1(invalid_multiple_scheduling, 0, &cexception_rtti_base_descriptor, + ".?AVinvalid_multiple_scheduling(a)Concurrency@@") DEFINE_RTTI_DATA1(invalid_scheduler_policy_key, 0, &cexception_rtti_base_descriptor, ".?AVinvalid_scheduler_policy_key(a)Concurrency@@") DEFINE_RTTI_DATA1(invalid_scheduler_policy_thread_specification, 0, &cexception_rtti_base_descriptor, @@ -595,6 +629,9 @@ DEFINE_RTTI_DATA1(scheduler_resource_allocation_error, 0, &cexception_rtti_base_ DEFINE_CXX_DATA1(improper_lock, &cexception_cxx_type_info, cexception_dtor) DEFINE_CXX_DATA1(improper_scheduler_attach, &cexception_cxx_type_info, cexception_dtor) DEFINE_CXX_DATA1(improper_scheduler_detach, &cexception_cxx_type_info, cexception_dtor) +#ifdef __x86_64__ +DEFINE_CXX_DATA1(invalid_multiple_scheduling, &cexception_cxx_type_info, cexception_dtor) +#endif DEFINE_CXX_DATA1(invalid_scheduler_policy_key, &cexception_cxx_type_info, cexception_dtor) DEFINE_CXX_DATA1(invalid_scheduler_policy_thread_specification, &cexception_cxx_type_info, cexception_dtor) DEFINE_CXX_DATA1(invalid_scheduler_policy_value, &cexception_cxx_type_info, cexception_dtor) @@ -610,6 +647,9 @@ __ASM_BLOCK_BEGIN(concurrency_exception_vtables) __ASM_VTABLE(improper_scheduler_detach, VTABLE_ADD_FUNC(cexception_vector_dtor) VTABLE_ADD_FUNC(cexception_what)); + __ASM_VTABLE(invalid_multiple_scheduling, + VTABLE_ADD_FUNC(cexception_vector_dtor) + VTABLE_ADD_FUNC(cexception_what)); __ASM_VTABLE(invalid_scheduler_policy_key, VTABLE_ADD_FUNC(cexception_vector_dtor) VTABLE_ADD_FUNC(cexception_what)); @@ -3042,6 +3082,7 @@ void msvcrt_init_concurrency(void *base) init_improper_lock_rtti(base); init_improper_scheduler_attach_rtti(base); init_improper_scheduler_detach_rtti(base); + init_invalid_multiple_scheduling_rtti(base); init_invalid_scheduler_policy_key_rtti(base); init_invalid_scheduler_policy_thread_specification_rtti(base); init_invalid_scheduler_policy_value_rtti(base); @@ -3058,6 +3099,7 @@ void msvcrt_init_concurrency(void *base) init_improper_lock_cxx(base); init_improper_scheduler_attach_cxx(base); init_improper_scheduler_detach_cxx(base); + init_invalid_multiple_scheduling_cxx(base); init_invalid_scheduler_policy_key_cxx(base); init_invalid_scheduler_policy_thread_specification_cxx(base); init_invalid_scheduler_policy_value_cxx(base); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/463
On Fri Jul 15 16:03:52 2022 +0000, Piotr Caban wrote:
Please use %s format when printing str. No other constructor in this file does that, should I change all of them?
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/463#note_4423
On Fri Jul 15 16:03:52 2022 +0000, Piotr Caban wrote:
It's still causing compilation warnings in 32-bit case: ``` In file included from ../wine_src/dlls/msvcrt/cxx.h:19, from ../wine_src/dlls/msvcrt/concurrency.c:28: ../wine_src/dlls/msvcrt/concurrency.c:632:18: error: �������invalid_multiple_scheduling_exception_type�������� defined but not used [-Werror=unused-const-variable=] 632 | DEFINE_CXX_DATA1(invalid_multiple_scheduling, &cexception_cxx_type_info, cexception_dtor) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~ ../wine_src/dlls/msvcrt/cppexcept.h:178:33: note: in definition of macro �������DEFINE_CXX_EXCEPTION�������� 178 | static const cxx_exception_type type ## _exception_type = { \ | ^~~~ ../wine_src/dlls/msvcrt/cppexcept.h:241:5: note: in expansion of macro �������DEFINE_CXX_DATA�������� 241 | DEFINE_CXX_DATA(name, 1, cl1, NULL, dtor) | ^~~~~~~~~~~~~~~ ``` Sorry about that, should be fixed now
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/463#note_4424
On Fri Jul 15 18:57:05 2022 +0000, Torge Matthies wrote:
Sorry about that, should be fixed now It should be fixed by removing the line, it's not needed on x86_64 as well. You will need to add it when adding code that throws the exception.
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/463#note_4425
On Fri Jul 15 18:56:32 2022 +0000, Torge Matthies wrote:
No other constructor in this file does that, should I change all of them? Yes, please.
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/463#note_4426
participants (3)
-
Piotr Caban (＠piotr) -
Torge Matthies
-
Torge Matthies (＠tmatthies)