From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Mon, 1 Jun 2015 10:00:31 +0000 (+0000)
Subject: [KERNEL32] Apply Wine commit 81dc0fe by Daniel Jelinski: Implement CAL_ICALINTVALUE... 
X-Git-Tag: backups/colins-printing-for-freedom@73041~15^2~233
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=cf09e71a195d033e219313c4225c0782fac46350

[KERNEL32] Apply Wine commit 81dc0fe by Daniel Jelinski: Implement CAL_ICALINTVALUE in GetCalendarInfo. CORE-9246

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

diff --git a/reactos/dll/win32/kernel32/winnls/string/lcformat.c b/reactos/dll/win32/kernel32/winnls/string/lcformat.c
index 3b2a6ebd567..a18fcbb5f1f 100644
--- a/reactos/dll/win32/kernel32/winnls/string/lcformat.c
+++ b/reactos/dll/win32/kernel32/winnls/string/lcformat.c
@@ -2138,8 +2138,10 @@ int WINAPI GetCalendarInfoW(LCID Locale, CALID Calendar, CALTYPE CalType,
      * for the CALTYPES not requiring GetLocaleInfoA */
     switch (CalType & ~(CAL_NOUSEROVERRIDE|CAL_RETURN_NUMBER|CAL_USE_CP_ACP)) {
 	case CAL_ICALINTVALUE:
-            FIXME("Unimplemented caltype %d\n", CalType & 0xffff);
-	    return 0;
+            if (CalType & CAL_RETURN_NUMBER)
+                return GetLocaleInfoW(Locale, LOCALE_RETURN_NUMBER | LOCALE_ICALENDARTYPE,
+                        (LPWSTR)lpValue, 2);
+            return GetLocaleInfoW(Locale, LOCALE_ICALENDARTYPE, lpCalData, cchData);
 	case CAL_SCALNAME:
             FIXME("Unimplemented caltype %d\n", CalType & 0xffff);
 	    return 0;