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

Author: akhaldi
Date: Mon Jun  1 10:00:31 2015
New Revision: 67987

URL: http://svn.reactos.org/svn/reactos?rev=67987&view=rev
Log:
[KERNEL32] Apply Wine commit 81dc0fe by Daniel Jelinski: Implement CAL_ICALINTVALUE in
GetCalendarInfo. CORE-9246

Modified:
    trunk/reactos/dll/win32/kernel32/winnls/string/lcformat.c

Modified: trunk/reactos/dll/win32/kernel32/winnls/string/lcformat.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/…
==============================================================================
--- trunk/reactos/dll/win32/kernel32/winnls/string/lcformat.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/kernel32/winnls/string/lcformat.c	[iso-8859-1] Mon Jun  1
10:00:31 2015
@@ -2138,8 +2138,10 @@
      * 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;