[3/3] kernel32: improved stub for GetCalendarInfo's CAL_SCALNAME

[Daniel Jeliński]

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.winehq.org/pipermail/wine-patches/attachments/20130520/5d7e8855/attachment.html>
-------------- next part --------------
From d30f875e8c698f69c7e45731076de584d06471cd Mon Sep 17 00:00:00 2001
From: Daniel Jelinski <djelinski1 at gmail.com>
Date: Mon, 20 May 2013 22:37:56 +0200
Subject: kernel32: improved stub for GetCalendarInfo's CAL_SCALNAME

based on patch by Mike Blumenkrantz found in bug 15804.
---
 dlls/kernel32/time.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c
index 63dfc93..a1875f4 100644
--- a/dlls/kernel32/time.c
+++ b/dlls/kernel32/time.c
@@ -674,7 +674,8 @@ int WINAPI GetCalendarInfoW(LCID Locale, CALID Calendar, CALTYPE CalType,
             return GetLocaleInfoW(Locale, LOCALE_ICALENDARTYPE, lpCalData, cchData);
 	case CAL_SCALNAME:
             FIXME("Unimplemented caltype %d\n", CalType & 0xffff);
-	    return 0;
+            if (lpCalData) *lpCalData = 0;
+	    return 1;
 	case CAL_IYEAROFFSETRANGE:
             FIXME("Unimplemented caltype %d\n", CalType & 0xffff);
 	    return 0;
-- 
1.7.5.4