Module: wine Branch: master Commit: 6ac25d3d8092bd572140b1900baf7e42b12960ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ac25d3d8092bd572140b1900b...
Author: Piotr Caban piotr@codeweavers.com Date: Wed Jan 7 18:02:10 2015 +0100
msvcp70: Add basic_ifstream(name, mode) constructor implementation.
---
dlls/msvcp70/msvcp70.spec | 12 ++++++------ dlls/msvcp90/ios.c | 27 +++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 6 deletions(-)
diff --git a/dlls/msvcp70/msvcp70.spec b/dlls/msvcp70/msvcp70.spec index 7067efa..053f5e7 100644 --- a/dlls/msvcp70/msvcp70.spec +++ b/dlls/msvcp70/msvcp70.spec @@ -50,16 +50,16 @@ @ cdecl -arch=win64 ??0?$basic_fstream@GU?$char_traits@G@std@@@std@@QEAA@XZ(ptr long) basic_fstream_short_ctor @ thiscall -arch=win32 ??0?$basic_fstream@_WU?$char_traits@_W@std@@@std@@QAE@PBDH@Z(ptr str long long) basic_fstream_wchar_ctor_name_noprot @ thiscall -arch=win32 ??0?$basic_fstream@_WU?$char_traits@_W@std@@@std@@QAE@XZ(ptr long) basic_fstream_wchar_ctor -@ stub -arch=win32 ??0?$basic_ifstream@DU?$char_traits@D@std@@@std@@QAE@PBDH@Z -@ stub -arch=win64 ??0?$basic_ifstream@DU?$char_traits@D@std@@@std@@QEAA@PEBDH@Z +@ thiscall -arch=win32 ??0?$basic_ifstream@DU?$char_traits@D@std@@@std@@QAE@PBDH@Z(ptr str long long) basic_ifstream_char_ctor_name_old +@ cdecl -arch=win64 ??0?$basic_ifstream@DU?$char_traits@D@std@@@std@@QEAA@PEBDH@Z(ptr str long long) basic_ifstream_char_ctor_name_old @ thiscall -arch=win32 ??0?$basic_ifstream@DU?$char_traits@D@std@@@std@@QAE@XZ(ptr long) basic_ifstream_char_ctor @ cdecl -arch=win64 ??0?$basic_ifstream@DU?$char_traits@D@std@@@std@@QEAA@XZ(ptr long) basic_ifstream_char_ctor -@ stub -arch=win32 ??0?$basic_ifstream@GU?$char_traits@G@std@@@std@@QAE@PBDH@Z -@ stub -arch=win64 ??0?$basic_ifstream@GU?$char_traits@G@std@@@std@@QEAA@PEBDH@Z +@ thiscall -arch=win32 ??0?$basic_ifstream@GU?$char_traits@G@std@@@std@@QAE@PBDH@Z(ptr str long long) basic_ifstream_short_ctor_name_old +@ cdecl -arch=win64 ??0?$basic_ifstream@GU?$char_traits@G@std@@@std@@QEAA@PEBDH@Z(ptr str long long) basic_ifstream_short_ctor_name_old @ thiscall -arch=win32 ??0?$basic_ifstream@GU?$char_traits@G@std@@@std@@QAE@XZ(ptr long) basic_ifstream_short_ctor @ cdecl -arch=win64 ??0?$basic_ifstream@GU?$char_traits@G@std@@@std@@QEAA@XZ(ptr long) basic_ifstream_short_ctor -@ stub -arch=win32 ??0?$basic_ifstream@_WU?$char_traits@_W@std@@@std@@QAE@PBDH@Z -@ stub -arch=win64 ??0?$basic_ifstream@_WU?$char_traits@_W@std@@@std@@QEAA@PEBDH@Z +@ thiscall -arch=win32 ??0?$basic_ifstream@_WU?$char_traits@_W@std@@@std@@QAE@PBDH@Z(ptr str long long) basic_ifstream_wchar_ctor_name_old +@ cdecl -arch=win64 ??0?$basic_ifstream@_WU?$char_traits@_W@std@@@std@@QEAA@PEBDH@Z(ptr str long long) basic_ifstream_wchar_ctor_name_old @ thiscall -arch=win32 ??0?$basic_ifstream@_WU?$char_traits@_W@std@@@std@@QAE@XZ(ptr long) basic_ifstream_wchar_ctor @ cdecl -arch=win64 ??0?$basic_ifstream@_WU?$char_traits@_W@std@@@std@@QEAA@XZ(ptr long) basic_ifstream_wchar_ctor @ thiscall -arch=i386 ??0?$basic_ios@DU?$char_traits@D@std@@@std@@IAE@XZ(ptr) basic_ios_char_ctor diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 7308729..39c59b6 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -11335,6 +11335,15 @@ basic_ifstream_char* __thiscall basic_ifstream_char_ctor_name(basic_ifstream_cha return this; }
+/* ??0?$basic_ifstream@DU?$char_traits@D@std@@@std@@QAE@PBDH@Z */ +/* ??0?$basic_ifstream@DU?$char_traits@D@std@@@std@@QEAA@PEBDH@Z */ +DEFINE_THISCALL_WRAPPER(basic_ifstream_char_ctor_name_old, 16) +basic_ifstream_char* __thiscall basic_ifstream_char_ctor_name_old(basic_ifstream_char *this, + const char *name, int mode, MSVCP_bool virt_init) +{ + return basic_ifstream_char_ctor_name(this, name, mode, _SH_DENYNO, virt_init); +} + /* ??0?$basic_ifstream@DU?$char_traits@D@std@@@std@@QAE@PBGHH@Z */ /* ??0?$basic_ifstream@DU?$char_traits@D@std@@@std@@QEAA@PEBGHH@Z */ /* ??0?$basic_ifstream@DU?$char_traits@D@std@@@std@@QAE@PB_WHH@Z */ @@ -11588,6 +11597,24 @@ basic_ifstream_wchar* __thiscall basic_ifstream_short_ctor_name(basic_ifstream_w return this; }
+/* ??0?$basic_ifstream@_WU?$char_traits@_W@std@@@std@@QAE@PBDH@Z */ +/* ??0?$basic_ifstream@_WU?$char_traits@_W@std@@@std@@QEAA@PEBDH@Z */ +DEFINE_THISCALL_WRAPPER(basic_ifstream_wchar_ctor_name_old, 16) +basic_ifstream_wchar* __thiscall basic_ifstream_wchar_ctor_name_old(basic_ifstream_wchar *this, + const char *name, int mode, MSVCP_bool virt_init) +{ + return basic_ifstream_wchar_ctor_name(this, name, mode, _SH_DENYNO, virt_init); +} + +/* ??0?$basic_ifstream@GU?$char_traits@G@std@@@std@@QAE@PBDH@Z */ +/* ??0?$basic_ifstream@GU?$char_traits@G@std@@@std@@QEAA@PEBDH@Z */ +DEFINE_THISCALL_WRAPPER(basic_ifstream_short_ctor_name_old, 16) +basic_ifstream_wchar* __thiscall basic_ifstream_short_ctor_name_old(basic_ifstream_wchar *this, + const char *name, int mode, MSVCP_bool virt_init) +{ + return basic_ifstream_short_ctor_name(this, name, mode, _SH_DENYNO, virt_init); +} + /* ??0?$basic_ifstream@_WU?$char_traits@_W@std@@@std@@QAE@PBGHH@Z */ /* ??0?$basic_ifstream@_WU?$char_traits@_W@std@@@std@@QEAA@PEBGHH@Z */ /* ??0?$basic_ifstream@_WU?$char_traits@_W@std@@@std@@QAE@PB_WHH@Z */