TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-04 02:42:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix for win98

Browse Source
This commit is contained in:
David Rose 2002-07-31 23:57:09 +00:00
parent 1174fe31f9
commit 9f9ec8d80b
1 changed files with 17 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
dtool/src/dtoolutil/pfstreamBuf.cxx
View File

@ -363,41 +363,31 @@ open_pipe(const string &cmd) {
// Now spawn the child process.
PROCESS_INFORMATION piProcInfo;
STARTUPINFO siStartInfo;
// Both WinExec() and CreateProcess() want a non-const char pointer.
// Maybe they change it, and maybe they don't. I'm not taking
// chances.
char *cmdline = new char[cmd.length() + 1];
strcpy(cmdline, cmd.c_str());
// Set up members of the PROCESS_INFORMATION structure.
ZeroMemory(&piProcInfo, sizeof(PROCESS_INFORMATION));
// Set up members of the STARTUPINFO structure.
ZeroMemory(&siStartInfo, sizeof(STARTUPINFO));
siStartInfo.cb = sizeof(STARTUPINFO);
siStartInfo.dwFlags = STARTF_USESTDHANDLES;
siStartInfo.hStdError = hChildStdoutWr;
siStartInfo.hStdInput = (HANDLE)STD_INPUT_HANDLE;
siStartInfo.hStdOutput = hChildStdoutWr;
if (!CreateProcess(NULL,
(LPSTR)cmd.c_str(), // command line
NULL, // process security attributes
NULL, // primary thread security attributes
TRUE, // handles are inherited
0, // creation flags
NULL, // use parent's environment
NULL, // use parent's current directory
&siStartInfo, // STARTUPINFO pointer
&piProcInfo)) {// receives PROCESS_INFORMATION
// We should be using CreateProcess() instead of WinExec(), but that
// seems to be likely to crash Win98. WinExec() seems better
// behaved, and it's all we need anyway.
if (!WinExec(cmdline, 0)) {
#ifndef NDEBUG
cerr << "Unable to spawn process.\n";
#endif
close_pipe();
return false;
}
delete[] cmdline;
// Now restore our own stdout, up here in the parent process.
if (!SetStdHandle(STD_OUTPUT_HANDLE, hSaveStdout)) {
#ifndef NDEBUG
cerr << "Unable to restore stdout\n";
#endif
close_pipe();
return false;
}
@ -407,6 +397,7 @@ open_pipe(const string &cmd) {
#ifndef NDEBUG
cerr << "Unable to close write end of pipe\n";
#endif
close_pipe();
return false;
}
@ -446,6 +437,9 @@ write_pipe(const char *data, size_t len) {
////////////////////////////////////////////////////////////////////
size_t PipeStreamBuf::
read_pipe(char *data, size_t len) {
if (_child_out == 0) {
return 0;
}
DWORD dwRead;
if (!ReadFile(_child_out, data, len, &dwRead, NULL)) {
close_pipe();