--- sourceforge.net/trunk/seamlessrdp/ServerExe/HookDll/hookdll.cpp 2005/08/30 11:17:52 1002 +++ sourceforge.net/trunk/seamlessrdp/ServerExe/HookDll/hookdll.cpp 2005/08/30 11:22:46 1003 @@ -85,7 +85,6 @@ return CallNextHookEx( hhook3, nCode, wParam, lParam ); } - PCHAR buffer = NULL; char windowTitle[ 150 ] = { "" }; HWND windowHandle = NULL; @@ -116,7 +115,6 @@ rect->bottom - rect->top, 0 ); result[ sizeof( result ) - 1 ] = '\0'; - buffer = result; break; @@ -143,7 +141,6 @@ wp->flags & SWP_NOACTIVATE ? wp->hwndInsertAfter : 0, 0 ); result[ sizeof( result ) - 1 ] = '\0'; - buffer = result; } break; @@ -153,7 +150,6 @@ snprintf( result, sizeof( result ), "CREATE1,0x%p,0x%x\n", details->hwnd, 0 ); - buffer = result; } break; @@ -163,7 +159,6 @@ snprintf( result, sizeof( result ), "DESTROY1,0x%p,0x%x\n", details->hwnd, 0 ); - buffer = result; } break; @@ -174,8 +169,8 @@ } if ( ChannelIsOpen() ) { - if ( buffer != NULL ) { - WriteToChannel( buffer ); + if ( result[ 0 ] != '\0' ) { + WriteToChannel( result ); } } @@ -188,10 +183,6 @@ return CallNextHookEx( hhook, nCode, wParam, lParam ); } - - PCHAR buffer = NULL; - - char windowTitle[ 150 ] = { "" }; HWND windowHandle = NULL; @@ -214,7 +205,6 @@ windowTitle, LOWORD( lParam ), 0 ); - buffer = result; break; @@ -223,8 +213,8 @@ } if ( ChannelIsOpen() ) { - if ( buffer != NULL ) { - WriteToChannel( buffer ); + if ( result[ 0 ] != '\0' ) { + WriteToChannel( result ); } } @@ -239,8 +229,6 @@ } if ( ChannelIsOpen() ) { - PCHAR buffer = NULL; - char windowTitle[ 150 ] = { "" }; HWND windowHandle = NULL; @@ -296,8 +284,6 @@ strcat( result, strW ); strcat( result, "." ); - buffer = result; - break; case HSHELL_WINDOWDESTROYED: @@ -341,15 +327,13 @@ strcat( result, strW ); strcat( result, "." ); - buffer = result; - break; default: break; } - if ( buffer != NULL ) { - WriteToChannel( buffer ); + if ( result[ 0 ] != '\0' ) { + WriteToChannel( result ); } }