wine-commits March 2022

wine-commits@winehq.org

2 participants
1138 discussions

Alexandre Julliard : kernelbase: Reimplement LOCALE_FONTSIGNATURE/SOPENTYPELANGUAGETAG in GetLocaleInfoW/Ex using the locale.nls data.
by Alexandre Julliard 29 Mar '22

29 Mar '22

Module: wine Branch: master Commit: d39c6851d3b449cfe1a77dab4d1379a17d48861d URL: https://source.winehq.org/git/wine.git/?a=commit;h=d39c6851d3b449cfe1a77dab… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 29 20:33:04 2022 +0200 kernelbase: Reimplement LOCALE_FONTSIGNATURE/SOPENTYPELANGUAGETAG in GetLocaleInfoW/Ex using the locale.nls data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 967757f91e1..8cb2120357c 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -1139,7 +1139,8 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return -1; case LOCALE_FONTSIGNATURE: - return -1; + return locale_return_data( locale_strings + locale->fontsignature + 1, + locale_strings[locale->fontsignature], type, buffer, len ); case LOCALE_SISO639LANGNAME: return locale_return_string( locale->siso639langname, type, buffer, len ); @@ -1233,7 +1234,7 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return locale_return_strarray( locale->sshorttime, 0, type, buffer, len ); case LOCALE_SOPENTYPELANGUAGETAG: - return -1; + return locale_return_string( locale->sopentypelanguagetag, type, buffer, len ); case LOCALE_SSORTLOCALE: return -1;

1 0

Alexandre Julliard : kernelbase: Reimplement misc format values in GetLocaleInfoW/Ex using the locale.nls data.
by Alexandre Julliard 29 Mar '22

29 Mar '22

Module: wine Branch: master Commit: 712e4757c6d877bad2902f426195dd3c89ffe23b URL: https://source.winehq.org/git/wine.git/?a=commit;h=712e4757c6d877bad2902f42… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 29 08:37:29 2022 +0200 kernelbase: Reimplement misc format values in GetLocaleInfoW/Ex using the locale.nls data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 3095234bd9b..967757f91e1 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -978,7 +978,7 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return -1; case LOCALE_IMEASURE: - return -1; + return locale_return_number( locale->imeasure, type, buffer, len ); case LOCALE_SDECIMAL: return -1; @@ -1203,7 +1203,7 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return locale_return_string( locale->senglanguage, type, buffer, len ); case LOCALE_IREADINGLAYOUT: - return -1; + return locale_return_number( locale->ireadinglayout, type, buffer, len ); case LOCALE_INEUTRAL: return -1; @@ -1279,7 +1279,7 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return locale_return_number( locale_strings[locale->scalendartype + 1], type, buffer, len ); case LOCALE_IPAPERSIZE: - return -1; + return locale_return_number( locale->ipapersize, type, buffer, len ); case LOCALE_IOPTIONALCALENDAR: return locale_return_number( locale_strings[locale->scalendartype + 2], type, buffer, len );

1 0

Alexandre Julliard : kernelbase: Reimplement calendar options in GetLocaleInfoW/Ex using the locale.nls data.
by Alexandre Julliard 29 Mar '22

29 Mar '22

Module: wine Branch: master Commit: 00fd05d4478317fa9c0395288a72b74fb760fd6e URL: https://source.winehq.org/git/wine.git/?a=commit;h=00fd05d4478317fa9c039528… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 29 08:37:18 2022 +0200 kernelbase: Reimplement calendar options in GetLocaleInfoW/Ex using the locale.nls data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 529cc663cd5..3095234bd9b 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -1276,19 +1276,19 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return locale_return_string( locale->snativecurrname, type, buffer, len ); case LOCALE_ICALENDARTYPE: - return -1; + return locale_return_number( locale_strings[locale->scalendartype + 1], type, buffer, len ); case LOCALE_IPAPERSIZE: return -1; case LOCALE_IOPTIONALCALENDAR: - return -1; + return locale_return_number( locale_strings[locale->scalendartype + 2], type, buffer, len ); case LOCALE_IFIRSTDAYOFWEEK: - return -1; + return locale_return_number( (locale->ifirstdayofweek + 6) % 7, type, buffer, len ); case LOCALE_IFIRSTWEEKOFYEAR: - return -1; + return locale_return_number( locale->ifirstweekofyear, type, buffer, len ); case LOCALE_SMONTHNAME13: return locale_return_strarray( ((type & LOCALE_RETURN_GENITIVE_NAMES) && locale->sgenitivemonth) ?

1 0

Alexandre Julliard : kernelbase: Reimplement date/time format strings in GetLocaleInfoW/Ex using the locale.nls data.
by Alexandre Julliard 29 Mar '22

29 Mar '22

Module: wine Branch: master Commit: 30e8a28c3df80ce9549ff3b43c8935b28936e1ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=30e8a28c3df80ce9549ff3b4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 29 08:37:12 2022 +0200 kernelbase: Reimplement date/time format strings in GetLocaleInfoW/Ex using the locale.nls data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 16b923915a9..529cc663cd5 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -1030,10 +1030,10 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return -1; case LOCALE_SSHORTDATE: - return -1; + return locale_return_strarray( locale->sshortdate, 0, type, buffer, len ); case LOCALE_SLONGDATE: - return -1; + return locale_return_strarray( locale->slongdate, 0, type, buffer, len ); case LOCALE_IDATE: return -1; @@ -1159,7 +1159,7 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return locale_return_string( locale->sname, type, buffer, len ); case LOCALE_SDURATION: - return -1; + return locale_return_strarray( locale->sduration, 0, type, buffer, len ); case LOCALE_SKEYBOARDSTOINSTALL: return -1; @@ -1227,10 +1227,10 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return locale_return_data( spermille, ARRAY_SIZE(spermille), type, buffer, len ); case LOCALE_SMONTHDAY: - return -1; + return locale_return_strarray( locale->smonthday, 0, type, buffer, len ); case LOCALE_SSHORTTIME: - return -1; + return locale_return_strarray( locale->sshorttime, 0, type, buffer, len ); case LOCALE_SOPENTYPELANGUAGETAG: return -1; @@ -1239,7 +1239,7 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return -1; case LOCALE_SRELATIVELONGDATE: - return -1; + return locale_return_string( locale->srelativelongdate, type, buffer, len ); case 0x007d: /* undocumented */ return -1; @@ -1257,7 +1257,7 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return locale_return_string( locale->sengcountry, type, buffer, len ); case LOCALE_STIMEFORMAT: - return -1; + return locale_return_strarray( locale->stimeformat, 0, type, buffer, len ); case LOCALE_IDEFAULTANSICODEPAGE: val = locale->idefaultansicodepage == CP_UTF8 ? CP_ACP : locale->idefaultansicodepage; @@ -1267,7 +1267,7 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return -1; case LOCALE_SYEARMONTH: - return -1; + return locale_return_strarray( locale->syearmonth, 0, type, buffer, len ); case LOCALE_SENGCURRNAME: return locale_return_string( locale->sengcurrname, type, buffer, len );

1 0

Alexandre Julliard : kernelbase: Reimplement LOCALE_SNATIVEDIGITS in GetLocaleInfoW/Ex using the locale.nls data.
by Alexandre Julliard 29 Mar '22

29 Mar '22

Module: wine Branch: master Commit: ec5d3c9fe753f53f6efe6d308b5d40bbbc1f052a URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec5d3c9fe753f53f6efe6d30… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 29 08:37:02 2022 +0200 kernelbase: Reimplement LOCALE_SNATIVEDIGITS in GetLocaleInfoW/Ex using the locale.nls data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 33 +++++++++++++++++++++++++++++++-- dlls/usp10/tests/usp10.c | 4 ---- 2 files changed, 31 insertions(+), 6 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 2a74cab6500..16b923915a9 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -896,6 +896,35 @@ static int locale_return_strarray( DWORD pos, WORD idx, LCTYPE type, WCHAR *buff } +static int locale_return_strarray_concat( DWORD pos, LCTYPE type, WCHAR *buffer, int len ) +{ + WORD i, count = locale_strings[pos]; + const DWORD *array = (const DWORD *)(locale_strings + pos + 1); + int ret; + + if (type & LOCALE_RETURN_NUMBER) + { + SetLastError( ERROR_INVALID_FLAGS ); + return 0; + } + for (i = 0, ret = 1; i < count; i++) ret += locale_strings[array[i]]; + + if (!len) return ret; + if (ret > len) + { + SetLastError( ERROR_INSUFFICIENT_BUFFER ); + return 0; + } + for (i = 0; i < count; i++) + { + memcpy( buffer, locale_strings + array[i] + 1, locale_strings[array[i]] * sizeof(WCHAR) ); + buffer += locale_strings[array[i]]; + } + *buffer = 0; + return ret; +} + + /* get locale information from the locale.nls file */ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE type, WCHAR *buffer, int len ) @@ -967,7 +996,7 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return -1; case LOCALE_SNATIVEDIGITS: - return -1; + return locale_return_strarray_concat( locale->snativedigits, type, buffer, len ); case LOCALE_SCURRENCY: return locale_return_string( locale->scurrency, type, buffer, len ); @@ -1285,7 +1314,7 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return -1; case LOCALE_IDIGITSUBSTITUTION: - return -1; + return locale_return_number( locale->idigitsubstitution, type, buffer, len ); } SetLastError( ERROR_INVALID_FLAGS ); return 0; diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index c18076bab53..aee751423b3 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -3613,7 +3613,6 @@ static BOOL CALLBACK enum_proc(LGRPID group, LCID lcid, LPSTR locale, LONG_PTR l SCRIPT_CONTROL sc; SCRIPT_STATE ss; LCID lcid_old; - BOOL todo; if (!IsValidLocale(lcid, LCID_INSTALLED)) return TRUE; @@ -3624,10 +3623,7 @@ static BOOL CALLBACK enum_proc(LGRPID group, LCID lcid, LPSTR locale, LONG_PTR l lcid_old = GetThreadLocale(); if (!SetThreadLocale(lcid)) return TRUE; - todo = !GetLocaleInfoW(lcid, LOCALE_IDIGITSUBSTITUTION | LOCALE_RETURN_NUMBER, NULL, 0); - hr = ScriptRecordDigitSubstitution(lcid, &sds); - todo_wine_if( todo ) ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = ScriptApplyDigitSubstitution(&sds, &sc, &ss);

1 0

Alexandre Julliard : kernelbase: Reimplement LOCALE_ICOUNTRY/IGEOID in GetLocaleInfoW/Ex using the locale.nls data.
by Alexandre Julliard 29 Mar '22

29 Mar '22

Module: wine Branch: master Commit: f0d43939ffead35bafdb2dc46b2402f0d3d2675e URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0d43939ffead35bafdb2dc4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 29 08:36:46 2022 +0200 kernelbase: Reimplement LOCALE_ICOUNTRY/IGEOID in GetLocaleInfoW/Ex using the locale.nls data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 98e0041f901..2a74cab6500 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -923,7 +923,7 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return locale_return_string( locale->snativelangname, type, buffer, len ); case LOCALE_ICOUNTRY: - return -1; + return locale_return_number( locale->icountry, type, buffer, len ); case LOCALE_SLOCALIZEDCOUNTRYNAME: /* FIXME: localization */ @@ -939,7 +939,7 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return locale_return_number( locale->idefaultlanguage, type, buffer, len ); case LOCALE_IDEFAULTCOUNTRY: - return -1; + return locale_return_number( locale->icountry, type, buffer, len ); case LOCALE_IDEFAULTCODEPAGE: val = locale->idefaultcodepage == CP_UTF8 ? CP_OEMCP : locale->idefaultcodepage; @@ -1119,7 +1119,7 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return locale_return_string( locale->siso3166ctryname, type, buffer, len ); case LOCALE_IGEOID: - return -1; + return locale_return_number( locale->igeoid, type, buffer, len ); case LOCALE_SNAME: if (SORTIDFROMLCID(lcid)) /* custom sort locale */

1 0

Alexandre Julliard : kernelbase: Reimplement LOCALE_*CURRNAME/CURRENCY in GetLocaleInfoW/Ex using the locale.nls data.
by Alexandre Julliard 29 Mar '22

29 Mar '22

Module: wine Branch: master Commit: 62cd33e6b0fd60dbd2a12d6734ff821f8ca5187d URL: https://source.winehq.org/git/wine.git/?a=commit;h=62cd33e6b0fd60dbd2a12d67… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 29 08:36:41 2022 +0200 kernelbase: Reimplement LOCALE_*CURRNAME/CURRENCY in GetLocaleInfoW/Ex using the locale.nls data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 8 ++++---- dlls/oleaut32/tests/vartest.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index b3cc0b0d3f0..98e0041f901 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -970,10 +970,10 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return -1; case LOCALE_SCURRENCY: - return -1; + return locale_return_string( locale->scurrency, type, buffer, len ); case LOCALE_SINTLSYMBOL: - return -1; + return locale_return_string( locale->sintlsymbol, type, buffer, len ); case LOCALE_SMONDECIMALSEP: return -1; @@ -1241,10 +1241,10 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return -1; case LOCALE_SENGCURRNAME: - return -1; + return locale_return_string( locale->sengcurrname, type, buffer, len ); case LOCALE_SNATIVECURRNAME: - return -1; + return locale_return_string( locale->snativecurrname, type, buffer, len ); case LOCALE_ICALENDARTYPE: return -1; diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 03eb566f555..db0562e2d03 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -2460,10 +2460,10 @@ static void test_VarParseNumFromStrMisc(void) lcid = MAKELCID(MAKELANGID(LANG_FRENCH,SUBLANG_FRENCH_SWISS),SORT_DEFAULT); WCONVERT(L"3CHF", NUMPRS_CURRENCY|NUMPRS_USE_ALL); /* Windows <= 8.1 uses an old currency symbol: "fr. 5" */ - todo_wine ok(hres == S_OK || broken(hres == DISP_E_TYPEMISMATCH), "returned %08lx\n", hres); + ok(hres == S_OK || broken(hres == DISP_E_TYPEMISMATCH), "returned %08lx\n", hres); if (hres == S_OK) { - todo_wine EXPECT(1,NUMPRS_CURRENCY|NUMPRS_USE_ALL,NUMPRS_CURRENCY,4,0,0); + EXPECT(1,NUMPRS_CURRENCY|NUMPRS_USE_ALL,NUMPRS_CURRENCY,4,0,0); EXPECT2(3,FAILDIG); }

1 0

Alexandre Julliard : kernelbase: Reimplement LOCALE_*AM/PM in GetLocaleInfoW/Ex using the locale.nls data.
by Alexandre Julliard 29 Mar '22

29 Mar '22

Module: wine Branch: master Commit: 37278557dd5f9c377e84ac1bc4922ce53c8f16c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=37278557dd5f9c377e84ac1b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 29 08:36:35 2022 +0200 kernelbase: Reimplement LOCALE_*AM/PM in GetLocaleInfoW/Ex using the locale.nls data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index e3960c1e74e..b3cc0b0d3f0 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -1028,10 +1028,10 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return -1; case LOCALE_S1159: - return -1; + return locale_return_string( locale->s1159, type, buffer, len ); case LOCALE_S2359: - return -1; + return locale_return_string( locale->s2359, type, buffer, len ); case LOCALE_SDAYNAME1: case LOCALE_SDAYNAME2: @@ -1216,10 +1216,10 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return -1; case LOCALE_SSHORTESTAM: - return -1; + return locale_return_string( locale->sshortestam, type, buffer, len ); case LOCALE_SSHORTESTPM: - return -1; + return locale_return_string( locale->sshortestpm, type, buffer, len ); case LOCALE_SENGLANGUAGE: return locale_return_string( locale->senglanguage, type, buffer, len );

1 0

Alexandre Julliard : kernelbase: Reimplement LOCALE_*PERCENT in GetLocaleInfoW/Ex using the locale.nls data.
by Alexandre Julliard 29 Mar '22

29 Mar '22

Module: wine Branch: master Commit: 9ef9d0293ad84b40d93f2bcd18e52534f51fb57d URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ef9d0293ad84b40d93f2bcd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 29 08:36:30 2022 +0200 kernelbase: Reimplement LOCALE_*PERCENT in GetLocaleInfoW/Ex using the locale.nls data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 3eb598be505..e3960c1e74e 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -900,6 +900,7 @@ static int locale_return_strarray( DWORD pos, WORD idx, LCTYPE type, WCHAR *buff static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE type, WCHAR *buffer, int len ) { + static const WCHAR spermille[] = { 0x2030, 0 }; /* this one seems hardcoded */ UINT val; if (locale != user_locale) type |= LOCALE_NOUSEROVERRIDE; @@ -1185,16 +1186,16 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return locale_return_string( locale->snativedisplayname, type, buffer, len ); case LOCALE_INEGATIVEPERCENT: - return -1; + return locale_return_number( locale->inegativepercent, type, buffer, len ); case LOCALE_IPOSITIVEPERCENT: - return -1; + return locale_return_number( locale->ipositivepercent, type, buffer, len ); case LOCALE_SPERCENT: - return -1; + return locale_return_string( locale->spercent, type, buffer, len ); case LOCALE_SPERMILLE: - return -1; + return locale_return_data( spermille, ARRAY_SIZE(spermille), type, buffer, len ); case LOCALE_SMONTHDAY: return -1;

1 0

Alexandre Julliard : kernelbase: Reimplement LOCALE_*INFINITY/NAN in GetLocaleInfoW/Ex using the locale.nls data.
by Alexandre Julliard 29 Mar '22

29 Mar '22

Module: wine Branch: master Commit: 17928e6a0146e9024339e04414ab813a933a10a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=17928e6a0146e9024339e044… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 29 08:36:20 2022 +0200 kernelbase: Reimplement LOCALE_*INFINITY/NAN in GetLocaleInfoW/Ex using the locale.nls data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 4b205aed9af..3eb598be505 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -1151,13 +1151,13 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return locale_return_string( locale->siso3166ctryname2, type, buffer, len ); case LOCALE_SNAN: - return -1; + return locale_return_string( locale->snan, type, buffer, len ); case LOCALE_SPOSINFINITY: - return -1; + return locale_return_string( locale->sposinfinity, type, buffer, len ); case LOCALE_SNEGINFINITY: - return -1; + return locale_return_string( locale->sneginfinity, type, buffer, len ); case LOCALE_SSCRIPTS: return -1;

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
114
Older →

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 March 2022