Daniel Jelinski : kernel32: Implement CAL_RETURN_NUMBER in EnumCalendarInfo*.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 614c45ad1c6d9141b45b6ecf87c44e23d9bad81c
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=614c45ad1c6d9141b45b6ecf87...

Author: Daniel Jelinski <djelinski1(a)gmail.com>
Date:   Mon May 20 23:18:22 2013 +0200

kernel32: Implement CAL_RETURN_NUMBER in EnumCalendarInfo*.

Based on a patch by Mike Blumenkrantz.

---

 dlls/kernel32/lcformat.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/dlls/kernel32/lcformat.c b/dlls/kernel32/lcformat.c
index 6240787..c1af253 100644
--- 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);