Piotr Caban : msvcp71: Added basic_string::append(iterator, iterator) implementation.

Alexandre Julliard julliard at winehq.org
Thu Jul 26 15:34:59 CDT 2012


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

Author: Piotr Caban <piotr at codeweavers.com>
Date:   Thu Jul 26 13:56:01 2012 +0200

msvcp71: Added basic_string::append(iterator, iterator) implementation.

---

 dlls/msvcp71/msvcp71.c    |   17 +++++++++++++++++
 dlls/msvcp71/msvcp71.spec |    6 +++---
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/dlls/msvcp71/msvcp71.c b/dlls/msvcp71/msvcp71.c
index 2a6846a..0759051 100644
--- a/dlls/msvcp71/msvcp71.c
+++ b/dlls/msvcp71/msvcp71.c
@@ -187,6 +187,14 @@ basic_string_char* __thiscall basic_string_char_replace_iter_iter(basic_string_c
             end.pos-beg.pos, rbeg.pos, rend.pos-rbeg.pos);
 }
 
+/* ?append@?$basic_string at DU?$char_traits at D@std@@V?$allocator at D@2@@std@@QAEAAV12 at Vconst_iterator@12 at 0@Z */
+DEFINE_THISCALL_WRAPPER(basic_string_char_append_iter, 12)
+basic_string_char* __thiscall basic_string_char_append_iter(basic_string_char *this,
+        basic_string_char_iterator beg, basic_string_char_iterator end)
+{
+    return pbasic_string_char_replace(this, this->size, 0, beg.pos, end.pos-beg.pos);
+}
+
 /* ?begin@?$basic_string at GU?$char_traits at G@std@@V?$allocator at G@2@@std@@QAE?AViterator at 12@XZ */
 /* ?begin@?$basic_string at GU?$char_traits at G@std@@V?$allocator at G@2@@std@@QBE?AVconst_iterator at 12@XZ */
 /* ?begin@?$basic_string at _WU?$char_traits at _W@std@@V?$allocator at _W@2@@std@@QAE?AViterator at 12@XZ */
@@ -287,6 +295,15 @@ basic_string_wchar* __thiscall basic_string_wchar_replace_iter_iter(basic_string
             end.pos-beg.pos, rbeg.pos, rend.pos-rbeg.pos);
 }
 
+/* ?append@?$basic_string at GU?$char_traits at G@std@@V?$allocator at G@2@@std@@QAEAAV12 at Vconst_iterator@12 at 0@Z */
+/* ?append@?$basic_string at _WU?$char_traits at _W@std@@V?$allocator at _W@2@@std@@QAEAAV12 at Vconst_iterator@12 at 0@Z */
+DEFINE_THISCALL_WRAPPER(basic_string_wchar_append_iter, 12)
+basic_string_wchar* __thiscall basic_string_wchar_append_iter(basic_string_wchar *this,
+        basic_string_wchar_iterator beg, basic_string_wchar_iterator end)
+{
+    return pbasic_string_wchar_replace(this, this->size, 0, beg.pos, end.pos-beg.pos);
+}
+
 static BOOL init_funcs(void)
 {
     HMODULE hmod = GetModuleHandleA("msvcp90.dll");
diff --git a/dlls/msvcp71/msvcp71.spec b/dlls/msvcp71/msvcp71.spec
index 325b69e..b7a9bc9 100644
--- a/dlls/msvcp71/msvcp71.spec
+++ b/dlls/msvcp71/msvcp71.spec
@@ -2481,7 +2481,7 @@
 @ cdecl -arch=win64 ?append@?$basic_string at DU?$char_traits at D@std@@V?$allocator at D@2@@std@@QEAAAEAV12 at PEBD_K@Z(ptr str long) msvcp90.?append@?$basic_string at DU?$char_traits at D@std@@V?$allocator at D@2@@std@@QEAAAEAV12 at PEBD_K@Z
 @ thiscall -arch=win32 ?append@?$basic_string at DU?$char_traits at D@std@@V?$allocator at D@2@@std@@QAEAAV12 at PBDI@Z(ptr str long) msvcp90.?append@?$basic_string at DU?$char_traits at D@std@@V?$allocator at D@2@@std@@QAEAAV12 at PBDI@Z
 @ cdecl -arch=win64 ?append@?$basic_string at DU?$char_traits at D@std@@V?$allocator at D@2@@std@@QEAAAEAV12 at _KD@Z(ptr long long) msvcp90.?append@?$basic_string at DU?$char_traits at D@std@@V?$allocator at D@2@@std@@QEAAAEAV12 at _KD@Z
-@ stub -arch=win32 ?append@?$basic_string at DU?$char_traits at D@std@@V?$allocator at D@2@@std@@QAEAAV12 at Vconst_iterator@12 at 0@Z
+@ thiscall -arch=win32 ?append@?$basic_string at DU?$char_traits at D@std@@V?$allocator at D@2@@std@@QAEAAV12 at Vconst_iterator@12 at 0@Z(ptr ptr ptr) basic_string_char_append_iter
 @ thiscall -arch=win32 ?append@?$basic_string at GU?$char_traits at G@std@@V?$allocator at G@2@@std@@QAEAAV12 at ABV12@@Z(ptr ptr) msvcp90.?append@?$basic_string at GU?$char_traits at G@std@@V?$allocator at G@2@@std@@QAEAAV12 at ABV12@@Z
 @ cdecl -arch=win64 ?append@?$basic_string at GU?$char_traits at G@std@@V?$allocator at G@2@@std@@QEAAAEAV12 at AEBV12@@Z(ptr ptr) msvcp90.?append@?$basic_string at GU?$char_traits at G@std@@V?$allocator at G@2@@std@@QEAAAEAV12 at AEBV12@@Z
 @ thiscall -arch=win32 ?append@?$basic_string at GU?$char_traits at G@std@@V?$allocator at G@2@@std@@QAEAAV12 at ABV12@II at Z(ptr ptr long long) msvcp90.?append@?$basic_string at GU?$char_traits at G@std@@V?$allocator at G@2@@std@@QAEAAV12 at ABV12@II at Z
@@ -2494,7 +2494,7 @@
 @ cdecl -arch=win64 ?append@?$basic_string at GU?$char_traits at G@std@@V?$allocator at G@2@@std@@QEAAAEAV12 at PEBG_K@Z(ptr wstr long) msvcp90.?append@?$basic_string at GU?$char_traits at G@std@@V?$allocator at G@2@@std@@QEAAAEAV12 at PEBG_K@Z
 @ thiscall -arch=win32 ?append@?$basic_string at GU?$char_traits at G@std@@V?$allocator at G@2@@std@@QAEAAV12 at PBGI@Z(ptr wstr long) msvcp90.?append@?$basic_string at GU?$char_traits at G@std@@V?$allocator at G@2@@std@@QAEAAV12 at PBGI@Z
 @ cdecl -arch=win64 ?append@?$basic_string at GU?$char_traits at G@std@@V?$allocator at G@2@@std@@QEAAAEAV12 at _KG@Z(ptr long long) msvcp90.?append@?$basic_string at GU?$char_traits at G@std@@V?$allocator at G@2@@std@@QEAAAEAV12 at _KG@Z
-@ stub -arch=win32 ?append@?$basic_string at GU?$char_traits at G@std@@V?$allocator at G@2@@std@@QAEAAV12 at Vconst_iterator@12 at 0@Z
+@ thiscall -arch=win32 ?append@?$basic_string at GU?$char_traits at G@std@@V?$allocator at G@2@@std@@QAEAAV12 at Vconst_iterator@12 at 0@Z(ptr ptr ptr) basic_string_wchar_append_iter
 @ thiscall -arch=win32 ?append@?$basic_string at _WU?$char_traits at _W@std@@V?$allocator at _W@2@@std@@QAEAAV12 at ABV12@@Z(ptr ptr) msvcp90.?append@?$basic_string at _WU?$char_traits at _W@std@@V?$allocator at _W@2@@std@@QAEAAV12 at ABV12@@Z
 @ cdecl -arch=win64 ?append@?$basic_string at _WU?$char_traits at _W@std@@V?$allocator at _W@2@@std@@QEAAAEAV12 at AEBV12@@Z(ptr ptr) msvcp90.?append@?$basic_string at _WU?$char_traits at _W@std@@V?$allocator at _W@2@@std@@QEAAAEAV12 at AEBV12@@Z
 @ thiscall -arch=win32 ?append@?$basic_string at _WU?$char_traits at _W@std@@V?$allocator at _W@2@@std@@QAEAAV12 at ABV12@II at Z(ptr ptr long long) msvcp90.?append@?$basic_string at _WU?$char_traits at _W@std@@V?$allocator at _W@2@@std@@QAEAAV12 at ABV12@II at Z
@@ -2507,7 +2507,7 @@
 @ cdecl -arch=win64 ?append@?$basic_string at _WU?$char_traits at _W@std@@V?$allocator at _W@2@@std@@QEAAAEAV12 at PEB_W_K@Z(ptr wstr long) msvcp90.?append@?$basic_string at _WU?$char_traits at _W@std@@V?$allocator at _W@2@@std@@QEAAAEAV12 at PEB_W_K@Z
 @ thiscall -arch=win32 ?append@?$basic_string at _WU?$char_traits at _W@std@@V?$allocator at _W@2@@std@@QAEAAV12 at PB_WI@Z(ptr wstr long) msvcp90.?append@?$basic_string at _WU?$char_traits at _W@std@@V?$allocator at _W@2@@std@@QAEAAV12 at PB_WI@Z
 @ cdecl -arch=win64 ?append@?$basic_string at _WU?$char_traits at _W@std@@V?$allocator at _W@2@@std@@QEAAAEAV12 at _K_W@Z(ptr long long) msvcp90.?append@?$basic_string at _WU?$char_traits at _W@std@@V?$allocator at _W@2@@std@@QEAAAEAV12 at _K_W@Z
-@ stub -arch=win32 ?append@?$basic_string at _WU?$char_traits at _W@std@@V?$allocator at _W@2@@std@@QAEAAV12 at Vconst_iterator@12 at 0@Z
+@ thiscall -arch=win32 ?append@?$basic_string at _WU?$char_traits at _W@std@@V?$allocator at _W@2@@std@@QAEAAV12 at Vconst_iterator@12 at 0@Z(ptr ptr ptr) basic_string_wchar_append_iter
 @ thiscall -arch=win32 ?assign@?$basic_string at DU?$char_traits at D@std@@V?$allocator at D@2@@std@@QAEAAV12 at ABV12@@Z(ptr ptr) msvcp90.?assign@?$basic_string at DU?$char_traits at D@std@@V?$allocator at D@2@@std@@QAEAAV12 at ABV12@@Z
 @ cdecl -arch=win64 ?assign@?$basic_string at DU?$char_traits at D@std@@V?$allocator at D@2@@std@@QEAAAEAV12 at AEBV12@@Z(ptr ptr) msvcp90.?assign@?$basic_string at DU?$char_traits at D@std@@V?$allocator at D@2@@std@@QEAAAEAV12 at AEBV12@@Z
 @ thiscall -arch=win32 ?assign@?$basic_string at DU?$char_traits at D@std@@V?$allocator at D@2@@std@@QAEAAV12 at ABV12@II at Z(ptr ptr long long) msvcp90.?assign@?$basic_string at DU?$char_traits at D@std@@V?$allocator at D@2@@std@@QAEAAV12 at ABV12@II at Z




More information about the wine-cvs mailing list