Alexandre Julliard : msvcp90: Add separate entry points for functions with different calling conventions .

[Alexandre Julliard]

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

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Wed Aug 24 19:33:30 2011 +0200

msvcp90: Add separate entry points for functions with different calling conventions.

---

 dlls/msvcp90/locale.c     |   19 +++++++++++++++----
 dlls/msvcp90/msvcp90.spec |    8 ++++----
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c
index 768cc51..c838744 100644
--- a/dlls/msvcp90/locale.c
+++ b/dlls/msvcp90/locale.c
@@ -250,8 +250,6 @@ locale__Locimp* __thiscall locale__Locimp_ctor_transparent(locale__Locimp *this,
 
 /* ??0_Locimp(a)locale@std@@AAE(a)ABV012@@Z */
 /* ??0_Locimp(a)locale@std@@AEAA(a)AEBV012@@Z */
-/* ?_Locimp_ctor(a)_Locimp@locale(a)std@@CAXPAV123(a)ABV123@@Z */
-/* ?_Locimp_ctor(a)_Locimp@locale(a)std@@CAXPEAV123(a)AEBV123@@Z */
 DEFINE_THISCALL_WRAPPER(locale__Locimp_copy_ctor, 8)
 locale__Locimp* __thiscall locale__Locimp_copy_ctor(locale__Locimp *this, const locale__Locimp *copy)
 {
@@ -259,16 +257,29 @@ locale__Locimp* __thiscall locale__Locimp_copy_ctor(locale__Locimp *this, const
     return NULL;
 }
 
+/* ?_Locimp_ctor(a)_Locimp@locale(a)std@@CAXPAV123(a)ABV123@@Z */
+/* ?_Locimp_ctor(a)_Locimp@locale(a)std@@CAXPEAV123(a)AEBV123@@Z */
+locale__Locimp* __cdecl locale__Locimp__Locimp_ctor(locale__Locimp *this, const locale__Locimp *copy)
+{
+    FIXME("(%p %p) stub\n", this, copy);
+    return NULL;
+}
+
 /* ??1_Locimp(a)locale@std@@MAE(a)XZ */
 /* ??1_Locimp(a)locale@std@@MEAA(a)XZ */
-/* ?_Locimp_dtor(a)_Locimp@locale(a)std@@CAXPAV123@@Z */
-/* ?_Locimp_dtor(a)_Locimp@locale(a)std@@CAXPEAV123@@Z */
 DEFINE_THISCALL_WRAPPER(locale__Locimp_dtor, 4)
 void __thiscall locale__Locimp_dtor(locale__Locimp *this)
 {
     FIXME("(%p) stub\n", this);
 }
 
+/* ?_Locimp_dtor(a)_Locimp@locale(a)std@@CAXPAV123@@Z */
+/* ?_Locimp_dtor(a)_Locimp@locale(a)std@@CAXPEAV123@@Z */
+void __cdecl locale__Locimp__Locimp_dtor(locale__Locimp *this)
+{
+    FIXME("(%p) stub\n", this);
+}
+
 DEFINE_THISCALL_WRAPPER(MSVCP_locale__Locimp_vector_dtor, 8)
 locale__Locimp* __thiscall MSVCP_locale__Locimp_vector_dtor(locale__Locimp *this, unsigned int flags)
 {
diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec
index 2f9079c..f3062cd 100644
--- a/dlls/msvcp90/msvcp90.spec
+++ b/dlls/msvcp90/msvcp90.spec
@@ -2577,10 +2577,10 @@
 @ stub ?_Isnan@?$_Ctraits(a)O@std@@SA_NO(a)Z
 @ cdecl -arch=win32 ?_Locimp_Addfac(a)_Locimp@locale(a)std@@CAXPAV123(a)PAVfacet@23(a)I@Z(ptr ptr long) locale__Locimp__Locimp_Addfac
 @ cdecl -arch=win64 ?_Locimp_Addfac(a)_Locimp@locale(a)std@@CAXPEAV123(a)PEAVfacet@23(a)_K@Z(ptr ptr long) locale__Locimp__Locimp_Addfac
-@ cdecl -arch=win32 ?_Locimp_ctor(a)_Locimp@locale(a)std@@CAXPAV123(a)ABV123@@Z(ptr ptr) locale__Locimp_copy_ctor
-@ cdecl -arch=win64 ?_Locimp_ctor(a)_Locimp@locale(a)std@@CAXPEAV123(a)AEBV123@@Z(ptr ptr) locale__Locimp_copy_ctor
-@ cdecl -arch=win32 ?_Locimp_dtor(a)_Locimp@locale(a)std@@CAXPAV123@@Z(ptr) locale__Locimp_dtor
-@ cdecl -arch=win64 ?_Locimp_dtor(a)_Locimp@locale(a)std@@CAXPEAV123@@Z(ptr) locale__Locimp_dtor
+@ cdecl -arch=win32 ?_Locimp_ctor(a)_Locimp@locale(a)std@@CAXPAV123(a)ABV123@@Z(ptr ptr) locale__Locimp__Locimp_ctor
+@ cdecl -arch=win64 ?_Locimp_ctor(a)_Locimp@locale(a)std@@CAXPEAV123(a)AEBV123@@Z(ptr ptr) locale__Locimp__Locimp_ctor
+@ cdecl -arch=win32 ?_Locimp_dtor(a)_Locimp@locale(a)std@@CAXPAV123@@Z(ptr) locale__Locimp__Locimp_dtor
+@ cdecl -arch=win64 ?_Locimp_dtor(a)_Locimp@locale(a)std@@CAXPEAV123@@Z(ptr) locale__Locimp__Locimp_dtor
 @ cdecl -arch=win32 ?_Locinfo_Addcats(a)_Locinfo@std@@SAAAV12(a)PAV12@HPBD(a)Z(ptr long str) _Locinfo__Locinfo_Addcats
 @ cdecl -arch=win64 ?_Locinfo_Addcats(a)_Locinfo@std@@SAAEAV12(a)PEAV12@HPEBD(a)Z(ptr long str) _Locinfo__Locinfo_Addcats
 @ cdecl -arch=win32 ?_Locinfo_ctor(a)_Locinfo@std@@SAXPAV12(a)ABV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2@@Z(ptr ptr) _Locinfo__Locinfo_ctor_bstr