ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msvcp90: Use critical sections in mutex object.

This commit is contained in:
Piotr Caban 2012-11-02 20:06:08 +01:00 committed by Alexandre Julliard
parent 0280c5fb5f
commit 5e1cbccebf
7 changed files with 57 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dlls/msvcp100/misc.c
View File

@ -33,7 +33,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcp);
DEFINE_THISCALL_WRAPPER(mutex_ctor, 4)
mutex* __thiscall mutex_ctor(mutex *this)
{
this->mutex = CreateMutexW(NULL, FALSE, NULL);
CRITICAL_SECTION *cs = MSVCRT_operator_new(sizeof(*cs));
if(!cs) {
ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL);
}
InitializeCriticalSection(cs);
cs->DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": _Mutex critical section");
this->mutex = cs;
return this;
}
@ -42,7 +50,9 @@ mutex* __thiscall mutex_ctor(mutex *this)
DEFINE_THISCALL_WRAPPER(mutex_dtor, 4)
void __thiscall mutex_dtor(mutex *this)
{
CloseHandle(this->mutex);
((CRITICAL_SECTION*)this->mutex)->DebugInfo->Spare[0] = 0;
DeleteCriticalSection(this->mutex);
MSVCRT_operator_delete(this->mutex);
}
/* ?_Lock@_Mutex@std@@QAEXXZ */
@ -50,7 +60,7 @@ void __thiscall mutex_dtor(mutex *this)
DEFINE_THISCALL_WRAPPER(mutex_lock, 4)
void __thiscall mutex_lock(mutex *this)
{
WaitForSingleObject(this->mutex, INFINITE);
EnterCriticalSection(this->mutex);
}
/* ?_Unlock@_Mutex@std@@QAEXXZ */
@ -58,7 +68,7 @@ void __thiscall mutex_lock(mutex *this)
DEFINE_THISCALL_WRAPPER(mutex_unlock, 4)
void __thiscall mutex_unlock(mutex *this)
{
ReleaseMutex(this->mutex);
LeaveCriticalSection(this->mutex);
}
/* ?_Mutex_Lock@_Mutex@std@@CAXPAV12@@Z */

16
dlls/msvcp60/misc.c
View File

@ -31,7 +31,13 @@
/* ??0_Mutex@std@@QEAA@XZ */
mutex* mutex_ctor(mutex *this)
{
this->mutex = CreateMutexW(NULL, FALSE, NULL);
CRITICAL_SECTION *cs = MSVCRT_operator_new(sizeof(*cs));
if(!cs)
throw_exception(EXCEPTION_BAD_ALLOC, NULL);
InitializeCriticalSection(cs);
cs->DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": _Mutex critical section");
this->mutex = cs;
return this;
}
@ -39,21 +45,23 @@ mutex* mutex_ctor(mutex *this)
/* ??1_Mutex@std@@QEAA@XZ */
void mutex_dtor(mutex *this)
{
CloseHandle(this->mutex);
((CRITICAL_SECTION*)this->mutex)->DebugInfo->Spare[0] = 0;
DeleteCriticalSection(this->mutex);
MSVCRT_operator_delete(this->mutex);
}
/* ?_Lock@_Mutex@std@@QAEXXZ */
/* ?_Lock@_Mutex@std@@QEAAXXZ */
void mutex_lock(mutex *this)
{
WaitForSingleObject(this->mutex, INFINITE);
EnterCriticalSection(this->mutex);
}
/* ?_Unlock@_Mutex@std@@QAEXXZ */
/* ?_Unlock@_Mutex@std@@QEAAXXZ */
void mutex_unlock(mutex *this)
{
ReleaseMutex(this->mutex);
LeaveCriticalSection(this->mutex);
}
static CRITICAL_SECTION lockit_cs;

18
dlls/msvcp71/misc.c
View File

@ -33,7 +33,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcp);
DEFINE_THISCALL_WRAPPER(mutex_ctor, 4)
mutex* __thiscall mutex_ctor(mutex *this)
{
this->mutex = CreateMutexW(NULL, FALSE, NULL);
CRITICAL_SECTION *cs = MSVCRT_operator_new(sizeof(*cs));
if(!cs) {
ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL);
}
InitializeCriticalSection(cs);
cs->DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": _Mutex critical section");
this->mutex = cs;
return this;
}
@ -42,7 +50,9 @@ mutex* __thiscall mutex_ctor(mutex *this)
DEFINE_THISCALL_WRAPPER(mutex_dtor, 4)
void __thiscall mutex_dtor(mutex *this)
{
CloseHandle(this->mutex);
((CRITICAL_SECTION*)this->mutex)->DebugInfo->Spare[0] = 0;
DeleteCriticalSection(this->mutex);
MSVCRT_operator_delete(this->mutex);
}
/* ?_Lock@_Mutex@std@@QAEXXZ */
@ -50,7 +60,7 @@ void __thiscall mutex_dtor(mutex *this)
DEFINE_THISCALL_WRAPPER(mutex_lock, 4)
void __thiscall mutex_lock(mutex *this)
{
WaitForSingleObject(this->mutex, INFINITE);
EnterCriticalSection(this->mutex);
}
/* ?_Unlock@_Mutex@std@@QAEXXZ */
@ -58,7 +68,7 @@ void __thiscall mutex_lock(mutex *this)
DEFINE_THISCALL_WRAPPER(mutex_unlock, 4)
void __thiscall mutex_unlock(mutex *this)
{
ReleaseMutex(this->mutex);
LeaveCriticalSection(this->mutex);
}
static CRITICAL_SECTION lockit_cs[_MAX_LOCK];

18
dlls/msvcp90/misc.c
View File

@ -33,7 +33,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcp);
DEFINE_THISCALL_WRAPPER(mutex_ctor, 4)
mutex* __thiscall mutex_ctor(mutex *this)
{
this->mutex = CreateMutexW(NULL, FALSE, NULL);
CRITICAL_SECTION *cs = MSVCRT_operator_new(sizeof(*cs));
if(!cs) {
ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL);
}
InitializeCriticalSection(cs);
cs->DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": _Mutex critical section");
this->mutex = cs;
return this;
}
@ -42,7 +50,9 @@ mutex* __thiscall mutex_ctor(mutex *this)
DEFINE_THISCALL_WRAPPER(mutex_dtor, 4)
void __thiscall mutex_dtor(mutex *this)
{
CloseHandle(this->mutex);
((CRITICAL_SECTION*)this->mutex)->DebugInfo->Spare[0] = 0;
DeleteCriticalSection(this->mutex);
MSVCRT_operator_delete(this->mutex);
}
/* ?_Lock@_Mutex@std@@QAEXXZ */
@ -50,7 +60,7 @@ void __thiscall mutex_dtor(mutex *this)
DEFINE_THISCALL_WRAPPER(mutex_lock, 4)
void __thiscall mutex_lock(mutex *this)
{
WaitForSingleObject(this->mutex, INFINITE);
EnterCriticalSection(this->mutex);
}
/* ?_Unlock@_Mutex@std@@QAEXXZ */
@ -58,7 +68,7 @@ void __thiscall mutex_lock(mutex *this)
DEFINE_THISCALL_WRAPPER(mutex_unlock, 4)
void __thiscall mutex_unlock(mutex *this)
{
ReleaseMutex(this->mutex);
LeaveCriticalSection(this->mutex);
}
/* ?_Mutex_Lock@_Mutex@std@@CAXPAV12@@Z */