wine-commits July 2012

wine-commits@winehq.org

2 participants
712 discussions

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

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

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 : setupx.dll16: Avoid strcmp() result truncation (Coverity) .
by Alexandre Julliard 09 Jul '12

09 Jul '12

Module: wine Branch: master Commit: a181e4dfe9e7a4c9644194fc8a5748d52ba2a53f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a181e4dfe9e7a4c9644194fc8… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Jul 7 11:52:22 2012 +0200 setupx.dll16: Avoid strcmp() result truncation (Coverity). --- dlls/setupx.dll16/virtcopy.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/setupx.dll16/virtcopy.c b/dlls/setupx.dll16/virtcopy.c index a718ac9..141fbd2 100644 --- a/dlls/setupx.dll16/virtcopy.c +++ b/dlls/setupx.dll16/virtcopy.c @@ -591,9 +591,17 @@ static void VCP_UI_RegisterProgressClass(void) static RETERR16 VCP_UI_NodeCompare(LPVIRTNODE vn1, LPVIRTNODE vn2) { LPCSTR file1, file2; + int ret; file1 = vsmGetStringRawName16(vn1->vfsSrc.vhstrFileName); file2 = vsmGetStringRawName16(vn2->vfsSrc.vhstrFileName); - return (RETERR16)strcmp(file1, file2); + + ret = strcmp(file1, file2); + /* 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; } static RETERR16 VCP_UI_CopyStart(void)

1 0

Marcus Meissner : krnl386.exe16: Do not truncate the strcmp result ( Coverity).
by Alexandre Julliard 09 Jul '12

09 Jul '12

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

Marcus Meissner : d3dcompiler_43: Fixed small overread possibility ( Coverity).
by Alexandre Julliard 09 Jul '12

09 Jul '12

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

Hans Leidekker : fusion: Also copy external files in IAssemblyCache:: InstallAssembly.
by Alexandre Julliard 09 Jul '12

09 Jul '12

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 parsing of floating point numbers starting with decimal separator.
by Alexandre Julliard 09 Jul '12

09 Jul '12

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

Piotr Caban : msvcp90: Fix off by one issues in basic_string functions operating on iterators.
by Alexandre Julliard 09 Jul '12

09 Jul '12

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@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@IAEXIID@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@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@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@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV12@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@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@IAEXII_W@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@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAE@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@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAEAAV12@I_W@Z */

1 0

Piotr Caban : msvcp90: Fix EOF handling in basic_filebuf<char>::underflow.
by Alexandre Julliard 09 Jul '12

09 Jul '12

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

1 0

← Newer
1
...
56
57
58
59
60
61
62
...
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