Piotr Caban : msvcp100: Fixed ctype class virtual functions table.

[Alexandre Julliard]

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

Author: Piotr Caban <piotr at codeweavers.com>
Date:   Thu Aug 16 10:36:17 2012 +0200

msvcp100: Fixed ctype class virtual functions table.

---

 dlls/msvcp100/locale.c |   20 +++++++-------------
 1 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/dlls/msvcp100/locale.c b/dlls/msvcp100/locale.c
index 58068c9..fedaea2 100644
--- a/dlls/msvcp100/locale.c
+++ b/dlls/msvcp100/locale.c
@@ -1372,7 +1372,7 @@ ctype_char* __thiscall MSVCP_ctype_char_vector_dtor(ctype_char *this, unsigned i
 /* ?do_narrow@?$ctype at D@std@@MBEDDD at Z */
 /* ?do_narrow@?$ctype at D@std@@MEBADDD at Z */
 DEFINE_THISCALL_WRAPPER(ctype_char_do_narrow_ch, 12)
-#define call_ctype_char_do_narrow_ch(this, ch, unused) CALL_VTBL_FUNC(this, 36, \
+#define call_ctype_char_do_narrow_ch(this, ch, unused) CALL_VTBL_FUNC(this, 32, \
         char, (const ctype_char*, char, char), (this, ch, unused))
 char __thiscall ctype_char_do_narrow_ch(const ctype_char *this, char ch, char unused)
 {
@@ -1383,7 +1383,7 @@ char __thiscall ctype_char_do_narrow_ch(const ctype_char *this, char ch, char un
 /* ?do_narrow@?$ctype at D@std@@MBEPBDPBD0DPAD at Z */
 /* ?do_narrow@?$ctype at D@std@@MEBAPEBDPEBD0DPEAD at Z */
 DEFINE_THISCALL_WRAPPER(ctype_char_do_narrow, 20)
-#define call_ctype_char_do_narrow(this, first, last, unused, dest) CALL_VTBL_FUNC(this, 32, \
+#define call_ctype_char_do_narrow(this, first, last, unused, dest) CALL_VTBL_FUNC(this, 28, \
         const char*, (const ctype_char*, const char*, const char*, char, char*), \
         (this, first, last, unused, dest))
 const char* __thiscall ctype_char_do_narrow(const ctype_char *this,
@@ -2000,7 +2000,7 @@ char __thiscall ctype_wchar__Donarrow(const ctype_wchar *this, wchar_t ch, char
 /* ?do_narrow@?$ctype at G@std@@MBEDGD at Z */
 /* ?do_narrow@?$ctype at G@std@@MEBADGD at Z */
 DEFINE_THISCALL_WRAPPER(ctype_wchar_do_narrow_ch, 12)
-#define call_ctype_wchar_do_narrow_ch(this, ch, dflt) CALL_VTBL_FUNC(this, 52, \
+#define call_ctype_wchar_do_narrow_ch(this, ch, dflt) CALL_VTBL_FUNC(this, 48, \
         char, (const ctype_wchar*, wchar_t, char), (this, ch, dflt))
 char __thiscall ctype_wchar_do_narrow_ch(const ctype_wchar *this, wchar_t ch, char dflt)
 {
@@ -2012,7 +2012,7 @@ char __thiscall ctype_wchar_do_narrow_ch(const ctype_wchar *this, wchar_t ch, ch
 /* ?do_narrow@?$ctype at G@std@@MBEPBGPBG0DPAD at Z */
 /* ?do_narrow@?$ctype at G@std@@MEBAPEBGPEBG0DPEAD at Z */
 DEFINE_THISCALL_WRAPPER(ctype_wchar_do_narrow, 20)
-#define call_ctype_wchar_do_narrow(this, first, last, dflt, dest) CALL_VTBL_FUNC(this, 48, \
+#define call_ctype_wchar_do_narrow(this, first, last, dflt, dest) CALL_VTBL_FUNC(this, 44, \
         const wchar_t*, (const ctype_wchar*, const wchar_t*, const wchar_t*, char, char*), \
         (this, first, last, dflt, dest))
 const wchar_t* __thiscall ctype_wchar_do_narrow(const ctype_wchar *this,
@@ -8590,10 +8590,8 @@ void __asm_dummy_vtables(void) {
             VTABLE_ADD_FUNC(ctype_char_do_toupper_ch)
             VTABLE_ADD_FUNC(ctype_char_do_widen)
             VTABLE_ADD_FUNC(ctype_char_do_widen_ch)
-            VTABLE_ADD_FUNC(ctype_char__Do_widen_s)
             VTABLE_ADD_FUNC(ctype_char_do_narrow)
-            VTABLE_ADD_FUNC(ctype_char_do_narrow_ch)
-            VTABLE_ADD_FUNC(ctype_char__Do_narrow_s));
+            VTABLE_ADD_FUNC(ctype_char_do_narrow_ch));
     __ASM_VTABLE(ctype_wchar,
             VTABLE_ADD_FUNC(ctype_wchar_do_is)
             VTABLE_ADD_FUNC(ctype_wchar_do_is_ch)
@@ -8605,10 +8603,8 @@ void __asm_dummy_vtables(void) {
             VTABLE_ADD_FUNC(ctype_wchar_do_toupper_ch)
             VTABLE_ADD_FUNC(ctype_wchar_do_widen)
             VTABLE_ADD_FUNC(ctype_wchar_do_widen_ch)
-            VTABLE_ADD_FUNC(ctype_wchar__Do_widen_s)
             VTABLE_ADD_FUNC(ctype_wchar_do_narrow)
-            VTABLE_ADD_FUNC(ctype_wchar_do_narrow_ch)
-            VTABLE_ADD_FUNC(ctype_wchar__Do_narrow_s));
+            VTABLE_ADD_FUNC(ctype_wchar_do_narrow_ch));
     __ASM_VTABLE(ctype_short,
             VTABLE_ADD_FUNC(ctype_wchar_do_is)
             VTABLE_ADD_FUNC(ctype_wchar_do_is_ch)
@@ -8620,10 +8616,8 @@ void __asm_dummy_vtables(void) {
             VTABLE_ADD_FUNC(ctype_wchar_do_toupper_ch)
             VTABLE_ADD_FUNC(ctype_wchar_do_widen)
             VTABLE_ADD_FUNC(ctype_wchar_do_widen_ch)
-            VTABLE_ADD_FUNC(ctype_wchar__Do_widen_s)
             VTABLE_ADD_FUNC(ctype_wchar_do_narrow)
-            VTABLE_ADD_FUNC(ctype_wchar_do_narrow_ch)
-            VTABLE_ADD_FUNC(ctype_wchar__Do_narrow_s));
+            VTABLE_ADD_FUNC(ctype_wchar_do_narrow_ch));
     __ASM_VTABLE(codecvt_base,
             VTABLE_ADD_FUNC(codecvt_base_do_always_noconv)
             VTABLE_ADD_FUNC(codecvt_base_do_max_length)