Piotr Caban : msvcp90: Added basic_string<char> constructor implementation (from cstr).

Alexandre Julliard julliard at winehq.org
Fri Aug 20 10:19:13 CDT 2010


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

Author: Piotr Caban <piotr at codeweavers.com>
Date:   Thu Aug 19 23:48:36 2010 +0200

msvcp90: Added basic_string<char> constructor implementation (from cstr).

---

 dlls/msvcp90/msvcp90.spec |    4 ++--
 dlls/msvcp90/string.c     |   13 +++++++++++++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec
index dd565b0..baf6003 100644
--- a/dlls/msvcp90/msvcp90.spec
+++ b/dlls/msvcp90/msvcp90.spec
@@ -743,10 +743,10 @@
 @ stub -arch=win32 ??0?$basic_string at DU?$char_traits at D@std@@V?$allocator at D@2@@std@@QAE at ID@Z
 @ stub -arch=win64 ??0?$basic_string at DU?$char_traits at D@std@@V?$allocator at D@2@@std@@QEAA at PEBD0@Z
 @ stub -arch=win32 ??0?$basic_string at DU?$char_traits at D@std@@V?$allocator at D@2@@std@@QAE at IDABV?$allocator at D@1@@Z
-@ stub -arch=win64 ??0?$basic_string at DU?$char_traits at D@std@@V?$allocator at D@2@@std@@QEAA at PEBD@Z
+@ cdecl -arch=win64 ??0?$basic_string at DU?$char_traits at D@std@@V?$allocator at D@2@@std@@QEAA at PEBD@Z(ptr str) MSVCP_basic_string_char_ctor_cstr
 @ stub -arch=win32 ??0?$basic_string at DU?$char_traits at D@std@@V?$allocator at D@2@@std@@QAE at PBD0@Z
 @ stub -arch=win64 ??0?$basic_string at DU?$char_traits at D@std@@V?$allocator at D@2@@std@@QEAA at PEBDAEBV?$allocator at D@1@@Z
-@ stub -arch=win32 ??0?$basic_string at DU?$char_traits at D@std@@V?$allocator at D@2@@std@@QAE at PBD@Z
+@ cdecl -arch=win32 -i386 -norelay ??0?$basic_string at DU?$char_traits at D@std@@V?$allocator at D@2@@std@@QAE at PBD@Z(str) __thiscall_MSVCP_basic_string_char_ctor_cstr
 @ stub -arch=win64 ??0?$basic_string at DU?$char_traits at D@std@@V?$allocator at D@2@@std@@QEAA at PEBD_K@Z
 @ stub -arch=win32 ??0?$basic_string at DU?$char_traits at D@std@@V?$allocator at D@2@@std@@QAE at PBDABV?$allocator at D@1@@Z
 @ stub -arch=win64 ??0?$basic_string at DU?$char_traits at D@std@@V?$allocator at D@2@@std@@QEAA at PEBD_KAEBV?$allocator at D@1@@Z
diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c
index 580ec5d..359ef39 100644
--- a/dlls/msvcp90/string.c
+++ b/dlls/msvcp90/string.c
@@ -679,6 +679,19 @@ basic_string_char* __stdcall MSVCP_basic_string_char_copy_ctor(
     return this;
 }
 
+/* ??0?$basic_string at DU?$char_traits at D@std@@V?$allocator at D@2@@std@@QAE at PBD@Z */
+/* ??0?$basic_string at DU?$char_traits at D@std@@V?$allocator at D@2@@std@@QEAA at PEBD@Z */
+DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_ctor_cstr, 8)
+basic_string_char* __stdcall MSVCP_basic_string_char_ctor_cstr(
+        basic_string_char *this, const char *str)
+{
+    TRACE("%p %s\n", this, debugstr_a(str));
+
+    basic_string_char_tidy(this, FALSE, 0);
+    MSVCP_basic_string_char_assign_cstr(this, str);
+    return this;
+}
+
 /* ??1?$basic_string at DU?$char_traits at D@std@@V?$allocator at D@2@@std@@QAE at XZ */
 /* ??1?$basic_string at DU?$char_traits at D@std@@V?$allocator at D@2@@std@@QEAA at XZ */
 DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_dtor, 4)




More information about the wine-cvs mailing list