Ros-diffs January 2025

ros-diffs@reactos.org

23 participants
278 discussions

[reactos] 01/01: [TELNET] Fix Unicode character printing (#7597)

by Marcin Jabłoński

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e3e520d15402eebe2e20e… commit e3e520d15402eebe2e20edad8a0b54973057daf3 Author: Marcin Jabłoński <nnxcomputing(a)gmail.com> AuthorDate: Thu Jan 16 18:24:04 2025 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Jan 16 18:24:04 2025 +0100 [TELNET] Fix Unicode character printing (#7597) CORE-18304 The included Telnet client does not support displaying messages with Unicode characters in them. This is a problem, because even though localisation for the program was made for ReactOS, it doesn't work properly. - Make the `printm` function load and format messages using wide character APIs instead of the narrow ones. - Add format specifiers to the resource files (this is necessary, as there are a lot of places, where narrow strings are used in the program, and passed as parameters to `printm`). --- base/applications/network/telnet/lang/en-US.rc | 52 +++++++++---------- base/applications/network/telnet/lang/pl-PL.rc | 52 +++++++++---------- base/applications/network/telnet/lang/ro-RO.rc | 52 +++++++++---------- base/applications/network/telnet/lang/ru-RU.rc | 52 +++++++++---------- base/applications/network/telnet/lang/tr-TR.rc | 52 +++++++++---------- base/applications/network/telnet/lang/zh-CN.rc | 52 +++++++++---------- base/applications/network/telnet/lang/zh-TW.rc | 52 +++++++++---------- base/applications/network/telnet/precomp.h | 1 + base/applications/network/telnet/src/tnerror.cpp | 63 +++++++++++++++++++++++- 9 files changed, 245 insertions(+), 183 deletions(-) diff --git a/base/applications/network/telnet/lang/en-US.rc b/base/applications/network/telnet/lang/en-US.rc index a13ad7f4144..edac1d7d5c1 100644 --- a/base/applications/network/telnet/lang/en-US.rc +++ b/base/applications/network/telnet/lang/en-US.rc @@ -9,25 +9,25 @@ BEGIN MSG_HELP "Commands may be abbreviated. Commands are:\n\ncl[ose] close current connection\nop[en] connect to a site\nq[uit] exit telnet\n" MSG_HELP_1 "ke[ys] changes/displays keymaps (write keys to see the options)\nse[t] displays/alters configuration options\nz suspend\n? h[elp] print help information\n" MSG_INVCMD "Invalid command. Type ? for help.\n" - MSG_ERROR "%1 failed.\n" - MSG_INFO "%1\n" - MSG_WARNING "%1\n" - MSG_TRYING "Trying %1.%2.%3.%4:%5...\n" - MSG_CONNECTED "Connected to %1. Escape key is ALT-%2.\n" + MSG_ERROR "%1!hs! failed.\n" + MSG_INFO "%1!hs!\n" + MSG_WARNING "%1!hs!\n" + MSG_TRYING "Trying %1!hs!.%2!hs!.%3!hs!.%4!hs!:%5!hs!...\n" + MSG_CONNECTED "Connected to %1!hs!. Escape key is ALT-%2!hs!.\n" MSG_TERMBYREM "Connection terminated.\n" - MSG_KEYMAP "Loading %1 from %2.\n" + MSG_KEYMAP "Loading %1!hs! from %2!hs!.\n" MSG_ERRKEYMAP "Error loading keymap.\n" - MSG_DUMPFILE "Writing output to file %1.\n" - MSG_CONFIG "Loading configuration options from %1.\n" - MSG_NOINI "Error loading configuration file %1.\nLoading default options.\n" - MSG_BADVAL "Warning: invalid variable %1.\n" + MSG_DUMPFILE "Writing output to file %1!hs!.\n" + MSG_CONFIG "Loading configuration options from %1!hs!.\n" + MSG_NOINI "Error loading configuration file %1!hs!.\nLoading default options.\n" + MSG_BADVAL "Warning: invalid variable %1!hs!.\n" MSG_NOSPAWN "Unable to spawn process.\n" - MSG_RESOLVING "Looking up host: %1..." - MSG_NOSERVICE "Could not find TCP service %1.\n" - MSG_SIZEALIAS "Warning: size of alias %1 is too big, ignoring.\n" + MSG_RESOLVING "Looking up host: %1!hs!..." + MSG_NOSERVICE "Could not find TCP service %1!hs!.\n" + MSG_SIZEALIAS "Warning: size of alias %1!hs! is too big, ignoring.\n" MSG_ERRPIPE "Error: unable to spawn process for pipe.\n" MSG_BADUSAGE "Error: invalid usage of command.\n" - MSG_ALREADYCONNECTED "Already connected to %1.\n" + MSG_ALREADYCONNECTED "Already connected to %1!hs!.\n" MSG_WSAEINTR "Interrupted function call.\n" MSG_WSAEBADF "WSAEBADF\n" MSG_WSAEACCESS "Permission denied.\n" @@ -72,25 +72,25 @@ BEGIN MSG_WSATRY_AGAIN "Non-authoritative host not found.\n" MSG_WSANO_RECOVERY "This is a non-recoverable error.\n" MSG_WSANO_DATA "Valid name, no data record of requested type.\n" - MSG_KEYNOVAL "[GLOBAL]: No value for %1.\n" - MSG_KEYBADVAL "[GLOBAL]: Bad value for %1.\n" - MSG_KEYBADSTRUCT "%1: Bad structure.\n" - MSG_KEYBADCHARS "%1: Bad chars? %1 -> %3.\n" - MSG_KEYUNEXPLINE "Unexpected line ""%1"".\n" + MSG_KEYNOVAL "[GLOBAL]: No value for %1!hs!.\n" + MSG_KEYBADVAL "[GLOBAL]: Bad value for %1!hs!.\n" + MSG_KEYBADSTRUCT "%1!hs!: Bad structure.\n" + MSG_KEYBADCHARS "%1!hs!: Bad chars? %1!hs! -> %3!hs!.\n" + MSG_KEYUNEXPLINE "Unexpected line ""%1!hs!"".\n" MSG_KEYUNEXPEOF "Unexpended end of file.\n" - MSG_KEYUNEXPTOK "Unexpected token %1.\n" - MSG_KEYUNEXPTOKIN "Unexpected token in %1.\n" + MSG_KEYUNEXPTOK "Unexpected token %1!hs!.\n" + MSG_KEYUNEXPTOKIN "Unexpected token in %1!hs!.\n" MSG_KEYUNEXP "Unexpected end of file or token.\n" MSG_KEYNOGLOBAL "No [GLOBAL] definition!\n" - MSG_KEYNOCONFIG "No [CONFIG %1].\n" - MSG_KEYUSECONFIG "Use configuration: %1.\n" - MSG_KEYNOSWKEY "No switch key for ""%1"".\n" + MSG_KEYNOCONFIG "No [CONFIG %1!hs!].\n" + MSG_KEYUSECONFIG "Use configuration: %1!hs!.\n" + MSG_KEYNOSWKEY "No switch key for ""%1!hs!"".\n" MSG_KEYCANNOTDEF "You cannot define switch key for default keymap - ignored.\n" MSG_KEYDUPSWKEY "Duplicate switching key.\n" - MSG_KEYUNKNOWNMAP "Unknown keymap %1.\n" + MSG_KEYUNKNOWNMAP "Unknown keymap %1!hs!.\n" MSG_KEYNOCHARMAPS "No charmaps loaded.\n" MSG_KEYNOKEYMAPS "No keymaps loaded.\n" - MSG_KEYNUMMAPS "There are %1 maps.\n" + MSG_KEYNUMMAPS "There are %1!hs! maps.\n" MSG_KEYBADMAP "Bad keymap number - try 'keys display'\n" MSG_KEYMAPSWITCHED "keymap switched.\n" END diff --git a/base/applications/network/telnet/lang/pl-PL.rc b/base/applications/network/telnet/lang/pl-PL.rc index c75e95e825a..9cb42a47f85 100644 --- a/base/applications/network/telnet/lang/pl-PL.rc +++ b/base/applications/network/telnet/lang/pl-PL.rc @@ -9,25 +9,25 @@ BEGIN MSG_HELP "Polecenia mogą być skracane. Dostępne polecenia:\n\ncl[ose] zamknij bieżące połączenie\nop[en] połącz z witryną\nq[uit] zakończ telnet\n" MSG_HELP_1 "ke[ys] zmienia/wyświetla mapy klawiszy (wpisz klawisze,\naby zobaczyć opcje)\nse[t] wyświetla/zmienia opcje konfiguracji\nz wstrzymaj\n? h[elp] wypisz informacje pomocy\n" MSG_INVCMD "Nieprawidłowe polecenie. Wpisz ?, aby uzyskać pomoc.\n" - MSG_ERROR "%1 nie powiodło się.\n" - MSG_INFO "%1\n" - MSG_WARNING "%1\n" - MSG_TRYING "Podejmowanie próby %1.%2.%3.%4:%5...\n" - MSG_CONNECTED "Podłączono do %1. Klawisze wyjścia to ALT-%2.\n" + MSG_ERROR "%1!hs! nie powiodło się.\n" + MSG_INFO "%1!hs!\n" + MSG_WARNING "%1!hs!\n" + MSG_TRYING "Podejmowanie próby %1!hs!.%2!hs!.%3!hs!.%4!hs!:%5!hs!...\n" + MSG_CONNECTED "Podłączono do %1!hs!. Klawisze wyjścia to ALT-%2!hs!.\n" MSG_TERMBYREM "Połączenie zakończone.\n" - MSG_KEYMAP "Ładowanie %1 z %2.\n" + MSG_KEYMAP "Ładowanie %1!hs! z %2!hs!.\n" MSG_ERRKEYMAP "Błąd podczas ładowania mapy klawiszy.\n" - MSG_DUMPFILE "Zapisywanie danych wyjściowych do pliku %1.\n" - MSG_CONFIG "Ładowanie opcji konfiguracji z %1.\n" - MSG_NOINI "Błąd podczas ładowania pliku konfiguracyjnego %1.\nŁadowanie domyślnych opcji.\n" - MSG_BADVAL "Ostrzeżenie: nieprawidłowa zmienna %1.\n" + MSG_DUMPFILE "Zapisywanie danych wyjściowych do pliku %1!hs!.\n" + MSG_CONFIG "Ładowanie opcji konfiguracji z %1!hs!.\n" + MSG_NOINI "Błąd podczas ładowania pliku konfiguracyjnego %1!hs!.\nŁadowanie domyślnych opcji.\n" + MSG_BADVAL "Ostrzeżenie: nieprawidłowa zmienna %1!hs!.\n" MSG_NOSPAWN "Nie można zduplikować procesu.\n" - MSG_RESOLVING "Wyszukiwanie hosta: %1..." - MSG_NOSERVICE "Nie odnaleziono usługi TCP %1.\n" - MSG_SIZEALIAS "Ostrzeżenie: rozmiar aliasu %1 jest zbyt duży, ignorowanie.\n" + MSG_RESOLVING "Wyszukiwanie hosta: %1!hs!..." + MSG_NOSERVICE "Nie odnaleziono usługi TCP %1!hs!.\n" + MSG_SIZEALIAS "Ostrzeżenie: rozmiar aliasu %1!hs! jest zbyt duży, ignorowanie.\n" MSG_ERRPIPE "Błąd: nie można zduplikować procesu dla potoku.\n" MSG_BADUSAGE "Błąd: nieprawidłowe użycie polecenia.\n" - MSG_ALREADYCONNECTED "Już połączono z %1.\n" + MSG_ALREADYCONNECTED "Już połączono z %1!hs!.\n" MSG_WSAEINTR "Przerwano wywołanie funkcji.\n" MSG_WSAEBADF "WSAEBADF\n" MSG_WSAEACCESS "Odmowa uprawnień.\n" @@ -72,25 +72,25 @@ BEGIN MSG_WSATRY_AGAIN "Nie odnaleziono nieautorytatywnego hosta.\n" MSG_WSANO_RECOVERY "Ten błąd jest niemożliwy do naprawienia.\n" MSG_WSANO_DATA "Nazwa jest prawidłowa, brak rekordu danych żądanego typu.\n" - MSG_KEYNOVAL "[GLOBAL]: Brak wartości dla %1.\n" - MSG_KEYBADVAL "[GLOBAL]: Zła wartość dla %1.\n" - MSG_KEYBADSTRUCT "%1: Zła struktura.\n" - MSG_KEYBADCHARS "%1: Złe znaki? %1 -> %3.\n" - MSG_KEYUNEXPLINE "Nieoczekiwany wiersz ""%1"".\n" + MSG_KEYNOVAL "[GLOBAL]: Brak wartości dla %1!hs!.\n" + MSG_KEYBADVAL "[GLOBAL]: Zła wartość dla %1!hs!.\n" + MSG_KEYBADSTRUCT "%1!hs!: Zła struktura.\n" + MSG_KEYBADCHARS "%1!hs!: Złe znaki? %1!hs! -> %3!hs!.\n" + MSG_KEYUNEXPLINE "Nieoczekiwany wiersz ""%1!hs!"".\n" MSG_KEYUNEXPEOF "Nieoczekiwany koniec pliku.\n" - MSG_KEYUNEXPTOK "Nieoczekiwany token %1.\n" - MSG_KEYUNEXPTOKIN "Nieoczekiwany token w %1.\n" + MSG_KEYUNEXPTOK "Nieoczekiwany token %1!hs!.\n" + MSG_KEYUNEXPTOKIN "Nieoczekiwany token w %1!hs!.\n" MSG_KEYUNEXP "Nieoczekiwany koniec pliku lub tokena.\n" MSG_KEYNOGLOBAL "Brak definicji [GLOBAL]!\n" - MSG_KEYNOCONFIG "Brak [CONFIG %1].\n" - MSG_KEYUSECONFIG "Użyj konfiguracji: %1.\n" - MSG_KEYNOSWKEY "Brak klawisza przełączającego dla ""%1"".\n" + MSG_KEYNOCONFIG "Brak [CONFIG %1!hs!].\n" + MSG_KEYUSECONFIG "Użyj konfiguracji: %1!hs!.\n" + MSG_KEYNOSWKEY "Brak klawisza przełączającego dla ""%1!hs!"".\n" MSG_KEYCANNOTDEF "Nie można zdefiniować klawisza przełączającego dla domyślnej mapy klawiszy - zignorowano.\n" MSG_KEYDUPSWKEY "Duplikuj klawisz przełączający.\n" - MSG_KEYUNKNOWNMAP "Nieznana mapa klawiszy %1.\n" + MSG_KEYUNKNOWNMAP "Nieznana mapa klawiszy %1!hs!.\n" MSG_KEYNOCHARMAPS "Nie załadowano żadnych tablic znaków.\n" MSG_KEYNOKEYMAPS "Nie załadowano żadnych map klawiszy.\n" - MSG_KEYNUMMAPS "Istnieje %1 map.\n" + MSG_KEYNUMMAPS "Istnieje %1!hs! map.\n" MSG_KEYBADMAP "Zły numer mapy klawiszy - sróbuj 'keys display'\n" MSG_KEYMAPSWITCHED "mapa klawiszy przełączona.\n" END diff --git a/base/applications/network/telnet/lang/ro-RO.rc b/base/applications/network/telnet/lang/ro-RO.rc index 4e22517242b..05ac44a9620 100644 --- a/base/applications/network/telnet/lang/ro-RO.rc +++ b/base/applications/network/telnet/lang/ro-RO.rc @@ -10,25 +10,25 @@ BEGIN MSG_HELP "Comenzile pot fi abreviate. Acestea sunt:\n\ncl[ose] Închide conexiunea curentă.\nop[en] Conectează la un sit.\nq[uit] Ieșire din telnet.\n" MSG_HELP_1 "ke[ys] Afișează/alterează configurații de taste.\nse[t] Afișează/alterează opțiunile de configurare.\nz Suspendă.\n? h[elp] Afișează informațiile de utilizare.\n" MSG_INVCMD "Comandă nevalidă. Tastați ? pentru informații.\n" - MSG_ERROR "%1 a eșuat.\n" - MSG_INFO "%1\n" - MSG_WARNING "%1\n" - MSG_TRYING "Este încearcată %1.%2.%3.%4:%5...\n" - MSG_CONNECTED "Conectat la %1. Pentru ieșire apăsați ALT-%2.\n" + MSG_ERROR "%1!hs! a eșuat.\n" + MSG_INFO "%1!hs!\n" + MSG_WARNING "%1!hs!\n" + MSG_TRYING "Este încearcată %1!hs!.%2!hs!.%3!hs!.%4!hs!:%5!hs!...\n" + MSG_CONNECTED "Conectat la %1!hs!. Pentru ieșire apăsați ALT-%2!hs!.\n" MSG_TERMBYREM "Conexiune încheiată.\n" - MSG_KEYMAP "Este încarcată %1 de la %2.\n" + MSG_KEYMAP "Este încarcată %1!hs! de la %2!hs!.\n" MSG_ERRKEYMAP "Eșec la încărcarea configurației de taste.\n" - MSG_DUMPFILE "Sunt scrise informații de ieșire în fișierul %1.\n" - MSG_CONFIG "Este încarcată din %1 opțiunile de configurare.\n" - MSG_NOINI "Eroare la încărcarea fișierului de configurare %1.\nSunt încărcate opțiunile implicite.\n" - MSG_BADVAL "Avertisment: variabila %1 nu este validă.\n" + MSG_DUMPFILE "Sunt scrise informații de ieșire în fișierul %1!hs!.\n" + MSG_CONFIG "Este încarcată din %1!hs! opțiunile de configurare.\n" + MSG_NOINI "Eroare la încărcarea fișierului de configurare %1!hs!.\nSunt încărcate opțiunile implicite.\n" + MSG_BADVAL "Avertisment: variabila %1!hs! nu este validă.\n" MSG_NOSPAWN "Lansarea procesului a eșuat.\n" - MSG_RESOLVING "Este căutată gazda: %1..." - MSG_NOSERVICE "Serviciul TCP %1 nu a fost găsit.\n" - MSG_SIZEALIAS "Avertisment: dimensiunea de alias %1 este prea mare, va fi ignorată.\n" + MSG_RESOLVING "Este căutată gazda: %1!hs!..." + MSG_NOSERVICE "Serviciul TCP %1!hs! nu a fost găsit.\n" + MSG_SIZEALIAS "Avertisment: dimensiunea de alias %1!hs! este prea mare, va fi ignorată.\n" MSG_ERRPIPE "Eroare: lansarea procesului pentru conexiune a eșuat.\n" MSG_BADUSAGE "Eroare: utilizare nevalidă a comenzii.\n" - MSG_ALREADYCONNECTED "Conexiunea la %1 a fost deja stabilită.\n" + MSG_ALREADYCONNECTED "Conexiunea la %1!hs! a fost deja stabilită.\n" MSG_WSAEINTR "Apel de funcție întrerupt.\n" MSG_WSAEBADF "WSAEBADF\n" MSG_WSAEACCESS "Acces respins.\n" @@ -73,25 +73,25 @@ BEGIN MSG_WSATRY_AGAIN "Gazda ne-autoritată nu a fost găsită.\n" MSG_WSANO_RECOVERY "Eroare, stare nerecuperabilă.\n" MSG_WSANO_DATA "Numeele este valid, nu există date de tipul solicitat.\n" - MSG_KEYNOVAL "[GLOBAL]: Nu există valoare pentru %1.\n" - MSG_KEYBADVAL "[GLOBAL]: Valoarea pentru %1 este eronată.\n" - MSG_KEYBADSTRUCT "%1: Structură eronată.\n" - MSG_KEYBADCHARS "%1: Caractere eronate? %1 -> %3.\n" - MSG_KEYUNEXPLINE "Rând neprevăzut «%1».\n" + MSG_KEYNOVAL "[GLOBAL]: Nu există valoare pentru %1!hs!.\n" + MSG_KEYBADVAL "[GLOBAL]: Valoarea pentru %1!hs! este eronată.\n" + MSG_KEYBADSTRUCT "%1!hs!: Structură eronată.\n" + MSG_KEYBADCHARS "%1!hs!: Caractere eronate? %1!hs! -> %3!hs!.\n" + MSG_KEYUNEXPLINE "Rând neprevăzut «%1!hs!».\n" MSG_KEYUNEXPEOF "Sfârșit neprevăzut de fișier.\n" - MSG_KEYUNEXPTOK "Simbol neprevăzut %1.\n" - MSG_KEYUNEXPTOKIN "Simbol neprevăzut la %1.\n" + MSG_KEYUNEXPTOK "Simbol neprevăzut %1!hs!.\n" + MSG_KEYUNEXPTOKIN "Simbol neprevăzut la %1!hs!.\n" MSG_KEYUNEXP "Sfârșit neprevăzut de fișier sau simbol.\n" MSG_KEYNOGLOBAL "Nu există definiție pentru [GLOBAL]!\n" - MSG_KEYNOCONFIG "Nu există [CONFIG %1].\n" - MSG_KEYUSECONFIG "Utilizare configurație: %1.\n" - MSG_KEYNOSWKEY "Nu există tastă de comutare pentru «%1».\n" + MSG_KEYNOCONFIG "Nu există [CONFIG %1!hs!].\n" + MSG_KEYUSECONFIG "Utilizare configurație: %1!hs!.\n" + MSG_KEYNOSWKEY "Nu există tastă de comutare pentru «%1!hs!».\n" MSG_KEYCANNOTDEF "În configurația implicită nu pot fi definite taste de comutare, vor fi ignorate.\n" MSG_KEYDUPSWKEY "Duplicare tastă de comutare.\n" - MSG_KEYUNKNOWNMAP "%1 este o configurație de taste necunoscută.\n" + MSG_KEYUNKNOWNMAP "%1!hs! este o configurație de taste necunoscută.\n" MSG_KEYNOCHARMAPS "Nu au fost încărcate configurații de caractere.\n" MSG_KEYNOKEYMAPS "Nu au fost încărcate configurații de taste.\n" - MSG_KEYNUMMAPS "În total există %1 configurații.\n" + MSG_KEYNUMMAPS "În total există %1!hs! configurații.\n" MSG_KEYBADMAP "Număr de configurație de taste nevalid, încercați «keys display»\n" MSG_KEYMAPSWITCHED "Configurația de taste a fost comutată.\n" END diff --git a/base/applications/network/telnet/lang/ru-RU.rc b/base/applications/network/telnet/lang/ru-RU.rc index 007c60c1f78..423f3f58105 100644 --- a/base/applications/network/telnet/lang/ru-RU.rc +++ b/base/applications/network/telnet/lang/ru-RU.rc @@ -9,25 +9,25 @@ BEGIN MSG_HELP "Команды можно сократить. Команды:\n\ncl[ose] закрыть текущее соединение\nop[en] подключиться к узлу\nq[uit] выйти из telnet\n" MSG_HELP_1 "ke[ys] изменить/показать раскладку\nse[t] изменить/показать опции\nz приостановить\n? h[elp] отобразить справку\n" MSG_INVCMD "Неверная команда. Введите ? для справки.\n" - MSG_ERROR "%1 не удалось.\n" - MSG_INFO "%1\n" - MSG_WARNING "%1\n" - MSG_TRYING "Попытка %1.%2.%3.%4:%5...\n" - MSG_CONNECTED "Подключение к %1. Для выхода нажмите ALT-%2.\n" + MSG_ERROR "%1!hs! не удалось.\n" + MSG_INFO "%1!hs!\n" + MSG_WARNING "%1!hs!\n" + MSG_TRYING "Попытка %1!hs!.%2!hs!.%3!hs!.%4!hs!:%5!hs!...\n" + MSG_CONNECTED "Подключение к %1!hs!. Для выхода нажмите ALT-%2!hs!.\n" MSG_TERMBYREM "Соединение прервано.\n" - MSG_KEYMAP "Загрузка %1 из %2.\n" + MSG_KEYMAP "Загрузка %1!hs! из %2!hs!.\n" MSG_ERRKEYMAP "Ошибка при загрузке раскладки.\n" - MSG_DUMPFILE "Запись вывода в файл %1.\n" - MSG_CONFIG "Загрузка параметров из %1.\n" - MSG_NOINI "Ошибка загрузки параметров из %1.\nЗагрузка параметров по умолчанию.\n" - MSG_BADVAL "Предупреждение: неправильная переменная %1.\n" + MSG_DUMPFILE "Запись вывода в файл %1!hs!.\n" + MSG_CONFIG "Загрузка параметров из %1!hs!.\n" + MSG_NOINI "Ошибка загрузки параметров из %1!hs!.\nЗагрузка параметров по умолчанию.\n" + MSG_BADVAL "Предупреждение: неправильная переменная %1!hs!.\n" MSG_NOSPAWN "Невозможно породить процесс.\n" - MSG_RESOLVING "Поиск узла: %1..." - MSG_NOSERVICE "TCP служба не найдена: %1.\n" - MSG_SIZEALIAS "Внимание: Размер псевдонима %1 слишком большой, игнорирование.\n" + MSG_RESOLVING "Поиск узла: %1!hs!..." + MSG_NOSERVICE "TCP служба не найдена: %1!hs!.\n" + MSG_SIZEALIAS "Внимание: Размер псевдонима %1!hs! слишком большой, игнорирование.\n" MSG_ERRPIPE "Ошибка: невозможно породить процесс для пайпа.\n" MSG_BADUSAGE "Ошибка: недопустимое использование команды.\n" - MSG_ALREADYCONNECTED "Уже подключен к %1.\n" + MSG_ALREADYCONNECTED "Уже подключен к %1!hs!.\n" MSG_WSAEINTR "Вызов функции прерван.\n" MSG_WSAEBADF "WSAEBADF\n" MSG_WSAEACCESS "Отказано в доступе.\n" @@ -72,25 +72,25 @@ BEGIN MSG_WSATRY_AGAIN "Ненадежный узел не найден.\n" MSG_WSANO_RECOVERY "Это неустранимая ошибка.\n" MSG_WSANO_DATA "Действительное имя, без записи данных требуемого типаe.\n" - MSG_KEYNOVAL "[GLOBAL]: Нет значения для %1.\n" - MSG_KEYBADVAL "[GLOBAL]: Неверное значение для %1.\n" - MSG_KEYBADSTRUCT "%1: Неправильная структура.\n" - MSG_KEYBADCHARS "%1: Неверные символы? %1 -> %3.\n" - MSG_KEYUNEXPLINE "Неожиданная строка ""%1"".\n" + MSG_KEYNOVAL "[GLOBAL]: Нет значения для %1!hs!.\n" + MSG_KEYBADVAL "[GLOBAL]: Неверное значение для %1!hs!.\n" + MSG_KEYBADSTRUCT "%1!hs!: Неправильная структура.\n" + MSG_KEYBADCHARS "%1!hs!: Неверные символы? %1!hs! -> %3!hs!.\n" + MSG_KEYUNEXPLINE "Неожиданная строка ""%1!hs!"".\n" MSG_KEYUNEXPEOF "Неожиданный конец файла.\n" - MSG_KEYUNEXPTOK "Неожиданный символ %1.\n" - MSG_KEYUNEXPTOKIN "Неожиданный символ в %1.\n" + MSG_KEYUNEXPTOK "Неожиданный символ %1!hs!.\n" + MSG_KEYUNEXPTOKIN "Неожиданный символ в %1!hs!.\n" MSG_KEYUNEXP "Неожиданный конец файла или символ.\n" MSG_KEYNOGLOBAL "[GLOBAL] Не определено!\n" - MSG_KEYNOCONFIG "Нет [CONFIG %1].\n" - MSG_KEYUSECONFIG "Используются настройки: %1.\n" - MSG_KEYNOSWKEY "Нет клавиши переключения для ""%1"".\n" + MSG_KEYNOCONFIG "Нет [CONFIG %1!hs!].\n" + MSG_KEYUSECONFIG "Используются настройки: %1!hs!.\n" + MSG_KEYNOSWKEY "Нет клавиши переключения для ""%1!hs!"".\n" MSG_KEYCANNOTDEF "Нельзя указать клавишу изменения раскладки клавиатуры по умолчанию – игнорирование.\n" MSG_KEYDUPSWKEY "Эта кнопка уже назначина.\n" - MSG_KEYUNKNOWNMAP "Неизвестная раскладка %1.\n" + MSG_KEYUNKNOWNMAP "Неизвестная раскладка %1!hs!.\n" MSG_KEYNOCHARMAPS "Не загружена таблица символов.\n" MSG_KEYNOKEYMAPS "Не загружена раскладка.\n" - MSG_KEYNUMMAPS "Раскладка %1 уже существует.\n" + MSG_KEYNUMMAPS "Раскладка %1!hs! уже существует.\n" MSG_KEYBADMAP "Неправильный номер раскладки - попробуйте 'keys display'\n" MSG_KEYMAPSWITCHED "раскладка переключена.\n" END diff --git a/base/applications/network/telnet/lang/tr-TR.rc b/base/applications/network/telnet/lang/tr-TR.rc index 77c29b4c856..c051774738c 100644 --- a/base/applications/network/telnet/lang/tr-TR.rc +++ b/base/applications/network/telnet/lang/tr-TR.rc @@ -11,25 +11,25 @@ BEGIN MSG_HELP "Komutlar kısaltılmış olabilir. Komutlar:\n\ncl[ose] Şimdiki bağlantıyı kapat.\nop[en] Bir siteye bağlan.\nq[uit] Telnet'ten çık.\n" MSG_HELP_1 "ke[ys] Tuş haritasını değiştirir ya da görüntüler. (Seçenekleri görmek için keys yazınız.)\nse[t] Yapılandırma seçeneklerini görüntüler ya da değiştirir.\nz Askıya al.\n? h[elp] Yardım bilgisini yazdır.\n" MSG_INVCMD "Geçersiz komut. Yardım için ? yazınız.\n" - MSG_ERROR "%1 başarısız.\n" - MSG_INFO "%1\n" - MSG_WARNING "%1\n" - MSG_TRYING "Deneniyor: %1.%2.%3.%4:%5...\n" - MSG_CONNECTED "%1 anabilgisayarına bağlandı. Çıkış tuş kombinasyonu ALT-%2.\n" + MSG_ERROR "%1!hs! başarısız.\n" + MSG_INFO "%1!hs!\n" + MSG_WARNING "%1!hs!\n" + MSG_TRYING "Deneniyor: %1!hs!.%2!hs!.%3!hs!.%4!hs!:%5!hs!...\n" + MSG_CONNECTED "%1!hs! anabilgisayarına bağlandı. Çıkış tuş kombinasyonu ALT-%2!hs!.\n" MSG_TERMBYREM "Bağlantı sonlandırıldı.\n" - MSG_KEYMAP "%2'den %1 yükleniyor.\n" + MSG_KEYMAP "%2!hs!'den %1!hs! yükleniyor.\n" MSG_ERRKEYMAP "Klavye yerleşimi yüklemede hata.\n" - MSG_DUMPFILE "%1 dosyasına çıktı yazdırılıyor.\n" - MSG_CONFIG "%1'den yapılandırma ayarları yükleniyor.\n" - MSG_NOINI "%1 yapılandırma dosyasına yüklemede hata.\nVarsayılan ayarlar yükleniyor.\n" - MSG_BADVAL "Uyarı: Geçersiz değişken (%1).\n" + MSG_DUMPFILE "%1!hs! dosyasına çıktı yazdırılıyor.\n" + MSG_CONFIG "%1!hs!'den yapılandırma ayarları yükleniyor.\n" + MSG_NOINI "%1!hs! yapılandırma dosyasına yüklemede hata.\nVarsayılan ayarlar yükleniyor.\n" + MSG_BADVAL "Uyarı: Geçersiz değişken (%1!hs!).\n" MSG_NOSPAWN "İşlem oluşturulamıyor.\n" - MSG_RESOLVING "Anabilgisayara bakılıyor: %1..." - MSG_NOSERVICE "%1 TCP hizmeti bulunamadı.\n" - MSG_SIZEALIAS "Uyarı: %1 takma adının büyüklüğü çok büyük, yok sayılıyor.\n" + MSG_RESOLVING "Anabilgisayara bakılıyor: %1!hs!..." + MSG_NOSERVICE "%1!hs! TCP hizmeti bulunamadı.\n" + MSG_SIZEALIAS "Uyarı: %1!hs! takma adının büyüklüğü çok büyük, yok sayılıyor.\n" MSG_ERRPIPE "Hata: Boru için işlem oluşturulamıyor.\n" MSG_BADUSAGE "Hata: Komutun kullanımı geçersiz.\n" - MSG_ALREADYCONNECTED "%1'e zaten bağlanılmış.\n" + MSG_ALREADYCONNECTED "%1!hs!'e zaten bağlanılmış.\n" MSG_WSAEINTR "Fonksiyon çağrısı kesildi.\n" MSG_WSAEBADF "WSAEBADF\n" MSG_WSAEACCESS "İzin geri çevrildi.\n" @@ -74,25 +74,25 @@ BEGIN MSG_WSATRY_AGAIN "Yetkili olmayan anabilgisayar bulunamadı.\n" MSG_WSANO_RECOVERY "Bu bir karşılanamayan hatadır.\n" MSG_WSANO_DATA "Geçerli ad, istenilen tür kaydı verisi yok.\n" - MSG_KEYNOVAL "[GENEL]: %1 için değer yok.\n" - MSG_KEYBADVAL "[GENEL]: %1 için geçersiz değer.\n" - MSG_KEYBADSTRUCT "%1: Geçersiz yapı.\n" - MSG_KEYBADCHARS "%1: Geçersiz karakterler? %1 -> %3.\n" - MSG_KEYUNEXPLINE "Beklenmeyen satır: ""%1"".\n" + MSG_KEYNOVAL "[GENEL]: %1!hs! için değer yok.\n" + MSG_KEYBADVAL "[GENEL]: %1!hs! için geçersiz değer.\n" + MSG_KEYBADSTRUCT "%1!hs!: Geçersiz yapı.\n" + MSG_KEYBADCHARS "%1!hs!: Geçersiz karakterler? %1!hs! -> %3!hs!.\n" + MSG_KEYUNEXPLINE "Beklenmeyen satır: ""%1!hs!"".\n" MSG_KEYUNEXPEOF "Beklemeyen dosya sonu.\n" - MSG_KEYUNEXPTOK "Beklenmeyen simge: %1.\n" - MSG_KEYUNEXPTOKIN "%1'de beklenmeyen simge.\n" + MSG_KEYUNEXPTOK "Beklenmeyen simge: %1!hs!.\n" + MSG_KEYUNEXPTOKIN "%1!hs!'de beklenmeyen simge.\n" MSG_KEYUNEXP "Beklenmeyen dosya sonu ya da simge.\n" MSG_KEYNOGLOBAL "[GENEL] tanımlama yok!\n" - MSG_KEYNOCONFIG "[CONFIG %1] yok.\n" - MSG_KEYUSECONFIG "Yapılandırmayı kullan: %1.\n" - MSG_KEYNOSWKEY """%1"" için geçiş anahtarı yok.\n" + MSG_KEYNOCONFIG "[CONFIG %1!hs!] yok.\n" + MSG_KEYUSECONFIG "Yapılandırmayı kullan: %1!hs!.\n" + MSG_KEYNOSWKEY """%1!hs!"" için geçiş anahtarı yok.\n" MSG_KEYCANNOTDEF "Varsayılan anahtar haritası için geçiş anahtarı tanımlayamazsınız - yok sayıldı.\n" MSG_KEYDUPSWKEY "Aynı geçiş anahtarı.\n" - MSG_KEYUNKNOWNMAP "Bilinmeyen anahtar haritası: %1.\n" + MSG_KEYUNKNOWNMAP "Bilinmeyen anahtar haritası: %1!hs!.\n" MSG_KEYNOCHARMAPS "Bir karakter haritası yüklenmedi.\n" MSG_KEYNOKEYMAPS "Bir anahtar haritası yüklenmedi.\n" - MSG_KEYNUMMAPS "Burada %1 harita var.\n" + MSG_KEYNUMMAPS "Burada %1!hs! harita var.\n" MSG_KEYBADMAP "Geçersiz anahtar haritası numarası, ""keys display""ı deneyiniz.\n" MSG_KEYMAPSWITCHED "Anahtar haritasına geçildi.\n" END diff --git a/base/applications/network/telnet/lang/zh-CN.rc b/base/applications/network/telnet/lang/zh-CN.rc index b9d70f10a9a..e96ce2b7b8b 100644 --- a/base/applications/network/telnet/lang/zh-CN.rc +++ b/base/applications/network/telnet/lang/zh-CN.rc @@ -17,25 +17,25 @@ BEGIN MSG_HELP "命令可以被简写。命令有：\n\ncl[ose] 关闭当前连接\nop[en] 连接到一个站点\nq[uit] 退出 telnet\n" MSG_HELP_1 "ke[ys] 修改或显示按键映射（写入一些键来查看选项）\nse[t] 显示或修改配置选项\nz 暂停\n? h[elp] 打印帮助信息\n" MSG_INVCMD "无效命令。输入 ? 获得帮助。\n" - MSG_ERROR "%1 失败。\n" - MSG_INFO "%1\n" - MSG_WARNING "%1\n" - MSG_TRYING "正在尝试 %1.%2.%3.%4:%5...\n" - MSG_CONNECTED "已连接到 %1。Escape 键是 ALT-%2。\n" + MSG_ERROR "%1!hs! 失败。\n" + MSG_INFO "%1!hs!\n" + MSG_WARNING "%1!hs!\n" + MSG_TRYING "正在尝试 %1!hs!.%2!hs!.%3!hs!.%4!hs!:%5!hs!...\n" + MSG_CONNECTED "已连接到 %1!hs!。Escape 键是 ALT-%2!hs!。\n" MSG_TERMBYREM "连接结束。\n" - MSG_KEYMAP "正在从 %2 加载 %1。\n" + MSG_KEYMAP "正在从 %2!hs! 加载 %1!hs!。\n" MSG_ERRKEYMAP "加载按键映射时发生错误。\n" - MSG_DUMPFILE "正在将输出写入到文件 %1 中。\n" - MSG_CONFIG "正在从 %1 中加载配置选项。\n" - MSG_NOINI "从配置文件 %1 中加载发生错误。\n正在加载默认选项。\n" - MSG_BADVAL "警告：无效变量 %1。\n" + MSG_DUMPFILE "正在将输出写入到文件 %1!hs! 中。\n" + MSG_CONFIG "正在从 %1!hs! 中加载配置选项。\n" + MSG_NOINI "从配置文件 %1!hs! 中加载发生错误。\n正在加载默认选项。\n" + MSG_BADVAL "警告：无效变量 %1!hs!。\n" MSG_NOSPAWN "无法创建进程。\n" - MSG_RESOLVING "正在查找主机：%1..." - MSG_NOSERVICE "无法找到 TCP 服务 %1。\n" - MSG_SIZEALIAS "警告：别名 %1 过大，已忽略。\n" + MSG_RESOLVING "正在查找主机：%1!hs!..." + MSG_NOSERVICE "无法找到 TCP 服务 %1!hs!。\n" + MSG_SIZEALIAS "警告：别名 %1!hs! 过大，已忽略。\n" MSG_ERRPIPE "错误：无法为管道创建进程。\n" MSG_BADUSAGE "错误：命令的用法无效。\n" - MSG_ALREADYCONNECTED "已经连接到 %1。\n" + MSG_ALREADYCONNECTED "已经连接到 %1!hs!。\n" MSG_WSAEINTR "函数调用已被中断。\n" MSG_WSAEBADF "WSAEBADF\n" MSG_WSAEACCESS "拒绝访问。\n" @@ -80,25 +80,25 @@ BEGIN MSG_WSATRY_AGAIN "未找到非授权主机。\n" MSG_WSANO_RECOVERY "这是一个无法恢复的错误。\n" MSG_WSANO_DATA "名称有效，但是没有与请求类型相同的数据记录。\n" - MSG_KEYNOVAL "[全局]：没有 %1 的值。\n" - MSG_KEYBADVAL "[全局]：%1 的值有错误。\n" - MSG_KEYBADSTRUCT "%1：错误的结构。\n" - MSG_KEYBADCHARS "%1：错误的字符？%1 -> %3。\n" - MSG_KEYUNEXPLINE "未预料的行 ""%1""。\n" + MSG_KEYNOVAL "[全局]：没有 %1!hs! 的值。\n" + MSG_KEYBADVAL "[全局]：%1!hs! 的值有错误。\n" + MSG_KEYBADSTRUCT "%1!hs!：错误的结构。\n" + MSG_KEYBADCHARS "%1!hs!：错误的字符？%1!hs! -> %3!hs!。\n" + MSG_KEYUNEXPLINE "未预料的行 ""%1!hs!""。\n" MSG_KEYUNEXPEOF "未预料的文件结束。\n" - MSG_KEYUNEXPTOK "未预料的令牌 %1。\n" - MSG_KEYUNEXPTOKIN "未预料的 %1 中的令牌。\n" + MSG_KEYUNEXPTOK "未预料的令牌 %1!hs!。\n" + MSG_KEYUNEXPTOKIN "未预料的 %1!hs! 中的令牌。\n" MSG_KEYUNEXP "未预料的文件或令牌结束。\n" MSG_KEYNOGLOBAL "没有 [全局] 定义！\n" - MSG_KEYNOCONFIG "没有 [配置 %1]。\n" - MSG_KEYUSECONFIG "使用配置：%1。\n" - MSG_KEYNOSWKEY "没有“%1”的切换键。\n" + MSG_KEYNOCONFIG "没有 [配置 %1!hs!]。\n" + MSG_KEYUSECONFIG "使用配置：%1!hs!。\n" + MSG_KEYNOSWKEY "没有“%1!hs!”的切换键。\n" MSG_KEYCANNOTDEF "您不能定义默认按键映射的切换键 - 已忽略。\n" MSG_KEYDUPSWKEY "重复的切换键。\n" - MSG_KEYUNKNOWNMAP "未知的按键映射 %1。\n" + MSG_KEYUNKNOWNMAP "未知的按键映射 %1!hs!。\n" MSG_KEYNOCHARMAPS "没有加载的字符映射。\n" MSG_KEYNOKEYMAPS "没有加载的按键映射。\n" - MSG_KEYNUMMAPS "有 %1 个映射。\n" + MSG_KEYNUMMAPS "有 %1!hs! 个映射。\n" MSG_KEYBADMAP "错误的按键映射码 - 请尝试“keys display”\n" MSG_KEYMAPSWITCHED "按键映射已经切换。\n" END diff --git a/base/applications/network/telnet/lang/zh-TW.rc b/base/applications/network/telnet/lang/zh-TW.rc index 8be539d105d..56cd84ecbf8 100644 --- a/base/applications/network/telnet/lang/zh-TW.rc +++ b/base/applications/network/telnet/lang/zh-TW.rc @@ -16,25 +16,25 @@ BEGIN MSG_HELP "命令可以被簡寫。命令有:\n\ncl[ose] 關閉目前連線\nop[en] 連線到一個網站\nq[uit] 退出 telnet\n" MSG_HELP_1 "ke[ys] 修改或顯示按鍵映射 (寫入一些鍵來查看選項)\nse[t] 顯示或修改配置選項\nz 暫停\n? h[elp] 列印說明資訊\n" MSG_INVCMD "無效的命令。輸入 ? 以取得說明。\n" - MSG_ERROR "%1 失敗。\n" - MSG_INFO "%1\n" - MSG_WARNING "%1\n" - MSG_TRYING "正在嘗試 %1.%2.%3.%4:%5...\n" - MSG_CONNECTED "已經連線到 %1。Escape 鍵是 ALT-%2.\n" + MSG_ERROR "%1!hs! 失敗。\n" + MSG_INFO "%1!hs!\n" + MSG_WARNING "%1!hs!\n" + MSG_TRYING "正在嘗試 %1!hs!.%2!hs!.%3!hs!.%4!hs!:%5!hs!...\n" + MSG_CONNECTED "已經連線到 %1!hs!。Escape 鍵是 ALT-%2!hs!.\n" MSG_TERMBYREM "連線結束。\n" - MSG_KEYMAP "正在從 %2 載入 %1。\n" + MSG_KEYMAP "正在從 %2!hs! 載入 %1!hs!。\n" MSG_ERRKEYMAP "載入按鍵映射時發生錯誤。\n" - MSG_DUMPFILE "正在將輸出寫入到檔案 %1 中。\n" - MSG_CONFIG "正在從 %1 中載入配置選項。\n" - MSG_NOINI "從配置檔案 %1 中載入發生錯誤。\n正在載入預設選項。\n" - MSG_BADVAL "警告: 無效的變量 %1。\n" + MSG_DUMPFILE "正在將輸出寫入到檔案 %1!hs! 中。\n" + MSG_CONFIG "正在從 %1!hs! 中載入配置選項。\n" + MSG_NOINI "從配置檔案 %1!hs! 中載入發生錯誤。\n正在載入預設選項。\n" + MSG_BADVAL "警告: 無效的變量 %1!hs!。\n" MSG_NOSPAWN "無法建立進程。\n" - MSG_RESOLVING "正在查找主機: %1..." - MSG_NOSERVICE "無法找到 TCP 服務 %1。\n" - MSG_SIZEALIAS "警告: 别名 %1 太大了，正在忽略。\n" + MSG_RESOLVING "正在查找主機: %1!hs!..." + MSG_NOSERVICE "無法找到 TCP 服務 %1!hs!。\n" + MSG_SIZEALIAS "警告: 别名 %1!hs! 太大了，正在忽略。\n" MSG_ERRPIPE "錯誤: 無法為管道建立進程。\n" MSG_BADUSAGE "錯誤: 無效的命令用法。\n" - MSG_ALREADYCONNECTED "已經連線到 %1。\n" + MSG_ALREADYCONNECTED "已經連線到 %1!hs!。\n" MSG_WSAEINTR "中斷的函數調用。\n" MSG_WSAEBADF "WSAEBADF\n" MSG_WSAEACCESS "拒絕存取。\n" @@ -79,25 +79,25 @@ BEGIN MSG_WSATRY_AGAIN "找不到非授權主機。\n" MSG_WSANO_RECOVERY "這是一個無法恢復的錯誤。\n" MSG_WSANO_DATA "名稱有效，但沒有請求數據記錄的類型。\n" - MSG_KEYNOVAL "[全域]: 沒有 %1 的值。\n" - MSG_KEYBADVAL "[全域]: %1 的值有錯誤。\n" - MSG_KEYBADSTRUCT "%1: 錯誤的結構。\n" - MSG_KEYBADCHARS "%1: 錯誤的字符？%1 -> %3。\n" - MSG_KEYUNEXPLINE "未預期的行 ""%1""。\n" + MSG_KEYNOVAL "[全域]: 沒有 %1!hs! 的值。\n" + MSG_KEYBADVAL "[全域]: %1!hs! 的值有錯誤。\n" + MSG_KEYBADSTRUCT "%1!hs!: 錯誤的結構。\n" + MSG_KEYBADCHARS "%1!hs!: 錯誤的字符？%1!hs! -> %3!hs!。\n" + MSG_KEYUNEXPLINE "未預期的行 ""%1!hs!""。\n" MSG_KEYUNEXPEOF "未預期的檔案結尾。\n" - MSG_KEYUNEXPTOK "未預期的權杖 %1。\n" - MSG_KEYUNEXPTOKIN "在 %1 中出現未預期的權杖。\n" + MSG_KEYUNEXPTOK "未預期的權杖 %1!hs!。\n" + MSG_KEYUNEXPTOKIN "在 %1!hs! 中出現未預期的權杖。\n" MSG_KEYUNEXP "未預期的檔案結尾或權杖。\n" MSG_KEYNOGLOBAL "沒有 [全域] 定義！\n" - MSG_KEYNOCONFIG "沒有 [配置 %1]。\n" - MSG_KEYUSECONFIG "使用配置: %1。\n" - MSG_KEYNOSWKEY "沒有 ""%1"" 的切換鍵。\n" + MSG_KEYNOCONFIG "沒有 [配置 %1!hs!]。\n" + MSG_KEYUSECONFIG "使用配置: %1!hs!。\n" + MSG_KEYNOSWKEY "沒有 ""%1!hs!"" 的切換鍵。\n" MSG_KEYCANNOTDEF "您不能定義預設按鍵映射的切換鍵 - 已略過。\n" MSG_KEYDUPSWKEY "重複的切換鍵。\n" - MSG_KEYUNKNOWNMAP "未知的按鍵映射 %1。\n" + MSG_KEYUNKNOWNMAP "未知的按鍵映射 %1!hs!。\n" MSG_KEYNOCHARMAPS "沒有已載入的字符映射。\n" MSG_KEYNOKEYMAPS "沒有已載入的按鍵映射。\n" - MSG_KEYNUMMAPS "有 %1 個映射。\n" + MSG_KEYNUMMAPS "有 %1!hs! 個映射。\n" MSG_KEYBADMAP "錯誤的按鍵映射碼 - 請嘗試 'keys display'\n" MSG_KEYMAPSWITCHED "按鍵映射已經切換。\n" END diff --git a/base/applications/network/telnet/precomp.h b/base/applications/network/telnet/precomp.h index c678b12c462..bb215f3f71d 100644 --- a/base/applications/network/telnet/precomp.h +++ b/base/applications/network/telnet/precomp.h @@ -9,6 +9,7 @@ #include <winbase.h> #include <winuser.h> #include <wincon.h> +#include <winnls.h> #define _INC_WINDOWS #include <winsock.h> diff --git a/base/applications/network/telnet/src/tnerror.cpp b/base/applications/network/telnet/src/tnerror.cpp index 5278cd266cf..82fda0b2180 100644 --- a/base/applications/network/telnet/src/tnerror.cpp +++ b/base/applications/network/telnet/src/tnerror.cpp @@ -81,6 +81,47 @@ int printit(const char * it){ return 0; } +#ifdef __REACTOS__ +int wprintit(LPCWSTR it) +{ + DWORD numwritten; + if (!ini.get_output_redir()) + { + if (!WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), + it, wcslen(it), &numwritten, NULL)) + { + return -1; + } + } + else + { + // calculate the number of bytes needed to store the UTF-8 string + int cbMultibyte = WideCharToMultiByte(CP_UTF8, 0, it, -1, NULL, 0, NULL, NULL); + if (cbMultibyte == 0) + return 0; + if (cbMultibyte < 0) + return -1; + // allocate the buffer for the UTF-8 string + char* szBuffer = new char[cbMultibyte]; + if (!szBuffer) + return -1; + + bool bSuccess = false; + if (WideCharToMultiByte(CP_UTF8, 0, it, -1, szBuffer, cbMultibyte, NULL, NULL) && + WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), + szBuffer, cbMultibyte, &numwritten, NULL)) + { + bSuccess = true; + } + + delete[] szBuffer; + if (!bSuccess) + return -1; + } + return 0; +} +#endif + int printm(LPTSTR szModule, BOOL fSystem, DWORD dwMessageId, ...) { int Result = 0; @@ -91,7 +132,23 @@ int printm(LPTSTR szModule, BOOL fSystem, DWORD dwMessageId, ...) va_list Ellipsis; va_start(Ellipsis, dwMessageId); +#ifdef __REACTOS__ + LPWSTR pszMessage = NULL; + DWORD dwMessage = 0; + if(fSystem) { + dwMessage = FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | + FORMAT_MESSAGE_FROM_SYSTEM, hModule, dwMessageId, + LANG_USER_DEFAULT, (LPWSTR)&pszMessage, 128, &Ellipsis); + } else { + // we will use a string table. + WCHAR wszString[256]; + if(LoadStringW(0, dwMessageId, wszString, sizeof(wszString) / sizeof(*wszString))) + dwMessage = FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | + FORMAT_MESSAGE_FROM_STRING, wszString, dwMessageId, + LANG_USER_DEFAULT, (LPWSTR)&pszMessage, sizeof(wszString) / sizeof(*wszString), &Ellipsis); + } +#else LPTSTR pszMessage = 0; DWORD dwMessage = 0; if(fSystem) { @@ -106,6 +163,7 @@ int printm(LPTSTR szModule, BOOL fSystem, DWORD dwMessageId, ...) FORMAT_MESSAGE_FROM_STRING, szString, dwMessageId, LANG_USER_DEFAULT, (LPTSTR)&pszMessage, 256, &Ellipsis); } +#endif va_end(Ellipsis); @@ -113,8 +171,11 @@ int printm(LPTSTR szModule, BOOL fSystem, DWORD dwMessageId, ...) FreeLibrary(hModule); if (dwMessage) { - +#ifdef __REACTOS__ + Result = wprintit(pszMessage); +#else Result = printit(pszMessage); +#endif LocalFree(pszMessage); }

2 weeks, 6 days

[reactos] 01/01: [INPUT] Update German (de-DE) translation (#7518)

by Václav Zouzalík

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cef5aa294ece41bd3cad8… commit cef5aa294ece41bd3cad897be8e487f215f0440f Author: Václav Zouzalík <Vaclav.Zouzalik(a)seznam.cz> AuthorDate: Thu Jan 16 18:21:53 2025 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Jan 16 18:21:53 2025 +0100 [INPUT] Update German (de-DE) translation (#7518) --- dll/cpl/input/lang/de-DE.rc | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/dll/cpl/input/lang/de-DE.rc b/dll/cpl/input/lang/de-DE.rc index 4e55706aa26..05b53b30065 100644 --- a/dll/cpl/input/lang/de-DE.rc +++ b/dll/cpl/input/lang/de-DE.rc @@ -1,3 +1,14 @@ +/* + * PROJECT: ReactOS Language Control Panel + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: German resource file + * TRANSLATORS: Copyright 2007-2014 Daniel Reimer <reimer.daniel(a)freenet.de> + * Copyright 2008 Colin Finck <colin(a)reactos.org> + * Copyright 2008-2011 Matthias Kupfer <mkupfer(a)reactos.org> + * Copyright 2010 Sven Knurr (tux.) <forenkrams(a)tuxproject.de> + * Copyright 2024 Václav Zouzalík (Venca24) <vaclav.zouzalik(a)seznam.cz> + */ + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL IDD_PROPPAGESETTINGS DIALOGEX 0, 0, 254, 228 @@ -5,10 +16,10 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Einstellungen" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Default input &language", -1, 5, 5, 246, 55 - LTEXT "Select one of the installed input languages to use when your computer starts.", -1, 15, 15, 230, 23 + GROUPBOX "&Standard-Eingabesprache", -1, 5, 5, 246, 55 + LTEXT "Wählen Sie eine der installierten Eingabesprachen aus, die beim Start Ihres Computers verwendet werden soll.", -1, 15, 15, 230, 23 COMBOBOX IDC_DEFAULT_LANGUAGE, 15, 40, 230, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - GROUPBOX "&Installed services", -1, 5, 65, 246, 125 + GROUPBOX "&Installierte Dienste", -1, 5, 65, 246, 125 LTEXT "Wählen Sie die Dienste aus, die Sie für die Eingabesprachen in der Liste verwenden wollen. Verwenden Sie ""Hinzufügen"" und ""Entfernen"", um die Liste zu bearbeiten.", -1, 15, 78, 230, 25 CONTROL "", IDC_KEYLAYOUT_LIST, "SysTreeView32", TVS_SHOWSELALWAYS | TVS_DISABLEDRAGDROP | WS_BORDER | WS_VSCROLL | WS_TABSTOP, 15, 105, 155, 80 PUSHBUTTON "&Hinzufügen...", IDC_ADD_BUTTON, 175, 105, 70, 14 @@ -110,7 +121,7 @@ BEGIN IDS_CTRL_SHIFT "Strg+Umschalt" IDS_LEFT_ALT_SHIFT "Alt links+Umschalt" IDS_SWITCH_BET_INLANG "Zwischen Eingabesprachen umschalten" - IDS_REBOOT_NOW "You have to restart the system for the settings to take effect. Reboot now?" + IDS_REBOOT_NOW "Damit die Einstellungen wirksam werden, müssen Sie das System neu starten. Jetzt neu starten?" END STRINGTABLE

2 weeks, 6 days

[reactos] 01/01: [MAZESCR] Improve Romanian (ro-RO) translation (#7364)

by Andrei Miloiu

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fe93a3f9ed6ca036879a7… commit fe93a3f9ed6ca036879a7d9cfc80c7085f6016b9 Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Thu Jan 16 19:20:40 2025 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Jan 16 18:20:40 2025 +0100 [MAZESCR] Improve Romanian (ro-RO) translation (#7364) Improvements based on recent Romanian translation document revision 06e89b2. This file was not translated in Romanian language in any Windows version (neither XP/2k3+, nor in the previous ones). I tried to translate this file as close as possible in the way I did in the previous PRs. --- .../screensavers/mazescr/lang/ro-RO.rc | 40 +++++++++++++--------- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/modules/rosapps/applications/screensavers/mazescr/lang/ro-RO.rc b/modules/rosapps/applications/screensavers/mazescr/lang/ro-RO.rc index 2dd10b9d67a..b943181d4f1 100644 --- a/modules/rosapps/applications/screensavers/mazescr/lang/ro-RO.rc +++ b/modules/rosapps/applications/screensavers/mazescr/lang/ro-RO.rc @@ -1,26 +1,32 @@ -/* Translator: Ștefan Fulea (stefan dot fulea at mail dot com) */ + /* + * PROJECT: Maze ScreenSaver + * LICENSE: HPND (https://spdx.org/licenses/HPND) + * PURPOSE: Romanian resource file + * TRANSLATORS: Copyright 2011-2018 Ștefan Fulea <stefan.fulea(a)mail.com> + * Copyright 2024 Andrei Miloiu <miloiuandrei(a)gmail.com> + */ LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT IDD_DLG_SCREEN DIALOGEX 0, 0, 276, 112 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Configurație animație de inactivitate „Labirint”" +CAPTION "Setări pentru economizorul de ecran Labirint" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Mărime labirint:",IDC_STATIC,7,7,90,12,SS_CENTERIMAGE + LTEXT "Mărimea Labirintului:",IDC_STATIC,7,7,90,12,SS_CENTERIMAGE CONTROL "Slider1",IDC_SLIDER_SIZE,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,101,7,140,12 CTEXT "Static",IDC_TEXT_SIZE,245,7,24,12,SS_CENTERIMAGE,WS_EX_STATICEDGE - LTEXT "Timp ante-rezolvare:",IDC_STATIC,7,28,90,12,SS_CENTERIMAGE + LTEXT "Înt. pre-rezolvare:",IDC_STATIC,7,28,90,12,SS_CENTERIMAGE CONTROL "Slider2",IDC_SLIDER_PRESD,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,101,28,140,12 CTEXT "Static",IDC_TEXT_PRESD,245,28,24,12,SS_CENTERIMAGE,WS_EX_STATICEDGE - LTEXT "Timp post-rezolvare:",IDC_STATIC,7,49,90,12,SS_CENTERIMAGE + LTEXT "Înt. după rezolvare:",IDC_STATIC,7,49,90,12,SS_CENTERIMAGE CONTROL "Slider3",IDC_SLIDER_POSTSD,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,101,49,140,12 CTEXT "Static",IDC_TEXT_POSTSD,245,49,24,12,SS_CENTERIMAGE,WS_EX_STATICEDGE - LTEXT "Timp de rezolvare:",IDC_STATIC,7,70,90,12,SS_CENTERIMAGE + LTEXT "Întârz. rezolvare:",IDC_STATIC,7,70,90,12,SS_CENTERIMAGE CONTROL "Slider4",IDC_SLIDER_SD,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,101,70,140,12 CTEXT "Static",IDC_TEXT_SD,245,70,24,12,SS_CENTERIMAGE,WS_EX_STATICEDGE - DEFPUSHBUTTON "Con&firmă",IDOK,59,91,50,14 - PUSHBUTTON "A&nulează",IDCANCEL,113,91,50,14 + DEFPUSHBUTTON "OK",IDOK,59,91,50,14 + PUSHBUTTON "Revocare",IDCANCEL,113,91,50,14 PUSHBUTTON "&Despre",IDABOUT,167,91,50,14 END @@ -29,19 +35,19 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Despre" FONT 8, "MS Shell Dlg" BEGIN - CTEXT "Animație de inactivitate „Labirint” versiune 1.0",IDC_STATIC,7,7,215,9 + CTEXT "Economizorul de ecran Labirint” versiune 1.0",IDC_STATIC,7,7,215,9 LTEXT "[06-21-85] Martin Weiss - Cod Original",IDC_STATIC,7,20,215,8 - LTEXT "[01-29-88] Dave Lemke - Specializare pentru X11",IDC_STATIC,7,29,215,8 - LTEXT "[10-04-88] Richard Hess - Generalizare de la X11",IDC_STATIC,7,38,215,8 + LTEXT "[01-29-88] Dave Lemke - Spart pentru X11",IDC_STATIC,7,29,215,8 + LTEXT "[10-04-88] Richard Hess - Nespart de la X11",IDC_STATIC,7,38,215,8 LTEXT "[03-03-93] Jim Randell - Generalizare de la X11",IDC_STATIC,7,47,215,8 - LTEXT "[03-07-93] Jamie Zawinski - Refactorizare și alte îmbunătățiri",IDC_STATIC,7,56,215,8 - LTEXT "[10-08-94] Ge van Geldorp - Portat în Windows",IDC_STATIC,7,65,215,8 - LTEXT "[08-15-03] Ge van Geldorp - Portat în ReactOS",IDC_STATIC,7,74,215,8 - CTEXT "R.I.P. Ge van Geldorp, we miss you!",IDC_STATIC,7,87,215,10,SS_SUNKEN - DEFPUSHBUTTON "Î&nchide",IDOK,87,100,56,14 + LTEXT "[03-07-93] Jamie Zawinski - Curățenie și ordine a codului",IDC_STATIC,7,56,215,8 + LTEXT "[10-08-94] Ge van Geldorp - Portat pe Windows",IDC_STATIC,7,65,215,8 + LTEXT "[08-15-03] Ge van Geldorp - Portat pe ReactOS",IDC_STATIC,7,74,215,8 + CTEXT "R.I.P. Ge van Geldorp, ne e dor de tine!",IDC_STATIC,7,87,215,10,SS_SUNKEN + DEFPUSHBUTTON "OK",IDOK,87,100,56,14 END STRINGTABLE BEGIN - IDS_DESCRIPTION "Labirint (animație de inactivitate)" + IDS_DESCRIPTION "Economizorul de ecran Labirint" END

2 weeks, 6 days

[reactos] 02/02: [WINE] Add explicit missing __ROS_LONG64__ for Wine modules (#7576)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=53d808d2eb448a60ea012… commit 53d808d2eb448a60ea0126c1b962c9e62fc1709d Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Dec 23 21:30:09 2024 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Jan 16 18:13:27 2025 +0100 [WINE] Add explicit missing __ROS_LONG64__ for Wine modules (#7576) i.e. fix build. When these get synced with more recent Wine version, you can remove this define once you get past a "Enable compilation with long types" Wine commit or similar. --- dll/directx/wine/d3drm/CMakeLists.txt | 2 +- dll/directx/wine/d3dxof/CMakeLists.txt | 2 +- dll/win32/comdlg32/CMakeLists.txt | 3 ++- dll/win32/cryptui/CMakeLists.txt | 3 ++- dll/win32/ieframe/CMakeLists.txt | 2 +- dll/win32/inetcomm/CMakeLists.txt | 2 +- dll/win32/wininet/CMakeLists.txt | 3 ++- 7 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dll/directx/wine/d3drm/CMakeLists.txt b/dll/directx/wine/d3drm/CMakeLists.txt index b0234641ac2..3812e460134 100644 --- a/dll/directx/wine/d3drm/CMakeLists.txt +++ b/dll/directx/wine/d3drm/CMakeLists.txt @@ -1,5 +1,5 @@ -add_definitions(-D__WINESRC__) +add_definitions(-D__WINESRC__ -D__ROS_LONG64__) include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) spec2def(d3drm.dll d3drm.spec ADD_IMPORTLIB) diff --git a/dll/directx/wine/d3dxof/CMakeLists.txt b/dll/directx/wine/d3dxof/CMakeLists.txt index 98fdae11965..1da900a2fd8 100644 --- a/dll/directx/wine/d3dxof/CMakeLists.txt +++ b/dll/directx/wine/d3dxof/CMakeLists.txt @@ -1,5 +1,5 @@ -add_definitions(-D__WINESRC__) +add_definitions(-D__WINESRC__ -D__ROS_LONG64__) include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) spec2def(d3dxof.dll d3dxof.spec ADD_IMPORTLIB) diff --git a/dll/win32/comdlg32/CMakeLists.txt b/dll/win32/comdlg32/CMakeLists.txt index 2516c4e2d22..f558991dd93 100644 --- a/dll/win32/comdlg32/CMakeLists.txt +++ b/dll/win32/comdlg32/CMakeLists.txt @@ -1,7 +1,8 @@ add_definitions( -D__WINESRC__ - -D_WINE) + -D_WINE + -D__ROS_LONG64__) include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) spec2def(comdlg32.dll comdlg32.spec ADD_IMPORTLIB) diff --git a/dll/win32/cryptui/CMakeLists.txt b/dll/win32/cryptui/CMakeLists.txt index 92ab7aaed0d..a80c65e84a2 100644 --- a/dll/win32/cryptui/CMakeLists.txt +++ b/dll/win32/cryptui/CMakeLists.txt @@ -1,7 +1,8 @@ add_definitions( -D__WINESRC__ - -D_WINE) + -D_WINE + -D__ROS_LONG64__) include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) spec2def(cryptui.dll cryptui.spec ADD_IMPORTLIB) diff --git a/dll/win32/ieframe/CMakeLists.txt b/dll/win32/ieframe/CMakeLists.txt index 830a3f5b9c3..6e4e2d4522e 100644 --- a/dll/win32/ieframe/CMakeLists.txt +++ b/dll/win32/ieframe/CMakeLists.txt @@ -1,6 +1,6 @@ include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) -add_definitions(-D__WINESRC__) +add_definitions(-D__WINESRC__ -D__ROS_LONG64__) spec2def(ieframe.dll ieframe.spec ADD_IMPORTLIB) list(APPEND SOURCE diff --git a/dll/win32/inetcomm/CMakeLists.txt b/dll/win32/inetcomm/CMakeLists.txt index 90ff8513cdc..b366d4da22a 100644 --- a/dll/win32/inetcomm/CMakeLists.txt +++ b/dll/win32/inetcomm/CMakeLists.txt @@ -1,5 +1,5 @@ -add_definitions(-D__WINESRC__) +add_definitions(-D__WINESRC__ -D__ROS_LONG64__) include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) spec2def(inetcomm.dll inetcomm.spec ADD_IMPORTLIB) diff --git a/dll/win32/wininet/CMakeLists.txt b/dll/win32/wininet/CMakeLists.txt index 73449f9f8b4..d9e717646d5 100644 --- a/dll/win32/wininet/CMakeLists.txt +++ b/dll/win32/wininet/CMakeLists.txt @@ -8,7 +8,8 @@ add_definitions( add_definitions( -D__WINESRC__ - -D_WINE) + -D_WINE + -D__ROS_LONG64__) spec2def(wininet.dll wininet.spec ADD_IMPORTLIB)

2 weeks, 6 days

[reactos] 01/02: [SDK] Fix the automatic definition of __ROS_LONG64__ (#7576)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=381e224f6b06b66dc6415… commit 381e224f6b06b66dc6415984f04896bcb20ceb8e Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Dec 23 20:31:08 2024 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Jan 16 18:13:19 2025 +0100 [SDK] Fix the automatic definition of __ROS_LONG64__ (#7576) It is not wishable anymore to automatically define __ROS_LONG64__ whenever __WINESRC__ is defined. Indeed, Wine now has started to introduce the possibility to "Enable compilation with long types". Thus, for these modules we import from them, we want to be able to define __WINESRC__ without __ROS_LONG64__ automatically defined. Addendum to commits 89c3520c86 (r73383) and 75eeb2a7e4 (r38872). --- sdk/include/psdk/basetsd.h | 6 +++--- sdk/include/psdk/windef.h | 8 ++++---- sdk/include/psdk/winsock.h | 4 ++-- sdk/include/psdk/winsock2.h | 4 ++-- sdk/include/xdk/winnt.template.h | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/sdk/include/psdk/basetsd.h b/sdk/include/psdk/basetsd.h index 7d3efc04725..6d8d85f17e2 100644 --- a/sdk/include/psdk/basetsd.h +++ b/sdk/include/psdk/basetsd.h @@ -6,8 +6,8 @@ #include <msvctarget.h> #endif -#if defined(__LP64__) || (!defined(_M_AMD64) && defined(__WINESRC__)) -#if !defined(__ROS_LONG64__) +#if (defined(_LP64) || defined(__LP64__)) && !defined(_M_AMD64) +#ifndef __ROS_LONG64__ #define __ROS_LONG64__ #endif #endif @@ -161,7 +161,7 @@ static inline void* ULongToPtr( const unsigned long ul ) { return( (void*)(ULONG_PTR)ul ); } #endif /* !__midl */ #else /* !_WIN64 */ -#if !defined(__ROS_LONG64__) +#ifndef __ROS_LONG64__ typedef int INT_PTR, *PINT_PTR; typedef unsigned int UINT_PTR, *PUINT_PTR; #else diff --git a/sdk/include/psdk/windef.h b/sdk/include/psdk/windef.h index a1f5581e3be..0766d6168e9 100644 --- a/sdk/include/psdk/windef.h +++ b/sdk/include/psdk/windef.h @@ -14,8 +14,8 @@ #pragma warning(disable:4255) #endif -#if defined(__LP64__) || (!defined(_M_AMD64) && defined(__WINESRC__)) -#if !defined(__ROS_LONG64__) +#if (defined(_LP64) || defined(__LP64__)) && !defined(_M_AMD64) +#ifndef __ROS_LONG64__ #define __ROS_LONG64__ #endif #endif @@ -166,9 +166,9 @@ typedef BOOL *LPBOOL; typedef unsigned char BYTE; typedef unsigned short WORD; #ifndef __ROS_LONG64__ - typedef unsigned long DWORD; +typedef unsigned long DWORD; #else - typedef unsigned int DWORD; +typedef unsigned int DWORD; #endif typedef float FLOAT; typedef FLOAT *PFLOAT; diff --git a/sdk/include/psdk/winsock.h b/sdk/include/psdk/winsock.h index 0d95be1e49e..cad1913fc81 100644 --- a/sdk/include/psdk/winsock.h +++ b/sdk/include/psdk/winsock.h @@ -15,8 +15,8 @@ #include <windows.h> #endif -#if defined(__LP64__) || (!defined(_M_AMD64) && defined(__WINESRC__)) -#if !defined(__ROS_LONG64__) +#if (defined(_LP64) || defined(__LP64__)) && !defined(_M_AMD64) +#ifndef __ROS_LONG64__ #define __ROS_LONG64__ #endif #endif diff --git a/sdk/include/psdk/winsock2.h b/sdk/include/psdk/winsock2.h index aa296a2311d..9646428a154 100644 --- a/sdk/include/psdk/winsock2.h +++ b/sdk/include/psdk/winsock2.h @@ -39,8 +39,8 @@ #endif #endif -#if defined(__LP64__) || (!defined(_M_AMD64) && defined(__WINESRC__)) -#if !defined(__ROS_LONG64__) +#if (defined(_LP64) || defined(__LP64__)) && !defined(_M_AMD64) +#ifndef __ROS_LONG64__ #define __ROS_LONG64__ #endif #endif diff --git a/sdk/include/xdk/winnt.template.h b/sdk/include/xdk/winnt.template.h index 050e87d472d..0da46e9285b 100644 --- a/sdk/include/xdk/winnt.template.h +++ b/sdk/include/xdk/winnt.template.h @@ -28,8 +28,8 @@ #error Compiler too old! #endif -#if defined(__LP64__) || (!defined(_M_AMD64) && defined(__WINESRC__)) -#if !defined(__ROS_LONG64__) +#if (defined(_LP64) || defined(__LP64__)) && !defined(_M_AMD64) +#ifndef __ROS_LONG64__ #define __ROS_LONG64__ #endif #endif

2 weeks, 6 days

[reactos] 33/33: [UCRT] Add CMake files

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7bb12665d6fd1d1f57241… commit 7bb12665d6fd1d1f57241fbc400b77b0a31d8aee Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Fri Oct 11 14:52:11 2024 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Jan 16 14:18:53 2025 +0200 [UCRT] Add CMake files --- CMakeLists.txt | 2 +- sdk/lib/CMakeLists.txt | 1 + sdk/lib/ucrt/CMakeLists.txt | 126 +++++++++++++++++++++++++++ sdk/lib/ucrt/conio/conio.cmake | 17 ++++ sdk/lib/ucrt/convert/convert.cmake | 42 +++++++++ sdk/lib/ucrt/dll/dll.cmake | 5 ++ sdk/lib/ucrt/env/env.cmake | 10 +++ sdk/lib/ucrt/exec/exec.cmake | 13 +++ sdk/lib/ucrt/filesystem/filesystem.cmake | 25 ++++++ sdk/lib/ucrt/heap/heap.cmake | 28 ++++++ sdk/lib/ucrt/initializers/initializers.cmake | 24 +++++ sdk/lib/ucrt/internal/internal.cmake | 17 ++++ sdk/lib/ucrt/locale/locale.cmake | 25 ++++++ sdk/lib/ucrt/lowio/lowio.cmake | 25 ++++++ sdk/lib/ucrt/mbstring/mbstring.cmake | 93 ++++++++++++++++++++ sdk/lib/ucrt/misc/misc.cmake | 34 ++++++++ sdk/lib/ucrt/startup/startup.cmake | 13 +++ sdk/lib/ucrt/stdio/stdio.cmake | 52 +++++++++++ sdk/lib/ucrt/stdlib/stdlib.cmake | 24 +++++ sdk/lib/ucrt/string/string.cmake | 58 ++++++++++++ sdk/lib/ucrt/time/time.cmake | 21 +++++ 21 files changed, 654 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 38f70b17f63..b51f6f25dea 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -256,7 +256,7 @@ Enable this if the module uses typeid or dynamic_cast. You will probably need to elseif(ARCH STREQUAL "amd64") # clang-cl defines this one for itself if (NOT (MSVC AND CMAKE_C_COMPILER_ID STREQUAL "Clang")) - add_compile_definitions(_M_AMD64) + add_compile_definitions(_M_AMD64 _M_X64) endif() add_definitions(-D_AMD64_ -D__x86_64__ -D_WIN64) elseif(ARCH STREQUAL "arm") diff --git a/sdk/lib/CMakeLists.txt b/sdk/lib/CMakeLists.txt index 34dc04870fd..e50c21cad8c 100644 --- a/sdk/lib/CMakeLists.txt +++ b/sdk/lib/CMakeLists.txt @@ -52,6 +52,7 @@ add_subdirectory(strmiids) add_subdirectory(smlib) add_subdirectory(tdilib) add_subdirectory(tzlib) +add_subdirectory(ucrt) add_subdirectory(udmihelp) add_subdirectory(uuid) add_subdirectory(wdmguid) diff --git a/sdk/lib/ucrt/CMakeLists.txt b/sdk/lib/ucrt/CMakeLists.txt new file mode 100644 index 00000000000..4c2b2e18559 --- /dev/null +++ b/sdk/lib/ucrt/CMakeLists.txt @@ -0,0 +1,126 @@ + +set(CMAKE_CXX_STANDARD 17) + +# Replace the old CRT include directory with the UCRT include directory +get_property(INCLUDE_DIRS DIRECTORY . PROPERTY INCLUDE_DIRECTORIES) +list(REMOVE_ITEM INCLUDE_DIRS "${REACTOS_SOURCE_DIR}/sdk/include/crt") +set_property(DIRECTORY . PROPERTY INCLUDE_DIRECTORIES ${INCLUDE_DIRS}) +include_directories(${REACTOS_SOURCE_DIR}/sdk/include/ucrt) + +if(MSVC) + # Disable warning C4083: expected ')'; found identifier '<warning identifier>' + add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:/wd4083>) + + # Disable warning C4189: 'cvt': local variable is initialized but not referenced + add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:/wd4189>) +endif() + +# Internal includes +include_directories(BEFORE inc) + +if(${ARCH} STREQUAL "i386") + include_directories(inc/i386) +endif() + +remove_definitions(-D_WIN32_WINNT=0x502 -DWINVER=0x502) +add_compile_definitions( + WINVER=0x600 + _WIN32_WINNT=0x600 + _UCRT + _CORECRT_BUILD + _CRT_DECLARE_GLOBAL_VARIABLES_DIRECTLY + _GCC_NO_SAL_ATTRIIBUTES + CRTDLL +) + +if(CMAKE_C_COMPILER_ID STREQUAL "GNU" OR + CMAKE_C_COMPILER_ID STREQUAL "Clang") + # Silence GCC/Clang warnings + add_compile_options( + -Wno-unknown-warning-option + -Wno-unused-function + -Wno-unknown-pragmas + -Wno-builtin-declaration-mismatch + -Wno-parentheses + -Wno-unused-variable + -Wno-sign-compare + -Wno-enum-compare + -Wno-switch + -Wno-write-strings + -Wno-comment + -Wno-narrowing + -Wno-misleading-indentation + -Wno-missing-braces + -Wno-unused-value + -Wno-unused-local-typedef + -Wno-unused-function + -Wno-writable-strings + -Wno-microsoft-template + -Wno-switch + -Wno-ignored-pragmas + -Wno-empty-body + -Wno-tautological-constant-out-of-range-compare + -Wno-ignored-attributes + -Wno-uninitialized + ) + add_compile_options($<$<COMPILE_LANGUAGE:CXX>:-Wno-reorder>) +endif() + +if(CMAKE_C_COMPILER_ID STREQUAL "Clang") + add_compile_definitions( + _lrotl=___lrotl + _rotl=___rotl + _rotl64=___rotl64 + _lrotr=___lrotr + _rotr=___rotr + _rotr64=___rotr64 + ) +endif() + +# Hack until we support globally defining _DEBUG +if(DBG) + add_compile_definitions(_DEBUG) +endif() + +include(conio/conio.cmake) +include(convert/convert.cmake) +include(dll/dll.cmake) +include(env/env.cmake) +include(exec/exec.cmake) +include(filesystem/filesystem.cmake) +include(heap/heap.cmake) +include(initializers/initializers.cmake) +include(internal/internal.cmake) +include(locale/locale.cmake) +include(lowio/lowio.cmake) +include(mbstring/mbstring.cmake) +include(misc/misc.cmake) +include(startup/startup.cmake) +include(stdio/stdio.cmake) +include(stdlib/stdlib.cmake) +include(string/string.cmake) +include(time/time.cmake) + +add_library(ucrt OBJECT + ${UCRT_CONIO_SOURCES} + ${UCRT_CONVERT_SOURCES} + ${UCRT_DLL_SOURCES} + ${UCRT_ENV_SOURCES} + ${UCRT_EXEC_SOURCES} + ${UCRT_FILESYSTEM_SOURCES} + ${UCRT_HEAP_SOURCES} + ${UCRT_INITIALIZERS_SOURCES} + ${UCRT_INTERNAL_SOURCES} + ${UCRT_LOCALE_SOURCES} + ${UCRT_LOWIO_SOURCES} + ${UCRT_MBSTRING_SOURCES} + ${UCRT_MISC_SOURCES} + ${UCRT_STARTUP_SOURCES} + ${UCRT_STDIO_SOURCES} + ${UCRT_STDLIB_SOURCES} + ${UCRT_STRING_SOURCES} + ${UCRT_TIME_SOURCES} +) + +#target_link_libraries(ucrt pseh) +add_dependencies(ucrt psdk asm) diff --git a/sdk/lib/ucrt/conio/conio.cmake b/sdk/lib/ucrt/conio/conio.cmake new file mode 100644 index 00000000000..7e6e7842f28 --- /dev/null +++ b/sdk/lib/ucrt/conio/conio.cmake @@ -0,0 +1,17 @@ + +list(APPEND UCRT_CONIO_SOURCES + conio/cgets.cpp + conio/cgetws.cpp + conio/cprintf.cpp + conio/cputs.cpp + conio/cputws.cpp + conio/cscanf.cpp + conio/getch.cpp + conio/getwch.cpp + conio/initcon.cpp + conio/initconin.cpp + conio/pipe.cpp + conio/popen.cpp + conio/putch.cpp + conio/putwch.cpp +) diff --git a/sdk/lib/ucrt/convert/convert.cmake b/sdk/lib/ucrt/convert/convert.cmake new file mode 100644 index 00000000000..90f9bb5008b --- /dev/null +++ b/sdk/lib/ucrt/convert/convert.cmake @@ -0,0 +1,42 @@ + +list(APPEND UCRT_CONVERT_SOURCES + convert/atof.cpp + convert/atoldbl.cpp + convert/atox.cpp + convert/c16rtomb.cpp + convert/c32rtomb.cpp + convert/cfout.cpp + convert/common_utf8.cpp + convert/cvt.cpp + convert/fcvt.cpp + convert/fp_flags.cpp + convert/gcvt.cpp + convert/isctype.cpp + convert/ismbstr.cpp + convert/iswctype.cpp + convert/mblen.cpp + convert/mbrtoc16.cpp + convert/mbrtoc32.cpp + convert/mbrtowc.cpp + convert/mbstowcs.cpp + convert/mbtowc.cpp + convert/strtod.cpp + convert/strtox.cpp + convert/swab.cpp + convert/tolower_toupper.cpp + convert/towlower.cpp + convert/towupper.cpp + convert/wcrtomb.cpp + convert/wcstombs.cpp + convert/wctomb.cpp + convert/wctrans.cpp + convert/wctype.cpp + convert/xtoa.cpp + convert/_ctype.cpp + convert/_fptostr.cpp + convert/_mbslen.cpp + convert/_wctype.cpp +) + +# All multibyte string functions require the _MBCS macro to be defined +set_source_files_properties(convert/ismbstr.cpp PROPERTIES COMPILE_DEFINITIONS _MBCS) diff --git a/sdk/lib/ucrt/dll/dll.cmake b/sdk/lib/ucrt/dll/dll.cmake new file mode 100644 index 00000000000..b8984d43bc5 --- /dev/null +++ b/sdk/lib/ucrt/dll/dll.cmake @@ -0,0 +1,5 @@ + +list(APPEND UCRT_DLL_SOURCES + dll/appcrt_dllmain.cpp + dll/empty.cpp +) diff --git a/sdk/lib/ucrt/env/env.cmake b/sdk/lib/ucrt/env/env.cmake new file mode 100644 index 00000000000..891dceb27f5 --- /dev/null +++ b/sdk/lib/ucrt/env/env.cmake @@ -0,0 +1,10 @@ + +list(APPEND UCRT_ENV_SOURCES + env/environment_initialization.cpp + env/getenv.cpp + env/getpath.cpp + env/get_environment_from_os.cpp + env/putenv.cpp + env/searchenv.cpp + env/setenv.cpp +) diff --git a/sdk/lib/ucrt/exec/exec.cmake b/sdk/lib/ucrt/exec/exec.cmake new file mode 100644 index 00000000000..f9810c50999 --- /dev/null +++ b/sdk/lib/ucrt/exec/exec.cmake @@ -0,0 +1,13 @@ + +list(APPEND UCRT_EXEC_SOURCES + exec/cenvarg.cpp + exec/exec.cmake + exec/getproc.cpp + exec/loaddll.cpp + exec/spawnl.cpp + exec/spawnlp.cpp + exec/spawnv.cpp + exec/spawnvp.cpp + exec/system.cpp + exec/wait.cpp +) diff --git a/sdk/lib/ucrt/filesystem/filesystem.cmake b/sdk/lib/ucrt/filesystem/filesystem.cmake new file mode 100644 index 00000000000..77685b23ec5 --- /dev/null +++ b/sdk/lib/ucrt/filesystem/filesystem.cmake @@ -0,0 +1,25 @@ + +list(APPEND UCRT_FILESYSTEM_SOURCES + filesystem/access.cpp + filesystem/chmod.cpp + filesystem/findfile.cpp + filesystem/fullpath.cpp + filesystem/makepath.cpp + filesystem/mkdir.cpp + filesystem/rename.cpp + filesystem/rmdir.cpp + filesystem/splitpath.cpp + filesystem/stat.cpp + filesystem/unlink.cpp + filesystem/waccess.cpp + filesystem/wchmod.cpp + filesystem/wmkdir.cpp + filesystem/wrename.cpp + filesystem/wrmdir.cpp + filesystem/wunlink.cpp +) + +if(MSVC) + # Disable warning C4838: conversion from 'int' to 'size_t' requires a narrowing conversion + set_source_files_properties(filesystem/splitpath.cpp PROPERTIES COMPILE_FLAGS "/wd4838") +endif() diff --git a/sdk/lib/ucrt/heap/heap.cmake b/sdk/lib/ucrt/heap/heap.cmake new file mode 100644 index 00000000000..1d3b30c0c34 --- /dev/null +++ b/sdk/lib/ucrt/heap/heap.cmake @@ -0,0 +1,28 @@ + +list(APPEND UCRT_HEAP_SOURCES + heap/align.cpp + heap/calloc.cpp + heap/calloc_base.cpp + heap/expand.cpp + heap/free.cpp + heap/free_base.cpp + heap/heapchk.cpp + heap/heapmin.cpp + heap/heapwalk.cpp + heap/heap_handle.cpp + heap/malloc.cpp + heap/malloc_base.cpp + heap/msize.cpp + heap/new_handler.cpp + heap/new_mode.cpp + heap/realloc.cpp + heap/realloc_base.cpp + heap/recalloc.cpp +) + +if(CMAKE_BUILD_TYPE STREQUAL "Debug") + list(APPEND UCRT_HEAP_SOURCES + heap/debug_heap.cpp + heap/debug_heap_hook.cpp + ) +endif() diff --git a/sdk/lib/ucrt/initializers/initializers.cmake b/sdk/lib/ucrt/initializers/initializers.cmake new file mode 100644 index 00000000000..1f2944cac86 --- /dev/null +++ b/sdk/lib/ucrt/initializers/initializers.cmake @@ -0,0 +1,24 @@ + +list(APPEND UCRT_INITIALIZERS_SOURCES + initializers/clock_initializer.cpp + initializers/console_input_initializer.cpp + initializers/console_output_initializer.cpp + initializers/fmode_initializer.cpp + initializers/locale_initializer.cpp + initializers/multibyte_initializer.cpp + initializers/stdio_initializer.cpp + initializers/timeset_initializer.cpp + initializers/tmpfile_initializer.cpp +) + +if(${ARCH} STREQUAL "i386") + list(APPEND UCRT_INITIALIZERS_SOURCES + initializers/i386/sse2_initializer.cpp + ) +endif() + +if(${ARCH} STREQUAL "amd64" OR ${ARCH} STREQUAL "arm64") + list(APPEND UCRT_INITIALIZERS_SOURCES + initializers/fma3_initializer.cpp + ) +endif() diff --git a/sdk/lib/ucrt/internal/internal.cmake b/sdk/lib/ucrt/internal/internal.cmake new file mode 100644 index 00000000000..503f5a20c79 --- /dev/null +++ b/sdk/lib/ucrt/internal/internal.cmake @@ -0,0 +1,17 @@ + +list(APPEND UCRT_INTERNAL_SOURCES + internal/CreateProcessA.cpp + internal/GetModuleFileNameA.cpp + internal/initialization.cpp + internal/LoadLibraryExA.cpp + internal/locks.cpp + internal/OutputDebugStringA.cpp + internal/peb_access.cpp + internal/per_thread_data.cpp + internal/report_runtime_error.cpp + internal/SetCurrentDirectoryA.cpp + internal/SetEnvironmentVariableA.cpp + internal/shared_initialization.cpp + internal/winapi_thunks.cpp + internal/win_policies.cpp +) diff --git a/sdk/lib/ucrt/locale/locale.cmake b/sdk/lib/ucrt/locale/locale.cmake new file mode 100644 index 00000000000..97fe554114a --- /dev/null +++ b/sdk/lib/ucrt/locale/locale.cmake @@ -0,0 +1,25 @@ + +list(APPEND UCRT_LOCALE_SOURCES + locale/CompareStringA.cpp + locale/CompareStringW.cpp + locale/ctype.cpp + locale/GetLocaleInfoA.cpp + locale/getqloc_downlevel.cpp + locale/GetStringTypeA.cpp + locale/get_qualified_locale.cpp + locale/glstatus.cpp + locale/initctype.cpp + locale/initmon.cpp + locale/initnum.cpp + locale/inittime.cpp + locale/lcidtoname_downlevel.cpp + locale/LCMapStringA.cpp + locale/LCMapStringW.cpp + locale/lconv_unsigned_char_initialization.cpp + locale/localeconv.cpp + locale/locale_refcounting.cpp + locale/locale_update.cpp + locale/nlsdata.cpp + locale/setlocale.cpp + locale/wsetlocale.cpp +) diff --git a/sdk/lib/ucrt/lowio/lowio.cmake b/sdk/lib/ucrt/lowio/lowio.cmake new file mode 100644 index 00000000000..119b5b90b0e --- /dev/null +++ b/sdk/lib/ucrt/lowio/lowio.cmake @@ -0,0 +1,25 @@ + +list(APPEND UCRT_LOWIO_SOURCES + lowio/chsize.cpp + lowio/close.cpp + lowio/commit.cpp + lowio/creat.cpp + lowio/dup.cpp + lowio/dup2.cpp + lowio/eof.cpp + lowio/filelength.cpp + lowio/ioinit.cpp + lowio/isatty.cpp + lowio/locking.cpp + lowio/lseek.cpp + lowio/mktemp.cpp + lowio/open.cpp + lowio/osfinfo.cpp + lowio/read.cpp + lowio/setmode.cpp + lowio/tell.cpp + lowio/telli64.cpp + lowio/txtmode.cpp + lowio/umask.cpp + lowio/write.cpp +) diff --git a/sdk/lib/ucrt/mbstring/mbstring.cmake b/sdk/lib/ucrt/mbstring/mbstring.cmake new file mode 100644 index 00000000000..f998ae2f327 --- /dev/null +++ b/sdk/lib/ucrt/mbstring/mbstring.cmake @@ -0,0 +1,93 @@ + +list(APPEND UCRT_MBSTRING_SOURCES + mbstring/ismbalnm.cpp + mbstring/ismbalph.cpp + mbstring/ismbbyte.cpp + mbstring/ismbdgt.cpp + mbstring/ismbgrph.cpp + mbstring/ismbknj.cpp + mbstring/ismblgl.cpp + mbstring/ismblwr.cpp + mbstring/ismbprn.cpp + mbstring/ismbpunc.cpp + mbstring/ismbsle.cpp + mbstring/ismbspc.cpp + mbstring/ismbupr.cpp + mbstring/mbbtype.cpp + mbstring/mbccpy.cpp + mbstring/mbccpy_s.cpp + mbstring/mbccpy_s_l.cpp + mbstring/mbclen.cpp + mbstring/mbclevel.cpp + mbstring/mbctype.cpp + mbstring/mbsbtype.cpp + mbstring/mbscat_s.cpp + mbstring/mbscat_s_l.cpp + mbstring/mbschr.cpp + mbstring/mbscmp.cpp + mbstring/mbscoll.cpp + mbstring/mbscpy_s.cpp + mbstring/mbscpy_s_l.cpp + mbstring/mbscspn.cpp + mbstring/mbsdec.cpp + mbstring/mbsicmp.cpp + mbstring/mbsicoll.cpp + mbstring/mbsinc.cpp + mbstring/mbslen.cpp + mbstring/mbslen_s.cpp + mbstring/mbslwr.cpp + mbstring/mbsnbcat.cpp + mbstring/mbsnbcat_s.cpp + mbstring/mbsnbcat_s_l.cpp + mbstring/mbsnbcmp.cpp + mbstring/mbsnbcnt.cpp + mbstring/mbsnbcol.cpp + mbstring/mbsnbcpy.cpp + mbstring/mbsnbcpy_s.cpp + mbstring/mbsnbcpy_s_l.cpp + mbstring/mbsnbicm.cpp + mbstring/mbsnbico.cpp + mbstring/mbsnbset.cpp + mbstring/mbsnbset_s.cpp + mbstring/mbsnbset_s_l.cpp + mbstring/mbsncat.cpp + mbstring/mbsncat_s.cpp + mbstring/mbsncat_s.inl + mbstring/mbsncat_s_l.cpp + mbstring/mbsnccnt.cpp + mbstring/mbsncmp.cpp + mbstring/mbsncoll.cpp + mbstring/mbsncpy.cpp + mbstring/mbsncpy_s.cpp + mbstring/mbsncpy_s.inl + mbstring/mbsncpy_s_l.cpp + mbstring/mbsnextc.cpp + mbstring/mbsnicmp.cpp + mbstring/mbsnicol.cpp + mbstring/mbsninc.cpp + mbstring/mbsnset.cpp + mbstring/mbsnset_s.cpp + mbstring/mbsnset_s.inl + mbstring/mbsnset_s_l.cpp + mbstring/mbspbrk.cpp + mbstring/mbsrchr.cpp + mbstring/mbsrev.cpp + mbstring/mbsset.cpp + mbstring/mbsset_s.cpp + mbstring/mbsset_s_l.cpp + mbstring/mbsspn.cpp + mbstring/mbsspnp.cpp + mbstring/mbsstr.cpp + mbstring/mbstok.cpp + mbstring/mbstok_s.cpp + mbstring/mbsupr.cpp + mbstring/mbtohira.cpp + mbstring/mbtokata.cpp + mbstring/mbtolwr.cpp + mbstring/mbtoupr.cpp + mbstring/tojisjms.cpp + mbstring/tombbmbc.cpp +) + +# All multibyte string functions require the _MBCS macro to be defined +set_source_files_properties(${UCRT_MBSTRING_SOURCES} PROPERTIES COMPILE_DEFINITIONS _MBCS) diff --git a/sdk/lib/ucrt/misc/misc.cmake b/sdk/lib/ucrt/misc/misc.cmake new file mode 100644 index 00000000000..92abf476e2f --- /dev/null +++ b/sdk/lib/ucrt/misc/misc.cmake @@ -0,0 +1,34 @@ + +list(APPEND UCRT_MISC_SOURCES + misc/chdir.cpp + misc/crtmbox.cpp + misc/drive.cpp + misc/drivemap.cpp + misc/drivfree.cpp + misc/errno.cpp + misc/exception_filter.cpp + misc/getcwd.cpp + misc/getpid.cpp + misc/invalid_parameter.cpp + misc/is_wctype.cpp + misc/perror.cpp + misc/resetstk.cpp + misc/seterrm.cpp + misc/set_error_mode.cpp + misc/signal.cpp + misc/slbeep.cpp + misc/strerror.cpp + misc/syserr.cpp + misc/systime.cpp + misc/terminate.cpp + misc/wperror.cpp + misc/_strerr.cpp +) + +if (CMAKE_BUILD_TYPE STREQUAL "Debug") + list(APPEND UCRT_MISC_SOURCES + misc/dbgrpt.cpp + misc/dbgrptt.cpp + misc/debug_fill_threshold.cpp + ) +endif() diff --git a/sdk/lib/ucrt/startup/startup.cmake b/sdk/lib/ucrt/startup/startup.cmake new file mode 100644 index 00000000000..9bc9b454df7 --- /dev/null +++ b/sdk/lib/ucrt/startup/startup.cmake @@ -0,0 +1,13 @@ + +list(APPEND UCRT_STARTUP_SOURCES + startup/abort.cpp + startup/argv_data.cpp + startup/argv_parsing.cpp + startup/argv_wildcards.cpp + startup/argv_winmain.cpp + startup/assert.cpp + startup/exit.cpp + startup/initterm.cpp + startup/onexit.cpp + startup/thread.cpp +) diff --git a/sdk/lib/ucrt/stdio/stdio.cmake b/sdk/lib/ucrt/stdio/stdio.cmake new file mode 100644 index 00000000000..fdddb4aa133 --- /dev/null +++ b/sdk/lib/ucrt/stdio/stdio.cmake @@ -0,0 +1,52 @@ + +list(APPEND UCRT_STDIO_SOURCES + stdio/clearerr.cpp + stdio/closeall.cpp + stdio/fclose.cpp + stdio/fdopen.cpp + stdio/feoferr.cpp + stdio/fflush.cpp + stdio/fgetc.cpp + stdio/fgetpos.cpp + stdio/fgets.cpp + stdio/fgetwc.cpp + stdio/fileno.cpp + stdio/fopen.cpp + stdio/fputc.cpp + stdio/fputs.cpp + stdio/fputwc.cpp + stdio/fputws.cpp + stdio/fread.cpp + stdio/freopen.cpp + stdio/fseek.cpp + stdio/fsetpos.cpp + stdio/ftell.cpp + stdio/fwrite.cpp + stdio/gets.cpp + stdio/gettemppath.cpp + stdio/getw.cpp + stdio/input.cpp + stdio/ncommode.cpp + stdio/openfile.cpp + stdio/output.cpp + stdio/printf_count_output.cpp + stdio/puts.cpp + stdio/putw.cpp + stdio/putws.cpp + stdio/rewind.cpp + stdio/rmtmp.cpp + stdio/setbuf.cpp + stdio/setmaxf.cpp + stdio/setvbuf.cpp + stdio/stream.cpp + stdio/tempnam.cpp + stdio/tmpfile.cpp + stdio/ungetc.cpp + stdio/ungetwc.cpp + stdio/_filbuf.cpp + stdio/_file.cpp + stdio/_flsbuf.cpp + stdio/_freebuf.cpp + stdio/_getbuf.cpp + stdio/_sftbuf.cpp +) diff --git a/sdk/lib/ucrt/stdlib/stdlib.cmake b/sdk/lib/ucrt/stdlib/stdlib.cmake new file mode 100644 index 00000000000..fafbad26ea6 --- /dev/null +++ b/sdk/lib/ucrt/stdlib/stdlib.cmake @@ -0,0 +1,24 @@ + +list(APPEND UCRT_STDLIB_SOURCES + stdlib/abs.cpp + stdlib/bsearch.cpp + stdlib/bsearch_s.cpp + stdlib/byteswap.cpp + stdlib/div.cpp + stdlib/imaxabs.cpp + stdlib/imaxdiv.cpp + stdlib/labs.cpp + stdlib/ldiv.cpp + stdlib/lfind.cpp + stdlib/lfind_s.cpp + stdlib/llabs.cpp + stdlib/lldiv.cpp + stdlib/lsearch.cpp + stdlib/lsearch_s.cpp + stdlib/qsort.cpp + stdlib/qsort_s.cpp + stdlib/rand.cpp + stdlib/rand_s.cpp + stdlib/rotl.cpp + stdlib/rotr.cpp +) diff --git a/sdk/lib/ucrt/string/string.cmake b/sdk/lib/ucrt/string/string.cmake new file mode 100644 index 00000000000..2935b353269 --- /dev/null +++ b/sdk/lib/ucrt/string/string.cmake @@ -0,0 +1,58 @@ + +list(APPEND UCRT_STRING_SOURCES + string/memcpy_s.cpp + string/memicmp.cpp + string/strcat_s.cpp + string/strcoll.cpp + string/strcpy_s.cpp + string/strdup.cpp + string/stricmp.cpp + string/stricoll.cpp + string/strlwr.cpp + string/strncat_s.cpp + string/strncnt.cpp + string/strncoll.cpp + string/strncpy_s.cpp + string/strnicmp.cpp + string/strnicol.cpp + string/strnlen.cpp + string/strnset_s.cpp + string/strset_s.cpp + string/strtok.cpp + string/strtok_s.cpp + string/strupr.cpp + string/strxfrm.cpp + string/wcscat.cpp + string/wcscat_s.cpp + string/wcscmp.cpp + string/wcscoll.cpp + string/wcscpy.cpp + string/wcscpy_s.cpp + string/wcscspn.cpp + string/wcsdup.cpp + string/wcsicmp.cpp + string/wcsicoll.cpp + string/wcslwr.cpp + string/wcsncat.cpp + string/wcsncat_s.cpp + string/wcsncmp.cpp + string/wcsncnt.cpp + string/wcsncoll.cpp + string/wcsncpy.cpp + string/wcsncpy_s.cpp + string/wcsnicmp.cpp + string/wcsnicol.cpp + string/wcsnset.cpp + string/wcsnset_s.cpp + string/wcspbrk.cpp + string/wcsrev.cpp + string/wcsset.cpp + string/wcsset_s.cpp + string/wcsspn.cpp + string/wcstok.cpp + string/wcstok_s.cpp + string/wcsupr.cpp + string/wcsxfrm.cpp + string/wmemcpy_s.cpp + string/wmemmove_s.cpp +) diff --git a/sdk/lib/ucrt/time/time.cmake b/sdk/lib/ucrt/time/time.cmake new file mode 100644 index 00000000000..c74d9f291b4 --- /dev/null +++ b/sdk/lib/ucrt/time/time.cmake @@ -0,0 +1,21 @@ + +list(APPEND UCRT_TIME_SOURCES + time/asctime.cpp + time/clock.cpp + time/ctime.cpp + time/days.cpp + time/difftime.cpp + time/ftime.cpp + time/gmtime.cpp + time/localtime.cpp + time/loctotime.cpp + time/mktime.cpp + time/strdate.cpp + time/strftime.cpp + time/strtime.cpp + time/time.cpp + time/timeset.cpp + time/tzset.cpp + time/utime.cpp + time/wcsftime.cpp +)

2 weeks, 6 days

[reactos] 32/33: [UCRT] Add a hack for a clang bug

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ef440b9aefcab33fab87c… commit ef440b9aefcab33fab87c9260b13a20125f34465 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Thu Nov 28 15:14:28 2024 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Jan 16 14:18:53 2025 +0200 [UCRT] Add a hack for a clang bug See CORE-19902 --- sdk/lib/ucrt/inc/corecrt_internal_traits.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sdk/lib/ucrt/inc/corecrt_internal_traits.h b/sdk/lib/ucrt/inc/corecrt_internal_traits.h index 71f38ab32e7..ff3fd61d388 100644 --- a/sdk/lib/ucrt/inc/corecrt_internal_traits.h +++ b/sdk/lib/ucrt/inc/corecrt_internal_traits.h @@ -53,6 +53,13 @@ errno_t __cdecl _wsopen_nolock( } // extern "C" #endif // __GNUC__ +#ifdef __clang__ +// Hack for broken Clang, which crashes, when using __cdecl on a static template function. +// See CORE-19902 +#undef __cdecl +#define __cdecl +#endif // __clang__ + //-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ //

2 weeks, 6 days

[reactos] 31/33: [UCRT] Fix definition of offsetof for clang-cl

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=42e9c802791790a7cac72… commit 42e9c802791790a7cac72863e7cf9d2dbf419e21 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Wed Nov 27 15:24:41 2024 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Jan 16 14:18:53 2025 +0200 [UCRT] Fix definition of offsetof for clang-cl --- sdk/include/ucrt/stddef.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/include/ucrt/stddef.h b/sdk/include/ucrt/stddef.h index 53fa61c8f52..9d44415d361 100644 --- a/sdk/include/ucrt/stddef.h +++ b/sdk/include/ucrt/stddef.h @@ -42,7 +42,7 @@ _CRT_BEGIN_C_HEADER -#if defined _MSC_VER && !defined _CRT_USE_BUILTIN_OFFSETOF +#if defined _MSC_VER && !defined __clang__ && !defined _CRT_USE_BUILTIN_OFFSETOF #ifdef __cplusplus #define offsetof(s,m) ((::size_t)&reinterpret_cast<char const volatile&>((((s*)0)->m))) #else

2 weeks, 6 days

[reactos] 30/33: [UCRT] Make includes unix compatible

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2eb314956587a6fe9c331… commit 2eb314956587a6fe9c3316b615a95e06a43132b7 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Wed Nov 27 13:58:34 2024 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Jan 16 14:18:53 2025 +0200 [UCRT] Make includes unix compatible --- sdk/lib/ucrt/filesystem/chmod.cpp | 2 +- sdk/lib/ucrt/filesystem/wchmod.cpp | 2 +- sdk/lib/ucrt/lowio/locking.cpp | 4 ++-- sdk/lib/ucrt/lowio/umask.cpp | 2 +- sdk/lib/ucrt/time/clock.cpp | 6 +++--- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sdk/lib/ucrt/filesystem/chmod.cpp b/sdk/lib/ucrt/filesystem/chmod.cpp index 63832ea2823..7aa34225374 100644 --- a/sdk/lib/ucrt/filesystem/chmod.cpp +++ b/sdk/lib/ucrt/filesystem/chmod.cpp @@ -7,7 +7,7 @@ // #include <corecrt_internal.h> #include <io.h> -#include <sys\stat.h> +#include <sys/stat.h> #include <corecrt_internal_win32_buffer.h> // Changes the mode of a file. The only supported mode bit is _S_IWRITE, which diff --git a/sdk/lib/ucrt/filesystem/wchmod.cpp b/sdk/lib/ucrt/filesystem/wchmod.cpp index 181afed05e4..24590200c71 100644 --- a/sdk/lib/ucrt/filesystem/wchmod.cpp +++ b/sdk/lib/ucrt/filesystem/wchmod.cpp @@ -7,7 +7,7 @@ // #include <corecrt_internal.h> #include <io.h> -#include <sys\stat.h> +#include <sys/stat.h> diff --git a/sdk/lib/ucrt/lowio/locking.cpp b/sdk/lib/ucrt/lowio/locking.cpp index 8f7dda92b51..ab2d2e3106f 100644 --- a/sdk/lib/ucrt/lowio/locking.cpp +++ b/sdk/lib/ucrt/lowio/locking.cpp @@ -6,7 +6,7 @@ // Defines _locking(), which locks and unlocks regions of a file. // #include <corecrt_internal_lowio.h> -#include <sys\locking.h> +#include <sys/locking.h> @@ -106,7 +106,7 @@ extern "C" int __cdecl _locking(int const fh, int const locking_mode, long const { errno = EBADF; _doserrno = 0; - _ASSERTE(("Invalid file descriptor. File possibly closed by a different thread",0)); + _ASSERTE(("Invalid file descriptor. File possibly closed by a different thread",0)); __leave; } diff --git a/sdk/lib/ucrt/lowio/umask.cpp b/sdk/lib/ucrt/lowio/umask.cpp index ad0de502ccc..de90e192331 100644 --- a/sdk/lib/ucrt/lowio/umask.cpp +++ b/sdk/lib/ucrt/lowio/umask.cpp @@ -10,7 +10,7 @@ *******************************************************************************/ #include <corecrt_internal_lowio.h> -#include <sys\stat.h> +#include <sys/stat.h> extern "C" { int _umaskval = 0; } diff --git a/sdk/lib/ucrt/time/clock.cpp b/sdk/lib/ucrt/time/clock.cpp index 0c88322d562..7ff8a04e8fb 100644 --- a/sdk/lib/ucrt/time/clock.cpp +++ b/sdk/lib/ucrt/time/clock.cpp @@ -7,8 +7,8 @@ // process started execution. // #include <corecrt_internal_time.h> -#include <sys\timeb.h> -#include <sys\types.h> +#include <sys/timeb.h> +#include <sys/types.h> @@ -51,7 +51,7 @@ extern "C" int __cdecl __acrt_initialize_clock() !QueryPerformanceCounter(&local_start_count) || local_frequency.QuadPart == 0) { - source_frequency = -1; + source_frequency = -1; start_count = -1; return 0; }

2 weeks, 6 days

[reactos] 29/33: [UCRT] Fix GCC build of __crt_char_traits

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=90dad446b7ac43ad54c53… commit 90dad446b7ac43ad54c538ac40d7b872d47b6084 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Wed Oct 16 14:13:59 2024 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Jan 16 14:18:53 2025 +0200 [UCRT] Fix GCC build of __crt_char_traits This is a workaround for GCC. It will disable debugging for tdupenv_s_crt. How it works on MSVC? Magic. --- sdk/lib/ucrt/inc/corecrt_internal_traits.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/lib/ucrt/inc/corecrt_internal_traits.h b/sdk/lib/ucrt/inc/corecrt_internal_traits.h index d84107e72d7..71f38ab32e7 100644 --- a/sdk/lib/ucrt/inc/corecrt_internal_traits.h +++ b/sdk/lib/ucrt/inc/corecrt_internal_traits.h @@ -112,7 +112,7 @@ struct __crt_char_traits; _APPLY(tcspbrk, strpbrk, wcspbrk ) \ _APPLY(tcsrchr, strrchr, wcsrchr ) \ _APPLY(tcstoull, strtoull, wcstoull ) \ - _APPLY(tdupenv_s_crt, _dupenv_s_crt, _wdupenv_s_crt ) \ + _APPLY(tdupenv_s_crt, _dupenv_s, _wdupenv_s ) \ _APPLY(texecve, _execve, _wexecve ) \ _APPLY(tfdopen, _fdopen, _wfdopen ) \ _APPLY(tfullpath, _fullpath, _wfullpath ) \

2 weeks, 6 days

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2025