From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Mon, 1 Jun 2015 18:53:24 +0000 (+0000)
Subject: [KERNEL32] Apply Wine commit debd62c by Daniel Jelinski: Improved stub for GetCalenda... 
X-Git-Tag: backups/colins-printing-for-freedom@73041~15^2~224
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=5ff668f29885f86b11c7b5c35e63fc214ac8da17

[KERNEL32] Apply Wine commit debd62c by Daniel Jelinski: Improved stub for GetCalendarInfo's CAL_SCALNAME. CORE-9246

svn path=/trunk/; revision=67996
---

diff --git a/reactos/dll/win32/kernel32/winnls/string/lcformat.c b/reactos/dll/win32/kernel32/winnls/string/lcformat.c
index a18fcbb5f1f..386f8fabfac 100644
--- a/reactos/dll/win32/kernel32/winnls/string/lcformat.c
+++ b/reactos/dll/win32/kernel32/winnls/string/lcformat.c
@@ -2144,7 +2144,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;