Re: [PATCH] kernel32: add support for CAL_ICALINTVALUE

[Alexandre Julliard]

Michael Blumenkrantz <michael.blumenkrantz(a)gmail.com> writes:
> @@ -656,8 +656,8 @@ int WINAPI GetCalendarInfoW(LCID Locale, CALID Calendar, CALTYPE CalType,
>       * for the CALTYPES not requiring GetLocaleInfoA */
>      switch (CalType & ~(CAL_NOUSEROVERRIDE|CAL_RETURN_NUMBER|CAL_USE_CP_ACP)) {
>   case CAL_ICALINTVALUE:
> -            FIXME("Unimplemented caltype %d\n", CalType & 0xffff);
> -	    return 0;
> +	    return GetLocaleInfoW(Locale, LOCALE_RETURN_NUMBER|LOCALE_ICALENDARTYPE,
> +				  (LPWSTR)lpValue, sizeof(CALID)/sizeof(WCHAR));

I doubt that you want to hardcode LOCALE_RETURN_NUMBER here.

-- 
Alexandre Julliard
julliard(a)winehq.org

[PATCH] kernel32: add support for CAL_ICALINTVALUE

[Michael Blumenkrantz]

Perhaps not, but I'll be the first to admit that I know very little about
wine internals; this seemed to return the correct result in the case that I
tested it.

On Thu, Aug 16, 2012 at 11:39 AM, Alexandre Julliard <julliard(a)winehq.org>wrote:
> Michael Blumenkrantz <michael.blumenkrantz(a)gmail.com> writes:
> > @@ -656,8 +656,8 @@ int WINAPI GetCalendarInfoW(LCID Locale, CALID
> > Calendar, CALTYPE CalType,
> >       * for the CALTYPES not requiring GetLocaleInfoA */
> >      switch (CalType &
> > ~(CAL_NOUSEROVERRIDE|CAL_RETURN_NUMBER|CAL_USE_CP_ACP)) {
> >       case CAL_ICALINTVALUE:
> > -            FIXME("Unimplemented caltype %d\n", CalType & 0xffff);
> > -         return 0;
> > +         return GetLocaleInfoW(Locale,
> > LOCALE_RETURN_NUMBER|LOCALE_ICALENDARTYPE,
> > +                               (LPWSTR)lpValue,
> > sizeof(CALID)/sizeof(WCHAR));
>
> I doubt that you want to hardcode LOCALE_RETURN_NUMBER here.
>
> --
> Alexandre Julliard
> julliard(a)winehq.org