Ros-diffs April 2019

ros-diffs@reactos.org

32 participants
240 discussions

[reactos] 01/01: [KERNEL32_APITEST] Forgot FreeLibrary

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e0152394262c8b61fa271… commit e0152394262c8b61fa2715691bd567eaf486f1b0 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Apr 6 13:48:05 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sat Apr 6 13:48:05 2019 +0900 [KERNEL32_APITEST] Forgot FreeLibrary --- modules/rostests/apitests/kernel32/MultiByteToWideChar.c | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/rostests/apitests/kernel32/MultiByteToWideChar.c b/modules/rostests/apitests/kernel32/MultiByteToWideChar.c index 0cb6e2215b..82e4dc6bc1 100644 --- a/modules/rostests/apitests/kernel32/MultiByteToWideChar.c +++ b/modules/rostests/apitests/kernel32/MultiByteToWideChar.c @@ -189,6 +189,7 @@ static OSVERSIONINFOW *GetRealOSVersion() return &osvi; } } + FreeLibrary(hNTDLL); } return NULL; }

5 years, 8 months

[reactos] 01/01: [KERNEL32_APITEST] Follow up of #1472

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=aa39ad97aa1295bd3f9d3… commit aa39ad97aa1295bd3f9d373f6220da5fe2a2f9d9 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Apr 6 13:34:21 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sat Apr 6 13:34:21 2019 +0900 [KERNEL32_APITEST] Follow up of #1472 --- .../apitests/kernel32/MultiByteToWideChar.c | 49 ++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/modules/rostests/apitests/kernel32/MultiByteToWideChar.c b/modules/rostests/apitests/kernel32/MultiByteToWideChar.c index 5b59acbe98..0cb6e2215b 100644 --- a/modules/rostests/apitests/kernel32/MultiByteToWideChar.c +++ b/modules/rostests/apitests/kernel32/MultiByteToWideChar.c @@ -171,9 +171,58 @@ static void TestEntry(const ENTRY *pEntry) } } +typedef NTSTATUS (WINAPI* RTLGETVERSION)(PRTL_OSVERSIONINFOW); + +static OSVERSIONINFOW *GetRealOSVersion() +{ + static OSVERSIONINFOW osvi = { 0 }; + HINSTANCE hNTDLL = LoadLibraryW(L"ntdll.dll"); + if (hNTDLL) + { + RTLGETVERSION fn; + fn = (RTLGETVERSION)GetProcAddress(hNTDLL, "RtlGetVersion"); + if (fn) + { + osvi.dwOSVersionInfoSize = sizeof(osvi); + if (fn(&osvi) == STATUS_SUCCESS) + { + return &osvi; + } + } + } + return NULL; +} + +static BOOL IsWin10Plus(void) +{ + RTL_OSVERSIONINFOW *info = GetRealOSVersion(); + if (!info) + return FALSE; + + return info->dwMajorVersion >= 10; +} + +static BOOL IsReactOS(void) +{ + WCHAR szWinDir[MAX_PATH]; + GetWindowsDirectoryW(szWinDir, _countof(szWinDir)); + return (wcsstr(szWinDir, L"ReactOS") != NULL); +} + START_TEST(MultiByteToWideChar) { size_t i; + + if (!IsWin10Plus() && !IsReactOS()) + { + trace("This test is designed for Windows 10+ and ReactOS.\n" + "It is expected to report some failures on older Windows versions.\n"); +#if 0 + skip(""); + return; +#endif + } + for (i = 0; i < _countof(Entries); ++i) { TestEntry(&Entries[i]);

5 years, 8 months

[reactos] 01/01: also add modules/AHK_Tests to .gitignore

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=da2767364ab9358b5143a… commit da2767364ab9358b5143a497db700d42e683e3d5 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Apr 6 12:05:15 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sat Apr 6 12:05:15 2019 +0900 also add modules/AHK_Tests to .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 2da1a634f8..125424b56a 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ modules/livecd_extras modules/hybridcd_extras modules/3rdparty modules/ahk_tests +modules/AHK_Tests .cproject .project .settings

5 years, 8 months

[reactos] 01/01: add modules/ahk_tests to .gitignore

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=246b691c64a8c750489fe… commit 246b691c64a8c750489fe4bbf5c6e8ae1ba6efe5 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Apr 6 11:47:25 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sat Apr 6 11:47:25 2019 +0900 add modules/ahk_tests to .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 0f4bcfc221..2da1a634f8 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ modules/bootcd_extras modules/livecd_extras modules/hybridcd_extras modules/3rdparty +modules/ahk_tests .cproject .project .settings

5 years, 8 months

[reactos] 01/01: [SHELL32] pl-PL.rc escape sequence fix

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6150baf41495848082bfb… commit 6150baf41495848082bfbda7d2004b4b20654e65 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Apr 6 11:41:08 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sat Apr 6 11:41:08 2019 +0900 [SHELL32] pl-PL.rc escape sequence fix --- dll/win32/shell32/lang/pl-PL.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/shell32/lang/pl-PL.rc b/dll/win32/shell32/lang/pl-PL.rc index f8d1b1606a..3f133a17ee 100644 --- a/dll/win32/shell32/lang/pl-PL.rc +++ b/dll/win32/shell32/lang/pl-PL.rc @@ -805,7 +805,7 @@ BEGIN /* Format Dialog Strings */ IDS_FORMAT_TITLE "Formatuj dysk lokalny" - IDS_FORMAT_WARNING "OSTRZEŻENIE: Formatowanie wymaże WSZYSTKIE dane na tym dysku.n\Naciśnij przycisk OK, aby sformatować dysk lub przycisk ANULUJ, aby pozostawić dysk bez zmian." + IDS_FORMAT_WARNING "OSTRZEŻENIE: Formatowanie wymaże WSZYSTKIE dane na tym dysku.\nNaciśnij przycisk OK, aby sformatować dysk lub przycisk ANULUJ, aby pozostawić dysk bez zmian." IDS_FORMAT_COMPLETE "Formatowanie zakończone." /* Run File dialog */

5 years, 8 months

[reactos] 01/01: [SYSSETUP] Add Lunar theme option to 2nd setup stage

by Adam Słaboń

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=21b7648f153521df903a1… commit 21b7648f153521df903a1fe1efaeebf2ebbede13 Author: Adam Słaboń <asaillen456esx(a)gmail.com> AuthorDate: Sat Apr 6 01:00:46 2019 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Apr 6 01:10:52 2019 +0200 [SYSSETUP] Add Lunar theme option to 2nd setup stage This adds Lunar theme option to the 2nd setup stage theme chooser page. --- dll/win32/syssetup/lang/bg-BG.rc | 1 + dll/win32/syssetup/lang/cs-CZ.rc | 1 + dll/win32/syssetup/lang/da-DK.rc | 1 + dll/win32/syssetup/lang/de-DE.rc | 1 + dll/win32/syssetup/lang/el-GR.rc | 1 + dll/win32/syssetup/lang/en-US.rc | 1 + dll/win32/syssetup/lang/es-ES.rc | 1 + dll/win32/syssetup/lang/et-EE.rc | 1 + dll/win32/syssetup/lang/fi-FI.rc | 1 + dll/win32/syssetup/lang/fr-FR.rc | 1 + dll/win32/syssetup/lang/he-IL.rc | 1 + dll/win32/syssetup/lang/hi-IN.rc | 1 + dll/win32/syssetup/lang/hu-HU.rc | 1 + dll/win32/syssetup/lang/id-ID.rc | 1 + dll/win32/syssetup/lang/it-IT.rc | 1 + dll/win32/syssetup/lang/ja-JP.rc | 1 + dll/win32/syssetup/lang/lt-LT.rc | 1 + dll/win32/syssetup/lang/nl-NL.rc | 1 + dll/win32/syssetup/lang/no-NO.rc | 1 + dll/win32/syssetup/lang/pl-PL.rc | 1 + dll/win32/syssetup/lang/pt-BR.rc | 1 + dll/win32/syssetup/lang/ro-RO.rc | 1 + dll/win32/syssetup/lang/ru-RU.rc | 1 + dll/win32/syssetup/lang/sk-SK.rc | 1 + dll/win32/syssetup/lang/sq-AL.rc | 1 + dll/win32/syssetup/lang/sv-SE.rc | 1 + dll/win32/syssetup/lang/th-TH.rc | 1 + dll/win32/syssetup/lang/tr-TR.rc | 1 + dll/win32/syssetup/lang/uk-UA.rc | 1 + dll/win32/syssetup/lang/zh-CN.rc | 1 + dll/win32/syssetup/lang/zh-TW.rc | 1 + dll/win32/syssetup/resource.h | 2 ++ dll/win32/syssetup/resources/thmlunar.bmp | Bin 0 -> 88074 bytes dll/win32/syssetup/syssetup.rc | 1 + dll/win32/syssetup/wizard.c | 1 + 35 files changed, 35 insertions(+) diff --git a/dll/win32/syssetup/lang/bg-BG.rc b/dll/win32/syssetup/lang/bg-BG.rc index 1ed71abcf2..3126b44d09 100644 --- a/dll/win32/syssetup/lang/bg-BG.rc +++ b/dll/win32/syssetup/lang/bg-BG.rc @@ -221,4 +221,5 @@ STRINGTABLE BEGIN IDS_CLASSIC "Classic" IDS_LAUTUS "Lautus" + IDS_LUNAR "Lunar" END diff --git a/dll/win32/syssetup/lang/cs-CZ.rc b/dll/win32/syssetup/lang/cs-CZ.rc index 341b935f05..19b168c4bd 100644 --- a/dll/win32/syssetup/lang/cs-CZ.rc +++ b/dll/win32/syssetup/lang/cs-CZ.rc @@ -227,4 +227,5 @@ STRINGTABLE BEGIN IDS_CLASSIC "Classic" IDS_LAUTUS "Lautus" + IDS_LUNAR "Lunar" END diff --git a/dll/win32/syssetup/lang/da-DK.rc b/dll/win32/syssetup/lang/da-DK.rc index be23699f38..5637c633c1 100644 --- a/dll/win32/syssetup/lang/da-DK.rc +++ b/dll/win32/syssetup/lang/da-DK.rc @@ -240,4 +240,5 @@ STRINGTABLE BEGIN IDS_CLASSIC "Classic" IDS_LAUTUS "Lautus" + IDS_LUNAR "Lunar" END diff --git a/dll/win32/syssetup/lang/de-DE.rc b/dll/win32/syssetup/lang/de-DE.rc index bc80914a8c..1799fc95e6 100644 --- a/dll/win32/syssetup/lang/de-DE.rc +++ b/dll/win32/syssetup/lang/de-DE.rc @@ -221,4 +221,5 @@ STRINGTABLE BEGIN IDS_CLASSIC "Classic" IDS_LAUTUS "Lautus" + IDS_LUNAR "Lunar" END diff --git a/dll/win32/syssetup/lang/el-GR.rc b/dll/win32/syssetup/lang/el-GR.rc index 99b5f706d3..d36cb5e023 100644 --- a/dll/win32/syssetup/lang/el-GR.rc +++ b/dll/win32/syssetup/lang/el-GR.rc @@ -221,4 +221,5 @@ STRINGTABLE BEGIN IDS_CLASSIC "Classic" IDS_LAUTUS "Lautus" + IDS_LUNAR "Lunar" END diff --git a/dll/win32/syssetup/lang/en-US.rc b/dll/win32/syssetup/lang/en-US.rc index 531dd8fa3e..89063f42a8 100644 --- a/dll/win32/syssetup/lang/en-US.rc +++ b/dll/win32/syssetup/lang/en-US.rc @@ -241,4 +241,5 @@ STRINGTABLE BEGIN IDS_CLASSIC "Classic" IDS_LAUTUS "Lautus" + IDS_LUNAR "Lunar" END diff --git a/dll/win32/syssetup/lang/es-ES.rc b/dll/win32/syssetup/lang/es-ES.rc index 52c8141536..67434c92df 100644 --- a/dll/win32/syssetup/lang/es-ES.rc +++ b/dll/win32/syssetup/lang/es-ES.rc @@ -229,4 +229,5 @@ STRINGTABLE BEGIN IDS_CLASSIC "Classic" IDS_LAUTUS "Lautus" + IDS_LUNAR "Lunar" END diff --git a/dll/win32/syssetup/lang/et-EE.rc b/dll/win32/syssetup/lang/et-EE.rc index a65e9fa2b2..869d392698 100644 --- a/dll/win32/syssetup/lang/et-EE.rc +++ b/dll/win32/syssetup/lang/et-EE.rc @@ -221,4 +221,5 @@ STRINGTABLE BEGIN IDS_CLASSIC "Classic" IDS_LAUTUS "Lautus" + IDS_LUNAR "Lunar" END diff --git a/dll/win32/syssetup/lang/fi-FI.rc b/dll/win32/syssetup/lang/fi-FI.rc index fa3b9569c2..8fa4fdb16b 100644 --- a/dll/win32/syssetup/lang/fi-FI.rc +++ b/dll/win32/syssetup/lang/fi-FI.rc @@ -240,4 +240,5 @@ STRINGTABLE BEGIN IDS_CLASSIC "Classic" IDS_LAUTUS "Lautus" + IDS_LUNAR "Lunar" END diff --git a/dll/win32/syssetup/lang/fr-FR.rc b/dll/win32/syssetup/lang/fr-FR.rc index c60e249083..3c63f52646 100644 --- a/dll/win32/syssetup/lang/fr-FR.rc +++ b/dll/win32/syssetup/lang/fr-FR.rc @@ -221,4 +221,5 @@ STRINGTABLE BEGIN IDS_CLASSIC "Classic" IDS_LAUTUS "Lautus" + IDS_LUNAR "Lunar" END diff --git a/dll/win32/syssetup/lang/he-IL.rc b/dll/win32/syssetup/lang/he-IL.rc index c62d47b2a0..23b21f1910 100644 --- a/dll/win32/syssetup/lang/he-IL.rc +++ b/dll/win32/syssetup/lang/he-IL.rc @@ -221,4 +221,5 @@ STRINGTABLE BEGIN IDS_CLASSIC "Classic" IDS_LAUTUS "Lautus" + IDS_LUNAR "Lunar" END diff --git a/dll/win32/syssetup/lang/hi-IN.rc b/dll/win32/syssetup/lang/hi-IN.rc index 65a1be8532..8ff1a8f965 100644 --- a/dll/win32/syssetup/lang/hi-IN.rc +++ b/dll/win32/syssetup/lang/hi-IN.rc @@ -229,4 +229,5 @@ STRINGTABLE BEGIN IDS_CLASSIC "Classic" IDS_LAUTUS "Lautus" + IDS_LUNAR "Lunar" END diff --git a/dll/win32/syssetup/lang/hu-HU.rc b/dll/win32/syssetup/lang/hu-HU.rc index 323f818234..7c6ede2ab4 100644 --- a/dll/win32/syssetup/lang/hu-HU.rc +++ b/dll/win32/syssetup/lang/hu-HU.rc @@ -221,4 +221,5 @@ STRINGTABLE BEGIN IDS_CLASSIC "Classic" IDS_LAUTUS "Lautus" + IDS_LUNAR "Lunar" END diff --git a/dll/win32/syssetup/lang/id-ID.rc b/dll/win32/syssetup/lang/id-ID.rc index d6cfa7337b..67817b8a3d 100644 --- a/dll/win32/syssetup/lang/id-ID.rc +++ b/dll/win32/syssetup/lang/id-ID.rc @@ -221,4 +221,5 @@ STRINGTABLE BEGIN IDS_CLASSIC "Classic" IDS_LAUTUS "Lautus" + IDS_LUNAR "Lunar" END diff --git a/dll/win32/syssetup/lang/it-IT.rc b/dll/win32/syssetup/lang/it-IT.rc index 9e999a0ae0..42245fa4d3 100644 --- a/dll/win32/syssetup/lang/it-IT.rc +++ b/dll/win32/syssetup/lang/it-IT.rc @@ -221,4 +221,5 @@ STRINGTABLE BEGIN IDS_CLASSIC "Classic" IDS_LAUTUS "Lautus" + IDS_LUNAR "Lunar" END diff --git a/dll/win32/syssetup/lang/ja-JP.rc b/dll/win32/syssetup/lang/ja-JP.rc index 3ef3bec17c..c97f23cb63 100644 --- a/dll/win32/syssetup/lang/ja-JP.rc +++ b/dll/win32/syssetup/lang/ja-JP.rc @@ -221,4 +221,5 @@ STRINGTABLE BEGIN IDS_CLASSIC "Classic" IDS_LAUTUS "Lautus" + IDS_LUNAR "Lunar" END diff --git a/dll/win32/syssetup/lang/lt-LT.rc b/dll/win32/syssetup/lang/lt-LT.rc index 817a01bd61..746edf2f92 100644 --- a/dll/win32/syssetup/lang/lt-LT.rc +++ b/dll/win32/syssetup/lang/lt-LT.rc @@ -240,4 +240,5 @@ STRINGTABLE BEGIN IDS_CLASSIC "Classic" IDS_LAUTUS "Lautus" + IDS_LUNAR "Lunar" END diff --git a/dll/win32/syssetup/lang/nl-NL.rc b/dll/win32/syssetup/lang/nl-NL.rc index 57f7aea1dc..4a102aba64 100644 --- a/dll/win32/syssetup/lang/nl-NL.rc +++ b/dll/win32/syssetup/lang/nl-NL.rc @@ -221,4 +221,5 @@ STRINGTABLE BEGIN IDS_CLASSIC "Classic" IDS_LAUTUS "Lautus" + IDS_LUNAR "Lunar" END diff --git a/dll/win32/syssetup/lang/no-NO.rc b/dll/win32/syssetup/lang/no-NO.rc index 0d2ce42677..308ff05f31 100644 --- a/dll/win32/syssetup/lang/no-NO.rc +++ b/dll/win32/syssetup/lang/no-NO.rc @@ -221,4 +221,5 @@ STRINGTABLE BEGIN IDS_CLASSIC "Classic" IDS_LAUTUS "Lautus" + IDS_LUNAR "Lunar" END diff --git a/dll/win32/syssetup/lang/pl-PL.rc b/dll/win32/syssetup/lang/pl-PL.rc index e942a82d61..444fa20182 100644 --- a/dll/win32/syssetup/lang/pl-PL.rc +++ b/dll/win32/syssetup/lang/pl-PL.rc @@ -221,4 +221,5 @@ STRINGTABLE BEGIN IDS_CLASSIC "Classic" IDS_LAUTUS "Lautus" + IDS_LUNAR "Lunar" END diff --git a/dll/win32/syssetup/lang/pt-BR.rc b/dll/win32/syssetup/lang/pt-BR.rc index 9857df3dea..f05f86df16 100644 --- a/dll/win32/syssetup/lang/pt-BR.rc +++ b/dll/win32/syssetup/lang/pt-BR.rc @@ -221,4 +221,5 @@ STRINGTABLE BEGIN IDS_CLASSIC "Classic" IDS_LAUTUS "Lautus" + IDS_LUNAR "Lunar" END diff --git a/dll/win32/syssetup/lang/ro-RO.rc b/dll/win32/syssetup/lang/ro-RO.rc index d7f82b3f16..28f3dcdd7c 100644 --- a/dll/win32/syssetup/lang/ro-RO.rc +++ b/dll/win32/syssetup/lang/ro-RO.rc @@ -230,4 +230,5 @@ STRINGTABLE BEGIN IDS_CLASSIC "Classic" IDS_LAUTUS "Lautus" + IDS_LUNAR "Lunar" END diff --git a/dll/win32/syssetup/lang/ru-RU.rc b/dll/win32/syssetup/lang/ru-RU.rc index a2cd4fde35..85a6e68206 100644 --- a/dll/win32/syssetup/lang/ru-RU.rc +++ b/dll/win32/syssetup/lang/ru-RU.rc @@ -223,4 +223,5 @@ STRINGTABLE BEGIN IDS_CLASSIC "Classic" IDS_LAUTUS "Lautus" + IDS_LUNAR "Lunar" END diff --git a/dll/win32/syssetup/lang/sk-SK.rc b/dll/win32/syssetup/lang/sk-SK.rc index 1f6198f969..6e05e47811 100644 --- a/dll/win32/syssetup/lang/sk-SK.rc +++ b/dll/win32/syssetup/lang/sk-SK.rc @@ -227,4 +227,5 @@ STRINGTABLE BEGIN IDS_CLASSIC "Classic" IDS_LAUTUS "Lautus" + IDS_LUNAR "Lunar" END diff --git a/dll/win32/syssetup/lang/sq-AL.rc b/dll/win32/syssetup/lang/sq-AL.rc index 60fbbbd3c6..a3c978732b 100644 --- a/dll/win32/syssetup/lang/sq-AL.rc +++ b/dll/win32/syssetup/lang/sq-AL.rc @@ -240,4 +240,5 @@ STRINGTABLE BEGIN IDS_CLASSIC "Classic" IDS_LAUTUS "Lautus" + IDS_LUNAR "Lunar" END diff --git a/dll/win32/syssetup/lang/sv-SE.rc b/dll/win32/syssetup/lang/sv-SE.rc index a1609d3007..fbeb8789c4 100644 --- a/dll/win32/syssetup/lang/sv-SE.rc +++ b/dll/win32/syssetup/lang/sv-SE.rc @@ -240,4 +240,5 @@ STRINGTABLE BEGIN IDS_CLASSIC "Classic" IDS_LAUTUS "Lautus" + IDS_LUNAR "Lunar" END diff --git a/dll/win32/syssetup/lang/th-TH.rc b/dll/win32/syssetup/lang/th-TH.rc index 5ae89a6edb..f4a44348eb 100644 --- a/dll/win32/syssetup/lang/th-TH.rc +++ b/dll/win32/syssetup/lang/th-TH.rc @@ -240,4 +240,5 @@ STRINGTABLE BEGIN IDS_CLASSIC "Classic" IDS_LAUTUS "Lautus" + IDS_LUNAR "Lunar" END diff --git a/dll/win32/syssetup/lang/tr-TR.rc b/dll/win32/syssetup/lang/tr-TR.rc index ee17829e90..43b8930a31 100644 --- a/dll/win32/syssetup/lang/tr-TR.rc +++ b/dll/win32/syssetup/lang/tr-TR.rc @@ -223,4 +223,5 @@ STRINGTABLE BEGIN IDS_CLASSIC "Classic" IDS_LAUTUS "Lautus" + IDS_LUNAR "Lunar" END diff --git a/dll/win32/syssetup/lang/uk-UA.rc b/dll/win32/syssetup/lang/uk-UA.rc index 0c9ffb6f65..d92fbdd4f8 100644 --- a/dll/win32/syssetup/lang/uk-UA.rc +++ b/dll/win32/syssetup/lang/uk-UA.rc @@ -229,4 +229,5 @@ STRINGTABLE BEGIN IDS_CLASSIC "Classic" IDS_LAUTUS "Lautus" + IDS_LUNAR "Lunar" END diff --git a/dll/win32/syssetup/lang/zh-CN.rc b/dll/win32/syssetup/lang/zh-CN.rc index 515e594111..e2adecc3fd 100644 --- a/dll/win32/syssetup/lang/zh-CN.rc +++ b/dll/win32/syssetup/lang/zh-CN.rc @@ -226,4 +226,5 @@ STRINGTABLE BEGIN IDS_CLASSIC "Classic" IDS_LAUTUS "Lautus" + IDS_LUNAR "Lunar" END diff --git a/dll/win32/syssetup/lang/zh-TW.rc b/dll/win32/syssetup/lang/zh-TW.rc index 6da4da4437..39a6148f3e 100644 --- a/dll/win32/syssetup/lang/zh-TW.rc +++ b/dll/win32/syssetup/lang/zh-TW.rc @@ -248,4 +248,5 @@ STRINGTABLE BEGIN IDS_CLASSIC "Classic" IDS_LAUTUS "Lautus" + IDS_LUNAR "Lunar" END diff --git a/dll/win32/syssetup/resource.h b/dll/win32/syssetup/resource.h index 030a5c2eed..2578f5ccda 100644 --- a/dll/win32/syssetup/resource.h +++ b/dll/win32/syssetup/resource.h @@ -22,6 +22,7 @@ #define IDB_HEADER 101 #define IDB_CLASSIC 102 #define IDB_LAUTUS 103 +#define IDB_LUNAR 104 #define IDI_ICON1 10 #define IDI_ICON2 11 @@ -141,5 +142,6 @@ #define IDS_CLASSIC 3800 #define IDS_LAUTUS 3801 +#define IDS_LUNAR 3802 #define IDR_GPL 4000 diff --git a/dll/win32/syssetup/resources/thmlunar.bmp b/dll/win32/syssetup/resources/thmlunar.bmp new file mode 100644 index 0000000000..bd4358f209 Binary files /dev/null and b/dll/win32/syssetup/resources/thmlunar.bmp differ diff --git a/dll/win32/syssetup/syssetup.rc b/dll/win32/syssetup/syssetup.rc index 800d4d2ce6..57137d8ef1 100644 --- a/dll/win32/syssetup/syssetup.rc +++ b/dll/win32/syssetup/syssetup.rc @@ -20,6 +20,7 @@ IDB_WATERMARK BITMAP "resources/watermark.bmp" IDB_HEADER BITMAP "resources/header.bmp" IDB_CLASSIC BITMAP "resources/thmclassic.bmp" IDB_LAUTUS BITMAP "resources/thmlautus.bmp" +IDB_LUNAR BITMAP "resources/thmlunar.bmp" IDI_ICON1 ICON "resources/1.ico" IDI_ICON2 ICON "resources/2.ico" diff --git a/dll/win32/syssetup/wizard.c b/dll/win32/syssetup/wizard.c index 5255b82a0c..45f1394781 100644 --- a/dll/win32/syssetup/wizard.c +++ b/dll/win32/syssetup/wizard.c @@ -1602,6 +1602,7 @@ static struct ThemeInfo } Themes[] = { { MAKEINTRESOURCE(IDB_CLASSIC), IDS_CLASSIC, NULL }, { MAKEINTRESOURCE(IDB_LAUTUS), IDS_LAUTUS, L"themes\\lautus\\lautus.msstyles" }, + { MAKEINTRESOURCE(IDB_LUNAR), IDS_LUNAR, L"themes\\lunar\\lunar.msstyles" }, }; static INT_PTR CALLBACK

5 years, 8 months

[reactos] 01/01: [NET][MC] Replace strings for the ACCOUNTS, GROUP and LOCALGROUP commands by netmsg.dll messages.

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9f95e35ff3e8769233d7d… commit 9f95e35ff3e8769233d7d4567231fb7f71b936cf Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Fri Apr 5 23:14:07 2019 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Fri Apr 5 23:15:32 2019 +0200 [NET][MC] Replace strings for the ACCOUNTS, GROUP and LOCALGROUP commands by netmsg.dll messages. --- base/applications/network/net/cmdAccounts.c | 16 ++--- base/applications/network/net/cmdGroup.c | 12 ++-- base/applications/network/net/cmdLocalGroup.c | 12 ++-- base/applications/network/net/lang/en-US.rc | 18 ----- base/applications/network/net/lang/es-ES.rc | 18 ----- base/applications/network/net/lang/pl-PL.rc | 18 ----- base/applications/network/net/lang/ro-RO.rc | 18 ----- base/applications/network/net/lang/ru-RU.rc | 18 ----- base/applications/network/net/lang/tr-TR.rc | 18 ----- base/applications/network/net/lang/zh-CN.rc | 18 ----- base/applications/network/net/lang/zh-TW.rc | 18 ----- base/applications/network/net/main.c | 78 ++++++++++++++++++++++ base/applications/network/net/net.h | 14 ++++ base/applications/network/net/resource.h | 18 ----- sdk/include/reactos/mc/netmsgmsg.mc | 96 +++++++++++++-------------- 15 files changed, 160 insertions(+), 230 deletions(-) diff --git a/base/applications/network/net/cmdAccounts.c b/base/applications/network/net/cmdAccounts.c index d04bc48f4f..8c940f0326 100644 --- a/base/applications/network/net/cmdAccounts.c +++ b/base/applications/network/net/cmdAccounts.c @@ -179,36 +179,36 @@ cmdAccounts( ConResPrintf(StdOut, IDS_ACCOUNTS_LOGOFF_SECONDS, Info0->usrmod0_force_logoff); ConPuts(StdOut, L"\n"); - PrintPaddedResourceString(IDS_ACCOUNTS_MIN_PW_AGE, nPaddedLength); + PrintPaddedMessageString(4572, nPaddedLength); ConPrintf(StdOut, L"%lu\n", Info0->usrmod0_min_passwd_age / 86400); - PrintPaddedResourceString(IDS_ACCOUNTS_MAX_PW_AGE, nPaddedLength); + PrintPaddedMessageString(4573, nPaddedLength); ConPrintf(StdOut, L"%lu\n", Info0->usrmod0_max_passwd_age / 86400); - PrintPaddedResourceString(IDS_ACCOUNTS_MIN_PW_LENGTH, nPaddedLength); + PrintPaddedMessageString(4574, nPaddedLength); ConPrintf(StdOut, L"%lu\n", Info0->usrmod0_min_passwd_len); - PrintPaddedResourceString(IDS_ACCOUNTS_PW_HIST_LENGTH, nPaddedLength); + PrintPaddedMessageString(4575, nPaddedLength); if (Info0->usrmod0_password_hist_len == 0) ConResPuts(StdOut, IDS_GENERIC_NONE); else ConPrintf(StdOut, L"%lu", Info0->usrmod0_password_hist_len); ConPuts(StdOut, L"\n"); - PrintPaddedResourceString(IDS_ACCOUNTS_LOCKOUT_THRESHOLD, nPaddedLength); + PrintPaddedMessageString(4578, nPaddedLength); if (Info3->usrmod3_lockout_threshold == 0) ConResPuts(StdOut, IDS_GENERIC_NEVER); else ConPrintf(StdOut, L"%lu", Info3->usrmod3_lockout_threshold); ConPuts(StdOut, L"\n"); - PrintPaddedResourceString(IDS_ACCOUNTS_LOCKOUT_DURATION, nPaddedLength); + PrintPaddedMessageString(4579, nPaddedLength); ConPrintf(StdOut, L"%lu\n", Info3->usrmod3_lockout_duration / 60); - PrintPaddedResourceString(IDS_ACCOUNTS_LOCKOUT_WINDOW, nPaddedLength); + PrintPaddedMessageString(4580, nPaddedLength); ConPrintf(StdOut, L"%lu\n", Info3->usrmod3_lockout_observation_window / 60); - PrintPaddedResourceString(IDS_ACCOUNTS_COMPUTER_ROLE, nPaddedLength); + PrintPaddedMessageString(4576, nPaddedLength); if (Info1->usrmod1_role == UAS_ROLE_PRIMARY) { if (ProductType == NtProductLanManNt) diff --git a/base/applications/network/net/cmdGroup.c b/base/applications/network/net/cmdGroup.c index 919e9ddeae..b5bf316f22 100644 --- a/base/applications/network/net/cmdGroup.c +++ b/base/applications/network/net/cmdGroup.c @@ -36,8 +36,8 @@ EnumerateGroups(VOID) return Status; ConPuts(StdOut, L"\n"); - ConResPrintf(StdOut, IDS_GROUP_GROUPS, pServer->sv100_name); - ConPuts(StdOut, L"\n\n"); + PrintMessageStringV(4400, pServer->sv100_name); + ConPuts(StdOut, L"\n"); PrintPadding(L'-', 79); ConPuts(StdOut, L"\n"); @@ -116,16 +116,16 @@ DisplayGroup(LPWSTR lpGroupName) pNames[i] = pUsers[i].grui0_name; } - PrintPaddedResourceString(IDS_GROUP_NAME, nPaddedLength); + PrintPaddedMessageString(4401, nPaddedLength); ConPrintf(StdOut, L"%s\n", pGroupInfo->grpi1_name); - PrintPaddedResourceString(IDS_GROUP_COMMENT, nPaddedLength); + PrintPaddedMessageString(4402, nPaddedLength); ConPrintf(StdOut, L"%s\n", pGroupInfo->grpi1_comment); ConPuts(StdOut, L"\n"); - ConResPuts(StdOut, IDS_GROUP_MEMBERS); - ConPuts(StdOut, L"\n\n"); + PrintMessageString(4403); + ConPuts(StdOut, L"\n"); PrintPadding(L'-', 79); ConPuts(StdOut, L"\n"); diff --git a/base/applications/network/net/cmdLocalGroup.c b/base/applications/network/net/cmdLocalGroup.c index 673c9a683d..bd6647c63a 100644 --- a/base/applications/network/net/cmdLocalGroup.c +++ b/base/applications/network/net/cmdLocalGroup.c @@ -39,8 +39,8 @@ EnumerateLocalGroups(VOID) return Status; ConPuts(StdOut, L"\n"); - ConResPrintf(StdOut, IDS_LOCALGROUP_ALIASES, pServer->sv100_name); - ConPuts(StdOut, L"\n\n"); + PrintMessageStringV(4405, pServer->sv100_name); + ConPuts(StdOut, L"\n"); PrintPadding(L'-', 79); ConPuts(StdOut, L"\n"); @@ -131,16 +131,16 @@ DisplayLocalGroup(LPWSTR lpGroupName) pNames[i] = pMembers[i].lgrmi3_domainandname; } - PrintPaddedResourceString(IDS_LOCALGROUP_ALIAS_NAME, nPaddedLength); + PrintPaddedMessageString(4406, nPaddedLength); ConPrintf(StdOut, L"%s\n", pGroupInfo->lgrpi1_name); - PrintPaddedResourceString(IDS_LOCALGROUP_COMMENT, nPaddedLength); + PrintPaddedMessageString(4407, nPaddedLength); ConPrintf(StdOut, L"%s\n", pGroupInfo->lgrpi1_comment); ConPuts(StdOut, L"\n"); - ConResPuts(StdOut, IDS_LOCALGROUP_MEMBERS); - ConPuts(StdOut, L"\n\n"); + PrintMessageString(4408); + ConPuts(StdOut, L"\n"); PrintPadding(L'-', 79); ConPuts(StdOut, L"\n"); diff --git a/base/applications/network/net/lang/en-US.rc b/base/applications/network/net/lang/en-US.rc index 18b5ca746b..5cd4930a7c 100644 --- a/base/applications/network/net/lang/en-US.rc +++ b/base/applications/network/net/lang/en-US.rc @@ -4,14 +4,6 @@ STRINGTABLE BEGIN IDS_ACCOUNTS_FORCE_LOGOFF "Force logoff after" IDS_ACCOUNTS_LOGOFF_SECONDS "%lu seconds" - IDS_ACCOUNTS_MIN_PW_AGE "Minimum password age (in days)" - IDS_ACCOUNTS_MAX_PW_AGE "Maximum password age (in days)" - IDS_ACCOUNTS_MIN_PW_LENGTH "Minimum password length" - IDS_ACCOUNTS_PW_HIST_LENGTH "Password history length" - IDS_ACCOUNTS_LOCKOUT_THRESHOLD "Lockout threshold" - IDS_ACCOUNTS_LOCKOUT_DURATION "Lockout duration (in minutes)" - IDS_ACCOUNTS_LOCKOUT_WINDOW "Lockout observation window (in minutes)" - IDS_ACCOUNTS_COMPUTER_ROLE "Computer role" IDS_ACCOUNTS_PRIMARY_SERVER "Primary server" IDS_ACCOUNTS_BACKUP_SERVER "Backup server" IDS_ACCOUNTS_STANDALONE_SERVER "Standalone server" @@ -35,16 +27,6 @@ BEGIN IDS_CONFIG_WORKSTATION_DOMAIN "Workstation domain" IDS_CONFIG_WORKSTATION_LOGON "Logon domain" - IDS_GROUP_GROUPS "Group Accounts for \\\\%s" - IDS_GROUP_NAME "Group name" - IDS_GROUP_COMMENT "Comment" - IDS_GROUP_MEMBERS "Members" - - IDS_LOCALGROUP_ALIASES "Aliases for \\\\%s" - IDS_LOCALGROUP_ALIAS_NAME "Alias name" - IDS_LOCALGROUP_COMMENT "Comment" - IDS_LOCALGROUP_MEMBERS "Members" - IDS_STATISTICS_TEXT "Statistics are available for the following services:\n\n\ Server\n Workstation\n\n" IDS_STATISTICS_SINCE "Statistics since %d/%d/%d %d:%02d %s\n\n\n" diff --git a/base/applications/network/net/lang/es-ES.rc b/base/applications/network/net/lang/es-ES.rc index 9e802f3d38..fffe8f175a 100644 --- a/base/applications/network/net/lang/es-ES.rc +++ b/base/applications/network/net/lang/es-ES.rc @@ -7,14 +7,6 @@ STRINGTABLE BEGIN IDS_ACCOUNTS_FORCE_LOGOFF "Forzar cierre de sesión tras" IDS_ACCOUNTS_LOGOFF_SECONDS "%lu segundos" - IDS_ACCOUNTS_MIN_PW_AGE "Validez mínima de contraseña (en días)" - IDS_ACCOUNTS_MAX_PW_AGE "Validez máxima de contraseña (en días)" - IDS_ACCOUNTS_MIN_PW_LENGTH "Tamaño mínimo de contraseña" - IDS_ACCOUNTS_PW_HIST_LENGTH "Duración del historial de contraseñas" - IDS_ACCOUNTS_LOCKOUT_THRESHOLD "Umbral de bloqueo" - IDS_ACCOUNTS_LOCKOUT_DURATION "Duración del bloqueo (en minutos)" - IDS_ACCOUNTS_LOCKOUT_WINDOW "Ventana de cumpl. de bloqueo (en minutos)" - IDS_ACCOUNTS_COMPUTER_ROLE "Rol del equipo" IDS_ACCOUNTS_PRIMARY_SERVER "Servidor primario" IDS_ACCOUNTS_BACKUP_SERVER "Servidor de respaldo" IDS_ACCOUNTS_STANDALONE_SERVER "Servidor independiente" @@ -38,16 +30,6 @@ BEGIN IDS_CONFIG_WORKSTATION_DOMAIN "Workstation domain" IDS_CONFIG_WORKSTATION_LOGON "Logon domain" - IDS_GROUP_GROUPS "Group Accounts for \\\\%s" - IDS_GROUP_NAME "Group name" - IDS_GROUP_COMMENT "Comment" - IDS_GROUP_MEMBERS "Members" - - IDS_LOCALGROUP_ALIASES "Alias de \\\\%s" - IDS_LOCALGROUP_ALIAS_NAME "Nombre del alias" - IDS_LOCALGROUP_COMMENT "Comentario" - IDS_LOCALGROUP_MEMBERS "Miembros" - IDS_STATISTICS_TEXT "Statistics are available for the following services:\n\n\ Server\n Workstation\n\n" IDS_STATISTICS_SINCE "Statistics since %d/%d/%d %d:%02d %s\n\n\n" diff --git a/base/applications/network/net/lang/pl-PL.rc b/base/applications/network/net/lang/pl-PL.rc index 7fe511779c..9bbbcd672c 100644 --- a/base/applications/network/net/lang/pl-PL.rc +++ b/base/applications/network/net/lang/pl-PL.rc @@ -3,14 +3,6 @@ STRINGTABLE BEGIN IDS_ACCOUNTS_FORCE_LOGOFF "Wymuś wylogowanie po upływie" IDS_ACCOUNTS_LOGOFF_SECONDS "%lu sekund" - IDS_ACCOUNTS_MIN_PW_AGE "Minimalny okres ważności hasła (dni)" - IDS_ACCOUNTS_MAX_PW_AGE "Maksymalny okres ważności hasła (dni)" - IDS_ACCOUNTS_MIN_PW_LENGTH "Minimalna długość hasła" - IDS_ACCOUNTS_PW_HIST_LENGTH "Długość zapamiętywanej historii haseł" - IDS_ACCOUNTS_LOCKOUT_THRESHOLD "Próg blokady" - IDS_ACCOUNTS_LOCKOUT_DURATION "Czas trwania blokady (minuty)" - IDS_ACCOUNTS_LOCKOUT_WINDOW "Okno obserwowania blokady (minuty)" - IDS_ACCOUNTS_COMPUTER_ROLE "Rola komputera" IDS_ACCOUNTS_PRIMARY_SERVER "Serwer podstawowy" IDS_ACCOUNTS_BACKUP_SERVER "Serwer zapasowy" IDS_ACCOUNTS_STANDALONE_SERVER "Serwer autonomiczny" @@ -34,16 +26,6 @@ BEGIN IDS_CONFIG_WORKSTATION_DOMAIN "Domena stacji roboczej" IDS_CONFIG_WORKSTATION_LOGON "Domena logowania" - IDS_GROUP_GROUPS "Konta grupowe dla \\\\%s" - IDS_GROUP_NAME "Nazwa grupy" - IDS_GROUP_COMMENT "Komentarz" - IDS_GROUP_MEMBERS "Członkowie" - - IDS_LOCALGROUP_ALIASES "Aliasy dla \\\\%s" - IDS_LOCALGROUP_ALIAS_NAME "Nazwa aliasu" - IDS_LOCALGROUP_COMMENT "Komentarz" - IDS_LOCALGROUP_MEMBERS "Członkowie" - IDS_STATISTICS_TEXT "Dostępne są statystyki dla następujących uruchomionych obecnie usług:\n\n\ Serwer\n Stacja robocza\n\n" IDS_STATISTICS_SINCE "Statystyka od %d/%d/%d %d:%02d %s\n\n\n" diff --git a/base/applications/network/net/lang/ro-RO.rc b/base/applications/network/net/lang/ro-RO.rc index 61328729ce..e1399d65c5 100644 --- a/base/applications/network/net/lang/ro-RO.rc +++ b/base/applications/network/net/lang/ro-RO.rc @@ -10,14 +10,6 @@ STRINGTABLE BEGIN IDS_ACCOUNTS_FORCE_LOGOFF "Forțează deautentificarea după" IDS_ACCOUNTS_LOGOFF_SECONDS "%lu secunde" - IDS_ACCOUNTS_MIN_PW_AGE "Vârsta minimă a parolei (în zile)" - IDS_ACCOUNTS_MAX_PW_AGE "Vârsta maximă a parolei (în zile)" - IDS_ACCOUNTS_MIN_PW_LENGTH "Lungimea minimă a parolei" - IDS_ACCOUNTS_PW_HIST_LENGTH "Lungimea istoricului parolei" - IDS_ACCOUNTS_LOCKOUT_THRESHOLD "Pragul de blocare" - IDS_ACCOUNTS_LOCKOUT_DURATION "Durata de blocare (în minute)" - IDS_ACCOUNTS_LOCKOUT_WINDOW "Fereastra de observare a blocării (în minute)" - IDS_ACCOUNTS_COMPUTER_ROLE "Rolul calculatorului" IDS_ACCOUNTS_PRIMARY_SERVER "Server primar" IDS_ACCOUNTS_BACKUP_SERVER "Server de rezervă" IDS_ACCOUNTS_STANDALONE_SERVER "Server de sine stătător" @@ -41,16 +33,6 @@ BEGIN IDS_CONFIG_WORKSTATION_DOMAIN "Domeniu de calculator" IDS_CONFIG_WORKSTATION_LOGON "Domeniu de autentificare" - IDS_GROUP_GROUPS "Conturile de grup pentru \\\\%s" - IDS_GROUP_NAME "Nume de grup" - IDS_GROUP_COMMENT "Comentariu" - IDS_GROUP_MEMBERS "Membri" - - IDS_LOCALGROUP_ALIASES "Alias pentru \\\\%s" - IDS_LOCALGROUP_ALIAS_NAME "Nume alias" - IDS_LOCALGROUP_COMMENT "Comentariu" - IDS_LOCALGROUP_MEMBERS "Membri" - IDS_STATISTICS_TEXT "Statistici disponibile pentru următoarele servicii:\n\n\ Server\n Stație de lucru\n\n" IDS_STATISTICS_SINCE "Statistici începând din %d/%d/%d %d:%02d %s\n\n\n" diff --git a/base/applications/network/net/lang/ru-RU.rc b/base/applications/network/net/lang/ru-RU.rc index 70b4dd777b..798df63c0f 100644 --- a/base/applications/network/net/lang/ru-RU.rc +++ b/base/applications/network/net/lang/ru-RU.rc @@ -6,14 +6,6 @@ STRINGTABLE BEGIN IDS_ACCOUNTS_FORCE_LOGOFF "Принудительный выход через" IDS_ACCOUNTS_LOGOFF_SECONDS "%lu секунд" - IDS_ACCOUNTS_MIN_PW_AGE "Минимальный срок действия пароля (дней)" - IDS_ACCOUNTS_MAX_PW_AGE "Максимальный срок действия пароля (дней)" - IDS_ACCOUNTS_MIN_PW_LENGTH "Минимальная длина пароля" - IDS_ACCOUNTS_PW_HIST_LENGTH "Длина истории паролей" - IDS_ACCOUNTS_LOCKOUT_THRESHOLD "Блокировка после ошибок ввода пароля" - IDS_ACCOUNTS_LOCKOUT_DURATION "Длительность блокировки (минут)" - IDS_ACCOUNTS_LOCKOUT_WINDOW "Сброс счетчика блокировок через (минут)" - IDS_ACCOUNTS_COMPUTER_ROLE "Роль компьютера" IDS_ACCOUNTS_PRIMARY_SERVER "Основной сервер" IDS_ACCOUNTS_BACKUP_SERVER "Резервный сервер" IDS_ACCOUNTS_STANDALONE_SERVER "Автономный сервер" @@ -37,16 +29,6 @@ BEGIN IDS_CONFIG_WORKSTATION_DOMAIN "Домен рабочей станции" IDS_CONFIG_WORKSTATION_LOGON "Домен входа" - IDS_GROUP_GROUPS "Учетные записи групп для \\\\%s" - IDS_GROUP_NAME "Имя группы" - IDS_GROUP_COMMENT "Комментарий" - IDS_GROUP_MEMBERS "Члены" - - IDS_LOCALGROUP_ALIASES "Псевдонимы для \\\\%s" - IDS_LOCALGROUP_ALIAS_NAME "Имя псевдонима" - IDS_LOCALGROUP_COMMENT "Комментарий" - IDS_LOCALGROUP_MEMBERS "Члены" - IDS_STATISTICS_TEXT "Статистика доступна для следующих выполняющихся служб:\n\n\ Сервер\n Рабочая станция\n\n" IDS_STATISTICS_SINCE "Статистика после %d/%d/%d %d:%02d %s\n\n\n" diff --git a/base/applications/network/net/lang/tr-TR.rc b/base/applications/network/net/lang/tr-TR.rc index 5c001e5429..17ca953bfd 100644 --- a/base/applications/network/net/lang/tr-TR.rc +++ b/base/applications/network/net/lang/tr-TR.rc @@ -6,14 +6,6 @@ STRINGTABLE BEGIN IDS_ACCOUNTS_FORCE_LOGOFF "Sonra oturum kapatmaya zorla" IDS_ACCOUNTS_LOGOFF_SECONDS "%lu sâniye" - IDS_ACCOUNTS_MIN_PW_AGE "En az şifre yaşı (gün)" - IDS_ACCOUNTS_MAX_PW_AGE "En çok şifre yaşı (gün)" - IDS_ACCOUNTS_MIN_PW_LENGTH "En az şifre uzunluğu" - IDS_ACCOUNTS_PW_HIST_LENGTH "Şifre geçmişi uzunluğu" - IDS_ACCOUNTS_LOCKOUT_THRESHOLD "Kilitleme başlangıcı" - IDS_ACCOUNTS_LOCKOUT_DURATION "Kilitleme süresi (dakîka)" - IDS_ACCOUNTS_LOCKOUT_WINDOW "Kilitleme gözlem penceresi (dakîka)" - IDS_ACCOUNTS_COMPUTER_ROLE "Bilgisayar görevi" IDS_ACCOUNTS_PRIMARY_SERVER "Birinci sunucu" IDS_ACCOUNTS_BACKUP_SERVER "Yedekleme sunucusu" IDS_ACCOUNTS_STANDALONE_SERVER "Bağımsız sunucu" @@ -37,16 +29,6 @@ BEGIN IDS_CONFIG_WORKSTATION_DOMAIN "Workstation domain" IDS_CONFIG_WORKSTATION_LOGON "Logon domain" - IDS_GROUP_GROUPS "Group Accounts for \\\\%s" - IDS_GROUP_NAME "Group name" - IDS_GROUP_COMMENT "Comment" - IDS_GROUP_MEMBERS "Members" - - IDS_LOCALGROUP_ALIASES "\\\\%s için başka adlar" - IDS_LOCALGROUP_ALIAS_NAME "Başka ad" - IDS_LOCALGROUP_COMMENT "Açıklama" - IDS_LOCALGROUP_MEMBERS "Üyeler" - IDS_STATISTICS_TEXT "Statistics are available for the following services:\n\n\ Server\n Workstation\n\n" IDS_STATISTICS_SINCE "Statistics since %d/%d/%d %d:%02d %s\n\n\n" diff --git a/base/applications/network/net/lang/zh-CN.rc b/base/applications/network/net/lang/zh-CN.rc index 35ae37150a..fc055bb7e7 100644 --- a/base/applications/network/net/lang/zh-CN.rc +++ b/base/applications/network/net/lang/zh-CN.rc @@ -6,14 +6,6 @@ STRINGTABLE BEGIN IDS_ACCOUNTS_FORCE_LOGOFF "强制注销后" IDS_ACCOUNTS_LOGOFF_SECONDS "%lu 秒" - IDS_ACCOUNTS_MIN_PW_AGE "密码最短使用期限 (以天为单位)" - IDS_ACCOUNTS_MAX_PW_AGE "密码最长使用期限 (以天为单位)" - IDS_ACCOUNTS_MIN_PW_LENGTH "最小密码长度" - IDS_ACCOUNTS_PW_HIST_LENGTH "密码历史记录长度" - IDS_ACCOUNTS_LOCKOUT_THRESHOLD "锁定阈值" - IDS_ACCOUNTS_LOCKOUT_DURATION "锁定时间 (以分钟为单位)" - IDS_ACCOUNTS_LOCKOUT_WINDOW "锁定观察窗口 (以分钟为单位)" - IDS_ACCOUNTS_COMPUTER_ROLE "计算机角色" IDS_ACCOUNTS_PRIMARY_SERVER "主服务器" IDS_ACCOUNTS_BACKUP_SERVER "备份服务器" IDS_ACCOUNTS_STANDALONE_SERVER "独立服务器" @@ -37,16 +29,6 @@ BEGIN IDS_CONFIG_WORKSTATION_DOMAIN "Workstation domain" IDS_CONFIG_WORKSTATION_LOGON "Logon domain" - IDS_GROUP_GROUPS "Group Accounts for \\\\%s" - IDS_GROUP_NAME "Group name" - IDS_GROUP_COMMENT "Comment" - IDS_GROUP_MEMBERS "Members" - - IDS_LOCALGROUP_ALIASES "\\\\%s 的别名" - IDS_LOCALGROUP_ALIAS_NAME "别名名称" - IDS_LOCALGROUP_COMMENT "注释" - IDS_LOCALGROUP_MEMBERS "成员" - IDS_STATISTICS_TEXT "Statistics are available for the following services:\n\n\ Server\n Workstation\n\n" IDS_STATISTICS_SINCE "Statistics since %d/%d/%d %d:%02d %s\n\n\n" diff --git a/base/applications/network/net/lang/zh-TW.rc b/base/applications/network/net/lang/zh-TW.rc index b50e07c4e4..a19c8921d1 100644 --- a/base/applications/network/net/lang/zh-TW.rc +++ b/base/applications/network/net/lang/zh-TW.rc @@ -6,14 +6,6 @@ STRINGTABLE BEGIN IDS_ACCOUNTS_FORCE_LOGOFF "強制登出後" IDS_ACCOUNTS_LOGOFF_SECONDS "%lu 秒" - IDS_ACCOUNTS_MIN_PW_AGE "密碼最短使用期限 (以天)" - IDS_ACCOUNTS_MAX_PW_AGE "密碼最長使用期限 (以天)" - IDS_ACCOUNTS_MIN_PW_LENGTH "最小密碼長度" - IDS_ACCOUNTS_PW_HIST_LENGTH "密碼歷史記錄長度" - IDS_ACCOUNTS_LOCKOUT_THRESHOLD "鎖定閾值" - IDS_ACCOUNTS_LOCKOUT_DURATION "鎖定時間 (以分鐘為單位)" - IDS_ACCOUNTS_LOCKOUT_WINDOW "鎖定觀察視窗 (以分鐘為單位)" - IDS_ACCOUNTS_COMPUTER_ROLE "電腦角色" IDS_ACCOUNTS_PRIMARY_SERVER "主伺服器" IDS_ACCOUNTS_BACKUP_SERVER "備份伺服器" IDS_ACCOUNTS_STANDALONE_SERVER "獨立伺服器" @@ -37,16 +29,6 @@ BEGIN IDS_CONFIG_WORKSTATION_DOMAIN "Workstation domain" IDS_CONFIG_WORKSTATION_LOGON "Logon domain" - IDS_GROUP_GROUPS "Group Accounts for \\\\%s" - IDS_GROUP_NAME "Group name" - IDS_GROUP_COMMENT "Comment" - IDS_GROUP_MEMBERS "Members" - - IDS_LOCALGROUP_ALIASES "別名 \\\\%s" - IDS_LOCALGROUP_ALIAS_NAME "別名名稱" - IDS_LOCALGROUP_COMMENT "評論" - IDS_LOCALGROUP_MEMBERS "成員" - IDS_STATISTICS_TEXT "Statistics are available for the following services:\n\n\ Server\n Workstation\n\n" IDS_STATISTICS_SINCE "Statistics since %d/%d/%d %d:%02d %s\n\n\n" diff --git a/base/applications/network/net/main.c b/base/applications/network/net/main.c index 4707c148cd..75baf1b110 100644 --- a/base/applications/network/net/main.c +++ b/base/applications/network/net/main.c @@ -78,6 +78,84 @@ PrintPadding( } +VOID +PrintMessageStringV( + DWORD dwMessage, + ...) +{ + PWSTR pBuffer; + va_list args = NULL; + + va_start(args, dwMessage); + + FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_HMODULE, + hModuleNetMsg, + dwMessage, + LANG_USER_DEFAULT, + (LPWSTR)&pBuffer, + 0, + &args); + va_end(args); + + if (pBuffer) + { + ConPuts(StdOut, pBuffer); + LocalFree(pBuffer); + pBuffer = NULL; + } +} + +VOID +PrintMessageString( + DWORD dwMessage) +{ + PWSTR pBuffer; + + FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_HMODULE | + FORMAT_MESSAGE_IGNORE_INSERTS, + hModuleNetMsg, + dwMessage, + LANG_USER_DEFAULT, + (LPWSTR)&pBuffer, + 0, + NULL); + if (pBuffer) + { + ConPuts(StdOut, pBuffer); + LocalFree(pBuffer); + pBuffer = NULL; + } +} + + +VOID +PrintPaddedMessageString( + DWORD dwMessage, + INT nPaddedLength) +{ + PWSTR pBuffer; + DWORD dwLength; + + dwLength = FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_HMODULE | + FORMAT_MESSAGE_IGNORE_INSERTS, + hModuleNetMsg, + dwMessage, + LANG_USER_DEFAULT, + (LPWSTR)&pBuffer, + 0, + NULL); + if (pBuffer) + { + ConPuts(StdOut, pBuffer); + LocalFree(pBuffer); + pBuffer = NULL; + } + + if (dwLength < (DWORD)nPaddedLength) + PrintPadding(L' ', (DWORD)nPaddedLength - dwLength); +} + + VOID PrintErrorMessage( DWORD dwError) diff --git a/base/applications/network/net/net.h b/base/applications/network/net/net.h index 43c5ae5a6a..13874a4eaa 100644 --- a/base/applications/network/net/net.h +++ b/base/applications/network/net/net.h @@ -39,6 +39,20 @@ PrintPadding( WCHAR chr, INT nPaddedLength); +VOID +PrintMessageString( + DWORD dwMessage); + +VOID +PrintMessageStringV( + DWORD dwMessage, + ...); + +VOID +PrintPaddedMessageString( + DWORD dwMessage, + INT nPaddedLength); + VOID PrintErrorMessage( DWORD dwError); diff --git a/base/applications/network/net/resource.h b/base/applications/network/net/resource.h index 1be6288333..0a024d2cf7 100644 --- a/base/applications/network/net/resource.h +++ b/base/applications/network/net/resource.h @@ -2,14 +2,6 @@ #define IDS_ACCOUNTS_FORCE_LOGOFF 200 #define IDS_ACCOUNTS_LOGOFF_SECONDS 201 -#define IDS_ACCOUNTS_MIN_PW_AGE 202 -#define IDS_ACCOUNTS_MAX_PW_AGE 203 -#define IDS_ACCOUNTS_MIN_PW_LENGTH 204 -#define IDS_ACCOUNTS_PW_HIST_LENGTH 205 -#define IDS_ACCOUNTS_LOCKOUT_THRESHOLD 206 -#define IDS_ACCOUNTS_LOCKOUT_DURATION 207 -#define IDS_ACCOUNTS_LOCKOUT_WINDOW 208 -#define IDS_ACCOUNTS_COMPUTER_ROLE 209 #define IDS_ACCOUNTS_PRIMARY_SERVER 210 #define IDS_ACCOUNTS_BACKUP_SERVER 211 #define IDS_ACCOUNTS_STANDALONE_SERVER 212 @@ -32,16 +24,6 @@ #define IDS_CONFIG_WORKSTATION_DOMAIN 244 #define IDS_CONFIG_WORKSTATION_LOGON 245 -#define IDS_GROUP_GROUPS 260 -#define IDS_GROUP_NAME 261 -#define IDS_GROUP_COMMENT 262 -#define IDS_GROUP_MEMBERS 263 - -#define IDS_LOCALGROUP_ALIASES 300 -#define IDS_LOCALGROUP_ALIAS_NAME 301 -#define IDS_LOCALGROUP_COMMENT 302 -#define IDS_LOCALGROUP_MEMBERS 303 - #define IDS_STATISTICS_TEXT 320 #define IDS_STATISTICS_SINCE 321 #define IDS_STATISTICS_SRV_NAME 322 diff --git a/sdk/include/reactos/mc/netmsgmsg.mc b/sdk/include/reactos/mc/netmsgmsg.mc index 5f0a30d194..b5b93e0b6c 100644 --- a/sdk/include/reactos/mc/netmsgmsg.mc +++ b/sdk/include/reactos/mc/netmsgmsg.mc @@ -22428,13 +22428,13 @@ Language=English Group Accounts for \\\\%1 . Language=Polish -Group Accounts for \\\\%1 +Konta grupowe dla \\\\%1 . Language=Romanian -Group Accounts for \\\\%1 +Conturile de grup pentru \\\\%1 . Language=Russian -Group Accounts for \\\\%1 +Учетные записи групп для \\\\%1 . Language=Spanish Group Accounts for \\\\%1 @@ -22457,13 +22457,13 @@ Language=English Group name%0 . Language=Polish -Group name%0 +Nazwa grupy%0 . Language=Romanian -Group name%0 +Nume de grup%0 . Language=Russian -Group name%0 +Имя группы%0 . Language=Spanish Group name%0 @@ -22486,25 +22486,25 @@ Language=English Comment%0 . Language=Polish -Comment%0 +Komentarz%0 . Language=Romanian -Comment%0 +Comentariu%0 . Language=Russian -Comment%0 +Комментарий%0 . Language=Spanish -Comment%0 +Comentario%0 . Language=Turkish -Comment%0 +Açıklama%0 . Language=Chinese -Comment%0 +注释%0 . Language=Taiwanese -Comment%0 +評論%0 . MessageId=4403 @@ -22515,25 +22515,25 @@ Language=English Members . Language=Polish -Members +Członkowie . Language=Romanian -Members +Membri . Language=Russian -Members +Члены . Language=Spanish -Members +Miembros . Language=Turkish -Members +Üyeler . Language=Chinese -Members +成员 . Language=Taiwanese -Members +成員 . MessageId=4405 @@ -22544,25 +22544,25 @@ Language=English Aliases for \\\\%1 . Language=Polish -Aliases for \\\\%1 +Aliasy dla \\\\%1 . Language=Romanian -Aliases for \\\\%1 +Alias pentru \\\\%1 . Language=Russian -Aliases for \\\\%1 +Псевдонимы для \\\\%1 . Language=Spanish -Aliases for \\\\%1 +Alias de \\\\%1 . Language=Turkish -Aliases for \\\\%1 +\\\\%s için başka adlar . Language=Chinese -Aliases for \\\\%1 +\\\\%s 的别名 . Language=Taiwanese -Aliases for \\\\%1 +別名 \\\\%s . MessageId=4406 @@ -22573,25 +22573,25 @@ Language=English Alias name%0 . Language=Polish -Alias name%0 +Nazwa aliasu%0 . Language=Romanian -Alias name%0 +Nume alias%0 . Language=Russian -Alias name%0 +Имя псевдонима%0 . Language=Spanish -Alias name%0 +Nombre del alias%0 . Language=Turkish -Alias name%0 +Başka ad%0 . Language=Chinese -Alias name%0 +别名名称%0 . Language=Taiwanese -Alias name%0 +別名名稱%0 . MessageId=4407 @@ -22602,25 +22602,25 @@ Language=English Comment%0 . Language=Polish -Comment%0 +Komentarz%0 . Language=Romanian -Comment%0 +Comentariu%0 . Language=Russian -Comment%0 +Комментарий%0 . Language=Spanish -Comment%0 +Comentario%0 . Language=Turkish -Comment%0 +Açıklama%0 . Language=Chinese -Comment%0 +注释%0 . Language=Taiwanese -Comment%0 +評論%0 . MessageId=4408 @@ -22631,25 +22631,25 @@ Language=English Members . Language=Polish -Members +Członkowie . Language=Romanian -Members +Membri . Language=Russian -Members +Члены . Language=Spanish -Members +Miembros . Language=Turkish -Members +Üyeler . Language=Chinese -Members +成员 . Language=Taiwanese -Members +成員 . MessageId=4410

5 years, 8 months

[reactos] 01/01: [SYSSETUP] Add a theme chooser that can handle multiple styles

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5d4d48a85030b7e1aa24a… commit 5d4d48a85030b7e1aa24a414b3c48e9ac56cf3a9 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Wed Apr 3 00:44:02 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Fri Apr 5 21:56:31 2019 +0200 [SYSSETUP] Add a theme chooser that can handle multiple styles --- dll/win32/syssetup/lang/bg-BG.rc | 9 +++- dll/win32/syssetup/lang/cs-CZ.rc | 9 +++- dll/win32/syssetup/lang/da-DK.rc | 9 +++- dll/win32/syssetup/lang/de-DE.rc | 9 +++- dll/win32/syssetup/lang/el-GR.rc | 9 +++- dll/win32/syssetup/lang/en-US.rc | 9 +++- dll/win32/syssetup/lang/es-ES.rc | 9 +++- dll/win32/syssetup/lang/et-EE.rc | 9 +++- dll/win32/syssetup/lang/fi-FI.rc | 9 +++- dll/win32/syssetup/lang/fr-FR.rc | 9 +++- dll/win32/syssetup/lang/he-IL.rc | 9 +++- dll/win32/syssetup/lang/hi-IN.rc | 9 +++- dll/win32/syssetup/lang/hu-HU.rc | 9 +++- dll/win32/syssetup/lang/id-ID.rc | 9 +++- dll/win32/syssetup/lang/it-IT.rc | 9 +++- dll/win32/syssetup/lang/ja-JP.rc | 9 +++- dll/win32/syssetup/lang/lt-LT.rc | 9 +++- dll/win32/syssetup/lang/nl-NL.rc | 9 +++- dll/win32/syssetup/lang/no-NO.rc | 9 +++- dll/win32/syssetup/lang/pl-PL.rc | 9 +++- dll/win32/syssetup/lang/pt-BR.rc | 9 +++- dll/win32/syssetup/lang/ro-RO.rc | 9 +++- dll/win32/syssetup/lang/ru-RU.rc | 9 +++- dll/win32/syssetup/lang/sk-SK.rc | 9 +++- dll/win32/syssetup/lang/sq-AL.rc | 9 +++- dll/win32/syssetup/lang/sv-SE.rc | 9 +++- dll/win32/syssetup/lang/th-TH.rc | 9 +++- dll/win32/syssetup/lang/tr-TR.rc | 9 +++- dll/win32/syssetup/lang/uk-UA.rc | 9 +++- dll/win32/syssetup/lang/zh-CN.rc | 9 +++- dll/win32/syssetup/lang/zh-TW.rc | 9 +++- dll/win32/syssetup/resource.h | 6 ++- dll/win32/syssetup/wizard.c | 94 ++++++++++++++++++++++++++++------------ 33 files changed, 288 insertions(+), 91 deletions(-) diff --git a/dll/win32/syssetup/lang/bg-BG.rc b/dll/win32/syssetup/lang/bg-BG.rc index 0716e8b0c4..1ed71abcf2 100644 --- a/dll/win32/syssetup/lang/bg-BG.rc +++ b/dll/win32/syssetup/lang/bg-BG.rc @@ -88,8 +88,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE - PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE + CONTROL "", IDC_THEMEPICKER, "SysListView32", LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_TABSTOP, 18, 8, 288, 130 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 @@ -217,3 +216,9 @@ BEGIN IDS_LOOKFORWHEEL "Look for wheel" IDS_ASSUMEPRESENT "Assume wheel is present" END + +STRINGTABLE +BEGIN + IDS_CLASSIC "Classic" + IDS_LAUTUS "Lautus" +END diff --git a/dll/win32/syssetup/lang/cs-CZ.rc b/dll/win32/syssetup/lang/cs-CZ.rc index 5ecd4c0fc2..341b935f05 100644 --- a/dll/win32/syssetup/lang/cs-CZ.rc +++ b/dll/win32/syssetup/lang/cs-CZ.rc @@ -94,8 +94,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE - PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE + CONTROL "", IDC_THEMEPICKER, "SysListView32", LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_TABSTOP, 18, 8, 288, 130 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 @@ -223,3 +222,9 @@ BEGIN IDS_LOOKFORWHEEL "Look for wheel" IDS_ASSUMEPRESENT "Assume wheel is present" END + +STRINGTABLE +BEGIN + IDS_CLASSIC "Classic" + IDS_LAUTUS "Lautus" +END diff --git a/dll/win32/syssetup/lang/da-DK.rc b/dll/win32/syssetup/lang/da-DK.rc index 547b30d0ca..be23699f38 100644 --- a/dll/win32/syssetup/lang/da-DK.rc +++ b/dll/win32/syssetup/lang/da-DK.rc @@ -107,8 +107,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE - PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE + CONTROL "", IDC_THEMEPICKER, "SysListView32", LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_TABSTOP, 18, 8, 288, 130 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 @@ -236,3 +235,9 @@ BEGIN IDS_LOOKFORWHEEL "Look for wheel" IDS_ASSUMEPRESENT "Assume wheel is present" END + +STRINGTABLE +BEGIN + IDS_CLASSIC "Classic" + IDS_LAUTUS "Lautus" +END diff --git a/dll/win32/syssetup/lang/de-DE.rc b/dll/win32/syssetup/lang/de-DE.rc index d7366c05a5..bc80914a8c 100644 --- a/dll/win32/syssetup/lang/de-DE.rc +++ b/dll/win32/syssetup/lang/de-DE.rc @@ -88,8 +88,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - PUSHBUTTON "Lautus Theme", IDC_THEMEDSTYLE, 18,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE - PUSHBUTTON "Klassisches Theme", IDC_CLASSICSTYLE, 175,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE + CONTROL "", IDC_THEMEPICKER, "SysListView32", LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_TABSTOP, 18, 8, 288, 130 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 @@ -217,3 +216,9 @@ BEGIN IDS_LOOKFORWHEEL "Rad suchen" IDS_ASSUMEPRESENT "Annehmen, dass Rad vorhanden ist" END + +STRINGTABLE +BEGIN + IDS_CLASSIC "Classic" + IDS_LAUTUS "Lautus" +END diff --git a/dll/win32/syssetup/lang/el-GR.rc b/dll/win32/syssetup/lang/el-GR.rc index 5fc14d94d4..99b5f706d3 100644 --- a/dll/win32/syssetup/lang/el-GR.rc +++ b/dll/win32/syssetup/lang/el-GR.rc @@ -88,8 +88,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE - PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE + CONTROL "", IDC_THEMEPICKER, "SysListView32", LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_TABSTOP, 18, 8, 288, 130 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 @@ -217,3 +216,9 @@ BEGIN IDS_LOOKFORWHEEL "Look for wheel" IDS_ASSUMEPRESENT "Assume wheel is present" END + +STRINGTABLE +BEGIN + IDS_CLASSIC "Classic" + IDS_LAUTUS "Lautus" +END diff --git a/dll/win32/syssetup/lang/en-US.rc b/dll/win32/syssetup/lang/en-US.rc index f44d6a3dc8..531dd8fa3e 100644 --- a/dll/win32/syssetup/lang/en-US.rc +++ b/dll/win32/syssetup/lang/en-US.rc @@ -107,8 +107,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE - PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE + CONTROL "", IDC_THEMEPICKER, "SysListView32", LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_TABSTOP, 18, 8, 288, 130 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 @@ -237,3 +236,9 @@ BEGIN IDS_LOOKFORWHEEL "Look for wheel" IDS_ASSUMEPRESENT "Assume wheel is present" END + +STRINGTABLE +BEGIN + IDS_CLASSIC "Classic" + IDS_LAUTUS "Lautus" +END diff --git a/dll/win32/syssetup/lang/es-ES.rc b/dll/win32/syssetup/lang/es-ES.rc index 4736edf504..52c8141536 100644 --- a/dll/win32/syssetup/lang/es-ES.rc +++ b/dll/win32/syssetup/lang/es-ES.rc @@ -96,8 +96,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Instalación de ReactOS" FONT 8, "MS Shell Dlg" BEGIN - PUSHBUTTON "Estilo Lautus", IDC_THEMEDSTYLE, 18,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE - PUSHBUTTON "Estilo Clásico", IDC_CLASSICSTYLE, 175,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE + CONTROL "", IDC_THEMEPICKER, "SysListView32", LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_TABSTOP, 18, 8, 288, 130 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 @@ -225,3 +224,9 @@ BEGIN IDS_LOOKFORWHEEL "Detectar rueda" IDS_ASSUMEPRESENT "Asumir que la rueda está presente" END + +STRINGTABLE +BEGIN + IDS_CLASSIC "Classic" + IDS_LAUTUS "Lautus" +END diff --git a/dll/win32/syssetup/lang/et-EE.rc b/dll/win32/syssetup/lang/et-EE.rc index be7b959a08..a65e9fa2b2 100644 --- a/dll/win32/syssetup/lang/et-EE.rc +++ b/dll/win32/syssetup/lang/et-EE.rc @@ -88,8 +88,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS'i paigaldus" FONT 8, "MS Shell Dlg" BEGIN - PUSHBUTTON "Lautus teema", IDC_THEMEDSTYLE, 18,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE - PUSHBUTTON "Klassikaline teema", IDC_CLASSICSTYLE, 175,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE + CONTROL "", IDC_THEMEPICKER, "SysListView32", LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_TABSTOP, 18, 8, 288, 130 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 @@ -217,3 +216,9 @@ BEGIN IDS_LOOKFORWHEEL "Otsi rullikut" IDS_ASSUMEPRESENT "Eelda rullik on olemas" END + +STRINGTABLE +BEGIN + IDS_CLASSIC "Classic" + IDS_LAUTUS "Lautus" +END diff --git a/dll/win32/syssetup/lang/fi-FI.rc b/dll/win32/syssetup/lang/fi-FI.rc index 1f19102619..fa3b9569c2 100644 --- a/dll/win32/syssetup/lang/fi-FI.rc +++ b/dll/win32/syssetup/lang/fi-FI.rc @@ -107,8 +107,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE - PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE + CONTROL "", IDC_THEMEPICKER, "SysListView32", LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_TABSTOP, 18, 8, 288, 130 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 @@ -236,3 +235,9 @@ BEGIN IDS_LOOKFORWHEEL "Look for wheel" IDS_ASSUMEPRESENT "Assume wheel is present" END + +STRINGTABLE +BEGIN + IDS_CLASSIC "Classic" + IDS_LAUTUS "Lautus" +END diff --git a/dll/win32/syssetup/lang/fr-FR.rc b/dll/win32/syssetup/lang/fr-FR.rc index 5aa51a1478..c60e249083 100644 --- a/dll/win32/syssetup/lang/fr-FR.rc +++ b/dll/win32/syssetup/lang/fr-FR.rc @@ -88,8 +88,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Installation de ReactOS" FONT 8, "MS Shell Dlg" BEGIN - PUSHBUTTON "Thème Lautus", IDC_THEMEDSTYLE, 18,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE - PUSHBUTTON "Thème Classique", IDC_CLASSICSTYLE, 175,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE + CONTROL "", IDC_THEMEPICKER, "SysListView32", LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_TABSTOP, 18, 8, 288, 130 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 @@ -217,3 +216,9 @@ BEGIN IDS_LOOKFORWHEEL "Look for wheel" IDS_ASSUMEPRESENT "Assume wheel is present" END + +STRINGTABLE +BEGIN + IDS_CLASSIC "Classic" + IDS_LAUTUS "Lautus" +END diff --git a/dll/win32/syssetup/lang/he-IL.rc b/dll/win32/syssetup/lang/he-IL.rc index de2b023800..c62d47b2a0 100644 --- a/dll/win32/syssetup/lang/he-IL.rc +++ b/dll/win32/syssetup/lang/he-IL.rc @@ -88,8 +88,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE - PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE + CONTROL "", IDC_THEMEPICKER, "SysListView32", LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_TABSTOP, 18, 8, 288, 130 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 @@ -217,3 +216,9 @@ BEGIN IDS_LOOKFORWHEEL "Look for wheel" IDS_ASSUMEPRESENT "Assume wheel is present" END + +STRINGTABLE +BEGIN + IDS_CLASSIC "Classic" + IDS_LAUTUS "Lautus" +END diff --git a/dll/win32/syssetup/lang/hi-IN.rc b/dll/win32/syssetup/lang/hi-IN.rc index 9ae9d9722b..65a1be8532 100644 --- a/dll/win32/syssetup/lang/hi-IN.rc +++ b/dll/win32/syssetup/lang/hi-IN.rc @@ -95,8 +95,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "रिऐक्ट ओएस सेटअप" FONT 8, "MS Shell Dlg" BEGIN - PUSHBUTTON "लौटस थीम", IDC_THEMEDSTYLE, 18,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE - PUSHBUTTON "क्लासिक थीम", IDC_CLASSICSTYLE, 175,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE + CONTROL "", IDC_THEMEPICKER, "SysListView32", LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_TABSTOP, 18, 8, 288, 130 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 @@ -225,3 +224,9 @@ BEGIN IDS_LOOKFORWHEEL "पहिया के लिए देखो" IDS_ASSUMEPRESENT "मान लें कि पहिया मौजूद है" END + +STRINGTABLE +BEGIN + IDS_CLASSIC "Classic" + IDS_LAUTUS "Lautus" +END diff --git a/dll/win32/syssetup/lang/hu-HU.rc b/dll/win32/syssetup/lang/hu-HU.rc index aad93e168a..323f818234 100644 --- a/dll/win32/syssetup/lang/hu-HU.rc +++ b/dll/win32/syssetup/lang/hu-HU.rc @@ -88,8 +88,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE - PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE + CONTROL "", IDC_THEMEPICKER, "SysListView32", LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_TABSTOP, 18, 8, 288, 130 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 @@ -217,3 +216,9 @@ BEGIN IDS_LOOKFORWHEEL "Look for wheel" IDS_ASSUMEPRESENT "Assume wheel is present" END + +STRINGTABLE +BEGIN + IDS_CLASSIC "Classic" + IDS_LAUTUS "Lautus" +END diff --git a/dll/win32/syssetup/lang/id-ID.rc b/dll/win32/syssetup/lang/id-ID.rc index 2d960f130d..d6cfa7337b 100644 --- a/dll/win32/syssetup/lang/id-ID.rc +++ b/dll/win32/syssetup/lang/id-ID.rc @@ -88,8 +88,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE - PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE + CONTROL "", IDC_THEMEPICKER, "SysListView32", LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_TABSTOP, 18, 8, 288, 130 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 @@ -217,3 +216,9 @@ BEGIN IDS_LOOKFORWHEEL "Look for wheel" IDS_ASSUMEPRESENT "Assume wheel is present" END + +STRINGTABLE +BEGIN + IDS_CLASSIC "Classic" + IDS_LAUTUS "Lautus" +END diff --git a/dll/win32/syssetup/lang/it-IT.rc b/dll/win32/syssetup/lang/it-IT.rc index 2f18ce4051..9e999a0ae0 100644 --- a/dll/win32/syssetup/lang/it-IT.rc +++ b/dll/win32/syssetup/lang/it-IT.rc @@ -88,8 +88,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - PUSHBUTTON "Tema Lautus", IDC_THEMEDSTYLE, 18,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE - PUSHBUTTON "Tema Classico", IDC_CLASSICSTYLE, 175,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE + CONTROL "", IDC_THEMEPICKER, "SysListView32", LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_TABSTOP, 18, 8, 288, 130 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 @@ -217,3 +216,9 @@ BEGIN IDS_LOOKFORWHEEL "Look for wheel" IDS_ASSUMEPRESENT "Assume wheel is present" END + +STRINGTABLE +BEGIN + IDS_CLASSIC "Classic" + IDS_LAUTUS "Lautus" +END diff --git a/dll/win32/syssetup/lang/ja-JP.rc b/dll/win32/syssetup/lang/ja-JP.rc index 4cda9d3e3c..3ef3bec17c 100644 --- a/dll/win32/syssetup/lang/ja-JP.rc +++ b/dll/win32/syssetup/lang/ja-JP.rc @@ -88,8 +88,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS セットアップ" FONT 9, "MS UI Gothic" BEGIN - PUSHBUTTON "Lautus テーマ", IDC_THEMEDSTYLE, 18,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE - PUSHBUTTON "クラシックテーマ", IDC_CLASSICSTYLE, 175,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE + CONTROL "", IDC_THEMEPICKER, "SysListView32", LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_TABSTOP, 18, 8, 288, 130 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 @@ -217,3 +216,9 @@ BEGIN IDS_LOOKFORWHEEL "Look for wheel" IDS_ASSUMEPRESENT "Assume wheel is present" END + +STRINGTABLE +BEGIN + IDS_CLASSIC "Classic" + IDS_LAUTUS "Lautus" +END diff --git a/dll/win32/syssetup/lang/lt-LT.rc b/dll/win32/syssetup/lang/lt-LT.rc index d19f2d5a88..817a01bd61 100644 --- a/dll/win32/syssetup/lang/lt-LT.rc +++ b/dll/win32/syssetup/lang/lt-LT.rc @@ -107,8 +107,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE - PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE + CONTROL "", IDC_THEMEPICKER, "SysListView32", LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_TABSTOP, 18, 8, 288, 130 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 @@ -236,3 +235,9 @@ BEGIN IDS_LOOKFORWHEEL "Look for wheel" IDS_ASSUMEPRESENT "Assume wheel is present" END + +STRINGTABLE +BEGIN + IDS_CLASSIC "Classic" + IDS_LAUTUS "Lautus" +END diff --git a/dll/win32/syssetup/lang/nl-NL.rc b/dll/win32/syssetup/lang/nl-NL.rc index e7c15889b6..57f7aea1dc 100644 --- a/dll/win32/syssetup/lang/nl-NL.rc +++ b/dll/win32/syssetup/lang/nl-NL.rc @@ -88,8 +88,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE - PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE + CONTROL "", IDC_THEMEPICKER, "SysListView32", LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_TABSTOP, 18, 8, 288, 130 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 @@ -217,3 +216,9 @@ BEGIN IDS_LOOKFORWHEEL "Look for wheel" IDS_ASSUMEPRESENT "Assume wheel is present" END + +STRINGTABLE +BEGIN + IDS_CLASSIC "Classic" + IDS_LAUTUS "Lautus" +END diff --git a/dll/win32/syssetup/lang/no-NO.rc b/dll/win32/syssetup/lang/no-NO.rc index 3e86a61548..0d2ce42677 100644 --- a/dll/win32/syssetup/lang/no-NO.rc +++ b/dll/win32/syssetup/lang/no-NO.rc @@ -88,8 +88,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE - PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE + CONTROL "", IDC_THEMEPICKER, "SysListView32", LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_TABSTOP, 18, 8, 288, 130 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 @@ -217,3 +216,9 @@ BEGIN IDS_LOOKFORWHEEL "Look for wheel" IDS_ASSUMEPRESENT "Assume wheel is present" END + +STRINGTABLE +BEGIN + IDS_CLASSIC "Classic" + IDS_LAUTUS "Lautus" +END diff --git a/dll/win32/syssetup/lang/pl-PL.rc b/dll/win32/syssetup/lang/pl-PL.rc index b4fb97ef00..e942a82d61 100644 --- a/dll/win32/syssetup/lang/pl-PL.rc +++ b/dll/win32/syssetup/lang/pl-PL.rc @@ -88,8 +88,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Instalator systemu ReactOS" FONT 8, "MS Shell Dlg" BEGIN - PUSHBUTTON "Lautus", IDC_THEMEDSTYLE, 18,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE - PUSHBUTTON "Klasyczny", IDC_CLASSICSTYLE, 175,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE + CONTROL "", IDC_THEMEPICKER, "SysListView32", LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_TABSTOP, 18, 8, 288, 130 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 @@ -217,3 +216,9 @@ BEGIN IDS_LOOKFORWHEEL "Szukaj kółka" IDS_ASSUMEPRESENT "Przyjmij obecność kółka" END + +STRINGTABLE +BEGIN + IDS_CLASSIC "Classic" + IDS_LAUTUS "Lautus" +END diff --git a/dll/win32/syssetup/lang/pt-BR.rc b/dll/win32/syssetup/lang/pt-BR.rc index 78302db084..9857df3dea 100644 --- a/dll/win32/syssetup/lang/pt-BR.rc +++ b/dll/win32/syssetup/lang/pt-BR.rc @@ -88,8 +88,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE - PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE + CONTROL "", IDC_THEMEPICKER, "SysListView32", LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_TABSTOP, 18, 8, 288, 130 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 @@ -217,3 +216,9 @@ BEGIN IDS_LOOKFORWHEEL "Look for wheel" IDS_ASSUMEPRESENT "Assume wheel is present" END + +STRINGTABLE +BEGIN + IDS_CLASSIC "Classic" + IDS_LAUTUS "Lautus" +END diff --git a/dll/win32/syssetup/lang/ro-RO.rc b/dll/win32/syssetup/lang/ro-RO.rc index 97da2193d9..d7f82b3f16 100644 --- a/dll/win32/syssetup/lang/ro-RO.rc +++ b/dll/win32/syssetup/lang/ro-RO.rc @@ -97,8 +97,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Asistent de instalare ReactOS" FONT 8, "MS Shell Dlg" BEGIN - PUSHBUTTON "Tema Lautus", IDC_THEMEDSTYLE, 18,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE - PUSHBUTTON "Tema clasică", IDC_CLASSICSTYLE, 175,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE + CONTROL "", IDC_THEMEPICKER, "SysListView32", LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_TABSTOP, 18, 8, 288, 130 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 @@ -226,3 +225,9 @@ BEGIN IDS_LOOKFORWHEEL "Caută rotiță" IDS_ASSUMEPRESENT "Consideră roatiță prezentă" END + +STRINGTABLE +BEGIN + IDS_CLASSIC "Classic" + IDS_LAUTUS "Lautus" +END diff --git a/dll/win32/syssetup/lang/ru-RU.rc b/dll/win32/syssetup/lang/ru-RU.rc index 53dcccd398..a2cd4fde35 100644 --- a/dll/win32/syssetup/lang/ru-RU.rc +++ b/dll/win32/syssetup/lang/ru-RU.rc @@ -90,8 +90,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Установка ReactOS" FONT 8, "MS Shell Dlg" BEGIN - PUSHBUTTON "Тема ""Lautus""", IDC_THEMEDSTYLE, 18,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE - PUSHBUTTON "Классическая тема", IDC_CLASSICSTYLE, 175,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE + CONTROL "", IDC_THEMEPICKER, "SysListView32", LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_TABSTOP, 18, 8, 288, 130 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 @@ -219,3 +218,9 @@ BEGIN IDS_LOOKFORWHEEL "Look for wheel" IDS_ASSUMEPRESENT "Assume wheel is present" END + +STRINGTABLE +BEGIN + IDS_CLASSIC "Classic" + IDS_LAUTUS "Lautus" +END diff --git a/dll/win32/syssetup/lang/sk-SK.rc b/dll/win32/syssetup/lang/sk-SK.rc index 5c66a19f2c..1f6198f969 100644 --- a/dll/win32/syssetup/lang/sk-SK.rc +++ b/dll/win32/syssetup/lang/sk-SK.rc @@ -94,8 +94,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE - PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE + CONTROL "", IDC_THEMEPICKER, "SysListView32", LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_TABSTOP, 18, 8, 288, 130 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 @@ -223,3 +222,9 @@ BEGIN IDS_LOOKFORWHEEL "Look for wheel" IDS_ASSUMEPRESENT "Assume wheel is present" END + +STRINGTABLE +BEGIN + IDS_CLASSIC "Classic" + IDS_LAUTUS "Lautus" +END diff --git a/dll/win32/syssetup/lang/sq-AL.rc b/dll/win32/syssetup/lang/sq-AL.rc index aa738bb99f..60fbbbd3c6 100644 --- a/dll/win32/syssetup/lang/sq-AL.rc +++ b/dll/win32/syssetup/lang/sq-AL.rc @@ -107,8 +107,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE - PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE + CONTROL "", IDC_THEMEPICKER, "SysListView32", LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_TABSTOP, 18, 8, 288, 130 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 @@ -236,3 +235,9 @@ BEGIN IDS_LOOKFORWHEEL "Look for wheel" IDS_ASSUMEPRESENT "Assume wheel is present" END + +STRINGTABLE +BEGIN + IDS_CLASSIC "Classic" + IDS_LAUTUS "Lautus" +END diff --git a/dll/win32/syssetup/lang/sv-SE.rc b/dll/win32/syssetup/lang/sv-SE.rc index 22921236ce..a1609d3007 100644 --- a/dll/win32/syssetup/lang/sv-SE.rc +++ b/dll/win32/syssetup/lang/sv-SE.rc @@ -107,8 +107,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE - PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE + CONTROL "", IDC_THEMEPICKER, "SysListView32", LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_TABSTOP, 18, 8, 288, 130 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 @@ -236,3 +235,9 @@ BEGIN IDS_LOOKFORWHEEL "Look for wheel" IDS_ASSUMEPRESENT "Assume wheel is present" END + +STRINGTABLE +BEGIN + IDS_CLASSIC "Classic" + IDS_LAUTUS "Lautus" +END diff --git a/dll/win32/syssetup/lang/th-TH.rc b/dll/win32/syssetup/lang/th-TH.rc index 67da58c030..5ae89a6edb 100644 --- a/dll/win32/syssetup/lang/th-TH.rc +++ b/dll/win32/syssetup/lang/th-TH.rc @@ -107,8 +107,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE - PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE + CONTROL "", IDC_THEMEPICKER, "SysListView32", LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_TABSTOP, 18, 8, 288, 130 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 @@ -236,3 +235,9 @@ BEGIN IDS_LOOKFORWHEEL "Look for wheel" IDS_ASSUMEPRESENT "Assume wheel is present" END + +STRINGTABLE +BEGIN + IDS_CLASSIC "Classic" + IDS_LAUTUS "Lautus" +END diff --git a/dll/win32/syssetup/lang/tr-TR.rc b/dll/win32/syssetup/lang/tr-TR.rc index ba8052219a..ee17829e90 100644 --- a/dll/win32/syssetup/lang/tr-TR.rc +++ b/dll/win32/syssetup/lang/tr-TR.rc @@ -90,8 +90,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE - PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE + CONTROL "", IDC_THEMEPICKER, "SysListView32", LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_TABSTOP, 18, 8, 288, 130 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 @@ -219,3 +218,9 @@ BEGIN IDS_LOOKFORWHEEL "Look for wheel" IDS_ASSUMEPRESENT "Assume wheel is present" END + +STRINGTABLE +BEGIN + IDS_CLASSIC "Classic" + IDS_LAUTUS "Lautus" +END diff --git a/dll/win32/syssetup/lang/uk-UA.rc b/dll/win32/syssetup/lang/uk-UA.rc index d1dc031d86..0c9ffb6f65 100644 --- a/dll/win32/syssetup/lang/uk-UA.rc +++ b/dll/win32/syssetup/lang/uk-UA.rc @@ -96,8 +96,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Встановлення ReactOS" FONT 8, "MS Shell Dlg" BEGIN - PUSHBUTTON "Тема ""Lautus""", IDC_THEMEDSTYLE, 18,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE - PUSHBUTTON "Класична тема", IDC_CLASSICSTYLE, 175,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE + CONTROL "", IDC_THEMEPICKER, "SysListView32", LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_TABSTOP, 18, 8, 288, 130 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 @@ -225,3 +224,9 @@ BEGIN IDS_LOOKFORWHEEL "Look for wheel" IDS_ASSUMEPRESENT "Assume wheel is present" END + +STRINGTABLE +BEGIN + IDS_CLASSIC "Classic" + IDS_LAUTUS "Lautus" +END diff --git a/dll/win32/syssetup/lang/zh-CN.rc b/dll/win32/syssetup/lang/zh-CN.rc index f54c9f3250..515e594111 100644 --- a/dll/win32/syssetup/lang/zh-CN.rc +++ b/dll/win32/syssetup/lang/zh-CN.rc @@ -90,8 +90,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS 安装程序" FONT 9, "宋体" BEGIN - PUSHBUTTON "Lautus 主题", IDC_THEMEDSTYLE, 18,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE - PUSHBUTTON "经典主题", IDC_CLASSICSTYLE, 175,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE + CONTROL "", IDC_THEMEPICKER, "SysListView32", LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_TABSTOP, 18, 8, 288, 130 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 @@ -222,3 +221,9 @@ BEGIN IDS_LOOKFORWHEEL "寻找滚轮" IDS_ASSUMEPRESENT "假设存在滚轮" END + +STRINGTABLE +BEGIN + IDS_CLASSIC "Classic" + IDS_LAUTUS "Lautus" +END diff --git a/dll/win32/syssetup/lang/zh-TW.rc b/dll/win32/syssetup/lang/zh-TW.rc index cc6b118859..6da4da4437 100644 --- a/dll/win32/syssetup/lang/zh-TW.rc +++ b/dll/win32/syssetup/lang/zh-TW.rc @@ -110,8 +110,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS 安裝程式" FONT 9, "新細明體" BEGIN - PUSHBUTTON "Lautus 主題", IDC_THEMEDSTYLE, 18,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE - PUSHBUTTON "傳統主題", IDC_CLASSICSTYLE, 175,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE + CONTROL "", IDC_THEMEPICKER, "SysListView32", LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_TABSTOP, 18, 8, 288, 130 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 @@ -244,3 +243,9 @@ BEGIN IDS_LOOKFORWHEEL "搜尋滾輪" IDS_ASSUMEPRESENT "假設滾輪已存在" END + +STRINGTABLE +BEGIN + IDS_CLASSIC "Classic" + IDS_LAUTUS "Lautus" +END diff --git a/dll/win32/syssetup/resource.h b/dll/win32/syssetup/resource.h index c9dcb3a0aa..030a5c2eed 100644 --- a/dll/win32/syssetup/resource.h +++ b/dll/win32/syssetup/resource.h @@ -69,8 +69,7 @@ #define IDC_RESTART_PROGRESS 1072 #define IDD_THEMEPAGE 1080 -#define IDC_THEMEDSTYLE 1081 -#define IDC_CLASSICSTYLE 1082 +#define IDC_THEMEPICKER 1081 #define IDD_GPL 2100 #define IDC_GPL_TEXT 2101 @@ -140,4 +139,7 @@ #define IDS_LOOKFORWHEEL 3701 #define IDS_ASSUMEPRESENT 3702 +#define IDS_CLASSIC 3800 +#define IDS_LAUTUS 3801 + #define IDR_GPL 4000 diff --git a/dll/win32/syssetup/wizard.c b/dll/win32/syssetup/wizard.c index 06219b941e..5255b82a0c 100644 --- a/dll/win32/syssetup/wizard.c +++ b/dll/win32/syssetup/wizard.c @@ -1593,6 +1593,16 @@ DateTimePageDlgProc(HWND hwndDlg, return FALSE; } +static struct ThemeInfo +{ + LPCWSTR PreviewBitmap; + UINT DisplayName; + LPCWSTR ThemeFile; + +} Themes[] = { + { MAKEINTRESOURCE(IDB_CLASSIC), IDS_CLASSIC, NULL }, + { MAKEINTRESOURCE(IDB_LAUTUS), IDS_LAUTUS, L"themes\\lautus\\lautus.msstyles" }, +}; static INT_PTR CALLBACK ThemePageDlgProc(HWND hwndDlg, @@ -1601,6 +1611,7 @@ ThemePageDlgProc(HWND hwndDlg, LPARAM lParam) { PSETUPDATA SetupData; + LPNMLISTVIEW pnmv; /* Retrieve pointer to the global setup data */ SetupData = (PSETUPDATA)GetWindowLongPtr(hwndDlg, GWLP_USERDATA); @@ -1609,46 +1620,75 @@ ThemePageDlgProc(HWND hwndDlg, { case WM_INITDIALOG: { - BUTTON_IMAGELIST imldata = {0, {0,10,0,10}, BUTTON_IMAGELIST_ALIGN_TOP}; + HWND hListView; + HIMAGELIST himl; + DWORD n; + LVITEM lvi = {0}; /* Save pointer to the global setup data */ SetupData = (PSETUPDATA)((LPPROPSHEETPAGE)lParam)->lParam; SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (DWORD_PTR)SetupData); - imldata.himl = ImageList_LoadImage(hDllInstance, MAKEINTRESOURCE(IDB_CLASSIC), 0, 0, 0x00FF00FF, IMAGE_BITMAP, LR_CREATEDIBSECTION); - SendDlgItemMessage(hwndDlg, IDC_CLASSICSTYLE, BCM_SETIMAGELIST, 0, (LPARAM)&imldata); + hListView = GetDlgItem(hwndDlg, IDC_THEMEPICKER); - imldata.himl = ImageList_LoadImage(hDllInstance, MAKEINTRESOURCE(IDB_LAUTUS), 0, 0, 0x00FF00FF , IMAGE_BITMAP, LR_CREATEDIBSECTION); - SendDlgItemMessage(hwndDlg, IDC_THEMEDSTYLE, BCM_SETIMAGELIST, 0, (LPARAM)&imldata); + /* Common */ + himl = ImageList_Create(180, 163, ILC_COLOR32 | ILC_MASK, ARRAYSIZE(Themes), 1); + lvi.mask = LVIF_TEXT | LVIF_IMAGE |LVIF_STATE; - SendDlgItemMessage(hwndDlg, IDC_CLASSICSTYLE, BM_SETCHECK, BST_CHECKED, 0); - break; - } - case WM_COMMAND: - if (HIWORD(wParam) == BN_CLICKED) + for (n = 0; n < ARRAYSIZE(Themes); ++n) { - switch (LOWORD(wParam)) - { - case IDC_THEMEDSTYLE: - { - WCHAR wszParams[1024]; - WCHAR wszTheme[MAX_PATH]; - WCHAR* format = L"desk.cpl desk,@Appearance /Action:ActivateMSTheme /file:\"%s\""; - - SHGetFolderPathAndSubDirW(0, CSIDL_RESOURCES, NULL, SHGFP_TYPE_DEFAULT, L"themes\\lautus\\lautus.msstyles", wszTheme); - swprintf(wszParams, format, wszTheme); - RunControlPanelApplet(hwndDlg, wszParams); - break; - } - case IDC_CLASSICSTYLE: - RunControlPanelApplet(hwndDlg, L"desk.cpl desk,@Appearance /Action:ActivateMSTheme"); - break; - } + WCHAR DisplayName[100] = {0}; + /* Load the bitmap */ + HANDLE image = LoadImageW(hDllInstance, Themes[n].PreviewBitmap, IMAGE_BITMAP, 0, 0, LR_CREATEDIBSECTION); + ImageList_AddMasked(himl, image, RGB(255,0,255)); + + /* Load the string */ + LoadStringW(hDllInstance, Themes[n].DisplayName, DisplayName, ARRAYSIZE(DisplayName)); + DisplayName[ARRAYSIZE(DisplayName)-1] = UNICODE_NULL; + + /* Add the listview item */ + lvi.iItem = n; + lvi.iImage = n; + lvi.pszText = DisplayName; + ListView_InsertItem(hListView, &lvi); } + + /* Register the imagelist */ + ListView_SetImageList(hListView, himl, LVSIL_NORMAL); + /* Transparant background */ + ListView_SetBkColor(hListView, CLR_NONE); + ListView_SetTextBkColor(hListView, CLR_NONE); + /* Reduce the size between the items */ + ListView_SetIconSpacing(hListView, 190, 173); break; + } case WM_NOTIFY: switch (((LPNMHDR)lParam)->code) { + //case LVN_ITEMCHANGING: + case LVN_ITEMCHANGED: + pnmv = (LPNMLISTVIEW)lParam; + if ((pnmv->uChanged & LVIF_STATE) && (pnmv->uNewState & LVIS_SELECTED)) + { + int iTheme = pnmv->iItem; + DPRINT1("Selected theme: %S\n", Themes[iTheme].DisplayName); + + if (Themes[iTheme].ThemeFile) + { + WCHAR wszParams[1024]; + WCHAR wszTheme[MAX_PATH]; + WCHAR* format = L"desk.cpl desk,@Appearance /Action:ActivateMSTheme /file:\"%s\""; + + SHGetFolderPathAndSubDirW(0, CSIDL_RESOURCES, NULL, SHGFP_TYPE_DEFAULT, Themes[iTheme].ThemeFile, wszTheme); + swprintf(wszParams, format, wszTheme); + RunControlPanelApplet(hwndDlg, wszParams); + } + else + { + RunControlPanelApplet(hwndDlg, L"desk.cpl desk,@Appearance /Action:ActivateMSTheme"); + } + } + break; case PSN_SETACTIVE: /* Enable the Back and Next buttons */ PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT);

5 years, 8 months

[reactos] 01/01: [KERNEL32_APITEST] Improve MultiByteToWideChar testcase (#1472)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3400a27ca50d321302c63… commit 3400a27ca50d321302c639a473e4ce775b5dc8d5 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Apr 5 22:04:04 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Apr 5 22:04:04 2019 +0900 [KERNEL32_APITEST] Improve MultiByteToWideChar testcase (#1472) Strengthen the testcase for kernel32!MultiByteToWideChar function. ROSTESTS-282 --- .../apitests/kernel32/MultiByteToWideChar.c | 176 ++++++++++++++++++++- 1 file changed, 169 insertions(+), 7 deletions(-) diff --git a/modules/rostests/apitests/kernel32/MultiByteToWideChar.c b/modules/rostests/apitests/kernel32/MultiByteToWideChar.c index 120ce60f90..5b59acbe98 100644 --- a/modules/rostests/apitests/kernel32/MultiByteToWideChar.c +++ b/modules/rostests/apitests/kernel32/MultiByteToWideChar.c @@ -2,18 +2,180 @@ * PROJECT: ReactOS api tests * LICENSE: GPLv2+ - See COPYING in the top level directory * PURPOSE: Test for MultiByteToWideChar - * PROGRAMMER: Mike "tamlin" Nordell + * PROGRAMMERS: Mike "tamlin" Nordell + * Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> */ #include "precomp.h" -START_TEST(MultiByteToWideChar) +/* NOTE: Tested on Win10. We follow Win10 in this function. + Win10 might alter its design in future. */ + +/* TODO: Russian, French, Korean etc. codepages */ + +#define CP932 932 /* Japanese Shift_JIS (SJIS) codepage */ + +/* "Japanese" in Japanese UTF-8 */ +static const char UTF8_Japanese[] = "\xE6\x97\xA5\xE6\x9C\xAC\xE8\xAA\x9E"; +/* "Japanese" in Japanese Shift_JIS */ +static const char SJIS_Japanese[] = "\x93\xFA\x96\x7B\x8C\xEA"; + +#define MAX_BUFFER 8 + +/* test entry */ +typedef struct ENTRY +{ + int LineNo; + int Return; + DWORD Error; + UINT CodePage; + DWORD Flags; + const char *Src; + int SrcLen; + int DestLen; + WCHAR CheckDest[MAX_BUFFER]; + int CheckLen; + BOOL SamePointer; +} ENTRY; + +static const ENTRY Entries[] = +{ + /* without buffer */ + { __LINE__, 1, 0xBEAF, CP_UTF8, 0, "a", 1 }, + { __LINE__, 2, 0xBEAF, CP_UTF8, 0, "a", 2 }, + { __LINE__, 2, 0xBEAF, CP_UTF8, MB_ERR_INVALID_CHARS, "a", 2 }, + /* negative length */ + { __LINE__, 2, 0xBEAF, CP_UTF8, 0, "a", -1 }, + { __LINE__, 2, 0xBEAF, CP_UTF8, 0, "a", -2 }, + { __LINE__, 2, 0xBEAF, CP_UTF8, MB_ERR_INVALID_CHARS, "a", -1 }, + { __LINE__, 2, 0xBEAF, CP_UTF8, MB_ERR_INVALID_CHARS, "a", -3 }, + /* with buffer */ + { __LINE__, 1, 0xBEAF, CP_UTF8, 0, "a", 1, 1, {'a', 0x7F7F}, 2 }, + { __LINE__, 2, 0xBEAF, CP_UTF8, 0, "a", 2, 4, {'a', 0, 0x7F7F}, 3 }, + { __LINE__, 2, 0xBEAF, CP_UTF8, MB_ERR_INVALID_CHARS, "a", 2, 4, {'a', 0, 0x7F7F}, 3 }, + /* short buffer */ + { __LINE__, 0, ERROR_INSUFFICIENT_BUFFER, CP_UTF8, 0, "a", 2, 1, {'a', 0x7F7F}, 2 }, + { __LINE__, 0, ERROR_INSUFFICIENT_BUFFER, CP_UTF8, 0, "a", 2, 1, {'a', 0x7F7F}, 2 }, + { __LINE__, 0, ERROR_INSUFFICIENT_BUFFER, CP_UTF8, MB_ERR_INVALID_CHARS, "a", 2, 1, {'a', 0x7F7F}, 2 }, + /* same pointer */ + { __LINE__, 0, ERROR_INVALID_PARAMETER, CP_UTF8, 0, "", 1, 1, { 0x7F7F }, 1, TRUE }, + { __LINE__, 0, ERROR_INVALID_PARAMETER, CP_UTF8, MB_ERR_INVALID_CHARS, "", 1, 1, { 0x7F7F }, 1, TRUE }, + /* invalid UTF-8 sequences without buffer */ + { __LINE__, 2, 0xBEAF, CP_UTF8, 0, "\xC0", 2 }, + { __LINE__, 4, 0xBEAF, CP_UTF8, 0, "\xC0\xC0\x80", 4 }, + { __LINE__, 3, 0xBEAF, CP_UTF8, 0, "\xE0\xC0", 3 }, + { __LINE__, 4, 0xBEAF, CP_UTF8, 0, "\xE0\x20\xC0", 4 }, + { __LINE__, 0, ERROR_NO_UNICODE_TRANSLATION, CP_UTF8, MB_ERR_INVALID_CHARS, "\xC0", 2 }, + { __LINE__, 0, ERROR_NO_UNICODE_TRANSLATION, CP_UTF8, MB_ERR_INVALID_CHARS, "\xC0\xC0\x80", 4 }, + { __LINE__, 0, ERROR_NO_UNICODE_TRANSLATION, CP_UTF8, MB_ERR_INVALID_CHARS, "\xE0\xC0", 3 }, + { __LINE__, 0, ERROR_NO_UNICODE_TRANSLATION, CP_UTF8, MB_ERR_INVALID_CHARS, "\xE0\x20\xC0", 4 }, + /* invalid UTF-8 sequences with buffer */ + { __LINE__, 2, 0xBEAF, CP_UTF8, 0, "\xC0", 2, 4, {0xFFFD, 0, 0x7F7F}, 3}, + { __LINE__, 4, 0xBEAF, CP_UTF8, 0, "\xC0\xC0\x80", 4, 5, {0xFFFD, 0xFFFD, 0xFFFD, 0, 0x7F7F}, 5 }, + { __LINE__, 3, 0xBEAF, CP_UTF8, 0, "\xE0\xC0", 3, 4, {0xFFFD, 0xFFFD, 0, 0x7F7F}, 4 }, + { __LINE__, 4, 0xBEAF, CP_UTF8, 0, "\xE0\x20\xC0", 4, 5, {0xFFFD, 0x0020, 0xFFFD, 0, 0x7F7F}, 5 }, + { __LINE__, 0, ERROR_NO_UNICODE_TRANSLATION, CP_UTF8, MB_ERR_INVALID_CHARS, "\xC0", 2, 4, {0xFFFD, 0, 0x7F7F}, 3 }, + { __LINE__, 0, ERROR_NO_UNICODE_TRANSLATION, CP_UTF8, MB_ERR_INVALID_CHARS, "\xC0\xC0\x80", 4, 5, {0xFFFD, 0xFFFD, 0xFFFD, 0, 0x7F7F}, 5 }, + { __LINE__, 0, ERROR_NO_UNICODE_TRANSLATION, CP_UTF8, MB_ERR_INVALID_CHARS, "\xE0\xC0", 3, 4, {0xFFFD, 0xFFFD, 0, 0x7F7F}, 4 }, + { __LINE__, 0, ERROR_NO_UNICODE_TRANSLATION, CP_UTF8, MB_ERR_INVALID_CHARS, "\xE0\x20\xC0", 4, 5, {0xFFFD, 0x0020, 0xFFFD, 0, 0x7F7F}, 5 }, + /* invalid UTF-8 sequences with short buffer */ + { __LINE__, 0, ERROR_INSUFFICIENT_BUFFER, CP_UTF8, 0, "\xC0", 2, 1, {0xFFFD, 0x7F7F}, 2}, + { __LINE__, 0, ERROR_INSUFFICIENT_BUFFER, CP_UTF8, 0, "\xC0\xC0\x80", 4, 1, {0xFFFD, 0x7F7F}, 2 }, + { __LINE__, 0, ERROR_INSUFFICIENT_BUFFER, CP_UTF8, 0, "\xE0\xC0", 3, 1, {0xFFFD, 0x7F7F}, 2 }, + { __LINE__, 0, ERROR_INSUFFICIENT_BUFFER, CP_UTF8, 0, "\xE0\x20\xC0", 4, 1, {0xFFFD, 0x7F7F}, 2 }, + { __LINE__, 0, ERROR_INSUFFICIENT_BUFFER, CP_UTF8, MB_ERR_INVALID_CHARS, "\xC0", 2, 1, {0xFFFD, 0x7F7F}, 2 }, + { __LINE__, 0, ERROR_INSUFFICIENT_BUFFER, CP_UTF8, MB_ERR_INVALID_CHARS, "\xC0\xC0\x80", 4, 1, {0xFFFD, 0x7F7F}, 2 }, + { __LINE__, 0, ERROR_INSUFFICIENT_BUFFER, CP_UTF8, MB_ERR_INVALID_CHARS, "\xE0\xC0", 3, 1, {0xFFFD, 0x7F7F}, 2 }, + { __LINE__, 0, ERROR_INSUFFICIENT_BUFFER, CP_UTF8, MB_ERR_INVALID_CHARS, "\xE0\x20\xC0", 4, 1, {0xFFFD, 0x7F7F}, 2 }, + /* Japanese UTF-8 without buffer */ + { __LINE__, 4, 0xBEAF, CP_UTF8, 0, UTF8_Japanese, sizeof(UTF8_Japanese) }, + { __LINE__, 4, 0xBEAF, CP_UTF8, MB_ERR_INVALID_CHARS, UTF8_Japanese, sizeof(UTF8_Japanese) }, + /* Japanese UTF-8 with buffer */ + { __LINE__, 4, 0xBEAF, CP_UTF8, 0, UTF8_Japanese, sizeof(UTF8_Japanese), 4, {0x65E5, 0x672C, 0x8A9E, 0, 0x7F7F}, 5 }, + { __LINE__, 4, 0xBEAF, CP_UTF8, MB_ERR_INVALID_CHARS, UTF8_Japanese, sizeof(UTF8_Japanese), 4, {0x65E5, 0x672C, 0x8A9E, 0, 0x7F7F}, 5 }, + /* Japanese UTF-8 with short buffer */ + { __LINE__, 0, ERROR_INSUFFICIENT_BUFFER, CP_UTF8, 0, UTF8_Japanese, sizeof(UTF8_Japanese), 1, {0x65E5, 0x7F7F}, 2 }, + { __LINE__, 0, ERROR_INSUFFICIENT_BUFFER, CP_UTF8, MB_ERR_INVALID_CHARS, UTF8_Japanese, sizeof(UTF8_Japanese), 1, {0x65E5, 0x7F7F}, 2 }, + /* Japanese UTF-8 truncated source */ + { __LINE__, 1, 0xBEAF, CP_UTF8, 0, UTF8_Japanese, 1, 4, {0xFFFD, 0x7F7F}, 2 }, + { __LINE__, 0, ERROR_NO_UNICODE_TRANSLATION, CP_UTF8, MB_ERR_INVALID_CHARS, UTF8_Japanese, 1, 4, {0xFFFD, 0x7F7F}, 2 }, + /* Japanese CP932 without buffer */ + { __LINE__, 4, 0xBEAF, CP932, 0, SJIS_Japanese, sizeof(SJIS_Japanese) }, + { __LINE__, 4, 0xBEAF, CP932, MB_ERR_INVALID_CHARS, SJIS_Japanese, sizeof(SJIS_Japanese) }, + /* Japanese CP932 with buffer */ + { __LINE__, 4, 0xBEAF, CP932, 0, SJIS_Japanese, sizeof(SJIS_Japanese), 4, {0x65E5, 0x672C, 0x8A9E, 0, 0x7F7F}, 5 }, + { __LINE__, 4, 0xBEAF, CP932, MB_ERR_INVALID_CHARS, SJIS_Japanese, sizeof(SJIS_Japanese), 4, {0x65E5, 0x672C, 0x8A9E, 0, 0x7F7F}, 5 }, + /* Japanese CP932 with short buffer */ + { __LINE__, 0, ERROR_INSUFFICIENT_BUFFER, CP932, 0, SJIS_Japanese, sizeof(SJIS_Japanese), 1, {0x65E5, 0x7F7F}, 2 }, + { __LINE__, 0, ERROR_INSUFFICIENT_BUFFER, CP932, MB_ERR_INVALID_CHARS, SJIS_Japanese, sizeof(SJIS_Japanese), 1, {0x65E5, 0x7F7F}, 2 }, + /* Japanese CP932 truncated source */ + { __LINE__, 1, 0xBEAF, CP932, 0, SJIS_Japanese, 1, 4, {0x30FB, 0x7F7F}, 2 }, + { __LINE__, 0, ERROR_NO_UNICODE_TRANSLATION, CP932, MB_ERR_INVALID_CHARS, SJIS_Japanese, 1, 4, {0x7F7F, 0x7F7F}, 2 }, +}; + +static void TestEntry(const ENTRY *pEntry) { - int ret; + int ret, i; + WCHAR Buffer[MAX_BUFFER]; + DWORD Error; - ret = MultiByteToWideChar(CP_UTF8, 0, "a", sizeof("a"), 0, 0); - ok(ret == 2, "ret should be 2, is %d\n", ret); + FillMemory(Buffer, sizeof(Buffer), 0x7F); + SetLastError(0xBEAF); - ret = MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, "a", sizeof("a"), 0, 0); - ok(ret == 2, "ret should be 2, is %d\n", ret); + if (pEntry->DestLen == 0) + { + /* dest is NULL */ + ret = MultiByteToWideChar(pEntry->CodePage, pEntry->Flags, pEntry->Src, + pEntry->SrcLen, NULL, 0); + } + else + { + ok(pEntry->DestLen >= pEntry->CheckLen - 1, + "Line %d: DestLen was shorter than (CheckLen - 1)\n", pEntry->LineNo); + + if (pEntry->SamePointer) + { + /* src ptr == dest ptr */ + ret = MultiByteToWideChar(pEntry->CodePage, pEntry->Flags, + (const char *)Buffer, pEntry->SrcLen, + Buffer, pEntry->DestLen); + } + else + { + /* src ptr != dest ptr */ + ret = MultiByteToWideChar(pEntry->CodePage, pEntry->Flags, + pEntry->Src, pEntry->SrcLen, + Buffer, pEntry->DestLen); + } + } + + Error = GetLastError(); + + /* check ret */ + ok(ret == pEntry->Return, "Line %d: ret expected %d, got %d\n", + pEntry->LineNo, pEntry->Return, ret); + + /* check error code */ + ok(Error == pEntry->Error, + "Line %d: Wrong last error. Expected %lu, got %lu\n", + pEntry->LineNo, pEntry->Error, Error); + + if (pEntry->DestLen) + { + /* check buffer */ + for (i = 0; i < pEntry->CheckLen; ++i) + { + ok(Buffer[i] == pEntry->CheckDest[i], "Line %d: Buffer[%d] expected %d, got %d\n", + pEntry->LineNo, i, pEntry->CheckDest[i], Buffer[i]); + } + } +} + +START_TEST(MultiByteToWideChar) +{ + size_t i; + for (i = 0; i < _countof(Entries); ++i) + { + TestEntry(&Entries[i]); + } }

5 years, 8 months

[reactos] 01/01: [SDK][ATL] Independence day of ReactOS ATL (#1473)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=572e028de1198c9d91836… commit 572e028de1198c9d91836ea54d46feb025bc5e1d Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Apr 5 19:45:45 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Apr 5 19:45:45 2019 +0900 [SDK][ATL] Independence day of ReactOS ATL (#1473) Today is the Independence Day of ReactOS ATL (RATL). CORE-12935 https://github.com/katahiromz/RATL --- sdk/lib/atl/atlcore.h | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/sdk/lib/atl/atlcore.h b/sdk/lib/atl/atlcore.h index 1d4ec7b4bd..279fa7f107 100644 --- a/sdk/lib/atl/atlcore.h +++ b/sdk/lib/atl/atlcore.h @@ -22,14 +22,18 @@ #include <malloc.h> -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H -#include <stdarg.h> -#include <windef.h> -#include <winbase.h> -#include <winreg.h> -#include <winnls.h> +#ifdef __REACTOS__ + #define WIN32_NO_STATUS + #define _INC_WINDOWS + #define COM_NO_WINDOWS_H + #include <stdarg.h> + #include <windef.h> + #include <winbase.h> + #include <winreg.h> + #include <winnls.h> +#else + #include <windows.h> +#endif #include <ole2.h> #include <olectl.h> #include <crtdbg.h>

5 years, 8 months

← Newer
1
...
17
18
19
20
21
22
23
24
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2019