July 2012 - Wine-Commits - list.winehq.org

Piotr Caban : msvcp90: Implement more basic_istream<char>::operator>> functions.
by Alexandre Julliard July 9, 2012

July 9, 2012

Module: wine Branch: master Commit: 91f695fd6e4cc6eff26db8b41961edfec77677c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91f695fd6e4cc6eff26db8b41… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 4 16:13:20 2012 +0200 msvcp90: Implement more basic_istream<char>::operator>> functions. --- dlls/msvcp90/ios.c | 114 ++++++++++++++++++++++++++++++++++++++++++-- dlls/msvcp90/msvcp90.spec | 40 ++++++++-------- 2 files changed, 128 insertions(+), 26 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=91f695fd6e4cc6eff26db…

1 0

Piotr Caban : msvcp90: Implement more basic_ostream<wchar>::operator<< functions.
by Alexandre Julliard July 9, 2012

July 9, 2012

Module: wine Branch: master Commit: bdb36b4afca83d93296f8d4fbc100018f4625b04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdb36b4afca83d93296f8d4fb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 4 16:14:15 2012 +0200 msvcp90: Implement more basic_ostream<wchar>::operator<< functions. --- dlls/msvcp90/ios.c | 125 +++++++++++++++++++++++++++++++++++++++++++-- dlls/msvcp90/msvcp90.spec | 8 ++-- 2 files changed, 124 insertions(+), 9 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index b90aac6..dfbd51d 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -5674,8 +5674,30 @@ basic_ostream_wchar* __thiscall basic_ostream_wchar_print_ldouble(basic_ostream_ DEFINE_THISCALL_WRAPPER(basic_ostream_wchar_print_streambuf, 8) basic_ostream_wchar* __thiscall basic_ostream_wchar_print_streambuf(basic_ostream_wchar *this, basic_streambuf_wchar *val) { - FIXME("(%p %p) stub\n", this, val); - return NULL; + basic_ios_wchar *base = basic_ostream_wchar_get_basic_ios(this); + IOSB_iostate state = IOSTATE_badbit; + unsigned short c = '\n'; + + TRACE("(%p %p)\n", this, val); + + if(basic_ostream_wchar_sentry_create(this)) { + for(c = basic_streambuf_wchar_sgetc(val); c!=WEOF; + c = basic_streambuf_wchar_snextc(val)) { + state = IOSTATE_goodbit; + + if(basic_streambuf_wchar_sputc(base->strbuf, c) == WEOF) { + state = IOSTATE_badbit; + break; + } + } + }else { + state = IOSTATE_badbit; + } + basic_ostream_wchar_sentry_destroy(this); + + ios_base_width_set(&base->base, 0); + basic_ios_wchar_setstate(base, state); + return this; } /* ??6?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@std@@QAEAAV01(a)PBX@Z */ @@ -5808,10 +5830,103 @@ basic_ostream_wchar* __cdecl basic_ostream_wchar_print_bstr(basic_ostream_wchar state = IOSTATE_badbit; } - for(; pad!=0; pad--) { - if(basic_streambuf_wchar_sputc(base->strbuf, base->fillch) == WEOF) { + if(state == IOSTATE_goodbit) { + for(; pad!=0; pad--) { + if(basic_streambuf_wchar_sputc(base->strbuf, base->fillch) == WEOF) { + state = IOSTATE_badbit; + break; + } + } + } + + base->base.wide = 0; + }else { + state = IOSTATE_badbit; + } + basic_ostream_wchar_sentry_destroy(ostr); + + basic_ios_wchar_setstate(base, state); + return ostr; +} + +/* ??$?6_WU?$char_traits(a)_W@std@@@std@@YAAAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@0(a)AAV10@_W(a)Z */ +/* ??$?6_WU?$char_traits(a)_W@std@@@std@@YAAEAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@0(a)AEAV10@_W(a)Z */ +basic_ostream_wchar* __cdecl basic_ostream_wchar_print_ch(basic_ostream_wchar *ostr, wchar_t ch) +{ + basic_ios_wchar *base = basic_ostream_wchar_get_basic_ios(ostr); + IOSB_iostate state = IOSTATE_goodbit; + + TRACE("(%p %d)\n", ostr, ch); + + if(basic_ostream_wchar_sentry_create(ostr)) { + streamsize pad = (base->base.wide>1 ? base->base.wide-1 : 0); + + if((base->base.fmtfl & FMTFLAG_adjustfield) != FMTFLAG_left) { + for(; pad!=0; pad--) { + if(basic_streambuf_wchar_sputc(base->strbuf, base->fillch) == WEOF) { + state = IOSTATE_badbit; + break; + } + } + } + + if(state == IOSTATE_goodbit) { + if(basic_streambuf_wchar_sputc(base->strbuf, ch) == WEOF) state = IOSTATE_badbit; - break; + } + + if(state == IOSTATE_goodbit) { + for(; pad!=0; pad--) { + if(basic_streambuf_wchar_sputc(base->strbuf, base->fillch) == WEOF) { + state = IOSTATE_badbit; + break; + } + } + } + + base->base.wide = 0; + }else { + state = IOSTATE_badbit; + } + basic_ostream_wchar_sentry_destroy(ostr); + + basic_ios_wchar_setstate(base, state); + return ostr; +} + +/* ??$?6_WU?$char_traits(a)_W@std@@@std@@YAAAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@0(a)AAV10@PB_W(a)Z */ +/* ??$?6_WU?$char_traits(a)_W@std@@@std@@YAAEAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@0(a)AEAV10@PEB_W(a)Z */ +basic_ostream_wchar* __cdecl basic_ostream_wchar_print_str(basic_ostream_wchar *ostr, const wchar_t *str) +{ + basic_ios_wchar *base = basic_ostream_wchar_get_basic_ios(ostr); + IOSB_iostate state = IOSTATE_goodbit; + + TRACE("(%p %s)\n", ostr, debugstr_w(str)); + + if(basic_ostream_wchar_sentry_create(ostr)) { + MSVCP_size_t len = wcslen(str); + streamsize pad = (base->base.wide>len ? base->base.wide-len : 0); + + if((base->base.fmtfl & FMTFLAG_adjustfield) != FMTFLAG_left) { + for(; pad!=0; pad--) { + if(basic_streambuf_wchar_sputc(base->strbuf, base->fillch) == WEOF) { + state = IOSTATE_badbit; + break; + } + } + } + + if(state == IOSTATE_goodbit) { + if(basic_streambuf_wchar_sputn(base->strbuf, str, len) != len) + state = IOSTATE_badbit; + } + + if(state == IOSTATE_goodbit) { + for(; pad!=0; pad--) { + if(basic_streambuf_wchar_sputc(base->strbuf, base->fillch) == WEOF) { + state = IOSTATE_badbit; + break; + } } } diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index a428abf..833bba8 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -80,10 +80,10 @@ @ cdecl -arch=win64 ??$?6U?$char_traits(a)D@std@@@std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@PEBD(a)Z(ptr str) basic_ostream_char_print_str @ cdecl -arch=win32 ??$?6U?$char_traits(a)D@std@@@std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@PBE(a)Z(ptr ptr) basic_ostream_char_print_str @ cdecl -arch=win64 ??$?6U?$char_traits(a)D@std@@@std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@PEBE(a)Z(ptr ptr) basic_ostream_char_print_str -@ stub -arch=win32 ??$?6_WU?$char_traits(a)_W@std@@@std@@YAAAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@0(a)AAV10@PB_W(a)Z -@ stub -arch=win64 ??$?6_WU?$char_traits(a)_W@std@@@std@@YAAEAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@0(a)AEAV10@PEB_W(a)Z -@ stub -arch=win32 ??$?6_WU?$char_traits(a)_W@std@@@std@@YAAAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@0(a)AAV10@_W(a)Z -@ stub -arch=win64 ??$?6_WU?$char_traits(a)_W@std@@@std@@YAAEAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@0(a)AEAV10@_W(a)Z +@ cdecl -arch=win32 ??$?6_WU?$char_traits(a)_W@std@@@std@@YAAAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@0(a)AAV10@PB_W(a)Z(ptr wstr) basic_ostream_wchar_print_str +@ cdecl -arch=win64 ??$?6_WU?$char_traits(a)_W@std@@@std@@YAAEAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@0(a)AEAV10@PEB_W(a)Z(ptr wstr) basic_ostream_wchar_print_str +@ cdecl -arch=win32 ??$?6_WU?$char_traits(a)_W@std@@@std@@YAAAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@0(a)AAV10@_W(a)Z(ptr long) basic_ostream_wchar_print_ch +@ cdecl -arch=win64 ??$?6_WU?$char_traits(a)_W@std@@@std@@YAAEAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@0(a)AEAV10@_W(a)Z(ptr long) basic_ostream_wchar_print_ch @ cdecl -arch=win32 ??$?6_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@1@@std@@YAAAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@0(a)AAV10@ABV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0@@Z(ptr ptr) basic_ostream_wchar_print_bstr @ cdecl -arch=win64 ??$?6_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@1@@std@@YAAEAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@0(a)AEAV10@AEBV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0@@Z(ptr ptr) basic_ostream_wchar_print_bstr @ cdecl -arch=win32 ??$?8DU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YA_NABV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0(a)0@Z(ptr ptr) MSVCP_basic_string_char_equal

1 0

Piotr Caban : msvcp90: Implement more basic_ostream<char>::operator<< functions.
by Alexandre Julliard July 9, 2012

July 9, 2012

Module: wine Branch: master Commit: ce4cbc7de22f1facac433b78486e136ddbe37463 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce4cbc7de22f1facac433b784… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 4 16:14:02 2012 +0200 msvcp90: Implement more basic_ostream<char>::operator<< functions. --- dlls/msvcp90/ios.c | 133 +++++++++++++++++++++++++++++++++++++++++++-- dlls/msvcp90/msvcp90.spec | 24 ++++---- 2 files changed, 140 insertions(+), 17 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 74321f5..b90aac6 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -4924,8 +4924,30 @@ basic_ostream_char* __thiscall basic_ostream_char_print_ldouble(basic_ostream_ch DEFINE_THISCALL_WRAPPER(basic_ostream_char_print_streambuf, 8) basic_ostream_char* __thiscall basic_ostream_char_print_streambuf(basic_ostream_char *this, basic_streambuf_char *val) { - FIXME("(%p %p) stub\n", this, val); - return NULL; + basic_ios_char *base = basic_ostream_char_get_basic_ios(this); + IOSB_iostate state = IOSTATE_badbit; + int c = '\n'; + + TRACE("(%p %p)\n", this, val); + + if(basic_ostream_char_sentry_create(this)) { + for(c = basic_streambuf_char_sgetc(val); c!=EOF; + c = basic_streambuf_char_snextc(val)) { + state = IOSTATE_goodbit; + + if(basic_streambuf_char_sputc(base->strbuf, c) == EOF) { + state = IOSTATE_badbit; + break; + } + } + }else { + state = IOSTATE_badbit; + } + basic_ostream_char_sentry_destroy(this); + + ios_base_width_set(&base->base, 0); + basic_ios_char_setstate(base, state); + return this; } /* ??6?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@QAEAAV01(a)PBX@Z */ @@ -5058,10 +5080,111 @@ basic_ostream_char* __cdecl basic_ostream_char_print_bstr(basic_ostream_char *os state = IOSTATE_badbit; } - for(; pad!=0; pad--) { - if(basic_streambuf_char_sputc(base->strbuf, base->fillch) == EOF) { + if(state == IOSTATE_goodbit) { + for(; pad!=0; pad--) { + if(basic_streambuf_char_sputc(base->strbuf, base->fillch) == EOF) { + state = IOSTATE_badbit; + break; + } + } + } + + base->base.wide = 0; + }else { + state = IOSTATE_badbit; + } + basic_ostream_char_sentry_destroy(ostr); + + basic_ios_char_setstate(base, state); + return ostr; +} + +/* ??$?6U?$char_traits(a)D@std@@@std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@C(a)Z */ +/* ??$?6U?$char_traits(a)D@std@@@std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@C(a)Z */ +/* ??$?6U?$char_traits(a)D@std@@@std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@D(a)Z */ +/* ??$?6U?$char_traits(a)D@std@@@std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@D(a)Z */ +/* ??$?6U?$char_traits(a)D@std@@@std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@E(a)Z */ +/* ??$?6U?$char_traits(a)D@std@@@std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@E(a)Z */ +basic_ostream_char* __cdecl basic_ostream_char_print_ch(basic_ostream_char *ostr, char ch) +{ + basic_ios_char *base = basic_ostream_char_get_basic_ios(ostr); + IOSB_iostate state = IOSTATE_goodbit; + + TRACE("(%p %d)\n", ostr, ch); + + if(basic_ostream_char_sentry_create(ostr)) { + streamsize pad = (base->base.wide>1 ? base->base.wide-1 : 0); + + if((base->base.fmtfl & FMTFLAG_adjustfield) != FMTFLAG_left) { + for(; pad!=0; pad--) { + if(basic_streambuf_char_sputc(base->strbuf, base->fillch) == EOF) { + state = IOSTATE_badbit; + break; + } + } + } + + if(state == IOSTATE_goodbit) { + if(basic_streambuf_char_sputc(base->strbuf, ch) == EOF) state = IOSTATE_badbit; - break; + } + + if(state == IOSTATE_goodbit) { + for(; pad!=0; pad--) { + if(basic_streambuf_char_sputc(base->strbuf, base->fillch) == EOF) { + state = IOSTATE_badbit; + break; + } + } + } + + base->base.wide = 0; + }else { + state = IOSTATE_badbit; + } + basic_ostream_char_sentry_destroy(ostr); + + basic_ios_char_setstate(base, state); + return ostr; +} + +/* ??$?6U?$char_traits(a)D@std@@@std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@PBC(a)Z */ +/* ??$?6U?$char_traits(a)D@std@@@std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@PEBC(a)Z */ +/* ??$?6U?$char_traits(a)D@std@@@std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@PBD(a)Z */ +/* ??$?6U?$char_traits(a)D@std@@@std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@PEBD(a)Z */ +/* ??$?6U?$char_traits(a)D@std@@@std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@PBE(a)Z */ +/* ??$?6U?$char_traits(a)D@std@@@std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@PEBE(a)Z */ +basic_ostream_char* __cdecl basic_ostream_char_print_str(basic_ostream_char *ostr, const char *str) +{ + basic_ios_char *base = basic_ostream_char_get_basic_ios(ostr); + IOSB_iostate state = IOSTATE_goodbit; + + TRACE("(%p %s)\n", ostr, str); + + if(basic_ostream_char_sentry_create(ostr)) { + MSVCP_size_t len = strlen(str); + streamsize pad = (base->base.wide>len ? base->base.wide-len : 0); + + if((base->base.fmtfl & FMTFLAG_adjustfield) != FMTFLAG_left) { + for(; pad!=0; pad--) { + if(basic_streambuf_char_sputc(base->strbuf, base->fillch) == EOF) { + state = IOSTATE_badbit; + break; + } + } + } + + if(state == IOSTATE_goodbit) { + if(basic_streambuf_char_sputn(base->strbuf, str, len) != len) + state = IOSTATE_badbit; + } + + if(state == IOSTATE_goodbit) { + for(; pad!=0; pad--) { + if(basic_streambuf_char_sputc(base->strbuf, base->fillch) == EOF) { + state = IOSTATE_badbit; + break; + } } } diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 23552a2..a428abf 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -68,18 +68,18 @@ @ stub -arch=win64 ??$?6OGU?$char_traits(a)G@std@@@std@@YAAEAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@0(a)AEAV10@AEBV?$complex(a)O@0@@Z @ stub -arch=win32 ??$?6O_WU?$char_traits(a)_W@std@@@std@@YAAAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@0(a)AAV10@ABV?$complex(a)O@0@@Z @ stub -arch=win64 ??$?6O_WU?$char_traits(a)_W@std@@@std@@YAAEAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@0(a)AEAV10@AEBV?$complex(a)O@0@@Z -@ stub -arch=win32 ??$?6U?$char_traits(a)D@std@@@std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@C(a)Z -@ stub -arch=win64 ??$?6U?$char_traits(a)D@std@@@std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@C(a)Z -@ stub -arch=win32 ??$?6U?$char_traits(a)D@std@@@std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@D(a)Z -@ stub -arch=win64 ??$?6U?$char_traits(a)D@std@@@std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@D(a)Z -@ stub -arch=win32 ??$?6U?$char_traits(a)D@std@@@std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@E(a)Z -@ stub -arch=win64 ??$?6U?$char_traits(a)D@std@@@std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@E(a)Z -@ stub -arch=win32 ??$?6U?$char_traits(a)D@std@@@std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@PBC(a)Z -@ stub -arch=win64 ??$?6U?$char_traits(a)D@std@@@std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@PEBC(a)Z -@ stub -arch=win32 ??$?6U?$char_traits(a)D@std@@@std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@PBD(a)Z -@ stub -arch=win64 ??$?6U?$char_traits(a)D@std@@@std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@PEBD(a)Z -@ stub -arch=win32 ??$?6U?$char_traits(a)D@std@@@std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@PBE(a)Z -@ stub -arch=win64 ??$?6U?$char_traits(a)D@std@@@std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@PEBE(a)Z +@ cdecl -arch=win32 ??$?6U?$char_traits(a)D@std@@@std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@C(a)Z(ptr long) basic_ostream_char_print_ch +@ cdecl -arch=win64 ??$?6U?$char_traits(a)D@std@@@std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@C(a)Z(ptr long) basic_ostream_char_print_ch +@ cdecl -arch=win32 ??$?6U?$char_traits(a)D@std@@@std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@D(a)Z(ptr long) basic_ostream_char_print_ch +@ cdecl -arch=win64 ??$?6U?$char_traits(a)D@std@@@std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@D(a)Z(ptr long) basic_ostream_char_print_ch +@ cdecl -arch=win32 ??$?6U?$char_traits(a)D@std@@@std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@E(a)Z(ptr long) basic_ostream_char_print_ch +@ cdecl -arch=win64 ??$?6U?$char_traits(a)D@std@@@std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@E(a)Z(ptr long) basic_ostream_char_print_ch +@ cdecl -arch=win32 ??$?6U?$char_traits(a)D@std@@@std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@PBC(a)Z(ptr ptr) basic_ostream_char_print_str +@ cdecl -arch=win64 ??$?6U?$char_traits(a)D@std@@@std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@PEBC(a)Z(ptr ptr) basic_ostream_char_print_str +@ cdecl -arch=win32 ??$?6U?$char_traits(a)D@std@@@std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@PBD(a)Z(ptr str) basic_ostream_char_print_str +@ cdecl -arch=win64 ??$?6U?$char_traits(a)D@std@@@std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@PEBD(a)Z(ptr str) basic_ostream_char_print_str +@ cdecl -arch=win32 ??$?6U?$char_traits(a)D@std@@@std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@PBE(a)Z(ptr ptr) basic_ostream_char_print_str +@ cdecl -arch=win64 ??$?6U?$char_traits(a)D@std@@@std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@PEBE(a)Z(ptr ptr) basic_ostream_char_print_str @ stub -arch=win32 ??$?6_WU?$char_traits(a)_W@std@@@std@@YAAAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@0(a)AAV10@PB_W(a)Z @ stub -arch=win64 ??$?6_WU?$char_traits(a)_W@std@@@std@@YAAEAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@0(a)AEAV10@PEB_W(a)Z @ stub -arch=win32 ??$?6_WU?$char_traits(a)_W@std@@@std@@YAAAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@0(a)AAV10@_W(a)Z

1 0

Piotr Caban : msvcp90: Implement more basic_istream<wchar>::operator>> functions.
by Alexandre Julliard July 9, 2012

July 9, 2012

Module: wine Branch: master Commit: 5c28a4e8cbb81d8c5f0deebcc574742588a47398 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c28a4e8cbb81d8c5f0deebcc… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 4 16:13:36 2012 +0200 msvcp90: Implement more basic_istream<wchar>::operator>> functions. --- dlls/msvcp90/ios.c | 106 ++++++++++++++++++++++++++++++++++++++++++--- dlls/msvcp90/msvcp90.spec | 24 +++++----- 2 files changed, 112 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5c28a4e8cbb81d8c5f0de…

1 0

Piotr Caban : msvcp: Sync spec files.
by Alexandre Julliard July 9, 2012

July 9, 2012

Module: wine Branch: master Commit: c14e98dd320efea61f5ec428a4350f3d49684111 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c14e98dd320efea61f5ec428a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 4 16:14:34 2012 +0200 msvcp: Sync spec files. --- dlls/msvcp100/msvcp100.spec | 34 ++++++++-------- dlls/msvcp70/msvcp70.spec | 34 ++++++++-------- dlls/msvcp71/msvcp71.spec | 74 +++++++++++++++++----------------- dlls/msvcp80/msvcp80.spec | 90 +++++++++++++++++++++--------------------- 4 files changed, 116 insertions(+), 116 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c14e98dd320efea61f5ec…

1 0

Piotr Caban : msvcp90: Pass base class pointer to virtual functions.
by Alexandre Julliard July 9, 2012

July 9, 2012

Module: wine Branch: master Commit: 36f79a1c2dfccf1c0e019a8a697bda2fefc62c1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=36f79a1c2dfccf1c0e019a8a6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 4 16:15:15 2012 +0200 msvcp90: Pass base class pointer to virtual functions. --- dlls/msvcp90/ios.c | 304 +++++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 242 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=36f79a1c2dfccf1c0e019…

1 0

Piotr Caban : msvcp90: Fix EOF handling in basic_filebuf<char>::underflow.
by Alexandre Julliard July 9, 2012

July 9, 2012

Module: wine Branch: master Commit: 0d3dcd23f4028fa77cb6c5e5a8dca9bde60c6647 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d3dcd23f4028fa77cb6c5e5a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 4 18:15:55 2012 +0200 msvcp90: Fix EOF handling in basic_filebuf<char>::underflow. --- 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 8550c6e..9501c8a 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -2513,7 +2513,7 @@ int __thiscall basic_filebuf_char_underflow(basic_filebuf_char *this) return *basic_streambuf_char_gptr(&this->base); ret = call_basic_filebuf_char_uflow(this); - if(ret) + if(ret != EOF) ret = call_basic_filebuf_char_pbackfail(this, ret); return ret; }

1 0

Hans Leidekker : wbemprox: Implement Win32_Processor. Manufacturer and Win32_Processor.Name.
by Alexandre Julliard July 9, 2012

July 9, 2012

Module: wine Branch: master Commit: 716870ef87e70937f822b8a2192b1068e42bd46a URL: http://source.winehq.org/git/wine.git/?a=commit;h=716870ef87e70937f822b8a21… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 4 10:32:55 2012 +0200 wbemprox: Implement Win32_Processor.Manufacturer and Win32_Processor.Name. --- dlls/wbemprox/builtin.c | 68 ++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 58 insertions(+), 10 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 740e096..53f9c6d 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -187,7 +187,8 @@ static const struct column col_processor[] = { { prop_cpustatusW, CIM_UINT16 }, { prop_deviceidW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, - { prop_manufacturerW, CIM_STRING }, + { prop_manufacturerW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_processoridW, CIM_STRING|COL_FLAG_DYNAMIC } }; static const struct column col_videocontroller[] = @@ -229,8 +230,6 @@ static const WCHAR os_32bitW[] = {'3','2','-','b','i','t',0}; static const WCHAR os_64bitW[] = {'6','4','-','b','i','t',0}; -static const WCHAR processor_manufacturerW[] = - {'G','e','n','u','i','n','e','I','n','t','e','l',0}; static const WCHAR videocontroller_deviceidW[] = {'V','i','d','e','o','C','o','n','t','r','o','l','l','e','r','1',0}; @@ -295,6 +294,7 @@ struct record_processor UINT16 cpu_status; const WCHAR *device_id; const WCHAR *manufacturer; + const WCHAR *name; const WCHAR *processor_id; }; struct record_videocontroller @@ -543,27 +543,75 @@ static inline void do_cpuid( unsigned int ax, unsigned int *p ) #endif } +static void get_processor_id( WCHAR *processor_id ) +{ + static const WCHAR fmtW[] = {'%','0','8','X','%','0','8','X',0}; + unsigned int regs[4] = {0, 0, 0, 0}; + + do_cpuid( 1, regs ); + sprintfW( processor_id, fmtW, regs[3], regs[0] ); +} +static void regs_to_str( unsigned int *regs, unsigned int len, WCHAR *buffer ) +{ + unsigned int i; + unsigned char *p = (unsigned char *)regs; + + for (i = 0; i < len; i++) + { + buffer[i] = *p++; + } + buffer[i] = 0; + return; +} +static void get_processor_manufacturer( WCHAR *manufacturer ) +{ + unsigned int tmp, regs[4] = {0, 0, 0, 0}; + + do_cpuid( 0, regs ); + tmp = regs[2]; /* swap edx and ecx */ + regs[2] = regs[3]; + regs[3] = tmp; + + regs_to_str( regs + 1, 12, manufacturer ); +} +static void get_processor_name( WCHAR *name ) +{ + unsigned int regs[4] = {0, 0, 0, 0}; + + do_cpuid( 0x80000000, regs ); + if (regs[0] >= 0x80000004) + { + do_cpuid( 0x80000002, regs ); + regs_to_str( regs, 16, name ); + do_cpuid( 0x80000003, regs ); + regs_to_str( regs, 16, name + 16 ); + do_cpuid( 0x80000004, regs ); + regs_to_str( regs, 16, name + 32 ); + } +} + static void fill_processor( struct table *table ) { static const WCHAR fmtW[] = {'C','P','U','%','u',0}; - static const WCHAR fmt_cpuidW[] = {'%','0','8','X','%','0','8','X',0}; - WCHAR device_id[14], cpu_id[17]; + WCHAR device_id[14], processor_id[17], manufacturer[13], name[49] = {0}; struct record_processor *rec; UINT i, offset = 0, count = get_processor_count(); - unsigned int regs[4] = {0, 0, 0, 0}; if (!(table->data = heap_alloc( sizeof(*rec) * count ))) return; - do_cpuid( 1, regs ); - sprintfW( cpu_id, fmt_cpuidW, regs[3], regs[0] ); + get_processor_id( processor_id ); + get_processor_manufacturer( manufacturer ); + get_processor_name( name ); + for (i = 0; i < count; i++) { rec = (struct record_processor *)(table->data + offset); rec->cpu_status = 1; /* CPU Enabled */ - rec->manufacturer = processor_manufacturerW; sprintfW( device_id, fmtW, i ); rec->device_id = heap_strdupW( device_id ); - rec->processor_id = heap_strdupW( cpu_id ); + rec->manufacturer = heap_strdupW( manufacturer ); + rec->name = heap_strdupW( name ); + rec->processor_id = heap_strdupW( processor_id ); offset += sizeof(*rec); }

1 0

Dmitry Timoshkov : winex11.drv: Avoid conflicting definitions of WINGDIAPI.
by Alexandre Julliard July 9, 2012

July 9, 2012

Module: wine Branch: master Commit: 6173e6bfb68108a84e190c1ce76dce26e97bc009 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6173e6bfb68108a84e190c1ce… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jul 4 01:21:11 2012 +0900 winex11.drv: Avoid conflicting definitions of WINGDIAPI. --- dlls/winex11.drv/opengl.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index f43127c..44882cb 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -44,6 +44,7 @@ #endif #undef APIENTRY #undef GLAPI +#undef WINGDIAPI #include "x11drv.h" #include "winternl.h"

1 0

Jacek Caban : vbscript: Fixed 'exit do' statements crossing for in loops.
by Alexandre Julliard July 9, 2012

July 9, 2012

Module: wine Branch: master Commit: 8de35a45143c48d80b522441558f1a1b2fdaa174 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8de35a45143c48d80b5224415… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 3 19:17:23 2012 +0200 vbscript: Fixed 'exit do' statements crossing for in loops. --- dlls/vbscript/compile.c | 9 ++++++--- dlls/vbscript/interp.c | 6 ++++-- dlls/vbscript/tests/lang.vbs | 6 ++++++ 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index e93b257..68e0a70 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -682,7 +682,7 @@ static HRESULT compile_foreach_statement(compile_ctx_t *ctx, foreach_statement_t static HRESULT compile_forto_statement(compile_ctx_t *ctx, forto_statement_t *stat) { - statement_ctx_t loop_ctx = {0}; + statement_ctx_t loop_ctx = {2}; unsigned step_instr, instr; BSTR identifier; HRESULT hres; @@ -743,9 +743,12 @@ static HRESULT compile_forto_statement(compile_ctx_t *ctx, forto_statement_t *st if(FAILED(hres)) return hres; - label_set_addr(ctx, loop_ctx.for_end_label); + hres = push_instr_uint(ctx, OP_pop, 2); + if(FAILED(hres)) + return hres; - return push_instr_uint(ctx, OP_pop, 2); + label_set_addr(ctx, loop_ctx.for_end_label); + return S_OK; } static HRESULT compile_assignment(compile_ctx_t *ctx, member_expression_t *member_expr, expression_t *value_expr, BOOL is_set) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 9a8f97e..3a6fb38 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -894,10 +894,12 @@ static HRESULT interp_step(exec_ctx_t *ctx) if(FAILED(hres)) return hres; - if(hres == VARCMP_EQ || hres == (gteq_zero ? VARCMP_LT : VARCMP_GT)) + if(hres == VARCMP_EQ || hres == (gteq_zero ? VARCMP_LT : VARCMP_GT)) { ctx->instr++; - else + }else { + stack_popn(ctx, 2); instr_jmp(ctx, ctx->instr->arg1.uint); + } return S_OK; } diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 1636de1..f203e83 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -415,6 +415,12 @@ for x = 1 to 100 Call ok(false, "exit for not escaped the loop?") next +do while true + for x = 1 to 100 + exit do + next +loop + Call collectionObj.reset() y = 0 x = 10

1 0