From: Stéphane Bacri frisou76@yahoo.fr
--- dlls/msvcr120/msvcr120.spec | 10 +++--- dlls/msvcr120/tests/msvcr120.c | 56 ++++++++++++++++++++++++++--- dlls/msvcr120_app/msvcr120_app.spec | 10 +++--- dlls/msvcrt/math.c | 29 +++++++++++++-- dlls/ucrtbase/ucrtbase.spec | 10 +++--- 5 files changed, 92 insertions(+), 23 deletions(-)
diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 78420df3757..fffa4a5f4ed 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -825,12 +825,12 @@ @ 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 _Cbuild(double double) @ cdecl _CreateFrameInfo(ptr ptr) @ stdcall _CxxThrowException(ptr ptr) @ cdecl -arch=i386 -norelay _EH_prolog() @ stub -arch=arm _FPE_Raise -@ stub _FCbuild +@ cdecl _FCbuild(float float) @ cdecl _FindAndUnlinkFrame(ptr) @ stub -arch=win64 _GetImageBase @ stub -arch=win64 _GetThrowImageBase @@ -2076,8 +2076,8 @@ @ stub cexp @ stub cexpf @ stub cexpl -@ stub cimag -@ stub cimagf +@ cdecl cimag(int128) MSVCR120_cimag +@ cdecl cimagf(int64) MSVCR120_cimagf @ stub cimagl @ cdecl clearerr(ptr) @ cdecl clearerr_s(ptr) @@ -2105,7 +2105,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/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index 2c9569f750d..30a73e83c9d 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 { @@ -221,8 +227,12 @@ 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 _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); @@ -333,6 +343,10 @@ static BOOL init(void) SET(p_vsscanf, "vsscanf"); SET(p__Cbuild, "_Cbuild"); 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"); @@ -1294,21 +1308,52 @@ static void test_vsscanf(void)
static void test__Cbuild(void) { - _Dcomplex c; double d;
- memset(&c, 0, sizeof(c)); - p__Cbuild(&c, 1.0, 2.0); + _Dcomplex 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); + d = p_cimag(c); + ok(d == 2.0, "cimag 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); + d = p_cimag(c); + ok(d == 4.0, "cimag returned %lf\n", d); +} + +static void test__FCbuild(void) +{ + float d; + + _Fcomplex 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); + + 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_cimagf(c); + ok(d == 4.0f, "cimagf returned %lf\n", d); }
static void test_nexttoward(void) @@ -1904,6 +1949,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 c15de4d01ce..c74929fca9b 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -820,12 +820,12 @@ @ 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 _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 @ stub -arch=arm _FPE_Raise -@ stub _FCbuild +@ cdecl _FCbuild(float float) msvcr120._FCbuild @ cdecl _FindAndUnlinkFrame(ptr) msvcr120._FindAndUnlinkFrame @ stub -arch=win64 _GetImageBase @ stub -arch=win64 _GetThrowImageBase @@ -1743,8 +1743,8 @@ @ stub cexp @ stub cexpf @ stub cexpl -@ stub cimag -@ stub cimagf +@ cdecl cimag(int128) msvcr120.cimag +@ 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 be345fb7a4a..ab187e166fa 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; }
@@ -2970,4 +2971,26 @@ double CDECL MSVCR120_creal(_Dcomplex z) return z._Val[0]; }
+double CDECL MSVCR120_cimag(_Dcomplex z) +{ + return z._Val[1]; +} + +_Fcomplex CDECL _FCbuild(float r, float i) +{ + _Fcomplex ret; + ret._Val[0] = r; + ret._Val[1] = i; + return ret; +} + +float CDECL MSVCR120_crealf(_Fcomplex z) +{ + return z._Val[0]; +} + +float CDECL MSVCR120_cimagf(_Fcomplex z) +{ + return z._Val[1]; +} #endif /* _MSVCR_VER>=120 */ diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index cd8f9f23898..b2f6cc569c2 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -14,14 +14,14 @@ @ cdecl -arch=i386 _CIsqrt() @ cdecl -arch=i386 _CItan() @ cdecl -arch=i386 _CItanh() -@ cdecl _Cbuild(ptr double double) +@ cdecl _Cbuild(double double) @ stub _Cmulcc @ stub _Cmulcr @ cdecl _CreateFrameInfo(ptr ptr) @ stdcall _CxxThrowException(ptr ptr) @ cdecl -arch=i386 -norelay _EH_prolog() @ cdecl _Exit(long) _exit -@ stub _FCbuild +@ cdecl _FCbuild(float float) @ stub _FCmulcc @ stub _FCmulcr @ cdecl _FindAndUnlinkFrame(ptr) @@ -2221,8 +2221,8 @@ @ stub cexp @ stub cexpf @ stub cexpl -@ stub cimag -@ stub cimagf +@ cdecl cimag(int128) MSVCR120_cimag +@ cdecl cimagf(int64) MSVCR120_cimagf @ stub cimagl @ cdecl clearerr(ptr) @ cdecl clearerr_s(ptr) @@ -2250,7 +2250,7 @@ @ stub cprojf @ stub cprojl @ cdecl creal(int128) MSVCR120_creal -@ stub crealf +@ cdecl crealf(int64) MSVCR120_crealf @ stub creall @ stub csin @ stub csinf