From 94da034364630ffd7814269d9df27088379aac27 Mon Sep 17 00:00:00 2001
From: Piotr Caban <piotr@codeweavers.com>
Date: Thu, 24 Jan 2013 12:28:19 +0100
Subject: [PATCH] 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 37dc3f71a66..9f75cd4f9b1 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@M@std@@YA?AV?$complex@M@0@ABV10@@Z */
+/* ??$conj@M@std@@YA?AV?$complex@M@0@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@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 */
@@ -1800,3 +1809,14 @@ double __cdecl complex_double_abs(const complex_double *c)
 {
     return hypot(c->real, c->imag);
 }
+
+/* ??$conj@N@std@@YA?AV?$complex@N@0@ABV10@@Z */
+/* ??$conj@N@std@@YA?AV?$complex@N@0@AEBV10@@Z */
+/* ??$conj@O@std@@YA?AV?$complex@O@0@ABV10@@Z */
+/* ??$conj@O@std@@YA?AV?$complex@O@0@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 ef4726d99d7..5e53c6d1220 100644
--- a/dlls/msvcp90/msvcp90.spec
+++ b/dlls/msvcp90/msvcp90.spec
@@ -362,12 +362,12 @@
 @ cdecl -arch=win64 ??$arg@N@std@@YANAEBV?$complex@N@0@@Z(ptr) complex_double_arg
 @ cdecl -arch=win32 ??$arg@O@std@@YAOABV?$complex@O@0@@Z(ptr) complex_double_arg
 @ cdecl -arch=win64 ??$arg@O@std@@YAOAEBV?$complex@O@0@@Z(ptr) complex_double_arg
-@ stub -arch=win32 ??$conj@M@std@@YA?AV?$complex@M@0@ABV10@@Z
-@ stub -arch=win64 ??$conj@M@std@@YA?AV?$complex@M@0@AEBV10@@Z
-@ stub -arch=win32 ??$conj@N@std@@YA?AV?$complex@N@0@ABV10@@Z
-@ stub -arch=win64 ??$conj@N@std@@YA?AV?$complex@N@0@AEBV10@@Z
-@ stub -arch=win32 ??$conj@O@std@@YA?AV?$complex@O@0@ABV10@@Z
-@ stub -arch=win64 ??$conj@O@std@@YA?AV?$complex@O@0@AEBV10@@Z
+@ cdecl -arch=win32 ??$conj@M@std@@YA?AV?$complex@M@0@ABV10@@Z(ptr ptr) complex_float_conj
+@ cdecl -arch=win64 ??$conj@M@std@@YA?AV?$complex@M@0@AEBV10@@Z(ptr ptr) complex_float_conj
+@ cdecl -arch=win32 ??$conj@N@std@@YA?AV?$complex@N@0@ABV10@@Z(ptr ptr) complex_double_conj
+@ 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