store the Process handle for ProcessReader

Author: janwilmans

DebugView++/MainFrame.cpp

@@ -517,19 +517,15 @@ void CMainFrame::OnContextMenu(HWND hWnd, CPoint pt)
 
 void CMainFrame::HandleDroppedFile(const std::wstring& file)
 {
-	if (!IsPaused())
-		Pause();
 	SetTitle(file);
 	using boost::algorithm::iequals;
 	auto ext = std::experimental::filesystem::path(file).extension().wstring();
 	if (iequals(ext, L".exe"))
 	{
-		m_logSources.AddMessage(stringbuilder() << "Started capturing output of " << Str(file) << "\n");
 		Run(file);
 	}
 	else if (iequals(ext, L".cmd") || iequals(ext, L".bat"))
 	{
-		m_logSources.AddMessage(stringbuilder() << "Started capturing output of " << Str(file) << "\n");
 		m_logSources.AddProcessReader(L"cmd.exe", wstringbuilder() << L"/Q /C \"" << file << "\"");
 	}
 	else
@@ -560,7 +556,7 @@ void CMainFrame::OnDropped(const std::wstring uri)
 			}
 
 			Win32::Process process(httpmonitor, uri);
-			m_httpMonitorHandle = Win32::DuplicateHandle(process.GetProcessHandle());
+            m_httpMonitorHandle = Win32::DuplicateHandle(process.GetProcessHandle());
 			m_jobs.AddProcessByHandle(m_httpMonitorHandle.get());
 		}
 		else

DebugView++Lib/PolledLogSource.cpp

@@ -14,6 +14,17 @@
 namespace fusion {
 namespace debugviewpp {
 
+
+PollLine::PollLine(Win32::Handle handle, const std::string& message, const LogSource* pLogSource) :
+    timesValid(false),
+    time(0.0),
+    systemTime(FILETIME()),
+    handle(std::move(handle)),
+    message(message),
+    pLogSource(pLogSource)
+{
+}
+
 PollLine::PollLine(DWORD pid, const std::string& processName, const std::string& message, const LogSource* pLogSource) :
 	timesValid(false),
 	time(0.0),
@@ -95,7 +106,9 @@ void PolledLogSource::Notify()
 
 	for (auto& line : m_backBuffer)
 	{
-		if (line.timesValid)
+		if (line.handle)
+			Add(line.handle.release(), line.message);
+		else if (line.timesValid)
 			Add(line.time, line.systemTime, line.pid, line.processName, line.message);
 		else
 			Add(line.pid, line.processName, line.message);
@@ -107,6 +120,12 @@ void PolledLogSource::Poll()
 {
 }
 
+void PolledLogSource::AddMessage(Win32::Handle handle, const std::string& message)
+{
+    std::lock_guard<std::mutex> lock(m_mutex);
+    m_lines.push_back(PollLine(std::move(handle), message, this));
+}
+
 void PolledLogSource::AddMessage(DWORD pid, const std::string& processName, const std::string& message)
 {
 	std::lock_guard<std::mutex> lock(m_mutex);

DebugView++Lib/ProcessReader.cpp

@@ -1,6 +1,6 @@
 // (C) Copyright Gert-Jan de Vos and Jan Wilmans 2013.
 // Distributed under the Boost Software License, Version 1.0.
-// (See accompanying file LICENSE_1_0.txt or copy at 
+// (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
 // Repository at: https://github.com/djeedjay/DebugViewPP/
@@ -21,6 +21,8 @@ ProcessReader::ProcessReader(Timer& timer, ILineBuffer& linebuffer, const std::w
 	m_stderr(timer, linebuffer, m_process.GetStdErr(), m_process.GetProcessId(), Str(m_process.GetName()).str() + ":stderr", 0)
 {
 	SetDescription(m_process.GetName() + L" stdout/stderr");
+	AddMessage(Win32::DuplicateHandle(m_process.GetProcessHandle()), "Started capturing output of stdout/stderr");
+	Signal();
 	StartThread();
 }
 
@@ -30,7 +32,8 @@ ProcessReader::~ProcessReader()
 
 void ProcessReader::Abort()
 {
-	AddMessage(m_process.GetProcessId(), Str(m_process.GetName()).str(), "<process terminated>");
+	AddMessage(m_process.GetProcessId(), Str(m_process.GetName()).str(), "<process reader aborted>");
+	Signal();
 	PolledLogSource::Abort();
 }
 
@@ -45,5 +48,5 @@ void ProcessReader::Poll()
 	m_stderr.Poll(*this);
 }
 
-} // namespace debugviewpp 
+} // namespace debugviewpp
 } // namespace fusion

Win32Lib/Win32Lib.cpp

@@ -505,6 +505,7 @@ void HFile::resize(size_t size) const
 		ThrowLastError("_chsize");
 }
 
+// SEH (Structured Exception Handling) return codes are in the 0xC000000-0xfffff00 range
 std::wstring GetSEHcodeDescription(DWORD code)
 {
     switch (code) {
@@ -528,6 +529,8 @@ std::wstring GetSEHcodeDescription(DWORD code)
     case EXCEPTION_PRIV_INSTRUCTION:         return L"EXCEPTION_PRIV_INSTRUCTION";
     case EXCEPTION_SINGLE_STEP:              return L"EXCEPTION_SINGLE_STEP";
     case EXCEPTION_STACK_OVERFLOW:           return L"EXCEPTION_STACK_OVERFLOW";
+
+    // undocumented? but regularly seen codes
     case 0xC0000142:                         return L"DllMain returned false";
     case 0xC0000022:                         return L"executable or one of the dependant dlls do not have execute rights";
     default: return L"UNKNOWN EXCEPTION";
@@ -540,6 +543,7 @@ std::wstring GetHresultMessage(HRESULT hr)
     return err.ErrorMessage();
 }
 
+// RESULT return codes are in the 0x8000000-0xbffffff range
 std::wstring GetHresultName(HRESULT hr)
 {
     switch (hr) {

include/DebugView++Lib/PolledLogSource.h

@@ -18,13 +18,15 @@ class ILineBuffer;
 
 struct PollLine
 {
-	PollLine(DWORD pid, const std::string& processName, const std::string& message, const LogSource* pLogSource);
-	PollLine(double time, FILETIME systemTime, DWORD pid, const std::string& processName, const std::string& message, const LogSource* pLogSource);
+    PollLine(Win32::Handle handle, const std::string& message, const LogSource* pLogSource);
+    PollLine(DWORD pid, const std::string& processName, const std::string& message, const LogSource* pLogSource);
+    PollLine(double time, FILETIME systemTime, DWORD pid, const std::string& processName, const std::string& message, const LogSource* pLogSource);
 
 	bool timesValid;
 	double time;
 	FILETIME systemTime;
-	DWORD pid;
+    Win32::Handle handle;
+    DWORD pid;
 	std::string processName;
 	std::string message;
 	const LogSource* pLogSource;
@@ -43,8 +45,9 @@ class PolledLogSource : public LogSource
 
 	// in contrast to the LogSource::Add methdods, these methods are de-coupled using m_backBuffer so they 
 	// can be used to add messages from any thread. The typical use-case are messages from the UI thread.
-	void AddMessage(DWORD pid, const std::string& processName, const std::string& message);
-	void AddMessage(const std::string& message);
+    void AddMessage(Win32::Handle handle, const std::string& message);
+    void AddMessage(DWORD pid, const std::string& processName, const std::string& message);
+    void AddMessage(const std::string& message);
 	void AddMessage(double time, FILETIME systemTime, DWORD pid, const std::string& processName, const std::string& message);
 
 	void Signal();