added pinvoke error-checking

retailcoder · retailcoder · commit b7a98c22961a · 2016-04-11T02:19:16.000-04:00
diff --git a/RetailCoder.VBE/Common/KeyboardHook.cs b/RetailCoder.VBE/Common/KeyboardHook.cs
@@ -65,7 +65,12 @@ public void Attach()
                 return;
             }
 
-            _hookId = User32.SetWindowsHookEx(WindowsHook.KEYBOARD, HookCallback, Kernel32.GetModuleHandle("user32"), 0);
+            var handle = Kernel32.GetModuleHandle("user32");
+            if (handle == IntPtr.Zero)
+            {
+                throw new Win32Exception();
+            }
+            _hookId = User32.SetWindowsHookEx(WindowsHook.KEYBOARD, HookCallback, handle, 0);
             if (_hookId == IntPtr.Zero)
             {
                 throw new Win32Exception();
@@ -81,7 +86,10 @@ public void Detach()
                 return;
             }
 
-            User32.UnhookWindowsHookEx(_hookId);
+            if (!User32.UnhookWindowsHookEx(_hookId))
+            {
+                throw new Win32Exception();
+            }
 
             IsAttached = false;
             Debug.WriteLine("{0}: {1}", GetType().Name, IsAttached ? "Attached" : "Detached");
diff --git a/RetailCoder.VBE/Common/MouseHook.cs b/RetailCoder.VBE/Common/MouseHook.cs
@@ -44,13 +44,17 @@ public void Attach()
                 return;
             }
 
-            _hookId = User32.SetWindowsHookEx(WindowsHook.MOUSE, HookCallback, Kernel32.GetModuleHandle("user32"), 0);
+            var handle = Kernel32.GetModuleHandle("user32");
+            if (handle == IntPtr.Zero)
+            {
+                throw new Win32Exception();
+            } 
+            _hookId = User32.SetWindowsHookEx(WindowsHook.MOUSE, HookCallback, handle, 0);
             if (_hookId == IntPtr.Zero)
             {
                 throw new Win32Exception();
             }
-
-
+            
             IsAttached = true;
             Debug.WriteLine("{0}: {1}", GetType().Name, IsAttached ? "Attached" : "Detached");
         }
@@ -62,7 +66,10 @@ public void Detach()
                 return;
             }
 
-            User32.UnhookWindowsHookEx(_hookId);
+            if (!User32.UnhookWindowsHookEx(_hookId))
+            {
+                throw new Win32Exception();
+            }
 
             IsAttached = false;
             Debug.WriteLine("{0}: {1}", GetType().Name, IsAttached ? "Attached" : "Detached");

Original file line number	Diff line number	Diff line change
`@@ -44,13 +44,17 @@ public void Attach()`
`44`	`44`	`return;`
`45`	`45`	`}`
`46`	`46`
`47`		`- _hookId = User32.SetWindowsHookEx(WindowsHook.MOUSE, HookCallback, Kernel32.GetModuleHandle("user32"), 0);`
	`47`	`+ var handle = Kernel32.GetModuleHandle("user32");`
	`48`	`+ if (handle == IntPtr.Zero)`
	`49`	`+ {`
	`50`	`+ throw new Win32Exception();`
	`51`	`+ }`
	`52`	`+ _hookId = User32.SetWindowsHookEx(WindowsHook.MOUSE, HookCallback, handle, 0);`
`48`	`53`	`if (_hookId == IntPtr.Zero)`
`49`	`54`	`{`
`50`	`55`	`throw new Win32Exception();`
`51`	`56`	`}`
`52`		`-`
`53`		`-`
	`57`	`+`
`54`	`58`	`IsAttached = true;`
`55`	`59`	`Debug.WriteLine("{0}: {1}", GetType().Name, IsAttached ? "Attached" : "Detached");`
`56`	`60`	`}`
`@@ -62,7 +66,10 @@ public void Detach()`
`62`	`66`	`return;`
`63`	`67`	`}`
`64`	`68`
`65`		`- User32.UnhookWindowsHookEx(_hookId);`
	`69`	`+ if (!User32.UnhookWindowsHookEx(_hookId))`
	`70`	`+ {`
	`71`	`+ throw new Win32Exception();`
	`72`	`+ }`
`66`	`73`
`67`	`74`	`IsAttached = false;`
`68`	`75`	`Debug.WriteLine("{0}: {1}", GetType().Name, IsAttached ? "Attached" : "Detached");`