fixes for compatibility

Foundation/src/Process_WIN32.cpp

@@ -27,7 +27,7 @@ namespace Poco {
 //
 // ProcessHandleImpl
 //
-ProcessHandleImpl::ProcessHandleImpl(HANDLE hProcess, UInt32 pid):
+ProcessHandleImpl::ProcessHandleImpl(HANDLE hProcess, UInt32 pid) :
 	_hProcess(hProcess),
 	_pid(pid)
 {
@@ -79,7 +79,7 @@ int ProcessHandleImpl::wait() const
 //
 ProcessImpl::PIDImpl ProcessImpl::idImpl()
 {
-	return GetCurrentProcessId(); 
+	return GetCurrentProcessId();
 }
 
 
@@ -93,14 +93,13 @@ void ProcessImpl::timesImpl(long& userTime, long& kernelTime)
 	if (GetProcessTimes(GetCurrentProcess(), &ftCreation, &ftExit, &ftKernel, &ftUser) != 0)
 	{
 		ULARGE_INTEGER time;
-		time.LowPart  = ftKernel.dwLowDateTime;
+		time.LowPart = ftKernel.dwLowDateTime;
 		time.HighPart = ftKernel.dwHighDateTime;
-		kernelTime    = long(time.QuadPart/10000000L);
+		kernelTime = long(time.QuadPart / 10000000L);
-		time.LowPart  = ftUser.dwLowDateTime;
+		time.LowPart = ftUser.dwLowDateTime;
 		time.HighPart = ftUser.dwHighDateTime;
-		userTime      = long(time.QuadPart/10000000L);
+		userTime = long(time.QuadPart / 10000000L);
-	}
+	} else
-	else
 	{
 		userTime = kernelTime = -1;
 	}
@@ -109,7 +108,7 @@ void ProcessImpl::timesImpl(long& userTime, long& kernelTime)
 
 static bool argNeedsEscaping(const std::string& arg)
 {
-	bool containsQuotableChar = arg.npos != arg.find_first_of(" \t\n\v\"");
+	bool containsQuotableChar = std::string::npos != arg.find_first_of(" \t\n\v\"");
 	// Assume args that start and end with quotes are already quoted and do not require further quoting.
 	// There is probably code out there written before launch() escaped the arguments that does its own
 	// escaping of arguments. This ensures we do not interfere with those arguments.
@@ -124,7 +123,7 @@ static std::string escapeArg(const std::string& arg)
 	if (argNeedsEscaping(arg))
 	{
 		std::string quotedArg("\"");
-		for (auto it = arg.begin(); ; ++it)
+		for (std::string::const_iterator it = arg.begin(); ; ++it)
 		{
 			unsigned backslashCount = 0;
 			while (it != arg.end() && '\\' == *it)
@@ -137,13 +136,11 @@ static std::string escapeArg(const std::string& arg)
 			{
 				quotedArg.append(2 * backslashCount, '\\');
 				break;
-			}
+			} else if ('"' == *it)
-			else if ('"' == *it)
 			{
 				quotedArg.append(2 * backslashCount + 1, '\\');
 				quotedArg.push_back('"');
-			}
+			} else
-			else
 			{
 				quotedArg.append(backslashCount, '\\');
 				quotedArg.push_back(*it);
@@ -151,8 +148,7 @@ static std::string escapeArg(const std::string& arg)
 		}
 		quotedArg.push_back('"');
 		return quotedArg;
-	}
+	} else
-	else
 	{
 		return arg;
 	}
@@ -170,11 +166,11 @@ ProcessHandleImpl* ProcessImpl::launchImpl(const std::string& command, const Arg
 
 	STARTUPINFOA startupInfo;
 	GetStartupInfoA(&startupInfo); // take defaults from current process
-	startupInfo.cb          = sizeof(STARTUPINFOA);
+	startupInfo.cb = sizeof(STARTUPINFOA);
-	startupInfo.lpReserved  = NULL;
+	startupInfo.lpReserved = NULL;
-	startupInfo.lpDesktop   = NULL;
+	startupInfo.lpDesktop = NULL;
-	startupInfo.lpTitle     = NULL;
+	startupInfo.lpTitle = NULL;
-	startupInfo.dwFlags     = STARTF_FORCEOFFFEEDBACK;
+	startupInfo.dwFlags = STARTF_FORCEOFFFEEDBACK;
 	startupInfo.cbReserved2 = 0;
 	startupInfo.lpReserved2 = NULL;
 
@@ -185,13 +181,11 @@ ProcessHandleImpl* ProcessImpl::launchImpl(const std::string& command, const Arg
 		DuplicateHandle(hProc, inPipe->readHandle(), hProc, &startupInfo.hStdInput, 0, TRUE, DUPLICATE_SAME_ACCESS);
 		mustInheritHandles = true;
 		inPipe->close(Pipe::CLOSE_READ);
-	}
+	} else if (GetStdHandle(STD_INPUT_HANDLE))
-	else if (GetStdHandle(STD_INPUT_HANDLE))
 	{
 		DuplicateHandle(hProc, GetStdHandle(STD_INPUT_HANDLE), hProc, &startupInfo.hStdInput, 0, TRUE, DUPLICATE_SAME_ACCESS);
 		mustInheritHandles = true;
-	}
+	} else
-	else 
 	{
 		startupInfo.hStdInput = 0;
 	}
@@ -200,13 +194,11 @@ ProcessHandleImpl* ProcessImpl::launchImpl(const std::string& command, const Arg
 	{
 		DuplicateHandle(hProc, outPipe->writeHandle(), hProc, &startupInfo.hStdOutput, 0, TRUE, DUPLICATE_SAME_ACCESS);
 		mustInheritHandles = true;
-	}
+	} else if (GetStdHandle(STD_OUTPUT_HANDLE))
-	else if (GetStdHandle(STD_OUTPUT_HANDLE))
 	{
 		DuplicateHandle(hProc, GetStdHandle(STD_OUTPUT_HANDLE), hProc, &startupInfo.hStdOutput, 0, TRUE, DUPLICATE_SAME_ACCESS);
 		mustInheritHandles = true;
-	}
+	} else
-	else 
 	{
 		startupInfo.hStdOutput = 0;
 	}
@@ -214,13 +206,11 @@ ProcessHandleImpl* ProcessImpl::launchImpl(const std::string& command, const Arg
 	{
 		DuplicateHandle(hProc, errPipe->writeHandle(), hProc, &startupInfo.hStdError, 0, TRUE, DUPLICATE_SAME_ACCESS);
 		mustInheritHandles = true;
-	}
+	} else if (GetStdHandle(STD_ERROR_HANDLE))
-	else if (GetStdHandle(STD_ERROR_HANDLE))
 	{
 		DuplicateHandle(hProc, GetStdHandle(STD_ERROR_HANDLE), hProc, &startupInfo.hStdError, 0, TRUE, DUPLICATE_SAME_ACCESS);
 		mustInheritHandles = true;
-	}
+	} else
-	else
 	{
 		startupInfo.hStdError = 0;
 	}
@@ -233,7 +223,7 @@ ProcessHandleImpl* ProcessImpl::launchImpl(const std::string& command, const Arg
 	}
 
 	const char* workingDirectory = initialDirectory.empty() ? 0 : initialDirectory.c_str();
-	
+
 	const char* pEnv = 0;
 	std::vector<char> envChars;
 	if (!env.empty())
@@ -245,15 +235,15 @@ ProcessHandleImpl* ProcessImpl::launchImpl(const std::string& command, const Arg
 	PROCESS_INFORMATION processInfo;
 	DWORD creationFlags = GetConsoleWindow() ? 0 : CREATE_NO_WINDOW;
 	BOOL rc = CreateProcessA(
-		NULL, 
+		NULL,
-		const_cast<char*>(commandLine.c_str()), 
+		const_cast<char*>(commandLine.c_str()),
 		NULL, // processAttributes
 		NULL, // threadAttributes
 		mustInheritHandles,
 		creationFlags,
-		(LPVOID) pEnv, 
+		(LPVOID)pEnv,
-		workingDirectory, 
+		workingDirectory,
-		&startupInfo, 
+		&startupInfo,
 		&processInfo
 	);
 	if (startupInfo.hStdInput) CloseHandle(startupInfo.hStdInput);
@@ -263,14 +253,13 @@ ProcessHandleImpl* ProcessImpl::launchImpl(const std::string& command, const Arg
 	{
 		CloseHandle(processInfo.hThread);
 		return new ProcessHandleImpl(processInfo.hProcess, processInfo.dwProcessId);
-	}
+	} else throw SystemException("Cannot launch process", command);
-	else throw SystemException("Cannot launch process", command);
 }
 
 
 void ProcessImpl::killImpl(ProcessHandleImpl& handle)
 {
-	if (handle.process()) 
+	if (handle.process())
 	{
 		if (TerminateProcess(handle.process(), 0) == 0)
 		{
@@ -292,23 +281,22 @@ void ProcessImpl::killImpl(PIDImpl pid)
 			throw SystemException("cannot kill process");
 		}
 		CloseHandle(hProc);
-	}
+	} else
-	else
 	{
 		switch (GetLastError())
 		{
 		case ERROR_ACCESS_DENIED:
-			throw NoPermissionException("cannot kill process");
+		throw NoPermissionException("cannot kill process");
-		case ERROR_INVALID_PARAMETER: 
+		case ERROR_INVALID_PARAMETER:
-			throw NotFoundException("cannot kill process");
+		throw NotFoundException("cannot kill process");
 		default:
-			throw SystemException("cannot kill process");
+		throw SystemException("cannot kill process");
 		}
 	}
 }
 
 
-bool ProcessImpl::isRunningImpl(const ProcessHandleImpl& handle) 
+bool ProcessImpl::isRunningImpl(const ProcessHandleImpl& handle)
 {
 	bool result = true;
 	DWORD exitCode;
@@ -318,7 +306,7 @@ bool ProcessImpl::isRunningImpl(const ProcessHandleImpl& handle)
 }
 
 
-bool ProcessImpl::isRunningImpl(PIDImpl pid) 
+bool ProcessImpl::isRunningImpl(PIDImpl pid)
 {
 	HANDLE hProc = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, pid);
 	bool result = true;

Foundation/src/Process_WIN32U.cpp

@@ -28,7 +28,7 @@ namespace Poco {
 //
 // ProcessHandleImpl
 //
-ProcessHandleImpl::ProcessHandleImpl(HANDLE hProcess, UInt32 pid):
+ProcessHandleImpl::ProcessHandleImpl(HANDLE hProcess, UInt32 pid) :
 	_hProcess(hProcess),
 	_pid(pid)
 {
@@ -80,7 +80,7 @@ int ProcessHandleImpl::wait() const
 //
 ProcessImpl::PIDImpl ProcessImpl::idImpl()
 {
-	return GetCurrentProcessId(); 
+	return GetCurrentProcessId();
 }
 
 
@@ -94,14 +94,13 @@ void ProcessImpl::timesImpl(long& userTime, long& kernelTime)
 	if (GetProcessTimes(GetCurrentProcess(), &ftCreation, &ftExit, &ftKernel, &ftUser) != 0)
 	{
 		ULARGE_INTEGER time;
-		time.LowPart  = ftKernel.dwLowDateTime;
+		time.LowPart = ftKernel.dwLowDateTime;
 		time.HighPart = ftKernel.dwHighDateTime;
-		kernelTime    = long(time.QuadPart/10000000L);
+		kernelTime = long(time.QuadPart / 10000000L);
-		time.LowPart  = ftUser.dwLowDateTime;
+		time.LowPart = ftUser.dwLowDateTime;
 		time.HighPart = ftUser.dwHighDateTime;
-		userTime      = long(time.QuadPart/10000000L);
+		userTime = long(time.QuadPart / 10000000L);
-	}
+	} else
-	else
 	{
 		userTime = kernelTime = -1;
 	}
@@ -110,7 +109,7 @@ void ProcessImpl::timesImpl(long& userTime, long& kernelTime)
 
 static bool argNeedsEscaping(const std::string& arg)
 {
-	bool containsQuotableChar = arg.npos != arg.find_first_of(" \t\n\v\"");
+	bool containsQuotableChar = std::string::npos != arg.find_first_of(" \t\n\v\"");
 	// Assume args that start and end with quotes are already quoted and do not require further quoting.
 	// There is probably code out there written before launch() escaped the arguments that does its own
 	// escaping of arguments. This ensures we do not interfere with those arguments.
@@ -125,7 +124,7 @@ static std::string escapeArg(const std::string& arg)
 	if (argNeedsEscaping(arg))
 	{
 		std::string quotedArg("\"");
-		for (auto it = arg.begin(); ; ++it)
+		for (std::string::const_iterator it = arg.begin(); ; ++it)
 		{
 			unsigned backslashCount = 0;
 			while (it != arg.end() && '\\' == *it)
@@ -138,13 +137,11 @@ static std::string escapeArg(const std::string& arg)
 			{
 				quotedArg.append(2 * backslashCount, '\\');
 				break;
-			}
+			} else if ('"' == *it)
-			else if ('"' == *it)
 			{
 				quotedArg.append(2 * backslashCount + 1, '\\');
 				quotedArg.push_back('"');
-			}
+			} else
-			else
 			{
 				quotedArg.append(backslashCount, '\\');
 				quotedArg.push_back(*it);
@@ -152,8 +149,7 @@ static std::string escapeArg(const std::string& arg)
 		}
 		quotedArg.push_back('"');
 		return quotedArg;
-	}
+	} else
-	else
 	{
 		return arg;
 	}
@@ -167,18 +163,18 @@ ProcessHandleImpl* ProcessImpl::launchImpl(const std::string& command, const Arg
 	{
 		commandLine.append(" ");
 		commandLine.append(escapeArg(*it));
-	}		
+	}
 
 	std::wstring ucommandLine;
 	UnicodeConverter::toUTF16(commandLine, ucommandLine);
 
 	STARTUPINFOW startupInfo;
 	GetStartupInfoW(&startupInfo); // take defaults from current process
-	startupInfo.cb          = sizeof(STARTUPINFOW);
+	startupInfo.cb = sizeof(STARTUPINFOW);
-	startupInfo.lpReserved  = NULL;
+	startupInfo.lpReserved = NULL;
-	startupInfo.lpDesktop   = NULL;
+	startupInfo.lpDesktop = NULL;
-	startupInfo.lpTitle     = NULL;
+	startupInfo.lpTitle = NULL;
-	startupInfo.dwFlags     = STARTF_FORCEOFFFEEDBACK;
+	startupInfo.dwFlags = STARTF_FORCEOFFFEEDBACK;
 	startupInfo.cbReserved2 = 0;
 	startupInfo.lpReserved2 = NULL;
 
@@ -189,13 +185,11 @@ ProcessHandleImpl* ProcessImpl::launchImpl(const std::string& command, const Arg
 		DuplicateHandle(hProc, inPipe->readHandle(), hProc, &startupInfo.hStdInput, 0, TRUE, DUPLICATE_SAME_ACCESS);
 		mustInheritHandles = true;
 		inPipe->close(Pipe::CLOSE_READ);
-	}
+	} else if (GetStdHandle(STD_INPUT_HANDLE))
-	else if (GetStdHandle(STD_INPUT_HANDLE))
 	{
 		DuplicateHandle(hProc, GetStdHandle(STD_INPUT_HANDLE), hProc, &startupInfo.hStdInput, 0, TRUE, DUPLICATE_SAME_ACCESS);
 		mustInheritHandles = true;
-	}
+	} else
-	else 
 	{
 		startupInfo.hStdInput = 0;
 	}
@@ -204,13 +198,11 @@ ProcessHandleImpl* ProcessImpl::launchImpl(const std::string& command, const Arg
 	{
 		DuplicateHandle(hProc, outPipe->writeHandle(), hProc, &startupInfo.hStdOutput, 0, TRUE, DUPLICATE_SAME_ACCESS);
 		mustInheritHandles = true;
-	}
+	} else if (GetStdHandle(STD_OUTPUT_HANDLE))
-	else if (GetStdHandle(STD_OUTPUT_HANDLE))
 	{
 		DuplicateHandle(hProc, GetStdHandle(STD_OUTPUT_HANDLE), hProc, &startupInfo.hStdOutput, 0, TRUE, DUPLICATE_SAME_ACCESS);
 		mustInheritHandles = true;
-	}
+	} else
-	else 
 	{
 		startupInfo.hStdOutput = 0;
 	}
@@ -218,13 +210,11 @@ ProcessHandleImpl* ProcessImpl::launchImpl(const std::string& command, const Arg
 	{
 		DuplicateHandle(hProc, errPipe->writeHandle(), hProc, &startupInfo.hStdError, 0, TRUE, DUPLICATE_SAME_ACCESS);
 		mustInheritHandles = true;
-	}
+	} else if (GetStdHandle(STD_ERROR_HANDLE))
-	else if (GetStdHandle(STD_ERROR_HANDLE))
 	{
 		DuplicateHandle(hProc, GetStdHandle(STD_ERROR_HANDLE), hProc, &startupInfo.hStdError, 0, TRUE, DUPLICATE_SAME_ACCESS);
 		mustInheritHandles = true;
-	}
+	} else
-	else
 	{
 		startupInfo.hStdError = 0;
 	}
@@ -247,19 +237,19 @@ ProcessHandleImpl* ProcessImpl::launchImpl(const std::string& command, const Arg
 		envChars = getEnvironmentVariablesBuffer(env);
 		pEnv = &envChars[0];
 	}
-		
+
 	PROCESS_INFORMATION processInfo;
 	DWORD creationFlags = GetConsoleWindow() ? 0 : CREATE_NO_WINDOW;
 	BOOL rc = CreateProcessW(
 		NULL, // applicationName
-		const_cast<wchar_t*>(ucommandLine.c_str()), 
+		const_cast<wchar_t*>(ucommandLine.c_str()),
 		NULL, // processAttributes
 		NULL, // threadAttributes
 		mustInheritHandles,
 		creationFlags,
-		(LPVOID) pEnv, 
+		(LPVOID)pEnv,
 		workingDirectory,
-		&startupInfo, 
+		&startupInfo,
 		&processInfo
 	);
 	if (startupInfo.hStdInput) CloseHandle(startupInfo.hStdInput);
@@ -269,8 +259,7 @@ ProcessHandleImpl* ProcessImpl::launchImpl(const std::string& command, const Arg
 	{
 		CloseHandle(processInfo.hThread);
 		return new ProcessHandleImpl(processInfo.hProcess, processInfo.dwProcessId);
-	}
+	} else throw SystemException("Cannot launch process", command);
-	else throw SystemException("Cannot launch process", command);
 }
 
 
@@ -298,23 +287,22 @@ void ProcessImpl::killImpl(PIDImpl pid)
 			throw SystemException("cannot kill process");
 		}
 		CloseHandle(hProc);
-	}
+	} else
-	else
 	{
 		switch (GetLastError())
 		{
 		case ERROR_ACCESS_DENIED:
-			throw NoPermissionException("cannot kill process");
+		throw NoPermissionException("cannot kill process");
-		case ERROR_INVALID_PARAMETER: 
+		case ERROR_INVALID_PARAMETER:
-			throw NotFoundException("cannot kill process");
+		throw NotFoundException("cannot kill process");
 		default:
-			throw SystemException("cannot kill process");
+		throw SystemException("cannot kill process");
 		}
 	}
 }
 
 
-bool ProcessImpl::isRunningImpl(const ProcessHandleImpl& handle) 
+bool ProcessImpl::isRunningImpl(const ProcessHandleImpl& handle)
 {
 	bool result = true;
 	DWORD exitCode;
@@ -324,7 +312,7 @@ bool ProcessImpl::isRunningImpl(const ProcessHandleImpl& handle)
 }
 
 
-bool ProcessImpl::isRunningImpl(PIDImpl pid) 
+bool ProcessImpl::isRunningImpl(PIDImpl pid)
 {
 	HANDLE hProc = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, pid);
 	bool result = true;

Foundation/testsuite/src/ProcessTest.cpp

@@ -149,16 +149,9 @@ void ProcessTest::testLaunchEnv()
 
 void ProcessTest::testLaunchArgs()
 {
-#if !defined(_WIN32_WCE)
+#if defined (_WIN32) && !defined(_WIN32_WCE)
 	std::string name("TestApp");
-	std::string cmd;
+	std::string cmd = name;
-
-#if defined(POCO_OS_FAMILY_UNIX)
-	cmd = "./";
-	cmd += name;
-#else
-	cmd = name;
-#endif
 
 	std::vector<std::string> args;
 	args.push_back("-echo-args");