Module: wine Branch: master Commit: 0cb615cf80f6d8a09fc6bd19ca0b5211f55764b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cb615cf80f6d8a09fc6bd19ca... Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 4 13:13:38 2012 +0200 msvcp90: Fixed io classes cleaning. --- dlls/msvcp100/ios.c | 24 ++++++++++++------------ dlls/msvcp71/ios.c | 24 ++++++++++++------------ dlls/msvcp90/ios.c | 24 ++++++++++++------------ 3 files changed, 36 insertions(+), 36 deletions(-) diff --git a/dlls/msvcp100/ios.c b/dlls/msvcp100/ios.c index fa2f76e..96e6835 100644 --- a/dlls/msvcp100/ios.c +++ b/dlls/msvcp100/ios.c @@ -8193,39 +8193,39 @@ void init_io(void *base) void free_io(void) { - basic_istream_char_dtor(basic_istream_char_to_basic_ios(&cin.obj)); + basic_istream_char_vbase_dtor(&cin.obj); basic_filebuf_char_dtor(&filebuf_char_stdin); - basic_istream_wchar_dtor(basic_istream_wchar_to_basic_ios(&ucin.obj)); + basic_istream_wchar_vbase_dtor(&ucin.obj); basic_filebuf_wchar_dtor(&filebuf_short_stdin); - basic_istream_wchar_dtor(basic_istream_wchar_to_basic_ios(&wcin.obj)); + basic_istream_wchar_vbase_dtor(&wcin.obj); basic_filebuf_wchar_dtor(&filebuf_wchar_stdin); - basic_ostream_char_dtor(basic_ostream_char_to_basic_ios(&cout.obj)); + basic_ostream_char_vbase_dtor(&cout.obj); basic_filebuf_char_dtor(&filebuf_char_stdout); - basic_ostream_wchar_dtor(basic_ostream_wchar_to_basic_ios(&ucout.obj)); + basic_ostream_wchar_vbase_dtor(&ucout.obj); basic_filebuf_wchar_dtor(&filebuf_short_stdout); - basic_ostream_wchar_dtor(basic_ostream_wchar_to_basic_ios(&wcout.obj)); + basic_ostream_wchar_vbase_dtor(&wcout.obj); basic_filebuf_wchar_dtor(&filebuf_wchar_stdout); - basic_ostream_char_dtor(basic_ostream_char_to_basic_ios(&cerr.obj)); + basic_ostream_char_vbase_dtor(&cerr.obj); basic_filebuf_char_dtor(&filebuf_char_stderr); - basic_ostream_wchar_dtor(basic_ostream_wchar_to_basic_ios(&ucerr.obj)); + basic_ostream_wchar_vbase_dtor(&ucerr.obj); basic_filebuf_wchar_dtor(&filebuf_short_stderr); - basic_ostream_wchar_dtor(basic_ostream_wchar_to_basic_ios(&wcerr.obj)); + basic_ostream_wchar_vbase_dtor(&wcerr.obj); basic_filebuf_wchar_dtor(&filebuf_wchar_stderr); - basic_ostream_char_dtor(basic_ostream_char_to_basic_ios(&clog.obj)); + basic_ostream_char_vbase_dtor(&clog.obj); basic_filebuf_char_dtor(&filebuf_char_log); - basic_ostream_wchar_dtor(basic_ostream_wchar_to_basic_ios(&uclog.obj)); + basic_ostream_wchar_vbase_dtor(&uclog.obj); basic_filebuf_wchar_dtor(&filebuf_short_log); - basic_ostream_wchar_dtor(basic_ostream_wchar_to_basic_ios(&wclog.obj)); + basic_ostream_wchar_vbase_dtor(&wclog.obj); basic_filebuf_wchar_dtor(&filebuf_wchar_log); } diff --git a/dlls/msvcp71/ios.c b/dlls/msvcp71/ios.c index 069011c..6696149 100644 --- a/dlls/msvcp71/ios.c +++ b/dlls/msvcp71/ios.c @@ -12637,39 +12637,39 @@ void init_io(void *base) void free_io(void) { - basic_istream_char_dtor(basic_istream_char_to_basic_ios(&cin.obj)); + basic_istream_char_vbase_dtor(&cin.obj); basic_filebuf_char_dtor(&filebuf_char_stdin); - basic_istream_wchar_dtor(basic_istream_wchar_to_basic_ios(&ucin.obj)); + basic_istream_wchar_vbase_dtor(&ucin.obj); basic_filebuf_wchar_dtor(&filebuf_short_stdin); - basic_istream_wchar_dtor(basic_istream_wchar_to_basic_ios(&wcin.obj)); + basic_istream_wchar_vbase_dtor(&wcin.obj); basic_filebuf_wchar_dtor(&filebuf_wchar_stdin); - basic_ostream_char_dtor(basic_ostream_char_to_basic_ios(&cout.obj)); + basic_ostream_char_vbase_dtor(&cout.obj); basic_filebuf_char_dtor(&filebuf_char_stdout); - basic_ostream_wchar_dtor(basic_ostream_wchar_to_basic_ios(&ucout.obj)); + basic_ostream_wchar_vbase_dtor(&ucout.obj); basic_filebuf_wchar_dtor(&filebuf_short_stdout); - basic_ostream_wchar_dtor(basic_ostream_wchar_to_basic_ios(&wcout.obj)); + basic_ostream_wchar_vbase_dtor(&wcout.obj); basic_filebuf_wchar_dtor(&filebuf_wchar_stdout); - basic_ostream_char_dtor(basic_ostream_char_to_basic_ios(&cerr.obj)); + basic_ostream_char_vbase_dtor(&cerr.obj); basic_filebuf_char_dtor(&filebuf_char_stderr); - basic_ostream_wchar_dtor(basic_ostream_wchar_to_basic_ios(&ucerr.obj)); + basic_ostream_wchar_vbase_dtor(&ucerr.obj); basic_filebuf_wchar_dtor(&filebuf_short_stderr); - basic_ostream_wchar_dtor(basic_ostream_wchar_to_basic_ios(&wcerr.obj)); + basic_ostream_wchar_vbase_dtor(&wcerr.obj); basic_filebuf_wchar_dtor(&filebuf_wchar_stderr); - basic_ostream_char_dtor(basic_ostream_char_to_basic_ios(&clog.obj)); + basic_ostream_char_vbase_dtor(&clog.obj); basic_filebuf_char_dtor(&filebuf_char_log); - basic_ostream_wchar_dtor(basic_ostream_wchar_to_basic_ios(&uclog.obj)); + basic_ostream_wchar_vbase_dtor(&uclog.obj); basic_filebuf_wchar_dtor(&filebuf_short_log); - basic_ostream_wchar_dtor(basic_ostream_wchar_to_basic_ios(&wclog.obj)); + basic_ostream_wchar_vbase_dtor(&wclog.obj); basic_filebuf_wchar_dtor(&filebuf_wchar_log); } diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 1816884..19b799c 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -13142,39 +13142,39 @@ void init_io(void *base) void free_io(void) { - basic_istream_char_dtor(basic_istream_char_to_basic_ios(&cin.obj)); + basic_istream_char_vbase_dtor(&cin.obj); basic_filebuf_char_dtor(&filebuf_char_stdin); - basic_istream_wchar_dtor(basic_istream_wchar_to_basic_ios(&ucin.obj)); + basic_istream_wchar_vbase_dtor(&ucin.obj); basic_filebuf_wchar_dtor(&filebuf_short_stdin); - basic_istream_wchar_dtor(basic_istream_wchar_to_basic_ios(&wcin.obj)); + basic_istream_wchar_vbase_dtor(&wcin.obj); basic_filebuf_wchar_dtor(&filebuf_wchar_stdin); - basic_ostream_char_dtor(basic_ostream_char_to_basic_ios(&cout.obj)); + basic_ostream_char_vbase_dtor(&cout.obj); basic_filebuf_char_dtor(&filebuf_char_stdout); - basic_ostream_wchar_dtor(basic_ostream_wchar_to_basic_ios(&ucout.obj)); + basic_ostream_wchar_vbase_dtor(&ucout.obj); basic_filebuf_wchar_dtor(&filebuf_short_stdout); - basic_ostream_wchar_dtor(basic_ostream_wchar_to_basic_ios(&wcout.obj)); + basic_ostream_wchar_vbase_dtor(&wcout.obj); basic_filebuf_wchar_dtor(&filebuf_wchar_stdout); - basic_ostream_char_dtor(basic_ostream_char_to_basic_ios(&cerr.obj)); + basic_ostream_char_vbase_dtor(&cerr.obj); basic_filebuf_char_dtor(&filebuf_char_stderr); - basic_ostream_wchar_dtor(basic_ostream_wchar_to_basic_ios(&ucerr.obj)); + basic_ostream_wchar_vbase_dtor(&ucerr.obj); basic_filebuf_wchar_dtor(&filebuf_short_stderr); - basic_ostream_wchar_dtor(basic_ostream_wchar_to_basic_ios(&wcerr.obj)); + basic_ostream_wchar_vbase_dtor(&wcerr.obj); basic_filebuf_wchar_dtor(&filebuf_wchar_stderr); - basic_ostream_char_dtor(basic_ostream_char_to_basic_ios(&clog.obj)); + basic_ostream_char_vbase_dtor(&clog.obj); basic_filebuf_char_dtor(&filebuf_char_log); - basic_ostream_wchar_dtor(basic_ostream_wchar_to_basic_ios(&uclog.obj)); + basic_ostream_wchar_vbase_dtor(&uclog.obj); basic_filebuf_wchar_dtor(&filebuf_short_log); - basic_ostream_wchar_dtor(basic_ostream_wchar_to_basic_ios(&wclog.obj)); + basic_ostream_wchar_vbase_dtor(&wclog.obj); basic_filebuf_wchar_dtor(&filebuf_wchar_log); }