Module: wine
Branch: master
Commit: 8c8d8e80f558e8b0de410196ce4bcc9c77b91edf
URL:
https://source.winehq.org/git/wine.git/?a=commit;h=8c8d8e80f558e8b0de410196…
Author: Nikolay Sivov <nsivov(a)codeweavers.com>
Date: Thu Feb 28 21:08:13 2019 +0100
ucrtbase: Add ilogb* functions.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
---
configure | 2 ++
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 | 31 ++++++++++++++++++++++
dlls/msvcrt/msvcrt.h | 4 +++
dlls/ucrtbase/ucrtbase.spec | 6 ++---
include/config.h.in | 6 +++++
9 files changed, 57 insertions(+), 12 deletions(-)
diff --git a/configure b/configure
index 793e2ff..0d2f523 100755
--- a/configure
+++ b/configure
@@ -18698,6 +18698,8 @@ for ac_func in \
exp2f \
expm1 \
expm1f \
+ ilogb \
+ ilogbf \
j0 \
j1 \
jn \
diff --git a/configure.ac b/configure.ac
index c978477..a55d2f8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2743,6 +2743,8 @@ AC_CHECK_FUNCS(\
exp2f \
expm1 \
expm1f \
+ ilogb \
+ ilogbf \
j0 \
j1 \
jn \
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 f5e4fb1..dea5094 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
@@ -254,9 +254,9 @@
@ cdecl -arch=arm,x86_64,arm64 fmodf(float float) ucrtbase.fmodf
@ cdecl frexp(double ptr) ucrtbase.frexp
@ cdecl hypot(double double) ucrtbase.hypot
-@ stub ilogb
-@ stub ilogbf
-@ stub ilogbl
+@ cdecl ilogb(double) ucrtbase.ilogb
+@ cdecl ilogbf(float) ucrtbase.ilogbf
+@ cdecl ilogbl(double) ucrtbase.ilogbl
@ cdecl ldexp(double long) ucrtbase.ldexp
@ cdecl lgamma(double) ucrtbase.lgamma
@ cdecl lgammaf(float) ucrtbase.lgammaf
diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec
index 7dfcabf..0e3d7bb 100644
--- a/dlls/msvcr120/msvcr120.spec
+++ b/dlls/msvcr120/msvcr120.spec
@@ -2207,9 +2207,9 @@
@ cdecl gets_s(ptr long) MSVCRT_gets_s
@ cdecl getwc(ptr) MSVCRT_getwc
@ cdecl getwchar() MSVCRT_getwchar
-@ stub ilogb
-@ stub ilogbf
-@ stub ilogbl
+@ cdecl ilogb(double) MSVCR120_ilogb
+@ cdecl ilogbf(float) MSVCR120_ilogbf
+@ cdecl ilogbl(double) MSVCR120_ilogbl
@ stub imaxabs
@ stub imaxdiv
@ cdecl is_wctype(long long) ntdll.iswctype
diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec
index d78d26f..5b1549b 100644
--- a/dlls/msvcr120_app/msvcr120_app.spec
+++ b/dlls/msvcr120_app/msvcr120_app.spec
@@ -1871,9 +1871,9 @@
@ cdecl gets_s(ptr long) msvcr120.gets_s
@ cdecl getwc(ptr) msvcr120.getwc
@ cdecl getwchar() msvcr120.getwchar
-@ stub ilogb
-@ stub ilogbf
-@ stub ilogbl
+@ cdecl ilogb(double) msvcr120.ilogb
+@ cdecl ilogbf(float) msvcr120.ilogbf
+@ cdecl ilogbl(double) msvcr120.ilogbl
@ stub imaxabs
@ stub imaxdiv
@ cdecl isalnum(long) msvcr120.isalnum
diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c
index dc12cb1..ca181d9 100644
--- a/dlls/msvcrt/math.c
+++ b/dlls/msvcrt/math.c
@@ -3433,4 +3433,35 @@ double CDECL MSVCR120_creal(_Dcomplex z)
return z.x;
}
+int CDECL MSVCR120_ilogb(double x)
+{
+ if (!x) return MSVCRT_FP_ILOGB0;
+ if (isnan(x)) return MSVCRT_FP_ILOGBNAN;
+ if (isinf(x)) return MSVCRT_INT_MAX;
+
+#ifdef HAVE_ILOGB
+ return ilogb(x);
+#else
+ return logb(x);
+#endif
+}
+
+int CDECL MSVCR120_ilogbf(float x)
+{
+ if (!x) return MSVCRT_FP_ILOGB0;
+ if (isnan(x)) return MSVCRT_FP_ILOGBNAN;
+ if (isinf(x)) return MSVCRT_INT_MAX;
+
+#ifdef HAVE_ILOGBF
+ return ilogbf(x);
+#else
+ return logbf(x);
+#endif
+}
+
+int CDECL MSVCR120_ilogbl(LDOUBLE x)
+{
+ return MSVCR120_ilogb(x);
+}
+
#endif /* _MSVCR_VER>=120 */
diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h
index eba545f..aad8c95 100644
--- a/dlls/msvcrt/msvcrt.h
+++ b/dlls/msvcrt/msvcrt.h
@@ -41,6 +41,7 @@
#include "windef.h"
#include "winbase.h"
+#define MSVCRT_INT_MAX 0x7fffffff
#define MSVCRT_LONG_MAX 0x7fffffff
#define MSVCRT_LONG_MIN (-MSVCRT_LONG_MAX-1)
#define MSVCRT_ULONG_MAX 0xffffffff
@@ -1187,6 +1188,9 @@ printf_arg arg_clbk_positional(void*, int, int, __ms_va_list*)
DECLSPEC_HIDDEN;
#define MSVCRT__OVERFLOW 3
#define MSVCRT__UNDERFLOW 4
+#define MSVCRT_FP_ILOGB0 (-MSVCRT_INT_MAX - 1)
+#define MSVCRT_FP_ILOGBNAN MSVCRT_INT_MAX
+
typedef struct
{
float f;
diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec
index 00c8064..f4ad66c 100644
--- a/dlls/ucrtbase/ucrtbase.spec
+++ b/dlls/ucrtbase/ucrtbase.spec
@@ -2341,9 +2341,9 @@
@ cdecl getwc(ptr) MSVCRT_getwc
@ cdecl getwchar() MSVCRT_getwchar
@ cdecl hypot(double double) _hypot
-@ stub ilogb
-@ stub ilogbf
-@ stub ilogbl
+@ cdecl ilogb(double) MSVCR120_ilogb
+@ cdecl ilogbf(float) MSVCR120_ilogbf
+@ cdecl ilogbl(double) MSVCR120_ilogbl
@ stub imaxabs
@ stub imaxdiv
@ cdecl is_wctype(long long) ntdll.iswctype
diff --git a/include/config.h.in b/include/config.h.in
index 149e8b1..999f4a6 100644
--- a/include/config.h.in
+++ b/include/config.h.in
@@ -303,6 +303,12 @@
/* Define to 1 if you have the `if_nameindex' function. */
#undef HAVE_IF_NAMEINDEX
+/* Define to 1 if you have the `ilogb' function. */
+#undef HAVE_ILOGB
+
+/* Define to 1 if you have the `ilogbf' function. */
+#undef HAVE_ILOGBF
+
/* Define to 1 if you have the `inet_addr' function. */
#undef HAVE_INET_ADDR