kernel32: Implement CAL_RETURN_NUMBER in EnumCalendarInfo*.

Based on a patch by Mike Blumenkrantz.

kernel32: Implement CAL_RETURN_NUMBER in EnumCalendarInfo*.
614c45ad · Daniel Jelinski · Alexandre Julliard · 3de75b1e · 614c45ad
Commit 614c45ad authored May 20, 2013 by Daniel Jelinski Committed by Alexandre Julliard May 21, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

lcformat.c dlls/kernel32/lcformat.c +3 -1

No files found.
--- a/dlls/kernel32/lcformat.c
+++ b/dlls/kernel32/lcformat.c
@@ -1975,7 +1975,9 @@ static BOOL NLS_EnumCalendarInfoAW(void *calinfoproc, LCID locale,
  {
    do				/* loop until there's no error */
    {
-      if (unicode)
+      if (caltype & CAL_RETURN_NUMBER)
+        ret = GetCalendarInfoW(locale, calendar, caltype, NULL, bufSz / sizeof(WCHAR), (LPDWORD)buf);
+      else if (unicode)
        ret = GetCalendarInfoW(locale, calendar, caltype, buf, bufSz / sizeof(WCHAR), NULL);
      else ret = GetCalendarInfoA(locale, calendar, caltype, (CHAR*)buf, bufSz / sizeof(CHAR), NULL);