CVS: seamlessrdp/ServerExe/HookDll hookdll.cpp,1.20,1.21

Update of /cvsroot/rdesktop/seamlessrdp/ServerExe/HookDll
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32017/ServerExe/HookDll

Modified Files:
	hookdll.cpp 
Log Message:
Better names for global hook variables. Removed unnecessary hooked variables.

Index: hookdll.cpp
===================================================================
RCS file: /cvsroot/rdesktop/seamlessrdp/ServerExe/HookDll/hookdll.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** hookdll.cpp	30 Aug 2005 12:04:08 -0000	1.20
--- hookdll.cpp	30 Aug 2005 12:31:58 -0000	1.21
***************
*** 27,36 ****
  #define snprintf _snprintf
  
! bool bHooked = false;
! bool bHooked2 = false;
! bool bHooked3 = false;
! HHOOK hhook = 0; //cbt
! HHOOK hhook2 = 0; //shell
! HHOOK hhook3 = 0; //wnd proc
  HINSTANCE hInst = 0;
  HANDLE m_vcHandle = 0;
--- 27,33 ----
  #define snprintf _snprintf
  
! HHOOK hCbtProc = 0; 
! HHOOK hShellProc = 0;
! HHOOK hWndProc = 0;
  HINSTANCE hInst = 0;
  HANDLE m_vcHandle = 0;
***************
*** 81,85 ****
  {
      if ( nCode < 0 ) {
!         return CallNextHookEx( hhook3, nCode, wParam, lParam );
      }
      
--- 78,82 ----
  {
      if ( nCode < 0 ) {
!         return CallNextHookEx( hWndProc, nCode, wParam, lParam );
      }
      
***************
*** 159,163 ****
                        details->hwnd,
                        cs->lpszName,
!                       1,    // FIXME: Check for WS_MAXIMIZE/WS_MINIMIZE
                        0 );
              result[ sizeof( result ) - 1 ] = '\0';
--- 156,160 ----
                        details->hwnd,
                        cs->lpszName,
!                       1,     // FIXME: Check for WS_MAXIMIZE/WS_MINIMIZE
                        0 );
              result[ sizeof( result ) - 1 ] = '\0';
***************
*** 195,199 ****
      }
      
!     return CallNextHookEx( hhook3, nCode, wParam, lParam );
  }
  
--- 192,196 ----
      }
      
!     return CallNextHookEx( hWndProc, nCode, wParam, lParam );
  }
  
***************
*** 201,205 ****
  {
      if ( nCode < 0 ) {
!         return CallNextHookEx( hhook, nCode, wParam, lParam );
      }
      
--- 198,202 ----
  {
      if ( nCode < 0 ) {
!         return CallNextHookEx( hCbtProc, nCode, wParam, lParam );
      }
      
***************
*** 237,241 ****
      
      
!     return CallNextHookEx( hhook, nCode, wParam, lParam );
  }
  
--- 234,238 ----
      
      
!     return CallNextHookEx( hCbtProc, nCode, wParam, lParam );
  }
  
***************
*** 244,248 ****
  {
      if ( nCode < 0 ) {
!         return CallNextHookEx( hhook, nCode, wParam, lParam );
      }
      
--- 241,245 ----
  {
      if ( nCode < 0 ) {
!         return CallNextHookEx( hShellProc, nCode, wParam, lParam );
      }
      
***************
*** 353,376 ****
      
      
!     return CallNextHookEx( hhook, nCode, wParam, lParam );
  }
  
  DLL_EXPORT void SetHooks( void )
  {
!     if ( !bHooked ) {
!         hhook = SetWindowsHookEx( WH_CBT, ( HOOKPROC ) CbtProc, hInst, ( DWORD ) NULL );
!         bHooked = true;
      }
      
  #if 0
!     if ( !bHooked2 ) {
!         hhook2 = SetWindowsHookEx( WH_SHELL, ( HOOKPROC ) ShellProc, hInst, ( DWORD ) NULL );
!         bHooked2 = true;
      }
  #endif
      
!     if ( !bHooked3 ) {
!         hhook3 = SetWindowsHookEx( WH_CALLWNDPROC, ( HOOKPROC ) CallWndProc, hInst, ( DWORD ) NULL );
!         bHooked3 = true;
      }
  }
--- 350,370 ----
      
      
!     return CallNextHookEx( hShellProc, nCode, wParam, lParam );
  }
  
  DLL_EXPORT void SetHooks( void )
  {
!     if ( !hCbtProc ) {
!         hCbtProc = SetWindowsHookEx( WH_CBT, ( HOOKPROC ) CbtProc, hInst, ( DWORD ) NULL );
      }
      
  #if 0
!     if ( !hShellProc ) {
!         hShellProc = SetWindowsHookEx( WH_SHELL, ( HOOKPROC ) ShellProc, hInst, ( DWORD ) NULL );
      }
  #endif
      
!     if ( !hWndProc ) {
!         hWndProc = SetWindowsHookEx( WH_CALLWNDPROC, ( HOOKPROC ) CallWndProc, hInst, ( DWORD ) NULL );
      }
  }
***************
*** 378,394 ****
  DLL_EXPORT void RemoveHooks( void )
  {
!     if ( bHooked ) {
!         UnhookWindowsHookEx( hhook );
!         bHooked = false;
      }
      
!     if ( bHooked2 ) {
!         UnhookWindowsHookEx( hhook2 );
!         bHooked2 = false;
      }
      
!     if ( bHooked3 ) {
!         UnhookWindowsHookEx( hhook3 );
!         bHooked3 = false;
      }
  }
--- 372,385 ----
  DLL_EXPORT void RemoveHooks( void )
  {
!     if ( hCbtProc ) {
!         UnhookWindowsHookEx( hCbtProc );
      }
      
!     if ( hShellProc ) {
!         UnhookWindowsHookEx( hShellProc );
      }
      
!     if ( hWndProc ) {
!         UnhookWindowsHookEx( hWndProc );
      }
  }



-------------------------------------------------------
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf