From f6233a8261525da7c1a7ee52afd46d1980275a40 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Mon, 9 Sep 2013 13:44:34 +0000 Subject: hook fix git-svn-id: http://svn.miranda-ng.org/main/trunk@6031 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/KeyboardNotify/src/main.cpp | 4 ++-- plugins/QuickContacts/src/quickcontacts.cpp | 2 +- plugins/StatusPlugins/AdvancedAutoAway/advancedautoaway.cpp | 4 ++-- plugins/TabSRMM/src/controls.cpp | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/plugins/KeyboardNotify/src/main.cpp b/plugins/KeyboardNotify/src/main.cpp index afe5bb1cca..b961c3b132 100644 --- a/plugins/KeyboardNotify/src/main.cpp +++ b/plugins/KeyboardNotify/src/main.cpp @@ -991,9 +991,9 @@ int HookWindowsHooks() case ACTIVE_WINDOWS: if (!MyGetLastInputInfo || bEmulateKeypresses) { if (hMouseHook == NULL) - hMouseHook = SetWindowsHookEx(WH_MOUSE, MouseHookFunction, hInst, 0); + hMouseHook = SetWindowsHookEx(WH_MOUSE, MouseHookFunction, 0, GetCurrentThreadId()); if (hKeyBoardHook == NULL) - hKeyBoardHook = SetWindowsHookEx(WH_KEYBOARD, KeyBoardHookFunction, hInst, 0); + hKeyBoardHook = SetWindowsHookEx(WH_KEYBOARD, KeyBoardHookFunction, 0, GetCurrentThreadId()); } break; case ACTIVE_MIRANDA: diff --git a/plugins/QuickContacts/src/quickcontacts.cpp b/plugins/QuickContacts/src/quickcontacts.cpp index 24cc2197b6..e6ec71a71e 100644 --- a/plugins/QuickContacts/src/quickcontacts.cpp +++ b/plugins/QuickContacts/src/quickcontacts.cpp @@ -789,7 +789,7 @@ static INT_PTR CALLBACK MainDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA if (!hasNewHotkeyModule) hAcct = LoadAccelerators(hInst, MAKEINTRESOURCE(ACCEL_TABLE)); - hHook = SetWindowsHookEx(WH_MSGFILTER, HookProc, hInst, GetCurrentThreadId()); + hHook = SetWindowsHookEx(WH_MSGFILTER, HookProc, 0, GetCurrentThreadId()); // Combo SendMessage(GetDlgItem(hwndDlg, IDC_USERNAME), EM_LIMITTEXT, (WPARAM)119,0); diff --git a/plugins/StatusPlugins/AdvancedAutoAway/advancedautoaway.cpp b/plugins/StatusPlugins/AdvancedAutoAway/advancedautoaway.cpp index a6de74e205..e3fd4580bb 100644 --- a/plugins/StatusPlugins/AdvancedAutoAway/advancedautoaway.cpp +++ b/plugins/StatusPlugins/AdvancedAutoAway/advancedautoaway.cpp @@ -424,9 +424,9 @@ static int HookWindowsHooks(int hookMiranda, int hookAll) if (hookAll) { MyGetLastInputInfo=NULL; if ( monitorKeyboard && hKeyBoardHook == NULL ) - hKeyBoardHook = SetWindowsHookEx(WH_KEYBOARD,KeyBoardHookFunction,hInst,0); + hKeyBoardHook = SetWindowsHookEx(WH_KEYBOARD, KeyBoardHookFunction, 0, GetCurrentThreadId()); if ( monitorMouse && hMouseHook == NULL ) - hMouseHook = SetWindowsHookEx(WH_MOUSE,MouseHookFunction,hInst,0); + hMouseHook = SetWindowsHookEx(WH_MOUSE, MouseHookFunction, 0, GetCurrentThreadId()); } return 0; diff --git a/plugins/TabSRMM/src/controls.cpp b/plugins/TabSRMM/src/controls.cpp index 6cd346f2dc..2b20e61e14 100644 --- a/plugins/TabSRMM/src/controls.cpp +++ b/plugins/TabSRMM/src/controls.cpp @@ -117,7 +117,7 @@ void CMenuBar::obtainHook() { releaseHook(); if (m_hHook == 0) - m_hHook = ::SetWindowsHookEx(WH_MSGFILTER, CMenuBar::MessageHook, g_hInst, 0); + m_hHook = ::SetWindowsHookEx(WH_MSGFILTER, CMenuBar::MessageHook, 0, GetCurrentThreadId()); m_Owner = this; } -- cgit v1.2.3