[PATCH] kernel32: Forward CAL_RETURN_GENITIVE_NAMES to GetLocaleInfo()
Nikolay Sivov
nsivov at codeweavers.com
Mon Sep 5 11:46:06 CDT 2016
From: David Keijser <keijser at gmail.com>
Signed-off-by: David Keijser <keijser at gmail.com>
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
---
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)
{
--
2.9.3
More information about the wine-patches
mailing list