Module: wine Branch: master Commit: 97f0874a7869b2c17bf1cd6d445d264acd0c63a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97f0874a7869b2c17bf1cd6d44...
Author: Piotr Caban piotr@codeweavers.com Date: Fri Oct 5 14:55:36 2012 +0200
msvcp60: Added basic_ifstream constructors implementation.
---
dlls/msvcp60/ios.c | 110 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp60/msvcp60.spec | 16 +++--- 2 files changed, 118 insertions(+), 8 deletions(-)
diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index 7c1c202..4b98fcf 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -9670,6 +9670,56 @@ basic_ifstream_char* __thiscall basic_ifstream_char_ctor(basic_ifstream_char *th return this; }
+/* ??0?$basic_ifstream@DU?$char_traits@D@std@@@std@@QAE@PAU_iobuf@@@Z */ +/* ??0?$basic_ifstream@DU?$char_traits@D@std@@@std@@QEAA@PEAU_iobuf@@@Z */ +static basic_ifstream_char* basic_ifstream_char_ctor_file( + basic_ifstream_char *this, FILE *file, MSVCP_bool virt_init) +{ + basic_ios_char *basic_ios; + + TRACE("(%p %p %d)\n", this, file, virt_init); + + if(virt_init) { + this->base.vbtable = basic_ifstream_char_vbtable; + basic_ios = basic_istream_char_get_basic_ios(&this->base); + basic_ios_char_ctor(basic_ios); + }else { + basic_ios = basic_istream_char_get_basic_ios(&this->base); + } + + basic_filebuf_char_ctor_file(&this->filebuf, file); + basic_istream_char_ctor(&this->base, &this->filebuf.base, FALSE, FALSE); + basic_ios->base.vtable = &MSVCP_basic_ifstream_char_vtable; + return this; +} + +/* ??0?$basic_ifstream@DU?$char_traits@D@std@@@std@@QAE@ABV01@@Z */ +/* ??0?$basic_ifstream@DU?$char_traits@D@std@@@std@@QEAA@AEBV01@@Z */ +DEFINE_THISCALL_WRAPPER(basic_ifstream_char_copy_ctor, 12) +basic_ifstream_char* __thiscall basic_ifstream_char_copy_ctor(basic_ifstream_char *this, + const basic_ifstream_char *copy, MSVCP_bool virt_init) +{ + TRACE("(%p %p %d)\n", this, copy, virt_init); + return basic_ifstream_char_ctor_file(this, copy->filebuf.file, virt_init); +} + +/* ??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, 16) +basic_ifstream_char* __thiscall basic_ifstream_char_ctor_name(basic_ifstream_char *this, + const char *name, int mode, MSVCP_bool virt_init) +{ + TRACE("(%p %s %d %d)\n", this, name, mode, virt_init); + + basic_ifstream_char_ctor(this, virt_init); + + if(!basic_filebuf_char_open(&this->filebuf, name, mode|OPENMODE_in, _SH_DENYNO)) { + basic_ios_char *basic_ios = basic_istream_char_get_basic_ios(&this->base); + basic_ios_char_setstate(basic_ios, IOSTATE_failbit); + } + return this; +} + /* ??1?$basic_ifstream@DU?$char_traits@D@std@@@std@@UAE@XZ */ /* ??1?$basic_ifstream@DU?$char_traits@D@std@@@std@@UEAA@XZ */ DEFINE_THISCALL_WRAPPER(basic_ifstream_char_dtor, 4) @@ -9813,6 +9863,66 @@ basic_ifstream_wchar* __thiscall basic_ifstream_short_ctor(basic_ifstream_wchar return this; }
+/* ??0?$basic_ifstream@_WU?$char_traits@_W@std@@@std@@QAE@PAU_iobuf@@@Z */ +/* ??0?$basic_ifstream@_WU?$char_traits@_W@std@@@std@@QEAA@PEAU_iobuf@@@Z */ +static basic_ifstream_wchar* basic_ifstream_wchar_ctor_file( + basic_ifstream_wchar *this, FILE *file, MSVCP_bool virt_init) +{ + basic_ios_wchar *basic_ios; + + TRACE("(%p %p %d)\n", this, file, virt_init); + + if(virt_init) { + this->base.vbtable = basic_ifstream_wchar_vbtable; + basic_ios = basic_istream_wchar_get_basic_ios(&this->base); + basic_ios_wchar_ctor(basic_ios); + }else { + basic_ios = basic_istream_wchar_get_basic_ios(&this->base); + } + + basic_filebuf_wchar_ctor_file(&this->filebuf, file); + basic_istream_wchar_ctor(&this->base, &this->filebuf.base, FALSE, FALSE); + basic_ios->base.vtable = &MSVCP_basic_ifstream_wchar_vtable; + return this; +} + +/* ??0?$basic_ifstream@GU?$char_traits@G@std@@@std@@QAE@PAU_iobuf@@@Z */ +/* ??0?$basic_ifstream@GU?$char_traits@G@std@@@std@@QEAA@PEAU_iobuf@@@Z */ +static basic_ifstream_wchar* basic_ifstream_short_ctor_file( + basic_ifstream_wchar *this, FILE *file, MSVCP_bool virt_init) +{ + basic_ifstream_wchar_ctor_file(this, file, virt_init); + basic_istream_wchar_get_basic_ios(&this->base)->base.vtable = &MSVCP_basic_ifstream_short_vtable; + return this; +} + +/* ??0?$basic_ifstream@GU?$char_traits@G@std@@@std@@QAE@ABV01@@Z */ +/* ??0?$basic_ifstream@GU?$char_traits@G@std@@@std@@QEAA@AEBV01@@Z */ +DEFINE_THISCALL_WRAPPER(basic_ifstream_short_copy_ctor, 12) +basic_ifstream_wchar* __thiscall basic_ifstream_short_copy_ctor(basic_ifstream_wchar *this, + basic_ifstream_wchar *copy, MSVCP_bool virt_init) +{ + TRACE("(%p %p %d)\n", this, copy, virt_init); + return basic_ifstream_short_ctor_file(this, copy->filebuf.file, 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, 16) +basic_ifstream_wchar* __thiscall basic_ifstream_short_ctor_name(basic_ifstream_wchar *this, + const char *name, int mode, MSVCP_bool virt_init) +{ + TRACE("(%p %s %d %d)\n", this, name, mode, virt_init); + + basic_ifstream_short_ctor(this, virt_init); + + if(!basic_filebuf_wchar_open(&this->filebuf, name, mode|OPENMODE_in, _SH_DENYNO)) { + basic_ios_wchar *basic_ios = basic_istream_wchar_get_basic_ios(&this->base); + basic_ios_wchar_setstate(basic_ios, IOSTATE_failbit); + } + return this; +} + /* ??1?$basic_ifstream@_WU?$char_traits@_W@std@@@std@@UAE@XZ */ /* ??1?$basic_ifstream@_WU?$char_traits@_W@std@@@std@@UEAA@XZ */ /* ??1?$basic_ifstream@GU?$char_traits@G@std@@@std@@UAE@XZ */ diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index 94bd7ec..aeae92b 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -541,16 +541,16 @@ @ stub -arch=win64 ??0?$basic_fstream@GU?$char_traits@G@std@@@std@@QEAA@PEBDH@Z @ thiscall -arch=win32 ??0?$basic_fstream@GU?$char_traits@G@std@@@std@@QAE@XZ(ptr long) basic_fstream_short_ctor @ cdecl -arch=win64 ??0?$basic_fstream@GU?$char_traits@G@std@@@std@@QEAA@XZ(ptr long) basic_fstream_short_ctor -@ stub -arch=win32 ??0?$basic_ifstream@DU?$char_traits@D@std@@@std@@QAE@ABV01@@Z -@ stub -arch=win64 ??0?$basic_ifstream@DU?$char_traits@D@std@@@std@@QEAA@AEBV01@@Z -@ 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@ABV01@@Z(ptr ptr long) basic_ifstream_char_copy_ctor +@ cdecl -arch=win64 ??0?$basic_ifstream@DU?$char_traits@D@std@@@std@@QEAA@AEBV01@@Z(ptr ptr long) basic_ifstream_char_copy_ctor +@ thiscall -arch=win32 ??0?$basic_ifstream@DU?$char_traits@D@std@@@std@@QAE@PBDH@Z(ptr str long long) basic_ifstream_char_ctor_name +@ cdecl -arch=win64 ??0?$basic_ifstream@DU?$char_traits@D@std@@@std@@QEAA@PEBDH@Z(ptr str long long) basic_ifstream_char_ctor_name @ 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@ABV01@@Z -@ stub -arch=win64 ??0?$basic_ifstream@GU?$char_traits@G@std@@@std@@QEAA@AEBV01@@Z -@ 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@ABV01@@Z(ptr ptr long) basic_ifstream_short_copy_ctor +@ cdecl -arch=win64 ??0?$basic_ifstream@GU?$char_traits@G@std@@@std@@QEAA@AEBV01@@Z(ptr ptr long) basic_ifstream_short_copy_ctor +@ thiscall -arch=win32 ??0?$basic_ifstream@GU?$char_traits@G@std@@@std@@QAE@PBDH@Z(ptr str long long) basic_ifstream_short_ctor_name +@ cdecl -arch=win64 ??0?$basic_ifstream@GU?$char_traits@G@std@@@std@@QEAA@PEBDH@Z(ptr str long long) basic_ifstream_short_ctor_name @ 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 @ thiscall -arch=win32 ??0?$basic_ios@DU?$char_traits@D@std@@@std@@IAE@XZ(ptr) basic_ios_char_ctor