ide: Developing debugger termination, Core/SMTP: Fixed issue with lone space at the end of text

git-svn-id: svn://ultimatepp.org/upp/trunk@7608 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2014-08-26 12:18:17 +00:00
parent 955699c6be
commit 1640a25f68
2 changed files with 12 additions and 6 deletions

View file

@ -282,6 +282,7 @@ String Smtp::GetMessage(bool chunks)
msg.Cat('='); msg.Cat('=');
msg.Cat(hex[(*p >> 4) & 15]); msg.Cat(hex[(*p >> 4) & 15]);
msg.Cat(hex[*p & 15]); msg.Cat(hex[*p & 15]);
begin = false;
} }
if(!begin) if(!begin)

View file

@ -337,17 +337,22 @@ Pdb::~Pdb()
WorkspaceConfigData("pdb-debugger") = ss; WorkspaceConfigData("pdb-debugger") = ss;
if(hProcess != INVALID_HANDLE_VALUE) { if(hProcess != INVALID_HANDLE_VALUE) {
if(!running) if(!running)
ContinueDebugEvent(event.dwProcessId, event.dwThreadId, DBG_CONTINUE); ContinueDebugEvent(event.dwProcessId, event.dwThreadId, DBG_TERMINATE_PROCESS);
TerminateProcess(hProcess, -1); TerminateProcess(hProcess, 0);
/*
// TerminateProcess should take care of everything... // TerminateProcess should take care of everything...
/* do { do {
if(!WaitForDebugEvent(&event, 1500)) if(!WaitForDebugEvent(&event, 1500) ||
!ContinueDebugEvent(event.dwProcessId, event.dwThreadId, DBG_CONTINUE)
TerminateProcess(hProcess, -1);
break; break;
if(!ContinueDebugEvent(event.dwProcessId, event.dwThreadId, DBG_CONTINUE)) }
if()
break; break;
} }
while(event.dwDebugEventCode != EXIT_PROCESS_DEBUG_EVENT); while(event.dwDebugEventCode != EXIT_PROCESS_DEBUG_EVENT);
*/ CleanupOnExit(); */
CleanupOnExit();
} }
StoreToGlobal(*this, CONFIGNAME); StoreToGlobal(*this, CONFIGNAME);
IdeRemoveBottom(*this); IdeRemoveBottom(*this);