Piotr Caban : msvcp90: Added std::conj(complex) implementation.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 94da034364630ffd7814269d9df27088379aac27
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=94da034364630ffd7814269d9d...

Author: Piotr Caban <piotr(a)codeweavers.com>
Date:   Thu Jan 24 12:28:19 2013 +0100

msvcp90: Added std::conj(complex) implementation.

---

 dlls/msvcp90/math.c       |   20 ++++++++++++++++++++
 dlls/msvcp90/msvcp90.spec |   12 ++++++------
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/dlls/msvcp90/math.c b/dlls/msvcp90/math.c
index 37dc3f7..9f75cd4 100644
--- a/dlls/msvcp90/math.c
+++ b/dlls/msvcp90/math.c
@@ -1303,6 +1303,15 @@ float __cdecl complex_float_abs(const complex_float *c)
     return hypotf(c->real, c->imag);
 }
 
+/* ??$conj(a)M@std@@YA?AV?$complex(a)M@0(a)ABV10@@Z */
+/* ??$conj(a)M@std@@YA?AV?$complex(a)M@0(a)AEBV10@@Z */
+complex_float* __cdecl complex_float_conj(complex_float *ret, const complex_float *c)
+{
+    ret->real = c->real;
+    ret->imag = -c->imag;
+    return ret;
+}
+
 /* ??0?$_Complex_base(a)NU_C_double_complex@@@std@@QAE(a)ABN0@Z */
 /* ??0?$_Complex_base(a)NU_C_double_complex@@@std@@QEAA(a)AEBN0@Z */
 /* ??0?$_Complex_base(a)OU_C_ldouble_complex@@@std@@QAE(a)ABO0@Z */
@@ -1800,3 +1809,14 @@ double __cdecl complex_double_abs(const complex_double *c)
 {
     return hypot(c->real, c->imag);
 }
+
+/* ??$conj(a)N@std@@YA?AV?$complex(a)N@0(a)ABV10@@Z */
+/* ??$conj(a)N@std@@YA?AV?$complex(a)N@0(a)AEBV10@@Z */
+/* ??$conj(a)O@std@@YA?AV?$complex(a)O@0(a)ABV10@@Z */
+/* ??$conj(a)O@std@@YA?AV?$complex(a)O@0(a)AEBV10@@Z */
+complex_double* __cdecl complex_double_conj(complex_double *ret, const complex_double *c)
+{
+    ret->real = c->real;
+    ret->imag = -c->imag;
+    return ret;
+}
diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec
index ef4726d..5e53c6d 100644
--- a/dlls/msvcp90/msvcp90.spec
+++ b/dlls/msvcp90/msvcp90.spec
@@ -362,12 +362,12 @@
 @ cdecl -arch=win64 ??$arg(a)N@std@@YANAEBV?$complex(a)N@0@@Z(ptr) complex_double_arg
 @ cdecl -arch=win32 ??$arg(a)O@std@@YAOABV?$complex(a)O@0@@Z(ptr) complex_double_arg
 @ cdecl -arch=win64 ??$arg(a)O@std@@YAOAEBV?$complex(a)O@0@@Z(ptr) complex_double_arg
-@ stub -arch=win32 ??$conj(a)M@std@@YA?AV?$complex(a)M@0(a)ABV10@@Z
-@ stub -arch=win64 ??$conj(a)M@std@@YA?AV?$complex(a)M@0(a)AEBV10@@Z
-@ stub -arch=win32 ??$conj(a)N@std@@YA?AV?$complex(a)N@0(a)ABV10@@Z
-@ stub -arch=win64 ??$conj(a)N@std@@YA?AV?$complex(a)N@0(a)AEBV10@@Z
-@ stub -arch=win32 ??$conj(a)O@std@@YA?AV?$complex(a)O@0(a)ABV10@@Z
-@ stub -arch=win64 ??$conj(a)O@std@@YA?AV?$complex(a)O@0(a)AEBV10@@Z
+@ cdecl -arch=win32 ??$conj(a)M@std@@YA?AV?$complex(a)M@0(a)ABV10@@Z(ptr ptr) complex_float_conj
+@ cdecl -arch=win64 ??$conj(a)M@std@@YA?AV?$complex(a)M@0(a)AEBV10@@Z(ptr ptr) complex_float_conj
+@ cdecl -arch=win32 ??$conj(a)N@std@@YA?AV?$complex(a)N@0(a)ABV10@@Z(ptr ptr) complex_double_conj
+@ cdecl -arch=win64 ??$conj(a)N@std@@YA?AV?$complex(a)N@0(a)AEBV10@@Z(ptr ptr) complex_double_conj
+@ cdecl -arch=win32 ??$conj(a)O@std@@YA?AV?$complex(a)O@0(a)ABV10@@Z(ptr ptr) complex_double_conj
+@ cdecl -arch=win64 ??$conj(a)O@std@@YA?AV?$complex(a)O@0(a)AEBV10@@Z(ptr ptr) complex_double_conj
 @ stub -arch=win32 ??$cos(a)M@std@@YA?AV?$complex(a)M@0(a)ABV10@@Z
 @ stub -arch=win64 ??$cos(a)M@std@@YA?AV?$complex(a)M@0(a)AEBV10@@Z
 @ stub -arch=win32 ??$cos(a)N@std@@YA?AV?$complex(a)N@0(a)ABV10@@Z