Related to:
- https://bugs.winehq.org/show_bug.cgi?id=39034 (closed)
- 6d22a3a4764d2e3247b26c875ff27ee2963e7220 msvcp120: Fix layout of classes with vtordisp field.
- 91ddd1d8b2b3164bffe1b4a7ddf2c485dd7a3879 msvcp120/tests: Test virtual base table size exports.
- 367b30d8278684aaff373f5666b78264137d7a8f msvcp120: Add vtordisp field to classes with virtual base.
- ba35b96e0e72c009942f5cede40a1957d952c0b8 msvcp120: Add _Add_vtordisp virtual functions to basic_ios class.
Signed-off-by: Bernhard Übelacker <bernhardu at vr-web.de>
---
dlls/msvcp60/tests/ios.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 49 insertions(+)
diff --git a/dlls/msvcp60/tests/ios.c b/dlls/msvcp60/tests/ios.c
index cf0fa19..f121604 100644
--- a/dlls/msvcp60/tests/ios.c
+++ b/dlls/msvcp60/tests/ios.c
@@ -1636,6 +1636,53 @@ static void test_ostream_print_ushort(void)
call_func1(p_basic_stringstream_wchar_vbase_dtor, &wss);
}
+static struct {
+ int value[2];
+ const char* export_name;
+} vbtable_size_exports_list[] = {
+ {{0x60, 0xb0}, "??_8?$basic_fstream at DU?$char_traits at D@std@@@std@@7B?$basic_istream at DU?$char_traits at D@std@@@1@@"},
+ {{0x58, 0xa0}, "??_8?$basic_fstream at DU?$char_traits at D@std@@@std@@7B?$basic_ostream at DU?$char_traits at D@std@@@1@@"},
+ {{0x60, 0xb0}, "??_8?$basic_fstream at GU?$char_traits at G@std@@@std@@7B?$basic_istream at GU?$char_traits at G@std@@@1@@"},
+ {{0x58, 0xa0}, "??_8?$basic_fstream at GU?$char_traits at G@std@@@std@@7B?$basic_ostream at GU?$char_traits at G@std@@@1@@"},
+ {{0x5c, 0xa8}, "??_8?$basic_ifstream at DU?$char_traits at D@std@@@std@@7B@"},
+ {{0x5c, 0xa8}, "??_8?$basic_ifstream at GU?$char_traits at G@std@@@std@@7B@"},
+ {{ 0xc, 0x18}, "??_8?$basic_iostream at DU?$char_traits at D@std@@@std@@7B?$basic_istream at DU?$char_traits at D@std@@@1@@"},
+ {{ 0x4, 0x8}, "??_8?$basic_iostream at DU?$char_traits at D@std@@@std@@7B?$basic_ostream at DU?$char_traits at D@std@@@1@@"},
+ {{ 0xc, 0x18}, "??_8?$basic_iostream at GU?$char_traits at G@std@@@std@@7B?$basic_istream at GU?$char_traits at G@std@@@1@@"},
+ {{ 0x4, 0x8}, "??_8?$basic_iostream at GU?$char_traits at G@std@@@std@@7B?$basic_ostream at GU?$char_traits at G@std@@@1@@"},
+ {{ 0x8, 0x10}, "??_8?$basic_istream at DU?$char_traits at D@std@@@std@@7B@"},
+ {{ 0x8, 0x10}, "??_8?$basic_istream at GU?$char_traits at G@std@@@std@@7B@"},
+ {{0x54, 0x98}, "??_8?$basic_istringstream at DU?$char_traits at D@std@@V?$allocator at D@2@@std@@7B@"},
+ {{0x54, 0x98}, "??_8?$basic_istringstream at GU?$char_traits at G@std@@V?$allocator at G@2@@std@@7B@"},
+ {{0x58, 0xa0}, "??_8?$basic_ofstream at DU?$char_traits at D@std@@@std@@7B@"},
+ {{0x58, 0xa0}, "??_8?$basic_ofstream at GU?$char_traits at G@std@@@std@@7B@"},
+ {{ 0x4, 0x8}, "??_8?$basic_ostream at DU?$char_traits at D@std@@@std@@7B@"},
+ {{ 0x4, 0x8}, "??_8?$basic_ostream at GU?$char_traits at G@std@@@std@@7B@"},
+ {{0x50, 0x90}, "??_8?$basic_ostringstream at DU?$char_traits at D@std@@V?$allocator at D@2@@std@@7B@"},
+ {{0x50, 0x90}, "??_8?$basic_ostringstream at GU?$char_traits at G@std@@V?$allocator at G@2@@std@@7B@"},
+ {{0x58, 0xa0}, "??_8?$basic_stringstream at DU?$char_traits at D@std@@V?$allocator at D@2@@std@@7B?$basic_istream at DU?$char_traits at D@std@@@1@@"},
+ {{0x50, 0x90}, "??_8?$basic_stringstream at DU?$char_traits at D@std@@V?$allocator at D@2@@std@@7B?$basic_ostream at DU?$char_traits at D@std@@@1@@"},
+ {{0x58, 0xa0}, "??_8?$basic_stringstream at GU?$char_traits at G@std@@V?$allocator at G@2@@std@@7B?$basic_istream at GU?$char_traits at G@std@@@1@@"},
+ {{0x50, 0x90}, "??_8?$basic_stringstream at GU?$char_traits at G@std@@V?$allocator at G@2@@std@@7B?$basic_ostream at GU?$char_traits at G@std@@@1@@"},
+ {{0x00, 0x00}, 0}
+};
+
+static void test_vbtable_size_exports(void)
+{
+ int i;
+ const int *p_vbtable;
+ int arch_idx = (sizeof(void*) == 8);
+
+ for (i = 0; vbtable_size_exports_list[i].export_name; i++)
+ {
+ SET(p_vbtable, vbtable_size_exports_list[i].export_name);
+
+ ok(p_vbtable[0] == 0, "vbtable[0] wrong, got 0x%x\n", p_vbtable[0]);
+ ok(p_vbtable[1] == vbtable_size_exports_list[i].value[arch_idx],
+ "%d: %s[1] wrong, got 0x%x\n", i, vbtable_size_exports_list[i].export_name, p_vbtable[1]);
+ }
+}
+
START_TEST(ios)
{
@@ -1653,5 +1700,7 @@ START_TEST(ios)
test_istream_getline();
test_ostream_print_ushort();
+ test_vbtable_size_exports();
+
FreeLibrary(msvcp);
}
--
2.1.4