Piotr Caban : msvcp110: Fix cin/cout/cerr/clog structure sizes.
Alexandre Julliard
julliard at winehq.org
Tue Oct 4 13:38:25 CDT 2016
Module: wine
Branch: master
Commit: 3ba26d38eb38ca32ea23c76c2c50f2a412730d9b
URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ba26d38eb38ca32ea23c76c2c50f2a412730d9b
Author: Piotr Caban <piotr at codeweavers.com>
Date: Tue Oct 4 10:09:58 2016 +0200
msvcp110: Fix cin/cout/cerr/clog structure sizes.
Signed-off-by: Piotr Caban <piotr at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/msvcp90/ios.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 48 insertions(+)
diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c
index f673bc1..84a6bf2c 100644
--- a/dlls/msvcp90/ios.c
+++ b/dlls/msvcp90/ios.c
@@ -15138,8 +15138,12 @@ static basic_filebuf_char filebuf_char_stdin;
/* ?cin at std@@3V?$basic_istream at DU?$char_traits at D@std@@@1 at A */
struct {
basic_istream_char obj;
+#if _MSVCP_VER >= 110
+ int vtordisp;
+#endif
basic_ios_char vbase;
} cin = { { 0 } };
+C_ASSERT(sizeof(cin) == VBTABLE_BASIC_IOS_ENTRY(basic_istream_char, 0)+sizeof(basic_ios_char));
/* ?_Ptr_cin at std@@3PAV?$basic_istream at DU?$char_traits at D@std@@@1 at A */
/* ?_Ptr_cin at std@@3PEAV?$basic_istream at DU?$char_traits at D@std@@@1 at EA */
basic_istream_char *_Ptr_cin = &cin.obj;
@@ -15148,8 +15152,12 @@ static basic_filebuf_wchar filebuf_short_stdin;
/* ?wcin at std@@3V?$basic_istream at GU?$char_traits at G@std@@@1 at A */
struct {
basic_istream_wchar obj;
+#if _MSVCP_VER >= 110
+ int vtordisp;
+#endif
basic_ios_wchar vbase;
} ucin = { { 0 } };
+C_ASSERT(sizeof(ucin) == VBTABLE_BASIC_IOS_ENTRY(basic_istream_wchar, 0)+sizeof(basic_ios_wchar));
/* ?_Ptr_wcin at std@@3PAV?$basic_istream at GU?$char_traits at G@std@@@1 at A */
/* ?_Ptr_wcin at std@@3PEAV?$basic_istream at GU?$char_traits at G@std@@@1 at EA */
basic_istream_wchar *_Ptr_ucin = &ucin.obj;
@@ -15158,8 +15166,12 @@ static basic_filebuf_wchar filebuf_wchar_stdin;
/* ?wcin at std@@3V?$basic_istream at _WU?$char_traits at _W@std@@@1 at A */
struct {
basic_istream_wchar obj;
+#if _MSVCP_VER >= 110
+ int vtordisp;
+#endif
basic_ios_wchar vbase;
} wcin = { { 0 } };
+C_ASSERT(sizeof(wcin) == VBTABLE_BASIC_IOS_ENTRY(basic_istream_wchar, 0)+sizeof(basic_ios_wchar));
/* ?_Ptr_wcin at std@@3PAV?$basic_istream at _WU?$char_traits at _W@std@@@1 at A */
/* ?_Ptr_wcin at std@@3PEAV?$basic_istream at _WU?$char_traits at _W@std@@@1 at EA */
basic_istream_wchar *_Ptr_wcin = &wcin.obj;
@@ -15168,8 +15180,12 @@ static basic_filebuf_char filebuf_char_stdout;
/* ?cout at std@@3V?$basic_ostream at DU?$char_traits at D@std@@@1 at A */
struct {
basic_ostream_char obj;
+#if _MSVCP_VER >= 110
+ int vtordisp;
+#endif
basic_ios_char vbase;
} cout = { { 0 } };
+C_ASSERT(sizeof(cout) == VBTABLE_BASIC_IOS_ENTRY(basic_ostream_char, 0)+sizeof(basic_ios_char));
/* ?_Ptr_cout at std@@3PAV?$basic_ostream at DU?$char_traits at D@std@@@1 at A */
/* ?_Ptr_cout at std@@3PEAV?$basic_ostream at DU?$char_traits at D@std@@@1 at EA */
basic_ostream_char *_Ptr_cout = &cout.obj;
@@ -15178,8 +15194,12 @@ static basic_filebuf_wchar filebuf_short_stdout;
/* ?wcout at std@@3V?$basic_ostream at GU?$char_traits at G@std@@@1 at A */
struct {
basic_ostream_wchar obj;
+#if _MSVCP_VER >= 110
+ int vtordisp;
+#endif
basic_ios_wchar vbase;
} ucout = { { 0 } };
+C_ASSERT(sizeof(ucout) == VBTABLE_BASIC_IOS_ENTRY(basic_ostream_wchar, 0)+sizeof(basic_ios_wchar));
/* ?_Ptr_wcout at std@@3PAV?$basic_ostream at GU?$char_traits at G@std@@@1 at A */
/* ?_Ptr_wcout at std@@3PEAV?$basic_ostream at GU?$char_traits at G@std@@@1 at EA */
basic_ostream_wchar *_Ptr_ucout = &ucout.obj;
@@ -15188,8 +15208,12 @@ static basic_filebuf_wchar filebuf_wchar_stdout;
/* ?wcout at std@@3V?$basic_ostream at _WU?$char_traits at _W@std@@@1 at A */
struct {
basic_ostream_wchar obj;
+#if _MSVCP_VER >= 110
+ int vtordisp;
+#endif
basic_ios_wchar vbase;
} wcout = { { 0 } };
+C_ASSERT(sizeof(wcout) == VBTABLE_BASIC_IOS_ENTRY(basic_ostream_wchar, 0)+sizeof(basic_ios_wchar));
/* ?_Ptr_wcout at std@@3PAV?$basic_ostream at _WU?$char_traits at _W@std@@@1 at A */
/* ?_Ptr_wcout at std@@3PEAV?$basic_ostream at _WU?$char_traits at _W@std@@@1 at EA */
basic_ostream_wchar *_Ptr_wcout = &wcout.obj;
@@ -15198,8 +15222,12 @@ static basic_filebuf_char filebuf_char_stderr;
/* ?cerr at std@@3V?$basic_ostream at DU?$char_traits at D@std@@@1 at A */
struct {
basic_ostream_char obj;
+#if _MSVCP_VER >= 110
+ int vtordisp;
+#endif
basic_ios_char vbase;
} cerr = { { 0 } };
+C_ASSERT(sizeof(cerr) == VBTABLE_BASIC_IOS_ENTRY(basic_ostream_char, 0)+sizeof(basic_ios_char));
/* ?_Ptr_cerr at std@@3PAV?$basic_ostream at DU?$char_traits at D@std@@@1 at A */
/* ?_Ptr_cerr at std@@3PEAV?$basic_ostream at DU?$char_traits at D@std@@@1 at EA */
basic_ostream_char *_Ptr_cerr = &cerr.obj;
@@ -15208,8 +15236,12 @@ static basic_filebuf_wchar filebuf_short_stderr;
/* ?wcerr at std@@3V?$basic_ostream at GU?$char_traits at G@std@@@1 at A */
struct {
basic_ostream_wchar obj;
+#if _MSVCP_VER >= 110
+ int vtordisp;
+#endif
basic_ios_wchar vbase;
} ucerr = { { 0 } };
+C_ASSERT(sizeof(ucerr) == VBTABLE_BASIC_IOS_ENTRY(basic_ostream_wchar, 0)+sizeof(basic_ios_wchar));
/* ?_Ptr_wcerr at std@@3PAV?$basic_ostream at GU?$char_traits at G@std@@@1 at A */
/* ?_Ptr_wcerr at std@@3PEAV?$basic_ostream at GU?$char_traits at G@std@@@1 at EA */
basic_ostream_wchar *_Ptr_ucerr = &ucerr.obj;
@@ -15218,8 +15250,12 @@ static basic_filebuf_wchar filebuf_wchar_stderr;
/* ?wcerr at std@@3V?$basic_ostream at _WU?$char_traits at _W@std@@@1 at A */
struct {
basic_ostream_wchar obj;
+#if _MSVCP_VER >= 110
+ int vtordisp;
+#endif
basic_ios_wchar vbase;
} wcerr = { { 0 } };
+C_ASSERT(sizeof(wcerr) == VBTABLE_BASIC_IOS_ENTRY(basic_ostream_wchar, 0)+sizeof(basic_ios_wchar));
/* ?_Ptr_wcerr at std@@3PAV?$basic_ostream at _WU?$char_traits at _W@std@@@1 at A */
/* ?_Ptr_wcerr at std@@3PEAV?$basic_ostream at _WU?$char_traits at _W@std@@@1 at EA */
basic_ostream_wchar *_Ptr_wcerr = &wcerr.obj;
@@ -15228,8 +15264,12 @@ static basic_filebuf_char filebuf_char_log;
/* ?clog at std@@3V?$basic_ostream at DU?$char_traits at D@std@@@1 at A */
struct {
basic_ostream_char obj;
+#if _MSVCP_VER >= 110
+ int vtordisp;
+#endif
basic_ios_char vbase;
} clog = { { 0 } };
+C_ASSERT(sizeof(clog) == VBTABLE_BASIC_IOS_ENTRY(basic_ostream_char, 0)+sizeof(basic_ios_char));
/* ?_Ptr_clog at std@@3PAV?$basic_ostream at DU?$char_traits at D@std@@@1 at A */
/* ?_Ptr_clog at std@@3PEAV?$basic_ostream at DU?$char_traits at D@std@@@1 at EA */
basic_ostream_char *_Ptr_clog = &clog.obj;
@@ -15238,8 +15278,12 @@ static basic_filebuf_wchar filebuf_short_log;
/* ?wclog at std@@3V?$basic_ostream at GU?$char_traits at G@std@@@1 at A */
struct {
basic_ostream_wchar obj;
+#if _MSVCP_VER >= 110
+ int vtordisp;
+#endif
basic_ios_wchar vbase;
} uclog = { { 0 } };
+C_ASSERT(sizeof(uclog) == VBTABLE_BASIC_IOS_ENTRY(basic_ostream_wchar, 0)+sizeof(basic_ios_wchar));
/* ?_Ptr_wclog at std@@3PAV?$basic_ostream at GU?$char_traits at G@std@@@1 at A */
/* ?_Ptr_wclog at std@@3PEAV?$basic_ostream at GU?$char_traits at G@std@@@1 at EA */
basic_ostream_wchar *_Ptr_uclog = &uclog.obj;
@@ -15248,8 +15292,12 @@ static basic_filebuf_wchar filebuf_wchar_log;
/* ?wclog at std@@3V?$basic_ostream at _WU?$char_traits at _W@std@@@1 at A */
struct {
basic_ostream_wchar obj;
+#if _MSVCP_VER >= 110
+ int vtordisp;
+#endif
basic_ios_wchar vbase;
} wclog = { { 0 } };
+C_ASSERT(sizeof(wclog) == VBTABLE_BASIC_IOS_ENTRY(basic_ostream_wchar, 0)+sizeof(basic_ios_wchar));
/* ?_Ptr_wclog at std@@3PAV?$basic_ostream at _WU?$char_traits at _W@std@@@1 at A */
/* ?_Ptr_wclog at std@@3PEAV?$basic_ostream at _WU?$char_traits at _W@std@@@1 at EA */
basic_ostream_wchar *_Ptr_wclog = &wclog.obj;
More information about the wine-cvs
mailing list