forked from Mirrors/wine-wine
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
parent
8865f4a4ec
commit
34a0c122cb
|
@ -916,6 +916,7 @@ int WINAPI GetCalendarInfoW(LCID Locale, CALID Calendar, CALTYPE CalType,
|
||||||
LOCALE_SMONTHDAY,
|
LOCALE_SMONTHDAY,
|
||||||
0, /* CAL_SABBREVERASTRING */
|
0, /* CAL_SABBREVERASTRING */
|
||||||
};
|
};
|
||||||
|
DWORD localeflags = 0;
|
||||||
CALTYPE calinfo;
|
CALTYPE calinfo;
|
||||||
|
|
||||||
if (CalType & CAL_NOUSEROVERRIDE)
|
if (CalType & CAL_NOUSEROVERRIDE)
|
||||||
|
@ -943,6 +944,9 @@ int WINAPI GetCalendarInfoW(LCID Locale, CALID Calendar, CALTYPE CalType,
|
||||||
|
|
||||||
calinfo = CalType & 0xffff;
|
calinfo = CalType & 0xffff;
|
||||||
|
|
||||||
|
if (CalType & CAL_RETURN_GENITIVE_NAMES)
|
||||||
|
localeflags |= LOCALE_RETURN_GENITIVE_NAMES;
|
||||||
|
|
||||||
switch (calinfo) {
|
switch (calinfo) {
|
||||||
case CAL_ICALINTVALUE:
|
case CAL_ICALINTVALUE:
|
||||||
if (CalType & CAL_RETURN_NUMBER)
|
if (CalType & CAL_RETURN_NUMBER)
|
||||||
|
@ -1002,7 +1006,7 @@ int WINAPI GetCalendarInfoW(LCID Locale, CALID Calendar, CALTYPE CalType,
|
||||||
case CAL_SABBREVMONTHNAME12:
|
case CAL_SABBREVMONTHNAME12:
|
||||||
case CAL_SABBREVMONTHNAME13:
|
case CAL_SABBREVMONTHNAME13:
|
||||||
case CAL_SYEARMONTH:
|
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:
|
case CAL_ITWODIGITYEARMAX:
|
||||||
if (CalType & CAL_RETURN_NUMBER)
|
if (CalType & CAL_RETURN_NUMBER)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue