[pywin32-checkins] pywin32/win32/src win32popen.cpp,1.9,1.10

[Roger U. <ru...@us...>]

Update of /cvsroot/pywin32/pywin32/win32/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1079/win32/src

Modified Files:
	win32popen.cpp 
Log Message:
Fix some 64-bit issues

Index: win32popen.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/src/win32popen.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** win32popen.cpp	7 Apr 2004 05:07:39 -0000	1.9
--- win32popen.cpp	6 Jun 2007 05:44:46 -0000	1.10
***************
*** 170,175 ****
  	char *s1,*s2, *s3=" /c ";
  	const char *szConsoleSpawn = "win32popenWin9x.exe \"";
! 	int i;
! 	int x;
  
  	if (i = GetEnvironmentVariable("COMSPEC",NULL,0))
--- 170,175 ----
  	char *s1,*s2, *s3=" /c ";
  	const char *szConsoleSpawn = "win32popenWin9x.exe \"";
! 	DWORD i;
! 	size_t x;
  
  	if (i = GetEnvironmentVariable("COMSPEC",NULL,0))
***************
*** 177,181 ****
  		s1 = (char *)_alloca(i);
  		if (!(x = GetEnvironmentVariable("COMSPEC", s1, i)))
! 			return x;
  		if (!g_fUsingWin9x)
  		{
--- 177,181 ----
  		s1 = (char *)_alloca(i);
  		if (!(x = GetEnvironmentVariable("COMSPEC", s1, i)))
! 			return FALSE;
  		if (!g_fUsingWin9x)
  		{
***************
*** 208,212 ****
  	// Now we'll just error out..
  	else
! 		return -1;
    
  	ZeroMemory( &siStartInfo, sizeof(STARTUPINFO));
--- 208,212 ----
  	// Now we'll just error out..
  	else
! 		return FALSE;
    
  	ZeroMemory( &siStartInfo, sizeof(STARTUPINFO));
***************
*** 310,314 ****
  		case _O_WRONLY | _O_TEXT:
  			// Case for writing to child Stdin in text mode.
! 			fd1 = _open_osfhandle((long)hChildStdinWrDup, mode);
  			f1 = _fdopen(fd1, "w");
  			f = PyFile_FromFile(f1, cmdstring, "w", _PyPclose);
--- 310,314 ----
  		case _O_WRONLY | _O_TEXT:
  			// Case for writing to child Stdin in text mode.
! 			fd1 = _open_osfhandle((INT_PTR)hChildStdinWrDup, mode);
  			f1 = _fdopen(fd1, "w");
  			f = PyFile_FromFile(f1, cmdstring, "w", _PyPclose);
***************
*** 321,325 ****
  		case _O_RDONLY | _O_TEXT:
  			// Case for reading from child Stdout in text mode.
! 			fd1 = _open_osfhandle((long)hChildStdoutRdDup, mode);
  			f1 = _fdopen(fd1, "r");
  			f = PyFile_FromFile(f1, cmdstring, "r", _PyPclose);
--- 321,325 ----
  		case _O_RDONLY | _O_TEXT:
  			// Case for reading from child Stdout in text mode.
! 			fd1 = _open_osfhandle((INT_PTR)hChildStdoutRdDup, mode);
  			f1 = _fdopen(fd1, "r");
  			f = PyFile_FromFile(f1, cmdstring, "r", _PyPclose);
***************
*** 332,336 ****
  		case _O_RDONLY | _O_BINARY:
  			// Case for readinig from child Stdout in binary mode.
! 			fd1 = _open_osfhandle((long)hChildStdoutRdDup, mode);
  			f1 = _fdopen(fd1, "rb");
  			f = PyFile_FromFile(f1, cmdstring, "rb", _PyPclose);
--- 332,336 ----
  		case _O_RDONLY | _O_BINARY:
  			// Case for readinig from child Stdout in binary mode.
! 			fd1 = _open_osfhandle((INT_PTR)hChildStdoutRdDup, mode);
  			f1 = _fdopen(fd1, "rb");
  			f = PyFile_FromFile(f1, cmdstring, "rb", _PyPclose);
***************
*** 343,347 ****
  		case _O_WRONLY | _O_BINARY:
  			// Case for writing to child Stdin in binary mode.
! 			fd1 = _open_osfhandle((long)hChildStdinWrDup, mode);
  			f1 = _fdopen(fd1, "wb");
  			f = PyFile_FromFile(f1, cmdstring, "wb", _PyPclose);
--- 343,347 ----
  		case _O_WRONLY | _O_BINARY:
  			// Case for writing to child Stdin in binary mode.
! 			fd1 = _open_osfhandle((INT_PTR)hChildStdinWrDup, mode);
  			f1 = _fdopen(fd1, "wb");
  			f = PyFile_FromFile(f1, cmdstring, "wb", _PyPclose);
***************
*** 372,378 ****
  		}
  
! 	    fd1 = _open_osfhandle((long)hChildStdinWrDup, mode);
  	    f1 = _fdopen(fd1, m2);
! 	    fd2 = _open_osfhandle((long)hChildStdoutRdDup, mode);
  	    f2 = _fdopen(fd2, m1);
  	    p1 = PyFile_FromFile(f1, cmdstring, m2, _PyPclose);
--- 372,378 ----
  		}
  
! 	    fd1 = _open_osfhandle((INT_PTR)hChildStdinWrDup, mode);
  	    f1 = _fdopen(fd1, m2);
! 	    fd2 = _open_osfhandle((INT_PTR)hChildStdoutRdDup, mode);
  	    f2 = _fdopen(fd2, m1);
  	    p1 = PyFile_FromFile(f1, cmdstring, m2, _PyPclose);
***************
*** 407,415 ****
  		}
  
! 	    fd1 = _open_osfhandle((long)hChildStdinWrDup, mode);
  	    f1 = _fdopen(fd1, m2);
! 		fd2 = _open_osfhandle((long)hChildStdoutRdDup, mode);
  	    f2 = _fdopen(fd2, m1);
! 		fd3 = _open_osfhandle((long)hChildStderrRdDup, mode);
  	    f3 = _fdopen(fd3, m1);
  	    p1 = PyFile_FromFile(f1, cmdstring, m2, _PyPclose);
--- 407,415 ----
  		}
  
! 	    fd1 = _open_osfhandle((INT_PTR)hChildStdinWrDup, mode);
  	    f1 = _fdopen(fd1, m2);
! 		fd2 = _open_osfhandle((INT_PTR)hChildStdoutRdDup, mode);
  	    f2 = _fdopen(fd2, m1);
! 		fd3 = _open_osfhandle((INT_PTR)hChildStderrRdDup, mode);
  	    f3 = _fdopen(fd3, m1);
  	    p1 = PyFile_FromFile(f1, cmdstring, m2, _PyPclose);