November 2019 - Wine-commits

Vijay Kiran Kamuju : kernel/nls: Fix LOCALE_SNAME for Azeri (Cyrillic).
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: stable Commit: 84868a0adb4d5ac8f9bf93878c6ca82943cd790d URL: https://source.winehq.org/git/wine.git/?a=commit;h=84868a0adb4d5ac8f9bf9387… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sat Apr 20 11:27:55 2019 +0200 kernel/nls: Fix LOCALE_SNAME for Azeri (Cyrillic). Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ba7144bfae205b4c8a4cd8442eaf31bfea5dbd0a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/nls/aze.nls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/nls/aze.nls b/dlls/kernel32/nls/aze.nls index cb8d384a97..bc2db0d0c7 100644 --- a/dlls/kernel32/nls/aze.nls +++ b/dlls/kernel32/nls/aze.nls @@ -123,7 +123,7 @@ STRINGTABLE LANGUAGE LANG_AZERI, SUBLANG_AZERI_CYRILLIC LOCALE_SMONTHNAME12 "Декабр" LOCALE_SMONTHNAME13 "" LOCALE_SMONTHOUSANDSEP " " - LOCALE_SNAME "az-AZ" + LOCALE_SNAME "az-Cyrl-AZ" LOCALE_SNAN "NaN" LOCALE_SNATIVECTRYNAME L"\x0410\x0437\x04d9\x0440\x0431\x0430\x0458\x04b9\x0430\x043d" LOCALE_SNATIVECURRNAME "рубль"

1 0

Vijay Kiran Kamuju : kernel/nls: Fix LOCALE_SNAME for Uzbek (Cyrillic).
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: stable Commit: c130bbfd06b7903c3bfefbf70d2a85abd26ba230 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c130bbfd06b7903c3bfefbf7… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sat Apr 20 11:32:31 2019 +0200 kernel/nls: Fix LOCALE_SNAME for Uzbek (Cyrillic). Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 1a759b792a26f99ed6a48d56eb01f18aba49254f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/nls/uzb.nls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/nls/uzb.nls b/dlls/kernel32/nls/uzb.nls index 2d4cf3f30c..7d0b4a8ac3 100644 --- a/dlls/kernel32/nls/uzb.nls +++ b/dlls/kernel32/nls/uzb.nls @@ -123,7 +123,7 @@ STRINGTABLE LANGUAGE LANG_UZBEK, SUBLANG_UZBEK_CYRILLIC LOCALE_SMONTHNAME12 "Декабр" LOCALE_SMONTHNAME13 "" LOCALE_SMONTHOUSANDSEP " " - LOCALE_SNAME "uz-UZ" + LOCALE_SNAME "uz-Cyrl-UZ" LOCALE_SNAN "ҳақиқий сон эмас" LOCALE_SNATIVECTRYNAME "Ўзбекистон" LOCALE_SNATIVECURRNAME "рубль"

1 0

Vijay Kiran Kamuju : kernel/nls: Fix LOCALE_SNAME for Serbian (Cyrillic).
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: stable Commit: 0e72518a04731eeb2840989291a3f3c29b810c20 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e72518a04731eeb28409892… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sat Apr 20 12:37:51 2019 +0200 kernel/nls: Fix LOCALE_SNAME for Serbian (Cyrillic). Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 982ec5fcd6ec77e5dbd0933ae320d3faea4a4e92) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/nls/srb.nls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/nls/srb.nls b/dlls/kernel32/nls/srb.nls index 4a3e006cc6..348cf40523 100644 --- a/dlls/kernel32/nls/srb.nls +++ b/dlls/kernel32/nls/srb.nls @@ -123,7 +123,7 @@ STRINGTABLE LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC LOCALE_SMONTHNAME12 "децембар" LOCALE_SMONTHNAME13 "" LOCALE_SMONTHOUSANDSEP "." - LOCALE_SNAME "sr-RS" + LOCALE_SNAME "sr-Cyrl-RS" LOCALE_SNAN "NaN" LOCALE_SNATIVECTRYNAME "Југославија" LOCALE_SNATIVECURRNAME "динар"

1 0

Vijay Kiran Kamuju : kernel/nls: Fix country name and sname in English-Caribbean locale.
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: stable Commit: fd9303dd40768b61411ef3a5bb6df9471c52cc18 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd9303dd40768b61411ef3a5… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sat Apr 20 12:37:52 2019 +0200 kernel/nls: Fix country name and sname in English-Caribbean locale. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d3cdff985fd836c8bea714860c1c27c48ab77704) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/nls/enb.nls | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/nls/enb.nls b/dlls/kernel32/nls/enb.nls index fb79284514..7aa6facc69 100644 --- a/dlls/kernel32/nls/enb.nls +++ b/dlls/kernel32/nls/enb.nls @@ -102,7 +102,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_CARIBBEAN LOCALE_SENGLANGUAGE "English" LOCALE_SGROUPING "3;0" LOCALE_SINTLSYMBOL "USD" - LOCALE_SISO3166CTRYNAME "CB" + LOCALE_SISO3166CTRYNAME "029" LOCALE_SISO639LANGNAME "en" LOCALE_SLANGUAGE "English (Caribbean)" LOCALE_SLIST "," @@ -123,7 +123,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_CARIBBEAN LOCALE_SMONTHNAME12 "December" LOCALE_SMONTHNAME13 "" LOCALE_SMONTHOUSANDSEP "," - LOCALE_SNAME "en-CB" + LOCALE_SNAME "en-029" LOCALE_SNAN "NaN" LOCALE_SNATIVECTRYNAME "Caribbean" LOCALE_SNATIVECURRNAME "US Dollar"

1 0

Vijay Kiran Kamuju : kernel/nls: Fix country name in Manx Gaelic locale.
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: stable Commit: 9c37afae2ae793d3d016827154e7396aa1c998b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c37afae2ae793d3d0168271… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sat Apr 20 12:37:53 2019 +0200 kernel/nls: Fix country name in Manx Gaelic locale. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit b2433315501901031105914ebaea664e50f8ee80) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/nls/gdv.nls | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/nls/gdv.nls b/dlls/kernel32/nls/gdv.nls index 5410325738..51e9ad0b86 100644 --- a/dlls/kernel32/nls/gdv.nls +++ b/dlls/kernel32/nls/gdv.nls @@ -103,7 +103,8 @@ STRINGTABLE LANGUAGE LANG_MANX_GAELIC, SUBLANG_MANX_GAELIC LOCALE_SENGLANGUAGE "Manx Gaelic" LOCALE_SGROUPING "3;0" LOCALE_SINTLSYMBOL "GBP" - LOCALE_SISO3166CTRYNAME "GB" + LOCALE_SISO3166CTRYNAME "IM" + LOCALE_SISO639LANGNAME "gv" LOCALE_SLANGUAGE "Gaelg (Manninn)" LOCALE_SLIST "," @@ -124,7 +125,7 @@ STRINGTABLE LANGUAGE LANG_MANX_GAELIC, SUBLANG_MANX_GAELIC LOCALE_SMONTHNAME12 "Mee ny Nollick" LOCALE_SMONTHNAME13 "" LOCALE_SMONTHOUSANDSEP "," - LOCALE_SNAME "gv-GB" + LOCALE_SNAME "gv-IM" LOCALE_SNAN "NaN" LOCALE_SNATIVECTRYNAME "Manninn" LOCALE_SNATIVECURRNAME "Punt Manninagh"

1 0

Vijay Kiran Kamuju : kernel/nls: Add LOCALE_SMONTHDAY to all supported languages.
by Alexandre Julliard 25 Nov '19

25 Nov '19

1 0

Vijay Kiran Kamuju : kernel/nls: Fix LOCALE_SLONGDATE and LOCALE_SYEARMONTH for some chinese locales.
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: stable Commit: 3acd748808ba66ab43d7538f3a27f25374774133 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3acd748808ba66ab43d7538f… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Tue Apr 23 11:17:23 2019 +0200 kernel/nls: Fix LOCALE_SLONGDATE and LOCALE_SYEARMONTH for some chinese locales. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 568609f051acbd147529dfe74854757831058267) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/nls/zhh.nls | 4 ++-- dlls/kernel32/nls/zhi.nls | 4 ++-- dlls/kernel32/nls/zhm.nls | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/nls/zhh.nls b/dlls/kernel32/nls/zhh.nls index 720261cd32..9da553c2c3 100644 --- a/dlls/kernel32/nls/zhh.nls +++ b/dlls/kernel32/nls/zhh.nls @@ -106,7 +106,7 @@ STRINGTABLE LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_HONGKONG LOCALE_SISO639LANGNAME "zh" LOCALE_SLANGUAGE "Chinese (Hong Kong S.A.R.)" LOCALE_SLIST "," - LOCALE_SLONGDATE "dddd, d MMMM, yyyy" + LOCALE_SLONGDATE "yyyy'年'M'月'd'日'" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" LOCALE_SMONTHDAY "M'月'd'日'" @@ -149,7 +149,7 @@ STRINGTABLE LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_HONGKONG LOCALE_STHOUSAND "," LOCALE_STIME ":" LOCALE_STIMEFORMAT "H:mm:ss" - LOCALE_SYEARMONTH "MMMM, yyyy" + LOCALE_SYEARMONTH "yyyy'年'M'月'" LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Western Europe and United States" LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Central Europe" diff --git a/dlls/kernel32/nls/zhi.nls b/dlls/kernel32/nls/zhi.nls index 2017b87f0c..389b8ebaa1 100644 --- a/dlls/kernel32/nls/zhi.nls +++ b/dlls/kernel32/nls/zhi.nls @@ -106,7 +106,7 @@ STRINGTABLE LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SINGAPORE LOCALE_SISO639LANGNAME "zh" LOCALE_SLANGUAGE "Chinese (Singapore)" LOCALE_SLIST "," - LOCALE_SLONGDATE "dddd, d MMMM, yyyy" + LOCALE_SLONGDATE "yyyy'年'M'月'd'日'" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" LOCALE_SMONTHDAY "M'月'd'日'" @@ -149,7 +149,7 @@ STRINGTABLE LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SINGAPORE LOCALE_STHOUSAND "," LOCALE_STIME ":" LOCALE_STIMEFORMAT "tt h:mm:ss" - LOCALE_SYEARMONTH "MMMM, yyyy" + LOCALE_SYEARMONTH "yyyy'年'M'月'" LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Western Europe and United States" LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Central Europe" diff --git a/dlls/kernel32/nls/zhm.nls b/dlls/kernel32/nls/zhm.nls index c9a6f14355..009fb93f5a 100644 --- a/dlls/kernel32/nls/zhm.nls +++ b/dlls/kernel32/nls/zhm.nls @@ -106,7 +106,7 @@ STRINGTABLE LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_MACAU LOCALE_SISO639LANGNAME "zh" LOCALE_SLANGUAGE "Chinese (Macau S.A.R.)" LOCALE_SLIST "," - LOCALE_SLONGDATE "dddd, d MMMM, yyyy" + LOCALE_SLONGDATE "yyyy'年'M'月'd'日'" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" LOCALE_SMONTHDAY "M'月'd'日'" @@ -149,7 +149,7 @@ STRINGTABLE LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_MACAU LOCALE_STHOUSAND "," LOCALE_STIME ":" LOCALE_STIMEFORMAT "H:mm:ss" - LOCALE_SYEARMONTH "MMMM, yyyy" + LOCALE_SYEARMONTH "yyyy'年'M'月'" LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Western Europe and United States" LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Central Europe"

1 0

Vijay Kiran Kamuju : kernel32: Add implementation of CAL_SSHORTESTDAYNAME*.
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: stable Commit: b9903ce0ce7d5516cc07268f5d82d413fd377420 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9903ce0ce7d5516cc07268f… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Fri Apr 19 22:14:37 2019 +0200 kernel32: Add implementation of CAL_SSHORTESTDAYNAME*. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ded7efd27cae89a0f1bebd05dcf2e8a0ef71e2dc) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/time.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index c425eb8280..7807f99a6c 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -1068,6 +1068,13 @@ int WINAPI GetCalendarInfoW(LCID Locale, CALID Calendar, CALTYPE CalType, case CAL_SABBREVMONTHNAME12: case CAL_SABBREVMONTHNAME13: case CAL_SYEARMONTH: + case CAL_SSHORTESTDAYNAME1: + case CAL_SSHORTESTDAYNAME2: + case CAL_SSHORTESTDAYNAME3: + case CAL_SSHORTESTDAYNAME4: + case CAL_SSHORTESTDAYNAME5: + case CAL_SSHORTESTDAYNAME6: + case CAL_SSHORTESTDAYNAME7: return GetLocaleInfoW(Locale, caltype_lctype_map[calinfo] | localeflags, lpCalData, cchData); case CAL_ITWODIGITYEARMAX: if (CalType & CAL_RETURN_NUMBER) @@ -1090,6 +1097,12 @@ int WINAPI GetCalendarInfoW(LCID Locale, CALID Calendar, CALTYPE CalType, return 0; } break; + case CAL_SMONTHDAY: + FIXME("Unimplemented caltype %d\n", calinfo); + return 0; + case CAL_SABBREVERASTRING: + FIXME("Unimplemented caltype %d\n", calinfo); + return 0; default: FIXME("Unknown caltype %d\n", calinfo); SetLastError(ERROR_INVALID_FLAGS);

1 0

Vijay Kiran Kamuju : kernel32: Add implementation for CAL_SMONTHDAY.
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: stable Commit: 5ff99b30a67fe87abf40859c86380059ea726be8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ff99b30a67fe87abf40859c… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Tue Apr 23 11:17:24 2019 +0200 kernel32: Add implementation for CAL_SMONTHDAY. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 9ed363a1fe7ab6fc8c6564de690f387f34bee1dd) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/time.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index 7807f99a6c..4a4c494b4f 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -1067,6 +1067,7 @@ int WINAPI GetCalendarInfoW(LCID Locale, CALID Calendar, CALTYPE CalType, case CAL_SABBREVMONTHNAME11: case CAL_SABBREVMONTHNAME12: case CAL_SABBREVMONTHNAME13: + case CAL_SMONTHDAY: case CAL_SYEARMONTH: case CAL_SSHORTESTDAYNAME1: case CAL_SSHORTESTDAYNAME2: @@ -1097,9 +1098,6 @@ int WINAPI GetCalendarInfoW(LCID Locale, CALID Calendar, CALTYPE CalType, return 0; } break; - case CAL_SMONTHDAY: - FIXME("Unimplemented caltype %d\n", calinfo); - return 0; case CAL_SABBREVERASTRING: FIXME("Unimplemented caltype %d\n", calinfo); return 0;

1 0

Vijay Kiran Kamuju : kernel/nls: Fix LOCALE_SABBREVCTRYNAME for Serbian.
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: stable Commit: ec1d0af95c719a16bf9e45b2b05b6d4f10664b90 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec1d0af95c719a16bf9e45b2… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Tue Apr 23 15:31:14 2019 +0200 kernel/nls: Fix LOCALE_SABBREVCTRYNAME for Serbian. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 57d6c541b93bf82919a9862cd36f038a24e6a80b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/nls/srb.nls | 2 +- dlls/kernel32/nls/srl.nls | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/nls/srb.nls b/dlls/kernel32/nls/srb.nls index 4d1049be44..86642443f7 100644 --- a/dlls/kernel32/nls/srb.nls +++ b/dlls/kernel32/nls/srb.nls @@ -64,7 +64,7 @@ STRINGTABLE LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC LOCALE_ITLZERO "0" LOCALE_S1159 "" LOCALE_S2359 "" - LOCALE_SABBREVCTRYNAME "SPB" + LOCALE_SABBREVCTRYNAME "SRB" LOCALE_SABBREVDAYNAME1 "пон" LOCALE_SABBREVDAYNAME2 "уто" LOCALE_SABBREVDAYNAME3 "сре" diff --git a/dlls/kernel32/nls/srl.nls b/dlls/kernel32/nls/srl.nls index fb6ba8b178..0c4b2f527f 100644 --- a/dlls/kernel32/nls/srl.nls +++ b/dlls/kernel32/nls/srl.nls @@ -64,7 +64,7 @@ STRINGTABLE LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN LOCALE_ITLZERO "0" LOCALE_S1159 "" LOCALE_S2359 "" - LOCALE_SABBREVCTRYNAME "SPB" + LOCALE_SABBREVCTRYNAME "SRB" LOCALE_SABBREVDAYNAME1 "pon" LOCALE_SABBREVDAYNAME2 "uto" LOCALE_SABBREVDAYNAME3 "sre"

1 0