Commit 4435bb09 authored by Andy Cedilnik's avatar Andy Cedilnik
Browse files

Cleanup

parent b0518155
...@@ -1351,7 +1351,6 @@ bool WindowsRunCommand(const char* command, const char* dir, ...@@ -1351,7 +1351,6 @@ bool WindowsRunCommand(const char* command, const char* dir,
} }
else sa.lpSecurityDescriptor = NULL; else sa.lpSecurityDescriptor = NULL;
sa.nLength = sizeof(SECURITY_ATTRIBUTES); sa.nLength = sizeof(SECURITY_ATTRIBUTES);
sa.bInheritHandle = true; sa.bInheritHandle = true;
...@@ -1380,10 +1379,11 @@ bool WindowsRunCommand(const char* command, const char* dir, ...@@ -1380,10 +1379,11 @@ bool WindowsRunCommand(const char* command, const char* dir,
* members. STARTF_USESHOWWINDOW validates the wShowWindow * members. STARTF_USESHOWWINDOW validates the wShowWindow
* member. */ * member. */
si.cb = sizeof(STARTUPINFO);
si.dwFlags = STARTF_USESTDHANDLES|STARTF_USESHOWWINDOW; si.dwFlags = STARTF_USESTDHANDLES|STARTF_USESHOWWINDOW;
si.wShowWindow = SW_HIDE;
si.hStdOutput = newstdout; si.hStdOutput = newstdout;
si.hStdError = newstdout; si.hStdError = newstdout;
si.wShowWindow = SW_HIDE;
//set the new handles for the child process si.hStdInput = newstdin; //set the new handles for the child process si.hStdInput = newstdin;
char* commandAndArgs = strcpy(new char[strlen(command)+1], command); char* commandAndArgs = strcpy(new char[strlen(command)+1], command);
...@@ -1456,6 +1456,8 @@ bool WindowsRunCommand(const char* command, const char* dir, ...@@ -1456,6 +1456,8 @@ bool WindowsRunCommand(const char* command, const char* dir,
if (exit != STILL_ACTIVE) break; if (exit != STILL_ACTIVE) break;
} }
WaitForSingleObject(pi.hProcess, INFINITE);
GetExitCodeProcess(pi.hProcess,&exit);
CloseHandle(pi.hThread); CloseHandle(pi.hThread);
CloseHandle(pi.hProcess); CloseHandle(pi.hProcess);
CloseHandle(newstdin); CloseHandle(newstdin);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment