wintab32: Make the csTablet critical section static.
Francois Gouget
fgouget at codeweavers.com
Tue Nov 15 07:41:30 CST 2011
---
dlls/wintab32/wintab32.c | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/dlls/wintab32/wintab32.c b/dlls/wintab32/wintab32.c
index 53c7523..50daebd 100644
--- a/dlls/wintab32/wintab32.c
+++ b/dlls/wintab32/wintab32.c
@@ -34,7 +34,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(wintab32);
HWND hwndDefault = NULL;
static const WCHAR
WC_TABLETCLASSNAME[] = {'W','i','n','e','T','a','b','l','e','t','C','l','a','s','s',0};
-CRITICAL_SECTION csTablet;
+static CRITICAL_SECTION_DEBUG csTablet_debug =
+{
+ 0, 0, &csTablet,
+ { &csTablet_debug.ProcessLocksList, &csTablet_debug.ProcessLocksList },
+ 0, 0, { (DWORD_PTR)(__FILE__ ": csTablet") }
+};
+CRITICAL_SECTION csTablet = { &csTablet_debug, -1, 0, 0, 0, 0 };
int (CDECL *pLoadTabletInfo)(HWND hwnddefault) = NULL;
int (CDECL *pGetCurrentPacket)(LPWTPACKET packet) = NULL;
@@ -74,8 +80,6 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpReserved)
case DLL_PROCESS_ATTACH:
TRACE("Initialization\n");
DisableThreadLibraryCalls(hInstDLL);
- InitializeCriticalSection(&csTablet);
- csTablet.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": csTablet");
hx11drv = GetModuleHandleA("winex11.drv");
if (hx11drv)
{
@@ -98,7 +102,6 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpReserved)
hwndDefault = 0;
}
TABLET_Unregister();
- csTablet.DebugInfo->Spare[0] = 0;
DeleteCriticalSection(&csTablet);
break;
}
--
1.7.7.1
More information about the wine-patches
mailing list