[2/3] kernel32: implement CAL_ICALINTVALUE in GetCalendarInfo
Daniel Jeliński
djelinski1 at gmail.com
Mon May 20 16:28:22 CDT 2013
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.winehq.org/pipermail/wine-patches/attachments/20130520/8b342da6/attachment.html>
-------------- next part --------------
From 807a12da8334f7ef0668ab5f44a722cff330da43 Mon Sep 17 00:00:00 2001
From: Daniel Jelinski <djelinski1 at gmail.com>
Date: Mon, 20 May 2013 22:32:36 +0200
Subject: kernel32: implement CAL_ICALINTVALUE in GetCalendarInfo
Based on patch by Mike Blumenkrantz found in bug 15804.
---
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;
--
1.7.5.4
More information about the wine-patches
mailing list