[PATCH 0/1] MR6583: msvcp70: Add basic_ofstream consturctor implementation.

[Piotr Caban (＠piotr)]

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/6583

[PATCH 1/1] msvcp70: Add basic_ofstream consturctor implementation.

[Piotr Caban]

From: Piotr Caban <piotr(a)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(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAA(a)H@Z(ptr long long) basic_istringstream_wchar_ctor_mode
 @ thiscall -arch=i386 ??0?$basic_istringstream(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAE(a)H@Z(ptr long long) basic_istringstream_wchar_ctor_mode
 @ cdecl -arch=win64 ??0?$basic_istringstream(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAA(a)H@Z(ptr long long) basic_istringstream_wchar_ctor_mode
-@ stub -arch=arm ??0?$basic_ofstream(a)DU?$char_traits(a)D@std@@@std@@QAA(a)PBDH@Z
-@ stub -arch=i386 ??0?$basic_ofstream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)PBDH@Z
-@ stub -arch=win64 ??0?$basic_ofstream(a)DU?$char_traits(a)D@std@@@std@@QEAA(a)PEBDH@Z
+@ cdecl -arch=arm ??0?$basic_ofstream(a)DU?$char_traits(a)D@std@@@std@@QAA(a)PBDH@Z(ptr str long long) basic_ofstream_char_ctor_name_mode
+@ thiscall -arch=i386 ??0?$basic_ofstream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)PBDH@Z(ptr str long long) basic_ofstream_char_ctor_name_mode
+@ cdecl -arch=win64 ??0?$basic_ofstream(a)DU?$char_traits(a)D@std@@@std@@QEAA(a)PEBDH@Z(ptr str long long) basic_ofstream_char_ctor_name_mode
 @ cdecl -arch=arm ??0?$basic_ofstream(a)DU?$char_traits(a)D@std@@@std@@QAA(a)XZ(ptr long) basic_ofstream_char_ctor
 @ thiscall -arch=i386 ??0?$basic_ofstream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)XZ(ptr long) basic_ofstream_char_ctor
 @ cdecl -arch=win64 ??0?$basic_ofstream(a)DU?$char_traits(a)D@std@@@std@@QEAA(a)XZ(ptr long) basic_ofstream_char_ctor
-@ stub -arch=arm ??0?$basic_ofstream(a)GU?$char_traits(a)G@std@@@std@@QAA(a)PBDH@Z
-@ stub -arch=i386 ??0?$basic_ofstream(a)GU?$char_traits(a)G@std@@@std@@QAE(a)PBDH@Z
-@ stub -arch=win64 ??0?$basic_ofstream(a)GU?$char_traits(a)G@std@@@std@@QEAA(a)PEBDH@Z
+@ cdecl -arch=arm ??0?$basic_ofstream(a)GU?$char_traits(a)G@std@@@std@@QAA(a)PBDH@Z(ptr str long long) basic_ofstream_short_ctor_name_mode
+@ thiscall -arch=i386 ??0?$basic_ofstream(a)GU?$char_traits(a)G@std@@@std@@QAE(a)PBDH@Z(ptr str long long) basic_ofstream_short_ctor_name_mode
+@ cdecl -arch=win64 ??0?$basic_ofstream(a)GU?$char_traits(a)G@std@@@std@@QEAA(a)PEBDH@Z(ptr str long long) basic_ofstream_short_ctor_name_mode
 @ cdecl -arch=arm ??0?$basic_ofstream(a)GU?$char_traits(a)G@std@@@std@@QAA(a)XZ(ptr long) basic_ofstream_short_ctor
 @ thiscall -arch=i386 ??0?$basic_ofstream(a)GU?$char_traits(a)G@std@@@std@@QAE(a)XZ(ptr long) basic_ofstream_short_ctor
 @ cdecl -arch=win64 ??0?$basic_ofstream(a)GU?$char_traits(a)G@std@@@std@@QEAA(a)XZ(ptr long) basic_ofstream_short_ctor
-@ stub -arch=arm ??0?$basic_ofstream(a)_WU?$char_traits(a)_W@std@@@std@@QAA(a)PBDH@Z
-@ stub -arch=i386 ??0?$basic_ofstream(a)_WU?$char_traits(a)_W@std@@@std@@QAE(a)PBDH@Z
-@ stub -arch=win64 ??0?$basic_ofstream(a)_WU?$char_traits(a)_W@std@@@std@@QEAA(a)PEBDH@Z
+@ cdecl -arch=arm ??0?$basic_ofstream(a)_WU?$char_traits(a)_W@std@@@std@@QAA(a)PBDH@Z(ptr str long long) basic_ofstream_wchar_ctor_name_mode
+@ thiscall -arch=i386 ??0?$basic_ofstream(a)_WU?$char_traits(a)_W@std@@@std@@QAE(a)PBDH@Z(ptr str long long) basic_ofstream_wchar_ctor_name_mode
+@ cdecl -arch=win64 ??0?$basic_ofstream(a)_WU?$char_traits(a)_W@std@@@std@@QEAA(a)PEBDH@Z(ptr str long long) basic_ofstream_wchar_ctor_name_mode
 @ cdecl -arch=arm ??0?$basic_ofstream(a)_WU?$char_traits(a)_W@std@@@std@@QAA(a)XZ(ptr long) basic_ofstream_wchar_ctor
 @ thiscall -arch=i386 ??0?$basic_ofstream(a)_WU?$char_traits(a)_W@std@@@std@@QAE(a)XZ(ptr long) basic_ofstream_wchar_ctor
 @ cdecl -arch=win64 ??0?$basic_ofstream(a)_WU?$char_traits(a)_W@std@@@std@@QEAA(a)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(a)DU?$char_traits(a)D@std@@@std@@QAE(a)PBDH@Z */
+/* ??0?$basic_ofstream(a)DU?$char_traits(a)D@std@@@std@@QEAA(a)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(a)DU?$char_traits(a)D@std@@@std@@QAE(a)PBGHH@Z */
 /* ??0?$basic_ofstream(a)DU?$char_traits(a)D@std@@@std@@QEAA(a)PEBGHH@Z */
 /* ??0?$basic_ofstream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)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(a)_WU?$char_traits(a)_W@std@@@std@@QAE(a)PBDH@Z */
+/* ??0?$basic_ofstream(a)_WU?$char_traits(a)_W@std@@@std@@QEAA(a)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(a)GU?$char_traits(a)G@std@@@std@@QAE(a)PBDHH@Z */
 /* ??0?$basic_ofstream(a)GU?$char_traits(a)G@std@@@std@@QEAA(a)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(a)GU?$char_traits(a)G@std@@@std@@QAE(a)PBDH@Z */
+/* ??0?$basic_ofstream(a)GU?$char_traits(a)G@std@@@std@@QEAA(a)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(a)_WU?$char_traits(a)_W@std@@@std@@QAE(a)PBGHH@Z */
 /* ??0?$basic_ofstream(a)_WU?$char_traits(a)_W@std@@@std@@QEAA(a)PEBGHH@Z */
 /* ??0?$basic_ofstream(a)_WU?$char_traits(a)_W@std@@@std@@QAE(a)PB_WHH@Z */
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/6583

[PATCH 1/1] msvcp70: Add basic_ofstream consturctor implementation.

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=148761

Your paranoid android.


=== debian11b (64 bit WoW report) ===

d3d9:
d3d9ex.c:3230: Test failed: Expected message 0x18 for window 0, but didn't receive it, i=0.

user32:
input.c:4305: Test succeeded inside todo block: button_down_hwnd_todo 1: got MSG_TEST_WIN hwnd 00000000038000EE, msg WM_LBUTTONDOWN, wparam 0x1, lparam 0x320032