diff options
Diffstat (limited to 'src/corelib/io/qprocess_win.cpp')
| -rw-r--r-- | src/corelib/io/qprocess_win.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/corelib/io/qprocess_win.cpp b/src/corelib/io/qprocess_win.cpp index 36346b6be7..f4469d670c 100644 --- a/src/corelib/io/qprocess_win.cpp +++ b/src/corelib/io/qprocess_win.cpp @@ -135,7 +135,7 @@ static void duplicateStdWriteChannel(Q_PIPE *pipe, DWORD nStdHandle) HANDLE hStdWriteChannel = GetStdHandle(nStdHandle); HANDLE hCurrentProcess = GetCurrentProcess(); DuplicateHandle(hCurrentProcess, hStdWriteChannel, hCurrentProcess, - &pipe[1], 0, true, DUPLICATE_SAME_ACCESS); + &pipe[1], 0, TRUE, DUPLICATE_SAME_ACCESS); } /* @@ -149,7 +149,7 @@ bool QProcessPrivate::createChannel(Channel &channel) if (&channel == &stderrChannel && processChannelMode == QProcess::MergedChannels) { return DuplicateHandle(GetCurrentProcess(), stdoutChannel.pipe[1], GetCurrentProcess(), - &stderrChannel.pipe[1], 0, true, DUPLICATE_SAME_ACCESS); + &stderrChannel.pipe[1], 0, TRUE, DUPLICATE_SAME_ACCESS); } if (channel.type == Channel::Normal) { @@ -182,7 +182,7 @@ bool QProcessPrivate::createChannel(Channel &channel) return true; } else if (channel.type == Channel::Redirect) { // we're redirecting the channel to/from a file - SECURITY_ATTRIBUTES secAtt = { sizeof(SECURITY_ATTRIBUTES), NULL, true }; + SECURITY_ATTRIBUTES secAtt = { sizeof(SECURITY_ATTRIBUTES), NULL, TRUE }; if (&channel == &stdinChannel) { // try to open in read-only mode @@ -244,7 +244,7 @@ bool QProcessPrivate::createChannel(Channel &channel) HANDLE tmpHandle = source->pipe[1]; if (!DuplicateHandle(GetCurrentProcess(), tmpHandle, GetCurrentProcess(), &source->pipe[1], - 0, true, DUPLICATE_SAME_ACCESS)) + 0, TRUE, DUPLICATE_SAME_ACCESS)) return false; CloseHandle(tmpHandle); @@ -270,7 +270,7 @@ bool QProcessPrivate::createChannel(Channel &channel) HANDLE tmpHandle = sink->pipe[0]; if (!DuplicateHandle(GetCurrentProcess(), tmpHandle, GetCurrentProcess(), &sink->pipe[0], - 0, true, DUPLICATE_SAME_ACCESS)) + 0, TRUE, DUPLICATE_SAME_ACCESS)) return false; CloseHandle(tmpHandle); @@ -484,7 +484,7 @@ void QProcessPrivate::startProcess() stdinChannel.pipe[0], stdoutChannel.pipe[1], stderrChannel.pipe[1] }; success = CreateProcess(0, (wchar_t*)args.utf16(), - 0, 0, true, dwCreationFlags, + 0, 0, TRUE, dwCreationFlags, environment.isEmpty() ? 0 : envlist.data(), workingDirectory.isEmpty() ? 0 : (wchar_t*)QDir::toNativeSeparators(workingDirectory).utf16(), &startupInfo, pid); @@ -585,7 +585,7 @@ static BOOL QT_WIN_CALLBACK qt_terminateApp(HWND hwnd, LPARAM procId) if (currentProcId == (DWORD)procId) PostMessage(hwnd, WM_CLOSE, 0, 0); - return true; + return TRUE; } void QProcessPrivate::terminateProcess() @@ -853,7 +853,7 @@ bool QProcessPrivate::startDetached(const QString &program, const QStringList &a 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; success = CreateProcess(0, (wchar_t*)args.utf16(), - 0, 0, false, CREATE_UNICODE_ENVIRONMENT | CREATE_NEW_CONSOLE, 0, + 0, 0, FALSE, CREATE_UNICODE_ENVIRONMENT | CREATE_NEW_CONSOLE, 0, workingDir.isEmpty() ? 0 : (wchar_t*)workingDir.utf16(), &startupInfo, &pinfo); |