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

André Hentschel : winedbg: Add branch and exchange operator to ARM disassembler.
by Alexandre Julliard July 9, 2012

July 9, 2012

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

Marcus Meissner : d3dcompiler_43: Fixed small overread possibility ( Coverity).
by Alexandre Julliard July 9, 2012

July 9, 2012

Module: wine Branch: master Commit: 1f1686fddd05f83d5a444d3795688b6c4ee8b828 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f1686fddd05f83d5a444d379… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Jul 7 11:51:45 2012 +0200 d3dcompiler_43: Fixed small overread possibility (Coverity). --- dlls/d3dcompiler_43/utils.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 350a116..886d506 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -1058,10 +1058,8 @@ static const char *debug_node_type(enum hlsl_ir_node_type type) "HLSL_IR_FUNCTION_DECL", }; - if (type > sizeof(names) / sizeof(names[0])) - { + if (type >= sizeof(names) / sizeof(names[0])) return "Unexpected node type"; - } return names[type]; }

1 0

André Hentschel : winedbg: Add swap operator to ARM disassembler.
by Alexandre Julliard July 9, 2012

July 9, 2012

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 multiplication operators to ARM disassembler.
by Alexandre Julliard July 9, 2012

July 9, 2012

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 new operators regarding data processing to ARM disassembler.
by Alexandre Julliard July 9, 2012

July 9, 2012

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

Marcus Meissner : krnl386.exe16: Do not truncate the strcmp result ( Coverity).
by Alexandre Julliard July 9, 2012

July 9, 2012

Module: wine Branch: master Commit: aa58bcfec9fc7a917b04c159b1204289ec9eeb3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa58bcfec9fc7a917b04c159b… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Jul 7 11:52:21 2012 +0200 krnl386.exe16: Do not truncate the strcmp result (Coverity). --- dlls/krnl386.exe16/kernel.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/krnl386.exe16/kernel.c b/dlls/krnl386.exe16/kernel.c index a1f7fff..e879507 100644 --- a/dlls/krnl386.exe16/kernel.c +++ b/dlls/krnl386.exe16/kernel.c @@ -254,7 +254,14 @@ SEGPTR WINAPI KERNEL_AnsiLower16( SEGPTR strOrChar ) */ INT16 WINAPI KERNEL_lstrcmp16( LPCSTR str1, LPCSTR str2 ) { - return (INT16)strcmp( str1, str2 ); + int ret = strcmp( str1, str2 ); + + /* 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. */ + if (ret < 0) return -1; + if (ret > 0) return 1; + return 0; } /***********************************************************************

1 0

Piotr Caban : msvcp90/tests: Added destructor tests for class with virtual inheritance.
by Alexandre Julliard July 9, 2012

July 9, 2012

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(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@7B@"); if(sizeof(void*) == 8) { /* 64-bit initialization */ SET(p_char_assign, "?assign@?$char_traits(a)D@std@@SAXAEADAEBD(a)Z"); SET(p_wchar_assign, "?assign@?$char_traits(a)_W@std@@SAXAEA_WAEB_W(a)Z"); @@ -207,6 +214,13 @@ static BOOL init(void) "??1?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA(a)XZ"); SET(p_basic_string_char_cstr, "?c_str@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBAPEBDXZ"); + + SET(p_basic_ostringstream_char_ctor_mode, + "??0?$basic_ostringstream(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA(a)H@Z"); + SET(p_basic_ostringstream_char_dtor, + "??1?$basic_ostringstream(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@UEAA(a)XZ"); + SET(p_basic_ostringstream_char_vbase_dtor, + "??_D?$basic_ostringstream(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAXXZ"); } else { SET(p_char_assign, "?assign@?$char_traits(a)D@std@@SAXAADABD(a)Z"); SET(p_wchar_assign, "?assign@?$char_traits(a)_W@std@@SAXAA_WAB_W(a)Z"); @@ -235,6 +249,13 @@ static BOOL init(void) "??1?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE(a)XZ"); SET(p_basic_string_char_cstr, "?c_str@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEPBDXZ"); + + SET(p_basic_ostringstream_char_ctor_mode, + "??0?$basic_ostringstream(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE(a)H@Z"); + SET(p_basic_ostringstream_char_dtor, + "??1?$basic_ostringstream(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@UAE(a)XZ"); + SET(p_basic_ostringstream_char_vbase_dtor, + "??_D?$basic_ostringstream(a)DU?$char_traits(a)D@std@@V?$allocator(a)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: Fix parsing of floating point numbers starting with decimal separator.
by Alexandre Julliard July 9, 2012

July 9, 2012

Module: wine Branch: master Commit: 9b34a3a75c9d96e42a202a63b3a693a345c3f8d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b34a3a75c9d96e42a202a63b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 5 17:35:01 2012 +0200 msvcp90: Fix parsing of floating point numbers starting with decimal separator. --- dlls/msvcp90/locale.c | 34 ++++++++++++++++++++++++++-------- 1 files changed, 26 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 8e3778f..9927dc5 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -4441,7 +4441,7 @@ static int num_get__Getffld(const num_get *this, char *dest, istreambuf_iterator char *dest_beg = dest, *num_end = dest+25, *exp_end = dest+31, *groups = NULL; wchar_t sep, digits[11], *digits_pos; const char *grouping; - BOOL error = TRUE, dest_empty = TRUE; + BOOL error = FALSE, got_digit = FALSE, dest_empty = TRUE; TRACE("(%p %p %p %p)\n", dest, first, last, loc); @@ -4485,7 +4485,7 @@ static int num_get__Getffld(const num_get *this, char *dest, istreambuf_iterator break; } }else { - error = FALSE; + got_digit = TRUE; if(dest_empty && first->val == digits[0]) continue; dest_empty = FALSE; @@ -4532,8 +4532,10 @@ static int num_get__Getffld(const num_get *this, char *dest, istreambuf_iterator istreambuf_iterator_wchar_inc(first); if(dest_empty) { - for(; first->strbuf && first->val==digits[0]; istreambuf_iterator_wchar_inc(first)) + for(; first->strbuf && first->val==digits[0]; istreambuf_iterator_wchar_inc(first)) { + got_digit = TRUE; exp--; + } if(!first->strbuf || !wcschr(digits, first->val)) dest--; @@ -4543,8 +4545,15 @@ static int num_get__Getffld(const num_get *this, char *dest, istreambuf_iterator for(; first->strbuf; istreambuf_iterator_wchar_inc(first)) { if(!(digits_pos = wcschr(digits, first->val))) break; - else if(dest<num_end) + else if(dest<num_end) { + got_digit = TRUE; *dest++ = '0'+digits_pos-digits; + } + } + + if(!got_digit) { + *dest_beg = '\0'; + return 0; } if(first->strbuf && (first->val==mb_to_wc('e', &this->cvt) || first->val==mb_to_wc('E', &this->cvt))) { @@ -5541,7 +5550,7 @@ int __cdecl num_get_char__Getffld(const num_get *this, char *dest, istreambuf_it int groups_no = 0, cur_group = 0, exp = 0; char *dest_beg = dest, *num_end = dest+25, *exp_end = dest+31, *groups = NULL, sep; const char *grouping; - BOOL error = TRUE, dest_empty = TRUE; + BOOL error = FALSE, got_digit = FALSE, dest_empty = TRUE; TRACE("(%p %p %p %p)\n", dest, first, last, loc); @@ -5578,7 +5587,7 @@ int __cdecl num_get_char__Getffld(const num_get *this, char *dest, istreambuf_it break; } }else { - error = FALSE; + got_digit = TRUE; if(dest_empty && first->val == '0') continue; dest_empty = FALSE; @@ -5625,8 +5634,10 @@ int __cdecl num_get_char__Getffld(const num_get *this, char *dest, istreambuf_it istreambuf_iterator_char_inc(first); if(dest_empty) { - for(; first->strbuf && first->val=='0'; istreambuf_iterator_char_inc(first)) + for(; first->strbuf && first->val=='0'; istreambuf_iterator_char_inc(first)) { + got_digit = TRUE; exp--; + } if(!first->strbuf || first->val<'1' || first->val>'9') dest--; @@ -5636,8 +5647,15 @@ int __cdecl num_get_char__Getffld(const num_get *this, char *dest, istreambuf_it for(; first->strbuf; istreambuf_iterator_char_inc(first)) { if(first->val<'0' || first->val>'9') break; - else if(dest<num_end) + else if(dest<num_end) { + got_digit = TRUE; *dest++ = first->val; + } + } + + if(!got_digit) { + *dest_beg = '\0'; + return 0; } if(first->strbuf && (first->val=='e' || first->val=='E')) {

1 0

Hans Leidekker : fusion: Also copy external files in IAssemblyCache:: InstallAssembly.
by Alexandre Julliard July 9, 2012

July 9, 2012

Module: wine Branch: master Commit: 45473a65a0a1fe2e61809d80f6d09bb96f923126 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45473a65a0a1fe2e61809d80f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 6 15:51:00 2012 +0200 fusion: Also copy external files in IAssemblyCache::InstallAssembly. --- dlls/fusion/asmcache.c | 79 +++++++++++++++++++++++++++++++++++++++------ dlls/fusion/assembly.c | 53 +++++++++++++++++++++++++++++- dlls/fusion/fusionpriv.h | 1 + 3 files changed, 120 insertions(+), 13 deletions(-) diff --git a/dlls/fusion/asmcache.c b/dlls/fusion/asmcache.c index 1cba6f6..485a56c 100644 --- a/dlls/fusion/asmcache.c +++ b/dlls/fusion/asmcache.c @@ -370,6 +370,32 @@ static HRESULT WINAPI IAssemblyCacheImpl_CreateAssemblyScavenger(IAssemblyCache return E_NOTIMPL; } +static HRESULT copy_file( const WCHAR *src_dir, DWORD src_len, const WCHAR *dst_dir, DWORD dst_len, + const WCHAR *filename ) +{ + WCHAR *src_file, *dst_file; + DWORD len = strlenW( filename ); + HRESULT hr = S_OK; + + if (!(src_file = HeapAlloc( GetProcessHeap(), 0, (src_len + len + 1) * sizeof(WCHAR) ))) + return E_OUTOFMEMORY; + memcpy( src_file, src_dir, src_len * sizeof(WCHAR) ); + strcpyW( src_file + src_len, filename ); + + if (!(dst_file = HeapAlloc( GetProcessHeap(), 0, (dst_len + len + 1) * sizeof(WCHAR) ))) + { + HeapFree( GetProcessHeap(), 0, src_file ); + return E_OUTOFMEMORY; + } + memcpy( dst_file, dst_dir, dst_len * sizeof(WCHAR) ); + strcpyW( dst_file + dst_len, filename ); + + if (!CopyFileW( src_file, dst_file, FALSE )) hr = HRESULT_FROM_WIN32( GetLastError() ); + HeapFree( GetProcessHeap(), 0, src_file ); + HeapFree( GetProcessHeap(), 0, dst_file ); + return hr; +} + static HRESULT WINAPI IAssemblyCacheImpl_InstallAssembly(IAssemblyCache *iface, DWORD dwFlags, LPCWSTR pszManifestFilePath, @@ -383,11 +409,12 @@ static HRESULT WINAPI IAssemblyCacheImpl_InstallAssembly(IAssemblyCache *iface, static const WCHAR ext_dll[] = {'.','d','l','l',0}; IAssemblyCacheImpl *cache = impl_from_IAssemblyCache(iface); ASSEMBLY *assembly; - WCHAR *filename, *ext; + const WCHAR *extension, *filename, *src_dir; WCHAR *name = NULL, *token = NULL, *version = NULL, *asmpath = NULL; - WCHAR path[MAX_PATH], asmdir[MAX_PATH]; + WCHAR asmdir[MAX_PATH], *p, **external_files = NULL, *dst_dir = NULL; PEKIND architecture; char *clr_version; + DWORD i, count = 0, src_len, dst_len = sizeof(format_v40)/sizeof(format_v40[0]); HRESULT hr; TRACE("(%p, %d, %s, %p)\n", iface, dwFlags, @@ -396,10 +423,10 @@ static HRESULT WINAPI IAssemblyCacheImpl_InstallAssembly(IAssemblyCache *iface, if (!pszManifestFilePath || !*pszManifestFilePath) return E_INVALIDARG; - if (!(ext = strrchrW(pszManifestFilePath, '.'))) + if (!(extension = strrchrW(pszManifestFilePath, '.'))) return HRESULT_FROM_WIN32(ERROR_INVALID_NAME); - if (lstrcmpiW(ext, ext_exe) && lstrcmpiW(ext, ext_dll)) + if (lstrcmpiW(extension, ext_exe) && lstrcmpiW(extension, ext_dll)) return HRESULT_FROM_WIN32(ERROR_INVALID_NAME); if (GetFileAttributesW(pszManifestFilePath) == INVALID_FILE_ATTRIBUTES) @@ -428,33 +455,63 @@ static HRESULT WINAPI IAssemblyCacheImpl_InstallAssembly(IAssemblyCache *iface, if (FAILED(hr)) goto done; + hr = assembly_get_external_files(assembly, &external_files, &count); + if (FAILED(hr)) + goto done; + cache_lock( cache ); architecture = assembly_get_architecture(assembly); get_assembly_directory(asmdir, MAX_PATH, clr_version, architecture); + dst_len += strlenW(asmdir) + strlenW(name) + strlenW(version) + strlenW(token); + if (!(dst_dir = HeapAlloc(GetProcessHeap(), 0, dst_len * sizeof(WCHAR)))) + { + hr = E_OUTOFMEMORY; + goto done; + } if (!strcmp(clr_version, "v4.0.30319")) - sprintfW(path, format_v40, asmdir, name, version, token); + dst_len = sprintfW(dst_dir, format_v40, asmdir, name, version, token); else - sprintfW(path, format, asmdir, name, version, token); + dst_len = sprintfW(dst_dir, format, asmdir, name, version, token); - create_full_path(path); + create_full_path(dst_dir); hr = assembly_get_path(assembly, &asmpath); if (FAILED(hr)) goto done; - filename = PathFindFileNameW(asmpath); + if ((p = strrchrW(asmpath, '\\'))) + { + filename = p + 1; + src_dir = asmpath; + src_len = filename - asmpath; + } + else + { + filename = asmpath; + src_dir = NULL; + src_len = 0; + } + hr = copy_file(src_dir, src_len, dst_dir, dst_len, filename); + if (FAILED(hr)) + goto done; - strcatW(path, filename); - if (!CopyFileW(asmpath, path, FALSE)) - hr = HRESULT_FROM_WIN32(GetLastError()); + for (i = 0; i < count; i++) + { + hr = copy_file(src_dir, src_len, dst_dir, dst_len, external_files[i]); + if (FAILED(hr)) + break; + } done: HeapFree(GetProcessHeap(), 0, name); HeapFree(GetProcessHeap(), 0, token); HeapFree(GetProcessHeap(), 0, version); HeapFree(GetProcessHeap(), 0, asmpath); + HeapFree(GetProcessHeap(), 0, dst_dir); + for (i = 0; i < count; i++) HeapFree(GetProcessHeap(), 0, external_files[i]); + HeapFree(GetProcessHeap(), 0, external_files); assembly_release(assembly); cache_unlock( cache ); return hr; diff --git a/dlls/fusion/assembly.c b/dlls/fusion/assembly.c index b655df1..d04ba73 100644 --- a/dlls/fusion/assembly.c +++ b/dlls/fusion/assembly.c @@ -761,9 +761,9 @@ HRESULT assembly_get_name(ASSEMBLY *assembly, LPWSTR *name) ptr += FIELD_OFFSET(ASSEMBLYTABLE, PublicKey) + assembly->blobsz; if (assembly->stringsz == sizeof(DWORD)) - stridx = *((DWORD *)ptr); + stridx = *(DWORD *)ptr; else - stridx = *((WORD *)ptr); + stridx = *(WORD *)ptr; *name = assembly_dup_str(assembly, stridx); if (!*name) @@ -912,3 +912,52 @@ HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version) *version = assembly->metadatahdr->Version; return S_OK; } + +HRESULT assembly_get_external_files(ASSEMBLY *assembly, LPWSTR **files, DWORD *count) +{ + LONG offset; + INT i, num_rows; + WCHAR **ret; + BYTE *ptr; + DWORD idx; + + *count = 0; + + offset = assembly->tables[TableFromToken(mdtFile)].offset; + if (offset == -1) + return S_OK; + + ptr = assembly_data_offset(assembly, offset); + if (!ptr) + return S_OK; + + num_rows = assembly->tables[TableFromToken(mdtFile)].rows; + if (num_rows <= 0) + return S_OK; + + ret = HeapAlloc(GetProcessHeap(), 0, num_rows * sizeof(WCHAR *)); + if (!ret) + return E_OUTOFMEMORY; + + for (i = 0; i < num_rows; i++) + { + ptr += sizeof(DWORD); /* skip Flags field */ + if (assembly->stringsz == sizeof(DWORD)) + idx = *(DWORD *)ptr; + else + idx = *(WORD *)ptr; + + ret[i] = assembly_dup_str(assembly, idx); + if (!ret[i]) + { + for (; i >= 0; i--) HeapFree(GetProcessHeap(), 0, ret[i]); + HeapFree(GetProcessHeap(), 0, ret); + return E_OUTOFMEMORY; + } + ptr += assembly->stringsz; /* skip Name field */ + ptr += assembly->blobsz; /* skip Hash field */ + } + *count = num_rows; + *files = ret; + return S_OK; +} diff --git a/dlls/fusion/fusionpriv.h b/dlls/fusion/fusionpriv.h index 3d538e3..95b1282 100644 --- a/dlls/fusion/fusionpriv.h +++ b/dlls/fusion/fusionpriv.h @@ -436,6 +436,7 @@ HRESULT assembly_get_version(ASSEMBLY *assembly, LPWSTR *version) DECLSPEC_HIDDE PEKIND assembly_get_architecture(ASSEMBLY *assembly) DECLSPEC_HIDDEN; HRESULT assembly_get_pubkey_token(ASSEMBLY *assembly, LPWSTR *token) DECLSPEC_HIDDEN; HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version) DECLSPEC_HIDDEN; +HRESULT assembly_get_external_files(ASSEMBLY *assembly, LPWSTR **files, DWORD *count) DECLSPEC_HIDDEN; extern HRESULT IAssemblyName_SetPath(IAssemblyName *iface, LPCWSTR path) DECLSPEC_HIDDEN; extern HRESULT IAssemblyName_GetPath(IAssemblyName *iface, LPWSTR buf, ULONG *len) DECLSPEC_HIDDEN;

1 0

Piotr Caban : msvcp90: Fix off by one issues in basic_string functions operating on iterators.
by Alexandre Julliard July 9, 2012

July 9, 2012

Module: wine Branch: master Commit: 4c73236d8631dfc2a3f60f27697ff317fd93d73d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c73236d8631dfc2a3f60f276… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 5 11:51:06 2012 +0200 msvcp90: Fix off by one issues in basic_string functions operating on iterators. --- dlls/msvcp90/string.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index f4811cd..d8bc6f3 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -841,7 +841,7 @@ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_assign_iter, 20) basic_string_char* __thiscall MSVCP_basic_string_char_assign_iter(basic_string_char *this, String_iterator_char beg, String_iterator_char end) { - return MSVCP_basic_string_char_assign_ptr_ptr(this, beg.pos, end.pos+1); + return MSVCP_basic_string_char_assign_ptr_ptr(this, beg.pos, end.pos); } /* ?_Chassign@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@IAEXIID(a)Z */ @@ -1060,7 +1060,7 @@ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_ctor_iter, 20) basic_string_char* __thiscall MSVCP_basic_string_char_ctor_iter(basic_string_char *this, String_iterator_char beg, String_iterator_char end) { - return MSVCP_basic_string_char_ctor_cstr_len(this, beg.pos, end.pos-beg.pos+1); + return MSVCP_basic_string_char_ctor_cstr_len(this, beg.pos, end.pos-beg.pos); } /* ??1?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE(a)XZ */ @@ -1224,7 +1224,7 @@ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_append_iter, 20) basic_string_char* __thiscall MSVCP_basic_string_char_append_iter( basic_string_char *this, String_iterator_char beg, String_iterator_char end) { - return MSVCP_basic_string_char_append_cstr_len(this, beg.pos, end.pos-beg.pos+1); + return MSVCP_basic_string_char_append_cstr_len(this, beg.pos, end.pos-beg.pos); } /* ?append@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV12(a)ID@Z */ @@ -2680,7 +2680,7 @@ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_assign_iter, 20) basic_string_wchar* __thiscall MSVCP_basic_string_wchar_assign_iter(basic_string_wchar *this, String_iterator_wchar beg, String_iterator_wchar end) { - return MSVCP_basic_string_wchar_assign_ptr_ptr(this, beg.pos, end.pos+1); + return MSVCP_basic_string_wchar_assign_ptr_ptr(this, beg.pos, end.pos); } /* ?_Chassign@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@IAEXII_W(a)Z */ @@ -2939,7 +2939,7 @@ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_ctor_iter, 20) basic_string_wchar* __thiscall MSVCP_basic_string_wchar_ctor_iter(basic_string_wchar *this, String_iterator_wchar beg, String_iterator_wchar end) { - return MSVCP_basic_string_wchar_ctor_cstr_len(this, beg.pos, end.pos-beg.pos+1); + return MSVCP_basic_string_wchar_ctor_cstr_len(this, beg.pos, end.pos-beg.pos); } /* ??1?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAE(a)XZ */ @@ -3133,7 +3133,7 @@ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_append_iter, 20) basic_string_wchar* __thiscall MSVCP_basic_string_wchar_append_iter( basic_string_wchar *this, String_iterator_wchar beg, String_iterator_wchar end) { - return MSVCP_basic_string_wchar_append_cstr_len(this, beg.pos, end.pos-beg.pos+1); + return MSVCP_basic_string_wchar_append_cstr_len(this, beg.pos, end.pos-beg.pos); } /* ?append@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV12(a)I_W@Z */

1 0