Module: wine Branch: master Commit: d5f6d841c1f16b31db53e2404c6ca8040ea4a195 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5f6d841c1f16b31db53e2404c...
Author: Huw Davies huw@codeweavers.com Date: Wed Aug 6 12:31:55 2008 +0100
kernel32: GetCalendarInfo shouldn't return HRESULT codes. Change a MESSAGE to a FIXME.
---
dlls/kernel32/time.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index 9f33af6..29b3dc8 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -651,16 +651,16 @@ int WINAPI GetCalendarInfoW(LCID Locale, CALID Calendar, CALTYPE CalType, switch (CalType & ~(CAL_NOUSEROVERRIDE|CAL_RETURN_NUMBER|CAL_USE_CP_ACP)) { case CAL_ICALINTVALUE: FIXME("Unimplemented caltype %d\n", CalType & 0xffff); - return E_FAIL; + return 0; case CAL_SCALNAME: FIXME("Unimplemented caltype %d\n", CalType & 0xffff); - return E_FAIL; + return 0; case CAL_IYEAROFFSETRANGE: FIXME("Unimplemented caltype %d\n", CalType & 0xffff); - return E_FAIL; + return 0; case CAL_SERASTRING: FIXME("Unimplemented caltype %d\n", CalType & 0xffff); - return E_FAIL; + return 0; case CAL_SSHORTDATE: return GetLocaleInfoW(Locale, LOCALE_SSHORTDATE, lpCalData, cchData); case CAL_SLONGDATE: @@ -750,8 +750,10 @@ int WINAPI GetCalendarInfoW(LCID Locale, CALID Calendar, CALTYPE CalType, case CAL_ITWODIGITYEARMAX: if (lpValue) *lpValue = CALINFO_MAX_YEAR; break; - default: MESSAGE("Unknown caltype %d\n",CalType & 0xffff); - return E_FAIL; + default: + FIXME("Unknown caltype %d\n",CalType & 0xffff); + SetLastError(ERROR_INVALID_FLAGS); + return 0; } return 0; }