October 2012 - Wine-commits

Piotr Caban : msvcp60: Added basic_ifstream constructors implementation.
by Alexandre Julliard 08 Oct '12

08 Oct '12

Module: wine Branch: master Commit: 97f0874a7869b2c17bf1cd6d445d264acd0c63a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97f0874a7869b2c17bf1cd6d4… Author: Piotr Caban <piotr(a)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(a)DU?$char_traits(a)D@std@@@std@@QAE(a)PAU_iobuf@@@Z */ +/* ??0?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QEAA(a)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(a)DU?$char_traits(a)D@std@@@std@@QAE(a)ABV01@@Z */ +/* ??0?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QEAA(a)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(a)DU?$char_traits(a)D@std@@@std@@QAE(a)PBDH@Z */ +/* ??0?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QEAA(a)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(a)DU?$char_traits(a)D@std@@@std@@UAE(a)XZ */ /* ??1?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@UEAA(a)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(a)_WU?$char_traits(a)_W@std@@@std@@QAE(a)PAU_iobuf@@@Z */ +/* ??0?$basic_ifstream(a)_WU?$char_traits(a)_W@std@@@std@@QEAA(a)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(a)GU?$char_traits(a)G@std@@@std@@QAE(a)PAU_iobuf@@@Z */ +/* ??0?$basic_ifstream(a)GU?$char_traits(a)G@std@@@std@@QEAA(a)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(a)GU?$char_traits(a)G@std@@@std@@QAE(a)ABV01@@Z */ +/* ??0?$basic_ifstream(a)GU?$char_traits(a)G@std@@@std@@QEAA(a)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(a)GU?$char_traits(a)G@std@@@std@@QAE(a)PBDH@Z */ +/* ??0?$basic_ifstream(a)GU?$char_traits(a)G@std@@@std@@QEAA(a)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(a)_WU?$char_traits(a)_W@std@@@std@@UAE(a)XZ */ /* ??1?$basic_ifstream(a)_WU?$char_traits(a)_W@std@@@std@@UEAA(a)XZ */ /* ??1?$basic_ifstream(a)GU?$char_traits(a)G@std@@@std@@UAE(a)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(a)GU?$char_traits(a)G@std@@@std@@QEAA(a)PEBDH@Z @ thiscall -arch=win32 ??0?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QAE(a)XZ(ptr long) basic_fstream_short_ctor @ cdecl -arch=win64 ??0?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QEAA(a)XZ(ptr long) basic_fstream_short_ctor -@ stub -arch=win32 ??0?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)ABV01@@Z -@ stub -arch=win64 ??0?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QEAA(a)AEBV01@@Z -@ stub -arch=win32 ??0?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)PBDH@Z -@ stub -arch=win64 ??0?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QEAA(a)PEBDH@Z +@ thiscall -arch=win32 ??0?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)ABV01@@Z(ptr ptr long) basic_ifstream_char_copy_ctor +@ cdecl -arch=win64 ??0?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QEAA(a)AEBV01@@Z(ptr ptr long) basic_ifstream_char_copy_ctor +@ thiscall -arch=win32 ??0?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)PBDH@Z(ptr str long long) basic_ifstream_char_ctor_name +@ cdecl -arch=win64 ??0?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QEAA(a)PEBDH@Z(ptr str long long) basic_ifstream_char_ctor_name @ thiscall -arch=win32 ??0?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)XZ(ptr long) basic_ifstream_char_ctor @ cdecl -arch=win64 ??0?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QEAA(a)XZ(ptr long) basic_ifstream_char_ctor -@ stub -arch=win32 ??0?$basic_ifstream(a)GU?$char_traits(a)G@std@@@std@@QAE(a)ABV01@@Z -@ stub -arch=win64 ??0?$basic_ifstream(a)GU?$char_traits(a)G@std@@@std@@QEAA(a)AEBV01@@Z -@ stub -arch=win32 ??0?$basic_ifstream(a)GU?$char_traits(a)G@std@@@std@@QAE(a)PBDH@Z -@ stub -arch=win64 ??0?$basic_ifstream(a)GU?$char_traits(a)G@std@@@std@@QEAA(a)PEBDH@Z +@ thiscall -arch=win32 ??0?$basic_ifstream(a)GU?$char_traits(a)G@std@@@std@@QAE(a)ABV01@@Z(ptr ptr long) basic_ifstream_short_copy_ctor +@ cdecl -arch=win64 ??0?$basic_ifstream(a)GU?$char_traits(a)G@std@@@std@@QEAA(a)AEBV01@@Z(ptr ptr long) basic_ifstream_short_copy_ctor +@ thiscall -arch=win32 ??0?$basic_ifstream(a)GU?$char_traits(a)G@std@@@std@@QAE(a)PBDH@Z(ptr str long long) basic_ifstream_short_ctor_name +@ cdecl -arch=win64 ??0?$basic_ifstream(a)GU?$char_traits(a)G@std@@@std@@QEAA(a)PEBDH@Z(ptr str long long) basic_ifstream_short_ctor_name @ thiscall -arch=win32 ??0?$basic_ifstream(a)GU?$char_traits(a)G@std@@@std@@QAE(a)XZ(ptr long) basic_ifstream_short_ctor @ cdecl -arch=win64 ??0?$basic_ifstream(a)GU?$char_traits(a)G@std@@@std@@QEAA(a)XZ(ptr long) basic_ifstream_short_ctor @ thiscall -arch=win32 ??0?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@IAE(a)XZ(ptr) basic_ios_char_ctor

1 0

Piotr Caban : msvcp60: Added basic_ofstream constructors implementation.
by Alexandre Julliard 08 Oct '12

08 Oct '12

Module: wine Branch: master Commit: 1956360c6d8d5a82c28a2fed0693936a013b898e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1956360c6d8d5a82c28a2fed0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Oct 5 14:55:51 2012 +0200 msvcp60: Added basic_ofstream 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 4b98fcf..cb355ec 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -9383,6 +9383,56 @@ basic_ofstream_char* __thiscall basic_ofstream_char_ctor(basic_ofstream_char *th return this; } +/* ??0?$basic_ofstream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)PAU_iobuf@@@Z */ +/* ??0?$basic_ofstream(a)DU?$char_traits(a)D@std@@@std@@QEAA(a)PEAU_iobuf@@@Z */ +static basic_ofstream_char* basic_ofstream_char_ctor_file( + basic_ofstream_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_ofstream_char_vbtable; + basic_ios = basic_ostream_char_get_basic_ios(&this->base); + basic_ios_char_ctor(basic_ios); + }else { + basic_ios = basic_ostream_char_get_basic_ios(&this->base); + } + + basic_filebuf_char_ctor_file(&this->filebuf, file); + basic_ostream_char_ctor(&this->base, &this->filebuf.base, FALSE, FALSE); + basic_ios->base.vtable = &MSVCP_basic_ofstream_char_vtable; + return this; +} + +/* ??0?$basic_ofstream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)ABV01@@Z */ +/* ??0?$basic_ofstream(a)DU?$char_traits(a)D@std@@@std@@QEAA(a)AEBV01@@Z */ +DEFINE_THISCALL_WRAPPER(basic_ofstream_char_copy_ctor, 12) +basic_ofstream_char* __thiscall basic_ofstream_char_copy_ctor(basic_ofstream_char *this, + basic_ofstream_char *copy, MSVCP_bool virt_init) +{ + TRACE("(%p %p %d)\n", this, copy, virt_init); + return basic_ofstream_char_ctor_file(this, copy->filebuf.file, virt_init); +} + +/* ??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, 16) +basic_ofstream_char* __thiscall basic_ofstream_char_ctor_name(basic_ofstream_char *this, + const char *name, int mode, MSVCP_bool virt_init) +{ + TRACE("(%p %s %d %d)\n", this, name, mode, virt_init); + + basic_ofstream_char_ctor(this, virt_init); + + if(!basic_filebuf_char_open(&this->filebuf, name, mode|OPENMODE_out, _SH_DENYNO)) { + basic_ios_char *basic_ios = basic_ostream_char_get_basic_ios(&this->base); + basic_ios_char_setstate(basic_ios, IOSTATE_failbit); + } + return this; +} + /* ??1?$basic_ofstream(a)DU?$char_traits(a)D@std@@@std@@UAE(a)XZ */ /* ??1?$basic_ofstream(a)DU?$char_traits(a)D@std@@@std@@UEAA(a)XZ */ DEFINE_THISCALL_WRAPPER(basic_ofstream_char_dtor, 4) @@ -9526,6 +9576,66 @@ basic_ofstream_wchar* __thiscall basic_ofstream_short_ctor(basic_ofstream_wchar return this; } +/* ??0?$basic_ofstream(a)_WU?$char_traits(a)_W@std@@@std@@QAE(a)PAU_iobuf@@@Z */ +/* ??0?$basic_ofstream(a)_WU?$char_traits(a)_W@std@@@std@@QEAA(a)PEAU_iobuf@@@Z */ +static basic_ofstream_wchar* basic_ofstream_wchar_ctor_file( + basic_ofstream_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_ofstream_wchar_vbtable; + basic_ios = basic_ostream_wchar_get_basic_ios(&this->base); + basic_ios_wchar_ctor(basic_ios); + }else { + basic_ios = basic_ostream_wchar_get_basic_ios(&this->base); + } + + basic_filebuf_wchar_ctor_file(&this->filebuf, file); + basic_ostream_wchar_ctor(&this->base, &this->filebuf.base, FALSE, FALSE); + basic_ios->base.vtable = &MSVCP_basic_ofstream_wchar_vtable; + return this; +} + +/* ??0?$basic_ofstream(a)GU?$char_traits(a)G@std@@@std@@QAE(a)PAU_iobuf@@@Z */ +/* ??0?$basic_ofstream(a)GU?$char_traits(a)G@std@@@std@@QEAA(a)PEAU_iobuf@@@Z */ +static basic_ofstream_wchar* basic_ofstream_short_ctor_file( + basic_ofstream_wchar *this, FILE *file, MSVCP_bool virt_init) +{ + basic_ofstream_wchar_ctor_file(this, file, virt_init); + basic_ostream_wchar_get_basic_ios(&this->base)->base.vtable = &MSVCP_basic_ofstream_short_vtable; + return this; +} + +/* ??0?$basic_ofstream(a)GU?$char_traits(a)G@std@@@std@@QAE(a)ABV01@@Z */ +/* ??0?$basic_ofstream(a)GU?$char_traits(a)G@std@@@std@@QEAA(a)AEBV01@@Z */ +DEFINE_THISCALL_WRAPPER(basic_ofstream_short_copy_ctor, 12) +basic_ofstream_wchar* __thiscall basic_ofstream_short_copy_ctor(basic_ofstream_wchar *this, + basic_ofstream_wchar *copy, MSVCP_bool virt_init) +{ + TRACE("(%p %p %d)\n", this, copy, virt_init); + return basic_ofstream_short_ctor_file(this, copy->filebuf.file, virt_init); +} + +/* ??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, 16) +basic_ofstream_wchar* __thiscall basic_ofstream_short_ctor_name(basic_ofstream_wchar *this, + const char *name, int mode, MSVCP_bool virt_init) +{ + TRACE("(%p %s %d %d)\n", this, name, mode, virt_init); + + basic_ofstream_short_ctor(this, virt_init); + + if(!basic_filebuf_wchar_open(&this->filebuf, name, mode|OPENMODE_out, _SH_DENYNO)) { + basic_ios_wchar *basic_ios = basic_ostream_wchar_get_basic_ios(&this->base); + basic_ios_wchar_setstate(basic_ios, IOSTATE_failbit); + } + return this; +} + /* ??1?$basic_ofstream(a)_WU?$char_traits(a)_W@std@@@std@@UAE(a)XZ */ /* ??1?$basic_ofstream(a)_WU?$char_traits(a)_W@std@@@std@@UEAA(a)XZ */ /* ??1?$basic_ofstream(a)GU?$char_traits(a)G@std@@@std@@UAE(a)XZ */ diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index aeae92b..ee9fa34 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -597,16 +597,16 @@ @ cdecl -arch=win64 ??0?$basic_istringstream(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEAA(a)AEBV?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@1(a)H@Z(ptr ptr long long) basic_istringstream_short_ctor_str @ thiscall -arch=win32 ??0?$basic_istringstream(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QAE(a)H@Z(ptr long long) basic_istringstream_short_ctor_mode @ cdecl -arch=win64 ??0?$basic_istringstream(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEAA(a)H@Z(ptr long long) basic_istringstream_short_ctor_mode -@ stub -arch=win32 ??0?$basic_ofstream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)ABV01@@Z -@ stub -arch=win64 ??0?$basic_ofstream(a)DU?$char_traits(a)D@std@@@std@@QEAA(a)AEBV01@@Z -@ stub -arch=win32 ??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 +@ thiscall -arch=win32 ??0?$basic_ofstream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)ABV01@@Z(ptr ptr long) basic_ofstream_char_copy_ctor +@ cdecl -arch=win64 ??0?$basic_ofstream(a)DU?$char_traits(a)D@std@@@std@@QEAA(a)AEBV01@@Z(ptr ptr long) basic_ofstream_char_copy_ctor +@ thiscall -arch=win32 ??0?$basic_ofstream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)PBDH@Z(ptr str long long) basic_ofstream_char_ctor_name +@ 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 @ thiscall -arch=win32 ??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=win32 ??0?$basic_ofstream(a)GU?$char_traits(a)G@std@@@std@@QAE(a)ABV01@@Z -@ stub -arch=win64 ??0?$basic_ofstream(a)GU?$char_traits(a)G@std@@@std@@QEAA(a)AEBV01@@Z -@ stub -arch=win32 ??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 +@ thiscall -arch=win32 ??0?$basic_ofstream(a)GU?$char_traits(a)G@std@@@std@@QAE(a)ABV01@@Z(ptr ptr long) basic_ofstream_short_copy_ctor +@ cdecl -arch=win64 ??0?$basic_ofstream(a)GU?$char_traits(a)G@std@@@std@@QEAA(a)AEBV01@@Z(ptr ptr long) basic_ofstream_short_copy_ctor +@ thiscall -arch=win32 ??0?$basic_ofstream(a)GU?$char_traits(a)G@std@@@std@@QAE(a)PBDH@Z(ptr str long long) basic_ofstream_short_ctor_name +@ 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 @ thiscall -arch=win32 ??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=win32 ??0?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)ABV01@@Z

1 0

Piotr Caban : msvcp60: Added basic_fstream constructors implementation.
by Alexandre Julliard 08 Oct '12

08 Oct '12

Module: wine Branch: master Commit: fd727fc15ef9d537fdcb4fe7d6bd2ee0c87b3ce6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd727fc15ef9d537fdcb4fe7d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Oct 5 14:56:10 2012 +0200 msvcp60: Added basic_fstream constructors implementation. --- dlls/msvcp60/ios.c | 112 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp60/msvcp60.spec | 16 +++--- 2 files changed, 120 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index cb355ec..4d753c5 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -10178,6 +10178,57 @@ basic_fstream_char* __thiscall basic_fstream_char_ctor(basic_fstream_char *this, return this; } +/* ??0?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)PAU_iobuf@@@Z */ +/* ??0?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@QEAA(a)PEAU_iobuf@@@Z */ +static basic_fstream_char* basic_fstream_char_ctor_file(basic_fstream_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.base1.vbtable = basic_fstream_char_vbtable1; + this->base.base2.vbtable = basic_fstream_char_vbtable2; + basic_ios = basic_istream_char_get_basic_ios(&this->base.base1); + basic_ios_char_ctor(basic_ios); + }else { + basic_ios = basic_istream_char_get_basic_ios(&this->base.base1); + } + + basic_filebuf_char_ctor_file(&this->filebuf, file); + basic_iostream_char_ctor(&this->base, &this->filebuf.base, FALSE); + basic_ios->base.vtable = &MSVCP_basic_fstream_char_vtable; + return this; +} + +/* ??0?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)ABV01@@Z */ +/* ??0?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@QEAA(a)AEBV01@@Z */ +DEFINE_THISCALL_WRAPPER(basic_fstream_char_copy_ctor, 12) +basic_fstream_char* __thiscall basic_fstream_char_copy_ctor(basic_fstream_char *this, + basic_fstream_char *copy, MSVCP_bool virt_init) +{ + TRACE("(%p %p %d)\n", this, copy, virt_init); + return basic_fstream_char_ctor_file(this, copy->filebuf.file, virt_init); +} + +/* ??0?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)PBDH@Z */ +/* ??0?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@QEAA(a)PEBDH@Z */ +DEFINE_THISCALL_WRAPPER(basic_fstream_char_ctor_name, 16) +basic_fstream_char* __thiscall basic_fstream_char_ctor_name(basic_fstream_char *this, + const char *name, int mode, MSVCP_bool virt_init) +{ + TRACE("(%p %s %d %d)\n", this, name, mode, virt_init); + + basic_fstream_char_ctor(this, virt_init); + + if(!basic_filebuf_char_open(&this->filebuf, name, mode, _SH_DENYNO)) { + basic_ios_char *basic_ios = basic_istream_char_get_basic_ios(&this->base.base1); + basic_ios_char_setstate(basic_ios, IOSTATE_failbit); + } + return this; +} + /* ??1?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@UAE(a)XZ */ /* ??1?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@UEAA(a)XZ */ DEFINE_THISCALL_WRAPPER(basic_fstream_char_dtor, 4) @@ -10322,6 +10373,67 @@ basic_fstream_wchar* __thiscall basic_fstream_short_ctor(basic_fstream_wchar *th return this; } +/* ??0?$basic_fstream(a)_WU?$char_traits(a)_W@std@@@std@@QAE(a)PAU_iobuf@@@Z */ +/* ??0?$basic_fstream(a)_WU?$char_traits(a)_W@std@@@std@@QEAA(a)PEAU_iobuf@@@Z */ +static basic_fstream_wchar* basic_fstream_wchar_ctor_file(basic_fstream_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.base1.vbtable = basic_fstream_wchar_vbtable1; + this->base.base2.vbtable = basic_fstream_wchar_vbtable2; + basic_ios = basic_istream_wchar_get_basic_ios(&this->base.base1); + basic_ios_wchar_ctor(basic_ios); + }else { + basic_ios = basic_istream_wchar_get_basic_ios(&this->base.base1); + } + + basic_filebuf_wchar_ctor_file(&this->filebuf, file); + basic_iostream_wchar_ctor(&this->base, &this->filebuf.base, FALSE); + basic_ios->base.vtable = &MSVCP_basic_fstream_wchar_vtable; + return this; +} + +/* ??0?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QAE(a)PAU_iobuf@@@Z */ +/* ??0?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QEAA(a)PEAU_iobuf@@@Z */ +static basic_fstream_wchar* basic_fstream_short_ctor_file(basic_fstream_wchar *this, + FILE *file, MSVCP_bool virt_init) +{ + basic_fstream_wchar_ctor_file(this, file, virt_init); + basic_istream_wchar_get_basic_ios(&this->base.base1)->base.vtable = &MSVCP_basic_fstream_short_vtable; + return this; +} + +/* ??0?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QAE(a)ABV01@@Z */ +/* ??0?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QEAA(a)AEBV01@@Z */ +DEFINE_THISCALL_WRAPPER(basic_fstream_short_copy_ctor, 12) +basic_fstream_wchar* __thiscall basic_fstream_short_copy_ctor(basic_fstream_wchar *this, + basic_fstream_wchar *copy, MSVCP_bool virt_init) +{ + TRACE("(%p %p %d)\n", this, copy, virt_init); + return basic_fstream_short_ctor_file(this, copy->filebuf.file, virt_init); +} + +/* ??0?$basic_fstream(a)_WU?$char_traits(a)_W@std@@@std@@QAE(a)PB_WHH@Z */ +/* ??0?$basic_fstream(a)_WU?$char_traits(a)_W@std@@@std@@QEAA(a)PEB_WHH@Z */ +DEFINE_THISCALL_WRAPPER(basic_fstream_short_ctor_name, 16) +basic_fstream_wchar* __thiscall basic_fstream_short_ctor_name(basic_fstream_wchar *this, + const char *name, int mode, MSVCP_bool virt_init) +{ + TRACE("(%p %s %d %d)\n", this, name, mode, virt_init); + + basic_fstream_short_ctor(this, virt_init); + + if(!basic_filebuf_wchar_open(&this->filebuf, name, mode, _SH_DENYNO)) { + basic_ios_wchar *basic_ios = basic_istream_wchar_get_basic_ios(&this->base.base1); + basic_ios_wchar_setstate(basic_ios, IOSTATE_failbit); + } + return this; +} + /* ??1?$basic_fstream(a)_WU?$char_traits(a)_W@std@@@std@@UAE(a)XZ */ /* ??1?$basic_fstream(a)_WU?$char_traits(a)_W@std@@@std@@UEAA(a)XZ */ /* ??1?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@UAE(a)XZ */ diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index ee9fa34..25ee5db 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -529,16 +529,16 @@ @ cdecl -arch=win64 ??0?$basic_filebuf(a)GU?$char_traits(a)G@std@@@std@@QEAA(a)PEAU_iobuf@@@Z(ptr ptr) basic_filebuf_short_ctor_file @ thiscall -arch=win32 ??0?$basic_filebuf(a)GU?$char_traits(a)G@std@@@std@@QAE(a)W4_Uninitialized@1@@Z(ptr long) basic_filebuf_short_ctor_uninitialized @ cdecl -arch=win64 ??0?$basic_filebuf(a)GU?$char_traits(a)G@std@@@std@@QEAA(a)W4_Uninitialized@1@@Z(ptr long) basic_filebuf_short_ctor_uninitialized -@ stub -arch=win32 ??0?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)ABV01@@Z -@ stub -arch=win64 ??0?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@QEAA(a)AEBV01@@Z -@ stub -arch=win32 ??0?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)PBDH@Z -@ stub -arch=win64 ??0?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@QEAA(a)PEBDH@Z +@ thiscall -arch=win32 ??0?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)ABV01@@Z(ptr ptr long) basic_fstream_char_copy_ctor +@ cdecl -arch=win64 ??0?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@QEAA(a)AEBV01@@Z(ptr ptr long) basic_fstream_char_copy_ctor +@ thiscall -arch=win32 ??0?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)PBDH@Z(ptr str long long) basic_fstream_char_ctor_name +@ cdecl -arch=win64 ??0?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@QEAA(a)PEBDH@Z(ptr str long long) basic_fstream_char_ctor_name @ thiscall -arch=win32 ??0?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)XZ(ptr long) basic_fstream_char_ctor @ cdecl -arch=win64 ??0?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@QEAA(a)XZ(ptr long) basic_fstream_char_ctor -@ stub -arch=win32 ??0?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QAE(a)ABV01@@Z -@ stub -arch=win64 ??0?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QEAA(a)AEBV01@@Z -@ stub -arch=win32 ??0?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QAE(a)PBDH@Z -@ stub -arch=win64 ??0?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QEAA(a)PEBDH@Z +@ thiscall -arch=win32 ??0?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QAE(a)ABV01@@Z(ptr ptr long) basic_fstream_short_copy_ctor +@ cdecl -arch=win64 ??0?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QEAA(a)AEBV01@@Z(ptr ptr long) basic_fstream_short_copy_ctor +@ thiscall -arch=win32 ??0?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QAE(a)PBDH@Z(ptr str long long) basic_fstream_short_ctor_name +@ cdecl -arch=win64 ??0?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QEAA(a)PEBDH@Z(ptr str long long) basic_fstream_short_ctor_name @ thiscall -arch=win32 ??0?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QAE(a)XZ(ptr long) basic_fstream_short_ctor @ cdecl -arch=win64 ??0?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QEAA(a)XZ(ptr long) basic_fstream_short_ctor @ thiscall -arch=win32 ??0?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)ABV01@@Z(ptr ptr long) basic_ifstream_char_copy_ctor

1 0

Piotr Caban : msvcp60: Added basic_istream::seekg implementation.
by Alexandre Julliard 08 Oct '12

08 Oct '12

Module: wine Branch: master Commit: 1fb247b0e31460d41bbb88439a1cf926e515b035 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fb247b0e31460d41bbb88439… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Oct 5 14:56:29 2012 +0200 msvcp60: Added basic_istream::seekg implementation. --- dlls/msvcp60/ios.c | 60 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp60/msvcp60.spec | 8 +++--- 2 files changed, 64 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index 4d753c5..2b06716 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -7332,6 +7332,36 @@ fpos_int* __thiscall basic_istream_char_tellg(basic_istream_char *this, fpos_int return ret; } +/* ?seekg@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAEAAV12(a)JW4seekdir@ios_base(a)2@@Z */ +/* ?seekg@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QEAAAEAV12(a)_JW4seekdir@ios_base(a)2@@Z */ +DEFINE_THISCALL_WRAPPER(basic_istream_char_seekg, 12) +basic_istream_char* __thiscall basic_istream_char_seekg(basic_istream_char *this, streamoff off, int dir) +{ + basic_ios_char *base = basic_istream_char_get_basic_ios(this); + + TRACE("(%p %ld %d)\n", this, off, dir); + + if(basic_istream_char_sentry_create(this, TRUE)) { + if(!ios_base_fail(&base->base)) { + basic_streambuf_char *strbuf = basic_ios_char_rdbuf_get(base); + fpos_int ret; + + basic_streambuf_char_pubseekoff(strbuf, &ret, off, dir, OPENMODE_in); + basic_istream_char_sentry_destroy(this); + + if(ret.off==0 && ret.pos==-1 && ret.state==0) + basic_ios_char_setstate(base, IOSTATE_failbit); + else + basic_ios_char_clear(base, IOSTATE_goodbit); + return this; + } + } + basic_istream_char_sentry_destroy(this); + + basic_ios_char_setstate(base, IOSTATE_failbit); + return this; +} + /* ?seekg@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAEAAV12(a)V?$fpos(a)H@2@@Z */ /* ?seekg@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QEAAAEAV12(a)V?$fpos(a)H@2@@Z */ DEFINE_THISCALL_WRAPPER(basic_istream_char_seekg_fpos, 28) @@ -8572,6 +8602,36 @@ fpos_int* __thiscall basic_istream_wchar_tellg(basic_istream_wchar *this, fpos_i return ret; } +/* ?seekg@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QAEAAV12(a)JW4seekdir@ios_base(a)2@@Z */ +/* ?seekg@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QEAAAEAV12(a)_JW4seekdir@ios_base(a)2@@Z */ +DEFINE_THISCALL_WRAPPER(basic_istream_wchar_seekg, 12) +basic_istream_wchar* __thiscall basic_istream_wchar_seekg(basic_istream_wchar *this, streamoff off, int dir) +{ + basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(this); + + TRACE("(%p %ld %d)\n", this, off, dir); + + if(basic_istream_wchar_sentry_create(this, TRUE)) { + if(!ios_base_fail(&base->base)) { + basic_streambuf_wchar *strbuf = basic_ios_wchar_rdbuf_get(base); + fpos_int ret; + + basic_streambuf_wchar_pubseekoff(strbuf, &ret, off, dir, OPENMODE_in); + basic_istream_wchar_sentry_destroy(this); + + if(ret.off==0 && ret.pos==-1 && ret.state==0) + basic_ios_wchar_setstate(base, IOSTATE_failbit); + else + basic_ios_wchar_clear(base, IOSTATE_goodbit); + return this; + } + } + basic_istream_wchar_sentry_destroy(this); + + basic_ios_wchar_setstate(base, IOSTATE_failbit); + return this; +} + /* ?seekg@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QAEAAV12(a)V?$fpos(a)H@2@@Z */ /* ?seekg@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QEAAAEAV12(a)V?$fpos(a)H@2@@Z */ /* ?seekg@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QAEAAV12(a)V?$fpos(a)H@2@@Z */ diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index 25ee5db..22a3da8 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -3908,14 +3908,14 @@ @ cdecl -arch=win64 ?scan_not@?$ctype(a)D@std@@QEBAPEBDFPEBD0(a)Z(ptr long ptr ptr) ctype_char_scan_not @ thiscall -arch=win32 ?scan_not@?$ctype(a)G@std@@QBEPBGFPBG0(a)Z(ptr long ptr ptr) ctype_wchar_scan_not @ cdecl -arch=win64 ?scan_not@?$ctype(a)G@std@@QEBAPEBGFPEBG0(a)Z(ptr long ptr ptr) ctype_wchar_scan_not -@ stub -arch=win32 ?seekg@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAEAAV12(a)JW4seekdir@ios_base(a)2@@Z +@ thiscall -arch=win32 ?seekg@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAEAAV12(a)JW4seekdir@ios_base(a)2@@Z(ptr long long) basic_istream_char_seekg @ cdecl -arch=win64 ?seekg@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QEAAAEAV12(a)V?$fpos(a)H@2@@Z(ptr ptr) basic_istream_char_seekg_fpos @ thiscall -arch=win32 ?seekg@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAEAAV12(a)V?$fpos(a)H@2@@Z(ptr long long int64 long long) basic_istream_char_seekg_fpos -@ stub -arch=win64 ?seekg@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QEAAAEAV12(a)_JW4seekdir@ios_base(a)2@@Z -@ stub -arch=win32 ?seekg@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QAEAAV12(a)JW4seekdir@ios_base(a)2@@Z +@ cdecl -arch=win64 ?seekg@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QEAAAEAV12(a)_JW4seekdir@ios_base(a)2@@Z(ptr long long) basic_istream_char_seekg +@ thiscall -arch=win32 ?seekg@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QAEAAV12(a)JW4seekdir@ios_base(a)2@@Z(ptr long long) basic_istream_wchar_seekg @ cdecl -arch=win64 ?seekg@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QEAAAEAV12(a)V?$fpos(a)H@2@@Z(ptr ptr) basic_istream_wchar_seekg_fpos @ thiscall -arch=win32 ?seekg@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QAEAAV12(a)V?$fpos(a)H@2@@Z(ptr long long int64 long long) basic_istream_wchar_seekg_fpos -@ stub -arch=win64 ?seekg@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QEAAAEAV12(a)_JW4seekdir@ios_base(a)2@@Z +@ cdecl -arch=win64 ?seekg@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QEAAAEAV12(a)_JW4seekdir@ios_base(a)2@@Z(ptr long long) basic_istream_wchar_seekg @ stub -arch=win32 ?seekoff@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@MAE?AV?$fpos(a)H@2(a)JW4seekdir@ios_base(a)2@H(a)Z @ stub -arch=win64 ?seekoff@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@MEAA?AV?$fpos(a)H@2(a)_JW4seekdir@ios_base(a)2@H(a)Z @ stub -arch=win32 ?seekoff@?$basic_filebuf(a)GU?$char_traits(a)G@std@@@std@@MAE?AV?$fpos(a)H@2(a)JW4seekdir@ios_base(a)2@H(a)Z

1 0

Daniel Lehman : msvcrt: Add declaration for _sc[w]printf to header.
by Alexandre Julliard 08 Oct '12

08 Oct '12

Module: wine Branch: master Commit: 7e414ee71a6692c61733c576d18fae7cbd19a285 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e414ee71a6692c61733c576d… Author: Daniel Lehman <dlehman(a)esri.com> Date: Thu Oct 4 12:12:10 2012 -0700 msvcrt: Add declaration for _sc[w]printf to header. --- include/msvcrt/stdio.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index 80439ee..f277516 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -121,6 +121,7 @@ int __cdecl _snprintf(char*,size_t,const char*,...); int __cdecl _snprintf_s(char*,size_t,size_t,const char*,...); char* __cdecl _tempnam(const char*,const char*); int __cdecl _unlink(const char*); +int __cdecl _scprintf(const char*,...); int __cdecl _vscprintf(const char*,__ms_va_list); int __cdecl _vsnprintf(char*,size_t,const char*,__ms_va_list); int __cdecl _vsnprintf_s(char*,size_t,size_t,const char*,__ms_va_list); @@ -189,6 +190,7 @@ wchar_t* __cdecl _getws(wchar_t*); int __cdecl _putws(const wchar_t*); int __cdecl _snwprintf(wchar_t*,size_t,const wchar_t*,...); int __cdecl _snwprintf_s(wchar_t*,size_t,size_t,const wchar_t*,...); +int __cdecl _scwprintf(const wchar_t*,...); int __cdecl _vscwprintf(const wchar_t*,__ms_va_list); int __cdecl _vsnwprintf(wchar_t*,size_t,const wchar_t*,__ms_va_list); int __cdecl _vsnwprintf_s(wchar_t*,size_t,size_t,const wchar_t*,__ms_va_list);

1 0

Łukasz Wojniłowicz : po: Update Polish translations.
by Alexandre Julliard 08 Oct '12

08 Oct '12

Module: wine Branch: master Commit: a1a6ce6398829daa65a68ab2808b7a315444977c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1a6ce6398829daa65a68ab28… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Fri Oct 5 17:51:29 2012 +0200 po: Update Polish translations. --- po/pl.po | 51 +++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 37 insertions(+), 14 deletions(-) diff --git a/po/pl.po b/po/pl.po index d1d3986..814b8a0 100644 --- a/po/pl.po +++ b/po/pl.po @@ -6,14 +6,14 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-06-14 15:46+0200\n" +"PO-Revision-Date: 2012-10-05 17:26+0200\n" "Last-Translator: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com>\n" "Language-Team: Polish <kde-i18n-doc(a)kde.org>\n" "Language: Polish\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.4\n" +"X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" @@ -3471,6 +3471,8 @@ msgid "" "After disabling or enabling a device, the connected joysticks won't be " "updated here until you restart this applet." msgstr "" +"Po wyłączeniu lub włączeniu urządzenia, podłączone joysticki nie będą tutaj " +"uaktualnione do momentu ponownego uruchomienia tego apletu." #: joy.rc:47 msgid "Test Joystick" @@ -3485,16 +3487,16 @@ msgid "Test Force Feedback" msgstr "Testuj odczucie siły zwrotnej" #: joy.rc:64 -#, fuzzy -#| msgid "Available formats" msgid "Available Effects" -msgstr "Dostępne formaty" +msgstr "Dostępne efekty" #: joy.rc:66 msgid "" "Press any button in the controller to activate the chosen effect. The effect " "direction can be changed with the controller axis." msgstr "" +"Naciśnij jakikolwiek klawisz na kontrolerze, aby aktywować wybrany efekt. " +"Kierunek efektu może być zmieniony przy użyciu osi kontrolera." #: joy.rc:28 msgid "Game Controllers" @@ -9718,6 +9720,33 @@ msgid "" "/ProgIDOpen Open a document using the specified progID.\n" "/? Display this help and exit.\n" msgstr "" +"Uruchom program lub otwórz dokument w programie normalnie używanym do plików " +"z tym przyrostkiem.\n" +"Użycie:\n" +"start [opcje] nazwa_programu_ze_ścieżką [...]\n" +"start [opcje] nazwa_dokumentu_ze_ścieżką\n" +"\n" +"Opcje:\n" +"\"title\" Podaje tytuł podrzędnych okien.\n" +"/d katalog Uruchamia program w podanym katalogu.\n" +"/b Nie twórz nowej konsoli dla programu.\n" +"/i Uruchom program ze świeżymi zmiennymi środowiskowymi.\n" +"/min Uruchom program zminimalizowany.\n" +"/max Uruchom program zmaksymalizowany.\n" +"/low Uruchom program w klasie priorytetowej bezczynności.\n" +"/normal Uruchom program w normalnej klasie priorytetowej.\n" +"/high Uruchom program w wysokiej klasie priorytetowej.\n" +"/realtime Uruchom program w klasie priorytetowej czasu rzeczywistego.\n" +"/abovenormal Uruchom program w klasie priorytetowej powyżej normalnej.\n" +"/belownormal Uruchom program w klasie priorytetowej poniżej normalnej.\n" +"/node n Uruchom program na podanym węźle NUMA.\n" +"/affinity maska Uruchom program ze specjalną maską afiniczności.\n" +"/wait Poczekaj, aż uruchomiony program skończy, a następnie wyjdź z " +"jego kodem wyjścia.\n" +"/unix Użyj nazwy pliku ze ścieżka z Uniksa i uruchom plik tak jak " +"windows explorer.\n" +"/ProgIDOpen Otwórz dokument używając podanego progID.\n" +"/? Wyświetl tą pomoc i wyjdź.\n" #: cmd.rc:211 msgid "TIME sets or shows the current system time.\n" @@ -13699,22 +13728,16 @@ msgid "Help topics: " msgstr "Tematy pomocy: " #: wmic.rc:25 -#, fuzzy -#| msgid "Error: Invalid command line parameters\n" msgid "Error: Command line not supported\n" -msgstr "Błąd: Niewłaściwe parametry wiersza poleceń\n" +msgstr "Błąd: Wiersz poleceń jest nieobsługiwany\n" #: wmic.rc:26 -#, fuzzy -#| msgid "Property set not found.\n" msgid "Error: Alias not found\n" -msgstr "Nie znaleziono zestawu właściwości.\n" +msgstr "Błąd: Nie znaleziono aliasu\n" #: wmic.rc:27 -#, fuzzy -#| msgid "Error: Invalid key name\n" msgid "Error: Invalid query\n" -msgstr "Błąd: Niewłaściwa nazwa klucza\n" +msgstr "Błąd: Nieprawidłowe zapytanie\n" #: wordpad.rc:28 msgid "&New...\tCtrl+N"

1 0

Alexandre Julliard : winedbg: Mark the lexer as always interactive to prevent some shortcuts.
by Alexandre Julliard 08 Oct '12

08 Oct '12

Module: wine Branch: master Commit: 8bf223a86dee7fe120e0ddd2460309a2198a0125 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bf223a86dee7fe120e0ddd24… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 8 12:33:52 2012 +0200 winedbg: Mark the lexer as always interactive to prevent some shortcuts. --- programs/winedbg/debug.l | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/debug.l b/programs/winedbg/debug.l index ab1f865..a6ab10c 100644 --- a/programs/winedbg/debug.l +++ b/programs/winedbg/debug.l @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -%option noinput nounput never-interactive 8bit prefix="dbg_" +%option noinput nounput always-interactive 8bit prefix="dbg_" %{ #include "config.h"

1 0

Vincent Povirk : ole32: Stub StgConvertVariantToProperty.
by Alexandre Julliard 08 Oct '12

08 Oct '12

Module: wine Branch: master Commit: 04eaae5ce81ef91435b89955ee89e250905cf4be URL: http://source.winehq.org/git/wine.git/?a=commit;h=04eaae5ce81ef91435b89955e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Oct 4 15:30:20 2012 -0500 ole32: Stub StgConvertVariantToProperty. --- dlls/ole32/ole32.spec | 1 + dlls/ole32/stg_prop.c | 9 +++++++++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index b9eb50e..9e3f80f 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -255,6 +255,7 @@ @ stub SetDocumentBitStg @ stdcall SetErrorInfo(long ptr) @ stdcall StgConvertPropertyToVariant(ptr long ptr ptr) +@ stdcall StgConvertVariantToProperty(ptr long ptr ptr long long ptr) @ stdcall StgCreateDocfile(wstr long long ptr) @ stdcall StgCreateDocfileOnILockBytes(ptr long long ptr) @ stdcall StgCreatePropSetStg(ptr long ptr) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index 98f562d..b582654 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -2762,3 +2762,12 @@ BOOLEAN WINAPI StgConvertPropertyToVariant(const SERIALIZEDPROPERTYVALUE* prop, return 0; } + +SERIALIZEDPROPERTYVALUE* WINAPI StgConvertVariantToProperty(const PROPVARIANT *pvar, + USHORT CodePage, SERIALIZEDPROPERTYVALUE *pprop, ULONG *pcb, PROPID pid, + BOOLEAN fReserved, ULONG *pcIndirect) +{ + FIXME("%p,%d,%p,%p,%d,%d,%p\n", pvar, CodePage, pprop, pcb, pid, fReserved, pcIndirect); + + return NULL; +}

1 0

Vincent Povirk : ole32: Add tests for StgConvertVariantToProperty.
by Alexandre Julliard 08 Oct '12

08 Oct '12

Module: wine Branch: master Commit: 718f09562900d9597bcfcaba54b80c7d280026cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=718f09562900d9597bcfcaba5… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Oct 4 16:19:07 2012 -0500 ole32: Add tests for StgConvertVariantToProperty. --- dlls/ole32/tests/propvariant.c | 93 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 93 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/propvariant.c b/dlls/ole32/tests/propvariant.c index 5f7adba..2de480a 100644 --- a/dlls/ole32/tests/propvariant.c +++ b/dlls/ole32/tests/propvariant.c @@ -408,9 +408,102 @@ static void test_propertytovariant(void) PropVariantClear(&propvar); } +static void test_varianttoproperty(void) +{ + HANDLE hole32; + PROPVARIANT propvar; + SERIALIZEDPROPERTYVALUE *propvalue, *own_propvalue; + SERIALIZEDPROPERTYVALUE* (__stdcall *pStgConvertVariantToProperty)( + const PROPVARIANT*,USHORT,SERIALIZEDPROPERTYVALUE*,ULONG*,PROPID,BOOLEAN,ULONG*); + ULONG len; + static const WCHAR test_string[] = {'t','e','s','t',0}; + BSTR test_string_bstr; + + hole32 = GetModuleHandleA("ole32"); + + pStgConvertVariantToProperty = (void*)GetProcAddress(hole32, "StgConvertVariantToProperty"); + + if (!pStgConvertVariantToProperty) + { + win_skip("StgConvertVariantToProperty not available\n"); + return; + } + + own_propvalue = HeapAlloc(GetProcessHeap(), 0, sizeof(SERIALIZEDPROPERTYVALUE) + 20); + + PropVariantInit(&propvar); + + propvar.vt = VT_I4; + U(propvar).lVal = 0xfeabcdef; + + len = 0xdeadbeef; + propvalue = pStgConvertVariantToProperty(&propvar, CP_WINUNICODE, NULL, &len, + 0, FALSE, 0); + + ok(propvalue == NULL, "got nonnull propvalue\n"); + todo_wine ok(len == 8, "unexpected length %d\n", len); + + if (len == 0xdeadbeef) + { + return; + } + + len = 20; + propvalue = pStgConvertVariantToProperty(&propvar, CP_WINUNICODE, own_propvalue, &len, + 0, FALSE, 0); + + ok(propvalue == own_propvalue, "unexpected propvalue %p\n", propvalue); + ok(len == 8, "unexpected length %d\n", len); + ok(!memcmp(propvalue, serialized_i4, 8), "got wrong data\n"); + + propvar.vt = VT_EMPTY; + len = 20; + own_propvalue->dwType = 0xdeadbeef; + propvalue = pStgConvertVariantToProperty(&propvar, CP_WINUNICODE, own_propvalue, &len, + 0, FALSE, 0); + + ok(propvalue == own_propvalue, "unexpected propvalue %p\n", propvalue); + ok(len == 0, "unexpected length %d\n", len); + ok(propvalue->dwType == 0xdeadbeef, "unexpected type %d\n", propvalue->dwType); + + propvar.vt = VT_NULL; + len = 20; + propvalue = pStgConvertVariantToProperty(&propvar, CP_WINUNICODE, own_propvalue, &len, + 0, FALSE, 0); + + ok(propvalue == own_propvalue, "unexpected propvalue %p\n", propvalue); + ok(len == 4, "unexpected length %d\n", len); + ok(!memcmp(propvalue, serialized_null, 4), "got wrong data\n"); + + test_string_bstr = SysAllocString(test_string); + + propvar.vt = VT_BSTR; + U(propvar).bstrVal = test_string_bstr; + len = 20; + propvalue = pStgConvertVariantToProperty(&propvar, CP_WINUNICODE, own_propvalue, &len, + 0, FALSE, 0); + + ok(propvalue == own_propvalue, "unexpected propvalue %p\n", propvalue); + ok(len == 20, "unexpected length %d\n", len); + ok(!memcmp(propvalue, serialized_bstr_wc, 20), "got wrong data\n"); + + len = 20; + propvalue = pStgConvertVariantToProperty(&propvar, CP_UTF8, own_propvalue, &len, + 0, FALSE, 0); + + ok(propvalue == own_propvalue, "unexpected propvalue %p\n", propvalue); + ok(len == 16, "unexpected length %d\n", len); + ok(!memcmp(propvalue, serialized_bstr_mb, 16), "got wrong data\n"); + + SysFreeString(test_string_bstr); + + HeapFree(GetProcessHeap(), 0, own_propvalue); +} + START_TEST(propvariant) { test_validtypes(); test_copy(); test_propertytovariant(); + test_varianttoproperty(); }

1 0

Alistair Leslie-Hughes : oledb32: Add IDBProperties support in IDBInitialize.
by Alexandre Julliard 08 Oct '12

08 Oct '12

Module: wine Branch: master Commit: 0eef665dbfe70d54b0bcee6514568554fff3f468 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0eef665dbfe70d54b0bcee651… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Oct 5 14:02:51 2012 +1000 oledb32: Add IDBProperties support in IDBInitialize. --- dlls/oledb32/datainit.c | 74 +++++++++++++++++++++++++++++++++++++++++ dlls/oledb32/tests/database.c | 2 +- 2 files changed, 75 insertions(+), 1 deletions(-) diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c index a84d8aa..862c725 100644 --- a/dlls/oledb32/datainit.c +++ b/dlls/oledb32/datainit.c @@ -50,6 +50,7 @@ static inline datainit *impl_from_IDataInitialize(IDataInitialize *iface) typedef struct { IDBInitialize IDBInitialize_iface; + IDBProperties IDBProperties_iface; LONG ref; } dbinit; @@ -59,6 +60,74 @@ static inline dbinit *impl_from_IDBInitialize(IDBInitialize *iface) return CONTAINING_RECORD(iface, dbinit, IDBInitialize_iface); } +static inline dbinit *impl_from_IDBProperties(IDBProperties *iface) +{ + return CONTAINING_RECORD(iface, dbinit, IDBProperties_iface); +} + +static HRESULT WINAPI dbprops_QueryInterface(IDBProperties *iface, REFIID riid, void **ppvObject) +{ + dbinit *This = impl_from_IDBProperties(iface); + + return IDBInitialize_QueryInterface(&This->IDBInitialize_iface, riid, ppvObject); +} + +static ULONG WINAPI dbprops_AddRef(IDBProperties *iface) +{ + dbinit *This = impl_from_IDBProperties(iface); + + return IDBInitialize_AddRef(&This->IDBInitialize_iface); +} + +static ULONG WINAPI dbprops_Release(IDBProperties *iface) +{ + dbinit *This = impl_from_IDBProperties(iface); + + return IDBInitialize_Release(&This->IDBInitialize_iface); +} + +static HRESULT WINAPI dbprops_GetProperties(IDBProperties *iface, ULONG cPropertyIDSets, + const DBPROPIDSET rgPropertyIDSets[], ULONG *pcPropertySets, DBPROPSET **prgPropertySets) +{ + dbinit *This = impl_from_IDBProperties(iface); + + FIXME("(%p)->(%d %p %p %p)\n", This, cPropertyIDSets, rgPropertyIDSets, pcPropertySets, prgPropertySets); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dbprops_GetPropertyInfo(IDBProperties *iface, ULONG cPropertyIDSets, + const DBPROPIDSET rgPropertyIDSets[], ULONG *pcPropertyInfoSets, + DBPROPINFOSET **prgPropertyInfoSets, OLECHAR **ppDescBuffer) +{ + dbinit *This = impl_from_IDBProperties(iface); + + FIXME("(%p)->(%d %p %p %p %p)\n", This, cPropertyIDSets, rgPropertyIDSets, pcPropertyInfoSets, + prgPropertyInfoSets, ppDescBuffer); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dbprops_SetProperties(IDBProperties *iface, ULONG cPropertySets, + DBPROPSET rgPropertySets[]) +{ + dbinit *This = impl_from_IDBProperties(iface); + + FIXME("(%p)->(%d %p)\n", This, cPropertySets, rgPropertySets); + + return E_NOTIMPL; +} + +static const struct IDBPropertiesVtbl dbprops_vtbl = +{ + dbprops_QueryInterface, + dbprops_AddRef, + dbprops_Release, + dbprops_GetProperties, + dbprops_GetPropertyInfo, + dbprops_SetProperties +}; + static HRESULT WINAPI dbinit_QueryInterface(IDBInitialize *iface, REFIID riid, void **obj) { dbinit *This = impl_from_IDBInitialize(iface); @@ -71,6 +140,10 @@ static HRESULT WINAPI dbinit_QueryInterface(IDBInitialize *iface, REFIID riid, v { *obj = iface; } + else if(IsEqualIID(riid, &IID_IDBProperties)) + { + *obj = &This->IDBProperties_iface; + } else { FIXME("interface %s not implemented\n", debugstr_guid(riid)); @@ -144,6 +217,7 @@ static HRESULT create_db_init(void **obj) if(!This) return E_OUTOFMEMORY; This->IDBInitialize_iface.lpVtbl = &dbinit_vtbl; + This->IDBProperties_iface.lpVtbl = &dbprops_vtbl; This->ref = 1; *obj = &This->IDBInitialize_iface; diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index fe92bb8..f093d17 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -51,7 +51,7 @@ static void test_database(void) IDBProperties *props = NULL; hr = IDBInitialize_QueryInterface(dbinit, &IID_IDBProperties, (void**)&props); - todo_wine ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "got %08x\n", hr); if(SUCCEEDED(hr)) { IDBProperties_Release(props);

1 0