Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-23 00:45:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixed some resource leaks and 64bit issues

Browse source 
svn path=/trunk/; revision=19239
This commit is contained in:
Christoph von Wittich 2005-11-15 02:25:28 +00:00
parent 1a42cad0e3
commit 96c802c1d3
1 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
rosapps/tests/map_dup_inherit/map_dup_inherit.c
View file

@ -16,7 +16,11 @@ int main( int argc, char **argv ) {
fprintf( stderr, "%lu: Starting\n", GetCurrentProcessId() ); fprintf( stderr, "%lu: Starting\n", GetCurrentProcessId() );
if( argc == 2 ) { if( argc == 2 ) {
file_map = (void *)atoi(argv[1]); #ifdef WIN64
file_map = (void *)atoi64(argv[1]);
#else
file_map = (void *)UlongToPtr(atoi(argv[1]));
#endif
} else { } else {
file_map = CreateFileMapping( INVALID_HANDLE_VALUE, file_map = CreateFileMapping( INVALID_HANDLE_VALUE,
NULL, NULL,
@ -46,12 +50,16 @@ int main( int argc, char **argv ) {
if( !file_view ) { if( !file_view ) {
fprintf( stderr, "%lu: Could not map view of file.\n", fprintf( stderr, "%lu: Could not map view of file.\n",
GetCurrentProcessId() ); GetCurrentProcessId() );
if (file_map != INVALID_HANDLE_VALUE)
CloseHandle(file_map);
return 2; return 2;
} }
if( !VirtualAlloc( file_view, 0x1000, MEM_COMMIT, PAGE_READWRITE ) ) { if( !VirtualAlloc( file_view, 0x1000, MEM_COMMIT, PAGE_READWRITE ) ) {
fprintf( stderr, "%lu: VirtualAlloc failed to realize the page.\n", fprintf( stderr, "%lu: VirtualAlloc failed to realize the page.\n",
GetCurrentProcessId() ); GetCurrentProcessId() );
if (file_map != INVALID_HANDLE_VALUE)
CloseHandle(file_map);
return 3; return 3;
} }
@ -72,19 +80,30 @@ int main( int argc, char **argv ) {
memset( &si, 0, sizeof( si ) ); memset( &si, 0, sizeof( si ) );
memset( &pi, 0, sizeof( pi ) ); memset( &pi, 0, sizeof( pi ) );
sprintf(cmdline,"%s %d", argv[0], (int)file_map); sprintf(cmdline,"%s %p", argv[0], file_map);
CloseHandle(file_map);
if( !CreateProcess(NULL, cmdline, NULL, NULL, TRUE, 0, NULL, NULL, if( !CreateProcess(NULL, cmdline, NULL, NULL, TRUE, 0, NULL, NULL,
&si, &pi ) ) { &si, &pi ) ) {
fprintf( stderr, "%lu: Could not create child process.\n", fprintf( stderr, "%lu: Could not create child process.\n",
GetCurrentProcessId() ); GetCurrentProcessId() );
if (pi.hProcess != INVALID_HANDLE_VALUE)
CloseHandle(pi.hProcess);
return 5; return 5;
} }
if( WaitForSingleObject( pi.hThread, INFINITE ) != WAIT_OBJECT_0 ) { if( WaitForSingleObject( pi.hThread, INFINITE ) != WAIT_OBJECT_0 ) {
fprintf( stderr, "%lu: Failed to wait for child process to terminate.\n", fprintf( stderr, "%lu: Failed to wait for child process to terminate.\n",
GetCurrentProcessId() ); GetCurrentProcessId() );
if (pi.hProcess != INVALID_HANDLE_VALUE)
CloseHandle(pi.hProcess);
return 6; return 6;
} }
if (pi.hProcess != INVALID_HANDLE_VALUE)
CloseHandle(pi.hProcess);
} }
return 0; return 0;