kernelbase: Reimplement calendar options in GetLocaleInfoW/Ex using the locale.nls data.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>

kernelbase: Reimplement calendar options in GetLocaleInfoW/Ex using the locale.nls data.
00fd05d4 · Alexandre Julliard · 30e8a28c · 00fd05d4
Commit 00fd05d4 authored Mar 29, 2022 by Alexandre Julliard
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

locale.c dlls/kernelbase/locale.c +4 -4

No files found.
--- 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) ?