Force Proxy to any Windows/MacOS/Linux Application TCP and UDP traffic
C ccybersecurityhttp3httpproxylinuxlinux-proxymacosmacos-appmacos-proxyproxifierproxifier-alternativeproxyclienttcpthick-clientudpwindivertwindows
#100 - Added Proxy Rule and Proxy Config Name Fixed Colum size in Proxy setting and Rule
AnoF-Cyber021b46095da1
diff --git a/Windows/gui/loc/loc.h b/Windows/gui/loc/loc.hindex ce42c32..78defb6 100644--- a/Windows/gui/loc/loc.h+++ b/Windows/gui/loc/loc.h@@ -36,6 +36,7 @@ enum {S_AB_VERSION, S_AB_DESC, S_AB_AUTHOR, S_AB_WEB, S_AB_GITHUB, S_AB_LICENSE,S_M_UPDATE, S_UPD_TITLE, S_UPD_AVAIL, S_UPD_NOTES, S_UPD_NOW, S_UPD_LATER,S_UPD_DONTASK, S_UPD_LATEST, S_UPD_ERR, S_UPD_DLING, S_UPD_DLFAIL,+ S_L_NAME, S_COL_NAME,S_COUNT};@@ -190,6 +191,8 @@ static const wchar_t* const g_strings[S_COUNT][2] = {/* S_UPD_ERR */ { L"Could not check for updates. Please try again later.", L"无法检查更新,请稍后重试。" },/* S_UPD_DLING */ { L"Downloading update...", L"正在下载更新..." },/* S_UPD_DLFAIL */ { L"Download failed.", L"下载失败。" },+ /* S_L_NAME */ { L"Name:", L"名称:" },+ /* S_COL_NAME */ { L"Name", L"名称" },};static const wchar_t* T(int id) { return g_strings[id][g_lang ? 1 : 0]; }diff --git a/Windows/gui/profile/profile.c b/Windows/gui/profile/profile.cindex fec3d1d..d77a549 100644--- a/Windows/gui/profile/profile.c+++ b/Windows/gui/profile/profile.c@@ -173,6 +173,7 @@ void PB_ProfileLoad(const wchar_t* name, PBProfile* p)if (c->type != J_OBJ) continue;PBConfig* cf = &p->cfg[p->cfgCount++];cf->storedId = (UINT32)json_long(c, "Id", 0);+ u2w(json_str(c, "Name", ""), cf->name, 128);u2w(json_str(c, "Type", "SOCKS5"), cf->type, 16);u2w(json_str(c, "Host", ""), cf->host, 128);u2w(json_str(c, "Port", ""), cf->port, 16);@@ -186,6 +187,7 @@ void PB_ProfileLoad(const wchar_t* name, PBProfile* p){if (r->type != J_OBJ) continue;PBRule* ru = &p->rule[p->ruleCount++];+ u2w(json_str(r, "Name", "ProxyBridge Rule"), ru->name, 128);u2w(json_str(r, "ProcessName", "*"), ru->proc, 256);u2w(json_str(r, "TargetHosts", "*"), ru->hosts, 256);u2w(json_str(r, "TargetPorts", "*"), ru->ports, 128);@@ -242,6 +244,7 @@ BOOL PB_ProfileSave(const wchar_t* name, const PBProfile* p)sb_put(&b, i ? ",\n" : "\n"); sb_put(&b, " {\n");snprintf(tmp, sizeof(tmp), "%u", c->storedId);sb_put(&b, " \"Id\": "); sb_put(&b, tmp); sb_put(&b, ",\n");+ put_kv_str(&b, " ", "Name", c->name, ",\n");put_kv_str(&b, " ", "Type", c->type, ",\n");put_kv_str(&b, " ", "Host", c->host, ",\n");put_kv_str(&b, " ", "Port", c->port, ",\n");@@ -256,6 +259,7 @@ BOOL PB_ProfileSave(const wchar_t* name, const PBProfile* p){const PBRule* r = &p->rule[i];sb_put(&b, i ? ",\n" : "\n"); sb_put(&b, " {\n");+ put_kv_str(&b, " ", "Name", r->name, ",\n");put_kv_str(&b, " ", "ProcessName", r->proc, ",\n");put_kv_str(&b, " ", "TargetHosts", r->hosts, ",\n");put_kv_str(&b, " ", "TargetPorts", r->ports, ",\n");diff --git a/Windows/gui/profile/profile.h b/Windows/gui/profile/profile.hindex 444bfb1..50e5de8 100644--- a/Windows/gui/profile/profile.h+++ b/Windows/gui/profile/profile.h@@ -19,6 +19,7 @@typedef struct {UINT32 storedId; // Id as written in the profileUINT32 nativeId; // id returned by AddProxyConfig after apply+ wchar_t name[128]; // friendly label (GUI-only; not sent to the core)wchar_t type[16]; // "SOCKS5" | "HTTP"wchar_t host[128];wchar_t port[16];@@ -28,6 +29,7 @@ typedef struct {typedef struct {UINT32 nativeId; // id returned by AddRule after apply+ wchar_t name[128]; // friendly label (GUI-only; not sent to the core)wchar_t proc[256];wchar_t hosts[256];wchar_t ports[128];diff --git a/Windows/gui/res/app.rc b/Windows/gui/res/app.rcindex df99b37..dee33c3 100644--- a/Windows/gui/res/app.rc+++ b/Windows/gui/res/app.rc@@ -42,42 +42,44 @@ END// at runtime - there is no menu resource here on purpose.// Proxy Servers (list) dialog-IDD_SERVERS DIALOGEX 0, 0, 340, 176+IDD_SERVERS DIALOGEX 0, 0, 460, 200STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENUCAPTION "Proxy Servers"FONT 11, "Segoe UI", 400, 0, 0x0BEGINCONTROL "", IDC_SV_LIST, "SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP,- 8, 8, 258, 138- PUSHBUTTON "Add...", IDC_SV_ADD, 274, 8, 58, 15- PUSHBUTTON "Edit...", IDC_SV_EDIT, 274, 28, 58, 15- PUSHBUTTON "Remove", IDC_SV_REMOVE, 274, 48, 58, 15- PUSHBUTTON "Proxy Test", IDC_SV_CHECK, 274, 72, 58, 15- DEFPUSHBUTTON "Close", IDCANCEL, 274, 155, 58, 15+ 8, 8, 378, 162+ PUSHBUTTON "Add...", IDC_SV_ADD, 394, 8, 58, 15+ PUSHBUTTON "Edit...", IDC_SV_EDIT, 394, 28, 58, 15+ PUSHBUTTON "Remove", IDC_SV_REMOVE, 394, 48, 58, 15+ PUSHBUTTON "Proxy Test", IDC_SV_CHECK, 394, 72, 58, 15+ DEFPUSHBUTTON "Close", IDCANCEL, 394, 179, 58, 15END// Proxy Server (edit) sub-dialog-IDD_SERVER DIALOGEX 0, 0, 244, 176+IDD_SERVER DIALOGEX 0, 0, 320, 200STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENUCAPTION "Proxy Server"FONT 11, "Segoe UI", 400, 0, 0x0BEGIN- GROUPBOX "Server", IDC_SE_G_SERVER, 8, 6, 228, 66- LTEXT "Address:", IDC_SE_L_ADDR, 18, 24, 44, 10- EDITTEXT IDC_SE_ADDR, 66, 22, 108, 12, ES_AUTOHSCROLL | WS_TABSTOP- LTEXT "Port:", IDC_SE_L_PORT, 182, 24, 20, 10- EDITTEXT IDC_SE_PORT, 204, 22, 24, 12, ES_AUTOHSCROLL | ES_NUMBER | WS_TABSTOP- LTEXT "Protocol:", IDC_SE_L_PROTO, 18, 48, 44, 10- COMBOBOX IDC_SE_PROTO, 66, 46, 108, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP- GROUPBOX "Authentication", IDC_SE_G_AUTH, 8, 80, 228, 66- AUTOCHECKBOX "Enable", IDC_SE_AUTH, 18, 96, 60, 10- LTEXT "Username:", IDC_SE_L_USER, 18, 114, 44, 10- EDITTEXT IDC_SE_USER, 66, 112, 162, 12, ES_AUTOHSCROLL | WS_TABSTOP- LTEXT "Password:", IDC_SE_L_PASS, 18, 130, 44, 10- EDITTEXT IDC_SE_PASS, 66, 128, 162, 12, ES_AUTOHSCROLL | ES_PASSWORD | WS_TABSTOP- DEFPUSHBUTTON "OK", IDOK, 128, 156, 50, 14- PUSHBUTTON "Cancel", IDCANCEL, 186, 156, 50, 14+ LTEXT "Name:", IDC_SE_L_NAME, 8, 10, 44, 10+ EDITTEXT IDC_SE_NAME, 56, 8, 256, 12, ES_AUTOHSCROLL | WS_TABSTOP+ GROUPBOX "Server", IDC_SE_G_SERVER, 8, 28, 304, 66+ LTEXT "Address:", IDC_SE_L_ADDR, 18, 46, 44, 10+ EDITTEXT IDC_SE_ADDR, 66, 44, 168, 12, ES_AUTOHSCROLL | WS_TABSTOP+ LTEXT "Port:", IDC_SE_L_PORT, 244, 46, 20, 10+ EDITTEXT IDC_SE_PORT, 268, 44, 36, 12, ES_AUTOHSCROLL | ES_NUMBER | WS_TABSTOP+ LTEXT "Protocol:", IDC_SE_L_PROTO, 18, 70, 44, 10+ COMBOBOX IDC_SE_PROTO, 66, 68, 168, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP+ GROUPBOX "Authentication", IDC_SE_G_AUTH, 8, 102, 304, 66+ AUTOCHECKBOX "Enable", IDC_SE_AUTH, 18, 118, 60, 10+ LTEXT "Username:", IDC_SE_L_USER, 18, 136, 44, 10+ EDITTEXT IDC_SE_USER, 66, 134, 238, 12, ES_AUTOHSCROLL | WS_TABSTOP+ LTEXT "Password:", IDC_SE_L_PASS, 18, 152, 44, 10+ EDITTEXT IDC_SE_PASS, 66, 150, 238, 12, ES_AUTOHSCROLL | ES_PASSWORD | WS_TABSTOP+ DEFPUSHBUTTON "OK", IDOK, 204, 180, 50, 14+ PUSHBUTTON "Cancel", IDCANCEL, 262, 180, 50, 14END// Proxy Checker dialog@@ -97,7 +99,7 @@ BEGINEND// Proxification Rules (list) dialog-IDD_RULES DIALOGEX 0, 0, 540, 300+IDD_RULES DIALOGEX 0, 0, 640, 320STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENUCAPTION "Proxy Rules"FONT 11, "Segoe UI", 400, 0, 0x0@@ -108,47 +110,50 @@ BEGINPUSHBUTTON "Remove", IDC_RL_REMOVE,200, 8, 60, 16CONTROL "", IDC_RL_LIST, "SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP,- 8, 30, 500, 232- PUSHBUTTON "Move Up", IDC_RL_UP, 516, 30, 18, 16- PUSHBUTTON "Move Down", IDC_RL_DOWN, 516, 52, 18, 16+ 8, 30, 600, 252+ PUSHBUTTON "Move Up", IDC_RL_UP, 616, 30, 18, 16+ PUSHBUTTON "Move Down", IDC_RL_DOWN, 616, 52, 18, 16LTEXT "Rules are checked top to bottom; use the check box to enable/disable a rule.",- IDC_RL_HINT, 8, 270, 400, 11- DEFPUSHBUTTON "Close", IDCANCEL, 456, 278, 60, 16+ IDC_RL_HINT, 8, 290, 480, 11+ DEFPUSHBUTTON "Close", IDCANCEL, 572, 298, 60, 16END// Proxification Rule (edit) sub-dialog-IDD_RULE DIALOGEX 0, 0, 400, 272+IDD_RULE DIALOGEX 0, 0, 480, 294STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENUCAPTION "Proxy Rule"FONT 11, "Segoe UI", 400, 0, 0x0BEGIN- AUTOCHECKBOX "Enabled", IDC_RE_ENABLED, 330, 10, 62, 10- LTEXT "Applications:", IDC_RE_L_APPS, 8, 10, 80, 10- EDITTEXT IDC_RE_APPS, 92, 8, 176, 13, ES_AUTOHSCROLL | WS_TABSTOP- PUSHBUTTON "Browse...", IDC_RE_BROWSE, 272, 7, 50, 14- LTEXT "", IDC_RE_EX_APPS, 92, 24, 300, 9+ LTEXT "Name:", IDC_RE_L_NAME, 8, 10, 80, 10+ EDITTEXT IDC_RE_NAME, 92, 8, 306, 13, ES_AUTOHSCROLL | WS_TABSTOP+ AUTOCHECKBOX "Enabled", IDC_RE_ENABLED, 410, 10, 62, 10- LTEXT "Target Hosts:", IDC_RE_L_HOSTS, 8, 40, 80, 10- EDITTEXT IDC_RE_HOSTS, 92, 38, 300, 13, ES_AUTOHSCROLL | WS_TABSTOP- LTEXT "", IDC_RE_EX_HOSTS, 92, 54, 300, 9+ LTEXT "Applications:", IDC_RE_L_APPS, 8, 32, 80, 10+ EDITTEXT IDC_RE_APPS, 92, 30, 316, 13, ES_AUTOHSCROLL | WS_TABSTOP+ PUSHBUTTON "Browse...", IDC_RE_BROWSE, 412, 29, 60, 14+ LTEXT "", IDC_RE_EX_APPS, 92, 46, 380, 9- LTEXT "Target Ports:", IDC_RE_L_PORTS, 8, 70, 80, 10- EDITTEXT IDC_RE_PORTS, 92, 68, 300, 13, ES_AUTOHSCROLL | WS_TABSTOP- LTEXT "", IDC_RE_EX_PORTS, 92, 84, 300, 9+ LTEXT "Target Hosts:", IDC_RE_L_HOSTS, 8, 62, 80, 10+ EDITTEXT IDC_RE_HOSTS, 92, 60, 380, 13, ES_AUTOHSCROLL | WS_TABSTOP+ LTEXT "", IDC_RE_EX_HOSTS, 92, 76, 380, 9- LTEXT "Target Domains:", IDC_RE_L_DOMAINS, 8, 100, 80, 10- EDITTEXT IDC_RE_DOMAINS, 92, 98, 300, 13, ES_AUTOHSCROLL | WS_TABSTOP- LTEXT "", IDC_RE_EX_DOMAINS,92, 114, 300, 9+ LTEXT "Target Ports:", IDC_RE_L_PORTS, 8, 92, 80, 10+ EDITTEXT IDC_RE_PORTS, 92, 90, 380, 13, ES_AUTOHSCROLL | WS_TABSTOP+ LTEXT "", IDC_RE_EX_PORTS, 92, 106, 380, 9- LTEXT "Protocol:", IDC_RE_L_PROTO, 8, 130, 80, 10- COMBOBOX IDC_RE_PROTO, 92, 128, 110, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP- LTEXT "", IDC_RE_UDPNOTE, 92, 146, 300, 40+ LTEXT "Target Domains:", IDC_RE_L_DOMAINS, 8, 122, 80, 10+ EDITTEXT IDC_RE_DOMAINS, 92, 120, 380, 13, ES_AUTOHSCROLL | WS_TABSTOP+ LTEXT "", IDC_RE_EX_DOMAINS,92, 136, 380, 9- LTEXT "Action:", IDC_RE_L_ACTION, 8, 192, 80, 10- COMBOBOX IDC_RE_ACTION, 92, 190, 300,160, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP+ LTEXT "Protocol:", IDC_RE_L_PROTO, 8, 152, 80, 10+ COMBOBOX IDC_RE_PROTO, 92, 150, 120, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP+ LTEXT "", IDC_RE_UDPNOTE, 92, 168, 380, 40- DEFPUSHBUTTON "OK", IDOK, 282, 250, 52, 14- PUSHBUTTON "Cancel", IDCANCEL, 338, 250, 52, 14+ LTEXT "Action:", IDC_RE_L_ACTION, 8, 214, 80, 10+ COMBOBOX IDC_RE_ACTION, 92, 212, 380,160, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP++ DEFPUSHBUTTON "OK", IDOK, 362, 272, 52, 14+ PUSHBUTTON "Cancel", IDCANCEL, 418, 272, 52, 14END// Log Filters (list) dialogdiff --git a/Windows/gui/res/resource.h b/Windows/gui/res/resource.hindex b05213b..9f8a724 100644--- a/Windows/gui/res/resource.h+++ b/Windows/gui/res/resource.h@@ -84,6 +84,8 @@#define IDC_SE_L_PASS 334#define IDC_SE_G_SERVER 335 // "Server" group box#define IDC_SE_G_AUTH 336 // "Authentication" group box+#define IDC_SE_NAME 327 // friendly name edit+#define IDC_SE_L_NAME 337 // "Name:" label// Proxy Checker dialog#define IDD_CHECKER 340@@ -126,6 +128,8 @@#define IDC_RE_EX_PORTS 439#define IDC_RE_EX_DOMAINS 440#define IDC_RE_UDPNOTE 441+#define IDC_RE_NAME 442 // friendly name edit+#define IDC_RE_L_NAME 443 // "Name:" label// Name-input dialog (new profile)#define IDD_NAME 500diff --git a/Windows/gui/ui/dialogs.h b/Windows/gui/ui/dialogs.hindex a69843d..6669fd9 100644--- a/Windows/gui/ui/dialogs.h+++ b/Windows/gui/ui/dialogs.h@@ -42,18 +42,31 @@ static LRESULT CALLBACK ListDarkSubProc(HWND h, UINT m, WPARAM w, LPARAM l, UINTreturn DefSubclassProc(h, m, w, l);}-// Stretch the last column so the list uses its full width (no dead space on the right).-static void FillLastColumn(HWND lv, int count)+// Grow every column proportionally so the grid fills its full client width - no dead space+// on the right, and no single over-wide column. Idempotent: once the columns already span+// the width, re-calling it is a no-op (it never shrinks below the seeded widths).+#define PB_MAX_COLS 16+static void FillColumns(HWND lv, int count){+ if (count <= 0 || count > PB_MAX_COLS) return;RECT rc; GetClientRect(lv, &rc);- int used = 0;- for (int i = 0; i < count - 1; i++) used += ListView_GetColumnWidth(lv, i);- int w = rc.right - used - 2;- if (w > 80) ListView_SetColumnWidth(lv, count - 1, w);+ int avail = rc.right - 4; // small margin to avoid a stray h-scrollbar+ if (avail <= 0) return;+ int w[PB_MAX_COLS]; int total = 0;+ for (int i = 0; i < count; i++) { w[i] = ListView_GetColumnWidth(lv, i); total += w[i]; }+ if (total <= 0 || avail <= total) return; // nothing to distribute (or would need to shrink)+ int extra = avail - total, given = 0;+ for (int i = 0; i < count; i++)+ {+ int add = (i == count - 1) ? (extra - given) // last column soaks up the rounding+ : (int)((INT64)extra * w[i] / total);+ given += add;+ ListView_SetColumnWidth(lv, i, w[i] + add);+ }}// Dark-theme a report ListView: full-row select + double buffer (+ any extra ex-styles),-// dark colours, dark-drawn header. Columns/FillLastColumn are added by the caller.+// dark colours, dark-drawn header. Columns/FillColumns are added by the caller.static void DarkListView(HWND lv, DWORD extraExStyle){ListView_SetExtendedListViewStyle(lv, LVS_EX_FULLROWSELECT | LVS_EX_DOUBLEBUFFER | extraExStyle);@@ -71,10 +84,10 @@ static void DarkListView(HWND lv, DWORD extraExStyle)static void InitServerList(HWND lv){DarkListView(lv, 0);- struct { int s; int w; } cols[] = { {S_COL_ADDR, 190}, {S_COL_PORTS, 70}, {S_COL_TYPE, 90} };+ struct { int s; int w; } cols[] = { {S_COL_NAME, 130}, {S_COL_ADDR, 160}, {S_COL_PORTS, 60}, {S_COL_TYPE, 80} };LVCOLUMNW c; c.mask = LVCF_TEXT | LVCF_WIDTH;- for (int i = 0; i < 3; i++) { c.pszText = (LPWSTR)T(cols[i].s); c.cx = cols[i].w; ListView_InsertColumn(lv, i, &c); }- FillLastColumn(lv, 3);+ for (int i = 0; i < 4; i++) { c.pszText = (LPWSTR)T(cols[i].s); c.cx = cols[i].w; ListView_InsertColumn(lv, i, &c); }+ FillColumns(lv, 4);}static void RefreshServerList(HWND lv){@@ -83,10 +96,11 @@ static void RefreshServerList(HWND lv){PBConfig* c = &g_profile.cfg[i];LVITEMW it; ZeroMemory(&it, sizeof(it));- it.mask = LVIF_TEXT; it.iItem = i; it.pszText = c->host;+ it.mask = LVIF_TEXT; it.iItem = i; it.pszText = c->name[0] ? c->name : c->host;ListView_InsertItem(lv, &it);- ListView_SetItemText(lv, i, 1, c->port);- ListView_SetItemText(lv, i, 2, c->type);+ ListView_SetItemText(lv, i, 1, c->host);+ ListView_SetItemText(lv, i, 2, c->port);+ ListView_SetItemText(lv, i, 3, c->type);}}@@ -101,6 +115,7 @@ INT_PTR CALLBACK ServerEditDlgProc(HWND dlg, UINT msg, WPARAM wp, LPARAM lp)SetWindowLongPtrW(dlg, GWLP_USERDATA, (LONG_PTR)lp);PBConfig* c = (PBConfig*)lp;SetWindowTextW(dlg, T(S_DLG_SERVER));+ SetDlgItemTextW(dlg, IDC_SE_L_NAME, T(S_L_NAME));SetDlgItemTextW(dlg, IDC_SE_G_SERVER, T(S_G_SERVER));SetDlgItemTextW(dlg, IDC_SE_G_AUTH, T(S_G_AUTH));SetDlgItemTextW(dlg, IDC_SE_L_ADDR, T(S_L_ADDR));@@ -115,6 +130,7 @@ INT_PTR CALLBACK ServerEditDlgProc(HWND dlg, UINT msg, WPARAM wp, LPARAM lp)SendMessageW(pr, CB_ADDSTRING, 0, (LPARAM)L"SOCKS5");SendMessageW(pr, CB_ADDSTRING, 0, (LPARAM)L"HTTP");SendMessageW(pr, CB_SETCURSEL, (_wcsicmp(c->type, L"HTTP") == 0) ? 1 : 0, 0);+ SetDlgItemTextW(dlg, IDC_SE_NAME, c->name);SetDlgItemTextW(dlg, IDC_SE_ADDR, c->host);if (c->port[0]) SetDlgItemTextW(dlg, IDC_SE_PORT, c->port); else SetDlgItemInt(dlg, IDC_SE_PORT, 1080, FALSE);SetDlgItemTextW(dlg, IDC_SE_USER, c->user);@@ -142,7 +158,9 @@ INT_PTR CALLBACK ServerEditDlgProc(HWND dlg, UINT msg, WPARAM wp, LPARAM lp)PBConfig* c = (PBConfig*)GetWindowLongPtrW(dlg, GWLP_USERDATA);int isHttp = (int)SendMessageW(GetDlgItem(dlg, IDC_SE_PROTO), CB_GETCURSEL, 0, 0) == 1;lstrcpynW(c->type, isHttp ? L"HTTP" : L"SOCKS5", 16);+ GetDlgItemTextW(dlg, IDC_SE_NAME, c->name, 128);GetDlgItemTextW(dlg, IDC_SE_ADDR, c->host, 128);+ if (!c->name[0]) lstrcpynW(c->name, c->host[0] ? c->host : L"Proxy Server", 128);GetDlgItemTextW(dlg, IDC_SE_PORT, c->port, 16);if (IsDlgButtonChecked(dlg, IDC_SE_AUTH) == BST_CHECKED){@@ -266,7 +284,7 @@ INT_PTR CALLBACK ServersDlgProc(HWND dlg, UINT msg, WPARAM wp, LPARAM lp)RefreshServerList(GetDlgItem(dlg, IDC_SV_LIST));return TRUE;case WM_SIZE:- FillLastColumn(GetDlgItem(dlg, IDC_SV_LIST), 3);+ FillColumns(GetDlgItem(dlg, IDC_SV_LIST), 4);return FALSE;PB_DARK_CTLCOLORS;case WM_NOTIFY:@@ -285,6 +303,7 @@ INT_PTR CALLBACK ServersDlgProc(HWND dlg, UINT msg, WPARAM wp, LPARAM lp){if (g_profile.cfgCount >= PB_MAX_CFG) { MessageBoxW(dlg, L"Config limit reached.", APP_TITLE, MB_OK); return TRUE; }PBConfig c; ZeroMemory(&c, sizeof(c));+ lstrcpynW(c.name, L"Proxy Server", 128);if (DialogBoxParamW(g_hInst, MAKEINTRESOURCEW(IDD_SERVER), dlg, ServerEditDlgProc, (LPARAM)&c) == 1){char h[256], u[256], p[256]; W2Ux(c.host, h, sizeof(h)); W2Ux(c.user, u, sizeof(u)); W2Ux(c.pass, p, sizeof(p));@@ -348,13 +367,13 @@ static void InitRulesList(HWND lv)// Checkboxes give the enable/disable toggle in the first column.DarkListView(lv, LVS_EX_CHECKBOXES);struct { int s; int w; } cols[] = {- {S_COL_ON, 36}, {S_COL_APPS, 180}, {S_COL_HOSTS, 70}, {S_COL_PORTS, 60},- {S_COL_DOMAINS, 100}, {S_COL_PROTO, 60}, {S_COL_ACTION, 70}, {S_COL_CFG, 200}+ {S_COL_ON, 36}, {S_COL_NAME, 130}, {S_COL_APPS, 160}, {S_COL_HOSTS, 70}, {S_COL_PORTS, 55},+ {S_COL_DOMAINS, 90}, {S_COL_PROTO, 55}, {S_COL_ACTION, 65}, {S_COL_CFG, 190}};LVCOLUMNW c; c.mask = LVCF_TEXT | LVCF_WIDTH;- for (int i = 0; i < 8; i++) { c.pszText = (LPWSTR)T(cols[i].s); c.cx = cols[i].w; ListView_InsertColumn(lv, i, &c); }+ for (int i = 0; i < 9; i++) { c.pszText = (LPWSTR)T(cols[i].s); c.cx = cols[i].w; ListView_InsertColumn(lv, i, &c); }SetWindowSubclass(lv, ListDarkSubProc, 3, 0);- FillLastColumn(lv, 8);+ FillColumns(lv, 9);}static void RefreshRulesList(HWND lv){@@ -366,24 +385,25 @@ static void RefreshRulesList(HWND lv)LVITEMW it; ZeroMemory(&it, sizeof(it));it.mask = LVIF_TEXT; it.iItem = i; it.pszText = (LPWSTR)L"";ListView_InsertItem(lv, &it);- ListView_SetItemText(lv, i, 1, r->proc);- ListView_SetItemText(lv, i, 2, r->hosts);- ListView_SetItemText(lv, i, 3, r->ports);- ListView_SetItemText(lv, i, 4, r->domains);- ListView_SetItemText(lv, i, 5, r->proto);- ListView_SetItemText(lv, i, 6, r->action);- wchar_t cfg[160];+ ListView_SetItemText(lv, i, 1, r->name[0] ? r->name : (LPWSTR)L"ProxyBridge Rule");+ ListView_SetItemText(lv, i, 2, r->proc);+ ListView_SetItemText(lv, i, 3, r->hosts);+ ListView_SetItemText(lv, i, 4, r->ports);+ ListView_SetItemText(lv, i, 5, r->domains);+ ListView_SetItemText(lv, i, 6, r->proto);+ ListView_SetItemText(lv, i, 7, r->action);+ wchar_t cfg[200];if (_wcsicmp(r->action, L"PROXY") == 0){const PBConfig* c = NULL;for (int k = 0; k < g_profile.cfgCount; k++)if (g_profile.cfg[k].storedId == r->cfgStoredId) { c = &g_profile.cfg[k]; break; }- if (c) _snwprintf_s(cfg, 160, _TRUNCATE, L"%s %s:%s", c->type, c->host, c->port);- else _snwprintf_s(cfg, 160, _TRUNCATE, L"#%u (missing)", r->cfgStoredId);- cfg[159] = 0;+ if (c) _snwprintf_s(cfg, 200, _TRUNCATE, L"%s %s %s:%s", c->name[0] ? c->name : c->type, c->type, c->host, c->port);+ else _snwprintf_s(cfg, 200, _TRUNCATE, L"#%u (missing)", r->cfgStoredId);+ cfg[199] = 0;}- else lstrcpynW(cfg, L"\x2014", 160); // em dash for Direct/Block- ListView_SetItemText(lv, i, 7, cfg);+ else lstrcpynW(cfg, L"\x2014", 200); // em dash for Direct/Block+ ListView_SetItemText(lv, i, 8, cfg);ListView_SetCheckState(lv, i, r->enabled ? TRUE : FALSE);}g_rulesRefreshing = FALSE;@@ -400,6 +420,7 @@ INT_PTR CALLBACK RuleEditDlgProc(HWND dlg, UINT msg, WPARAM wp, LPARAM lp)SetWindowLongPtrW(dlg, GWLP_USERDATA, (LONG_PTR)lp);PBRule* r = (PBRule*)lp;SetWindowTextW(dlg, T(S_DLG_RULE));+ SetDlgItemTextW(dlg, IDC_RE_L_NAME, T(S_L_NAME));SetDlgItemTextW(dlg, IDC_RE_ENABLED, T(S_CHK_ENABLED));SetDlgItemTextW(dlg, IDC_RE_L_APPS, T(S_L_APPS));SetDlgItemTextW(dlg, IDC_RE_L_HOSTS, T(S_L_HOSTS));@@ -427,13 +448,14 @@ INT_PTR CALLBACK RuleEditDlgProc(HWND dlg, UINT msg, WPARAM wp, LPARAM lp){PBConfig* c = &g_profile.cfg[i];wchar_t label[320];- _snwprintf_s(label, 320, _TRUNCATE, L"%s %s:%s (#%u)", c->type, c->host, c->port, c->storedId);+ _snwprintf_s(label, 320, _TRUNCATE, L"%s %s %s:%s", c->name[0] ? c->name : c->type, c->type, c->host, c->port);label[319] = 0;LRESULT idx = SendMessageW(ac, CB_ADDSTRING, 0, (LPARAM)label);SendMessageW(ac, CB_SETITEMDATA, idx, c->storedId);}- SendMessageW(ac, CB_SETDROPPEDWIDTH, 280, 0);+ SendMessageW(ac, CB_SETDROPPEDWIDTH, 360, 0);// Seed fields from the rule.+ SetDlgItemTextW(dlg, IDC_RE_NAME, r->name[0] ? r->name : L"ProxyBridge Rule");SetDlgItemTextW(dlg, IDC_RE_APPS, r->proc[0] ? r->proc : L"*");SetDlgItemTextW(dlg, IDC_RE_HOSTS, r->hosts[0] ? r->hosts : L"*");SetDlgItemTextW(dlg, IDC_RE_PORTS, r->ports[0] ? r->ports : L"*");@@ -503,6 +525,8 @@ INT_PTR CALLBACK RuleEditDlgProc(HWND dlg, UINT msg, WPARAM wp, LPARAM lp)case IDOK:{PBRule* r = (PBRule*)GetWindowLongPtrW(dlg, GWLP_USERDATA);+ GetDlgItemTextW(dlg, IDC_RE_NAME, r->name, 128);+ if (!r->name[0]) lstrcpynW(r->name, L"ProxyBridge Rule", 128);GetDlgItemTextW(dlg, IDC_RE_APPS, r->proc, 256);GetDlgItemTextW(dlg, IDC_RE_HOSTS, r->hosts, 256);GetDlgItemTextW(dlg, IDC_RE_PORTS, r->ports, 128);@@ -562,7 +586,7 @@ INT_PTR CALLBACK RulesDlgProc(HWND dlg, UINT msg, WPARAM wp, LPARAM lp)RefreshRulesList(GetDlgItem(dlg, IDC_RL_LIST));return TRUE;case WM_SIZE:- FillLastColumn(GetDlgItem(dlg, IDC_RL_LIST), 8);+ FillColumns(GetDlgItem(dlg, IDC_RL_LIST), 9);return FALSE;PB_DARK_CTLCOLORS;case WM_NOTIFY:@@ -601,6 +625,7 @@ INT_PTR CALLBACK RulesDlgProc(HWND dlg, UINT msg, WPARAM wp, LPARAM lp){if (g_profile.ruleCount >= PB_MAX_RULE) { MessageBoxW(dlg, L"Rule limit reached.", APP_TITLE, MB_OK); return TRUE; }PBRule r; ZeroMemory(&r, sizeof(r));+ lstrcpynW(r.name, L"ProxyBridge Rule", 128);lstrcpynW(r.proc, L"*", 256); lstrcpynW(r.hosts, L"*", 256);lstrcpynW(r.ports, L"*", 128); lstrcpynW(r.domains, L"*", 256);lstrcpynW(r.proto, L"BOTH", 8); lstrcpynW(r.action, L"DIRECT", 16); r.enabled = 1;@@ -729,7 +754,7 @@ static void InitFilterList(HWND lv)LVCOLUMNW c; c.mask = LVCF_TEXT | LVCF_WIDTH;for (int i = 0; i < 6; i++) { c.pszText = (LPWSTR)T(cols[i].s); c.cx = cols[i].w; ListView_InsertColumn(lv, i, &c); }SetWindowSubclass(lv, ListDarkSubProc, 3, 0);- FillLastColumn(lv, 6);+ FillColumns(lv, 6);}static void RefreshFilterList(HWND lv){