wine-commits January 2018

wine-commits@winehq.org

2 participants
638 discussions

Akihiro Sagawa : msvcrt/tests: Add tests for mbstowcs and wcstombs with empty strings.
by Alexandre Julliard 02 Jan '18

02 Jan '18

Module: wine Branch: stable Commit: 09a6695799f9b371f98d0eadc4632b76e1ae3933 URL: https://source.winehq.org/git/wine.git/?a=commit;h=09a6695799f9b371f98d0ead… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Aug 4 23:06:37 2017 +0900 msvcrt/tests: Add tests for mbstowcs and wcstombs with empty strings. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 82bf4edf36fd34f9fdadeddb991c6bf03dded871) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/tests/string.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 3fe8df8..58e19a9 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -1833,8 +1833,10 @@ static void test_mbstowcs(void) { static const wchar_t wSimple[] = { 't','e','x','t',0 }; static const wchar_t wHiragana[] = { 0x3042,0x3043,0 }; + static const wchar_t wEmpty[] = { 0 }; static const char mSimple[] = "text"; static const char mHiragana[] = { 0x82,0xa0,0x82,0xa1,0 }; + static const char mEmpty[] = { 0 }; const wchar_t *pwstr; wchar_t wOut[6]; @@ -1863,6 +1865,13 @@ static void test_mbstowcs(void) ok(!memcmp(wOut, wSimple, 4*sizeof(wchar_t)), "wOut = %s\n", wine_dbgstr_w(wOut)); ok(wOut[4] == '!', "wOut[4] != \'!\'\n"); + ret = mbstowcs(NULL, mEmpty, 1); + ok(ret == 0, "mbstowcs did not return 0, got %d\n", (int)ret); + + ret = mbstowcs(wOut, mEmpty, 1); + ok(ret == 0, "mbstowcs did not return 0, got %d\n", (int)ret); + ok(!memcmp(wOut, wEmpty, sizeof(wEmpty)), "wOut = %s\n", wine_dbgstr_w(wOut)); + ret = wcstombs(NULL, wSimple, 0); ok(ret == 4, "wcstombs did not return 4\n"); @@ -1874,6 +1883,13 @@ static void test_mbstowcs(void) ok(ret == 2, "wcstombs did not return 2\n"); ok(!memcmp(mOut, mSimple, 5*sizeof(char)), "mOut = %s\n", mOut); + ret = wcstombs(NULL, wEmpty, 1); + ok(ret == 0, "wcstombs did not return 0, got %d\n", (int)ret); + + ret = wcstombs(mOut, wEmpty, 1); + ok(ret == 0, "wcstombs did not return 0, got %d\n", (int)ret); + ok(!memcmp(mOut, mEmpty, sizeof(mEmpty)), "mOut = %s\n", mOut); + if(!setlocale(LC_ALL, "Japanese_Japan.932")) { win_skip("Japanese_Japan.932 locale not available\n"); return; @@ -1883,10 +1899,18 @@ static void test_mbstowcs(void) ok(ret == 2, "mbstowcs did not return 2\n"); ok(!memcmp(wOut, wHiragana, sizeof(wHiragana)), "wOut = %s\n", wine_dbgstr_w(wOut)); + ret = mbstowcs(wOut, mEmpty, 6); + todo_wine ok(ret == 0, "mbstowcs did not return 0, got %d\n", (int)ret); + ok(!memcmp(wOut, wEmpty, sizeof(wEmpty)), "wOut = %s\n", wine_dbgstr_w(wOut)); + ret = wcstombs(mOut, wHiragana, 6); ok(ret == 4, "wcstombs did not return 4\n"); ok(!memcmp(mOut, mHiragana, sizeof(mHiragana)), "mOut = %s\n", mOut); + ret = wcstombs(mOut, wEmpty, 6); + ok(ret == 0, "wcstombs did not return 0, got %d\n", (int)ret); + ok(!memcmp(mOut, mEmpty, sizeof(mEmpty)), "mOut = %s\n", mOut); + if(!pmbstowcs_s || !pwcstombs_s) { setlocale(LC_ALL, "C"); win_skip("mbstowcs_s or wcstombs_s not available\n"); @@ -1903,6 +1927,11 @@ static void test_mbstowcs(void) ok(ret == 3, "mbstowcs_s did not return 3\n"); ok(!memcmp(wOut, wHiragana, sizeof(wHiragana)), "wOut = %s\n", wine_dbgstr_w(wOut)); + err = pmbstowcs_s(&ret, wOut, 6, mEmpty, _TRUNCATE); + todo_wine ok(err == 0, "err = %d\n", err); + todo_wine ok(ret == 1, "mbstowcs_s did not return 1, got %d\n", (int)ret); + ok(!memcmp(wOut, wEmpty, sizeof(wEmpty)), "wOut = %s\n", wine_dbgstr_w(wOut)); + err = pmbstowcs_s(&ret, NULL, 0, mHiragana, 1); ok(err == 0, "err = %d\n", err); ok(ret == 3, "mbstowcs_s did not return 3\n"); @@ -1917,6 +1946,11 @@ static void test_mbstowcs(void) ok(ret == 5, "wcstombs_s did not return 5\n"); ok(!memcmp(mOut, mHiragana, sizeof(mHiragana)), "mOut = %s\n", mOut); + err = pwcstombs_s(&ret, mOut, 6, wEmpty, _TRUNCATE); + ok(err == 0, "err = %d\n", err); + ok(ret == 1, "wcstombs_s did not return 1, got %d\n", (int)ret); + ok(!memcmp(mOut, mEmpty, sizeof(mEmpty)), "mOut = %s\n", mOut); + err = pwcstombs_s(&ret, NULL, 0, wHiragana, 1); ok(err == 0, "err = %d\n", err); ok(ret == 5, "wcstombs_s did not return 5\n");

1 0

Nikolay Sivov : kernel32/nls: Added LOCALE_SNAN entries.
by Alexandre Julliard 02 Jan '18

02 Jan '18

1 0

Nikolay Sivov : kernel32/nls: Added Bangla (India) locale data.
by Alexandre Julliard 02 Jan '18

02 Jan '18

Module: wine Branch: stable Commit: 35055014c06170fbd84b8817ca3e5a54b6836331 URL: https://source.winehq.org/git/wine.git/?a=commit;h=35055014c06170fbd84b8817… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 9 17:30:22 2017 +0300 kernel32/nls: Added Bangla (India) locale data. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 2f6e6605b494b2412f9e4363149fec704c04d4e8) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/locale_rc.rc | 2 + dlls/kernel32/nls/ben.nls | 162 +++++++++++++++++++++++++++++++++++++++++++++ include/winnt.rh | 3 + 3 files changed, 167 insertions(+) diff --git a/dlls/kernel32/locale_rc.rc b/dlls/kernel32/locale_rc.rc index cddac46..37b20e3 100644 --- a/dlls/kernel32/locale_rc.rc +++ b/dlls/kernel32/locale_rc.rc @@ -208,6 +208,8 @@ #include "nls/ttt.nls" /* 0x0444 LANG_TATAR, SUBLANG_DEFAULT */ +#include "nls/ben.nls" /* 0x0445 LANG_BANGLA, SUBLANG_BANGLA_INDIA */ + #include "nls/pan.nls" /* 0x0446 LANG_PUNJABI, SUBLANG_DEFAULT */ #include "nls/guj.nls" /* 0x0447 LANG_GUJARATI, SUBLANG_DEFAULT */ diff --git a/dlls/kernel32/nls/ben.nls b/dlls/kernel32/nls/ben.nls new file mode 100644 index 0000000..9dcfa70 --- /dev/null +++ b/dlls/kernel32/nls/ben.nls @@ -0,0 +1,162 @@ +/* + * Locale definitions for Bangla + * + * Copyright 2017 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma code_page(65001) /* UTF-8 */ + +STRINGTABLE LANGUAGE LANG_BANGLA, SUBLANG_BANGLA_INDIA +{ + LOCALE_FONTSIGNATURE L"\x0000\x0001\x0000\x0000\x0000\x0000\x0000\x8000\x0000\x0000\x0000\x0000\x0000\x0000\x0000\x0000" + LOCALE_ICALENDARTYPE "1" + LOCALE_ICENTURY "0" + LOCALE_ICOUNTRY "91" + LOCALE_ICURRDIGITS "2" + LOCALE_ICURRENCY "2" + LOCALE_IDATE "1" + LOCALE_IDAYLZERO "1" + LOCALE_IDEFAULTANSICODEPAGE "0" + LOCALE_IDEFAULTCODEPAGE "1" + LOCALE_IDEFAULTCOUNTRY "91" + LOCALE_IDEFAULTEBCDICCODEPAGE "500" + LOCALE_IDEFAULTLANGUAGE "0445" + LOCALE_IDEFAULTMACCODEPAGE "2" + LOCALE_IDEFAULTUNIXCODEPAGE "" + LOCALE_IDIGITS "2" + LOCALE_IDIGITSUBSTITUTION "1" + LOCALE_IFIRSTDAYOFWEEK "0" + LOCALE_IFIRSTWEEKOFYEAR "0" + LOCALE_IINTLCURRDIGITS "2" + LOCALE_ILANGUAGE "0445" + LOCALE_ILDATE "1" + LOCALE_ILZERO "1" + LOCALE_IMEASURE "0" + LOCALE_IMONLZERO "1" + LOCALE_INEGCURR "12" + LOCALE_INEGNUMBER "1" + LOCALE_INEGSEPBYSPACE "1" + LOCALE_INEGSIGNPOSN "4" + LOCALE_IPOSSYMPRECEDES "1" + LOCALE_IREADINGLAYOUT "0" + LOCALE_ITIME "1" + LOCALE_ITIMEMARKPOSN "0" + LOCALE_ITLZERO "1" + LOCALE_S1159 "AM" + LOCALE_S2359 "PM" + LOCALE_SABBREVCTRYNAME "IND" + LOCALE_SABBREVDAYNAME1 "সোম." + LOCALE_SABBREVDAYNAME2 "মঙ্গল." + LOCALE_SABBREVDAYNAME3 "বুধ." + LOCALE_SABBREVDAYNAME4 "বৃহস্পতি." + LOCALE_SABBREVDAYNAME5 "শুক্র." + LOCALE_SABBREVDAYNAME6 "শনি." + LOCALE_SABBREVDAYNAME7 "রবি." + LOCALE_SABBREVLANGNAME "BNG" + LOCALE_SABBREVMONTHNAME1 "জানু." + LOCALE_SABBREVMONTHNAME2 "ফেব্রু." + LOCALE_SABBREVMONTHNAME3 "মার্চ" + LOCALE_SABBREVMONTHNAME4 "এপ্রিল" + LOCALE_SABBREVMONTHNAME5 "মে" + LOCALE_SABBREVMONTHNAME6 "জুন" + LOCALE_SABBREVMONTHNAME7 "জুলাই" + LOCALE_SABBREVMONTHNAME8 "আগ." + LOCALE_SABBREVMONTHNAME9 "সেপ্টে." + LOCALE_SABBREVMONTHNAME10 "অক্টো." + LOCALE_SABBREVMONTHNAME11 "নভে." + LOCALE_SABBREVMONTHNAME12 "ডিসে." + LOCALE_SABBREVMONTHNAME13 "" + LOCALE_SCOUNTRY "India" + LOCALE_SCURRENCY "₹" + LOCALE_SDATE "-" + LOCALE_SDAYNAME1 "সোমবার" + LOCALE_SDAYNAME2 "মঙ্গলবার" + LOCALE_SDAYNAME3 "বুধবার" + LOCALE_SDAYNAME4 "বৃহস্পতিবার" + LOCALE_SDAYNAME5 "শুক্রবার" + LOCALE_SDAYNAME6 "শনিবার" + LOCALE_SDAYNAME7 "রবিবার" + LOCALE_SDECIMAL "." + LOCALE_SENGCOUNTRY "India" + LOCALE_SENGCURRNAME "Indian Rupee" + LOCALE_SENGLANGUAGE "Bangla" + LOCALE_SGROUPING "3;2;0" + LOCALE_SINTLSYMBOL "INR" + LOCALE_SISO3166CTRYNAME "IN" + LOCALE_SISO639LANGNAME "bn" + LOCALE_SLANGUAGE "Bangla (India)" + LOCALE_SLIST "," + LOCALE_SLONGDATE "dd MMMM yyyy" + LOCALE_SMONDECIMALSEP "." + LOCALE_SMONGROUPING "3;2;0" + LOCALE_SMONTHNAME1 "জানুয়ারী" + LOCALE_SMONTHNAME2 "ফেব্রুয়ারী" + LOCALE_SMONTHNAME3 "মার্চ" + LOCALE_SMONTHNAME4 "এপ্রিল" + LOCALE_SMONTHNAME5 "মে" + LOCALE_SMONTHNAME6 "জুন" + LOCALE_SMONTHNAME7 "জুলাই" + LOCALE_SMONTHNAME8 "আগস্ট" + LOCALE_SMONTHNAME9 "সেপ্টেম্বর" + LOCALE_SMONTHNAME10 "অক্টোবর" + LOCALE_SMONTHNAME11 "নভেম্বর" + LOCALE_SMONTHNAME12 "ডিসেম্বর" + LOCALE_SMONTHNAME13 "" + LOCALE_SMONTHOUSANDSEP "," + LOCALE_SNAME "bn-IN" + LOCALE_SNATIVECTRYNAME "ভারত" + LOCALE_SNATIVECURRNAME "টাকা" + LOCALE_SNATIVEDIGITS "০১২৩৪৫৬৭৮৯" + LOCALE_SNATIVEDISPLAYNAME "বাংলা (ভারত)" + LOCALE_SNATIVELANGNAME "বাংলা" + LOCALE_SNEGATIVESIGN "-" + LOCALE_SOPENTYPELANGUAGETAG "BEN " + LOCALE_SPOSITIVESIGN "" + LOCALE_SSCRIPTS "Beng;" + LOCALE_SSHORTDATE "dd-MM-yy" + LOCALE_SSHORTESTDAYNAME1 "স" + LOCALE_SSHORTESTDAYNAME2 "ম" + LOCALE_SSHORTESTDAYNAME3 "বু" + LOCALE_SSHORTESTDAYNAME4 "বৃ" + LOCALE_SSHORTESTDAYNAME5 "শু" + LOCALE_SSHORTESTDAYNAME6 "শ" + LOCALE_SSHORTESTDAYNAME7 "র" + LOCALE_SSHORTTIME "HH.mm" + LOCALE_SSORTNAME "Default" + LOCALE_STHOUSAND "," + LOCALE_STIME "." + LOCALE_STIMEFORMAT "HH.mm.ss" + LOCALE_SYEARMONTH "MMMM, yyyy" + + LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Western Europe and United States" + LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Central Europe" + LGRPID_BALTIC+LGRPID_RES_BASE "Baltic" + LGRPID_GREEK+LGRPID_RES_BASE "Greek" + LGRPID_CYRILLIC+LGRPID_RES_BASE "Cyrillic" + LGRPID_TURKISH+LGRPID_RES_BASE "Turkic" + LGRPID_JAPANESE+LGRPID_RES_BASE "Japanese" + LGRPID_KOREAN+LGRPID_RES_BASE "Korean" + LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Traditional Chinese" + LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" + LGRPID_THAI+LGRPID_RES_BASE "Thai" + LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" + LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" + LGRPID_INDIC+LGRPID_RES_BASE "Indic" + LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" + LGRPID_ARMENIAN+LGRPID_RES_BASE "Armenian" +} diff --git a/include/winnt.rh b/include/winnt.rh index 1013a24..5f07168 100644 --- a/include/winnt.rh +++ b/include/winnt.rh @@ -45,6 +45,7 @@ #define LANG_ARMENIAN 0x2b #define LANG_ASSAMESE 0x4d #define LANG_AZERI 0x2c +#define LANG_BANGLA 0x45 #define LANG_BASHKIR 0x6d #define LANG_BASQUE 0x2d #define LANG_BELARUSIAN 0x23 @@ -211,6 +212,8 @@ #define SUBLANG_ASSAMESE_INDIA 0x01 #define SUBLANG_AZERI_LATIN 0x01 #define SUBLANG_AZERI_CYRILLIC 0x02 +#define SUBLANG_BANGLA_BANGLADESH 0x02 +#define SUBLANG_BANGLA_INDIA 0x01 #define SUBLANG_BASHKIR_RUSSIA 0x01 #define SUBLANG_BASQUE_BASQUE 0x01 #define SUBLANG_BELARUSIAN_BELARUS 0x01

1 0

Nikolay Sivov : kernel32/nls: Added Nepali locale data.
by Alexandre Julliard 02 Jan '18

02 Jan '18

Module: wine Branch: stable Commit: 852b0cbf07dec81c5486366feace20277b63f91d URL: https://source.winehq.org/git/wine.git/?a=commit;h=852b0cbf07dec81c5486366f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 1 07:59:30 2017 +0300 kernel32/nls: Added Nepali locale data. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 452c1ef66df73e178a26d317a99bea15aea72d53) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/locale_rc.rc | 2 + dlls/kernel32/nls/nep.nls | 162 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 164 insertions(+) diff --git a/dlls/kernel32/locale_rc.rc b/dlls/kernel32/locale_rc.rc index 363e7ab..cddac46 100644 --- a/dlls/kernel32/locale_rc.rc +++ b/dlls/kernel32/locale_rc.rc @@ -232,6 +232,8 @@ #include "nls/syr.nls" /* 0x045a LANG_SYRIAC, SUBLANG_DEFAULT */ +#include "nls/nep.nls" /* 0x0461 LANG_NEPALI, SUBLANG_NEPALI_NEPAL */ + #include "nls/div.nls" /* 0x0465 LANG_DIVEHI, SUBLANG_DEFAULT */ #include "nls/brf.nls" /* 0x047e LANG_BRETON, SUBLANG_DEFAULT */ diff --git a/dlls/kernel32/nls/nep.nls b/dlls/kernel32/nls/nep.nls new file mode 100644 index 0000000..3b13f8a --- /dev/null +++ b/dlls/kernel32/nls/nep.nls @@ -0,0 +1,162 @@ +/* + * Locale definitions for Nepali + * + * Copyright 2017 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma code_page(65001) /* UTF-8 */ + +STRINGTABLE LANGUAGE LANG_NEPALI, SUBLANG_NEPALI_NEPAL +{ + LOCALE_FONTSIGNATURE L"\x8000\x0000\x0000\x0000\x0000\x0000\x0000\x8000\x0000\x0000\x0000\x0000\x0000\x0000\x0000\x0000" + LOCALE_ICALENDARTYPE "1" + LOCALE_ICENTURY "1" + LOCALE_ICOUNTRY "977" + LOCALE_ICURRDIGITS "2" + LOCALE_ICURRENCY "2" + LOCALE_IDATE "0" + LOCALE_IDAYLZERO "0" + LOCALE_IDEFAULTANSICODEPAGE "0" + LOCALE_IDEFAULTCODEPAGE "1" + LOCALE_IDEFAULTCOUNTRY "977" + LOCALE_IDEFAULTEBCDICCODEPAGE "500" + LOCALE_IDEFAULTLANGUAGE "0461" + LOCALE_IDEFAULTMACCODEPAGE "2" + LOCALE_IDEFAULTUNIXCODEPAGE "" + LOCALE_IDIGITS "2" + LOCALE_IDIGITSUBSTITUTION "1" + LOCALE_IFIRSTDAYOFWEEK "6" + LOCALE_IFIRSTWEEKOFYEAR "0" + LOCALE_IINTLCURRDIGITS "2" + LOCALE_ILANGUAGE "0461" + LOCALE_ILDATE "0" + LOCALE_ILZERO "1" + LOCALE_IMEASURE "0" + LOCALE_IMONLZERO "0" + LOCALE_INEGCURR "9" + LOCALE_INEGNUMBER "1" + LOCALE_INEGSEPBYSPACE "1" + LOCALE_INEGSIGNPOSN "3" + LOCALE_IPOSSYMPRECEDES "1" + LOCALE_IREADINGLAYOUT "0" + LOCALE_ITIME "0" + LOCALE_ITIMEMARKPOSN "0" + LOCALE_ITLZERO "0" + LOCALE_S1159 "पूर्वाह्न" + LOCALE_S2359 "अपराह्न" + LOCALE_SABBREVCTRYNAME "NPL" + LOCALE_SABBREVDAYNAME1 "सोम" + LOCALE_SABBREVDAYNAME2 "मङ्गल" + LOCALE_SABBREVDAYNAME3 "बुध" + LOCALE_SABBREVDAYNAME4 "बिही" + LOCALE_SABBREVDAYNAME5 "शुक्र" + LOCALE_SABBREVDAYNAME6 "शनि" + LOCALE_SABBREVDAYNAME7 "आइत" + LOCALE_SABBREVLANGNAME "NEP" + LOCALE_SABBREVMONTHNAME1 "जन" + LOCALE_SABBREVMONTHNAME2 "फेब" + LOCALE_SABBREVMONTHNAME3 "मार्च" + LOCALE_SABBREVMONTHNAME4 "अप्रिल" + LOCALE_SABBREVMONTHNAME5 "मे" + LOCALE_SABBREVMONTHNAME6 "जून" + LOCALE_SABBREVMONTHNAME7 "जुलाई" + LOCALE_SABBREVMONTHNAME8 "अग" + LOCALE_SABBREVMONTHNAME9 "सेप्ट" + LOCALE_SABBREVMONTHNAME10 "अक्ट" + LOCALE_SABBREVMONTHNAME11 "नोभ" + LOCALE_SABBREVMONTHNAME12 "डिस" + LOCALE_SABBREVMONTHNAME13 "" + LOCALE_SCOUNTRY "Nepal" + LOCALE_SCURRENCY "रु" + LOCALE_SDATE "/" + LOCALE_SDAYNAME1 "सोमवार" + LOCALE_SDAYNAME2 "मङ्गलवार" + LOCALE_SDAYNAME3 "बुधवार" + LOCALE_SDAYNAME4 "बिहीवार" + LOCALE_SDAYNAME5 "शुक्रवार" + LOCALE_SDAYNAME6 "शनिवार" + LOCALE_SDAYNAME7 "आइतवार" + LOCALE_SDECIMAL "." + LOCALE_SENGCOUNTRY "Nepal" + LOCALE_SENGCURRNAME "Nepalese Rupee" + LOCALE_SENGLANGUAGE "Nepali" + LOCALE_SGROUPING "3;2;0" + LOCALE_SINTLSYMBOL "NPR" + LOCALE_SISO3166CTRYNAME "NP" + LOCALE_SISO639LANGNAME "ne" + LOCALE_SLANGUAGE "Nepali (Nepal)" + LOCALE_SLIST "," + LOCALE_SLONGDATE "dddd, MMMM dd, yyyy" + LOCALE_SMONDECIMALSEP "." + LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHNAME1 "जनवरी" + LOCALE_SMONTHNAME2 "फेब्रुअरी" + LOCALE_SMONTHNAME3 "मार्च" + LOCALE_SMONTHNAME4 "अप्रिल" + LOCALE_SMONTHNAME5 "मे" + LOCALE_SMONTHNAME6 "जून" + LOCALE_SMONTHNAME7 "जुलाई" + LOCALE_SMONTHNAME8 "अगस्त" + LOCALE_SMONTHNAME9 "सेप्टेम्बर" + LOCALE_SMONTHNAME10 "अक्टोबर" + LOCALE_SMONTHNAME11 "नोभेम्बर" + LOCALE_SMONTHNAME12 "डिसेम्बर" + LOCALE_SMONTHNAME13 "" + LOCALE_SMONTHOUSANDSEP "," + LOCALE_SNAME "ne-NP" + LOCALE_SNATIVECTRYNAME "नेपाल" + LOCALE_SNATIVECURRNAME "रुपैयाँ" + LOCALE_SNATIVEDIGITS "०१२३४५६७८९" + LOCALE_SNATIVEDISPLAYNAME "नेपाली (नेपाल)" + LOCALE_SNATIVELANGNAME "नेपाली" + LOCALE_SNEGATIVESIGN "-" + LOCALE_SOPENTYPELANGUAGETAG "NEP " + LOCALE_SPOSITIVESIGN "" + LOCALE_SSCRIPTS "Deva;" + LOCALE_SSHORTDATE "M/d/yyyy" + LOCALE_SSHORTESTDAYNAME1 "सो" + LOCALE_SSHORTESTDAYNAME2 "म" + LOCALE_SSHORTESTDAYNAME3 "बु" + LOCALE_SSHORTESTDAYNAME4 "बि" + LOCALE_SSHORTESTDAYNAME5 "शु" + LOCALE_SSHORTESTDAYNAME6 "श" + LOCALE_SSHORTESTDAYNAME7 "आ" + LOCALE_SSHORTTIME "h:mm tt" + LOCALE_SSORTNAME "Default" + LOCALE_STHOUSAND "," + LOCALE_STIME ":" + LOCALE_STIMEFORMAT "h:mm:ss tt" + LOCALE_SYEARMONTH "MMMM,yyyy" + + LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Western Europe and United States" + LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Central Europe" + LGRPID_BALTIC+LGRPID_RES_BASE "Baltic" + LGRPID_GREEK+LGRPID_RES_BASE "Greek" + LGRPID_CYRILLIC+LGRPID_RES_BASE "Cyrillic" + LGRPID_TURKISH+LGRPID_RES_BASE "Turkic" + LGRPID_JAPANESE+LGRPID_RES_BASE "Japanese" + LGRPID_KOREAN+LGRPID_RES_BASE "Korean" + LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Traditional Chinese" + LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" + LGRPID_THAI+LGRPID_RES_BASE "Thai" + LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" + LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" + LGRPID_INDIC+LGRPID_RES_BASE "Indic" + LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" + LGRPID_ARMENIAN+LGRPID_RES_BASE "Armenian" +}

1 0

Nikolay Sivov : kernel32/nls: Added genitive month names for Czech.
by Alexandre Julliard 02 Jan '18

02 Jan '18

Module: wine Branch: stable Commit: 78d69929cd25be9270266f9ccba3a83726b0d0a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=78d69929cd25be9270266f9c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 30 17:37:58 2017 +0300 kernel32/nls: Added genitive month names for Czech. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit bb1386b999e6c3b6acb708c6d815a2109102a7c0) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/nls/csy.nls | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/kernel32/nls/csy.nls b/dlls/kernel32/nls/csy.nls index 6a6da7e..564cd0f 100644 --- a/dlls/kernel32/nls/csy.nls +++ b/dlls/kernel32/nls/csy.nls @@ -109,18 +109,18 @@ STRINGTABLE LANGUAGE LANG_CZECH, SUBLANG_DEFAULT LOCALE_SLONGDATE "d. MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" - LOCALE_SMONTHNAME1 "leden" - LOCALE_SMONTHNAME2 "únor" - LOCALE_SMONTHNAME3 "březen" - LOCALE_SMONTHNAME4 "duben" - LOCALE_SMONTHNAME5 "květen" - LOCALE_SMONTHNAME6 "červen" - LOCALE_SMONTHNAME7 "červenec" - LOCALE_SMONTHNAME8 "srpen" - LOCALE_SMONTHNAME9 "září" - LOCALE_SMONTHNAME10 "říjen" - LOCALE_SMONTHNAME11 "listopad" - LOCALE_SMONTHNAME12 "prosinec" + LOCALE_SMONTHNAME1 "leden\0ledna" + LOCALE_SMONTHNAME2 "únor\0února" + LOCALE_SMONTHNAME3 "březen\0března" + LOCALE_SMONTHNAME4 "duben\0dubna" + LOCALE_SMONTHNAME5 "květen\0května" + LOCALE_SMONTHNAME6 "červen\0června" + LOCALE_SMONTHNAME7 "červenec\0července" + LOCALE_SMONTHNAME8 "srpen\0srpna" + LOCALE_SMONTHNAME9 "září\0září" + LOCALE_SMONTHNAME10 "říjen\0října" + LOCALE_SMONTHNAME11 "listopad\0listopadu" + LOCALE_SMONTHNAME12 "prosinec\0prosince" LOCALE_SMONTHNAME13 "" LOCALE_SMONTHOUSANDSEP " " LOCALE_SNAME "cs-CZ"

1 0

Nikolay Sivov : kernel32/nls: Added genitive month names for Croatian.
by Alexandre Julliard 02 Jan '18

02 Jan '18

Module: wine Branch: stable Commit: 58fd65c2b353f07ad476ef999b47315011c6804b URL: https://source.winehq.org/git/wine.git/?a=commit;h=58fd65c2b353f07ad476ef99… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 30 17:37:57 2017 +0300 kernel32/nls: Added genitive month names for Croatian. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 188501e5875a7843ed1d400b4e6399bf85962c32) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/nls/hrv.nls | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/kernel32/nls/hrv.nls b/dlls/kernel32/nls/hrv.nls index 6b38507..4289a0a 100644 --- a/dlls/kernel32/nls/hrv.nls +++ b/dlls/kernel32/nls/hrv.nls @@ -109,18 +109,18 @@ STRINGTABLE LANGUAGE LANG_SERBIAN, SUBLANG_DEFAULT LOCALE_SLONGDATE "d. MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" - LOCALE_SMONTHNAME1 "siječanj" - LOCALE_SMONTHNAME2 "veljača" - LOCALE_SMONTHNAME3 "ožujak" - LOCALE_SMONTHNAME4 "travanj" - LOCALE_SMONTHNAME5 "svibanj" - LOCALE_SMONTHNAME6 "lipanj" - LOCALE_SMONTHNAME7 "srpanj" - LOCALE_SMONTHNAME8 "kolovoz" - LOCALE_SMONTHNAME9 "rujan" - LOCALE_SMONTHNAME10 "listopad" - LOCALE_SMONTHNAME11 "studeni" - LOCALE_SMONTHNAME12 "prosinac" + LOCALE_SMONTHNAME1 "siječanj\0siječnja" + LOCALE_SMONTHNAME2 "veljača\0veljače" + LOCALE_SMONTHNAME3 "ožujak\0ožujka" + LOCALE_SMONTHNAME4 "travanj\0travnja" + LOCALE_SMONTHNAME5 "svibanj\0svibnja" + LOCALE_SMONTHNAME6 "lipanj\0lipnja" + LOCALE_SMONTHNAME7 "srpanj\0srpnja" + LOCALE_SMONTHNAME8 "kolovoz\0kolovoza" + LOCALE_SMONTHNAME9 "rujan\0rujna" + LOCALE_SMONTHNAME10 "listopad\0listopada" + LOCALE_SMONTHNAME11 "studeni\0studenog" + LOCALE_SMONTHNAME12 "prosinac\0prosinca" LOCALE_SMONTHNAME13 "" LOCALE_SMONTHOUSANDSEP "." LOCALE_SNAME "hr-HR"

1 0

Nikolay Sivov : kernel32/nls: Added genitive month names for Armenian.
by Alexandre Julliard 02 Jan '18

02 Jan '18

Module: wine Branch: stable Commit: 84817ebff7effee3d613a199b16a4b335f3dd7e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=84817ebff7effee3d613a199… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 30 17:37:56 2017 +0300 kernel32/nls: Added genitive month names for Armenian. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 5deca0e781255a8a3d91cb2e86a8bae11fee0607) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/nls/hye.nls | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/kernel32/nls/hye.nls b/dlls/kernel32/nls/hye.nls index 039d454..e8f1bf5 100644 --- a/dlls/kernel32/nls/hye.nls +++ b/dlls/kernel32/nls/hye.nls @@ -109,18 +109,18 @@ STRINGTABLE LANGUAGE LANG_ARMENIAN, SUBLANG_DEFAULT LOCALE_SLONGDATE "d MMMM, yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" - LOCALE_SMONTHNAME1 "Հունվար" - LOCALE_SMONTHNAME2 "Փետրվար" - LOCALE_SMONTHNAME3 "Մարտ" - LOCALE_SMONTHNAME4 "Ապրիլ" - LOCALE_SMONTHNAME5 "Մայիս" - LOCALE_SMONTHNAME6 "Հունիս" - LOCALE_SMONTHNAME7 "Հուլիս" - LOCALE_SMONTHNAME8 "Օգոստոս" - LOCALE_SMONTHNAME9 "Սեպտեմբեր" - LOCALE_SMONTHNAME10 "Հոկտեմբեր" - LOCALE_SMONTHNAME11 "Նոյեմբեր" - LOCALE_SMONTHNAME12 "Դեկտեմբեր" + LOCALE_SMONTHNAME1 "Հունվար\0հունվարի" + LOCALE_SMONTHNAME2 "Փետրվար\0փետրվարի" + LOCALE_SMONTHNAME3 "Մարտ\0մարտի" + LOCALE_SMONTHNAME4 "Ապրիլ\0ապրիլի" + LOCALE_SMONTHNAME5 "Մայիս\0մայիսի" + LOCALE_SMONTHNAME6 "Հունիս\0հունիսի" + LOCALE_SMONTHNAME7 "Հուլիս\0հուլիսի" + LOCALE_SMONTHNAME8 "Օգոստոս\0օգոստոսի" + LOCALE_SMONTHNAME9 "Սեպտեմբեր\0սեպտեմբերի" + LOCALE_SMONTHNAME10 "Հոկտեմբեր\0հոկտեմբերի" + LOCALE_SMONTHNAME11 "Նոյեմբեր\0նոյեմբերի" + LOCALE_SMONTHNAME12 "Դեկտեմբեր\0դեկտեմբերի" LOCALE_SMONTHNAME13 "" LOCALE_SMONTHOUSANDSEP "," LOCALE_SNAME "hy-AM"

1 0

Nikolay Sivov : kernel32/nls: Added genitive month names for Belarusian.
by Alexandre Julliard 02 Jan '18

02 Jan '18

Module: wine Branch: stable Commit: a03703f83230067af1ba24f6dd2a0d5cfe777a7f URL: https://source.winehq.org/git/wine.git/?a=commit;h=a03703f83230067af1ba24f6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 30 17:37:55 2017 +0300 kernel32/nls: Added genitive month names for Belarusian. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 5999e0d0324540513b4466325af07757d90a02e1) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/nls/bel.nls | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/kernel32/nls/bel.nls b/dlls/kernel32/nls/bel.nls index 76141bd..5112ebf 100644 --- a/dlls/kernel32/nls/bel.nls +++ b/dlls/kernel32/nls/bel.nls @@ -109,18 +109,18 @@ STRINGTABLE LANGUAGE LANG_BELARUSIAN, SUBLANG_DEFAULT LOCALE_SLONGDATE "d MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;3" - LOCALE_SMONTHNAME1 "Студзень" - LOCALE_SMONTHNAME2 "Люты" - LOCALE_SMONTHNAME3 "Сакавік" - LOCALE_SMONTHNAME4 "Красавік" - LOCALE_SMONTHNAME5 "Май" - LOCALE_SMONTHNAME6 "Чэрвень" - LOCALE_SMONTHNAME7 "Ліпень" - LOCALE_SMONTHNAME8 "Жнівень" - LOCALE_SMONTHNAME9 "Верасень" - LOCALE_SMONTHNAME10 "Кастрычнік" - LOCALE_SMONTHNAME11 "Лістапад" - LOCALE_SMONTHNAME12 "Снежань" + LOCALE_SMONTHNAME1 "Студзень\0студзеня" + LOCALE_SMONTHNAME2 "Люты\0лютага" + LOCALE_SMONTHNAME3 "Сакавік\0сакавіка" + LOCALE_SMONTHNAME4 "Красавік\0красавіка" + LOCALE_SMONTHNAME5 "Май\0мая" + LOCALE_SMONTHNAME6 "Чэрвень\0чэрвеня" + LOCALE_SMONTHNAME7 "Ліпень\0ліпеня" + LOCALE_SMONTHNAME8 "Жнівень\0жніўня" + LOCALE_SMONTHNAME9 "Верасень\0верасня" + LOCALE_SMONTHNAME10 "Кастрычнік\0кастрычніка" + LOCALE_SMONTHNAME11 "Лістапад\0лістапада" + LOCALE_SMONTHNAME12 "Снежань\0снежня" LOCALE_SMONTHNAME13 "" LOCALE_SMONTHOUSANDSEP " " LOCALE_SNAME "be-BY"

1 0

Nikolay Sivov : kernel32/nls: Added genitive month names for Polish.
by Alexandre Julliard 02 Jan '18

02 Jan '18

Module: wine Branch: stable Commit: 671e342bb80afc9d7dd8536705f3a892185c0ab6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=671e342bb80afc9d7dd85367… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 30 17:37:54 2017 +0300 kernel32/nls: Added genitive month names for Polish. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ceceda61fd0c658a28c4721e1297f4cd22b57979) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/nls/plk.nls | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/kernel32/nls/plk.nls b/dlls/kernel32/nls/plk.nls index 41f77ff..f4b0db8 100644 --- a/dlls/kernel32/nls/plk.nls +++ b/dlls/kernel32/nls/plk.nls @@ -109,18 +109,18 @@ STRINGTABLE LANGUAGE LANG_POLISH, SUBLANG_DEFAULT LOCALE_SLONGDATE "d MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" - LOCALE_SMONTHNAME1 "styczeń" - LOCALE_SMONTHNAME2 "luty" - LOCALE_SMONTHNAME3 "marzec" - LOCALE_SMONTHNAME4 "kwiecień" - LOCALE_SMONTHNAME5 "maj" - LOCALE_SMONTHNAME6 "czerwiec" - LOCALE_SMONTHNAME7 "lipiec" - LOCALE_SMONTHNAME8 "sierpień" - LOCALE_SMONTHNAME9 "wrzesień" - LOCALE_SMONTHNAME10 "październik" - LOCALE_SMONTHNAME11 "listopad" - LOCALE_SMONTHNAME12 "grudzień" + LOCALE_SMONTHNAME1 "styczeń\0stycznia" + LOCALE_SMONTHNAME2 "luty\0lutego" + LOCALE_SMONTHNAME3 "marzec\0marca" + LOCALE_SMONTHNAME4 "kwiecień\0kwietnia" + LOCALE_SMONTHNAME5 "maj\0maja" + LOCALE_SMONTHNAME6 "czerwiec\0czerwca" + LOCALE_SMONTHNAME7 "lipiec\0lipca" + LOCALE_SMONTHNAME8 "sierpień\0sierpnia" + LOCALE_SMONTHNAME9 "wrzesień\0września" + LOCALE_SMONTHNAME10 "październik\0października" + LOCALE_SMONTHNAME11 "listopad\0listopada" + LOCALE_SMONTHNAME12 "grudzień\0grudnia" LOCALE_SMONTHNAME13 "" LOCALE_SMONTHOUSANDSEP " " LOCALE_SNAME "pl-PL"

1 0

Andrew Eikum : kernel32: Use different default sublangs for Spanish and Chinese.
by Alexandre Julliard 02 Jan '18

02 Jan '18

Module: wine Branch: stable Commit: dc282ebb309374dd1c69bd9c5a8bd2281cccdf7e URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc282ebb309374dd1c69bd9c… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Jan 24 14:43:53 2017 -0600 kernel32: Use different default sublangs for Spanish and Chinese. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7737693693ca46a88c41cfeab95d2b65423d8e51) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/locale.c | 20 ++++++++++++++++---- dlls/kernel32/nls/esn.nls | 2 +- dlls/kernel32/nls/esp.nls | 2 +- dlls/kernel32/tests/locale.c | 8 ++++---- dlls/msvcr120/tests/msvcr120.c | 8 +++----- 5 files changed, 25 insertions(+), 15 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 9b3a957..2bf1024 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -359,6 +359,18 @@ static UINT find_charset( const WCHAR *name ) return 0; } +static WORD get_default_sublang(LCID lang) +{ + switch (PRIMARYLANGID(lang)) + { + case LANG_SPANISH: + return SUBLANG_SPANISH_MODERN; + case LANG_CHINESE: + return SUBLANG_CHINESE_SIMPLIFIED; + default: + return SUBLANG_DEFAULT; + } +} /*********************************************************************** * find_locale_id_callback @@ -402,7 +414,7 @@ static BOOL CALLBACK find_locale_id_callback( HMODULE hModule, LPCWSTR type, } else /* match default language */ { - if (SUBLANGID(LangID) == SUBLANG_DEFAULT) matches++; + if (SUBLANGID(LangID) == get_default_sublang( LangID )) matches++; } if (data->codepage) @@ -1671,7 +1683,7 @@ INT WINAPI GetLocaleInfoW( LCID lcid, LCTYPE lctype, LPWSTR buffer, INT len ) /* replace SUBLANG_NEUTRAL by SUBLANG_DEFAULT */ if (SUBLANGID(lang_id) == SUBLANG_NEUTRAL) - lang_id = MAKELANGID(PRIMARYLANGID(lang_id), SUBLANG_DEFAULT); + lang_id = MAKELANGID(PRIMARYLANGID(lang_id), get_default_sublang( lang_id )); if (!(hrsrc = FindResourceExW( kernel32_handle, (LPWSTR)RT_STRING, ULongToPtr((lctype >> 4) + 1), lang_id ))) @@ -2776,7 +2788,7 @@ LCID WINAPI ConvertDefaultLocale( LCID lcid ) langid = LANGIDFROMLCID(lcid); if (SUBLANGID(langid) == SUBLANG_NEUTRAL) { - langid = MAKELANGID(PRIMARYLANGID(langid), SUBLANG_DEFAULT); + langid = MAKELANGID(PRIMARYLANGID(langid), get_default_sublang( langid )); lcid = MAKELCID(langid, SORTIDFROMLCID(lcid)); } } @@ -4212,7 +4224,7 @@ static BOOL NLS_GetLanguageGroupName(LGRPID lgrpid, LPWSTR szName, ULONG nameSiz langId = GetSystemDefaultLangID(); if (SUBLANGID(langId) == SUBLANG_NEUTRAL) - langId = MAKELANGID( PRIMARYLANGID(langId), SUBLANG_DEFAULT ); + langId = MAKELANGID(PRIMARYLANGID(langId), get_default_sublang( langId )); hResource = FindResourceExW( kernel32_handle, (LPWSTR)RT_STRING, szResourceName, langId ); diff --git a/dlls/kernel32/nls/esn.nls b/dlls/kernel32/nls/esn.nls index 7306c00..4108ca2 100644 --- a/dlls/kernel32/nls/esn.nls +++ b/dlls/kernel32/nls/esn.nls @@ -123,7 +123,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_MODERN LOCALE_SMONTHNAME12 "diciembre" LOCALE_SMONTHNAME13 "" LOCALE_SMONTHOUSANDSEP "." - LOCALE_SNAME "es-ES_modern" + LOCALE_SNAME "es-ES" LOCALE_SNATIVECTRYNAME "España" LOCALE_SNATIVECURRNAME "euro" LOCALE_SNATIVEDIGITS "0123456789" diff --git a/dlls/kernel32/nls/esp.nls b/dlls/kernel32/nls/esp.nls index 5260627..5547752 100644 --- a/dlls/kernel32/nls/esp.nls +++ b/dlls/kernel32/nls/esp.nls @@ -123,7 +123,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH LOCALE_SMONTHNAME12 "diciembre" LOCALE_SMONTHNAME13 "" LOCALE_SMONTHOUSANDSEP "." - LOCALE_SNAME "es-ES" + LOCALE_SNAME "es-ES_tradnl" LOCALE_SNATIVECTRYNAME "España" LOCALE_SNATIVECURRNAME "euro" LOCALE_SNATIVEDIGITS "0123456789" diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 4224c0a..7cbaafa 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -255,7 +255,7 @@ static const struct neutralsublang_name2_t neutralsublang_names2[] = { { {'e','s',0}, {'e','s','-','E','S',0}, MAKELCID(MAKELANGID(LANG_SPANISH, SUBLANG_SPANISH_MODERN), SORT_DEFAULT), MAKELCID(MAKELANGID(LANG_SPANISH, SUBLANG_SPANISH), SORT_DEFAULT) /* vista */, - {'e','s','-','E','S','_','t','r','a','d','n','l',0}, 0x1 }, + {'e','s','-','E','S','_','t','r','a','d','n','l',0} }, { {'g','a',0}, {'g','a','-','I','E',0}, MAKELCID(MAKELANGID(LANG_IRISH, SUBLANG_IRISH_IRELAND), SORT_DEFAULT), 0, {0}, 0x3 }, { {'i','t',0}, {'i','t','-','I','T',0}, @@ -273,7 +273,7 @@ static const struct neutralsublang_name2_t neutralsublang_names2[] = { { {'u','z',0}, {'u','z','-','L','a','t','n','-','U','Z',0}, MAKELCID(MAKELANGID(LANG_UZBEK, SUBLANG_UZBEK_LATIN), SORT_DEFAULT) }, { {'z','h',0}, {'z','h','-','C','N',0}, - MAKELCID(MAKELANGID(LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED), SORT_DEFAULT), 0, {0}, 0x3 }, + MAKELCID(MAKELANGID(LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED), SORT_DEFAULT) }, { {0} } }; @@ -2684,7 +2684,7 @@ static const struct neutralsublang_name_t neutralsublang_names[] = { { {'a','z',0}, MAKELCID(MAKELANGID(LANG_AZERI, SUBLANG_AZERI_LATIN), SORT_DEFAULT) }, { {'d','e',0}, MAKELCID(MAKELANGID(LANG_GERMAN, SUBLANG_GERMAN), SORT_DEFAULT) }, { {'e','n',0}, MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT) }, - { {'e','s',0}, MAKELCID(MAKELANGID(LANG_SPANISH, SUBLANG_SPANISH_MODERN), SORT_DEFAULT), 1 }, + { {'e','s',0}, MAKELCID(MAKELANGID(LANG_SPANISH, SUBLANG_SPANISH_MODERN), SORT_DEFAULT) }, { {'g','a',0}, MAKELCID(MAKELANGID(LANG_IRISH, SUBLANG_IRISH_IRELAND), SORT_DEFAULT) }, { {'i','t',0}, MAKELCID(MAKELANGID(LANG_ITALIAN, SUBLANG_ITALIAN), SORT_DEFAULT) }, { {'m','s',0}, MAKELCID(MAKELANGID(LANG_MALAY, SUBLANG_MALAY_MALAYSIA), SORT_DEFAULT) }, @@ -2693,7 +2693,7 @@ static const struct neutralsublang_name_t neutralsublang_names[] = { { {'s','r',0}, MAKELCID(MAKELANGID(LANG_SERBIAN, SUBLANG_SERBIAN_SERBIA_LATIN), SORT_DEFAULT), 1 }, { {'s','v',0}, MAKELCID(MAKELANGID(LANG_SWEDISH, SUBLANG_SWEDISH), SORT_DEFAULT) }, { {'u','z',0}, MAKELCID(MAKELANGID(LANG_UZBEK, SUBLANG_UZBEK_LATIN), SORT_DEFAULT) }, - { {'z','h',0}, MAKELCID(MAKELANGID(LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED), SORT_DEFAULT), 1 }, + { {'z','h',0}, MAKELCID(MAKELANGID(LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED), SORT_DEFAULT) }, { {0} } }; diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index e631738..13f3672 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -453,11 +453,10 @@ static void test____lc_locale_name_func(void) const char *locale; const WCHAR name[10]; const WCHAR broken_name[10]; - BOOL todo; } tests[] = { { "American", {'e','n',0}, {'e','n','-','U','S',0} }, { "Belgian", {'n','l','-','B','E',0} }, - { "Chinese", {'z','h',0}, {'z','h','-','C','N',0}, TRUE }, + { "Chinese", {'z','h',0}, {'z','h','-','C','N',0} }, { "Dutch", {'n','l',0}, {'n','l','-','N','L',0} }, { "English", {'e','n',0}, {'e','n','-','U','S',0} }, { "French", {'f','r',0}, {'f','r','-','F','R',0} }, @@ -476,9 +475,8 @@ static void test____lc_locale_name_func(void) lc_names = p____lc_locale_name_func(); ok(lc_names[0] == NULL, "%d - lc_names[0] = %s\n", i, wine_dbgstr_w(lc_names[0])); - todo_wine_if(tests[i].todo) - ok(!lstrcmpW(lc_names[1], tests[i].name) || broken(!lstrcmpW(lc_names[1], tests[i].broken_name)), - "%d - lc_names[1] = %s\n", i, wine_dbgstr_w(lc_names[1])); + ok(!lstrcmpW(lc_names[1], tests[i].name) || broken(!lstrcmpW(lc_names[1], tests[i].broken_name)), + "%d - lc_names[1] = %s\n", i, wine_dbgstr_w(lc_names[1])); for(j=LC_MIN+2; j<=LC_MAX; j++) { ok(!lstrcmpW(lc_names[1], lc_names[j]), "%d - lc_names[%d] = %s, expected %s\n",

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2018