Ros-diffs October 2021

ros-diffs@reactos.org

26 participants
116 discussions

[reactos] 01/01: [IPHLPAPI] Check the family parameter in the statistics functions

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=da4e15f93aa1337890907… commit da4e15f93aa1337890907f06e87419d4cc70e918 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon Oct 25 00:36:03 2021 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon Oct 25 00:36:03 2021 +0200 [IPHLPAPI] Check the family parameter in the statistics functions --- dll/win32/iphlpapi/ipstats_reactos.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/dll/win32/iphlpapi/ipstats_reactos.c b/dll/win32/iphlpapi/ipstats_reactos.c index a1214926a72..b3cda7eb64a 100644 --- a/dll/win32/iphlpapi/ipstats_reactos.c +++ b/dll/win32/iphlpapi/ipstats_reactos.c @@ -179,7 +179,7 @@ NTSTATUS tdiGetIpAddrsForIpEntity INFO_TYPE_PROVIDER, IP_MIB_ADDRTABLE_ENTRY_ID, CL_NL_ENTITY, - ent->tei_instance, + ent->tei_instance, 0, sizeof(IPAddrEntry), (PVOID *)addrs, @@ -334,6 +334,10 @@ DWORD getIPStats(PMIB_IPSTATS stats, DWORD family) { if (!stats) return ERROR_INVALID_PARAMETER; + + if (family != AF_INET && family != AF_INET6) + return ERROR_INVALID_PARAMETER; + return NO_ERROR; } @@ -341,6 +345,10 @@ DWORD getTCPStats(MIB_TCPSTATS *stats, DWORD family) { if (!stats) return ERROR_INVALID_PARAMETER; + + if (family != AF_INET && family != AF_INET6) + return ERROR_INVALID_PARAMETER; + return NO_ERROR; } @@ -348,6 +356,10 @@ DWORD getUDPStats(MIB_UDPSTATS *stats, DWORD family) { if (!stats) return ERROR_INVALID_PARAMETER; + + if (family != AF_INET && family != AF_INET6) + return ERROR_INVALID_PARAMETER; + return NO_ERROR; }

2 years, 11 months

[reactos] 02/02: [BOOTDATA] hivesys.inf: Add Russian translation for keyboard layouts

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cdcd9547348efb713f465… commit cdcd9547348efb713f465c25267a05d429c1b720 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Mon Oct 25 00:46:08 2021 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Mon Oct 25 00:46:08 2021 +0300 [BOOTDATA] hivesys.inf: Add Russian translation for keyboard layouts [INPUT.CPL] Fix some mistakes in Russian translation --- boot/bootdata/hivesys.inf | 89 +++++++++++++++++++++++++++++++++++++++++++++ dll/cpl/input/lang/ru-RU.rc | 10 ++--- 2 files changed, 94 insertions(+), 5 deletions(-) diff --git a/boot/bootdata/hivesys.inf b/boot/bootdata/hivesys.inf index ca1c8d71683..74d6df755ef 100644 --- a/boot/bootdata/hivesys.inf +++ b/boot/bootdata/hivesys.inf @@ -2779,6 +2779,95 @@ WORKSTATION_SERVICE_DESCRIPTION="Обеспечивает поддержку с WUAUSERV_SERVICE="Automatic Updates" WUAUSERV_SERVICE_DESCRIPTION="AutoUpdate Service stub." +; Keyboard layouts +ALBANIAN = "Албанская" +ARABIC_101 = "Арабская (101)" +ARABIC_102 = "Арабская (102)" +ARABIC_102_AZERTY = "Арабская (102) AZERTY" +ARMENIAN_EASTERN = "Армянская восточная" +ARMENIAN_WESTERN = "Армянская западная" +ASSAMESE = "Ассамская - инскрипт" +AZERI_CYRILLIC = "Азербайджанская (кир)" +AZERI_LATIN = "Азербайджанская (лат)" +BELARUSIAN = "Белорусская" +BELGIAN_DUTCH = "Бельгийская (голландская)" +BELGIAN_FRENCH = "Бельгийская (французская)" +BENGALI = "Бенгальская" +BENGALI_INSCRIPT = "Бенгальская - инскрипт" +BULGARIAN_BDS = "Болгарская (BDS 5237-1978)" +BULGARIAN_PHONETIC = "Болгарская фонетическая (классическая)" +BULGARIAN_PHONETIC_BDS = "Болгарская фонетическая (BDS 5237-2006)" +BURMESE = "Бирманская" +CANADIAN_FRENCH = "Канадская (французская традиционная)" +CANADIAN_MULTILINGUAL = "Канадская стандартная (многоязычная)" +CROATIAN = "Хорватская" +CZECH = "Чешская" +CZECH_QWERTY = "Чешская (QWERTY)" +DANISH = "Датская" +DEVANAGARI = "Деванагари - инскрипт" +DUTCH = "Голландская" +ESPERANTO = "Эсперанто" +ESTONIAN = "Эстонская" +GERMAN_ERGO = "Немецкая (de_ergo)" +GERMAN_NEO = "Немецкая (NEO-1.1)" +GERMAN_RISTOME = "Немецкая (RISTOME)" +GERMAN = "Немецкая" +GREEK = "Греческая" +GUJARATI = "Гуджарати" +IRISH = "Ирландская" +FAEROESE = "Фарерская" +FINNISH = "Финская" +FRENCH = "Французская" +GEORGIAN = "Грузинская" +HEBREW = "Иврит" +HUNGARIAN = "Венгерская" +ICELANDIC = "Исландская" +ITALIAN = "Итальянская" +JAPANESE = "Японская" +KAZAKH = "Казахская" +KOREAN = "Корейская" +LATIN_AMERICAN = "Латиноамериканская" +LATVIAN = "Латышская" +LATVIAN_QWERTY = "Латышская (QWERTY)" +LITHUANIAN = "Литовская" +MACEDONIAN = "Македонская (FYROM)" +MALAYALAM = "Малаялам" +NORWEGIAN = "Норвежская" +POLISH_214 = "Польская (214)" +POLISH_PROGRAMMERS = "Польская (программистская)" +PORTUGESE = "Португальская (Португалия)" +PORTUGESE_BRAZILIAN = "Португальская (Бразилия ABNT2)" +ROMANIAN_LEGACY = "Румынская (традиционная)" +ROMANIAN_STANDARD = "Румынская (стандартная)" +RUSSIAN = "Русская" +RUSSIAN_TYPEWRITER = "Русская (машинопись)" +SERBIAN_CYRILLIC = "Сербская (кириллица)" +SERBIAN_LATIN = "Сербская (латиница)" +SLOVAK = "Словацкая" +SLOVAK_QWERTY = "Словацкая (QWERTY)" +SPANISH = "Испанская" +SWEDISH = "Шведская" +SWISS_FRENCH = "Швейцарская французская" +SWISS_GERMAN = "Швейцарская немецкая" +TATAR = "Татарская" +THAI_KEDMANEE = "Тайская Кедмани" +THAI_KEDMANEE_NON_SHIFTLOCK = "Тайская Кедмани (без ShiftLock)" +THAI_PATTACHOTE = "Тайская Паташот" +THAI_PATTACHOTE_NON_SHIFTLOCK = "Тайская Паташот (без ShiftLock)" +TURKISH_Q = "Турецкая Q" +TURKISH_F = "Турецкая F" +UK = "Британская" +UKRAINIAN = "Украинская" +UKRAINIAN_STUDENT = "Украинская (студенческая)" +US = "США" +US_ARABIC = "США английская табличная для IBM арабского 238_L" +US_DVORAK = "США - по Двораку" +US_DVORAK_LEFT = "США - по Двораку для левой руки" +US_DVORAK_RIGHT = "США - по Двораку для правой руки" +US_INTERNATIONAL = "США - международная" +UZBEK_CYRILLIC = "Узбекская кириллица" +VIETNAMESE = "Вьетнамская" + ; LANG_SPANISH SUBLANG_NEUTRAL [Strings.000A] diff --git a/dll/cpl/input/lang/ru-RU.rc b/dll/cpl/input/lang/ru-RU.rc index 01f8359a284..2a7bd8646a6 100644 --- a/dll/cpl/input/lang/ru-RU.rc +++ b/dll/cpl/input/lang/ru-RU.rc @@ -194,15 +194,15 @@ BEGIN IDS_JAPANESE_INPUT_SYSTEM_MSIME2002_LAYOUT "Японская система ввода (MS-IME2002)" IDS_KANNADA_LAYOUT "Каннада" IDS_KAZAKH_LAYOUT "Казахская" - IDS_KOREAN_LAYOUT "Корейский" + IDS_KOREAN_LAYOUT "Корейская" IDS_KOREAN_INPUT_SYSTEM_MSIME2002_LAYOUT "Корейская система ввода (MS-IME98)" IDS_KYRGYZ_CYRILLIC_LAYOUT "Киргизская (кириллица)" IDS_LATIN_AMERICAN_LAYOUT "Латиноамериканская" IDS_LATVIAN_LAYOUT "Латышская" - IDS_LATVIAN_QWERTY_LAYOUT "Латвийская (QWERTY)" + IDS_LATVIAN_QWERTY_LAYOUT "Латышская (QWERTY)" IDS_LITHUANIAN_LAYOUT "Литовская" IDS_LITHUANIAN_IBM_LAYOUT "Литовская IBM" - IDS_FYRO_MACEDONIAN_LAYOUT "Македонский (FYROM)" + IDS_FYRO_MACEDONIAN_LAYOUT "Македонская (FYROM)" IDS_MALAYALAM_LAYOUT "Малаялам" IDS_MARATHI_LAYOUT "Маратхи" IDS_MONGOLIAN_CYRILLIC_LAYOUT "Монгольская (кириллица)" @@ -211,8 +211,8 @@ BEGIN IDS_POLISH_214_LAYOUT "Польская (214)" IDS_POLISH_LAYOUT "Польская (программистская)" IDS_PORTUGUESE_LAYOUT "Португальская" - IDS_PORTUGUESE_BRAZILIAN_ABNT_LAYOUT "Португальская (Бразильская ABNT)" - IDS_PORTUGUESE_BRAZIL_ABNT2_LAYOUT "Португальская (Бразилия)" + IDS_PORTUGUESE_BRAZILIAN_ABNT_LAYOUT "Португальская (Бразилия ABNT)" + IDS_PORTUGUESE_BRAZIL_ABNT2_LAYOUT "Португальская (Бразилия ABNT2)" IDS_PUNJABI_LAYOUT "Пенджабская" IDS_ROMANIAN_LEGACY_LAYOUT "Румынская (традиционная)" IDS_ROMANIAN_STANDARD_LAYOUT "Румынская (стандартная)"

2 years, 11 months

[reactos] 01/02: [BOOTDATA] hivesys.inf: Fix keyboard layout identifier for Bengali Inscript

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c6e002bfb3069e0c1dc2b… commit c6e002bfb3069e0c1dc2b313b1a5bc11821eac07 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Mon Oct 25 00:16:13 2021 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Mon Oct 25 00:44:18 2021 +0300 [BOOTDATA] hivesys.inf: Fix keyboard layout identifier for Bengali Inscript - Also fix typo in Latvian (QWERTY) keyboard layout - Also add missing localization for Bengali Inscript and Esperanto layouts --- boot/bootdata/hivesys.inf | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/boot/bootdata/hivesys.inf b/boot/bootdata/hivesys.inf index dd300216656..ca1c8d71683 100644 --- a/boot/bootdata/hivesys.inf +++ b/boot/bootdata/hivesys.inf @@ -736,7 +736,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000426","Layout Text", HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000426","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5043" ; HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010426","Layout File",0x00000000,"kbdlv1.dll" -; HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010426","Layout Text",0x00000000,%LATVIAN_QUERTY% +; HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010426","Layout Text",0x00000000,%LATVIAN_QWERTY% ; HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010426","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5044" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010427","Layout File",0x00000000,"kbdlt1.dll" @@ -795,9 +795,9 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000445","Layout File", HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000445","Layout Text",0x00000000,%BENGALI% HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000445","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5135" -; HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000845","Layout File",0x00000000,"kbdinben.dll" -; HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000845","Layout Text",0x00000000,"Bengali" -; HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000845","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5135" +; HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00020445","Layout File",0x00000000,"kbdinbe2.dll" +; HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00020445","Layout Text",0x00000000,%BENGALI_INSCRIPT% +; HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00020445","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5135" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000447","Layout File",0x00000000,"kbdinguj.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000447","Layout Text",0x00000000,%GUJARATI% @@ -816,7 +816,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000455","Layout Text", HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000455","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5140" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000048f","Layout File",0x00000000,"kbdeo.dll" -HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000048f","Layout Text",0x00000000,"Esperanto" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000048f","Layout Text",0x00000000,%ESPERANTO% HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000048f","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5142" ; Keyboard layouts @@ -2331,6 +2331,7 @@ BELARUSIAN = "Belarusian" BELGIAN_DUTCH = "Belgian (Dutch)" BELGIAN_FRENCH = "Belgian (French)" BENGALI = "Bengali" +BENGALI_INSCRIPT = "Bengali - INSCRIPT" BULGARIAN_BDS = "Bulgarian BDS 5237-1978" BULGARIAN_PHONETIC = "Bulgarian phonetic classic" BULGARIAN_PHONETIC_BDS = "Bulgarian phonetic BDS 5237-2006" @@ -2343,6 +2344,7 @@ CZECH_QWERTY = "Czech (QWERTY)" DANISH = "Danish" DEVANAGARI = "Devanagari - INSCRIPT" DUTCH = "Dutch" +ESPERANTO = "Esperanto" ESTONIAN = "Estonian" GERMAN_ERGO = "German (de_ergo)" GERMAN_NEO = "German (NEO-1.1)" @@ -2364,7 +2366,7 @@ KAZAKH = "Kazakh" KOREAN = "Korean" LATIN_AMERICAN = "Latin American" LATVIAN = "Latvian" -LATVIAN_QUERTY = "Latvian (QUERTY)" +LATVIAN_QWERTY = "Latvian (QWERTY)" LITHUANIAN = "Lithuanian" MACEDONIAN = "Macedonian (FYRO)" MALAYALAM = "Malayalam" @@ -2486,6 +2488,7 @@ BELARUSIAN = "Białoruski" BELGIAN_DUTCH = "Belgijski (Period)" BELGIAN_FRENCH = "Belgijski Francuski" BENGALI = "Bengalski" +BENGALI_INSCRIPT = "Bengalski - INSCRIPT" BULGARIAN_BDS = "Bułgarski BDS 5237-1978" BULGARIAN_PHONETIC = "Bułgarski (Fonetyczny)" BULGARIAN_PHONETIC_BDS = "Bułgarski (Fonetyczny, BDS)" @@ -2498,6 +2501,7 @@ CZECH_QWERTY = "Czeski (QWERTY)" DANISH = "Duński" DEVANAGARI = "Devanagari - INSCRIPT" DUTCH = "Holenderski" +ESPERANTO = "Esperanto" ESTONIAN = "Estoński" GERMAN_ERGO = "Niemiecki (de_ergo)" GERMAN_NEO = "Niemiecki (NEO-1.1)" @@ -2519,7 +2523,7 @@ KAZAKH = "Kazachski" KOREAN = "Koreański" LATIN_AMERICAN = "Latynoamerykański" LATVIAN = "Łotewski" -LATVIAN_QUERTY = "Łotewski (QUERTY)" +LATVIAN_QWERTY = "Łotewski (QWERTY)" LITHUANIAN = "Litewski" MACEDONIAN = "Macedoński (FYRO)" MALAYALAM = "Malajalam" @@ -2635,6 +2639,7 @@ BELARUSIAN = "Belarusă" BELGIAN_DUTCH = "Belgiană (Olandeză)" BELGIAN_FRENCH = "Belgiană (Franceză)" BENGALI = "Bengaleză" +BENGALI_INSCRIPT = "Bengaleză - INSCRIPT" BULGARIAN_BDS = "Bulgară BDS 5237-1978" BULGARIAN_PHONETIC = "Bulgară, fonetică clasică" BULGARIAN_PHONETIC_BDS = "Bulgară, fonetică BDS 5237-2006" @@ -2647,6 +2652,7 @@ CZECH_QWERTY = "Cehă (QWERTY)" DANISH = "Daneză" DEVANAGARI = "Devanagari - INSCRIPT" DUTCH = "Olandeză" +ESPERANTO = "Esperanto" ESTONIAN = "Estonă" GERMAN_ERGO = "Germană (de_ergo)" GERMAN_NEO = "Germană (NEO-1.1)" @@ -2668,7 +2674,7 @@ KAZAKH = "Kazahă" KOREAN = "Coreeană" LATIN_AMERICAN = "Iberoamericană" LATVIAN = "Letonă" -LATVIAN_QUERTY = "Letonă (QUERTY)" +LATVIAN_QWERTY = "Letonă (QWERTY)" LITHUANIAN = "Lituaniană" MACEDONIAN = "Macedonă (FYRO)" MALAYALAM = "Malayalam" @@ -2855,6 +2861,7 @@ BELARUSIAN = "Bielorruso" BELGIAN_DUTCH = "Belga (Holandés)" BELGIAN_FRENCH = "Belga (Francés)" BENGALI = "Bengalí" +BENGALI_INSCRIPT = "Bengalí - INSCRIPT" BULGARIAN_BDS = "Búlgaro BDS 5237-1978" BULGARIAN_PHONETIC = "Búlgaro fonético clásico" BULGARIAN_PHONETIC_BDS = "Búlgaro fonético BDS 5237-2006" @@ -2867,6 +2874,7 @@ CZECH_QWERTY = "Checo (QWERTY)" DANISH = "Danés" DEVANAGARI = "Devanagari - INSCRIPT" DUTCH = "Holandés" +ESPERANTO = "Esperanto" ESTONIAN = "Estonio" GERMAN_ERGO = "Alemán (de_ergo)" GERMAN_NEO = "Alemán (NEO-1.1)" @@ -2888,7 +2896,7 @@ KAZAKH = "Kazajo" KOREAN = "Coreano" LATIN_AMERICAN = "Español (America Latina)" LATVIAN = "Letón" -LATVIAN_QUERTY = "Letón (QUERTY)" +LATVIAN_QWERTY = "Letón (QWERTY)" LITHUANIAN = "Lituano" MACEDONIAN = "Macedonia (FYRO)" MALAYALAM = "Malabari" @@ -3009,6 +3017,7 @@ BELARUSIAN = "Belarusça" BELGIAN_DUTCH = "Felemenkçe (Hollanda)" BELGIAN_FRENCH = "Felemenkçe (Fransa)" BENGALI = "Bengalce" +BENGALI_INSCRIPT = "Bengalce - INSCRIPT" BULGARIAN_BDS = "Bulgarca BDS 5237-1978" BULGARIAN_PHONETIC = "Bulgarca klasik fonetik" BULGARIAN_PHONETIC_BDS = "Bulgarca fonetik BDS 5237-2006" @@ -3021,6 +3030,7 @@ CZECH_QWERTY = "Çekçe (QWERTY)" DANISH = "Danca" DEVANAGARI = "Devanagari - INSCRIPT" DUTCH = "Hollandaca" +ESPERANTO = "Esperanto" ESTONIAN = "Estonca" GERMAN_ERGO = "Almanca (de_ergo)" GERMAN_NEO = "Almanca (NEO-1.1)" @@ -3042,7 +3052,7 @@ KAZAKH = "Kazakça" KOREAN = "Korece" LATIN_AMERICAN = "Latin Amerikanca" LATVIAN = "Letonca" -LATVIAN_QUERTY = "Letonca (QUERTY)" +LATVIAN_QWERTY = "Letonca (QWERTY)" LITHUANIAN = "Litvcanyaca" MACEDONIAN = "Makedonca (FYRO)" MALAYALAM = "Malayalam"

2 years, 11 months

[reactos] 01/01: [BOOTDATA] Fix another hivesys.inf typo introduced in 8e521934 (ICELANDIC)

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4b88a8709c8af9a085756… commit 4b88a8709c8af9a085756e999bdd81d82412870d Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sun Oct 24 23:46:42 2021 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sun Oct 24 23:46:42 2021 +0300 [BOOTDATA] Fix another hivesys.inf typo introduced in 8e521934 (ICELANDIC) Addendum to 6ce259e6. --- boot/bootdata/hivesys.inf | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/boot/bootdata/hivesys.inf b/boot/bootdata/hivesys.inf index a38600d5f68..dd300216656 100644 --- a/boot/bootdata/hivesys.inf +++ b/boot/bootdata/hivesys.inf @@ -601,7 +601,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000040e","Layout Text", HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000040e","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5033" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000040f","Layout File",0x00000000,"kbdic.dll" -HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000040f","Layout Text",0x00000000,%ICELANDIC%"Icelandic" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000040f","Layout Text",0x00000000,%ICELANDIC% HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000040f","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5013" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000410","Layout File",0x00000000,"kbdit.dll" @@ -815,7 +815,6 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000455","Layout File", HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000455","Layout Text",0x00000000,%BURMESE% HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000455","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5140" - HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000048f","Layout File",0x00000000,"kbdeo.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000048f","Layout Text",0x00000000,"Esperanto" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000048f","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5142"

2 years, 11 months

[reactos] 02/02: [SYSSETUP][INTL.CPL] Use GetGeoInfoW with current thread locale

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9635f45bd4b088bf075ea… commit 9635f45bd4b088bf075eac6b7b6870c964cd6a24 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sun Oct 24 20:10:28 2021 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sun Oct 24 23:42:14 2021 +0300 [SYSSETUP][INTL.CPL] Use GetGeoInfoW with current thread locale Fixes inconsistency when thread locale differs from system or user locale. --- dll/cpl/intl/generalp.c | 4 ++-- dll/win32/syssetup/wizard.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dll/cpl/intl/generalp.c b/dll/cpl/intl/generalp.c index 8055e89edd4..76beeb0370a 100644 --- a/dll/cpl/intl/generalp.c +++ b/dll/cpl/intl/generalp.c @@ -1162,7 +1162,7 @@ LocationsEnumProc(GEOID gId) WCHAR loc[MAX_STR_SIZE]; INT index; - if (GetGeoInfoW(gId, GEO_FRIENDLYNAME, loc, MAX_STR_SIZE, LANG_SYSTEM_DEFAULT) == 0) + if (GetGeoInfoW(gId, GEO_FRIENDLYNAME, loc, MAX_STR_SIZE, GetThreadLocale()) == 0) return TRUE; index = (INT)SendMessageW(hGeoList, @@ -1196,7 +1196,7 @@ CreateLocationsList(HWND hWnd) GEO_FRIENDLYNAME, loc, MAX_STR_SIZE, - LANG_SYSTEM_DEFAULT); + GetThreadLocale()); SendMessageW(hGeoList, CB_SELECTSTRING, diff --git a/dll/win32/syssetup/wizard.c b/dll/win32/syssetup/wizard.c index 330b0f2916b..6d7d5861061 100644 --- a/dll/win32/syssetup/wizard.c +++ b/dll/win32/syssetup/wizard.c @@ -1095,7 +1095,7 @@ SetUserLocaleName(HWND hwnd) WCHAR LocaleText[256 * 2]; GetLocaleInfoW(GetUserDefaultLCID(), LOCALE_SLANGUAGE, CurLocale, ARRAYSIZE(CurLocale)); - GetGeoInfoW(GetUserGeoID(GEOCLASS_NATION), GEO_FRIENDLYNAME, CurGeo, ARRAYSIZE(CurGeo), LANG_SYSTEM_DEFAULT); + GetGeoInfoW(GetUserGeoID(GEOCLASS_NATION), GEO_FRIENDLYNAME, CurGeo, ARRAYSIZE(CurGeo), GetThreadLocale()); LoadStringW(hDllInstance, IDS_LOCALETEXT, ResText, ARRAYSIZE(ResText)); StringCchPrintfW(LocaleText, ARRAYSIZE(LocaleText), ResText, CurLocale, CurGeo);

2 years, 11 months

[reactos] 01/02: [KERNEL32][WINNLS] GetGeoInfoW: Allow to get localized text

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4278f46620dcd914daaf4… commit 4278f46620dcd914daaf44b10f788c1fd50874b6 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sun Oct 24 20:04:57 2021 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sun Oct 24 23:42:06 2021 +0300 [KERNEL32][WINNLS] GetGeoInfoW: Allow to get localized text Previous implementation ignored the last LangId parameter, and always used GetUserDefaultLCID() instead. --- dll/win32/kernel32/winnls/string/lang.c | 20 ++++++++++++++++++++ dll/win32/kernel32/winnls/string/nls.c | 15 +++++++++------ 2 files changed, 29 insertions(+), 6 deletions(-) diff --git a/dll/win32/kernel32/winnls/string/lang.c b/dll/win32/kernel32/winnls/string/lang.c index 000b3e11bd0..06be3da8cb7 100644 --- a/dll/win32/kernel32/winnls/string/lang.c +++ b/dll/win32/kernel32/winnls/string/lang.c @@ -36,7 +36,11 @@ DEBUG_CHANNEL(nls); extern int wine_fold_string(int flags, const WCHAR *src, int srclen, WCHAR *dst, int dstlen); extern int wine_get_sortkey(int flags, const WCHAR *src, int srclen, char *dst, int dstlen); extern int wine_compare_string(int flags, const WCHAR *str1, int len1, const WCHAR *str2, int len2); +#ifdef __REACTOS__ +extern UINT GetLocalisedText(IN UINT uID, IN LPWSTR lpszDest, IN UINT cchDest, IN LANGID lang); +#else extern UINT GetLocalisedText(IN UINT uID, IN LPWSTR lpszDest, IN UINT cchDest); +#endif #define NLSRC_OFFSET 5000 /* FIXME */ extern HMODULE kernel32_handle; @@ -3503,16 +3507,28 @@ BOOL WINAPI EnumUILanguagesW(UILANGUAGE_ENUMPROCW pUILangEnumProc, DWORD dwFlags } static int +#ifdef __REACTOS__ +NLS_GetGeoFriendlyName(GEOID Location, LPWSTR szFriendlyName, int cchData, LANGID lang) +#else NLS_GetGeoFriendlyName(GEOID Location, LPWSTR szFriendlyName, int cchData) +#endif { /* FIXME: move *.nls resources out of kernel32 into locale.nls */ Location += NLSRC_OFFSET; Location &= 0xFFFF; if (cchData == 0) +#ifdef __REACTOS__ + return GetLocalisedText(Location, NULL, 0, lang); +#else return GetLocalisedText(Location, NULL, 0); +#endif +#ifdef __REACTOS__ + if (GetLocalisedText(Location, szFriendlyName, (UINT)cchData, lang)) +#else if (GetLocalisedText(Location, szFriendlyName, (UINT)cchData)) +#endif return strlenW(szFriendlyName) + 1; return 0; @@ -3564,7 +3580,11 @@ INT WINAPI GetGeoInfoW(GEOID geoid, GEOTYPE geotype, LPWSTR data, int data_len, switch (geotype) { case GEO_FRIENDLYNAME: { +#ifdef __REACTOS__ + return NLS_GetGeoFriendlyName(geoid, data, data_len, lang); +#else return NLS_GetGeoFriendlyName(geoid, data, data_len); +#endif } case GEO_NATION: val = geoid; diff --git a/dll/win32/kernel32/winnls/string/nls.c b/dll/win32/kernel32/winnls/string/nls.c index 712545f6da4..7264fa73cae 100644 --- a/dll/win32/kernel32/winnls/string/nls.c +++ b/dll/win32/kernel32/winnls/string/nls.c @@ -1828,7 +1828,8 @@ UINT GetLocalisedText( IN UINT uID, IN LPWSTR lpszDest, - IN UINT cchDest) + IN UINT cchDest, + IN LANGID lang) { HRSRC hrsrc; HGLOBAL hmem; @@ -1841,8 +1842,7 @@ GetLocalisedText( if (uID == 37) uID = uID * 100; - lcid = GetUserDefaultLCID(); - lcid = ConvertDefaultLocale(lcid); + lcid = ConvertDefaultLocale(lang); langId = LANGIDFROMLCID(lcid); @@ -1981,7 +1981,8 @@ GetCPInfoExW(UINT CodePage, lpCPInfoEx->UnicodeDefaultChar = 0x3f; return GetLocalisedText(lpCPInfoEx->CodePage, lpCPInfoEx->CodePageName, - ARRAYSIZE(lpCPInfoEx->CodePageName)) != 0; + ARRAYSIZE(lpCPInfoEx->CodePageName), + GetThreadLocale()) != 0; } break; @@ -1991,7 +1992,8 @@ GetCPInfoExW(UINT CodePage, lpCPInfoEx->UnicodeDefaultChar = 0x3f; return GetLocalisedText(lpCPInfoEx->CodePage, lpCPInfoEx->CodePageName, - ARRAYSIZE(lpCPInfoEx->CodePageName)) != 0; + ARRAYSIZE(lpCPInfoEx->CodePageName), + GetThreadLocale()) != 0; } default: @@ -2010,7 +2012,8 @@ GetCPInfoExW(UINT CodePage, lpCPInfoEx->UnicodeDefaultChar = CodePageEntry->CodePageTable.UniDefaultChar; return GetLocalisedText(lpCPInfoEx->CodePage, lpCPInfoEx->CodePageName, - ARRAYSIZE(lpCPInfoEx->CodePageName)) != 0; + ARRAYSIZE(lpCPInfoEx->CodePageName), + GetThreadLocale()) != 0; } break; }

2 years, 11 months

[reactos] 01/01: [IPHLPAPI] GetInterfaceInfo(): Add "\DEVICE\TCPIP_"-Prefix to interface names

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1b35626d54ea157dbeb07… commit 1b35626d54ea157dbeb07660dd2a8308e0facb16 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Oct 24 16:52:18 2021 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Oct 24 16:52:18 2021 +0200 [IPHLPAPI] GetInterfaceInfo(): Add "\DEVICE\TCPIP_"-Prefix to interface names --- dll/win32/iphlpapi/iphlpapi_main.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dll/win32/iphlpapi/iphlpapi_main.c b/dll/win32/iphlpapi/iphlpapi_main.c index 7a4253ff65d..377a1cbaa80 100644 --- a/dll/win32/iphlpapi/iphlpapi_main.c +++ b/dll/win32/iphlpapi/iphlpapi_main.c @@ -1763,9 +1763,10 @@ DWORD WINAPI GetInterfaceInfo(PIP_INTERFACE_INFO pIfTable, PULONG dwOutBufLen) pIfTable->Adapter[ndx].Index = table->indexes[ndx]; name = getInterfaceNameByIndex(table->indexes[ndx]); - for (walker = name, assigner = pIfTable->Adapter[ndx].Name; + wcscpy(pIfTable->Adapter[ndx].Name, L"\\DEVICE\\TCPIP_"); + for (walker = name, assigner = &pIfTable->Adapter[ndx].Name[14]; walker && *walker && - assigner - pIfTable->Adapter[ndx].Name < MAX_ADAPTER_NAME - 1; + assigner - pIfTable->Adapter[ndx].Name < MAX_ADAPTER_NAME - 1 - 14; walker++, assigner++) *assigner = *walker; *assigner = 0;

2 years, 11 months

[reactos] 01/01: [BOOTDATA] Fix problem in PORTUGESE_BRAZILIAN strings in hivesys.inf

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6ce259e694fb4adc3980b… commit 6ce259e694fb4adc3980bbacc5f66ce6f7a5ce09 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sun Oct 24 16:48:26 2021 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sun Oct 24 16:52:53 2021 +0300 [BOOTDATA] Fix problem in PORTUGESE_BRAZILIAN strings in hivesys.inf Regressed in 2017 with r74654 (commit hash 8e521934). --- boot/bootdata/hivesys.inf | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/boot/bootdata/hivesys.inf b/boot/bootdata/hivesys.inf index 21d2ba30d47..a38600d5f68 100644 --- a/boot/bootdata/hivesys.inf +++ b/boot/bootdata/hivesys.inf @@ -2373,7 +2373,7 @@ NORWEGIAN = "Norwegian" POLISH_214 = "Polish (214)" POLISH_PROGRAMMERS = "Polish (Programmers)" PORTUGESE = "Portuguese (Portugal)" -PORTUGESE_BRAZILIAN% = "Portuguese (Brazilian ABNT2)" +PORTUGESE_BRAZILIAN = "Portuguese (Brazilian ABNT2)" ROMANIAN_LEGACY = "Romanian (Legacy)" ROMANIAN_STANDARD = "Romanian (Standard)" RUSSIAN = "Russian" @@ -2528,7 +2528,7 @@ NORWEGIAN = "Norweski" POLISH_214 = "Polski (214)" POLISH_PROGRAMMERS = "Polski (Programisty)" PORTUGESE = "Portugalski" -PORTUGESE_BRAZILIAN% = "Portugalski (Brazylijski ABNT2)" +PORTUGESE_BRAZILIAN = "Portugalski (Brazylijski ABNT2)" ROMANIAN_LEGACY = "Rumuński (Legacy)" ROMANIAN_STANDARD = "Rumuński (Standard)" RUSSIAN = "Rosyjski" @@ -2677,7 +2677,7 @@ NORWEGIAN = "Norvegiană" POLISH_214 = "Poloneză (214)" POLISH_PROGRAMMERS = "Poloneză (programatori)" PORTUGESE = "Portugheză (Portugalia)" -PORTUGESE_BRAZILIAN% = "Portugheză (Braziliană ABNT2)" +PORTUGESE_BRAZILIAN = "Portugheză (Braziliană ABNT2)" ROMANIAN_LEGACY = "Română (moștenire)" ROMANIAN_STANDARD = "Română (standard)" RUSSIAN = "Rusă" @@ -2897,7 +2897,7 @@ NORWEGIAN = "Noruego" POLISH_214 = "Polaco (214)" POLISH_PROGRAMMERS = "Polaco (Programmers)" PORTUGESE = "Portugués (Portugal)" -PORTUGESE_BRAZILIAN% = "Portugués (Brasil ABNT2)" +PORTUGESE_BRAZILIAN = "Portugués (Brasil ABNT2)" ROMANIAN_LEGACY = "Rumano (Legacy)" ROMANIAN_STANDARD = "Rumano (Standard)" RUSSIAN = "Ruso" @@ -3051,7 +3051,7 @@ NORWEGIAN = "Norveççe" POLISH_214 = "Polonezce (214)" POLISH_PROGRAMMERS = "Polonezce (Programcılar)" PORTUGESE = "Portekizce (Portekiz)" -PORTUGESE_BRAZILIAN% = "Portekizce (Brezilya ABNT2)" +PORTUGESE_BRAZILIAN = "Portekizce (Brezilya ABNT2)" ROMANIAN_LEGACY = "Rumence (Eski)" ROMANIAN_STANDARD = "Rumence (Standart)" RUSSIAN = "Rusça"

2 years, 11 months

[reactos] 01/01: [SHELL32_APITEST] Strengthen ShellHook testcase for fullscreen (#4051)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=067ca884bc848aafba6eb… commit 067ca884bc848aafba6ebf6b87c01206e1e515c5 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Oct 24 09:19:23 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Oct 24 09:19:23 2021 +0900 [SHELL32_APITEST] Strengthen ShellHook testcase for fullscreen (#4051) - Add tests for HSHELL_RUDEAPPACTIVATED. CORE-16130 --- modules/rostests/apitests/shell32/ShellHook.cpp | 228 +++++++++++++++++++++--- 1 file changed, 206 insertions(+), 22 deletions(-) diff --git a/modules/rostests/apitests/shell32/ShellHook.cpp b/modules/rostests/apitests/shell32/ShellHook.cpp index 0efabef3018..1afb4155071 100644 --- a/modules/rostests/apitests/shell32/ShellHook.cpp +++ b/modules/rostests/apitests/shell32/ShellHook.cpp @@ -7,21 +7,6 @@ #include "shelltest.h" #include "undocshell.h" -static UINT s_uShellHookMsg = 0; -static HWND s_hwndHookViewer = NULL; -static HWND s_hwndParent = NULL; -static HWND s_hwndTarget = NULL; -static UINT s_nWindowCreatedCount = 0; -static WCHAR s_szName[] = L"ReactOS ShellHook testcase"; - -static HWND -DoCreateWindow(HWND hwndParent, DWORD style, DWORD exstyle) -{ - return CreateWindowExW(exstyle, s_szName, s_szName, style, - CW_USEDEFAULT, CW_USEDEFAULT, 100, 100, - hwndParent, NULL, GetModuleHandleW(NULL), NULL); -} - struct TEST_ENTRY { INT lineno; @@ -47,7 +32,7 @@ struct TEST_ENTRY #define TYPE_1 FALSE, TRUE #define TYPE_2 TRUE, TRUE -static const TEST_ENTRY s_entries[] = +static const TEST_ENTRY s_entries1[] = { // TYPE_0 { __LINE__, 0, TYPE_0, STYLE_0, EXSTYLE_0 }, @@ -260,7 +245,152 @@ static const TEST_ENTRY s_entries[] = { __LINE__, 0, TYPE_2, STYLE_2, EXSTYLE_3, STYLE_2, EXSTYLE_3 }, }; -static const size_t s_num_entries = sizeof(s_entries) / sizeof(s_entries[0]); +typedef struct RUDEAPP_TEST_ENTRY +{ + INT lineno; + UINT nCount; + DWORD style; + DWORD exstyle; + BOOL bSetForeground; + BOOL bFullscreen; + BOOL bSetFullscreen; +} RUDEAPP_TEST_ENTRY; + +static const RUDEAPP_TEST_ENTRY s_entries2[] = +{ + /* STYLE_0 */ + { __LINE__, 0, STYLE_0, EXSTYLE_0, FALSE, FALSE, FALSE }, + { __LINE__, 0, STYLE_0, EXSTYLE_0, FALSE, FALSE, TRUE }, + { __LINE__, 0, STYLE_0, EXSTYLE_0, FALSE, TRUE, FALSE }, + { __LINE__, 0, STYLE_0, EXSTYLE_0, FALSE, TRUE, TRUE }, + { __LINE__, 0, STYLE_0, EXSTYLE_0, TRUE, FALSE, FALSE }, + { __LINE__, 0, STYLE_0, EXSTYLE_0, TRUE, FALSE, TRUE }, + { __LINE__, 0, STYLE_0, EXSTYLE_0, TRUE, TRUE, FALSE }, + { __LINE__, 0, STYLE_0, EXSTYLE_0, TRUE, TRUE, TRUE }, + + { __LINE__, 0, STYLE_0, EXSTYLE_1, FALSE, FALSE, FALSE }, + { __LINE__, 0, STYLE_0, EXSTYLE_1, FALSE, FALSE, TRUE }, + { __LINE__, 0, STYLE_0, EXSTYLE_1, FALSE, TRUE, FALSE }, + { __LINE__, 0, STYLE_0, EXSTYLE_1, FALSE, TRUE, TRUE }, + { __LINE__, 0, STYLE_0, EXSTYLE_1, TRUE, FALSE, FALSE }, + { __LINE__, 0, STYLE_0, EXSTYLE_1, TRUE, FALSE, TRUE }, + { __LINE__, 0, STYLE_0, EXSTYLE_1, TRUE, TRUE, FALSE }, + { __LINE__, 0, STYLE_0, EXSTYLE_1, TRUE, TRUE, TRUE }, + + { __LINE__, 0, STYLE_0, EXSTYLE_2, FALSE, FALSE, FALSE }, + { __LINE__, 0, STYLE_0, EXSTYLE_2, FALSE, FALSE, TRUE }, + { __LINE__, 0, STYLE_0, EXSTYLE_2, FALSE, TRUE, FALSE }, + { __LINE__, 0, STYLE_0, EXSTYLE_2, FALSE, TRUE, TRUE }, + { __LINE__, 0, STYLE_0, EXSTYLE_2, TRUE, FALSE, FALSE }, + { __LINE__, 0, STYLE_0, EXSTYLE_2, TRUE, FALSE, TRUE }, + { __LINE__, 0, STYLE_0, EXSTYLE_2, TRUE, TRUE, FALSE }, + { __LINE__, 0, STYLE_0, EXSTYLE_2, TRUE, TRUE, TRUE }, + + { __LINE__, 0, STYLE_0, EXSTYLE_3, FALSE, FALSE, FALSE }, + { __LINE__, 0, STYLE_0, EXSTYLE_3, FALSE, FALSE, TRUE }, + { __LINE__, 0, STYLE_0, EXSTYLE_3, FALSE, TRUE, FALSE }, + { __LINE__, 0, STYLE_0, EXSTYLE_3, FALSE, TRUE, TRUE }, + { __LINE__, 0, STYLE_0, EXSTYLE_3, TRUE, FALSE, FALSE }, + { __LINE__, 0, STYLE_0, EXSTYLE_3, TRUE, FALSE, TRUE }, + { __LINE__, 0, STYLE_0, EXSTYLE_3, TRUE, TRUE, FALSE }, + { __LINE__, 0, STYLE_0, EXSTYLE_3, TRUE, TRUE, TRUE }, + + /* STYLE_1 */ + { __LINE__, 0, STYLE_1, EXSTYLE_0, FALSE, FALSE, FALSE }, + { __LINE__, 1, STYLE_1, EXSTYLE_0, FALSE, FALSE, TRUE }, + { __LINE__, 1, STYLE_1, EXSTYLE_0, FALSE, TRUE, FALSE }, + { __LINE__, 1, STYLE_1, EXSTYLE_0, FALSE, TRUE, TRUE }, + { __LINE__, 0, STYLE_1, EXSTYLE_0, TRUE, FALSE, FALSE }, + { __LINE__, 1, STYLE_1, EXSTYLE_0, TRUE, FALSE, TRUE }, + { __LINE__, 1, STYLE_1, EXSTYLE_0, TRUE, TRUE, FALSE }, + { __LINE__, 1, STYLE_1, EXSTYLE_0, TRUE, TRUE, TRUE }, + + { __LINE__, 0, STYLE_1, EXSTYLE_1, FALSE, FALSE, FALSE }, + { __LINE__, 1, STYLE_1, EXSTYLE_1, FALSE, FALSE, TRUE }, + { __LINE__, 1, STYLE_1, EXSTYLE_1, FALSE, TRUE, FALSE }, + { __LINE__, 1, STYLE_1, EXSTYLE_1, FALSE, TRUE, TRUE }, + { __LINE__, 0, STYLE_1, EXSTYLE_1, TRUE, FALSE, FALSE }, + { __LINE__, 1, STYLE_1, EXSTYLE_1, TRUE, FALSE, TRUE }, + { __LINE__, 1, STYLE_1, EXSTYLE_1, TRUE, TRUE, FALSE }, + { __LINE__, 1, STYLE_1, EXSTYLE_1, TRUE, TRUE, TRUE }, + + { __LINE__, 0, STYLE_1, EXSTYLE_2, FALSE, FALSE, FALSE }, + { __LINE__, 0, STYLE_1, EXSTYLE_2, FALSE, FALSE, TRUE }, + { __LINE__, 0, STYLE_1, EXSTYLE_2, FALSE, TRUE, FALSE }, + { __LINE__, 0, STYLE_1, EXSTYLE_2, FALSE, TRUE, TRUE }, + { __LINE__, 0, STYLE_1, EXSTYLE_2, TRUE, FALSE, FALSE }, + { __LINE__, 0, STYLE_1, EXSTYLE_2, TRUE, FALSE, TRUE }, + { __LINE__, 0, STYLE_1, EXSTYLE_2, TRUE, TRUE, FALSE }, + { __LINE__, 0, STYLE_1, EXSTYLE_2, TRUE, TRUE, TRUE }, + + { __LINE__, 0, STYLE_1, EXSTYLE_3, FALSE, FALSE, FALSE }, + { __LINE__, 0, STYLE_1, EXSTYLE_3, FALSE, FALSE, TRUE }, + { __LINE__, 0, STYLE_1, EXSTYLE_3, FALSE, TRUE, FALSE }, + { __LINE__, 0, STYLE_1, EXSTYLE_3, FALSE, TRUE, TRUE }, + { __LINE__, 0, STYLE_1, EXSTYLE_3, TRUE, FALSE, FALSE }, + { __LINE__, 0, STYLE_1, EXSTYLE_3, TRUE, FALSE, TRUE }, + { __LINE__, 0, STYLE_1, EXSTYLE_3, TRUE, TRUE, FALSE }, + { __LINE__, 0, STYLE_1, EXSTYLE_3, TRUE, TRUE, TRUE }, + + /* STYLE_2 */ + { __LINE__, 0, STYLE_2, EXSTYLE_0, FALSE, FALSE, FALSE }, + { __LINE__, 1, STYLE_2, EXSTYLE_0, FALSE, FALSE, TRUE }, + { __LINE__, 1, STYLE_2, EXSTYLE_0, FALSE, TRUE, FALSE }, + { __LINE__, 1, STYLE_2, EXSTYLE_0, FALSE, TRUE, TRUE }, + { __LINE__, 0, STYLE_2, EXSTYLE_0, TRUE, FALSE, FALSE }, + { __LINE__, 1, STYLE_2, EXSTYLE_0, TRUE, FALSE, TRUE }, + { __LINE__, 1, STYLE_2, EXSTYLE_0, TRUE, TRUE, FALSE }, + { __LINE__, 1, STYLE_2, EXSTYLE_0, TRUE, TRUE, TRUE }, + + { __LINE__, 0, STYLE_2, EXSTYLE_1, FALSE, FALSE, FALSE }, + { __LINE__, 1, STYLE_2, EXSTYLE_1, FALSE, FALSE, TRUE }, + { __LINE__, 1, STYLE_2, EXSTYLE_1, FALSE, TRUE, FALSE }, + { __LINE__, 1, STYLE_2, EXSTYLE_1, FALSE, TRUE, TRUE }, + { __LINE__, 0, STYLE_2, EXSTYLE_1, TRUE, FALSE, FALSE }, + { __LINE__, 1, STYLE_2, EXSTYLE_1, TRUE, FALSE, TRUE }, + { __LINE__, 1, STYLE_2, EXSTYLE_1, TRUE, TRUE, FALSE }, + { __LINE__, 1, STYLE_2, EXSTYLE_1, TRUE, TRUE, TRUE }, + + { __LINE__, 0, STYLE_2, EXSTYLE_2, FALSE, FALSE, FALSE }, + { __LINE__, 0, STYLE_2, EXSTYLE_2, FALSE, FALSE, TRUE }, + { __LINE__, 0, STYLE_2, EXSTYLE_2, FALSE, TRUE, FALSE }, + { __LINE__, 0, STYLE_2, EXSTYLE_2, FALSE, TRUE, TRUE }, + { __LINE__, 0, STYLE_2, EXSTYLE_2, TRUE, FALSE, FALSE }, + { __LINE__, 0, STYLE_2, EXSTYLE_2, TRUE, FALSE, TRUE }, + { __LINE__, 0, STYLE_2, EXSTYLE_2, TRUE, TRUE, FALSE }, + { __LINE__, 0, STYLE_2, EXSTYLE_2, TRUE, TRUE, TRUE }, + + { __LINE__, 0, STYLE_2, EXSTYLE_3, FALSE, FALSE, FALSE }, + { __LINE__, 0, STYLE_2, EXSTYLE_3, FALSE, FALSE, TRUE }, + { __LINE__, 0, STYLE_2, EXSTYLE_3, FALSE, TRUE, FALSE }, + { __LINE__, 0, STYLE_2, EXSTYLE_3, FALSE, TRUE, TRUE }, + { __LINE__, 0, STYLE_2, EXSTYLE_3, TRUE, FALSE, FALSE }, + { __LINE__, 0, STYLE_2, EXSTYLE_3, TRUE, FALSE, TRUE }, + { __LINE__, 0, STYLE_2, EXSTYLE_3, TRUE, TRUE, FALSE }, + { __LINE__, 0, STYLE_2, EXSTYLE_3, TRUE, TRUE, TRUE }, +}; + +static UINT s_uShellHookMsg = 0; +static HWND s_hwndHookViewer = NULL; +static HWND s_hwndParent = NULL; +static HWND s_hwndTarget = NULL; +static UINT s_nWindowCreatedCount = 0; +static UINT s_nRudeAppActivated = 0; +static WCHAR s_szName[] = L"ReactOS ShellHook testcase"; + +static HWND +DoCreateWindow(HWND hwndParent, DWORD style, DWORD exstyle, BOOL bFullscreen = FALSE) +{ + INT x = CW_USEDEFAULT, y = CW_USEDEFAULT, cx = 100, cy = 100; + if (bFullscreen) + { + x = y = 0; + cx = GetSystemMetrics(SM_CXSCREEN); + cy = GetSystemMetrics(SM_CYSCREEN); + } + return CreateWindowExW(exstyle, s_szName, s_szName, style, x, y, cx, cy, + hwndParent, NULL, GetModuleHandleW(NULL), NULL); +} static void DoTestEntryPart1(const TEST_ENTRY *pEntry) { @@ -300,6 +430,34 @@ static void DoTestEntryPart2(const TEST_ENTRY *pEntry) } } +static void DoRudeAppTest1(const RUDEAPP_TEST_ENTRY *pEntry) +{ + s_hwndParent = NULL; + + DWORD style = pEntry->style; + DWORD exstyle = pEntry->exstyle; + + s_nRudeAppActivated = 0; + s_hwndTarget = DoCreateWindow(s_hwndParent, style, exstyle, pEntry->bFullscreen); + if (pEntry->bSetForeground) + SetForegroundWindow(s_hwndTarget); + if (pEntry->bSetFullscreen) + { + MoveWindow(s_hwndTarget, 0, 0, + GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN), TRUE); + } +} + +static void DoRudeAppTest2(const RUDEAPP_TEST_ENTRY *pEntry) +{ + ok(s_nRudeAppActivated == pEntry->nCount, + "Line %d: s_nRudeAppActivated expected %u but was %u\n", + pEntry->lineno, pEntry->nCount, s_nRudeAppActivated); + + PostMessageW(s_hwndTarget, WM_CLOSE, 0, 0); + s_hwndTarget = NULL; +} + static LRESULT CALLBACK WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { @@ -312,10 +470,18 @@ WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) break; ++s_nWindowCreatedCount; break; + + case HSHELL_RUDEAPPACTIVATED: + if ((HWND)lParam != s_hwndTarget) + break; + ++s_nRudeAppActivated; + break; } } #define ID_IGNITION 1000 #define ID_BURNING 2000 +#define ID_RUDEAPPTEST1 3000 +#define ID_RUDEAPPTEST2 4000 switch (uMsg) { case WM_CREATE: @@ -328,21 +494,39 @@ WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) if (ID_IGNITION <= wParam && wParam < ID_BURNING) { INT i = (INT)wParam - ID_IGNITION; - DoTestEntryPart1(&s_entries[i]); + DoTestEntryPart1(&s_entries1[i]); PostMessageW(hwnd, WM_COMMAND, ID_BURNING + i, 0); } - else if (ID_BURNING <= wParam) + else if (ID_BURNING <= wParam && wParam < ID_RUDEAPPTEST1) { INT i = (INT)wParam - ID_BURNING; - DoTestEntryPart2(&s_entries[i]); + DoTestEntryPart2(&s_entries1[i]); ++i; - if (i == (INT)s_num_entries) + if (i == (INT)_countof(s_entries1)) { - PostQuitMessage(0); + PostMessageW(hwnd, WM_COMMAND, ID_RUDEAPPTEST1, 0); break; } PostMessageW(hwnd, WM_COMMAND, ID_IGNITION + i, 0); } + else if (ID_RUDEAPPTEST1 <= wParam && wParam < ID_RUDEAPPTEST2) + { + INT i = (INT)wParam - ID_RUDEAPPTEST1; + DoRudeAppTest1(&s_entries2[i]); + PostMessageW(hwnd, WM_COMMAND, ID_RUDEAPPTEST2 + i, 0); + } + else if (ID_RUDEAPPTEST2 <= wParam) + { + INT i = (INT)wParam - ID_RUDEAPPTEST2; + DoRudeAppTest2(&s_entries2[i]); + ++i; + if (i == (INT)_countof(s_entries2)) + { + PostQuitMessage(0); + break; + } + PostMessageW(hwnd, WM_COMMAND, ID_RUDEAPPTEST1 + i, 0); + } break; default: return DefWindowProcW(hwnd, uMsg, wParam, lParam);

2 years, 12 months

[reactos] 02/02: [SYSSETUP] Fill in missing locale, location, and default keyboard layout

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6d09885ce4f92361194cf… commit 6d09885ce4f92361194cfc5d27fde8bcaa23656c Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Thu Oct 21 04:38:07 2021 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sun Oct 24 00:12:18 2021 +0300 [SYSSETUP] Fill in missing locale, location, and default keyboard layout - Implement functions to get regional data from system - Disable setup window and buttons when control panel applet is started - Update regional information when control panel applet is closed - Add a horizontal separator between user locale and keyboard layout --- dll/win32/syssetup/lang/bg-BG.rc | 3 + dll/win32/syssetup/lang/cs-CZ.rc | 3 + dll/win32/syssetup/lang/da-DK.rc | 3 + dll/win32/syssetup/lang/de-DE.rc | 3 + dll/win32/syssetup/lang/el-GR.rc | 3 + dll/win32/syssetup/lang/en-GB.rc | 3 + dll/win32/syssetup/lang/en-US.rc | 3 + dll/win32/syssetup/lang/es-ES.rc | 3 + dll/win32/syssetup/lang/et-EE.rc | 3 + dll/win32/syssetup/lang/fi-FI.rc | 3 + dll/win32/syssetup/lang/fr-FR.rc | 3 + dll/win32/syssetup/lang/he-IL.rc | 3 + dll/win32/syssetup/lang/hi-IN.rc | 3 + dll/win32/syssetup/lang/hu-HU.rc | 3 + dll/win32/syssetup/lang/id-ID.rc | 3 + dll/win32/syssetup/lang/it-IT.rc | 3 + dll/win32/syssetup/lang/ja-JP.rc | 3 + dll/win32/syssetup/lang/lt-LT.rc | 3 + dll/win32/syssetup/lang/nl-NL.rc | 3 + dll/win32/syssetup/lang/no-NO.rc | 3 + dll/win32/syssetup/lang/pl-PL.rc | 3 + dll/win32/syssetup/lang/pt-BR.rc | 3 + dll/win32/syssetup/lang/pt-PT.rc | 3 + dll/win32/syssetup/lang/ro-RO.rc | 3 + dll/win32/syssetup/lang/ru-RU.rc | 3 + dll/win32/syssetup/lang/sk-SK.rc | 3 + dll/win32/syssetup/lang/sq-AL.rc | 3 + dll/win32/syssetup/lang/sv-SE.rc | 3 + dll/win32/syssetup/lang/th-TH.rc | 3 + dll/win32/syssetup/lang/tr-TR.rc | 3 + dll/win32/syssetup/lang/uk-UA.rc | 3 + dll/win32/syssetup/lang/zh-CN.rc | 3 + dll/win32/syssetup/lang/zh-TW.rc | 3 + dll/win32/syssetup/resource.h | 2 + dll/win32/syssetup/wizard.c | 139 ++++++++++++++++++++++++++------------- 35 files changed, 193 insertions(+), 47 deletions(-) diff --git a/dll/win32/syssetup/lang/bg-BG.rc b/dll/win32/syssetup/lang/bg-BG.rc index 01cd32bf4a7..f02d2292ab5 100644 --- a/dll/win32/syssetup/lang/bg-BG.rc +++ b/dll/win32/syssetup/lang/bg-BG.rc @@ -77,6 +77,7 @@ BEGIN LTEXT "%s", IDC_LOCALETEXT, 53, 29, 250, 16 LTEXT "За промяна на уредбените или местните настройки, натиснете „Нагласяване“.", IDC_STATIC, 53, 60, 184, 16 PUSHBUTTON "&Нагласяване...", IDC_CUSTOMLOCALE, 245, 57, 55, 14 + LTEXT "", IDC_STATIC, 53, 82, 246, 1, SS_ETCHEDHORZ LTEXT "Клавиатурната подредба определя знаците, появяващи се при писане.", IDC_STATIC, 53, 86, 253, 8 LTEXT "%s", IDC_LAYOUTTEXT, 53, 100, 250, 16 LTEXT "За смяна на клавиатурната подредба, натиснете „Нагласяване“.", IDC_STATIC, 53, 126, 184, 16 @@ -174,6 +175,8 @@ BEGIN IDS_COMPUTERSUBTITLE "Трябва да въведете администраторска парола и име на компютъра" IDS_LOCALETITLE "Местни настройки" IDS_LOCALESUBTITLE "Можете да нагласите РеактОС за различни области и езици." + IDS_LOCALETEXT "The Standards and formats are set to %s, and the location is set to %s." + IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard layout" IDS_DATETIMETITLE "Дата и време" IDS_DATETIMESUBTITLE "Задайте правилните дата и време." IDS_PROCESSTITLE "Вписване на съставните" diff --git a/dll/win32/syssetup/lang/cs-CZ.rc b/dll/win32/syssetup/lang/cs-CZ.rc index 05ab8b4f1bd..151e83400c9 100644 --- a/dll/win32/syssetup/lang/cs-CZ.rc +++ b/dll/win32/syssetup/lang/cs-CZ.rc @@ -85,6 +85,7 @@ BEGIN LTEXT "%s", IDC_LOCALETEXT, 53, 29, 250, 16 LTEXT "Pro změnu lokalizace systému klikněte na Změnit.", IDC_STATIC, 53, 60, 184, 8 PUSHBUTTON "&Změnit...", IDC_CUSTOMLOCALE, 245, 57, 50, 14 + LTEXT "", IDC_STATIC, 53, 79, 241, 1, SS_ETCHEDHORZ LTEXT "Rozložení kláves určí znaky, které se zobrazí, když píšete.", IDC_STATIC, 53, 86, 253, 8 LTEXT "%s", IDC_LAYOUTTEXT, 53, 100, 250, 16 LTEXT "Pro změnu rozložení kláves, klikněte na Změnit.", IDC_STATIC, 53, 126, 184, 8 @@ -182,6 +183,8 @@ BEGIN IDS_COMPUTERSUBTITLE "Zadejte jméno a heslo pro účet Administrator." IDS_LOCALETITLE "Regionální nastavení" IDS_LOCALESUBTITLE "Systém ReactOS můžete přizpůsobit různým regionům a jazykům." + IDS_LOCALETEXT "The Standards and formats are set to %s, and the location is set to %s." + IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard layout" IDS_DATETIMETITLE "Datum a čas" IDS_DATETIMESUBTITLE "Nastavte správný čas pro Váš počítač." IDS_PROCESSTITLE "Registrace součástí" diff --git a/dll/win32/syssetup/lang/da-DK.rc b/dll/win32/syssetup/lang/da-DK.rc index 49823fd973e..2eae84398b0 100644 --- a/dll/win32/syssetup/lang/da-DK.rc +++ b/dll/win32/syssetup/lang/da-DK.rc @@ -96,6 +96,7 @@ BEGIN LTEXT "%s", IDC_LOCALETEXT, 53, 29, 250, 16 LTEXT "To change system or user locale settings, click Customize.", IDC_STATIC, 53, 60, 196, 8 PUSHBUTTON "&Customize...", IDC_CUSTOMLOCALE, 250, 57, 50, 14 + LTEXT "", IDC_STATIC, 53, 79, 246, 1, SS_ETCHEDHORZ LTEXT "The keyboard layout controls the characters that appear when you type.", IDC_STATIC, 53, 86, 253, 8 LTEXT "%s", IDC_LAYOUTTEXT, 53, 100, 250, 16 LTEXT "To change the keyboard layout, click Customize.", IDC_STATIC, 53, 126, 184, 8 @@ -193,6 +194,8 @@ BEGIN IDS_COMPUTERSUBTITLE "You must provide a name and an Administrator Password for your computer." IDS_LOCALETITLE "Regional settings" IDS_LOCALESUBTITLE "You can customize ReactOS for different regions and languages." + IDS_LOCALETEXT "The Standards and formats are set to %s, and the location is set to %s." + IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard layout" IDS_DATETIMETITLE "Date and Time" IDS_DATETIMESUBTITLE "Set the correct date and time for your computer." IDS_PROCESSTITLE "Registering Components" diff --git a/dll/win32/syssetup/lang/de-DE.rc b/dll/win32/syssetup/lang/de-DE.rc index 0626f5a6278..5552e82e9e5 100644 --- a/dll/win32/syssetup/lang/de-DE.rc +++ b/dll/win32/syssetup/lang/de-DE.rc @@ -77,6 +77,7 @@ BEGIN LTEXT "%s", IDC_LOCALETEXT, 53, 34, 250, 16 LTEXT "Klicken Sie auf Einstellen, um die regionalen Einstellungen zu ändern.", IDC_STATIC, 53, 57, 188, 16 PUSHBUTTON "&Einstellen...", IDC_CUSTOMLOCALE, 245, 57, 50, 14 + LTEXT "", IDC_STATIC, 53, 79, 241, 1, SS_ETCHEDHORZ LTEXT "Das Tastaturlayout gibt vor, welches Zeichen ein Tastendruck bewirkt.", IDC_STATIC, 53, 86, 253, 8 LTEXT "%s", IDC_LAYOUTTEXT, 53, 100, 250, 16 LTEXT "Klicken Sie auf Einstellen, um das Tastaturlayout zu ändern.", IDC_STATIC, 53, 122, 188, 16 @@ -174,6 +175,8 @@ BEGIN IDS_COMPUTERSUBTITLE "Sie müssen einen Namen und ein Adminstratorpasswort für Ihren Computer festlegen." IDS_LOCALETITLE "Regionale Einstellungen" IDS_LOCALESUBTITLE "Sie können ReactOS auf unterschiedliche Regionen und Sprachen einstellen." + IDS_LOCALETEXT "The Standards and formats are set to %s, and the location is set to %s." + IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard layout" IDS_DATETIMETITLE "Datum und Uhrzeit" IDS_DATETIMESUBTITLE "Stellen Sie das korrekte Datum und die Uhrzeit für Ihren Computer ein." IDS_PROCESSTITLE "Komponenten werden registriert" diff --git a/dll/win32/syssetup/lang/el-GR.rc b/dll/win32/syssetup/lang/el-GR.rc index 9d27c1da0bd..163d0fc8958 100644 --- a/dll/win32/syssetup/lang/el-GR.rc +++ b/dll/win32/syssetup/lang/el-GR.rc @@ -77,6 +77,7 @@ BEGIN LTEXT "%s", IDC_LOCALETEXT, 53, 36, 250, 16 LTEXT "Για να αλλάξετε τις τοπικές ρυθμίσεις, πατήστε το κουμπί 'Προσαρμογή'.", IDC_STATIC, 53, 57, 184, 16 PUSHBUTTON "&Προσαρμογή...", IDC_CUSTOMLOCALE, 245, 57, 50, 14 + LTEXT "", IDC_STATIC, 53, 79, 241, 1, SS_ETCHEDHORZ LTEXT "Η διάταξη πληκτρολογίου έλέγχει τους χαρακτήρες που θα εμφανίζονται καθώς πληκτρολογείτε.", IDC_STATIC, 53, 86, 253, 20 LTEXT "%s", IDC_LAYOUTTEXT, 53, 106, 253, 16 LTEXT "Για να αλλάξετε τη διάταξη του πληκτρολογίου, πατήστε το κουμπί 'Προσαρμογή'.", IDC_STATIC, 53, 122, 184, 16 @@ -174,6 +175,8 @@ BEGIN IDS_COMPUTERSUBTITLE "Πρέπει να δώσετε ένα όνομα και έναν κωδικό πρόσβασης για τον υπολογιστή σας." IDS_LOCALETITLE "Τοπικές ρυθμίσεις" IDS_LOCALESUBTITLE "Μπορείτε να προσαρμόσετε το ReactOS για διαφορετικές περιοχές και γλώσσες." + IDS_LOCALETEXT "The Standards and formats are set to %s, and the location is set to %s." + IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard layout" IDS_DATETIMETITLE "Ημερομηνία και ώρα" IDS_DATETIMESUBTITLE "Ορίστε τη σωστή ημερομηνία και ώρα για τον υπολογιστή σας." IDS_PROCESSTITLE "Τίτλος" diff --git a/dll/win32/syssetup/lang/en-GB.rc b/dll/win32/syssetup/lang/en-GB.rc index c8126ad911c..52dc9989491 100644 --- a/dll/win32/syssetup/lang/en-GB.rc +++ b/dll/win32/syssetup/lang/en-GB.rc @@ -77,6 +77,7 @@ BEGIN LTEXT "%s", IDC_LOCALETEXT, 53, 29, 250, 16 LTEXT "To change system or user locale settings, click Customise.", IDC_STATIC, 53, 60, 196, 8 PUSHBUTTON "&Customise...", IDC_CUSTOMLOCALE, 250, 57, 50, 14 + LTEXT "", IDC_STATIC, 53, 79, 246, 1, SS_ETCHEDHORZ LTEXT "The keyboard layout controls the characters that appear when you type.", IDC_STATIC, 53, 86, 253, 8 LTEXT "%s", IDC_LAYOUTTEXT, 53, 100, 250, 16 LTEXT "To change the keyboard layout, click Customise.", IDC_STATIC, 53, 126, 184, 8 @@ -174,6 +175,8 @@ BEGIN IDS_COMPUTERSUBTITLE "You must provide a name and an Administrator Password for your computer." IDS_LOCALETITLE "Regional settings" IDS_LOCALESUBTITLE "You can customise ReactOS for different regions and languages." + IDS_LOCALETEXT "The Standards and formats are set to %s, and the location is set to %s." + IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard layout" IDS_DATETIMETITLE "Date and Time" IDS_DATETIMESUBTITLE "Set the correct date and time for your computer." IDS_PROCESSTITLE "Registering Components" diff --git a/dll/win32/syssetup/lang/en-US.rc b/dll/win32/syssetup/lang/en-US.rc index bd93b61cefb..c99ee4208a6 100644 --- a/dll/win32/syssetup/lang/en-US.rc +++ b/dll/win32/syssetup/lang/en-US.rc @@ -96,6 +96,7 @@ BEGIN LTEXT "%s", IDC_LOCALETEXT, 53, 29, 250, 16 LTEXT "To change system or user locale settings, click Customize.", IDC_STATIC, 53, 60, 196, 8 PUSHBUTTON "&Customize...", IDC_CUSTOMLOCALE, 250, 57, 50, 14 + LTEXT "", IDC_STATIC, 53, 79, 246, 1, SS_ETCHEDHORZ LTEXT "The keyboard layout controls the characters that appear when you type.", IDC_STATIC, 53, 86, 253, 8 LTEXT "%s", IDC_LAYOUTTEXT, 53, 100, 250, 16 LTEXT "To change the keyboard layout, click Customize.", IDC_STATIC, 53, 126, 184, 8 @@ -193,6 +194,8 @@ BEGIN IDS_COMPUTERSUBTITLE "You must provide a name and an Administrator Password for your computer." IDS_LOCALETITLE "Regional settings" IDS_LOCALESUBTITLE "You can customize ReactOS for different regions and languages." + IDS_LOCALETEXT "The Standards and formats are set to %s, and the location is set to %s." + IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard layout" IDS_DATETIMETITLE "Date and Time" IDS_DATETIMESUBTITLE "Set the correct date and time for your computer." IDS_PROCESSTITLE "Registering Components" diff --git a/dll/win32/syssetup/lang/es-ES.rc b/dll/win32/syssetup/lang/es-ES.rc index ee6366d8656..aec821b46c5 100644 --- a/dll/win32/syssetup/lang/es-ES.rc +++ b/dll/win32/syssetup/lang/es-ES.rc @@ -86,6 +86,7 @@ BEGIN LTEXT "%s", IDC_LOCALETEXT, 53, 34, 250, 16 LTEXT "Para modificar esta configuración, pulse Modificar.", IDC_STATIC, 53, 60, 184, 8 PUSHBUTTON "&Modificar...", IDC_CUSTOMLOCALE, 245, 57, 50, 14 + LTEXT "", IDC_STATIC, 53, 79, 241, 1, SS_ETCHEDHORZ LTEXT "La distribución del teclado determina el caracter que se muestra al presionar cada tecla.", IDC_STATIC, 53, 86, 253, 32 LTEXT "%s", IDC_LAYOUTTEXT, 53, 109, 250, 16 LTEXT "Para cambiar la distribución del teclado, pulse Modificar.", IDC_STATIC, 53, 126, 184, 8 @@ -183,6 +184,8 @@ BEGIN IDS_COMPUTERSUBTITLE "Debe dar un nombre y una contraseña de Administrador a su equipo." IDS_LOCALETITLE "Opciones regionales" IDS_LOCALESUBTITLE "Puede personalizar ReactOS para diferentes regiones e idiomas." + IDS_LOCALETEXT "The Standards and formats are set to %s, and the location is set to %s." + IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard layout" IDS_DATETIMETITLE "Fecha y hora" IDS_DATETIMESUBTITLE "Fije la fecha y hora correcta de su equipo." IDS_PROCESSTITLE "Registrando componentes" diff --git a/dll/win32/syssetup/lang/et-EE.rc b/dll/win32/syssetup/lang/et-EE.rc index 9c644328ec7..f4dbf052aa5 100644 --- a/dll/win32/syssetup/lang/et-EE.rc +++ b/dll/win32/syssetup/lang/et-EE.rc @@ -77,6 +77,7 @@ BEGIN LTEXT "%s", IDC_LOCALETEXT, 53, 36, 250, 16 LTEXT "Süsteemi või kasutaja lokaadi muutmiseks vajutage Täpsusta.", IDC_STATIC, 53, 60, 196, 8 PUSHBUTTON "Tä&psusta...", IDC_CUSTOMLOCALE, 250, 57, 50, 14 + LTEXT "", IDC_STATIC, 53, 79, 246, 1, SS_ETCHEDHORZ LTEXT "Klaviatuuriasetus määrab tähemärgid, mis klaviatuuril kirjutades ilmuvad.", IDC_STATIC, 53, 86, 253, 8 LTEXT "%s", IDC_LAYOUTTEXT, 53, 100, 250, 16 LTEXT "Klaviatuuriasetuse muutmiseks vajuta Täp&susta.", IDC_STATIC, 53, 126, 184, 8 @@ -174,6 +175,8 @@ BEGIN IDS_COMPUTERSUBTITLE "Arvutile tuleb anda nimi ja administraatori parool." IDS_LOCALETITLE "Regionaalsed seaded" IDS_LOCALESUBTITLE "ReactOS'i saab kohandada erinevatele regioonidele ja keeltele vastavaks." + IDS_LOCALETEXT "The Standards and formats are set to %s, and the location is set to %s." + IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard layout" IDS_DATETIMETITLE "Kuupäev ja kellaaeg" IDS_DATETIMESUBTITLE "Sisesta õige kellaaeg ja kuupäev." IDS_PROCESSTITLE "Komponentide registreerimine" diff --git a/dll/win32/syssetup/lang/fi-FI.rc b/dll/win32/syssetup/lang/fi-FI.rc index 7ae61fcc45f..cdf3c2ab56c 100644 --- a/dll/win32/syssetup/lang/fi-FI.rc +++ b/dll/win32/syssetup/lang/fi-FI.rc @@ -96,6 +96,7 @@ BEGIN LTEXT "%s", IDC_LOCALETEXT, 53, 29, 250, 16 LTEXT "To change system or user locale settings, click Customize.", IDC_STATIC, 53, 60, 196, 8 PUSHBUTTON "&Customize...", IDC_CUSTOMLOCALE, 250, 57, 50, 14 + LTEXT "", IDC_STATIC, 53, 79, 246, 1, SS_ETCHEDHORZ LTEXT "The keyboard layout controls the characters that appear when you type.", IDC_STATIC, 53, 86, 253, 8 LTEXT "%s", IDC_LAYOUTTEXT, 53, 100, 250, 16 LTEXT "To change the keyboard layout, click Customize.", IDC_STATIC, 53, 126, 184, 8 @@ -193,6 +194,8 @@ BEGIN IDS_COMPUTERSUBTITLE "You must provide a name and an Administrator Password for your computer." IDS_LOCALETITLE "Regional settings" IDS_LOCALESUBTITLE "You can customize ReactOS for different regions and languages." + IDS_LOCALETEXT "The Standards and formats are set to %s, and the location is set to %s." + IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard layout" IDS_DATETIMETITLE "Date and Time" IDS_DATETIMESUBTITLE "Set the correct date and time for your computer." IDS_PROCESSTITLE "Registering Components" diff --git a/dll/win32/syssetup/lang/fr-FR.rc b/dll/win32/syssetup/lang/fr-FR.rc index c57acfb5b7c..425c358a939 100644 --- a/dll/win32/syssetup/lang/fr-FR.rc +++ b/dll/win32/syssetup/lang/fr-FR.rc @@ -77,6 +77,7 @@ BEGIN LTEXT "%s", IDC_LOCALETEXT, 53, 29, 250, 16 LTEXT "Pour changer la localisation système, cliquez sur Modifier.", IDC_STATIC, 53, 60, 184, 8 PUSHBUTTON "&Modifier...", IDC_CUSTOMLOCALE, 250, 57, 50, 14 + LTEXT "", IDC_STATIC, 53, 79, 246, 1, SS_ETCHEDHORZ LTEXT "La configuration clavier contrôle la saisie des touches quand vous tapez.", IDC_STATIC, 53, 86, 253, 8 LTEXT "%s", IDC_LAYOUTTEXT, 53, 100, 250, 16 LTEXT "Pour changer la configuration clavier, cliquez sur Modifier.", IDC_STATIC, 53, 126, 184, 8 @@ -174,6 +175,8 @@ BEGIN IDS_COMPUTERSUBTITLE "Vous devez fournir un nom et un mot de passe Administrateur pour votre ordinateur." IDS_LOCALETITLE "Options régionales" IDS_LOCALESUBTITLE "Vous pouvez modifier ReactOS pour différentes régions et langues." + IDS_LOCALETEXT "The Standards and formats are set to %s, and the location is set to %s." + IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard layout" IDS_DATETIMETITLE "Date et Heure" IDS_DATETIMESUBTITLE "Configurez la date et l'heure correcte pour votre ordinateur." IDS_PROCESSTITLE "Enregistrement des composants" diff --git a/dll/win32/syssetup/lang/he-IL.rc b/dll/win32/syssetup/lang/he-IL.rc index 58c659779ee..80ba2d65384 100644 --- a/dll/win32/syssetup/lang/he-IL.rc +++ b/dll/win32/syssetup/lang/he-IL.rc @@ -77,6 +77,7 @@ BEGIN LTEXT "%s", IDC_LOCALETEXT, 53, 29, 250, 16 LTEXT "To change system or user locale settings, click Customize.", IDC_STATIC, 53, 60, 196, 8 PUSHBUTTON "&Customize...", IDC_CUSTOMLOCALE, 250, 57, 50, 14 + LTEXT "", IDC_STATIC, 53, 79, 246, 1, SS_ETCHEDHORZ LTEXT "The keyboard layout controls the characters that appear when you type.", IDC_STATIC, 53, 86, 253, 8 LTEXT "%s", IDC_LAYOUTTEXT, 53, 100, 250, 16 LTEXT "To change the keyboard layout, click Customize.", IDC_STATIC, 53, 126, 184, 8 @@ -174,6 +175,8 @@ BEGIN IDS_COMPUTERSUBTITLE "You must provide a name and an Administrator Password for your computer." IDS_LOCALETITLE "הגדרות אזור" IDS_LOCALESUBTITLE "You can customize ReactOS for different regions and languages." + IDS_LOCALETEXT "The Standards and formats are set to %s, and the location is set to %s." + IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard layout" IDS_DATETIMETITLE "תאריך ושעה" IDS_DATETIMESUBTITLE "Set the correct date and time for your computer." IDS_PROCESSTITLE "רושם מרכיבים" diff --git a/dll/win32/syssetup/lang/hi-IN.rc b/dll/win32/syssetup/lang/hi-IN.rc index 4a022b49593..1625a5de437 100644 --- a/dll/win32/syssetup/lang/hi-IN.rc +++ b/dll/win32/syssetup/lang/hi-IN.rc @@ -84,6 +84,7 @@ BEGIN LTEXT "%s", IDC_LOCALETEXT, 53, 36, 250, 16 LTEXT "सिस्टम या उपयोगकर्ता लोकेल सेटिंग बदलने के लिए, अनुकूलित करें पर क्लिक करें।", IDC_STATIC, 53, 60, 196, 8 PUSHBUTTON "&अनुकूलित...", IDC_CUSTOMLOCALE, 250, 57, 50, 14 + LTEXT "", IDC_STATIC, 53, 79, 246, 1, SS_ETCHEDHORZ LTEXT "कीबोर्ड लेआउट आपके द्वारा टाइप किए जाने पर दिखाई देने वाले अक्षरों को नियंत्रित करता है।", IDC_STATIC, 53, 86, 253, 8 LTEXT "%s", IDC_LAYOUTTEXT, 53, 100, 250, 16 LTEXT "कीबोर्ड लेआउट बदलने के लिए, अनुकूलित करें पर क्लिक करें।", IDC_STATIC, 53, 126, 184, 8 @@ -181,6 +182,8 @@ BEGIN IDS_COMPUTERSUBTITLE "आपको अपने कंप्यूटर के लिए एक नाम और एक एडमिनिस्ट्रेटर पासवर्ड प्रदान करना होगा।" IDS_LOCALETITLE "क्षेत्रीय सेटिंग" IDS_LOCALESUBTITLE "आप विभिन्न क्षेत्रों और भाषाओं के लिए रिऐक्ट ओएस को अनुकूलित कर सकते हैं।" + IDS_LOCALETEXT "The Standards and formats are set to %s, and the location is set to %s." + IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard layout" IDS_DATETIMETITLE "दिनांक और समय" IDS_DATETIMESUBTITLE "अपने कंप्यूटर के लिए सही तारीख और समय निर्धारित करें।" IDS_PROCESSTITLE "कम्पोनन्ट का दर्ज" diff --git a/dll/win32/syssetup/lang/hu-HU.rc b/dll/win32/syssetup/lang/hu-HU.rc index 250f054421b..726fa58848d 100644 --- a/dll/win32/syssetup/lang/hu-HU.rc +++ b/dll/win32/syssetup/lang/hu-HU.rc @@ -77,6 +77,7 @@ BEGIN LTEXT "%s", IDC_LOCALETEXT, 53, 35, 250, 16 LTEXT "A rendszer vagy felhasználói területi beállítások megváltoztatásához kattintson a Testreszabás gombra.", IDC_STATIC, 53, 56, 184, 16 PUSHBUTTON "Te&streszabás...", IDC_CUSTOMLOCALE, 245, 57, 60, 14 + LTEXT "", IDC_STATIC, 53, 79, 250, 1, SS_ETCHEDHORZ LTEXT "A billentyűzetkiosztás határozza meg a karaktereket,\namelyek megjelennek gépeléskor.", IDC_STATIC, 53, 86, 253, 16 LTEXT "%s", IDC_LAYOUTTEXT, 53, 102, 250, 16 LTEXT "A billentyűzetkiosztás megváltoztatásához kattintson\na Testreszabás gombra.", IDC_STATIC, 53, 116, 230, 16 @@ -174,6 +175,8 @@ BEGIN IDS_COMPUTERSUBTITLE "Meg kell adnia egy számítógép nevet és a rendszergazda jelszavát." IDS_LOCALETITLE "Területi beállítások" IDS_LOCALESUBTITLE "Beállíthatja, hogy a ReactOS milyen területi és nyelvi beállításokkal működjön." + IDS_LOCALETEXT "The Standards and formats are set to %s, and the location is set to %s." + IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard layout" IDS_DATETIMETITLE "Dátum és idő" IDS_DATETIMESUBTITLE "Beállíthatja a számítógép dátumát és óráját." IDS_PROCESSTITLE "Összetevők regisztrálása" diff --git a/dll/win32/syssetup/lang/id-ID.rc b/dll/win32/syssetup/lang/id-ID.rc index 918339d2209..282b7f13165 100644 --- a/dll/win32/syssetup/lang/id-ID.rc +++ b/dll/win32/syssetup/lang/id-ID.rc @@ -77,6 +77,7 @@ BEGIN LTEXT "%s", IDC_LOCALETEXT, 53, 29, 250, 16 LTEXT "Untuk mengubah setelan lokal sistem atau pengguna, klik Sesuaikan.", IDC_STATIC, 53, 60, 184, 16 PUSHBUTTON "&Sesuaikan...", IDC_CUSTOMLOCALE, 245, 57, 50, 14 + LTEXT "", IDC_STATIC, 53, 81, 241, 1, SS_ETCHEDHORZ LTEXT "Tata letak papan ketik mengontrol tampilan karakter yang muncul ketika anda ketik.", IDC_STATIC, 53, 86, 253, 8 LTEXT "%s", IDC_LAYOUTTEXT, 53, 100, 250, 16 LTEXT "Untuk mengubah tata letak papan ketik, klik Sesuaikan.", IDC_STATIC, 53, 126, 184, 8 @@ -174,6 +175,8 @@ BEGIN IDS_COMPUTERSUBTITLE "Anda harus menyediakan nama dan Kata sandi Administrator untuk komputer anda." IDS_LOCALETITLE "Setelan Daerah" IDS_LOCALESUBTITLE "Anda bisa menyesuaikan ReactOS untuk daerah dan bahasa berbeda." + IDS_LOCALETEXT "The Standards and formats are set to %s, and the location is set to %s." + IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard layout" IDS_DATETIMETITLE "Tanggal dan Jam" IDS_DATETIMESUBTITLE "Setel tanggal dan jam yang benar untuk komputer anda." IDS_PROCESSTITLE "Judul halaman proses" diff --git a/dll/win32/syssetup/lang/it-IT.rc b/dll/win32/syssetup/lang/it-IT.rc index e331653350c..9a25d6f517a 100644 --- a/dll/win32/syssetup/lang/it-IT.rc +++ b/dll/win32/syssetup/lang/it-IT.rc @@ -77,6 +77,7 @@ BEGIN LTEXT "%s", IDC_LOCALETEXT, 56, 35, 250, 16 LTEXT "Per cambiare le impostazioni linguistiche del sistema o dell'utente, selezionare Personalizza.", IDC_STATIC, 20, 55, 184, 16 PUSHBUTTON "&Personalizza...", IDC_CUSTOMLOCALE, 240, 55, 60, 16 + LTEXT "", IDC_STATIC, 20, 76, 278, 1, SS_ETCHEDHORZ LTEXT "Il formato della tastiera stabilisce i caratteri che appaiono quando si preme un tasto.", IDC_STATIC, 20, 80, 253, 16 LTEXT "%s", IDC_LAYOUTTEXT, 20, 104, 250, 16 LTEXT "Per cambiare il formato della tastiera, selezionare Personalizza.", IDC_STATIC, 20, 120, 184, 16 @@ -174,6 +175,8 @@ BEGIN IDS_COMPUTERSUBTITLE "È necessario fornire un nome e una password di Administrator per il proprio computer." IDS_LOCALETITLE "Impostazioni regionali" IDS_LOCALESUBTITLE "È possibile personalizzare ReactOS per regioni e lingue differenti." + IDS_LOCALETEXT "The Standards and formats are set to %s, and the location is set to %s." + IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard layout" IDS_DATETIMETITLE "Data e ora" IDS_DATETIMESUBTITLE "Impostare la data e l'ora corrette per il proprio computer." IDS_PROCESSTITLE "Registrazione dei componenti" diff --git a/dll/win32/syssetup/lang/ja-JP.rc b/dll/win32/syssetup/lang/ja-JP.rc index f3299fd34bb..82b32a85143 100644 --- a/dll/win32/syssetup/lang/ja-JP.rc +++ b/dll/win32/syssetup/lang/ja-JP.rc @@ -77,6 +77,7 @@ BEGIN LTEXT "%s", IDC_LOCALETEXT, 53, 29, 250, 16 LTEXT "システム、ユーザーロケール設定変更には [カスタマイズ] をクリックします。", IDC_STATIC, 53, 50, 166, 25 PUSHBUTTON "カスタマイズ(&C)...", IDC_CUSTOMLOCALE, 220, 52, 80, 14 + LTEXT "", IDC_STATIC, 53, 74, 246, 1, SS_ETCHEDHORZ LTEXT "キーボードレイアウトは、キーを押したときにどの文字が入力されるかを制御します。", IDC_STATIC, 53, 81, 253, 20 LTEXT "%s", IDC_LAYOUTTEXT, 53, 100, 250, 16 LTEXT "キーボードレイアウト変更には [カスタマイズ] をクリックします。", IDC_STATIC, 53, 120, 166, 25 @@ -174,6 +175,8 @@ BEGIN IDS_COMPUTERSUBTITLE "コンピュータ名と Administrator パスワードを入力する必要があります。" IDS_LOCALETITLE "地域の設定" IDS_LOCALESUBTITLE "ReactOS を様々な地域と言語にあわせてカスタマイズすることができます。" + IDS_LOCALETEXT "The Standards and formats are set to %s, and the location is set to %s." + IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard layout" IDS_DATETIMETITLE "日付と時刻" IDS_DATETIMESUBTITLE "コンピュータの日付と時刻を正しく設定して下さい。" IDS_PROCESSTITLE "コンポーネントの登録中" diff --git a/dll/win32/syssetup/lang/lt-LT.rc b/dll/win32/syssetup/lang/lt-LT.rc index d224001fdda..576131703c2 100644 --- a/dll/win32/syssetup/lang/lt-LT.rc +++ b/dll/win32/syssetup/lang/lt-LT.rc @@ -96,6 +96,7 @@ BEGIN LTEXT "%s", IDC_LOCALETEXT, 53, 29, 250, 16 LTEXT "To change system or user locale settings, click Customize.", IDC_STATIC, 53, 60, 196, 8 PUSHBUTTON "&Customize...", IDC_CUSTOMLOCALE, 250, 57, 50, 14 + LTEXT "", IDC_STATIC, 53, 79, 246, 1, SS_ETCHEDHORZ LTEXT "The keyboard layout controls the characters that appear when you type.", IDC_STATIC, 53, 86, 253, 8 LTEXT "%s", IDC_LAYOUTTEXT, 53, 100, 250, 16 LTEXT "To change the keyboard layout, click Customize.", IDC_STATIC, 53, 126, 184, 8 @@ -193,6 +194,8 @@ BEGIN IDS_COMPUTERSUBTITLE "You must provide a name and an Administrator Password for your computer." IDS_LOCALETITLE "Regional settings" IDS_LOCALESUBTITLE "You can customize ReactOS for different regions and languages." + IDS_LOCALETEXT "The Standards and formats are set to %s, and the location is set to %s." + IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard layout" IDS_DATETIMETITLE "Date and Time" IDS_DATETIMESUBTITLE "Set the correct date and time for your computer." IDS_PROCESSTITLE "Registering Components" diff --git a/dll/win32/syssetup/lang/nl-NL.rc b/dll/win32/syssetup/lang/nl-NL.rc index 7bfd5a0c99d..7d594f52b43 100644 --- a/dll/win32/syssetup/lang/nl-NL.rc +++ b/dll/win32/syssetup/lang/nl-NL.rc @@ -77,6 +77,7 @@ BEGIN LTEXT "%s", IDC_LOCALETEXT, 53, 29, 250, 16 LTEXT "To change system or user locale settings, click Customize.", IDC_STATIC, 53, 60, 196, 8 PUSHBUTTON "&Customize...", IDC_CUSTOMLOCALE, 250, 57, 50, 14 + LTEXT "", IDC_STATIC, 53, 79, 246, 1, SS_ETCHEDHORZ LTEXT "The keyboard layout controls the characters that appear when you type.", IDC_STATIC, 53, 86, 253, 8 LTEXT "%s", IDC_LAYOUTTEXT, 53, 100, 250, 16 LTEXT "To change the keyboard layout, click Customize.", IDC_STATIC, 53, 126, 184, 8 @@ -174,6 +175,8 @@ BEGIN IDS_COMPUTERSUBTITLE "You must provide a name and an Administrator Password for your computer." IDS_LOCALETITLE "Regional settings" IDS_LOCALESUBTITLE "You can customize ReactOS for different regions and languages." + IDS_LOCALETEXT "The Standards and formats are set to %s, and the location is set to %s." + IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard layout" IDS_DATETIMETITLE "Date and Time" IDS_DATETIMESUBTITLE "Set the correct date and time for your computer." IDS_PROCESSTITLE "Registering Components" diff --git a/dll/win32/syssetup/lang/no-NO.rc b/dll/win32/syssetup/lang/no-NO.rc index 8a4339656f1..b8e4e2f1f09 100644 --- a/dll/win32/syssetup/lang/no-NO.rc +++ b/dll/win32/syssetup/lang/no-NO.rc @@ -77,6 +77,7 @@ BEGIN LTEXT "%s", IDC_LOCALETEXT, 53, 32, 250, 16 LTEXT "For å forandre systemets språk og region instilling, Trykk på Tilpass.", IDC_STATIC, 53, 60, 184, 8 PUSHBUTTON "&Tilpass...", IDC_CUSTOMLOCALE, 245, 57, 50, 14 + LTEXT "", IDC_STATIC, 53, 79, 246, 1, SS_ETCHEDHORZ LTEXT "Tastatur oppsettet kontrollerer karakterene som kommer opp når du trykker.", IDC_STATIC, 53, 86, 253, 8 LTEXT "%s", IDC_LAYOUTTEXT, 53, 100, 250, 16 LTEXT "For å forandre tastatur oppsettet, trykk på Tilpass.", IDC_STATIC, 53, 126, 184, 8 @@ -174,6 +175,8 @@ BEGIN IDS_COMPUTERSUBTITLE "Du må angi et navn og et administrator passord for din datamaskin." IDS_LOCALETITLE "Regionale innstillinger" IDS_LOCALESUBTITLE "Du kan stille inn ReactOS for andre regioner og språk." + IDS_LOCALETEXT "The Standards and formats are set to %s, and the location is set to %s." + IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard layout" IDS_DATETIMETITLE "Dato og tid" IDS_DATETIMESUBTITLE "Still inn dato og tid for din datamaskin." IDS_PROCESSTITLE "Bearbeid side tittel" diff --git a/dll/win32/syssetup/lang/pl-PL.rc b/dll/win32/syssetup/lang/pl-PL.rc index 1636f569927..828acf3e386 100644 --- a/dll/win32/syssetup/lang/pl-PL.rc +++ b/dll/win32/syssetup/lang/pl-PL.rc @@ -77,6 +77,7 @@ BEGIN LTEXT "%s", IDC_LOCALETEXT, 53, 36, 250, 16 LTEXT "By zmienić lokalizację systemu, kliknij przycisk Dostosuj.", IDC_STATIC, 53, 60, 184, 8 PUSHBUTTON "&Dostosuj..", IDC_CUSTOMLOCALE, 245, 57, 50, 14 + LTEXT "", IDC_STATIC, 53, 79, 241, 1, SS_ETCHEDHORZ LTEXT "Układ klawiatury decyduje o przyporządkowaniu znaków pod klawisze.", IDC_STATIC, 53, 86, 253, 8 LTEXT "%s", IDC_LAYOUTTEXT, 53, 100, 250, 16 LTEXT "Aby zmienić układ klawiatury, kliknij przycisk Dostosuj.", IDC_STATIC, 53, 126, 184, 8 @@ -174,6 +175,8 @@ BEGIN IDS_COMPUTERSUBTITLE "Należy podać nazwę dla tego komputera oraz hasło administratora." IDS_LOCALETITLE "Opcje regionalne i językowe" IDS_LOCALESUBTITLE "System ReactOS można dostosować pod kątem języka i sposobu wyświetlania danych." + IDS_LOCALETEXT "The Standards and formats are set to %s, and the location is set to %s." + IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard layout" IDS_DATETIMETITLE "Data i godzina" IDS_DATETIMESUBTITLE "Ustaw prawidłową datę i godzinę." IDS_PROCESSTITLE "Rejestracja składników" diff --git a/dll/win32/syssetup/lang/pt-BR.rc b/dll/win32/syssetup/lang/pt-BR.rc index a71549d3057..a2c5c176717 100644 --- a/dll/win32/syssetup/lang/pt-BR.rc +++ b/dll/win32/syssetup/lang/pt-BR.rc @@ -77,6 +77,7 @@ BEGIN LTEXT "%s", IDC_LOCALETEXT, 53, 36, 250, 16 LTEXT "Para alterar a localidade de sistema ou usuário, clique Personalizar.", IDC_STATIC, 53, 60, 196, 8 PUSHBUTTON "&Personalizar...", IDC_CUSTOMLOCALE, 250, 57, 50, 14 + LTEXT "", IDC_STATIC, 53, 79, 246, 1, SS_ETCHEDHORZ LTEXT "O layout do teclado controla os caracteres que aparecem quando você digita.", IDC_STATIC, 53, 86, 253, 8 LTEXT "%s", IDC_LAYOUTTEXT, 53, 100, 250, 16 LTEXT "Para alterar o layout do teclado, clique Personalizar.", IDC_STATIC, 53, 126, 184, 8 @@ -174,6 +175,8 @@ BEGIN IDS_COMPUTERSUBTITLE "Você deve fornecer um nome e senha de administrador para o seu computador." IDS_LOCALETITLE "Configurações Regionais" IDS_LOCALESUBTITLE "Você pode personalizar o ReactOS para diferentes regiões e línguas." + IDS_LOCALETEXT "The Standards and formats are set to %s, and the location is set to %s." + IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard layout" IDS_DATETIMETITLE "Data e Hora" IDS_DATETIMESUBTITLE "Definir a data e a hora corretas para o seu computador." IDS_PROCESSTITLE "Registrando componentes" diff --git a/dll/win32/syssetup/lang/pt-PT.rc b/dll/win32/syssetup/lang/pt-PT.rc index 9dc33e265ee..db1ca0fd77f 100644 --- a/dll/win32/syssetup/lang/pt-PT.rc +++ b/dll/win32/syssetup/lang/pt-PT.rc @@ -77,6 +77,7 @@ BEGIN LTEXT "%s", IDC_LOCALETEXT, 50, 36, 250, 16 LTEXT "Para alterar a localização do sistema, clique em Personalizar.", IDC_STATIC, 50, 60, 196, 8 PUSHBUTTON "&Personalizar...", IDC_CUSTOMLOCALE, 245, 57, 55, 14 + LTEXT "", IDC_STATIC, 50, 79, 249, 1, SS_ETCHEDHORZ LTEXT "O tipo de teclado controla os caracteres que aparecem quando digita.", IDC_STATIC, 50, 86, 253, 8 LTEXT "%s", IDC_LAYOUTTEXT, 50, 100, 250, 16 LTEXT "Para alterar o tipo do teclado, clique em Personalizar.", IDC_STATIC, 50, 126, 184, 8 @@ -174,6 +175,8 @@ BEGIN IDS_COMPUTERSUBTITLE "Deve fornecer um nome e palavra-passe de administrador para o seu computador." IDS_LOCALETITLE "Configurações Regionais" IDS_LOCALESUBTITLE "Pode personalizar o ReactOS para diferentes regiões e línguas." + IDS_LOCALETEXT "The Standards and formats are set to %s, and the location is set to %s." + IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard layout" IDS_DATETIMETITLE "Data e Hora" IDS_DATETIMESUBTITLE "Definir a data e a hora correctas para o seu computador." IDS_PROCESSTITLE "A registar componentes" diff --git a/dll/win32/syssetup/lang/ro-RO.rc b/dll/win32/syssetup/lang/ro-RO.rc index 943abd757ac..a41910ee409 100644 --- a/dll/win32/syssetup/lang/ro-RO.rc +++ b/dll/win32/syssetup/lang/ro-RO.rc @@ -85,6 +85,7 @@ BEGIN LTEXT "%s", IDC_LOCALETEXT, 53, 29, 250, 16 LTEXT "Modificați configurația de localizare a sistemului.", IDC_STATIC, 53, 60, 186, 8 PUSHBUTTON "&Configurare…", IDC_CUSTOMLOCALE, 230, 57, 70, 14 + LTEXT "", IDC_STATIC, 53, 78, 246, 1, SS_ETCHEDHORZ LTEXT "Configurări și localizări pentru tastatură, aranjamente ale caracterelor asociate tastelor la dactilografiere, și alte servicii de text.", IDC_STATIC, 53, 82, 253, 20 LTEXT "%s", IDC_LAYOUTTEXT, 53, 100, 250, 16 LTEXT "Configurați aranjamentele de tastatură.", IDC_STATIC, 53, 126, 184, 8 @@ -182,6 +183,8 @@ BEGIN IDS_COMPUTERSUBTITLE "Furnizare nume pentru calculator și parolă pentru contul Administrator" IDS_LOCALETITLE "Particularizări regionale" IDS_LOCALESUBTITLE "Particularizare sistem pentru anumite regiuni sau limbi" + IDS_LOCALETEXT "The Standards and formats are set to %s, and the location is set to %s." + IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard layout" IDS_DATETIMETITLE "Dată și oră" IDS_DATETIMESUBTITLE "Stabilire dată și oră corectă pentru calculator" IDS_PROCESSTITLE "Înregistrare componente" diff --git a/dll/win32/syssetup/lang/ru-RU.rc b/dll/win32/syssetup/lang/ru-RU.rc index ad59183ad3a..c88d2a1b21f 100644 --- a/dll/win32/syssetup/lang/ru-RU.rc +++ b/dll/win32/syssetup/lang/ru-RU.rc @@ -85,6 +85,7 @@ BEGIN LTEXT "%s", IDC_LOCALETEXT, 53, 29, 250, 16 LTEXT "Для изменения языка системы нажмите ""Настроить"".", IDC_STATIC, 53, 60, 197, 8 PUSHBUTTON "&Настроить...", IDC_CUSTOMLOCALE, 245, 57, 55, 14 + LTEXT "", IDC_STATIC, 53, 79, 246, 1, SS_ETCHEDHORZ LTEXT "Выбрав раскладку вы сможете вводить символы на вашем языке.", IDC_STATIC, 53, 86, 253, 8 LTEXT "%s", IDC_LAYOUTTEXT, 53, 100, 250, 16 LTEXT "Для изменения раскладки нажмите ""Настроить"".", IDC_STATIC, 53, 126, 184, 8 @@ -182,6 +183,8 @@ BEGIN IDS_COMPUTERSUBTITLE "Вы должны ввести имя и администраторский пароль для вашего компьютера." IDS_LOCALETITLE "Региональные настройки" IDS_LOCALESUBTITLE "Вы можете настраивать ReactOS для разных регионов и языков." + IDS_LOCALETEXT "Языковые стандарты и форматы: %s, расположение: %s." + IDS_LAYOUTTEXT "Ваш язык и метод ввода текста по умолчанию: %s раскладка клавиатуры" IDS_DATETIMETITLE "Дата и время" IDS_DATETIMESUBTITLE "Установите правильную дату и время на вашем компьютере." IDS_PROCESSTITLE "Процесс установки" diff --git a/dll/win32/syssetup/lang/sk-SK.rc b/dll/win32/syssetup/lang/sk-SK.rc index bb77c95158e..75dbe067973 100644 --- a/dll/win32/syssetup/lang/sk-SK.rc +++ b/dll/win32/syssetup/lang/sk-SK.rc @@ -84,6 +84,7 @@ BEGIN LTEXT "%s", IDC_LOCALETEXT, 53, 29, 250, 16 LTEXT "Pre zmenu lokalizácie systému kliknite na Zmeniť.", IDC_STATIC, 53, 60, 184, 8 PUSHBUTTON "&Zmeniť...", IDC_CUSTOMLOCALE, 245, 57, 50, 14 + LTEXT "", IDC_STATIC, 53, 79, 241, 1, SS_ETCHEDHORZ LTEXT "Rozloženie kláves určí znaky, ktoré sa zobrazia, keď píšete.", IDC_STATIC, 53, 86, 253, 8 LTEXT "%s", IDC_LAYOUTTEXT, 53, 100, 250, 16 LTEXT "Pre zmenu rozloženia kláves, kliknite na Zmeniť.", IDC_STATIC, 53, 126, 184, 8 @@ -181,6 +182,8 @@ BEGIN IDS_COMPUTERSUBTITLE "Zadajte meno a heslo pre účet Administrator." IDS_LOCALETITLE "Regionálne nastavenia" IDS_LOCALESUBTITLE "Systém ReactOS môžete prispôsobiť rôznym regiónom a jazykom." + IDS_LOCALETEXT "The Standards and formats are set to %s, and the location is set to %s." + IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard layout" IDS_DATETIMETITLE "Dátum a čas" IDS_DATETIMESUBTITLE "Nastavte správny čas pre Váš počítač." IDS_PROCESSTITLE "Registrácia súčastí" diff --git a/dll/win32/syssetup/lang/sq-AL.rc b/dll/win32/syssetup/lang/sq-AL.rc index abb73c96c7c..b2f52560bdf 100644 --- a/dll/win32/syssetup/lang/sq-AL.rc +++ b/dll/win32/syssetup/lang/sq-AL.rc @@ -96,6 +96,7 @@ BEGIN LTEXT "%s", IDC_LOCALETEXT, 53, 36, 250, 16 LTEXT "Për të ndryshuar parametrat e sistemit ose përdoruesit vendorë, kliko Ndrysho.", IDC_STATIC, 53, 60, 196, 8 PUSHBUTTON "&Ndrysho...", IDC_CUSTOMLOCALE, 250, 57, 50, 14 + LTEXT "", IDC_STATIC, 53, 79, 246, 1, SS_ETCHEDHORZ LTEXT "Paraqitja Tastierës kontrollon karakteret që shfaqen kur ju shkruani.", IDC_STATIC, 53, 86, 253, 8 LTEXT "%s", IDC_LAYOUTTEXT, 53, 100, 250, 16 LTEXT "Për të ndryshuar paraqitje tastieres, kliko Ndrysho.", IDC_STATIC, 53, 126, 184, 8 @@ -193,6 +194,8 @@ BEGIN IDS_COMPUTERSUBTITLE "Ju duhet të siguroni një emër dhe një Fjalëkalim Administratori për kompjuterin tuaj." IDS_LOCALETITLE "Cilësimet Rajonale" IDS_LOCALESUBTITLE "Ju mund ta rregulloje ReactOS për rajone dhe gjuhë të ndryshme." + IDS_LOCALETEXT "The Standards and formats are set to %s, and the location is set to %s." + IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard layout" IDS_DATETIMETITLE "Data dhe Ora" IDS_DATETIMESUBTITLE "Vendos datën e saktë dhe orën për kompjuterin tuaj." IDS_PROCESSTITLE "Regjistrimi Komponenteve" diff --git a/dll/win32/syssetup/lang/sv-SE.rc b/dll/win32/syssetup/lang/sv-SE.rc index 2a45a68fb66..8ca9de01d65 100644 --- a/dll/win32/syssetup/lang/sv-SE.rc +++ b/dll/win32/syssetup/lang/sv-SE.rc @@ -96,6 +96,7 @@ BEGIN LTEXT "%s", IDC_LOCALETEXT, 53, 29, 250, 16 LTEXT "To change system or user locale settings, click Customize.", IDC_STATIC, 53, 60, 196, 8 PUSHBUTTON "&Customize...", IDC_CUSTOMLOCALE, 250, 57, 50, 14 + LTEXT "", IDC_STATIC, 53, 79, 246, 1, SS_ETCHEDHORZ LTEXT "The keyboard layout controls the characters that appear when you type.", IDC_STATIC, 53, 86, 253, 8 LTEXT "%s", IDC_LAYOUTTEXT, 53, 100, 250, 16 LTEXT "To change the keyboard layout, click Customize.", IDC_STATIC, 53, 126, 184, 8 @@ -193,6 +194,8 @@ BEGIN IDS_COMPUTERSUBTITLE "You must provide a name and an Administrator Password for your computer." IDS_LOCALETITLE "Regional settings" IDS_LOCALESUBTITLE "You can customize ReactOS for different regions and languages." + IDS_LOCALETEXT "The Standards and formats are set to %s, and the location is set to %s." + IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard layout" IDS_DATETIMETITLE "Date and Time" IDS_DATETIMESUBTITLE "Set the correct date and time for your computer." IDS_PROCESSTITLE "Registering Components" diff --git a/dll/win32/syssetup/lang/th-TH.rc b/dll/win32/syssetup/lang/th-TH.rc index 2789ed3d3d3..49f004e3f98 100644 --- a/dll/win32/syssetup/lang/th-TH.rc +++ b/dll/win32/syssetup/lang/th-TH.rc @@ -96,6 +96,7 @@ BEGIN LTEXT "%s", IDC_LOCALETEXT, 53, 29, 250, 16 LTEXT "To change system or user locale settings, click Customize.", IDC_STATIC, 53, 60, 196, 8 PUSHBUTTON "&Customize...", IDC_CUSTOMLOCALE, 250, 57, 50, 14 + LTEXT "", IDC_STATIC, 53, 79, 246, 1, SS_ETCHEDHORZ LTEXT "The keyboard layout controls the characters that appear when you type.", IDC_STATIC, 53, 86, 253, 8 LTEXT "%s", IDC_LAYOUTTEXT, 53, 100, 250, 16 LTEXT "To change the keyboard layout, click Customize.", IDC_STATIC, 53, 126, 184, 8 @@ -193,6 +194,8 @@ BEGIN IDS_COMPUTERSUBTITLE "You must provide a name and an Administrator Password for your computer." IDS_LOCALETITLE "Regional settings" IDS_LOCALESUBTITLE "You can customize ReactOS for different regions and languages." + IDS_LOCALETEXT "The Standards and formats are set to %s, and the location is set to %s." + IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard layout" IDS_DATETIMETITLE "Date and Time" IDS_DATETIMESUBTITLE "Set the correct date and time for your computer." IDS_PROCESSTITLE "Registering Components" diff --git a/dll/win32/syssetup/lang/tr-TR.rc b/dll/win32/syssetup/lang/tr-TR.rc index 3cd9bd6b497..ce03d962c38 100644 --- a/dll/win32/syssetup/lang/tr-TR.rc +++ b/dll/win32/syssetup/lang/tr-TR.rc @@ -86,6 +86,7 @@ BEGIN LTEXT "%s", IDC_LOCALETEXT, 53, 34, 250, 16 LTEXT "Sistem veya kullanıcı yerel ayarlarını değiştirmek için Özelleştir'e tıklayınız.", IDC_STATIC, 53, 60, 196, 30 PUSHBUTTON "Ö&zelleştir...", IDC_CUSTOMLOCALE, 250, 57, 50, 14 + LTEXT "", IDC_STATIC, 53, 81, 246, 1, SS_ETCHEDHORZ LTEXT "Klavye düzeni, yazdığınızda gözüken karakterleri denetler.", IDC_STATIC, 53, 86, 253, 8 LTEXT "%s", IDC_LAYOUTTEXT, 53, 100, 250, 16 LTEXT "Klavye düzenini değiştirmek için Özelleştir'e tıklayınız.", IDC_STATIC, 53, 126, 184, 8 @@ -183,6 +184,8 @@ BEGIN IDS_COMPUTERSUBTITLE "Bilgisayarınız için bir ad ve bir Yönetici Şifresi sağlamalısınız." IDS_LOCALETITLE "Yerel Ayarlar" IDS_LOCALESUBTITLE "Farklı bölgeler ve diller için ReactOS'u özelleştirebilirsiniz." + IDS_LOCALETEXT "The Standards and formats are set to %s, and the location is set to %s." + IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard layout" IDS_DATETIMETITLE "Tarih ve Saat" IDS_DATETIMESUBTITLE "Bilgisayarınız için doğru zamanı ayarlayınız." IDS_PROCESSTITLE "Bileşenler Kaydediliyor" diff --git a/dll/win32/syssetup/lang/uk-UA.rc b/dll/win32/syssetup/lang/uk-UA.rc index f3aa55d56a7..1f7009ad7cb 100644 --- a/dll/win32/syssetup/lang/uk-UA.rc +++ b/dll/win32/syssetup/lang/uk-UA.rc @@ -86,6 +86,7 @@ BEGIN LTEXT "%s", IDC_LOCALETEXT, 53, 36, 250, 16 LTEXT "Для зміни мови системи або мови користувача натисніть ""Налаштувати"".", IDC_STATIC, 53, 60, 184, 16 PUSHBUTTON "На&лаштувати...", IDC_CUSTOMLOCALE, 240, 57, 57, 14 + LTEXT "", IDC_STATIC, 53, 81, 246, 1, SS_ETCHEDHORZ LTEXT "Розкладка клавіатури визначає символи, що вводяться при натисненні клавіш.", IDC_STATIC, 53, 84, 253, 18 LTEXT "%s", IDC_LAYOUTTEXT, 53, 106, 250, 16 LTEXT "Для зміни розкладки клавіатури натисніть ""Налаштувати"".", IDC_STATIC, 53, 126, 184, 18 @@ -183,6 +184,8 @@ BEGIN IDS_COMPUTERSUBTITLE "Ви маєте вказати ім'я та пароль адміністратора Вашого комп'ютера." IDS_LOCALETITLE "Регіональні налаштування" IDS_LOCALESUBTITLE "Ви можете налаштувати ReactOS для різних регіонів і мов." + IDS_LOCALETEXT "The Standards and formats are set to %s, and the location is set to %s." + IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard layout" IDS_DATETIMETITLE "Дата та час" IDS_DATETIMESUBTITLE "Встановіть правильні дату і час для Вашого комп'ютера." IDS_PROCESSTITLE "Реєстрація компонентів" diff --git a/dll/win32/syssetup/lang/zh-CN.rc b/dll/win32/syssetup/lang/zh-CN.rc index 927891086a8..b98b7d4c39c 100644 --- a/dll/win32/syssetup/lang/zh-CN.rc +++ b/dll/win32/syssetup/lang/zh-CN.rc @@ -84,6 +84,7 @@ BEGIN LTEXT "%s", IDC_LOCALETEXT, 53, 29, 250, 16 LTEXT "想要更改系统和用户的区域设置，请单击 “自定义” 。", IDC_STATIC, 53, 60, 184, 8 PUSHBUTTON "自定义(&C)...", IDC_CUSTOMLOCALE, 245, 57, 50, 14 + LTEXT "", IDC_STATIC, 53, 79, 246, 1, SS_ETCHEDHORZ LTEXT "“文字输入语言”让您使用多种输入方法和设备用\n许多不同的语言输入文字。", IDC_STATIC, 53, 86, 253, 20 LTEXT "%s", IDC_LAYOUTTEXT, 53, 106, 250, 16 LTEXT "想要查看或改变当前配置，请单击“自定义”。", IDC_STATIC, 53, 124, 184, 8 @@ -181,6 +182,8 @@ BEGIN IDS_COMPUTERSUBTITLE "您必须提供计算机名和系统管理员密码。" IDS_LOCALETITLE "区域设置" IDS_LOCALESUBTITLE "您可以为不同的区域和语言自定义 ReactOS。" + IDS_LOCALETEXT "The Standards and formats are set to %s, and the location is set to %s." + IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard layout" IDS_DATETIMETITLE "日期和时间" IDS_DATETIMESUBTITLE "为您的计算机配置正确的日期和时间。" IDS_PROCESSTITLE "注册组件" diff --git a/dll/win32/syssetup/lang/zh-TW.rc b/dll/win32/syssetup/lang/zh-TW.rc index 116c0bed379..707a831294c 100644 --- a/dll/win32/syssetup/lang/zh-TW.rc +++ b/dll/win32/syssetup/lang/zh-TW.rc @@ -86,6 +86,7 @@ BEGIN LTEXT "%s", IDC_LOCALETEXT, 53, 29, 250, 16 LTEXT "若要變更系統和使用者的地區設定, 請按［自訂］。", IDC_STATIC, 53, 60, 196, 8 PUSHBUTTON "自訂(&C)...", IDC_CUSTOMLOCALE, 250, 57, 50, 14 + LTEXT "", IDC_STATIC, 53, 79, 246, 1, SS_ETCHEDHORZ LTEXT "鍵盤配置控制鍵入時出現的字元。", IDC_STATIC, 53, 86, 253, 8 LTEXT "%s", IDC_LAYOUTTEXT, 53, 100, 250, 16 LTEXT "要查看或變更目前設定，請按［自訂］。", IDC_STATIC, 53, 126, 184, 8 @@ -183,6 +184,8 @@ BEGIN IDS_COMPUTERSUBTITLE "您必須提供電腦名稱和管理員密碼。" IDS_LOCALETITLE "地區設定" IDS_LOCALESUBTITLE "您可以為不同的地區和語言自訂 ReactOS。" + IDS_LOCALETEXT "The Standards and formats are set to %s, and the location is set to %s." + IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard layout" IDS_DATETIMETITLE "日期和時間" IDS_DATETIMESUBTITLE "為您的電腦配置正確的日期和時間。" IDS_PROCESSTITLE "正在登錄元件" diff --git a/dll/win32/syssetup/resource.h b/dll/win32/syssetup/resource.h index f4f24462dff..173f3f05ad5 100644 --- a/dll/win32/syssetup/resource.h +++ b/dll/win32/syssetup/resource.h @@ -108,6 +108,8 @@ #define IDS_LOCALETITLE 3040 #define IDS_LOCALESUBTITLE 3041 +#define IDS_LOCALETEXT 3042 +#define IDS_LAYOUTTEXT 3043 #define IDS_DATETIMETITLE 3050 #define IDS_DATETIMESUBTITLE 3051 diff --git a/dll/win32/syssetup/wizard.c b/dll/win32/syssetup/wizard.c index c891813f1ae..330b0f2916b 100644 --- a/dll/win32/syssetup/wizard.c +++ b/dll/win32/syssetup/wizard.c @@ -1089,67 +1089,99 @@ ComputerPageDlgProc(HWND hwndDlg, static VOID SetUserLocaleName(HWND hwnd) { - /* FIXME: Set actual locale name */ - SetWindowTextW(hwnd, L""); + WCHAR CurLocale[256] = L""; + WCHAR CurGeo[256] = L""; + WCHAR ResText[256] = L""; + WCHAR LocaleText[256 * 2]; + + GetLocaleInfoW(GetUserDefaultLCID(), LOCALE_SLANGUAGE, CurLocale, ARRAYSIZE(CurLocale)); + GetGeoInfoW(GetUserGeoID(GEOCLASS_NATION), GEO_FRIENDLYNAME, CurGeo, ARRAYSIZE(CurGeo), LANG_SYSTEM_DEFAULT); + + LoadStringW(hDllInstance, IDS_LOCALETEXT, ResText, ARRAYSIZE(ResText)); + StringCchPrintfW(LocaleText, ARRAYSIZE(LocaleText), ResText, CurLocale, CurGeo); + + SetWindowTextW(hwnd, LocaleText); } static VOID SetKeyboardLayoutName(HWND hwnd) { -#if 0 - TCHAR szLayoutPath[256]; - TCHAR szLocaleName[32]; - DWORD dwLocaleSize; + HKL hkl; + BOOL LayoutSpecial = FALSE; + WCHAR LayoutPath[256]; + WCHAR LocaleName[32]; + WCHAR SpecialId[5] = L""; + WCHAR ResText[256] = L""; + DWORD dwValueSize; HKEY hKey; + UINT i; - if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, - _T("SYSTEM\\CurrentControlSet\\Control\\NLS\\Locale"), - 0, - KEY_ALL_ACCESS, - &hKey)) - return; + /* Get the default input language and method */ + if (!SystemParametersInfoW(SPI_GETDEFAULTINPUTLANG, 0, (LPDWORD)&hkl, 0)) + { + hkl = GetKeyboardLayout(0); + } - dwValueSize = 16 * sizeof(TCHAR); - if (RegQueryValueEx(hKey, - NULL, - NULL, - NULL, - szLocaleName, - &dwLocaleSize)) + if ((HIWORD(hkl) & 0xF000) == 0xF000) { - RegCloseKey(hKey); - return; + /* Process keyboard layout with special id */ + StringCchPrintfW(SpecialId, ARRAYSIZE(SpecialId), L"%04x", (HIWORD(hkl) & 0x0FFF)); + LayoutSpecial = TRUE; } - _tcscpy(szLayoutPath, - _T("SYSTEM\\CurrentControlSet\\Control\\Keyboard Layouts\\")); - _tcscat(szLayoutPath, - szLocaleName); +#define MAX_LAYOUTS_PER_LANGID 0x10000 + for (i = 0; i < (LayoutSpecial ? MAX_LAYOUTS_PER_LANGID : 1); i++) + { + /* Generate a hexadecimal identifier for keyboard layout registry key */ + StringCchPrintfW(LocaleName, ARRAYSIZE(LocaleName), L"%08lx", (i << 16) | LOWORD(hkl)); - if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, - szLayoutPath, - 0, - KEY_ALL_ACCESS, - &hKey)) - return; + StringCchCopyW(LayoutPath, ARRAYSIZE(LayoutPath), L"SYSTEM\\CurrentControlSet\\Control\\Keyboard Layouts\\"); + StringCchCatW(LayoutPath, ARRAYSIZE(LayoutPath), LocaleName); + *LocaleName = UNICODE_NULL; - dwValueSize = 32 * sizeof(TCHAR); - if (RegQueryValueEx(hKey, - _T("Layout Text"), - NULL, - NULL, - szLocaleName, - &dwLocaleSize)) - { - RegCloseKey(hKey); - return; + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, + LayoutPath, + 0, + KEY_ALL_ACCESS, + &hKey) == ERROR_SUCCESS) + { + /* Make sure the keyboard layout key we opened is the one we need. + * If the layout has no special id, just pass this check. */ + dwValueSize = sizeof(LocaleName); + if (!LayoutSpecial || + ((RegQueryValueExW(hKey, + L"Layout Id", + NULL, + NULL, + (PVOID)&LocaleName, + &dwValueSize) == ERROR_SUCCESS) && + (wcscmp(LocaleName, SpecialId) == 0))) + { + *LocaleName = UNICODE_NULL; + dwValueSize = sizeof(LocaleName); + RegQueryValueExW(hKey, + L"Layout Text", + NULL, + NULL, + (PVOID)&LocaleName, + &dwValueSize); + /* Let the loop know where to stop */ + i = MAX_LAYOUTS_PER_LANGID; + } + RegCloseKey(hKey); + } + else + { + /* Keyboard layout registry keys are expected to go in order without gaps */ + break; + } } +#undef MAX_LAYOUTS_PER_LANGID - RegCloseKey(hKey); -#else - /* FIXME: Set actual layout name */ - SetWindowTextW(hwnd, L""); -#endif + LoadStringW(hDllInstance, IDS_LAYOUTTEXT, ResText, ARRAYSIZE(ResText)); + StringCchPrintfW(LayoutPath, ARRAYSIZE(LayoutPath), ResText, LocaleName); + + SetWindowTextW(hwnd, LayoutPath); } @@ -1157,6 +1189,7 @@ static BOOL RunControlPanelApplet(HWND hwnd, PCWSTR pwszCPLParameters) { MSG msg; + HWND MainWindow = GetParent(hwnd); STARTUPINFOW StartupInfo; PROCESS_INFORMATION ProcessInformation; WCHAR CmdLine[MAX_PATH] = L"rundll32.exe shell32.dll,Control_RunDLL "; @@ -1189,8 +1222,14 @@ RunControlPanelApplet(HWND hwnd, PCWSTR pwszCPLParameters) return FALSE; } + /* Disable the Back and Next buttons and the main window + * while we're interacting with the control panel applet */ + PropSheet_SetWizButtons(MainWindow, 0); + EnableWindow(MainWindow, FALSE); + while ((MsgWaitForMultipleObjects(1, &ProcessInformation.hProcess, FALSE, INFINITE, QS_ALLINPUT|QS_ALLPOSTMESSAGE )) != WAIT_OBJECT_0) { + /* We still need to process main window messages to avoid freeze */ while (PeekMessageW(&msg, NULL, 0, 0, PM_REMOVE)) { TranslateMessage(&msg); @@ -1199,6 +1238,11 @@ RunControlPanelApplet(HWND hwnd, PCWSTR pwszCPLParameters) } CloseHandle(ProcessInformation.hThread); CloseHandle(ProcessInformation.hProcess); + + /* Enable the Back and Next buttons and the main window again */ + PropSheet_SetWizButtons(MainWindow, PSWIZB_BACK | PSWIZB_NEXT); + EnableWindow(MainWindow, TRUE); + return TRUE; } @@ -1255,11 +1299,12 @@ LocalePageDlgProc(HWND hwndDlg, { case IDC_CUSTOMLOCALE: RunControlPanelApplet(hwndDlg, L"intl.cpl,,5"); - /* FIXME: Update input locale name */ + SetUserLocaleName(GetDlgItem(hwndDlg, IDC_LOCALETEXT)); break; case IDC_CUSTOMLAYOUT: RunControlPanelApplet(hwndDlg, L"input.dll,@1"); + SetKeyboardLayoutName(GetDlgItem(hwndDlg, IDC_LAYOUTTEXT)); break; } }

2 years, 12 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2021