kernel32: Forward CAL_RETURN_GENITIVE_NAMES to GetLocaleInfo().

Signed-off-by: David Keijser <keijser@gmail.com> Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

kernel32: Forward CAL_RETURN_GENITIVE_NAMES to GetLocaleInfo().
34a0c122 · David Keijser · Alexandre Julliard · 8865f4a4 · 34a0c122
Commit 34a0c122 authored Sep 05, 2016 by David Keijser Committed by Alexandre Julliard Sep 07, 2016
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

time.c dlls/kernel32/time.c +5 -1

No files found.
--- a/dlls/kernel32/time.c
+++ b/dlls/kernel32/time.c
@@ -916,6 +916,7 @@ int WINAPI GetCalendarInfoW(LCID Locale, CALID Calendar, CALTYPE CalType,
        LOCALE_SMONTHDAY,
        0, /* CAL_SABBREVERASTRING */
    };
+    DWORD localeflags = 0;
    CALTYPE calinfo;

    if (CalType & CAL_NOUSEROVERRIDE)
@@ -943,6 +944,9 @@ int WINAPI GetCalendarInfoW(LCID Locale, CALID Calendar, CALTYPE CalType,

    calinfo = CalType & 0xffff;

+    if (CalType & CAL_RETURN_GENITIVE_NAMES)
+        localeflags |= LOCALE_RETURN_GENITIVE_NAMES;
+
    switch (calinfo) {
 	case CAL_ICALINTVALUE:
            if (CalType & CAL_RETURN_NUMBER)
@@ -1002,7 +1006,7 @@ int WINAPI GetCalendarInfoW(LCID Locale, CALID Calendar, CALTYPE CalType,
 	case CAL_SABBREVMONTHNAME12:
 	case CAL_SABBREVMONTHNAME13:
 	case CAL_SYEARMONTH:
-            return GetLocaleInfoW(Locale, caltype_lctype_map[calinfo], lpCalData, cchData);
+            return GetLocaleInfoW(Locale, caltype_lctype_map[calinfo] | localeflags, lpCalData, cchData);
 	case CAL_ITWODIGITYEARMAX:
            if (CalType & CAL_RETURN_NUMBER)
            {