From: Piotr Caban piotr@codeweavers.com
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=57242 --- dlls/msvcp70/msvcp70.spec | 18 +++++++++--------- dlls/msvcp90/ios.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 9 deletions(-)
diff --git a/dlls/msvcp70/msvcp70.spec b/dlls/msvcp70/msvcp70.spec index cb7991ebc29..054755c40a5 100644 --- a/dlls/msvcp70/msvcp70.spec +++ b/dlls/msvcp70/msvcp70.spec @@ -164,21 +164,21 @@ @ cdecl -arch=arm ??0?$basic_istringstream@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAA@H@Z(ptr long long) basic_istringstream_wchar_ctor_mode @ thiscall -arch=i386 ??0?$basic_istringstream@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAE@H@Z(ptr long long) basic_istringstream_wchar_ctor_mode @ cdecl -arch=win64 ??0?$basic_istringstream@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAA@H@Z(ptr long long) basic_istringstream_wchar_ctor_mode -@ stub -arch=arm ??0?$basic_ofstream@DU?$char_traits@D@std@@@std@@QAA@PBDH@Z -@ stub -arch=i386 ??0?$basic_ofstream@DU?$char_traits@D@std@@@std@@QAE@PBDH@Z -@ stub -arch=win64 ??0?$basic_ofstream@DU?$char_traits@D@std@@@std@@QEAA@PEBDH@Z +@ cdecl -arch=arm ??0?$basic_ofstream@DU?$char_traits@D@std@@@std@@QAA@PBDH@Z(ptr str long long) basic_ofstream_char_ctor_name_mode +@ thiscall -arch=i386 ??0?$basic_ofstream@DU?$char_traits@D@std@@@std@@QAE@PBDH@Z(ptr str long long) basic_ofstream_char_ctor_name_mode +@ cdecl -arch=win64 ??0?$basic_ofstream@DU?$char_traits@D@std@@@std@@QEAA@PEBDH@Z(ptr str long long) basic_ofstream_char_ctor_name_mode @ cdecl -arch=arm ??0?$basic_ofstream@DU?$char_traits@D@std@@@std@@QAA@XZ(ptr long) basic_ofstream_char_ctor @ thiscall -arch=i386 ??0?$basic_ofstream@DU?$char_traits@D@std@@@std@@QAE@XZ(ptr long) basic_ofstream_char_ctor @ cdecl -arch=win64 ??0?$basic_ofstream@DU?$char_traits@D@std@@@std@@QEAA@XZ(ptr long) basic_ofstream_char_ctor -@ stub -arch=arm ??0?$basic_ofstream@GU?$char_traits@G@std@@@std@@QAA@PBDH@Z -@ stub -arch=i386 ??0?$basic_ofstream@GU?$char_traits@G@std@@@std@@QAE@PBDH@Z -@ stub -arch=win64 ??0?$basic_ofstream@GU?$char_traits@G@std@@@std@@QEAA@PEBDH@Z +@ cdecl -arch=arm ??0?$basic_ofstream@GU?$char_traits@G@std@@@std@@QAA@PBDH@Z(ptr str long long) basic_ofstream_short_ctor_name_mode +@ thiscall -arch=i386 ??0?$basic_ofstream@GU?$char_traits@G@std@@@std@@QAE@PBDH@Z(ptr str long long) basic_ofstream_short_ctor_name_mode +@ cdecl -arch=win64 ??0?$basic_ofstream@GU?$char_traits@G@std@@@std@@QEAA@PEBDH@Z(ptr str long long) basic_ofstream_short_ctor_name_mode @ cdecl -arch=arm ??0?$basic_ofstream@GU?$char_traits@G@std@@@std@@QAA@XZ(ptr long) basic_ofstream_short_ctor @ thiscall -arch=i386 ??0?$basic_ofstream@GU?$char_traits@G@std@@@std@@QAE@XZ(ptr long) basic_ofstream_short_ctor @ cdecl -arch=win64 ??0?$basic_ofstream@GU?$char_traits@G@std@@@std@@QEAA@XZ(ptr long) basic_ofstream_short_ctor -@ stub -arch=arm ??0?$basic_ofstream@_WU?$char_traits@_W@std@@@std@@QAA@PBDH@Z -@ stub -arch=i386 ??0?$basic_ofstream@_WU?$char_traits@_W@std@@@std@@QAE@PBDH@Z -@ stub -arch=win64 ??0?$basic_ofstream@_WU?$char_traits@_W@std@@@std@@QEAA@PEBDH@Z +@ cdecl -arch=arm ??0?$basic_ofstream@_WU?$char_traits@_W@std@@@std@@QAA@PBDH@Z(ptr str long long) basic_ofstream_wchar_ctor_name_mode +@ thiscall -arch=i386 ??0?$basic_ofstream@_WU?$char_traits@_W@std@@@std@@QAE@PBDH@Z(ptr str long long) basic_ofstream_wchar_ctor_name_mode +@ cdecl -arch=win64 ??0?$basic_ofstream@_WU?$char_traits@_W@std@@@std@@QEAA@PEBDH@Z(ptr str long long) basic_ofstream_wchar_ctor_name_mode @ cdecl -arch=arm ??0?$basic_ofstream@_WU?$char_traits@_W@std@@@std@@QAA@XZ(ptr long) basic_ofstream_wchar_ctor @ thiscall -arch=i386 ??0?$basic_ofstream@_WU?$char_traits@_W@std@@@std@@QAE@XZ(ptr long) basic_ofstream_wchar_ctor @ cdecl -arch=win64 ??0?$basic_ofstream@_WU?$char_traits@_W@std@@@std@@QEAA@XZ(ptr long) basic_ofstream_wchar_ctor diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 1bf1a41cca4..5b791cd4345 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -11520,6 +11520,17 @@ basic_ofstream_char* __thiscall basic_ofstream_char_ctor_name(basic_ofstream_cha return this; }
+#if _MSVCP_VER == 70 +/* ??0?$basic_ofstream@DU?$char_traits@D@std@@@std@@QAE@PBDH@Z */ +/* ??0?$basic_ofstream@DU?$char_traits@D@std@@@std@@QEAA@PEBDH@Z */ +DEFINE_THISCALL_WRAPPER(basic_ofstream_char_ctor_name_mode, 16) +basic_ofstream_char* __thiscall basic_ofstream_char_ctor_name_mode(basic_ofstream_char *this, + const char *name, int mode, bool virt_init) +{ + return basic_ofstream_char_ctor_name(this, name, mode, _SH_DENYNO, virt_init); +} +#endif + /* ??0?$basic_ofstream@DU?$char_traits@D@std@@@std@@QAE@PBGHH@Z */ /* ??0?$basic_ofstream@DU?$char_traits@D@std@@@std@@QEAA@PEBGHH@Z */ /* ??0?$basic_ofstream@DU?$char_traits@D@std@@@std@@QAE@PB_WHH@Z */ @@ -11766,6 +11777,17 @@ basic_ofstream_wchar* __thiscall basic_ofstream_wchar_ctor_name(basic_ofstream_w return this; }
+#if _MSVCP_VER == 70 +/* ??0?$basic_ofstream@_WU?$char_traits@_W@std@@@std@@QAE@PBDH@Z */ +/* ??0?$basic_ofstream@_WU?$char_traits@_W@std@@@std@@QEAA@PEBDH@Z */ +DEFINE_THISCALL_WRAPPER(basic_ofstream_wchar_ctor_name_mode, 16) +basic_ofstream_wchar* __thiscall basic_ofstream_wchar_ctor_name_mode(basic_ofstream_wchar *this, + const char *name, int mode, bool virt_init) +{ + return basic_ofstream_wchar_ctor_name(this, name, mode, _SH_DENYNO, virt_init); +} +#endif + /* ??0?$basic_ofstream@GU?$char_traits@G@std@@@std@@QAE@PBDHH@Z */ /* ??0?$basic_ofstream@GU?$char_traits@G@std@@@std@@QEAA@PEBDHH@Z */ DEFINE_THISCALL_WRAPPER(basic_ofstream_short_ctor_name, 20) @@ -11777,6 +11799,17 @@ basic_ofstream_wchar* __thiscall basic_ofstream_short_ctor_name(basic_ofstream_w return this; }
+#if _MSVCP_VER == 70 +/* ??0?$basic_ofstream@GU?$char_traits@G@std@@@std@@QAE@PBDH@Z */ +/* ??0?$basic_ofstream@GU?$char_traits@G@std@@@std@@QEAA@PEBDH@Z */ +DEFINE_THISCALL_WRAPPER(basic_ofstream_short_ctor_name_mode, 16) +basic_ofstream_wchar* __thiscall basic_ofstream_short_ctor_name_mode(basic_ofstream_wchar *this, + const char *name, int mode, bool virt_init) +{ + return basic_ofstream_short_ctor_name(this, name, mode, _SH_DENYNO, virt_init); +} +#endif + /* ??0?$basic_ofstream@_WU?$char_traits@_W@std@@@std@@QAE@PBGHH@Z */ /* ??0?$basic_ofstream@_WU?$char_traits@_W@std@@@std@@QEAA@PEBGHH@Z */ /* ??0?$basic_ofstream@_WU?$char_traits@_W@std@@@std@@QAE@PB_WHH@Z */