October 2017 - Wine-commits

Piotr Caban : msvcrt: Don' t define type_info structures as const so we can set demangled class name.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: master Commit: 7274ed63e2165f3d0c500660aa4d89a57d89f3d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7274ed63e2165f3d0c500660a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Oct 20 13:02:19 2017 +0200 msvcrt: Don't define type_info structures as const so we can set demangled class name. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/cxx.h | 4 ++-- dlls/msvcrt/cxx.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/cxx.h b/dlls/msvcp90/cxx.h index ddf9421..3da510e 100644 --- a/dlls/msvcp90/cxx.h +++ b/dlls/msvcp90/cxx.h @@ -68,7 +68,7 @@ #ifndef __x86_64__ #define DEFINE_RTTI_DATA(name, off, base_classes_no, cl1, cl2, cl3, cl4, cl5, cl6, cl7, cl8, cl9, mangled_name) \ - static const type_info name ## _type_info = { \ + static type_info name ## _type_info = { \ &MSVCP_type_info_vtable, \ NULL, \ mangled_name \ @@ -140,7 +140,7 @@ static const cxx_exception_type type ## _cxx_type = { \ #else #define DEFINE_RTTI_DATA(name, off, base_classes_no, cl1, cl2, cl3, cl4, cl5, cl6, cl7, cl8, cl9, mangled_name) \ - static const type_info name ## _type_info = { \ + static type_info name ## _type_info = { \ &MSVCP_type_info_vtable, \ NULL, \ mangled_name \ diff --git a/dlls/msvcrt/cxx.h b/dlls/msvcrt/cxx.h index 50bf7ca..027026e 100644 --- a/dlls/msvcrt/cxx.h +++ b/dlls/msvcrt/cxx.h @@ -67,7 +67,7 @@ #ifndef __x86_64__ #define DEFINE_RTTI_DATA(name, off, base_classes_no, cl1, cl2, cl3, cl4, cl5, cl6, cl7, cl8, cl9, mangled_name) \ - static const type_info name ## _type_info = { \ + static type_info name ## _type_info = { \ &MSVCRT_type_info_vtable, \ NULL, \ mangled_name \ @@ -113,7 +113,7 @@ const rtti_object_locator name ## _rtti = { \ #else #define DEFINE_RTTI_DATA(name, off, base_classes_no, cl1, cl2, cl3, cl4, cl5, cl6, cl7, cl8, cl9, mangled_name) \ - static const type_info name ## _type_info = { \ + static type_info name ## _type_info = { \ &MSVCRT_type_info_vtable, \ NULL, \ mangled_name \

1 0

Daniel Lehman : msvcp120: Implement concurrent_vector:: _Internal_throw_exception.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: master Commit: 237788a56e54c1b9e58d7aa269d2b201e061380b URL: http://source.winehq.org/git/wine.git/?a=commit;h=237788a56e54c1b9e58d7aa26… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Oct 20 13:02:23 2017 +0200 msvcp120: Implement concurrent_vector::_Internal_throw_exception. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/concrt140/concrt140.spec | 4 ++-- dlls/msvcp100/msvcp100.spec | 4 ++-- dlls/msvcp110/msvcp110.spec | 6 +++--- dlls/msvcp120/msvcp120.spec | 6 +++--- dlls/msvcp120_app/msvcp120_app.spec | 6 +++--- dlls/msvcp90/misc.c | 20 ++++++++++++++++++++ 6 files changed, 33 insertions(+), 13 deletions(-) diff --git a/dlls/concrt140/concrt140.spec b/dlls/concrt140/concrt140.spec index eb0c9fb..0f96d7e 100644 --- a/dlls/concrt140/concrt140.spec +++ b/dlls/concrt140/concrt140.spec @@ -385,8 +385,8 @@ @ stub -arch=win64 ?_Internal_swap(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEAAXAEAV123@@Z @ stub -arch=i386 ?_Internal_throw_exception(a)_Concurrent_queue_base_v4@details(a)Concurrency@@IBEXXZ @ stub -arch=win64 ?_Internal_throw_exception(a)_Concurrent_queue_base_v4@details(a)Concurrency@@IEBAXXZ -@ stub -arch=i386 ?_Internal_throw_exception(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IBEXI(a)Z -@ stub -arch=win64 ?_Internal_throw_exception(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEBAX_K(a)Z +@ thiscall -arch=i386 ?_Internal_throw_exception(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IBEXI(a)Z(ptr long) msvcp120.?_Internal_throw_exception(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IBEXI(a)Z +@ cdecl -arch=win64 ?_Internal_throw_exception(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEBAX_K(a)Z(ptr long) msvcp120.?_Internal_throw_exception(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEBAX_K(a)Z @ stub -arch=i386 ?_IsCanceling(a)_StructuredTaskCollection@details(a)Concurrency@@QAE_NXZ @ stub -arch=win64 ?_IsCanceling(a)_StructuredTaskCollection@details(a)Concurrency@@QEAA_NXZ @ stub -arch=i386 ?_IsCanceling(a)_TaskCollection@details(a)Concurrency@@QAE_NXZ diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index 8bffda2..d557a4a 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -1061,8 +1061,8 @@ @ stub -arch=win64 ?_Internal_swap(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEAAXAEAV123@@Z @ stub -arch=win32 ?_Internal_throw_exception(a)_Concurrent_queue_base_v4@details(a)Concurrency@@IBEXXZ @ stub -arch=win64 ?_Internal_throw_exception(a)_Concurrent_queue_base_v4@details(a)Concurrency@@IEBAXXZ -@ stub -arch=win32 ?_Internal_throw_exception(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IBEXI(a)Z -@ stub -arch=win64 ?_Internal_throw_exception(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEBAX_K(a)Z +@ thiscall -arch=win32 ?_Internal_throw_exception(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IBEXI(a)Z(ptr long) _vector_base_v4__Internal_throw_exception +@ cdecl -arch=win64 ?_Internal_throw_exception(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEBAX_K(a)Z(ptr long) _vector_base_v4__Internal_throw_exception @ cdecl -arch=win32 ?_Ios_base_dtor(a)ios_base@std@@CAXPAV12@@Z(ptr) ios_base_Ios_base_dtor @ cdecl -arch=win64 ?_Ios_base_dtor(a)ios_base@std@@CAXPEAV12@@Z(ptr) ios_base_Ios_base_dtor @ thiscall -arch=win32 ?_Ipfx@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAE_N_N(a)Z(ptr long) basic_istream_char__Ipfx diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index c912202..aa8adaf 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -1539,9 +1539,9 @@ @ stub -arch=arm ?_Internal_throw_exception(a)_Concurrent_queue_base_v4@details(a)Concurrency@@IBAXXZ @ stub -arch=i386 ?_Internal_throw_exception(a)_Concurrent_queue_base_v4@details(a)Concurrency@@IBEXXZ @ stub -arch=win64 ?_Internal_throw_exception(a)_Concurrent_queue_base_v4@details(a)Concurrency@@IEBAXXZ -@ stub -arch=arm ?_Internal_throw_exception(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IBAXI(a)Z -@ stub -arch=i386 ?_Internal_throw_exception(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IBEXI(a)Z -@ stub -arch=win64 ?_Internal_throw_exception(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEBAX_K(a)Z +@ cdecl -arch=arm ?_Internal_throw_exception(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IBAXI(a)Z(ptr long) _vector_base_v4__Internal_throw_exception +@ thiscall -arch=i386 ?_Internal_throw_exception(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IBEXI(a)Z(ptr long) _vector_base_v4__Internal_throw_exception +@ cdecl -arch=win64 ?_Internal_throw_exception(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEBAX_K(a)Z(ptr long) _vector_base_v4__Internal_throw_exception @ cdecl -arch=win32 ?_Ios_base_dtor(a)ios_base@std@@CAXPAV12@@Z(ptr) ios_base_Ios_base_dtor @ cdecl -arch=win64 ?_Ios_base_dtor(a)ios_base@std@@CAXPEAV12@@Z(ptr) ios_base_Ios_base_dtor @ cdecl -arch=arm ?_Ipfx@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAA_N_N(a)Z(ptr long) basic_istream_char__Ipfx diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index 61d7c7d..e26e3cb 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -1500,9 +1500,9 @@ @ stub -arch=arm ?_Internal_throw_exception(a)_Concurrent_queue_base_v4@details(a)Concurrency@@IBAXXZ @ stub -arch=i386 ?_Internal_throw_exception(a)_Concurrent_queue_base_v4@details(a)Concurrency@@IBEXXZ @ stub -arch=win64 ?_Internal_throw_exception(a)_Concurrent_queue_base_v4@details(a)Concurrency@@IEBAXXZ -@ stub -arch=arm ?_Internal_throw_exception(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IBAXI(a)Z -@ stub -arch=i386 ?_Internal_throw_exception(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IBEXI(a)Z -@ stub -arch=win64 ?_Internal_throw_exception(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEBAX_K(a)Z +@ cdecl -arch=arm ?_Internal_throw_exception(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IBAXI(a)Z(ptr long) _vector_base_v4__Internal_throw_exception +@ thiscall -arch=i386 ?_Internal_throw_exception(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IBEXI(a)Z(ptr long) _vector_base_v4__Internal_throw_exception +@ cdecl -arch=win64 ?_Internal_throw_exception(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEBAX_K(a)Z(ptr long) _vector_base_v4__Internal_throw_exception @ cdecl -arch=win32 ?_Ios_base_dtor(a)ios_base@std@@CAXPAV12@@Z(ptr) ios_base_Ios_base_dtor @ cdecl -arch=win64 ?_Ios_base_dtor(a)ios_base@std@@CAXPEAV12@@Z(ptr) ios_base_Ios_base_dtor @ cdecl -arch=arm ?_Ipfx@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAA_N_N(a)Z(ptr long) basic_istream_char__Ipfx diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index e63b3f7..03df113 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -1500,9 +1500,9 @@ @ stub -arch=arm ?_Internal_throw_exception(a)_Concurrent_queue_base_v4@details(a)Concurrency@@IBAXXZ @ stub -arch=i386 ?_Internal_throw_exception(a)_Concurrent_queue_base_v4@details(a)Concurrency@@IBEXXZ @ stub -arch=win64 ?_Internal_throw_exception(a)_Concurrent_queue_base_v4@details(a)Concurrency@@IEBAXXZ -@ stub -arch=arm ?_Internal_throw_exception(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IBAXI(a)Z -@ stub -arch=i386 ?_Internal_throw_exception(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IBEXI(a)Z -@ stub -arch=win64 ?_Internal_throw_exception(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEBAX_K(a)Z +@ cdecl -arch=arm ?_Internal_throw_exception(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IBAXI(a)Z(ptr long) msvcp120.?_Internal_throw_exception(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IBAXI(a)Z +@ thiscall -arch=i386 ?_Internal_throw_exception(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IBEXI(a)Z(ptr long) msvcp120.?_Internal_throw_exception(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IBEXI(a)Z +@ cdecl -arch=win64 ?_Internal_throw_exception(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEBAX_K(a)Z(ptr long) msvcp120.?_Internal_throw_exception(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEBAX_K(a)Z @ cdecl -arch=win32 ?_Ios_base_dtor(a)ios_base@std@@CAXPAV12@@Z(ptr) msvcp120.?_Ios_base_dtor(a)ios_base@std@@CAXPAV12@@Z @ cdecl -arch=win64 ?_Ios_base_dtor(a)ios_base@std@@CAXPEAV12@@Z(ptr) msvcp120.?_Ios_base_dtor(a)ios_base@std@@CAXPEAV12@@Z @ cdecl -arch=arm ?_Ipfx@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAA_N_N(a)Z(ptr long) msvcp120.?_Ipfx@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAA_N_N(a)Z diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 9f26a48..901930b 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1702,4 +1702,24 @@ MSVCP_size_t __cdecl _vector_base_v4__Segment_index_of(MSVCP_size_t x) return log2i(x); } + +/* ?_Internal_throw_exception(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IBEXI(a)Z */ +/* ?_Internal_throw_exception(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEBAX_K(a)Z */ +DEFINE_THISCALL_WRAPPER(_vector_base_v4__Internal_throw_exception, 8) +void __thiscall _vector_base_v4__Internal_throw_exception(void/*_vector_base_v4*/ *this, MSVCP_size_t idx) +{ + static const struct { + exception_type type; + const char *msg; + } exceptions[] = { + { EXCEPTION_OUT_OF_RANGE, "Index out of range" }, + { EXCEPTION_OUT_OF_RANGE, "Index out of segments table range" }, + { EXCEPTION_RANGE_ERROR, "Index is inside segment which failed to be allocated" }, + }; + + TRACE("(%p %lu)\n", this, idx); + + if(idx < sizeof(exceptions)/sizeof(exceptions[0])) + throw_exception(exceptions[idx].type, exceptions[idx].msg); +} #endif

1 0

Piotr Caban : msvcp: Fix logic_error and runtime_error class layout if _MSVCP_VER>90.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: master Commit: 818d20adb50fb74d468326a86f538b1aa45b4abe URL: http://source.winehq.org/git/wine.git/?a=commit;h=818d20adb50fb74d468326a86… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Oct 20 13:02:30 2017 +0200 msvcp: Fix logic_error and runtime_error class layout if _MSVCP_VER>90. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/exception.c | 40 ++++++++++++++++++++++++---------------- 1 file changed, 24 insertions(+), 16 deletions(-) diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index e62dfae..4e2dda6 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -297,7 +297,7 @@ DEFINE_CXX_DATA1(bad_alloc, &exception_cxx_type_info, MSVCP_bad_alloc_dtor) /* logic_error class data */ typedef struct { exception e; -#ifndef _MSVCIRT +#if _MSVCP_VER <= 90 && !defined _MSVCIRT basic_string_char str; #endif } logic_error; @@ -308,12 +308,15 @@ DEFINE_THISCALL_WRAPPER(MSVCP_logic_error_ctor, 8) logic_error* __thiscall MSVCP_logic_error_ctor( logic_error *this, exception_name name ) { TRACE("%p %s\n", this, EXCEPTION_STR(name)); -#ifdef _MSVCIRT - MSVCP_exception_ctor(&this->e, name); +#if _MSVCP_VER <= 90 && !defined _MSVCIRT +#if _MSVCP_VER == 60 + MSVCP_exception_ctor(&this->e, ""); #else - this->e.name = NULL; - this->e.do_free = FALSE; + MSVCP_exception_ctor(&this->e, NULL); +#endif MSVCP_basic_string_char_ctor_cstr(&this->str, EXCEPTION_STR(name)); +#else + MSVCP_exception_ctor(&this->e, name); #endif this->e.vtable = &MSVCP_logic_error_vtable; return this; @@ -327,7 +330,7 @@ logic_error* __thiscall MSVCP_logic_error_copy_ctor( { TRACE("%p %p\n", this, rhs); MSVCP_exception_copy_ctor(&this->e, &rhs->e); -#ifndef _MSVCIRT +#if _MSVCP_VER <= 90 && !defined _MSVCIRT MSVCP_basic_string_char_copy_ctor(&this->str, &rhs->str); #endif this->e.vtable = &MSVCP_logic_error_vtable; @@ -357,7 +360,7 @@ void __thiscall MSVCP_logic_error_dtor(logic_error *this) { TRACE("%p\n", this); MSVCP_exception_dtor(&this->e); -#ifndef _MSVCIRT +#if _MSVCP_VER <= 90 && !defined _MSVCIRT MSVCP_basic_string_char_dtor(&this->str); #endif } @@ -408,7 +411,7 @@ DEFINE_THISCALL_WRAPPER(MSVCP_logic_error_what, 4) const char* __thiscall MSVCP_logic_error_what(logic_error *this) { TRACE("%p\n", this); -#ifdef _MSVCIRT +#if _MSVCP_VER > 90 || defined _MSVCIRT return MSVCP_exception_what( &this->e ); #else return MSVCP_basic_string_char_c_str(&this->str); @@ -543,18 +546,23 @@ DEFINE_CXX_DATA2(invalid_argument, &logic_error_cxx_type_info, &exception_cxx_t /* runtime_error class data */ typedef struct { exception e; +#if _MSVCP_VER <= 90 && !defined _MSVCIRT basic_string_char str; +#endif } runtime_error; static runtime_error* MSVCP_runtime_error_ctor( runtime_error *this, exception_name name ) { TRACE("%p %s\n", this, EXCEPTION_STR(name)); -#ifdef _MSVCIRT - MSVCP_exception_ctor(&this->e, name); +#if _MSVCP_VER <= 90 && !defined _MSVCIRT +#if _MSVCP_VER == 60 + MSVCP_exception_ctor(&this->e, ""); #else - this->e.name = NULL; - this->e.do_free = FALSE; + MSVCP_exception_ctor(&this->e, NULL); +#endif MSVCP_basic_string_char_ctor_cstr(&this->str, EXCEPTION_STR(name)); +#else + MSVCP_exception_ctor(&this->e, name); #endif this->e.vtable = &MSVCP_runtime_error_vtable; return this; @@ -568,7 +576,7 @@ runtime_error* __thiscall MSVCP_runtime_error_copy_ctor( { TRACE("%p %p\n", this, rhs); MSVCP_exception_copy_ctor(&this->e, &rhs->e); -#ifndef _MSVCIRT +#if _MSVCP_VER <= 90 && !defined _MSVCIRT MSVCP_basic_string_char_copy_ctor(&this->str, &rhs->str); #endif this->e.vtable = &MSVCP_runtime_error_vtable; @@ -596,7 +604,7 @@ void __thiscall MSVCP_runtime_error_dtor(runtime_error *this) { TRACE("%p\n", this); MSVCP_exception_dtor(&this->e); -#ifndef _MSVCIRT +#if _MSVCP_VER <= 90 && !defined _MSVCIRT MSVCP_basic_string_char_dtor(&this->str); #endif } @@ -637,7 +645,7 @@ DEFINE_THISCALL_WRAPPER(MSVCP_runtime_error_what, 4) const char* __thiscall MSVCP_runtime_error_what(runtime_error *this) { TRACE("%p\n", this); -#ifdef _MSVCIRT +#if _MSVCP_VER > 90 || defined _MSVCIRT return MSVCP_exception_what( &this->e ); #else return MSVCP_basic_string_char_c_str(&this->str); @@ -911,7 +919,7 @@ void __asm_dummy_vtables(void) { VTABLE_ADD_FUNC(MSVCP_exception_what)); EXCEPTION_VTABLE(range_error, VTABLE_ADD_FUNC(MSVCP_runtime_error_vector_dtor) - VTABLE_ADD_FUNC(MSVCP_exception_what)); + VTABLE_ADD_FUNC(MSVCP_runtime_error_what)); #ifndef __GNUC__ } #endif

1 0

Daniel Lehman : msvcirt/tests: Add more exception tests.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: master Commit: daf0172bd935ae0ffc1d89610c2829c7d7af8607 URL: http://source.winehq.org/git/wine.git/?a=commit;h=daf0172bd935ae0ffc1d89610… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Oct 20 13:02:36 2017 +0200 msvcirt/tests: Add more exception tests. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/tests/msvcirt.c | 63 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 63582e8..61f166b 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -168,6 +168,18 @@ typedef struct { ios base_ios; /* virtually inherited */ } iostream; +/* class exception */ +typedef struct { + const void *vtable; + char *name; + int do_free; +} exception; + +/* class logic_error */ +typedef struct { + exception e; +} logic_error; + static inline float __port_infinity(void) { static const unsigned __inf_bytes = 0x7f800000; @@ -422,6 +434,14 @@ static iostream* (*__thiscall p_stdiostream_assign)(iostream*, const iostream*); /* Iostream_init */ static void* (*__thiscall p_Iostream_init_ios_ctor)(void*, ios*, int); +/* exception */ +static exception* (*__thiscall p_exception_ctor)(exception*, const char**); +static void (*__thiscall p_exception_dtor)(exception*); +static const char* (*__thiscall p_exception_what)(exception*); + +static logic_error* (*__thiscall p_logic_error_ctor)(logic_error*, const char**); +static void (*__thiscall p_logic_error_dtor)(logic_error*); + /* Predefined streams */ static istream *p_cin; static ostream *p_cout, *p_cerr, *p_clog; @@ -710,6 +730,13 @@ static BOOL init(void) SET(p_stdiostream_assign, "??4stdiostream@@QEAAAEAV0(a)AEAV0@@Z"); SET(p_Iostream_init_ios_ctor, "??0Iostream_init@@QEAA(a)AEAVios@@H(a)Z"); + + SET(p_exception_ctor, "??0exception@@QEAA(a)AEBQEBD@Z"); + SET(p_exception_dtor, "??1exception@@UEAA(a)XZ"); + SET(p_exception_what, "?what(a)exception@@UEBAPEBDXZ"); + + SET(p_logic_error_ctor, "??0logic_error@@QEAA(a)AEBQEBD@Z"); + SET(p_logic_error_dtor, "??1logic_error@@UEAA(a)XZ"); } else { p_operator_new = (void*)GetProcAddress(msvcrt, "??2(a)YAPAXI@Z"); p_operator_delete = (void*)GetProcAddress(msvcrt, "??3(a)YAXPAX@Z"); @@ -917,6 +944,13 @@ static BOOL init(void) SET(p_stdiostream_assign, "??4stdiostream@@QAEAAV0(a)AAV0@@Z"); SET(p_Iostream_init_ios_ctor, "??0Iostream_init@@QAE(a)AAVios@@H(a)Z"); + + SET(p_exception_ctor, "??0exception@@QAE(a)ABQBD@Z"); + SET(p_exception_dtor, "??1exception@@UAE(a)XZ"); + SET(p_exception_what, "?what(a)exception@@UBEPBDXZ"); + + SET(p_logic_error_ctor, "??0logic_error@@QAE(a)ABQBD@Z"); + SET(p_logic_error_dtor, "??1logic_error@@UAE(a)XZ"); } SET(p_ios_static_lock, "?x_lockc(a)ios@@0U_CRT_CRITICAL_SECTION@@A"); SET(p_ios_lockc, "?lockc(a)ios@@KAXXZ"); @@ -7464,6 +7498,34 @@ static void test_std_streams(void) ok(p_cin->count == 0xabababab, "expected %d got %d\n", 0xabababab, p_cin->count); } +static void test_exception(void) +{ + const char *unknown = "Unknown exception"; + const char *test = "test"; + const char *what; + logic_error le; + exception e; + + /* exception */ + memset(&e, 0, sizeof(e)); + what = call_func1(p_exception_what, (void*) &e); + ok(!strcmp(what, unknown), "expected %s got %s\n", unknown, what); + + call_func2(p_exception_ctor, (void*) &e, &test); + what = call_func1(p_exception_what, (void*) &e); + ok(!strcmp(what, test), "expected %s got %s\n", test, what); + call_func1(p_exception_dtor, (void*) &e); + + /* logic_error */ + memset(&le, 0xff, sizeof(le)); + call_func2(p_logic_error_ctor, (void*) &le, &test); + ok(!strcmp(le.e.name, test), "expected %s got %s\n", test, le.e.name); + ok(le.e.do_free, "expected TRUE, got FALSE\n"); + what = call_func1(p_exception_what, (void*) &le.e); + ok(!strcmp(what, test), "expected %s got %s\n", test, what); + call_func1(p_logic_error_dtor, (void*) &le); +} + START_TEST(msvcirt) { if(!init()) @@ -7489,6 +7551,7 @@ START_TEST(msvcirt) test_stdiostream(); test_Iostream_init(); test_std_streams(); + test_exception(); FreeLibrary(msvcrt); FreeLibrary(msvcirt);

1 0

Daniel Lehman : msvcp60: Only use name for internal string in exception.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: master Commit: 3a4fed1d7346e04b197abc2cb5f31c1c185e474d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a4fed1d7346e04b197abc2cb… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Oct 20 13:02:51 2017 +0200 msvcp60: Only use name for internal string in exception. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp60/tests/string.c | 127 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 127 insertions(+) diff --git a/dlls/msvcp60/tests/string.c b/dlls/msvcp60/tests/string.c index f61ad4a..bf396f7 100644 --- a/dlls/msvcp60/tests/string.c +++ b/dlls/msvcp60/tests/string.c @@ -43,6 +43,29 @@ typedef struct MSVCP_size_t res; } basic_string_wchar; +typedef void (*vtable_ptr)(void); +typedef struct __exception +{ + const vtable_ptr *vtable; + char *name; + int do_free; +} exception; + +typedef struct { + exception e; + basic_string_char str; +} runtime_error; + +typedef struct { + exception e; + basic_string_char str; +} range_error; + +typedef struct { + exception e; + basic_string_char str; +} logic_error; + static basic_string_char* (__cdecl *p_basic_string_char_concatenate)(basic_string_char*, const basic_string_char*, const basic_string_char*); static basic_string_char* (__cdecl *p_basic_string_char_concatenate_cstr)(basic_string_char*, const basic_string_char*, const char*); @@ -86,6 +109,17 @@ static size_t (__thiscall *p_basic_string_wchar_size)(basic_string_wchar*); static size_t (__thiscall *p_basic_string_wchar_capacity)(basic_string_wchar*); static void (__thiscall *p_basic_string_wchar_swap)(basic_string_wchar*, basic_string_wchar*); +static runtime_error* (__thiscall *p_runtime_error_ctor_bstr)(runtime_error*, const basic_string_char*); +static void (__thiscall *p_runtime_error_dtor)(runtime_error*); +static const char *(__thiscall *p_runtime_error_what)(runtime_error*); + +static range_error* (__thiscall *p_range_error_ctor_bstr)(range_error*, const basic_string_char*); +static void (__thiscall *p_range_error_dtor)(range_error*); + +static logic_error* (__thiscall *p_logic_error_ctor_bstr)(logic_error*, const basic_string_char*); +static void (__thiscall *p_logic_error_dtor)(logic_error*); +static const char *(__thiscall *p_logic_error_what)(logic_error*); + /* Emulate a __thiscall */ #ifdef __i386__ @@ -226,6 +260,25 @@ static BOOL init(void) "?capacity@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEBA_KXZ"); SET(p_basic_string_wchar_swap, "?swap@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEAAXAEAV12@@Z"); + + SET(p_runtime_error_ctor_bstr, + "??0runtime_error(a)std@@QEAA(a)AEBV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@1@@Z"); + SET(p_runtime_error_dtor, + "??1runtime_error(a)std@@UEAA(a)XZ"); + SET(p_runtime_error_what, + "?what(a)runtime_error@std@@UEBAPEBDXZ"); + + SET(p_range_error_ctor_bstr, + "??0range_error(a)std@@QEAA(a)AEBV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@1@@Z"); + SET(p_range_error_dtor, + "??1range_error(a)std@@UEAA(a)XZ"); + + SET(p_logic_error_ctor_bstr, + "??0logic_error(a)std@@QEAA(a)AEBV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@1@@Z"); + SET(p_logic_error_dtor, + "??1logic_error(a)std@@UEAA(a)XZ"); + SET(p_logic_error_what, + "?what(a)logic_error@std@@UEBAPEBDXZ"); } else { SET(p_basic_string_char_ctor, "??_F?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEXXZ"); @@ -292,6 +345,25 @@ static BOOL init(void) "?capacity@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QBEIXZ"); SET(p_basic_string_wchar_swap, "?swap@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QAEXAAV12@@Z"); + + SET(p_runtime_error_ctor_bstr, + "??0runtime_error(a)std@@QAE(a)ABV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@1@@Z"); + SET(p_runtime_error_dtor, + "??1runtime_error(a)std@@UAE(a)XZ"); + SET(p_runtime_error_what, + "?what(a)runtime_error@std@@UBEPBDXZ"); + + SET(p_range_error_ctor_bstr, + "??0range_error(a)std@@QAE(a)ABV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@1@@Z"); + SET(p_range_error_dtor, + "??1range_error(a)std@@UAE(a)XZ"); + + SET(p_logic_error_ctor_bstr, + "??0logic_error(a)std@@QAE(a)ABV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@1@@Z"); + SET(p_logic_error_dtor, + "??1logic_error(a)std@@UAE(a)XZ"); + SET(p_logic_error_what, + "?what(a)logic_error@std@@UBEPBDXZ"); } init_thiscall_thunk(); @@ -687,6 +759,59 @@ static void test_basic_string_wchar_swap(void) { call_func1(p_basic_string_wchar_dtor, &str2); } +static void test_exception(void) +{ + const char *name = "test"; + const char *what; + basic_string_char str; + runtime_error re; + range_error ra; + logic_error le; + + call_func3(p_basic_string_char_ctor_cstr_alloc, &str, name, &fake_allocator); + + /* runtime_error */ + memset(&re, 0, sizeof(re)); + what = call_func1(p_runtime_error_what, &re); + ok(!strcmp("", what), "what = %s\n", what); + + memset(&re, 0xff, sizeof(re)); + call_func2(p_runtime_error_ctor_bstr, &re, &str); + ok(!strcmp(re.e.name, ""), "re.e.name = %s\n", re.e.name); + ok(re.e.do_free, "re.e.do_free == FALSE\n"); + what = call_func1(p_runtime_error_what, &re); + ok(!strcmp(name, what), "what = %s\n", what); + call_func1(p_runtime_error_dtor, &re); + + /* range_error */ + memset(&ra, 0, sizeof(ra)); + what = call_func1(p_runtime_error_what, (runtime_error*)&ra); + ok(!strcmp("", what), "what = %s\n", what); + + memset(&ra, 0xff, sizeof(ra)); + call_func2(p_range_error_ctor_bstr, &ra, &str); + ok(!strcmp(ra.e.name, ""), "ra.e.name = %s\n", ra.e.name); + ok(ra.e.do_free, "ra.e.do_free == FALSE\n"); + what = call_func1(p_runtime_error_what, (runtime_error*)&ra); + ok(!strcmp(name, what), "what = %s\n", what); + call_func1(p_range_error_dtor, &ra); + + /* logic_error */ + memset(&le, 0, sizeof(le)); + what = call_func1(p_logic_error_what, &le); + ok(!strcmp("", what), "what = %s\n", what); + + memset(&le, 0xff, sizeof(le)); + call_func2(p_logic_error_ctor_bstr, &le, &str); + ok(!strcmp(le.e.name, ""), "le.e.name = %s\n", le.e.name); + ok(le.e.do_free, "le.e.do_free == FALSE\n"); + what = call_func1(p_logic_error_what, &le); + ok(!strcmp(name, what), "what = %s\n", what); + call_func1(p_logic_error_dtor, &le); + + call_func1(p_basic_string_char_dtor, &str); +} + START_TEST(string) { if(!init()) @@ -703,5 +828,7 @@ START_TEST(string) test_basic_string_wchar(); test_basic_string_wchar_swap(); + test_exception(); + FreeLibrary(msvcp); }

1 0

Jacek Caban : mshtml: Implement IDOMEvent:: preventDefault and use it where appropriate.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: master Commit: d5b0c1d77c7d3e329e2da7ba013bd0f505a752ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5b0c1d77c7d3e329e2da7ba0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 20 15:08:59 2017 +0200 mshtml: Implement IDOMEvent::preventDefault and use it where appropriate. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 33 +++++++++++++++------------------ dlls/mshtml/htmlevent.h | 1 + dlls/mshtml/tests/events.c | 3 +++ 3 files changed, 19 insertions(+), 18 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 00b9524..0e1946b 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -232,7 +232,6 @@ struct HTMLEventObj { const event_info_t *type; DOMEvent *event; VARIANT return_value; - BOOL prevent_default; BOOL cancel_bubble; }; @@ -435,8 +434,8 @@ static HRESULT WINAPI HTMLEventObj_put_returnValue(IHTMLEventObj *iface, VARIANT } This->return_value = v; - if(!V_BOOL(&v)) - This->prevent_default = TRUE; + if(!V_BOOL(&v) && This->event) + IDOMEvent_preventDefault(&This->event->IDOMEvent_iface); return S_OK; } @@ -974,8 +973,12 @@ static HRESULT WINAPI DOMEvent_initEvent(IDOMEvent *iface, BSTR type, VARIANT_BO static HRESULT WINAPI DOMEvent_preventDefault(IDOMEvent *iface) { DOMEvent *This = impl_from_IDOMEvent(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + + TRACE("(%p)\n", This); + + This->prevent_default = TRUE; + nsIDOMEvent_PreventDefault(This->nsevent); + return S_OK; } static HRESULT WINAPI DOMEvent_stopPropagation(IDOMEvent *iface) @@ -1274,7 +1277,7 @@ void call_event_handlers(HTMLEventObj *event_obj, EventTarget *event_target, DOM if(cancelable) { if(V_VT(&v) == VT_BOOL) { if(!V_BOOL(&v)) - event_obj->prevent_default = TRUE; + IDOMEvent_preventDefault(&event->IDOMEvent_iface); }else if(V_VT(&v) != VT_EMPTY) { FIXME("unhandled result %s\n", debugstr_variant(&v)); } @@ -1306,7 +1309,7 @@ void call_event_handlers(HTMLEventObj *event_obj, EventTarget *event_target, DOM if(cancelable) { if(V_VT(&v) == VT_BOOL) { if(!V_BOOL(&v)) - event_obj->prevent_default = TRUE; + IDOMEvent_preventDefault(&event->IDOMEvent_iface); }else if(V_VT(&v) != VT_EMPTY) { FIXME("unhandled result %s\n", debugstr_variant(&v)); } @@ -1346,7 +1349,7 @@ void call_event_handlers(HTMLEventObj *event_obj, EventTarget *event_target, DOM if(cancelable) { if(V_VT(&v) == VT_BOOL) { if(!V_BOOL(&v)) - event_obj->prevent_default = TRUE; + IDOMEvent_preventDefault(&event->IDOMEvent_iface); }else if(V_VT(&v) != VT_EMPTY) { FIXME("unhandled result %s\n", debugstr_variant(&v)); } @@ -1368,7 +1371,6 @@ static void fire_event_obj(EventTarget *event_target, DOMEvent *event, HTMLEvent unsigned chain_cnt, chain_buf_size, i; const event_target_vtbl_t *vtbl, *target_vtbl; IHTMLEventObj *prev_event = NULL; - BOOL prevent_default = FALSE; EventTarget *iter; DWORD event_flags; HRESULT hres; @@ -1430,11 +1432,9 @@ static void fire_event_obj(EventTarget *event_target, DOMEvent *event, HTMLEvent IHTMLEventObj_Release(prev_event); } - if(event_obj && event_obj->prevent_default) - prevent_default = TRUE; - if(event_flags & EVENT_HASDEFAULTHANDLERS) { - for(i = 0; !prevent_default && i < chain_cnt; i++) { + for(i = 0; !event->prevent_default && i < chain_cnt; i++) { + BOOL prevent_default = FALSE; vtbl = dispex_get_vtbl(&target_chain[i]->dispex); if(!vtbl || !vtbl->handle_event_default) continue; @@ -1442,6 +1442,8 @@ static void fire_event_obj(EventTarget *event_target, DOMEvent *event, HTMLEvent event->nsevent, &prevent_default); if(FAILED(hres) || (event_obj && event_obj->cancel_bubble)) break; + if(prevent_default) + IDOMEvent_preventDefault(&event->IDOMEvent_iface); } } @@ -1449,11 +1451,6 @@ static void fire_event_obj(EventTarget *event_target, DOMEvent *event, HTMLEvent IDispatchEx_Release(&target_chain[i]->dispex.IDispatchEx_iface); if(target_chain != target_chain_buf) heap_free(target_chain); - - if(prevent_default) { - TRACE("calling PreventDefault\n"); - nsIDOMEvent_PreventDefault(event->nsevent); - } } void fire_event(HTMLDocumentNode *doc, eventid_t eid, BOOL set_event, EventTarget *target, nsIDOMEvent *nsevent) diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 2230608..1528f91 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -64,6 +64,7 @@ typedef struct { nsIDOMEvent *nsevent; eventid_t event_id; EventTarget *target; + BOOL prevent_default; } DOMEvent; eventid_t str_to_eid(LPCWSTR) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index 228aa04..cc1da62 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -2547,6 +2547,9 @@ static void test_create_event(IHTMLDocument2 *doc) SysFreeString(str); ok(hres == S_OK, "createEvent failed: %08x\n", hres); + hres = IDOMEvent_preventDefault(event); + ok(hres == S_OK, "preventDefault failed: %08x\n", hres); + IDOMEvent_Release(event); IDocumentEvent_Release(doc_event);

1 0

Jacek Caban : mshtml: Implement IDOMEvent:: stopPropagation and use it where appropriate.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: master Commit: aa6882cba86d63ac89d06081e0af69cafd0f2e20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa6882cba86d63ac89d06081e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 20 15:09:05 2017 +0200 mshtml: Implement IDOMEvent::stopPropagation and use it where appropriate. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 19 ++++++++++++------- dlls/mshtml/htmlevent.h | 1 + dlls/mshtml/tests/events.c | 3 +++ 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 0e1946b..02e4363 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -232,7 +232,6 @@ struct HTMLEventObj { const event_info_t *type; DOMEvent *event; VARIANT return_value; - BOOL cancel_bubble; }; static inline HTMLEventObj *impl_from_IHTMLEventObj(IHTMLEventObj *iface) @@ -455,7 +454,8 @@ static HRESULT WINAPI HTMLEventObj_put_cancelBubble(IHTMLEventObj *iface, VARIAN TRACE("(%p)->(%x)\n", This, v); - This->cancel_bubble = !!v; + if(This->event) + IDOMEvent_stopPropagation(&This->event->IDOMEvent_iface); return S_OK; } @@ -465,7 +465,7 @@ static HRESULT WINAPI HTMLEventObj_get_cancelBubble(IHTMLEventObj *iface, VARIAN TRACE("(%p)->(%p)\n", This, p); - *p = This->cancel_bubble ? VARIANT_TRUE : VARIANT_FALSE; + *p = This->event && This->event->stop_propagation ? VARIANT_TRUE : VARIANT_FALSE; return S_OK; } @@ -984,8 +984,13 @@ static HRESULT WINAPI DOMEvent_preventDefault(IDOMEvent *iface) static HRESULT WINAPI DOMEvent_stopPropagation(IDOMEvent *iface) { DOMEvent *This = impl_from_IDOMEvent(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + + TRACE("(%p)\n", This); + + This->stop_propagation = TRUE; + nsIDOMEvent_StopPropagation(This->nsevent); + IDOMEvent_preventDefault(&This->IDOMEvent_iface); + return S_OK; } static HRESULT WINAPI DOMEvent_stopImmediatePropagation(IDOMEvent *iface) @@ -1422,7 +1427,7 @@ static void fire_event_obj(EventTarget *event_target, DOMEvent *event, HTMLEvent for(i = 0; i < chain_cnt; i++) { call_event_handlers(event_obj, target_chain[i], event); - if(!(event_flags & EVENT_BUBBLES) || (event_obj && event_obj->cancel_bubble)) + if(!(event_flags & EVENT_BUBBLES) || event->stop_propagation) break; } @@ -1440,7 +1445,7 @@ static void fire_event_obj(EventTarget *event_target, DOMEvent *event, HTMLEvent continue; hres = vtbl->handle_event_default(&event_target->dispex, event->event_id, event->nsevent, &prevent_default); - if(FAILED(hres) || (event_obj && event_obj->cancel_bubble)) + if(FAILED(hres) || event->stop_propagation) break; if(prevent_default) IDOMEvent_preventDefault(&event->IDOMEvent_iface); diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 1528f91..76b971f 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -65,6 +65,7 @@ typedef struct { eventid_t event_id; EventTarget *target; BOOL prevent_default; + BOOL stop_propagation; } DOMEvent; eventid_t str_to_eid(LPCWSTR) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index cc1da62..84a35f3 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -2550,6 +2550,9 @@ static void test_create_event(IHTMLDocument2 *doc) hres = IDOMEvent_preventDefault(event); ok(hres == S_OK, "preventDefault failed: %08x\n", hres); + hres = IDOMEvent_stopPropagation(event); + ok(hres == S_OK, "stopPropagation failed: %08x\n", hres); + IDOMEvent_Release(event); IDocumentEvent_Release(doc_event);

1 0

Jacek Caban : mshtml: Store current IHTMLEventObj in DOMEvent and create it in fire_event_obj if needed.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: master Commit: aaa576463c0caf015bdd3f8bff9f92f27ce44351 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aaa576463c0caf015bdd3f8bf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 20 15:09:15 2017 +0200 mshtml: Store current IHTMLEventObj in DOMEvent and create it in fire_event_obj if needed. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 59 +++++++++++++++++++++++++------------------- dlls/mshtml/htmlevent.h | 6 +++-- dlls/mshtml/xmlhttprequest.c | 3 ++- 3 files changed, 39 insertions(+), 29 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 02e4363..6314b14 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -223,7 +223,7 @@ static eventid_t attr_to_eid(const WCHAR *str) return EVENTID_LAST; } -struct HTMLEventObj { +typedef struct { DispatchEx dispex; IHTMLEventObj IHTMLEventObj_iface; @@ -232,7 +232,7 @@ struct HTMLEventObj { const event_info_t *type; DOMEvent *event; VARIANT return_value; -}; +} HTMLEventObj; static inline HTMLEventObj *impl_from_IHTMLEventObj(IHTMLEventObj *iface) { @@ -1204,7 +1204,7 @@ static HRESULT call_disp_func(IDispatch *disp, DISPPARAMS *dp, VARIANT *retv) return hres; } -static HRESULT call_cp_func(IDispatch *disp, DISPID dispid, HTMLEventObj *event_obj, VARIANT *retv) +static HRESULT call_cp_func(IDispatch *disp, DISPID dispid, IHTMLEventObj *event_obj, VARIANT *retv) { DISPPARAMS dp = {NULL,NULL,0,0}; VARIANT event_arg; @@ -1213,7 +1213,7 @@ static HRESULT call_cp_func(IDispatch *disp, DISPID dispid, HTMLEventObj *event_ if(event_obj) { V_VT(&event_arg) = VT_DISPATCH; - V_DISPATCH(&event_arg) = (IDispatch*)&event_obj->IHTMLEventObj_iface; + V_DISPATCH(&event_arg) = (IDispatch*)event_obj; dp.rgvarg = &event_arg; dp.cArgs = 1; } @@ -1252,7 +1252,7 @@ static BOOL is_cp_event(cp_static_data_t *data, DISPID dispid) return FALSE; } -void call_event_handlers(HTMLEventObj *event_obj, EventTarget *event_target, DOMEvent *event) +void call_event_handlers(EventTarget *event_target, DOMEvent *event) { const eventid_t eid = event->event_id; handler_vector_t *handler_vector = get_handler_vector(event_target, eid, FALSE); @@ -1299,7 +1299,7 @@ void call_event_handlers(HTMLEventObj *event_obj, EventTarget *event_target, DOM int i; V_VT(&arg) = VT_DISPATCH; - V_DISPATCH(&arg) = (IDispatch*)&event_obj->dispex.IDispatchEx_iface; + V_DISPATCH(&arg) = (IDispatch*)event->event_obj; i = handler_vector->handler_cnt; while(i--) { @@ -1347,7 +1347,7 @@ void call_event_handlers(HTMLEventObj *event_obj, EventTarget *event_target, DOM TRACE("cp %s [%u] >>>\n", debugstr_w(event_info[eid].name), i); hres = call_cp_func(cp->sinks[i].disp, event_info[eid].dispid, - cp->data->pass_event_arg ? event_obj : NULL, &v); + cp->data->pass_event_arg ? event->event_obj : NULL, &v); if(hres == S_OK) { TRACE("cp %s [%u] <<<\n", debugstr_w(event_info[eid].name), i); @@ -1370,11 +1370,12 @@ void call_event_handlers(HTMLEventObj *event_obj, EventTarget *event_target, DOM } } -static void fire_event_obj(EventTarget *event_target, DOMEvent *event, HTMLEventObj *event_obj) +static void fire_event_obj(EventTarget *event_target, DOMEvent *event) { EventTarget *target_chain_buf[8], **target_chain = target_chain_buf; unsigned chain_cnt, chain_buf_size, i; const event_target_vtbl_t *vtbl, *target_vtbl; + HTMLEventObj *event_obj_ref = NULL; IHTMLEventObj *prev_event = NULL; EventTarget *iter; DWORD event_flags; @@ -1418,15 +1419,23 @@ static void fire_event_obj(EventTarget *event_target, DOMEvent *event, HTMLEvent iter = vtbl->get_parent_event_target(&iter->dispex); } while(iter); + if(!event->event_obj && !event->no_event_obj) { + event_obj_ref = alloc_event_obj(event); + if(event_obj_ref) { + event_obj_ref->type = event_info + event->event_id; + event->event_obj = &event_obj_ref->IHTMLEventObj_iface; + } + } + target_vtbl = dispex_get_vtbl(&event_target->dispex); if(target_vtbl && target_vtbl->set_current_event) - prev_event = target_vtbl->set_current_event(&event_target->dispex, event_obj ? &event_obj->IHTMLEventObj_iface : NULL); + prev_event = target_vtbl->set_current_event(&event_target->dispex, event->event_obj); event->target = event_target; IDispatchEx_AddRef(&event_target->dispex.IDispatchEx_iface); for(i = 0; i < chain_cnt; i++) { - call_event_handlers(event_obj, target_chain[i], event); + call_event_handlers(target_chain[i], event); if(!(event_flags & EVENT_BUBBLES) || event->stop_propagation) break; } @@ -1452,6 +1461,11 @@ static void fire_event_obj(EventTarget *event_target, DOMEvent *event, HTMLEvent } } + if(event_obj_ref) { + event->event_obj = NULL; + IHTMLEventObj_Release(&event_obj_ref->IHTMLEventObj_iface); + } + for(i = 0; i < chain_cnt; i++) IDispatchEx_Release(&target_chain[i]->dispex.IDispatchEx_iface); if(target_chain != target_chain_buf) @@ -1460,7 +1474,6 @@ static void fire_event_obj(EventTarget *event_target, DOMEvent *event, HTMLEvent void fire_event(HTMLDocumentNode *doc, eventid_t eid, BOOL set_event, EventTarget *target, nsIDOMEvent *nsevent) { - HTMLEventObj *event_obj = NULL; DOMEvent *event; HRESULT hres; @@ -1471,19 +1484,11 @@ void fire_event(HTMLDocumentNode *doc, eventid_t eid, BOOL set_event, EventTarge if(FAILED(hres)) return; - if(set_event) { - event_obj = alloc_event_obj(event); - if(!event_obj) { - IDOMEvent_Release(&event->IDOMEvent_iface); - return; - } - event_obj->type = event_info + eid; - } + if(!set_event) + event->no_event_obj = TRUE; - fire_event_obj(target, event, event_obj); + fire_event_obj(target, event); - if(event_obj) - IHTMLEventObj_Release(&event_obj->IHTMLEventObj_iface); IDOMEvent_Release(&event->IDOMEvent_iface); } @@ -1533,11 +1538,13 @@ HRESULT dispatch_event(HTMLDOMNode *node, const WCHAR *event_name, VARIANT *even if(!event_obj->event) hres = create_document_event(node->doc, eid, &event_obj->event); - if(SUCCEEDED(hres)) - fire_event_obj(&node->event_target, event_obj->event, event_obj); + if(SUCCEEDED(hres)) { + event_obj->event->event_obj = &event_obj->IHTMLEventObj_iface; + fire_event_obj(&node->event_target, event_obj->event); + event_obj->event->event_obj = NULL; + } - if(event_obj) - IHTMLEventObj_Release(&event_obj->IHTMLEventObj_iface); + IHTMLEventObj_Release(&event_obj->IHTMLEventObj_iface); if(FAILED(hres)) return hres; diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 76b971f..f348076 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -66,6 +66,9 @@ typedef struct { EventTarget *target; BOOL prevent_default; BOOL stop_propagation; + + IHTMLEventObj *event_obj; + BOOL no_event_obj; } DOMEvent; eventid_t str_to_eid(LPCWSTR) DECLSPEC_HIDDEN; @@ -84,8 +87,7 @@ HRESULT create_event_obj(IHTMLEventObj**) DECLSPEC_HIDDEN; void bind_target_event(HTMLDocumentNode*,EventTarget*,const WCHAR*,IDispatch*) DECLSPEC_HIDDEN; HRESULT ensure_doc_nsevent_handler(HTMLDocumentNode*,eventid_t) DECLSPEC_HIDDEN; -typedef struct HTMLEventObj HTMLEventObj; -void call_event_handlers(HTMLEventObj*,EventTarget*,DOMEvent*); +void call_event_handlers(EventTarget*,DOMEvent*); HRESULT create_document_event_str(HTMLDocumentNode*,const WCHAR*,IDOMEvent**) DECLSPEC_HIDDEN; HRESULT create_event_from_nsevent(nsIDOMEvent*,DOMEvent**) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c index 1563870..cc7a5e0 100644 --- a/dlls/mshtml/xmlhttprequest.c +++ b/dlls/mshtml/xmlhttprequest.c @@ -194,7 +194,8 @@ static nsresult NSAPI XMLHttpReqEventListener_HandleEvent(nsIDOMEventListener *i hres = create_event_from_nsevent(nsevent, &event); if(SUCCEEDED(hres) ){ - call_event_handlers(NULL, &This->xhr->event_target, event); + event->no_event_obj = TRUE; + call_event_handlers(&This->xhr->event_target, event); IDOMEvent_Release(&event->IDOMEvent_iface); } return NS_OK;

1 0

Jacek Caban : mshtml: Use fire_event_obj to dispatch XHR readystatechange event.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: master Commit: 62e76f1847f648a4973fec72c7c8345782366a59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62e76f1847f648a4973fec72c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 20 15:09:20 2017 +0200 mshtml: Use fire_event_obj to dispatch XHR readystatechange event. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 4 ++-- dlls/mshtml/htmlevent.h | 2 +- dlls/mshtml/xmlhttprequest.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 6314b14..352121b 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1252,7 +1252,7 @@ static BOOL is_cp_event(cp_static_data_t *data, DISPID dispid) return FALSE; } -void call_event_handlers(EventTarget *event_target, DOMEvent *event) +static void call_event_handlers(EventTarget *event_target, DOMEvent *event) { const eventid_t eid = event->event_id; handler_vector_t *handler_vector = get_handler_vector(event_target, eid, FALSE); @@ -1370,7 +1370,7 @@ void call_event_handlers(EventTarget *event_target, DOMEvent *event) } } -static void fire_event_obj(EventTarget *event_target, DOMEvent *event) +void fire_event_obj(EventTarget *event_target, DOMEvent *event) { EventTarget *target_chain_buf[8], **target_chain = target_chain_buf; unsigned chain_cnt, chain_buf_size, i; diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index f348076..8c26c38 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -87,7 +87,7 @@ HRESULT create_event_obj(IHTMLEventObj**) DECLSPEC_HIDDEN; void bind_target_event(HTMLDocumentNode*,EventTarget*,const WCHAR*,IDispatch*) DECLSPEC_HIDDEN; HRESULT ensure_doc_nsevent_handler(HTMLDocumentNode*,eventid_t) DECLSPEC_HIDDEN; -void call_event_handlers(EventTarget*,DOMEvent*); +void fire_event_obj(EventTarget*,DOMEvent*) DECLSPEC_HIDDEN; HRESULT create_document_event_str(HTMLDocumentNode*,const WCHAR*,IDOMEvent**) DECLSPEC_HIDDEN; HRESULT create_event_from_nsevent(nsIDOMEvent*,DOMEvent**) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c index cc7a5e0..455bbfb 100644 --- a/dlls/mshtml/xmlhttprequest.c +++ b/dlls/mshtml/xmlhttprequest.c @@ -195,7 +195,7 @@ static nsresult NSAPI XMLHttpReqEventListener_HandleEvent(nsIDOMEventListener *i hres = create_event_from_nsevent(nsevent, &event); if(SUCCEEDED(hres) ){ event->no_event_obj = TRUE; - call_event_handlers(&This->xhr->event_target, event); + fire_event_obj(&This->xhr->event_target, event); IDOMEvent_Release(&event->IDOMEvent_iface); } return NS_OK;

1 0

Jacek Caban : mshtml: Don't use fire_event to dispatch contextmenu event.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: master Commit: 6bf1250b826b3ee16e12d6ff29edda8f354e9e52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bf1250b826b3ee16e12d6ff2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 20 15:09:29 2017 +0200 mshtml: Don't use fire_event to dispatch contextmenu event. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/nsembed.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index bb4f122..c811a0f 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -1486,8 +1486,9 @@ static nsresult NSAPI nsContextMenuListener_OnShowContextMenu(nsIContextMenuList UINT32 aContextFlags, nsIDOMEvent *aEvent, nsIDOMNode *aNode) { NSContainer *This = impl_from_nsIContextMenuListener(iface); - nsIDOMMouseEvent *event; + nsIDOMMouseEvent *mouse_event; HTMLDOMNode *node; + DOMEvent *event; POINT pt; DWORD dwID = CONTEXT_MENU_DEFAULT; nsresult nsres; @@ -1499,14 +1500,18 @@ static nsresult NSAPI nsContextMenuListener_OnShowContextMenu(nsIContextMenuList if(FAILED(hres)) return NS_ERROR_FAILURE; - fire_event(This->doc->basedoc.doc_node /* FIXME */, EVENTID_CONTEXTMENU, TRUE, &node->event_target, aEvent); + hres = create_event_from_nsevent(aEvent, &event); + if(SUCCEEDED(hres)) { + fire_event_obj(&node->event_target, event); + IDOMEvent_Release(&event->IDOMEvent_iface); + } - nsres = nsIDOMEvent_QueryInterface(aEvent, &IID_nsIDOMMouseEvent, (void**)&event); + nsres = nsIDOMEvent_QueryInterface(aEvent, &IID_nsIDOMMouseEvent, (void**)&mouse_event); assert(NS_SUCCEEDED(nsres)); - nsIDOMMouseEvent_GetScreenX(event, &pt.x); - nsIDOMMouseEvent_GetScreenY(event, &pt.y); - nsIDOMMouseEvent_Release(event); + nsIDOMMouseEvent_GetScreenX(mouse_event, &pt.x); + nsIDOMMouseEvent_GetScreenY(mouse_event, &pt.y); + nsIDOMMouseEvent_Release(mouse_event); switch(aContextFlags) { case CONTEXT_NONE:

1 0