Commit 26bc6c4d authored by Joerg Bornemann's avatar Joerg Bornemann Committed by Oswald Buddenhagen

fix incomplete renaming of qtcbuildhelper to qtcreator_ctrlc_stub

Change-Id: Ie70c61770efc056c70a84c298100fec33295afb5
Reviewed-on: http://codereview.qt.nokia.com/2945Reviewed-by: default avatarQt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: default avatarOswald Buddenhagen <oswald.buddenhagen@nokia.com>
parent 169be441
...@@ -50,8 +50,8 @@ ...@@ -50,8 +50,8 @@
#include <cstdlib> #include <cstdlib>
#include <cstdio> #include <cstdio>
const wchar_t szTitle[] = L"qtcbuildhelper"; const wchar_t szTitle[] = L"qtcctrlcstub";
const wchar_t szWindowClass[] = L"wcqtcbuildhelper"; const wchar_t szWindowClass[] = L"wcqtcctrlcstub";
UINT uiShutDownWindowMessage; UINT uiShutDownWindowMessage;
HWND hwndMain = 0; HWND hwndMain = 0;
...@@ -68,7 +68,7 @@ int main(int argc, char **) ...@@ -68,7 +68,7 @@ int main(int argc, char **)
} }
SetConsoleCtrlHandler(ctrlHandler, TRUE); SetConsoleCtrlHandler(ctrlHandler, TRUE);
uiShutDownWindowMessage = RegisterWindowMessage(L"qtcbuildhelper_shutdown"); uiShutDownWindowMessage = RegisterWindowMessage(L"qtcctrlcstub_shutdown");
WNDCLASSEX wcex; WNDCLASSEX wcex;
ZeroMemory(&wcex, sizeof(wcex)); ZeroMemory(&wcex, sizeof(wcex));
...@@ -86,7 +86,7 @@ int main(int argc, char **) ...@@ -86,7 +86,7 @@ int main(int argc, char **)
// Get the command line and remove the call to this executable. // 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. // 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()); wchar_t *strCommandLine = _wcsdup(GetCommandLine());
const size_t strCommandLineLength = wcslen(strCommandLine); const size_t strCommandLineLength = wcslen(strCommandLine);
size_t pos = 1; size_t pos = 1;
...@@ -177,16 +177,15 @@ bool startProcess(wchar_t *pCommandLine) ...@@ -177,16 +177,15 @@ bool startProcess(wchar_t *pCommandLine)
DWORD dwCreationFlags = 0; DWORD dwCreationFlags = 0;
BOOL bSuccess = CreateProcess(NULL, pCommandLine, &sa, &sa, TRUE, dwCreationFlags, NULL, NULL, &si, &pi); BOOL bSuccess = CreateProcess(NULL, pCommandLine, &sa, &sa, TRUE, dwCreationFlags, NULL, NULL, &si, &pi);
if (!bSuccess) { 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; return false;
} }
HANDLE hThread = CreateThread(NULL, 0, processWatcherThread, reinterpret_cast<void*>(pi.hProcess), 0, NULL); HANDLE hThread = CreateThread(NULL, 0, processWatcherThread, reinterpret_cast<void*>(pi.hProcess), 0, NULL);
if (!hThread) { 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; return false;
} }
CloseHandle(hThread); CloseHandle(hThread);
return true; return true;
} }
...@@ -690,7 +690,7 @@ void QtcProcess::start() ...@@ -690,7 +690,7 @@ void QtcProcess::start()
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
BOOL CALLBACK sendShutDownMessageToAllWindowsOfProcess_enumWnd(HWND hwnd, LPARAM lParam) BOOL CALLBACK sendShutDownMessageToAllWindowsOfProcess_enumWnd(HWND hwnd, LPARAM lParam)
{ {
static UINT uiShutDownMessage = RegisterWindowMessage(L"qtcbuildhelper_shutdown"); static UINT uiShutDownMessage = RegisterWindowMessage(L"qtcctrlcstub_shutdown");
DWORD dwProcessID; DWORD dwProcessID;
GetWindowThreadProcessId(hwnd, &dwProcessID); GetWindowThreadProcessId(hwnd, &dwProcessID);
if ((DWORD)lParam == dwProcessID) { if ((DWORD)lParam == dwProcessID) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment