diff --git a/dlls/msvcp90/math.c b/dlls/msvcp90/math.c index 9f75cd4f9b1..c13fd3c224b 100644 --- a/dlls/msvcp90/math.c +++ b/dlls/msvcp90/math.c @@ -1312,6 +1312,34 @@ complex_float* __cdecl complex_float_conj(complex_float *ret, const complex_floa return ret; } +/* ??$cos@M@std@@YA?AV?$complex@M@0@ABV10@@Z */ +/* ??$cos@M@std@@YA?AV?$complex@M@0@AEBV10@@Z */ +complex_float* __cdecl complex_float_cos(complex_float *ret, const complex_float *c) +{ + ret->real = cos(c->real)*cosh(c->imag); + ret->imag = -sin(c->real)*sinh(c->imag); + return ret; +} + +/* ??$sin@M@std@@YA?AV?$complex@M@0@ABV10@@Z */ +/* ??$sin@M@std@@YA?AV?$complex@M@0@AEBV10@@Z */ +complex_float* __cdecl complex_float_sin(complex_float *ret, const complex_float *c) +{ + ret->real = sin(c->real)*cosh(c->imag); + ret->imag = cos(c->real)*sinh(c->imag); + return ret; +} + +/* ??$tan@M@std@@YA?AV?$complex@M@0@ABV10@@Z */ +/* ??$tan@M@std@@YA?AV?$complex@M@0@AEBV10@@Z */ +complex_float* __cdecl complex_float_tan(complex_float *ret, const complex_float *c) +{ + double denom = cos(2*c->real) + cosh(2*c->imag); + ret->real = sin(2*c->real) / denom; + ret->imag = sinh(2*c->imag) / denom; + return ret; +} + /* ??0?$_Complex_base@NU_C_double_complex@@@std@@QAE@ABN0@Z */ /* ??0?$_Complex_base@NU_C_double_complex@@@std@@QEAA@AEBN0@Z */ /* ??0?$_Complex_base@OU_C_ldouble_complex@@@std@@QAE@ABO0@Z */ @@ -1820,3 +1848,37 @@ complex_double* __cdecl complex_double_conj(complex_double *ret, const complex_d ret->imag = -c->imag; return ret; } + +/* ??$cos@N@std@@YA?AV?$complex@N@0@ABV10@@Z */ +/* ??$cos@N@std@@YA?AV?$complex@N@0@AEBV10@@Z */ +/* ??$cos@O@std@@YA?AV?$complex@O@0@ABV10@@Z */ +/* ??$cos@O@std@@YA?AV?$complex@O@0@AEBV10@@Z */ +complex_double* __cdecl complex_double_cos(complex_double *ret, const complex_double *c) +{ + ret->real = cos(c->real)*cosh(c->imag); + ret->imag = -sin(c->real)*sinh(c->imag); + return ret; +} + +/* ??$sin@N@std@@YA?AV?$complex@N@0@ABV10@@Z */ +/* ??$sin@N@std@@YA?AV?$complex@N@0@AEBV10@@Z */ +/* ??$sin@O@std@@YA?AV?$complex@O@0@ABV10@@Z */ +/* ??$sin@O@std@@YA?AV?$complex@O@0@AEBV10@@Z */ +complex_double* __cdecl complex_double_sin(complex_double *ret, const complex_double *c) +{ + ret->real = sin(c->real)*cosh(c->imag); + ret->imag = cos(c->real)*sinh(c->imag); + return ret; +} + +/* ??$tan@N@std@@YA?AV?$complex@N@0@ABV10@@Z */ +/* ??$tan@N@std@@YA?AV?$complex@N@0@AEBV10@@Z */ +/* ??$tan@O@std@@YA?AV?$complex@O@0@ABV10@@Z */ +/* ??$tan@O@std@@YA?AV?$complex@O@0@AEBV10@@Z */ +complex_double* __cdecl complex_double_tan(complex_double *ret, const complex_double *c) +{ + double denom = cos(2*c->real) + cosh(2*c->imag); + ret->real = sin(2*c->real) / denom; + ret->imag = sinh(2*c->imag) / denom; + return ret; +} diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 5e53c6d1220..3022505b178 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -368,12 +368,12 @@ @ cdecl -arch=win64 ??$conj@N@std@@YA?AV?$complex@N@0@AEBV10@@Z(ptr ptr) complex_double_conj @ cdecl -arch=win32 ??$conj@O@std@@YA?AV?$complex@O@0@ABV10@@Z(ptr ptr) complex_double_conj @ cdecl -arch=win64 ??$conj@O@std@@YA?AV?$complex@O@0@AEBV10@@Z(ptr ptr) complex_double_conj -@ stub -arch=win32 ??$cos@M@std@@YA?AV?$complex@M@0@ABV10@@Z -@ stub -arch=win64 ??$cos@M@std@@YA?AV?$complex@M@0@AEBV10@@Z -@ stub -arch=win32 ??$cos@N@std@@YA?AV?$complex@N@0@ABV10@@Z -@ stub -arch=win64 ??$cos@N@std@@YA?AV?$complex@N@0@AEBV10@@Z -@ stub -arch=win32 ??$cos@O@std@@YA?AV?$complex@O@0@ABV10@@Z -@ stub -arch=win64 ??$cos@O@std@@YA?AV?$complex@O@0@AEBV10@@Z +@ cdecl -arch=win32 ??$cos@M@std@@YA?AV?$complex@M@0@ABV10@@Z(ptr ptr) complex_float_cos +@ cdecl -arch=win64 ??$cos@M@std@@YA?AV?$complex@M@0@AEBV10@@Z(ptr ptr) complex_float_cos +@ cdecl -arch=win32 ??$cos@N@std@@YA?AV?$complex@N@0@ABV10@@Z(ptr ptr) complex_double_cos +@ cdecl -arch=win64 ??$cos@N@std@@YA?AV?$complex@N@0@AEBV10@@Z(ptr ptr) complex_double_cos +@ cdecl -arch=win32 ??$cos@O@std@@YA?AV?$complex@O@0@ABV10@@Z(ptr ptr) complex_double_cos +@ cdecl -arch=win64 ??$cos@O@std@@YA?AV?$complex@O@0@AEBV10@@Z(ptr ptr) complex_double_cos @ stub -arch=win32 ??$cosh@M@std@@YA?AV?$complex@M@0@ABV10@@Z @ stub -arch=win64 ??$cosh@M@std@@YA?AV?$complex@M@0@AEBV10@@Z @ stub -arch=win32 ??$cosh@N@std@@YA?AV?$complex@N@0@ABV10@@Z @@ -464,12 +464,12 @@ @ cdecl -arch=win64 ??$real@N@std@@YANAEBV?$complex@N@0@@Z(ptr) complex_double_real @ cdecl -arch=win32 ??$real@O@std@@YAOABV?$complex@O@0@@Z(ptr) complex_double_real @ cdecl -arch=win64 ??$real@O@std@@YAOAEBV?$complex@O@0@@Z(ptr) complex_double_real -@ stub -arch=win32 ??$sin@M@std@@YA?AV?$complex@M@0@ABV10@@Z -@ stub -arch=win64 ??$sin@M@std@@YA?AV?$complex@M@0@AEBV10@@Z -@ stub -arch=win32 ??$sin@N@std@@YA?AV?$complex@N@0@ABV10@@Z -@ stub -arch=win64 ??$sin@N@std@@YA?AV?$complex@N@0@AEBV10@@Z -@ stub -arch=win32 ??$sin@O@std@@YA?AV?$complex@O@0@ABV10@@Z -@ stub -arch=win64 ??$sin@O@std@@YA?AV?$complex@O@0@AEBV10@@Z +@ cdecl -arch=win32 ??$sin@M@std@@YA?AV?$complex@M@0@ABV10@@Z(ptr ptr) complex_float_sin +@ cdecl -arch=win64 ??$sin@M@std@@YA?AV?$complex@M@0@AEBV10@@Z(ptr ptr) complex_float_sin +@ cdecl -arch=win32 ??$sin@N@std@@YA?AV?$complex@N@0@ABV10@@Z(ptr ptr) complex_double_sin +@ cdecl -arch=win64 ??$sin@N@std@@YA?AV?$complex@N@0@AEBV10@@Z(ptr ptr) complex_double_sin +@ cdecl -arch=win32 ??$sin@O@std@@YA?AV?$complex@O@0@ABV10@@Z(ptr ptr) complex_double_sin +@ cdecl -arch=win64 ??$sin@O@std@@YA?AV?$complex@O@0@AEBV10@@Z(ptr ptr) complex_double_sin @ stub -arch=win32 ??$sinh@M@std@@YA?AV?$complex@M@0@ABV10@@Z @ stub -arch=win64 ??$sinh@M@std@@YA?AV?$complex@M@0@AEBV10@@Z @ stub -arch=win32 ??$sinh@N@std@@YA?AV?$complex@N@0@ABV10@@Z @@ -482,12 +482,12 @@ @ stub -arch=win64 ??$sqrt@N@std@@YA?AV?$complex@N@0@AEBV10@@Z @ stub -arch=win32 ??$sqrt@O@std@@YA?AV?$complex@O@0@ABV10@@Z @ stub -arch=win64 ??$sqrt@O@std@@YA?AV?$complex@O@0@AEBV10@@Z -@ stub -arch=win32 ??$tan@M@std@@YA?AV?$complex@M@0@ABV10@@Z -@ stub -arch=win64 ??$tan@M@std@@YA?AV?$complex@M@0@AEBV10@@Z -@ stub -arch=win32 ??$tan@N@std@@YA?AV?$complex@N@0@ABV10@@Z -@ stub -arch=win64 ??$tan@N@std@@YA?AV?$complex@N@0@AEBV10@@Z -@ stub -arch=win32 ??$tan@O@std@@YA?AV?$complex@O@0@ABV10@@Z -@ stub -arch=win64 ??$tan@O@std@@YA?AV?$complex@O@0@AEBV10@@Z +@ cdecl -arch=win32 ??$tan@M@std@@YA?AV?$complex@M@0@ABV10@@Z(ptr ptr) complex_float_tan +@ cdecl -arch=win64 ??$tan@M@std@@YA?AV?$complex@M@0@AEBV10@@Z(ptr ptr) complex_float_tan +@ cdecl -arch=win32 ??$tan@N@std@@YA?AV?$complex@N@0@ABV10@@Z(ptr ptr) complex_double_tan +@ cdecl -arch=win64 ??$tan@N@std@@YA?AV?$complex@N@0@AEBV10@@Z(ptr ptr) complex_double_tan +@ cdecl -arch=win32 ??$tan@O@std@@YA?AV?$complex@O@0@ABV10@@Z(ptr ptr) complex_double_tan +@ cdecl -arch=win64 ??$tan@O@std@@YA?AV?$complex@O@0@AEBV10@@Z(ptr ptr) complex_double_tan @ stub -arch=win32 ??$tanh@M@std@@YA?AV?$complex@M@0@ABV10@@Z @ stub -arch=win64 ??$tanh@M@std@@YA?AV?$complex@M@0@AEBV10@@Z @ stub -arch=win32 ??$tanh@N@std@@YA?AV?$complex@N@0@ABV10@@Z