Module: wine Branch: master Commit: ca171741d05488c4622123c3cc7dea5da8e1afc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca171741d05488c4622123c3cc...
Author: Piotr Caban piotr@codeweavers.com Date: Mon Sep 17 10:25:47 2012 +0200
msvcp71: Fixed basic_streambuf virtual functions table.
---
dlls/msvcp71/ios.c | 24 +++++++++--------------- 1 files changed, 9 insertions(+), 15 deletions(-)
diff --git a/dlls/msvcp71/ios.c b/dlls/msvcp71/ios.c index ea07e37..8d15622 100644 --- a/dlls/msvcp71/ios.c +++ b/dlls/msvcp71/ios.c @@ -637,7 +637,6 @@ void __asm_dummy_vtables(void) { VTABLE_ADD_FUNC(basic_streambuf_char_underflow) VTABLE_ADD_FUNC(basic_streambuf_char_uflow) VTABLE_ADD_FUNC(basic_streambuf_char_xsgetn) - VTABLE_ADD_FUNC(basic_streambuf_char__Xsgetn_s) VTABLE_ADD_FUNC(basic_streambuf_char_xsputn) VTABLE_ADD_FUNC(basic_streambuf_char_seekoff) VTABLE_ADD_FUNC(basic_streambuf_char_seekpos) @@ -682,7 +681,6 @@ void __asm_dummy_vtables(void) { VTABLE_ADD_FUNC(basic_filebuf_char_underflow) VTABLE_ADD_FUNC(basic_filebuf_char_uflow) VTABLE_ADD_FUNC(basic_streambuf_char_xsgetn) - VTABLE_ADD_FUNC(basic_streambuf_char__Xsgetn_s) VTABLE_ADD_FUNC(basic_streambuf_char_xsputn) VTABLE_ADD_FUNC(basic_filebuf_char_seekoff) VTABLE_ADD_FUNC(basic_filebuf_char_seekpos) @@ -727,7 +725,6 @@ void __asm_dummy_vtables(void) { VTABLE_ADD_FUNC(basic_stringbuf_char_underflow) VTABLE_ADD_FUNC(basic_streambuf_char_uflow) VTABLE_ADD_FUNC(basic_streambuf_char_xsgetn) - VTABLE_ADD_FUNC(basic_streambuf_char__Xsgetn_s) VTABLE_ADD_FUNC(basic_streambuf_char_xsputn) VTABLE_ADD_FUNC(basic_stringbuf_char_seekoff) VTABLE_ADD_FUNC(basic_stringbuf_char_seekpos) @@ -826,7 +823,6 @@ void __asm_dummy_vtables(void) { VTABLE_ADD_FUNC(strstreambuf_underflow) VTABLE_ADD_FUNC(basic_streambuf_char_uflow) VTABLE_ADD_FUNC(basic_streambuf_char_xsgetn) - VTABLE_ADD_FUNC(basic_streambuf_char__Xsgetn_s) VTABLE_ADD_FUNC(basic_streambuf_char_xsputn) VTABLE_ADD_FUNC(strstreambuf_seekoff) VTABLE_ADD_FUNC(strstreambuf_seekpos) @@ -1064,8 +1060,6 @@ int __thiscall basic_streambuf_char_uflow(basic_streambuf_char *this) /* ?_Xsgetn_s@?$basic_streambuf@DU?$char_traits@D@std@@@std@@MAEHPADIH@Z */ /* ?_Xsgetn_s@?$basic_streambuf@DU?$char_traits@D@std@@@std@@MEAA_JPEAD_K_J@Z */ DEFINE_THISCALL_WRAPPER(basic_streambuf_char__Xsgetn_s, 16) -#define call_basic_streambuf_char__Xsgetn_s(this, ptr, size, count) CALL_VTBL_FUNC(this, 28, \ - streamsize, (basic_streambuf_char*, char*, MSVCP_size_t, streamsize), (this, ptr, size, count)) streamsize __thiscall basic_streambuf_char__Xsgetn_s(basic_streambuf_char *this, char *ptr, MSVCP_size_t size, streamsize count) { streamsize copied, chunk; @@ -1102,7 +1096,7 @@ DEFINE_THISCALL_WRAPPER(basic_streambuf_char__Sgetn_s, 16) streamsize __thiscall basic_streambuf_char__Sgetn_s(basic_streambuf_char *this, char *ptr, MSVCP_size_t size, streamsize count) { TRACE("(%p %p %lu %ld)\n", this, ptr, size, count); - return call_basic_streambuf_char__Xsgetn_s(this, ptr, size, count); + return basic_streambuf_char__Xsgetn_s(this, ptr, size, count); }
/* ?_Unlock@?$basic_streambuf@DU?$char_traits@D@std@@@std@@QAEXXZ */ @@ -1172,7 +1166,7 @@ locale* __thiscall basic_streambuf_char_getloc(const basic_streambuf_char *this, /* ?imbue@?$basic_streambuf@DU?$char_traits@D@std@@@std@@MAEXABVlocale@2@@Z */ /* ?imbue@?$basic_streambuf@DU?$char_traits@D@std@@@std@@MEAAXAEBVlocale@2@@Z */ DEFINE_THISCALL_WRAPPER(basic_streambuf_char_imbue, 8) -#define call_basic_streambuf_char_imbue(this, loc) CALL_VTBL_FUNC(this, 52, \ +#define call_basic_streambuf_char_imbue(this, loc) CALL_VTBL_FUNC(this, 48, \ void, (basic_streambuf_char*, const locale*), (this, loc)) void __thiscall basic_streambuf_char_imbue(basic_streambuf_char *this, const locale *loc) { @@ -1244,7 +1238,7 @@ locale* __thiscall basic_streambuf_char_pubimbue(basic_streambuf_char *this, loc /* ?seekoff@?$basic_streambuf@DU?$char_traits@D@std@@@std@@MAE?AV?$fpos@H@2@JHH@Z */ /* ?seekoff@?$basic_streambuf@DU?$char_traits@D@std@@@std@@MEAA?AV?$fpos@H@2@_JHH@Z */ DEFINE_THISCALL_WRAPPER(basic_streambuf_char_seekoff, 20) -#define call_basic_streambuf_char_seekoff(this, ret, off, way, mode) CALL_VTBL_FUNC(this, 36, \ +#define call_basic_streambuf_char_seekoff(this, ret, off, way, mode) CALL_VTBL_FUNC(this, 32, \ fpos_int*, (basic_streambuf_char*, fpos_int*, streamoff, int, int), (this, ret, off, way, mode)) fpos_int* __thiscall basic_streambuf_char_seekoff(basic_streambuf_char *this, fpos_int *ret, streamoff off, int way, int mode) @@ -1279,7 +1273,7 @@ fpos_int* __thiscall basic_streambuf_char_pubseekoff_old(basic_streambuf_char *t /* ?seekpos@?$basic_streambuf@DU?$char_traits@D@std@@@std@@MAE?AV?$fpos@H@2@V32@H@Z */ /* ?seekpos@?$basic_streambuf@DU?$char_traits@D@std@@@std@@MEAA?AV?$fpos@H@2@V32@H@Z */ DEFINE_THISCALL_WRAPPER(basic_streambuf_char_seekpos, 36) -#define call_basic_streambuf_char_seekpos(this, ret, pos, mode) CALL_VTBL_FUNC(this, 40, \ +#define call_basic_streambuf_char_seekpos(this, ret, pos, mode) CALL_VTBL_FUNC(this, 36, \ fpos_int*, (basic_streambuf_char*, fpos_int*, fpos_int, int), (this, ret, pos, mode)) fpos_int* __thiscall basic_streambuf_char_seekpos(basic_streambuf_char *this, fpos_int *ret, fpos_int pos, int mode) @@ -1314,7 +1308,7 @@ fpos_int* __thiscall basic_streambuf_char_pubseekpos_old(basic_streambuf_char *t /* ?setbuf@?$basic_streambuf@DU?$char_traits@D@std@@@std@@MAEPAV12@PADH@Z */ /* ?setbuf@?$basic_streambuf@DU?$char_traits@D@std@@@std@@MEAAPEAV12@PEAD_J@Z */ DEFINE_THISCALL_WRAPPER(basic_streambuf_char_setbuf, 12) -#define call_basic_streambuf_char_setbuf(this, buf, count) CALL_VTBL_FUNC(this, 44, \ +#define call_basic_streambuf_char_setbuf(this, buf, count) CALL_VTBL_FUNC(this, 40, \ basic_streambuf_char*, (basic_streambuf_char*, char*, streamsize), (this, buf, count)) basic_streambuf_char* __thiscall basic_streambuf_char_setbuf(basic_streambuf_char *this, char *buf, streamsize count) { @@ -1334,7 +1328,7 @@ basic_streambuf_char* __thiscall basic_streambuf_char_pubsetbuf(basic_streambuf_ /* ?sync@?$basic_streambuf@DU?$char_traits@D@std@@@std@@MAEHXZ */ /* ?sync@?$basic_streambuf@DU?$char_traits@D@std@@@std@@MEAAHXZ */ DEFINE_THISCALL_WRAPPER(basic_streambuf_char_sync, 4) -#define call_basic_streambuf_char_sync(this) CALL_VTBL_FUNC(this, 48, \ +#define call_basic_streambuf_char_sync(this) CALL_VTBL_FUNC(this, 44, \ int, (basic_streambuf_char*), (this)) int __thiscall basic_streambuf_char_sync(basic_streambuf_char *this) { @@ -1357,7 +1351,7 @@ DEFINE_THISCALL_WRAPPER(basic_streambuf_char_sgetn, 12) streamsize __thiscall basic_streambuf_char_sgetn(basic_streambuf_char *this, char *ptr, streamsize count) { TRACE("(%p %p %ld)\n", this, ptr, count); - return call_basic_streambuf_char__Xsgetn_s(this, ptr, -1, count); + return basic_streambuf_char__Xsgetn_s(this, ptr, -1, count); }
/* ?showmanyc@?$basic_streambuf@DU?$char_traits@D@std@@@std@@MAEHXZ */ @@ -1478,13 +1472,13 @@ DEFINE_THISCALL_WRAPPER(basic_streambuf_char_xsgetn, 12) streamsize __thiscall basic_streambuf_char_xsgetn(basic_streambuf_char *this, char *ptr, streamsize count) { TRACE("(%p %p %ld)\n", this, ptr, count); - return call_basic_streambuf_char__Xsgetn_s(this, ptr, -1, count); + return basic_streambuf_char__Xsgetn_s(this, ptr, -1, count); }
/* ?xsputn@?$basic_streambuf@DU?$char_traits@D@std@@@std@@MAEHPBDH@Z */ /* ?xsputn@?$basic_streambuf@DU?$char_traits@D@std@@@std@@MEAA_JPEBD_J@Z */ DEFINE_THISCALL_WRAPPER(basic_streambuf_char_xsputn, 12) -#define call_basic_streambuf_char_xsputn(this, ptr, count) CALL_VTBL_FUNC(this, 32, \ +#define call_basic_streambuf_char_xsputn(this, ptr, count) CALL_VTBL_FUNC(this, 28, \ streamsize, (basic_streambuf_char*, const char*, streamsize), (this, ptr, count)) streamsize __thiscall basic_streambuf_char_xsputn(basic_streambuf_char *this, const char *ptr, streamsize count) {