Module: wine Branch: master Commit: 09e4fc834dce082b4a69792b55a4b2418e2ac8d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09e4fc834dce082b4a69792b55...
Author: Daniel Lehman dlehman@esri.com Date: Fri Jan 27 12:38:02 2017 +0100
msvcrt: Implement nan.
Signed-off-by: Daniel Lehman dlehman@esri.com Signed-off-by: Piotr Caban piotr@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
.../api-ms-win-crt-math-l1-1-0.spec | 6 +++--- dlls/msvcr120/msvcr120.spec | 6 +++--- dlls/msvcr120_app/msvcr120_app.spec | 6 +++--- dlls/msvcrt/math.c | 17 +++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 6 +++--- 5 files changed, 29 insertions(+), 12 deletions(-)
diff --git a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec index 6a31197..8ff4c58 100644 --- a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec +++ b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec @@ -288,9 +288,9 @@ @ cdecl lroundl(double) ucrtbase.lroundl @ cdecl modf(double ptr) ucrtbase.modf @ cdecl -arch=arm,x86_64 modff(float ptr) ucrtbase.modff -@ stub nan -@ stub nanf -@ stub nanl +@ cdecl nan(str) ucrtbase.nan +@ cdecl nanf(str) ucrtbase.nanf +@ cdecl nanl(str) ucrtbase.nanl @ cdecl nearbyint(double) ucrtbase.nearbyint @ cdecl nearbyintf(float) ucrtbase.nearbyintf @ cdecl nearbyintl(double) ucrtbase.nearbyintl diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index a6eb80d..fa9eef3 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2293,9 +2293,9 @@ @ cdecl memset(ptr long long) MSVCRT_memset @ cdecl modf(double ptr) MSVCRT_modf @ cdecl -arch=arm,x86_64 modff(float ptr) MSVCRT_modff -@ stub nan -@ stub nanf -@ stub nanl +@ cdecl nan(str) MSVCR120_nan +@ cdecl nanf(str) MSVCR120_nanf +@ cdecl nanl(str) MSVCR120_nan @ cdecl nearbyint(double) MSVCRT_nearbyint @ cdecl nearbyintf(float) MSVCRT_nearbyintf @ cdecl nearbyintl(double) MSVCRT_nearbyint diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 15f42f0..1b6e5a8 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1956,9 +1956,9 @@ @ cdecl memset(ptr long long) msvcr120.memset @ cdecl modf(double ptr) msvcr120.modf @ cdecl -arch=arm,x86_64 modff(float ptr) msvcr120.modff -@ stub nan -@ stub nanf -@ stub nanl +@ cdecl nan(str) msvcr120.nan +@ cdecl nanf(str) msvcr120.nanf +@ cdecl nanl(str) msvcr120.nanl @ cdecl nearbyint(double) msvcr120.nearbyint @ cdecl nearbyintf(float) msvcr120.nearbyintf @ cdecl nearbyintl(double) msvcr120.nearbyintl diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 6880d6c..55e2efc 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2901,3 +2901,20 @@ LDOUBLE CDECL MSVCR120_lgammal(LDOUBLE x) { return MSVCR120_lgamma(x); } + +/********************************************************************* + * nan (MSVCR120.@) + */ +double CDECL MSVCR120_nan(const char *tagp) +{ + /* Windows ignores input (MSDN) */ + return NAN; +} + +/********************************************************************* + * nanf (MSVCR120.@) + */ +float CDECL MSVCR120_nanf(const char *tagp) +{ + return NAN; +} diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 4cd3760..800ae8f 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2429,9 +2429,9 @@ @ cdecl memset(ptr long long) MSVCRT_memset @ cdecl modf(double ptr) MSVCRT_modf @ cdecl -arch=arm,x86_64 modff(float ptr) MSVCRT_modff -@ stub nan -@ stub nanf -@ stub nanl +@ cdecl nan(str) MSVCR120_nan +@ cdecl nanf(str) MSVCR120_nanf +@ cdecl nanl(str) MSVCR120_nan @ cdecl nearbyint(double) MSVCRT_nearbyint @ cdecl nearbyintf(float) MSVCRT_nearbyintf @ cdecl nearbyintl(double) MSVCRT_nearbyint