Ros-diffs April 2019

ros-diffs@reactos.org

32 participants
240 discussions

[reactos] 01/01: [NET][MC] Move the remaining STATISTICS and USER strings from net.exe to netmsg.dll.

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5563525ad440f4f43db04… commit 5563525ad440f4f43db04de538d808bf731b1360 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Apr 7 09:21:34 2019 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Apr 7 09:23:01 2019 +0200 [NET][MC] Move the remaining STATISTICS and USER strings from net.exe to netmsg.dll. Translators, please check the translations! --- base/applications/network/net/cmdStatistics.c | 53 ++++++----- base/applications/network/net/cmdUser.c | 9 +- base/applications/network/net/lang/en-US.rc | 27 ------ base/applications/network/net/lang/es-ES.rc | 27 ------ base/applications/network/net/lang/pl-PL.rc | 27 ------ base/applications/network/net/lang/ro-RO.rc | 27 ------ base/applications/network/net/lang/ru-RU.rc | 27 ------ base/applications/network/net/lang/tr-TR.rc | 27 ------ base/applications/network/net/lang/zh-CN.rc | 27 ------ base/applications/network/net/lang/zh-TW.rc | 27 ------ base/applications/network/net/resource.h | 26 ------ sdk/include/reactos/mc/netmsgmsg.mc | 124 +++++++++++++------------- 12 files changed, 96 insertions(+), 332 deletions(-) diff --git a/base/applications/network/net/cmdStatistics.c b/base/applications/network/net/cmdStatistics.c index 799f712bf8..8d4f68db86 100644 --- a/base/applications/network/net/cmdStatistics.c +++ b/base/applications/network/net/cmdStatistics.c @@ -149,7 +149,8 @@ DisplayWorkstationStatistics(VOID) if (Status != NERR_Success) goto done; - ConResPrintf(StdOut, IDS_STATISTICS_WKS_NAME, WorkstationInfo->wki100_computername); + PrintMessageStringV(4623, WorkstationInfo->wki100_computername); + ConPrintf(StdOut, L"\n\n"); RtlSecondsSince1970ToTime(StatisticsInfo->StatisticsStartTime.u.LowPart, &LargeValue); @@ -168,66 +169,68 @@ DisplayWorkstationStatistics(VOID) wHour = wHour - 12; } - ConResPrintf(StdOut, IDS_STATISTICS_SINCE, - SystemTime.wMonth, SystemTime.wDay, SystemTime.wYear, - wHour, SystemTime.wMinute, (SystemTime.wHour >= 1 && SystemTime.wHour < 13) ? L"AM" : L"PM"); + PrintMessageString(4600); + ConPrintf(StdOut, L" %d/%d/%d %d:%02d %s\n\n\n", + SystemTime.wMonth, SystemTime.wDay, SystemTime.wYear, + wHour, SystemTime.wMinute, + (SystemTime.wHour >= 1 && SystemTime.wHour < 13) ? L"AM" : L"PM"); - PrintPaddedResourceString(IDS_STATISTICS_WKS_BYTESRCVD, nPaddedLength); + PrintPaddedMessageString(4630, nPaddedLength); ConPrintf(StdOut, L"%I64u\n", StatisticsInfo->BytesReceived.QuadPart); - PrintPaddedResourceString(IDS_STATISTICS_WKS_SMBSRCVD, nPaddedLength); + PrintPaddedMessageString(4631, nPaddedLength); ConPrintf(StdOut, L"%I64u\n", StatisticsInfo->SmbsReceived.QuadPart); - PrintPaddedResourceString(IDS_STATISTICS_WKS_BYTESTRANS, nPaddedLength); + PrintPaddedMessageString(4632, nPaddedLength); ConPrintf(StdOut, L"%I64u\n", StatisticsInfo->BytesTransmitted.QuadPart); - PrintPaddedResourceString(IDS_STATISTICS_WKS_SMBSTRANS, nPaddedLength); + PrintPaddedMessageString(4633, nPaddedLength); ConPrintf(StdOut, L"%I64u\n", StatisticsInfo->SmbsTransmitted.QuadPart); - PrintPaddedResourceString(IDS_STATISTICS_WKS_READOPS, nPaddedLength); + PrintPaddedMessageString(4634, nPaddedLength); ConPrintf(StdOut, L"%lu\n", StatisticsInfo->ReadOperations); - PrintPaddedResourceString(IDS_STATISTICS_WKS_WRITEOPS, nPaddedLength); + PrintPaddedMessageString(4635, nPaddedLength); ConPrintf(StdOut, L"%lu\n", StatisticsInfo->WriteOperations); - PrintPaddedResourceString(IDS_STATISTICS_WKS_READDENIED, nPaddedLength); + PrintPaddedMessageString(4636, nPaddedLength); ConPrintf(StdOut, L"%lu\n", StatisticsInfo->RawReadsDenied); - PrintPaddedResourceString(IDS_STATISTICS_WKS_WRITEDENIED, nPaddedLength); + PrintPaddedMessageString(4637, nPaddedLength); ConPrintf(StdOut, L"%lu\n\n", StatisticsInfo->RawWritesDenied); - PrintPaddedResourceString(IDS_STATISTICS_WKS_NETWORKERROR, nPaddedLength); + PrintPaddedMessageString(4638, nPaddedLength); ConPrintf(StdOut, L"%lu\n", StatisticsInfo->NetworkErrors); - PrintPaddedResourceString(IDS_STATISTICS_WKS_CONNECTS, nPaddedLength); + PrintPaddedMessageString(4639, nPaddedLength); ConPrintf(StdOut, L"%lu\n", StatisticsInfo->CoreConnects + StatisticsInfo->Lanman20Connects + StatisticsInfo->Lanman21Connects + StatisticsInfo->LanmanNtConnects); - PrintPaddedResourceString(IDS_STATISTICS_WKS_RECONNECTS, nPaddedLength); + PrintPaddedMessageString(4640, nPaddedLength); ConPrintf(StdOut, L"%lu\n", StatisticsInfo->Reconnects); - PrintPaddedResourceString(IDS_STATISTICS_WKS_DISCONNECTS, nPaddedLength); + PrintPaddedMessageString(4641, nPaddedLength); ConPrintf(StdOut, L"%lu\n\n", StatisticsInfo->ServerDisconnects); - PrintPaddedResourceString(IDS_STATISTICS_WKS_SESSIONS, nPaddedLength); + PrintPaddedMessageString(4642, nPaddedLength); ConPrintf(StdOut, L"%lu\n", StatisticsInfo->Sessions); - PrintPaddedResourceString(IDS_STATISTICS_WKS_HUNGSESSIONS, nPaddedLength); + PrintPaddedMessageString(4643, nPaddedLength); ConPrintf(StdOut, L"%lu\n", StatisticsInfo->HungSessions); - PrintPaddedResourceString(IDS_STATISTICS_WKS_FAILSESSIONS, nPaddedLength); + PrintPaddedMessageString(4644, nPaddedLength); ConPrintf(StdOut, L"%lu\n", StatisticsInfo->FailedSessions); - PrintPaddedResourceString(IDS_STATISTICS_WKS_FAILEDOPS, nPaddedLength); + PrintPaddedMessageString(4645, nPaddedLength); ConPrintf(StdOut, L"%lu\n", StatisticsInfo->InitiallyFailedOperations + StatisticsInfo->FailedCompletionOperations); - PrintPaddedResourceString(IDS_STATISTICS_WKS_USECOUNT, nPaddedLength); + PrintPaddedMessageString(4646, nPaddedLength); ConPrintf(StdOut, L"%lu\n", StatisticsInfo->UseCount); - PrintPaddedResourceString(IDS_STATISTICS_WKS_FAILUSECOUNT, nPaddedLength); + PrintPaddedMessageString(4647, nPaddedLength); ConPrintf(StdOut, L"%lu\n\n", StatisticsInfo->FailedUseCount); done: @@ -294,7 +297,11 @@ cmdStatistics( } else { - ConResPuts(StdOut, IDS_STATISTICS_TEXT); + PrintMessageString(4379); + ConPuts(StdOut, L"\n"); + ConPuts(StdOut, L" Server\n"); + ConPuts(StdOut, L" Workstation\n"); + ConPuts(StdOut, L"\n"); } if (result == 0) diff --git a/base/applications/network/net/cmdUser.c b/base/applications/network/net/cmdUser.c index 517e2c028b..1adce8858c 100644 --- a/base/applications/network/net/cmdUser.c +++ b/base/applications/network/net/cmdUser.c @@ -394,11 +394,11 @@ ReadPassword( while (TRUE) { - ConResPuts(StdOut, IDS_USER_ENTER_PASSWORD1); + PrintMessageString(4358); ReadFromConsole(szPassword1, PWLEN + 1, FALSE); ConPuts(StdOut, L"\n"); - ConResPuts(StdOut, IDS_USER_ENTER_PASSWORD2); + PrintMessageString(4361); ReadFromConsole(szPassword2, PWLEN + 1, FALSE); ConPuts(StdOut, L"\n"); @@ -419,8 +419,7 @@ ReadPassword( else { ConPuts(StdOut, L"\n"); - ConResPuts(StdOut, IDS_USER_NO_PASSWORD_MATCH); - ConPuts(StdOut, L"\n"); + PrintMessageString(3728); *lpPassword = NULL; } } @@ -973,7 +972,7 @@ cmdUser( lpPassword != NULL && bRandomPassword == TRUE) { - ConPrintf(StdOut, L"The password for %s is: %s\n", lpUserName, lpPassword); + PrintMessageStringV(3968, lpUserName, lpPassword); } done: diff --git a/base/applications/network/net/lang/en-US.rc b/base/applications/network/net/lang/en-US.rc index 1bd152049d..4473e7c4cc 100644 --- a/base/applications/network/net/lang/en-US.rc +++ b/base/applications/network/net/lang/en-US.rc @@ -9,33 +9,6 @@ BEGIN IDS_ACCOUNTS_STANDALONE_SERVER "Standalone server" IDS_ACCOUNTS_WORKSTATION "Workstation" - IDS_STATISTICS_TEXT "Statistics are available for the following services:\n\n\ - Server\n Workstation\n\n" - IDS_STATISTICS_SINCE "Statistics since %d/%d/%d %d:%02d %s\n\n\n" - IDS_STATISTICS_WKS_NAME "Workstation statistics for \\\\%s\n\n\n" - IDS_STATISTICS_WKS_BYTESRCVD "Bytes received" - IDS_STATISTICS_WKS_SMBSRCVD "Server Message Blocks (SMBs) received" - IDS_STATISTICS_WKS_BYTESTRANS "Bytes transmitted" - IDS_STATISTICS_WKS_SMBSTRANS "Server Message Blocks (SMBs) transmitted" - IDS_STATISTICS_WKS_READOPS "Read operations" - IDS_STATISTICS_WKS_WRITEOPS "Write operations" - IDS_STATISTICS_WKS_READDENIED "Raw reads denied" - IDS_STATISTICS_WKS_WRITEDENIED "Raw writes denied" - IDS_STATISTICS_WKS_NETWORKERROR "Network errors" - IDS_STATISTICS_WKS_CONNECTS "Connections made" - IDS_STATISTICS_WKS_RECONNECTS "Reconnections made" - IDS_STATISTICS_WKS_DISCONNECTS "Server disconnects" - IDS_STATISTICS_WKS_SESSIONS "Sessions started" - IDS_STATISTICS_WKS_HUNGSESSIONS "Hung sessions" - IDS_STATISTICS_WKS_FAILSESSIONS "Failed sessions" - IDS_STATISTICS_WKS_FAILEDOPS "Failed operations" - IDS_STATISTICS_WKS_USECOUNT "Use count" - IDS_STATISTICS_WKS_FAILUSECOUNT "Failed use count" - - IDS_USER_ENTER_PASSWORD1 "Enter a new password for the user: " - IDS_USER_ENTER_PASSWORD2 "Enter the password again: " - IDS_USER_NO_PASSWORD_MATCH "The passwords do not match!" - IDS_USE_NOW_CONNECTED "%s is now connected to %s\n" IDS_GENERIC_YES "Yes" diff --git a/base/applications/network/net/lang/es-ES.rc b/base/applications/network/net/lang/es-ES.rc index 82db3f6566..2f9b8335bf 100644 --- a/base/applications/network/net/lang/es-ES.rc +++ b/base/applications/network/net/lang/es-ES.rc @@ -12,33 +12,6 @@ BEGIN IDS_ACCOUNTS_STANDALONE_SERVER "Servidor independiente" IDS_ACCOUNTS_WORKSTATION "Estación de trabajo" - IDS_STATISTICS_TEXT "Statistics are available for the following services:\n\n\ - Server\n Workstation\n\n" - IDS_STATISTICS_SINCE "Statistics since %d/%d/%d %d:%02d %s\n\n\n" - IDS_STATISTICS_WKS_NAME "Workstation statistics for \\\\%s\n\n\n" - IDS_STATISTICS_WKS_BYTESRCVD "Bytes received" - IDS_STATISTICS_WKS_SMBSRCVD "Server Message Blocks (SMBs) received" - IDS_STATISTICS_WKS_BYTESTRANS "Bytes transmitted" - IDS_STATISTICS_WKS_SMBSTRANS "Server Message Blocks (SMBs) transmitted" - IDS_STATISTICS_WKS_READOPS "Read operations" - IDS_STATISTICS_WKS_WRITEOPS "Write operations" - IDS_STATISTICS_WKS_READDENIED "Raw reads denied" - IDS_STATISTICS_WKS_WRITEDENIED "Raw writes denied" - IDS_STATISTICS_WKS_NETWORKERROR "Network errors" - IDS_STATISTICS_WKS_CONNECTS "Connections made" - IDS_STATISTICS_WKS_RECONNECTS "Reconnections made" - IDS_STATISTICS_WKS_DISCONNECTS "Server disconnects" - IDS_STATISTICS_WKS_SESSIONS "Sessions started" - IDS_STATISTICS_WKS_HUNGSESSIONS "Hung sessions" - IDS_STATISTICS_WKS_FAILSESSIONS "Failed sessions" - IDS_STATISTICS_WKS_FAILEDOPS "Failed operations" - IDS_STATISTICS_WKS_USECOUNT "Use count" - IDS_STATISTICS_WKS_FAILUSECOUNT "Failed use count" - - IDS_USER_ENTER_PASSWORD1 "Escriba una contraseña: " - IDS_USER_ENTER_PASSWORD2 "Vuelva a escribir la contraseña: " - IDS_USER_NO_PASSWORD_MATCH "Las contraseñas no coinciden." - IDS_USE_NOW_CONNECTED "%s is now connected to %s\n" IDS_GENERIC_YES "Sí" diff --git a/base/applications/network/net/lang/pl-PL.rc b/base/applications/network/net/lang/pl-PL.rc index 6f3d50767a..54ed876756 100644 --- a/base/applications/network/net/lang/pl-PL.rc +++ b/base/applications/network/net/lang/pl-PL.rc @@ -8,33 +8,6 @@ BEGIN IDS_ACCOUNTS_STANDALONE_SERVER "Serwer autonomiczny" IDS_ACCOUNTS_WORKSTATION "Stacja robocza" - IDS_STATISTICS_TEXT "Dostępne są statystyki dla następujących uruchomionych obecnie usług:\n\n\ - Serwer\n Stacja robocza\n\n" - IDS_STATISTICS_SINCE "Statystyka od %d/%d/%d %d:%02d %s\n\n\n" - IDS_STATISTICS_WKS_NAME "Statystyka stacji roboczej dla \\\\%s\n\n\n" - IDS_STATISTICS_WKS_BYTESRCVD "Bajty odebrane" - IDS_STATISTICS_WKS_SMBSRCVD "Odebrane bloki komunikatów serwera (SMB)" - IDS_STATISTICS_WKS_BYTESTRANS "Bajty przesłane" - IDS_STATISTICS_WKS_SMBSTRANS "Przesłane bloki komunikatów serwera (SMB)" - IDS_STATISTICS_WKS_READOPS "Operacje odczytu" - IDS_STATISTICS_WKS_WRITEOPS "Operacje zapisu" - IDS_STATISTICS_WKS_READDENIED "Odrzucone operacje odczytu bez przetwarzania" - IDS_STATISTICS_WKS_WRITEDENIED "Odrzucone operacje zapisu bez przetwarzania" - IDS_STATISTICS_WKS_NETWORKERROR "Błędy sieciowe" - IDS_STATISTICS_WKS_CONNECTS "Wykonane połączenia" - IDS_STATISTICS_WKS_RECONNECTS "Ponownie wykonane połączenia" - IDS_STATISTICS_WKS_DISCONNECTS "Rozłączenia serwera" - IDS_STATISTICS_WKS_SESSIONS "Sesje uruchomione" - IDS_STATISTICS_WKS_HUNGSESSIONS "Zawieszone sesje" - IDS_STATISTICS_WKS_FAILSESSIONS "Niepowodzenia sesji" - IDS_STATISTICS_WKS_FAILEDOPS "Niepowodzenia operacji" - IDS_STATISTICS_WKS_USECOUNT "Liczba pomyślnych prób użycia" - IDS_STATISTICS_WKS_FAILUSECOUNT "Liczba niepomyślnych prób użycia" - - IDS_USER_ENTER_PASSWORD1 "Wpisz nowe hasło dla użytkownika: " - IDS_USER_ENTER_PASSWORD2 "Wpisz hasło ponownie w celu potwierdzenia: " - IDS_USER_NO_PASSWORD_MATCH "Hasła są niezgodne!" - IDS_USE_NOW_CONNECTED "%s jest obecnie podłączony do %s\n" IDS_GENERIC_YES "Tak" diff --git a/base/applications/network/net/lang/ro-RO.rc b/base/applications/network/net/lang/ro-RO.rc index 05c16d70e5..4623835a55 100644 --- a/base/applications/network/net/lang/ro-RO.rc +++ b/base/applications/network/net/lang/ro-RO.rc @@ -15,33 +15,6 @@ BEGIN IDS_ACCOUNTS_STANDALONE_SERVER "Server de sine stătător" IDS_ACCOUNTS_WORKSTATION "Stație de lucru" - IDS_STATISTICS_TEXT "Statistici disponibile pentru următoarele servicii:\n\n\ - Server\n Stație de lucru\n\n" - IDS_STATISTICS_SINCE "Statistici începând din %d/%d/%d %d:%02d %s\n\n\n" - IDS_STATISTICS_WKS_NAME "Statistici pentru stația de lucru \\\\%s\n\n\n" - IDS_STATISTICS_WKS_BYTESRCVD "Octeți receptați" - IDS_STATISTICS_WKS_SMBSRCVD "Blocuri Mesaje de Server (SMB) receptate" - IDS_STATISTICS_WKS_BYTESTRANS "Octeți transmiși" - IDS_STATISTICS_WKS_SMBSTRANS "Blocuri Mesaje de Server (SMB) transmise" - IDS_STATISTICS_WKS_READOPS "Operații de citire" - IDS_STATISTICS_WKS_WRITEOPS "Operații de scriere" - IDS_STATISTICS_WKS_READDENIED "Citiri brute respinse" - IDS_STATISTICS_WKS_WRITEDENIED "Scrieri brute respinse" - IDS_STATISTICS_WKS_NETWORKERROR "Erori de rețea" - IDS_STATISTICS_WKS_CONNECTS "Conexiuni realizate" - IDS_STATISTICS_WKS_RECONNECTS "Reconectări realizate" - IDS_STATISTICS_WKS_DISCONNECTS "Deconectări de server" - IDS_STATISTICS_WKS_SESSIONS "Sesiuni pornite" - IDS_STATISTICS_WKS_HUNGSESSIONS "Sesiuni suspendate" - IDS_STATISTICS_WKS_FAILSESSIONS "Sesiuni eșuate" - IDS_STATISTICS_WKS_FAILEDOPS "Operații eșuate" - IDS_STATISTICS_WKS_USECOUNT "Număr de utilizări" - IDS_STATISTICS_WKS_FAILUSECOUNT "Utilizări eșuate" - - IDS_USER_ENTER_PASSWORD1 "Introduceți o parolă nouă pentru utilizatorul (curent): " - IDS_USER_ENTER_PASSWORD2 "Introduceți din nou parola: " - IDS_USER_NO_PASSWORD_MATCH "Parolele diferă!" - IDS_USE_NOW_CONNECTED "Conectarea %s la %s a fost realizată.\n" IDS_GENERIC_YES "Da" diff --git a/base/applications/network/net/lang/ru-RU.rc b/base/applications/network/net/lang/ru-RU.rc index a419f08957..6b43a7f1d7 100644 --- a/base/applications/network/net/lang/ru-RU.rc +++ b/base/applications/network/net/lang/ru-RU.rc @@ -11,33 +11,6 @@ BEGIN IDS_ACCOUNTS_STANDALONE_SERVER "Автономный сервер" IDS_ACCOUNTS_WORKSTATION "Рабочая станция" - IDS_STATISTICS_TEXT "Статистика доступна для следующих выполняющихся служб:\n\n\ - Сервер\n Рабочая станция\n\n" - IDS_STATISTICS_SINCE "Статистика после %d/%d/%d %d:%02d %s\n\n\n" - IDS_STATISTICS_WKS_NAME "Статистика рабочей станции для \\\\%s\n\n\n" - IDS_STATISTICS_WKS_BYTESRCVD "Получено байт" - IDS_STATISTICS_WKS_SMBSRCVD "Принятые блоки сообщений сервера SMB" - IDS_STATISTICS_WKS_BYTESTRANS "Передано байт" - IDS_STATISTICS_WKS_SMBSTRANS "Переданные блоки сообщений сервера SMB" - IDS_STATISTICS_WKS_READOPS "Операции чтения" - IDS_STATISTICS_WKS_WRITEOPS "Операции записи" - IDS_STATISTICS_WKS_READDENIED "Отказано в чтении" - IDS_STATISTICS_WKS_WRITEDENIED "Отказано в записи" - IDS_STATISTICS_WKS_NETWORKERROR "Ошибки сети" - IDS_STATISTICS_WKS_CONNECTS "Выполненные подключения" - IDS_STATISTICS_WKS_RECONNECTS "Повторные подключения" - IDS_STATISTICS_WKS_DISCONNECTS "Отключений от сервера" - IDS_STATISTICS_WKS_SESSIONS "Запущенные сеансы" - IDS_STATISTICS_WKS_HUNGSESSIONS "Зависание сеансов" - IDS_STATISTICS_WKS_FAILSESSIONS "Сбои в сеансах" - IDS_STATISTICS_WKS_FAILEDOPS "Сбои в операциях" - IDS_STATISTICS_WKS_USECOUNT "Счетчик использования" - IDS_STATISTICS_WKS_FAILUSECOUNT "Счетчик сбоев при использовании" - - IDS_USER_ENTER_PASSWORD1 "Введите пароль для пользователя: " - IDS_USER_ENTER_PASSWORD2 "Повторите ввод пароля для подтверждения: " - IDS_USER_NO_PASSWORD_MATCH "Пароли не совпадают!" - IDS_USE_NOW_CONNECTED "%s сейчас подключен к %s\n" IDS_GENERIC_YES "Да" diff --git a/base/applications/network/net/lang/tr-TR.rc b/base/applications/network/net/lang/tr-TR.rc index 1894af28dc..c812bc2a4a 100644 --- a/base/applications/network/net/lang/tr-TR.rc +++ b/base/applications/network/net/lang/tr-TR.rc @@ -11,33 +11,6 @@ BEGIN IDS_ACCOUNTS_STANDALONE_SERVER "Bağımsız sunucu" IDS_ACCOUNTS_WORKSTATION "İş istasyonu" - IDS_STATISTICS_TEXT "Statistics are available for the following services:\n\n\ - Server\n Workstation\n\n" - IDS_STATISTICS_SINCE "Statistics since %d/%d/%d %d:%02d %s\n\n\n" - IDS_STATISTICS_WKS_NAME "Workstation statistics for \\\\%s\n\n\n" - IDS_STATISTICS_WKS_BYTESRCVD "Bytes received" - IDS_STATISTICS_WKS_SMBSRCVD "Server Message Blocks (SMBs) received" - IDS_STATISTICS_WKS_BYTESTRANS "Bytes transmitted" - IDS_STATISTICS_WKS_SMBSTRANS "Server Message Blocks (SMBs) transmitted" - IDS_STATISTICS_WKS_READOPS "Read operations" - IDS_STATISTICS_WKS_WRITEOPS "Write operations" - IDS_STATISTICS_WKS_READDENIED "Raw reads denied" - IDS_STATISTICS_WKS_WRITEDENIED "Raw writes denied" - IDS_STATISTICS_WKS_NETWORKERROR "Network errors" - IDS_STATISTICS_WKS_CONNECTS "Connections made" - IDS_STATISTICS_WKS_RECONNECTS "Reconnections made" - IDS_STATISTICS_WKS_DISCONNECTS "Server disconnects" - IDS_STATISTICS_WKS_SESSIONS "Sessions started" - IDS_STATISTICS_WKS_HUNGSESSIONS "Hung sessions" - IDS_STATISTICS_WKS_FAILSESSIONS "Failed sessions" - IDS_STATISTICS_WKS_FAILEDOPS "Failed operations" - IDS_STATISTICS_WKS_USECOUNT "Use count" - IDS_STATISTICS_WKS_FAILUSECOUNT "Failed use count" - - IDS_USER_ENTER_PASSWORD1 "Bu kullanıcı için yeni bir şifre giriniz: " - IDS_USER_ENTER_PASSWORD2 "Şifreyi yeniden giriniz: " - IDS_USER_NO_PASSWORD_MATCH "Şifreler uyuşmuyor!" - IDS_USE_NOW_CONNECTED "%s şuna bağlandı: %s\n" IDS_GENERIC_YES "Evet" diff --git a/base/applications/network/net/lang/zh-CN.rc b/base/applications/network/net/lang/zh-CN.rc index 576db43c22..4662ec29af 100644 --- a/base/applications/network/net/lang/zh-CN.rc +++ b/base/applications/network/net/lang/zh-CN.rc @@ -11,33 +11,6 @@ BEGIN IDS_ACCOUNTS_STANDALONE_SERVER "独立服务器" IDS_ACCOUNTS_WORKSTATION "工作站" - IDS_STATISTICS_TEXT "Statistics are available for the following services:\n\n\ - Server\n Workstation\n\n" - IDS_STATISTICS_SINCE "Statistics since %d/%d/%d %d:%02d %s\n\n\n" - IDS_STATISTICS_WKS_NAME "Workstation statistics for \\\\%s\n\n\n" - IDS_STATISTICS_WKS_BYTESRCVD "Bytes received" - IDS_STATISTICS_WKS_SMBSRCVD "Server Message Blocks (SMBs) received" - IDS_STATISTICS_WKS_BYTESTRANS "Bytes transmitted" - IDS_STATISTICS_WKS_SMBSTRANS "Server Message Blocks (SMBs) transmitted" - IDS_STATISTICS_WKS_READOPS "Read operations" - IDS_STATISTICS_WKS_WRITEOPS "Write operations" - IDS_STATISTICS_WKS_READDENIED "Raw reads denied" - IDS_STATISTICS_WKS_WRITEDENIED "Raw writes denied" - IDS_STATISTICS_WKS_NETWORKERROR "Network errors" - IDS_STATISTICS_WKS_CONNECTS "Connections made" - IDS_STATISTICS_WKS_RECONNECTS "Reconnections made" - IDS_STATISTICS_WKS_DISCONNECTS "Server disconnects" - IDS_STATISTICS_WKS_SESSIONS "Sessions started" - IDS_STATISTICS_WKS_HUNGSESSIONS "Hung sessions" - IDS_STATISTICS_WKS_FAILSESSIONS "Failed sessions" - IDS_STATISTICS_WKS_FAILEDOPS "Failed operations" - IDS_STATISTICS_WKS_USECOUNT "Use count" - IDS_STATISTICS_WKS_FAILUSECOUNT "Failed use count" - - IDS_USER_ENTER_PASSWORD1 "为用户输入新的密码: " - IDS_USER_ENTER_PASSWORD2 "再次输入密码: " - IDS_USER_NO_PASSWORD_MATCH "密码不匹配！" - IDS_USE_NOW_CONNECTED "%s 现在连接到 %s\n" IDS_GENERIC_YES "是" diff --git a/base/applications/network/net/lang/zh-TW.rc b/base/applications/network/net/lang/zh-TW.rc index 5497281115..43fdc9dab6 100644 --- a/base/applications/network/net/lang/zh-TW.rc +++ b/base/applications/network/net/lang/zh-TW.rc @@ -11,33 +11,6 @@ BEGIN IDS_ACCOUNTS_STANDALONE_SERVER "獨立伺服器" IDS_ACCOUNTS_WORKSTATION "工作站" - IDS_STATISTICS_TEXT "Statistics are available for the following services:\n\n\ - Server\n Workstation\n\n" - IDS_STATISTICS_SINCE "Statistics since %d/%d/%d %d:%02d %s\n\n\n" - IDS_STATISTICS_WKS_NAME "Workstation statistics for \\\\%s\n\n\n" - IDS_STATISTICS_WKS_BYTESRCVD "Bytes received" - IDS_STATISTICS_WKS_SMBSRCVD "Server Message Blocks (SMBs) received" - IDS_STATISTICS_WKS_BYTESTRANS "Bytes transmitted" - IDS_STATISTICS_WKS_SMBSTRANS "Server Message Blocks (SMBs) transmitted" - IDS_STATISTICS_WKS_READOPS "Read operations" - IDS_STATISTICS_WKS_WRITEOPS "Write operations" - IDS_STATISTICS_WKS_READDENIED "Raw reads denied" - IDS_STATISTICS_WKS_WRITEDENIED "Raw writes denied" - IDS_STATISTICS_WKS_NETWORKERROR "Network errors" - IDS_STATISTICS_WKS_CONNECTS "Connections made" - IDS_STATISTICS_WKS_RECONNECTS "Reconnections made" - IDS_STATISTICS_WKS_DISCONNECTS "Server disconnects" - IDS_STATISTICS_WKS_SESSIONS "Sessions started" - IDS_STATISTICS_WKS_HUNGSESSIONS "Hung sessions" - IDS_STATISTICS_WKS_FAILSESSIONS "Failed sessions" - IDS_STATISTICS_WKS_FAILEDOPS "Failed operations" - IDS_STATISTICS_WKS_USECOUNT "Use count" - IDS_STATISTICS_WKS_FAILUSECOUNT "Failed use count" - - IDS_USER_ENTER_PASSWORD1 "為使用者輸入新的密碼: " - IDS_USER_ENTER_PASSWORD2 "再次輸入密碼: " - IDS_USER_NO_PASSWORD_MATCH "密碼不匹配!" - IDS_USE_NOW_CONNECTED "%s is now connected to %s\n" IDS_GENERIC_YES "是" diff --git a/base/applications/network/net/resource.h b/base/applications/network/net/resource.h index 4ce354511f..e1a58c8846 100644 --- a/base/applications/network/net/resource.h +++ b/base/applications/network/net/resource.h @@ -7,32 +7,6 @@ #define IDS_ACCOUNTS_STANDALONE_SERVER 212 #define IDS_ACCOUNTS_WORKSTATION 213 -#define IDS_STATISTICS_TEXT 320 -#define IDS_STATISTICS_SINCE 321 -#define IDS_STATISTICS_WKS_NAME 338 -#define IDS_STATISTICS_WKS_BYTESRCVD 339 -#define IDS_STATISTICS_WKS_SMBSRCVD 340 -#define IDS_STATISTICS_WKS_BYTESTRANS 341 -#define IDS_STATISTICS_WKS_SMBSTRANS 342 -#define IDS_STATISTICS_WKS_READOPS 343 -#define IDS_STATISTICS_WKS_WRITEOPS 344 -#define IDS_STATISTICS_WKS_READDENIED 345 -#define IDS_STATISTICS_WKS_WRITEDENIED 346 -#define IDS_STATISTICS_WKS_NETWORKERROR 347 -#define IDS_STATISTICS_WKS_CONNECTS 348 -#define IDS_STATISTICS_WKS_RECONNECTS 349 -#define IDS_STATISTICS_WKS_DISCONNECTS 350 -#define IDS_STATISTICS_WKS_SESSIONS 351 -#define IDS_STATISTICS_WKS_HUNGSESSIONS 352 -#define IDS_STATISTICS_WKS_FAILSESSIONS 353 -#define IDS_STATISTICS_WKS_FAILEDOPS 354 -#define IDS_STATISTICS_WKS_USECOUNT 355 -#define IDS_STATISTICS_WKS_FAILUSECOUNT 356 - -#define IDS_USER_ENTER_PASSWORD1 490 -#define IDS_USER_ENTER_PASSWORD2 491 -#define IDS_USER_NO_PASSWORD_MATCH 492 - #define IDS_USE_NOW_CONNECTED 500 #define IDS_GENERIC_YES 600 diff --git a/sdk/include/reactos/mc/netmsgmsg.mc b/sdk/include/reactos/mc/netmsgmsg.mc index 196478103d..9bb0ff92f8 100644 --- a/sdk/include/reactos/mc/netmsgmsg.mc +++ b/sdk/include/reactos/mc/netmsgmsg.mc @@ -17970,25 +17970,25 @@ Language=English The passwords do not match. . Language=Polish -The passwords do not match. +Hasła są niezgodne. . Language=Romanian -The passwords do not match. +Parolele diferă. . Language=Russian -The passwords do not match. +Пароли не совпадают. . Language=Spanish -The passwords do not match. +Las contraseñas no coinciden. . Language=Turkish -The passwords do not match. +Şifreler uyuşmuyor. . Language=Chinese -The passwords do not match. +密码不匹配！. . Language=Taiwanese -The passwords do not match. +密碼不匹配. . MessageId=3729 @@ -20767,7 +20767,7 @@ NetWare compatible logon ; -; apperr2.h (non-public) message difinitions (4300 - 5299 APPERR2_BASE) +; apperr2.h (non-public) message definitions (4300 - 5299 APPERR2_BASE) ; MessageId=4300 @@ -27174,13 +27174,13 @@ Language=English Bytes received%0 . Language=Polish -Bytes received%0 +Bajty odebrane%0 . Language=Romanian -Bytes received%0 +Octeți receptați%0 . Language=Russian -Bytes received%0 +Получено байт%0 . Language=Spanish Bytes received%0 @@ -27203,13 +27203,13 @@ Language=English Server Message Blocks (SMBs) received%0 . Language=Polish -Server Message Blocks (SMBs) received%0 +Odebrane bloki komunikatów serwera (SMB)%0 . Language=Romanian -Server Message Blocks (SMBs) received%0 +Blocuri Mesaje de Server (SMB) receptate%0 . Language=Russian -Server Message Blocks (SMBs) received%0 +Принятые блоки сообщений сервера SMB%0 . Language=Spanish Server Message Blocks (SMBs) received%0 @@ -27232,13 +27232,13 @@ Language=English Bytes transmitted%0 . Language=Polish -Bytes transmitted%0 +Bajty przesłane%0 . Language=Romanian -Bytes transmitted%0 +Octeți transmiși%0 . Language=Russian -Bytes transmitted%0 +Передано байт%0 . Language=Spanish Bytes transmitted%0 @@ -27261,13 +27261,13 @@ Language=English Server Message Blocks (SMBs) transmitted%0 . Language=Polish -Server Message Blocks (SMBs) transmitted%0 +Przesłane bloki komunikatów serwera (SMB)%0 . Language=Romanian -Server Message Blocks (SMBs) transmitted%0 +Blocuri Mesaje de Server (SMB) transmise%0 . Language=Russian -Server Message Blocks (SMBs) transmitted%0 +Переданные блоки сообщений сервера SMB%0 . Language=Spanish Server Message Blocks (SMBs) transmitted%0 @@ -27290,13 +27290,13 @@ Language=English Read operations%0 . Language=Polish -Read operations%0 +Operacje odczytu%0 . Language=Romanian -Read operations%0 +Operații de citire%0 . Language=Russian -Read operations%0 +Операции чтения%0 . Language=Spanish Read operations%0 @@ -27319,13 +27319,13 @@ Language=English Write operations%0 . Language=Polish -Write operations%0 +Operacje zapisu%0 . Language=Romanian -Write operations%0 +Operații de scriere%0 . Language=Russian -Write operations%0 +Операции записи%0 . Language=Spanish Write operations%0 @@ -27348,13 +27348,13 @@ Language=English Raw reads denied%0 . Language=Polish -Raw reads denied%0 +Odrzucone operacje odczytu bez przetwarzania%0 . Language=Romanian -Raw reads denied%0 +Citiri brute respinse%0 . Language=Russian -Raw reads denied%0 +Отказано в чтении%0 . Language=Spanish Raw reads denied%0 @@ -27377,13 +27377,13 @@ Language=English Raw writes denied%0 . Language=Polish -Raw writes denied%0 +Odrzucone operacje zapisu bez przetwarzania%0 . Language=Romanian -Raw writes denied%0 +Scrieri brute respinse%0 . Language=Russian -Raw writes denied%0 +Отказано в записи%0 . Language=Spanish Raw writes denied%0 @@ -27406,13 +27406,13 @@ Language=English Network errors%0 . Language=Polish -Network errors%0 +Błędy sieciowe%0 . Language=Romanian -Network errors%0 +Erori de rețea%0 . Language=Russian -Network errors%0 +Ошибки сети%0 . Language=Spanish Network errors%0 @@ -27435,13 +27435,13 @@ Language=English Connections made%0 . Language=Polish -Connections made%0 +Wykonane połączenia%0 . Language=Romanian -Connections made%0 +Conexiuni realizate%0 . Language=Russian -Connections made%0 +Выполненные подключения%0 . Language=Spanish Connections made%0 @@ -27464,13 +27464,13 @@ Language=English Reconnections made%0 . Language=Polish -Reconnections made%0 +Ponownie wykonane połączenia%0 . Language=Romanian -Reconnections made%0 +Reconectări realizate%0 . Language=Russian -Reconnections made%0 +Повторные подключения%0 . Language=Spanish Reconnections made%0 @@ -27493,13 +27493,13 @@ Language=English Server disconnects%0 . Language=Polish -Server disconnects%0 +Rozłączenia serwera%0 . Language=Romanian -Server disconnects%0 +Deconectări de server%0 . Language=Russian -Server disconnects%0 +Отключений от сервера%0 . Language=Spanish Server disconnects%0 @@ -27522,13 +27522,13 @@ Language=English Sessions started%0 . Language=Polish -Sessions started%0 +Sesje uruchomione%0 . Language=Romanian -Sessions started%0 +Sesiuni pornite%0 . Language=Russian -Sessions started%0 +Запущенные сеансы%0 . Language=Spanish Sessions started%0 @@ -27551,13 +27551,13 @@ Language=English Hung sessions%0 . Language=Polish -Hung sessions%0 +Zawieszone sesje%0 . Language=Romanian -Hung sessions%0 +Sesiuni suspendate%0 . Language=Russian -Hung sessions%0 +Зависание сеансов%0 . Language=Spanish Hung sessions%0 @@ -27580,13 +27580,13 @@ Language=English Failed sessions%0 . Language=Polish -Failed sessions%0 +Niepowodzenia sesji%0 . Language=Romanian -Failed sessions%0 +Sesiuni eșuate%0 . Language=Russian -Failed sessions%0 +Сбои в сеансах%0 . Language=Spanish Failed sessions%0 @@ -27609,13 +27609,13 @@ Language=English Failed operations%0 . Language=Polish -Failed operations%0 +Niepowodzenia operacji%0 . Language=Romanian -Failed operations%0 +Operații eșuate%0 . Language=Russian -Failed operations%0 +Сбои в операциях%0 . Language=Spanish Failed operations%0 @@ -27638,13 +27638,13 @@ Language=English Use count%0 . Language=Polish -Use count%0 +Liczba pomyślnych prób użycia%0 . Language=Romanian -Use count%0 +Număr de utilizări%0 . Language=Russian -Use count%0 +Счетчик использования%0 . Language=Spanish Use count%0 @@ -27667,13 +27667,13 @@ Language=English Failed use count%0 . Language=Polish -Failed use count%0 +Liczba niepomyślnych prób użycia%0 . Language=Romanian -Failed use count%0 +Utilizări eșuate%0 . Language=Russian -Failed use count%0 +Счетчик сбоев при использовании%0 . Language=Spanish Failed use count%0

5 years, 8 months

[reactos] 01/01: [KERNEL32_APITEST] JapaneseCalendar must work even if not codepage 932"

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=72990b29c5f0a8cbad33f… commit 72990b29c5f0a8cbad33f9048b97b9a81547851e Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Apr 7 12:18:54 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sun Apr 7 12:18:54 2019 +0900 [KERNEL32_APITEST] JapaneseCalendar must work even if not codepage 932" Delete (GetACP() != 932) check. --- modules/rostests/apitests/kernel32/JapaneseCalendar.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/modules/rostests/apitests/kernel32/JapaneseCalendar.c b/modules/rostests/apitests/kernel32/JapaneseCalendar.c index e01a369f02..b3f551659c 100644 --- a/modules/rostests/apitests/kernel32/JapaneseCalendar.c +++ b/modules/rostests/apitests/kernel32/JapaneseCalendar.c @@ -44,12 +44,6 @@ START_TEST(JapaneseCalendar) trace("lcid: 0x%08lX\n", lcid); trace("langid: 0x%04lX\n", langid); - if (GetACP() != 932) - { - skip("Codepage is not Japanese.\n"); - return; - } - ZeroMemory(&st, sizeof(st)); st.wYear = 2019; st.wMonth = 4;

5 years, 8 months

[reactos] 01/01: [FONT] Fix FontSmoothing

by Maxim Smirnov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ffb4b674c7aba694d6657… commit ffb4b674c7aba694d6657948fdc5f99a6ec2f474 Author: Maxim Smirnov <Maxim.like.python(a)ya.ru> AuthorDate: Fri Apr 5 13:16:07 2019 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Apr 7 01:42:29 2019 +0200 [FONT] Fix FontSmoothing --- boot/bootdata/hivedef.inf | 2 +- win32ss/gdi/ntgdi/freetype.c | 8 ++++++-- win32ss/user/ntuser/sysparams.c | 19 +++++++++++++------ 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/boot/bootdata/hivedef.inf b/boot/bootdata/hivedef.inf index d7e561f766..f03cbc532d 100644 --- a/boot/bootdata/hivedef.inf +++ b/boot/bootdata/hivedef.inf @@ -67,7 +67,7 @@ HKCU,"Control Panel\Desktop","Pattern",2,"(None)" HKCU,"Control Panel\Desktop","Wallpaper",0x00000002,"" HKCU,"Control Panel\Desktop","TileWallpaper",2,"0" HKCU,"Control Panel\Desktop","WallpaperStyle",2,"2" -HKCU,"Control Panel\Desktop","FontSmoothing",2,"1" +HKCU,"Control Panel\Desktop","FontSmoothing",2,"0" HKCU,"Control Panel\Desktop","FontSmoothingOrientation",0x00010003,0x00000001 HKCU,"Control Panel\Desktop","FontSmoothingType",0x00010003,0x00000001 HKCU,"Control Panel\Desktop","ForegroundFlashCount",0x00010003,0x00000003 diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index 7e5307a716..a5f93e92c8 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -1661,8 +1661,12 @@ IntGetFontRenderMode(LOGFONTW *logfont) return FT_RENDER_MODE_MONO; case DRAFT_QUALITY: return FT_RENDER_MODE_LIGHT; - /* case CLEARTYPE_QUALITY: - return FT_RENDER_MODE_LCD; */ + case CLEARTYPE_QUALITY: + if (!gspv.bFontSmoothing) + break; + if (!gspv.uiFontSmoothingType) + break; + return FT_RENDER_MODE_LCD; } return FT_RENDER_MODE_NORMAL; } diff --git a/win32ss/user/ntuser/sysparams.c b/win32ss/user/ntuser/sysparams.c index 0fede4ceec..a325dcc672 100644 --- a/win32ss/user/ntuser/sysparams.c +++ b/win32ss/user/ntuser/sysparams.c @@ -65,7 +65,10 @@ static const WCHAR* VAL_GRID = L"GridGranularity"; static const WCHAR* VAL_DRAG = L"DragFullWindows"; static const WCHAR* VAL_DRAGHEIGHT = L"DragHeight"; static const WCHAR* VAL_DRAGWIDTH = L"DragWidth"; -static const WCHAR* VAL_FNTSMOOTH = L"FontSmoothing"; +static const WCHAR* VAL_FONTSMOOTHING = L"FontSmoothing"; +static const WCHAR* VAL_FONTSMOOTHINGTYPE = L"FontSmoothingType"; +static const WCHAR* VAL_FONTSMOOTHINGCONTRAST = L"FontSmoothingGamma"; +static const WCHAR* VAL_FONTSMOOTHINGORIENTATION = L"FontSmoothingOrientation"; static const WCHAR* VAL_SCRLLLINES = L"WheelScrollLines"; static const WCHAR* VAL_CLICKLOCKTIME = L"ClickLockTime"; static const WCHAR* VAL_PAINTDESKVER = L"PaintDesktopVersion"; @@ -284,6 +287,10 @@ SpiUpdatePerUserSystemParameters(VOID) gspv.dwUserPrefMask = SpiLoadUserPrefMask(UPM_DEFAULT); gspv.bMouseClickLock = (gspv.dwUserPrefMask & UPM_CLICKLOCK) != 0; gspv.bMouseCursorShadow = (gspv.dwUserPrefMask & UPM_CURSORSHADOW) != 0; + gspv.bFontSmoothing = SpiLoadInt(KEY_DESKTOP, VAL_FONTSMOOTHING, 0) == 2; + gspv.uiFontSmoothingType = SpiLoadDWord(KEY_DESKTOP, VAL_FONTSMOOTHINGTYPE, 1); + gspv.uiFontSmoothingContrast = SpiLoadDWord(KEY_DESKTOP, VAL_FONTSMOOTHINGCONTRAST, 1400); + gspv.uiFontSmoothingOrientation = SpiLoadDWord(KEY_DESKTOP, VAL_FONTSMOOTHINGORIENTATION, 1); #if (_WIN32_WINNT >= 0x0600) gspv.uiWheelScrollChars = SpiLoadInt(KEY_DESKTOP, VAL_SCRLLCHARS, 3); #endif @@ -1369,10 +1376,10 @@ SpiGetSet(UINT uiAction, UINT uiParam, PVOID pvParam, FLONG fl) return SpiGetInt(pvParam, &gspv.bFontSmoothing, fl); case SPI_SETFONTSMOOTHING: - gspv.bFontSmoothing = uiParam ? TRUE : FALSE; + gspv.bFontSmoothing = (uiParam == 2); if (fl & SPIF_UPDATEINIFILE) { - SpiStoreSzInt(KEY_DESKTOP, VAL_FNTSMOOTH, uiParam ? 2 : 0); + SpiStoreSz(KEY_DESKTOP, VAL_FONTSMOOTHING, (uiParam == 2) ? L"2" : L"0"); } return (UINT_PTR)KEY_DESKTOP; @@ -1721,13 +1728,13 @@ SpiGetSet(UINT uiAction, UINT uiParam, PVOID pvParam, FLONG fl) return SpiGetInt(pvParam, &gspv.uiFontSmoothingType, fl); case SPI_SETFONTSMOOTHINGTYPE: - return SpiSetInt(&gspv.uiFontSmoothingType, uiParam, KEY_MOUSE, L"", fl); + return SpiSetDWord(&gspv.uiFontSmoothingType, PtrToUlong(pvParam), KEY_DESKTOP, VAL_FONTSMOOTHINGTYPE, fl); case SPI_GETFONTSMOOTHINGCONTRAST: return SpiGetInt(pvParam, &gspv.uiFontSmoothingContrast, fl); case SPI_SETFONTSMOOTHINGCONTRAST: - return SpiSetInt(&gspv.uiFontSmoothingContrast, uiParam, KEY_MOUSE, L"", fl); + return SpiSetDWord(&gspv.uiFontSmoothingContrast, PtrToUlong(pvParam), KEY_DESKTOP, VAL_FONTSMOOTHINGCONTRAST, fl); case SPI_GETFOCUSBORDERWIDTH: return SpiGetInt(pvParam, &gspv.uiFocusBorderWidth, fl); @@ -1745,7 +1752,7 @@ SpiGetSet(UINT uiAction, UINT uiParam, PVOID pvParam, FLONG fl) return SpiGetInt(pvParam, &gspv.uiFontSmoothingOrientation, fl); case SPI_SETFONTSMOOTHINGORIENTATION: - return SpiSetInt(&gspv.uiFontSmoothingOrientation, uiParam, KEY_MOUSE, L"", fl); + return SpiSetDWord(&gspv.uiFontSmoothingOrientation, PtrToUlong(pvParam), KEY_DESKTOP, VAL_FONTSMOOTHINGORIENTATION, fl); /* The following are undocumented, but valid SPI values */ case 0x1010:

5 years, 8 months

[reactos] 01/01: [BOOTDATA] Improve error message of AHKAppTests.cmd (#1476)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b8f5fed484da3033d4cde… commit b8f5fed484da3033d4cde3bf5bf86e7e172d177d Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Apr 7 08:05:35 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Apr 7 08:05:35 2019 +0900 [BOOTDATA] Improve error message of AHKAppTests.cmd (#1476) + dbgprint "Insert ReactOS CD and try again." --- boot/bootdata/bootcdregtest/AHKAppTests.cmd | 1 + 1 file changed, 1 insertion(+) diff --git a/boot/bootdata/bootcdregtest/AHKAppTests.cmd b/boot/bootdata/bootcdregtest/AHKAppTests.cmd index b17347d01e..9278669461 100644 --- a/boot/bootdata/bootcdregtest/AHKAppTests.cmd +++ b/boot/bootdata/bootcdregtest/AHKAppTests.cmd @@ -5,6 +5,7 @@ for %%X in (A B C D E F G H I J K L M N O P Q R S T U V W X Y Z) do (if exist %% if not defined DRIVE ( dbgprint "AHK Application testing suite not present, skipping." + dbgprint "Insert ReactOS CD and try again." exit /b 0 )

5 years, 8 months

[reactos] 01/01: [NET][MC] Move STATISTICS SERVER strings from net.exe to netmsg.dll.

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cf16429c60f28c1827e89… commit cf16429c60f28c1827e89738954e3e23e2b88952 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Apr 6 19:42:51 2019 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Apr 6 19:42:51 2019 +0200 [NET][MC] Move STATISTICS SERVER strings from net.exe to netmsg.dll. Translators, please check the translations! --- base/applications/network/net/cmdStatistics.c | 45 ++++++----- base/applications/network/net/lang/en-US.rc | 16 ---- base/applications/network/net/lang/es-ES.rc | 16 ---- base/applications/network/net/lang/pl-PL.rc | 16 ---- base/applications/network/net/lang/ro-RO.rc | 16 ---- base/applications/network/net/lang/ru-RU.rc | 16 ---- base/applications/network/net/lang/tr-TR.rc | 16 ---- base/applications/network/net/lang/zh-CN.rc | 16 ---- base/applications/network/net/lang/zh-TW.rc | 16 ---- base/applications/network/net/resource.h | 16 ---- sdk/include/reactos/mc/netmsgmsg.mc | 108 +++++++++++++------------- 11 files changed, 79 insertions(+), 218 deletions(-) diff --git a/base/applications/network/net/cmdStatistics.c b/base/applications/network/net/cmdStatistics.c index 7c69fcdf9d..799f712bf8 100644 --- a/base/applications/network/net/cmdStatistics.c +++ b/base/applications/network/net/cmdStatistics.c @@ -34,7 +34,8 @@ DisplayServerStatistics(VOID) if (Status != NERR_Success) goto done; - ConResPrintf(StdOut, IDS_STATISTICS_SRV_NAME, ServerInfo->sv100_name); + PrintMessageStringV(4624, ServerInfo->sv100_name); + ConPrintf(StdOut, L"\n\n"); RtlSecondsSince1970ToTime(StatisticsInfo->sts0_start, &LargeValue); @@ -53,57 +54,61 @@ DisplayServerStatistics(VOID) wHour = wHour - 12; } - ConResPrintf(StdOut, IDS_STATISTICS_SINCE, - SystemTime.wMonth, SystemTime.wDay, SystemTime.wYear, - wHour, SystemTime.wMinute, - (SystemTime.wHour >= 1 && SystemTime.wHour < 13) ? L"AM" : L"PM"); + PrintMessageString(4600); + ConPrintf(StdOut, L" %d/%d/%d %d:%02d %s\n\n\n", + SystemTime.wMonth, SystemTime.wDay, SystemTime.wYear, + wHour, SystemTime.wMinute, + (SystemTime.wHour >= 1 && SystemTime.wHour < 13) ? L"AM" : L"PM"); - PrintPaddedResourceString(IDS_STATISTICS_SRV_SESACCEPT, nPaddedLength); + PrintPaddedMessageString(4601, nPaddedLength); ConPrintf(StdOut, L"%lu\n", StatisticsInfo->sts0_sopens); - PrintPaddedResourceString(IDS_STATISTICS_SRV_SESSTIME, nPaddedLength); + PrintPaddedMessageString(4602, nPaddedLength); ConPrintf(StdOut, L"%lu\n", StatisticsInfo->sts0_stimedout); - PrintPaddedResourceString(IDS_STATISTICS_SRV_SESSERROR, nPaddedLength); + PrintPaddedMessageString(4603, nPaddedLength); ConPrintf(StdOut, L"%lu\n\n", StatisticsInfo->sts0_serrorout); LargeValue.u.LowPart = StatisticsInfo->sts0_bytessent_low; LargeValue.u.HighPart = StatisticsInfo->sts0_bytessent_high; - PrintPaddedResourceString(IDS_STATISTICS_SRV_KBSENT, nPaddedLength); + PrintPaddedMessageString(4604, nPaddedLength); ConPrintf(StdOut, L"%I64u\n", LargeValue.QuadPart / 1024); LargeValue.u.LowPart = StatisticsInfo->sts0_bytesrcvd_low; LargeValue.u.HighPart = StatisticsInfo->sts0_bytesrcvd_high; - PrintPaddedResourceString(IDS_STATISTICS_SRV_KBRCVD, nPaddedLength); + PrintPaddedMessageString(4605, nPaddedLength); ConPrintf(StdOut, L"%I64u\n", LargeValue.QuadPart / 1024); - PrintPaddedResourceString(IDS_STATISTICS_SRV_MRESPTIME, nPaddedLength); + PrintPaddedMessageString(4606, nPaddedLength); ConPrintf(StdOut, L"%lu\n\n", StatisticsInfo->sts0_avresponse); - PrintPaddedResourceString(IDS_STATISTICS_SRV_SYSERRORS, nPaddedLength); + PrintPaddedMessageString(4610, nPaddedLength); ConPrintf(StdOut, L"%lu\n", StatisticsInfo->sts0_syserrors); - PrintPaddedResourceString(IDS_STATISTICS_SRV_PMERRORS, nPaddedLength); + PrintPaddedMessageString(4612, nPaddedLength); ConPrintf(StdOut, L"%lu\n", StatisticsInfo->sts0_permerrors); - PrintPaddedResourceString(IDS_STATISTICS_SRV_PWERRORS, nPaddedLength); + PrintPaddedMessageString(4611, nPaddedLength); ConPrintf(StdOut, L"%lu\n\n", StatisticsInfo->sts0_pwerrors); - PrintPaddedResourceString(IDS_STATISTICS_SRV_FILES, nPaddedLength); + PrintPaddedMessageString(4608, nPaddedLength); ConPrintf(StdOut, L"%lu\n", StatisticsInfo->sts0_fopens); - PrintPaddedResourceString(IDS_STATISTICS_SRV_DEVICES, nPaddedLength); + PrintPaddedMessageString(4613, nPaddedLength); ConPrintf(StdOut, L"%lu\n", StatisticsInfo->sts0_devopens); - PrintPaddedResourceString(IDS_STATISTICS_SRV_JOBS, nPaddedLength); + PrintPaddedMessageString(4609, nPaddedLength); ConPrintf(StdOut, L"%lu\n\n", StatisticsInfo->sts0_jobsqueued); - ConResPuts(StdOut, IDS_STATISTICS_SRV_BUFFERS); + PrintMessageString(4620); + ConPrintf(StdOut, L"\n"); - PrintPaddedResourceString(IDS_STATISTICS_SRV_BIGBUFFERS, nPaddedLength); + ConPrintf(StdOut, L" "); + PrintPaddedMessageString(4621, nPaddedLength - 2); ConPrintf(StdOut, L"%lu\n", StatisticsInfo->sts0_bigbufneed); - PrintPaddedResourceString(IDS_STATISTICS_SRV_REQBUFFERS, nPaddedLength); + ConPrintf(StdOut, L" "); + PrintPaddedMessageString(4622, nPaddedLength - 2); ConPrintf(StdOut, L"%lu\n\n", StatisticsInfo->sts0_reqbufneed); done: diff --git a/base/applications/network/net/lang/en-US.rc b/base/applications/network/net/lang/en-US.rc index d95ed0dded..1bd152049d 100644 --- a/base/applications/network/net/lang/en-US.rc +++ b/base/applications/network/net/lang/en-US.rc @@ -12,22 +12,6 @@ BEGIN IDS_STATISTICS_TEXT "Statistics are available for the following services:\n\n\ Server\n Workstation\n\n" IDS_STATISTICS_SINCE "Statistics since %d/%d/%d %d:%02d %s\n\n\n" - IDS_STATISTICS_SRV_NAME "Server statistics for \\\\%s\n\n\n" - IDS_STATISTICS_SRV_SESACCEPT "Sessions accepted" - IDS_STATISTICS_SRV_SESSTIME "Sessions timed-out" - IDS_STATISTICS_SRV_SESSERROR "Sessions errored-out" - IDS_STATISTICS_SRV_KBSENT "Kilobytes sent" - IDS_STATISTICS_SRV_KBRCVD "Kilobytes received" - IDS_STATISTICS_SRV_MRESPTIME "Mean response time (msec)" - IDS_STATISTICS_SRV_SYSERRORS "System errors" - IDS_STATISTICS_SRV_PMERRORS "Permission violations" - IDS_STATISTICS_SRV_PWERRORS "Password violations" - IDS_STATISTICS_SRV_FILES "Files accessed" - IDS_STATISTICS_SRV_DEVICES "Communication devices accessed" - IDS_STATISTICS_SRV_JOBS "Print jobs spooled" - IDS_STATISTICS_SRV_BUFFERS "Times buffers exhausted\n\n" - IDS_STATISTICS_SRV_BIGBUFFERS " Big buffers" - IDS_STATISTICS_SRV_REQBUFFERS " Request buffers" IDS_STATISTICS_WKS_NAME "Workstation statistics for \\\\%s\n\n\n" IDS_STATISTICS_WKS_BYTESRCVD "Bytes received" IDS_STATISTICS_WKS_SMBSRCVD "Server Message Blocks (SMBs) received" diff --git a/base/applications/network/net/lang/es-ES.rc b/base/applications/network/net/lang/es-ES.rc index 9a70556e90..82db3f6566 100644 --- a/base/applications/network/net/lang/es-ES.rc +++ b/base/applications/network/net/lang/es-ES.rc @@ -15,22 +15,6 @@ BEGIN IDS_STATISTICS_TEXT "Statistics are available for the following services:\n\n\ Server\n Workstation\n\n" IDS_STATISTICS_SINCE "Statistics since %d/%d/%d %d:%02d %s\n\n\n" - IDS_STATISTICS_SRV_NAME "Server statistics for \\\\%s\n\n\n" - IDS_STATISTICS_SRV_SESACCEPT "Sessions accepted" - IDS_STATISTICS_SRV_SESSTIME "Sessions timed-out" - IDS_STATISTICS_SRV_SESSERROR "Sessions errored-out" - IDS_STATISTICS_SRV_KBSENT "Kilobytes sent" - IDS_STATISTICS_SRV_KBRCVD "Kilobytes received" - IDS_STATISTICS_SRV_MRESPTIME "Mean response time (msec)" - IDS_STATISTICS_SRV_SYSERRORS "System errors" - IDS_STATISTICS_SRV_PMERRORS "Permission violations" - IDS_STATISTICS_SRV_PWERRORS "Password violations" - IDS_STATISTICS_SRV_FILES "Files accessed" - IDS_STATISTICS_SRV_DEVICES "Communication devices accessed" - IDS_STATISTICS_SRV_JOBS "Print jobs spooled" - IDS_STATISTICS_SRV_BUFFERS "Times buffers exhausted\n\n" - IDS_STATISTICS_SRV_BIGBUFFERS " Big buffers" - IDS_STATISTICS_SRV_REQBUFFERS " Request buffers" IDS_STATISTICS_WKS_NAME "Workstation statistics for \\\\%s\n\n\n" IDS_STATISTICS_WKS_BYTESRCVD "Bytes received" IDS_STATISTICS_WKS_SMBSRCVD "Server Message Blocks (SMBs) received" diff --git a/base/applications/network/net/lang/pl-PL.rc b/base/applications/network/net/lang/pl-PL.rc index 3ece6822dd..6f3d50767a 100644 --- a/base/applications/network/net/lang/pl-PL.rc +++ b/base/applications/network/net/lang/pl-PL.rc @@ -11,22 +11,6 @@ BEGIN IDS_STATISTICS_TEXT "Dostępne są statystyki dla następujących uruchomionych obecnie usług:\n\n\ Serwer\n Stacja robocza\n\n" IDS_STATISTICS_SINCE "Statystyka od %d/%d/%d %d:%02d %s\n\n\n" - IDS_STATISTICS_SRV_NAME "Statystyka serwera dla \\\\%s\n\n\n" - IDS_STATISTICS_SRV_SESACCEPT "Zaakceptowane sesje" - IDS_STATISTICS_SRV_SESSTIME "Sesje przerwane z powodu upłynięcia limitu czasu" - IDS_STATISTICS_SRV_SESSERROR "Sesje przerwane z powodu wystąpienia błędu" - IDS_STATISTICS_SRV_KBSENT "Wysłano kilobajtów" - IDS_STATISTICS_SRV_KBRCVD "Odebrano kilobajtów" - IDS_STATISTICS_SRV_MRESPTIME "Średni czas odpowiedzi (ms)" - IDS_STATISTICS_SRV_SYSERRORS "Błędy systemu" - IDS_STATISTICS_SRV_PMERRORS "Naruszenia uprawnień" - IDS_STATISTICS_SRV_PWERRORS "Naruszenia hasła" - IDS_STATISTICS_SRV_FILES "Wykorzystane pliki" - IDS_STATISTICS_SRV_DEVICES "Wykorzystane urządzenia komunikacyjne" - IDS_STATISTICS_SRV_JOBS "Buforowane zadania drukowania" - IDS_STATISTICS_SRV_BUFFERS "Wyczerpane bufory czasomierzy\n\n" - IDS_STATISTICS_SRV_BIGBUFFERS " Duże bufory" - IDS_STATISTICS_SRV_REQBUFFERS " Bufory żądań" IDS_STATISTICS_WKS_NAME "Statystyka stacji roboczej dla \\\\%s\n\n\n" IDS_STATISTICS_WKS_BYTESRCVD "Bajty odebrane" IDS_STATISTICS_WKS_SMBSRCVD "Odebrane bloki komunikatów serwera (SMB)" diff --git a/base/applications/network/net/lang/ro-RO.rc b/base/applications/network/net/lang/ro-RO.rc index 1608837557..05c16d70e5 100644 --- a/base/applications/network/net/lang/ro-RO.rc +++ b/base/applications/network/net/lang/ro-RO.rc @@ -18,22 +18,6 @@ BEGIN IDS_STATISTICS_TEXT "Statistici disponibile pentru următoarele servicii:\n\n\ Server\n Stație de lucru\n\n" IDS_STATISTICS_SINCE "Statistici începând din %d/%d/%d %d:%02d %s\n\n\n" - IDS_STATISTICS_SRV_NAME "Statistici de server pentru \\\\%s\n\n\n" - IDS_STATISTICS_SRV_SESACCEPT "Sesiuni acceptate" - IDS_STATISTICS_SRV_SESSTIME "Sesiuni expirate" - IDS_STATISTICS_SRV_SESSERROR "Sesiuni eșuate" - IDS_STATISTICS_SRV_KBSENT "Kiloocteți transmiși" - IDS_STATISTICS_SRV_KBRCVD "Kiloocteți receptați" - IDS_STATISTICS_SRV_MRESPTIME "Timpul mediu de răspuns (msec)" - IDS_STATISTICS_SRV_SYSERRORS "Erori de sistem" - IDS_STATISTICS_SRV_PMERRORS "Erori la permisiuni" - IDS_STATISTICS_SRV_PWERRORS "Erori la parole" - IDS_STATISTICS_SRV_FILES "Fișiere accesate" - IDS_STATISTICS_SRV_DEVICES "Dispozitive de comunicații accesate" - IDS_STATISTICS_SRV_JOBS "Comenzi de imprimare cumulate" - IDS_STATISTICS_SRV_BUFFERS "Momente cu limită de memorie depășită\n\n" - IDS_STATISTICS_SRV_BIGBUFFERS " memorii masive" - IDS_STATISTICS_SRV_REQBUFFERS " memorii tranzitive" IDS_STATISTICS_WKS_NAME "Statistici pentru stația de lucru \\\\%s\n\n\n" IDS_STATISTICS_WKS_BYTESRCVD "Octeți receptați" IDS_STATISTICS_WKS_SMBSRCVD "Blocuri Mesaje de Server (SMB) receptate" diff --git a/base/applications/network/net/lang/ru-RU.rc b/base/applications/network/net/lang/ru-RU.rc index d951c8a30b..a419f08957 100644 --- a/base/applications/network/net/lang/ru-RU.rc +++ b/base/applications/network/net/lang/ru-RU.rc @@ -14,22 +14,6 @@ BEGIN IDS_STATISTICS_TEXT "Статистика доступна для следующих выполняющихся служб:\n\n\ Сервер\n Рабочая станция\n\n" IDS_STATISTICS_SINCE "Статистика после %d/%d/%d %d:%02d %s\n\n\n" - IDS_STATISTICS_SRV_NAME "Статистика сервера для \\\\%s\n\n\n" - IDS_STATISTICS_SRV_SESACCEPT "Принятые сеансы" - IDS_STATISTICS_SRV_SESSTIME "Сеансы с истекшим интервалом" - IDS_STATISTICS_SRV_SESSERROR "Сеансы с ошибками" - IDS_STATISTICS_SRV_KBSENT "Послано КБ" - IDS_STATISTICS_SRV_KBRCVD "Принято КБ" - IDS_STATISTICS_SRV_MRESPTIME "Среднее время отклика (мс)" - IDS_STATISTICS_SRV_SYSERRORS "Системные ошибки" - IDS_STATISTICS_SRV_PMERRORS "Нарушение разрешений" - IDS_STATISTICS_SRV_PWERRORS "Нарушение паролей" - IDS_STATISTICS_SRV_FILES "Доступ к файлам" - IDS_STATISTICS_SRV_DEVICES "Доступ к устройствам связи" - IDS_STATISTICS_SRV_JOBS "Задания печати в очереди" - IDS_STATISTICS_SRV_BUFFERS "Исчерпанные буферы времени\n\n" - IDS_STATISTICS_SRV_BIGBUFFERS " Большие буферы" - IDS_STATISTICS_SRV_REQBUFFERS " Затребованные буферы" IDS_STATISTICS_WKS_NAME "Статистика рабочей станции для \\\\%s\n\n\n" IDS_STATISTICS_WKS_BYTESRCVD "Получено байт" IDS_STATISTICS_WKS_SMBSRCVD "Принятые блоки сообщений сервера SMB" diff --git a/base/applications/network/net/lang/tr-TR.rc b/base/applications/network/net/lang/tr-TR.rc index 9af60f8d53..1894af28dc 100644 --- a/base/applications/network/net/lang/tr-TR.rc +++ b/base/applications/network/net/lang/tr-TR.rc @@ -14,22 +14,6 @@ BEGIN IDS_STATISTICS_TEXT "Statistics are available for the following services:\n\n\ Server\n Workstation\n\n" IDS_STATISTICS_SINCE "Statistics since %d/%d/%d %d:%02d %s\n\n\n" - IDS_STATISTICS_SRV_NAME "Server statistics for \\\\%s\n\n\n" - IDS_STATISTICS_SRV_SESACCEPT "Sessions accepted" - IDS_STATISTICS_SRV_SESSTIME "Sessions timed-out" - IDS_STATISTICS_SRV_SESSERROR "Sessions errored-out" - IDS_STATISTICS_SRV_KBSENT "Kilobytes sent" - IDS_STATISTICS_SRV_KBRCVD "Kilobytes received" - IDS_STATISTICS_SRV_MRESPTIME "Mean response time (msec)" - IDS_STATISTICS_SRV_SYSERRORS "System errors" - IDS_STATISTICS_SRV_PMERRORS "Permission violations" - IDS_STATISTICS_SRV_PWERRORS "Password violations" - IDS_STATISTICS_SRV_FILES "Files accessed" - IDS_STATISTICS_SRV_DEVICES "Communication devices accessed" - IDS_STATISTICS_SRV_JOBS "Print jobs spooled" - IDS_STATISTICS_SRV_BUFFERS "Times buffers exhausted\n\n" - IDS_STATISTICS_SRV_BIGBUFFERS " Big buffers" - IDS_STATISTICS_SRV_REQBUFFERS " Request buffers" IDS_STATISTICS_WKS_NAME "Workstation statistics for \\\\%s\n\n\n" IDS_STATISTICS_WKS_BYTESRCVD "Bytes received" IDS_STATISTICS_WKS_SMBSRCVD "Server Message Blocks (SMBs) received" diff --git a/base/applications/network/net/lang/zh-CN.rc b/base/applications/network/net/lang/zh-CN.rc index 7404eea5f4..576db43c22 100644 --- a/base/applications/network/net/lang/zh-CN.rc +++ b/base/applications/network/net/lang/zh-CN.rc @@ -14,22 +14,6 @@ BEGIN IDS_STATISTICS_TEXT "Statistics are available for the following services:\n\n\ Server\n Workstation\n\n" IDS_STATISTICS_SINCE "Statistics since %d/%d/%d %d:%02d %s\n\n\n" - IDS_STATISTICS_SRV_NAME "Server statistics for \\\\%s\n\n\n" - IDS_STATISTICS_SRV_SESACCEPT "Sessions accepted" - IDS_STATISTICS_SRV_SESSTIME "Sessions timed-out" - IDS_STATISTICS_SRV_SESSERROR "Sessions errored-out" - IDS_STATISTICS_SRV_KBSENT "Kilobytes sent" - IDS_STATISTICS_SRV_KBRCVD "Kilobytes received" - IDS_STATISTICS_SRV_MRESPTIME "Mean response time (msec)" - IDS_STATISTICS_SRV_SYSERRORS "System errors" - IDS_STATISTICS_SRV_PMERRORS "Permission violations" - IDS_STATISTICS_SRV_PWERRORS "Password violations" - IDS_STATISTICS_SRV_FILES "Files accessed" - IDS_STATISTICS_SRV_DEVICES "Communication devices accessed" - IDS_STATISTICS_SRV_JOBS "Print jobs spooled" - IDS_STATISTICS_SRV_BUFFERS "Times buffers exhausted\n\n" - IDS_STATISTICS_SRV_BIGBUFFERS " Big buffers" - IDS_STATISTICS_SRV_REQBUFFERS " Request buffers" IDS_STATISTICS_WKS_NAME "Workstation statistics for \\\\%s\n\n\n" IDS_STATISTICS_WKS_BYTESRCVD "Bytes received" IDS_STATISTICS_WKS_SMBSRCVD "Server Message Blocks (SMBs) received" diff --git a/base/applications/network/net/lang/zh-TW.rc b/base/applications/network/net/lang/zh-TW.rc index c93babe320..5497281115 100644 --- a/base/applications/network/net/lang/zh-TW.rc +++ b/base/applications/network/net/lang/zh-TW.rc @@ -14,22 +14,6 @@ BEGIN IDS_STATISTICS_TEXT "Statistics are available for the following services:\n\n\ Server\n Workstation\n\n" IDS_STATISTICS_SINCE "Statistics since %d/%d/%d %d:%02d %s\n\n\n" - IDS_STATISTICS_SRV_NAME "Server statistics for \\\\%s\n\n\n" - IDS_STATISTICS_SRV_SESACCEPT "Sessions accepted" - IDS_STATISTICS_SRV_SESSTIME "Sessions timed-out" - IDS_STATISTICS_SRV_SESSERROR "Sessions errored-out" - IDS_STATISTICS_SRV_KBSENT "Kilobytes sent" - IDS_STATISTICS_SRV_KBRCVD "Kilobytes received" - IDS_STATISTICS_SRV_MRESPTIME "Mean response time (msec)" - IDS_STATISTICS_SRV_SYSERRORS "System errors" - IDS_STATISTICS_SRV_PMERRORS "Permission violations" - IDS_STATISTICS_SRV_PWERRORS "Password violations" - IDS_STATISTICS_SRV_FILES "Files accessed" - IDS_STATISTICS_SRV_DEVICES "Communication devices accessed" - IDS_STATISTICS_SRV_JOBS "Print jobs spooled" - IDS_STATISTICS_SRV_BUFFERS "Times buffers exhausted\n\n" - IDS_STATISTICS_SRV_BIGBUFFERS " Big buffers" - IDS_STATISTICS_SRV_REQBUFFERS " Request buffers" IDS_STATISTICS_WKS_NAME "Workstation statistics for \\\\%s\n\n\n" IDS_STATISTICS_WKS_BYTESRCVD "Bytes received" IDS_STATISTICS_WKS_SMBSRCVD "Server Message Blocks (SMBs) received" diff --git a/base/applications/network/net/resource.h b/base/applications/network/net/resource.h index c65cc77bcf..4ce354511f 100644 --- a/base/applications/network/net/resource.h +++ b/base/applications/network/net/resource.h @@ -9,22 +9,6 @@ #define IDS_STATISTICS_TEXT 320 #define IDS_STATISTICS_SINCE 321 -#define IDS_STATISTICS_SRV_NAME 322 -#define IDS_STATISTICS_SRV_SESACCEPT 323 -#define IDS_STATISTICS_SRV_SESSTIME 324 -#define IDS_STATISTICS_SRV_SESSERROR 325 -#define IDS_STATISTICS_SRV_KBSENT 326 -#define IDS_STATISTICS_SRV_KBRCVD 327 -#define IDS_STATISTICS_SRV_MRESPTIME 328 -#define IDS_STATISTICS_SRV_SYSERRORS 329 -#define IDS_STATISTICS_SRV_PMERRORS 330 -#define IDS_STATISTICS_SRV_PWERRORS 331 -#define IDS_STATISTICS_SRV_FILES 332 -#define IDS_STATISTICS_SRV_DEVICES 333 -#define IDS_STATISTICS_SRV_JOBS 334 -#define IDS_STATISTICS_SRV_BUFFERS 335 -#define IDS_STATISTICS_SRV_BIGBUFFERS 336 -#define IDS_STATISTICS_SRV_REQBUFFERS 337 #define IDS_STATISTICS_WKS_NAME 338 #define IDS_STATISTICS_WKS_BYTESRCVD 339 #define IDS_STATISTICS_WKS_SMBSRCVD 340 diff --git a/sdk/include/reactos/mc/netmsgmsg.mc b/sdk/include/reactos/mc/netmsgmsg.mc index 9e9ee29fc5..196478103d 100644 --- a/sdk/include/reactos/mc/netmsgmsg.mc +++ b/sdk/include/reactos/mc/netmsgmsg.mc @@ -26362,13 +26362,13 @@ Language=English Statistics since%0 . Language=Polish -Statistics since%0 +Statystyka od%0 . Language=Romanian -Statistics since%0 +Statistici începând din%0 . Language=Russian -Statistics since%0 +Статистика после%0 . Language=Spanish Statistics since%0 @@ -26391,13 +26391,13 @@ Language=English Sessions accepted%0 . Language=Polish -Sessions accepted%0 +Zaakceptowane sesje%0 . Language=Romanian -Sessions accepted%0 +Sesiuni acceptate%0 . Language=Russian -Sessions accepted%0 +Принятые сеансы%0 . Language=Spanish Sessions accepted%0 @@ -26420,13 +26420,13 @@ Language=English Sessions timed-out%0 . Language=Polish -Sessions timed-out%0 +Sesje przerwane z powodu upłynięcia limitu czasu%0 . Language=Romanian -Sessions timed-out%0 +Sesiuni expirate%0 . Language=Russian -Sessions timed-out%0 +Сеансы с истекшим интервалом%0 . Language=Spanish Sessions timed-out%0 @@ -26449,13 +26449,13 @@ Language=English Sessions errored-out%0 . Language=Polish -Sessions errored-out%0 +Sesje przerwane z powodu wystąpienia błędu%0 . Language=Romanian -Sessions errored-out%0 +Sesiuni eșuate%0 . Language=Russian -Sessions errored-out%0 +Сеансы с ошибками%0 . Language=Spanish Sessions errored-out%0 @@ -26478,13 +26478,13 @@ Language=English Kilobytes sent%0 . Language=Polish -Kilobytes sent%0 +Wysłano kilobajtów%0 . Language=Romanian -Kilobytes sent%0 +Kiloocteți transmiși%0 . Language=Russian -Kilobytes sent%0 +Послано КБ%0 . Language=Spanish Kilobytes sent%0 @@ -26507,13 +26507,13 @@ Language=English Kilobytes received%0 . Language=Polish -Kilobytes received%0 +Odebrano kilobajtów%0 . Language=Romanian -Kilobytes received%0 +Kiloocteți receptați%0 . Language=Russian -Kilobytes received%0 +Принято КБ%0 . Language=Spanish Kilobytes received%0 @@ -26536,13 +26536,13 @@ Language=English Mean response time (msec)%0 . Language=Polish -Mean response time (msec)%0 +Średni czas odpowiedzi (ms)%0 . Language=Romanian -Mean response time (msec)%0 +Timpul mediu de răspuns (msec)%0 . Language=Russian -Mean response time (msec)%0 +Среднее время отклика (мс)%0 . Language=Spanish Mean response time (msec)%0 @@ -26594,13 +26594,13 @@ Language=English Files accessed%0 . Language=Polish -Files accessed%0 +Wykorzystane pliki%0 . Language=Romanian -Files accessed%0 +Fișiere accesate%0 . Language=Russian -Files accessed%0 +Доступ к файлам%0 . Language=Spanish Files accessed%0 @@ -26623,13 +26623,13 @@ Language=English Print jobs spooled%0 . Language=Polish -Print jobs spooled%0 +Buforowane zadania drukowania%0 . Language=Romanian -Print jobs spooled%0 +Comenzi de imprimare cumulate%0 . Language=Russian -Print jobs spooled%0 +Задания печати в очереди%0 . Language=Spanish Print jobs spooled%0 @@ -26652,13 +26652,13 @@ Language=English System errors%0 . Language=Polish -System errors%0 +Błędy systemu%0 . Language=Romanian -System errors%0 +Erori de sistem%0 . Language=Russian -System errors%0 +Системные ошибки%0 . Language=Spanish System errors%0 @@ -26681,13 +26681,13 @@ Language=English Password violations%0 . Language=Polish -Password violations%0 +Naruszenia hasła%0 . Language=Romanian -Password violations%0 +Erori la parole%0 . Language=Russian -Password violations%0 +Нарушение паролей%0 . Language=Spanish Password violations%0 @@ -26710,13 +26710,13 @@ Language=English Permission violations%0 . Language=Polish -Permission violations%0 +Naruszenia uprawnień%0 . Language=Romanian -Permission violations%0 +Erori la permisiuni%0 . Language=Russian -Permission violations%0 +Нарушение разрешений%0 . Language=Spanish Permission violations%0 @@ -26739,13 +26739,13 @@ Language=English Communication devices accessed%0 . Language=Polish -Communication devices accessed%0 +Wykorzystane urządzenia komunikacyjne%0 . Language=Romanian -Communication devices accessed%0 +Dispozitive de comunicații accesate%0 . Language=Russian -Communication devices accessed%0 +Доступ к устройствам связи%0 . Language=Spanish Communication devices accessed%0 @@ -26942,13 +26942,13 @@ Language=English Times buffers exhausted . Language=Polish -Times buffers exhausted +Wyczerpane bufory czasomierzy . Language=Romanian -Times buffers exhausted +Momente cu limită de memorie depășită . Language=Russian -Times buffers exhausted +Исчерпанные буферы времени . Language=Spanish Times buffers exhausted @@ -26971,13 +26971,13 @@ Language=English Big buffers%0 . Language=Polish -Big buffers%0 +Duże bufory%0 . Language=Romanian -Big buffers%0 +memorii masive%0 . Language=Russian -Big buffers%0 +Большие буферы%0 . Language=Spanish Big buffers%0 @@ -27000,13 +27000,13 @@ Language=English Request buffers%0 . Language=Polish -Request buffers%0 +Bufory żądań%0 . Language=Romanian -Request buffers%0 +memorii tranzitive%0 . Language=Russian -Request buffers%0 +Затребованные буферы%0 . Language=Spanish Request buffers%0 @@ -27029,13 +27029,13 @@ Language=English Workstation Statistics for \\\\%1 . Language=Polish -Workstation Statistics for \\\\%1 +Statystyka stacji roboczej dla \\\\%1 . Language=Romanian -Workstation Statistics for \\\\%1 +Statistici pentru stația de lucru \\\\%1 . Language=Russian -Workstation Statistics for \\\\%1 +Статистика рабочей станции для \\\\%1 . Language=Spanish Workstation Statistics for \\\\%1 @@ -27058,13 +27058,13 @@ Language=English Server Statistics for \\\\%1 . Language=Polish -Server Statistics for \\\\%1 +Statystyka serwera dla \\\\%1 . Language=Romanian -Server Statistics for \\\\%1 +Statistici de server pentru \\\\%1 . Language=Russian -Server Statistics for \\\\%1 +Статистика сервера для \\\\%1 . Language=Spanish Server Statistics for \\\\%1

5 years, 8 months

[reactos] 06/06: [CMAKE] Clear CMAKE_<LANGUAGE>_IMPLICIT_LINK_LIBRARIES and _IMPLICIT_LINK_DIRECTORIES

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f489c3fd078db4fc44e56… commit f489c3fd078db4fc44e56ddd3add47434805a19b Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Sat Apr 6 16:55:10 2019 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Sat Apr 6 17:43:38 2019 +0200 [CMAKE] Clear CMAKE_<LANGUAGE>_IMPLICIT_LINK_LIBRARIES and _IMPLICIT_LINK_DIRECTORIES Othrewise, if you link a RC module with a static C library (as done for fusion DLLs), you get the standard C libraries from GCC. This is not what we want. This might have to be done for MSVC builds. Check build.ninja to verify this. --- overrides-gcc.cmake | 2 ++ sdk/cmake/gcc.cmake | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/overrides-gcc.cmake b/overrides-gcc.cmake index d7f7d91927..854caf26aa 100644 --- a/overrides-gcc.cmake +++ b/overrides-gcc.cmake @@ -3,4 +3,6 @@ foreach(lang C CXX ASM) set(CMAKE_${lang}_FLAGS_MINSIZEREL "-Os -DNDEBUG") set(CMAKE_${lang}_FLAGS_RELEASE "") set(CMAKE_${lang}_FLAGS_RELWITHDEBINFO "-O2 -g -DNDEBUG") + set(CMAKE_${lang}_IMPLICIT_LINK_LIBRARIES "") + set(CMAKE_${lang}_IMPLICIT_LINK_DIRECTORIES "") endforeach() diff --git a/sdk/cmake/gcc.cmake b/sdk/cmake/gcc.cmake index 5eee683307..8ecc06b710 100644 --- a/sdk/cmake/gcc.cmake +++ b/sdk/cmake/gcc.cmake @@ -63,6 +63,8 @@ if(CMAKE_C_COMPILER_ID STREQUAL "Clang") set(CMAKE_CXX_COMPILE_OPTIONS_PIE "") set(CMAKE_SHARED_LIBRARY_C_FLAGS "") set(CMAKE_SHARED_LIBRARY_CXX_FLAGS "") + set(CMAKE_SHARED_MODULE_C_FLAGS "") + set(CMAKE_SHARED_MODULE_CXX_FLAGS "") set(CMAKE_ASM_FLAGS_DEBUG "") set(CMAKE_C_FLAGS_DEBUG "") set(CMAKE_CXX_FLAGS_DEBUG "") @@ -105,6 +107,9 @@ endif() if(DEFINED CMAKE_SHARED_LIBRARY_ASM_FLAGS) string(REPLACE "-fPIC" "" CMAKE_SHARED_LIBRARY_ASM_FLAGS ${CMAKE_SHARED_LIBRARY_ASM_FLAGS}) endif() +if(DEFINED CMAKE_SHARED_MODULE_ASM_FLAGS) + string(REPLACE "-fPIC" "" CMAKE_SHARED_MODULE_ASM_FLAGS ${CMAKE_SHARED_MODULE_ASM_FLAGS}) +endif() # Tuning if(ARCH STREQUAL "i386")

5 years, 8 months

[reactos] 05/06: [CMAKE] Also set blank DEFINE_SYMBOL property for freeldr helpers

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=157a509a0fb7023134557… commit 157a509a0fb70231345577b59690a3af19e4fb3d Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Sat Apr 6 16:50:56 2019 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Sat Apr 6 17:43:38 2019 +0200 [CMAKE] Also set blank DEFINE_SYMBOL property for freeldr helpers --- boot/freeldr/freeldr/CMakeLists.txt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/boot/freeldr/freeldr/CMakeLists.txt b/boot/freeldr/freeldr/CMakeLists.txt index 1030710479..4ffa44a7ca 100644 --- a/boot/freeldr/freeldr/CMakeLists.txt +++ b/boot/freeldr/freeldr/CMakeLists.txt @@ -2,6 +2,7 @@ if(SEPARATE_DBG) # FIXME: http://sourceware.org/bugzilla/show_bug.cgi?id=11822 set(CMAKE_LDR_PE_HELPER_LINK_EXECUTABLE "<CMAKE_C_COMPILER> <CMAKE_C_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>") + set(CMAKE_LDR_PE_HELPER_STANDARD_LIBRARIES_INIT "") set(CMAKE_LDR_PE_HELPER_STANDARD_LIBRARIES "-lgcc" CACHE STRING "Standard C Libraries") endif() @@ -236,8 +237,10 @@ endif() add_executable(freeldr_pe ${FREELDR_BASE_SOURCE}) add_executable(freeldr_pe_dbg EXCLUDE_FROM_ALL ${FREELDR_BASE_SOURCE}) -set_property(TARGET freeldr_pe PROPERTY ENABLE_EXPORTS TRUE) -set_property(TARGET freeldr_pe_dbg PROPERTY ENABLE_EXPORTS TRUE) +set_target_properties(freeldr_pe freeldr_pe_dbg + PROPERTIES + ENABLE_EXPORTS TRUE + DEFINE_SYMBOL "") if(NOT MSVC AND SEPARATE_DBG) set_target_properties(freeldr_pe PROPERTIES LINKER_LANGUAGE LDR_PE_HELPER)

5 years, 8 months

[reactos] 04/06: [GDI32] Use correct dependenxy for the winegdi library

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e24182f8c005482847f5a… commit e24182f8c005482847f5a530c1086734f2ac3868 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Sat Apr 6 14:00:23 2019 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Sat Apr 6 17:43:38 2019 +0200 [GDI32] Use correct dependenxy for the winegdi library --- win32ss/gdi/gdi32/wine/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/win32ss/gdi/gdi32/wine/CMakeLists.txt b/win32ss/gdi/gdi32/wine/CMakeLists.txt index 861ca575b7..63e139cd8c 100644 --- a/win32ss/gdi/gdi32/wine/CMakeLists.txt +++ b/win32ss/gdi/gdi32/wine/CMakeLists.txt @@ -23,4 +23,4 @@ list(APPEND SOURCE rosglue.c) add_library(winegdi ${SOURCE}) -add_dependencies(winegdi xdk) +add_dependencies(winegdi psdk)

5 years, 8 months

[reactos] 03/06: [ZLIB] use correct dependency for minizip library

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=aa91628b0e3779d02c1f2… commit aa91628b0e3779d02c1f27513fb741b9e113fe66 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Sat Apr 6 13:56:48 2019 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Sat Apr 6 17:43:38 2019 +0200 [ZLIB] use correct dependency for minizip library --- sdk/lib/3rdparty/zlib/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/lib/3rdparty/zlib/CMakeLists.txt b/sdk/lib/3rdparty/zlib/CMakeLists.txt index 12b02fb3d9..e507fe284d 100644 --- a/sdk/lib/3rdparty/zlib/CMakeLists.txt +++ b/sdk/lib/3rdparty/zlib/CMakeLists.txt @@ -38,7 +38,7 @@ if(CMAKE_CROSSCOMPILING) add_library(zlib_solo ${SOLO_SOURCE}) add_target_compile_definitions(zlib_solo Z_SOLO) add_library(minizip ${MINIZIP_SOURCE}) - add_dependencies(minizip xdk) + add_dependencies(minizip psdk) else() add_library(zlibhost ${SOLO_SOURCE}) add_target_compile_definitions(zlibhost Z_SOLO)

5 years, 8 months

[reactos] 02/06: [CMAKE] unset EXPORT_SYMBOL for modules and shared libraries

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=979972b9008001c5125b7… commit 979972b9008001c5125b71d7496ec7206769f170 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Sat Apr 6 13:22:50 2019 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Sat Apr 6 17:43:38 2019 +0200 [CMAKE] unset EXPORT_SYMBOL for modules and shared libraries We don't use that --- ntoskrnl/CMakeLists.txt | 1 + sdk/cmake/CMakeMacros.cmake | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/ntoskrnl/CMakeLists.txt b/ntoskrnl/CMakeLists.txt index d1ee38201d..3111893fb0 100644 --- a/ntoskrnl/CMakeLists.txt +++ b/ntoskrnl/CMakeLists.txt @@ -19,6 +19,7 @@ add_executable(ntoskrnl ntoskrnl.rc ${CMAKE_CURRENT_BINARY_DIR}/ntoskrnl.def) set_property(TARGET ntoskrnl PROPERTY ENABLE_EXPORTS TRUE) +set_target_properties(ntoskrnl PROPERTIES DEFINE_SYMBOL "") if(ARCH STREQUAL "i386") set_entrypoint(ntoskrnl KiSystemStartup 4) diff --git a/sdk/cmake/CMakeMacros.cmake b/sdk/cmake/CMakeMacros.cmake index 70d146d97a..b8fe5ad4db 100644 --- a/sdk/cmake/CMakeMacros.cmake +++ b/sdk/cmake/CMakeMacros.cmake @@ -524,6 +524,11 @@ if(NOT MSVC_IDE) function(add_library name) _add_library(${name} ${ARGN}) add_clean_target(${name}) + # cmake adds a module_EXPORTS define when compiling a module or a shared library. We don't use that. + get_target_property(_type ${name} TYPE) + if (_type MATCHES SHARED_LIBRARY|MODULE_LIBRARY) + set_target_properties(${name} PROPERTIES DEFINE_SYMBOL "") + endif() endfunction() function(add_executable name) @@ -549,6 +554,11 @@ elseif(USE_FOLDER_STRUCTURE) string(SUBSTRING ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR_LENGTH} -1 CMAKE_CURRENT_SOURCE_DIR_RELATIVE) set_property(TARGET "${name}" PROPERTY FOLDER "${CMAKE_CURRENT_SOURCE_DIR_RELATIVE}") endif() + # cmake adds a module_EXPORTS define when compiling a module or a shared library. We don't use that. + get_target_property(_type ${name} TYPE) + if (_type MATCHES SHARED_LIBRARY|MODULE_LIBRARY) + set_target_properties(${name} PROPERTIES DEFINE_SYMBOL "") + endif() endfunction() function(add_executable name) @@ -556,6 +566,15 @@ elseif(USE_FOLDER_STRUCTURE) string(SUBSTRING ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR_LENGTH} -1 CMAKE_CURRENT_SOURCE_DIR_RELATIVE) set_property(TARGET "${name}" PROPERTY FOLDER "${CMAKE_CURRENT_SOURCE_DIR_RELATIVE}") endfunction() +else() + function(add_library name) + _add_library(${name} ${ARGN}) + # cmake adds a module_EXPORTS define when compiling a module or a shared library. We don't use that. + get_target_property(_type ${name} TYPE) + if (_type MATCHES SHARED_LIBRARY|MODULE_LIBRARY) + set_target_properties(${name} PROPERTIES DEFINE_SYMBOL "") + endif() + endfunction() endif() if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")

5 years, 8 months

← Newer
1
...
15
16
17
18
19
20
21
...
24
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2019