Module: wine Branch: master Commit: 1228f0bba500e2c3644fb1a10f80947338b73032 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1228f0bba500e2c3644fb1a10f...
Author: Nikolay Sivov nsivov@codeweavers.com Date: Wed Sep 10 21:39:17 2014 +0400
msvcrt: Added __dstbias() export.
---
dlls/msvcr100/msvcr100.spec | 4 ++-- dlls/msvcr110/msvcr110.spec | 4 ++-- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 4 ++-- dlls/msvcr90/msvcr90.spec | 4 ++-- dlls/msvcrt/msvcrt.spec | 4 ++-- dlls/msvcrt/tests/time.c | 11 +++++++++++ dlls/msvcrt/time.c | 8 ++++---- 9 files changed, 27 insertions(+), 16 deletions(-)
diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index f8062f9..0d6e2dc 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -584,7 +584,7 @@ @ cdecl __daylight() MSVCRT___p__daylight @ cdecl __dllonexit(ptr ptr ptr) @ cdecl __doserrno() MSVCRT___doserrno -@ stub __dstbias +@ cdecl __dstbias() MSVCRT___p__dstbias @ stub ___fls_getvalue@4 @ stub ___fls_setvalue@8 @ cdecl __fpecode() @@ -633,7 +633,7 @@ @ cdecl __p__acmdln() @ cdecl __p__commode() @ cdecl __p__daylight() MSVCRT___p__daylight -@ cdecl __p__dstbias() +@ cdecl __p__dstbias() MSVCRT___p__dstbias @ cdecl __p__environ() MSVCRT___p__environ @ cdecl __p__fmode() @ cdecl __p__iob() MSVCRT___iob_func diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 6a328eb..1114190 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -934,7 +934,7 @@ @ cdecl __daylight() MSVCRT___p__daylight @ cdecl __dllonexit(ptr ptr ptr) @ cdecl __doserrno() MSVCRT___doserrno -@ stub __dstbias +@ cdecl __dstbias() MSVCRT___p__dstbias @ cdecl __fpecode() @ stub __free_locale @ stub __get_current_locale @@ -982,7 +982,7 @@ @ cdecl __p__acmdln() @ cdecl __p__commode() @ cdecl __p__daylight() MSVCRT___p__daylight -@ cdecl __p__dstbias() +@ cdecl __p__dstbias() MSVCRT___p__dstbias @ cdecl __p__environ() MSVCRT___p__environ @ cdecl __p__fmode() @ cdecl __p__iob() MSVCRT___iob_func diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index 1a94ee2..fb47e78 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -171,7 +171,7 @@ @ cdecl __p__amblksiz() @ cdecl __p__commode() @ cdecl __p__daylight() MSVCRT___p__daylight -@ cdecl __p__dstbias() +@ cdecl __p__dstbias() MSVCRT___p__dstbias @ cdecl __p__environ() MSVCRT___p__environ @ stub __p__fileinfo() @ cdecl __p__fmode() diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index 127a440..8b868db 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -166,7 +166,7 @@ @ cdecl __p__amblksiz() @ cdecl __p__commode() @ cdecl __p__daylight() MSVCRT___p__daylight -@ cdecl __p__dstbias() +@ cdecl __p__dstbias() MSVCRT___p__dstbias @ cdecl __p__environ() MSVCRT___p__environ @ stub __p__fileinfo() @ cdecl __p__fmode() diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 3902c85..fc313a4 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -220,7 +220,7 @@ @ cdecl __daylight() MSVCRT___p__daylight @ cdecl __dllonexit(ptr ptr ptr) @ cdecl __doserrno() MSVCRT___doserrno -@ stub __dstbias +@ cdecl __dstbias() MSVCRT___p__dstbias @ stub -arch=i386 ___fls_getvalue@4 @ stub -arch=x86_64 __fls_getvalue @ stub -arch=i386 ___fls_setvalue@8 @@ -277,7 +277,7 @@ @ cdecl __p__amblksiz() @ cdecl __p__commode() @ cdecl __p__daylight() MSVCRT___p__daylight -@ cdecl __p__dstbias() +@ cdecl __p__dstbias() MSVCRT___p__dstbias @ cdecl __p__environ() MSVCRT___p__environ @ cdecl __p__fmode() @ cdecl __p__iob() MSVCRT___iob_func diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index fa19f40..a89dbfb 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -211,7 +211,7 @@ @ cdecl __daylight() MSVCRT___p__daylight @ cdecl __dllonexit(ptr ptr ptr) @ cdecl __doserrno() MSVCRT___doserrno -@ stub __dstbias +@ cdecl __dstbias() MSVCRT___p__dstbias @ stub ___fls_getvalue@4 @ stub ___fls_setvalue@8 @ cdecl __fpecode() @@ -266,7 +266,7 @@ @ cdecl __p__amblksiz() @ cdecl __p__commode() @ cdecl __p__daylight() MSVCRT___p__daylight -@ cdecl __p__dstbias() +@ cdecl __p__dstbias() MSVCRT___p__dstbias @ cdecl __p__environ() MSVCRT___p__environ @ cdecl __p__fmode() @ cdecl __p__iob() MSVCRT___iob_func diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 01788e1..742ada3 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -209,7 +209,7 @@ @ cdecl __daylight() MSVCRT___p__daylight @ cdecl __dllonexit(ptr ptr ptr) @ cdecl __doserrno() MSVCRT___doserrno -# stub __dstbias() +@ cdecl __dstbias() MSVCRT___p__dstbias @ cdecl __fpecode() @ stub __get_app_type @ cdecl __getmainargs(ptr ptr ptr long ptr) @@ -255,7 +255,7 @@ @ cdecl __p__amblksiz() @ cdecl __p__commode() @ cdecl __p__daylight() MSVCRT___p__daylight -@ cdecl __p__dstbias() +@ cdecl __p__dstbias() MSVCRT___p__dstbias @ cdecl __p__environ() MSVCRT___p__environ @ stub __p__fileinfo() @ cdecl __p__fmode() diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c index 71e58ba..995ece2 100644 --- a/dlls/msvcrt/tests/time.c +++ b/dlls/msvcrt/tests/time.c @@ -47,6 +47,7 @@ static errno_t (__cdecl *p_localtime64_s)(struct tm*, __time64_t*); static int* (__cdecl *p__daylight)(void); static int* (__cdecl *p___p__daylight)(void); static long* (__cdecl *p___p__dstbias)(void); +static long* (__cdecl *p__dstbias)(void); static long* (__cdecl *p___p__timezone)(void); static size_t (__cdecl *p_strftime)(char *, size_t, const char *, const struct tm *); static size_t (__cdecl *p_wcsftime)(wchar_t *, size_t, const wchar_t *, const struct tm *); @@ -67,6 +68,7 @@ static void init(void) p__daylight = (void*)GetProcAddress(hmod, "__daylight"); p___p__daylight = (void*)GetProcAddress(hmod, "__p__daylight"); p___p__dstbias = (void*)GetProcAddress(hmod, "__p__dstbias"); + p__dstbias = (void*)GetProcAddress(hmod, "__dstbias"); p___p__timezone = (void*)GetProcAddress(hmod, "__p__timezone"); p_strftime = (void*)GetProcAddress(hmod, "strftime"); p_wcsftime = (void*)GetProcAddress(hmod, "wcsftime"); @@ -821,6 +823,15 @@ static void test__tzset(void) return; }
+ if (p__dstbias) { + ret = *p__dstbias(); + ok(ret == -3600, "*__dstbias() = %d\n", ret); + ret = *p___p__dstbias(); + ok(ret == -3600, "*__p__dstbias() = %d\n", ret); + } + else + win_skip("__dstbias() is not available.\n"); + _snprintf(TZ_env,255,"TZ=%s",(getenv("TZ")?getenv("TZ"):""));
ret = *p___p__daylight(); diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 9c15bf4..e52e1d8 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -875,7 +875,7 @@ MSVCRT___time32_t CDECL MSVCRT_time(MSVCRT___time32_t* buf) #endif
/********************************************************************* - * __p_daylight (MSVCRT.@) + * __p__daylight (MSVCRT.@) */ int * CDECL MSVCRT___p__daylight(void) { @@ -883,15 +883,15 @@ int * CDECL MSVCRT___p__daylight(void) }
/********************************************************************* - * __p_dstbias (MSVCRT.@) + * __p__dstbias (MSVCRT.@) */ -int * CDECL __p__dstbias(void) +int * CDECL MSVCRT___p__dstbias(void) { return &MSVCRT__dstbias; }
/********************************************************************* - * __p_timezone (MSVCRT.@) + * __p__timezone (MSVCRT.@) */ MSVCRT_long * CDECL MSVCRT___p__timezone(void) {