Add some error handling, fix bug with shift key, update project files…

… to VS2015.
benbuck · May 12, 2017 · 4999d16 · 4999d16
1 parent d0aea48
commit 4999d16
Show file tree

Hide file tree

Showing 9 changed files with 321 additions and 301 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,17 +1,17 @@
-/ipch
+#/ipch
+/.vs
 *.aps
 *.cache
+*.db
 *.exp
-*.lastbuildstate
+*.iobj
+*.ipdb
 *.lib
 *.log
-*.manifest
 *.obj
-*.opensdf
+*.opendb
 *.pdb
 *.res
-*.sdf
-*.suo
 *.tlog
 *.user
 !/**/RBTray.exe
diff --git a/RBHook.cpp b/RBHook.cpp
@@ -1,23 +1,23 @@
 // ****************************************************************************
-// 
+//
 // RBTray
 // Copyright (C) 1998-2010  Nikolay Redko, J.D. Purcell
 // Copyright (C) 2015 Benbuck Nason
-// 
+//
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation; either version 2 of the License, or
 // (at your option) any later version.
-// 
+//
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
-// 
+//
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-// 
+//
 // ****************************************************************************
 
 #include <windows.h>
@@ -29,64 +29,64 @@ static HWND _hLastHit = NULL;
 
 // Works for 32-bit and 64-bit apps
 LRESULT CALLBACK MouseProc(int nCode, WPARAM wParam, LPARAM lParam) {
-	if (nCode >= 0) {
-		if (wParam == WM_NCRBUTTONDOWN || wParam == WM_NCRBUTTONUP) {
-			MOUSEHOOKSTRUCT *info = (MOUSEHOOKSTRUCT*)lParam;
-			BOOL isHit = (info->wHitTestCode == HTMINBUTTON) || GetKeyState(VK_SHIFT);
-			if (wParam == WM_NCRBUTTONDOWN && isHit) {
-				_hLastHit = info->hwnd;
-				return 1;
-			}
-			else if (wParam == WM_NCRBUTTONUP && isHit) {
-				if (info->hwnd == _hLastHit) {
-					PostMessage(FindWindow(NAME, NAME), WM_ADDTRAY, 0, (LPARAM)info->hwnd);
-				}
-				_hLastHit = NULL;
-				return 1;
-			}
-			else {
-				_hLastHit = NULL;
-			}
-		}
-		else if (wParam == WM_RBUTTONDOWN || wParam == WM_RBUTTONUP) {
-			_hLastHit = NULL;
-		}
-	}
-	return CallNextHookEx(_hMouse, nCode, wParam, lParam);
+    if (nCode >= 0) {
+        if ((wParam == WM_NCRBUTTONDOWN) || (wParam == WM_NCRBUTTONUP)) {
+            MOUSEHOOKSTRUCT *info = (MOUSEHOOKSTRUCT*)lParam;
+            BOOL isHit = (info->wHitTestCode == HTMINBUTTON) || ((info->wHitTestCode == HTCAPTION) && (GetKeyState(VK_SHIFT) & 0x8000));
+            if ((wParam == WM_NCRBUTTONDOWN) && isHit) {
+                _hLastHit = info->hwnd;
+                return 1;
+            }
+            else if ((wParam == WM_NCRBUTTONUP) && isHit) {
+                if (info->hwnd == _hLastHit) {
+                    PostMessage(FindWindow(NAME, NAME), WM_ADDTRAY, 0, (LPARAM)info->hwnd);
+                }
+                _hLastHit = NULL;
+                return 1;
+            }
+            else {
+                _hLastHit = NULL;
+            }
+        }
+        else if (wParam == WM_RBUTTONDOWN || wParam == WM_RBUTTONUP) {
+            _hLastHit = NULL;
+        }
+    }
+    return CallNextHookEx(_hMouse, nCode, wParam, lParam);
 }
 
 // Only works for 32-bit apps or 64-bit apps depending on whether this is complied
 // as 32-bit or 64-bit
 LRESULT CALLBACK CallWndRetProc(int nCode, WPARAM wParam, LPARAM lParam) {
-	if (nCode >= 0) {
-		CWPRETSTRUCT *msg = (CWPRETSTRUCT*)lParam;
-		if ((msg->message == WM_WINDOWPOSCHANGED && 
-			 (((WINDOWPOS*)msg->lParam)->flags & SWP_SHOWWINDOW) != 0) ||
-			(msg->message == WM_NCDESTROY))
-		{
-			PostMessage(FindWindow(NAME, NAME), WM_REFRTRAY, 0, (LPARAM)msg->hwnd);
-		}
-	}
-	return CallNextHookEx(_hWndProc, nCode, wParam, lParam);
+    if (nCode >= 0) {
+        CWPRETSTRUCT *msg = (CWPRETSTRUCT*)lParam;
+        if ((msg->message == WM_WINDOWPOSCHANGED &&
+             (((WINDOWPOS*)msg->lParam)->flags & SWP_SHOWWINDOW) != 0) ||
+            (msg->message == WM_NCDESTROY))
+        {
+            PostMessage(FindWindow(NAME, NAME), WM_REFRTRAY, 0, (LPARAM)msg->hwnd);
+        }
+    }
+    return CallNextHookEx(_hWndProc, nCode, wParam, lParam);
 }
 
 BOOL DLLIMPORT RegisterHook(HMODULE hLib) {
-	_hMouse = SetWindowsHookEx(WH_MOUSE, (HOOKPROC)MouseProc, hLib, 0);
-	_hWndProc = SetWindowsHookEx(WH_CALLWNDPROCRET, (HOOKPROC)CallWndRetProc, hLib, 0);
-	if (_hMouse == NULL || _hWndProc == NULL) {
-		UnRegisterHook();
-		return FALSE;
-	}
-	return TRUE;
+    _hMouse = SetWindowsHookEx(WH_MOUSE, (HOOKPROC)MouseProc, hLib, 0);
+    _hWndProc = SetWindowsHookEx(WH_CALLWNDPROCRET, (HOOKPROC)CallWndRetProc, hLib, 0);
+    if (_hMouse == NULL || _hWndProc == NULL) {
+        UnRegisterHook();
+        return FALSE;
+    }
+    return TRUE;
 }
 
 void DLLIMPORT UnRegisterHook() {
-	if (_hMouse) {
-		UnhookWindowsHookEx(_hMouse);
-		_hMouse = NULL;
-	}
-	if (_hWndProc) {
-		UnhookWindowsHookEx(_hWndProc);
-		_hWndProc = NULL;
-	}
+    if (_hMouse) {
+        UnhookWindowsHookEx(_hMouse);
+        _hMouse = NULL;
+    }
+    if (_hWndProc) {
+        UnhookWindowsHookEx(_hWndProc);
+        _hWndProc = NULL;
+    }
 }
diff --git a/RBHook.vcxproj b/RBHook.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
@@ -20,11 +20,13 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">