summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKirill Volinsky <mataes2007@gmail.com>2013-09-09 13:44:34 +0000
committerKirill Volinsky <mataes2007@gmail.com>2013-09-09 13:44:34 +0000
commitf6233a8261525da7c1a7ee52afd46d1980275a40 (patch)
tree20e13ac2e662ed3731e7f9435f80f872bfba89d0
parente527fd4754135c18c51d2cbdb42a7a4c31afd94a (diff)
hook fix
git-svn-id: http://svn.miranda-ng.org/main/trunk@6031 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
-rw-r--r--plugins/KeyboardNotify/src/main.cpp4
-rw-r--r--plugins/QuickContacts/src/quickcontacts.cpp2
-rw-r--r--plugins/StatusPlugins/AdvancedAutoAway/advancedautoaway.cpp4
-rw-r--r--plugins/TabSRMM/src/controls.cpp2
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;
}