From debd62cf9fbd63c04599c77696c8fa603de8238b Mon Sep 17 00:00:00 2001
From: Daniel Jelinski <djelinski1@gmail.com>
Date: Mon, 20 May 2013 22:37:56 +0200
Subject: [PATCH] kernel32: Improved stub for GetCalendarInfo's CAL_SCALNAME.

Based on patch by Mike Blumenkrantz.
---
 dlls/kernel32/time.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c
index 63dfc93d977..a1875f40400 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;
-- 
GitLab