test

gistfile1.txt

diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c
index deb0c33..dea2856 100644
--- a/dlls/kernel32/time.c
+++ b/dlls/kernel32/time.c
@@ -652,12 +652,28 @@ int WINAPI GetCalendarInfoW(LCID Locale, CALID Calendar, CALTYPE CalType,
 	    WARN("lpValue not NULL (%p) when it should!\n", lpValue);
     }
 
+	static const WCHAR dummy[] = {'1',0};
     /* FIXME: No verification is made yet wrt Locale
      * 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;
+        /* according to the bottom of http://msdn.microsoft.com/en-us/library/ms904721.aspx
+        we should be able to return "1" for Gregorian here and empty strings for
+        CAL_IYEAROFFSETRANGE and CAL_SERASTRING. */
+        if (CalType & CAL_RETURN_NUMBER) {
+            *lpValue = 1;
+            return sizeof(DWORD) / sizeof(WCHAR);
+        } else {
+            if (!lpCalData) return 1;
+            if (cchData >= 1){
+                strcpyW( lpCalData, dummy );
+                return 1;
+            }
+            SetLastError( ERROR_INSUFFICIENT_BUFFER );
+            return 0;
+        }
+        break;
 	case CAL_SCALNAME:
             FIXME("Unimplemented caltype %d\n", CalType & 0xffff);
 	    return 0;