X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fcore%2Fwindows%2Fprocess.cpp;h=3bd03fa3816dbefc3faa71726fa1632c5537cdcd;hp=da76fe38dd3551f82dbfd3910d995a0058191108;hb=41363aed34382386f915f17c1a961750b4fdcb14;hpb=f24e7b96e76b63c9b9b8a6bce4c7a9db64276ea8

diff --git a/source/core/windows/process.cpp b/source/core/windows/process.cpp
index da76fe3..3bd03fa 100644
--- a/source/core/windows/process.cpp
+++ b/source/core/windows/process.cpp
@@ -48,7 +48,7 @@ Process::~Process()
 void Process::platform_get_self_info(Private &priv)
 {
 	priv.info.hProcess = GetCurrentProcess();
-	priv.info.hThread = 0;
+	priv.info.hThread = nullptr;
 	priv.info.dwProcessId = GetCurrentProcessId();
 	priv.info.dwThreadId = 0;
 }
@@ -61,12 +61,12 @@ void Process::execute(const string &command, bool path_search, const Arguments &
 
 	STARTUPINFO startup;
 	startup.cb = sizeof(STARTUPINFO);
-	startup.lpReserved = 0;
-	startup.lpDesktop = 0;
-	startup.lpTitle = 0;
+	startup.lpReserved = nullptr;
+	startup.lpDesktop = nullptr;
+	startup.lpTitle = nullptr;
 	startup.dwFlags = 0;
 	startup.cbReserved2 = 0;
-	startup.lpReserved2 = 0;
+	startup.lpReserved2 = nullptr;
 	if(redirect)
 	{
 		startup.dwFlags |= STARTF_USESTDHANDLES;
@@ -78,9 +78,9 @@ void Process::execute(const string &command, bool path_search, const Arguments &
 		HANDLE cerr_handle = (cerr ? *cerr->get_handle(IO::M_WRITE) : GetStdHandle(STD_ERROR_HANDLE));
 		DuplicateHandle(self_handle, cerr_handle, self_handle, &startup.hStdError, 0, true, DUPLICATE_SAME_ACCESS);
 	}
-	const char *cmdptr = (path_search ? 0 : command.c_str());
-	const char *wd = (work_dir.empty() ? 0 : work_dir.c_str());
-	if(!CreateProcess(cmdptr, const_cast<char *>(cmdline.c_str()), 0, 0, true, 0, 0, wd, &startup, &priv->info))
+	const char *cmdptr = (path_search ? nullptr : command.c_str());
+	const char *wd = (work_dir.empty() ? nullptr : work_dir.c_str());
+	if(!CreateProcess(cmdptr, const_cast<char *>(cmdline.c_str()), nullptr, nullptr, true, 0, nullptr, wd, &startup, &priv->info))
 		throw system_error("CreateProcess");
 
 	if(redirect)
@@ -109,6 +109,9 @@ bool Process::wait(bool block)
 	{
 		running = false;
 		finished = true;
+		DWORD ec;
+		if(GetExitCodeProcess(priv->info.hProcess, &ec))
+			exit_code = ec;
 	}
 
 	return finished;
@@ -132,8 +135,8 @@ void Process::interrupt()
 
 Process::Private::Private()
 {
-	info.hProcess = 0;
-	info.hThread = 0;
+	info.hProcess = nullptr;
+	info.hThread = nullptr;
 	info.dwProcessId = 0;
 	info.dwThreadId = 0;
 }