feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

fix incomplete renaming of qtcbuildhelper to qtcreator_ctrlc_stub

Browse Source 
Change-Id: Ie70c61770efc056c70a84c298100fec33295afb5
Reviewed-on: http://codereview.qt.nokia.com/2945
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
This commit is contained in:
Joerg Bornemann
2011-08-15 11:31:42 +02:00
committed by Oswald Buddenhagen
parent 169be44125
commit 26bc6c4d39
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/libs/utils/process_ctrlc_stub.cpp
View File

@@ -50,8 +50,8 @@
#include <cstdlib>
#include <cstdio>
const wchar_t szTitle[] = L"qtcbuildhelper";
const wchar_t szWindowClass[] = L"wcqtcbuildhelper";
const wchar_t szTitle[] = L"qtcctrlcstub";
const wchar_t szWindowClass[] = L"wcqtcctrlcstub";
UINT uiShutDownWindowMessage;
HWND hwndMain = 0;
@@ -68,7 +68,7 @@ int main(int argc, char **)
}
SetConsoleCtrlHandler(ctrlHandler, TRUE);
uiShutDownWindowMessage = RegisterWindowMessage(L"qtcbuildhelper_shutdown");
uiShutDownWindowMessage = RegisterWindowMessage(L"qtcctrlcstub_shutdown");
WNDCLASSEX wcex;
ZeroMemory(&wcex, sizeof(wcex));
@@ -86,7 +86,7 @@ int main(int argc, char **)
// Get the command line and remove the call to this executable.
// Note: We trust Qt Creator at this point to quote the call to this tool in a sensible way.
// Strange things like C:\Q"t Crea"tor\bin\qtcbuildhelper.exe are not supported.
// Strange things like C:\Q"t Crea"tor\bin\qtcreator_ctrlc_stub.exe are not supported.
wchar_t *strCommandLine = _wcsdup(GetCommandLine());
const size_t strCommandLineLength = wcslen(strCommandLine);
size_t pos = 1;
@@ -177,16 +177,15 @@ bool startProcess(wchar_t *pCommandLine)
DWORD dwCreationFlags = 0;
BOOL bSuccess = CreateProcess(NULL, pCommandLine, &sa, &sa, TRUE, dwCreationFlags, NULL, NULL, &si, &pi);
if (!bSuccess) {
fwprintf(stderr, L"qtcbuildhelper: Command line failed: %s\n", pCommandLine);
fwprintf(stderr, L"qtcreator_ctrlc_stub: Command line failed: %s\n", pCommandLine);
return false;
}
HANDLE hThread = CreateThread(NULL, 0, processWatcherThread, reinterpret_cast<void*>(pi.hProcess), 0, NULL);
if (!hThread) {
fwprintf(stderr, L"qtcbuildhelper: The watch dog thread cannot be started.\n");
fwprintf(stderr, L"qtcreator_ctrlc_stub: The watch dog thread cannot be started.\n");
return false;
}
CloseHandle(hThread);
return true;
}