Module: wine Branch: master Commit: 34a0c122cb5b767e17032d1d3e54e42cf1f536fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=34a0c122cb5b767e17032d1d3e...
Author: David Keijser keijser@gmail.com Date: Mon Sep 5 19:46:06 2016 +0300
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
---
dlls/kernel32/time.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index 0a5aa07..f4a1a35 100644 --- 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) {