Changeset 2271

Timestamp:

07/18/08 05:17:06 (4 months ago)

Author:

jteh

Message:

keyHook and mouseHook:

• Remove the isInitialized variable, which is unnecessary and was never used properly anyway. The hook ID Is now used to determine whether the hook has been initialized.
  
• initialize():
  
  • SetWindowsHookEx? returns NULL on failure, so only check for NULL instead of <= 0.
    
  • Can no longer be called twice without an intervening call to terminate().
    
• terminate():
  
  • Fix the issue where this function never unregistered the hook at all due to the broken use of isInitialized.
    
  • Now returns an int like initialize(): 0 on success, -1 on failure.
    
  • -1 is returned if already initialized or the hook could not be unregistered.
    
  • Clean up state so that initialize() can be called again if desired.
    
• Update copyright headers.
  

Files:

• keyHook/keyHook.c (modified) (5 diffs)
• keyHook/keyHook.h (modified) (2 diffs)
• mouseHook/MOUSEHook.c (modified) (4 diffs)
• mouseHook/MOUSEHook.h (modified) (2 diffs)

keyHook/keyHook.c

@@ -1 +1 @@
 //keyHook.c
-//Copyright (c) 2007 Michael Curran <mick@kulgan.net>
+//Copyright (c) 2007-2008 Michael Curran <mick@kulgan.net>
 //This file is covered by the GNU General Public Licence
-//See the file Copying for details.
+//See the file copying.txt for details.
 
 #define UNICODE
@@ -13 +13 @@
 HINSTANCE moduleHandle;
 HHOOK keyHookID=0;
-BOOL isInitialized=FALSE;
 
 #pragma comment(linker,"/entry:_DllMainCRTStartup@12")
@@ -47 +46 @@
 
 int initialize(keyCallback_t downCallback, keyCallback_t upCallback) {
-        if(isInitialized) {
+        if(keyHookID) {
                 fprintf(stderr,"Already initialized\n");
                 return -1;
@@ -53 +52 @@
         keyDownCallback=downCallback;
         keyUpCallback=upCallback;
-        if((keyHookID=SetWindowsHookEx(WH_KEYBOARD_LL,(HOOKPROC)keyHook,moduleHandle,0))<=0) {
+        if(!(keyHookID=SetWindowsHookEx(WH_KEYBOARD_LL,(HOOKPROC)keyHook,moduleHandle,0))) {
                 fprintf(stderr,"Error registering key hook\n");
                 return -1;
@@ -60 +59 @@
 }
 
-void terminate() {
-        if(isInitialized) {
-                UnhookWindowsHookEx(keyHookID);
+int terminate() {
+        if(keyHookID) {
+                if(UnhookWindowsHookEx(keyHookID)) {
+                        keyHookID=0;
+                        return 0;
+                }
         }
+        return -1;
 }

keyHook/keyHook.h

@@ -1 @@
-//Copyright (c) 2007 Michael Curran <mick@kulgan.net>
+//Copyright (c) 2007-2008 Michael Curran <mick@kulgan.net>
 //This file is covered by the GNU General Public Licence
 
@@ -12 +12 @@
 //Functions
 DLLEXPORT int initialize(keyCallback_t downCallback, keyCallback_t upCallback);
-DLLEXPORT void terminate();
+DLLEXPORT int terminate();
 
 #endif

mouseHook/MOUSEHook.c

@@ -1 +1 @@
 //mouseHook.c
-//Copyright (c) 2007 Michael Curran <mick@kulgan.net>
+//Copyright (c) 2007-2008 Michael Curran <mick@kulgan.net>
 //This file is covered by the GNU General Public Licence
-//See the file Copying for details.
+//See the file copying.txt for details.
 
 #define UNICODE
@@ -12 +12 @@
 HINSTANCE moduleHandle;
 HHOOK mouseHookID=0;
-BOOL isInitialized=FALSE;
 
 #pragma comment(linker,"/entry:_DllMainCRTStartup@12")
@@ -37 +36 @@
 
 int initialize(mouseCallback_t callback) {
-        if(isInitialized) {
+        if(mouseHookID) {
                 fprintf(stderr,"Already initialized\n");
                 return -1;
         }
         mouseCallback=callback;
-        if((mouseHookID=SetWindowsHookEx(WH_MOUSE_LL,(HOOKPROC)mouseHook,moduleHandle,0))<=0) {
+        if(!(mouseHookID=SetWindowsHookEx(WH_MOUSE_LL,(HOOKPROC)mouseHook,moduleHandle,0))) {
                 fprintf(stderr,"Error registering mouse hook\n");
                 return -1;
@@ -49 +48 @@
 }
 
-void terminate() {
-        if(isInitialized) {
-                UnhookWindowsHookEx(mouseHookID);
+int terminate() {
+        if(mouseHookID) {
+                if(UnhookWindowsHookEx(mouseHookID)) {
+                        mouseHookID=0;
+                        return 0;
+                }
         }
+        return -1;
 }

mouseHook/MOUSEHook.h

@@ -1 @@
-//Copyright (c) 2007 Michael Curran <mick@kulgan.net>
+//Copyright (c) 2008 Michael Curran <mick@kulgan.net>
 //This file is covered by the GNU General Public Licence
 
@@ -12 +12 @@
 //Functions
 DLLEXPORT int initialize(mouseCallback_t callback);
-DLLEXPORT void terminate();
+DLLEXPORT int terminate();
 
 #endif