mirror of
https://github.com/reactos/reactos.git
synced 2025-02-22 16:36:33 +00:00
[NETCFGX] Improvements to the TCP/IP settings dialog.
- Separate the gateway settings from the DHCP settings. - Enable Edit and Delete buttons only if an item in a list box has been selected. CORE-9908
This commit is contained in:
Eric Kohl
parent
da1b08e842
commit
90aa2c26f8
1 changed files with 93 additions and 101 deletions
|
|
@ -666,38 +666,11 @@ InsertIpAddressToListView(
|
|||
}
|
||||
}
|
||||
|
||||
static
|
||||
VOID
|
||||
EnableIpButtons(
|
||||
HWND hwndDlg)
|
||||
{
|
||||
BOOL bEnable;
|
||||
|
||||
bEnable = (ListView_GetItemCount(GetDlgItem(hwndDlg, IDC_IPLIST)) != 0);
|
||||
|
||||
EnableWindow(GetDlgItem(hwndDlg, IDC_IPMOD), bEnable);
|
||||
EnableWindow(GetDlgItem(hwndDlg, IDC_IPDEL), bEnable);
|
||||
}
|
||||
|
||||
static
|
||||
VOID
|
||||
EnableGwButtons(
|
||||
HWND hwndDlg)
|
||||
{
|
||||
BOOL bEnable;
|
||||
|
||||
bEnable = (ListView_GetItemCount(GetDlgItem(hwndDlg, IDC_GWLIST)) != 0);
|
||||
|
||||
EnableWindow(GetDlgItem(hwndDlg, IDC_GWMOD), bEnable);
|
||||
EnableWindow(GetDlgItem(hwndDlg, IDC_GWDEL), bEnable);
|
||||
}
|
||||
|
||||
VOID
|
||||
InitializeTcpipAdvancedIpDlg(
|
||||
HWND hwndDlg,
|
||||
TcpipConfNotifyImpl * This)
|
||||
{
|
||||
|
||||
RECT rect;
|
||||
LVITEMW li;
|
||||
WCHAR szBuffer[100];
|
||||
|
|
@ -716,24 +689,25 @@ InitializeTcpipAdvancedIpDlg(
|
|||
SendDlgItemMessageW(hwndDlg, IDC_IPLIST, LVM_INSERTITEMW, 0, (LPARAM)&li);
|
||||
}
|
||||
EnableWindow(GetDlgItem(hwndDlg, IDC_IPADD), FALSE);
|
||||
EnableWindow(GetDlgItem(hwndDlg, IDC_IPMOD), FALSE);
|
||||
EnableWindow(GetDlgItem(hwndDlg, IDC_IPDEL), FALSE);
|
||||
}
|
||||
else
|
||||
{
|
||||
InsertIpAddressToListView(GetDlgItem(hwndDlg, IDC_IPLIST), This->pCurrentConfig->Ip, TRUE);
|
||||
EnableIpButtons(hwndDlg);
|
||||
}
|
||||
|
||||
EnableWindow(GetDlgItem(hwndDlg, IDC_IPMOD), FALSE);
|
||||
EnableWindow(GetDlgItem(hwndDlg, IDC_IPDEL), FALSE);
|
||||
|
||||
InsertColumnToListView(GetDlgItem(hwndDlg, IDC_GWLIST), IDS_GATEWAY, 0, 100);
|
||||
GetClientRect(GetDlgItem(hwndDlg, IDC_IPLIST), &rect);
|
||||
InsertColumnToListView(GetDlgItem(hwndDlg, IDC_GWLIST), IDS_METRIC, 1, (rect.right - rect.left - 100));
|
||||
|
||||
InsertIpAddressToListView(GetDlgItem(hwndDlg, IDC_GWLIST), This->pCurrentConfig->Gw, FALSE);
|
||||
EnableGwButtons(hwndDlg);
|
||||
|
||||
EnableWindow(GetDlgItem(hwndDlg, IDC_GWMOD), FALSE);
|
||||
EnableWindow(GetDlgItem(hwndDlg, IDC_GWDEL), FALSE);
|
||||
|
||||
SendDlgItemMessageW(hwndDlg, IDC_METRIC, EM_LIMITTEXT, 4, 0);
|
||||
|
||||
}
|
||||
|
||||
INT_PTR
|
||||
|
|
@ -1088,7 +1062,6 @@ TcpipAddSuffixDlg(
|
|||
}
|
||||
|
||||
|
||||
|
||||
INT
|
||||
GetSelectedItem(HWND hDlgCtrl)
|
||||
{
|
||||
|
|
@ -1313,7 +1286,30 @@ TcpipAdvancedIpDlg(
|
|||
return TRUE;
|
||||
case WM_NOTIFY:
|
||||
lppsn = (LPPSHNOTIFY) lParam;
|
||||
if (lppsn->hdr.code == PSN_KILLACTIVE)
|
||||
if (lppsn->hdr.code == LVN_ITEMCHANGED)
|
||||
{
|
||||
LPNMLISTVIEW lplv = (LPNMLISTVIEW)lParam;
|
||||
BOOL bEnable;
|
||||
|
||||
if (lplv->hdr.idFrom == IDC_IPLIST)
|
||||
{
|
||||
This = (TcpipConfNotifyImpl*)GetWindowLongPtr(hwndDlg, DWLP_USER);
|
||||
|
||||
bEnable = ((lplv->uNewState & LVIS_SELECTED) != 0) &&
|
||||
(!This->pCurrentConfig->DhcpEnabled);
|
||||
|
||||
EnableWindow(GetDlgItem(hwndDlg, IDC_IPMOD), bEnable);
|
||||
EnableWindow(GetDlgItem(hwndDlg, IDC_IPDEL), bEnable);
|
||||
}
|
||||
else if (lplv->hdr.idFrom == IDC_GWLIST)
|
||||
{
|
||||
bEnable = ((lplv->uNewState & LVIS_SELECTED) != 0);
|
||||
|
||||
EnableWindow(GetDlgItem(hwndDlg, IDC_GWMOD), bEnable);
|
||||
EnableWindow(GetDlgItem(hwndDlg, IDC_GWDEL), bEnable);
|
||||
}
|
||||
}
|
||||
else if (lppsn->hdr.code == PSN_KILLACTIVE)
|
||||
{
|
||||
This = (TcpipConfNotifyImpl*)GetWindowLongPtr(hwndDlg, DWLP_USER);
|
||||
if (!This->pCurrentConfig->DhcpEnabled && ListView_GetItemCount(GetDlgItem(hwndDlg, IDC_IPLIST)) == 0)
|
||||
|
|
@ -1363,8 +1359,6 @@ TcpipAdvancedIpDlg(
|
|||
li.pszText = Ip.szMask;
|
||||
SendDlgItemMessageW(hwndDlg, IDC_IPLIST, LVM_SETITEMW, 0, (LPARAM)&li);
|
||||
}
|
||||
|
||||
EnableIpButtons(hwndDlg);
|
||||
}
|
||||
}
|
||||
else if (LOWORD(wParam) == IDC_IPMOD)
|
||||
|
|
@ -1397,7 +1391,6 @@ TcpipAdvancedIpDlg(
|
|||
else if (LOWORD(wParam) == IDC_IPDEL)
|
||||
{
|
||||
DeleteItemFromList(GetDlgItem(hwndDlg, IDC_IPLIST));
|
||||
EnableIpButtons(hwndDlg);
|
||||
break;
|
||||
}
|
||||
else if (LOWORD(wParam) == IDC_GWADD)
|
||||
|
|
@ -1432,8 +1425,6 @@ TcpipAdvancedIpDlg(
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
EnableGwButtons(hwndDlg);
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
|
@ -1482,7 +1473,6 @@ TcpipAdvancedIpDlg(
|
|||
else if (LOWORD(wParam) == IDC_GWDEL)
|
||||
{
|
||||
DeleteItemFromList(GetDlgItem(hwndDlg, IDC_GWLIST));
|
||||
EnableGwButtons(hwndDlg);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
@ -2228,6 +2218,11 @@ StoreTcpipBasicSettings(
|
|||
}
|
||||
/* store subnetmask */
|
||||
This->pCurrentConfig->Ip->u.Subnetmask = dwIpAddr;
|
||||
}
|
||||
else
|
||||
{
|
||||
This->pCurrentConfig->DhcpEnabled = TRUE;
|
||||
}
|
||||
|
||||
if (SendDlgItemMessageW(hwndDlg, IDC_DEFGATEWAY, IPM_GETADDRESS, 0, (LPARAM)&dwIpAddr) == 4)
|
||||
{
|
||||
|
|
@ -2250,11 +2245,7 @@ StoreTcpipBasicSettings(
|
|||
This->pCurrentConfig->Gw = pNextGw;
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
This->pCurrentConfig->DhcpEnabled = TRUE;
|
||||
}
|
||||
|
||||
if (SendDlgItemMessageW(hwndDlg, IDC_FIXEDDNS, BM_GETCHECK, 0, 0) == BST_CHECKED)
|
||||
{
|
||||
BOOL bSkip = FALSE;
|
||||
|
|
@ -2380,12 +2371,14 @@ InitializeTcpipBasicDlgCtrls(
|
|||
/* set current hostmask */
|
||||
SendDlgItemMessageA(hwndDlg, IDC_SUBNETMASK, IPM_SETADDRESS, 0, (LPARAM)pCurSettings->Ip->u.Subnetmask);
|
||||
}
|
||||
}
|
||||
|
||||
if (pCurSettings->Gw && pCurSettings->Gw->IpAddress)
|
||||
{
|
||||
/* set current gateway */
|
||||
SendDlgItemMessageA(hwndDlg, IDC_DEFGATEWAY, IPM_SETADDRESS, 0, (LPARAM)pCurSettings->Gw->IpAddress);
|
||||
}
|
||||
}
|
||||
|
||||
if (pCurSettings->AutoconfigActive)
|
||||
{
|
||||
SendDlgItemMessageW(hwndDlg, IDC_AUTODNS, BM_SETCHECK, BST_CHECKED, 0);
|
||||
|
|
@ -2909,9 +2902,10 @@ Initialize(TcpipConfNotifyImpl * This)
|
|||
if (!pCurrentAdapter->DhcpEnabled)
|
||||
{
|
||||
CopyIpAddrString(&pCurrentAdapter->IpAddressList, &pCurSettings->Ip, SUBMASK, NULL);
|
||||
CopyIpAddrString(&pCurrentAdapter->GatewayList, &pCurSettings->Gw, METRIC, NULL); //FIXME
|
||||
}
|
||||
|
||||
CopyIpAddrString(&pCurrentAdapter->GatewayList, &pCurSettings->Gw, METRIC, NULL);
|
||||
|
||||
uLength = sizeof(IP_PER_ADAPTER_INFO);
|
||||
ZeroMemory(&Info, sizeof(IP_PER_ADAPTER_INFO));
|
||||
|
||||
|
|
@ -3262,8 +3256,6 @@ INetCfgComponentControl_fnApplyRegistryChanges(
|
|||
{
|
||||
RegSetValueExW(hKey, L"IPAddress", 0, REG_MULTI_SZ, (LPBYTE)L"0.0.0.0\0", 9 * sizeof(WCHAR));
|
||||
RegSetValueExW(hKey, L"SubnetMask", 0, REG_MULTI_SZ, (LPBYTE)L"0.0.0.0\0", 9 * sizeof(WCHAR));
|
||||
RegSetValueExW(hKey, L"DefaultGateway", 0, REG_MULTI_SZ, (LPBYTE)L"\0", 2 * sizeof(WCHAR));
|
||||
RegSetValueExW(hKey, L"DefaultGatewayMetric", 0, REG_MULTI_SZ, (LPBYTE)L"\0", 2 * sizeof(WCHAR));
|
||||
if (!pOldConfig->DhcpEnabled)
|
||||
{
|
||||
/* Delete this adapter's current IP address */
|
||||
|
|
@ -3355,6 +3347,7 @@ INetCfgComponentControl_fnApplyRegistryChanges(
|
|||
CoTaskMemFree(pIpForwardTable);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (pCurrentConfig->Gw)
|
||||
{
|
||||
|
|
@ -3390,7 +3383,6 @@ INetCfgComponentControl_fnApplyRegistryChanges(
|
|||
RegSetValueExW(hKey, L"DefaultGateway", 0, REG_MULTI_SZ, (LPBYTE)L"", 1 * sizeof(WCHAR));
|
||||
RegSetValueExW(hKey, L"DefaultGatewayMetric", 0, REG_MULTI_SZ, (LPBYTE)L"\0", sizeof(WCHAR) * 2);
|
||||
}
|
||||
}
|
||||
|
||||
if (!pCurrentConfig->Ns || pCurrentConfig->AutoconfigActive)
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in a new issue