Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-08-12 14:16:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

- change statistics to display number of bytes received / send instead of number of packets

Browse source 
- dont show a decimal seperator

svn path=/trunk/; revision=32869
This commit is contained in:
Johannes Anderwald 2008-04-05 11:00:29 +00:00
parent 8ab61dee39
commit 76a59c8312
19 changed files with 34 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/dll/cpl/ncpa/lang/bg-BG.rc
View file

@ -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

2
reactos/dll/cpl/ncpa/lang/cs-CZ.rc
View file

@ -46,7 +46,7 @@ BEGIN
ICON IDI_NETSTAT, -1, 110, 85, 18, 20
ICON IDI_HORIZONTAL, -1, 130, 85, 18, 20
LTEXT "Pøijato", -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

2
reactos/dll/cpl/ncpa/lang/da-DK.rc
View file

@ -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 "Netværks 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

2
reactos/dll/cpl/ncpa/lang/de-DE.rc
View file

@ -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

2
reactos/dll/cpl/ncpa/lang/el-GR.rc
View file

@ -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

2
reactos/dll/cpl/ncpa/lang/en-US.rc
View file

@ -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

2
reactos/dll/cpl/ncpa/lang/fr-FR.rc
View file

@ -46,7 +46,7 @@ BEGIN
ICON IDI_NETSTAT, -1, 110, 85, 18, 20
ICON IDI_HORIZONTAL, -1, 130, 85, 18, 20
LTEXT "Reçus", -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

2
reactos/dll/cpl/ncpa/lang/hu-HU.rc
View file

@ -47,7 +47,7 @@ BEGIN
ICON IDI_NETSTAT, -1, 110, 85, 18, 20
ICON IDI_HORIZONTAL, -1, 130, 85, 18, 20
LTEXT "Beérkezett", -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

2
reactos/dll/cpl/ncpa/lang/id-ID.rc
View file

@ -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

2
reactos/dll/cpl/ncpa/lang/it-IT.rc
View file

@ -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

2
reactos/dll/cpl/ncpa/lang/ja-JP.rc
View file

@ -46,7 +46,7 @@ BEGIN
ICON IDI_NETSTAT, -1, 110, 85, 18, 20
ICON IDI_HORIZONTAL, -1, 130, 85, 18, 20
LTEXT "Žó<C5BD>M", -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

2
reactos/dll/cpl/ncpa/lang/nb-NO.rc
View file

@ -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

2
reactos/dll/cpl/ncpa/lang/nl-NL.rc
View file

@ -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

2
reactos/dll/cpl/ncpa/lang/pl-PL.rc
View file

@ -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 "Pakietów:", -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

2
reactos/dll/cpl/ncpa/lang/ru-RU.rc
View file

@ -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

2
reactos/dll/cpl/ncpa/lang/sv-SE.rc
View file

@ -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

2
reactos/dll/cpl/ncpa/lang/uk-UA.rc
View file

@ -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

17
reactos/dll/cpl/ncpa/ncpa.c
View file

@ -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)

10
reactos/dll/cpl/ncpa/tcpip_properties.c
View file

@ -26,7 +26,7 @@
#include "resource.h"
#include "ncpa.h"
#define NDEBUG
#include <wine/debug.h>
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)) {