[PATCH 9/9] msvcr120: Add log1p.

Alex Henrie alexhenrie24 at gmail.com
Sun Jul 9 23:55:10 CDT 2017


Fixes https://bugs.winehq.org/show_bug.cgi?id=43305

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 4e606a807c..a89d993c03 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2612,6 +2612,8 @@ AC_CHECK_FUNCS(\
 	llrintf \
 	llround \
 	llroundf \
+	log1p \
+	log1pf \
 	log2 \
 	log2f \
 	lrint \
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 9ed215f0df..7a6a8eda94 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
@@ -270,9 +270,9 @@
 @ cdecl log(double) ucrtbase.log
 @ cdecl log10(double) ucrtbase.log10
 @ cdecl -arch=arm,x86_64 log10f(float) ucrtbase.log10f
-@ stub log1p
-@ stub log1pf
-@ stub log1pl
+@ cdecl log1p(double) ucrtbase.log1p
+@ cdecl log1pf(float) ucrtbase.log1pf
+@ cdecl log1pl(double) ucrtbase.log1pl
 @ cdecl log2(double) ucrtbase.log2
 @ cdecl log2f(float) ucrtbase.log2f
 @ cdecl log2l(double) ucrtbase.log2l
diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec
index 407c86cd49..9da3f4980c 100644
--- a/dlls/msvcr120/msvcr120.spec
+++ b/dlls/msvcr120/msvcr120.spec
@@ -2259,9 +2259,9 @@
 @ cdecl -arch=arm,x86_64 logf(float) MSVCRT_logf
 @ cdecl log10(double) MSVCRT_log10
 @ cdecl -arch=arm,x86_64 log10f(float) MSVCRT_log10f
-@ stub log1p
-@ stub log1pf
-@ stub log1pl
+@ cdecl log1p(double) MSVCR120_log1p
+@ cdecl log1pf(float) MSVCR120_log1pf
+@ cdecl log1pl(double) MSVCR120_log1pl
 @ cdecl log2(double) MSVCR120_log2
 @ cdecl log2f(float) MSVCR120_log2f
 @ cdecl log2l(double) MSVCR120_log2l
diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec
index 8858f43d90..41acbbd3cd 100644
--- a/dlls/msvcr120_app/msvcr120_app.spec
+++ b/dlls/msvcr120_app/msvcr120_app.spec
@@ -1922,9 +1922,9 @@
 @ cdecl -arch=arm,x86_64 logf(float) msvcr120.logf
 @ cdecl log10(double) msvcr120.log10
 @ cdecl -arch=arm,x86_64 log10f(float) msvcr120.log10f
-@ stub log1p
-@ stub log1pf
-@ stub log1pl
+@ cdecl log1p(double) msvcr120.log1p
+@ cdecl log1pf(float) msvcr120.log1pf
+@ cdecl log1pl(double) msvcr120.log1pl
 @ cdecl log2(double) msvcr120.log2
 @ cdecl log2f(float) msvcr120.log2f
 @ cdecl log2l(double) msvcr120.log2l
diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c
index 2188dcc62d..2cd7c579a4 100644
--- a/dlls/msvcrt/math.c
+++ b/dlls/msvcrt/math.c
@@ -2444,6 +2444,38 @@ LDOUBLE CDECL MSVCR120_expm1l(LDOUBLE x)
 }
 
 /*********************************************************************
+ *      log1p (MSVCR120.@)
+ */
+double CDECL MSVCR120_log1p(double x)
+{
+#ifdef HAVE_LOG1P
+    return log1p(x);
+#else
+    return log(1 + x);
+#endif
+}
+
+/*********************************************************************
+ *      log1pf (MSVCR120.@)
+ */
+float CDECL MSVCR120_log1pf(float x)
+{
+#ifdef HAVE_LOG1PF
+    return log1pf(x);
+#else
+    return log(1 + x);
+#endif
+}
+
+/*********************************************************************
+ *      log1pl (MSVCR120.@)
+ */
+LDOUBLE CDECL MSVCR120_log1pl(LDOUBLE x)
+{
+    return MSVCR120_log1p(x);
+}
+
+/*********************************************************************
  *      log2 (MSVCR120.@)
  */
 double CDECL MSVCR120_log2(double x)
diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec
index 0d799fd2ae..ff1102843e 100644
--- a/dlls/ucrtbase/ucrtbase.spec
+++ b/dlls/ucrtbase/ucrtbase.spec
@@ -2392,9 +2392,9 @@
 @ cdecl log(double) MSVCRT_log
 @ cdecl log10(double) MSVCRT_log10
 @ cdecl -arch=arm,x86_64 log10f(float) MSVCRT_log10f
-@ stub log1p
-@ stub log1pf
-@ stub log1pl
+@ cdecl log1p(double) MSVCR120_log1p
+@ cdecl log1pf(float) MSVCR120_log1pf
+@ cdecl log1pl(double) MSVCR120_log1pl
 @ cdecl log2(double) MSVCR120_log2
 @ cdecl log2f(float) MSVCR120_log2f
 @ cdecl log2l(double) MSVCR120_log2l
-- 
2.13.2




More information about the wine-patches mailing list