[PATCH v2 1/3] msvcr120: Add erfc.
Alex Henrie
alexhenrie24 at gmail.com
Fri Jul 14 00:14:19 CDT 2017
Needed for the mathematical modeling program MLwiN, see
https://forum.winehq.org/viewtopic.php?f=9&t=29088
Signed-off-by: Alex Henrie <alexhenrie24 at gmail.com>
---
configure.ac | 2 ++
.../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 | 32 ++++++++++++++++++++++
dlls/ucrtbase/ucrtbase.spec | 6 ++--
6 files changed, 46 insertions(+), 12 deletions(-)
diff --git a/configure.ac b/configure.ac
index bae5ba0ba7..5bee74ab96 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2603,6 +2603,8 @@ AC_CHECK_FUNCS(\
cbrt \
cbrtf \
erf \
+ erfc \
+ erfcf \
erff \
exp2 \
exp2f \
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 fb5c35059f..a1668bb8f2 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
@@ -221,9 +221,9 @@
@ stub ctanhl
@ stub ctanl
@ cdecl erf(double) ucrtbase.erf
-@ stub erfc
-@ stub erfcf
-@ stub erfcl
+@ cdecl erfc(double) ucrtbase.erfc
+@ cdecl erfcf(float) ucrtbase.erfcf
+@ cdecl erfcl(double) ucrtbase.erfcl
@ cdecl erff(float) ucrtbase.erff
@ cdecl erfl(double) ucrtbase.erfl
@ cdecl exp(double) ucrtbase.exp
diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec
index 323d5f43c0..d44812a264 100644
--- a/dlls/msvcr120/msvcr120.spec
+++ b/dlls/msvcr120/msvcr120.spec
@@ -2123,9 +2123,9 @@
@ stub ctanl
@ cdecl -ret64 div(long long) MSVCRT_div
@ cdecl erf(double) MSVCR120_erf
-@ stub erfc
-@ stub erfcf
-@ stub erfcl
+@ cdecl erfc(double) MSVCR120_erfc
+@ cdecl erfcf(float) MSVCR120_erfcf
+@ cdecl erfcl(double) MSVCR120_erfcl
@ cdecl erff(float) MSVCR120_erff
@ cdecl erfl(double) MSVCR120_erfl
@ cdecl exit(long) MSVCRT_exit
diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec
index 73101c7437..8c3ecfd1d3 100644
--- a/dlls/msvcr120_app/msvcr120_app.spec
+++ b/dlls/msvcr120_app/msvcr120_app.spec
@@ -1789,9 +1789,9 @@
@ stub ctanl
@ cdecl -ret64 div(long long) msvcr120.div
@ cdecl erf(double) msvcr120.erf
-@ stub erfc
-@ stub erfcf
-@ stub erfcl
+@ cdecl erfc(double) msvcr120.erfc
+@ cdecl erfcf(float) msvcr120.erfcf
+@ cdecl erfcl(double) msvcr120.erfcl
@ cdecl erff(float) msvcr120.erff
@ cdecl erfl(double) msvcr120.erfl
@ cdecl exit(long) msvcr120.exit
diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c
index 9eed9b8b89..89c45c794c 100644
--- a/dlls/msvcrt/math.c
+++ b/dlls/msvcrt/math.c
@@ -2773,6 +2773,38 @@ LDOUBLE CDECL MSVCR120_erfl(LDOUBLE x)
}
/*********************************************************************
+ * erfc (MSVCR120.@)
+ */
+double CDECL MSVCR120_erfc(double x)
+{
+#ifdef HAVE_ERFC
+ return erfc(x);
+#else
+ return 1 - MSVCR120_erf(x);
+#endif
+}
+
+/*********************************************************************
+ * erfcf (MSVCR120.@)
+ */
+float CDECL MSVCR120_erfcf(float x)
+{
+#ifdef HAVE_ERFCF
+ return erfcf(x);
+#else
+ return MSVCR120_erfc(x);
+#endif
+}
+
+/*********************************************************************
+ * erfcl (MSVCR120.@)
+ */
+LDOUBLE CDECL MSVCR120_erfcl(LDOUBLE x)
+{
+ return MSVCR120_erfc(x);
+}
+
+/*********************************************************************
* fmaxf (MSVCR120.@)
*/
float CDECL MSVCR120_fmaxf(float x, float y)
diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec
index aacf3614da..017f086fc1 100644
--- a/dlls/ucrtbase/ucrtbase.spec
+++ b/dlls/ucrtbase/ucrtbase.spec
@@ -2266,9 +2266,9 @@
@ stub ctanl
@ cdecl -ret64 div(long long) MSVCRT_div
@ cdecl erf(double) MSVCR120_erf
-@ stub erfc
-@ stub erfcf
-@ stub erfcl
+@ cdecl erfc(double) MSVCR120_erfc
+@ cdecl erfcf(float) MSVCR120_erfcf
+@ cdecl erfcl(double) MSVCR120_erfcl
@ cdecl erff(float) MSVCR120_erff
@ cdecl erfl(double) MSVCR120_erfl
@ cdecl exit(long) MSVCRT_exit
--
2.13.2
More information about the wine-patches
mailing list