Piotr Caban : msvcp90: Added allocator<char> 64-bit exports.
Alexandre Julliard
julliard at winehq.org
Wed Aug 18 12:09:56 CDT 2010
Module: wine
Branch: master
Commit: 2a866928c9834dbc94b506225b58276a4198d937
URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a866928c9834dbc94b506225b58276a4198d937
Author: Piotr Caban <piotr at codeweavers.com>
Date: Wed Aug 18 10:36:10 2010 +0200
msvcp90: Added allocator<char> 64-bit exports.
---
dlls/msvcp90/memory.c | 19 +++++++++++++++----
dlls/msvcp90/msvcp90.spec | 22 +++++++++++-----------
2 files changed, 26 insertions(+), 15 deletions(-)
diff --git a/dlls/msvcp90/memory.c b/dlls/msvcp90/memory.c
index 14e6ea0..6c0c50a 100644
--- a/dlls/msvcp90/memory.c
+++ b/dlls/msvcp90/memory.c
@@ -29,6 +29,7 @@
WINE_DEFAULT_DEBUG_CHANNEL(msvcp90);
/* ?address@?$allocator at D@std@@QBEPADAAD at Z */
+/* ?address@?$allocator at D@std@@QEBAPEADAEAD at Z */
DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_address, 8)
char* __stdcall MSVCP_allocator_char_address(void *this, char *ptr)
{
@@ -36,6 +37,7 @@ char* __stdcall MSVCP_allocator_char_address(void *this, char *ptr)
}
/* ?address@?$allocator at D@std@@QBEPBDABD at Z */
+/* ?address@?$allocator at D@std@@QEBAPEBDAEBD at Z */
DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_const_address, 8)
const char* __stdcall MSVCP_allocator_char_const_address(void *this, const char *ptr)
{
@@ -43,6 +45,7 @@ const char* __stdcall MSVCP_allocator_char_const_address(void *this, const char
}
/* ??0?$allocator at D@std@@QAE at XZ */
+/* ??0?$allocator at D@std@@QEAA at XZ */
DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_ctor, 4)
void* __stdcall MSVCP_allocator_char_ctor(void *this)
{
@@ -50,6 +53,7 @@ void* __stdcall MSVCP_allocator_char_ctor(void *this)
}
/* ??0?$allocator at D@std@@QAE at ABV01@@Z */
+/* ??0?$allocator at D@std@@QEAA at AEBV01@@Z */
DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_copy_ctor, 8)
void* __stdcall MSVCP_allocator_char_copy_ctor(void *this, void *copy)
{
@@ -57,6 +61,7 @@ void* __stdcall MSVCP_allocator_char_copy_ctor(void *this, void *copy)
}
/* ??4?$allocator at D@std@@QAEAAV01 at ABV01@@Z */
+/* ??4?$allocator at D@std@@QEAAAEAV01 at AEBV01@@Z */
DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_assign, 8);
void* __stdcall MSVCP_allocator_char_assign(void *this, void *assign)
{
@@ -64,29 +69,33 @@ void* __stdcall MSVCP_allocator_char_assign(void *this, void *assign)
}
/* ?deallocate@?$allocator at D@std@@QAEXPADI at Z */
+/* ?deallocate@?$allocator at D@std@@QEAAXPEAD_K at Z */
DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_deallocate, 12);
-void __stdcall MSVCP_allocator_char_deallocate(void *this, char *ptr, unsigned int size)
+void __stdcall MSVCP_allocator_char_deallocate(void *this, char *ptr, size_t size)
{
MSVCRT_operator_delete(ptr);
}
/* ?allocate@?$allocator at D@std@@QAEPADI at Z */
+/* ?allocate@?$allocator at D@std@@QEAAPEAD_K at Z */
DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_allocate, 8);
-char* __stdcall MSVCP_allocator_char_allocate(void *this, unsigned int count)
+char* __stdcall MSVCP_allocator_char_allocate(void *this, size_t count)
{
return MSVCRT_operator_new(sizeof(char[count]));
}
/* ?allocate@?$allocator at D@std@@QAEPADIPBX at Z */
+/* ?allocate@?$allocator at D@std@@QEAAPEAD_KPEBX at Z */
DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_allocate_hint, 12);
char* __stdcall MSVCP_allocator_char_allocate_hint(void *this,
- unsigned int count, const void *hint)
+ size_t count, const void *hint)
{
/* Native ignores hint */
return MSVCP_allocator_char_allocate(this, count);
}
/* ?construct@?$allocator at D@std@@QAEXPADABD at Z */
+/* ?construct@?$allocator at D@std@@QEAAXPEADAEBD at Z */
DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_construct, 12);
void __stdcall MSVCP_allocator_char_construct(void *this, char *ptr, const char *val)
{
@@ -94,14 +103,16 @@ void __stdcall MSVCP_allocator_char_construct(void *this, char *ptr, const char
}
/* ?destroy@?$allocator at D@std@@QAEXPAD at Z */
+/* ?destroy@?$allocator at D@std@@QEAAXPEAD at Z */
DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_destroy, 8);
void __stdcall MSVCP_allocator_char_destroy(void *this, char *ptr)
{
}
/* ?max_size@?$allocator at D@std@@QBEIXZ */
+/* ?max_size@?$allocator at D@std@@QEBA_KXZ */
DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_max_size, 4);
-unsigned int __stdcall MSVCP_allocator_char_max_size(void *this)
+size_t __stdcall MSVCP_allocator_char_max_size(void *this)
{
return UINT_MAX/sizeof(char);
}
diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec
index 34d19f1..34c9061 100644
--- a/dlls/msvcp90/msvcp90.spec
+++ b/dlls/msvcp90/msvcp90.spec
@@ -531,9 +531,9 @@
@ stub -arch=win32 ??0?$_String_val at _WV?$allocator at _W@std@@@std@@QAE at ABV01@@Z
@ stub -arch=win64 ??0?$_String_val at _WV?$allocator at _W@std@@@std@@QEAA at AEBV01@@Z
@ cdecl -arch=win32 -i386 -norelay ??0?$allocator at D@std@@QAE at ABV01@@Z(ptr) __thiscall_MSVCP_allocator_char_copy_ctor
-@ stub -arch=win64 ??0?$allocator at D@std@@QEAA at AEBV01@@Z
+@ cdecl -arch=win64 ??0?$allocator at D@std@@QEAA at AEBV01@@Z(ptr ptr) MSVCP_allocator_char_copy_ctor
@ cdecl -arch=win32 -i386 -norelay ??0?$allocator at D@std@@QAE at XZ() __thiscall_MSVCP_allocator_char_ctor
-@ stub -arch=win64 ??0?$allocator at D@std@@QEAA at XZ
+@ cdecl -arch=win64 ??0?$allocator at D@std@@QEAA at XZ(ptr) MSVCP_allocator_char_ctor
@ stub -arch=win32 ??0?$allocator at G@std@@QAE at ABV01@@Z
@ stub -arch=win64 ??0?$allocator at G@std@@QEAA at AEBV01@@Z
@ stub -arch=win32 ??0?$allocator at G@std@@QAE at XZ
@@ -1373,7 +1373,7 @@
@ stub -arch=win32 ??4?$_String_val at _WV?$allocator at _W@std@@@std@@QAEAAV01 at ABV01@@Z
@ stub -arch=win64 ??4?$_String_val at _WV?$allocator at _W@std@@@std@@QEAAAEAV01 at AEBV01@@Z
@ cdecl -arch=win32 -i386 -norelay ??4?$allocator at D@std@@QAEAAV01 at ABV01@@Z(ptr) __thiscall_MSVCP_allocator_char_assign
-@ stub -arch=win64 ??4?$allocator at D@std@@QEAAAEAV01 at AEBV01@@Z
+@ cdecl -arch=win64 ??4?$allocator at D@std@@QEAAAEAV01 at AEBV01@@Z(ptr ptr) MSVCP_allocator_char_assign
@ stub -arch=win32 ??4?$allocator at G@std@@QAEAAV01 at ABV01@@Z
@ stub -arch=win64 ??4?$allocator at G@std@@QEAAAEAV01 at AEBV01@@Z
@ stub -arch=win32 ??4?$allocator at X@std@@QAEAAV01 at ABV01@@Z
@@ -2891,9 +2891,9 @@
@ stub -arch=win64 ?_Xsgetn_s@?$basic_streambuf at _WU?$char_traits at _W@std@@@std@@MEAA_JPEA_W_K_J at Z
@ stub ?_Xweak at tr1@std@@YAXXZ
@ cdecl -arch=win32 -i386 -norelay ?address@?$allocator at D@std@@QBEPADAAD at Z(ptr) __thiscall_MSVCP_allocator_char_address
-@ stub -arch=win64 ?address@?$allocator at D@std@@QEBAPEADAEAD at Z
+@ cdecl -arch=win64 ?address@?$allocator at D@std@@QEBAPEADAEAD at Z(ptr ptr) MSVCP_allocator_char_address
@ cdecl -arch=win32 -i386 -norelay ?address@?$allocator at D@std@@QBEPBDABD at Z(ptr) __thiscall_MSVCP_allocator_char_const_address
-@ stub -arch=win64 ?address@?$allocator at D@std@@QEBAPEBDAEBD at Z
+@ cdecl -arch=win64 ?address@?$allocator at D@std@@QEBAPEBDAEBD at Z(ptr ptr) MSVCP_allocator_char_const_address
@ stub -arch=win32 ?address@?$allocator at G@std@@QBEPAGAAG at Z
@ stub -arch=win64 ?address@?$allocator at G@std@@QEBAPEAGAEAG at Z
@ stub -arch=win32 ?address@?$allocator at G@std@@QBEPBGABG at Z
@@ -2903,9 +2903,9 @@
@ stub -arch=win32 ?address@?$allocator at _W@std@@QBEPB_WAB_W at Z
@ stub -arch=win64 ?address@?$allocator at _W@std@@QEBAPEB_WAEB_W at Z
@ cdecl -arch=win32 -i386 -norelay ?allocate@?$allocator at D@std@@QAEPADI at Z(long) __thiscall_MSVCP_allocator_char_allocate
-@ stub -arch=win64 ?allocate@?$allocator at D@std@@QEAAPEAD_K at Z
+@ cdecl -arch=win64 ?allocate@?$allocator at D@std@@QEAAPEAD_K at Z(ptr long) MSVCP_allocator_char_allocate
@ cdecl -arch=win32 -i386 -norelay ?allocate@?$allocator at D@std@@QAEPADIPBX at Z(long ptr) __thiscall_MSVCP_allocator_char_allocate_hint
-@ stub -arch=win64 ?allocate@?$allocator at D@std@@QEAAPEAD_KPEBX at Z
+@ cdecl -arch=win64 ?allocate@?$allocator at D@std@@QEAAPEAD_KPEBX at Z(ptr long ptr) MSVCP_allocator_char_allocate_hint
@ stub -arch=win32 ?allocate@?$allocator at G@std@@QAEPAGI at Z
@ stub -arch=win64 ?allocate@?$allocator at G@std@@QEAAPEAG_K at Z
@ stub -arch=win32 ?allocate@?$allocator at G@std@@QAEPAGIPBX at Z
@@ -3163,7 +3163,7 @@
@ stub -arch=win32 ?compare@?$collate at _W@std@@QBEHPB_W000 at Z
@ stub -arch=win64 ?compare@?$collate at _W@std@@QEBAHPEB_W000 at Z
@ cdecl -arch=win32 -i386 -norelay ?construct@?$allocator at D@std@@QAEXPADABD at Z(ptr ptr) __thiscall_MSVCP_allocator_char_construct
-@ stub -arch=win64 ?construct@?$allocator at D@std@@QEAAXPEADAEBD at Z
+@ cdecl -arch=win64 ?construct@?$allocator at D@std@@QEAAXPEADAEBD at Z(ptr ptr ptr) MSVCP_allocator_char_construct
@ stub -arch=win32 ?construct@?$allocator at G@std@@QAEXPAGABG at Z
@ stub -arch=win64 ?construct@?$allocator at G@std@@QEAAXPEAGAEBG at Z
@ stub -arch=win32 ?construct@?$allocator at _W@std@@QAEXPA_WAB_W at Z
@@ -3211,7 +3211,7 @@
@ stub -arch=win32 ?date_order@?$time_get at _WV?$istreambuf_iterator at _WU?$char_traits at _W@std@@@std@@@std@@QBE?AW4dateorder at time_base@2 at XZ
@ stub -arch=win64 ?date_order@?$time_get at _WV?$istreambuf_iterator at _WU?$char_traits at _W@std@@@std@@@std@@QEBA?AW4dateorder at time_base@2 at XZ
@ cdecl -arch=win32 -i386 -norelay ?deallocate@?$allocator at D@std@@QAEXPADI at Z(ptr long) __thiscall_MSVCP_allocator_char_deallocate
-@ stub -arch=win64 ?deallocate@?$allocator at D@std@@QEAAXPEAD_K at Z
+@ cdecl -arch=win64 ?deallocate@?$allocator at D@std@@QEAAXPEAD_K at Z(ptr ptr long) MSVCP_allocator_char_deallocate
@ stub -arch=win32 ?deallocate@?$allocator at G@std@@QAEXPAGI at Z
@ stub -arch=win64 ?deallocate@?$allocator at G@std@@QEAAXPEAG_K at Z
@ stub -arch=win32 ?deallocate@?$allocator at _W@std@@QAEXPA_WI at Z
@@ -3245,7 +3245,7 @@
@ stub ?denorm_min@?$numeric_limits at _N@std@@SA_NXZ
@ stub ?denorm_min@?$numeric_limits at _W@std@@SA_WXZ
@ cdecl -arch=win32 -i386 -norelay ?destroy@?$allocator at D@std@@QAEXPAD at Z(ptr) __thiscall_MSVCP_allocator_char_destroy
-@ stub -arch=win64 ?destroy@?$allocator at D@std@@QEAAXPEAD at Z
+@ cdecl -arch=win64 ?destroy@?$allocator at D@std@@QEAAXPEAD at Z(ptr ptr) MSVCP_allocator_char_destroy
@ stub -arch=win32 ?destroy@?$allocator at G@std@@QAEXPAG at Z
@ stub -arch=win64 ?destroy@?$allocator at G@std@@QEAAXPEAG at Z
@ stub -arch=win32 ?destroy@?$allocator at _W@std@@QAEXPA_W at Z
@@ -4510,7 +4510,7 @@
@ stub -arch=win32 ?max_length at codecvt_base@std@@QBEHXZ
@ stub -arch=win64 ?max_length at codecvt_base@std@@QEBAHXZ
@ cdecl -arch=win32 -i386 -norelay ?max_size@?$allocator at D@std@@QBEIXZ() __thiscall_MSVCP_allocator_char_max_size
-@ stub -arch=win64 ?max_size@?$allocator at D@std@@QEBA_KXZ
+@ cdecl -arch=win64 ?max_size@?$allocator at D@std@@QEBA_KXZ(ptr) MSVCP_allocator_char_max_size
@ stub -arch=win32 ?max_size@?$allocator at G@std@@QBEIXZ
@ stub -arch=win64 ?max_size@?$allocator at G@std@@QEBA_KXZ
@ stub -arch=win32 ?max_size@?$allocator at _W@std@@QBEIXZ
More information about the wine-cvs
mailing list