October 2012 - Wine-commits

Piotr Caban : msvcp60: Added more std::getline functions.
by Alexandre Julliard 17 Oct '12

17 Oct '12

Module: wine Branch: master Commit: 50cfac7ef41e5e694f6fcdd30e6578f2035a6648 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50cfac7ef41e5e694f6fcdd30… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 17 09:57:18 2012 +0200 msvcp60: Added more std::getline functions. --- dlls/msvcp60/msvcp60.spec | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index 561fc64..6e3813a 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -3204,14 +3204,14 @@ @ cdecl -arch=win64 ?getline@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QEAAAEAV12(a)PEAG_J@Z(ptr ptr long) basic_istream_wchar_getline @ thiscall -arch=win32 ?getline@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QAEAAV12(a)PAGHG@Z(ptr ptr long long) basic_istream_wchar_getline_delim @ cdecl -arch=win64 ?getline@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QEAAAEAV12(a)PEAG_JG@Z(ptr ptr long long) basic_istream_wchar_getline_delim -@ stub -arch=win32 ?getline(a)std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@1(a)AAV21@AAV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@1@@Z -@ stub -arch=win64 ?getline(a)std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@1(a)AEAV21@AEAV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@1@@Z -@ stub -arch=win32 ?getline(a)std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@1(a)AAV21@AAV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@1(a)D@Z -@ stub -arch=win64 ?getline(a)std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@1(a)AEAV21@AEAV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@1(a)D@Z -@ stub -arch=win32 ?getline(a)std@@YAAAV?$basic_istream(a)GU?$char_traits(a)G@std@@@1(a)AAV21@AAV?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@1@@Z -@ stub -arch=win64 ?getline(a)std@@YAAEAV?$basic_istream(a)GU?$char_traits(a)G@std@@@1(a)AEAV21@AEAV?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@1@@Z -@ stub -arch=win32 ?getline(a)std@@YAAAV?$basic_istream(a)GU?$char_traits(a)G@std@@@1(a)AAV21@AAV?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@1(a)G@Z -@ stub -arch=win64 ?getline(a)std@@YAAEAV?$basic_istream(a)GU?$char_traits(a)G@std@@@1(a)AEAV21@AEAV?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@1(a)G@Z +@ cdecl -arch=win32 ?getline(a)std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@1(a)AAV21@AAV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@1@@Z(ptr ptr) basic_istream_char_getline_bstr +@ cdecl -arch=win64 ?getline(a)std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@1(a)AEAV21@AEAV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@1@@Z(ptr ptr) basic_istream_char_getline_bstr +@ cdecl -arch=win32 ?getline(a)std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@1(a)AAV21@AAV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@1(a)D@Z(ptr ptr long) basic_istream_char_getline_bstr_delim +@ cdecl -arch=win64 ?getline(a)std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@1(a)AEAV21@AEAV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@1(a)D@Z(ptr ptr long) basic_istream_char_getline_bstr_delim +@ cdecl -arch=win32 ?getline(a)std@@YAAAV?$basic_istream(a)GU?$char_traits(a)G@std@@@1(a)AAV21@AAV?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@1@@Z(ptr ptr) basic_istream_wchar_getline_bstr +@ cdecl -arch=win64 ?getline(a)std@@YAAEAV?$basic_istream(a)GU?$char_traits(a)G@std@@@1(a)AEAV21@AEAV?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@1@@Z(ptr ptr) basic_istream_wchar_getline_bstr +@ cdecl -arch=win32 ?getline(a)std@@YAAAV?$basic_istream(a)GU?$char_traits(a)G@std@@@1(a)AAV21@AAV?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@1(a)G@Z(ptr ptr long) basic_istream_wchar_getline_bstr_delim +@ cdecl -arch=win64 ?getline(a)std@@YAAEAV?$basic_istream(a)GU?$char_traits(a)G@std@@@1(a)AEAV21@AEAV?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@1(a)G@Z(ptr ptr long) basic_istream_wchar_getline_bstr_delim @ stub -arch=win32 ?getloc@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@QAE?AVlocale(a)2@XZ @ stub -arch=win64 ?getloc@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@QEAA?AVlocale(a)2@XZ @ stub -arch=win32 ?getloc@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@QAE?AVlocale(a)2@XZ

1 0

Piotr Caban : msvcp90: Fixed strstreambuf_ctor_get implementation.
by Alexandre Julliard 17 Oct '12

17 Oct '12

Module: wine Branch: master Commit: ea828e557f6b7c8c2d92f9624cd6a0d341ed5666 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea828e557f6b7c8c2d92f9624… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 17 09:57:39 2012 +0200 msvcp90: Fixed strstreambuf_ctor_get implementation. --- dlls/msvcp90/ios.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 00a1b68..a3c44f2 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -12561,7 +12561,7 @@ strstreambuf* __thiscall strstreambuf_ctor_get(strstreambuf *this, const char *g { TRACE("(%p %p %ld)\n", this, g, len); - strstreambuf_ctor_get_put(this, NULL, 0, NULL); + strstreambuf_ctor_get_put(this, (char*)g, len, NULL); this->strmode |= STRSTATE_Constant; return this; }

1 0

Piotr Caban : msvcp90: Added _Nomemory implementation.
by Alexandre Julliard 17 Oct '12

17 Oct '12

Module: wine Branch: master Commit: 1f4f07c026d3ee5bc006b111e15f9c23bb9e41b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f4f07c026d3ee5bc006b111e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 17 09:58:25 2012 +0200 msvcp90: Added _Nomemory implementation. --- dlls/msvcp90/exception.c | 7 +++++++ dlls/msvcp90/msvcp90.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index d883307..6247616 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -447,6 +447,13 @@ const char* __thiscall MSVCP_failure_what(failure *this) DEFINE_RTTI_DATA2(failure, 0, &runtime_error_rtti_base_descriptor, &exception_rtti_base_descriptor, ".?AVfailure(a)std@@"); DEFINE_CXX_DATA2(failure, &runtime_error_cxx_type_info, &exception_cxx_type_info, MSVCP_runtime_error_dtor); +/* ?_Nomemory(a)std@@YAXXZ */ +void __cdecl _Nomemory(void) +{ + TRACE("()\n"); + throw_exception(EXCEPTION_BAD_ALLOC, NULL); +} + #ifndef __GNUC__ void __asm_dummy_vtables(void) { #endif diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index c544ff5..742f162 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -2664,7 +2664,7 @@ @ cdecl -arch=win64 ?_Narrow_s@?$ctype(a)G@std@@QEBAPEBGPEBG0DPEAD_K(a)Z(ptr ptr ptr long ptr long) ctype_wchar__Narrow_s @ thiscall -arch=win32 ?_Narrow_s@?$ctype(a)_W@std@@QBEPB_WPB_W0DPADI(a)Z(ptr ptr ptr long ptr long) ctype_wchar__Narrow_s @ cdecl -arch=win64 ?_Narrow_s@?$ctype(a)_W@std@@QEBAPEB_WPEB_W0DPEAD_K(a)Z(ptr ptr ptr long ptr long) ctype_wchar__Narrow_s -@ stub ?_Nomemory(a)std@@YAXXZ +@ cdecl ?_Nomemory(a)std@@YAXXZ() _Nomemory # extern -arch=win64 ?_Oneplusroot2high@?CA@???$_Fabs(a)M@std@@YAMAEBV?$complex(a)M@1(a)PEAH@Z(a)4MB # extern -arch=win64 ?_Oneplusroot2high@?CA@???$_Fabs(a)N@std@@YANAEBV?$complex(a)N@1(a)PEAH@Z(a)4NB # extern -arch=win64 ?_Oneplusroot2low@?CA@???$_Fabs(a)M@std@@YAMAEBV?$complex(a)M@1(a)PEAH@Z(a)4MB

1 0

Piotr Caban : msvcp71: Added strstream class implementation.
by Alexandre Julliard 17 Oct '12

17 Oct '12

Module: wine Branch: master Commit: a8f231b54685b5b4fd56203d980a929cd37f6c7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8f231b54685b5b4fd56203d9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 17 09:58:57 2012 +0200 msvcp71: Added strstream class implementation. --- dlls/msvcp71/ios.c | 117 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp71/msvcp71.spec | 8 ++-- 2 files changed, 121 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp71/ios.c b/dlls/msvcp71/ios.c index 830d730..f1b354b 100644 --- a/dlls/msvcp71/ios.c +++ b/dlls/msvcp71/ios.c @@ -276,6 +276,14 @@ typedef struct { void (__cdecl *pfree)(void*); } strstreambuf; +typedef struct { + basic_iostream_char base; + strstreambuf buf; + /* virtual inheritance + * basic_ios_char basic_ios; + */ +} strstream; + extern const vtable_ptr MSVCP_iosb_vtable; /* ??_7ios_base(a)std@@6B@ */ @@ -467,6 +475,10 @@ extern const vtable_ptr MSVCP_basic_stringstream_short_vtable; /* ??_7strstreambuf(a)std@@6B */ extern const vtable_ptr MSVCP_strstreambuf_vtable; +static const int strstream_vbtable1[] = {0, sizeof(strstream)}; +static const int strstream_vbtable2[] = {0, sizeof(strstream)-FIELD_OFFSET(strstream, base.base2)}; +extern const vtable_ptr MSVCP_strstream_vtable; + DEFINE_RTTI_DATA0(iosb, 0, ".?AV?$_Iosb(a)H@std@@"); DEFINE_RTTI_DATA1(ios_base, 0, &iosb_rtti_base_descriptor, ".?AV?$_Iosb(a)H@std@@"); DEFINE_RTTI_DATA2(basic_ios_char, 0, &ios_base_rtti_base_descriptor, &iosb_rtti_base_descriptor, @@ -615,6 +627,12 @@ DEFINE_RTTI_DATA8(basic_stringstream_short, sizeof(basic_stringstream_wchar), ".?AV?$basic_stringstream(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@"); DEFINE_RTTI_DATA1(strstreambuf, sizeof(strstreambuf), &basic_streambuf_char_rtti_base_descriptor, ".?AVstrstreambuf(a)std@@"); +DEFINE_RTTI_DATA8(strstream, sizeof(strstream), + &basic_istream_char_rtti_base_descriptor, &basic_ios_char_rtti_base_descriptor, + &ios_base_rtti_base_descriptor, &iosb_rtti_base_descriptor, + &basic_ostream_char_rtti_base_descriptor, &basic_ios_char_rtti_base_descriptor, + &ios_base_rtti_base_descriptor, &iosb_rtti_base_descriptor, + "?AVstrstream(a)std@@"); #ifndef __GNUC__ void __asm_dummy_vtables(void) { @@ -829,6 +847,8 @@ void __asm_dummy_vtables(void) { VTABLE_ADD_FUNC(basic_streambuf_char_setbuf) VTABLE_ADD_FUNC(basic_streambuf_char_sync) VTABLE_ADD_FUNC(basic_streambuf_char_imbue)); + __ASM_VTABLE(strstream, + VTABLE_ADD_FUNC(strstream_vector_dtor)); #ifndef __GNUC__ } #endif @@ -12088,6 +12108,23 @@ void __thiscall strstreambuf__Init(strstreambuf *this, streamsize len, char *g, basic_streambuf_char_setp(&this->base, p, this->seekhigh); } +/* ??0strstreambuf(a)std@@QAE(a)PACH0@Z */ +/* ??0strstreambuf(a)std@@QEAA(a)PEAC_J0@Z */ +/* ??0strstreambuf(a)std@@QAE(a)PADH0@Z */ +/* ??0strstreambuf(a)std@@QEAA(a)PEAD_J0@Z */ +/* ??0strstreambuf(a)std@@QAE(a)PAEH0@Z */ +/* ??0strstreambuf(a)std@@QEAA(a)PEAE_J0@Z */ +static strstreambuf* strstreambuf_ctor_get_put(strstreambuf *this, char *g, streamsize len, char *p) +{ + TRACE("(%p %p %ld %p)\n", this, g, len, p); + + basic_streambuf_char_ctor(&this->base); + this->base.vtable = &MSVCP_strstreambuf_vtable; + + strstreambuf__Init(this, len, g, p, 0); + return this; +} + /* ?_Tidy(a)strstreambuf@std@@IAEXXZ */ /* ?_Tidy(a)strstreambuf@std@@IEAAXXZ */ DEFINE_THISCALL_WRAPPER(strstreambuf__Tidy, 4) @@ -12342,6 +12379,85 @@ int __thiscall strstreambuf_underflow(strstreambuf *this) return (unsigned char)(*gptr); } +static inline basic_ios_char* strstream_to_basic_ios(strstream *ptr) +{ + return (basic_ios_char*)((char*)ptr+strstream_vbtable1[1]); +} + +static inline strstream* strstream_from_basic_ios(basic_ios_char *ptr) +{ + return (strstream*)((char*)ptr-strstream_vbtable1[1]); +} + +/* ??0strstream(a)std@@QAE(a)PADHH@Z */ +/* ??0strstream(a)std@@QEAA(a)PEAD_JH@Z */ +DEFINE_THISCALL_WRAPPER(strstream_ctor, 20) +strstream* __thiscall strstream_ctor(strstream *this, char *buf, streamsize size, int mode, MSVCP_bool virt_init) +{ + basic_ios_char *basic_ios; + + TRACE("(%p %p %ld %d %d)\n", this, buf, size, mode, virt_init); + + if(virt_init) { + this->base.base1.vbtable = strstream_vbtable1; + this->base.base2.vbtable = strstream_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); + } + + strstreambuf_ctor_get_put(&this->buf, buf, size, + buf && (mode & OPENMODE_app) ? buf+strlen(buf) : buf); + basic_iostream_char_ctor(&this->base, &this->buf.base, FALSE); + basic_ios->base.vtable = &MSVCP_strstream_vtable; + return this; +} + +/* ??1strstream(a)std@@UAE(a)XZ */ +/* ??1strstream(a)std@@UEAA(a)XZ */ +DEFINE_THISCALL_WRAPPER(strstream_dtor, 4) +void __thiscall strstream_dtor(basic_ios_char *base) +{ + strstream *this = strstream_from_basic_ios(base); + + TRACE("(%p)\n", this); + + basic_iostream_char_dtor(basic_iostream_char_to_basic_ios(&this->base)); + strstreambuf_dtor(&this->buf); +} + +static void strstream_vbase_dtor(strstream *this) +{ + TRACE("(%p)\n", this); + + strstream_dtor(strstream_to_basic_ios(this)); + basic_ios_char_dtor(basic_istream_char_get_basic_ios(&this->base.base1)); +} + +DEFINE_THISCALL_WRAPPER(strstream_vector_dtor, 8) +strstream* __thiscall strstream_vector_dtor(basic_ios_char *base, unsigned int flags) +{ + strstream *this = strstream_from_basic_ios(base); + + TRACE("(%p %x)\n", this, flags); + + if(flags & 2) { + /* we have an array, with the number of elements stored before the first object */ + INT_PTR i, *ptr = (INT_PTR *)this-1; + + for(i=*ptr-1; i>=0; i--) + strstream_vbase_dtor(this+i); + MSVCRT_operator_delete(ptr); + } else { + strstream_vbase_dtor(this); + if(flags & 1) + MSVCRT_operator_delete(this); + } + + return this; +} + static void __cdecl setprecision_func(ios_base *base, streamsize prec) { ios_base_precision_set(base, prec); @@ -12690,6 +12806,7 @@ void init_io(void *base) init_basic_stringstream_wchar_rtti(base); init_basic_stringstream_short_rtti(base); init_strstreambuf_rtti(base); + init_strstream_rtti(base); #endif basic_filebuf_char_ctor_file(&filebuf_char_stdin, stdin); diff --git a/dlls/msvcp71/msvcp71.spec b/dlls/msvcp71/msvcp71.spec index a8c3869..0e3928d 100644 --- a/dlls/msvcp71/msvcp71.spec +++ b/dlls/msvcp71/msvcp71.spec @@ -1003,8 +1003,8 @@ @ stub -arch=win32 ??0money_base(a)std@@QAE(a)I@Z @ stub -arch=win64 ??0money_base(a)std@@QEAA(a)_K@Z @ stub -arch=win32 ??0ostrstream(a)std@@QAE(a)PADHH@Z -@ stub -arch=win32 ??0strstream(a)std@@QAE(a)PADHH@Z -@ stub -arch=win64 ??0strstream(a)std@@QEAA(a)PEAD_JH@Z +@ thiscall -arch=win32 ??0strstream(a)std@@QAE(a)PADHH@Z(ptr ptr long long long) strstream_ctor +@ cdecl -arch=win64 ??0strstream(a)std@@QEAA(a)PEAD_JH@Z(ptr ptr long long long) strstream_ctor @ stub -arch=win32 ??0time_base(a)std@@QAE(a)I@Z @ stub -arch=win64 ??0time_base(a)std@@QEAA(a)_K@Z @ stub -arch=win32 ??1?$_Mpunct(a)D@std@@MAE(a)XZ @@ -1207,8 +1207,8 @@ @ stub -arch=win64 ??1money_base(a)std@@UEAA(a)XZ @ stub -arch=win32 ??1ostrstream(a)std@@UAE(a)XZ @ stub -arch=win64 ??1ostrstream(a)std@@UEAA(a)XZ -@ stub -arch=win32 ??1strstream(a)std@@UAE(a)XZ -@ stub -arch=win64 ??1strstream(a)std@@UEAA(a)XZ +@ thiscall -arch=win32 ??1strstream(a)std@@UAE(a)XZ(ptr) strstream_dtor +@ cdecl -arch=win64 ??1strstream(a)std@@UEAA(a)XZ(ptr) strstream_dtor @ thiscall -arch=win32 ??1strstreambuf(a)std@@UAE(a)XZ(ptr) strstreambuf_dtor @ cdecl -arch=win64 ??1strstreambuf(a)std@@UEAA(a)XZ(ptr) strstreambuf_dtor @ stub -arch=win32 ??1time_base(a)std@@UAE(a)XZ

1 0

Piotr Caban : msvcp71: Added ostrstream class implementation.
by Alexandre Julliard 17 Oct '12

17 Oct '12

Module: wine Branch: master Commit: 13fa0a8e58de4d61d23784d0e4b1d62f91e22f86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13fa0a8e58de4d61d23784d0e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 17 09:59:17 2012 +0200 msvcp71: Added ostrstream class implementation. --- dlls/msvcp71/ios.c | 95 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp71/msvcp71.spec | 6 +- 2 files changed, 98 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp71/ios.c b/dlls/msvcp71/ios.c index f1b354b..b9af853 100644 --- a/dlls/msvcp71/ios.c +++ b/dlls/msvcp71/ios.c @@ -277,6 +277,14 @@ typedef struct { } strstreambuf; typedef struct { + basic_ostream_char base; + strstreambuf buf; + /* virtual inheritance + * basic_ios_char basic_ios; + */ +} ostrstream; + +typedef struct { basic_iostream_char base; strstreambuf buf; /* virtual inheritance @@ -475,6 +483,9 @@ extern const vtable_ptr MSVCP_basic_stringstream_short_vtable; /* ??_7strstreambuf(a)std@@6B */ extern const vtable_ptr MSVCP_strstreambuf_vtable; +static const int ostrstream_vbtable[] = {0, sizeof(ostrstream)}; +extern const vtable_ptr MSVCP_ostrstream_vtable; + static const int strstream_vbtable1[] = {0, sizeof(strstream)}; static const int strstream_vbtable2[] = {0, sizeof(strstream)-FIELD_OFFSET(strstream, base.base2)}; extern const vtable_ptr MSVCP_strstream_vtable; @@ -627,6 +638,10 @@ DEFINE_RTTI_DATA8(basic_stringstream_short, sizeof(basic_stringstream_wchar), ".?AV?$basic_stringstream(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@"); DEFINE_RTTI_DATA1(strstreambuf, sizeof(strstreambuf), &basic_streambuf_char_rtti_base_descriptor, ".?AVstrstreambuf(a)std@@"); +DEFINE_RTTI_DATA4(ostrstream, sizeof(ostrstream), + &basic_ostream_char_rtti_base_descriptor, &basic_ios_char_rtti_base_descriptor, + &ios_base_rtti_base_descriptor, &iosb_rtti_base_descriptor, + "?AVostrstream(a)std@@"); DEFINE_RTTI_DATA8(strstream, sizeof(strstream), &basic_istream_char_rtti_base_descriptor, &basic_ios_char_rtti_base_descriptor, &ios_base_rtti_base_descriptor, &iosb_rtti_base_descriptor, @@ -847,6 +862,8 @@ void __asm_dummy_vtables(void) { VTABLE_ADD_FUNC(basic_streambuf_char_setbuf) VTABLE_ADD_FUNC(basic_streambuf_char_sync) VTABLE_ADD_FUNC(basic_streambuf_char_imbue)); + __ASM_VTABLE(ostrstream, + VTABLE_ADD_FUNC(ostrstream_vector_dtor)); __ASM_VTABLE(strstream, VTABLE_ADD_FUNC(strstream_vector_dtor)); #ifndef __GNUC__ @@ -12379,6 +12396,83 @@ int __thiscall strstreambuf_underflow(strstreambuf *this) return (unsigned char)(*gptr); } +static inline basic_ios_char* ostrstream_to_basic_ios(ostrstream *ptr) +{ + return (basic_ios_char*)((char*)ptr+ostrstream_vbtable[1]); +} + +static inline ostrstream* ostrstream_from_basic_ios(basic_ios_char *ptr) +{ + return (ostrstream*)((char*)ptr-ostrstream_vbtable[1]); +} + +/* ??0ostrstream(a)std@@QAE(a)PADHH@Z */ +DEFINE_THISCALL_WRAPPER(ostrstream_ctor, 20) +ostrstream* __thiscall ostrstream_ctor(ostrstream *this, char *buf, streamsize size, int mode, MSVCP_bool virt_init) +{ + basic_ios_char *basic_ios; + + TRACE("(%p %p %ld %d %d)\n", this, buf, size, mode, virt_init); + + if(virt_init) { + this->base.vbtable = ostrstream_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); + } + + strstreambuf_ctor_get_put(&this->buf, buf, size, + buf && (mode & OPENMODE_app) ? buf+strlen(buf) : buf); + basic_ostream_char_ctor(&this->base, &this->buf.base, FALSE, FALSE); + basic_ios->base.vtable = &MSVCP_ostrstream_vtable; + return this; +} + +/* ??1ostrstream(a)std@@UAE(a)XZ */ +/* ??1ostrstream(a)std@@UEAA(a)XZ */ +DEFINE_THISCALL_WRAPPER(ostrstream_dtor, 4) +void __thiscall ostrstream_dtor(basic_ios_char *base) +{ + ostrstream *this = ostrstream_from_basic_ios(base); + + TRACE("(%p)\n", this); + + basic_ostream_char_dtor(basic_ostream_char_to_basic_ios(&this->base)); + strstreambuf_dtor(&this->buf); +} + +static void ostrstream_vbase_dtor(ostrstream *this) +{ + TRACE("(%p)\n", this); + + ostrstream_dtor(ostrstream_to_basic_ios(this)); + basic_ios_char_dtor(basic_ostream_char_get_basic_ios(&this->base)); +} + +DEFINE_THISCALL_WRAPPER(ostrstream_vector_dtor, 8) +ostrstream* __thiscall ostrstream_vector_dtor(basic_ios_char *base, unsigned int flags) +{ + ostrstream *this = ostrstream_from_basic_ios(base); + + TRACE("(%p %x)\n", this, flags); + + if(flags & 2) { + /* we have an array, with the number of elements stored before the first object */ + INT_PTR i, *ptr = (INT_PTR *)this-1; + + for(i=*ptr-1; i>=0; i--) + ostrstream_vbase_dtor(this+i); + MSVCRT_operator_delete(ptr); + } else { + ostrstream_vbase_dtor(this); + if(flags & 1) + MSVCRT_operator_delete(this); + } + + return this; +} + static inline basic_ios_char* strstream_to_basic_ios(strstream *ptr) { return (basic_ios_char*)((char*)ptr+strstream_vbtable1[1]); @@ -12807,6 +12901,7 @@ void init_io(void *base) init_basic_stringstream_short_rtti(base); init_strstreambuf_rtti(base); init_strstream_rtti(base); + init_ostrstream_rtti(base); #endif basic_filebuf_char_ctor_file(&filebuf_char_stdin, stdin); diff --git a/dlls/msvcp71/msvcp71.spec b/dlls/msvcp71/msvcp71.spec index 0e3928d..726bfd8 100644 --- a/dlls/msvcp71/msvcp71.spec +++ b/dlls/msvcp71/msvcp71.spec @@ -1002,7 +1002,7 @@ @ stub -arch=win64 ??0messages_base(a)std@@QEAA(a)_K@Z @ stub -arch=win32 ??0money_base(a)std@@QAE(a)I@Z @ stub -arch=win64 ??0money_base(a)std@@QEAA(a)_K@Z -@ stub -arch=win32 ??0ostrstream(a)std@@QAE(a)PADHH@Z +@ thiscall -arch=win32 ??0ostrstream(a)std@@QAE(a)PADHH@Z(ptr ptr long long long) ostrstream_ctor @ thiscall -arch=win32 ??0strstream(a)std@@QAE(a)PADHH@Z(ptr ptr long long long) strstream_ctor @ cdecl -arch=win64 ??0strstream(a)std@@QEAA(a)PEAD_JH@Z(ptr ptr long long long) strstream_ctor @ stub -arch=win32 ??0time_base(a)std@@QAE(a)I@Z @@ -1205,8 +1205,8 @@ @ stub -arch=win64 ??1messages_base(a)std@@UEAA(a)XZ @ stub -arch=win32 ??1money_base(a)std@@UAE(a)XZ @ stub -arch=win64 ??1money_base(a)std@@UEAA(a)XZ -@ stub -arch=win32 ??1ostrstream(a)std@@UAE(a)XZ -@ stub -arch=win64 ??1ostrstream(a)std@@UEAA(a)XZ +@ thiscall -arch=win32 ??1ostrstream(a)std@@UAE(a)XZ(ptr) ostrstream_dtor +@ cdecl -arch=win64 ??1ostrstream(a)std@@UEAA(a)XZ(ptr) ostrstream_dtor @ thiscall -arch=win32 ??1strstream(a)std@@UAE(a)XZ(ptr) strstream_dtor @ cdecl -arch=win64 ??1strstream(a)std@@UEAA(a)XZ(ptr) strstream_dtor @ thiscall -arch=win32 ??1strstreambuf(a)std@@UAE(a)XZ(ptr) strstreambuf_dtor

1 0

Piotr Caban : msvcp71: Added istrstream destructor implementation.
by Alexandre Julliard 17 Oct '12

17 Oct '12

Module: wine Branch: master Commit: 84c5e3a198ce7993bf1f880508715fde61003f86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84c5e3a198ce7993bf1f88050… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 17 09:59:32 2012 +0200 msvcp71: Added istrstream destructor implementation. --- dlls/msvcp71/ios.c | 28 ++++++++++++++++++++++++++++ dlls/msvcp71/msvcp71.spec | 4 ++-- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp71/ios.c b/dlls/msvcp71/ios.c index b9af853..8c4e4dc 100644 --- a/dlls/msvcp71/ios.c +++ b/dlls/msvcp71/ios.c @@ -285,6 +285,14 @@ typedef struct { } ostrstream; typedef struct { + basic_istream_char base; + strstreambuf buf; + /* virtual inheritance + * basic_ios_char basic_ios; + */ +} istrstream; + +typedef struct { basic_iostream_char base; strstreambuf buf; /* virtual inheritance @@ -486,6 +494,8 @@ extern const vtable_ptr MSVCP_strstreambuf_vtable; static const int ostrstream_vbtable[] = {0, sizeof(ostrstream)}; extern const vtable_ptr MSVCP_ostrstream_vtable; +static const int istrstream_vbtable[] = {0, sizeof(istrstream)}; + static const int strstream_vbtable1[] = {0, sizeof(strstream)}; static const int strstream_vbtable2[] = {0, sizeof(strstream)-FIELD_OFFSET(strstream, base.base2)}; extern const vtable_ptr MSVCP_strstream_vtable; @@ -12473,6 +12483,24 @@ ostrstream* __thiscall ostrstream_vector_dtor(basic_ios_char *base, unsigned int return this; } +static inline istrstream* istrstream_from_basic_ios(basic_ios_char *ptr) +{ + return (istrstream*)((char*)ptr-istrstream_vbtable[1]); +} + +/* ??1istrstream(a)std@@UAE(a)XZ */ +/* ??1istrstream(a)std@@UEAA(a)XZ */ +DEFINE_THISCALL_WRAPPER(istrstream_dtor, 4) +void __thiscall istrstream_dtor(basic_ios_char *base) +{ + istrstream *this = istrstream_from_basic_ios(base); + + TRACE("(%p)\n", this); + + basic_istream_char_dtor(basic_istream_char_to_basic_ios(&this->base)); + strstreambuf_dtor(&this->buf); +} + static inline basic_ios_char* strstream_to_basic_ios(strstream *ptr) { return (basic_ios_char*)((char*)ptr+strstream_vbtable1[1]); diff --git a/dlls/msvcp71/msvcp71.spec b/dlls/msvcp71/msvcp71.spec index 726bfd8..26083b8 100644 --- a/dlls/msvcp71/msvcp71.spec +++ b/dlls/msvcp71/msvcp71.spec @@ -1197,8 +1197,8 @@ @ cdecl -arch=win64 ??1facet(a)locale@std@@UEAA(a)XZ(ptr) locale_facet_dtor @ thiscall -arch=win32 ??1ios_base(a)std@@UAE(a)XZ(ptr) ios_base_dtor @ cdecl -arch=win64 ??1ios_base(a)std@@UEAA(a)XZ(ptr) ios_base_dtor -@ stub -arch=win32 ??1istrstream(a)std@@UAE(a)XZ -@ stub -arch=win64 ??1istrstream(a)std@@UEAA(a)XZ +@ thiscall -arch=win32 ??1istrstream(a)std@@UAE(a)XZ(ptr) istrstream_dtor +@ cdecl -arch=win64 ??1istrstream(a)std@@UEAA(a)XZ(ptr) istrstream_dtor @ thiscall -arch=win32 ??1locale(a)std@@QAE(a)XZ(ptr) locale_dtor @ cdecl -arch=win64 ??1locale(a)std@@QEAA(a)XZ(ptr) locale_dtor @ stub -arch=win32 ??1messages_base(a)std@@UAE(a)XZ

1 0

Piotr Caban : msvcp71: Fixed basic_string::ptr implementation.
by Alexandre Julliard 17 Oct '12

17 Oct '12

Module: wine Branch: master Commit: 8de45a3df1ea0f2afe833e5638d1492244b19578 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8de45a3df1ea0f2afe833e563… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 17 09:59:53 2012 +0200 msvcp71: Fixed basic_string::ptr implementation. --- dlls/msvcp71/string.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp71/string.c b/dlls/msvcp71/string.c index 9907ad1..d6336ad 100644 --- a/dlls/msvcp71/string.c +++ b/dlls/msvcp71/string.c @@ -531,7 +531,7 @@ const MSVCP_size_t MSVCP_basic_string_char_npos = -1; DEFINE_THISCALL_WRAPPER(basic_string_char_ptr, 4) char* __thiscall basic_string_char_ptr(basic_string_char *this) { - if(this->res == BUF_SIZE_CHAR-1) + if(this->res < BUF_SIZE_CHAR) return this->data.buf; return this->data.ptr; } @@ -541,7 +541,7 @@ char* __thiscall basic_string_char_ptr(basic_string_char *this) DEFINE_THISCALL_WRAPPER(basic_string_char_const_ptr, 4) const char* __thiscall basic_string_char_const_ptr(const basic_string_char *this) { - if(this->res == BUF_SIZE_CHAR-1) + if(this->res < BUF_SIZE_CHAR) return this->data.buf; return this->data.ptr; } @@ -2214,7 +2214,7 @@ const MSVCP_size_t MSVCP_basic_string_wchar_npos = -1; DEFINE_THISCALL_WRAPPER(basic_string_wchar_ptr, 4) wchar_t* __thiscall basic_string_wchar_ptr(basic_string_wchar *this) { - if(this->res == BUF_SIZE_WCHAR-1) + if(this->res < BUF_SIZE_WCHAR) return this->data.buf; return this->data.ptr; } @@ -2226,7 +2226,7 @@ wchar_t* __thiscall basic_string_wchar_ptr(basic_string_wchar *this) DEFINE_THISCALL_WRAPPER(basic_string_wchar_const_ptr, 4) const wchar_t* __thiscall basic_string_wchar_const_ptr(const basic_string_wchar *this) { - if(this->res == BUF_SIZE_WCHAR-1) + if(this->res < BUF_SIZE_WCHAR) return this->data.buf; return this->data.ptr; }

1 0

Piotr Caban : msvcp60: Fixed overflow in basic_string_char_find_cstr_substr function.
by Alexandre Julliard 17 Oct '12

17 Oct '12

Module: wine Branch: master Commit: 1b6dfafce240745f6b509492673e1c1c60fe9f39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b6dfafce240745f6b5094926… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 17 10:00:13 2012 +0200 msvcp60: Fixed overflow in basic_string_char_find_cstr_substr function. --- dlls/msvcp60/string.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/msvcp60/string.c b/dlls/msvcp60/string.c index 2bef248..591ffdf 100644 --- a/dlls/msvcp60/string.c +++ b/dlls/msvcp60/string.c @@ -826,6 +826,8 @@ MSVCP_size_t __thiscall basic_string_char_find_cstr_substr( if(len==0 && pos<=this->size) return pos; + if(pos>=this->size || len>this->size) + return basic_string_char_npos; end = this->ptr+this->size-len+1; for(p=this->ptr+pos; p<end; p++) { @@ -2531,6 +2533,8 @@ MSVCP_size_t __thiscall basic_string_wchar_find_cstr_substr( if(len==0 && pos<=this->size) return pos; + if(pos>=this->size || len>this->size) + return basic_string_wchar_npos; end = this->ptr+this->size-len+1; for(p=this->ptr+pos; p<end; p++) {

1 0

Piotr Caban : msvcp60: Fixed basic_stringbuf class structure.
by Alexandre Julliard 17 Oct '12

17 Oct '12

Module: wine Branch: master Commit: 5b1ee41daa2e1d0a16d77b3e9b2e0d6630c90608 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b1ee41daa2e1d0a16d77b3e9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 17 10:01:21 2012 +0200 msvcp60: Fixed basic_stringbuf class structure. --- dlls/msvcp60/ios.c | 9 ++++----- dlls/msvcp60/msvcp.h | 1 - 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index ba6299c..3eea5d2 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -91,14 +91,18 @@ typedef enum { typedef struct { basic_streambuf_char base; + char *pendsave; char *seekhigh; + int alsize; int state; char allocator; /* empty struct */ } basic_stringbuf_char; typedef struct { basic_streambuf_wchar base; + wchar_t *pendsave; wchar_t *seekhigh; + int alsize; int state; char allocator; /* empty struct */ } basic_stringbuf_wchar; @@ -884,7 +888,6 @@ basic_streambuf_char* __thiscall basic_streambuf_char_ctor_uninitialized(basic_s { TRACE("(%p %d)\n", this, uninitialized); this->vtable = &MSVCP_basic_streambuf_char_vtable; - mutex_ctor(&this->lock); return this; } @@ -896,7 +899,6 @@ basic_streambuf_char* __thiscall basic_streambuf_char_ctor(basic_streambuf_char TRACE("(%p)\n", this); this->vtable = &MSVCP_basic_streambuf_char_vtable; - mutex_ctor(&this->lock); this->loc = MSVCRT_operator_new(sizeof(locale)); locale_ctor(this->loc); basic_streambuf_char__Init_empty(this); @@ -911,7 +913,6 @@ void __thiscall basic_streambuf_char_dtor(basic_streambuf_char *this) { TRACE("(%p)\n", this); - mutex_dtor(&this->lock); locale_dtor(this->loc); MSVCRT_operator_delete(this->loc); } @@ -995,7 +996,6 @@ void __thiscall basic_streambuf_char__Init(basic_streambuf_char *this, char **gf static void basic_streambuf_char__Lock(basic_streambuf_char *this) { TRACE("(%p)\n", this); - mutex_lock(&this->lock); } /* ?_Pnavail@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@IBEHXZ */ @@ -1092,7 +1092,6 @@ static streamsize basic_streambuf_char__Sgetn_s(basic_streambuf_char *this, char static void basic_streambuf_char__Unlock(basic_streambuf_char *this) { TRACE("(%p)\n", this); - mutex_unlock(&this->lock); } /* ?eback@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@IBEPADXZ */ diff --git a/dlls/msvcp60/msvcp.h b/dlls/msvcp60/msvcp.h index e1c13ea..e5476fd 100644 --- a/dlls/msvcp60/msvcp.h +++ b/dlls/msvcp60/msvcp.h @@ -290,7 +290,6 @@ typedef struct _ios_base { /* class basic_streambuf<char> */ typedef struct { const vtable_ptr *vtable; - mutex lock; char *rbuf; char *wbuf; char **prbuf;

1 0

Hans Leidekker : wbemprox: Implement Win32_Service.ResumeService.
by Alexandre Julliard 17 Oct '12

17 Oct '12

Module: wine Branch: master Commit: 139c9f02765134bf93919d45555ab7adf5c0b2a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=139c9f02765134bf93919d455… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 17 11:07:38 2012 +0200 wbemprox: Implement Win32_Service.ResumeService. --- dlls/wbemprox/builtin.c | 6 +++++- dlls/wbemprox/service.c | 35 +++++++++++++++++++++++++++++++++++ dlls/wbemprox/wbemprox_private.h | 2 ++ 3 files changed, 42 insertions(+), 1 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 5138fde..5ed2742 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -293,7 +293,8 @@ static const struct column col_service[] = { prop_stateW, CIM_STRING }, { prop_systemnameW, CIM_STRING|COL_FLAG_DYNAMIC }, /* methods */ - { method_pauseserviceW, CIM_FLAG_ARRAY|COL_FLAG_METHOD } + { method_pauseserviceW, CIM_FLAG_ARRAY|COL_FLAG_METHOD }, + { method_resumeserviceW, CIM_FLAG_ARRAY|COL_FLAG_METHOD } }; static const struct column col_sounddevice[] = { @@ -473,6 +474,7 @@ struct record_service const WCHAR *systemname; /* methods */ class_method *pause_service; + class_method *resume_service; }; struct record_sounddevice { @@ -515,6 +517,7 @@ static const struct record_diskdrive data_diskdrive[] = static const struct record_params data_params[] = { { class_serviceW, method_pauseserviceW, -1, param_returnvalueW, CIM_UINT32, VT_I4 }, + { class_serviceW, method_resumeserviceW, -1, param_returnvalueW, CIM_UINT32, VT_I4 }, { class_stdregprovW, method_enumkeyW, 1, param_defkeyW, CIM_SINT32, 0, 0x80000002 }, { class_stdregprovW, method_enumkeyW, 1, param_subkeynameW, CIM_STRING }, { class_stdregprovW, method_enumkeyW, -1, param_returnvalueW, CIM_UINT32, VT_I4 }, @@ -1114,6 +1117,7 @@ static void fill_service( struct table *table ) rec->state = get_service_state( status->dwCurrentState ); rec->systemname = heap_strdupW( sysnameW ); rec->pause_service = service_pause_service; + rec->resume_service = service_resume_service; heap_free( config ); offset += sizeof(*rec); num_rows++; diff --git a/dlls/wbemprox/service.c b/dlls/wbemprox/service.c index 7c6aabf..f381a4b 100644 --- a/dlls/wbemprox/service.c +++ b/dlls/wbemprox/service.c @@ -111,3 +111,38 @@ done: if (hr != S_OK) IWbemClassObject_Release( *out ); return hr; } + +HRESULT service_resume_service( IWbemClassObject *obj, IWbemClassObject *in, IWbemClassObject **out ) +{ + VARIANT name, retval; + IWbemClassObject *sig; + HRESULT hr; + + TRACE("%p, %p, %p\n", obj, in, out); + + hr = IWbemClassObject_Get( obj, prop_nameW, 0, &name, NULL, NULL ); + if (hr != S_OK) return hr; + + hr = create_signature( class_serviceW, method_resumeserviceW, PARAM_OUT, &sig ); + if (hr != S_OK) + { + VariantClear( &name ); + return hr; + } + hr = IWbemClassObject_SpawnInstance( sig, 0, out ); + if (hr != S_OK) + { + VariantClear( &name ); + IWbemClassObject_Release( sig ); + return hr; + } + hr = control_service( V_BSTR(&name), SERVICE_CONTROL_CONTINUE, &retval ); + if (hr != S_OK) goto done; + hr = IWbemClassObject_Put( *out, param_returnvalueW, 0, &retval, CIM_UINT32 ); + +done: + VariantClear( &name ); + IWbemClassObject_Release( sig ); + if (hr != S_OK) IWbemClassObject_Release( *out ); + return hr; +} diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index c2181c0..7f5bc6a 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -202,6 +202,7 @@ HRESULT reg_enum_key(IWbemClassObject *, IWbemClassObject *, IWbemClassObject ** HRESULT reg_enum_values(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; HRESULT reg_get_stringvalue(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; HRESULT service_pause_service(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; +HRESULT service_resume_service(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; static void *heap_alloc( size_t len ) __WINE_ALLOC_SIZE(1); static inline void *heap_alloc( size_t len ) @@ -243,6 +244,7 @@ static const WCHAR method_enumkeyW[] = {'E','n','u','m','K','e','y',0}; static const WCHAR method_enumvaluesW[] = {'E','n','u','m','V','a','l','u','e','s',0}; static const WCHAR method_getstringvalueW[] = {'G','e','t','S','t','r','i','n','g','V','a','l','u','e',0}; static const WCHAR method_pauseserviceW[] = {'P','a','u','s','e','S','e','r','v','i','c','e',0}; +static const WCHAR method_resumeserviceW[] = {'R','e','s','u','m','e','S','e','r','v','i','c','e',0}; static const WCHAR param_defkeyW[] = {'h','D','e','f','K','e','y',0}; static const WCHAR param_namesW[] = {'s','N','a','m','e','s',0};

1 0