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

dinput: Only register the window class once to avoid race conditions.

Browse Source
This commit is contained in:
Alexandre Julliard 2006-10-05 17:45:45 +02:00
parent cd2c458588
commit 09371c75d5
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
dlls/dinput/dinput_main.c
View File

@ -754,20 +754,13 @@ static LRESULT CALLBACK dinput_hook_WndProc(HWND hWnd, UINT message, WPARAM wPar
static HWND hook_thread_hwnd; static HWND hook_thread_hwnd;
static LONG hook_thread_refcount; static LONG hook_thread_refcount;
static const WCHAR classW[]={'H','o','o','k','_','L','L','_','C','L',0};
static DWORD WINAPI hook_thread_proc(void *param) static DWORD WINAPI hook_thread_proc(void *param)
{ {
static const WCHAR classW[]={'H','o','o','k','_','L','L','_','C','L',0};
MSG msg; MSG msg;
WNDCLASSEXW wcex;
HWND hwnd; HWND hwnd;
memset(&wcex, 0, sizeof(wcex));
wcex.cbSize = sizeof(wcex);
wcex.lpfnWndProc = dinput_hook_WndProc;
wcex.lpszClassName = classW;
wcex.hInstance = GetModuleHandleW(0);
if (!RegisterClassExW(&wcex)) ERR("Error registering window class\n");
hwnd = CreateWindowExW(0, classW, NULL, 0, 0, 0, 0, 0, HWND_MESSAGE, NULL, NULL, 0); hwnd = CreateWindowExW(0, classW, NULL, 0, 0, 0, 0, 0, HWND_MESSAGE, NULL, NULL, 0);
hook_thread_hwnd = hwnd; hook_thread_hwnd = hwnd;
@ -783,7 +776,6 @@ static DWORD WINAPI hook_thread_proc(void *param)
} }
else ERR("Error creating message window\n"); else ERR("Error creating message window\n");
UnregisterClassW(wcex.lpszClassName, wcex.hInstance);
return 0; return 0;
} }
@ -799,8 +791,21 @@ static CRITICAL_SECTION dinput_hook_crit = { &dinput_critsect_debug, -1, 0, 0, 0
static BOOL create_hook_thread(void) static BOOL create_hook_thread(void)
{ {
LONG ref; LONG ref;
static ATOM class_atom;
EnterCriticalSection(&dinput_hook_crit); EnterCriticalSection(&dinput_hook_crit);
if (!class_atom)
{
WNDCLASSEXW wcex;
memset(&wcex, 0, sizeof(wcex));
wcex.cbSize = sizeof(wcex);
wcex.lpfnWndProc = dinput_hook_WndProc;
wcex.lpszClassName = classW;
wcex.hInstance = GetModuleHandleW(0);
if (!(class_atom = RegisterClassExW(&wcex))) ERR("Error registering window class\n");
}
ref = ++hook_thread_refcount; ref = ++hook_thread_refcount;
TRACE("Refcount %ld\n", ref); TRACE("Refcount %ld\n", ref);
if (ref == 1) if (ref == 1)