From f64c2f73804adcd91a9854b33dc53267deef79dd Mon Sep 17 00:00:00 2001 From: Daniel Lehman Date: Fri, 17 Jun 2016 13:32:06 -0700 Subject: [PATCH 1/2] msvcrt: Add _strfime_l --- dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/time.c | 9 +++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 10 files changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec b/dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec index 2939b95..fc39007 100644 --- a/dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec +++ b/dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec @@ -42,7 +42,7 @@ @ cdecl _setsystime(ptr long) ucrtbase._setsystime @ cdecl _strdate(ptr) ucrtbase._strdate @ cdecl _strdate_s(ptr long) ucrtbase._strdate_s -@ stub _strftime_l +@ cdecl _strftime_l(str long str ptr ptr) ucrtbase._strftime_l @ cdecl _strtime(ptr) ucrtbase._strtime @ cdecl _strtime_s(ptr long) ucrtbase._strtime_s @ cdecl _time32(ptr) ucrtbase._time32 diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index fa09827..3cfac96 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1340,7 +1340,7 @@ @ cdecl _strdup(str) MSVCRT__strdup @ cdecl _strerror(long) MSVCRT__strerror @ stub _strerror_s -@ stub _strftime_l +@ cdecl _strftime_l(str long str ptr ptr) MSVCRT__strftime_l @ cdecl _stricmp(str str) MSVCRT__stricmp @ cdecl _stricmp_l(str str ptr) MSVCRT__stricmp_l @ cdecl _stricoll(str str) MSVCRT__stricoll diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index e0ab69a..2eb5064 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1697,7 +1697,7 @@ @ cdecl _strdup(str) MSVCRT__strdup @ cdecl _strerror(long) MSVCRT__strerror @ stub _strerror_s -@ stub _strftime_l +@ cdecl _strftime_l(str long str ptr ptr) MSVCRT__strftime_l @ cdecl _stricmp(str str) MSVCRT__stricmp @ cdecl _stricmp_l(str str ptr) MSVCRT__stricmp_l @ cdecl _stricoll(str str) MSVCRT__stricoll diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index a2e7832..5ba624a 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1708,7 +1708,7 @@ @ cdecl _strdup(str) MSVCRT__strdup @ cdecl _strerror(long) MSVCRT__strerror @ stub _strerror_s -@ stub _strftime_l +@ cdecl _strftime_l(str long str ptr ptr) MSVCRT__strftime_l @ cdecl _stricmp(str str) MSVCRT__stricmp @ cdecl _stricmp_l(str str ptr) MSVCRT__stricmp_l @ cdecl _stricoll(str str) MSVCRT__stricoll diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 94c0e08..c7df924 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1419,7 +1419,7 @@ @ cdecl _strdup(str) msvcr120._strdup @ cdecl _strerror(long) msvcr120._strerror @ stub _strerror_s -@ stub _strftime_l +@ cdecl strftime_l(str long str ptr ptr) msvcr120._strftime_l @ cdecl _stricmp(str str) msvcr120._stricmp @ cdecl _stricmp_l(str str ptr) msvcr120._stricmp_l @ cdecl _stricoll(str str) msvcr120._stricoll diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index c0edc8f..069bc9f 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1020,7 +1020,7 @@ @ cdecl _strdup(str) MSVCRT__strdup @ cdecl _strerror(long) MSVCRT__strerror @ stub _strerror_s -@ stub _strftime_l +@ cdecl _strftime_l(str long str ptr ptr) MSVCRT__strftime_l @ cdecl _stricmp(str str) MSVCRT__stricmp @ cdecl _stricmp_l(str str ptr) MSVCRT__stricmp_l @ cdecl _stricoll(str str) MSVCRT__stricoll diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index bf5ab57..b30cd4d 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -995,7 +995,7 @@ @ cdecl _strdup(str) MSVCRT__strdup @ cdecl _strerror(long) MSVCRT__strerror @ stub _strerror_s -@ stub _strftime_l +@ cdecl _strftime_l(str long str ptr ptr) MSVCRT__strftime_l @ cdecl _stricmp(str str) MSVCRT__stricmp @ cdecl _stricmp_l(str str ptr) MSVCRT__stricmp_l @ cdecl _stricoll(str str) MSVCRT__stricoll diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 274d2e7..2998376 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1101,7 +1101,7 @@ # stub _wcsdup_dbg(wstr long str long) @ cdecl _wcserror(long) MSVCRT__wcserror @ cdecl _wcserror_s(ptr long long) MSVCRT__wcserror_s -# stub _wcsftime_l(ptr long wstr ptr ptr) +@ cdecl _wcsftime_l(ptr long wstr ptr ptr) MSVCRT__wcsftime_l @ cdecl _wcsicmp(wstr wstr) MSVCRT__wcsicmp @ cdecl _wcsicmp_l(wstr wstr ptr) MSVCRT__wcsicmp_l @ cdecl _wcsicoll(wstr wstr) MSVCRT__wcsicoll diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 50a27ec..16f1da9 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -1244,6 +1244,15 @@ MSVCRT_size_t CDECL MSVCRT_strftime( char *str, MSVCRT_size_t max, const char *f } /********************************************************************* + * _strftime_l (MSVCRT.@) + */ +MSVCRT_size_t CDECL MSVCRT__strftime_l( char *str, MSVCRT_size_t max, const char *format, + const struct MSVCRT_tm *mstm, MSVCRT__locale_t loc ) +{ + return _Strftime(str, max, format, mstm, loc ? loc->locinfo->lc_time_curr : NULL); +} + +/********************************************************************* * wcsftime (MSVCRT.@) */ MSVCRT_size_t CDECL MSVCRT_wcsftime( MSVCRT_wchar_t *str, MSVCRT_size_t max, diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index bb549d1..a0260d3 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -1926,7 +1926,7 @@ @ cdecl _strdup(str) MSVCRT__strdup @ cdecl _strerror(long) MSVCRT__strerror @ stub _strerror_s -@ stub _strftime_l +@ cdecl _strftime_l(str long str ptr ptr) MSVCRT__strftime_l @ cdecl _stricmp(str str) MSVCRT__stricmp @ cdecl _stricmp_l(str str ptr) MSVCRT__stricmp_l @ cdecl _stricoll(str str) MSVCRT__stricoll -- 1.9.5