Piotr Caban : msvcp100: Removed virtual function callers for functions that are not virtual.
Alexandre Julliard
julliard at winehq.org
Mon Aug 27 14:35:03 CDT 2012
Module: wine
Branch: master
Commit: 388f11abb3adef9397a65f4e996ec215a3449a99
URL: http://source.winehq.org/git/wine.git/?a=commit;h=388f11abb3adef9397a65f4e996ec215a3449a99
Author: Piotr Caban <piotr at codeweavers.com>
Date: Mon Aug 27 11:09:44 2012 +0200
msvcp100: Removed virtual function callers for functions that are not virtual.
---
dlls/msvcp100/ios.c | 16 ++++++----------
dlls/msvcp100/locale.c | 20 ++++----------------
2 files changed, 10 insertions(+), 26 deletions(-)
diff --git a/dlls/msvcp100/ios.c b/dlls/msvcp100/ios.c
index b79c8a1..e69345a 100644
--- a/dlls/msvcp100/ios.c
+++ b/dlls/msvcp100/ios.c
@@ -1071,8 +1071,6 @@ int __thiscall basic_streambuf_char_uflow(basic_streambuf_char *this)
/* ?_Xsgetn_s@?$basic_streambuf at DU?$char_traits at D@std@@@std@@MAEHPADIH at Z */
/* ?_Xsgetn_s@?$basic_streambuf at DU?$char_traits at D@std@@@std@@MEAA_JPEAD_K_J at Z */
DEFINE_THISCALL_WRAPPER(basic_streambuf_char__Xsgetn_s, 20)
-#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;
@@ -1109,7 +1107,7 @@ DEFINE_THISCALL_WRAPPER(basic_streambuf_char__Sgetn_s, 20)
streamsize __thiscall basic_streambuf_char__Sgetn_s(basic_streambuf_char *this, char *ptr, MSVCP_size_t size, streamsize count)
{
TRACE("(%p %p %lu %s)\n", this, ptr, size, wine_dbgstr_longlong(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 at DU?$char_traits at D@std@@@std@@QAEXXZ */
@@ -1366,7 +1364,7 @@ DEFINE_THISCALL_WRAPPER(basic_streambuf_char_sgetn, 16)
streamsize __thiscall basic_streambuf_char_sgetn(basic_streambuf_char *this, char *ptr, streamsize count)
{
TRACE("(%p %p %s)\n", this, ptr, wine_dbgstr_longlong(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 at DU?$char_traits at D@std@@@std@@MAEHXZ */
@@ -1487,7 +1485,7 @@ DEFINE_THISCALL_WRAPPER(basic_streambuf_char_xsgetn, 16)
streamsize __thiscall basic_streambuf_char_xsgetn(basic_streambuf_char *this, char *ptr, streamsize count)
{
TRACE("(%p %p %s)\n", this, ptr, wine_dbgstr_longlong(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 at DU?$char_traits at D@std@@@std@@MAEHPBDH at Z */
@@ -1811,8 +1809,6 @@ unsigned short __thiscall basic_streambuf_wchar_uflow(basic_streambuf_wchar *thi
/* ?_Xsgetn_s@?$basic_streambuf at GU?$char_traits at G@std@@@std@@MAEHPAGIH at Z */
/* ?_Xsgetn_s@?$basic_streambuf at GU?$char_traits at G@std@@@std@@MEAA_JPEAG_K_J at Z */
DEFINE_THISCALL_WRAPPER(basic_streambuf_wchar__Xsgetn_s, 20)
-#define call_basic_streambuf_wchar__Xsgetn_s(this, ptr, size, count) CALL_VTBL_FUNC(this, 28, \
- streamsize, (basic_streambuf_wchar*, wchar_t*, MSVCP_size_t, streamsize), (this, ptr, size, count))
streamsize __thiscall basic_streambuf_wchar__Xsgetn_s(basic_streambuf_wchar *this, wchar_t *ptr, MSVCP_size_t size, streamsize count)
{
streamsize copied, chunk;
@@ -1851,7 +1847,7 @@ DEFINE_THISCALL_WRAPPER(basic_streambuf_wchar__Sgetn_s, 20)
streamsize __thiscall basic_streambuf_wchar__Sgetn_s(basic_streambuf_wchar *this, wchar_t *ptr, MSVCP_size_t size, streamsize count)
{
TRACE("(%p %p %lu %s)\n", this, ptr, size, wine_dbgstr_longlong(count));
- return call_basic_streambuf_wchar__Xsgetn_s(this, ptr, size, count);
+ return basic_streambuf_wchar__Xsgetn_s(this, ptr, size, count);
}
/* ?_Unlock@?$basic_streambuf at _WU?$char_traits at _W@std@@@std@@QAEXXZ */
@@ -2156,7 +2152,7 @@ DEFINE_THISCALL_WRAPPER(basic_streambuf_wchar_sgetn, 16)
streamsize __thiscall basic_streambuf_wchar_sgetn(basic_streambuf_wchar *this, wchar_t *ptr, streamsize count)
{
TRACE("(%p %p %s)\n", this, ptr, wine_dbgstr_longlong(count));
- return call_basic_streambuf_wchar__Xsgetn_s(this, ptr, -1, count);
+ return basic_streambuf_wchar__Xsgetn_s(this, ptr, -1, count);
}
/* ?showmanyc@?$basic_streambuf at _WU?$char_traits at _W@std@@@std@@MAEHXZ */
@@ -2297,7 +2293,7 @@ DEFINE_THISCALL_WRAPPER(basic_streambuf_wchar_xsgetn, 16)
streamsize __thiscall basic_streambuf_wchar_xsgetn(basic_streambuf_wchar *this, wchar_t *ptr, streamsize count)
{
TRACE("(%p %p %s)\n", this, ptr, wine_dbgstr_longlong(count));
- return call_basic_streambuf_wchar__Xsgetn_s(this, ptr, -1, count);
+ return basic_streambuf_wchar__Xsgetn_s(this, ptr, -1, count);
}
/* ?xsputn@?$basic_streambuf at _WU?$char_traits at _W@std@@@std@@MAEHPB_WH at Z */
diff --git a/dlls/msvcp100/locale.c b/dlls/msvcp100/locale.c
index ccc48ab..52a45ba 100644
--- a/dlls/msvcp100/locale.c
+++ b/dlls/msvcp100/locale.c
@@ -1391,9 +1391,6 @@ const char* __thiscall ctype_char_do_narrow(const ctype_char *this,
/* ?_Do_narrow_s@?$ctype at D@std@@MBEPBDPBD0DPADI at Z */
/* ?_Do_narrow_s@?$ctype at D@std@@MEBAPEBDPEBD0DPEAD_K at Z */
DEFINE_THISCALL_WRAPPER(ctype_char__Do_narrow_s, 24)
-#define call_ctype_char__Do_narrow_s(this, first, last, unused, dest, size) CALL_VTBL_FUNC(this, 40, \
- const char*, (const ctype_char*, const char*, const char*, char, char*, MSVCP_size_t), \
- (this, first, last, unused, dest, size))
const char* __thiscall ctype_char__Do_narrow_s(const ctype_char *this, const char *first,
const char *last, char unused, char *dest, MSVCP_size_t size)
{
@@ -1428,7 +1425,7 @@ const char* __thiscall ctype_char__Narrow_s(const ctype_char *this, const char *
const char *last, char dflt, char *dest, MSVCP_size_t size)
{
TRACE("(%p %p %p %p %lu)\n", this, first, last, dest, size);
- return call_ctype_char__Do_narrow_s(this, first, last, dflt, dest, size);
+ return ctype_char__Do_narrow_s(this, first, last, dflt, dest, size);
}
/* ?do_widen@?$ctype at D@std@@MBEDD at Z */
@@ -1459,9 +1456,6 @@ const char* __thiscall ctype_char_do_widen(const ctype_char *this,
/* ?_Do_widen_s@?$ctype at D@std@@MBEPBDPBD0PADI at Z */
/* ?_Do_widen_s@?$ctype at D@std@@MEBAPEBDPEBD0PEAD_K at Z */
DEFINE_THISCALL_WRAPPER(ctype_char__Do_widen_s, 20)
-#define call_ctype_char__Do_widen_s(this, first, last, dest, size) CALL_VTBL_FUNC(this, 28, \
- const char*, (const ctype_char*, const char*, const char*, char*, MSVCP_size_t), \
- (this, first, last, dest, size))
const char* __thiscall ctype_char__Do_widen_s(const ctype_char *this,
const char *first, const char *last, char *dest, MSVCP_size_t size)
{
@@ -1496,7 +1490,7 @@ const char* __thiscall ctype_char__Widen_s(const ctype_char *this,
const char *first, const char *last, char *dest, MSVCP_size_t size)
{
TRACE("(%p %p %p %p %lu)\n", this, first, last, dest, size);
- return call_ctype_char__Do_widen_s(this, first, last, dest, size);
+ return ctype_char__Do_widen_s(this, first, last, dest, size);
}
/* ?_Getcat@?$ctype at D@std@@SAIPAPBVfacet at locale@2 at PBV42@@Z */
@@ -2017,9 +2011,6 @@ const wchar_t* __thiscall ctype_wchar_do_narrow(const ctype_wchar *this,
/* ?_Do_narrow_s@?$ctype at G@std@@MBEPBGPBG0DPADI at Z */
/* ?_Do_narrow_s@?$ctype at G@std@@MEBAPEBGPEBG0DPEAD_K at Z */
DEFINE_THISCALL_WRAPPER(ctype_wchar__Do_narrow_s, 24)
-#define call_ctype_wchar__Do_narrow_s(this, first, last, dflt, dest, size) CALL_VTBL_FUNC(this, 56, \
- const wchar_t*, (const ctype_wchar*, const wchar_t*, const wchar_t*, char, char*, MSVCP_size_t), \
- (this, first, last, dflt, dest, size))
const wchar_t* __thiscall ctype_wchar__Do_narrow_s(const ctype_wchar *this,
const wchar_t *first, const wchar_t *last, char dflt, char *dest, MSVCP_size_t size)
{
@@ -2063,7 +2054,7 @@ const wchar_t* __thiscall ctype_wchar__Narrow_s(const ctype_wchar *this, const w
const wchar_t *last, char dflt, char *dest, MSVCP_size_t size)
{
TRACE("(%p %p %p %d %p %lu)\n", this, first, last, dflt, dest, size);
- return call_ctype_wchar__Do_narrow_s(this, first, last, dflt, dest, size);
+ return ctype_wchar__Do_narrow_s(this, first, last, dflt, dest, size);
}
/* _Mbrtowc */
@@ -2182,9 +2173,6 @@ const char* __thiscall ctype_wchar_do_widen(const ctype_wchar *this,
/* ?_Do_widen_s@?$ctype at G@std@@MBEPBDPBD0PAGI at Z */
/* ?_Do_widen_s@?$ctype at G@std@@MEBAPEBDPEBD0PEAG_K at Z */
DEFINE_THISCALL_WRAPPER(ctype_wchar__Do_widen_s, 20)
-#define call_ctype_wchar__Do_widen_s(this, first, last, dest, size) CALL_VTBL_FUNC(this, 44, \
- const char*, (const ctype_wchar*, const char*, const char*, wchar_t*, MSVCP_size_t), \
- (this, first, last, dest, size))
const char* __thiscall ctype_wchar__Do_widen_s(const ctype_wchar *this,
const char *first, const char *last, wchar_t *dest, MSVCP_size_t size)
{
@@ -2228,7 +2216,7 @@ const char* __thiscall ctype_wchar__Widen_s(const ctype_wchar *this,
const char *first, const char *last, wchar_t *dest, MSVCP_size_t size)
{
TRACE("(%p %p %p %p %lu)\n", this, first, last, dest, size);
- return call_ctype_wchar__Do_widen_s(this, first, last, dest, size);
+ return ctype_wchar__Do_widen_s(this, first, last, dest, size);
}
/* ?_Getcat@?$ctype at _W@std@@SAIPAPBVfacet at locale@2 at PBV42@@Z */
More information about the wine-cvs
mailing list