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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 00fd05d4478317fa9c0395288a72b74fb760fd6e
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=00fd05d4478317fa9c0395288a72b74fb760fd6e

Author: Alexandre Julliard <julliard at 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 at 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) ?