made name leftmost column for filters, callbacks, and layers for easi…

…er searching minor UI enhancements
zodiacon · Jan 24, 2023 · 5c091c8 · 5c091c8
1 parent 15edf6a
commit 5c091c8
Show file tree

Hide file tree

Showing 12 changed files with 36 additions and 50 deletions.
diff --git a/WFPCore/WFPEngine.cpp b/WFPCore/WFPEngine.cpp
@@ -1,6 +1,5 @@
 #include "pch.h"
 #include "WFPEngine.h"
-#include <unordered_map>
 
 bool WFPEngine::Open(DWORD auth) {
 	if (m_hEngine)

diff --git a/WFPCore/WFPEngine.h b/WFPCore/WFPEngine.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include <vector>
-
 template<typename T>
 struct WFPObject {
 	explicit WFPObject(T* p) : Data(p) {}

diff --git a/WFPCore/WFPEnumerator.h b/WFPCore/WFPEnumerator.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <vector>
+
 template<typename TItem, typename T = TItem*>
 class WFPObjectVector {
 public:

diff --git a/WFPExplorer/AboutDlg.cpp b/WFPExplorer/AboutDlg.cpp
@@ -22,3 +22,10 @@ LRESULT CAboutDlg::OnCloseCmd(WORD /*wNotifyCode*/, WORD wID, HWND /*hWndCtl*/,
 	EndDialog(wID);
 	return 0;
 }
+
+LRESULT CAboutDlg::OnClickSyslink(int, LPNMHDR hdr, BOOL&) const {
+	if (hdr->idFrom == IDC_LINK) {
+		::ShellExecute(nullptr, L"open", L"https://github.com/zodiacon/wfpexplorer", nullptr, nullptr, SW_SHOWDEFAULT);
+	}
+	return 0;
+}
diff --git a/WFPExplorer/AboutDlg.h b/WFPExplorer/AboutDlg.h
@@ -10,6 +10,8 @@ class CAboutDlg :
 
 	BEGIN_MSG_MAP(CAboutDlg)
 		MESSAGE_HANDLER(WM_INITDIALOG, OnInitDialog)
+		NOTIFY_CODE_HANDLER(NM_CLICK, OnClickSyslink)
+		NOTIFY_CODE_HANDLER(NM_RETURN, OnClickSyslink)
 		COMMAND_ID_HANDLER(IDOK, OnCloseCmd)
 		COMMAND_ID_HANDLER(IDCANCEL, OnCloseCmd)
 	END_MSG_MAP()
@@ -21,4 +23,5 @@ class CAboutDlg :
 
 	LRESULT OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/);
 	LRESULT OnCloseCmd(WORD /*wNotifyCode*/, WORD wID, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
+	LRESULT OnClickSyslink(int, LPNMHDR hdr, BOOL&) const;
 };
diff --git a/WFPExplorer/CalloutsView.cpp b/WFPExplorer/CalloutsView.cpp
@@ -30,9 +30,9 @@ LRESULT CCalloutsView::OnCreate(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lPara
 	m_List.SetExtendedListViewStyle(LVS_EX_DOUBLEBUFFER | LVS_EX_FULLROWSELECT | LVS_EX_INFOTIP);
 
 	auto cm = GetColumnManager(m_List);
-	cm->AddColumn(L"Callout Key", 0, 300, ColumnType::Key, ColumnFlags::Visible | ColumnFlags::Numeric);
-	cm->AddColumn(L"Callout ID", LVCFMT_RIGHT, 90, ColumnType::Id, ColumnFlags::Visible | ColumnFlags::Numeric);
 	cm->AddColumn(L"Name", 0, 250, ColumnType::Name);
+	cm->AddColumn(L"ID", LVCFMT_RIGHT, 90, ColumnType::Id, ColumnFlags::Visible | ColumnFlags::Numeric);
+	cm->AddColumn(L"Key", 0, 300, ColumnType::Key, ColumnFlags::Visible | ColumnFlags::Numeric);
 	cm->AddColumn(L"Flags", 0, 120, ColumnType::Flags);
 	cm->AddColumn(L"Provider", 0, 250, ColumnType::Provider);
 	cm->AddColumn(L"Applicable Layer", 0, 250, ColumnType::Layer);

diff --git a/WFPExplorer/FiltersView.cpp b/WFPExplorer/FiltersView.cpp
@@ -120,12 +120,12 @@ LRESULT CFiltersView::OnCreate(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam
 	m_List.SetExtendedListViewStyle(LVS_EX_DOUBLEBUFFER | LVS_EX_FULLROWSELECT | LVS_EX_INFOTIP | LVS_EX_HEADERDRAGDROP);
 
 	auto cm = GetColumnManager(m_List);
-	cm->AddColumn(L"Filter Key", 0, 300, ColumnType::Key, ColumnFlags::Visible | ColumnFlags::Numeric);
-	cm->AddColumn(L"Filter Name", 0, 170, ColumnType::Name);
+	cm->AddColumn(L"Name", 0, 300, ColumnType::Name);
 	cm->AddColumn(L"Layer", LVCFMT_LEFT, 200, ColumnType::Layer);
+	cm->AddColumn(L"Key", 0, 300, ColumnType::Key, ColumnFlags::Visible | ColumnFlags::Numeric);
+	cm->AddColumn(L"Id", LVCFMT_RIGHT, 100, ColumnType::Id, ColumnFlags::Visible | ColumnFlags::Numeric);
 	cm->AddColumn(L"Weight", LVCFMT_RIGHT, 140, ColumnType::Weight, ColumnFlags::Visible | ColumnFlags::Numeric);
 	cm->AddColumn(L"Effective Weight", LVCFMT_RIGHT, 140, ColumnType::EffectiveWeight, ColumnFlags::Visible | ColumnFlags::Numeric);
-	cm->AddColumn(L"Filter Id", LVCFMT_RIGHT, 100, ColumnType::Id, ColumnFlags::Visible | ColumnFlags::Numeric);
 	cm->AddColumn(L"Conditions", LVCFMT_RIGHT, 70, ColumnType::ConditionCount, ColumnFlags::Visible | ColumnFlags::Numeric);
 	cm->AddColumn(L"Action", LVCFMT_LEFT, 110, ColumnType::Action);
 	cm->AddColumn(L"Action Filter/Callout", LVCFMT_LEFT, 120, ColumnType::ActionKey);

diff --git a/WFPExplorer/GenericListViewBase.h b/WFPExplorer/GenericListViewBase.h
@@ -37,37 +37,10 @@ class CGenericListViewBase abstract :
 		auto p = static_cast<T*>(this);
 		auto findDlg = p->Frame()->GetFindDialog();
 		auto searchDown = findDlg->SearchDown();
-		int start = m_List.GetNextItem(-1, LVIS_SELECTED);
-		CString find(findDlg->GetFindString());
-		auto ignoreCase = !findDlg->MatchCase();
-		if (ignoreCase)
-			find.MakeLower();
+		auto index = ListViewHelper::SearchItem(m_List, findDlg->GetFindString(), searchDown, findDlg->MatchCase());
 
-		auto columns = m_List.GetHeader().GetItemCount();
-		auto count = m_List.GetItemCount();
-		int from = searchDown ? start + 1 : start - 1 + count;
-		int to = searchDown ? count + start : start + 1;
-		int step = searchDown ? 1 : -1;
-
-		int findIndex = -1;
-		CString text;
-		for (int i = from; i != to; i += step) {
-			int index = i % count;
-			for (int c = 0; c < columns; c++) {
-				m_List.GetItemText(index, c, text);
-				if (ignoreCase)
-					text.MakeLower();
-				if (text.Find(find) >= 0) {
-					findIndex = index;
-					break;
-				}
-			}
-			if (findIndex >= 0)
-				break;
-		}
-
-		if (findIndex >= 0) {
-			m_List.SelectItem(findIndex);
+		if (index >= 0) {
+			m_List.SelectItem(index);
 			m_List.SetFocus();
 		}
 		else {

diff --git a/WFPExplorer/LayersView.cpp b/WFPExplorer/LayersView.cpp
@@ -17,9 +17,9 @@ LRESULT CLayersView::OnCreate(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*
 	m_List.SetExtendedListViewStyle(LVS_EX_DOUBLEBUFFER | LVS_EX_FULLROWSELECT | LVS_EX_INFOTIP);
 
 	auto cm = GetColumnManager(m_List);
-	cm->AddColumn(L"Layer Key", 0, 300, ColumnType::Key, ColumnFlags::Visible | ColumnFlags::Numeric);
-	cm->AddColumn(L"Layer ID", LVCFMT_RIGHT, 70, ColumnType::Id, ColumnFlags::Visible | ColumnFlags::Numeric);
 	cm->AddColumn(L"Name", 0, 250, ColumnType::Name);
+	cm->AddColumn(L"Key", 0, 300, ColumnType::Key, ColumnFlags::Visible | ColumnFlags::Numeric);
+	cm->AddColumn(L"ID", LVCFMT_RIGHT, 70, ColumnType::Id, ColumnFlags::Visible | ColumnFlags::Numeric);
 	cm->AddColumn(L"Flags", LVCFMT_LEFT, 250, ColumnType::Flags);
 	cm->AddColumn(L"Fields", LVCFMT_RIGHT, 60, ColumnType::Fields, ColumnFlags::Visible | ColumnFlags::Numeric);
 	//cm->AddColumn(L"Filters", LVCFMT_RIGHT, 60, ColumnType::Filters);

diff --git a/WFPExplorer/WFPExplorer.rc b/WFPExplorer/WFPExplorer.rc
@@ -215,10 +215,12 @@ STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "About WFP Explorer"
 FONT 9, "Segoe UI", 0, 0, 0x0
 BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,69,60,50,14
+    DEFPUSHBUTTON   "OK",IDOK,73,60,43,14
     ICON            IDR_MAINFRAME,IDC_STATIC,7,7,20,20
-    LTEXT           "Static",IDC_VERSION,56,12,97,8
-    LTEXT           "Static",IDC_COPYRIGHT,56,28,97,8
+    LTEXT           "Static",IDC_VERSION,56,11,97,8
+    LTEXT           "Static",IDC_COPYRIGHT,56,24,97,8
+    CONTROL         "<a>github.com/zodiacon/WFPExplorer</a>",IDC_LINK,
+                    "SysLink",WS_TABSTOP,37,41,123,14
 END
 
 IDD_FILTERINFO DIALOGEX 0, 0, 417, 241
@@ -496,7 +498,7 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,5,3,0
+ FILEVERSION 0,5,4,0
  PRODUCTVERSION 0,5,3,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
@@ -514,12 +516,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Scorpio Software"
             VALUE "FileDescription", "Windows Filtering Platform Explorer"
-            VALUE "FileVersion", "0.5.3.0"
+            VALUE "FileVersion", "0.5.4.0"
             VALUE "InternalName", "WFPExplorer"
-            VALUE "LegalCopyright", "�2022 Pavel Yosifovich"
+            VALUE "LegalCopyright", "�2022-2023 Pavel Yosifovich"
             VALUE "OriginalFilename", "WFPExplorer.exe"
             VALUE "ProductName", "WFP Explorer"
-            VALUE "ProductVersion", "0.5.3.0"
+            VALUE "ProductVersion", "0.5.4"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/WFPExplorer/resource.h b/WFPExplorer/resource.h
@@ -54,7 +54,6 @@
 #define IDC_PROVIDER                    1004
 #define IDC_SERVICENAME                 1004
 #define IDC_PROVIDER_PROP               1005
-#define IDC_PROVIDERDATA                1027
 #define IDC_LAYER                       1006
 #define IDC_LAYER_PROP                  1007
 #define IDC_ACTIONTYPE                  1008
@@ -81,6 +80,9 @@
 #define IDC_DATASIZE                    1024
 #define IDC_REGISTERED                  1025
 #define IDC_COFI                        1026
+#define IDC_PROVIDERDATA                1027
+#define IDC_SYSLINK1                    1028
+#define IDC_LINK                        1028
 #define ID_WINDOW_CLOSE                 32772
 #define ID_WINDOW_CLOSE_ALL             32773
 #define ID_OPTIONS_ALWAYSONTOP          32775
@@ -111,7 +113,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        247
 #define _APS_NEXT_COMMAND_VALUE         32799
-#define _APS_NEXT_CONTROL_VALUE         1028
+#define _APS_NEXT_CONTROL_VALUE         1029
 #define _APS_NEXT_SYMED_VALUE           101
 #endif
 #endif
diff --git a/WTLHelper b/WTLHelper
+9 −5		CustomStatusBar.h
+33 −0		ListViewhelper.cpp
+2 −0		ListViewhelper.h
+0 −2		ThemeHelper.cpp