[PATCH v2 0/7] MR906: msvcr: Implement _StructuredTaskCollection::_RunAndWait and the constructor
This implements the _RunAndWait member function and the constructor of the _StructuredTaskCollection, which enables the tests for that class to run. Also adds a throw of a missing_wait exception to the destructor when chores are scheduled and _RunAndWait was not called. Remaining stuff after this: - Task collection cancelling + IsCancelling function (next MR) - Cancellation token support (requires RE'ing the _CancellationTokenState class, currently in progress) -- v2: msvcr120: Throw exception in _StructuredTaskCollection_dtor if _RunAndWait was not called. msvcr100: Implement missing_wait exception. msvcr110: Implement _StructuredTaskCollection::_StructuredTaskCollection_ctor. msvcr100: Implement exception passing from chore threads to _RunAndWait. msvcr100: Factor out EXCEPTION_RECORD to exception_ptr conversion. msvcr100: Move exception_ptr functions to a separate file. msvcr100: Implement _StructuredTaskCollection::_RunAndWait. https://gitlab.winehq.org/wine/wine/-/merge_requests/906
From: Torge Matthies <tmatthies(a)codeweavers.com> Signed-off-by: Torge Matthies <tmatthies(a)codeweavers.com> --- dlls/msvcrt/concurrency.c | 50 +++++++++++++++++++++++++++++++++------ 1 file changed, 43 insertions(+), 7 deletions(-) diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index f7f7adb86ed..9b066230a54 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -1900,6 +1900,15 @@ static ThreadScheduler *get_thread_scheduler_from_context(Context *context) return NULL; } +static void execute_chore(_UnrealizedChore *chore, + _StructuredTaskCollection *task_collection) +{ + TRACE("(%p %p)\n", chore, task_collection); + + if (chore->chore_proc) + chore->chore_proc(chore); +} + static void CALLBACK chore_wrapper_finally(BOOL normal, void *data) { _UnrealizedChore *chore = data; @@ -1921,23 +1930,20 @@ static void CALLBACK chore_wrapper_finally(BOOL normal, void *data) new_finished = prev_finished + 1; } while (InterlockedCompareExchange(ptr, new_finished, prev_finished) != prev_finished); + RtlWakeAddressAll((LONG*)ptr); } static void __cdecl chore_wrapper(_UnrealizedChore *chore) { - TRACE("(%p)\n", chore); - __TRY { - if (chore->chore_proc) - chore->chore_proc(chore); + execute_chore(chore, chore->task_collection); } __FINALLY_CTX(chore_wrapper_finally, chore) } -static void __cdecl _StructuredTaskCollection_scheduler_cb(void *data) +static void pick_and_execute_chore(ThreadScheduler *scheduler) { - ThreadScheduler *scheduler = (ThreadScheduler*)get_current_scheduler(); struct list *entry; struct scheduled_chore *sc; _UnrealizedChore *chore; @@ -1965,6 +1971,11 @@ static void __cdecl _StructuredTaskCollection_scheduler_cb(void *data) chore->chore_wrapper(chore); } +static void __cdecl _StructuredTaskCollection_scheduler_cb(void *data) +{ + pick_and_execute_chore((ThreadScheduler*)get_current_scheduler()); +} + static bool schedule_chore(_StructuredTaskCollection *this, _UnrealizedChore *chore, Scheduler **pscheduler) { @@ -2048,7 +2059,32 @@ void __thiscall _StructuredTaskCollection__Schedule( _StructuredTaskCollection__RunAndWait( _StructuredTaskCollection *this, _UnrealizedChore *chore) { - FIXME("(%p %p): stub!\n", this, chore); + LONG expected, val; + + TRACE("(%p %p)\n", this, chore); + + if (this->context) + { + ThreadScheduler *scheduler = get_thread_scheduler_from_context(this->context); + if (scheduler) + pick_and_execute_chore(scheduler); + } + + if (chore) { + if (chore->task_collection) { + invalid_multiple_scheduling e; + invalid_multiple_scheduling_ctor_str(&e, "Chore scheduled multiple times"); + _CxxThrowException(&e, &invalid_multiple_scheduling_exception_type); + } + execute_chore(chore, this); + } + + expected = this->count ? this->count : FINISHED_INITIAL; + while ((val = this->finished) != expected) + RtlWaitOnAddress((LONG*)&this->finished, &val, sizeof(val), NULL); + + this->finished = 0; + this->count = 0; return 1; } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/906
From: Torge Matthies <tmatthies(a)codeweavers.com> Signed-off-by: Torge Matthies <tmatthies(a)codeweavers.com> --- dlls/msvcr100/Makefile.in | 1 + dlls/msvcr110/Makefile.in | 1 + dlls/msvcr120/Makefile.in | 1 + dlls/msvcrt/Makefile.in | 1 + dlls/msvcrt/cpp.c | 357 ++---------------------------------- dlls/msvcrt/cxx.h | 8 + dlls/msvcrt/exception_ptr.c | 350 +++++++++++++++++++++++++++++++++++ 7 files changed, 378 insertions(+), 341 deletions(-) create mode 100644 dlls/msvcrt/exception_ptr.c diff --git a/dlls/msvcr100/Makefile.in b/dlls/msvcr100/Makefile.in index a48ae314257..d17aa79b3d7 100644 --- a/dlls/msvcr100/Makefile.in +++ b/dlls/msvcr100/Makefile.in @@ -19,6 +19,7 @@ C_SRCS = \ except_arm64.c \ except_i386.c \ except_x86_64.c \ + exception_ptr.c \ exit.c \ file.c \ heap.c \ diff --git a/dlls/msvcr110/Makefile.in b/dlls/msvcr110/Makefile.in index 26db1d46f7a..0bc15e27d94 100644 --- a/dlls/msvcr110/Makefile.in +++ b/dlls/msvcr110/Makefile.in @@ -19,6 +19,7 @@ C_SRCS = \ except_arm64.c \ except_i386.c \ except_x86_64.c \ + exception_ptr.c \ exit.c \ file.c \ heap.c \ diff --git a/dlls/msvcr120/Makefile.in b/dlls/msvcr120/Makefile.in index d2957c2f1d3..cc3d5b2bdff 100644 --- a/dlls/msvcr120/Makefile.in +++ b/dlls/msvcr120/Makefile.in @@ -19,6 +19,7 @@ C_SRCS = \ except_arm64.c \ except_i386.c \ except_x86_64.c \ + exception_ptr.c \ exit.c \ file.c \ heap.c \ diff --git a/dlls/msvcrt/Makefile.in b/dlls/msvcrt/Makefile.in index e8a510d9937..8cd0c4ea7f4 100644 --- a/dlls/msvcrt/Makefile.in +++ b/dlls/msvcrt/Makefile.in @@ -23,6 +23,7 @@ C_SRCS = \ except_arm64.c \ except_i386.c \ except_x86_64.c \ + exception_ptr.c \ exit.c \ file.c \ heap.c \ diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index f3200e046cb..4c46b3d4e86 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -583,7 +583,9 @@ DEFINE_RTTI_DATA1( bad_cast, 0, &exception_rtti_base_descriptor, ".?AVbad_cast@@ DEFINE_RTTI_DATA2( __non_rtti_object, 0, &bad_typeid_rtti_base_descriptor, &exception_rtti_base_descriptor, ".?AV__non_rtti_object@@" ) #endif +#if _MSVCR_VER >= 100 DEFINE_CXX_EXCEPTION0( exception, exception_dtor ) +#endif DEFINE_CXX_DATA1( bad_typeid, &exception_cxx_type_info, bad_typeid_dtor ) DEFINE_CXX_DATA1( bad_cast, &exception_cxx_type_info, bad_cast_dtor ) DEFINE_CXX_DATA2( __non_rtti_object, &bad_typeid_cxx_type_info, @@ -605,7 +607,11 @@ void msvcrt_init_exception(void *base) init_bad_cast_rtti(base); init___non_rtti_object_rtti(base); +#if _MSVCR_VER >= 100 init_exception_cxx(base); +#else + init_exception_cxx_type_info(base); +#endif init_bad_typeid_cxx(base); init_bad_cast_cxx(base); init___non_rtti_object_cxx(base); @@ -624,6 +630,15 @@ void throw_bad_alloc(void) } #endif +#if _MSVCR_VER >= 100 +void throw_exception(const char* msg) +{ + exception e; + __exception_ctor(&e, msg, &exception_vtable); + _CxxThrowException(&e, &exception_exception_type); +} +#endif + /****************************************************************** * ?set_terminate@@YAP6AXXZP6AXXZ(a)Z (MSVCRT.@) * @@ -1128,351 +1143,11 @@ const char * __thiscall type_info_name_internal_method(type_info * _this, struct return type_info_name(_this); } -#endif /* _MSVCR_VER >= 80 */ - -/* std::exception_ptr class helpers */ -typedef struct -{ - EXCEPTION_RECORD *rec; - LONG *ref; /* not binary compatible with native msvcr100 */ -} exception_ptr; - -#if _MSVCR_VER >= 100 - -/********************************************************************* - * ?__ExceptionPtrCreate@@YAXPAX(a)Z - * ?__ExceptionPtrCreate@@YAXPEAX(a)Z - */ -void __cdecl __ExceptionPtrCreate(exception_ptr *ep) -{ - TRACE("(%p)\n", ep); - - ep->rec = NULL; - ep->ref = NULL; -} - -#ifdef __ASM_USE_THISCALL_WRAPPER -extern void call_dtor(const cxx_exception_type *type, void *func, void *object); - -__ASM_GLOBAL_FUNC( call_dtor, - "movl 12(%esp),%ecx\n\t" - "call *8(%esp)\n\t" - "ret" ); -#elif __x86_64__ -static inline void call_dtor(const cxx_exception_type *type, unsigned int dtor, void *object) -{ - char *base = RtlPcToFileHeader((void*)type, (void**)&base); - void (__cdecl *func)(void*) = (void*)(base + dtor); - func(object); -} -#else -#define call_dtor(type, func, object) ((void (__thiscall*)(void*))(func))(object) -#endif - -/********************************************************************* - * ?__ExceptionPtrDestroy@@YAXPAX(a)Z - * ?__ExceptionPtrDestroy@@YAXPEAX(a)Z - */ -void __cdecl __ExceptionPtrDestroy(exception_ptr *ep) -{ - TRACE("(%p)\n", ep); - - if (!ep->rec) - return; - - if (!InterlockedDecrement(ep->ref)) - { - if (ep->rec->ExceptionCode == CXX_EXCEPTION) - { - const cxx_exception_type *type = (void*)ep->rec->ExceptionInformation[2]; - void *obj = (void*)ep->rec->ExceptionInformation[1]; - - if (type && type->destructor) call_dtor(type, type->destructor, obj); - HeapFree(GetProcessHeap(), 0, obj); - } - - HeapFree(GetProcessHeap(), 0, ep->rec); - HeapFree(GetProcessHeap(), 0, ep->ref); - } -} - -/********************************************************************* - * ?__ExceptionPtrCopy@@YAXPAXPBX(a)Z - * ?__ExceptionPtrCopy@@YAXPEAXPEBX(a)Z - */ -void __cdecl __ExceptionPtrCopy(exception_ptr *ep, const exception_ptr *copy) -{ - TRACE("(%p %p)\n", ep, copy); - - /* don't destroy object stored in ep */ - *ep = *copy; - if (ep->ref) - InterlockedIncrement(copy->ref); -} - -/********************************************************************* - * ?__ExceptionPtrAssign@@YAXPAXPBX(a)Z - * ?__ExceptionPtrAssign@@YAXPEAXPEBX(a)Z - */ -void __cdecl __ExceptionPtrAssign(exception_ptr *ep, const exception_ptr *assign) -{ - TRACE("(%p %p)\n", ep, assign); - - /* don't destroy object stored in ep */ - if (ep->ref) - InterlockedDecrement(ep->ref); - - *ep = *assign; - if (ep->ref) - InterlockedIncrement(ep->ref); -} - -#endif /* _MSVCR_VER >= 100 */ - -/********************************************************************* - * ?__ExceptionPtrRethrow@@YAXPBX(a)Z - * ?__ExceptionPtrRethrow@@YAXPEBX(a)Z - */ -void __cdecl __ExceptionPtrRethrow(const exception_ptr *ep) -{ - TRACE("(%p)\n", ep); - - if (!ep->rec) - { - static const char *exception_msg = "bad exception"; - exception e; - - exception_ctor(&e, &exception_msg); - _CxxThrowException(&e, &exception_exception_type); - return; - } - - RaiseException(ep->rec->ExceptionCode, ep->rec->ExceptionFlags & (~EH_UNWINDING), - ep->rec->NumberParameters, ep->rec->ExceptionInformation); -} - -#if _MSVCR_VER >= 100 - -#ifdef __i386__ -extern void call_copy_ctor( void *func, void *this, void *src, int has_vbase ); -#else -static inline void call_copy_ctor( void *func, void *this, void *src, int has_vbase ) -{ - TRACE( "calling copy ctor %p object %p src %p\n", func, this, src ); - if (has_vbase) - ((void (__cdecl*)(void*, void*, BOOL))func)(this, src, 1); - else - ((void (__cdecl*)(void*, void*))func)(this, src); -} -#endif - -/********************************************************************* - * ?__ExceptionPtrCurrentException@@YAXPAX(a)Z - * ?__ExceptionPtrCurrentException@@YAXPEAX(a)Z - */ -#ifndef __x86_64__ -void __cdecl __ExceptionPtrCurrentException(exception_ptr *ep) -{ - EXCEPTION_RECORD *rec = msvcrt_get_thread_data()->exc_record; - - TRACE("(%p)\n", ep); - - if (!rec) - { - ep->rec = NULL; - ep->ref = NULL; - return; - } - - ep->rec = HeapAlloc(GetProcessHeap(), 0, sizeof(EXCEPTION_RECORD)); - ep->ref = HeapAlloc(GetProcessHeap(), 0, sizeof(int)); - - *ep->rec = *rec; - *ep->ref = 1; - - if (ep->rec->ExceptionCode == CXX_EXCEPTION) - { - const cxx_exception_type *et = (void*)ep->rec->ExceptionInformation[2]; - const cxx_type_info *ti; - void **data, *obj; - - ti = et->type_info_table->info[0]; - data = HeapAlloc(GetProcessHeap(), 0, ti->size); - - obj = (void*)ep->rec->ExceptionInformation[1]; - if (ti->flags & CLASS_IS_SIMPLE_TYPE) - { - memcpy(data, obj, ti->size); - if (ti->size == sizeof(void *)) *data = get_this_pointer(&ti->offsets, *data); - } - else if (ti->copy_ctor) - { - call_copy_ctor(ti->copy_ctor, data, get_this_pointer(&ti->offsets, obj), - ti->flags & CLASS_HAS_VIRTUAL_BASE_CLASS); - } - else - memcpy(data, get_this_pointer(&ti->offsets, obj), ti->size); - ep->rec->ExceptionInformation[1] = (ULONG_PTR)data; - } - return; -} -#else -void __cdecl __ExceptionPtrCurrentException(exception_ptr *ep) -{ - EXCEPTION_RECORD *rec = msvcrt_get_thread_data()->exc_record; - - TRACE("(%p)\n", ep); - - if (!rec) - { - ep->rec = NULL; - ep->ref = NULL; - return; - } - - ep->rec = HeapAlloc(GetProcessHeap(), 0, sizeof(EXCEPTION_RECORD)); - ep->ref = HeapAlloc(GetProcessHeap(), 0, sizeof(int)); - - *ep->rec = *rec; - *ep->ref = 1; - - if (ep->rec->ExceptionCode == CXX_EXCEPTION) - { - const cxx_exception_type *et = (void*)ep->rec->ExceptionInformation[2]; - const cxx_type_info *ti; - void **data, *obj; - char *base = RtlPcToFileHeader((void*)et, (void**)&base); - - ti = (const cxx_type_info*)(base + ((const cxx_type_info_table*)(base + et->type_info_table))->info[0]); - data = HeapAlloc(GetProcessHeap(), 0, ti->size); - - obj = (void*)ep->rec->ExceptionInformation[1]; - if (ti->flags & CLASS_IS_SIMPLE_TYPE) - { - memcpy(data, obj, ti->size); - if (ti->size == sizeof(void *)) *data = get_this_pointer(&ti->offsets, *data); - } - else if (ti->copy_ctor) - { - call_copy_ctor(base + ti->copy_ctor, data, get_this_pointer(&ti->offsets, obj), - ti->flags & CLASS_HAS_VIRTUAL_BASE_CLASS); - } - else - memcpy(data, get_this_pointer(&ti->offsets, obj), ti->size); - ep->rec->ExceptionInformation[1] = (ULONG_PTR)data; - } - return; -} -#endif - -#endif /* _MSVCR_VER >= 100 */ - -#if _MSVCR_VER >= 110 -/********************************************************************* - * ?__ExceptionPtrToBool@@YA_NPBX(a)Z - * ?__ExceptionPtrToBool@@YA_NPEBX(a)Z - */ -bool __cdecl __ExceptionPtrToBool(exception_ptr *ep) -{ - return !!ep->rec; -} -#endif - -#if _MSVCR_VER >= 100 - -/********************************************************************* - * ?__ExceptionPtrCopyException@@YAXPAXPBX1(a)Z - * ?__ExceptionPtrCopyException@@YAXPEAXPEBX1(a)Z - */ -#ifndef __x86_64__ -void __cdecl __ExceptionPtrCopyException(exception_ptr *ep, - exception *object, const cxx_exception_type *type) -{ - const cxx_type_info *ti; - void **data; - - __ExceptionPtrDestroy(ep); - - ep->rec = HeapAlloc(GetProcessHeap(), 0, sizeof(EXCEPTION_RECORD)); - ep->ref = HeapAlloc(GetProcessHeap(), 0, sizeof(int)); - *ep->ref = 1; - - memset(ep->rec, 0, sizeof(EXCEPTION_RECORD)); - ep->rec->ExceptionCode = CXX_EXCEPTION; - ep->rec->ExceptionFlags = EH_NONCONTINUABLE; - ep->rec->NumberParameters = 3; - ep->rec->ExceptionInformation[0] = CXX_FRAME_MAGIC_VC6; - ep->rec->ExceptionInformation[2] = (ULONG_PTR)type; - - ti = type->type_info_table->info[0]; - data = HeapAlloc(GetProcessHeap(), 0, ti->size); - if (ti->flags & CLASS_IS_SIMPLE_TYPE) - { - memcpy(data, object, ti->size); - if (ti->size == sizeof(void *)) *data = get_this_pointer(&ti->offsets, *data); - } - else if (ti->copy_ctor) - { - call_copy_ctor(ti->copy_ctor, data, get_this_pointer(&ti->offsets, object), - ti->flags & CLASS_HAS_VIRTUAL_BASE_CLASS); - } - else - memcpy(data, get_this_pointer(&ti->offsets, object), ti->size); - ep->rec->ExceptionInformation[1] = (ULONG_PTR)data; -} -#else -void __cdecl __ExceptionPtrCopyException(exception_ptr *ep, - exception *object, const cxx_exception_type *type) -{ - const cxx_type_info *ti; - void **data; - char *base; - - RtlPcToFileHeader((void*)type, (void**)&base); - __ExceptionPtrDestroy(ep); - - ep->rec = HeapAlloc(GetProcessHeap(), 0, sizeof(EXCEPTION_RECORD)); - ep->ref = HeapAlloc(GetProcessHeap(), 0, sizeof(int)); - *ep->ref = 1; - - memset(ep->rec, 0, sizeof(EXCEPTION_RECORD)); - ep->rec->ExceptionCode = CXX_EXCEPTION; - ep->rec->ExceptionFlags = EH_NONCONTINUABLE; - ep->rec->NumberParameters = 4; - ep->rec->ExceptionInformation[0] = CXX_FRAME_MAGIC_VC6; - ep->rec->ExceptionInformation[2] = (ULONG_PTR)type; - ep->rec->ExceptionInformation[3] = (ULONG_PTR)base; - - ti = (const cxx_type_info*)(base + ((const cxx_type_info_table*)(base + type->type_info_table))->info[0]); - data = HeapAlloc(GetProcessHeap(), 0, ti->size); - if (ti->flags & CLASS_IS_SIMPLE_TYPE) - { - memcpy(data, object, ti->size); - if (ti->size == sizeof(void *)) *data = get_this_pointer(&ti->offsets, *data); - } - else if (ti->copy_ctor) - { - call_copy_ctor(base + ti->copy_ctor, data, get_this_pointer(&ti->offsets, object), - ti->flags & CLASS_HAS_VIRTUAL_BASE_CLASS); - } - else - memcpy(data, get_this_pointer(&ti->offsets, object), ti->size); - ep->rec->ExceptionInformation[1] = (ULONG_PTR)data; -} -#endif - -bool __cdecl __ExceptionPtrCompare(const exception_ptr *ep1, const exception_ptr *ep2) -{ - return ep1->rec == ep2->rec; -} - -#endif /* _MSVCR_VER >= 100 */ - -#if _MSVCR_VER >= 80 void* __cdecl __AdjustPointer(void *obj, const this_ptr_offsets *off) { return get_this_pointer(off, obj); } + #endif #if _MSVCR_VER >= 140 diff --git a/dlls/msvcrt/cxx.h b/dlls/msvcrt/cxx.h index cacbb1524b6..4051229c626 100644 --- a/dlls/msvcrt/cxx.h +++ b/dlls/msvcrt/cxx.h @@ -308,3 +308,11 @@ __ASM_BLOCK_BEGIN(type_info_vtables) \ __ASM_VTABLE(type_info, \ VTABLE_ADD_FUNC(type_info_vector_dtor)); \ __ASM_BLOCK_END + +typedef struct +{ + EXCEPTION_RECORD *rec; + LONG *ref; /* not binary compatible with native msvcr100 */ +} exception_ptr; + +void throw_exception(const char*) DECLSPEC_HIDDEN; diff --git a/dlls/msvcrt/exception_ptr.c b/dlls/msvcrt/exception_ptr.c new file mode 100644 index 00000000000..d4c427e436f --- /dev/null +++ b/dlls/msvcrt/exception_ptr.c @@ -0,0 +1,350 @@ +/* + * std::exception_ptr helper functions + * + * Copyright 2022 Torge Matthies for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include <stdbool.h> + +#include "windef.h" +#include "winternl.h" +#include "wine/exception.h" +#include "wine/debug.h" +#include "msvcrt.h" +#include "cxx.h" + +#if _MSVCR_VER >= 100 + +WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); + +/********************************************************************* + * ?__ExceptionPtrCreate@@YAXPAX(a)Z + * ?__ExceptionPtrCreate@@YAXPEAX(a)Z + */ +void __cdecl __ExceptionPtrCreate(exception_ptr *ep) +{ + TRACE("(%p)\n", ep); + + ep->rec = NULL; + ep->ref = NULL; +} + +#ifdef __ASM_USE_THISCALL_WRAPPER +extern void call_dtor(const cxx_exception_type *type, void *func, void *object); + +__ASM_GLOBAL_FUNC( call_dtor, + "movl 12(%esp),%ecx\n\t" + "call *8(%esp)\n\t" + "ret" ); +#elif __x86_64__ +static inline void call_dtor(const cxx_exception_type *type, unsigned int dtor, void *object) +{ + char *base = RtlPcToFileHeader((void*)type, (void**)&base); + void (__cdecl *func)(void*) = (void*)(base + dtor); + func(object); +} +#else +#define call_dtor(type, func, object) ((void (__thiscall*)(void*))(func))(object) +#endif + +/********************************************************************* + * ?__ExceptionPtrDestroy@@YAXPAX(a)Z + * ?__ExceptionPtrDestroy@@YAXPEAX(a)Z + */ +void __cdecl __ExceptionPtrDestroy(exception_ptr *ep) +{ + TRACE("(%p)\n", ep); + + if (!ep->rec) + return; + + if (!InterlockedDecrement(ep->ref)) + { + if (ep->rec->ExceptionCode == CXX_EXCEPTION) + { + const cxx_exception_type *type = (void*)ep->rec->ExceptionInformation[2]; + void *obj = (void*)ep->rec->ExceptionInformation[1]; + + if (type && type->destructor) call_dtor(type, type->destructor, obj); + HeapFree(GetProcessHeap(), 0, obj); + } + + HeapFree(GetProcessHeap(), 0, ep->rec); + HeapFree(GetProcessHeap(), 0, ep->ref); + } +} + +/********************************************************************* + * ?__ExceptionPtrCopy@@YAXPAXPBX(a)Z + * ?__ExceptionPtrCopy@@YAXPEAXPEBX(a)Z + */ +void __cdecl __ExceptionPtrCopy(exception_ptr *ep, const exception_ptr *copy) +{ + TRACE("(%p %p)\n", ep, copy); + + /* don't destroy object stored in ep */ + *ep = *copy; + if (ep->ref) + InterlockedIncrement(copy->ref); +} + +/********************************************************************* + * ?__ExceptionPtrAssign@@YAXPAXPBX(a)Z + * ?__ExceptionPtrAssign@@YAXPEAXPEBX(a)Z + */ +void __cdecl __ExceptionPtrAssign(exception_ptr *ep, const exception_ptr *assign) +{ + TRACE("(%p %p)\n", ep, assign); + + /* don't destroy object stored in ep */ + if (ep->ref) + InterlockedDecrement(ep->ref); + + *ep = *assign; + if (ep->ref) + InterlockedIncrement(ep->ref); +} + +/********************************************************************* + * ?__ExceptionPtrRethrow@@YAXPBX(a)Z + * ?__ExceptionPtrRethrow@@YAXPEBX(a)Z + */ +void __cdecl __ExceptionPtrRethrow(const exception_ptr *ep) +{ + TRACE("(%p)\n", ep); + + if (!ep->rec) + { + throw_exception("bad exception"); + return; + } + + RaiseException(ep->rec->ExceptionCode, ep->rec->ExceptionFlags & (~EH_UNWINDING), + ep->rec->NumberParameters, ep->rec->ExceptionInformation); +} + +#ifdef __i386__ +extern void call_copy_ctor( void *func, void *this, void *src, int has_vbase ); +#else +static inline void call_copy_ctor( void *func, void *this, void *src, int has_vbase ) +{ + TRACE( "calling copy ctor %p object %p src %p\n", func, this, src ); + if (has_vbase) + ((void (__cdecl*)(void*, void*, BOOL))func)(this, src, 1); + else + ((void (__cdecl*)(void*, void*))func)(this, src); +} +#endif + +/********************************************************************* + * ?__ExceptionPtrCurrentException@@YAXPAX(a)Z + * ?__ExceptionPtrCurrentException@@YAXPEAX(a)Z + */ +#ifndef __x86_64__ +void __cdecl __ExceptionPtrCurrentException(exception_ptr *ep) +{ + EXCEPTION_RECORD *rec = msvcrt_get_thread_data()->exc_record; + + TRACE("(%p)\n", ep); + + if (!rec) + { + ep->rec = NULL; + ep->ref = NULL; + return; + } + + ep->rec = HeapAlloc(GetProcessHeap(), 0, sizeof(EXCEPTION_RECORD)); + ep->ref = HeapAlloc(GetProcessHeap(), 0, sizeof(int)); + + *ep->rec = *rec; + *ep->ref = 1; + + if (ep->rec->ExceptionCode == CXX_EXCEPTION) + { + const cxx_exception_type *et = (void*)ep->rec->ExceptionInformation[2]; + const cxx_type_info *ti; + void **data, *obj; + + ti = et->type_info_table->info[0]; + data = HeapAlloc(GetProcessHeap(), 0, ti->size); + + obj = (void*)ep->rec->ExceptionInformation[1]; + if (ti->flags & CLASS_IS_SIMPLE_TYPE) + { + memcpy(data, obj, ti->size); + if (ti->size == sizeof(void *)) *data = get_this_pointer(&ti->offsets, *data); + } + else if (ti->copy_ctor) + { + call_copy_ctor(ti->copy_ctor, data, get_this_pointer(&ti->offsets, obj), + ti->flags & CLASS_HAS_VIRTUAL_BASE_CLASS); + } + else + memcpy(data, get_this_pointer(&ti->offsets, obj), ti->size); + ep->rec->ExceptionInformation[1] = (ULONG_PTR)data; + } + return; +} +#else +void __cdecl __ExceptionPtrCurrentException(exception_ptr *ep) +{ + EXCEPTION_RECORD *rec = msvcrt_get_thread_data()->exc_record; + + TRACE("(%p)\n", ep); + + if (!rec) + { + ep->rec = NULL; + ep->ref = NULL; + return; + } + + ep->rec = HeapAlloc(GetProcessHeap(), 0, sizeof(EXCEPTION_RECORD)); + ep->ref = HeapAlloc(GetProcessHeap(), 0, sizeof(int)); + + *ep->rec = *rec; + *ep->ref = 1; + + if (ep->rec->ExceptionCode == CXX_EXCEPTION) + { + const cxx_exception_type *et = (void*)ep->rec->ExceptionInformation[2]; + const cxx_type_info *ti; + void **data, *obj; + char *base = RtlPcToFileHeader((void*)et, (void**)&base); + + ti = (const cxx_type_info*)(base + ((const cxx_type_info_table*)(base + et->type_info_table))->info[0]); + data = HeapAlloc(GetProcessHeap(), 0, ti->size); + + obj = (void*)ep->rec->ExceptionInformation[1]; + if (ti->flags & CLASS_IS_SIMPLE_TYPE) + { + memcpy(data, obj, ti->size); + if (ti->size == sizeof(void *)) *data = get_this_pointer(&ti->offsets, *data); + } + else if (ti->copy_ctor) + { + call_copy_ctor(base + ti->copy_ctor, data, get_this_pointer(&ti->offsets, obj), + ti->flags & CLASS_HAS_VIRTUAL_BASE_CLASS); + } + else + memcpy(data, get_this_pointer(&ti->offsets, obj), ti->size); + ep->rec->ExceptionInformation[1] = (ULONG_PTR)data; + } + return; +} +#endif + +#if _MSVCR_VER >= 110 +/********************************************************************* + * ?__ExceptionPtrToBool@@YA_NPBX(a)Z + * ?__ExceptionPtrToBool@@YA_NPEBX(a)Z + */ +bool __cdecl __ExceptionPtrToBool(exception_ptr *ep) +{ + return !!ep->rec; +} +#endif + +/********************************************************************* + * ?__ExceptionPtrCopyException@@YAXPAXPBX1(a)Z + * ?__ExceptionPtrCopyException@@YAXPEAXPEBX1(a)Z + */ +#ifndef __x86_64__ +void __cdecl __ExceptionPtrCopyException(exception_ptr *ep, + exception *object, const cxx_exception_type *type) +{ + const cxx_type_info *ti; + void **data; + + __ExceptionPtrDestroy(ep); + + ep->rec = HeapAlloc(GetProcessHeap(), 0, sizeof(EXCEPTION_RECORD)); + ep->ref = HeapAlloc(GetProcessHeap(), 0, sizeof(int)); + *ep->ref = 1; + + memset(ep->rec, 0, sizeof(EXCEPTION_RECORD)); + ep->rec->ExceptionCode = CXX_EXCEPTION; + ep->rec->ExceptionFlags = EH_NONCONTINUABLE; + ep->rec->NumberParameters = 3; + ep->rec->ExceptionInformation[0] = CXX_FRAME_MAGIC_VC6; + ep->rec->ExceptionInformation[2] = (ULONG_PTR)type; + + ti = type->type_info_table->info[0]; + data = HeapAlloc(GetProcessHeap(), 0, ti->size); + if (ti->flags & CLASS_IS_SIMPLE_TYPE) + { + memcpy(data, object, ti->size); + if (ti->size == sizeof(void *)) *data = get_this_pointer(&ti->offsets, *data); + } + else if (ti->copy_ctor) + { + call_copy_ctor(ti->copy_ctor, data, get_this_pointer(&ti->offsets, object), + ti->flags & CLASS_HAS_VIRTUAL_BASE_CLASS); + } + else + memcpy(data, get_this_pointer(&ti->offsets, object), ti->size); + ep->rec->ExceptionInformation[1] = (ULONG_PTR)data; +} +#else +void __cdecl __ExceptionPtrCopyException(exception_ptr *ep, + exception *object, const cxx_exception_type *type) +{ + const cxx_type_info *ti; + void **data; + char *base; + + RtlPcToFileHeader((void*)type, (void**)&base); + __ExceptionPtrDestroy(ep); + + ep->rec = HeapAlloc(GetProcessHeap(), 0, sizeof(EXCEPTION_RECORD)); + ep->ref = HeapAlloc(GetProcessHeap(), 0, sizeof(int)); + *ep->ref = 1; + + memset(ep->rec, 0, sizeof(EXCEPTION_RECORD)); + ep->rec->ExceptionCode = CXX_EXCEPTION; + ep->rec->ExceptionFlags = EH_NONCONTINUABLE; + ep->rec->NumberParameters = 4; + ep->rec->ExceptionInformation[0] = CXX_FRAME_MAGIC_VC6; + ep->rec->ExceptionInformation[2] = (ULONG_PTR)type; + ep->rec->ExceptionInformation[3] = (ULONG_PTR)base; + + ti = (const cxx_type_info*)(base + ((const cxx_type_info_table*)(base + type->type_info_table))->info[0]); + data = HeapAlloc(GetProcessHeap(), 0, ti->size); + if (ti->flags & CLASS_IS_SIMPLE_TYPE) + { + memcpy(data, object, ti->size); + if (ti->size == sizeof(void *)) *data = get_this_pointer(&ti->offsets, *data); + } + else if (ti->copy_ctor) + { + call_copy_ctor(base + ti->copy_ctor, data, get_this_pointer(&ti->offsets, object), + ti->flags & CLASS_HAS_VIRTUAL_BASE_CLASS); + } + else + memcpy(data, get_this_pointer(&ti->offsets, object), ti->size); + ep->rec->ExceptionInformation[1] = (ULONG_PTR)data; +} +#endif + +bool __cdecl __ExceptionPtrCompare(const exception_ptr *ep1, const exception_ptr *ep2) +{ + return ep1->rec == ep2->rec; +} + +#endif /* _MSVCR_VER >= 100 */ -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/906
From: Torge Matthies <tmatthies(a)codeweavers.com> Signed-off-by: Torge Matthies <tmatthies(a)codeweavers.com> --- dlls/msvcrt/exception_ptr.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/msvcrt/exception_ptr.c b/dlls/msvcrt/exception_ptr.c index d4c427e436f..8238baec548 100644 --- a/dlls/msvcrt/exception_ptr.c +++ b/dlls/msvcrt/exception_ptr.c @@ -151,15 +151,9 @@ static inline void call_copy_ctor( void *func, void *this, void *src, int has_vb } #endif -/********************************************************************* - * ?__ExceptionPtrCurrentException@@YAXPAX(a)Z - * ?__ExceptionPtrCurrentException@@YAXPEAX(a)Z - */ #ifndef __x86_64__ -void __cdecl __ExceptionPtrCurrentException(exception_ptr *ep) +static void exception_ptr_from_record(exception_ptr *ep, EXCEPTION_RECORD *rec) { - EXCEPTION_RECORD *rec = msvcrt_get_thread_data()->exc_record; - TRACE("(%p)\n", ep); if (!rec) @@ -202,10 +196,8 @@ void __cdecl __ExceptionPtrCurrentException(exception_ptr *ep) return; } #else -void __cdecl __ExceptionPtrCurrentException(exception_ptr *ep) +static void exception_ptr_from_record(exception_ptr *ep, EXCEPTION_RECORD *rec) { - EXCEPTION_RECORD *rec = msvcrt_get_thread_data()->exc_record; - TRACE("(%p)\n", ep); if (!rec) @@ -250,6 +242,16 @@ void __cdecl __ExceptionPtrCurrentException(exception_ptr *ep) } #endif +/********************************************************************* + * ?__ExceptionPtrCurrentException@@YAXPAX(a)Z + * ?__ExceptionPtrCurrentException@@YAXPEAX(a)Z + */ +void __cdecl __ExceptionPtrCurrentException(exception_ptr *ep) +{ + TRACE("(%p)\n", ep); + exception_ptr_from_record(ep, msvcrt_get_thread_data()->exc_record); +} + #if _MSVCR_VER >= 110 /********************************************************************* * ?__ExceptionPtrToBool@@YA_NPBX(a)Z -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/906
From: Torge Matthies <tmatthies(a)codeweavers.com> Signed-off-by: Torge Matthies <tmatthies(a)codeweavers.com> --- dlls/concrt140/Makefile.in | 4 ++- dlls/concrt140/concrt140.c | 27 +++++++++++++- dlls/msvcrt/concurrency.c | 71 +++++++++++++++++++++++++++++++++++-- dlls/msvcrt/cxx.h | 5 +++ dlls/msvcrt/exception_ptr.c | 12 +++++-- 5 files changed, 113 insertions(+), 6 deletions(-) diff --git a/dlls/concrt140/Makefile.in b/dlls/concrt140/Makefile.in index aac1ed7b34a..05258adf7ee 100644 --- a/dlls/concrt140/Makefile.in +++ b/dlls/concrt140/Makefile.in @@ -1,7 +1,9 @@ +EXTRADEFS = -D_CONCRT= MODULE = concrt140.dll PARENTSRC = ../msvcrt C_SRCS = \ concrt140.c \ concurrency.c \ - details.c + details.c \ + exception_ptr.c diff --git a/dlls/concrt140/concrt140.c b/dlls/concrt140/concrt140.c index 0a770c9dae6..21973103e9f 100644 --- a/dlls/concrt140/concrt140.c +++ b/dlls/concrt140/concrt140.c @@ -91,6 +91,7 @@ __ASM_VTABLE(range_error, VTABLE_ADD_FUNC(exception_what)); __ASM_BLOCK_END +DEFINE_CXX_EXCEPTION0( exception, exception_dtor ) DEFINE_RTTI_DATA1(runtime_error, 0, &exception_rtti_base_descriptor, ".?AVruntime_error(a)std@@") DEFINE_CXX_TYPE_INFO(runtime_error) DEFINE_RTTI_DATA2(range_error, 0, &runtime_error_rtti_base_descriptor, @@ -105,6 +106,30 @@ void DECLSPEC_NORETURN throw_range_error(const char *str) _CxxThrowException(&e, &range_error_exception_type); } +void DECLSPEC_NORETURN throw_exception(const char* msg) +{ + exception e; + __exception_ctor(&e, msg, &exception_vtable); + _CxxThrowException(&e, &exception_exception_type); +} + +#ifdef __i386__ +__ASM_GLOBAL_FUNC( call_copy_ctor, + "pushl %ebp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") + "movl %esp, %ebp\n\t" + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") + "pushl $1\n\t" + "movl 12(%ebp), %ecx\n\t" + "pushl 16(%ebp)\n\t" + "call *8(%ebp)\n\t" + "leave\n" + __ASM_CFI(".cfi_def_cfa %esp,4\n\t") + __ASM_CFI(".cfi_same_value %ebp\n\t") + "ret" ); +#endif + static BOOL init_cxx_funcs(void) { msvcp140 = LoadLibraryA("msvcp140.dll"); @@ -138,7 +163,7 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) init_runtime_error_rtti((char*)inst); init_type_info_rtti((char*)inst); - init_exception_cxx_type_info((char*)inst); + init_exception_cxx((char*)inst); init_runtime_error_cxx_type_info((char*)inst); init_range_error_cxx((char*)inst); #endif diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index 9b066230a54..6d98010dd28 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -1900,13 +1900,57 @@ static ThreadScheduler *get_thread_scheduler_from_context(Context *context) return NULL; } +struct execute_chore_data { + _UnrealizedChore *chore; + _StructuredTaskCollection *task_collection; +}; + +static LONG CALLBACK execute_chore_except(EXCEPTION_POINTERS *pexc, + void *_data) +{ + struct execute_chore_data *data = _data; + void *prev_exception, *new_exception; + exception_ptr *ptr; + + if (pexc->ExceptionRecord->ExceptionCode != CXX_EXCEPTION) + return EXCEPTION_CONTINUE_SEARCH; + + ptr = operator_new(sizeof(*ptr)); + __ExceptionPtrCreate(ptr); + exception_ptr_from_record(ptr, pexc->ExceptionRecord); + + new_exception = data->task_collection->exception; + do { + if ((ULONG_PTR)new_exception & ~0x7) { + __ExceptionPtrDestroy(ptr); + operator_delete(ptr); + break; + } + prev_exception = new_exception; + new_exception = (void*)((ULONG_PTR)new_exception | (ULONG_PTR)ptr); + } while ((new_exception = InterlockedCompareExchangePointer( + &data->task_collection->exception, new_exception, + prev_exception)) != prev_exception); + data->task_collection->event = 0; + return EXCEPTION_EXECUTE_HANDLER; +} + static void execute_chore(_UnrealizedChore *chore, _StructuredTaskCollection *task_collection) { + struct execute_chore_data data = { chore, task_collection }; + TRACE("(%p %p)\n", chore, task_collection); - if (chore->chore_proc) - chore->chore_proc(chore); + __TRY + { + if (chore->chore_proc) + chore->chore_proc(chore); + } + __EXCEPT_CTX(execute_chore_except, &data) + { + } + __ENDTRY } static void CALLBACK chore_wrapper_finally(BOOL normal, void *data) @@ -2052,6 +2096,16 @@ void __thiscall _StructuredTaskCollection__Schedule( } } +static void CALLBACK exception_ptr_rethrow_finally(BOOL normal, void *data) +{ + exception_ptr *ep = data; + + TRACE("(%u %p)\n", normal, data); + + __ExceptionPtrDestroy(ep); + operator_delete(ep); +} + /* ?_RunAndWait(a)_StructuredTaskCollection@details(a)Concurrency@@QAA?AW4_TaskCollectionStatus(a)23@PAV_UnrealizedChore(a)23@@Z */ /* ?_RunAndWait(a)_StructuredTaskCollection@details(a)Concurrency@@QAG?AW4_TaskCollectionStatus(a)23@PAV_UnrealizedChore(a)23@@Z */ /* ?_RunAndWait(a)_StructuredTaskCollection@details(a)Concurrency@@QEAA?AW4_TaskCollectionStatus(a)23@PEAV_UnrealizedChore(a)23@@Z */ @@ -2060,6 +2114,7 @@ _StructuredTaskCollection__RunAndWait( _StructuredTaskCollection *this, _UnrealizedChore *chore) { LONG expected, val; + ULONG_PTR exception; TRACE("(%p %p)\n", this, chore); @@ -2085,6 +2140,18 @@ _StructuredTaskCollection__RunAndWait( this->finished = 0; this->count = 0; + + exception = (ULONG_PTR)this->exception; + if (exception & ~0x7) + this->exception = 0; + if (exception & ~0x7) { + exception_ptr *ep = (exception_ptr*)(exception & ~0x7); + __TRY + { + __ExceptionPtrRethrow(ep); + } + __FINALLY_CTX(exception_ptr_rethrow_finally, ep) + } return 1; } diff --git a/dlls/msvcrt/cxx.h b/dlls/msvcrt/cxx.h index 4051229c626..c2558974b73 100644 --- a/dlls/msvcrt/cxx.h +++ b/dlls/msvcrt/cxx.h @@ -316,3 +316,8 @@ typedef struct } exception_ptr; void throw_exception(const char*) DECLSPEC_HIDDEN; +void exception_ptr_from_record(exception_ptr*,EXCEPTION_RECORD*) DECLSPEC_HIDDEN; + +void __cdecl __ExceptionPtrCreate(exception_ptr*); +void __cdecl __ExceptionPtrDestroy(exception_ptr*); +void __cdecl __ExceptionPtrRethrow(const exception_ptr*); diff --git a/dlls/msvcrt/exception_ptr.c b/dlls/msvcrt/exception_ptr.c index 8238baec548..82ab4acff43 100644 --- a/dlls/msvcrt/exception_ptr.c +++ b/dlls/msvcrt/exception_ptr.c @@ -89,6 +89,8 @@ void __cdecl __ExceptionPtrDestroy(exception_ptr *ep) } } +#ifndef _CONCRT + /********************************************************************* * ?__ExceptionPtrCopy@@YAXPAXPBX(a)Z * ?__ExceptionPtrCopy@@YAXPEAXPEBX(a)Z @@ -120,6 +122,8 @@ void __cdecl __ExceptionPtrAssign(exception_ptr *ep, const exception_ptr *assign InterlockedIncrement(ep->ref); } +#endif + /********************************************************************* * ?__ExceptionPtrRethrow@@YAXPBX(a)Z * ?__ExceptionPtrRethrow@@YAXPEBX(a)Z @@ -152,7 +156,7 @@ static inline void call_copy_ctor( void *func, void *this, void *src, int has_vb #endif #ifndef __x86_64__ -static void exception_ptr_from_record(exception_ptr *ep, EXCEPTION_RECORD *rec) +void exception_ptr_from_record(exception_ptr *ep, EXCEPTION_RECORD *rec) { TRACE("(%p)\n", ep); @@ -196,7 +200,7 @@ static void exception_ptr_from_record(exception_ptr *ep, EXCEPTION_RECORD *rec) return; } #else -static void exception_ptr_from_record(exception_ptr *ep, EXCEPTION_RECORD *rec) +void exception_ptr_from_record(exception_ptr *ep, EXCEPTION_RECORD *rec) { TRACE("(%p)\n", ep); @@ -242,6 +246,8 @@ static void exception_ptr_from_record(exception_ptr *ep, EXCEPTION_RECORD *rec) } #endif +#ifndef _CONCRT + /********************************************************************* * ?__ExceptionPtrCurrentException@@YAXPAX(a)Z * ?__ExceptionPtrCurrentException@@YAXPEAX(a)Z @@ -349,4 +355,6 @@ bool __cdecl __ExceptionPtrCompare(const exception_ptr *ep1, const exception_ptr return ep1->rec == ep2->rec; } +#endif + #endif /* _MSVCR_VER >= 100 */ -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/906
From: Torge Matthies <tmatthies(a)codeweavers.com> Signed-off-by: Torge Matthies <tmatthies(a)codeweavers.com> --- dlls/msvcr120/tests/msvcr120.c | 6 +++--- dlls/msvcrt/concurrency.c | 10 ++++++++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index 91e9bae1cf8..0a4fb383e0e 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -1403,7 +1403,7 @@ static void __cdecl chore_proc(_UnrealizedChore *_this) MSVCRT_bool canceling = call_func1( p__StructuredTaskCollection__IsCanceling, chore->chore.task_collection); - ok(canceling, "Task is not canceling\n"); + todo_wine ok(canceling, "Task is not canceling\n"); } } @@ -1433,7 +1433,7 @@ static void test_StructuredTaskCollection(void) skip("_StructuredTaskCollection constructor not implemented\n"); return; } - ok(task_coll.unk2 == 0x1fffffff, + todo_wine ok(task_coll.unk2 == 0x1fffffff, "_StructuredTaskCollection ctor set wrong unk2: 0x%x != 0x1fffffff\n", task_coll.unk2); ok(task_coll.unk3 == NULL, "_StructuredTaskCollection ctor set wrong unk3: %p != NULL\n", task_coll.unk3); @@ -1587,7 +1587,7 @@ static void test_StructuredTaskCollection(void) ok(b, "SetEvent failed\n"); status = p__StructuredTaskCollection__RunAndWait(&task_coll, NULL); - ok(status == 2, "_StructuredTaskCollection::_RunAndWait failed: %d\n", status); + todo_wine ok(status == 2, "_StructuredTaskCollection::_RunAndWait failed: %d\n", status); call_func1(p__StructuredTaskCollection_dtor, &task_coll); CloseHandle(chore_start_evt); diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index 6d98010dd28..7b1f1985da3 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -1873,8 +1873,14 @@ DEFINE_THISCALL_WRAPPER(_StructuredTaskCollection_ctor, 8) _StructuredTaskCollection* __thiscall _StructuredTaskCollection_ctor( _StructuredTaskCollection *this, /*_CancellationTokenState*/void *token) { - FIXME("(%p): stub\n", this); - return NULL; + TRACE("(%p)\n", this); + + if (token) + FIXME("_StructuredTaskCollection with cancellation token not implemented!\n"); + + memset(this, 0, sizeof(*this)); + this->finished = FINISHED_INITIAL; + return this; } #endif /* _MSVCR_VER >= 110 */ -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/906
From: Torge Matthies <tmatthies(a)codeweavers.com> Signed-off-by: Torge Matthies <tmatthies(a)codeweavers.com> --- dlls/msvcrt/concurrency.c | 43 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index 7b1f1985da3..400efd89cc8 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -361,6 +361,9 @@ extern const vtable_ptr invalid_scheduler_policy_thread_specification_vtable; typedef exception invalid_scheduler_policy_value; extern const vtable_ptr invalid_scheduler_policy_value_vtable; +typedef exception missing_wait; +extern const vtable_ptr missing_wait_vtable; + typedef struct { exception e; HRESULT hr; @@ -584,6 +587,34 @@ invalid_scheduler_policy_value * __thiscall invalid_scheduler_policy_value_copy_ return __exception_copy_ctor(_this, rhs, &invalid_scheduler_policy_value_vtable); } +/* ??0missing_wait(a)Concurrency@@QAA(a)PBD@Z */ +/* ??0missing_wait(a)Concurrency@@QAE(a)PBD@Z */ +/* ??0missing_wait(a)Concurrency@@QEAA(a)PEBD@Z */ +DEFINE_THISCALL_WRAPPER(missing_wait_ctor_str, 8) +missing_wait* __thiscall missing_wait_ctor_str( + missing_wait *this, const char *str) +{ + TRACE("(%p %p)\n", this, str); + return __exception_ctor(this, str, &missing_wait_vtable); +} + +/* ??0missing_wait(a)Concurrency@@QAA(a)XZ */ +/* ??0missing_wait(a)Concurrency@@QAE(a)XZ */ +/* ??0missing_wait(a)Concurrency@@QEAA(a)XZ */ +DEFINE_THISCALL_WRAPPER(missing_wait_ctor, 4) +missing_wait* __thiscall missing_wait_ctor(missing_wait *this) +{ + return missing_wait_ctor_str(this, NULL); +} + +DEFINE_THISCALL_WRAPPER(missing_wait_copy_ctor,8) +missing_wait * __thiscall missing_wait_copy_ctor( + missing_wait * _this, const missing_wait * rhs) +{ + TRACE("(%p %p)\n", _this, rhs); + return __exception_copy_ctor(_this, rhs, &missing_wait_vtable); +} + /* ??0scheduler_resource_allocation_error(a)Concurrency@@QAE(a)PBDJ@Z */ /* ??0scheduler_resource_allocation_error(a)Concurrency@@QEAA(a)PEBDJ@Z */ DEFINE_THISCALL_WRAPPER(scheduler_resource_allocation_error_ctor_name, 12) @@ -643,6 +674,8 @@ DEFINE_RTTI_DATA1(invalid_scheduler_policy_thread_specification, 0, &cexception_ ".?AVinvalid_scheduler_policy_thread_specification(a)Concurrency@@") DEFINE_RTTI_DATA1(invalid_scheduler_policy_value, 0, &cexception_rtti_base_descriptor, ".?AVinvalid_scheduler_policy_value(a)Concurrency@@") +DEFINE_RTTI_DATA1(missing_wait, 0, &cexception_rtti_base_descriptor, + ".?AVmissing_wait(a)Concurrency@@") DEFINE_RTTI_DATA1(scheduler_resource_allocation_error, 0, &cexception_rtti_base_descriptor, ".?AVscheduler_resource_allocation_error(a)Concurrency@@") @@ -653,6 +686,9 @@ DEFINE_CXX_DATA1(invalid_multiple_scheduling, &cexception_cxx_type_info, cexcept 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) +#if defined(__x86_64__) && _MSVCR_VER >= 120 +DEFINE_CXX_DATA1(missing_wait, &cexception_cxx_type_info, cexception_dtor) +#endif DEFINE_CXX_DATA1(scheduler_resource_allocation_error, &cexception_cxx_type_info, cexception_dtor) __ASM_BLOCK_BEGIN(concurrency_exception_vtables) @@ -677,6 +713,9 @@ __ASM_BLOCK_BEGIN(concurrency_exception_vtables) __ASM_VTABLE(invalid_scheduler_policy_value, VTABLE_ADD_FUNC(cexception_vector_dtor) VTABLE_ADD_FUNC(cexception_what)); + __ASM_VTABLE(missing_wait, + VTABLE_ADD_FUNC(cexception_vector_dtor) + VTABLE_ADD_FUNC(cexception_what)); __ASM_VTABLE(scheduler_resource_allocation_error, VTABLE_ADD_FUNC(cexception_vector_dtor) VTABLE_ADD_FUNC(cexception_what)); @@ -3393,6 +3432,7 @@ void msvcrt_init_concurrency(void *base) init_invalid_scheduler_policy_key_rtti(base); init_invalid_scheduler_policy_thread_specification_rtti(base); init_invalid_scheduler_policy_value_rtti(base); + init_missing_wait_rtti(base); init_scheduler_resource_allocation_error_rtti(base); init_Context_rtti(base); init_ContextBase_rtti(base); @@ -3410,6 +3450,9 @@ void msvcrt_init_concurrency(void *base) init_invalid_scheduler_policy_key_cxx(base); init_invalid_scheduler_policy_thread_specification_cxx(base); init_invalid_scheduler_policy_value_cxx(base); +#if _MSVCR_VER >= 120 + init_missing_wait_cxx(base); +#endif init_scheduler_resource_allocation_error_cxx(base); #endif } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/906
From: Torge Matthies <tmatthies(a)codeweavers.com> Signed-off-by: Torge Matthies <tmatthies(a)codeweavers.com> --- dlls/msvcrt/concurrency.c | 7 ++++++- dlls/msvcrt/cxx.h | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index 400efd89cc8..dc51ba47542 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -686,7 +686,7 @@ DEFINE_CXX_DATA1(invalid_multiple_scheduling, &cexception_cxx_type_info, cexcept 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) -#if defined(__x86_64__) && _MSVCR_VER >= 120 +#if _MSVCR_VER >= 120 DEFINE_CXX_DATA1(missing_wait, &cexception_cxx_type_info, cexception_dtor) #endif DEFINE_CXX_DATA1(scheduler_resource_allocation_error, &cexception_cxx_type_info, cexception_dtor) @@ -1933,6 +1933,11 @@ DEFINE_THISCALL_WRAPPER(_StructuredTaskCollection_dtor, 4) void __thiscall _StructuredTaskCollection_dtor(_StructuredTaskCollection *this) { FIXME("(%p): stub!\n", this); + if (this->count && !__uncaught_exception()) { + missing_wait e; + missing_wait_ctor_str(&e, "Missing call to _RunAndWait"); + _CxxThrowException(&e, &missing_wait_exception_type); + } } #endif /* _MSVCR_VER >= 120 */ diff --git a/dlls/msvcrt/cxx.h b/dlls/msvcrt/cxx.h index c2558974b73..aa73aabf797 100644 --- a/dlls/msvcrt/cxx.h +++ b/dlls/msvcrt/cxx.h @@ -321,3 +321,5 @@ void exception_ptr_from_record(exception_ptr*,EXCEPTION_RECORD*) DECLSPEC_HIDDEN void __cdecl __ExceptionPtrCreate(exception_ptr*); void __cdecl __ExceptionPtrDestroy(exception_ptr*); void __cdecl __ExceptionPtrRethrow(const exception_ptr*); + +BOOL __cdecl __uncaught_exception(void); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/906
Piotr Caban (@piotr) commented about dlls/msvcrt/concurrency.c:
new_finished = prev_finished + 1; } while (InterlockedCompareExchange(ptr, new_finished, prev_finished) != prev_finished); + RtlWakeAddressAll((LONG*)ptr);
Is there a reason for not using RtlWakeAddressSingle here? How about calling RtlWakeAddressAll only if chore->task_collection->finished == chore->task_collection->count? -- https://gitlab.winehq.org/wine/wine/-/merge_requests/906#note_9371
Piotr Caban (@piotr) commented about dlls/msvcrt/concurrency.c:
+ + if (this->context) + { + ThreadScheduler *scheduler = get_thread_scheduler_from_context(this->context); + if (scheduler) + pick_and_execute_chore(scheduler); + } + + if (chore) { + if (chore->task_collection) { + invalid_multiple_scheduling e; + invalid_multiple_scheduling_ctor_str(&e, "Chore scheduled multiple times"); + _CxxThrowException(&e, &invalid_multiple_scheduling_exception_type); + } + execute_chore(chore, this); + } pick_and_execute_chore executes only one scheduled chore. It should be done in a loop as long as there are more chores to execute. You're also executing chores in wrong order - chore passed as argument should be run first.
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/906#note_9372
Piotr Caban (@piotr) commented about dlls/concrt140/concrt140.c:
+ +#ifdef __i386__ +__ASM_GLOBAL_FUNC( call_copy_ctor, + "pushl %ebp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") + "movl %esp, %ebp\n\t" + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") + "pushl $1\n\t" + "movl 12(%ebp), %ecx\n\t" + "pushl 16(%ebp)\n\t" + "call *8(%ebp)\n\t" + "leave\n" + __ASM_CFI(".cfi_def_cfa %esp,4\n\t") + __ASM_CFI(".cfi_same_value %ebp\n\t") + "ret" ); How about moving call_copy_ctor to exception_ptr.c file to avoid code duplication?
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/906#note_9373
Piotr Caban (@piotr) commented about dlls/msvcrt/concurrency.c:
return __exception_copy_ctor(_this, rhs, &invalid_scheduler_policy_value_vtable); }
+/* ??0missing_wait(a)Concurrency@@QAA(a)PBD@Z */ +/* ??0missing_wait(a)Concurrency@@QAE(a)PBD@Z */ +/* ??0missing_wait(a)Concurrency@@QEAA(a)PEBD@Z */
Please also update spec files. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/906#note_9375
On Tue Sep 27 10:57:14 2022 +0000, Piotr Caban wrote:
Is there a reason for not using RtlWakeAddressSingle here? How about calling RtlWakeAddressAll only if chore->task_collection->finished == chore->task_collection->count? I used `RtlWakeAddressAll` because I don't know that there will only ever be a single waiter. Maybe two threads call `_StructuredTaskCollection::_RunAndWait`, or we add a wait in the worker threads at some point. Is `RtlWakeAddressAll` less performant than `RtlWakeAddressSingle`?
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/906#note_9377
Piotr Caban (@piotr) commented about dlls/msvcrt/concurrency.c:
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) +#if defined(__x86_64__) && _MSVCR_VER >= 120 +DEFINE_CXX_DATA1(missing_wait, &cexception_cxx_type_info, cexception_dtor) +#endif Please define exception related code in the same patch that throws the exception - it's currently unused.
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/906#note_9378
On Tue Sep 27 11:11:55 2022 +0000, Piotr Caban wrote:
Please define exception related code in the same patch that throws the exception - it's currently unused. Above comment may be unclear, what I've meant is, please add DEFINE_CXX_DATA() macro in the same patch that throws the exception.
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/906#note_9379
On Tue Sep 27 11:06:28 2022 +0000, Piotr Caban wrote:
How about moving call_copy_ctor to exception_ptr.c file to avoid code duplication? Previous discussion: https://gitlab.winehq.org/wine/wine/-/merge_requests/464#note_4484
Other functions in 32-bit msvcrt (except_i386.c) use this function too. Should I still move it to exception_ptr.c? -- https://gitlab.winehq.org/wine/wine/-/merge_requests/906#note_9381
On Tue Sep 27 11:21:42 2022 +0000, Piotr Caban wrote:
Please also update spec files. how did I forget that...
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/906#note_9383
On Tue Sep 27 11:11:22 2022 +0000, Torge Matthies wrote:
I used `RtlWakeAddressAll` because I don't know that there will only ever be a single waiter. Maybe two threads call `_StructuredTaskCollection::_RunAndWait`, or we add a wait in the worker threads at some point. Is `RtlWakeAddressAll` less performant than `RtlWakeAddressSingle`? I don't know if it's valid to run _RunAndWait concurrently. If no - RtlWakeAddressSingle will be sufficient. If yes - expected variable can't be computed once because this->finished may be zeroed by another _RunAndWait call.
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/906#note_9384
On Tue Sep 27 11:20:01 2022 +0000, Torge Matthies wrote:
Previous discussion: https://gitlab.winehq.org/wine/wine/-/merge_requests/464#note_4484 Other functions in 32-bit msvcrt (except_i386.c) use this function too. Should I still move it to exception_ptr.c? Other functions may use the implementation from exception_ptr.c file.
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/906#note_9385
this->finished may be zeroed by another \_RunAndWait call.
`this->finished` is only zeroed after all chores complete though? -- https://gitlab.winehq.org/wine/wine/-/merge_requests/906#note_9386
On Tue Sep 27 11:28:58 2022 +0000, Piotr Caban wrote:
Other functions may use the implementation from exception_ptr.c file. yep, I just wanted to reconfirm that that's really what you want, since other stuff in except_i386.c also uses that function. But I guess moving it to exception_ptr.c removes duplicated code, I'll do that, give me a few minutes.
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/906#note_9387
On Tue Sep 27 11:29:34 2022 +0000, Torge Matthies wrote:
this->finished may be zeroed by another \_RunAndWait call. `this->finished` is only zeroed after all chores complete though? There's a race in case of concurrent _RunAndWait execution: thread 1 - runs _RunAndWait and gets to RtlWaitOnAddress call (expected = 2; this->finished = 1) thread 2 - runs _RunAndWait and gets to RtlWaitOnAddress call (expected = 2; this->finished = 1) thread 3 - executed the chore and calls RtlWakeAddressAll thread 1 - wakes, exits the loop since expected = 2 and this->finished = 2 thread 1 - sets this->finished = 0 thread 2 - wakes and waits again since expected = 2 and this->finished = 0
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/906#note_9388
On Tue Sep 27 11:37:44 2022 +0000, Piotr Caban wrote:
There's a race in case of concurrent _RunAndWait execution: ``` thread 1 - runs _RunAndWait and gets to RtlWaitOnAddress call (expected = 2; this->finished = 1) thread 2 - runs _RunAndWait and gets to RtlWaitOnAddress call (expected = 2; this->finished = 1) thread 3 - executed the chore and calls RtlWakeAddressAll thread 1 - wakes, exits the loop since expected = 2 and this->finished = 2 thread 1 - sets this->finished = 0 thread 2 - wakes and waits again since expected = 2 and this->finished = 0 ``` makes sense, I'll need to test if concurrent `_RunAndWait` is allowed, if it is my current approach will not work.
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/906#note_9389
Current status: The game hangs, I'm debugging that at the moment -- https://gitlab.winehq.org/wine/wine/-/merge_requests/906#note_9857
participants (3)
-
Piotr Caban (＠piotr) -
Torge Matthies
-
Torge Matthies (＠tmatthies)