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

Edit debugger so win64interrupt is called

Browse Source 
when trying to debug a 64bit application under windows.

Task-number: QTCREATORBUG-2521
Change-Id: I38922a6bed09640ce88184e6913a9fbb1d7433de
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
David Schulz
2012-01-16 15:24:04 +01:00
committed by hjk
parent 1bb1c2884f
commit e7e74db758
4 changed files with 48 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/debugger/shared/hostutils.cpp
View File

@@ -146,7 +146,7 @@ bool winResumeThread(unsigned long dwThreadId, QString *errorMessage)
}
// Open the process and break into it
bool winDebugBreakProcess(unsigned long pid, QString *errorMessage)
bool winDebugBreakProcess(unsigned long pid, QString *errorMessage, bool isCdb64bit)
{
bool ok = false;
HANDLE inferior = NULL;
@@ -160,7 +160,21 @@ bool winDebugBreakProcess(unsigned long pid, QString *errorMessage)
arg(pid).arg(Utils::winErrorMessage(GetLastError()));
break;
}
if (!DebugBreakProcess(inferior)) {
if (isCdb64bit) {
switch (QProcess::execute(QCoreApplication::applicationDirPath() + QString::fromLatin1("/win64interrupt.exe %1").arg(pid))) {
case -2:
*errorMessage = QString::fromLatin1("Cannot start win64interrupt.exe. Check src/tools/win64interrupt/win64interrupt.c for more information.");
break;
case 0:
ok = true;
break;
default:
*errorMessage = QString::fromLatin1("win64interrupt.exe could not break the process with the pid %1.").arg(pid);
break;
}
break;
} else if (!DebugBreakProcess(inferior)) {
*errorMessage = QString::fromLatin1("DebugBreakProcess failed: %1").arg(Utils::winErrorMessage(GetLastError()));
break;
}