Piotr Caban : msvcp60: Fix _Lockit class implementation.
Alexandre Julliard
julliard at winehq.org
Mon Jan 30 14:05:58 CST 2012
Module: wine
Branch: master
Commit: e3174d93d8c898ea6ecd9c8d8f9bb5b9ff41b9b2
URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3174d93d8c898ea6ecd9c8d8f9bb5b9ff41b9b2
Author: Piotr Caban <piotr at codeweavers.com>
Date: Mon Jan 30 17:47:36 2012 +0100
msvcp60: Fix _Lockit class implementation.
---
dlls/msvcp60/misc.c | 59 ++++++-------------------------------------------
dlls/msvcp60/msvcp.h | 2 +-
2 files changed, 9 insertions(+), 52 deletions(-)
diff --git a/dlls/msvcp60/misc.c b/dlls/msvcp60/misc.c
index 94b673b..61cf4a5 100644
--- a/dlls/msvcp60/misc.c
+++ b/dlls/msvcp60/misc.c
@@ -89,56 +89,21 @@ void CDECL mutex_mutex_dtor(mutex *m)
mutex_dtor(m);
}
-static CRITICAL_SECTION lockit_cs[_MAX_LOCK];
-
-/* ?_Lockit_ctor at _Lockit@std@@SAXH at Z */
-void __cdecl _Lockit_init(int locktype) {
- InitializeCriticalSection(&lockit_cs[locktype]);
- lockit_cs[locktype].DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": _Lockit critical section");
-}
-
-/* ?_Lockit_dtor at _Lockit@std@@SAXH at Z */
-void __cdecl _Lockit_free(int locktype)
-{
- lockit_cs[locktype].DebugInfo->Spare[0] = 0;
- DeleteCriticalSection(&lockit_cs[locktype]);
-}
+static CRITICAL_SECTION lockit_cs;
void init_lockit(void) {
- int i;
-
- for(i=0; i<_MAX_LOCK; i++)
- _Lockit_init(i);
+ InitializeCriticalSection(&lockit_cs);
+ lockit_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": _Lockit critical section");
}
void free_lockit(void) {
- int i;
-
- for(i=0; i<_MAX_LOCK; i++)
- _Lockit_free(i);
+ lockit_cs.DebugInfo->Spare[0] = 0;
+ DeleteCriticalSection(&lockit_cs);
}
-/* ?_Lockit_ctor at _Lockit@std@@CAXPAV12 at H@Z */
-/* ?_Lockit_ctor at _Lockit@std@@CAXPEAV12 at H@Z */
-void __cdecl _Lockit__Lockit_ctor_locktype(_Lockit *lockit, int locktype)
-{
- lockit->locktype = locktype;
- EnterCriticalSection(&lockit_cs[locktype]);
-}
-
-/* ?_Lockit_ctor at _Lockit@std@@CAXPAV12@@Z */
-/* ?_Lockit_ctor at _Lockit@std@@CAXPEAV12@@Z */
-void __cdecl _Lockit__Lockit_ctor(_Lockit *lockit)
-{
- _Lockit__Lockit_ctor_locktype(lockit, 0);
-}
-
-/* ??0_Lockit at std@@QAE at H@Z */
-/* ??0_Lockit at std@@QEAA at H@Z */
-DEFINE_THISCALL_WRAPPER(_Lockit_ctor_locktype, 8)
_Lockit* __thiscall _Lockit_ctor_locktype(_Lockit *this, int locktype)
{
- _Lockit__Lockit_ctor_locktype(this, locktype);
+ EnterCriticalSection(&lockit_cs);
return this;
}
@@ -147,15 +112,7 @@ _Lockit* __thiscall _Lockit_ctor_locktype(_Lockit *this, int locktype)
DEFINE_THISCALL_WRAPPER(_Lockit_ctor, 4)
_Lockit* __thiscall _Lockit_ctor(_Lockit *this)
{
- _Lockit__Lockit_ctor_locktype(this, 0);
- return this;
-}
-
-/* ?_Lockit_dtor at _Lockit@std@@CAXPAV12@@Z */
-/* ?_Lockit_dtor at _Lockit@std@@CAXPEAV12@@Z */
-void __cdecl _Lockit__Lockit_dtor(_Lockit *lockit)
-{
- LeaveCriticalSection(&lockit_cs[lockit->locktype]);
+ return _Lockit_ctor_locktype(this, 0);
}
/* ??1_Lockit at std@@QAE at XZ */
@@ -163,7 +120,7 @@ void __cdecl _Lockit__Lockit_dtor(_Lockit *lockit)
DEFINE_THISCALL_WRAPPER(_Lockit_dtor, 4)
void __thiscall _Lockit_dtor(_Lockit *this)
{
- _Lockit__Lockit_dtor(this);
+ LeaveCriticalSection(&lockit_cs);
}
/* wctype */
diff --git a/dlls/msvcp60/msvcp.h b/dlls/msvcp60/msvcp.h
index ed31419..ef6f864 100644
--- a/dlls/msvcp60/msvcp.h
+++ b/dlls/msvcp60/msvcp.h
@@ -256,7 +256,7 @@ void __thiscall locale_dtor(locale*);
/* class _Lockit */
typedef struct {
- int locktype;
+ char empty_struct;
} _Lockit;
#define _LOCK_LOCALE 0
More information about the wine-cvs
mailing list