Muldersoft/LameXP
Muldersoft/LameXP
1
0
Fork 0
Code Releases 2 Activity
4a516c909f
LameXP/etc/Patches/deprecated/Qt-v4.8.5-QProcess-JobObjectsBugfix.V1.diff

22 lines
1.4 KiB
Diff
Raw Normal View History

Updated patch collection.
2013-10-21 14:58:12 +02:00
diff --git "a/D:\\Qt\\QtSource\\4.8.5-VS2013\\src\\corelib\\io\\qprocess_win.ori" "b/D:\\Qt\\QtSource\\4.8.5-VS2013\\src\\corelib\\io\\qprocess_win.cpp"
index 6cf6d65..3b5c4fb 100644
--- "a/D:\\Qt\\QtSource\\4.8.5-VS2013\\src\\corelib\\io\\qprocess_win.ori"
+++ "b/D:\\Qt\\QtSource\\4.8.5-VS2013\\src\\corelib\\io\\qprocess_win.cpp"
@@ -414,6 +414,7 @@ void QProcessPrivate::startProcess()
Patched Qt's QProcess class to pass the CREATE_BREAKAWAY_FROM_JOB flag when creating a new process. This is required, because Windows (Vista and later) will add our child processes to the PCA (Program Compatibility Assistant) job object automatically! And then we cannot add the child processes to our own job object, as a process can be assigned to only one job object. With the CREATE_BREAKAWAY_FROM_JOB flag, we ensure that our child processes does NOT get added to the PCA job object automatically and we can add it to our own job object again. Unfortunately QProcess does NOT provide a way to pass process creation flags yet, so we have to patch Qt for now. Passing the CREATE_BREAKAWAY_FROM_JOB flag may not always be desired though...
2012-03-01 23:14:41 +01:00
#else
DWORD dwCreationFlags = CREATE_NO_WINDOW;
dwCreationFlags |= CREATE_UNICODE_ENVIRONMENT;
+ dwCreationFlags |= CREATE_BREAKAWAY_FROM_JOB;
STARTUPINFOW startupInfo = { sizeof( STARTUPINFO ), 0, 0, 0,
(ulong)CW_USEDEFAULT, (ulong)CW_USEDEFAULT,
(ulong)CW_USEDEFAULT, (ulong)CW_USEDEFAULT,
Updated patch collection.
2013-10-21 14:58:12 +02:00
@@ -859,7 +860,7 @@ bool QProcessPrivate::startDetached(const QString &program, const QStringList &a
Patched Qt's QProcess class to pass the CREATE_BREAKAWAY_FROM_JOB flag when creating a new process. This is required, because Windows (Vista and later) will add our child processes to the PCA (Program Compatibility Assistant) job object automatically! And then we cannot add the child processes to our own job object, as a process can be assigned to only one job object. With the CREATE_BREAKAWAY_FROM_JOB flag, we ensure that our child processes does NOT get added to the PCA job object automatically and we can add it to our own job object again. Unfortunately QProcess does NOT provide a way to pass process creation flags yet, so we have to patch Qt for now. Passing the CREATE_BREAKAWAY_FROM_JOB flag may not always be desired though...
2012-03-01 23:14:41 +01:00
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 | CREATE_BREAKAWAY_FROM_JOB, 0,
workingDir.isEmpty() ? 0 : (wchar_t*)workingDir.utf16(),
&startupInfo, &pinfo);
#endif // Q_OS_WINCE
Copy Permalink