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

Marcus Meissner : shell32: Avoid memcmp result truncation (Coverity).
by Alexandre Julliard 09 Jul '12

09 Jul '12

Module: wine Branch: master Commit: 0ef705fb69903d68c53a77700e167f68f9b8c55c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ef705fb69903d68c53a77700… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Jul 7 11:52:23 2012 +0200 shell32: Avoid memcmp result truncation (Coverity). --- dlls/shell32/recyclebin.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/recyclebin.c b/dlls/shell32/recyclebin.c index 6b7d4aa..a10bffa 100644 --- a/dlls/shell32/recyclebin.c +++ b/dlls/shell32/recyclebin.c @@ -457,12 +457,19 @@ static HRESULT WINAPI RecycleBin_BindToStorage(IShellFolder2 *This, LPCITEMIDLIS static HRESULT WINAPI RecycleBin_CompareIDs(IShellFolder2 *iface, LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2) { RecycleBin *This = impl_from_IShellFolder2(iface); + int ret; /* TODO */ TRACE("(%p, %p, %p, %p)\n", This, (void *)lParam, pidl1, pidl2); if (pidl1->mkid.cb != pidl2->mkid.cb) return MAKE_HRESULT(SEVERITY_SUCCESS, 0, pidl1->mkid.cb - pidl2->mkid.cb); - return MAKE_HRESULT(SEVERITY_SUCCESS, 0, (unsigned short)memcmp(pidl1->mkid.abID, pidl2->mkid.abID, pidl1->mkid.cb)); + /* Looks too complicated, but in optimized memcpy we might get + * a 32bit wide difference and would truncate it to 16 bit, so + * erroneously returning equality. */ + ret = memcmp(pidl1->mkid.abID, pidl2->mkid.abID, pidl1->mkid.cb); + if (ret < 0) ret = -1; + if (ret > 0) ret = 1; + return MAKE_HRESULT(SEVERITY_SUCCESS, 0, (unsigned short)ret); } static HRESULT WINAPI RecycleBin_CreateViewObject(IShellFolder2 *iface, HWND hwndOwner, REFIID riid, void **ppv)

1 0

Marcus Meissner : user.exe: Avoid truncating strcmp result (Coverity).
by Alexandre Julliard 09 Jul '12

09 Jul '12

Module: wine Branch: master Commit: f917cd0e42642aefc8924379f4dacacb6563bc24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f917cd0e42642aefc8924379f… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Jul 7 11:52:24 2012 +0200 user.exe: Avoid truncating strcmp result (Coverity). --- dlls/user.exe16/user.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/user.exe16/user.c b/dlls/user.exe16/user.c index 705620b..7f184a2 100644 --- a/dlls/user.exe16/user.c +++ b/dlls/user.exe16/user.c @@ -2557,7 +2557,14 @@ INT16 WINAPIV wsprintf16( LPSTR buffer, LPCSTR spec, VA_LIST16 valist ) */ INT16 WINAPI lstrcmp16( LPCSTR str1, LPCSTR str2 ) { - return strcmp( str1, str2 ); + int ret; + /* Looks too complicated, but in optimized strcpy we might get + * a 32bit wide difference and would truncate it to 16 bit, so + * erroneously returning equality. */ + ret = strcmp( str1, str2 ); + if (ret < 0) return -1; + if (ret > 0) return 1; + return 0; }

1 0

André Hentschel : winedbg: Add branch and exchange operator to ARM disassembler.
by Alexandre Julliard 09 Jul '12

09 Jul '12

Module: wine Branch: master Commit: bc86f0d5dd552aac65a8e7cb0d0ef0e596dd7060 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc86f0d5dd552aac65a8e7cb0… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Jul 7 15:10:06 2012 +0200 winedbg: Add branch and exchange operator to ARM disassembler. --- programs/winedbg/be_arm.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index 866ab61..bc19c98 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -133,6 +133,12 @@ static UINT arm_disasm_branchreg(UINT inst, ADDRESS64 *addr) return 0; } +static UINT arm_disasm_branchxchg(UINT inst, ADDRESS64 *addr) +{ + dbg_printf("\n\tbx%s\t%s", get_cond(inst), tbl_regs[get_nibble(inst, 0)]); + return 0; +} + static UINT arm_disasm_dataprocessing(UINT inst, ADDRESS64 *addr) { short condcodes = (inst >> 20) & 0x01; @@ -691,7 +697,8 @@ struct inst_arm static const struct inst_arm tbl_arm[] = { { 0x0e000000, 0x0a000000, arm_disasm_branch }, { 0x0e000090, 0x00000090, arm_disasm_halfwordtrans }, - { 0x0fffff00, 0x012fff00, arm_disasm_branchreg }, + { 0x0ffffff0, 0x012fff00, arm_disasm_branchreg }, + { 0x0ffffff0, 0x012fff10, arm_disasm_branchxchg }, { 0x0c000000, 0x00000000, arm_disasm_dataprocessing }, { 0x0c000000, 0x04000000, arm_disasm_singletrans }, { 0x0e000000, 0x08000000, arm_disasm_blocktrans },

1 0

André Hentschel : winedbg: Add multiplication operators to ARM disassembler.
by Alexandre Julliard 09 Jul '12

09 Jul '12

Module: wine Branch: master Commit: 498614dda69f04f688de35e1b93c6ab844812d47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=498614dda69f04f688de35e1b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Jul 7 15:11:06 2012 +0200 winedbg: Add multiplication operators to ARM disassembler. --- programs/winedbg/be_arm.c | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index bc19c98..3beb60a 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -127,6 +127,35 @@ static UINT arm_disasm_branch(UINT inst, ADDRESS64 *addr) return 0; } +static UINT arm_disasm_mul(UINT inst, ADDRESS64 *addr) +{ + short accu = (inst >> 21) & 0x01; + short condcodes = (inst >> 20) & 0x01; + + if (accu) + dbg_printf("\n\tmla%s%s\t%s, %s, %s, %s", get_cond(inst), condcodes ? "s" : "", + tbl_regs[get_nibble(inst, 4)], tbl_regs[get_nibble(inst, 0)], + tbl_regs[get_nibble(inst, 2)], tbl_regs[get_nibble(inst, 3)]); + else + dbg_printf("\n\tmul%s%s\t%s, %s, %s", get_cond(inst), condcodes ? "s" : "", + tbl_regs[get_nibble(inst, 4)], tbl_regs[get_nibble(inst, 0)], + tbl_regs[get_nibble(inst, 2)]); + return 0; +} + +static UINT arm_disasm_longmul(UINT inst, ADDRESS64 *addr) +{ + short sign = (inst >> 22) & 0x01; + short accu = (inst >> 21) & 0x01; + short condcodes = (inst >> 20) & 0x01; + + dbg_printf("\n\t%s%s%s%s\t%s, %s, %s, %s", sign ? "s" : "u", accu ? "mlal" : "mull", + get_cond(inst), condcodes ? "s" : "", + tbl_regs[get_nibble(inst, 3)], tbl_regs[get_nibble(inst, 4)], + tbl_regs[get_nibble(inst, 0)], tbl_regs[get_nibble(inst, 2)]); + return 0; +} + static UINT arm_disasm_branchreg(UINT inst, ADDRESS64 *addr) { dbg_printf("\n\tb%s\t%s", get_cond(inst), tbl_regs[get_nibble(inst, 0)]); @@ -696,6 +725,8 @@ struct inst_arm static const struct inst_arm tbl_arm[] = { { 0x0e000000, 0x0a000000, arm_disasm_branch }, + { 0x0fc000f0, 0x00000090, arm_disasm_mul }, + { 0x0f8000f0, 0x00800090, arm_disasm_longmul }, { 0x0e000090, 0x00000090, arm_disasm_halfwordtrans }, { 0x0ffffff0, 0x012fff00, arm_disasm_branchreg }, { 0x0ffffff0, 0x012fff10, arm_disasm_branchxchg },

1 0

André Hentschel : winedbg: Add swap operator to ARM disassembler.
by Alexandre Julliard 09 Jul '12

09 Jul '12

Module: wine Branch: master Commit: b96d613337537477b1571c88170011a1db8d5c56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b96d613337537477b1571c881… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Jul 7 15:12:20 2012 +0200 winedbg: Add swap operator to ARM disassembler. --- programs/winedbg/be_arm.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index 3beb60a..7095208 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -156,6 +156,16 @@ static UINT arm_disasm_longmul(UINT inst, ADDRESS64 *addr) return 0; } +static UINT arm_disasm_swp(UINT inst, ADDRESS64 *addr) +{ + short byte = (inst >> 22) & 0x01; + + dbg_printf("\n\tswp%s%s\t%s, %s, [%s]", get_cond(inst), byte ? "b" : "", + tbl_regs[get_nibble(inst, 3)], tbl_regs[get_nibble(inst, 0)], + tbl_regs[get_nibble(inst, 4)]); + return 0; +} + static UINT arm_disasm_branchreg(UINT inst, ADDRESS64 *addr) { dbg_printf("\n\tb%s\t%s", get_cond(inst), tbl_regs[get_nibble(inst, 0)]); @@ -727,6 +737,7 @@ static const struct inst_arm tbl_arm[] = { { 0x0e000000, 0x0a000000, arm_disasm_branch }, { 0x0fc000f0, 0x00000090, arm_disasm_mul }, { 0x0f8000f0, 0x00800090, arm_disasm_longmul }, + { 0x0fb00ff0, 0x01000090, arm_disasm_swp }, { 0x0e000090, 0x00000090, arm_disasm_halfwordtrans }, { 0x0ffffff0, 0x012fff00, arm_disasm_branchreg }, { 0x0ffffff0, 0x012fff10, arm_disasm_branchxchg },

1 0

André Hentschel : winedbg: Add new operators regarding data processing to ARM disassembler.
by Alexandre Julliard 09 Jul '12

09 Jul '12

Module: wine Branch: master Commit: 338f5e9cb6d6863ed3269deee93c4af664b321e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=338f5e9cb6d6863ed3269deee… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Jul 7 15:16:50 2012 +0200 winedbg: Add new operators regarding data processing to ARM disassembler. --- programs/winedbg/be_arm.c | 54 ++++++++++++++++++++++++++++++++++++++------ 1 files changed, 46 insertions(+), 8 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index 7095208..1362ef1 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -178,6 +178,48 @@ static UINT arm_disasm_branchxchg(UINT inst, ADDRESS64 *addr) return 0; } +static UINT arm_disasm_mrstrans(UINT inst, ADDRESS64 *addr) +{ + short src = (inst >> 22) & 0x01; + + dbg_printf("\n\tmrs%s\t%s, %s", get_cond(inst), tbl_regs[get_nibble(inst, 3)], + src ? "spsr" : "cpsr"); + return 0; +} + +static UINT arm_disasm_msrtrans(UINT inst, ADDRESS64 *addr) +{ + short immediate = (inst >> 25) & 0x01; + short dst = (inst >> 22) & 0x01; + short simple = (inst >> 16) & 0x01; + + if (simple || !immediate) + { + dbg_printf("\n\tmsr%s\t%s, %s", get_cond(inst), dst ? "spsr" : "cpsr", + tbl_regs[get_nibble(inst, 0)]); + return 0; + } + + dbg_printf("\n\tmsr%s\t%s, #%u", get_cond(inst), dst ? "spsr" : "cpsr", + ROR32(inst & 0xff, 2 * get_nibble(inst, 2))); + return 0; +} + +static UINT arm_disasm_wordmov(UINT inst, ADDRESS64 *addr) +{ + short top = (inst >> 22) & 0x01; + + dbg_printf("\n\tmov%s%s\t%s, #%u", top ? "t" : "w", get_cond(inst), + tbl_regs[get_nibble(inst, 3)], (get_nibble(inst, 4) << 12) | (inst & 0x0fff)); + return 0; +} + +static UINT arm_disasm_nop(UINT inst, ADDRESS64 *addr) +{ + dbg_printf("\n\tnop%s", get_cond(inst)); + return 0; +} + static UINT arm_disasm_dataprocessing(UINT inst, ADDRESS64 *addr) { short condcodes = (inst >> 20) & 0x01; @@ -186,14 +228,6 @@ static UINT arm_disasm_dataprocessing(UINT inst, ADDRESS64 *addr) short no_op1 = (opcode & 0x0d) == 0x0d; short no_dst = (opcode & 0x0c) == 0x08; - /* check for nop */ - if (get_nibble(inst, 3) == 15 /* r15 */ && condcodes == 0 && - opcode >= 8 /* tst */ && opcode <= 11 /* cmn */) - { - dbg_printf("\n\tnop"); - return 0; - } - dbg_printf("\n\t%s%s%s", tbl_dataops[opcode], condcodes ? "s" : "", get_cond(inst)); if (!no_dst) dbg_printf("\t%s, ", tbl_regs[get_nibble(inst, 3)]); else dbg_printf("\t"); @@ -741,6 +775,10 @@ static const struct inst_arm tbl_arm[] = { { 0x0e000090, 0x00000090, arm_disasm_halfwordtrans }, { 0x0ffffff0, 0x012fff00, arm_disasm_branchreg }, { 0x0ffffff0, 0x012fff10, arm_disasm_branchxchg }, + { 0x0fbf0fff, 0x010f0000, arm_disasm_mrstrans }, + { 0x0dbef000, 0x0128f000, arm_disasm_msrtrans }, + { 0x0fb00000, 0x03000000, arm_disasm_wordmov }, + { 0x0fffffff, 0x0320f000, arm_disasm_nop }, { 0x0c000000, 0x00000000, arm_disasm_dataprocessing }, { 0x0c000000, 0x04000000, arm_disasm_singletrans }, { 0x0e000000, 0x08000000, arm_disasm_blocktrans },

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

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_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(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_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(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