August 2010 - Wine-Commits - list.winehq.org

Piotr Caban : msvcp90: Added basic_string<char> copy constructor implementation.
by Alexandre Julliard Aug. 20, 2010

Aug. 20, 2010

Module: wine Branch: master Commit: d7b4b032de627a5a40b7fdafeaa8eade376a49f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7b4b032de627a5a40b7fdafe… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 19 23:48:17 2010 +0200 msvcp90: Added basic_string<char> copy constructor implementation. --- dlls/msvcp90/msvcp90.spec | 4 ++-- dlls/msvcp90/string.c | 13 +++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 3db1999..dd565b0 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -732,8 +732,8 @@ @ stub -arch=win64 ??0?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@IEAA(a)W4_Uninitialized@1@@Z @ stub -arch=win32 ??0?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@IAE(a)XZ @ stub -arch=win64 ??0?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@IEAA(a)XZ -@ stub -arch=win32 ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE(a)ABV01@@Z -@ stub -arch=win64 ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA(a)AEBV01@@Z +@ cdecl -arch=win32 -i386 -norelay ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE(a)ABV01@@Z(ptr) __thiscall_MSVCP_basic_string_char_copy_ctor +@ cdecl -arch=win64 ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA(a)AEBV01@@Z(ptr ptr) MSVCP_basic_string_char_copy_ctor @ stub -arch=win32 ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE(a)ABV01@II(a)Z @ stub -arch=win64 ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA(a)AEBV01@_K1(a)Z @ stub -arch=win32 ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE(a)ABV01@IIABV?$allocator(a)D@1@@Z diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 0021245..580ec5d 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -666,6 +666,19 @@ basic_string_char* __stdcall MSVCP_basic_string_char_ctor(basic_string_char *thi return this; } +/* ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE(a)ABV01@@Z */ +/* ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA(a)AEBV01@@Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_copy_ctor, 8) +basic_string_char* __stdcall MSVCP_basic_string_char_copy_ctor( + basic_string_char *this, const basic_string_char *copy) +{ + TRACE("%p %p\n", this, copy); + + basic_string_char_tidy(this, FALSE, 0); + MSVCP_basic_string_char_assign(this, copy); + return this; +} + /* ??1?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE(a)XZ */ /* ??1?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA(a)XZ */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_dtor, 4)

1 0

Piotr Caban : msvcp90: Added logic_error exception.
by Alexandre Julliard Aug. 20, 2010

Aug. 20, 2010

Module: wine Branch: master Commit: 8f78375d835dac5f7ccb15eef78017d4e294da1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f78375d835dac5f7ccb15eef… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 19 23:48:56 2010 +0200 msvcp90: Added logic_error exception. --- dlls/msvcp90/exception.c | 140 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.h | 8 ++- 2 files changed, 147 insertions(+), 1 deletions(-) diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index 4710848..69da38a 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -76,6 +76,9 @@ void CDECL _CxxThrowException(exception*,const cxx_exception_type*); #define __ASM_EXCEPTION_VTABLE(name) \ __ASM_VTABLE(name, "\t.quad " THISCALL_NAME(MSVCP_what_exception) ) +#define __ASM_EXCEPTION_STRING_VTABLE(name) \ + __ASM_VTABLE(name, "\t.quad " THISCALL_NAME(MSVCP_logic_error_what) ) + #else #define __ASM_VTABLE(name,funcs) \ @@ -90,9 +93,13 @@ void CDECL _CxxThrowException(exception*,const cxx_exception_type*); #define __ASM_EXCEPTION_VTABLE(name) \ __ASM_VTABLE(name, "\t.long " THISCALL_NAME(MSVCP_what_exception) ) +#define __ASM_EXCEPTION_STRING_VTABLE(name) \ + __ASM_VTABLE(name, "\t.long " THISCALL_NAME(MSVCP_logic_error_what) ) + #endif /* _WIN64 */ extern const vtable_ptr MSVCP_bad_alloc_vtable; +extern const vtable_ptr MSVCP_logic_error_vtable; /* exception class data */ static type_info exception_type_info = { @@ -295,10 +302,136 @@ static const cxx_exception_type bad_alloc_cxx_type = { &bad_alloc_cxx_type_table }; +/* logic_error class data */ +typedef struct _logic_error { + exception e; + basic_string_char str; +} logic_error; + +DEFINE_THISCALL_WRAPPER(MSVCP_logic_error_ctor, 8) +logic_error* __stdcall MSVCP_logic_error_ctor( + logic_error *this, const char **name) +{ + TRACE("%p %s\n", this, *name); + this->e.vtable = &MSVCP_logic_error_vtable; + this->e.name = NULL; + this->e.do_free = FALSE; + MSVCP_basic_string_char_ctor_cstr(&this->str, *name); + return this; +} + +DEFINE_THISCALL_WRAPPER(MSVCP_logic_error_copy_ctor, 8) +logic_error* __stdcall MSVCP_logic_error_copy_ctor( + logic_error *this, logic_error *rhs) +{ + TRACE("%p %p\n", this, rhs); + MSVCP_exception_copy_ctor(&this->e, &rhs->e); + MSVCP_basic_string_char_copy_ctor(&this->str, &rhs->str); + this->e.vtable = &MSVCP_logic_error_vtable; + return this; +} + +DEFINE_THISCALL_WRAPPER(MSVCP_logic_error_dtor, 4) +void __stdcall MSVCP_logic_error_dtor(logic_error *this) +{ + TRACE("%p\n", this); + MSVCP_exception_dtor(&this->e); + MSVCP_basic_string_char_dtor(&this->str); +} + +DEFINE_THISCALL_WRAPPER(MSVCP_logic_error_vector_dtor, 8) +void* __stdcall MSVCP_logic_error_vector_dtor( + logic_error *this, unsigned int flags) +{ + TRACE("%p %x\n", this, flags); + if(flags & 2) { + /* we have an array, with the number of elements stored before the first object */ + int i, *ptr = (int *)this-1; + + for(i=*ptr-1; i>=0; i--) + MSVCP_logic_error_dtor(this+i); + MSVCRT_operator_delete(ptr); + } else { + MSVCP_logic_error_dtor(this); + if(flags & 1) + MSVCRT_operator_delete(this); + } + + return this; +} + +DEFINE_THISCALL_WRAPPER(MSVCP_logic_error_what, 4) +const char* __stdcall MSVCP_logic_error_what(logic_error *this) +{ + TRACE("%p\n", this); + return MSVCP_basic_string_char_c_str(&this->str); +} + +static const type_info logic_error_type_info = { + &MSVCP_logic_error_vtable, + NULL, + ".?AVlogic_error(a)std@@" +}; + +static const rtti_base_descriptor logic_error_rtti_base_descriptor = { + &logic_error_type_info, + 1, + { 0, -1, 0 }, + 64 +}; + +static const rtti_base_array logic_error_rtti_base_array = { + { + &logic_error_rtti_base_descriptor, + &exception_rtti_base_descriptor, + NULL + } +}; + +static const rtti_object_hierarchy logic_error_type_hierarchy = { + 0, + 0, + 2, + &logic_error_rtti_base_array +}; + +const rtti_object_locator logic_error_rtti = { + 0, + 0, + 0, + &logic_error_type_info, + &logic_error_type_hierarchy +}; + +static const cxx_type_info logic_error_cxx_type_info = { + 0, + &logic_error_type_info, + { 0, -1, 0 }, + sizeof(logic_error), + (cxx_copy_ctor)THISCALL(MSVCP_logic_error_copy_ctor) +}; + +static const cxx_type_info_table logic_error_cxx_type_table = { + 2, + { + &logic_error_cxx_type_info, + &exception_cxx_type_info, + NULL + } +}; + +static const cxx_exception_type logic_error_cxx_type = { + 0, + (cxx_copy_ctor)THISCALL(MSVCP_logic_error_dtor), + NULL, + &logic_error_cxx_type_table +}; + #ifndef __GNUC__ void __asm_dummy_vtables(void) { #endif __ASM_EXCEPTION_VTABLE(bad_alloc) + __ASM_EXCEPTION_STRING_VTABLE(logic_error) #ifndef __GNUC__ } #endif @@ -319,6 +452,13 @@ void throw_exception(exception_type et, const char *str) bad_alloc e; MSVCP_bad_alloc_ctor(&e, &addr); _CxxThrowException(&e, &bad_alloc_cxx_type); + return; + } + case EXCEPTION_LOGIC_ERROR: { + logic_error e; + MSVCP_logic_error_ctor(&e, &addr); + _CxxThrowException((exception*)&e, &logic_error_cxx_type); + return; } } } diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 3470d1b..b2e45bd 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -59,7 +59,8 @@ typedef struct __exception /* Internal: throws selected exception */ typedef enum __exception_type { EXCEPTION, - EXCEPTION_BAD_ALLOC + EXCEPTION_BAD_ALLOC, + EXCEPTION_LOGIC_ERROR } exception_type; void throw_exception(exception_type, const char *); void set_exception_vtable(void); @@ -123,5 +124,10 @@ typedef struct _basic_string_char size_t res; } basic_string_char; +basic_string_char* __stdcall MSVCP_basic_string_char_ctor_cstr(basic_string_char*, const char*); +basic_string_char* __stdcall MSVCP_basic_string_char_copy_ctor(basic_string_char*, const basic_string_char*); +void __stdcall MSVCP_basic_string_char_dtor(basic_string_char*); +const char* __stdcall MSVCP_basic_string_char_c_str(basic_string_char*); + char* __stdcall MSVCP_allocator_char_allocate(void*, size_t); void __stdcall MSVCP_allocator_char_deallocate(void*, char*, size_t);

1 0

Piotr Caban : msvcp90: Added _String_base::Xlen implementation.
by Alexandre Julliard Aug. 20, 2010

Aug. 20, 2010

Module: wine Branch: master Commit: 1ba4fff9894c8b9145c2dbdea5026e55e6f0378a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ba4fff9894c8b9145c2dbdea… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 19 23:49:08 2010 +0200 msvcp90: Added _String_base::Xlen implementation. --- dlls/msvcp90/exception.c | 99 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.h | 3 +- dlls/msvcp90/msvcp90.spec | 2 +- dlls/msvcp90/string.c | 11 +++++ 4 files changed, 113 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index 69da38a..d795b66 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -100,6 +100,7 @@ void CDECL _CxxThrowException(exception*,const cxx_exception_type*); extern const vtable_ptr MSVCP_bad_alloc_vtable; extern const vtable_ptr MSVCP_logic_error_vtable; +extern const vtable_ptr MSVCP_length_error_vtable; /* exception class data */ static type_info exception_type_info = { @@ -427,11 +428,103 @@ static const cxx_exception_type logic_error_cxx_type = { &logic_error_cxx_type_table }; +/* length_error class data */ +typedef logic_error length_error; + +DEFINE_THISCALL_WRAPPER(MSVCP_length_error_ctor, 8) +length_error* __stdcall MSVCP_length_error_ctor( + length_error *this, const char **name) +{ + TRACE("%p %s\n", this, *name); + MSVCP_logic_error_ctor(this, name); + this->e.vtable = &MSVCP_length_error_vtable; + return this; +} + +DEFINE_THISCALL_WRAPPER(MSVCP_length_error_copy_ctor, 8) +length_error* __stdcall MSVCP_length_error_copy_ctor( + length_error *this, length_error *rhs) +{ + TRACE("%p %p\n", this, rhs); + MSVCP_logic_error_copy_ctor(this, rhs); + this->e.vtable = &MSVCP_length_error_vtable; + return this; +} + +DEFINE_THISCALL_WRAPPER(MSVCP_length_error_vector_dtor, 8) +void* __stdcall MSVCP_length_error_vector_dtor( + length_error *this, unsigned int flags) +{ + TRACE("%p %x\n", this, flags); + return MSVCP_logic_error_vector_dtor(this, flags); +} + +static const type_info length_error_type_info = { + &MSVCP_length_error_vtable, + NULL, + ".?AVlength_error(a)std@@" +}; + +static const rtti_base_descriptor length_error_rtti_base_descriptor = { + &length_error_type_info, + 2, + { 0, -1, 0 }, + 64 +}; + +static const rtti_base_array length_error_rtti_base_array = { + { + &length_error_rtti_base_descriptor, + &logic_error_rtti_base_descriptor, + &exception_rtti_base_descriptor + } +}; + +static const rtti_object_hierarchy length_error_type_hierarchy = { + 0, + 0, + 3, + &length_error_rtti_base_array +}; + +const rtti_object_locator length_error_rtti = { + 0, + 0, + 0, + &length_error_type_info, + &length_error_type_hierarchy +}; + +static const cxx_type_info length_error_cxx_type_info = { + 0, + &length_error_type_info, + { 0, -1, 0 }, + sizeof(length_error), + (cxx_copy_ctor)THISCALL(MSVCP_length_error_copy_ctor) +}; + +static const cxx_type_info_table length_error_cxx_type_table = { + 3, + { + &length_error_cxx_type_info, + &logic_error_cxx_type_info, + &exception_cxx_type_info + } +}; + +static const cxx_exception_type length_error_cxx_type = { + 0, + (cxx_copy_ctor)THISCALL(MSVCP_logic_error_dtor), + NULL, + &length_error_cxx_type_table +}; + #ifndef __GNUC__ void __asm_dummy_vtables(void) { #endif __ASM_EXCEPTION_VTABLE(bad_alloc) __ASM_EXCEPTION_STRING_VTABLE(logic_error) + __ASM_EXCEPTION_STRING_VTABLE(length_error) #ifndef __GNUC__ } #endif @@ -460,5 +553,11 @@ void throw_exception(exception_type et, const char *str) _CxxThrowException((exception*)&e, &logic_error_cxx_type); return; } + case EXCEPTION_LENGTH_ERROR: { + length_error e; + MSVCP_length_error_ctor(&e, &addr); + _CxxThrowException((exception*)&e, &length_error_cxx_type); + return; + } } } diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index b2e45bd..3c43117 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -60,7 +60,8 @@ typedef struct __exception typedef enum __exception_type { EXCEPTION, EXCEPTION_BAD_ALLOC, - EXCEPTION_LOGIC_ERROR + EXCEPTION_LOGIC_ERROR, + EXCEPTION_LENGTH_ERROR } exception_type; void throw_exception(exception_type, const char *); void set_exception_vtable(void); diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 0db56fa..4a442c6 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -2878,7 +2878,7 @@ @ stub -arch=win32 ?_Xinvalid(a)tr1@std@@YAXPBD(a)Z @ stub -arch=win64 ?_Xinvalid(a)tr1@std@@YAXPEBD(a)Z @ stub ?_Xinvarg(a)_String_base@std@@SAXXZ -@ stub ?_Xlen(a)_String_base@std@@SAXXZ +@ cdecl ?_Xlen(a)_String_base@std@@SAXXZ() MSVCP__String_base_Xlen @ stub ?_Xmem(a)tr1@std@@YAXXZ @ stub ?_Xoutrange(a)tr1@std@@YAXXZ @ stub ?_Xran(a)_String_base@std@@SAXXZ diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index b71af40..3b8fc66 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -466,6 +466,17 @@ unsigned short CDECL MSVCP_char_traits_short_not_eof(const unsigned short *in) } +/* _String_base */ +/* ?_Xlen(a)_String_base@std@@SAXXZ */ +void CDECL MSVCP__String_base_Xlen(void) +{ + static const char msg[] = "string too long"; + + TRACE("\n"); + throw_exception(EXCEPTION_LENGTH_ERROR, msg); +} + + /* basic_string<char, char_traits<char>, allocator<char>> */ /* ?npos@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@2IB */ const size_t MSVCP_basic_string_char_npos = -1;

1 0

Marko Nikolic : advpack/tests: Removed sign comparison warning in advpack tests.
by Alexandre Julliard Aug. 20, 2010

Aug. 20, 2010

Module: wine Branch: master Commit: 78b020c018750a7032b9daadc75daa1035f54d03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78b020c018750a7032b9daadc… Author: Marko Nikolic <grkoma(a)gmail.com> Date: Thu Aug 19 23:33:02 2010 +0200 advpack/tests: Removed sign comparison warning in advpack tests. --- dlls/advpack/tests/advpack.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/advpack/tests/advpack.c b/dlls/advpack/tests/advpack.c index 3ead0f2..1345d72 100644 --- a/dlls/advpack/tests/advpack.c +++ b/dlls/advpack/tests/advpack.c @@ -130,7 +130,7 @@ static void delnode_test(void) HRESULT hr; HANDLE hn; CHAR currDir[MAX_PATH]; - int currDirLen; + UINT currDirLen; /* Native DelNode apparently does not support relative paths, so we use absolute paths for testing */ @@ -446,7 +446,7 @@ static void translateinfstringex_test(void) ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); ok(!lstrcmpi(buffer, PROG_FILES_ROOT), "Expected %s, got %s\n", PROG_FILES_ROOT, buffer); - ok(size == lstrlenA(PROG_FILES_ROOT)+1, "Expected size %d, got %d\n", + ok(size == strlen(PROG_FILES_ROOT)+1, "Expected size %d, got %d\n", lstrlenA(PROG_FILES_ROOT)+1, size); memset(buffer, 'a', APP_PATH_LEN); @@ -457,7 +457,7 @@ static void translateinfstringex_test(void) ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); ok(!lstrcmpi(buffer, PROG_FILES_ROOT), "Expected %s, got %s\n", PROG_FILES_ROOT, buffer); - ok(size == lstrlenA(PROG_FILES_ROOT)+1, "Expected size %d, got %d\n", + ok(size == strlen(PROG_FILES_ROOT)+1, "Expected size %d, got %d\n", lstrlenA(PROG_FILES_ROOT)+1, size); { @@ -473,7 +473,7 @@ static void translateinfstringex_test(void) ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); ok(!lstrcmpi(buffer, drive), "Expected %s, got %s\n", drive, buffer); - ok(size == lstrlenA(drive)+1, "Expected size %d, got %d\n", + ok(size == strlen(drive)+1, "Expected size %d, got %d\n", lstrlenA(drive)+1, size); } @@ -531,7 +531,7 @@ static void translateinfstringex_test(void) ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); ok(!lstrcmpi(buffer, PROG_FILES_ROOT), "Expected %s, got %s\n", PROG_FILES_ROOT, buffer); - ok(size == lstrlenA(PROG_FILES_ROOT)+1, "Expected size %d, got %d\n", + ok(size == strlen(PROG_FILES_ROOT)+1, "Expected size %d, got %d\n", lstrlenA(PROG_FILES_ROOT)+1, size); /* close the INF again */

1 0

Piotr Caban : msvcp90: Added basic_string<char>::c_str implementation.
by Alexandre Julliard Aug. 20, 2010

Aug. 20, 2010

Module: wine Branch: master Commit: 22e221c4201cef0587a3d54f4a2661def1fc904c URL: http://source.winehq.org/git/wine.git/?a=commit;h=22e221c4201cef0587a3d54f4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 19 23:48:46 2010 +0200 msvcp90: Added basic_string<char>::c_str implementation. --- dlls/msvcp90/msvcp90.spec | 4 ++-- dlls/msvcp90/string.c | 9 +++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index baf6003..0db56fa 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -3041,8 +3041,8 @@ @ stub -arch=win64 ?begin@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAA?AV?$_String_iterator(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@2(a)XZ @ stub -arch=win32 ?begin@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBE?AV?$_String_const_iterator(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@2(a)XZ @ stub -arch=win64 ?begin@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBA?AV?$_String_const_iterator(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@2(a)XZ -@ stub -arch=win32 ?c_str@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEPBDXZ -@ stub -arch=win64 ?c_str@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBAPEBDXZ +@ cdecl -arch=win32 -i386 -norelay ?c_str@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEPBDXZ() __thiscall_MSVCP_basic_string_char_c_str +@ cdecl -arch=win64 ?c_str@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBAPEBDXZ(ptr) MSVCP_basic_string_char_c_str @ stub -arch=win32 ?c_str@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QBEPBGXZ @ stub -arch=win64 ?c_str@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEBAPEBGXZ @ stub -arch=win32 ?c_str@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEPB_WXZ diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 359ef39..b71af40 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -655,6 +655,15 @@ basic_string_char* __stdcall MSVCP_basic_string_char_assign_cstr( MSVCP_char_traits_char_length(str)); } +/* ?c_str@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEPBDXZ */ +/* ?c_str@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBAPEBDXZ */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_c_str, 4) +const char* __stdcall MSVCP_basic_string_char_c_str(basic_string_char *this) +{ + TRACE("%p\n", this); + return basic_string_char_const_ptr(this); +} + /* ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE(a)XZ */ /* ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA(a)XZ */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_ctor, 4)

1 0

Piotr Caban : msvcp90: Added _String_base::Xran implementation.
by Alexandre Julliard Aug. 20, 2010

Aug. 20, 2010

Module: wine Branch: master Commit: d7938822f75ea113039e5bd2e79966f3d256f698 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7938822f75ea113039e5bd2e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 19 23:49:18 2010 +0200 msvcp90: Added _String_base::Xran implementation. --- dlls/msvcp90/exception.c | 98 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.h | 3 +- dlls/msvcp90/msvcp90.spec | 2 +- dlls/msvcp90/string.c | 13 +++++- 4 files changed, 112 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index d795b66..b4c8bff 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -101,6 +101,7 @@ void CDECL _CxxThrowException(exception*,const cxx_exception_type*); extern const vtable_ptr MSVCP_bad_alloc_vtable; extern const vtable_ptr MSVCP_logic_error_vtable; extern const vtable_ptr MSVCP_length_error_vtable; +extern const vtable_ptr MSVCP_out_of_range_vtable; /* exception class data */ static type_info exception_type_info = { @@ -519,12 +520,104 @@ static const cxx_exception_type length_error_cxx_type = { &length_error_cxx_type_table }; +/* out_of_range class data */ +typedef logic_error out_of_range; + +DEFINE_THISCALL_WRAPPER(MSVCP_out_of_range_ctor, 8) +out_of_range* __stdcall MSVCP_out_of_range_ctor( + out_of_range *this, const char **name) +{ + TRACE("%p %s\n", this, *name); + MSVCP_logic_error_ctor(this, name); + this->e.vtable = &MSVCP_out_of_range_vtable; + return this; +} + +DEFINE_THISCALL_WRAPPER(MSVCP_out_of_range_copy_ctor, 8) +out_of_range* __stdcall MSVCP_out_of_range_copy_ctor( + out_of_range *this, out_of_range *rhs) +{ + TRACE("%p %p\n", this, rhs); + MSVCP_logic_error_copy_ctor(this, rhs); + this->e.vtable = &MSVCP_out_of_range_vtable; + return this; +} + +DEFINE_THISCALL_WRAPPER(MSVCP_out_of_range_vector_dtor, 8) +void* __stdcall MSVCP_out_of_range_vector_dtor( + out_of_range *this, unsigned int flags) +{ + TRACE("%p %x\n", this, flags); + return MSVCP_logic_error_vector_dtor(this, flags); +} + +static const type_info out_of_range_type_info = { + &MSVCP_out_of_range_vtable, + NULL, + ".?AVout_of_range(a)std@@" +}; + +static const rtti_base_descriptor out_of_range_rtti_base_descriptor = { + &out_of_range_type_info, + 2, + { 0, -1, 0 }, + 64 +}; + +static const rtti_base_array out_of_range_rtti_base_array = { + { + &out_of_range_rtti_base_descriptor, + &logic_error_rtti_base_descriptor, + &exception_rtti_base_descriptor + } +}; + +static const rtti_object_hierarchy out_of_range_type_hierarchy = { + 0, + 0, + 3, + &out_of_range_rtti_base_array +}; + +const rtti_object_locator out_of_range_rtti = { + 0, + 0, + 0, + &out_of_range_type_info, + &out_of_range_type_hierarchy +}; + +static const cxx_type_info out_of_range_cxx_type_info = { + 0, + &out_of_range_type_info, + { 0, -1, 0 }, + sizeof(out_of_range), + (cxx_copy_ctor)THISCALL(MSVCP_out_of_range_copy_ctor) +}; + +static const cxx_type_info_table out_of_range_cxx_type_table = { + 3, + { + &out_of_range_cxx_type_info, + &logic_error_cxx_type_info, + &exception_cxx_type_info + } +}; + +static const cxx_exception_type out_of_range_cxx_type = { + 0, + (cxx_copy_ctor)THISCALL(MSVCP_logic_error_dtor), + NULL, + &out_of_range_cxx_type_table +}; + #ifndef __GNUC__ void __asm_dummy_vtables(void) { #endif __ASM_EXCEPTION_VTABLE(bad_alloc) __ASM_EXCEPTION_STRING_VTABLE(logic_error) __ASM_EXCEPTION_STRING_VTABLE(length_error) + __ASM_EXCEPTION_STRING_VTABLE(out_of_range) #ifndef __GNUC__ } #endif @@ -559,5 +652,10 @@ void throw_exception(exception_type et, const char *str) _CxxThrowException((exception*)&e, &length_error_cxx_type); return; } + case EXCEPTION_OUT_OF_RANGE: { + out_of_range e; + MSVCP_out_of_range_ctor(&e, &addr); + _CxxThrowException((exception*)&e, &out_of_range_cxx_type); + } } } diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 3c43117..bc3c73d 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -61,7 +61,8 @@ typedef enum __exception_type { EXCEPTION, EXCEPTION_BAD_ALLOC, EXCEPTION_LOGIC_ERROR, - EXCEPTION_LENGTH_ERROR + EXCEPTION_LENGTH_ERROR, + EXCEPTION_OUT_OF_RANGE } exception_type; void throw_exception(exception_type, const char *); void set_exception_vtable(void); diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 4a442c6..898cac5 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -2881,7 +2881,7 @@ @ cdecl ?_Xlen(a)_String_base@std@@SAXXZ() MSVCP__String_base_Xlen @ stub ?_Xmem(a)tr1@std@@YAXXZ @ stub ?_Xoutrange(a)tr1@std@@YAXXZ -@ stub ?_Xran(a)_String_base@std@@SAXXZ +@ cdecl ?_Xran(a)_String_base@std@@SAXXZ() MSVCP__String_base_Xran @ stub ?_Xran(a)ctype_base@std@@KAXXZ @ stub -arch=win32 ?_Xsgetn_s@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@MAEHPADIH(a)Z @ stub -arch=win64 ?_Xsgetn_s@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@MEAA_JPEAD_K_J(a)Z diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 3b8fc66..97c47d0 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -476,6 +476,15 @@ void CDECL MSVCP__String_base_Xlen(void) throw_exception(EXCEPTION_LENGTH_ERROR, msg); } +/* ?_Xran(a)_String_base@std@@SAXXZ */ +void CDECL MSVCP__String_base_Xran(void) +{ + static const char msg[] = "invalid string position"; + + TRACE("\n"); + throw_exception(EXCEPTION_OUT_OF_RANGE, msg); +} + /* basic_string<char, char_traits<char>, allocator<char>> */ /* ?npos@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@2IB */ @@ -580,7 +589,7 @@ basic_string_char* __stdcall MSVCP_basic_string_char_erase( TRACE("%p %d %d\n", this, pos, len); if(pos > this->size) { - FIXME("Throw exception (_Xran)\n"); + MSVCP__String_base_Xran(); return NULL; } @@ -607,7 +616,7 @@ basic_string_char* __stdcall MSVCP_basic_string_char_assign_substr( TRACE("%p %p %d %d\n", this, assign, pos, len); if(assign->size < pos) { - FIXME("Throw exception (_Xran)\n"); + MSVCP__String_base_Xran(); return NULL; }

1 0

Davide Pizzetti : wordpad: Italian translation update.
by Alexandre Julliard Aug. 20, 2010

Aug. 20, 2010

Module: wine Branch: master Commit: a27109747251753e4a3d6c879e25c1e4730f7189 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a27109747251753e4a3d6c879… Author: Davide Pizzetti <erpizzo(a)alice.it> Date: Thu Aug 19 23:20:56 2010 +0200 wordpad: Italian translation update. --- programs/wordpad/It.rc | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/wordpad/It.rc b/programs/wordpad/It.rc index de9828e..a19bc64 100644 --- a/programs/wordpad/It.rc +++ b/programs/wordpad/It.rc @@ -93,7 +93,7 @@ BEGIN END POPUP "&Aiuto" BEGIN - MENUITEM "&Riguardo A Wine Wordpad" ID_ABOUT + MENUITEM "&Riguardo a Wine Wordpad" ID_ABOUT END END @@ -130,7 +130,7 @@ BEGIN MENUITEM "Fucsia" ID_COLOR_FUCHSIA MENUITEM "Aqua" ID_COLOR_AQUA MENUITEM "Bianco" ID_COLOR_WHITE - MENUITEM "Automatic" ID_COLOR_AUTOMATIC + MENUITEM "Automatico" ID_COLOR_AUTOMATIC END END @@ -161,7 +161,7 @@ STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU Caption "Formato del paragrafo" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Indentazione", -1, 10, 10, 120, 68 + GROUPBOX "Rientro", -1, 10, 10, 120, 68 LTEXT "Sinistra", -1, 15, 22, 40, 13 EDITTEXT IDC_PARA_LEFT, 55, 20, 60, 13 LTEXT "Destra", -1, 15, 40, 40, 13 @@ -211,7 +211,7 @@ BEGIN STRING_TEXT_FILES_TXT, "File di testo (*.txt)" STRING_TEXT_FILES_UNICODE_TXT, "File di testo Unicode (*.txt)" STRING_RICHTEXT_FILES_RTF, "Formato rich text (*.rtf)" - STRING_NEWFILE_RICHTEXT, "Documento Rich text" + STRING_NEWFILE_RICHTEXT, "Documento rich text" STRING_NEWFILE_TXT, "Documento di testo" STRING_NEWFILE_TXT_UNICODE, "Documento di testo Unicode" STRING_PRINTER_FILES_PRN, "File di stampa (*.PRN)" @@ -264,6 +264,6 @@ BEGIN STRING_WRITE_ACCESS_DENIED, "Non hai i diritti di accesso per salvare il file." STRING_OPEN_FAILED, "Impossibile aprire il file." STRING_OPEN_ACCESS_DENIED, "Non hai i diritti di accesso per aprire il file." - STRING_PRINTING_NOT_IMPLEMENTED, "Stampa non implementata" + STRING_PRINTING_NOT_IMPLEMENTED, "Stampa non implementata" STRING_MAX_TAB_STOPS, "Non si possono aggiungere più di 32 punti di fermata delle tabulazioni." END

1 0

Wolfgang Schwotzer : ws2_32: Initialize variable lsap_sel.
by Alexandre Julliard Aug. 20, 2010

Aug. 20, 2010

Module: wine Branch: master Commit: 6d5aaaa5e0d1fd3277906d0f711f784d6fe4da17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d5aaaa5e0d1fd3277906d0f7… Author: Wolfgang Schwotzer <wolfgang.schwotzer(a)gmx.net> Date: Thu Aug 19 22:02:35 2010 +0200 ws2_32: Initialize variable lsap_sel. --- dlls/ws2_32/socket.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index c226fda..acd3f6e 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1190,7 +1190,7 @@ static unsigned int ws_sockaddr_ws2u(const struct WS_sockaddr* wsaddr, int wsadd uin->sir_family = AF_IRDA; if (!strncmp( win->irdaServiceName, "LSAP-SEL", strlen( "LSAP-SEL" ) )) { - unsigned int lsap_sel; + unsigned int lsap_sel = 0; sscanf( win->irdaServiceName, "LSAP-SEL%u", &lsap_sel ); uin->sir_lsap_sel = lsap_sel;

1 0

Davide Pizzetti : xcopy: Italian translation update.
by Alexandre Julliard Aug. 20, 2010

Aug. 20, 2010

Module: wine Branch: master Commit: e4755abf61d8be6c463835cf097b4d9edf8f6a87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4755abf61d8be6c463835cf0… Author: Davide Pizzetti <erpizzo(a)alice.it> Date: Thu Aug 19 17:24:36 2010 +0200 xcopy: Italian translation update. --- programs/xcopy/It.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/xcopy/It.rc b/programs/xcopy/It.rc index a3b742a..fa2d75a 100644 --- a/programs/xcopy/It.rc +++ b/programs/xcopy/It.rc @@ -48,7 +48,7 @@ STRINGTABLE STRING_DIR_CHAR, "C" STRING_HELP, -"XCOPY - Copia file(s) e alberi di cartelle sorgenti in una destinazione\n\ +"XCOPY - Copia file e alberi di cartelle sorgenti in una destinazione\n\ \n\ Sintassi:\n\ XCOPY sorgente [destinazione] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\

1 0

Juan Lang : mshtml: Fix off by one error in setting status text.
by Alexandre Julliard Aug. 20, 2010

Aug. 20, 2010

Module: wine Branch: master Commit: 5f6b135668777305ccf955da4297c7c00651f6d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f6b135668777305ccf955da4… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Aug 19 11:25:46 2010 -0700 mshtml: Fix off by one error in setting status text. --- dlls/mshtml/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index d61c1f4..4aef475 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -114,7 +114,7 @@ void set_statustext(HTMLDocumentObj* doc, INT id, LPCWSTR arg) DWORD len = lstrlenW(p) + lstrlenW(arg) - 1; LPWSTR buf = heap_alloc(len * sizeof(WCHAR)); - snprintfW(buf, len - 1, p, arg); + snprintfW(buf, len, p, arg); p = buf; }

1 0