CVS: seamlessrdp/ServerExe/HookDll hookdll.cpp,1.17,1.18

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

Modified Files:
	hookdll.cpp 
Log Message:
Moved calls to WriteToChannel; now calling directly as we have our
string.

Also, make sure result from snprintf is null terminated.


Index: hookdll.cpp
===================================================================
RCS file: /cvsroot/rdesktop/seamlessrdp/ServerExe/HookDll/hookdll.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** hookdll.cpp	30 Aug 2005 11:28:55 -0000	1.17
--- hookdll.cpp	30 Aug 2005 11:34:05 -0000	1.18
***************
*** 114,117 ****
--- 114,118 ----
                    0 );
          result[ sizeof( result ) - 1 ] = '\0';
+         WriteToChannel( result );
          break;
          
***************
*** 140,143 ****
--- 141,145 ----
                        0 );
              result[ sizeof( result ) - 1 ] = '\0';
+             WriteToChannel( result );
          }
          break;
***************
*** 149,152 ****
--- 151,156 ----
                        "CREATE1,0x%p,0x%x\n",
                        details->hwnd, 0 );
+             result[ sizeof( result ) - 1 ] = '\0';
+             WriteToChannel( result );
          }
          break;
***************
*** 158,161 ****
--- 162,167 ----
                        "DESTROY1,0x%p,0x%x\n",
                        details->hwnd, 0 );
+             result[ sizeof( result ) - 1 ] = '\0';
+             WriteToChannel( result );
          }
          
***************
*** 167,174 ****
      }
      
-     if ( result[ 0 ] != '\0' ) {
-         WriteToChannel( result );
-     }
-     
      return CallNextHookEx( hhook3, nCode, wParam, lParam );
  }
--- 173,176 ----
***************
*** 202,205 ****
--- 204,209 ----
                    LOWORD( lParam ),
                    0 );
+         result[ sizeof( result ) - 1 ] = '\0';
+         WriteToChannel( result );
          break;
          
***************
*** 209,215 ****
      }
      
!     if ( result[ 0 ] != '\0' ) {
!         WriteToChannel( result );
!     }
      
      return CallNextHookEx( hhook, nCode, wParam, lParam );
--- 213,217 ----
      }
      
!     
      
      return CallNextHookEx( hhook, nCode, wParam, lParam );
***************
*** 277,281 ****
          strcat( result, strW );
          strcat( result, "." );
!         
          break;
          
--- 279,283 ----
          strcat( result, strW );
          strcat( result, "." );
!         WriteToChannel( result );
          break;
          
***************
*** 320,332 ****
          strcat( result, strW );
          strcat( result, "." );
!         
          break;
          default:
          break;
      }
      
-     if ( result[ 0 ] != '\0' ) {
-         WriteToChannel( result );
-     }
      
      return CallNextHookEx( hhook, nCode, wParam, lParam );
--- 322,333 ----
          strcat( result, strW );
          strcat( result, "." );
!         WriteToChannel( result );
          break;
+         
+         
          default:
          break;
      }
      
      
      return CallNextHookEx( hhook, nCode, wParam, lParam );



-------------------------------------------------------
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