Piotr Caban : msvcp90: Added allocator<void> implementation.

Alexandre Julliard julliard at winehq.org
Thu Aug 19 11:44:09 CDT 2010


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

Author: Piotr Caban <piotr at codeweavers.com>
Date:   Thu Aug 19 12:15:51 2010 +0200

msvcp90: Added allocator<void> implementation.

---

 dlls/msvcp90/memory.c     |   25 +++++++++++++++++++++++++
 dlls/msvcp90/msvcp90.spec |   12 ++++++------
 2 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/dlls/msvcp90/memory.c b/dlls/msvcp90/memory.c
index 998130b..acbdda7 100644
--- a/dlls/msvcp90/memory.c
+++ b/dlls/msvcp90/memory.c
@@ -312,3 +312,28 @@ size_t __stdcall MSVCP_allocator_short_max_size(void *this)
 {
     return UINT_MAX/sizeof(unsigned short);
 }
+
+/* allocator<void> */
+/* ??0?$allocator at X@std@@QAE at XZ */
+/* ??0?$allocator at X@std@@QEAA at XZ */
+DEFINE_THISCALL_WRAPPER(MSVCP_allocator_void_ctor, 4);
+void* __stdcall MSVCP_allocator_void_ctor(void *this)
+{
+    return this;
+}
+
+/* ??0?$allocator at X@std@@QAE at ABV01@@Z */
+/* ??0?$allocator at X@std@@QEAA at AEBV01@@Z */
+DEFINE_THISCALL_WRAPPER(MSVCP_allocator_void_copy_ctor, 8);
+void* __stdcall MSVCP_allocator_void_copy_ctor(void *this, void *copy)
+{
+    return this;
+}
+
+/* ??4?$allocator at X@std@@QAEAAV01 at ABV01@@Z */
+/* ??4?$allocator at X@std@@QEAAAEAV01 at AEBV01@@Z */
+DEFINE_THISCALL_WRAPPER(MSVCP_allocator_void_assign, 8);
+void* __stdcall MSVCP_allocator_void_assign(void *this, void *assign)
+{
+    return this;
+}
diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec
index 8e96c5d..0542b63 100644
--- a/dlls/msvcp90/msvcp90.spec
+++ b/dlls/msvcp90/msvcp90.spec
@@ -538,10 +538,10 @@
 @ cdecl -arch=win64 ??0?$allocator at G@std@@QEAA at AEBV01@@Z(ptr ptr) MSVCP_allocator_short_copy_ctor
 @ cdecl -arch=win32 -i386 -norelay ??0?$allocator at G@std@@QAE at XZ() __thiscall_MSVCP_allocator_short_ctor
 @ cdecl -arch=win64 ??0?$allocator at G@std@@QEAA at XZ(ptr) MSVCP_allocator_short_ctor
-@ stub -arch=win32 ??0?$allocator at X@std@@QAE at ABV01@@Z
-@ stub -arch=win64 ??0?$allocator at X@std@@QEAA at AEBV01@@Z
-@ stub -arch=win32 ??0?$allocator at X@std@@QAE at XZ
-@ stub -arch=win64 ??0?$allocator at X@std@@QEAA at XZ
+@ cdecl -arch=win32 -i386 -norelay ??0?$allocator at X@std@@QAE at ABV01@@Z(ptr) __thiscall_MSVCP_allocator_void_copy_ctor
+@ cdecl -arch=win64 ??0?$allocator at X@std@@QEAA at AEBV01@@Z(ptr ptr) MSVCP_allocator_void_copy_ctor
+@ cdecl -arch=win32 -i386 -norelay ??0?$allocator at X@std@@QAE at XZ() __thiscall_MSVCP_allocator_void_ctor
+@ cdecl -arch=win64 ??0?$allocator at X@std@@QEAA at XZ(ptr) MSVCP_allocator_void_ctor
 @ cdecl -arch=win32 -i386 -norelay ??0?$allocator at _W@std@@QAE at ABV01@@Z(ptr) __thiscall_MSVCP_allocator_wchar_copy_ctor
 @ cdecl -arch=win64 ??0?$allocator at _W@std@@QEAA at AEBV01@@Z(ptr ptr) MSVCP_allocator_wchar_copy_ctor
 @ cdecl -arch=win32 -i386 -norelay ??0?$allocator at _W@std@@QAE at XZ() __thiscall_MSVCP_allocator_wchar_ctor
@@ -1376,8 +1376,8 @@
 @ cdecl -arch=win64 ??4?$allocator at D@std@@QEAAAEAV01 at AEBV01@@Z(ptr ptr) MSVCP_allocator_char_assign
 @ cdecl -arch=win32 -i386 -norelay ??4?$allocator at G@std@@QAEAAV01 at ABV01@@Z(ptr) __thiscall_MSVCP_allocator_short_assign
 @ cdecl -arch=win64 ??4?$allocator at G@std@@QEAAAEAV01 at AEBV01@@Z(ptr ptr) MSVCP_allocator_short_assign
-@ stub -arch=win32 ??4?$allocator at X@std@@QAEAAV01 at ABV01@@Z
-@ stub -arch=win64 ??4?$allocator at X@std@@QEAAAEAV01 at AEBV01@@Z
+@ cdecl -arch=win32 -i386 -norelay ??4?$allocator at X@std@@QAEAAV01 at ABV01@@Z(ptr) __thiscall_MSVCP_allocator_void_assign
+@ cdecl -arch=win64 ??4?$allocator at X@std@@QEAAAEAV01 at AEBV01@@Z(ptr ptr) MSVCP_allocator_void_assign
 @ cdecl -arch=win32 -i386 -norelay ??4?$allocator at _W@std@@QAEAAV01 at ABV01@@Z(ptr) __thiscall_MSVCP_allocator_wchar_assign
 @ cdecl -arch=win64 ??4?$allocator at _W@std@@QEAAAEAV01 at AEBV01@@Z(ptr ptr) MSVCP_allocator_wchar_assign
 @ stub -arch=win32 ??4?$basic_string at DU?$char_traits at D@std@@V?$allocator at D@2@@std@@QAEAAV01 at ABV01@@Z




More information about the wine-cvs mailing list