Ros-diffs

ros-diffs@reactos.org

12 participants
81034 discussions

[reactos] 01/01: [NETCFGX] Strip 2x wrong WS_DISABLED style on dlgs (#5987)

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=49399361652f291a3190e… commit 49399361652f291a3190e5599dc92df0b81183cb Author: Joachim Henze <joachim.henze(a)reactos.org> AuthorDate: Sun Nov 19 15:37:29 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Nov 19 14:37:29 2023 +0000 [NETCFGX] Strip 2x wrong WS_DISABLED style on dlgs (#5987) I checked: those are not present in german XPSP3 for those dlgs. I noticed that subtle thing just by the fact that the de-DE.rc had one less of those compared to all other languages. I don't know why those were added, but it is like that since eternity already, e.g. see ebc7599c6dbb63115314fbfb5b07d38126f0048a from ancient 2008 SVN r36325 times had them already. --- dll/win32/netcfgx/lang/bg-BG.rc | 4 ++-- dll/win32/netcfgx/lang/cs-CZ.rc | 4 ++-- dll/win32/netcfgx/lang/da-DK.rc | 4 ++-- dll/win32/netcfgx/lang/de-DE.rc | 2 +- dll/win32/netcfgx/lang/el-GR.rc | 4 ++-- dll/win32/netcfgx/lang/en-US.rc | 4 ++-- dll/win32/netcfgx/lang/es-ES.rc | 4 ++-- dll/win32/netcfgx/lang/fr-FR.rc | 4 ++-- dll/win32/netcfgx/lang/he-IL.rc | 4 ++-- dll/win32/netcfgx/lang/hu-HU.rc | 4 ++-- dll/win32/netcfgx/lang/id-ID.rc | 4 ++-- dll/win32/netcfgx/lang/it-IT.rc | 4 ++-- dll/win32/netcfgx/lang/ja-JP.rc | 4 ++-- dll/win32/netcfgx/lang/nl-NL.rc | 4 ++-- dll/win32/netcfgx/lang/no-NO.rc | 4 ++-- dll/win32/netcfgx/lang/pl-PL.rc | 4 ++-- dll/win32/netcfgx/lang/pt-PT.rc | 4 ++-- dll/win32/netcfgx/lang/ro-RO.rc | 4 ++-- dll/win32/netcfgx/lang/ru-RU.rc | 4 ++-- dll/win32/netcfgx/lang/sk-SK.rc | 4 ++-- dll/win32/netcfgx/lang/sq-AL.rc | 4 ++-- dll/win32/netcfgx/lang/sv-SE.rc | 4 ++-- dll/win32/netcfgx/lang/tr-TR.rc | 4 ++-- dll/win32/netcfgx/lang/uk-UA.rc | 4 ++-- dll/win32/netcfgx/lang/zh-CN.rc | 4 ++-- dll/win32/netcfgx/lang/zh-HK.rc | 4 ++-- dll/win32/netcfgx/lang/zh-TW.rc | 4 ++-- 27 files changed, 53 insertions(+), 53 deletions(-) diff --git a/dll/win32/netcfgx/lang/bg-BG.rc b/dll/win32/netcfgx/lang/bg-BG.rc index d0d7fd7c1f3..82ec4f5af78 100644 --- a/dll/win32/netcfgx/lang/bg-BG.rc +++ b/dll/win32/netcfgx/lang/bg-BG.rc @@ -1,7 +1,7 @@ LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT IDD_TCPIP_BASIC_DLG DIALOGEX 0, 0, 246, 216 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Общи" FONT 8, "MS Shell Dlg" BEGIN @@ -196,7 +196,7 @@ BEGIN END IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Advanced" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/win32/netcfgx/lang/cs-CZ.rc b/dll/win32/netcfgx/lang/cs-CZ.rc index a06fb56f2aa..da3d3f4aebe 100644 --- a/dll/win32/netcfgx/lang/cs-CZ.rc +++ b/dll/win32/netcfgx/lang/cs-CZ.rc @@ -4,7 +4,7 @@ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT IDD_TCPIP_BASIC_DLG DIALOGEX 0, 0, 246, 216 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Obecné nastavení" FONT 8, "MS Shell Dlg" BEGIN @@ -199,7 +199,7 @@ BEGIN END IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Advanced" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/win32/netcfgx/lang/da-DK.rc b/dll/win32/netcfgx/lang/da-DK.rc index a8132b2cf5f..f344cb24bb5 100644 --- a/dll/win32/netcfgx/lang/da-DK.rc +++ b/dll/win32/netcfgx/lang/da-DK.rc @@ -1,7 +1,7 @@ LANGUAGE LANG_DANISH, SUBLANG_DEFAULT IDD_TCPIP_BASIC_DLG DIALOGEX 0, 0, 246, 216 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "General" FONT 8, "MS Shell Dlg" BEGIN @@ -196,7 +196,7 @@ BEGIN END IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Advanced" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/win32/netcfgx/lang/de-DE.rc b/dll/win32/netcfgx/lang/de-DE.rc index 3f08b498d59..c3c4af4c9c9 100644 --- a/dll/win32/netcfgx/lang/de-DE.rc +++ b/dll/win32/netcfgx/lang/de-DE.rc @@ -196,7 +196,7 @@ BEGIN END IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Erweitert" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/win32/netcfgx/lang/el-GR.rc b/dll/win32/netcfgx/lang/el-GR.rc index e4749d058be..5ca96fd1e84 100644 --- a/dll/win32/netcfgx/lang/el-GR.rc +++ b/dll/win32/netcfgx/lang/el-GR.rc @@ -1,7 +1,7 @@ LANGUAGE LANG_GREEK, SUBLANG_DEFAULT IDD_TCPIP_BASIC_DLG DIALOGEX 0, 0, 246, 216 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Γενικά" FONT 8, "MS Shell Dlg" BEGIN @@ -196,7 +196,7 @@ BEGIN END IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Advanced" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/win32/netcfgx/lang/en-US.rc b/dll/win32/netcfgx/lang/en-US.rc index 8ff8c2fe949..80583ce62f4 100644 --- a/dll/win32/netcfgx/lang/en-US.rc +++ b/dll/win32/netcfgx/lang/en-US.rc @@ -1,7 +1,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US IDD_TCPIP_BASIC_DLG DIALOGEX 0, 0, 246, 216 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "General" FONT 8, "MS Shell Dlg" BEGIN @@ -196,7 +196,7 @@ BEGIN END IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Advanced" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/win32/netcfgx/lang/es-ES.rc b/dll/win32/netcfgx/lang/es-ES.rc index 6270dbe4dff..7ba13586b57 100644 --- a/dll/win32/netcfgx/lang/es-ES.rc +++ b/dll/win32/netcfgx/lang/es-ES.rc @@ -9,7 +9,7 @@ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL IDD_TCPIP_BASIC_DLG DIALOGEX 0, 0, 246, 216 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "General" FONT 8, "MS Shell Dlg" BEGIN @@ -204,7 +204,7 @@ BEGIN END IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Avanzado" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/win32/netcfgx/lang/fr-FR.rc b/dll/win32/netcfgx/lang/fr-FR.rc index 9da53a5a904..26f88406c9a 100644 --- a/dll/win32/netcfgx/lang/fr-FR.rc +++ b/dll/win32/netcfgx/lang/fr-FR.rc @@ -1,7 +1,7 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL IDD_TCPIP_BASIC_DLG DIALOGEX 0, 0, 246, 216 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Général" FONT 8, "MS Shell Dlg" BEGIN @@ -196,7 +196,7 @@ BEGIN END IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Avancé" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/win32/netcfgx/lang/he-IL.rc b/dll/win32/netcfgx/lang/he-IL.rc index 7aeb3b417ab..73f291c967a 100644 --- a/dll/win32/netcfgx/lang/he-IL.rc +++ b/dll/win32/netcfgx/lang/he-IL.rc @@ -1,7 +1,7 @@ LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT IDD_TCPIP_BASIC_DLG DIALOGEX 0, 0, 246, 216 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "כללי" FONT 8, "MS Shell Dlg" BEGIN @@ -196,7 +196,7 @@ BEGIN END IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Advanced" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/win32/netcfgx/lang/hu-HU.rc b/dll/win32/netcfgx/lang/hu-HU.rc index 4f513847aff..556a5149167 100644 --- a/dll/win32/netcfgx/lang/hu-HU.rc +++ b/dll/win32/netcfgx/lang/hu-HU.rc @@ -1,7 +1,7 @@ LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT IDD_TCPIP_BASIC_DLG DIALOGEX 0, 0, 246, 216 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Általános" FONT 8, "MS Shell Dlg" BEGIN @@ -196,7 +196,7 @@ BEGIN END IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Advanced" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/win32/netcfgx/lang/id-ID.rc b/dll/win32/netcfgx/lang/id-ID.rc index bb96c879880..c52912ccc13 100644 --- a/dll/win32/netcfgx/lang/id-ID.rc +++ b/dll/win32/netcfgx/lang/id-ID.rc @@ -1,7 +1,7 @@ LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT IDD_TCPIP_BASIC_DLG DIALOGEX 0, 0, 246, 216 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Umum" FONT 8, "MS Shell Dlg" BEGIN @@ -196,7 +196,7 @@ BEGIN END IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Advanced" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/win32/netcfgx/lang/it-IT.rc b/dll/win32/netcfgx/lang/it-IT.rc index 10ec96e83c7..f43133b7ed8 100644 --- a/dll/win32/netcfgx/lang/it-IT.rc +++ b/dll/win32/netcfgx/lang/it-IT.rc @@ -1,7 +1,7 @@ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL IDD_TCPIP_BASIC_DLG DIALOGEX 0, 0, 246, 216 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Generale" FONT 8, "MS Shell Dlg" BEGIN @@ -196,7 +196,7 @@ BEGIN END IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Advanced" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/win32/netcfgx/lang/ja-JP.rc b/dll/win32/netcfgx/lang/ja-JP.rc index 7b8e67fd71d..542f0d826f8 100644 --- a/dll/win32/netcfgx/lang/ja-JP.rc +++ b/dll/win32/netcfgx/lang/ja-JP.rc @@ -1,7 +1,7 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT IDD_TCPIP_BASIC_DLG DIALOGEX 0, 0, 246, 216 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "全般" FONT 9, "MS UI Gothic" BEGIN @@ -196,7 +196,7 @@ BEGIN END IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Advanced" FONT 9, "MS UI Gothic" BEGIN diff --git a/dll/win32/netcfgx/lang/nl-NL.rc b/dll/win32/netcfgx/lang/nl-NL.rc index 45426cb309f..06815c66cdb 100644 --- a/dll/win32/netcfgx/lang/nl-NL.rc +++ b/dll/win32/netcfgx/lang/nl-NL.rc @@ -1,7 +1,7 @@ LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL IDD_TCPIP_BASIC_DLG DIALOGEX 0, 0, 246, 216 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Algemeen" FONT 8, "MS Shell Dlg" BEGIN @@ -196,7 +196,7 @@ BEGIN END IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Advanced" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/win32/netcfgx/lang/no-NO.rc b/dll/win32/netcfgx/lang/no-NO.rc index 45e2504addb..68d5cb42543 100644 --- a/dll/win32/netcfgx/lang/no-NO.rc +++ b/dll/win32/netcfgx/lang/no-NO.rc @@ -1,7 +1,7 @@ LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL IDD_TCPIP_BASIC_DLG DIALOGEX 0, 0, 246, 216 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Generielt" FONT 8, "MS Shell Dlg" BEGIN @@ -196,7 +196,7 @@ BEGIN END IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Advanced" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/win32/netcfgx/lang/pl-PL.rc b/dll/win32/netcfgx/lang/pl-PL.rc index cf593ea4e8c..f45e266524b 100644 --- a/dll/win32/netcfgx/lang/pl-PL.rc +++ b/dll/win32/netcfgx/lang/pl-PL.rc @@ -3,7 +3,7 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT IDD_TCPIP_BASIC_DLG DIALOGEX 0, 0, 246, 216 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Ogólne" FONT 8, "MS Shell Dlg" BEGIN @@ -198,7 +198,7 @@ BEGIN END IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Zaawansowane" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/win32/netcfgx/lang/pt-PT.rc b/dll/win32/netcfgx/lang/pt-PT.rc index a41b3ac373b..52e1c1a8ade 100644 --- a/dll/win32/netcfgx/lang/pt-PT.rc +++ b/dll/win32/netcfgx/lang/pt-PT.rc @@ -3,7 +3,7 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL IDD_TCPIP_BASIC_DLG DIALOGEX 0, 0, 246, 216 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Geral" FONT 8, "MS Shell Dlg" BEGIN @@ -198,7 +198,7 @@ BEGIN END IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Avançado" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/win32/netcfgx/lang/ro-RO.rc b/dll/win32/netcfgx/lang/ro-RO.rc index 78dd2f0edae..fae8a5d2c3f 100644 --- a/dll/win32/netcfgx/lang/ro-RO.rc +++ b/dll/win32/netcfgx/lang/ro-RO.rc @@ -3,7 +3,7 @@ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL IDD_TCPIP_BASIC_DLG DIALOGEX 0, 0, 246, 216 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Generale" FONT 8, "MS Shell Dlg" BEGIN @@ -198,7 +198,7 @@ BEGIN END IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Avansate" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/win32/netcfgx/lang/ru-RU.rc b/dll/win32/netcfgx/lang/ru-RU.rc index 76bb6f1bfc6..5d46291502c 100644 --- a/dll/win32/netcfgx/lang/ru-RU.rc +++ b/dll/win32/netcfgx/lang/ru-RU.rc @@ -1,7 +1,7 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT IDD_TCPIP_BASIC_DLG DIALOGEX 0, 0, 246, 216 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Общие" FONT 8, "MS Shell Dlg" BEGIN @@ -196,7 +196,7 @@ BEGIN END IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Дополнительно" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/win32/netcfgx/lang/sk-SK.rc b/dll/win32/netcfgx/lang/sk-SK.rc index 811fbab6ec0..1115422238f 100644 --- a/dll/win32/netcfgx/lang/sk-SK.rc +++ b/dll/win32/netcfgx/lang/sk-SK.rc @@ -1,7 +1,7 @@ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT IDD_TCPIP_BASIC_DLG DIALOGEX 0, 0, 246, 216 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Všeobecné" FONT 8, "MS Shell Dlg" BEGIN @@ -196,7 +196,7 @@ BEGIN END IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Advanced" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/win32/netcfgx/lang/sq-AL.rc b/dll/win32/netcfgx/lang/sq-AL.rc index eb5e7e0f37d..d72048b17c0 100644 --- a/dll/win32/netcfgx/lang/sq-AL.rc +++ b/dll/win32/netcfgx/lang/sq-AL.rc @@ -3,7 +3,7 @@ LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL IDD_TCPIP_BASIC_DLG DIALOGEX 0, 0, 246, 216 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Përgjithshëm" FONT 8, "MS Shell Dlg" BEGIN @@ -198,7 +198,7 @@ BEGIN END IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Advanced" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/win32/netcfgx/lang/sv-SE.rc b/dll/win32/netcfgx/lang/sv-SE.rc index a47f80f2f01..578e279a0bd 100644 --- a/dll/win32/netcfgx/lang/sv-SE.rc +++ b/dll/win32/netcfgx/lang/sv-SE.rc @@ -1,7 +1,7 @@ LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL IDD_TCPIP_BASIC_DLG DIALOGEX 0, 0, 246, 216 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Allmänt" FONT 8, "MS Shell Dlg" BEGIN @@ -196,7 +196,7 @@ BEGIN END IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Advanced" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/win32/netcfgx/lang/tr-TR.rc b/dll/win32/netcfgx/lang/tr-TR.rc index 20f63877ca6..e218c502488 100644 --- a/dll/win32/netcfgx/lang/tr-TR.rc +++ b/dll/win32/netcfgx/lang/tr-TR.rc @@ -3,7 +3,7 @@ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT IDD_TCPIP_BASIC_DLG DIALOGEX 0, 0, 246, 216 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Özellik" FONT 8, "MS Shell Dlg" BEGIN @@ -198,7 +198,7 @@ BEGIN END IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Gelişmiş" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/win32/netcfgx/lang/uk-UA.rc b/dll/win32/netcfgx/lang/uk-UA.rc index 9e755783ae3..b72169e3bf4 100644 --- a/dll/win32/netcfgx/lang/uk-UA.rc +++ b/dll/win32/netcfgx/lang/uk-UA.rc @@ -1,7 +1,7 @@ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT IDD_TCPIP_BASIC_DLG DIALOGEX 0, 0, 246, 216 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Загальні" FONT 8, "MS Shell Dlg" BEGIN @@ -196,7 +196,7 @@ BEGIN END IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Advanced" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/win32/netcfgx/lang/zh-CN.rc b/dll/win32/netcfgx/lang/zh-CN.rc index c2a45bd667c..9420b890c8f 100644 --- a/dll/win32/netcfgx/lang/zh-CN.rc +++ b/dll/win32/netcfgx/lang/zh-CN.rc @@ -10,7 +10,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED IDD_TCPIP_BASIC_DLG DIALOGEX 0, 0, 246, 216 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "常规" FONT 9, "宋体" BEGIN @@ -205,7 +205,7 @@ BEGIN END IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "高级选项" FONT 9, "宋体" BEGIN diff --git a/dll/win32/netcfgx/lang/zh-HK.rc b/dll/win32/netcfgx/lang/zh-HK.rc index f001fac402a..d2e7ddaae9a 100644 --- a/dll/win32/netcfgx/lang/zh-HK.rc +++ b/dll/win32/netcfgx/lang/zh-HK.rc @@ -9,7 +9,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_HONGKONG IDD_TCPIP_BASIC_DLG DIALOGEX 0, 0, 246, 216 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "一般" FONT 9, "新細明體" BEGIN @@ -204,7 +204,7 @@ BEGIN END IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "進階" FONT 9, "新細明體" BEGIN diff --git a/dll/win32/netcfgx/lang/zh-TW.rc b/dll/win32/netcfgx/lang/zh-TW.rc index 01fa39efe08..b4cb6651580 100644 --- a/dll/win32/netcfgx/lang/zh-TW.rc +++ b/dll/win32/netcfgx/lang/zh-TW.rc @@ -9,7 +9,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL IDD_TCPIP_BASIC_DLG DIALOGEX 0, 0, 246, 216 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "一般" FONT 9, "新細明體" BEGIN @@ -204,7 +204,7 @@ BEGIN END IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "進階" FONT 9, "新細明體" BEGIN

1 year, 1 month

[reactos] 01/01: [ADVAPI32] Improve handling of unaligned key name in RegOpenKeyExW

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=aff16663562ac33b8da05… commit aff16663562ac33b8da058baacae2187ba303203 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Oct 22 21:42:11 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Nov 19 15:32:39 2023 +0200 [ADVAPI32] Improve handling of unaligned key name in RegOpenKeyExW Check for unaligned buffer before calling NtOpenKey instead of checking the result for STATUS_DATATYPE_MISALIGNMENT. --- dll/win32/advapi32/reg/reg.c | 57 ++++++++++++++++++++------------------------ 1 file changed, 26 insertions(+), 31 deletions(-) diff --git a/dll/win32/advapi32/reg/reg.c b/dll/win32/advapi32/reg/reg.c index 1ded4b54222..284731628b1 100644 --- a/dll/win32/advapi32/reg/reg.c +++ b/dll/win32/advapi32/reg/reg.c @@ -3362,6 +3362,7 @@ RegOpenKeyExW(HKEY hKey, NTSTATUS Status; ULONG Attributes = OBJ_CASE_INSENSITIVE; LONG ErrorCode = ERROR_SUCCESS; + BOOLEAN SubKeyStringAllocated = FALSE; TRACE("RegOpenKeyExW hKey 0x%x lpSubKey %S ulOptions 0x%x samDesired 0x%x phkResult %p\n", hKey, lpSubKey, ulOptions, samDesired, phkResult); @@ -3398,10 +3399,31 @@ RegOpenKeyExW(HKEY hKey, Attributes |= OBJ_OPENLINK; if (lpSubKey == NULL || wcscmp(lpSubKey, L"\\") == 0) + { RtlInitUnicodeString(&SubKeyString, L""); + } else + { RtlInitUnicodeString(&SubKeyString, lpSubKey); + /* Handle unaligned lpSubKey */ + if ((ULONG_PTR)lpSubKey & 1) + { + UNICODE_STRING AlignedString; + + Status = RtlDuplicateUnicodeString(RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE, + &SubKeyString, + &AlignedString); + if (!NT_SUCCESS(Status)) + { + goto Exit; + } + + SubKeyString = AlignedString; + SubKeyStringAllocated = TRUE; + } + } + InitializeObjectAttributes(&ObjectAttributes, &SubKeyString, Attributes, @@ -3412,37 +3434,11 @@ RegOpenKeyExW(HKEY hKey, samDesired, &ObjectAttributes); - if (Status == STATUS_DATATYPE_MISALIGNMENT) - { - HANDLE hAligned; - UNICODE_STRING AlignedString; - - Status = RtlDuplicateUnicodeString(RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE, - &SubKeyString, - &AlignedString); - if (NT_SUCCESS(Status)) - { - /* Try again with aligned parameters */ - InitializeObjectAttributes(&ObjectAttributes, - &AlignedString, - Attributes, - KeyHandle, - NULL); - - Status = NtOpenKey(&hAligned, - samDesired, - &ObjectAttributes); - - RtlFreeUnicodeString(&AlignedString); +Exit: - if (NT_SUCCESS(Status)) - *phkResult = hAligned; - } - else - { - /* Restore the original error */ - Status = STATUS_DATATYPE_MISALIGNMENT; - } + if (SubKeyStringAllocated) + { + RtlFreeUnicodeString(&SubKeyString); } if (!NT_SUCCESS(Status)) @@ -3450,7 +3446,6 @@ RegOpenKeyExW(HKEY hKey, ErrorCode = RtlNtStatusToDosError(Status); } - ClosePredefKey(KeyHandle); return ErrorCode;

1 year, 1 month

[reactos] 01/01: [SHELL32] Select 1st item after deletion of file type (#6007)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f95c789f2bc214cb19fb3… commit f95c789f2bc214cb19fb387830f65e44540d525f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Nov 19 22:16:03 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Nov 19 22:16:03 2023 +0900 [SHELL32] Select 1st item after deletion of file type (#6007) Based on KRosUser's filestypedel.patch. - Select the first item after the user deleted a file type. CORE-19325 --- dll/win32/shell32/dialogs/filetypes.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dll/win32/shell32/dialogs/filetypes.cpp b/dll/win32/shell32/dialogs/filetypes.cpp index ba2a5c10a42..78e5f7322ad 100644 --- a/dll/win32/shell32/dialogs/filetypes.cpp +++ b/dll/win32/shell32/dialogs/filetypes.cpp @@ -1612,6 +1612,12 @@ FileTypesDlg_OnDelete(HWND hwndDlg) if (MessageBoxW(hwndDlg, strRemoveExt, strTitle, MB_ICONQUESTION | MB_YESNO) == IDYES) { FileTypesDlg_RemoveExt(hwndDlg); + + // Select first item (Win2k3 does it) + LV_ITEMW item = { LVIF_STATE }; + item.stateMask = item.state = LVIS_FOCUSED | LVIS_SELECTED; + item.iItem = 0; + ListView_SetItem(GetDlgItem(hwndDlg, IDC_FILETYPES_LISTVIEW), &item); } }

1 year, 1 month

[reactos] 01/01: [CALC] Adapt to <strsafe.h> (#5894)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ede60035f4f03729c1ad1… commit ede60035f4f03729c1ad1f9a04b6a6a9e9675350 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Nov 19 21:46:00 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Nov 19 21:46:00 2023 +0900 [CALC] Adapt to <strsafe.h> (#5894) Use safer string functions of <strsafe.h>. Use StringCbPrintf instead of _stprintf. Use StringCbCopy insteaad of _tcscpy. Use StringCbCat instead of _tcscat. CORE-19306 --- base/applications/calc/calc.h | 1 + base/applications/calc/utl_ieee.c | 8 +++---- base/applications/calc/utl_mpfr.c | 2 +- base/applications/calc/winmain.c | 50 +++++++++++++++++++++++---------------- 4 files changed, 35 insertions(+), 26 deletions(-) diff --git a/base/applications/calc/calc.h b/base/applications/calc/calc.h index 3af74cc3701..05f9d6104c6 100644 --- a/base/applications/calc/calc.h +++ b/base/applications/calc/calc.h @@ -15,6 +15,7 @@ #include <htmlhelp.h> #endif #include <limits.h> +#include <strsafe.h> /* RESOURCES */ #include "resource.h" diff --git a/base/applications/calc/utl_ieee.c b/base/applications/calc/utl_ieee.c index 69be266f617..8bc8181f9c9 100644 --- a/base/applications/calc/utl_ieee.c +++ b/base/applications/calc/utl_ieee.c @@ -27,7 +27,7 @@ void prepare_rpn_result_2(calc_number_t *rpn, TCHAR *buffer, int size, int base) switch (base) { case IDC_RADIO_HEX: - _stprintf(buffer, _T("%I64X"), rpn->i); + StringCchPrintf(buffer, size, _T("%I64X"), rpn->i); break; case IDC_RADIO_DEC: /* @@ -40,11 +40,11 @@ void prepare_rpn_result_2(calc_number_t *rpn, TCHAR *buffer, int size, int base) /* calculate the width of integer number */ width = (rpn->f==0) ? 1 : (int)log10(fabs(rpn->f))+1; if (calc.sci_out == TRUE || width > MAX_LD_WIDTH || width < -MAX_LD_WIDTH) - _stprintf(buffer, _T("%#.*e"), MAX_LD_WIDTH-1, rpn->f); + StringCchPrintf(buffer, size, _T("%#.*e"), MAX_LD_WIDTH-1, rpn->f); else { TCHAR *ptr, *dst; - ptr = buffer + _stprintf(buffer, _T("%#*.*f"), width, ((MAX_LD_WIDTH-width-1)>=0) ? MAX_LD_WIDTH-width-1 : 0, rpn->f); + StringCchPrintfEx(buffer, size, &ptr, NULL, 0, _T("%#*.*f"), width, ((MAX_LD_WIDTH-width-1)>=0) ? MAX_LD_WIDTH-width-1 : 0, rpn->f); /* format string ensures there is a '.': */ dst = _tcschr(buffer, _T('.')); while (--ptr > dst) @@ -61,7 +61,7 @@ void prepare_rpn_result_2(calc_number_t *rpn, TCHAR *buffer, int size, int base) #undef MAX_LD_WIDTH break; case IDC_RADIO_OCT: - _stprintf(buffer, _T("%I64o"), rpn->i); + StringCchPrintf(buffer, size, _T("%I64o"), rpn->i); break; case IDC_RADIO_BIN: if (rpn->i == 0) { diff --git a/base/applications/calc/utl_mpfr.c b/base/applications/calc/utl_mpfr.c index 5c2d797e806..40686430407 100644 --- a/base/applications/calc/utl_mpfr.c +++ b/base/applications/calc/utl_mpfr.c @@ -107,7 +107,7 @@ void prepare_rpn_result_2(calc_number_t *rpn, TCHAR *buffer, int size, int base) } mpz_clear(zz); mpf_clear(ff); - _sntprintf(buffer, SIZEOF(calc.buffer), _T("%hs"), temp); + StringCchPrintf(buffer, size, _T("%hs"), temp); } void convert_text2number_2(calc_number_t *a) diff --git a/base/applications/calc/winmain.c b/base/applications/calc/winmain.c index cc26983cc52..974216b6f14 100644 --- a/base/applications/calc/winmain.c +++ b/base/applications/calc/winmain.c @@ -254,10 +254,10 @@ static void UpdateNumberIntl(void) { /* Get current user defaults */ if (!GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, calc.sDecimal, SIZEOF(calc.sDecimal))) - _tcscpy(calc.sDecimal, _T(".")); + StringCbCopy(calc.sDecimal, sizeof(calc.sDecimal), _T(".")); if (!GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_STHOUSAND, calc.sThousand, SIZEOF(calc.sThousand))) - _tcscpy(calc.sThousand, _T(",")); + StringCbCopy(calc.sThousand, sizeof(calc.sThousand), _T(",")); /* get the string lengths */ calc.sDecimal_len = _tcslen(calc.sDecimal); @@ -342,7 +342,7 @@ static void save_config(void) switch (osvi.dwPlatformId) { case VER_PLATFORM_WIN32s: case VER_PLATFORM_WIN32_WINDOWS: - _stprintf(buf, _T("%lu"), calc.layout); + StringCbPrintf(buf, sizeof(buf), _T("%lu"), calc.layout); WriteProfileString(_T("SciCalc"), _T("layout"), buf); WriteProfileString(_T("SciCalc"), _T("UseSep"), (calc.usesep==TRUE) ? _T("1") : _T("0")); break; @@ -496,16 +496,16 @@ static void update_lcd_display(HWND hwnd) TCHAR tmp[MAX_CALC_SIZE * 2 + 2]; if (calc.buffer[0] == _T('\0')) - _tcscpy(tmp, _T("0")); + StringCbCopy(tmp, sizeof(tmp), _T("0")); else - _tcscpy(tmp, calc.buffer); + StringCbCopy(tmp, sizeof(tmp), calc.buffer); /* Add final '.' in decimal mode (if it's missing), but * only if it's a result: no append if it prints "ERROR". */ if (calc.base == IDC_RADIO_DEC && !calc.is_nan) { if (_tcschr(tmp, _T('.')) == NULL) - _tcscat(tmp, _T(".")); + StringCbCat(tmp, sizeof(tmp), _T(".")); } /* if separator mode is on, let's add an additional space */ if (calc.usesep && !calc.sci_in && !calc.sci_out && !calc.is_nan) { @@ -573,13 +573,14 @@ static void update_parent_display(HWND hWnd) if (!n) str[0] = _T('\0'); else - _stprintf(str,_T("(=%d"), n); + StringCbPrintf(str, sizeof(str), _T("(=%d"), n); SetDlgItemText(hWnd, IDC_TEXT_PARENT, str); } static void build_operand(HWND hwnd, DWORD idc) { unsigned int i = 0, n; + size_t cbPtr; if (idc == IDC_BUTTON_DOT) { /* if dot is the first char, it's added automatically */ @@ -617,12 +618,14 @@ static void build_operand(HWND hwnd, DWORD idc) if (idc != IDC_STATIC) calc.esp = (calc.esp * 10 + (key2code[i].key-'0')) % LOCAL_EXP_SIZE; if (calc.ptr == calc.buffer) - _stprintf(calc.ptr, _T("0.e%+d"), calc.esp); + StringCbPrintf(calc.ptr, sizeof(calc.buffer), _T("0.e%+d"), calc.esp); else { /* adds the dot at the end if the number has no decimal part */ if (!_tcschr(calc.buffer, _T('.'))) *calc.ptr++ = _T('.'); - _stprintf(calc.ptr, _T("e%+d"), calc.esp); + + cbPtr = sizeof(calc.buffer) - ((BYTE*)calc.ptr - (BYTE*)calc.buffer); + StringCbPrintf(calc.ptr, cbPtr, _T("e%+d"), calc.esp); } update_lcd_display(hwnd); return; @@ -637,7 +640,11 @@ static void build_operand(HWND hwnd, DWORD idc) return; break; } - calc.ptr += _stprintf(calc.ptr, _T("%C"), key2code[i].key); + + cbPtr = sizeof(calc.buffer) - ((BYTE*)calc.ptr - (BYTE*)calc.buffer); + StringCbPrintfEx(calc.ptr, cbPtr, &calc.ptr, NULL, STRSAFE_FILL_ON_FAILURE, + _T("%C"), key2code[i].key); + update_lcd_display(hwnd); } @@ -850,11 +857,11 @@ static void update_memory_flag(HWND hWnd, BOOL mem_flag) SetDlgItemText(hWnd, IDC_TEXT_MEMORY, mem_flag ? _T("M") : _T("")); } -static void update_n_stats_items(HWND hWnd, TCHAR *buffer) +static void update_n_stats_items(HWND hWnd, TCHAR *buffer, size_t cbBuffer) { unsigned int n = SendDlgItemMessage(hWnd, IDC_LIST_STAT, LB_GETCOUNT, 0, 0); - _stprintf(buffer, _T("n=%u"), n); + StringCbPrintf(buffer, cbBuffer, _T("n=%u"), n); SetDlgItemText(hWnd, IDC_TEXT_NITEMS, buffer); } @@ -905,7 +912,7 @@ static char *ReadConversion(const char *formula) str[len+1] = ')'; str[len+2] = '\0'; - _tcscpy(calc.source, (*calc.buffer == _T('\0')) ? _T("0") : calc.buffer); + StringCbCopy(calc.source, sizeof(calc.source), (*calc.buffer == _T('\0')) ? _T("0") : calc.buffer); /* clear display content before proceeding */ calc.ptr = calc.buffer; @@ -942,13 +949,13 @@ static INT_PTR CALLBACK DlgStatProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) if (n == LB_ERR) return TRUE; SendDlgItemMessage(hWnd, IDC_LIST_STAT, LB_DELETESTRING, (WPARAM)n, 0); - update_n_stats_items(hWnd, buffer); + update_n_stats_items(hWnd, buffer, sizeof(buffer)); delete_stat_item(n); return TRUE; case IDC_BUTTON_CAD: SendDlgItemMessage(hWnd, IDC_LIST_STAT, LB_RESETCONTENT, 0, 0); clean_stat_list(); - update_n_stats_items(hWnd, buffer); + update_n_stats_items(hWnd, buffer, sizeof(buffer)); return TRUE; } break; @@ -964,7 +971,7 @@ static INT_PTR CALLBACK DlgStatProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) buffer, SIZEOF(buffer), ((statistic_t *)lp)->base); SendDlgItemMessage(hWnd, IDC_LIST_STAT, LB_ADDSTRING, 0, (LPARAM)buffer); - update_n_stats_items(hWnd, buffer); + update_n_stats_items(hWnd, buffer, sizeof(buffer)); return TRUE; } return FALSE; @@ -986,11 +993,13 @@ static void CopyMemToClipboard(void *ptr) if(OpenClipboard(NULL)) { HGLOBAL clipbuffer; TCHAR *buffer; + size_t cbBuffer; EmptyClipboard(); - clipbuffer = GlobalAlloc(GMEM_DDESHARE, (_tcslen(ptr)+1)*sizeof(TCHAR)); + cbBuffer = (_tcslen(ptr) + 1) * sizeof(TCHAR); + clipbuffer = GlobalAlloc(GMEM_DDESHARE, cbBuffer); buffer = (TCHAR *)GlobalLock(clipbuffer); - _tcscpy(buffer, ptr); + StringCbCopy(buffer, cbBuffer, ptr); GlobalUnlock(clipbuffer); #ifdef UNICODE SetClipboardData(CF_UNICODETEXT,clipbuffer); @@ -1056,9 +1065,8 @@ static char *handle_sequence_input(HWND hwnd, sequence_t *seq) } } else if (ch == '$') { - calc.ptr = - _tcscpy(calc.buffer, calc.source) + - _tcslen(calc.source); + StringCbCopyEx(calc.buffer, sizeof(calc.buffer), calc.source, &calc.ptr, NULL, + STRSAFE_FILL_ON_FAILURE); } else { for (x=0; x<SIZEOF(key2code); x++) { if (!(key2code[x].mask & BITMASK_IS_ASCII) ||

1 year, 1 month

[reactos] 01/01: [INPUT] Implement advanced settings (#5864)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=80c4856bbafd9286a5f4d… commit 80c4856bbafd9286a5f4de243c05bb01806953a0 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Nov 19 21:39:06 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Nov 19 21:39:06 2023 +0900 [INPUT] Implement advanced settings (#5864) Allow the user to turn off "Advanced Text Service". [HKEY_CURRENT_USER\Software\Microsoft\CTF] "Disable Thread Input Manager"=dword:00000001 Implement AdvancedSettingsPageProc procedure. Modify IDS_REBOOT_NOW resource string. CORE-19268 --- dll/cpl/input/advanced_settings_page.c | 92 +++++++++++++++++++++++++++++++++- dll/cpl/input/input.c | 32 ++++++++++-- dll/cpl/input/input.h | 2 + dll/cpl/input/input_list.c | 16 ++++++ dll/cpl/input/lang/bg-BG.rc | 2 +- dll/cpl/input/lang/cs-CZ.rc | 2 +- dll/cpl/input/lang/de-DE.rc | 2 +- dll/cpl/input/lang/el-GR.rc | 2 +- dll/cpl/input/lang/en-US.rc | 2 +- dll/cpl/input/lang/es-ES.rc | 2 +- dll/cpl/input/lang/fr-FR.rc | 2 +- dll/cpl/input/lang/he-IL.rc | 2 +- dll/cpl/input/lang/id-ID.rc | 2 +- dll/cpl/input/lang/it-IT.rc | 2 +- dll/cpl/input/lang/ja-JP.rc | 2 +- dll/cpl/input/lang/no-NO.rc | 2 +- dll/cpl/input/lang/pl-PL.rc | 2 +- dll/cpl/input/lang/pt-BR.rc | 2 +- dll/cpl/input/lang/pt-PT.rc | 2 +- dll/cpl/input/lang/ro-RO.rc | 2 +- dll/cpl/input/lang/ru-RU.rc | 2 +- dll/cpl/input/lang/sk-SK.rc | 2 +- dll/cpl/input/lang/sq-AL.rc | 2 +- dll/cpl/input/lang/tr-TR.rc | 2 +- dll/cpl/input/lang/uk-UA.rc | 2 +- dll/cpl/input/lang/zh-CN.rc | 2 +- dll/cpl/input/lang/zh-HK.rc | 2 +- dll/cpl/input/lang/zh-TW.rc | 2 +- dll/cpl/input/settings_page.c | 42 ++-------------- 29 files changed, 166 insertions(+), 66 deletions(-) diff --git a/dll/cpl/input/advanced_settings_page.c b/dll/cpl/input/advanced_settings_page.c index 77536525a34..45e32591095 100644 --- a/dll/cpl/input/advanced_settings_page.c +++ b/dll/cpl/input/advanced_settings_page.c @@ -3,13 +3,103 @@ * FILE: dll/cpl/input/advanced_settings_page.c * PURPOSE: input.dll * PROGRAMMER: Dmitry Chapyshev (dmitry(a)reactos.org) +* Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) */ #include "input.h" +BOOL g_bTextServiceIsOff = FALSE; + +BOOL LoadAdvancedSettings(HWND hwndDlg) +{ + HKEY hKey; + LRESULT error; + DWORD dwType; + DWORD dwValue; + DWORD cbValue = sizeof(dwValue); + + error = RegOpenKeyExW(HKEY_CURRENT_USER, L"Software\\Microsoft\\CTF", 0, KEY_READ, &hKey); + if (error != ERROR_SUCCESS) + return FALSE; + + error = RegQueryValueExW(hKey, + L"Disable Thread Input Manager", + NULL, + &dwType, + (LPBYTE)&dwValue, + &cbValue); + if ((error != ERROR_SUCCESS) || (dwType != REG_DWORD) || (cbValue != sizeof(dwValue))) + dwValue = FALSE; /* Default */ + + RegCloseKey(hKey); + + CheckDlgButton(hwndDlg, IDC_TURNOFFTEXTSVCS_CB, (dwValue ? BST_CHECKED : BST_UNCHECKED)); + g_bTextServiceIsOff = !!dwValue; + return TRUE; +} + +BOOL SaveAdvancedSettings(HWND hwndDlg) +{ + HKEY hKey; + LRESULT error; + const DWORD dwValue = g_bTextServiceIsOff; + const DWORD cbValue = sizeof(dwValue); + + error = RegOpenKeyExW(HKEY_CURRENT_USER, L"Software\\Microsoft\\CTF", 0, KEY_WRITE, &hKey); + if (error != ERROR_SUCCESS) + return FALSE; + + error = RegSetValueExW(hKey, L"Disable Thread Input Manager", 0, REG_DWORD, + (const BYTE *)&dwValue, cbValue); + + RegCloseKey(hKey); + return (error == ERROR_SUCCESS); +} + +static INT_PTR OnNotifyAdvancedSettingsPage(HWND hwndDlg, LPARAM lParam) +{ + LPNMHDR header = (LPNMHDR)lParam; + + switch (header->code) + { + case PSN_APPLY: + { + BOOL bOff = (IsDlgButtonChecked(hwndDlg, IDC_TURNOFFTEXTSVCS_CB) == BST_CHECKED); + g_bRebootNeeded |= (g_bTextServiceIsOff && !bOff); + g_bTextServiceIsOff = bOff; + + /* Write advanced settings */ + SaveAdvancedSettings(hwndDlg); + break; + } + } + + return 0; +} INT_PTR CALLBACK AdvancedSettingsPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { - return FALSE; + switch (uMsg) + { + case WM_INITDIALOG: + LoadAdvancedSettings(hwndDlg); + return TRUE; + + case WM_NOTIFY: + return OnNotifyAdvancedSettingsPage(hwndDlg, lParam); + + case WM_COMMAND: + { + switch (LOWORD(wParam)) + { + case IDC_TURNOFFTEXTSVCS_CB: + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + break; + } + break; + } + } + + return 0; } diff --git a/dll/cpl/input/input.c b/dll/cpl/input/input.c index cd8a0291cb5..de64edf9af7 100644 --- a/dll/cpl/input/input.c +++ b/dll/cpl/input/input.c @@ -15,6 +15,7 @@ static LONG CALLBACK SystemApplet(HWND hwnd, UINT uMsg, LPARAM lParam1, LPARAM lParam2); HINSTANCE hApplet = NULL; +BOOL g_bRebootNeeded = FALSE; /* Applets */ static APPLET Applets[NUM_APPLETS] = @@ -35,19 +36,44 @@ InitPropSheetPage(PROPSHEETPAGEW *page, WORD idDlg, DLGPROC DlgProc) page->pfnDlgProc = DlgProc; } +static BOOL AskForReboot(HWND hwndDlg) +{ + WCHAR szText[128], szCaption[64]; + LoadStringW(hApplet, IDS_REBOOT_NOW, szText, _countof(szText)); + LoadStringW(hApplet, IDS_LANGUAGE, szCaption, _countof(szCaption)); + return (MessageBoxW(hwndDlg, szText, szCaption, MB_ICONINFORMATION | MB_YESNO) == IDYES); +} + static int CALLBACK PropSheetProc(HWND hwndDlg, UINT uMsg, LPARAM lParam) { - // NOTE: This callback is needed to set large icon correctly. - HICON hIcon; switch (uMsg) { case PSCB_INITIALIZED: { - hIcon = LoadIconW(hApplet, MAKEINTRESOURCEW(IDI_CPLSYSTEM)); + /* Set large icon correctly */ + HICON hIcon = LoadIconW(hApplet, MAKEINTRESOURCEW(IDI_CPLSYSTEM)); SendMessageW(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)hIcon); break; } + + case PSCB_BUTTONPRESSED: + { + switch (lParam) + { + case PSBTN_OK: + case PSBTN_APPLYNOW: + { + if (g_bRebootNeeded && AskForReboot(hwndDlg)) + { + EnableProcessPrivileges(SE_SHUTDOWN_NAME, TRUE); + ExitWindowsEx(EWX_REBOOT | EWX_FORCE, 0); + } + break; + } + } + break; + } } return 0; } diff --git a/dll/cpl/input/input.h b/dll/cpl/input/input.h index 4f06ea66ac6..b57993c0c2c 100644 --- a/dll/cpl/input/input.h +++ b/dll/cpl/input/input.h @@ -28,6 +28,7 @@ typedef struct } APPLET, *PAPPLET; extern HINSTANCE hApplet; +extern BOOL g_bRebootNeeded; // Character Count of a layout ID like "00000409" #define CCH_LAYOUT_ID 8 @@ -40,6 +41,7 @@ extern HINSTANCE hApplet; /* settings_page.c */ INT_PTR CALLBACK SettingsPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); +BOOL EnableProcessPrivileges(LPCWSTR lpPrivilegeName, BOOL bEnable); /* advanced_settings_page.c */ INT_PTR CALLBACK diff --git a/dll/cpl/input/input_list.c b/dll/cpl/input/input_list.c index 49347d841dc..8cb6b443cca 100644 --- a/dll/cpl/input/input_list.c +++ b/dll/cpl/input/input_list.c @@ -395,12 +395,28 @@ InputList_Process(VOID) return FALSE; } + /* Find change in the IME HKLs */ + for (pCurrent = _InputList; pCurrent != NULL; pCurrent = pCurrent->pNext) + { + if (!IS_IME_HKL(pCurrent->hkl)) + continue; + + if ((pCurrent->wFlags & INPUT_LIST_NODE_FLAG_ADDED) || + (pCurrent->wFlags & INPUT_LIST_NODE_FLAG_EDITED) || + (pCurrent->wFlags & INPUT_LIST_NODE_FLAG_DELETED)) + { + bRet = TRUE; /* Reboot is needed */ + break; + } + } + /* Process DELETED and EDITED entries */ for (pCurrent = _InputList; pCurrent != NULL; pCurrent = pCurrent->pNext) { if ((pCurrent->wFlags & INPUT_LIST_NODE_FLAG_DELETED) || (pCurrent->wFlags & INPUT_LIST_NODE_FLAG_EDITED)) { + /* Only unload the DELETED and EDITED entries */ if (UnloadKeyboardLayout(pCurrent->hkl)) { diff --git a/dll/cpl/input/lang/bg-BG.rc b/dll/cpl/input/lang/bg-BG.rc index d7e7ff05828..fc6385936bc 100644 --- a/dll/cpl/input/lang/bg-BG.rc +++ b/dll/cpl/input/lang/bg-BG.rc @@ -110,7 +110,7 @@ BEGIN IDS_CTRL_SHIFT "Ctrl+Shift" IDS_LEFT_ALT_SHIFT "Ляв Alt+Shift" IDS_SWITCH_BET_INLANG "Превключване на езиците за въвеждане" - IDS_REBOOT_NOW, "Рестартирай сега?" + IDS_REBOOT_NOW "You have to restart the system for the settings to take effect. Reboot now?" END STRINGTABLE diff --git a/dll/cpl/input/lang/cs-CZ.rc b/dll/cpl/input/lang/cs-CZ.rc index 1b58469d1d1..ebea8f9fd25 100644 --- a/dll/cpl/input/lang/cs-CZ.rc +++ b/dll/cpl/input/lang/cs-CZ.rc @@ -115,7 +115,7 @@ BEGIN IDS_CTRL_SHIFT "Ctrl+Shift" IDS_LEFT_ALT_SHIFT "Levý Alt+Shift" IDS_SWITCH_BET_INLANG "Přepnout mezi vstupními jazyky" - IDS_REBOOT_NOW, "Reboot now?" + IDS_REBOOT_NOW "You have to restart the system for the settings to take effect. Reboot now?" END STRINGTABLE diff --git a/dll/cpl/input/lang/de-DE.rc b/dll/cpl/input/lang/de-DE.rc index 38984e61436..4e55706aa26 100644 --- a/dll/cpl/input/lang/de-DE.rc +++ b/dll/cpl/input/lang/de-DE.rc @@ -110,7 +110,7 @@ BEGIN IDS_CTRL_SHIFT "Strg+Umschalt" IDS_LEFT_ALT_SHIFT "Alt links+Umschalt" IDS_SWITCH_BET_INLANG "Zwischen Eingabesprachen umschalten" - IDS_REBOOT_NOW, "Reboot now?" + IDS_REBOOT_NOW "You have to restart the system for the settings to take effect. Reboot now?" END STRINGTABLE diff --git a/dll/cpl/input/lang/el-GR.rc b/dll/cpl/input/lang/el-GR.rc index fa982cd7b80..b5ca7be6454 100644 --- a/dll/cpl/input/lang/el-GR.rc +++ b/dll/cpl/input/lang/el-GR.rc @@ -110,7 +110,7 @@ BEGIN IDS_CTRL_SHIFT "Ctrl+Shift" IDS_LEFT_ALT_SHIFT "Left Alt+Shift" IDS_SWITCH_BET_INLANG "Switch between input languages" - IDS_REBOOT_NOW, "Reboot now?" + IDS_REBOOT_NOW "You have to restart the system for the settings to take effect. Reboot now?" END STRINGTABLE diff --git a/dll/cpl/input/lang/en-US.rc b/dll/cpl/input/lang/en-US.rc index 9e8709b065f..8ba0158e9e8 100644 --- a/dll/cpl/input/lang/en-US.rc +++ b/dll/cpl/input/lang/en-US.rc @@ -110,7 +110,7 @@ BEGIN IDS_CTRL_SHIFT "Ctrl+Shift" IDS_LEFT_ALT_SHIFT "Left Alt+Shift" IDS_SWITCH_BET_INLANG "Switch between input languages" - IDS_REBOOT_NOW, "Reboot now?" + IDS_REBOOT_NOW "You have to restart the system for the settings to take effect. Reboot now?" END STRINGTABLE diff --git a/dll/cpl/input/lang/es-ES.rc b/dll/cpl/input/lang/es-ES.rc index 9401b59f1d6..19acb40fccd 100644 --- a/dll/cpl/input/lang/es-ES.rc +++ b/dll/cpl/input/lang/es-ES.rc @@ -119,7 +119,7 @@ BEGIN IDS_CTRL_SHIFT "Ctrl+Mayús" IDS_LEFT_ALT_SHIFT "Alt Izq+Mayús" IDS_SWITCH_BET_INLANG "Cambiar entre los idiomas de entrada" - IDS_REBOOT_NOW, "¿Reiniciar ahora?" + IDS_REBOOT_NOW "You have to restart the system for the settings to take effect. Reboot now?" END STRINGTABLE diff --git a/dll/cpl/input/lang/fr-FR.rc b/dll/cpl/input/lang/fr-FR.rc index 24ab68dab44..1e45d284a9a 100644 --- a/dll/cpl/input/lang/fr-FR.rc +++ b/dll/cpl/input/lang/fr-FR.rc @@ -110,7 +110,7 @@ BEGIN IDS_CTRL_SHIFT "Ctrl+Maj" IDS_LEFT_ALT_SHIFT "Alt Gauche+Maj" IDS_SWITCH_BET_INLANG "Changer les langues de saisie" - IDS_REBOOT_NOW, "Redémarrer maintenant ?" + IDS_REBOOT_NOW "Il est nécessaire de redémarrer le système afin que les changements prennent effet. Redémarrer maintenant ?" END /* FIXME : À améliorer/compléter */ diff --git a/dll/cpl/input/lang/he-IL.rc b/dll/cpl/input/lang/he-IL.rc index e6685eb3155..2a838ad2a4d 100644 --- a/dll/cpl/input/lang/he-IL.rc +++ b/dll/cpl/input/lang/he-IL.rc @@ -112,7 +112,7 @@ BEGIN IDS_CTRL_SHIFT "Ctrl+Shift" IDS_LEFT_ALT_SHIFT "מקש Alt שמאלי+Shift" IDS_SWITCH_BET_INLANG "החלף בין שפות כתיבה" - IDS_REBOOT_NOW, "להפעיל מחדש כעת?" + IDS_REBOOT_NOW "You have to restart the system for the settings to take effect. Reboot now?" END STRINGTABLE diff --git a/dll/cpl/input/lang/id-ID.rc b/dll/cpl/input/lang/id-ID.rc index 40667cfbc71..323dfa45224 100644 --- a/dll/cpl/input/lang/id-ID.rc +++ b/dll/cpl/input/lang/id-ID.rc @@ -110,7 +110,7 @@ BEGIN IDS_CTRL_SHIFT "Ctrl+Shift" IDS_LEFT_ALT_SHIFT "Alt kiri+Shift" IDS_SWITCH_BET_INLANG "Mengganti salah satu bahasa masukan" - IDS_REBOOT_NOW, "Mulai ulang sekarang?" + IDS_REBOOT_NOW "You have to restart the system for the settings to take effect. Reboot now?" END STRINGTABLE diff --git a/dll/cpl/input/lang/it-IT.rc b/dll/cpl/input/lang/it-IT.rc index 44acb4187b2..19b98363462 100644 --- a/dll/cpl/input/lang/it-IT.rc +++ b/dll/cpl/input/lang/it-IT.rc @@ -110,7 +110,7 @@ BEGIN IDS_CTRL_SHIFT "Ctrl+Shift" IDS_LEFT_ALT_SHIFT "Alt sinistro+Shift" IDS_SWITCH_BET_INLANG "Cambia lingua di digitazione" - IDS_REBOOT_NOW, "Reboot now?" + IDS_REBOOT_NOW "You have to restart the system for the settings to take effect. Reboot now?" END STRINGTABLE diff --git a/dll/cpl/input/lang/ja-JP.rc b/dll/cpl/input/lang/ja-JP.rc index a3fbc0b8925..ddbac542302 100644 --- a/dll/cpl/input/lang/ja-JP.rc +++ b/dll/cpl/input/lang/ja-JP.rc @@ -110,7 +110,7 @@ BEGIN IDS_CTRL_SHIFT "Ctrl+Shift" IDS_LEFT_ALT_SHIFT "左Alt+Shift" IDS_SWITCH_BET_INLANG "入力言語の切り替え" - IDS_REBOOT_NOW, "再起動しますか?" + IDS_REBOOT_NOW "設定を有効にするにはシステムを再起動する必要があります。今すぐ再起動しますか？" END STRINGTABLE diff --git a/dll/cpl/input/lang/no-NO.rc b/dll/cpl/input/lang/no-NO.rc index 2dd97cb0dcd..75a786126bc 100644 --- a/dll/cpl/input/lang/no-NO.rc +++ b/dll/cpl/input/lang/no-NO.rc @@ -110,7 +110,7 @@ BEGIN IDS_CTRL_SHIFT "Ctrl+Shift" IDS_LEFT_ALT_SHIFT "Venstre Alt+Shift" IDS_SWITCH_BET_INLANG "Bytt mellom inndataspråk" - IDS_REBOOT_NOW, "Reboot now?" + IDS_REBOOT_NOW "You have to restart the system for the settings to take effect. Reboot now?" END STRINGTABLE diff --git a/dll/cpl/input/lang/pl-PL.rc b/dll/cpl/input/lang/pl-PL.rc index 8643faabee5..80f6be90a27 100644 --- a/dll/cpl/input/lang/pl-PL.rc +++ b/dll/cpl/input/lang/pl-PL.rc @@ -119,7 +119,7 @@ BEGIN IDS_CTRL_SHIFT "Ctrl+Shift" IDS_LEFT_ALT_SHIFT "Lewy Alt+Shift" IDS_SWITCH_BET_INLANG "Przełącza pomiędzy układami klawiatury" - IDS_REBOOT_NOW, "Uruchomić ponownie system?" + IDS_REBOOT_NOW "You have to restart the system for the settings to take effect. Reboot now?" END STRINGTABLE diff --git a/dll/cpl/input/lang/pt-BR.rc b/dll/cpl/input/lang/pt-BR.rc index 9dbee2c881a..a320f414a53 100644 --- a/dll/cpl/input/lang/pt-BR.rc +++ b/dll/cpl/input/lang/pt-BR.rc @@ -110,7 +110,7 @@ BEGIN IDS_CTRL_SHIFT "CTRL+SHIFT" IDS_LEFT_ALT_SHIFT "ALT esquerdo+SHIFT" IDS_SWITCH_BET_INLANG "Alternar entre idiomas de entrada" - IDS_REBOOT_NOW, "Reboot now?" + IDS_REBOOT_NOW "You have to restart the system for the settings to take effect. Reboot now?" END STRINGTABLE diff --git a/dll/cpl/input/lang/pt-PT.rc b/dll/cpl/input/lang/pt-PT.rc index b8d05992c31..7972707e353 100644 --- a/dll/cpl/input/lang/pt-PT.rc +++ b/dll/cpl/input/lang/pt-PT.rc @@ -110,7 +110,7 @@ BEGIN IDS_CTRL_SHIFT "CTRL+SHIFT" IDS_LEFT_ALT_SHIFT "ALT esquerdo+SHIFT" IDS_SWITCH_BET_INLANG "Alternar entre idiomas de entrada" - IDS_REBOOT_NOW, "Reiniciar agora?" + IDS_REBOOT_NOW "You have to restart the system for the settings to take effect. Reboot now?" END STRINGTABLE diff --git a/dll/cpl/input/lang/ro-RO.rc b/dll/cpl/input/lang/ro-RO.rc index e20715df5e9..00835477038 100644 --- a/dll/cpl/input/lang/ro-RO.rc +++ b/dll/cpl/input/lang/ro-RO.rc @@ -118,7 +118,7 @@ BEGIN IDS_CTRL_SHIFT "«Ctrl» + «Shift»" IDS_LEFT_ALT_SHIFT "«Alt» (stâng) + «Shift»" IDS_SWITCH_BET_INLANG "Comutarea între limbile de intrare" - IDS_REBOOT_NOW, "Reporniți acum?" + IDS_REBOOT_NOW "You have to restart the system for the settings to take effect. Reboot now?" END STRINGTABLE diff --git a/dll/cpl/input/lang/ru-RU.rc b/dll/cpl/input/lang/ru-RU.rc index ca1ddcccedd..838262e836c 100644 --- a/dll/cpl/input/lang/ru-RU.rc +++ b/dll/cpl/input/lang/ru-RU.rc @@ -110,7 +110,7 @@ BEGIN IDS_CTRL_SHIFT "Ctrl+Shift" IDS_LEFT_ALT_SHIFT "Alt слева+Shift" IDS_SWITCH_BET_INLANG "Переключение между языками ввода" - IDS_REBOOT_NOW, "Перезагрузить сейчас?" + IDS_REBOOT_NOW "You have to restart the system for the settings to take effect. Reboot now?" END STRINGTABLE diff --git a/dll/cpl/input/lang/sk-SK.rc b/dll/cpl/input/lang/sk-SK.rc index 89422607055..4cdaad5f0cc 100644 --- a/dll/cpl/input/lang/sk-SK.rc +++ b/dll/cpl/input/lang/sk-SK.rc @@ -115,7 +115,7 @@ BEGIN IDS_CTRL_SHIFT "Ctrl+Shift" IDS_LEFT_ALT_SHIFT "Ľavý Alt+Shift" IDS_SWITCH_BET_INLANG "Switch between input languages" - IDS_REBOOT_NOW, "Reboot now?" + IDS_REBOOT_NOW "You have to restart the system for the settings to take effect. Reboot now?" END STRINGTABLE diff --git a/dll/cpl/input/lang/sq-AL.rc b/dll/cpl/input/lang/sq-AL.rc index d8760da6718..b1026259e29 100644 --- a/dll/cpl/input/lang/sq-AL.rc +++ b/dll/cpl/input/lang/sq-AL.rc @@ -114,7 +114,7 @@ BEGIN IDS_CTRL_SHIFT "Ctrl+Shift" IDS_LEFT_ALT_SHIFT "Left Alt+Shift" IDS_SWITCH_BET_INLANG "Ndërro ndër gjuhët hyrese" - IDS_REBOOT_NOW, "Reboot now?" + IDS_REBOOT_NOW "You have to restart the system for the settings to take effect. Reboot now?" END STRINGTABLE diff --git a/dll/cpl/input/lang/tr-TR.rc b/dll/cpl/input/lang/tr-TR.rc index 02e3367a43b..9bc688f7e89 100644 --- a/dll/cpl/input/lang/tr-TR.rc +++ b/dll/cpl/input/lang/tr-TR.rc @@ -112,7 +112,7 @@ BEGIN IDS_CTRL_SHIFT "Ctrl + Shift" IDS_LEFT_ALT_SHIFT "Sol Alt + Shift" IDS_SWITCH_BET_INLANG "Giriş dilleri arasında geçiş yap." - IDS_REBOOT_NOW, "Şimdi yeniden başlatılsın mı?" + IDS_REBOOT_NOW "You have to restart the system for the settings to take effect. Reboot now?" END STRINGTABLE diff --git a/dll/cpl/input/lang/uk-UA.rc b/dll/cpl/input/lang/uk-UA.rc index 7e3be1e26c7..deb2fce89ce 100644 --- a/dll/cpl/input/lang/uk-UA.rc +++ b/dll/cpl/input/lang/uk-UA.rc @@ -118,7 +118,7 @@ BEGIN IDS_CTRL_SHIFT "Ctrl+Shift" IDS_LEFT_ALT_SHIFT "Alt зліва+Shift" IDS_SWITCH_BET_INLANG "Перемикання мов вводу" - IDS_REBOOT_NOW, "Перезавантажити зараз?" + IDS_REBOOT_NOW "You have to restart the system for the settings to take effect. Reboot now?" END STRINGTABLE diff --git a/dll/cpl/input/lang/zh-CN.rc b/dll/cpl/input/lang/zh-CN.rc index 41053c006e6..d35e4903531 100644 --- a/dll/cpl/input/lang/zh-CN.rc +++ b/dll/cpl/input/lang/zh-CN.rc @@ -112,7 +112,7 @@ BEGIN IDS_CTRL_SHIFT "Ctrl+Shift" IDS_LEFT_ALT_SHIFT "左 Alt+Shift" IDS_SWITCH_BET_INLANG "在输入语言间切换" - IDS_REBOOT_NOW, "要现在重新启动计算机吗？" + IDS_REBOOT_NOW "You have to restart the system for the settings to take effect. Reboot now?" END STRINGTABLE diff --git a/dll/cpl/input/lang/zh-HK.rc b/dll/cpl/input/lang/zh-HK.rc index 355dd92d44e..cdbcbf1c6bc 100644 --- a/dll/cpl/input/lang/zh-HK.rc +++ b/dll/cpl/input/lang/zh-HK.rc @@ -118,7 +118,7 @@ BEGIN IDS_CTRL_SHIFT "Ctrl+Shift" IDS_LEFT_ALT_SHIFT "左 Alt+Shift" IDS_SWITCH_BET_INLANG "在輸入語言間切換" - IDS_REBOOT_NOW, "要立即重新啟動嗎？" + IDS_REBOOT_NOW "You have to restart the system for the settings to take effect. Reboot now?" END STRINGTABLE diff --git a/dll/cpl/input/lang/zh-TW.rc b/dll/cpl/input/lang/zh-TW.rc index e535fd54902..edfae5f8edc 100644 --- a/dll/cpl/input/lang/zh-TW.rc +++ b/dll/cpl/input/lang/zh-TW.rc @@ -118,7 +118,7 @@ BEGIN IDS_CTRL_SHIFT "Ctrl+Shift" IDS_LEFT_ALT_SHIFT "左 Alt+Shift" IDS_SWITCH_BET_INLANG "在輸入語言間切換" - IDS_REBOOT_NOW, "要立即重新啟動嗎？" + IDS_REBOOT_NOW "You have to restart the system for the settings to take effect. Reboot now?" END STRINGTABLE diff --git a/dll/cpl/input/settings_page.c b/dll/cpl/input/settings_page.c index bf10b057623..7f5057cddad 100644 --- a/dll/cpl/input/settings_page.c +++ b/dll/cpl/input/settings_page.c @@ -15,7 +15,6 @@ static INT s_nAliveLeafCount = 0; static INT s_nRootCount = 0; static INT s_iKeyboardImage = -1; static INT s_iDotImage = -1; -static BOOL s_bDefaultInputChanged = FALSE; static HICON CreateLayoutIcon(LANGID LangID) @@ -461,12 +460,12 @@ OnCommandSettingsPage(HWND hwndDlg, WPARAM wParam) if (HIWORD(item.lParam)) // Leaf? { if (InputList_Remove((INPUT_LIST_NODE*)item.lParam)) - s_bDefaultInputChanged = TRUE; + g_bRebootNeeded = TRUE; } else // Root? { if (InputList_RemoveByLang(LOWORD(item.lParam))) - s_bDefaultInputChanged = TRUE; + g_bRebootNeeded = TRUE; } UpdateInputListView(hwndList); @@ -533,7 +532,7 @@ OnCommandSettingsPage(HWND hwndDlg, WPARAM wParam) INPUT_LIST_NODE* pNode = (INPUT_LIST_NODE*)lParam; if (!(pNode->wFlags & INPUT_LIST_NODE_FLAG_DEFAULT)) { - s_bDefaultInputChanged = TRUE; + g_bRebootNeeded = TRUE; InputList_SetDefault(pNode); UpdateInputListView(hwndList); SetControlsState(hwndDlg); @@ -546,24 +545,6 @@ OnCommandSettingsPage(HWND hwndDlg, WPARAM wParam) } } -static BOOL IsRebootNeeded(VOID) -{ - INPUT_LIST_NODE *pNode; - - if (s_bDefaultInputChanged) - return TRUE; - - for (pNode = InputList_GetFirst(); pNode != NULL; pNode = pNode->pNext) - { - if (IS_IME_HKL(pNode->hkl)) /* IME? */ - { - return TRUE; - } - } - - return FALSE; -} - BOOL EnableProcessPrivileges(LPCWSTR lpPrivilegeName, BOOL bEnable) { HANDLE hToken; @@ -619,23 +600,8 @@ OnNotifySettingsPage(HWND hwndDlg, LPARAM lParam) case PSN_APPLY: { - BOOL bRebootNeeded = IsRebootNeeded(); - /* Write Input Methods list to registry */ - if (InputList_Process() && bRebootNeeded) - { - /* Needs reboot */ - WCHAR szNeedsReboot[128], szLanguage[64]; - LoadStringW(hApplet, IDS_REBOOT_NOW, szNeedsReboot, _countof(szNeedsReboot)); - LoadStringW(hApplet, IDS_LANGUAGE, szLanguage, _countof(szLanguage)); - - if (MessageBoxW(hwndDlg, szNeedsReboot, szLanguage, - MB_ICONINFORMATION | MB_YESNOCANCEL) == IDYES) - { - EnableProcessPrivileges(SE_SHUTDOWN_NAME, TRUE); - ExitWindowsEx(EWX_REBOOT | EWX_FORCE, 0); - } - } + g_bRebootNeeded |= InputList_Process(); break; } }

1 year, 1 month

[reactos] 01/01: [STOBJECT] Remove #if 0 and #endif in Volume_IsMute (#5973)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b6a0ef10d205f846a5204… commit b6a0ef10d205f846a5204e21b0db3e9a406bfc5c Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Nov 19 21:28:37 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Nov 19 21:28:37 2023 +0900 [STOBJECT] Remove #if 0 and #endif in Volume_IsMute (#5973) Based on KRosUser's volume.patch. The pair of #if 0 and #endif was added in 180b6fb. CORE-18583 --- dll/shellext/stobject/volume.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dll/shellext/stobject/volume.cpp b/dll/shellext/stobject/volume.cpp index 4b63e05a6b1..048197eaab1 100644 --- a/dll/shellext/stobject/volume.cpp +++ b/dll/shellext/stobject/volume.cpp @@ -111,7 +111,6 @@ static HRESULT __stdcall Volume_FindMixerControl(CSysTray * pSysTray) HRESULT Volume_IsMute() { -#if 0 MIXERCONTROLDETAILS mixerControlDetails; if (g_mixerId != (UINT)-1 && g_muteControlID != (DWORD)-1) @@ -123,14 +122,14 @@ HRESULT Volume_IsMute() mixerControlDetails.cChannels = 1; mixerControlDetails.paDetails = &detailsResult; mixerControlDetails.cbDetails = sizeof(detailsResult); - if (mixerGetControlDetailsW((HMIXEROBJ) g_mixerId, &mixerControlDetails, 0)) + if (mixerGetControlDetailsW((HMIXEROBJ)UlongToHandle(g_mixerId), &mixerControlDetails, 0)) return E_FAIL; TRACE("Obtained mute status %d\n", detailsResult); g_IsMute = detailsResult != 0; } -#endif + return S_OK; }

1 year, 1 month

[reactos] 01/01: [HOTPLUG] Update Japanese (ja-JP) translation

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d5cfd837891ec004c956b… commit d5cfd837891ec004c956b22d377d73b6655b332d Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Nov 19 20:51:59 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sun Nov 19 20:51:59 2023 +0900 [HOTPLUG] Update Japanese (ja-JP) translation CORE-18706 --- dll/cpl/hotplug/lang/ja-JP.rc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dll/cpl/hotplug/lang/ja-JP.rc b/dll/cpl/hotplug/lang/ja-JP.rc index 0940057bd35..9a544ce8ddd 100644 --- a/dll/cpl/hotplug/lang/ja-JP.rc +++ b/dll/cpl/hotplug/lang/ja-JP.rc @@ -18,15 +18,15 @@ BEGIN END IDD_CONFIRM_STOP_HARDWARE_DIALOG DIALOGEX 32, 10, 256, 148 -CAPTION "Stop a Hardware Device" +CAPTION "ハードウェアデバイスを停止する" STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -FONT 8, "MS Shell Dlg" +FONT 9, "MS UI Gothic" BEGIN - LTEXT "Confirm devices to be stopped, choose OK to continue.", IDC_STATIC, 7, 8, 241, 14, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "ReactOS will attempt to stop the following devices. After the devices are stopped they may be removed safely.", IDC_STATIC, 7, 22, 240, 18, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "停止対象のデバイスを確認し、OK をクリックして下さい。", IDC_STATIC, 7, 8, 241, 14, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "ReactOS は、以下のデバイスを停止しようとしています。停止後は、安全に取り外すことができます。", IDC_STATIC, 7, 22, 240, 18, WS_CHILD | WS_VISIBLE | WS_GROUP CONTROL "", IDC_CONFIRM_STOP_DEVICE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_ALIGNLEFT | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_GROUP | WS_TABSTOP, 8, 45, 240, 78 DEFPUSHBUTTON "OK", IDOK, 144, 127, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 198, 127, 50, 14 + PUSHBUTTON "キャンセル", IDCANCEL, 198, 127, 50, 14 END @@ -48,6 +48,6 @@ STRINGTABLE BEGIN IDS_CPLNAME "安全なハードウェアの取り外し" IDS_CPLDESCRIPTION "コンピュータからデバイスを安全に取り外しできます。" - IDS_UNKNOWN_DEVICE "Unknown Device" - IDS_EJECT_ERROR_FORMAT "Failed to remove device (0x%x)\0" + IDS_UNKNOWN_DEVICE "未知のデバイス" + IDS_EJECT_ERROR_FORMAT "デバイス (0x%x) の取り外しに失敗\0" END

1 year, 1 month

[reactos] 01/01: [DEVCPUX] Add Japanese (ja-JP) translation

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6a63d4a3c1f8992e0d9d1… commit 6a63d4a3c1f8992e0d9d1c5524f2d715b6fcff5f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Nov 19 20:44:25 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sun Nov 19 20:44:25 2023 +0900 [DEVCPUX] Add Japanese (ja-JP) translation CORE-18706 --- dll/shellext/devcpux/lang/ja-JP.rc | 41 ++++++++++++++++++++++++++++++++++++++ dll/shellext/devcpux/processor.rc | 3 +++ 2 files changed, 44 insertions(+) diff --git a/dll/shellext/devcpux/lang/ja-JP.rc b/dll/shellext/devcpux/lang/ja-JP.rc new file mode 100644 index 00000000000..6d2a1968f4b --- /dev/null +++ b/dll/shellext/devcpux/lang/ja-JP.rc @@ -0,0 +1,41 @@ +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +DLG_PROCESSORINFO DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +CAPTION "CPU" +FONT 9, "MS UI Gothic" +BEGIN + LTEXT "機能:", -1, 7, 23, 50, 8 + LTEXT "テスト", IDC_FEATURES, 57, 23, 181, 8 + LTEXT "モデル:", -1, 7, 38, 50, 8 + LTEXT "テスト", IDC_MODEL, 57, 38, 181, 8 + LTEXT "ステッピング:", -1, 7, 53, 50, 51 + LTEXT "テスト", IDC_STEPPING, 57, 53, 181, 8 + LTEXT "コア速度:", -1, 7, 68, 50, 8 + LTEXT "テスト", IDC_CORESPEED, 57, 68, 181, 8 +END + +STRINGTABLE +BEGIN + IDS_MEGAHERTZ "%ld MHz" +END + +/* +DLG_PROCESSORINFO DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +CAPTION "CPU" +FONT 9, "MS UI Gothic" +BEGIN + LTEXT "機能:", -1, 7, 23, 50, 8 + LTEXT "<テスト>", IDC_FEATURES, 7, 34, 238, 8 + + LTEXT "モデル:", -1, 7, 49, 50, 8 + LTEXT "<テスト>", IDC_MODEL, 7, 60, 238, 8 + + LTEXT "ステッピング:", -1, 7, 75, 50, 8 + LTEXT "<テスト>", IDC_STEPPING, 7, 86, 238, 8 + + LTEXT "コア速度:", -1, 7, 101, 50, 8 + LTEXT "<テスト>", IDC_CORESPEED, 7, 112, 238, 8 +END +*/ \ No newline at end of file diff --git a/dll/shellext/devcpux/processor.rc b/dll/shellext/devcpux/processor.rc index 83a55e66831..46f24a65c57 100644 --- a/dll/shellext/devcpux/processor.rc +++ b/dll/shellext/devcpux/processor.rc @@ -24,6 +24,9 @@ #ifdef LANGUAGE_HI_IN #include "lang/hi-IN.rc" #endif +#ifdef LANGUAGE_JA_JP + #include "lang/ja-JP.rc" +#endif #ifdef LANGUAGE_PL_PL #include "lang/pl-PL.rc" #endif

1 year, 1 month

[reactos] 01/01: [DESKADP] Add Japanese (ja-JP) translation

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e2988b537a1e40648272d… commit e2988b537a1e40648272d4ed874d985b1f5d064b Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Nov 19 20:39:30 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sun Nov 19 20:39:30 2023 +0900 [DESKADP] Add Japanese (ja-JP) translation CORE-18706 --- dll/shellext/deskadp/deskadp.rc | 3 +++ dll/shellext/deskadp/lang/ja-JP.rc | 49 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+) diff --git a/dll/shellext/deskadp/deskadp.rc b/dll/shellext/deskadp/deskadp.rc index bf4c1da4601..db8d6373fd3 100644 --- a/dll/shellext/deskadp/deskadp.rc +++ b/dll/shellext/deskadp/deskadp.rc @@ -49,6 +49,9 @@ IDC_DESK_ADAPTER ICON "resources/adapter.ico" #ifdef LANGUAGE_IT_IT #include "lang/it-IT.rc" #endif +#ifdef LANGUAGE_JA_JP + #include "lang/ja-JP.rc" +#endif #ifdef LANGUAGE_NB_NO #include "lang/no-NO.rc" #endif diff --git a/dll/shellext/deskadp/lang/ja-JP.rc b/dll/shellext/deskadp/lang/ja-JP.rc new file mode 100644 index 00000000000..8f18a06385f --- /dev/null +++ b/dll/shellext/deskadp/lang/ja-JP.rc @@ -0,0 +1,49 @@ +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +IDD_DISPLAYADAPTER DIALOGEX 0, 0, 252, 226 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "アダプター" +FONT 9, "MS UI Gothic", 0, 0, 0x0 +BEGIN + GROUPBOX "アダプターの種類", -1, 7, 3, 237, 50 + ICON IDC_DESK_ADAPTER, IDC_DESK_ADAPTER, 13, 11, 21, 20, SS_ICON + LTEXT "", IDC_ADAPTERNAME, 40, 17, 190, 20, SS_NOPREFIX + PUSHBUTTON "プロパティ(&P)", IDC_ADAPTERPROPERTIES, 177, 33, 59, 14 + GROUPBOX "アダプター情報", -1, 7, 56, 237, 75 + LTEXT "チップの種類:", -1, 13, 68, 58, 8 + LTEXT "", IDC_CHIPTYPE, 77, 68, 164, 8, SS_NOPREFIX + LTEXT "DAC の種類:", -1, 13, 80, 58, 8 + LTEXT "", IDC_DACTYPE, 77, 80, 164, 8, SS_NOPREFIX + LTEXT "メモリーサイズ:", -1, 13, 92, 58, 8 + LTEXT "", IDC_MEMORYSIZE, 77, 92, 164, 8, SS_NOPREFIX + LTEXT "アダプター文字列:", -1, 13, 104, 58, 8 + LTEXT "", IDC_ADAPTERSTRING, 77, 104, 164, 8, SS_NOPREFIX + LTEXT "BIOS 情報:", -1, 13, 116, 58, 8 + LTEXT "", IDC_BIOSINFORMATION, 77, 116, 164, 8, SS_NOPREFIX + PUSHBUTTON "すべてのモードのリスト(&L)...", IDC_LISTALLMODES, 7, 139, 75, 14 +END + +IDD_LISTALLMODES DIALOGEX 0, 0, 225, 135 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME +CAPTION "すべてのモードのリスト" +FONT 9, "MS UI Gothic", 0, 0, 0x0 +BEGIN + DEFPUSHBUTTON "OK", IDOK, 112, 115, 50, 15 + PUSHBUTTON "キャンセル", IDCANCEL, 167, 115, 50, 15 + GROUPBOX "有効なモードのリスト", -1, 6, 7, 212, 98 + LISTBOX IDC_ALLVALIDMODES, 10, 20, 204, 87, LBS_NOTIFY | WS_VSCROLL +END + +STRINGTABLE +BEGIN + IDS_MODEFMT "%d by %d, %s, %s" + IDS_DEFREFRESHRATE "既定のリフレッシュ" + IDES_REFRESHRATEFMT "%d ヘルツ" + IDS_4BPP "16 色" + IDS_8BPP "256 色" + IDS_15BPP "High Color (15 ビット)" + IDS_16BPP "High Color (16 ビット)" + IDS_24BPP "True Color (24 ビット)" + IDS_32BPP "True Color (32 ビット)" + IDS_NOTAVAIL "利用不可" +END

1 year, 1 month

[reactos] 01/01: [CRYPTEXT] Add Japanese (ja-JP) translation

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4aeaf747d166949471700… commit 4aeaf747d1669494717006021b1800138db0c2e7 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Nov 19 20:34:39 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sun Nov 19 20:34:39 2023 +0900 [CRYPTEXT] Add Japanese (ja-JP) translation CORE-18706 --- dll/shellext/cryptext/cryptext.rc | 3 +++ dll/shellext/cryptext/lang/ja-JP.rc | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/dll/shellext/cryptext/cryptext.rc b/dll/shellext/cryptext/cryptext.rc index 9e2e70070da..ffc3a5df7e9 100644 --- a/dll/shellext/cryptext/cryptext.rc +++ b/dll/shellext/cryptext/cryptext.rc @@ -32,6 +32,9 @@ #ifdef LANGUAGE_IT_IT #include "lang/it-IT.rc" #endif +#ifdef LANGUAGE_JA_JP + #include "lang/ja-JP.rc" +#endif #ifdef LANGUAGE_PL_PL #include "lang/pl-PL.rc" #endif diff --git a/dll/shellext/cryptext/lang/ja-JP.rc b/dll/shellext/cryptext/lang/ja-JP.rc new file mode 100644 index 00000000000..3ee027c3726 --- /dev/null +++ b/dll/shellext/cryptext/lang/ja-JP.rc @@ -0,0 +1,7 @@ +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_INVALIDFILE "これは有効な証明書ファイルではありません。" + IDS_CER_FILE "証明書ファイル" +END

1 year, 1 month

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