mirror of
https://github.com/reactos/reactos.git
synced 2025-08-03 01:35:41 +00:00
- Only display a gateway address when there is one
svn path=/trunk/; revision=37056
This commit is contained in:
parent
962142cf78
commit
474c4e0362
21 changed files with 29 additions and 26 deletions
|
@ -63,7 +63,7 @@ BEGIN
|
|||
RTEXT "Íåíàëè÷íî", IDC_DETAILSTYPE, 122, 20, 80, 8
|
||||
RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8
|
||||
RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8
|
||||
RTEXT "000.000.000.000", IDC_DETAILSGATEWAY, 122, 62, 80, 8
|
||||
RTEXT "", IDC_DETAILSGATEWAY, 122, 62, 80, 8
|
||||
|
||||
PUSHBUTTON "&Ïîäðîáíîñòè...", IDC_DETAILS, 22, 76, 62, 14
|
||||
END
|
||||
|
|
|
@ -62,7 +62,7 @@ BEGIN
|
|||
RTEXT "N/A", IDC_DETAILSTYPE, 122, 20, 80, 8
|
||||
RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8
|
||||
RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8
|
||||
RTEXT "000.000.000.000", IDC_DETAILSGATEWAY, 122, 62, 80, 8
|
||||
RTEXT "", IDC_DETAILSGATEWAY, 122, 62, 80, 8
|
||||
|
||||
PUSHBUTTON "&Detaily...", IDC_DETAILS, 22, 76, 62, 14
|
||||
END
|
||||
|
|
|
@ -62,7 +62,7 @@ BEGIN
|
|||
RTEXT "N/A", IDC_DETAILSTYPE, 122, 20, 80, 8
|
||||
RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8
|
||||
RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8
|
||||
RTEXT "000.000.000.000", IDC_DETAILSGATEWAY, 122, 62, 80, 8
|
||||
RTEXT "", IDC_DETAILSGATEWAY, 122, 62, 80, 8
|
||||
|
||||
PUSHBUTTON "&Details...", IDC_DETAILS, 22, 76, 62, 14
|
||||
END
|
||||
|
|
|
@ -63,7 +63,7 @@ BEGIN
|
|||
RTEXT "Nicht verfügbar", IDC_DETAILSTYPE, 122, 20, 80, 8
|
||||
RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8
|
||||
RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8
|
||||
RTEXT "000.000.000.000", IDC_DETAILSGATEWAY, 122, 62, 80, 8
|
||||
RTEXT "", IDC_DETAILSGATEWAY, 122, 62, 80, 8
|
||||
|
||||
PUSHBUTTON "&Details...", IDC_DETAILS, 22, 76, 62, 14
|
||||
END
|
||||
|
|
|
@ -62,7 +62,7 @@ BEGIN
|
|||
RTEXT "N/A", IDC_DETAILSTYPE, 122, 20, 80, 8
|
||||
RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8
|
||||
RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8
|
||||
RTEXT "000.000.000.000", IDC_DETAILSGATEWAY, 122, 62, 80, 8
|
||||
RTEXT "", IDC_DETAILSGATEWAY, 122, 62, 80, 8
|
||||
|
||||
PUSHBUTTON "&Details...", IDC_DETAILS, 22, 76, 62, 14
|
||||
END
|
||||
|
|
|
@ -63,7 +63,7 @@ BEGIN
|
|||
RTEXT "N/A", IDC_DETAILSTYPE, 122, 20, 80, 8
|
||||
RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8
|
||||
RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8
|
||||
RTEXT "000.000.000.000", IDC_DETAILSGATEWAY, 122, 62, 80, 8
|
||||
RTEXT "", IDC_DETAILSGATEWAY, 122, 62, 80, 8
|
||||
|
||||
PUSHBUTTON "&Details...", IDC_DETAILS, 22, 76, 62, 14
|
||||
END
|
||||
|
|
|
@ -57,7 +57,7 @@ BEGIN
|
|||
RTEXT "N/A", IDC_DETAILSTYPE, 110, 20, 80, 8
|
||||
RTEXT "000.000.000.000", IDC_DETAILSIP, 110, 34, 80, 8
|
||||
RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 110, 48, 80, 8
|
||||
RTEXT "000.000.000.000", IDC_DETAILSGATEWAY, 110, 62, 80, 8
|
||||
RTEXT "", IDC_DETAILSGATEWAY, 110, 62, 80, 8
|
||||
|
||||
PUSHBUTTON "&Detalles...", IDC_DETAILS, 22, 76, 62, 14
|
||||
END
|
||||
|
|
|
@ -62,7 +62,7 @@ BEGIN
|
|||
RTEXT "N/A", IDC_DETAILSTYPE, 122, 20, 80, 8
|
||||
RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8
|
||||
RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8
|
||||
RTEXT "000.000.000.000", IDC_DETAILSGATEWAY, 122, 62, 80, 8
|
||||
RTEXT "", IDC_DETAILSGATEWAY, 122, 62, 80, 8
|
||||
|
||||
PUSHBUTTON "&Détails...", IDC_DETAILS, 22, 76, 62, 14
|
||||
END
|
||||
|
|
|
@ -63,7 +63,7 @@ BEGIN
|
|||
RTEXT "N/A", IDC_DETAILSTYPE, 122, 20, 80, 8
|
||||
RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8
|
||||
RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8
|
||||
RTEXT "000.000.000.000", IDC_DETAILSGATEWAY, 122, 62, 80, 8
|
||||
RTEXT "", IDC_DETAILSGATEWAY, 122, 62, 80, 8
|
||||
|
||||
PUSHBUTTON "&Details...", IDC_DETAILS, 22, 76, 62, 14
|
||||
END
|
||||
|
|
|
@ -62,7 +62,7 @@ BEGIN
|
|||
RTEXT "N/A", IDC_DETAILSTYPE, 122, 20, 80, 8
|
||||
RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8
|
||||
RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8
|
||||
RTEXT "000.000.000.000", IDC_DETAILSGATEWAY, 122, 62, 80, 8
|
||||
RTEXT "", IDC_DETAILSGATEWAY, 122, 62, 80, 8
|
||||
|
||||
PUSHBUTTON "&Detil...", IDC_DETAILS, 22, 76, 62, 14
|
||||
END
|
||||
|
|
|
@ -67,7 +67,7 @@ BEGIN
|
|||
RTEXT "N/A", IDC_DETAILSTYPE, 122, 20, 80, 8
|
||||
RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8
|
||||
RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8
|
||||
RTEXT "000.000.000.000", IDC_DETAILSGATEWAY, 122, 62, 80, 8
|
||||
RTEXT "", IDC_DETAILSGATEWAY, 122, 62, 80, 8
|
||||
|
||||
PUSHBUTTON "&Dettagli...", IDC_DETAILS, 22, 76, 62, 14
|
||||
END
|
||||
|
|
|
@ -62,7 +62,7 @@ BEGIN
|
|||
RTEXT "N/A", IDC_DETAILSTYPE, 122, 20, 80, 8
|
||||
RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8
|
||||
RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8
|
||||
RTEXT "000.000.000.000", IDC_DETAILSGATEWAY, 122, 62, 80, 8
|
||||
RTEXT "", IDC_DETAILSGATEWAY, 122, 62, 80, 8
|
||||
|
||||
PUSHBUTTON "&Details...", IDC_DETAILS, 22, 76, 62, 14
|
||||
END
|
||||
|
|
|
@ -62,7 +62,7 @@ BEGIN
|
|||
RTEXT "N/A", IDC_DETAILSTYPE, 122, 20, 80, 8
|
||||
RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8
|
||||
RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8
|
||||
RTEXT "000.000.000.000", IDC_DETAILSGATEWAY, 122, 62, 80, 8
|
||||
RTEXT "", IDC_DETAILSGATEWAY, 122, 62, 80, 8
|
||||
|
||||
PUSHBUTTON "&Details...", IDC_DETAILS, 22, 76, 62, 14
|
||||
END
|
||||
|
|
|
@ -66,7 +66,7 @@ BEGIN
|
|||
RTEXT "Ikke tilgjengelig", IDC_DETAILSTYPE, 122, 20, 80, 8
|
||||
RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8
|
||||
RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8
|
||||
RTEXT "000.000.000.000", IDC_DETAILSGATEWAY, 122, 62, 80, 8
|
||||
RTEXT "", IDC_DETAILSGATEWAY, 122, 62, 80, 8
|
||||
|
||||
PUSHBUTTON "&Detaljer...", IDC_DETAILS, 22, 76, 62, 14
|
||||
END
|
||||
|
|
|
@ -63,7 +63,7 @@ BEGIN
|
|||
RTEXT "n/d", IDC_DETAILSTYPE, 122, 20, 80, 8
|
||||
RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8
|
||||
RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8
|
||||
RTEXT "000.000.000.000", IDC_DETAILSGATEWAY, 122, 62, 80, 8
|
||||
RTEXT "", IDC_DETAILSGATEWAY, 122, 62, 80, 8
|
||||
|
||||
PUSHBUTTON "&Szczegó³y...", IDC_DETAILS, 22, 76, 62, 14
|
||||
END
|
||||
|
|
|
@ -63,7 +63,7 @@ BEGIN
|
|||
RTEXT "N/A", IDC_DETAILSTYPE, 122, 20, 80, 8
|
||||
RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8
|
||||
RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8
|
||||
RTEXT "000.000.000.000", IDC_DETAILSGATEWAY, 122, 62, 80, 8
|
||||
RTEXT "", IDC_DETAILSGATEWAY, 122, 62, 80, 8
|
||||
|
||||
PUSHBUTTON "&Äîïîëíèòåëüíî...", IDC_DETAILS, 22, 76, 62, 14
|
||||
END
|
||||
|
|
|
@ -68,7 +68,7 @@ BEGIN
|
|||
RTEXT "N/A", IDC_DETAILSTYPE, 122, 20, 80, 8
|
||||
RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8
|
||||
RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8
|
||||
RTEXT "000.000.000.000", IDC_DETAILSGATEWAY, 122, 62, 80, 8
|
||||
RTEXT "", IDC_DETAILSGATEWAY, 122, 62, 80, 8
|
||||
|
||||
PUSHBUTTON "Po&drobnosti...", IDC_DETAILS, 22, 76, 62, 14
|
||||
END
|
||||
|
|
|
@ -63,7 +63,7 @@ BEGIN
|
|||
RTEXT "N/A", IDC_DETAILSTYPE, 122, 20, 80, 8
|
||||
RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8
|
||||
RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8
|
||||
RTEXT "000.000.000.000", IDC_DETAILSGATEWAY, 122, 62, 80, 8
|
||||
RTEXT "", IDC_DETAILSGATEWAY, 122, 62, 80, 8
|
||||
|
||||
PUSHBUTTON "&Details...", IDC_DETAILS, 22, 76, 62, 14
|
||||
END
|
||||
|
|
|
@ -65,7 +65,7 @@ BEGIN
|
|||
RTEXT "N/A", IDC_DETAILSTYPE, 122, 20, 80, 8
|
||||
RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8
|
||||
RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8
|
||||
RTEXT "000.000.000.000", IDC_DETAILSGATEWAY, 122, 62, 80, 8
|
||||
RTEXT "", IDC_DETAILSGATEWAY, 122, 62, 80, 8
|
||||
|
||||
PUSHBUTTON "&Ñêëàä...", IDC_DETAILS, 22, 76, 62, 14
|
||||
END
|
||||
|
|
|
@ -62,7 +62,7 @@ BEGIN
|
|||
RTEXT "N/A", IDC_DETAILSTYPE, 122, 20, 80, 8
|
||||
RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8
|
||||
RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8
|
||||
RTEXT "000.000.000.000", IDC_DETAILSGATEWAY, 122, 62, 80, 8
|
||||
RTEXT "", IDC_DETAILSGATEWAY, 122, 62, 80, 8
|
||||
|
||||
PUSHBUTTON "&Details...", IDC_DETAILS, 22, 76, 62, 14
|
||||
END
|
||||
|
|
|
@ -443,10 +443,11 @@ LANStatusUiDetailsDlg(
|
|||
SendMessageW(hDlgCtrl, LVM_SETITEMW, 0, (LPARAM)&li);
|
||||
|
||||
li.iItem = InsertItemToListView(hDlgCtrl, IDS_DEF_GATEWAY);
|
||||
if (li.iItem >= 0)
|
||||
if (li.iItem >= 0 && pCurAdapter->GatewayList.IpAddress.String[0] != '0')
|
||||
{
|
||||
if (MultiByteToWideChar(CP_ACP, 0, pCurAdapter->GatewayList.IpAddress.String, -1, szBuffer, sizeof(szBuffer)/sizeof(WCHAR)))
|
||||
SendMessageW(hDlgCtrl, LVM_SETITEMW, 0, (LPARAM)&li);
|
||||
|
||||
}
|
||||
#if 0
|
||||
li.iItem = InsertItemToListView(hDlgCtrl, IDS_LEASE_OBTAINED);
|
||||
li.iItem = InsertItemToListView(hDlgCtrl, IDS_LEASE_EXPIRES);
|
||||
|
@ -529,10 +530,12 @@ LANStatusUiAdvancedDlg(
|
|||
SendDlgItemMessageW(hwndDlg, IDC_DETAILSSUBNET, WM_SETTEXT, 0, (LPARAM)szBuffer);
|
||||
|
||||
dwIpAddr = ntohl(pContext->Gateway);
|
||||
swprintf(szBuffer, L"%u.%u.%u.%u", FIRST_IPADDRESS(dwIpAddr), SECOND_IPADDRESS(dwIpAddr),
|
||||
THIRD_IPADDRESS(dwIpAddr), FOURTH_IPADDRESS(dwIpAddr));
|
||||
SendDlgItemMessageW(hwndDlg, IDC_DETAILSGATEWAY, WM_SETTEXT, 0, (LPARAM)szBuffer);
|
||||
|
||||
if (dwIpAddr)
|
||||
{
|
||||
swprintf(szBuffer, L"%u.%u.%u.%u", FIRST_IPADDRESS(dwIpAddr), SECOND_IPADDRESS(dwIpAddr),
|
||||
THIRD_IPADDRESS(dwIpAddr), FOURTH_IPADDRESS(dwIpAddr));
|
||||
SendDlgItemMessageW(hwndDlg, IDC_DETAILSGATEWAY, WM_SETTEXT, 0, (LPARAM)szBuffer);
|
||||
}
|
||||
return TRUE;
|
||||
case WM_COMMAND:
|
||||
if (LOWORD(wParam) == IDC_DETAILS)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue