marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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>
oldstable
David Keijser 2016-09-05 19:46:06 +03:00 committed by Alexandre Julliard
parent 8865f4a4ec
commit 34a0c122cb
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlls/kernel32/time.c
View File

@ -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)
{