From 76a59c83120a1c8ed2cca20326114fd22f7935d2 Mon Sep 17 00:00:00 2001 From: Johannes Anderwald Date: Sat, 5 Apr 2008 11:00:29 +0000 Subject: [PATCH] - change statistics to display number of bytes received / send instead of number of packets - dont show a decimal seperator svn path=/trunk/; revision=32869 --- reactos/dll/cpl/ncpa/lang/bg-BG.rc | 2 +- reactos/dll/cpl/ncpa/lang/cs-CZ.rc | 2 +- reactos/dll/cpl/ncpa/lang/da-DK.rc | 2 +- reactos/dll/cpl/ncpa/lang/de-DE.rc | 2 +- reactos/dll/cpl/ncpa/lang/el-GR.rc | 2 +- reactos/dll/cpl/ncpa/lang/en-US.rc | 2 +- reactos/dll/cpl/ncpa/lang/fr-FR.rc | 2 +- reactos/dll/cpl/ncpa/lang/hu-HU.rc | 2 +- reactos/dll/cpl/ncpa/lang/id-ID.rc | 2 +- reactos/dll/cpl/ncpa/lang/it-IT.rc | 2 +- reactos/dll/cpl/ncpa/lang/ja-JP.rc | 2 +- reactos/dll/cpl/ncpa/lang/nb-NO.rc | 2 +- reactos/dll/cpl/ncpa/lang/nl-NL.rc | 2 +- reactos/dll/cpl/ncpa/lang/pl-PL.rc | 2 +- reactos/dll/cpl/ncpa/lang/ru-RU.rc | 2 +- reactos/dll/cpl/ncpa/lang/sv-SE.rc | 2 +- reactos/dll/cpl/ncpa/lang/uk-UA.rc | 2 +- reactos/dll/cpl/ncpa/ncpa.c | 17 ++++++++++++----- reactos/dll/cpl/ncpa/tcpip_properties.c | 10 +++++----- 19 files changed, 34 insertions(+), 27 deletions(-) diff --git a/reactos/dll/cpl/ncpa/lang/bg-BG.rc b/reactos/dll/cpl/ncpa/lang/bg-BG.rc index 3d2757447f9..d3aa12a3bb4 100644 --- a/reactos/dll/cpl/ncpa/lang/bg-BG.rc +++ b/reactos/dll/cpl/ncpa/lang/bg-BG.rc @@ -46,7 +46,7 @@ BEGIN ICON IDI_NETSTAT, -1, 110, 85, 18, 20 ICON IDI_HORIZONTAL, -1, 130, 85, 18, 20 LTEXT "", -1, 149, 90, 37, 8 - LTEXT ":", -1, 17, 115, 32, 8 + LTEXT "Bytes:", -1, 17, 115, 32, 8 RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 ICON IDI_VERTICAL, -1, 110, 108, 18, 20 RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 diff --git a/reactos/dll/cpl/ncpa/lang/cs-CZ.rc b/reactos/dll/cpl/ncpa/lang/cs-CZ.rc index fe5a93f8c28..bfc5277f6b8 100644 --- a/reactos/dll/cpl/ncpa/lang/cs-CZ.rc +++ b/reactos/dll/cpl/ncpa/lang/cs-CZ.rc @@ -46,7 +46,7 @@ BEGIN ICON IDI_NETSTAT, -1, 110, 85, 18, 20 ICON IDI_HORIZONTAL, -1, 130, 85, 18, 20 LTEXT "Pijato", -1, 149, 90, 37, 8 - LTEXT "Paket:", -1, 17, 115, 32, 8 + LTEXT "Bytes:", -1, 17, 115, 32, 8 RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 ICON IDI_VERTICAL, -1, 110, 108, 18, 20 RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 diff --git a/reactos/dll/cpl/ncpa/lang/da-DK.rc b/reactos/dll/cpl/ncpa/lang/da-DK.rc index a601d0a0515..e95b3a9f955 100644 --- a/reactos/dll/cpl/ncpa/lang/da-DK.rc +++ b/reactos/dll/cpl/ncpa/lang/da-DK.rc @@ -46,7 +46,7 @@ BEGIN ICON IDI_NETSTAT, -1, 110, 85, 18, 20 ICON IDI_HORIZONTAL, -1, 130, 85, 18, 20 LTEXT " Modtaget", -1, 149, 90, 37, 8 - LTEXT "Netvrks pakker:", -1, 73, 115, 44, 8 + LTEXT "Bytes:", -1, 73, 115, 44, 8 RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 ICON IDI_VERTICAL, -1, 117, 108, 21, 20 RTEXT "000.000.000", IDC_RECEIVED, 134, 115, 44, 8 diff --git a/reactos/dll/cpl/ncpa/lang/de-DE.rc b/reactos/dll/cpl/ncpa/lang/de-DE.rc index 76228d6b6fc..2c8765fca33 100644 --- a/reactos/dll/cpl/ncpa/lang/de-DE.rc +++ b/reactos/dll/cpl/ncpa/lang/de-DE.rc @@ -46,7 +46,7 @@ BEGIN ICON IDI_NETSTAT, -1, 110, 85, 18, 20 ICON IDI_HORIZONTAL, -1, 130, 85, 18, 20 LTEXT "Empfangen", -1, 149, 90, 37, 8 - LTEXT "Pakete:", -1, 17, 115, 32, 8 + LTEXT "Bytes:", -1, 17, 115, 32, 8 RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 ICON IDI_VERTICAL, -1, 110, 108, 18, 20 RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 diff --git a/reactos/dll/cpl/ncpa/lang/el-GR.rc b/reactos/dll/cpl/ncpa/lang/el-GR.rc index 1382a837e12..c893ba89d29 100644 --- a/reactos/dll/cpl/ncpa/lang/el-GR.rc +++ b/reactos/dll/cpl/ncpa/lang/el-GR.rc @@ -46,7 +46,7 @@ BEGIN ICON IDI_NETSTAT, -1, 110, 85, 18, 20 ICON IDI_HORIZONTAL, -1, 130, 85, 18, 20 LTEXT "", -1, 149, 90, 37, 8 - LTEXT ":", -1, 17, 115, 32, 8 + LTEXT "Bytes:", -1, 17, 115, 32, 8 RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 ICON IDI_VERTICAL, -1, 110, 108, 18, 20 RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 diff --git a/reactos/dll/cpl/ncpa/lang/en-US.rc b/reactos/dll/cpl/ncpa/lang/en-US.rc index 9df02a88f0a..a657840fba8 100644 --- a/reactos/dll/cpl/ncpa/lang/en-US.rc +++ b/reactos/dll/cpl/ncpa/lang/en-US.rc @@ -46,7 +46,7 @@ BEGIN ICON IDI_NETSTAT, -1, 110, 85, 18, 20 ICON IDI_HORIZONTAL, -1, 130, 85, 18, 20 LTEXT "Received", -1, 149, 90, 37, 8 - LTEXT "Packets:", -1, 17, 115, 32, 8 + LTEXT "Bytes:", -1, 17, 115, 32, 8 RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 ICON IDI_VERTICAL, -1, 110, 108, 18, 20 RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 diff --git a/reactos/dll/cpl/ncpa/lang/fr-FR.rc b/reactos/dll/cpl/ncpa/lang/fr-FR.rc index c9d15daab72..d7d3652de42 100644 --- a/reactos/dll/cpl/ncpa/lang/fr-FR.rc +++ b/reactos/dll/cpl/ncpa/lang/fr-FR.rc @@ -46,7 +46,7 @@ BEGIN ICON IDI_NETSTAT, -1, 110, 85, 18, 20 ICON IDI_HORIZONTAL, -1, 130, 85, 18, 20 LTEXT "Reus", -1, 149, 90, 37, 8 - LTEXT "Paquets :", -1, 17, 115, 32, 8 + LTEXT "Bytes:", -1, 17, 115, 32, 8 RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 ICON IDI_VERTICAL, -1, 110, 108, 18, 20 RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 diff --git a/reactos/dll/cpl/ncpa/lang/hu-HU.rc b/reactos/dll/cpl/ncpa/lang/hu-HU.rc index 761db4d36c5..faab5cd2f41 100644 --- a/reactos/dll/cpl/ncpa/lang/hu-HU.rc +++ b/reactos/dll/cpl/ncpa/lang/hu-HU.rc @@ -47,7 +47,7 @@ BEGIN ICON IDI_NETSTAT, -1, 110, 85, 18, 20 ICON IDI_HORIZONTAL, -1, 130, 85, 18, 20 LTEXT "Berkezett", -1, 149, 90, 37, 8 - LTEXT "Csomagok:", -1, 17, 115, 32, 8 + LTEXT "Bytes:", -1, 17, 115, 32, 8 RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 ICON IDI_VERTICAL, -1, 110, 108, 18, 20 RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 diff --git a/reactos/dll/cpl/ncpa/lang/id-ID.rc b/reactos/dll/cpl/ncpa/lang/id-ID.rc index c7aca4f9c66..18ef92b5593 100644 --- a/reactos/dll/cpl/ncpa/lang/id-ID.rc +++ b/reactos/dll/cpl/ncpa/lang/id-ID.rc @@ -46,7 +46,7 @@ BEGIN ICON IDI_NETSTAT, -1, 110, 85, 18, 20 ICON IDI_HORIZONTAL, -1, 130, 85, 18, 20 LTEXT "Diterima", -1, 149, 90, 37, 8 - LTEXT "Paket:", -1, 17, 115, 32, 8 + LTEXT "Bytes:", -1, 17, 115, 32, 8 RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 ICON IDI_VERTICAL, -1, 110, 108, 18, 20 RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 diff --git a/reactos/dll/cpl/ncpa/lang/it-IT.rc b/reactos/dll/cpl/ncpa/lang/it-IT.rc index c031cd561fd..6c2fccef3e9 100644 --- a/reactos/dll/cpl/ncpa/lang/it-IT.rc +++ b/reactos/dll/cpl/ncpa/lang/it-IT.rc @@ -46,7 +46,7 @@ BEGIN ICON IDI_NETSTAT, -1, 110, 85, 18, 20 ICON IDI_HORIZONTAL, -1, 130, 85, 18, 20 LTEXT "Ricevuti", -1, 149, 90, 37, 8 - LTEXT "Pacchetti:", -1, 17, 115, 32, 8 + LTEXT "Bytes:", -1, 17, 115, 32, 8 RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 ICON IDI_VERTICAL, -1, 110, 108, 18, 20 RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 diff --git a/reactos/dll/cpl/ncpa/lang/ja-JP.rc b/reactos/dll/cpl/ncpa/lang/ja-JP.rc index 70b7c691b4e..e906109e3b2 100644 --- a/reactos/dll/cpl/ncpa/lang/ja-JP.rc +++ b/reactos/dll/cpl/ncpa/lang/ja-JP.rc @@ -46,7 +46,7 @@ BEGIN ICON IDI_NETSTAT, -1, 110, 85, 18, 20 ICON IDI_HORIZONTAL, -1, 130, 85, 18, 20 LTEXT "M", -1, 149, 90, 37, 8 - LTEXT "pPbg:", -1, 17, 115, 32, 8 + LTEXT "Bytes:", -1, 17, 115, 32, 8 RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 ICON IDI_VERTICAL, -1, 110, 108, 18, 20 RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 diff --git a/reactos/dll/cpl/ncpa/lang/nb-NO.rc b/reactos/dll/cpl/ncpa/lang/nb-NO.rc index afdfac3b7e0..d28a79f9f49 100644 --- a/reactos/dll/cpl/ncpa/lang/nb-NO.rc +++ b/reactos/dll/cpl/ncpa/lang/nb-NO.rc @@ -46,7 +46,7 @@ BEGIN ICON IDI_NETSTAT, -1, 110, 85, 18, 20 ICON IDI_HORIZONTAL, -1, 130, 85, 18, 20 LTEXT "Received", -1, 149, 90, 37, 8 - LTEXT "Packets:", -1, 17, 115, 32, 8 + LTEXT "Bytes:", -1, 17, 115, 32, 8 RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 ICON IDI_VERTICAL, -1, 110, 108, 18, 20 RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 diff --git a/reactos/dll/cpl/ncpa/lang/nl-NL.rc b/reactos/dll/cpl/ncpa/lang/nl-NL.rc index bc849d3e8a3..7f53b652f0f 100644 --- a/reactos/dll/cpl/ncpa/lang/nl-NL.rc +++ b/reactos/dll/cpl/ncpa/lang/nl-NL.rc @@ -46,7 +46,7 @@ BEGIN ICON IDI_NETSTAT, -1, 110, 85, 18, 20 ICON IDI_HORIZONTAL, -1, 130, 85, 18, 20 LTEXT "Ontvangen", -1, 149, 90, 37, 8 - LTEXT "Pakketten:", -1, 17, 115, 32, 8 + LTEXT "Bytes:", -1, 17, 115, 32, 8 RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 ICON IDI_VERTICAL, -1, 110, 108, 18, 20 RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 diff --git a/reactos/dll/cpl/ncpa/lang/pl-PL.rc b/reactos/dll/cpl/ncpa/lang/pl-PL.rc index 636a37b1305..df812ef9974 100644 --- a/reactos/dll/cpl/ncpa/lang/pl-PL.rc +++ b/reactos/dll/cpl/ncpa/lang/pl-PL.rc @@ -55,7 +55,7 @@ BEGIN ICON IDI_NETSTAT, -1, 110, 85, 18, 20 ICON IDI_HORIZONTAL, -1, 130, 85, 18, 20 LTEXT "Odebrano", -1, 149, 90, 37, 8 - LTEXT "Pakietw:", -1, 17, 115, 32, 8 + LTEXT "Bytes:", -1, 17, 115, 32, 8 RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 ICON IDI_VERTICAL, -1, 110, 108, 18, 20 RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 diff --git a/reactos/dll/cpl/ncpa/lang/ru-RU.rc b/reactos/dll/cpl/ncpa/lang/ru-RU.rc index 50fc6f0c6f5..06ad68c42a0 100644 --- a/reactos/dll/cpl/ncpa/lang/ru-RU.rc +++ b/reactos/dll/cpl/ncpa/lang/ru-RU.rc @@ -46,7 +46,7 @@ BEGIN ICON IDI_NETSTAT, -1, 110, 85, 18, 20 ICON IDI_HORIZONTAL, -1, 130, 85, 18, 20 LTEXT "", -1, 149, 90, 37, 8 - LTEXT ":", -1, 17, 115, 32, 8 + LTEXT "Bytes:", -1, 17, 115, 32, 8 RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 ICON IDI_VERTICAL, -1, 110, 108, 18, 20 RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 diff --git a/reactos/dll/cpl/ncpa/lang/sv-SE.rc b/reactos/dll/cpl/ncpa/lang/sv-SE.rc index 7d4bbd7bd50..feed300c9db 100644 --- a/reactos/dll/cpl/ncpa/lang/sv-SE.rc +++ b/reactos/dll/cpl/ncpa/lang/sv-SE.rc @@ -48,7 +48,7 @@ BEGIN ICON IDI_NETSTAT, -1, 110, 85, 18, 20 ICON IDI_HORIZONTAL, -1, 130, 85, 18, 20 LTEXT "Mottaget", -1, 149, 90, 37, 8 - LTEXT "Paket:", -1, 17, 115, 32, 8 + LTEXT "Bytes:", -1, 17, 115, 32, 8 RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 ICON IDI_VERTICAL, -1, 110, 108, 18, 20 RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 diff --git a/reactos/dll/cpl/ncpa/lang/uk-UA.rc b/reactos/dll/cpl/ncpa/lang/uk-UA.rc index b75f021accf..c1af5fb375a 100644 --- a/reactos/dll/cpl/ncpa/lang/uk-UA.rc +++ b/reactos/dll/cpl/ncpa/lang/uk-UA.rc @@ -54,7 +54,7 @@ BEGIN ICON IDI_NETSTAT, -1, 110, 85, 18, 20 ICON IDI_HORIZONTAL, -1, 130, 85, 18, 20 LTEXT "", -1, 149, 90, 37, 8 - LTEXT ":", -1, 17, 115, 32, 8 + LTEXT "Bytes:", -1, 17, 115, 32, 8 RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 ICON IDI_VERTICAL, -1, 110, 108, 18, 20 RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 diff --git a/reactos/dll/cpl/ncpa/ncpa.c b/reactos/dll/cpl/ncpa/ncpa.c index d308fbe3ce8..8f1f0dc6a64 100644 --- a/reactos/dll/cpl/ncpa/ncpa.c +++ b/reactos/dll/cpl/ncpa/ncpa.c @@ -534,8 +534,9 @@ UpdateNICStatusData(HWND hwndDlg, PGLOBAL_NCPA_DATA pGlobalData) DWORD Mbps = 0; DWORD OperStatus = IF_OPER_STATUS_DISCONNECTED; PMIB_IFROW pIfRow = NULL; - TCHAR Buffer[256], LocBuffer[256]; + TCHAR Buffer[256], LocBuffer[256], szDecimalSep[3]; SYSTEMTIME TimeConnected; + NUMBERFMT fmt; memset(&TimeConnected, 0, sizeof(TimeConnected)); @@ -554,8 +555,8 @@ UpdateNICStatusData(HWND hwndDlg, PGLOBAL_NCPA_DATA pGlobalData) FILETIME SystemFileTime; ULARGE_INTEGER LargeSystemTime; - PktsOut = pIfRow->dwOutUcastPkts; - PktsIn = pIfRow->dwInUcastPkts; + PktsOut = pIfRow->dwOutOctets; + PktsIn = pIfRow->dwInOctets; Mbps = pIfRow->dwSpeed; OperStatus = pIfRow->dwOperStatus; @@ -575,12 +576,18 @@ UpdateNICStatusData(HWND hwndDlg, PGLOBAL_NCPA_DATA pGlobalData) } } + memset(&fmt, 0x0, sizeof(fmt)); + if (GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_STHOUSAND, szDecimalSep, sizeof(szDecimalSep) / sizeof(szDecimalSep[0]))) + fmt.lpThousandSep = szDecimalSep; + fmt.Grouping = 3; + fmt.lpDecimalSep = _T(""); + _stprintf(Buffer, L"%u", PktsOut); - GetNumberFormat(LOCALE_USER_DEFAULT, 0, Buffer, NULL, LocBuffer, sizeof(LocBuffer) / sizeof(LocBuffer[0])); + GetNumberFormat(LOCALE_USER_DEFAULT, 0, Buffer, &fmt, LocBuffer, sizeof(LocBuffer) / sizeof(LocBuffer[0])); SendDlgItemMessage(hwndDlg, IDC_SEND, WM_SETTEXT, 0, (LPARAM)LocBuffer); _stprintf(Buffer, L"%u", PktsIn); - GetNumberFormat(LOCALE_USER_DEFAULT, 0, Buffer, NULL, LocBuffer, sizeof(LocBuffer) / sizeof(LocBuffer[0])); + GetNumberFormat(LOCALE_USER_DEFAULT, 0, Buffer, &fmt, LocBuffer, sizeof(LocBuffer) / sizeof(LocBuffer[0])); SendDlgItemMessage(hwndDlg, IDC_RECEIVED, WM_SETTEXT, 0, (LPARAM)LocBuffer); switch (OperStatus) diff --git a/reactos/dll/cpl/ncpa/tcpip_properties.c b/reactos/dll/cpl/ncpa/tcpip_properties.c index be5d92a553f..03479333240 100644 --- a/reactos/dll/cpl/ncpa/tcpip_properties.c +++ b/reactos/dll/cpl/ncpa/tcpip_properties.c @@ -26,7 +26,7 @@ #include "resource.h" #include "ncpa.h" - +#define NDEBUG #include WINE_DEFAULT_DEBUG_CHANNEL(ncpa); @@ -163,7 +163,7 @@ ValidateAndStore(HWND Dlg, PTCPIP_PROPERTIES_DATA DlgData) DlgData->DhcpEnabled = (BST_CHECKED == IsDlgButtonChecked(Dlg, IDC_USEDHCP)); if (! DlgData->DhcpEnabled) { - DhcpReleaseIpAddressLease( DlgData->AdapterIndex ); +// DhcpReleaseIpAddressLease( DlgData->AdapterIndex ); if (4 != SendMessageW(GetDlgItem(Dlg, IDC_IPADDR), IPM_GETADDRESS, 0, (LPARAM) &IpAddress)) { @@ -185,8 +185,8 @@ ValidateAndStore(HWND Dlg, PTCPIP_PROPERTIES_DATA DlgData) } else { DlgData->Gateway = htonl(IpAddress); } - DhcpStaticRefreshParams - ( DlgData->AdapterIndex, DlgData->IpAddress, DlgData->SubnetMask ); +// DhcpStaticRefreshParams +// ( DlgData->AdapterIndex, DlgData->IpAddress, DlgData->SubnetMask ); RowToRem.dwForwardMask = 0; RowToRem.dwForwardMetric1 = 1; @@ -204,7 +204,7 @@ ValidateAndStore(HWND Dlg, PTCPIP_PROPERTIES_DATA DlgData) DlgData->IpAddress = INADDR_NONE; DlgData->SubnetMask = INADDR_NONE; DlgData->Gateway = INADDR_NONE; - DhcpLeaseIpAddress( DlgData->AdapterIndex ); +// DhcpLeaseIpAddress( DlgData->AdapterIndex ); } if (BST_CHECKED == IsDlgButtonChecked(Dlg, IDC_FIXEDDNS)) {