[PATCH 0/5] MR7225: msvcr120: Add _FCbuild, cimag, cimags and crealf implementation.

[PATCH 1/5] msvcr120: Fix _Cbuild signature.

[Stéphane Bacri]

From: Stéphane Bacri

---
 dlls/msvcr120/msvcr120.spec         |  2 +-
 dlls/msvcr120/tests/msvcr120.c      | 11 +++++++----
 dlls/msvcr120_app/msvcr120_app.spec |  2 +-
 dlls/msvcrt/math.c                  |  7 ++++---
 dlls/ucrtbase/ucrtbase.spec         |  2 +-
 5 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec
index 78420df3757..d0b2ca9f2cf 100644
--- a/dlls/msvcr120/msvcr120.spec
+++ b/dlls/msvcr120/msvcr120.spec
@@ -825,7 +825,7 @@
 @ cdecl -arch=i386 _CItanh()
 @ cdecl _CRT_RTC_INIT(ptr ptr long long long)
 @ cdecl _CRT_RTC_INITW(ptr ptr long long long)
-@ cdecl _Cbuild(ptr double double)
+@ cdecl -norelay _Cbuild(double double)
 @ cdecl _CreateFrameInfo(ptr ptr)
 @ stdcall _CxxThrowException(ptr ptr)
 @ cdecl -arch=i386 -norelay _EH_prolog()
diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c
index 2c9569f750d..f63c86384d8 100644
--- a/dlls/msvcr120/tests/msvcr120.c
+++ b/dlls/msvcr120/tests/msvcr120.c
@@ -221,7 +221,7 @@ static _locale_t (__cdecl *p_wcreate_locale)(int, const wchar_t *);
 static void (__cdecl *p_free_locale)(_locale_t);
 static unsigned short (__cdecl *p_wctype)(const char*);
 static int (__cdecl *p_vsscanf)(const char*, const char *, va_list valist);
-static _Dcomplex* (__cdecl *p__Cbuild)(_Dcomplex*, double, double);
+static _Dcomplex (__cdecl *p__Cbuild)(double, double);
 static double (__cdecl *p_creal)(_Dcomplex);
 static double (__cdecl *p_nexttoward)(double, double);
 static float (__cdecl *p_nexttowardf)(float, double);
@@ -1297,18 +1297,21 @@ static void test__Cbuild(void)
     _Dcomplex c;
     double d;

-    memset(&c, 0, sizeof(c));
-    p__Cbuild(&c, 1.0, 2.0);
+    c = p__Cbuild(1.0, 2.0);
     ok(c.r == 1.0, "c.r = %lf\n", c.r);
     ok(c.i == 2.0, "c.i = %lf\n", c.i);
     d = p_creal(c);
     ok(d == 1.0, "creal returned %lf\n", d);

-    p__Cbuild(&c, 3.0, NAN);
+    c = p__Cbuild(3.0, NAN);
     ok(c.r == 3.0, "c.r = %lf\n", c.r);
     ok(_isnan(c.i), "c.i = %lf\n", c.i);
     d = p_creal(c);
     ok(d == 3.0, "creal returned %lf\n", d);
+
+    c = p__Cbuild(NAN, 4.0);
+    ok(_isnan(c.r), "c.r = %lf\n", c.r);
+    ok(c.i == 4.0, "c.i = %lf\n", c.i);
 }

static void test_nexttoward(void)
diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec
index c15de4d01ce..80ab50de9dc 100644
--- a/dlls/msvcr120_app/msvcr120_app.spec
+++ b/dlls/msvcr120_app/msvcr120_app.spec
@@ -820,7 +820,7 @@
 @ cdecl -arch=i386 _CIsqrt() msvcr120._CIsqrt
 @ cdecl -arch=i386 _CItan() msvcr120._CItan
 @ cdecl -arch=i386 _CItanh() msvcr120._CItanh
-@ cdecl _Cbuild(ptr double double) msvcr120._Cbuild
+@ cdecl -norelay _Cbuild(double double) msvcr120._Cbuild
 @ cdecl _CreateFrameInfo(ptr ptr) msvcr120._CreateFrameInfo
 @ stdcall _CxxThrowException(ptr ptr) msvcr120._CxxThrowException
 @ cdecl -arch=i386 -norelay _EH_prolog() msvcr120._EH_prolog
diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c
index be345fb7a4a..c620cb5fab9 100644
--- a/dlls/msvcrt/math.c
+++ b/dlls/msvcrt/math.c
@@ -2958,10 +2958,11 @@ double CDECL _except1(DWORD fpe, _FP_OPERATION_CODE op, double arg, double res,
     return res;
 }

-_Dcomplex* CDECL _Cbuild(_Dcomplex *ret, double r, double i)
+_Dcomplex CDECL _Cbuild(double r, double i)
 {
-    ret->_Val[0] = r;
-    ret->_Val[1] = i;
+    _Dcomplex ret;
+    ret._Val[0] = r;
+    ret._Val[1] = i;
     return ret;
 }

diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec
index cd8f9f23898..f3fda78e379 100644
--- a/dlls/ucrtbase/ucrtbase.spec
+++ b/dlls/ucrtbase/ucrtbase.spec
@@ -14,7 +14,7 @@
 @ cdecl -arch=i386 _CIsqrt()
 @ cdecl -arch=i386 _CItan()
 @ cdecl -arch=i386 _CItanh()
-@ cdecl _Cbuild(ptr double double)
+@ cdecl -norelay _Cbuild(double double)
 @ stub _Cmulcc
 @ stub _Cmulcr
 @ cdecl _CreateFrameInfo(ptr ptr)

[PATCH 2/5] msvcr120: Add cimag() implementation.

[Stéphane Bacri]

From: Stéphane Bacri

---
 dlls/msvcr120/msvcr120.spec         | 2 +-
 dlls/msvcr120/tests/msvcr120.c      | 6 ++++++
 dlls/msvcr120_app/msvcr120_app.spec | 2 +-
 dlls/msvcrt/math.c                  | 5 +++++
 dlls/ucrtbase/ucrtbase.spec         | 2 +-
 5 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec
index d0b2ca9f2cf..49931ea677d 100644
--- a/dlls/msvcr120/msvcr120.spec
+++ b/dlls/msvcr120/msvcr120.spec
@@ -2076,7 +2076,7 @@
 @ stub cexp
 @ stub cexpf
 @ stub cexpl
-@ stub cimag
+@ cdecl cimag(int128)
 @ stub cimagf
 @ stub cimagl
 @ cdecl clearerr(ptr)
diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c
index f63c86384d8..53cd0431cc5 100644
--- a/dlls/msvcr120/tests/msvcr120.c
+++ b/dlls/msvcr120/tests/msvcr120.c
@@ -223,6 +223,7 @@ static unsigned short (__cdecl *p_wctype)(const char*);
 static int (__cdecl *p_vsscanf)(const char*, const char *, va_list valist);
 static _Dcomplex (__cdecl *p__Cbuild)(double, double);
 static double (__cdecl *p_creal)(_Dcomplex);
+static double (__cdecl *p_cimag)(_Dcomplex);
 static double (__cdecl *p_nexttoward)(double, double);
 static float (__cdecl *p_nexttowardf)(float, double);
 static double (__cdecl *p_nexttowardl)(double, double);
@@ -333,6 +334,7 @@ static BOOL init(void)
     SET(p_vsscanf, "vsscanf");
     SET(p__Cbuild, "_Cbuild");
     SET(p_creal, "creal");
+    SET(p_cimag, "cimag");
     SET(p_nexttoward, "nexttoward");
     SET(p_nexttowardf, "nexttowardf");
     SET(p_nexttowardl, "nexttowardl");
@@ -1302,6 +1304,8 @@ static void test__Cbuild(void)
     ok(c.i == 2.0, "c.i = %lf\n", c.i);
     d = p_creal(c);
     ok(d == 1.0, "creal returned %lf\n", d);
+    d = p_cimag(c);
+    ok(d == 2.0, "cimag returned %lf\n", d);

c = p__Cbuild(3.0, NAN);
     ok(c.r == 3.0, "c.r = %lf\n", c.r);
@@ -1312,6 +1316,8 @@ static void test__Cbuild(void)
     c = p__Cbuild(NAN, 4.0);
     ok(_isnan(c.r), "c.r = %lf\n", c.r);
     ok(c.i == 4.0, "c.i = %lf\n", c.i);
+    d = p_cimag(c);
+    ok(d == 4.0, "cimag returned %lf\n", d);
 }

static void test_nexttoward(void)
diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec
index 80ab50de9dc..7f44909650f 100644
--- a/dlls/msvcr120_app/msvcr120_app.spec
+++ b/dlls/msvcr120_app/msvcr120_app.spec
@@ -1743,7 +1743,7 @@
 @ stub cexp
 @ stub cexpf
 @ stub cexpl
-@ stub cimag
+@ cdecl cimag(int128) msvcr120.cimag
 @ stub cimagf
 @ stub cimagl
 @ cdecl clearerr(ptr) msvcr120.clearerr
diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c
index c620cb5fab9..9024dd03a85 100644
--- a/dlls/msvcrt/math.c
+++ b/dlls/msvcrt/math.c
@@ -2971,4 +2971,9 @@ double CDECL MSVCR120_creal(_Dcomplex z)
     return z._Val[0];
 }

+double CDECL cimag(_Dcomplex z)
+{
+    return z._Val[1];
+}
+
 #endif /* _MSVCR_VER>=120 */
diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec
index f3fda78e379..2480a0d538c 100644
--- a/dlls/ucrtbase/ucrtbase.spec
+++ b/dlls/ucrtbase/ucrtbase.spec
@@ -2221,7 +2221,7 @@
 @ stub cexp
 @ stub cexpf
 @ stub cexpl
-@ stub cimag
+@ cdecl cimag(int128)
 @ stub cimagf
 @ stub cimagl
 @ cdecl clearerr(ptr)

[PATCH 3/5] msvcr120: Remove MSVCR120_ prefix from creal().

[Piotr Caban]

From: Piotr Caban

---
 dlls/msvcr120/msvcr120.spec | 2 +-
 dlls/msvcrt/math.c          | 2 +-
 dlls/ucrtbase/ucrtbase.spec | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec
index 49931ea677d..c5950385b4e 100644
--- a/dlls/msvcr120/msvcr120.spec
+++ b/dlls/msvcr120/msvcr120.spec
@@ -2104,7 +2104,7 @@
 @ stub cproj
 @ stub cprojf
 @ stub cprojl
-@ cdecl creal(int128) MSVCR120_creal
+@ cdecl creal(int128)
 @ stub crealf
 @ stub creall
 @ stub csin
diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c
index 9024dd03a85..7e1128e93ea 100644
--- a/dlls/msvcrt/math.c
+++ b/dlls/msvcrt/math.c
@@ -2966,7 +2966,7 @@ _Dcomplex CDECL _Cbuild(double r, double i)
     return ret;
 }

-double CDECL MSVCR120_creal(_Dcomplex z)
+double CDECL creal(_Dcomplex z)
 {
     return z._Val[0];
 }
diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec
index 2480a0d538c..98a3177a3cc 100644
--- a/dlls/ucrtbase/ucrtbase.spec
+++ b/dlls/ucrtbase/ucrtbase.spec
@@ -2249,7 +2249,7 @@
 @ stub cproj
 @ stub cprojf
 @ stub cprojl
-@ cdecl creal(int128) MSVCR120_creal
+@ cdecl creal(int128)
 @ stub crealf
 @ stub creall
 @ stub csin

[PATCH 4/5] msvcr120: Add _FCbuild() implementation.

[Stéphane Bacri]

From: Stéphane Bacri

---
 dlls/msvcr120/msvcr120.spec         |  2 +-
 dlls/msvcr120/tests/msvcr120.c      | 46 +++++++++++++++++++++++++++++
 dlls/msvcr120_app/msvcr120_app.spec |  2 +-
 dlls/msvcrt/math.c                  | 25 ++++++++++++++++
 dlls/ucrtbase/ucrtbase.spec         |  2 +-
 5 files changed, 74 insertions(+), 3 deletions(-)

diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec
index c5950385b4e..b7795e6353d 100644
--- a/dlls/msvcr120/msvcr120.spec
+++ b/dlls/msvcr120/msvcr120.spec
@@ -830,7 +830,7 @@
 @ stdcall _CxxThrowException(ptr ptr)
 @ cdecl -arch=i386 -norelay _EH_prolog()
 @ stub -arch=arm _FPE_Raise
-@ stub _FCbuild
+@ cdecl -norelay _FCbuild(float float)
 @ cdecl _FindAndUnlinkFrame(ptr)
 @ stub -arch=win64 _GetImageBase
 @ stub -arch=win64 _GetThrowImageBase
diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c
index 53cd0431cc5..0ff8adf4453 100644
--- a/dlls/msvcr120/tests/msvcr120.c
+++ b/dlls/msvcr120/tests/msvcr120.c
@@ -155,6 +155,12 @@ typedef struct
     double i;
 } _Dcomplex;

+typedef struct
+{
+    float r;
+    float i;
+} _Fcomplex;
+
 typedef void (*vtable_ptr)(void);

typedef struct {
@@ -222,6 +228,7 @@ static void (__cdecl *p_free_locale)(_locale_t);
 static unsigned short (__cdecl *p_wctype)(const char*);
 static int (__cdecl *p_vsscanf)(const char*, const char *, va_list valist);
 static _Dcomplex (__cdecl *p__Cbuild)(double, double);
+static _Fcomplex (__cdecl *p__FCbuild)(float, float);
 static double (__cdecl *p_creal)(_Dcomplex);
 static double (__cdecl *p_cimag)(_Dcomplex);
 static double (__cdecl *p_nexttoward)(double, double);
@@ -277,6 +284,19 @@ static _Cancellation_beacon* (__thiscall *p__Cancellation_beacon_ctor)(_Cancella
 static void (__thiscall *p__Cancellation_beacon_dtor)(_Cancellation_beacon*);
 static MSVCRT_bool (__thiscall *p__Cancellation_beacon__Confirm_cancel)(_Cancellation_beacon*);

+#ifdef __i386__
+static ULONGLONG (__cdecl *p_i386_FCbuild)(float, float);
+static _Fcomplex __cdecl i386_FCbuild(float r, float i)
+{
+    union {
+        _Fcomplex c;
+        ULONGLONG ull;
+    } ret;
+    ret.ull = p_i386_FCbuild(r, i);
+    return ret.c;
+}
+#endif
+
 #define SETNOFAIL(x,y) x = (void*)GetProcAddress(module,y)
 #define SET(x,y) do { SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y); } while(0)

@@ -335,6 +355,7 @@ static BOOL init(void)
     SET(p__Cbuild, "_Cbuild");
     SET(p_creal, "creal");
     SET(p_cimag, "cimag");
+    SET(p__FCbuild, "_FCbuild");
     SET(p_nexttoward, "nexttoward");
     SET(p_nexttowardf, "nexttowardf");
     SET(p_nexttowardl, "nexttowardl");
@@ -499,6 +520,12 @@ static BOOL init(void)
                 "?CurrentContext@Context@Concurrency@@SAPAV12@XZ");
     }

+#ifdef __i386__
+    SET(p_i386_FCbuild,
+                "_FCbuild");
+    p__FCbuild = i386_FCbuild;
+#endif
+
     init_thiscall_thunk();
     return TRUE;
 }
@@ -1320,6 +1347,24 @@ static void test__Cbuild(void)
     ok(d == 4.0, "cimag returned %lf\n", d);
 }

+static void test__FCbuild(void)
+{
+    _Fcomplex c;
+    float d;
+
+    c = p__FCbuild(1.0f, 2.0f);
+    ok(c.r == 1.0f, "c.r = %lf\n", c.r);
+    ok(c.i == 2.0f, "c.i = %lf\n", c.i);
+
+    c = p__FCbuild(3.0f, NAN);
+    ok(c.r == 3.0f, "c.r = %lf\n", c.r);
+    ok(_isnan(c.i), "c.i = %lf\n", c.i);
+
+    c = p__FCbuild(NAN, 4.0f);
+    ok(_isnan(c.r), "c.r = %lf\n", c.r);
+    ok(c.i == 4.0f, "c.i = %lf\n", c.i);
+}
+
 static void test_nexttoward(void)
 {
     errno_t e;
@@ -1913,6 +1958,7 @@ START_TEST(msvcr120)
     test__Condition_variable();
     test_wctype();
     test_vsscanf();
+    test__FCbuild();
     test__Cbuild();
     test_nexttoward();
     test_towctrans();
diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec
index 7f44909650f..7bf8e8a4bce 100644
--- a/dlls/msvcr120_app/msvcr120_app.spec
+++ b/dlls/msvcr120_app/msvcr120_app.spec
@@ -825,7 +825,7 @@
 @ stdcall _CxxThrowException(ptr ptr) msvcr120._CxxThrowException
 @ cdecl -arch=i386 -norelay _EH_prolog() msvcr120._EH_prolog
 @ stub -arch=arm _FPE_Raise
-@ stub _FCbuild
+@ cdecl -norelay _FCbuild(float float) msvcr120._FCbuild
 @ cdecl _FindAndUnlinkFrame(ptr) msvcr120._FindAndUnlinkFrame
 @ stub -arch=win64 _GetImageBase
 @ stub -arch=win64 _GetThrowImageBase
diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c
index 7e1128e93ea..d8f3bb324e4 100644
--- a/dlls/msvcrt/math.c
+++ b/dlls/msvcrt/math.c
@@ -2976,4 +2976,29 @@ double CDECL cimag(_Dcomplex z)
     return z._Val[1];
 }

+#ifndef __i386__
+_Fcomplex CDECL _FCbuild(float r, float i)
+{
+    _Fcomplex ret;
+    ret._Val[0] = r;
+    ret._Val[1] = i;
+    return ret;
+}
+#else
+ULONGLONG CDECL _FCbuild(float r, float i)
+{
+    union
+    {
+        _Fcomplex c;
+        ULONGLONG ull;
+    } ret;
+
+    C_ASSERT(sizeof(_Fcomplex) == sizeof(ULONGLONG));
+
+    ret.c._Val[0] = r;
+    ret.c._Val[1] = i;
+    return ret.ull;
+}
+#endif
+
 #endif /* _MSVCR_VER>=120 */
diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec
index 98a3177a3cc..8c06f8d75ff 100644
--- a/dlls/ucrtbase/ucrtbase.spec
+++ b/dlls/ucrtbase/ucrtbase.spec
@@ -21,7 +21,7 @@
 @ stdcall _CxxThrowException(ptr ptr)
 @ cdecl -arch=i386 -norelay _EH_prolog()
 @ cdecl _Exit(long) _exit
-@ stub _FCbuild
+@ cdecl -norelay _FCbuild(float float)
 @ stub _FCmulcc
 @ stub _FCmulcr
 @ cdecl _FindAndUnlinkFrame(ptr)

[PATCH 5/5] msvcr120: Add crealf() and cimagf() implementation.

[Stéphane Bacri]

From: Stéphane Bacri

---
 dlls/msvcr120/msvcr120.spec         |  4 ++--
 dlls/msvcr120/tests/msvcr120.c      | 16 ++++++++++++++++
 dlls/msvcr120_app/msvcr120_app.spec |  4 ++--
 dlls/msvcrt/math.c                  | 10 ++++++++++
 dlls/ucrtbase/ucrtbase.spec         |  4 ++--
 5 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec
index b7795e6353d..daa3d350cce 100644
--- a/dlls/msvcr120/msvcr120.spec
+++ b/dlls/msvcr120/msvcr120.spec
@@ -2077,7 +2077,7 @@
 @ stub cexpf
 @ stub cexpl
 @ cdecl cimag(int128)
-@ stub cimagf
+@ cdecl cimagf(int64)
 @ stub cimagl
 @ cdecl clearerr(ptr)
 @ cdecl clearerr_s(ptr)
@@ -2105,7 +2105,7 @@
 @ stub cprojf
 @ stub cprojl
 @ cdecl creal(int128)
-@ stub crealf
+@ cdecl crealf(int64)
 @ stub creall
 @ stub csin
 @ stub csinf
diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c
index 0ff8adf4453..21b1c00b4c3 100644
--- a/dlls/msvcr120/tests/msvcr120.c
+++ b/dlls/msvcr120/tests/msvcr120.c
@@ -230,7 +230,9 @@ static int (__cdecl *p_vsscanf)(const char*, const char *, va_list valist);
 static _Dcomplex (__cdecl *p__Cbuild)(double, double);
 static _Fcomplex (__cdecl *p__FCbuild)(float, float);
 static double (__cdecl *p_creal)(_Dcomplex);
+static float (__cdecl *p_crealf)(_Fcomplex);
 static double (__cdecl *p_cimag)(_Dcomplex);
+static float (__cdecl *p_cimagf)(_Fcomplex);
 static double (__cdecl *p_nexttoward)(double, double);
 static float (__cdecl *p_nexttowardf)(float, double);
 static double (__cdecl *p_nexttowardl)(double, double);
@@ -356,6 +358,8 @@ static BOOL init(void)
     SET(p_creal, "creal");
     SET(p_cimag, "cimag");
     SET(p__FCbuild, "_FCbuild");
+    SET(p_crealf, "crealf");
+    SET(p_cimagf, "cimagf");
     SET(p_nexttoward, "nexttoward");
     SET(p_nexttowardf, "nexttowardf");
     SET(p_nexttowardl, "nexttowardl");
@@ -1355,14 +1359,26 @@ static void test__FCbuild(void)
     c = p__FCbuild(1.0f, 2.0f);
     ok(c.r == 1.0f, "c.r = %lf\n", c.r);
     ok(c.i == 2.0f, "c.i = %lf\n", c.i);
+    d = p_crealf(c);
+    ok(d == 1.0f, "crealf returned %lf\n", d);
+    d = p_cimagf(c);
+    ok(d == 2.0f, "cimagf returned %lf\n", d);

c = p__FCbuild(3.0f, NAN);
     ok(c.r == 3.0f, "c.r = %lf\n", c.r);
     ok(_isnan(c.i), "c.i = %lf\n", c.i);
+    d = p_crealf(c);
+    ok(d == 3.0f, "crealf returned %lf\n", d);
+    d = p_cimagf(c);
+    ok(_isnan(d), "cimagf returned %lf\n", d);

c = p__FCbuild(NAN, 4.0f);
     ok(_isnan(c.r), "c.r = %lf\n", c.r);
     ok(c.i == 4.0f, "c.i = %lf\n", c.i);
+    d = p_crealf(c);
+    ok(_isnan(d), "crealf returned %lf\n", d);
+    d = p_cimagf(c);
+    ok(d == 4.0f, "cimagf returned %lf\n", d);
 }

static void test_nexttoward(void)
diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec
index 7bf8e8a4bce..1d8ea83a468 100644
--- a/dlls/msvcr120_app/msvcr120_app.spec
+++ b/dlls/msvcr120_app/msvcr120_app.spec
@@ -1744,7 +1744,7 @@
 @ stub cexpf
 @ stub cexpl
 @ cdecl cimag(int128) msvcr120.cimag
-@ stub cimagf
+@ cdecl cimagf(int64) msvcr120.cimagf
 @ stub cimagl
 @ cdecl clearerr(ptr) msvcr120.clearerr
 @ cdecl clearerr_s(ptr) msvcr120.clearerr_s
@@ -1772,7 +1772,7 @@
 @ stub cprojf
 @ stub cprojl
 @ cdecl creal(int128) msvcr120.creal
-@ stub crealf
+@ cdecl crealf(int64) msvcr120.crealf
 @ stub creall
 @ stub csin
 @ stub csinf
diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c
index d8f3bb324e4..bcdf459396b 100644
--- a/dlls/msvcrt/math.c
+++ b/dlls/msvcrt/math.c
@@ -3001,4 +3001,14 @@ ULONGLONG CDECL _FCbuild(float r, float i)
 }
 #endif

+float CDECL crealf(_Fcomplex z)
+{
+    return z._Val[0];
+}
+
+float CDECL cimagf(_Fcomplex z)
+{
+    return z._Val[1];
+}
+
 #endif /* _MSVCR_VER>=120 */
diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec
index 8c06f8d75ff..d7b62aa7f46 100644
--- a/dlls/ucrtbase/ucrtbase.spec
+++ b/dlls/ucrtbase/ucrtbase.spec
@@ -2222,7 +2222,7 @@
 @ stub cexpf
 @ stub cexpl
 @ cdecl cimag(int128)
-@ stub cimagf
+@ cdecl cimagf(int64)
 @ stub cimagl
 @ cdecl clearerr(ptr)
 @ cdecl clearerr_s(ptr)
@@ -2250,7 +2250,7 @@
 @ stub cprojf
 @ stub cprojl
 @ cdecl creal(int128)
-@ stub crealf
+@ cdecl crealf(int64)
 @ stub creall
 @ stub csin
 @ stub csinf

[PATCH 5/5] msvcr120: Add crealf() and cimagf() implementation.

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=151139

Your paranoid android.

=== debian11 (build log) ===

error: patch failed: dlls/msvcr120/msvcr120.spec:825
error: patch failed: dlls/msvcr120/tests/msvcr120.c:221
error: patch failed: dlls/msvcr120_app/msvcr120_app.spec:820
error: patch failed: dlls/msvcrt/math.c:2958
error: patch failed: dlls/ucrtbase/ucrtbase.spec:14
error: patch failed: dlls/msvcr120/msvcr120.spec:2076
error: patch failed: dlls/msvcr120/tests/msvcr120.c:223
error: patch failed: dlls/msvcr120_app/msvcr120_app.spec:1743
error: patch failed: dlls/msvcrt/math.c:2971
error: patch failed: dlls/ucrtbase/ucrtbase.spec:2221
error: patch failed: dlls/msvcr120/msvcr120.spec:830
error: patch failed: dlls/msvcr120/tests/msvcr120.c:155
error: patch failed: dlls/msvcr120_app/msvcr120_app.spec:825
error: patch failed: dlls/msvcrt/math.c:2976
error: patch failed: dlls/ucrtbase/ucrtbase.spec:21
error: patch failed: dlls/msvcr120/msvcr120.spec:2077
error: patch failed: dlls/msvcr120/tests/msvcr120.c:230
error: patch failed: dlls/msvcr120_app/msvcr120_app.spec:1744
error: patch failed: dlls/msvcrt/math.c:3001
error: patch failed: dlls/ucrtbase/ucrtbase.spec:2222
Task: Patch failed to apply

=== debian11b (build log) ===

error: patch failed: dlls/msvcr120/msvcr120.spec:825
error: patch failed: dlls/msvcr120/tests/msvcr120.c:221
error: patch failed: dlls/msvcr120_app/msvcr120_app.spec:820
error: patch failed: dlls/msvcrt/math.c:2958
error: patch failed: dlls/ucrtbase/ucrtbase.spec:14
error: patch failed: dlls/msvcr120/msvcr120.spec:2076
error: patch failed: dlls/msvcr120/tests/msvcr120.c:223
error: patch failed: dlls/msvcr120_app/msvcr120_app.spec:1743
error: patch failed: dlls/msvcrt/math.c:2971
error: patch failed: dlls/ucrtbase/ucrtbase.spec:2221
error: patch failed: dlls/msvcr120/msvcr120.spec:830
error: patch failed: dlls/msvcr120/tests/msvcr120.c:155
error: patch failed: dlls/msvcr120_app/msvcr120_app.spec:825
error: patch failed: dlls/msvcrt/math.c:2976
error: patch failed: dlls/ucrtbase/ucrtbase.spec:21
error: patch failed: dlls/msvcr120/msvcr120.spec:2077
error: patch failed: dlls/msvcr120/tests/msvcr120.c:230
error: patch failed: dlls/msvcr120_app/msvcr120_app.spec:1744
error: patch failed: dlls/msvcrt/math.c:3001
error: patch failed: dlls/ucrtbase/ucrtbase.spec:2222
Task: Patch failed to apply