msvcirt: Include iostream in strstream's and stdiostream's rtti hierarchy.

Signed-off-by: Arkadiusz Hiler <ahiler@codeweavers.com> Signed-off-by: Piotr Caban <piotr@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

msvcirt: Include iostream in strstream's and stdiostream's rtti hierarchy.
b3428ac9 · Arkadiusz Hiler · Alexandre Julliard · d25e7429 · b3428ac9 · b3428ac9
Commit b3428ac9 authored Sep 07, 2020 by Arkadiusz Hiler Committed by Alexandre Julliard Sep 07, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

msvcirt.c dlls/msvcirt/msvcirt.c +2 -2

cxx.h dlls/msvcp90/cxx.h +2 -0

No files found.
--- a/dlls/msvcirt/msvcirt.c
+++ b/dlls/msvcirt/msvcirt.c
@@ -315,10 +315,10 @@ DEFINE_RTTI_DATA2(ifstream, sizeof(istream),
 DEFINE_RTTI_DATA4(iostream, sizeof(iostream),
    &istream_rtti_base_descriptor, &ios_rtti_base_descriptor,
    &ostream_rtti_base_descriptor, &ios_rtti_base_descriptor, ".?AViostream@@")
-DEFINE_RTTI_DATA4(strstream, sizeof(iostream),
+DEFINE_RTTI_DATA5(strstream, sizeof(iostream), &iostream_rtti_base_descriptor,
    &istream_rtti_base_descriptor, &ios_rtti_base_descriptor,
    &ostream_rtti_base_descriptor, &ios_rtti_base_descriptor, ".?AVstrstream@@")
-DEFINE_RTTI_DATA4(stdiostream, sizeof(iostream),
+DEFINE_RTTI_DATA5(stdiostream, sizeof(iostream), &iostream_rtti_base_descriptor,
    &istream_rtti_base_descriptor, &ios_rtti_base_descriptor,
    &ostream_rtti_base_descriptor, &ios_rtti_base_descriptor, ".?AVstdiostream@@")


--- a/dlls/msvcp90/cxx.h
+++ b/dlls/msvcp90/cxx.h
@@ -247,6 +247,8 @@ static void init_ ## type ## _cxx(char *base) \
    DEFINE_RTTI_DATA(name, off, 3, cl1, cl2, cl3, NULL, NULL, NULL, NULL, NULL, NULL, mangled_name)
 #define DEFINE_RTTI_DATA4(name, off, cl1, cl2, cl3, cl4, mangled_name) \
    DEFINE_RTTI_DATA(name, off, 4, cl1, cl2, cl3, cl4, NULL, NULL, NULL, NULL, NULL, mangled_name)
+#define DEFINE_RTTI_DATA5(name, off, cl1, cl2, cl3, cl4, cl5, mangled_name) \
+    DEFINE_RTTI_DATA(name, off, 5, cl1, cl2, cl3, cl4, cl5, NULL, NULL, NULL, NULL, mangled_name)
 #define DEFINE_RTTI_DATA8(name, off, cl1, cl2, cl3, cl4, cl5, cl6, cl7, cl8, mangled_name) \
    DEFINE_RTTI_DATA(name, off, 8, cl1, cl2, cl3, cl4, cl5, cl6, cl7, cl8, NULL, mangled_name)
 #define DEFINE_RTTI_DATA9(name, off, cl1, cl2, cl3, cl4, cl5, cl6, cl7, cl8, cl9, mangled_name) \