wine-commits October 2017

wine-commits@winehq.org

2 participants
478 discussions

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@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEBA_KXZ"); SET(p_basic_string_wchar_swap, "?swap@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEAAXAEAV12@@Z"); + + SET(p_runtime_error_ctor_bstr, + "??0runtime_error@std@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@1@@Z"); + SET(p_runtime_error_dtor, + "??1runtime_error@std@@UEAA@XZ"); + SET(p_runtime_error_what, + "?what@runtime_error@std@@UEBAPEBDXZ"); + + SET(p_range_error_ctor_bstr, + "??0range_error@std@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@1@@Z"); + SET(p_range_error_dtor, + "??1range_error@std@@UEAA@XZ"); + + SET(p_logic_error_ctor_bstr, + "??0logic_error@std@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@1@@Z"); + SET(p_logic_error_dtor, + "??1logic_error@std@@UEAA@XZ"); + SET(p_logic_error_what, + "?what@logic_error@std@@UEBAPEBDXZ"); } else { SET(p_basic_string_char_ctor, "??_F?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEXXZ"); @@ -292,6 +345,25 @@ static BOOL init(void) "?capacity@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QBEIXZ"); SET(p_basic_string_wchar_swap, "?swap@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QAEXAAV12@@Z"); + + SET(p_runtime_error_ctor_bstr, + "??0runtime_error@std@@QAE@ABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@1@@Z"); + SET(p_runtime_error_dtor, + "??1runtime_error@std@@UAE@XZ"); + SET(p_runtime_error_what, + "?what@runtime_error@std@@UBEPBDXZ"); + + SET(p_range_error_ctor_bstr, + "??0range_error@std@@QAE@ABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@1@@Z"); + SET(p_range_error_dtor, + "??1range_error@std@@UAE@XZ"); + + SET(p_logic_error_ctor_bstr, + "??0logic_error@std@@QAE@ABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@1@@Z"); + SET(p_logic_error_dtor, + "??1logic_error@std@@UAE@XZ"); + SET(p_logic_error_what, + "?what@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

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@AEAV0@@Z"); SET(p_Iostream_init_ios_ctor, "??0Iostream_init@@QEAA@AEAVios@@H@Z"); + + SET(p_exception_ctor, "??0exception@@QEAA@AEBQEBD@Z"); + SET(p_exception_dtor, "??1exception@@UEAA@XZ"); + SET(p_exception_what, "?what@exception@@UEBAPEBDXZ"); + + SET(p_logic_error_ctor, "??0logic_error@@QEAA@AEBQEBD@Z"); + SET(p_logic_error_dtor, "??1logic_error@@UEAA@XZ"); } else { p_operator_new = (void*)GetProcAddress(msvcrt, "??2@YAPAXI@Z"); p_operator_delete = (void*)GetProcAddress(msvcrt, "??3@YAXPAX@Z"); @@ -917,6 +944,13 @@ static BOOL init(void) SET(p_stdiostream_assign, "??4stdiostream@@QAEAAV0@AAV0@@Z"); SET(p_Iostream_init_ios_ctor, "??0Iostream_init@@QAE@AAVios@@H@Z"); + + SET(p_exception_ctor, "??0exception@@QAE@ABQBD@Z"); + SET(p_exception_dtor, "??1exception@@UAE@XZ"); + SET(p_exception_what, "?what@exception@@UBEPBDXZ"); + + SET(p_logic_error_ctor, "??0logic_error@@QAE@ABQBD@Z"); + SET(p_logic_error_dtor, "??1logic_error@@UAE@XZ"); } SET(p_ios_static_lock, "?x_lockc@ios@@0U_CRT_CRITICAL_SECTION@@A"); SET(p_ios_lockc, "?lockc@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

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 : 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@_Concurrent_vector_base_v4@details@Concurrency@@IEAAXAEAV123@@Z @ stub -arch=i386 ?_Internal_throw_exception@_Concurrent_queue_base_v4@details@Concurrency@@IBEXXZ @ stub -arch=win64 ?_Internal_throw_exception@_Concurrent_queue_base_v4@details@Concurrency@@IEBAXXZ -@ stub -arch=i386 ?_Internal_throw_exception@_Concurrent_vector_base_v4@details@Concurrency@@IBEXI@Z -@ stub -arch=win64 ?_Internal_throw_exception@_Concurrent_vector_base_v4@details@Concurrency@@IEBAX_K@Z +@ thiscall -arch=i386 ?_Internal_throw_exception@_Concurrent_vector_base_v4@details@Concurrency@@IBEXI@Z(ptr long) msvcp120.?_Internal_throw_exception@_Concurrent_vector_base_v4@details@Concurrency@@IBEXI@Z +@ cdecl -arch=win64 ?_Internal_throw_exception@_Concurrent_vector_base_v4@details@Concurrency@@IEBAX_K@Z(ptr long) msvcp120.?_Internal_throw_exception@_Concurrent_vector_base_v4@details@Concurrency@@IEBAX_K@Z @ stub -arch=i386 ?_IsCanceling@_StructuredTaskCollection@details@Concurrency@@QAE_NXZ @ stub -arch=win64 ?_IsCanceling@_StructuredTaskCollection@details@Concurrency@@QEAA_NXZ @ stub -arch=i386 ?_IsCanceling@_TaskCollection@details@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@_Concurrent_vector_base_v4@details@Concurrency@@IEAAXAEAV123@@Z @ stub -arch=win32 ?_Internal_throw_exception@_Concurrent_queue_base_v4@details@Concurrency@@IBEXXZ @ stub -arch=win64 ?_Internal_throw_exception@_Concurrent_queue_base_v4@details@Concurrency@@IEBAXXZ -@ stub -arch=win32 ?_Internal_throw_exception@_Concurrent_vector_base_v4@details@Concurrency@@IBEXI@Z -@ stub -arch=win64 ?_Internal_throw_exception@_Concurrent_vector_base_v4@details@Concurrency@@IEBAX_K@Z +@ thiscall -arch=win32 ?_Internal_throw_exception@_Concurrent_vector_base_v4@details@Concurrency@@IBEXI@Z(ptr long) _vector_base_v4__Internal_throw_exception +@ cdecl -arch=win64 ?_Internal_throw_exception@_Concurrent_vector_base_v4@details@Concurrency@@IEBAX_K@Z(ptr long) _vector_base_v4__Internal_throw_exception @ cdecl -arch=win32 ?_Ios_base_dtor@ios_base@std@@CAXPAV12@@Z(ptr) ios_base_Ios_base_dtor @ cdecl -arch=win64 ?_Ios_base_dtor@ios_base@std@@CAXPEAV12@@Z(ptr) ios_base_Ios_base_dtor @ thiscall -arch=win32 ?_Ipfx@?$basic_istream@DU?$char_traits@D@std@@@std@@QAE_N_N@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@_Concurrent_queue_base_v4@details@Concurrency@@IBAXXZ @ stub -arch=i386 ?_Internal_throw_exception@_Concurrent_queue_base_v4@details@Concurrency@@IBEXXZ @ stub -arch=win64 ?_Internal_throw_exception@_Concurrent_queue_base_v4@details@Concurrency@@IEBAXXZ -@ stub -arch=arm ?_Internal_throw_exception@_Concurrent_vector_base_v4@details@Concurrency@@IBAXI@Z -@ stub -arch=i386 ?_Internal_throw_exception@_Concurrent_vector_base_v4@details@Concurrency@@IBEXI@Z -@ stub -arch=win64 ?_Internal_throw_exception@_Concurrent_vector_base_v4@details@Concurrency@@IEBAX_K@Z +@ cdecl -arch=arm ?_Internal_throw_exception@_Concurrent_vector_base_v4@details@Concurrency@@IBAXI@Z(ptr long) _vector_base_v4__Internal_throw_exception +@ thiscall -arch=i386 ?_Internal_throw_exception@_Concurrent_vector_base_v4@details@Concurrency@@IBEXI@Z(ptr long) _vector_base_v4__Internal_throw_exception +@ cdecl -arch=win64 ?_Internal_throw_exception@_Concurrent_vector_base_v4@details@Concurrency@@IEBAX_K@Z(ptr long) _vector_base_v4__Internal_throw_exception @ cdecl -arch=win32 ?_Ios_base_dtor@ios_base@std@@CAXPAV12@@Z(ptr) ios_base_Ios_base_dtor @ cdecl -arch=win64 ?_Ios_base_dtor@ios_base@std@@CAXPEAV12@@Z(ptr) ios_base_Ios_base_dtor @ cdecl -arch=arm ?_Ipfx@?$basic_istream@DU?$char_traits@D@std@@@std@@QAA_N_N@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@_Concurrent_queue_base_v4@details@Concurrency@@IBAXXZ @ stub -arch=i386 ?_Internal_throw_exception@_Concurrent_queue_base_v4@details@Concurrency@@IBEXXZ @ stub -arch=win64 ?_Internal_throw_exception@_Concurrent_queue_base_v4@details@Concurrency@@IEBAXXZ -@ stub -arch=arm ?_Internal_throw_exception@_Concurrent_vector_base_v4@details@Concurrency@@IBAXI@Z -@ stub -arch=i386 ?_Internal_throw_exception@_Concurrent_vector_base_v4@details@Concurrency@@IBEXI@Z -@ stub -arch=win64 ?_Internal_throw_exception@_Concurrent_vector_base_v4@details@Concurrency@@IEBAX_K@Z +@ cdecl -arch=arm ?_Internal_throw_exception@_Concurrent_vector_base_v4@details@Concurrency@@IBAXI@Z(ptr long) _vector_base_v4__Internal_throw_exception +@ thiscall -arch=i386 ?_Internal_throw_exception@_Concurrent_vector_base_v4@details@Concurrency@@IBEXI@Z(ptr long) _vector_base_v4__Internal_throw_exception +@ cdecl -arch=win64 ?_Internal_throw_exception@_Concurrent_vector_base_v4@details@Concurrency@@IEBAX_K@Z(ptr long) _vector_base_v4__Internal_throw_exception @ cdecl -arch=win32 ?_Ios_base_dtor@ios_base@std@@CAXPAV12@@Z(ptr) ios_base_Ios_base_dtor @ cdecl -arch=win64 ?_Ios_base_dtor@ios_base@std@@CAXPEAV12@@Z(ptr) ios_base_Ios_base_dtor @ cdecl -arch=arm ?_Ipfx@?$basic_istream@DU?$char_traits@D@std@@@std@@QAA_N_N@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@_Concurrent_queue_base_v4@details@Concurrency@@IBAXXZ @ stub -arch=i386 ?_Internal_throw_exception@_Concurrent_queue_base_v4@details@Concurrency@@IBEXXZ @ stub -arch=win64 ?_Internal_throw_exception@_Concurrent_queue_base_v4@details@Concurrency@@IEBAXXZ -@ stub -arch=arm ?_Internal_throw_exception@_Concurrent_vector_base_v4@details@Concurrency@@IBAXI@Z -@ stub -arch=i386 ?_Internal_throw_exception@_Concurrent_vector_base_v4@details@Concurrency@@IBEXI@Z -@ stub -arch=win64 ?_Internal_throw_exception@_Concurrent_vector_base_v4@details@Concurrency@@IEBAX_K@Z +@ cdecl -arch=arm ?_Internal_throw_exception@_Concurrent_vector_base_v4@details@Concurrency@@IBAXI@Z(ptr long) msvcp120.?_Internal_throw_exception@_Concurrent_vector_base_v4@details@Concurrency@@IBAXI@Z +@ thiscall -arch=i386 ?_Internal_throw_exception@_Concurrent_vector_base_v4@details@Concurrency@@IBEXI@Z(ptr long) msvcp120.?_Internal_throw_exception@_Concurrent_vector_base_v4@details@Concurrency@@IBEXI@Z +@ cdecl -arch=win64 ?_Internal_throw_exception@_Concurrent_vector_base_v4@details@Concurrency@@IEBAX_K@Z(ptr long) msvcp120.?_Internal_throw_exception@_Concurrent_vector_base_v4@details@Concurrency@@IEBAX_K@Z @ cdecl -arch=win32 ?_Ios_base_dtor@ios_base@std@@CAXPAV12@@Z(ptr) msvcp120.?_Ios_base_dtor@ios_base@std@@CAXPAV12@@Z @ cdecl -arch=win64 ?_Ios_base_dtor@ios_base@std@@CAXPEAV12@@Z(ptr) msvcp120.?_Ios_base_dtor@ios_base@std@@CAXPEAV12@@Z @ cdecl -arch=arm ?_Ipfx@?$basic_istream@DU?$char_traits@D@std@@@std@@QAA_N_N@Z(ptr long) msvcp120.?_Ipfx@?$basic_istream@DU?$char_traits@D@std@@@std@@QAA_N_N@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@_Concurrent_vector_base_v4@details@Concurrency@@IBEXI@Z */ +/* ?_Internal_throw_exception@_Concurrent_vector_base_v4@details@Concurrency@@IEBAX_K@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 : 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

Dmitry Timoshkov : ole32: Remove an optimization from DataCache_Save() that copies whole original storage.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: master Commit: f7eabdf3a8ebdcc388772949749f36808ba7fea4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7eabdf3a8ebdcc3887729497… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Oct 20 17:43:28 2017 +0800 ole32: Remove an optimization from DataCache_Save() that copies whole original storage. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/datacache.c | 6 ------ dlls/ole32/tests/ole2.c | 7 ++----- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 808c2dc..360ecd8 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -1665,12 +1665,6 @@ static HRESULT WINAPI DataCache_Save( } } - /* this is a shortcut if nothing changed */ - if (!dirty && !fSameAsLoad && This->presentationStorage) - { - return IStorage_CopyTo(This->presentationStorage, 0, NULL, NULL, pStg); - } - /* assign stream numbers to the cache entries */ LIST_FOR_EACH_ENTRY(cache_entry, &This->cache_list, DataCacheEntry, entry) { diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 16c6d88..08b6a27 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -2980,9 +2980,7 @@ static HRESULT WINAPI Storage_SetElementTimes(IStorage *iface, LPCOLESTR pwcsNam static HRESULT WINAPI Storage_SetClass(IStorage *iface, REFCLSID clsid) { -todo_wine_if(!expect_Storage_SetClass) CHECK_EXPECT(Storage_SetClass); -todo_wine_if(IsEqualIID(Storage_SetClass_CLSID, &CLSID_NULL)) ok(IsEqualIID(clsid, Storage_SetClass_CLSID), "expected %s, got %s\n", wine_dbgstr_guid(Storage_SetClass_CLSID), wine_dbgstr_guid(clsid)); return S_OK; @@ -3491,7 +3489,6 @@ static void check_storage_contents(IStorage *stg, const struct storage_def *stg_ hr = IStorage_Stat(stg, &stat, STATFLAG_NONAME); ok(hr == S_OK, "unexpected %#x\n", hr); -todo_wine_if(!IsEqualCLSID(stg_def->clsid, &stat.clsid)) ok(IsEqualCLSID(stg_def->clsid, &stat.clsid), "expected %s, got %s\n", wine_dbgstr_guid(stg_def->clsid), wine_dbgstr_guid(&stat.clsid)); @@ -3702,10 +3699,10 @@ todo_wine_if(test_data[i].in == &stg_def_4 || test_data[i].in == &stg_def_8 || t enumerated_streams = matched_streams = -1; check_storage_contents(doc2, test_data[i].out, &enumerated_streams, &matched_streams); -todo_wine +todo_wine_if(!(test_data[i].in == &stg_def_0 || test_data[i].in == &stg_def_1 || test_data[i].in == &stg_def_2)) ok(enumerated_streams == matched_streams, "%d out: enumerated %d != matched %d\n", i, enumerated_streams, matched_streams); -todo_wine +todo_wine_if(!(test_data[i].in == &stg_def_0 || test_data[i].in == &stg_def_5)) ok(enumerated_streams == test_data[i].out->stream_count, "%d: saved streams %d != def streams %d\n", i, enumerated_streams, test_data[i].out->stream_count);

1 0

Dmitry Timoshkov : ole32/tests: Add a test for IOleCache storage contents created by IPersistStorage_Save ().
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: master Commit: 19385780ca630a553051e8e4f009a11eb82bcac8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19385780ca630a553051e8e4f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Oct 20 17:42:39 2017 +0800 ole32/tests: Add a test for IOleCache storage contents created by IPersistStorage_Save(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/ole2.c | 402 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 402 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=19385780ca630a553051e…

1 0

Dmitry Timoshkov : ole32/tests: Add a test for saving an IOleCache storage.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: master Commit: 970c5b1dd2a971c5bac69e1f4e6f8e494c37fd8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=970c5b1dd2a971c5bac69e1f4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Oct 20 17:41:56 2017 +0800 ole32/tests: Add a test for saving an IOleCache storage. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/ole2.c | 205 +++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 195 insertions(+), 10 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=970c5b1dd2a971c5bac69…

1 0

Alexandre Julliard : configure: Silence error when krb5-config is missing.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: master Commit: 56cb45456b8146d4c2aaa67298afdbaa4084bfbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=56cb45456b8146d4c2aaa6729… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 20 18:59:00 2017 +0200 configure: Silence error when krb5-config is missing. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 4 ++-- configure.ac | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 8b6fc45..0c090eb 100755 --- a/configure +++ b/configure @@ -13753,13 +13753,13 @@ then KRB5_CFLAGS=`$PKG_CONFIG --cflags krb5 2>/dev/null` fi fi -test "$cross_compiling" = yes || KRB5_CFLAGS=${KRB5_CFLAGS:-`krb5-config --cflags`} +test "$cross_compiling" = yes || KRB5_CFLAGS=${KRB5_CFLAGS:-`${KRB5_CONFIG:-krb5-config} --cflags 2>/dev/null`} if ${KRB5_LIBS:+false} :; then : if ${PKG_CONFIG+:} false; then : KRB5_LIBS=`$PKG_CONFIG --libs krb5 2>/dev/null` fi fi -test "$cross_compiling" = yes || KRB5_LIBS=${KRB5_LIBS:-`krb5-config --libs`} +test "$cross_compiling" = yes || KRB5_LIBS=${KRB5_LIBS:-`${KRB5_CONFIG:-krb5-config} --libs 2>/dev/null`} $as_echo "$as_me:${as_lineno-$LINENO}: krb5 cflags: $KRB5_CFLAGS" >&5 $as_echo "$as_me:${as_lineno-$LINENO}: krb5 libs: $KRB5_LIBS" >&5 diff --git a/configure.ac b/configure.ac index 0ad9028..c02253b 100644 --- a/configure.ac +++ b/configure.ac @@ -1629,7 +1629,9 @@ WINE_NOTICE_WITH(gsm,[test "x$ac_cv_lib_soname_gsm" = "x"], dnl **** Check for krb5 **** if test "x$with_krb5" != "xno" then - WINE_PACKAGE_FLAGS(KRB5,[krb5],,[`krb5-config --cflags`],[`krb5-config --libs`], + WINE_PACKAGE_FLAGS(KRB5,[krb5],, + [`${KRB5_CONFIG:-krb5-config} --cflags 2>/dev/null`], + [`${KRB5_CONFIG:-krb5-config} --libs 2>/dev/null`], [AC_CHECK_HEADERS([krb5/krb5.h]) if test "$ac_cv_header_krb5_krb5_h" = "yes" then

1 0

Alexandre Julliard : makedep: Output empty rule for source makefiles.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: master Commit: 83fbb78d5f186fd2a38134689296142ae91a0609 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83fbb78d5f186fd2a38134689… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 20 10:03:17 2017 +0200 makedep: Output empty rule for source makefiles. This should avoid breaking the build when a makefile is removed. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/makedep.c b/tools/makedep.c index 296356b..ec339e0 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3151,6 +3151,8 @@ static struct strarray output_sources( const struct makefile *make ) output( "Makefile:" ); output_filenames( makefile_deps ); output( "\n" ); + output_filenames( makefile_deps ); + output( ":\n" ); output( "distclean::\n"); output( "\trm -f" ); output_filenames( distclean_files );

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
48
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2017