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

32
src/plugins/debugger/procinterrupt.cpp
View File

@@ -33,6 +33,7 @@
#include "procinterrupt.h"
#include <QtCore/QProcess> // makes kill visible on Windows.
#include <QtCore/QFile>
using namespace Debugger::Internal;
@@ -40,8 +41,27 @@ using namespace Debugger::Internal;
#define _WIN32_WINNT 0x0501 /* WinXP, needed for DebugBreakProcess() */
#include <utils/winutils.h>
#include <windows.h>
static BOOL isWow64Process(HANDLE hproc)
{
BOOL ret = false;
typedef BOOL (WINAPI *LPFN_ISWOW64PROCESS) (HANDLE, PBOOL);
LPFN_ISWOW64PROCESS fnIsWow64Process = NULL;
HMODULE hModule = GetModuleHandle(L"kernel32.dll");
if (hModule == NULL)
return false;
fnIsWow64Process = reinterpret_cast<LPFN_ISWOW64PROCESS>(GetProcAddress(hModule, "IsWow64Process"));
if (fnIsWow64Process == NULL)
return false;
if (!fnIsWow64Process(hproc, &ret))
return false;
return ret;
}
bool Debugger::Internal::interruptProcess(int pID)
{
if (pID <= 0)
@@ -51,10 +71,18 @@ bool Debugger::Internal::interruptProcess(int pID)
if (hproc == NULL)
return false;
bool ok = DebugBreakProcess(hproc) != 0;
BOOL proc64bit = false;
if (Utils::winIs64BitSystem())
proc64bit = !isWow64Process(hproc);
bool ok = false;
if (proc64bit)
ok = !QProcess::execute(QCoreApplication::applicationDirPath() + QString::fromLatin1("/win64interrupt.exe %1").arg(pID));
else
ok = !DebugBreakProcess(hproc);
CloseHandle(hproc);
return ok;
}