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

Alexandre Julliard : msvcrt: Use macros to define exception type info structures.
by Alexandre Julliard April 5, 2012

April 5, 2012

Module: wine Branch: master Commit: 04ccf4f1004446512adf97e9be8931a632db1cb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04ccf4f1004446512adf97e9b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 4 20:47:06 2012 +0200 msvcrt: Use macros to define exception type info structures. --- dlls/msvcrt/cpp.c | 114 +++++++++++++++-------------------------------------- 1 files changed, 32 insertions(+), 82 deletions(-) diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index 6f5f0a5..9564ff3 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -746,94 +746,44 @@ const rtti_object_locator name ## _rtti = { \ &name ## _hierarchy \ } +#define DEFINE_EXCEPTION_TYPE_INFO(name, base_classes, cl1, cl2) \ +static const cxx_type_info name ## _cxx_type_info = \ +{ \ + 0, \ + &name ## _type_info, \ + { 0, -1, 0 }, \ + sizeof(name), \ + (cxx_copy_ctor)THISCALL(MSVCRT_ ## name ## _copy_ctor) \ +}; \ +\ +static const cxx_type_info_table name ## _type_info_table = \ +{ \ + base_classes+1, \ + { \ + &name ## _cxx_type_info, \ + cl2, \ + cl1 \ + } \ +}; \ +\ +const cxx_exception_type name ## _exception_type = \ +{ \ + 0, \ + (void *)THISCALL(MSVCRT_ ## name ## _dtor), \ + NULL, \ + &name ## _type_info_table \ +} + DEFINE_RTTI_DATA( type_info, 0, NULL, NULL, ".?AVtype_info@@" ); DEFINE_RTTI_DATA( exception, 0, NULL, NULL, ".?AVexception@@" ); DEFINE_RTTI_DATA( bad_typeid, 1, &exception_rtti_base_descriptor, NULL, ".?AVbad_typeid@@" ); DEFINE_RTTI_DATA( bad_cast, 1, &exception_rtti_base_descriptor, NULL, ".?AVbad_cast@@" ); DEFINE_RTTI_DATA( __non_rtti_object, 2, &bad_typeid_rtti_base_descriptor, &exception_rtti_base_descriptor, ".?AV__non_rtti_object@@" ); -static const cxx_type_info exception_cxx_type_info = -{ - 0, - &exception_type_info, - { 0, -1, 0 }, - sizeof(exception), - (cxx_copy_ctor)THISCALL(MSVCRT_exception_copy_ctor) -}; - -static const cxx_type_info bad_typeid_cxx_type_info = -{ - 0, - &bad_typeid_type_info, - { 0, -1, 0 }, - sizeof(exception), - (cxx_copy_ctor)THISCALL(MSVCRT_bad_typeid_copy_ctor) -}; - -static const cxx_type_info bad_cast_cxx_type_info = -{ - 0, - &bad_cast_type_info, - { 0, -1, 0 }, - sizeof(exception), - (cxx_copy_ctor)THISCALL(MSVCRT_bad_cast_copy_ctor) -}; - -static const cxx_type_info __non_rtti_object_cxx_type_info = -{ - 0, - &__non_rtti_object_type_info, - { 0, -1, 0 }, - sizeof(exception), - (cxx_copy_ctor)THISCALL(MSVCRT___non_rtti_object_copy_ctor) -}; - -/* - * Exception RTTI for cpp objects - */ -static const cxx_type_info_table bad_cast_type_info_table = -{ - 3, - { - &__non_rtti_object_cxx_type_info, - &bad_typeid_cxx_type_info, - &exception_cxx_type_info - } -}; - -static const cxx_exception_type bad_cast_exception_type = -{ - 0, - (void*)THISCALL(MSVCRT_bad_cast_dtor), - NULL, - &bad_cast_type_info_table -}; - -static const cxx_type_info_table bad_typeid_type_info_table = -{ - 2, - { - &bad_cast_cxx_type_info, - &exception_cxx_type_info, - NULL - } -}; - -static const cxx_exception_type bad_typeid_exception_type = -{ - 0, - (void*)THISCALL(MSVCRT_bad_typeid_dtor), - NULL, - &bad_cast_type_info_table -}; - -static const cxx_exception_type __non_rtti_object_exception_type = -{ - 0, - (void*)THISCALL(MSVCRT___non_rtti_object_dtor), - NULL, - &bad_typeid_type_info_table -}; +DEFINE_EXCEPTION_TYPE_INFO( exception, 0, NULL, NULL ); +DEFINE_EXCEPTION_TYPE_INFO( bad_typeid, 1, &exception_cxx_type_info, NULL ); +DEFINE_EXCEPTION_TYPE_INFO( bad_cast, 1, &exception_cxx_type_info, NULL ); +DEFINE_EXCEPTION_TYPE_INFO( __non_rtti_object, 2, &bad_typeid_cxx_type_info, &exception_cxx_type_info ); /******************************************************************

1 0

Alexandre Julliard : msvcrt: Use macros to define RTTI data.
by Alexandre Julliard April 5, 2012

April 5, 2012

Module: wine Branch: master Commit: 6bb9f2009090db86a5e52dd8a45ddbc960105965 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bb9f2009090db86a5e52dd8a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 4 20:17:44 2012 +0200 msvcrt: Use macros to define RTTI data. --- dlls/msvcrt/cpp.c | 246 +++++++++-------------------------------------------- 1 files changed, 42 insertions(+), 204 deletions(-) diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index dc609c1..6f5f0a5 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -709,46 +709,48 @@ __ASM_EXCEPTION_VTABLE(__non_rtti_object) /* Static RTTI for exported objects */ -static const type_info exception_type_info = -{ - &MSVCRT_type_info_vtable, - NULL, - ".?AVexception@@" -}; - -static const rtti_base_descriptor exception_rtti_base_descriptor = -{ - &exception_type_info, - 0, - { 0, -1, 0 }, - 0 -}; - -static const rtti_base_array exception_rtti_base_array = -{ - { - &exception_rtti_base_descriptor, - NULL, - NULL - } -}; - -static const rtti_object_hierarchy exception_type_hierarchy = -{ - 0, - 0, - 1, - &exception_rtti_base_array -}; +#define DEFINE_RTTI_DATA(name, base_classes, cl1, cl2, mangled_name) \ +static const type_info name ## _type_info = { \ + &MSVCRT_type_info_vtable, \ + NULL, \ + mangled_name \ +}; \ +\ +static const rtti_base_descriptor name ## _rtti_base_descriptor = { \ + &name ##_type_info, \ + base_classes, \ + { 0, -1, 0}, \ + 0 \ +}; \ +\ +static const rtti_base_array name ## _rtti_base_array = { \ + { \ + &name ## _rtti_base_descriptor, \ + cl1, \ + cl2 \ + } \ +}; \ +\ +static const rtti_object_hierarchy name ## _hierarchy = { \ + 0, \ + 0, \ + base_classes+1, \ + &name ## _rtti_base_array \ +}; \ +\ +const rtti_object_locator name ## _rtti = { \ + 0, \ + 0, \ + 0, \ + &name ## _type_info, \ + &name ## _hierarchy \ +} -const rtti_object_locator exception_rtti = -{ - 0, - 0, - 0, - &exception_type_info, - &exception_type_hierarchy -}; +DEFINE_RTTI_DATA( type_info, 0, NULL, NULL, ".?AVtype_info@@" ); +DEFINE_RTTI_DATA( exception, 0, NULL, NULL, ".?AVexception@@" ); +DEFINE_RTTI_DATA( bad_typeid, 1, &exception_rtti_base_descriptor, NULL, ".?AVbad_typeid@@" ); +DEFINE_RTTI_DATA( bad_cast, 1, &exception_rtti_base_descriptor, NULL, ".?AVbad_cast@@" ); +DEFINE_RTTI_DATA( __non_rtti_object, 2, &bad_typeid_rtti_base_descriptor, &exception_rtti_base_descriptor, ".?AV__non_rtti_object@@" ); static const cxx_type_info exception_cxx_type_info = { @@ -759,47 +761,6 @@ static const cxx_type_info exception_cxx_type_info = (cxx_copy_ctor)THISCALL(MSVCRT_exception_copy_ctor) }; -static const type_info bad_typeid_type_info = -{ - &MSVCRT_type_info_vtable, - NULL, - ".?AVbad_typeid@@" -}; - -static const rtti_base_descriptor bad_typeid_rtti_base_descriptor = -{ - &bad_typeid_type_info, - 1, - { 0, -1, 0 }, - 0 -}; - -static const rtti_base_array bad_typeid_rtti_base_array = -{ - { - &bad_typeid_rtti_base_descriptor, - &exception_rtti_base_descriptor, - NULL - } -}; - -static const rtti_object_hierarchy bad_typeid_type_hierarchy = -{ - 0, - 0, - 2, - &bad_typeid_rtti_base_array -}; - -const rtti_object_locator bad_typeid_rtti = -{ - 0, - 0, - 0, - &bad_typeid_type_info, - &bad_typeid_type_hierarchy -}; - static const cxx_type_info bad_typeid_cxx_type_info = { 0, @@ -809,47 +770,6 @@ static const cxx_type_info bad_typeid_cxx_type_info = (cxx_copy_ctor)THISCALL(MSVCRT_bad_typeid_copy_ctor) }; -static const type_info bad_cast_type_info = -{ - &MSVCRT_type_info_vtable, - NULL, - ".?AVbad_cast@@" -}; - -static const rtti_base_descriptor bad_cast_rtti_base_descriptor = -{ - &bad_cast_type_info, - 1, - { 0, -1, 0 }, - 0 -}; - -static const rtti_base_array bad_cast_rtti_base_array = -{ - { - &bad_cast_rtti_base_descriptor, - &exception_rtti_base_descriptor, - NULL - } -}; - -static const rtti_object_hierarchy bad_cast_type_hierarchy = -{ - 0, - 0, - 2, - &bad_cast_rtti_base_array -}; - -const rtti_object_locator bad_cast_rtti = -{ - 0, - 0, - 0, - &bad_cast_type_info, - &bad_cast_type_hierarchy -}; - static const cxx_type_info bad_cast_cxx_type_info = { 0, @@ -859,47 +779,6 @@ static const cxx_type_info bad_cast_cxx_type_info = (cxx_copy_ctor)THISCALL(MSVCRT_bad_cast_copy_ctor) }; -static const type_info __non_rtti_object_type_info = -{ - &MSVCRT_type_info_vtable, - NULL, - ".?AV__non_rtti_object@@" -}; - -static const rtti_base_descriptor __non_rtti_object_rtti_base_descriptor = -{ - &__non_rtti_object_type_info, - 2, - { 0, -1, 0 }, - 0 -}; - -static const rtti_base_array __non_rtti_object_rtti_base_array = -{ - { - &__non_rtti_object_rtti_base_descriptor, - &bad_typeid_rtti_base_descriptor, - &exception_rtti_base_descriptor - } -}; - -static const rtti_object_hierarchy __non_rtti_object_type_hierarchy = -{ - 0, - 0, - 3, - &__non_rtti_object_rtti_base_array -}; - -const rtti_object_locator __non_rtti_object_rtti = -{ - 0, - 0, - 0, - &__non_rtti_object_type_info, - &__non_rtti_object_type_hierarchy -}; - static const cxx_type_info __non_rtti_object_cxx_type_info = { 0, @@ -909,47 +788,6 @@ static const cxx_type_info __non_rtti_object_cxx_type_info = (cxx_copy_ctor)THISCALL(MSVCRT___non_rtti_object_copy_ctor) }; -static const type_info type_info_type_info = -{ - &MSVCRT_type_info_vtable, - NULL, - ".?AVtype_info@@" -}; - -static const rtti_base_descriptor type_info_rtti_base_descriptor = -{ - &type_info_type_info, - 0, - { 0, -1, 0 }, - 0 -}; - -static const rtti_base_array type_info_rtti_base_array = -{ - { - &type_info_rtti_base_descriptor, - NULL, - NULL - } -}; - -static const rtti_object_hierarchy type_info_type_hierarchy = -{ - 0, - 0, - 1, - &type_info_rtti_base_array -}; - -const rtti_object_locator type_info_rtti = -{ - 0, - 0, - 0, - &type_info_type_info, - &type_info_type_hierarchy -}; - /* * Exception RTTI for cpp objects */

1 0

Alexandre Julliard : msvcp60: Use DEFINE_RTTI_DATA to initialize exception RTTI data.
by Alexandre Julliard April 5, 2012

April 5, 2012

Module: wine Branch: master Commit: 860ffe6013e96928281ed73ac6c4b6cfd898aa04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=860ffe6013e96928281ed73ac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 4 20:09:21 2012 +0200 msvcp60: Use DEFINE_RTTI_DATA to initialize exception RTTI data. --- dlls/msvcp60/exception.c | 52 +++++++++++++++++++++++++-------------------- dlls/msvcp60/main.c | 1 - dlls/msvcp60/msvcp.h | 1 - 3 files changed, 29 insertions(+), 25 deletions(-) diff --git a/dlls/msvcp60/exception.c b/dlls/msvcp60/exception.c index fa9a300..6dfdb50 100644 --- a/dlls/msvcp60/exception.c +++ b/dlls/msvcp60/exception.c @@ -61,6 +61,7 @@ typedef struct __cxx_exception_type void WINAPI _CxxThrowException(exception*,const cxx_exception_type*); /* vtables */ +extern const vtable_ptr MSVCP_exception_vtable; /* ??_7bad_alloc(a)std@@6B@ */ extern const vtable_ptr MSVCP_bad_alloc_vtable; /* ??_7logic_error(a)std@@6B@ */ @@ -73,19 +74,12 @@ extern const vtable_ptr MSVCP_invalid_argument_vtable; /* ??_7runtime_error(a)std@@6B@ */ extern const vtable_ptr MSVCP_runtime_error_vtable; -/* exception class data */ -static type_info exception_type_info = { - NULL, /* set by set_exception_vtable */ - NULL, - ".?AVexception(a)std@@" -}; - DEFINE_THISCALL_WRAPPER(MSVCP_exception_ctor, 8) exception* __thiscall MSVCP_exception_ctor(exception *this, const char *name) { TRACE("(%p %s)\n", this, name); - this->vtable = exception_type_info.vtable; + this->vtable = &MSVCP_exception_vtable; if(name) { unsigned int name_len = strlen(name) + 1; this->name = malloc(name_len); @@ -104,7 +98,7 @@ exception* __thiscall MSVCP_exception_copy_ctor(exception *this, const exception TRACE("(%p,%p)\n", this, rhs); if(!rhs->do_free) { - this->vtable = exception_type_info.vtable; + this->vtable = &MSVCP_exception_vtable; this->name = rhs->name; this->do_free = FALSE; } else @@ -117,11 +111,33 @@ DEFINE_THISCALL_WRAPPER(MSVCP_exception_dtor,4) void __thiscall MSVCP_exception_dtor(exception *this) { TRACE("(%p)\n", this); - this->vtable = exception_type_info.vtable; + this->vtable = &MSVCP_exception_vtable; if(this->do_free) free(this->name); } +DEFINE_THISCALL_WRAPPER(MSVCP_exception_vector_dtor, 8) +void * __thiscall MSVCP_exception_vector_dtor(exception *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_exception_dtor(this+i); + MSVCRT_operator_delete(ptr); + } else { + MSVCP_exception_dtor(this); + if(flags & 1) + MSVCRT_operator_delete(this); + } + + return this; +} + +DEFINE_RTTI_DATA(exception, 0, 0, NULL, NULL, NULL, ".?AVexception(a)std@@"); + /* ?_Doraise(a)bad_alloc@std@@MBEXXZ */ /* ?_Doraise(a)bad_alloc@std@@MEBAXXZ */ /* ?_Doraise(a)logic_error@std@@MBEXXZ */ @@ -145,13 +161,6 @@ const char* __thiscall MSVCP_exception_what(exception * this) return this->name ? this->name : "Unknown exception"; } -static const rtti_base_descriptor exception_rtti_base_descriptor = { - &exception_type_info, - 0, - { 0, -1, 0 }, - 0 -}; - static const cxx_type_info exception_cxx_type_info = { 0, &exception_type_info, @@ -176,12 +185,6 @@ static const cxx_exception_type exception_cxx_type = { &exception_cxx_type_table }; -void set_exception_vtable(void) -{ - HMODULE hmod = GetModuleHandleA("msvcrt.dll"); - exception_type_info.vtable = (void*)GetProcAddress(hmod, "??_7exception@@6B@"); -} - /* bad_alloc class data */ typedef exception bad_alloc; @@ -700,6 +703,9 @@ const char* __thiscall MSVCP_runtime_error_what(runtime_error *this) #ifndef __GNUC__ void __asm_dummy_vtables(void) { #endif + __ASM_VTABLE(exception, + VTABLE_ADD_FUNC(MSVCP_exception_what) + VTABLE_ADD_FUNC(MSVCP_exception__Doraise)); __ASM_VTABLE(bad_alloc, VTABLE_ADD_FUNC(MSVCP_exception_what) VTABLE_ADD_FUNC(MSVCP_exception__Doraise)); diff --git a/dlls/msvcp60/main.c b/dlls/msvcp60/main.c index 24832ff..1dd6a49 100644 --- a/dlls/msvcp60/main.c +++ b/dlls/msvcp60/main.c @@ -89,7 +89,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: init_cxx_funcs(); - set_exception_vtable(); init_lockit(); break; case DLL_PROCESS_DETACH: diff --git a/dlls/msvcp60/msvcp.h b/dlls/msvcp60/msvcp.h index ef6f864..82d9d4c 100644 --- a/dlls/msvcp60/msvcp.h +++ b/dlls/msvcp60/msvcp.h @@ -166,7 +166,6 @@ typedef enum __exception_type { EXCEPTION_RUNTIME_ERROR } exception_type; void throw_exception(exception_type, const char *); -void set_exception_vtable(void); /* rtti */ typedef struct __type_info

1 0

Alexandre Julliard : msvcp90: Use the correct vtable pointer for type_info objects.
by Alexandre Julliard April 5, 2012

April 5, 2012

Module: wine Branch: master Commit: efd693c57bace5a34390f6f5c6bececcf3aafa26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efd693c57bace5a34390f6f5c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 4 20:12:07 2012 +0200 msvcp90: Use the correct vtable pointer for type_info objects. --- dlls/msvcp90/exception.c | 29 +++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.h | 4 +++- 2 files changed, 32 insertions(+), 1 deletions(-) diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index 0965716..289dcd8 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -70,6 +70,34 @@ extern const vtable_ptr MSVCP_invalid_argument_vtable; extern const vtable_ptr MSVCP_runtime_error_vtable; extern const vtable_ptr MSVCP_failure_vtable; +static void MSVCP_type_info_dtor(type_info * _this) +{ + free(_this->name); +} + +/* Unexported */ +DEFINE_THISCALL_WRAPPER(MSVCP_type_info_vector_dtor,8) +void * __thiscall MSVCP_type_info_vector_dtor(type_info * _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_type_info_dtor(_this + i); + MSVCRT_operator_delete(ptr); + } + else + { + MSVCP_type_info_dtor(_this); + if (flags & 1) MSVCRT_operator_delete(_this); + } + return _this; +} + +DEFINE_RTTI_DATA( type_info, 0, 0, NULL, NULL, NULL, ".?AVtype_info@@" ); + DEFINE_THISCALL_WRAPPER(MSVCP_exception_ctor, 8) exception* __thiscall MSVCP_exception_ctor(exception *this, const char **name) { @@ -666,6 +694,7 @@ static const cxx_exception_type failure_cxx_type = { #ifndef __GNUC__ void __asm_dummy_vtables(void) { #endif + __ASM_VTABLE(type_info, ""); __ASM_VTABLE(exception, VTABLE_ADD_FUNC(MSVCP_what_exception)); __ASM_VTABLE(bad_alloc, VTABLE_ADD_FUNC(MSVCP_what_exception)); __ASM_VTABLE(logic_error, VTABLE_ADD_FUNC(MSVCP_logic_error_what)); diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index c774e98..1b40b55 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -83,7 +83,7 @@ extern void* (__cdecl *MSVCRT_set_new_handler)(void*); #define DEFINE_RTTI_DATA(name, off, base_classes, cl1, cl2, cl3, mangled_name) \ static const type_info name ## _type_info = { \ - &MSVCP_ ## name ## _vtable, \ + &MSVCP_type_info_vtable, \ NULL, \ mangled_name \ }; \ @@ -177,6 +177,8 @@ typedef struct __type_info char mangled[128]; /* Variable length, but we declare it large enough for static RTTI */ } type_info; +extern const vtable_ptr MSVCP_type_info_vtable; + /* offsets for computing the this pointer */ typedef struct {

1 0

Alexandre Julliard : msvcp60: Use the correct vtable pointer for type_info objects.
by Alexandre Julliard April 5, 2012

April 5, 2012

Module: wine Branch: master Commit: 7016a638fe7aa8c2fe93b2dc67b304d86cb49f2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7016a638fe7aa8c2fe93b2dc6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 4 20:11:59 2012 +0200 msvcp60: Use the correct vtable pointer for type_info objects. --- dlls/msvcp60/exception.c | 29 +++++++++++++++++++++++++++++ dlls/msvcp60/msvcp.h | 2 +- 2 files changed, 30 insertions(+), 1 deletions(-) diff --git a/dlls/msvcp60/exception.c b/dlls/msvcp60/exception.c index 6dfdb50..609cb98 100644 --- a/dlls/msvcp60/exception.c +++ b/dlls/msvcp60/exception.c @@ -61,6 +61,7 @@ typedef struct __cxx_exception_type void WINAPI _CxxThrowException(exception*,const cxx_exception_type*); /* vtables */ +extern const vtable_ptr MSVCP_type_info_vtable; extern const vtable_ptr MSVCP_exception_vtable; /* ??_7bad_alloc(a)std@@6B@ */ extern const vtable_ptr MSVCP_bad_alloc_vtable; @@ -74,6 +75,33 @@ extern const vtable_ptr MSVCP_invalid_argument_vtable; /* ??_7runtime_error(a)std@@6B@ */ extern const vtable_ptr MSVCP_runtime_error_vtable; +static void MSVCP_type_info_dtor(type_info * _this) +{ + free(_this->name); +} + +DEFINE_THISCALL_WRAPPER(MSVCP_type_info_vector_dtor,8) +void * __thiscall MSVCP_type_info_vector_dtor(type_info * _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_type_info_dtor(_this + i); + MSVCRT_operator_delete(ptr); + } + else + { + MSVCP_type_info_dtor(_this); + if (flags & 1) MSVCRT_operator_delete(_this); + } + return _this; +} + +DEFINE_RTTI_DATA( type_info, 0, 0, NULL, NULL, NULL, ".?AVtype_info@@" ); + DEFINE_THISCALL_WRAPPER(MSVCP_exception_ctor, 8) exception* __thiscall MSVCP_exception_ctor(exception *this, const char *name) { @@ -703,6 +731,7 @@ const char* __thiscall MSVCP_runtime_error_what(runtime_error *this) #ifndef __GNUC__ void __asm_dummy_vtables(void) { #endif + __ASM_VTABLE(type_info,""); __ASM_VTABLE(exception, VTABLE_ADD_FUNC(MSVCP_exception_what) VTABLE_ADD_FUNC(MSVCP_exception__Doraise)); diff --git a/dlls/msvcp60/msvcp.h b/dlls/msvcp60/msvcp.h index 82d9d4c..27d5366 100644 --- a/dlls/msvcp60/msvcp.h +++ b/dlls/msvcp60/msvcp.h @@ -83,7 +83,7 @@ extern void* (__cdecl *MSVCRT_set_new_handler)(void*); #define DEFINE_RTTI_DATA(name, off, base_classes, cl1, cl2, cl3, mangled_name) \ static const type_info name ## _type_info = { \ - &MSVCP_ ## name ## _vtable, \ + &MSVCP_type_info_vtable, \ NULL, \ mangled_name \ }; \

1 0

Lucas Fialho Zawacki : Correct Portuguese translation of release 1.5.1
by Jeremy Newman April 4, 2012

April 4, 2012

Module: website Branch: master Commit: bb307f44e0ac8e71ccd50e4387777b39298b9a22 URL: http://source.winehq.org/git/website.git/?a=commit;h=bb307f44e0ac8e71ccd50e… Author: Lucas Fialho Zawacki <lfzawacki(a)gmail.com> Date: Wed Apr 4 15:37:20 2012 -0500 Correct Portuguese translation of release 1.5.1 --- news/pt/2012033001.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/news/pt/2012033001.xml b/news/pt/2012033001.xml index 7e091a2..36d39c4 100644 --- a/news/pt/2012033001.xml +++ b/news/pt/2012033001.xml @@ -6,7 +6,7 @@ <p> <a href="{$root}/announce/1.5.1">Novidades</a> nesta versão: <ul> <li>Javascript built-in agora tem preferência ao Gecko na maioria dos casos.</li> - <li>Suporte a fontes redimensionáveis em recursos.</li> + <li>Suporte para recursos de fontes escaláveis.</li> <li>Correções na reprodução de vídeo e áudio.</li> <li>Suporte a decodificação de scripts em JScript.</li> <li>Várias correções de bugs.</li>

1 0

Jacek Caban : jscript: Avoid cleaning an uninitialized variable.
by Alexandre Julliard April 4, 2012

April 4, 2012

Module: wine Branch: master Commit: bf066791e014b5ef9b5c5f296a5b7ed80918e83b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf066791e014b5ef9b5c5f296… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 4 17:05:07 2012 +0200 jscript: Avoid cleaning an uninitialized variable. --- dlls/jscript/engine.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 955ba71..19fddd4 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2629,11 +2629,8 @@ HRESULT exec_source(exec_ctx_t *ctx, bytecode_t *code, source_elements_t *source assert(ctx->script->exec_ctx == ctx); ctx->script->exec_ctx = prev_ctx; - - if(FAILED(hres)) { - VariantClear(&val); + if(FAILED(hres)) return hres; - } if(retv) *retv = val;

1 0

Vincent Povirk : gdiplus: Implement path gradient transform setters.
by Alexandre Julliard April 4, 2012

April 4, 2012

Module: wine Branch: master Commit: c374fe9bdbdf40b755596bcd07fcff62b6cbc924 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c374fe9bdbdf40b755596bcd0… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Mar 31 13:30:44 2012 -0500 gdiplus: Implement path gradient transform setters. --- dlls/gdiplus/brush.c | 52 +++++++++++++++++++++++--------------------- dlls/gdiplus/gdiplus.spec | 2 +- 2 files changed, 28 insertions(+), 26 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 359f4973..ac5328e 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -1656,14 +1656,14 @@ GpStatus WINGDIPAPI GdipSetPathGradientWrapMode(GpPathGradient *grad, GpStatus WINGDIPAPI GdipSetPathGradientTransform(GpPathGradient *grad, GpMatrix *matrix) { - static int calls; - TRACE("(%p,%p)\n", grad, matrix); - if(!(calls++)) - FIXME("not implemented\n"); + if (!grad || !matrix) + return InvalidParameter; - return NotImplemented; + memcpy(grad->transform, matrix, sizeof(GpMatrix)); + + return Ok; } GpStatus WINGDIPAPI GdipGetPathGradientTransform(GpPathGradient *grad, @@ -1682,53 +1682,55 @@ GpStatus WINGDIPAPI GdipGetPathGradientTransform(GpPathGradient *grad, GpStatus WINGDIPAPI GdipMultiplyPathGradientTransform(GpPathGradient *grad, GDIPCONST GpMatrix *matrix, GpMatrixOrder order) { - static int calls; - TRACE("(%p,%p,%i)\n", grad, matrix, order); - if(!(calls++)) - FIXME("not implemented\n"); + if (!grad) + return InvalidParameter; - return NotImplemented; + return GdipMultiplyMatrix(grad->transform, matrix, order); +} + +GpStatus WINGDIPAPI GdipResetPathGradientTransform(GpPathGradient *grad) +{ + TRACE("(%p)\n", grad); + + if (!grad) + return InvalidParameter; + + return GdipSetMatrixElements(grad->transform, 1.0, 0.0, 0.0, 1.0, 0.0, 0.0); } GpStatus WINGDIPAPI GdipRotatePathGradientTransform(GpPathGradient *grad, REAL angle, GpMatrixOrder order) { - static int calls; - TRACE("(%p,%0.2f,%i)\n", grad, angle, order); - if(!(calls++)) - FIXME("not implemented\n"); + if (!grad) + return InvalidParameter; - return NotImplemented; + return GdipRotateMatrix(grad->transform, angle, order); } GpStatus WINGDIPAPI GdipScalePathGradientTransform(GpPathGradient *grad, REAL sx, REAL sy, GpMatrixOrder order) { - static int calls; - TRACE("(%p,%0.2f,%0.2f,%i)\n", grad, sx, sy, order); - if(!(calls++)) - FIXME("not implemented\n"); + if (!grad) + return InvalidParameter; - return NotImplemented; + return GdipScaleMatrix(grad->transform, sx, sy, order); } GpStatus WINGDIPAPI GdipTranslatePathGradientTransform(GpPathGradient *grad, REAL dx, REAL dy, GpMatrixOrder order) { - static int calls; - TRACE("(%p,%0.2f,%0.2f,%i)\n", grad, dx, dy, order); - if(!(calls++)) - FIXME("not implemented\n"); + if (!grad) + return InvalidParameter; - return NotImplemented; + return GdipTranslateMatrix(grad->transform, dx, dy, order); } GpStatus WINGDIPAPI GdipSetSolidFillColor(GpSolidFill *sf, ARGB argb) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 535ecab..01e8dd7 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -459,7 +459,7 @@ 459 stdcall GdipResetLineTransform(ptr) 460 stdcall GdipResetPageTransform(ptr) 461 stdcall GdipResetPath(ptr) -462 stub GdipResetPathGradientTransform +462 stdcall GdipResetPathGradientTransform(ptr) 463 stdcall GdipResetPenTransform(ptr) 464 stdcall GdipResetTextureTransform(ptr) 465 stdcall GdipResetWorldTransform(ptr)

1 0

Alexander Morozov : advapi32: Regular program should not freeze forever if it calls StartServiceCtrlDispatcher .
by Alexandre Julliard April 4, 2012

April 4, 2012

Module: wine Branch: master Commit: 6d6e6600ef17dd4d18ad3f2e3d3c20f296fe1e53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d6e6600ef17dd4d18ad3f2e3… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Fri Mar 30 20:04:01 2012 +0400 advapi32: Regular program should not freeze forever if it calls StartServiceCtrlDispatcher. --- dlls/advapi32/service.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 025d6c9..0e5001a 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -242,7 +242,7 @@ static HANDLE service_open_pipe(void) break; if (GetLastError() != ERROR_PIPE_BUSY) break; - } while (WaitNamedPipeW(szPipe, NMPWAIT_WAIT_FOREVER)); + } while (WaitNamedPipeW(szPipe, NMPWAIT_USE_DEFAULT_WAIT)); HeapFree(GetProcessHeap(), 0, szPipe); return handle; @@ -366,7 +366,7 @@ static DWORD WINAPI service_control_dispatcher(LPVOID arg) if (pipe==INVALID_HANDLE_VALUE) { - ERR("failed to create control pipe error = %d\n", GetLastError()); + WARN("failed to create control pipe error = %d\n", GetLastError()); return 0; }

1 0

Jacek Caban : mshtml: Added IHTMLWindow2::onerror semi-stub implementation.
by Alexandre Julliard April 4, 2012

April 4, 2012

Module: wine Branch: master Commit: e370f4bf3a113d253b9fc85e3bac72975b9a6bb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e370f4bf3a113d253b9fc85e3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 4 15:08:38 2012 +0200 mshtml: Added IHTMLWindow2::onerror semi-stub implementation. --- dlls/mshtml/htmlevent.c | 5 +++++ dlls/mshtml/htmlevent.h | 1 + dlls/mshtml/htmlwindow.c | 12 ++++++++---- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index cf2d808..cfba560 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -68,6 +68,9 @@ static const WCHAR ondragW[] = {'o','n','d','r','a','g',0}; static const WCHAR dragstartW[] = {'d','r','a','g','s','t','a','r','t',0}; static const WCHAR ondragstartW[] = {'o','n','d','r','a','g','s','t','a','r','t',0}; +static const WCHAR errorW[] = {'e','r','r','o','r',0}; +static const WCHAR onerrorW[] = {'o','n','e','r','r','o','r',0}; + static const WCHAR focusW[] = {'f','o','c','u','s',0}; static const WCHAR onfocusW[] = {'o','n','f','o','c','u','s',0}; @@ -160,6 +163,8 @@ static const event_info_t event_info[] = { EVENT_CANCELABLE}, {dragstartW, ondragstartW, EVENTT_MOUSE, DISPID_EVMETH_ONDRAGSTART, EVENT_CANCELABLE}, + {errorW, onerrorW, EVENTT_NONE, DISPID_EVMETH_ONERROR, + 0}, {focusW, onfocusW, EVENTT_HTML, DISPID_EVMETH_ONFOCUS, EVENT_DEFAULTLISTENER}, {keydownW, onkeydownW, EVENTT_KEY, DISPID_EVMETH_ONKEYDOWN, diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index b3ff251..70056b3 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -25,6 +25,7 @@ typedef enum { EVENTID_DBLCLICK, EVENTID_DRAG, EVENTID_DRAGSTART, + EVENTID_ERROR, EVENTID_FOCUS, EVENTID_KEYDOWN, EVENTID_KEYUP, diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 2bd5d7e..294f551 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -971,15 +971,19 @@ static HRESULT WINAPI HTMLWindow2_get_onhelp(IHTMLWindow2 *iface, VARIANT *p) static HRESULT WINAPI HTMLWindow2_put_onerror(IHTMLWindow2 *iface, VARIANT v) { HTMLWindow *This = impl_from_IHTMLWindow2(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + + FIXME("(%p)->(%s) semi-stub\n", This, debugstr_variant(&v)); + + return set_window_event(This, EVENTID_ERROR, &v); } static HRESULT WINAPI HTMLWindow2_get_onerror(IHTMLWindow2 *iface, VARIANT *p) { HTMLWindow *This = impl_from_IHTMLWindow2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_window_event(This, EVENTID_ERROR, p); } static HRESULT WINAPI HTMLWindow2_put_onresize(IHTMLWindow2 *iface, VARIANT v)

1 0