Module: wine Branch: master Commit: ef81cfb5fbc6d8f2b892c2782bdd469a5bb2f526 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef81cfb5fbc6d8f2b892c2782...
Author: Piotr Caban piotr@codeweavers.com Date: Fri Aug 20 18:44:41 2021 +0200
msvcrt: Move improper_lock implementation to concurrency.c.
Signed-off-by: Piotr Caban piotr@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/msvcrt/concurrency.c | 76 +++++++++++++++++++++++++++++++++++++++++------ dlls/msvcrt/cpp.c | 39 ------------------------ dlls/msvcrt/msvcrt.h | 1 - 3 files changed, 67 insertions(+), 49 deletions(-)
diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index a4df63d19a8..194cc707497 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -31,6 +31,9 @@
WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
+typedef exception cexception; +CREATE_EXCEPTION_OBJECT(cexception) + static int context_id = -1; static int scheduler_id = -1;
@@ -296,6 +299,9 @@ typedef struct { CRITICAL_SECTION cs; } _ReentrantBlockingLock;
+typedef exception improper_lock; +extern const vtable_ptr improper_lock_vtable; + enum ConcRT_EventType { CONCRT_EVENT_GENERIC, @@ -325,6 +331,41 @@ static HANDLE keyed_event;
static void create_default_scheduler(void);
+/* ??0improper_lock@Concurrency@@QAE@PBD@Z */ +/* ??0improper_lock@Concurrency@@QEAA@PEBD@Z */ +DEFINE_THISCALL_WRAPPER(improper_lock_ctor_str, 8) +improper_lock* __thiscall improper_lock_ctor_str(improper_lock *this, const char *str) +{ + TRACE("(%p %p)\n", this, str); + return __exception_ctor(this, str, &improper_lock_vtable); +} + +/* ??0improper_lock@Concurrency@@QAE@XZ */ +/* ??0improper_lock@Concurrency@@QEAA@XZ */ +DEFINE_THISCALL_WRAPPER(improper_lock_ctor, 4) +improper_lock* __thiscall improper_lock_ctor(improper_lock *this) +{ + return improper_lock_ctor_str(this, NULL); +} + +DEFINE_THISCALL_WRAPPER(improper_lock_copy_ctor,8) +improper_lock * __thiscall improper_lock_copy_ctor(improper_lock *this, const improper_lock *rhs) +{ + TRACE("(%p %p)\n", this, rhs); + return __exception_copy_ctor(this, rhs, &improper_lock_vtable); +} + +DEFINE_RTTI_DATA1(improper_lock, 0, &cexception_rtti_base_descriptor, + ".?AVimproper_lock@Concurrency@@") + +DEFINE_CXX_DATA1(improper_lock, &cexception_cxx_type_info, cexception_dtor) + +__ASM_BLOCK_BEGIN(concurrency_exception_vtables) + __ASM_VTABLE(improper_lock, + VTABLE_ADD_FUNC(cexception_vector_dtor) + VTABLE_ADD_FUNC(cexception_what)); +__ASM_BLOCK_END + static Context* try_get_current_context(void) { if (context_tls_index == TLS_OUT_OF_INDEXES) @@ -1433,8 +1474,11 @@ static inline void cs_lock(critical_section *cs, cs_queue *q) { cs_queue *last;
- if(cs->unk_thread_id == GetCurrentThreadId()) - throw_exception(EXCEPTION_IMPROPER_LOCK, 0, "Already locked"); + if(cs->unk_thread_id == GetCurrentThreadId()) { + improper_lock e; + improper_lock_ctor_str(&e, "Already locked"); + _CxxThrowException(&e, &improper_lock_exception_type); + }
memset(q, 0, sizeof(*q)); last = InterlockedExchangePointer(&cs->tail, q); @@ -1540,8 +1584,11 @@ bool __thiscall critical_section_try_lock_for(
TRACE("(%p %d)\n", this, timeout);
- if(this->unk_thread_id == GetCurrentThreadId()) - throw_exception(EXCEPTION_IMPROPER_LOCK, 0, "Already locked"); + if(this->unk_thread_id == GetCurrentThreadId()) { + improper_lock e; + improper_lock_ctor_str(&e, "Already locked"); + _CxxThrowException(&e, &improper_lock_exception_type); + }
if(!(q = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*q)))) return critical_section_try_lock(this); @@ -2131,8 +2178,11 @@ void __thiscall reader_writer_lock_lock(reader_writer_lock *this)
TRACE("(%p)\n", this);
- if (this->thread_id == GetCurrentThreadId()) - throw_exception(EXCEPTION_IMPROPER_LOCK, 0, "Already locked"); + if (this->thread_id == GetCurrentThreadId()) { + improper_lock e; + improper_lock_ctor_str(&e, "Already locked"); + _CxxThrowException(&e, &improper_lock_exception_type); + }
last = InterlockedExchangePointer((void**)&this->writer_tail, &q); if (last) { @@ -2162,8 +2212,11 @@ void __thiscall reader_writer_lock_lock_read(reader_writer_lock *this)
TRACE("(%p)\n", this);
- if (this->thread_id == GetCurrentThreadId()) - throw_exception(EXCEPTION_IMPROPER_LOCK, 0, "Already locked as writer"); + if (this->thread_id == GetCurrentThreadId()) { + improper_lock e; + improper_lock_ctor_str(&e, "Already locked as writer"); + _CxxThrowException(&e, &improper_lock_exception_type); + }
do { q.next = this->reader_head; @@ -2436,7 +2489,7 @@ DEFINE_RTTI_DATA1(SchedulerBase, 0, &Scheduler_rtti_base_descriptor, ".?AVSchedu DEFINE_RTTI_DATA2(ThreadScheduler, 0, &SchedulerBase_rtti_base_descriptor, &Scheduler_rtti_base_descriptor, ".?AVThreadScheduler@details@Concurrency@@")
-__ASM_BLOCK_BEGIN(scheduler_vtables) +__ASM_BLOCK_BEGIN(concurrency_vtables) __ASM_VTABLE(ExternalContextBase, VTABLE_ADD_FUNC(ExternalContextBase_GetId) VTABLE_ADD_FUNC(ExternalContextBase_GetVirtualProcessorId) @@ -2470,12 +2523,17 @@ __ASM_BLOCK_END void msvcrt_init_concurrency(void *base) { #ifdef __x86_64__ + init_cexception_rtti(base); + init_improper_lock_rtti(base); init_Context_rtti(base); init_ContextBase_rtti(base); init_ExternalContextBase_rtti(base); init_Scheduler_rtti(base); init_SchedulerBase_rtti(base); init_ThreadScheduler_rtti(base); + + init_cexception_cxx_type_info(base); + init_improper_lock_cxx(base); #endif }
diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index 980b580c71e..fcdefd5512f 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -602,33 +602,6 @@ HRESULT __thiscall scheduler_resource_allocation_error_get_error_code( return this->hr; }
-typedef exception improper_lock; -extern const vtable_ptr improper_lock_vtable; - -/* ??0improper_lock@Concurrency@@QAE@PBD@Z */ -/* ??0improper_lock@Concurrency@@QEAA@PEBD@Z */ -DEFINE_THISCALL_WRAPPER(improper_lock_ctor_str, 8) -improper_lock* __thiscall improper_lock_ctor_str(improper_lock *this, const char *str) -{ - TRACE("(%p %p)\n", this, str); - return __exception_ctor(this, str, &improper_lock_vtable); -} - -/* ??0improper_lock@Concurrency@@QAE@XZ */ -/* ??0improper_lock@Concurrency@@QEAA@XZ */ -DEFINE_THISCALL_WRAPPER(improper_lock_ctor, 4) -improper_lock* __thiscall improper_lock_ctor(improper_lock *this) -{ - return improper_lock_ctor_str(this, NULL); -} - -DEFINE_THISCALL_WRAPPER(improper_lock_copy_ctor,8) -improper_lock * __thiscall improper_lock_copy_ctor(improper_lock * _this, const improper_lock * rhs) -{ - TRACE("(%p %p)\n", _this, rhs); - return __exception_copy_ctor(_this, rhs, &improper_lock_vtable); -} - typedef exception invalid_scheduler_policy_key; extern const vtable_ptr invalid_scheduler_policy_key_vtable;
@@ -804,9 +777,6 @@ __ASM_VTABLE(__non_rtti_object, __ASM_VTABLE(scheduler_resource_allocation_error, VTABLE_ADD_FUNC(exception_vector_dtor) VTABLE_ADD_FUNC(exception_what)); -__ASM_VTABLE(improper_lock, - VTABLE_ADD_FUNC(exception_vector_dtor) - VTABLE_ADD_FUNC(exception_what)); __ASM_VTABLE(invalid_scheduler_policy_key, VTABLE_ADD_FUNC(exception_vector_dtor) VTABLE_ADD_FUNC(exception_what)); @@ -840,7 +810,6 @@ DEFINE_RTTI_DATA2( __non_rtti_object, 0, &bad_typeid_rtti_base_descriptor, &exce #if _MSVCR_VER >= 100 DEFINE_RTTI_DATA1(scheduler_resource_allocation_error, 0, &exception_rtti_base_descriptor, ".?AVscheduler_resource_allocation_error@Concurrency@@") -DEFINE_RTTI_DATA1(improper_lock, 0, &exception_rtti_base_descriptor, ".?AVimproper_lock@Concurrency@@" ) DEFINE_RTTI_DATA1(invalid_scheduler_policy_key, 0, &exception_rtti_base_descriptor, ".?AVinvalid_scheduler_policy_key@Concurrency@@" ) DEFINE_RTTI_DATA1(invalid_scheduler_policy_value, 0, &exception_rtti_base_descriptor, @@ -863,7 +832,6 @@ DEFINE_CXX_DATA1( bad_alloc, &exception_cxx_type_info, bad_alloc_dtor ) #endif #if _MSVCR_VER >= 100 DEFINE_CXX_DATA1(scheduler_resource_allocation_error, &exception_cxx_type_info, exception_dtor) -DEFINE_CXX_DATA1(improper_lock, &exception_cxx_type_info, exception_dtor) DEFINE_CXX_DATA1(invalid_scheduler_policy_key, &exception_cxx_type_info, exception_dtor) DEFINE_CXX_DATA1(invalid_scheduler_policy_value, &exception_cxx_type_info, exception_dtor) DEFINE_CXX_DATA1(invalid_scheduler_policy_thread_specification, &exception_cxx_type_info, exception_dtor) @@ -885,7 +853,6 @@ void msvcrt_init_exception(void *base) init___non_rtti_object_rtti(base); #if _MSVCR_VER >= 100 init_scheduler_resource_allocation_error_rtti(base); - init_improper_lock_rtti(base); init_invalid_scheduler_policy_key_rtti(base); init_invalid_scheduler_policy_value_rtti(base); init_invalid_scheduler_policy_thread_specification_rtti(base); @@ -902,7 +869,6 @@ void msvcrt_init_exception(void *base) #endif #if _MSVCR_VER >= 100 init_scheduler_resource_allocation_error_cxx(base); - init_improper_lock_cxx(base); init_invalid_scheduler_policy_key_cxx(base); init_invalid_scheduler_policy_value_cxx(base); init_invalid_scheduler_policy_thread_specification_cxx(base); @@ -927,11 +893,6 @@ void throw_exception(exception_type et, HRESULT hr, const char *str) scheduler_resource_allocation_error_ctor_name(&e, str, hr); _CxxThrowException(&e.e, &scheduler_resource_allocation_error_exception_type); } - case EXCEPTION_IMPROPER_LOCK: { - improper_lock e; - improper_lock_ctor_str(&e, str); - _CxxThrowException(&e, &improper_lock_exception_type); - } case EXCEPTION_INVALID_SCHEDULER_POLICY_KEY: { invalid_scheduler_policy_key e; invalid_scheduler_policy_key_ctor_str(&e, str); diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 51e9b9726db..2d779cc1f5c 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -191,7 +191,6 @@ typedef enum { EXCEPTION_BAD_ALLOC, #if _MSVCR_VER >= 100 EXCEPTION_SCHEDULER_RESOURCE_ALLOCATION_ERROR, - EXCEPTION_IMPROPER_LOCK, EXCEPTION_INVALID_SCHEDULER_POLICY_KEY, EXCEPTION_INVALID_SCHEDULER_POLICY_VALUE, EXCEPTION_INVALID_SCHEDULER_POLICY_THREAD_SPECIFICATION,
-
Alexandre Julliard