wine-commits July 2012

wine-commits@winehq.org

2 participants
712 discussions

Piotr Caban : msvcp90/tests: Added destructor tests for class with virtual inheritance.
by Alexandre Julliard 09 Jul '12

09 Jul '12

Module: wine Branch: master Commit: 3adb3a3c283c277c04976354744c396b851fe963 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3adb3a3c283c277c049763547… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 4 16:16:01 2012 +0200 msvcp90/tests: Added destructor tests for class with virtual inheritance. --- dlls/msvcp90/tests/misc.c | 45 +++++++++++++++++++++++++++++++++++++++------ 1 files changed, 39 insertions(+), 6 deletions(-) diff --git a/dlls/msvcp90/tests/misc.c b/dlls/msvcp90/tests/misc.c index 7d9ef39..5faa03c 100644 --- a/dlls/msvcp90/tests/misc.c +++ b/dlls/msvcp90/tests/misc.c @@ -80,16 +80,22 @@ static char* (__thiscall *p_char_allocate)(void*, size_t); static void (__thiscall *p_char_construct)(void*, char*, const char*); static size_t (__thiscall *p_char_max_size)(void*); -void* (__thiscall *p_collate_char_ctor_refs)(void*, size_t); -int (__thiscall *p_collate_char_compare)(const void*, const char*, +static void* (__thiscall *p_collate_char_ctor_refs)(void*, size_t); +static int (__thiscall *p_collate_char_compare)(const void*, const char*, const char*, const char*, const char*); -void (__thiscall *p_collate_char_dtor)(void*); -void* (__thiscall *p_numpunct_char_ctor)(void*); -basic_string_char* (__thiscall *p_numpunct_char_falsename)(void*,basic_string_char*); -void (__thiscall *p_numpunct_char_dtor)(void*); +static void (__thiscall *p_collate_char_dtor)(void*); +static void* (__thiscall *p_numpunct_char_ctor)(void*); +static basic_string_char* (__thiscall *p_numpunct_char_falsename)(void*,basic_string_char*); +static void (__thiscall *p_numpunct_char_dtor)(void*); static void (__thiscall *p_basic_string_char_dtor)(basic_string_char*); static const char* (__thiscall *p_basic_string_char_cstr)(basic_string_char*); +static const int *basic_ostringstream_char_vbtable; +static /*basic_ostringstream_char*/void* (__thiscall *p_basic_ostringstream_char_ctor_mode)( + /*basic_ostringstream_char*/void*, int, /*MSVCP_bool*/int); +static void (__thiscall *p_basic_ostringstream_char_dtor)(/*basic_ostringstream_char*/void*); +static void (__thiscall *p_basic_ostringstream_char_vbase_dtor)(/*basic_ostringstream_char*/void*); + static int invalid_parameter = 0; static void __cdecl test_invalid_parameter_handler(const wchar_t *expression, const wchar_t *function, const wchar_t *file, @@ -179,6 +185,7 @@ static BOOL init(void) SET(p_wctype, "wctype"); SET(p__Getctype, "_Getctype"); SET(p__Getcoll, "_Getcoll"); + SET(basic_ostringstream_char_vbtable, "??_8?$basic_ostringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@7B@"); if(sizeof(void*) == 8) { /* 64-bit initialization */ SET(p_char_assign, "?assign@?$char_traits@D@std@@SAXAEADAEBD@Z"); SET(p_wchar_assign, "?assign@?$char_traits@_W@std@@SAXAEA_WAEB_W@Z"); @@ -207,6 +214,13 @@ static BOOL init(void) "??1?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA@XZ"); SET(p_basic_string_char_cstr, "?c_str@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBAPEBDXZ"); + + SET(p_basic_ostringstream_char_ctor_mode, + "??0?$basic_ostringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA@H@Z"); + SET(p_basic_ostringstream_char_dtor, + "??1?$basic_ostringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@UEAA@XZ"); + SET(p_basic_ostringstream_char_vbase_dtor, + "??_D?$basic_ostringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAXXZ"); } else { SET(p_char_assign, "?assign@?$char_traits@D@std@@SAXAADABD@Z"); SET(p_wchar_assign, "?assign@?$char_traits@_W@std@@SAXAA_WAB_W@Z"); @@ -235,6 +249,13 @@ static BOOL init(void) "??1?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@XZ"); SET(p_basic_string_char_cstr, "?c_str@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEPBDXZ"); + + SET(p_basic_ostringstream_char_ctor_mode, + "??0?$basic_ostringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@H@Z"); + SET(p_basic_ostringstream_char_dtor, + "??1?$basic_ostringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@UAE@XZ"); + SET(p_basic_ostringstream_char_vbase_dtor, + "??_D?$basic_ostringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEXXZ"); } init_thiscall_thunk(); @@ -464,6 +485,17 @@ static void test_virtual_call(void) call_func1(p_numpunct_char_dtor, this); } +static void test_virtual_base_dtors(void) +{ + char this[512]; + + call_func3(p_basic_ostringstream_char_ctor_mode, this, 0, 1); + call_func1(p_basic_ostringstream_char_vbase_dtor, this); + + call_func3(p_basic_ostringstream_char_ctor_mode, this, 0, 0); + call_func1(p_basic_ostringstream_char_dtor, this+basic_ostringstream_char_vbtable[1]); +} + START_TEST(misc) { if(!init()) @@ -476,6 +508,7 @@ START_TEST(misc) test__Getctype(); test__Getcoll(); test_virtual_call(); + test_virtual_base_dtors(); test_allocator_char();

1 0

Piotr Caban : msvcp90: Pass base class pointer to virtual functions.
by Alexandre Julliard 09 Jul '12

09 Jul '12

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 : msvcp: Sync spec files.
by Alexandre Julliard 09 Jul '12

09 Jul '12

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: Implement more basic_ostream<wchar>::operator<< functions.
by Alexandre Julliard 09 Jul '12

09 Jul '12

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@_WU?$char_traits@_W@std@@@std@@QAEAAV01@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@_W@std@@@std@@YAAAV?$basic_ostream@_WU?$char_traits@_W@std@@@0@AAV10@_W@Z */ +/* ??$?6_WU?$char_traits@_W@std@@@std@@YAAEAV?$basic_ostream@_WU?$char_traits@_W@std@@@0@AEAV10@_W@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@_W@std@@@std@@YAAAV?$basic_ostream@_WU?$char_traits@_W@std@@@0@AAV10@PB_W@Z */ +/* ??$?6_WU?$char_traits@_W@std@@@std@@YAAEAV?$basic_ostream@_WU?$char_traits@_W@std@@@0@AEAV10@PEB_W@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@D@std@@@std@@YAAEAV?$basic_ostream@DU?$char_traits@D@std@@@0@AEAV10@PEBD@Z(ptr str) basic_ostream_char_print_str @ cdecl -arch=win32 ??$?6U?$char_traits@D@std@@@std@@YAAAV?$basic_ostream@DU?$char_traits@D@std@@@0@AAV10@PBE@Z(ptr ptr) basic_ostream_char_print_str @ cdecl -arch=win64 ??$?6U?$char_traits@D@std@@@std@@YAAEAV?$basic_ostream@DU?$char_traits@D@std@@@0@AEAV10@PEBE@Z(ptr ptr) basic_ostream_char_print_str -@ stub -arch=win32 ??$?6_WU?$char_traits@_W@std@@@std@@YAAAV?$basic_ostream@_WU?$char_traits@_W@std@@@0@AAV10@PB_W@Z -@ stub -arch=win64 ??$?6_WU?$char_traits@_W@std@@@std@@YAAEAV?$basic_ostream@_WU?$char_traits@_W@std@@@0@AEAV10@PEB_W@Z -@ stub -arch=win32 ??$?6_WU?$char_traits@_W@std@@@std@@YAAAV?$basic_ostream@_WU?$char_traits@_W@std@@@0@AAV10@_W@Z -@ stub -arch=win64 ??$?6_WU?$char_traits@_W@std@@@std@@YAAEAV?$basic_ostream@_WU?$char_traits@_W@std@@@0@AEAV10@_W@Z +@ cdecl -arch=win32 ??$?6_WU?$char_traits@_W@std@@@std@@YAAAV?$basic_ostream@_WU?$char_traits@_W@std@@@0@AAV10@PB_W@Z(ptr wstr) basic_ostream_wchar_print_str +@ cdecl -arch=win64 ??$?6_WU?$char_traits@_W@std@@@std@@YAAEAV?$basic_ostream@_WU?$char_traits@_W@std@@@0@AEAV10@PEB_W@Z(ptr wstr) basic_ostream_wchar_print_str +@ cdecl -arch=win32 ??$?6_WU?$char_traits@_W@std@@@std@@YAAAV?$basic_ostream@_WU?$char_traits@_W@std@@@0@AAV10@_W@Z(ptr long) basic_ostream_wchar_print_ch +@ cdecl -arch=win64 ??$?6_WU?$char_traits@_W@std@@@std@@YAAEAV?$basic_ostream@_WU?$char_traits@_W@std@@@0@AEAV10@_W@Z(ptr long) basic_ostream_wchar_print_ch @ cdecl -arch=win32 ??$?6_WU?$char_traits@_W@std@@V?$allocator@_W@1@@std@@YAAAV?$basic_ostream@_WU?$char_traits@_W@std@@@0@AAV10@ABV?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@0@@Z(ptr ptr) basic_ostream_wchar_print_bstr @ cdecl -arch=win64 ??$?6_WU?$char_traits@_W@std@@V?$allocator@_W@1@@std@@YAAEAV?$basic_ostream@_WU?$char_traits@_W@std@@@0@AEAV10@AEBV?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@0@@Z(ptr ptr) basic_ostream_wchar_print_bstr @ cdecl -arch=win32 ??$?8DU?$char_traits@D@std@@V?$allocator@D@1@@std@@YA_NABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@0@0@Z(ptr ptr) MSVCP_basic_string_char_equal

1 0

Piotr Caban : msvcp90: Implement more basic_ostream<char>::operator<< functions.
by Alexandre Julliard 09 Jul '12

09 Jul '12

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@DU?$char_traits@D@std@@@std@@QAEAAV01@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@D@std@@@std@@YAAAV?$basic_ostream@DU?$char_traits@D@std@@@0@AAV10@C@Z */ +/* ??$?6U?$char_traits@D@std@@@std@@YAAEAV?$basic_ostream@DU?$char_traits@D@std@@@0@AEAV10@C@Z */ +/* ??$?6U?$char_traits@D@std@@@std@@YAAAV?$basic_ostream@DU?$char_traits@D@std@@@0@AAV10@D@Z */ +/* ??$?6U?$char_traits@D@std@@@std@@YAAEAV?$basic_ostream@DU?$char_traits@D@std@@@0@AEAV10@D@Z */ +/* ??$?6U?$char_traits@D@std@@@std@@YAAAV?$basic_ostream@DU?$char_traits@D@std@@@0@AAV10@E@Z */ +/* ??$?6U?$char_traits@D@std@@@std@@YAAEAV?$basic_ostream@DU?$char_traits@D@std@@@0@AEAV10@E@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@D@std@@@std@@YAAAV?$basic_ostream@DU?$char_traits@D@std@@@0@AAV10@PBC@Z */ +/* ??$?6U?$char_traits@D@std@@@std@@YAAEAV?$basic_ostream@DU?$char_traits@D@std@@@0@AEAV10@PEBC@Z */ +/* ??$?6U?$char_traits@D@std@@@std@@YAAAV?$basic_ostream@DU?$char_traits@D@std@@@0@AAV10@PBD@Z */ +/* ??$?6U?$char_traits@D@std@@@std@@YAAEAV?$basic_ostream@DU?$char_traits@D@std@@@0@AEAV10@PEBD@Z */ +/* ??$?6U?$char_traits@D@std@@@std@@YAAAV?$basic_ostream@DU?$char_traits@D@std@@@0@AAV10@PBE@Z */ +/* ??$?6U?$char_traits@D@std@@@std@@YAAEAV?$basic_ostream@DU?$char_traits@D@std@@@0@AEAV10@PEBE@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@G@std@@@std@@YAAEAV?$basic_ostream@GU?$char_traits@G@std@@@0@AEAV10@AEBV?$complex@O@0@@Z @ stub -arch=win32 ??$?6O_WU?$char_traits@_W@std@@@std@@YAAAV?$basic_ostream@_WU?$char_traits@_W@std@@@0@AAV10@ABV?$complex@O@0@@Z @ stub -arch=win64 ??$?6O_WU?$char_traits@_W@std@@@std@@YAAEAV?$basic_ostream@_WU?$char_traits@_W@std@@@0@AEAV10@AEBV?$complex@O@0@@Z -@ stub -arch=win32 ??$?6U?$char_traits@D@std@@@std@@YAAAV?$basic_ostream@DU?$char_traits@D@std@@@0@AAV10@C@Z -@ stub -arch=win64 ??$?6U?$char_traits@D@std@@@std@@YAAEAV?$basic_ostream@DU?$char_traits@D@std@@@0@AEAV10@C@Z -@ stub -arch=win32 ??$?6U?$char_traits@D@std@@@std@@YAAAV?$basic_ostream@DU?$char_traits@D@std@@@0@AAV10@D@Z -@ stub -arch=win64 ??$?6U?$char_traits@D@std@@@std@@YAAEAV?$basic_ostream@DU?$char_traits@D@std@@@0@AEAV10@D@Z -@ stub -arch=win32 ??$?6U?$char_traits@D@std@@@std@@YAAAV?$basic_ostream@DU?$char_traits@D@std@@@0@AAV10@E@Z -@ stub -arch=win64 ??$?6U?$char_traits@D@std@@@std@@YAAEAV?$basic_ostream@DU?$char_traits@D@std@@@0@AEAV10@E@Z -@ stub -arch=win32 ??$?6U?$char_traits@D@std@@@std@@YAAAV?$basic_ostream@DU?$char_traits@D@std@@@0@AAV10@PBC@Z -@ stub -arch=win64 ??$?6U?$char_traits@D@std@@@std@@YAAEAV?$basic_ostream@DU?$char_traits@D@std@@@0@AEAV10@PEBC@Z -@ stub -arch=win32 ??$?6U?$char_traits@D@std@@@std@@YAAAV?$basic_ostream@DU?$char_traits@D@std@@@0@AAV10@PBD@Z -@ stub -arch=win64 ??$?6U?$char_traits@D@std@@@std@@YAAEAV?$basic_ostream@DU?$char_traits@D@std@@@0@AEAV10@PEBD@Z -@ stub -arch=win32 ??$?6U?$char_traits@D@std@@@std@@YAAAV?$basic_ostream@DU?$char_traits@D@std@@@0@AAV10@PBE@Z -@ stub -arch=win64 ??$?6U?$char_traits@D@std@@@std@@YAAEAV?$basic_ostream@DU?$char_traits@D@std@@@0@AEAV10@PEBE@Z +@ cdecl -arch=win32 ??$?6U?$char_traits@D@std@@@std@@YAAAV?$basic_ostream@DU?$char_traits@D@std@@@0@AAV10@C@Z(ptr long) basic_ostream_char_print_ch +@ cdecl -arch=win64 ??$?6U?$char_traits@D@std@@@std@@YAAEAV?$basic_ostream@DU?$char_traits@D@std@@@0@AEAV10@C@Z(ptr long) basic_ostream_char_print_ch +@ cdecl -arch=win32 ??$?6U?$char_traits@D@std@@@std@@YAAAV?$basic_ostream@DU?$char_traits@D@std@@@0@AAV10@D@Z(ptr long) basic_ostream_char_print_ch +@ cdecl -arch=win64 ??$?6U?$char_traits@D@std@@@std@@YAAEAV?$basic_ostream@DU?$char_traits@D@std@@@0@AEAV10@D@Z(ptr long) basic_ostream_char_print_ch +@ cdecl -arch=win32 ??$?6U?$char_traits@D@std@@@std@@YAAAV?$basic_ostream@DU?$char_traits@D@std@@@0@AAV10@E@Z(ptr long) basic_ostream_char_print_ch +@ cdecl -arch=win64 ??$?6U?$char_traits@D@std@@@std@@YAAEAV?$basic_ostream@DU?$char_traits@D@std@@@0@AEAV10@E@Z(ptr long) basic_ostream_char_print_ch +@ cdecl -arch=win32 ??$?6U?$char_traits@D@std@@@std@@YAAAV?$basic_ostream@DU?$char_traits@D@std@@@0@AAV10@PBC@Z(ptr ptr) basic_ostream_char_print_str +@ cdecl -arch=win64 ??$?6U?$char_traits@D@std@@@std@@YAAEAV?$basic_ostream@DU?$char_traits@D@std@@@0@AEAV10@PEBC@Z(ptr ptr) basic_ostream_char_print_str +@ cdecl -arch=win32 ??$?6U?$char_traits@D@std@@@std@@YAAAV?$basic_ostream@DU?$char_traits@D@std@@@0@AAV10@PBD@Z(ptr str) basic_ostream_char_print_str +@ cdecl -arch=win64 ??$?6U?$char_traits@D@std@@@std@@YAAEAV?$basic_ostream@DU?$char_traits@D@std@@@0@AEAV10@PEBD@Z(ptr str) basic_ostream_char_print_str +@ cdecl -arch=win32 ??$?6U?$char_traits@D@std@@@std@@YAAAV?$basic_ostream@DU?$char_traits@D@std@@@0@AAV10@PBE@Z(ptr ptr) basic_ostream_char_print_str +@ cdecl -arch=win64 ??$?6U?$char_traits@D@std@@@std@@YAAEAV?$basic_ostream@DU?$char_traits@D@std@@@0@AEAV10@PEBE@Z(ptr ptr) basic_ostream_char_print_str @ stub -arch=win32 ??$?6_WU?$char_traits@_W@std@@@std@@YAAAV?$basic_ostream@_WU?$char_traits@_W@std@@@0@AAV10@PB_W@Z @ stub -arch=win64 ??$?6_WU?$char_traits@_W@std@@@std@@YAAEAV?$basic_ostream@_WU?$char_traits@_W@std@@@0@AEAV10@PEB_W@Z @ stub -arch=win32 ??$?6_WU?$char_traits@_W@std@@@std@@YAAAV?$basic_ostream@_WU?$char_traits@_W@std@@@0@AAV10@_W@Z

1 0

Piotr Caban : msvcp90: Implement more basic_istream<wchar>::operator>> functions.
by Alexandre Julliard 09 Jul '12

09 Jul '12

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 : msvcp90: Implement more basic_istream<char>::operator>> functions.
by Alexandre Julliard 09 Jul '12

09 Jul '12

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

Michael Stefaniuc : quartz: Remove an object to IFilterGraph2 cast.
by Alexandre Julliard 09 Jul '12

09 Jul '12

Module: wine Branch: master Commit: 4e57e3bf5291fd687e2627432114c9654ead94df URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e57e3bf5291fd687e2627432… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jul 4 17:26:49 2012 +0200 quartz: Remove an object to IFilterGraph2 cast. --- dlls/quartz/filtergraph.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 7b6654b..6b0085d 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1991,7 +1991,7 @@ static HRESULT WINAPI MediaControl_Run(IMediaControl *iface) This->EcCompleteCount = 0; if (This->defaultclock && !This->refClock) - IFilterGraph2_SetDefaultSyncSource((IFilterGraph2*)This); + IFilterGraph2_SetDefaultSyncSource(&This->IFilterGraph2_iface); if (This->refClock) {

1 0

Hans Leidekker : wbemprox: Implement Win32_Processor. Manufacturer and Win32_Processor.Name.
by Alexandre Julliard 09 Jul '12

09 Jul '12

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

Hans Leidekker : wbemprox: Add a partial Win32_BaseBoard class implementation.
by Alexandre Julliard 09 Jul '12

09 Jul '12

Module: wine Branch: master Commit: 993d8c245a5c0cc87aafd93c99ee108aaab3962c URL: http://source.winehq.org/git/wine.git/?a=commit;h=993d8c245a5c0cc87aafd93c9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 4 10:32:00 2012 +0200 wbemprox: Add a partial Win32_BaseBoard class implementation. --- dlls/wbemprox/builtin.c | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 75f37dc..740e096 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -39,6 +39,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(wbemprox); +static const WCHAR class_baseboardW[] = + {'W','i','n','3','2','_','B','a','s','e','B','o','a','r','d',0}; static const WCHAR class_biosW[] = {'W','i','n','3','2','_','B','I','O','S',0}; static const WCHAR class_compsysW[] = @@ -118,12 +120,20 @@ static const WCHAR prop_speedW[] = {'S','p','e','e','d',0}; static const WCHAR prop_systemdirectoryW[] = {'S','y','s','t','e','m','D','i','r','e','c','t','o','r','y',0}; +static const WCHAR prop_tagW[] = + {'T','a','g',0}; static const WCHAR prop_threadcountW[] = {'T','h','r','e','a','d','C','o','u','n','t',0}; static const WCHAR prop_totalphysicalmemoryW[] = {'T','o','t','a','l','P','h','y','s','i','c','a','l','M','e','m','o','r','y',0}; /* column definitions must be kept in sync with record structures below */ +static const struct column col_baseboard[] = +{ + { prop_manufacturerW, CIM_STRING }, + { prop_serialnumberW, CIM_STRING }, + { prop_tagW, CIM_STRING|COL_FLAG_KEY } +}; static const struct column col_bios[] = { { prop_descriptionW, CIM_STRING }, @@ -190,6 +200,12 @@ static const struct column col_videocontroller[] = { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC } }; +static const WCHAR baseboard_manufacturerW[] = + {'I','n','t','e','l',' ','C','o','r','p','o','r','a','t','i','o','n',0}; +static const WCHAR baseboard_serialnumberW[] = + {'N','o','n','e',0}; +static const WCHAR baseboard_tagW[] = + {'B','a','s','e',' ','B','o','a','r','d',0}; static const WCHAR bios_descriptionW[] = {'D','e','f','a','u','l','t',' ','S','y','s','t','e','m',' ','B','I','O','S',0}; static const WCHAR bios_manufacturerW[] = @@ -219,6 +235,12 @@ static const WCHAR videocontroller_deviceidW[] = {'V','i','d','e','o','C','o','n','t','r','o','l','l','e','r','1',0}; #include "pshpack1.h" +struct record_baseboard +{ + const WCHAR *manufacturer; + const WCHAR *serialnumber; + const WCHAR *tag; +}; struct record_bios { const WCHAR *description; @@ -286,6 +308,10 @@ struct record_videocontroller }; #include "poppack.h" +static const struct record_baseboard data_baseboard[] = +{ + { baseboard_manufacturerW, baseboard_serialnumberW, baseboard_tagW } +}; static const struct record_bios data_bios[] = { { bios_descriptionW, bios_manufacturerW, bios_releasedateW, bios_serialnumberW } @@ -632,6 +658,7 @@ done: static struct table classtable[] = { + { class_baseboardW, SIZEOF(col_baseboard), col_baseboard, SIZEOF(data_baseboard), (BYTE *)data_baseboard }, { class_biosW, SIZEOF(col_bios), col_bios, SIZEOF(data_bios), (BYTE *)data_bios, NULL }, { class_compsysW, SIZEOF(col_compsys), col_compsys, 0, NULL, fill_compsys }, { class_logicaldiskW, SIZEOF(col_logicaldisk), col_logicaldisk, 0, NULL, fill_logicaldisk },

1 0

← Newer
1
...
57
58
59
60
61
62
63
...
72
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2012