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

CDB: Start up correctly if no working directory is specified.

Browse Source
This commit is contained in:
Friedemann Kleint
2009-07-28 09:10:12 +02:00
parent 3629e091c4
commit c1ddd71472
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/plugins/debugger/cdb/cdbdebugengine.cpp
View File

@@ -635,7 +635,12 @@ bool CdbDebugEngine::startDebuggerWithExecutable(DebuggerStartMode sm, QString *
imagePath += QLatin1Char(';'); imagePath += QLatin1Char(';');
imagePath += m_d->m_baseImagePath; imagePath += m_d->m_baseImagePath;
} }
m_d->m_cif.debugSymbols->SetImagePathWide(reinterpret_cast<PCWSTR>(imagePath.utf16())); HRESULT hr = m_d->m_cif.debugSymbols->SetImagePathWide(reinterpret_cast<PCWSTR>(imagePath.utf16()));
if (FAILED(hr)) {
*errorMessage = tr("Unable to set the image path to %1: %2").arg(imagePath, msgComFailed("SetImagePathWide", hr));
return false;
}
if (debugCDB) if (debugCDB)
qDebug() << Q_FUNC_INFO <<'\n' << filename << imagePath; qDebug() << Q_FUNC_INFO <<'\n' << filename << imagePath;
@@ -653,12 +658,15 @@ bool CdbDebugEngine::startDebuggerWithExecutable(DebuggerStartMode sm, QString *
envData = Core::Utils::AbstractProcess::createWinEnvironment(Core::Utils::AbstractProcess::fixWinEnvironment(sp->environment)); envData = Core::Utils::AbstractProcess::createWinEnvironment(Core::Utils::AbstractProcess::fixWinEnvironment(sp->environment));
env = reinterpret_cast<PCWSTR>(envData.data()); env = reinterpret_cast<PCWSTR>(envData.data());
} }
const HRESULT hr = m_d->m_cif.debugClient->CreateProcess2Wide(NULL, // The working directory cannot be empty.
reinterpret_cast<PWSTR>(const_cast<ushort *>(cmd.utf16())), PCWSTR workingDirC = 0;
&dbgopts, const QString workingDir = sp->workingDir.isEmpty() ? QString() : QDir::toNativeSeparators(sp->workingDir);
sizeof(dbgopts), if (!workingDir.isEmpty())
reinterpret_cast<PCWSTR>(sp->workingDir.utf16()), workingDirC = workingDir.utf16();
env); hr = m_d->m_cif.debugClient->CreateProcess2Wide(NULL,
reinterpret_cast<PWSTR>(const_cast<ushort *>(cmd.utf16())),
&dbgopts, sizeof(dbgopts),
workingDirC, env);
if (FAILED(hr)) { if (FAILED(hr)) {
*errorMessage = tr("Unable to create a process '%1': %2").arg(cmd, msgDebugEngineComResult(hr)); *errorMessage = tr("Unable to create a process '%1': %2").arg(cmd, msgDebugEngineComResult(hr));
m_d->m_debuggerManagerAccess->notifyInferiorExited(); m_d->m_debuggerManagerAccess->notifyInferiorExited();