Ros-diffs

ros-diffs@reactos.org

19 participants
81099 discussions

[reactos] 01/01: [ATL] atlimage.h: s/IsGuidEqual/::IsEqualGUID/

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4ff55ad48e68d7c05a0c4… commit 4ff55ad48e68d7c05a0c44cca808e91d5975a72f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Jul 6 08:29:45 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Jul 6 08:29:45 2023 +0900 [ATL] atlimage.h: s/IsGuidEqual/::IsEqualGUID/ CORE-18867 --- sdk/lib/atl/atlimage.h | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/sdk/lib/atl/atlimage.h b/sdk/lib/atl/atlimage.h index 5d8eed02029..9765b0e70d5 100644 --- a/sdk/lib/atl/atlimage.h +++ b/sdk/lib/atl/atlimage.h @@ -557,7 +557,7 @@ public: // if the file type is null, get the file type from extension const GUID *FileType = &guidFileType; - if (IsGuidEqual(guidFileType, GUID_NULL)) + if (::IsEqualGUID(guidFileType, GUID_NULL)) { LPCWSTR pszExt = GetFileExtension(pszNameW); FileType = FileTypeFromExtension(pszExt); @@ -1074,7 +1074,7 @@ protected: const size_t count = _countof(table); for (size_t i = 0; i < count; ++i) { - if (IsGuidEqual(table[i].guid, *guid)) + if (::IsEqualGUID(table[i].guid, *guid)) { int num = GetEncoderClsid(table[i].mime, clsid); if (num >= 0) @@ -1116,18 +1116,6 @@ protected: return -1; // failure } - bool IsGuidEqual(const GUID& guid1, const GUID& guid2) const - { - RPC_STATUS status; - if (::UuidEqual(const_cast<GUID *>(&guid1), - const_cast<GUID *>(&guid2), &status)) - { - if (status == RPC_S_OK) - return true; - } - return false; - } - void AttachInternal(HBITMAP hBitmap, DIBOrientation eOrientation, LONG iTransColor) {

1 year, 6 months

[reactos] 01/01: [MSPAINT] s/IsGuidEqual/::IsEqualGUID/

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a1f7b3f2dddd5249029b5… commit a1f7b3f2dddd5249029b5e3f8a1b4c0cba37f0d5 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Jul 6 08:24:46 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Jul 6 08:24:46 2023 +0900 [MSPAINT] s/IsGuidEqual/::IsEqualGUID/ CORE-18867 --- base/applications/mspaint/atlimagedx.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/mspaint/atlimagedx.h b/base/applications/mspaint/atlimagedx.h index 0d56b187029..735d4716dc7 100644 --- a/base/applications/mspaint/atlimagedx.h +++ b/base/applications/mspaint/atlimagedx.h @@ -94,7 +94,7 @@ public: // if the file type is null, get the file type from extension const GUID *FileType = &guidFileType; - if (IsGuidEqual(guidFileType, GUID_NULL)) + if (::IsEqualGUID(guidFileType, GUID_NULL)) { LPCWSTR pszExt = GetFileExtension(pszNameW); FileType = FileTypeFromExtension(pszExt);

1 year, 6 months

[reactos] 01/01: [NETSTAT] Fix Traditional Chinese (zh-TW) translation

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=818908d9d3e44e1be9295… commit 818908d9d3e44e1be9295af6aed86b185bb2a985 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Thu Jul 6 01:56:14 2023 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Thu Jul 6 01:56:14 2023 +0300 [NETSTAT] Fix Traditional Chinese (zh-TW) translation Take double-width characters into account. Addendum to 06ca384f78cf. --- base/applications/network/netstat/lang/zh-TW.rc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/base/applications/network/netstat/lang/zh-TW.rc b/base/applications/network/netstat/lang/zh-TW.rc index 2b81153605a..618831f044e 100644 --- a/base/applications/network/netstat/lang/zh-TW.rc +++ b/base/applications/network/netstat/lang/zh-TW.rc @@ -58,20 +58,20 @@ END STRINGTABLE BEGIN IDS_ICMP4_STAT_HEADER "\nICMPv4 統計資料\n\n" - IDS_ICMP_THEADER " 已接收已傳送\n" - IDS_ICMP_MSG " 訊息 %-11lu %-10lu\n" - IDS_ICMP_ERROR " 錯誤 %-11lu %-10lu\n" - IDS_ICMP_DEST_UNREACH " 無法與目的地連線 %-11lu %-10lu\n" + IDS_ICMP_THEADER " 已接收已傳送\n" + IDS_ICMP_MSG " 訊息 %-11lu %-10lu\n" + IDS_ICMP_ERROR " 錯誤 %-11lu %-10lu\n" + IDS_ICMP_DEST_UNREACH " 無法與目的地連線 %-11lu %-10lu\n" IDS_ICMP_TIME_EXCEED " 超過時間 %-11lu %-10lu\n" IDS_ICMP_PARAM_PROBLEM " 參數問題 %-11lu %-10lu\n" IDS_ICMP_SRC_QUENCHES " 來源抑制 %-11lu %-10lu\n" IDS_ICMP_REDIRECT " 重新導向 %-11lu %-10lu\n" - IDS_ICMP_ECHO " Echo %-11lu %-10lu\n" - IDS_ICMP_ECHO_REPLY " Echo 回應 %-11lu %-10lu\n" + IDS_ICMP_ECHO " Echo %-11lu %-10lu\n" + IDS_ICMP_ECHO_REPLY " Echo 回應 %-11lu %-10lu\n" IDS_ICMP_TIMESTAMP " 時間戳記 %-11lu %-10lu\n" - IDS_ICMP_TIMESTAMP_REPLY " 時間戳記回應 %-11lu %-10lu\n" + IDS_ICMP_TIMESTAMP_REPLY " 時間戳記回應 %-11lu %-10lu\n" IDS_ICMP_ADDRESSS_MASK " 位址遮罩 %-11lu %-10lu\n" - IDS_ICMP_ADDRESSS_MASK_REPLY " 位址遮罩回應 %-11lu %-10lu\n" + IDS_ICMP_ADDRESSS_MASK_REPLY " 位址遮罩回應 %-11lu %-10lu\n" END STRINGTABLE

1 year, 6 months

[reactos] 04/04: [NETSTAT] Add Russian (ru-RU) translation

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5df6963754e226b38192b… commit 5df6963754e226b38192be33b9404035b89919c0 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Thu Jul 6 01:41:41 2023 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Thu Jul 6 01:41:41 2023 +0300 [NETSTAT] Add Russian (ru-RU) translation --- base/applications/network/netstat/lang/ru-RU.rc | 121 ++++++++++++++++++++++++ base/applications/network/netstat/netstat.rc | 3 + 2 files changed, 124 insertions(+) diff --git a/base/applications/network/netstat/lang/ru-RU.rc b/base/applications/network/netstat/lang/ru-RU.rc new file mode 100644 index 00000000000..d4cea042118 --- /dev/null +++ b/base/applications/network/netstat/lang/ru-RU.rc @@ -0,0 +1,121 @@ +/* + * PROJECT: ReactOS netstat utility + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Russian resource file + * TRANSLATORS: Copyright 2023 Stanislav Motylkov <binarymaster(a)mail.ru> + */ + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_USAGE "\nОтображение статистики протокола и текущих сетевых подключений TCP/IP.\n\n\ +NETSTAT [-a] [-b] [-e] [-n] [-o] [-p протокол] [-r] [-s] [-t] [-v] [интервал]\n\n\ + -a Отображение всех подключений и ожидающих портов.\n\ + -b FIXME (Опция допустима, но не реализована).\n\ + -e Отображение статистики Ethernet. Он может применяться вместе\n\ + с параметром -s.\n\ + -n Отображение адресов и номеров портов в числовом формате.\n\ + -o Отображение кода (ID) процесса каждого подключения.\n\ + -p протокол Отображение подключений для протокола, задаваемых этим\n\ + параметром. Допустимые значения: TCP или UDP.\n\ + Используется вместе с параметром -s для отображения статистики\n\ + по протоколам. Допустимые значения: TCP, UDP или IP.\n\ + -r Отображение содержимого таблицы маршрутов.\n\ + -s Отображение статистических данных по протоколам. По умолчанию\n\ + данные отображаются для IP, ICMP, TCP или UDP.\n\ + Параметр -p позволяет указать подмножество выводящихся данных.\n\ + -t FIXME (Опция допустима, но не реализована).\n\ + -v FIXME (Опция допустима, но не реализована).\n\ + интервал Повторный вывод статистических данных через указанный\n\ + промежуток времени в секундах. Для прекращения вывода данных\n\ + нажмите клавиши CTRL+C. Если параметр не задан, сведения о\n\ + текущей конфигурации выводятся один раз.\n" + IDS_DISPLAY_THEADER "\n Имя Локальный адрес Внешний адрес Состояние" + IDS_DISPLAY_PROCESS " Процесс\n" + IDS_ACTIVE_CONNECT "\nАктивные подключения\n" +END + +STRINGTABLE +BEGIN + IDS_IP4_STAT_HEADER "\nСтатистика IPv4\n\n" + IDS_IP_PACK_REC " Получено пакетов = %lu\n" + IDS_IP_HEAD_REC_ERROR " Получено ошибок в заголовках = %lu\n" + IDS_IP_ADDR_REC_ERROR " Получено ошибок в адресах = %lu\n" + IDS_IP_DATAG_FWD " Направлено датаграмм = %lu\n" + IDS_IP_UNKNOWN_PRO_REC " Получено неизвестных протоколов = %lu\n" + IDS_IP_REC_PACK_DISCARD " Отброшено полученных пакетов = %lu\n" + IDS_IP_REC_PACK_DELIVER " Доставлено полученных пакетов = %lu\n" + IDS_IP_OUT_REQUEST " Запросов на вывод = %lu\n" + IDS_IP_ROUTE_DISCARD " Отброшено маршрутов = %lu\n" + IDS_IP_DISCARD_OUT_PACK " Отброшено выходных пакетов = %lu\n" + IDS_IP_OUT_PACKET_NO_ROUTE " Выходных пакетов без маршрута = %lu\n" + IDS_IP_REASSEMBLE_REQUIRED " Требуется сборка = %lu\n" + IDS_IP_REASSEMBLE_SUCCESS " Успешная сборка = %lu\n" + IDS_IP_REASSEMBLE_FAILURE " Сбоев при сборке = %lu\n" + IDS_IP_DATAG_FRAG_SUCCESS " Успешно фрагментировано датаграмм = %lu\n" + IDS_IP_DATAG_FRAG_FAILURE " Сбоев при фрагментации датаграмм = %lu\n" + IDS_IP_DATAG_FRAG_CREATE " Создано фрагментов = %lu\n" +END + +STRINGTABLE +BEGIN + IDS_ICMP4_STAT_HEADER "\nСтатистика ICMPv4\n\n" + IDS_ICMP_THEADER " Получено Отправлено\n" + IDS_ICMP_MSG " Сообщений %-11lu %-10lu\n" + IDS_ICMP_ERROR " Ошибок %-11lu %-10lu\n" + IDS_ICMP_DEST_UNREACH " 'Назначение недостижимо' %-11lu %-10lu\n" + IDS_ICMP_TIME_EXCEED " Превышений времени %-11lu %-10lu\n" + IDS_ICMP_PARAM_PROBLEM " Ошибок в параметрах %-11lu %-10lu\n" + IDS_ICMP_SRC_QUENCHES " Просьб ""снизить скорость"" %-11lu %-10lu\n" + IDS_ICMP_REDIRECT " Переадресовано %-11lu %-10lu\n" + IDS_ICMP_ECHO " Эхо-сообщений %-11lu %-10lu\n" + IDS_ICMP_ECHO_REPLY " Ответных пакетов %-11lu %-10lu\n" + IDS_ICMP_TIMESTAMP " Штампов времени %-11lu %-10lu\n" + IDS_ICMP_TIMESTAMP_REPLY " Ответы на штампы времени %-11lu %-10lu\n" + IDS_ICMP_ADDRESSS_MASK " Масок адресов %-11lu %-10lu\n" + IDS_ICMP_ADDRESSS_MASK_REPLY " Ответов на маски адресов %-11lu %-10lu\n" +END + +STRINGTABLE +BEGIN + IDS_TCP4_HEADER "\nСтатистика TCP для IPv4\n\n" + IDS_TCP_ACTIVE_OPEN " Активных открыто = %lu\n" + IDS_TCP_PASS_OPEN " Пассивных открыто = %lu\n" + IDS_TCP_FAIL_CONNECT " Сбоев при подключении = %lu\n" + IDS_TCP_RESET_CONNECT " Сброшено подключений = %lu\n" + IDS_TCP_CURRENT_CONNECT " Текущих подключений = %lu\n" + IDS_TCP_SEG_RECEIVE " Получено сегментов = %lu\n" + IDS_TCP_SEG_SENT " Отправлено сегментов = %lu\n" + IDS_TCP_SEG_RETRANSMIT " Повторно отправлено сегментов = %lu\n" +END + +STRINGTABLE +BEGIN + IDS_UDP_IP4_HEADER "\nСтатистика UDP для IPv4\n\n" + IDS_UDP_DATAG_RECEIVE " Получено датаграмм = %lu\n" + IDS_UDP_NO_PORT " Отсутствие портов = %lu\n" + IDS_UDP_RECEIVE_ERROR " Ошибки при получении = %lu\n" + IDS_UDP_DATAG_SEND " Отправлено датаграмм = %lu\n" +END + +STRINGTABLE +BEGIN + IDS_ETHERNET_INTERFACE_STAT "Статистика интерфейса\n\n" + IDS_ETHERNET_THEADER " Получено Отправлено\n\n" + IDS_ETHERNET_BYTES "Байт %14lu %15lu\n" + IDS_ETHERNET_UNICAST_PACKET "Одноадресные пакеты %14lu %15lu\n" + IDS_ETHERNET_NON_UNICAST_PACKET "Многоадресные пакеты %14lu %15lu\n" + IDS_ETHERNET_DISCARD "Отброшено %14lu %15lu\n" + IDS_ETHERNET_ERROR "Ошибки %14lu %15lu\n" + IDS_ETHERNET_UNKNOWN "Неизвестный протокол %14lu\n" +END + +STRINGTABLE +BEGIN + IDS_ERROR_WSA_START "ОШИБКА: Не удалось выполнить WSAStartup(): %d\n" + IDS_ERROR_ROUTE "ОШИБКА: Не удалось найти 'route.exe'\n" + IDS_ERROR_TCP_SNAPSHOT "ОШИБКА: Не удалось сделать снимок конечных точек TCP.\n" + IDS_ERROR_UDP_ENDPOINT "ОШИБКА: Не удалось сделать снимок конечных точек UDP.\n" + IDS_ERROR_UDP_ENDPOINT_TABLE "ОШИБКА: Не удалось сделать снимок таблицы конечных точек UDP.\n" +END diff --git a/base/applications/network/netstat/netstat.rc b/base/applications/network/netstat/netstat.rc index 76e3a387619..ad494073ce8 100644 --- a/base/applications/network/netstat/netstat.rc +++ b/base/applications/network/netstat/netstat.rc @@ -17,6 +17,9 @@ #ifdef LANGUAGE_PL_PL #include "lang/pl-PL.rc" #endif +#ifdef LANGUAGE_RU_RU + #include "lang/ru-RU.rc" +#endif #ifdef LANGUAGE_ZH_TW #include "lang/zh-TW.rc" #endif

1 year, 6 months

[reactos] 03/04: [NETSTAT] Fix some unintuitive formatting in translations

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=06ca384f78cfbc5097d61… commit 06ca384f78cfbc5097d61c872689182bd272ef06 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Thu Jul 6 01:30:06 2023 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Thu Jul 6 01:30:06 2023 +0300 [NETSTAT] Fix some unintuitive formatting in translations --- base/applications/network/netstat/lang/en-US.rc | 2 +- base/applications/network/netstat/lang/pl-PL.rc | 2 +- base/applications/network/netstat/lang/zh-TW.rc | 16 ++++++++-------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/base/applications/network/netstat/lang/en-US.rc b/base/applications/network/netstat/lang/en-US.rc index 38b2ae9aab3..74a53461db8 100644 --- a/base/applications/network/netstat/lang/en-US.rc +++ b/base/applications/network/netstat/lang/en-US.rc @@ -52,7 +52,7 @@ END STRINGTABLE BEGIN IDS_ICMP4_STAT_HEADER "\nICMPv4 Statistics\n\n" - IDS_ICMP_THEADER " Received Sent\n" + IDS_ICMP_THEADER " Received Sent\n" IDS_ICMP_MSG " Messages %-11lu %-10lu\n" IDS_ICMP_ERROR " Errors %-11lu %-10lu\n" IDS_ICMP_DEST_UNREACH " Destination Unreachable %-11lu %-10lu\n" diff --git a/base/applications/network/netstat/lang/pl-PL.rc b/base/applications/network/netstat/lang/pl-PL.rc index 05f647b5f6b..caa9cfe93ff 100644 --- a/base/applications/network/netstat/lang/pl-PL.rc +++ b/base/applications/network/netstat/lang/pl-PL.rc @@ -54,7 +54,7 @@ END STRINGTABLE BEGIN IDS_ICMP4_STAT_HEADER "\nStatystyki ICMPv4\n\n" - IDS_ICMP_THEADER " Odebrano Wysłano\n" + IDS_ICMP_THEADER " Odebrano Wysłano\n" IDS_ICMP_MSG " Komunikaty %-11lu %lu\n" IDS_ICMP_ERROR " Błędy %-11lu %lu\n" IDS_ICMP_DEST_UNREACH " Miejsce docelowe nieosiągalne %-11lu %lu\n" diff --git a/base/applications/network/netstat/lang/zh-TW.rc b/base/applications/network/netstat/lang/zh-TW.rc index 4021812829f..2b81153605a 100644 --- a/base/applications/network/netstat/lang/zh-TW.rc +++ b/base/applications/network/netstat/lang/zh-TW.rc @@ -58,20 +58,20 @@ END STRINGTABLE BEGIN IDS_ICMP4_STAT_HEADER "\nICMPv4 統計資料\n\n" - IDS_ICMP_THEADER " 已接收已傳送\n" - IDS_ICMP_MSG " 訊息 %-11lu %-10lu\n" - IDS_ICMP_ERROR " 錯誤 %-11lu %-10lu\n" - IDS_ICMP_DEST_UNREACH " 無法與目的地連線 %-11lu %-10lu\n" + IDS_ICMP_THEADER " 已接收已傳送\n" + IDS_ICMP_MSG " 訊息 %-11lu %-10lu\n" + IDS_ICMP_ERROR " 錯誤 %-11lu %-10lu\n" + IDS_ICMP_DEST_UNREACH " 無法與目的地連線 %-11lu %-10lu\n" IDS_ICMP_TIME_EXCEED " 超過時間 %-11lu %-10lu\n" IDS_ICMP_PARAM_PROBLEM " 參數問題 %-11lu %-10lu\n" IDS_ICMP_SRC_QUENCHES " 來源抑制 %-11lu %-10lu\n" IDS_ICMP_REDIRECT " 重新導向 %-11lu %-10lu\n" - IDS_ICMP_ECHO " Echo %-11lu %-10lu\n" - IDS_ICMP_ECHO_REPLY " Echo 回應 %-11lu %-10lu\n" + IDS_ICMP_ECHO " Echo %-11lu %-10lu\n" + IDS_ICMP_ECHO_REPLY " Echo 回應 %-11lu %-10lu\n" IDS_ICMP_TIMESTAMP " 時間戳記 %-11lu %-10lu\n" - IDS_ICMP_TIMESTAMP_REPLY " 時間戳記回應 %-11lu %-10lu\n" + IDS_ICMP_TIMESTAMP_REPLY " 時間戳記回應 %-11lu %-10lu\n" IDS_ICMP_ADDRESSS_MASK " 位址遮罩 %-11lu %-10lu\n" - IDS_ICMP_ADDRESSS_MASK_REPLY " 位址遮罩回應 %-11lu %-10lu\n" + IDS_ICMP_ADDRESSS_MASK_REPLY " 位址遮罩回應 %-11lu %-10lu\n" END STRINGTABLE

1 year, 6 months

[reactos] 02/04: [MSPAINT] Update Russian (ru-RU) translation

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=af18a970a9537f25a1382… commit af18a970a9537f25a1382ce1ca44fb007b5353c3 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Thu Jul 6 01:04:13 2023 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Thu Jul 6 01:04:13 2023 +0300 [MSPAINT] Update Russian (ru-RU) translation --- base/applications/mspaint/lang/ru-RU.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/mspaint/lang/ru-RU.rc b/base/applications/mspaint/lang/ru-RU.rc index 695955742bc..654ea538794 100644 --- a/base/applications/mspaint/lang/ru-RU.rc +++ b/base/applications/mspaint/lang/ru-RU.rc @@ -265,5 +265,5 @@ BEGIN IDS_VERTICAL "Вертикальный" IDS_PRINTRES "%d x %d точек/см" IDS_CANTPASTE "Не удалось вставить из буфера обмена. Формат данных либо некорректный, либо не поддерживается." - IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_SAVEERROR "Не удалось сохранить точечный рисунок в файл:\n\n%s" END

1 year, 6 months

[reactos] 01/04: [MSPAINT] Improve wording of IDS_SAVEERROR

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fa4c72b79e5592371cf8b… commit fa4c72b79e5592371cf8bdd218da3a8e03c0beff Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Thu Jul 6 01:02:33 2023 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Thu Jul 6 01:02:33 2023 +0300 [MSPAINT] Improve wording of IDS_SAVEERROR Addendum to 3e23cdf9e. CORE-18867 --- base/applications/mspaint/lang/bg-BG.rc | 2 +- base/applications/mspaint/lang/cs-CZ.rc | 2 +- base/applications/mspaint/lang/de-DE.rc | 2 +- base/applications/mspaint/lang/en-GB.rc | 2 +- base/applications/mspaint/lang/en-US.rc | 2 +- base/applications/mspaint/lang/es-ES.rc | 2 +- base/applications/mspaint/lang/et-EE.rc | 2 +- base/applications/mspaint/lang/eu-ES.rc | 2 +- base/applications/mspaint/lang/fr-FR.rc | 2 +- base/applications/mspaint/lang/he-IL.rc | 2 +- base/applications/mspaint/lang/hu-HU.rc | 2 +- base/applications/mspaint/lang/id-ID.rc | 2 +- base/applications/mspaint/lang/it-IT.rc | 2 +- base/applications/mspaint/lang/nl-NL.rc | 2 +- base/applications/mspaint/lang/no-NO.rc | 2 +- base/applications/mspaint/lang/pl-PL.rc | 2 +- base/applications/mspaint/lang/pt-BR.rc | 2 +- base/applications/mspaint/lang/pt-PT.rc | 2 +- base/applications/mspaint/lang/ro-RO.rc | 2 +- base/applications/mspaint/lang/ru-RU.rc | 2 +- base/applications/mspaint/lang/sk-SK.rc | 2 +- base/applications/mspaint/lang/sq-AL.rc | 2 +- base/applications/mspaint/lang/sv-SE.rc | 2 +- base/applications/mspaint/lang/tr-TR.rc | 2 +- base/applications/mspaint/lang/uk-UA.rc | 2 +- base/applications/mspaint/lang/vi-VN.rc | 2 +- base/applications/mspaint/lang/zh-CN.rc | 2 +- base/applications/mspaint/lang/zh-HK.rc | 2 +- base/applications/mspaint/lang/zh-TW.rc | 2 +- 29 files changed, 29 insertions(+), 29 deletions(-) diff --git a/base/applications/mspaint/lang/bg-BG.rc b/base/applications/mspaint/lang/bg-BG.rc index 31663fde2d3..f3b6382d5b7 100644 --- a/base/applications/mspaint/lang/bg-BG.rc +++ b/base/applications/mspaint/lang/bg-BG.rc @@ -262,5 +262,5 @@ BEGIN IDS_VERTICAL "Вертикален" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." - IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" + IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" END diff --git a/base/applications/mspaint/lang/cs-CZ.rc b/base/applications/mspaint/lang/cs-CZ.rc index c1d67ce1682..5e5fcbb6caa 100644 --- a/base/applications/mspaint/lang/cs-CZ.rc +++ b/base/applications/mspaint/lang/cs-CZ.rc @@ -262,5 +262,5 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." - IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" + IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" END diff --git a/base/applications/mspaint/lang/de-DE.rc b/base/applications/mspaint/lang/de-DE.rc index fc46fe2f042..4cfe2e6c328 100644 --- a/base/applications/mspaint/lang/de-DE.rc +++ b/base/applications/mspaint/lang/de-DE.rc @@ -261,5 +261,5 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." - IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" + IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" END diff --git a/base/applications/mspaint/lang/en-GB.rc b/base/applications/mspaint/lang/en-GB.rc index c653732c4d8..69e8873cf75 100644 --- a/base/applications/mspaint/lang/en-GB.rc +++ b/base/applications/mspaint/lang/en-GB.rc @@ -261,5 +261,5 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d dots per inch" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." - IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" + IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" END diff --git a/base/applications/mspaint/lang/en-US.rc b/base/applications/mspaint/lang/en-US.rc index 9de01a2499f..935c3fe4c8b 100644 --- a/base/applications/mspaint/lang/en-US.rc +++ b/base/applications/mspaint/lang/en-US.rc @@ -262,5 +262,5 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d dots per inch" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." - IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" + IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" END diff --git a/base/applications/mspaint/lang/es-ES.rc b/base/applications/mspaint/lang/es-ES.rc index d30226ccaf7..ac60a967781 100644 --- a/base/applications/mspaint/lang/es-ES.rc +++ b/base/applications/mspaint/lang/es-ES.rc @@ -264,5 +264,5 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." - IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" + IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" END diff --git a/base/applications/mspaint/lang/et-EE.rc b/base/applications/mspaint/lang/et-EE.rc index 0c2b543cbe6..1f8012d233f 100644 --- a/base/applications/mspaint/lang/et-EE.rc +++ b/base/applications/mspaint/lang/et-EE.rc @@ -261,5 +261,5 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." - IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" + IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" END diff --git a/base/applications/mspaint/lang/eu-ES.rc b/base/applications/mspaint/lang/eu-ES.rc index 273f8c9f20a..1adb078efad 100644 --- a/base/applications/mspaint/lang/eu-ES.rc +++ b/base/applications/mspaint/lang/eu-ES.rc @@ -262,5 +262,5 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." - IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" + IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" END diff --git a/base/applications/mspaint/lang/fr-FR.rc b/base/applications/mspaint/lang/fr-FR.rc index aee25ef236b..cadd7699281 100644 --- a/base/applications/mspaint/lang/fr-FR.rc +++ b/base/applications/mspaint/lang/fr-FR.rc @@ -262,5 +262,5 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." - IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" + IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" END diff --git a/base/applications/mspaint/lang/he-IL.rc b/base/applications/mspaint/lang/he-IL.rc index e02fcea3758..03b1ef391e8 100644 --- a/base/applications/mspaint/lang/he-IL.rc +++ b/base/applications/mspaint/lang/he-IL.rc @@ -264,5 +264,5 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." - IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" + IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" END diff --git a/base/applications/mspaint/lang/hu-HU.rc b/base/applications/mspaint/lang/hu-HU.rc index ff132eda6f9..d3299286f57 100644 --- a/base/applications/mspaint/lang/hu-HU.rc +++ b/base/applications/mspaint/lang/hu-HU.rc @@ -262,5 +262,5 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." - IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" + IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" END diff --git a/base/applications/mspaint/lang/id-ID.rc b/base/applications/mspaint/lang/id-ID.rc index ad2d99b362a..9ae48324433 100644 --- a/base/applications/mspaint/lang/id-ID.rc +++ b/base/applications/mspaint/lang/id-ID.rc @@ -261,5 +261,5 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." - IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" + IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" END diff --git a/base/applications/mspaint/lang/it-IT.rc b/base/applications/mspaint/lang/it-IT.rc index 45ff4d842e9..d55a546848e 100644 --- a/base/applications/mspaint/lang/it-IT.rc +++ b/base/applications/mspaint/lang/it-IT.rc @@ -262,5 +262,5 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." - IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" + IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" END diff --git a/base/applications/mspaint/lang/nl-NL.rc b/base/applications/mspaint/lang/nl-NL.rc index 62ae6c4e47a..a08efcab887 100644 --- a/base/applications/mspaint/lang/nl-NL.rc +++ b/base/applications/mspaint/lang/nl-NL.rc @@ -261,5 +261,5 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." - IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" + IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" END diff --git a/base/applications/mspaint/lang/no-NO.rc b/base/applications/mspaint/lang/no-NO.rc index b6014ef58e0..40290499bb0 100644 --- a/base/applications/mspaint/lang/no-NO.rc +++ b/base/applications/mspaint/lang/no-NO.rc @@ -261,5 +261,5 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." - IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" + IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" END diff --git a/base/applications/mspaint/lang/pl-PL.rc b/base/applications/mspaint/lang/pl-PL.rc index 0714c9ce3cb..9dbc184b3c1 100644 --- a/base/applications/mspaint/lang/pl-PL.rc +++ b/base/applications/mspaint/lang/pl-PL.rc @@ -264,5 +264,5 @@ BEGIN IDS_VERTICAL "Pionowe" IDS_PRINTRES "%d x %d piksel/cm" IDS_CANTPASTE "Nie można wkleić ze schowka. Format danych jest nieprawidłowy lub nieobsługiwany." - IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" + IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" END diff --git a/base/applications/mspaint/lang/pt-BR.rc b/base/applications/mspaint/lang/pt-BR.rc index 0c8442b4b35..9ae3d5de864 100644 --- a/base/applications/mspaint/lang/pt-BR.rc +++ b/base/applications/mspaint/lang/pt-BR.rc @@ -262,5 +262,5 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." - IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" + IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" END diff --git a/base/applications/mspaint/lang/pt-PT.rc b/base/applications/mspaint/lang/pt-PT.rc index e150cfa14a2..8f164db2991 100644 --- a/base/applications/mspaint/lang/pt-PT.rc +++ b/base/applications/mspaint/lang/pt-PT.rc @@ -262,5 +262,5 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." - IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" + IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" END diff --git a/base/applications/mspaint/lang/ro-RO.rc b/base/applications/mspaint/lang/ro-RO.rc index 3fce7fbca19..d6afd6a9a01 100644 --- a/base/applications/mspaint/lang/ro-RO.rc +++ b/base/applications/mspaint/lang/ro-RO.rc @@ -263,5 +263,5 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixeli/cm" IDS_CANTPASTE "Nu a putut fi lipit din clipboard. Formatul de date este fie incorect, fie nesuportat." - IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" + IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" END diff --git a/base/applications/mspaint/lang/ru-RU.rc b/base/applications/mspaint/lang/ru-RU.rc index ded8d919f0f..695955742bc 100644 --- a/base/applications/mspaint/lang/ru-RU.rc +++ b/base/applications/mspaint/lang/ru-RU.rc @@ -265,5 +265,5 @@ BEGIN IDS_VERTICAL "Вертикальный" IDS_PRINTRES "%d x %d точек/см" IDS_CANTPASTE "Не удалось вставить из буфера обмена. Формат данных либо некорректный, либо не поддерживается." - IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" + IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" END diff --git a/base/applications/mspaint/lang/sk-SK.rc b/base/applications/mspaint/lang/sk-SK.rc index 1fb92dbb4f6..de9943cb899 100644 --- a/base/applications/mspaint/lang/sk-SK.rc +++ b/base/applications/mspaint/lang/sk-SK.rc @@ -261,5 +261,5 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." - IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" + IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" END diff --git a/base/applications/mspaint/lang/sq-AL.rc b/base/applications/mspaint/lang/sq-AL.rc index b2122a03273..ca4fb20a5bc 100644 --- a/base/applications/mspaint/lang/sq-AL.rc +++ b/base/applications/mspaint/lang/sq-AL.rc @@ -261,5 +261,5 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." - IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" + IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" END diff --git a/base/applications/mspaint/lang/sv-SE.rc b/base/applications/mspaint/lang/sv-SE.rc index 3d92c35f6c6..a944710d617 100644 --- a/base/applications/mspaint/lang/sv-SE.rc +++ b/base/applications/mspaint/lang/sv-SE.rc @@ -262,5 +262,5 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." - IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" + IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" END diff --git a/base/applications/mspaint/lang/tr-TR.rc b/base/applications/mspaint/lang/tr-TR.rc index a87fb699142..9026820d5d7 100644 --- a/base/applications/mspaint/lang/tr-TR.rc +++ b/base/applications/mspaint/lang/tr-TR.rc @@ -262,5 +262,5 @@ BEGIN IDS_VERTICAL "Düşey" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." - IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" + IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" END diff --git a/base/applications/mspaint/lang/uk-UA.rc b/base/applications/mspaint/lang/uk-UA.rc index a998b99363a..2710a7e410a 100644 --- a/base/applications/mspaint/lang/uk-UA.rc +++ b/base/applications/mspaint/lang/uk-UA.rc @@ -263,5 +263,5 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." - IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" + IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" END diff --git a/base/applications/mspaint/lang/vi-VN.rc b/base/applications/mspaint/lang/vi-VN.rc index 0db569f74f3..4cc725d213c 100644 --- a/base/applications/mspaint/lang/vi-VN.rc +++ b/base/applications/mspaint/lang/vi-VN.rc @@ -261,5 +261,5 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." - IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" + IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" END diff --git a/base/applications/mspaint/lang/zh-CN.rc b/base/applications/mspaint/lang/zh-CN.rc index d40e2390b77..e2283e68e6f 100644 --- a/base/applications/mspaint/lang/zh-CN.rc +++ b/base/applications/mspaint/lang/zh-CN.rc @@ -264,5 +264,5 @@ BEGIN IDS_VERTICAL "垂直" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." - IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" + IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" END diff --git a/base/applications/mspaint/lang/zh-HK.rc b/base/applications/mspaint/lang/zh-HK.rc index 85dd5341843..c76ec7920aa 100644 --- a/base/applications/mspaint/lang/zh-HK.rc +++ b/base/applications/mspaint/lang/zh-HK.rc @@ -262,5 +262,5 @@ BEGIN IDS_VERTICAL "垂直" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." - IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" + IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" END diff --git a/base/applications/mspaint/lang/zh-TW.rc b/base/applications/mspaint/lang/zh-TW.rc index b044da06910..776a7e5d7e3 100644 --- a/base/applications/mspaint/lang/zh-TW.rc +++ b/base/applications/mspaint/lang/zh-TW.rc @@ -262,5 +262,5 @@ BEGIN IDS_VERTICAL "垂直" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." - IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" + IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" END

1 year, 6 months

[reactos] 01/01: [NETSTAT] Optimize a bit (#5405)

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8ef47d2e5e53f62fb4807… commit 8ef47d2e5e53f62fb48073a34e4467c743a18d6c Author: Joachim Henze <joachim.henze(a)reactos.org> AuthorDate: Wed Jul 5 20:52:04 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jul 5 20:52:04 2023 +0200 [NETSTAT] Optimize a bit (#5405) in netstat.c 100% of the calls to DisplayTableHeader(); have in the exact line beforehand a call to ConResPuts(StdOut, IDS_ACTIVE_CONNECT); So let's fuse them. Also fix a superfluous space in the *.rc files before it will get duplicated a thousand times. --- base/applications/network/netstat/lang/en-US.rc | 2 +- base/applications/network/netstat/lang/pl-PL.rc | 2 +- base/applications/network/netstat/lang/zh-TW.rc | 2 +- base/applications/network/netstat/netstat.c | 6 +----- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/base/applications/network/netstat/lang/en-US.rc b/base/applications/network/netstat/lang/en-US.rc index 0ba302812b6..38b2ae9aab3 100644 --- a/base/applications/network/netstat/lang/en-US.rc +++ b/base/applications/network/netstat/lang/en-US.rc @@ -104,7 +104,7 @@ END STRINGTABLE BEGIN - IDS_ERROR_WSA_START "ERROR: WSAStartup() failed : %d\n" + IDS_ERROR_WSA_START "ERROR: WSAStartup() failed: %d\n" IDS_ERROR_ROUTE "ERROR: Cannot find 'route.exe'\n" IDS_ERROR_TCP_SNAPSHOT "ERROR: Failed to snapshot TCP endpoints.\n" IDS_ERROR_UDP_ENDPOINT "ERROR: Failed to snapshot UDP endpoints.\n" diff --git a/base/applications/network/netstat/lang/pl-PL.rc b/base/applications/network/netstat/lang/pl-PL.rc index 6601576132a..05f647b5f6b 100644 --- a/base/applications/network/netstat/lang/pl-PL.rc +++ b/base/applications/network/netstat/lang/pl-PL.rc @@ -106,7 +106,7 @@ END STRINGTABLE BEGIN - IDS_ERROR_WSA_START "BŁĄD: Procedura WSAStartup() nie powiodła się : %d\n" + IDS_ERROR_WSA_START "BŁĄD: Procedura WSAStartup() nie powiodła się: %d\n" IDS_ERROR_ROUTE "BŁĄD: Nie można odnaleźć pliku 'route.exe'\n" IDS_ERROR_TCP_SNAPSHOT "BŁĄD: Nie powiodło się utworzenie migawki dla punktów końcowych TCP.\n" IDS_ERROR_UDP_ENDPOINT "BŁĄD: Nie powiodło się utworzenie migawki dla punktów końcowych UDP.\n" diff --git a/base/applications/network/netstat/lang/zh-TW.rc b/base/applications/network/netstat/lang/zh-TW.rc index 0fa63067c7f..4021812829f 100644 --- a/base/applications/network/netstat/lang/zh-TW.rc +++ b/base/applications/network/netstat/lang/zh-TW.rc @@ -110,7 +110,7 @@ END STRINGTABLE BEGIN - IDS_ERROR_WSA_START "錯誤: WSAStartup() 失敗 : %d\n" + IDS_ERROR_WSA_START "錯誤: WSAStartup() 失敗: %d\n" IDS_ERROR_ROUTE "錯誤: 找不到 'route.exe'\n" IDS_ERROR_TCP_SNAPSHOT "錯誤: 無法取得 TCP 端點快照。\n" IDS_ERROR_UDP_ENDPOINT "錯誤: 無法取得 UDP 端點快照。\n" diff --git a/base/applications/network/netstat/netstat.c b/base/applications/network/netstat/netstat.c index b3754fa2de1..c4449add815 100644 --- a/base/applications/network/netstat/netstat.c +++ b/base/applications/network/netstat/netstat.c @@ -63,6 +63,7 @@ VOID DoFormatMessage(DWORD ErrorCode) */ VOID DisplayTableHeader(VOID) { + ConResPuts(StdOut, IDS_ACTIVE_CONNECT); ConResPuts(StdOut, IDS_DISPLAY_THEADER); if (bDoShowProcessId) ConResPuts(StdOut, IDS_DISPLAY_PROCESS); @@ -115,7 +116,6 @@ BOOL ParseCmdline(int argc, wchar_t* argv[]) bDoShowProtoCons = TRUE; if (i+1 >= argc) { - ConResPuts(StdOut, IDS_ACTIVE_CONNECT); DisplayTableHeader(); return TRUE; } @@ -173,7 +173,6 @@ BOOL DisplayOutput(VOID) { if (bNoOptions) { - ConResPuts(StdOut, IDS_ACTIVE_CONNECT); DisplayTableHeader(); return ShowTcpTable(); } @@ -209,13 +208,11 @@ BOOL DisplayOutput(VOID) case TCP: if (bDoShowProtoStats) ShowTcpStatistics(); - ConResPuts(StdOut, IDS_ACTIVE_CONNECT); DisplayTableHeader(); return ShowTcpTable(); case UDP: if (bDoShowProtoStats) ShowUdpStatistics(); - ConResPuts(StdOut, IDS_ACTIVE_CONNECT); DisplayTableHeader(); return (bDoShowAllCons ? ShowUdpTable() : TRUE); default: @@ -232,7 +229,6 @@ BOOL DisplayOutput(VOID) } else { - ConResPuts(StdOut, IDS_ACTIVE_CONNECT); DisplayTableHeader(); if (ShowTcpTable() && bDoShowAllCons) ShowUdpTable();

1 year, 6 months

[reactos] 01/01: [MSPAINT] Some bug fixes on loading/saving files (#5385)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3e23cdf9ee1268fe21916… commit 3e23cdf9ee1268fe219168ebf8e8e0f544d6f0df Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Jul 5 12:06:22 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jul 5 12:06:22 2023 +0900 [MSPAINT] Some bug fixes on loading/saving files (#5385) - Display a correct error message on failing to save a file. - Don't confuse the main file info and the non-main file info. - Rename ShowFileLoadError as ShowError, and strengthen and move it to dialogs.cpp. - Add SetFileInfo and InitializeImage helper functions. - Add IDS_SAVEERROR resource string. - Modify SaveDIBToFile, SetBitmapAndInfo, and DoLoadImageFile functions. CORE-18867 --- base/applications/mspaint/dialogs.cpp | 16 ++++ base/applications/mspaint/dialogs.h | 2 + base/applications/mspaint/dib.cpp | 164 ++++++++++++++++---------------- base/applications/mspaint/dib.h | 10 +- base/applications/mspaint/history.cpp | 2 +- base/applications/mspaint/lang/bg-BG.rc | 1 + base/applications/mspaint/lang/cs-CZ.rc | 1 + base/applications/mspaint/lang/de-DE.rc | 1 + base/applications/mspaint/lang/en-GB.rc | 1 + base/applications/mspaint/lang/en-US.rc | 1 + base/applications/mspaint/lang/es-ES.rc | 1 + base/applications/mspaint/lang/et-EE.rc | 1 + base/applications/mspaint/lang/eu-ES.rc | 1 + base/applications/mspaint/lang/fr-FR.rc | 1 + base/applications/mspaint/lang/he-IL.rc | 1 + base/applications/mspaint/lang/hu-HU.rc | 1 + base/applications/mspaint/lang/id-ID.rc | 1 + base/applications/mspaint/lang/it-IT.rc | 1 + base/applications/mspaint/lang/ja-JP.rc | 1 + base/applications/mspaint/lang/nl-NL.rc | 1 + base/applications/mspaint/lang/no-NO.rc | 1 + base/applications/mspaint/lang/pl-PL.rc | 1 + base/applications/mspaint/lang/pt-BR.rc | 1 + base/applications/mspaint/lang/pt-PT.rc | 1 + base/applications/mspaint/lang/ro-RO.rc | 1 + base/applications/mspaint/lang/ru-RU.rc | 1 + base/applications/mspaint/lang/sk-SK.rc | 1 + base/applications/mspaint/lang/sq-AL.rc | 1 + base/applications/mspaint/lang/sv-SE.rc | 1 + base/applications/mspaint/lang/tr-TR.rc | 1 + base/applications/mspaint/lang/uk-UA.rc | 1 + base/applications/mspaint/lang/vi-VN.rc | 1 + base/applications/mspaint/lang/zh-CN.rc | 1 + base/applications/mspaint/lang/zh-HK.rc | 1 + base/applications/mspaint/lang/zh-TW.rc | 1 + base/applications/mspaint/main.cpp | 6 +- base/applications/mspaint/resource.h | 1 + base/applications/mspaint/winproc.cpp | 26 +++-- 38 files changed, 149 insertions(+), 108 deletions(-) diff --git a/base/applications/mspaint/dialogs.cpp b/base/applications/mspaint/dialogs.cpp index 1d818616cd9..9c9fad3e567 100644 --- a/base/applications/mspaint/dialogs.cpp +++ b/base/applications/mspaint/dialogs.cpp @@ -22,6 +22,22 @@ CFontsDialog fontsDialog; /* FUNCTIONS ********************************************************/ +void ShowError(INT stringID, ...) +{ + va_list va; + va_start(va, stringID); + + CStringW strFormat, strText; + strFormat.LoadString(stringID); + strText.FormatV(strFormat, va); + + CStringW strProgramName; + strProgramName.LoadString(IDS_PROGRAMNAME); + + mainWindow.MessageBox(strText, strProgramName, MB_ICONERROR); + va_end(va); +} + LRESULT CMirrorRotateDialog::OnInitDialog(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { CheckDlgButton(IDD_MIRRORROTATERB1, BST_CHECKED); diff --git a/base/applications/mspaint/dialogs.h b/base/applications/mspaint/dialogs.h index b4c55c28adb..d760c59d556 100644 --- a/base/applications/mspaint/dialogs.h +++ b/base/applications/mspaint/dialogs.h @@ -7,6 +7,8 @@ #pragma once +void ShowError(INT stringID, ...); + class CMirrorRotateDialog : public CDialogImpl<CMirrorRotateDialog> { public: diff --git a/base/applications/mspaint/dib.cpp b/base/applications/mspaint/dib.cpp index 4723b25f465..ea5ead7427a 100644 --- a/base/applications/mspaint/dib.cpp +++ b/base/applications/mspaint/dib.cpp @@ -142,76 +142,65 @@ GetDIBHeight(HBITMAP hBitmap) return bm.bmHeight; } -BOOL SaveDIBToFile(HBITMAP hBitmap, LPCTSTR FileName, HDC hDC) +BOOL SaveDIBToFile(HBITMAP hBitmap, LPCWSTR FileName, BOOL fIsMainFile) { CImageDx img; img.Attach(hBitmap); - img.SaveDx(FileName, GUID_NULL, g_xDpi, g_yDpi); // TODO: error handling + HRESULT hr = img.SaveDx(FileName, GUID_NULL, g_xDpi, g_yDpi); img.Detach(); - WIN32_FIND_DATA find; - HANDLE hFind = FindFirstFile(FileName, &find); - if (hFind == INVALID_HANDLE_VALUE) + if (FAILED(hr)) { - ShowFileLoadError(FileName); + ShowError(IDS_SAVEERROR, FileName); return FALSE; } - FindClose(hFind); - // update time and size - FILETIME ft; - FileTimeToLocalFileTime(&find.ftLastWriteTime, &ft); - FileTimeToSystemTime(&ft, &g_fileTime); - g_fileSize = find.nFileSizeLow; + if (!fIsMainFile) + return TRUE; - // TODO: update hRes and vRes - - registrySettings.SetMostRecentFile(FileName); + WIN32_FIND_DATAW find; + HANDLE hFind = ::FindFirstFileW(FileName, &find); + if (hFind == INVALID_HANDLE_VALUE) + { + ShowError(IDS_SAVEERROR, FileName); + return FALSE; + } + ::FindClose(hFind); - g_isAFile = TRUE; + SetFileInfo(FileName, &find, TRUE); g_imageSaved = TRUE; return TRUE; } -void ShowFileLoadError(LPCTSTR name) +void SetFileInfo(LPCWSTR name, LPWIN32_FIND_DATAW pFound, BOOL isAFile) { - CString strText; - strText.Format(IDS_LOADERRORTEXT, (LPCTSTR) name); - CString strProgramName; - strProgramName.LoadString(IDS_PROGRAMNAME); - mainWindow.MessageBox(strText, strProgramName, MB_OK | MB_ICONEXCLAMATION); -} - -HBITMAP SetBitmapAndInfo(HBITMAP hBitmap, LPCTSTR name, DWORD dwFileSize, BOOL isFile) -{ - if (hBitmap == NULL) + // update file time and size + if (pFound) { - COLORREF white = RGB(255, 255, 255); - hBitmap = CreateColorDIB(registrySettings.BMPWidth, - registrySettings.BMPHeight, white); - if (hBitmap == NULL) - return FALSE; - - HDC hScreenDC = GetDC(NULL); - g_xDpi = GetDeviceCaps(hScreenDC, LOGPIXELSX); - g_yDpi = GetDeviceCaps(hScreenDC, LOGPIXELSY); - ReleaseDC(NULL, hScreenDC); + FILETIME ft; + ::FileTimeToLocalFileTime(&pFound->ftLastWriteTime, &ft); + ::FileTimeToSystemTime(&ft, &g_fileTime); + g_fileSize = pFound->nFileSizeLow; + } + else + { ZeroMemory(&g_fileTime, sizeof(g_fileTime)); + g_fileSize = 0; } - // update image - imageModel.PushImageForUndo(hBitmap); - imageModel.ClearHistory(); - - // update g_fileSize - g_fileSize = dwFileSize; - // update g_szFileName if (name && name[0]) - GetFullPathName(name, _countof(g_szFileName), g_szFileName, NULL); + { + CStringW strName = name; + ::GetFullPathNameW(strName, _countof(g_szFileName), g_szFileName, NULL); + // The following code won't work correctly when (name == g_szFileName): + // ::GetFullPathNameW(name, _countof(g_szFileName), g_szFileName, NULL); + } else - LoadString(g_hinstExe, IDS_DEFAULTFILENAME, g_szFileName, _countof(g_szFileName)); + { + ::LoadStringW(g_hinstExe, IDS_DEFAULTFILENAME, g_szFileName, _countof(g_szFileName)); + } // set title CString strTitle; @@ -219,71 +208,80 @@ HBITMAP SetBitmapAndInfo(HBITMAP hBitmap, LPCTSTR name, DWORD dwFileSize, BOOL i mainWindow.SetWindowText(strTitle); // update file info and recent - g_isAFile = isFile; + g_isAFile = isAFile; if (g_isAFile) registrySettings.SetMostRecentFile(g_szFileName); g_imageSaved = TRUE; +} + +HBITMAP InitializeImage(LPCWSTR name, LPWIN32_FIND_DATAW pFound, BOOL isFile) +{ + COLORREF white = RGB(255, 255, 255); + HBITMAP hBitmap = CreateColorDIB(registrySettings.BMPWidth, registrySettings.BMPHeight, white); + if (hBitmap == NULL) + return NULL; + + HDC hScreenDC = ::GetDC(NULL); + g_xDpi = ::GetDeviceCaps(hScreenDC, LOGPIXELSX); + g_yDpi = ::GetDeviceCaps(hScreenDC, LOGPIXELSY); + ::ReleaseDC(NULL, hScreenDC); + + return SetBitmapAndInfo(hBitmap, name, pFound, isFile); +} +HBITMAP SetBitmapAndInfo(HBITMAP hBitmap, LPCWSTR name, LPWIN32_FIND_DATAW pFound, BOOL isFile) +{ + // update image + imageModel.PushImageForUndo(hBitmap); + imageModel.ClearHistory(); + + SetFileInfo(name, pFound, isFile); + g_imageSaved = TRUE; return hBitmap; } -HBITMAP DoLoadImageFile(HWND hwnd, LPCTSTR name, BOOL fIsMainFile) +HBITMAP DoLoadImageFile(HWND hwnd, LPCWSTR name, BOOL fIsMainFile) { // find the file WIN32_FIND_DATA find; - HANDLE hFind = FindFirstFile(name, &find); - if (hFind == INVALID_HANDLE_VALUE) + HANDLE hFind = ::FindFirstFileW(name, &find); + if (hFind == INVALID_HANDLE_VALUE) // does not exist { - // does not exist - CStringW strText; - strText.Format(IDS_LOADERRORTEXT, name); - MessageBoxW(hwnd, strText, NULL, MB_ICONERROR); + ShowError(IDS_LOADERRORTEXT, name); return NULL; } - DWORD dwFileSize = find.nFileSizeLow; // get file size - FindClose(hFind); + ::FindClose(hFind); // is file empty? - if (dwFileSize == 0) + if (find.nFileSizeLow == 0 && find.nFileSizeHigh == 0) { if (fIsMainFile) - { - FILETIME ft; - FileTimeToLocalFileTime(&find.ftLastWriteTime, &ft); - FileTimeToSystemTime(&ft, &g_fileTime); - return SetBitmapAndInfo(NULL, name, dwFileSize, TRUE); - } + return InitializeImage(name, &find, TRUE); } // load the image CImageDx img; - img.LoadDx(name, &g_xDpi, &g_yDpi); + float xDpi, yDpi; + HRESULT hr = img.LoadDx(name, &xDpi, &yDpi); + if (FAILED(hr)) + { + ShowError(IDS_LOADERRORTEXT, name); + return NULL; + } + + HBITMAP hBitmap = img.Detach(); + if (!fIsMainFile) + return hBitmap; + g_xDpi = xDpi; + g_yDpi = yDpi; if (g_xDpi <= 0) g_xDpi = 96; if (g_yDpi <= 0) g_yDpi = 96; - HBITMAP hBitmap = img.Detach(); - - if (hBitmap == NULL) - { - // cannot open - CStringW strText; - strText.Format(IDS_LOADERRORTEXT, name); - MessageBoxW(hwnd, strText, NULL, MB_ICONERROR); - return NULL; - } - - if (fIsMainFile) - { - FILETIME ft; - FileTimeToLocalFileTime(&find.ftLastWriteTime, &ft); - FileTimeToSystemTime(&ft, &g_fileTime); - SetBitmapAndInfo(hBitmap, name, dwFileSize, TRUE); - } - + SetBitmapAndInfo(hBitmap, name, &find, TRUE); return hBitmap; } diff --git a/base/applications/mspaint/dib.h b/base/applications/mspaint/dib.h index 0ddb5067db5..9c1e5d4f09c 100644 --- a/base/applications/mspaint/dib.h +++ b/base/applications/mspaint/dib.h @@ -20,16 +20,16 @@ static inline HBITMAP CopyDIBImage(HBITMAP hbm, INT cx = 0, INT cy = 0) } int GetDIBWidth(HBITMAP hbm); - int GetDIBHeight(HBITMAP hbm); -BOOL SaveDIBToFile(HBITMAP hBitmap, LPCTSTR FileName, HDC hDC); +BOOL SaveDIBToFile(HBITMAP hBitmap, LPCWSTR FileName, BOOL fIsMainFile); -HBITMAP DoLoadImageFile(HWND hwnd, LPCTSTR name, BOOL fIsMainFile); +HBITMAP DoLoadImageFile(HWND hwnd, LPCWSTR name, BOOL fIsMainFile); -void ShowFileLoadError(LPCTSTR name); +void SetFileInfo(LPCWSTR name, LPWIN32_FIND_DATAW pFound, BOOL isAFile); -HBITMAP SetBitmapAndInfo(HBITMAP hBitmap, LPCTSTR name, DWORD dwFileSize, BOOL isFile); +HBITMAP InitializeImage(LPCWSTR name, LPWIN32_FIND_DATAW pFound, BOOL isFile); +HBITMAP SetBitmapAndInfo(HBITMAP hBitmap, LPCWSTR name, LPWIN32_FIND_DATAW pFound, BOOL isFile); HBITMAP Rotate90DegreeBlt(HDC hDC1, INT cx, INT cy, BOOL bRight, BOOL bMono); diff --git a/base/applications/mspaint/history.cpp b/base/applications/mspaint/history.cpp index 3b861b1840c..3f1878ad3d3 100644 --- a/base/applications/mspaint/history.cpp +++ b/base/applications/mspaint/history.cpp @@ -159,7 +159,7 @@ void ImageModel::Crop(int nWidth, int nHeight, int nOffsetX, int nOffsetY) void ImageModel::SaveImage(LPCTSTR lpFileName) { - SaveDIBToFile(m_hBms[m_currInd], lpFileName, m_hDrawingDC); + SaveDIBToFile(m_hBms[m_currInd], lpFileName, TRUE); } BOOL ImageModel::IsImageSaved() const diff --git a/base/applications/mspaint/lang/bg-BG.rc b/base/applications/mspaint/lang/bg-BG.rc index bdb017608e6..31663fde2d3 100644 --- a/base/applications/mspaint/lang/bg-BG.rc +++ b/base/applications/mspaint/lang/bg-BG.rc @@ -262,4 +262,5 @@ BEGIN IDS_VERTICAL "Вертикален" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." + IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" END diff --git a/base/applications/mspaint/lang/cs-CZ.rc b/base/applications/mspaint/lang/cs-CZ.rc index f500d7ebc52..c1d67ce1682 100644 --- a/base/applications/mspaint/lang/cs-CZ.rc +++ b/base/applications/mspaint/lang/cs-CZ.rc @@ -262,4 +262,5 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." + IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" END diff --git a/base/applications/mspaint/lang/de-DE.rc b/base/applications/mspaint/lang/de-DE.rc index 086c5bb953c..fc46fe2f042 100644 --- a/base/applications/mspaint/lang/de-DE.rc +++ b/base/applications/mspaint/lang/de-DE.rc @@ -261,4 +261,5 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." + IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" END diff --git a/base/applications/mspaint/lang/en-GB.rc b/base/applications/mspaint/lang/en-GB.rc index 699fc815286..c653732c4d8 100644 --- a/base/applications/mspaint/lang/en-GB.rc +++ b/base/applications/mspaint/lang/en-GB.rc @@ -261,4 +261,5 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d dots per inch" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." + IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" END diff --git a/base/applications/mspaint/lang/en-US.rc b/base/applications/mspaint/lang/en-US.rc index b3d8f58be45..9de01a2499f 100644 --- a/base/applications/mspaint/lang/en-US.rc +++ b/base/applications/mspaint/lang/en-US.rc @@ -262,4 +262,5 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d dots per inch" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." + IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" END diff --git a/base/applications/mspaint/lang/es-ES.rc b/base/applications/mspaint/lang/es-ES.rc index 734938c6e7e..d30226ccaf7 100644 --- a/base/applications/mspaint/lang/es-ES.rc +++ b/base/applications/mspaint/lang/es-ES.rc @@ -264,4 +264,5 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." + IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" END diff --git a/base/applications/mspaint/lang/et-EE.rc b/base/applications/mspaint/lang/et-EE.rc index eb1f2eb2a11..0c2b543cbe6 100644 --- a/base/applications/mspaint/lang/et-EE.rc +++ b/base/applications/mspaint/lang/et-EE.rc @@ -261,4 +261,5 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." + IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" END diff --git a/base/applications/mspaint/lang/eu-ES.rc b/base/applications/mspaint/lang/eu-ES.rc index e06db967538..273f8c9f20a 100644 --- a/base/applications/mspaint/lang/eu-ES.rc +++ b/base/applications/mspaint/lang/eu-ES.rc @@ -262,4 +262,5 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." + IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" END diff --git a/base/applications/mspaint/lang/fr-FR.rc b/base/applications/mspaint/lang/fr-FR.rc index 38f365838e5..aee25ef236b 100644 --- a/base/applications/mspaint/lang/fr-FR.rc +++ b/base/applications/mspaint/lang/fr-FR.rc @@ -262,4 +262,5 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." + IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" END diff --git a/base/applications/mspaint/lang/he-IL.rc b/base/applications/mspaint/lang/he-IL.rc index eec4f332e19..e02fcea3758 100644 --- a/base/applications/mspaint/lang/he-IL.rc +++ b/base/applications/mspaint/lang/he-IL.rc @@ -264,4 +264,5 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." + IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" END diff --git a/base/applications/mspaint/lang/hu-HU.rc b/base/applications/mspaint/lang/hu-HU.rc index 195907b30dd..ff132eda6f9 100644 --- a/base/applications/mspaint/lang/hu-HU.rc +++ b/base/applications/mspaint/lang/hu-HU.rc @@ -262,4 +262,5 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." + IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" END diff --git a/base/applications/mspaint/lang/id-ID.rc b/base/applications/mspaint/lang/id-ID.rc index 888c1557ed9..ad2d99b362a 100644 --- a/base/applications/mspaint/lang/id-ID.rc +++ b/base/applications/mspaint/lang/id-ID.rc @@ -261,4 +261,5 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." + IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" END diff --git a/base/applications/mspaint/lang/it-IT.rc b/base/applications/mspaint/lang/it-IT.rc index 9470b433909..45ff4d842e9 100644 --- a/base/applications/mspaint/lang/it-IT.rc +++ b/base/applications/mspaint/lang/it-IT.rc @@ -262,4 +262,5 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." + IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" END diff --git a/base/applications/mspaint/lang/ja-JP.rc b/base/applications/mspaint/lang/ja-JP.rc index 17e48fbfe11..b44eb8b4b74 100644 --- a/base/applications/mspaint/lang/ja-JP.rc +++ b/base/applications/mspaint/lang/ja-JP.rc @@ -263,4 +263,5 @@ BEGIN IDS_VERTICAL "縦書き" IDS_PRINTRES "%d x %d ピクセル/cm" IDS_CANTPASTE "クリップボードからの貼り付けに失敗しました。データ形式が間違っているか、未対応です。" + IDS_SAVEERROR "次のファイルとして画像を保存するのに失敗しました:\n\n%s" END diff --git a/base/applications/mspaint/lang/nl-NL.rc b/base/applications/mspaint/lang/nl-NL.rc index 2d348a9ab8d..62ae6c4e47a 100644 --- a/base/applications/mspaint/lang/nl-NL.rc +++ b/base/applications/mspaint/lang/nl-NL.rc @@ -261,4 +261,5 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." + IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" END diff --git a/base/applications/mspaint/lang/no-NO.rc b/base/applications/mspaint/lang/no-NO.rc index e400c5bc2bb..b6014ef58e0 100644 --- a/base/applications/mspaint/lang/no-NO.rc +++ b/base/applications/mspaint/lang/no-NO.rc @@ -261,4 +261,5 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." + IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" END diff --git a/base/applications/mspaint/lang/pl-PL.rc b/base/applications/mspaint/lang/pl-PL.rc index 80d75558f8e..0714c9ce3cb 100644 --- a/base/applications/mspaint/lang/pl-PL.rc +++ b/base/applications/mspaint/lang/pl-PL.rc @@ -264,4 +264,5 @@ BEGIN IDS_VERTICAL "Pionowe" IDS_PRINTRES "%d x %d piksel/cm" IDS_CANTPASTE "Nie można wkleić ze schowka. Format danych jest nieprawidłowy lub nieobsługiwany." + IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" END diff --git a/base/applications/mspaint/lang/pt-BR.rc b/base/applications/mspaint/lang/pt-BR.rc index c3fc84f47a8..0c8442b4b35 100644 --- a/base/applications/mspaint/lang/pt-BR.rc +++ b/base/applications/mspaint/lang/pt-BR.rc @@ -262,4 +262,5 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." + IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" END diff --git a/base/applications/mspaint/lang/pt-PT.rc b/base/applications/mspaint/lang/pt-PT.rc index f1378126d93..e150cfa14a2 100644 --- a/base/applications/mspaint/lang/pt-PT.rc +++ b/base/applications/mspaint/lang/pt-PT.rc @@ -262,4 +262,5 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." + IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" END diff --git a/base/applications/mspaint/lang/ro-RO.rc b/base/applications/mspaint/lang/ro-RO.rc index 398201aec18..3fce7fbca19 100644 --- a/base/applications/mspaint/lang/ro-RO.rc +++ b/base/applications/mspaint/lang/ro-RO.rc @@ -263,4 +263,5 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixeli/cm" IDS_CANTPASTE "Nu a putut fi lipit din clipboard. Formatul de date este fie incorect, fie nesuportat." + IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" END diff --git a/base/applications/mspaint/lang/ru-RU.rc b/base/applications/mspaint/lang/ru-RU.rc index 61e2a6f8382..ded8d919f0f 100644 --- a/base/applications/mspaint/lang/ru-RU.rc +++ b/base/applications/mspaint/lang/ru-RU.rc @@ -265,4 +265,5 @@ BEGIN IDS_VERTICAL "Вертикальный" IDS_PRINTRES "%d x %d точек/см" IDS_CANTPASTE "Не удалось вставить из буфера обмена. Формат данных либо некорректный, либо не поддерживается." + IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" END diff --git a/base/applications/mspaint/lang/sk-SK.rc b/base/applications/mspaint/lang/sk-SK.rc index b85e192dd3d..1fb92dbb4f6 100644 --- a/base/applications/mspaint/lang/sk-SK.rc +++ b/base/applications/mspaint/lang/sk-SK.rc @@ -261,4 +261,5 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." + IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" END diff --git a/base/applications/mspaint/lang/sq-AL.rc b/base/applications/mspaint/lang/sq-AL.rc index 1488e35ede6..b2122a03273 100644 --- a/base/applications/mspaint/lang/sq-AL.rc +++ b/base/applications/mspaint/lang/sq-AL.rc @@ -261,4 +261,5 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." + IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" END diff --git a/base/applications/mspaint/lang/sv-SE.rc b/base/applications/mspaint/lang/sv-SE.rc index cf9ab447e42..3d92c35f6c6 100644 --- a/base/applications/mspaint/lang/sv-SE.rc +++ b/base/applications/mspaint/lang/sv-SE.rc @@ -262,4 +262,5 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." + IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" END diff --git a/base/applications/mspaint/lang/tr-TR.rc b/base/applications/mspaint/lang/tr-TR.rc index 3113476be88..a87fb699142 100644 --- a/base/applications/mspaint/lang/tr-TR.rc +++ b/base/applications/mspaint/lang/tr-TR.rc @@ -262,4 +262,5 @@ BEGIN IDS_VERTICAL "Düşey" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." + IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" END diff --git a/base/applications/mspaint/lang/uk-UA.rc b/base/applications/mspaint/lang/uk-UA.rc index 2858cfb2432..a998b99363a 100644 --- a/base/applications/mspaint/lang/uk-UA.rc +++ b/base/applications/mspaint/lang/uk-UA.rc @@ -263,4 +263,5 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." + IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" END diff --git a/base/applications/mspaint/lang/vi-VN.rc b/base/applications/mspaint/lang/vi-VN.rc index 3e1e85f1102..0db569f74f3 100644 --- a/base/applications/mspaint/lang/vi-VN.rc +++ b/base/applications/mspaint/lang/vi-VN.rc @@ -261,4 +261,5 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." + IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" END diff --git a/base/applications/mspaint/lang/zh-CN.rc b/base/applications/mspaint/lang/zh-CN.rc index 307a0cda341..d40e2390b77 100644 --- a/base/applications/mspaint/lang/zh-CN.rc +++ b/base/applications/mspaint/lang/zh-CN.rc @@ -264,4 +264,5 @@ BEGIN IDS_VERTICAL "垂直" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." + IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" END diff --git a/base/applications/mspaint/lang/zh-HK.rc b/base/applications/mspaint/lang/zh-HK.rc index ea6ca319c38..85dd5341843 100644 --- a/base/applications/mspaint/lang/zh-HK.rc +++ b/base/applications/mspaint/lang/zh-HK.rc @@ -262,4 +262,5 @@ BEGIN IDS_VERTICAL "垂直" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." + IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" END diff --git a/base/applications/mspaint/lang/zh-TW.rc b/base/applications/mspaint/lang/zh-TW.rc index 4b90a8185ea..b044da06910 100644 --- a/base/applications/mspaint/lang/zh-TW.rc +++ b/base/applications/mspaint/lang/zh-TW.rc @@ -262,4 +262,5 @@ BEGIN IDS_VERTICAL "垂直" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." + IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" END diff --git a/base/applications/mspaint/main.cpp b/base/applications/mspaint/main.cpp index ef0b5da6aa1..a4cbb54b5b0 100644 --- a/base/applications/mspaint/main.cpp +++ b/base/applications/mspaint/main.cpp @@ -209,10 +209,8 @@ _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, INT nC } // Initialize imageModel - imageModel.Crop(registrySettings.BMPWidth, registrySettings.BMPHeight); - if (__argc >= 2) - DoLoadImageFile(mainWindow, __targv[1], TRUE); - imageModel.ClearHistory(); + if (__argc < 2 || !DoLoadImageFile(mainWindow, __targv[1], TRUE)) + InitializeImage(NULL, NULL, FALSE); // Make the window visible on the screen mainWindow.ShowWindow(registrySettings.WindowPlacement.showCmd); diff --git a/base/applications/mspaint/resource.h b/base/applications/mspaint/resource.h index 3b9f530a6e5..1e34232d3c1 100644 --- a/base/applications/mspaint/resource.h +++ b/base/applications/mspaint/resource.h @@ -220,3 +220,4 @@ #define IDS_VERTICAL 938 #define IDS_PRINTRES 939 #define IDS_CANTPASTE 940 +#define IDS_SAVEERROR 941 diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index 161a4926fe9..a15e6dd3d6b 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -148,11 +148,6 @@ void CMainWindow::saveImage(BOOL overwrite) else if (GetSaveFileName(g_szFileName, _countof(g_szFileName))) { imageModel.SaveImage(g_szFileName); - - CString strTitle; - strTitle.Format(IDS_WINDOWTITLE, PathFindFileName(g_szFileName)); - SetWindowText(strTitle); - g_isAFile = TRUE; } } @@ -201,7 +196,6 @@ void CMainWindow::InsertSelectionFromHBITMAP(HBITMAP bitmap, HWND window) toolsModel.SetActiveTool(TOOL_RECTSEL); - imageModel.PushImageForUndo(); selectionModel.InsertFromHBITMAP(bitmap, 0, 0); selectionModel.m_bShow = TRUE; imageModel.NotifyImageChanged(); @@ -380,9 +374,10 @@ void CMainWindow::ProcessFileMenu(HMENU hPopupMenu) isBMP = TRUE; } - EnableMenuItem(hPopupMenu, IDM_FILEASWALLPAPERPLANE, ENABLED_IF(g_isAFile && isBMP)); - EnableMenuItem(hPopupMenu, IDM_FILEASWALLPAPERCENTERED, ENABLED_IF(g_isAFile && isBMP)); - EnableMenuItem(hPopupMenu, IDM_FILEASWALLPAPERSTRETCHED, ENABLED_IF(g_isAFile && isBMP)); + UINT uWallpaperEnabled = ENABLED_IF(g_isAFile && isBMP && g_fileSize > 0); + ::EnableMenuItem(hPopupMenu, IDM_FILEASWALLPAPERPLANE, uWallpaperEnabled); + ::EnableMenuItem(hPopupMenu, IDM_FILEASWALLPAPERCENTERED, uWallpaperEnabled); + ::EnableMenuItem(hPopupMenu, IDM_FILEASWALLPAPERSTRETCHED, uWallpaperEnabled); for (INT iItem = 0; iItem < MAX_RECENT_FILES; ++iItem) RemoveMenu(hPopupMenu, IDM_FILE1 + iItem, MF_BYCOMMAND); @@ -612,7 +607,7 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH case IDM_FILENEW: if (ConfirmSave()) { - SetBitmapAndInfo(NULL, NULL, 0, FALSE); + InitializeImage(NULL, NULL, FALSE); } break; case IDM_FILEOPEN: @@ -850,25 +845,26 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH } case IDM_EDITCOPYTO: { - TCHAR szFileName[MAX_LONG_PATH] = _T(""); + WCHAR szFileName[MAX_LONG_PATH] = L"*.png"; if (GetSaveFileName(szFileName, _countof(szFileName))) { HBITMAP hbm = selectionModel.CopyBitmap(); - SaveDIBToFile(hbm, szFileName, imageModel.GetDC()); + if (!SaveDIBToFile(hbm, szFileName, FALSE)) + ShowError(IDS_SAVEERROR, szFileName); ::DeleteObject(hbm); } break; } case IDM_EDITPASTEFROM: { - TCHAR szFileName[MAX_LONG_PATH] = _T(""); + WCHAR szFileName[MAX_LONG_PATH] = L""; if (GetOpenFileName(szFileName, _countof(szFileName))) { HBITMAP hbmNew = DoLoadImageFile(m_hWnd, szFileName, FALSE); if (hbmNew) - { InsertSelectionFromHBITMAP(hbmNew, m_hWnd); - } + else + ShowError(IDS_LOADERRORTEXT, szFileName); } break; }

1 year, 6 months

[reactos] 01/01: [RTL][ADVAPI32_APITEST] RtlIsTextUnicode: Don't change weight unless lead-byte flag (#5396)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=17e9dcc9224b7773148c0… commit 17e9dcc9224b7773148c015f6b4d916e4478272b Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Jul 5 12:01:42 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jul 5 12:01:42 2023 +0900 [RTL][ADVAPI32_APITEST] RtlIsTextUnicode: Don't change weight unless lead-byte flag (#5396) - Fix the garbled characters (a.k.a. mojibake) in some Japanese text files. - weight will remain 3 unless IS_TEXT_UNICODE_DBCS_LEADBYTE flag is set. - Strengthen advapi32_apitest IsTextUnicode testcase. CORE-19016 --- modules/rostests/apitests/advapi32/IsTextUnicode.c | 30 ++++++++++++++++++++-- sdk/lib/rtl/unicode.c | 5 ++-- 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/modules/rostests/apitests/advapi32/IsTextUnicode.c b/modules/rostests/apitests/advapi32/IsTextUnicode.c index 404ab69d07d..d3f9f3dfcb5 100644 --- a/modules/rostests/apitests/advapi32/IsTextUnicode.c +++ b/modules/rostests/apitests/advapi32/IsTextUnicode.c @@ -4,6 +4,7 @@ * PURPOSE: Tests for (Rtl)IsTextUnicode. * PROGRAMMERS: Hermes Belusca-Maito * Dmitry Chapyshev + * Katayama Hirofumi MZ */ #include "precomp.h" @@ -128,6 +129,9 @@ START_TEST(IsTextUnicode) }; const char japanese_with_lead[] = "ABC" "\x83\x40" "D"; + const char japanese_sjis[] = "\x93\xFA\x96\x7B\x8C\xEA\x31\x32\x33\x93\xFA\x96\x7B\x8C\xEA"; + const char japanese_utf8[] = "\xE6\x97\xA5\xE6\x9C\xAC\xE8\xAA\x9E\x31\x32\x33\xE6\x97\xA5" + "\xE6\x9C\xAC\xE8\xAA\x9E"; const char simplfied_chinese_with_lead[] = "ABC" "\xC5\xC5" "D"; const char korean_with_lead[] = "ABC" "\xBF\xAD" "D"; const char traditional_chinese_with_lead[] = "ABC" "\xB1\xC1" "D"; @@ -149,8 +153,30 @@ START_TEST(IsTextUnicode) SetupLocale(932, 932, -1); Result = IS_TEXT_UNICODE_DBCS_LEADBYTE; - ok(!IsTextUnicode(japanese_with_lead, sizeof(japanese_with_lead), &Result), "IsTextUnicode() returned TRUE, expected FALSE\n"); - ok(Result == IS_TEXT_UNICODE_DBCS_LEADBYTE, "Result returned 0x%x, expected 0x%x\n", Result, IS_TEXT_UNICODE_DBCS_LEADBYTE); + ok_int(IsTextUnicode(japanese_with_lead, sizeof(japanese_with_lead), &Result), FALSE); + ok_int(Result, IS_TEXT_UNICODE_DBCS_LEADBYTE); + + ok_int(IsTextUnicode(japanese_sjis, sizeof(japanese_sjis) - 1, NULL), FALSE); + + Result = IS_TEXT_UNICODE_STATISTICS | IS_TEXT_UNICODE_REVERSE_STATISTICS; + ok_int(IsTextUnicode(japanese_sjis, sizeof(japanese_sjis) - 1, &Result), FALSE); + ok_int(Result, 0); + + Result = IS_TEXT_UNICODE_STATISTICS | IS_TEXT_UNICODE_REVERSE_STATISTICS | + IS_TEXT_UNICODE_DBCS_LEADBYTE; + ok_int(IsTextUnicode(japanese_sjis, sizeof(japanese_sjis) - 1, &Result), FALSE); + ok_int(Result, (IS_TEXT_UNICODE_DBCS_LEADBYTE | IS_TEXT_UNICODE_REVERSE_STATISTICS)); + + ok_int(IsTextUnicode(japanese_utf8, sizeof(japanese_utf8) - 1, NULL), FALSE); + + Result = IS_TEXT_UNICODE_STATISTICS | IS_TEXT_UNICODE_REVERSE_STATISTICS; + ok_int(IsTextUnicode(japanese_utf8, sizeof(japanese_utf8) - 1, &Result), FALSE); + ok_int(Result, 0); + + Result = IS_TEXT_UNICODE_STATISTICS | IS_TEXT_UNICODE_REVERSE_STATISTICS | + IS_TEXT_UNICODE_DBCS_LEADBYTE; + ok_int(IsTextUnicode(japanese_utf8, sizeof(japanese_utf8) - 1, &Result), FALSE); + ok_int(Result, (IS_TEXT_UNICODE_DBCS_LEADBYTE | IS_TEXT_UNICODE_STATISTICS)); /* Simplified Chinese */ SetupLocale(936, 936, -1); diff --git a/sdk/lib/rtl/unicode.c b/sdk/lib/rtl/unicode.c index 8c7248db155..c29dfa4f3b8 100644 --- a/sdk/lib/rtl/unicode.c +++ b/sdk/lib/rtl/unicode.c @@ -1356,7 +1356,7 @@ RtlIsTextUnicode(CONST VOID* buf, INT len, INT* pf) } } - if (NlsMbCodePageTag) + if (NlsMbCodePageTag && pf && (*pf & IS_TEXT_UNICODE_DBCS_LEADBYTE)) { for (i = 0; i < len; i++) { @@ -1378,8 +1378,7 @@ RtlIsTextUnicode(CONST VOID* buf, INT len, INT* pf) else weight = 1; - if (pf && (*pf & IS_TEXT_UNICODE_DBCS_LEADBYTE)) - out_flags |= IS_TEXT_UNICODE_DBCS_LEADBYTE; + out_flags |= IS_TEXT_UNICODE_DBCS_LEADBYTE; } }

1 year, 6 months

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