[1/3] kernel32: implement CAL_RETURN_NUMBER in EnumCalendarInfo*

[Daniel Jeliński]

These 3 patches are apparently enough to resolve bug 15804. They allow at
least SQL Server 2008 installer to pass.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.winehq.org/pipermail/wine-patches/attachments/20130520/4f28e510/attachment.html>
-------------- next part --------------
From 6a81a2eeecaf60cb0c3a607e7395a82df0a01d90 Mon Sep 17 00:00:00 2001
From: Daniel Jelinski <djelinski1 at gmail.com>
Date: Mon, 20 May 2013 23:18:22 +0200
Subject: kernel32: implement CAL_RETURN_NUMBER in EnumCalendarInfo*

Based on a patch by Mike Blumenkrantz found in bug 15804
---
 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);
 
-- 
1.7.5.4