Daniel Jelinski : kernel32: Implement CAL_ICALINTVALUE in GetCalendarInfo.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 81dc0fe87b13aaadffd15e23ec69e485b5091724
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=81dc0fe87b13aaadffd15e23ec...

Author: Daniel Jelinski <djelinski1(a)gmail.com>
Date:   Mon May 20 22:32:36 2013 +0200

kernel32: Implement CAL_ICALINTVALUE in GetCalendarInfo.

Based on patch by Mike Blumenkrantz.

---

 dlls/kernel32/time.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c
index 39d3395..63dfc93 100644
--- a/dlls/kernel32/time.c
+++ b/dlls/kernel32/time.c
@@ -668,8 +668,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;