Fix #292, added JobObject to tie httpmonitor lifetime to debugview++

also prevent multiple httpmonitor instances

Author: janwilmans

DebugView++/MainFrame.cpp

@@ -554,12 +554,19 @@ void CMainFrame::OnDropped(const std::wstring uri)
 		std::wstring httpmonitor = wstringbuilder() << Win32::GetExecutionPath() << "\\debugview++plugins\\HttpMonitor.exe";
 		if (std::experimental::filesystem::exists(httpmonitor))
 		{
+			if (m_httpMonitorHandle)
+			{
+				::TerminateProcess(m_httpMonitorHandle.get(), 0);
+			}
+
 			Win32::Process process(httpmonitor, uri);
+			m_httpMonitorHandle = Win32::DuplicateHandle(process.GetProcessHandle());
+			m_jobs.AddProcessByHandle(m_httpMonitorHandle.get());
+		}
+		else
+		{
+			m_logSources.AddMessage(stringbuilder() << httpmonitor << " missing, dropped url ignored\n");
 		}
-        else
-        {
-            m_logSources.AddMessage(stringbuilder() << httpmonitor << " missing, dropped url ignored\n");
-        }
 	}
 }
 

DebugView++/MainFrame.h

@@ -245,6 +245,8 @@ class CMainFrame : public CTabbedFrameImpl<CMainFrame, CDotNetTabCtrl<SelectedTa
 	std::vector<SourceInfo> m_sourceInfos;
 	std::unique_ptr<GuiExecutorClient> m_GuiExecutorClient;
 	LogSources m_logSources;
+    Win32::JobObject m_jobs;
+    Win32::Handle m_httpMonitorHandle;
 };
 
 } // namespace debugviewpp

DebugView++/version.h

@@ -1,2 +1,2 @@
-#define VERSION 1,8,0,3 
-#define VERSION_STR "1.8.0.3" 
+#define VERSION 1,8,0,4 
+#define VERSION_STR "1.8.0.4" 

DebugView++/version.wxi

@@ -3,6 +3,6 @@
     <?define ProductVersion.Major="1" ?> 
     <?define ProductVersion.Minor="8" ?> 
     <?define ProductVersion.Revision="0" ?> 
-    <?define ProductVersion.Build="3" ?> 
-    <?define ProductVersion="1.8.0.3" ?> 
+    <?define ProductVersion.Build="4" ?> 
+    <?define ProductVersion="1.8.0.4" ?> 
 </Include> 

GDIGraphicsPOC/MainFrame.cpp

@@ -29,47 +29,52 @@ int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hInstPrev, LPSTR szCmdLine, int nC
     return msg.wParam;
 }
 
-LRESULT fusion::CMainFrame::OnClose(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
+namespace fusion
 {
-	DestroyWindow();
-	return 0;
-}
 
-LRESULT fusion::CMainFrame::OnDestroy(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
-{
-	PostQuitMessage(0);
-	return 0;
-}
+    LRESULT CMainFrame::OnClose(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
+    {
+        DestroyWindow();
+        return 0;
+    }
 
-LRESULT fusion::CMainFrame::OnSize(UINT nType, CSize Extent)
-{
-    cdbg << "OnSize:: " << Extent.cx << ", " << Extent.cy << "\n";
-	UpdateLayout();
-	return 1;
-}
+    LRESULT CMainFrame::OnDestroy(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
+    {
+        PostQuitMessage(0);
+        return 0;
+    }
 
-void fusion::CMainFrame::AddTab(const std::wstring name)
-{
-	auto lvi = std::make_shared<CLogViewTabItem2>();
-	m_tabitems.push_back(lvi);
-	lvi->SetText(name.c_str());
-	lvi->Create(*this);
-
-	int newIndex = GetTabCtrl().GetItemCount();
-	GetTabCtrl().InsertItem(newIndex, lvi.get());
-	GetTabCtrl().SetCurSel(newIndex);
-}
+    LRESULT CMainFrame::OnSize(UINT nType, CSize Extent)
+    {
+        cdbg << "OnSize:: " << Extent.cx << ", " << Extent.cy << "\n";
+        UpdateLayout();
+        return 1;
+    }
 
-LRESULT fusion::CMainFrame::OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
-{
-	auto rect = RECT();
-	GetClientRect(&rect);
+    void CMainFrame::AddTab(const std::wstring name)
+    {
+        auto lvi = std::make_shared<CLogViewTabItem2>();
+        m_tabitems.push_back(lvi);
+        lvi->SetText(name.c_str());
+        lvi->Create(*this);
 
-	// block 2
-	CreateTabWindow(*this, rect, CTCS_CLOSEBUTTON | CTCS_DRAGREARRANGE);
-	AddTab(L"Tab1");
-	AddTab(L"Tab2");
+        int newIndex = GetTabCtrl().GetItemCount();
+        GetTabCtrl().InsertItem(newIndex, lvi.get());
+        GetTabCtrl().SetCurSel(newIndex);
+    }
 
-	ShowTabControl();
-	return 0;
-}
+    LRESULT CMainFrame::OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
+    {
+        auto rect = RECT();
+        GetClientRect(&rect);
+
+        // block 2
+        CreateTabWindow(*this, rect, CTCS_CLOSEBUTTON | CTCS_DRAGREARRANGE);
+        AddTab(L"Tab1");
+        AddTab(L"Tab2");
+
+        ShowTabControl();
+        return 0;
+    }
+
+}

Win32Lib/Win32Lib.cpp

@@ -566,6 +566,41 @@ std::wstring GetHresultDescription(HRESULT hr)
     return name + L", " + msg;
 }
 
+JobObject::JobObject()
+    : m_jobHandle(::CreateJobObject(nullptr, nullptr))
+{
+    JOBOBJECT_EXTENDED_LIMIT_INFORMATION jeli = { 0 };
+
+    jeli.BasicLimitInformation.LimitFlags = JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE;
+    if (0 == ::SetInformationJobObject(m_jobHandle.get(), JobObjectExtendedLimitInformation, &jeli, sizeof(jeli)))
+    {
+        ThrowLastError("SetInformationJobObject");
+    }
+}
+
+HANDLE JobObject::get() const
+{
+    return m_jobHandle.get();
+}
+
+void JobObject::AddProcessById(DWORD pid) const
+{
+    Handle processHandle(OpenProcess(PROCESS_ALL_ACCESS, FALSE, pid));
+    ::AssignProcessToJobObject(m_jobHandle.get(), processHandle.get());
+}
+
+void JobObject::AddProcessByHandle(HANDLE processHandle) const
+{
+    ::AssignProcessToJobObject(m_jobHandle.get(), processHandle);
+}
+
+Handle DuplicateHandle(HANDLE handle)
+{
+    HANDLE result;
+    ::DuplicateHandle(GetCurrentProcess(), handle, GetCurrentProcess(), &result, 0, FALSE, DUPLICATE_SAME_ACCESS);
+    return Handle(result);
+}
+
 } // namespace Win32
 
 bool operator==(const FILETIME& ft1, const FILETIME& ft2)

include/Win32/Win32Lib.h

@@ -302,6 +302,20 @@ std::wstring GetHresultMessage(HRESULT hr);
 std::wstring GetHresultName(HRESULT hr);
 std::wstring GetHresultDescription(HRESULT hr);
 
+class JobObject
+{
+public:
+    JobObject();
+    HANDLE get() const;
+    void AddProcessById(DWORD processId) const;
+    void AddProcessByHandle(HANDLE processHandle) const;
+
+private:
+    Handle m_jobHandle;
+};
+
+Handle DuplicateHandle(HANDLE handle);
+
 } // namespace Win32
 
 bool operator==(const FILETIME& ft1, const FILETIME& ft2);