Menu
▾
▴
[Gaim-commits] CVS: gaim/src/win32/IdleTracker idletrack.c,1.6,1.7
|
From: Luke S. <lsc...@us...> - 2004-06-27 22:30:02
|
Update of /cvsroot/gaim/gaim/src/win32/IdleTracker In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22620/src/win32/IdleTracker Modified Files: idletrack.c Log Message: " IDLETRACK.DLL uses Windows hooks to record the last time the user pressed a key or moved the mouse. Windows hooks are a bit unfriendly in that they force the hook DLL into every process - so IDLETRACK.DLL gets added to every process after Gaim runs. This can mean that IDLETRACK.DLL doesn't get unloaded when Gaim stops, which causes a warning about being unable to write to IDLETRACK.DLL if you then upgrade Gaim. Further, hooking is a common tactic employed by key loggers. If the user has a program installed that checks for global hooks then it will warn the user that Gaim may contain a key logger. From Windows 2000 onwards Microsoft introduced an API function called GetLastInputInfo that returns the timer tick at the point that the user last pressed a key or moved the mouse. I have changed idletrack.c so that it will try to use this if it can, which avoids all the ugliness of having to use hooks, but it will fall back to using hooks if the function isn't present. This patch changes all three exported functions in idletrack.c. In wgaim_set_idlehooks it checks to see if GetLastInputInfo is present. If it is then the address of the function is recorded and no hooks are set. If it isn't then we're running on an old verison of Windows and the hooks are set as per current behaviour. In wgaim_remove_idlehooks the module handle taken for USER32.DLL by wgaim_set_idlehooks is released. In wgaim_get_lastactive the GetLastInputInfo function is called, if present. If it isn't present then the hooks will have run and the shared memory they write to will be read as per current behaviour. Both methods end up getting the timer tick of the last user activity, which is returned as per current behaviour." --Andrew Whewell Index: idletrack.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/win32/IdleTracker/idletrack.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -p -r1.6 -r1.7 --- idletrack.c 12 Oct 2003 21:00:26 -0000 1.6 +++ idletrack.c 27 Jun 2004 22:29:53 -0000 1.7 @@ -5,7 +5,18 @@ * Herman Bloggs <her...@ya...> * Date: February, 2003 * Description: Track user inactivity. + * + * Andrew Whewell <awh...@us...> - 25th June 2004. Added + * support for GetLastInputInfo under Windows 2000 and above. This avoids having + * IDLETRACK.DLL hook itself into every process on the machine, which makes + * upgrades easier. The hook mechanism is also used by key loggers, so not + * using hooks doesn't put the willys up programs that keep an eye out for + * loggers. + * + * Windows 9x doesn't have GetLastInputInfo - when GAIM runs on these machines + * the code silently falls back onto the old hooking scheme. */ +#define _WIN32_WINNT 0x0500 #include <windows.h> #define EXPORT __declspec(dllexport) @@ -17,6 +28,13 @@ static HHOOK mouseHook = NULL; static HINSTANCE g_hInstance = NULL; static POINT g_point; +// GetLastInputInfo address and module - if g_GetLastInputInfo == NULL then +// we fall back on the old "hook the world" method. GetLastInputInfo was brought +// in with Windows 2000 so Windows 9x will still hook everything. +typedef BOOL (WINAPI *GETLASTINPUTINFO)(LASTINPUTINFO *); +static HMODULE g_user32 = NULL; +static GETLASTINPUTINFO g_GetLastInputInfo = NULL; + static DWORD* setup_shared_mem() { BOOL fInit; @@ -81,38 +99,59 @@ LRESULT CALLBACK MouseProc(int code, WPA EXPORT DWORD wgaim_get_lastactive() { - if (lastTime == NULL) - lastTime = setup_shared_mem(); - - if (lastTime) - return *lastTime; - - return 0; + DWORD result = 0; + + // If we have GetLastInputInfo then use it, otherwise use the hooks + if (g_GetLastInputInfo != NULL) { + LASTINPUTINFO lii; + memset(&lii, 0, sizeof(lii)); + lii.cbSize = sizeof(lii); + if (g_GetLastInputInfo(&lii)) { + result = lii.dwTime; + } + } else { + if (lastTime == NULL) + lastTime = setup_shared_mem(); + + if (lastTime) + result = *lastTime; + } + + return result; } EXPORT BOOL wgaim_set_idlehooks() { - // Set up the shared memory. - lastTime = setup_shared_mem(); - if (lastTime == NULL) - return FALSE; - *lastTime = GetTickCount(); - - // Set up the keyboard hook. - keyHook = SetWindowsHookEx(WH_KEYBOARD, KeyboardProc, g_hInstance, 0); - if (keyHook == NULL) { - UnmapViewOfFile(lastTime); - CloseHandle(hMapObject); - return FALSE; - } - - // Set up the mouse hook. - mouseHook = SetWindowsHookEx(WH_MOUSE, MouseProc, g_hInstance, 0); - if (mouseHook == NULL) { - UnhookWindowsHookEx(keyHook); - UnmapViewOfFile(lastTime); - CloseHandle(hMapObject); - return FALSE; + // Is GetLastInputInfo available? + g_user32 = LoadLibrary("user32.dll"); + if (g_user32) { + g_GetLastInputInfo = (GETLASTINPUTINFO)GetProcAddress(g_user32, "GetLastInputInfo"); + } + + // If we couldn't find GetLastInputInfo then fall back onto the hooking scheme + if (g_GetLastInputInfo == NULL) { + // Set up the shared memory. + lastTime = setup_shared_mem(); + if (lastTime == NULL) + return FALSE; + *lastTime = GetTickCount(); + + // Set up the keyboard hook. + keyHook = SetWindowsHookEx(WH_KEYBOARD, KeyboardProc, g_hInstance, 0); + if (keyHook == NULL) { + UnmapViewOfFile(lastTime); + CloseHandle(hMapObject); + return FALSE; + } + + // Set up the mouse hook. + mouseHook = SetWindowsHookEx(WH_MOUSE, MouseProc, g_hInstance, 0); + if (mouseHook == NULL) { + UnhookWindowsHookEx(keyHook); + UnmapViewOfFile(lastTime); + CloseHandle(hMapObject); + return FALSE; + } } return TRUE; @@ -120,6 +159,8 @@ EXPORT BOOL wgaim_set_idlehooks() { EXPORT void wgaim_remove_idlehooks() { + if (g_user32 != NULL) + FreeLibrary(g_user32); if (keyHook) UnhookWindowsHookEx(keyHook); if (mouseHook) |