Hua Meng : msvcp120: Add test for Concurrent_vector_Internal_resize and reverse.
Module: wine Branch: master Commit: 8f4fb12dc594674eea13488b65481a5c9e4ad38d URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f4fb12dc594674eea13488b6... Author: Hua Meng <161220092(a)smail.nju.edu.cn> Date: Wed Jun 27 10:50:50 2018 +0200 msvcp120: Add test for Concurrent_vector_Internal_resize and reverse. Signed-off-by: Hua Meng <161220092(a)smail.nju.edu.cn> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp120/tests/msvcp120.c | 90 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 2974482..959f7a8 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -124,6 +124,8 @@ static void * (WINAPI *call_thiscall_func5)( void *func, void *this, const void const void *b, const void *c, const void *d ); static void * (WINAPI *call_thiscall_func6)( void *func, void *this, const void *a, const void *b, const void *c, const void *d, const void *e ); +static void * (WINAPI *call_thiscall_func7)( void *func, void *this, const void *a, + const void *b, const void *c, const void *d, const void *e, const void *f ); static void init_thiscall_thunk(void) { @@ -140,6 +142,7 @@ static void init_thiscall_thunk(void) call_thiscall_func4 = (void *)thunk; call_thiscall_func5 = (void *)thunk; call_thiscall_func6 = (void *)thunk; + call_thiscall_func7 = (void *)thunk; } #define call_func1(func,_this) call_thiscall_func1(func,_this) @@ -152,6 +155,8 @@ static void init_thiscall_thunk(void) (const void*)(b),(const void*)(c),(const void*)(d)) #define call_func6(func,_this,a,b,c,d,e) call_thiscall_func6(func,_this,(const void*)(a),\ (const void*)(b),(const void*)(c),(const void*)(d),(const void*)(e)) +#define call_func7(func,_this,a,b,c,d,e,f) call_thiscall_func7(func,_this,(const void*)(a),\ + (const void*)(b),(const void*)(c),(const void*)(d),(const void*)(e),(const void*)(f)) #else #define init_thiscall_thunk() @@ -161,6 +166,7 @@ static void init_thiscall_thunk(void) #define call_func4(func,_this,a,b,c) func(_this,a,b,c) #define call_func5(func,_this,a,b,c,d) func(_this,a,b,c,d) #define call_func6(func,_this,a,b,c,d,e) func(_this,a,b,c,d,e) +#define call_func7(func,_this,a,b,c,d,e,f) func(_this,a,b,c,d,e,f) #endif /* __i386__ */ static inline float __port_infinity(void) @@ -422,6 +428,11 @@ static size_t (__thiscall *p_vector_base_v4__Internal_grow_by)( vector_base_v4*, size_t, size_t, void (__cdecl*)(void*, const void*, size_t), const void *); static size_t (__thiscall *p_vector_base_v4__Internal_grow_to_at_least_with_result)( vector_base_v4*, size_t, size_t, void (__cdecl*)(void*, const void*, size_t), const void *); +static void (__thiscall *p_vector_base_v4__Internal_reserve)( + vector_base_v4*, size_t, size_t, size_t); +static void (__thiscall *p_vector_base_v4__Internal_resize)( + vector_base_v4*, size_t, size_t, size_t, void (__cdecl*)(void*, size_t), + void (__cdecl *copy)(void*, const void*, size_t), const void*); static HMODULE msvcp; #define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y) @@ -576,6 +587,10 @@ static BOOL init(void) "?_Internal_grow_by(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEAA_K_K0P6AXPEAXPEBX0(a)Z2@Z"); SET(p_vector_base_v4__Internal_grow_to_at_least_with_result, "?_Internal_grow_to_at_least_with_result(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEAA_K_K0P6AXPEAXPEBX0(a)Z2@Z"); + SET(p_vector_base_v4__Internal_reserve, + "?_Internal_reserve(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEAAX_K00(a)Z"); + SET(p_vector_base_v4__Internal_resize, + "?_Internal_resize(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEAAX_K00P6AXPEAX0(a)ZP6AX1PEBX0@Z3(a)Z"); } else { SET(p_tr2_sys__File_size, "?_File_size(a)sys@tr2(a)std@@YA_KPBD(a)Z"); @@ -699,6 +714,10 @@ static BOOL init(void) "?_Internal_grow_by(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAEIIIP6AXPAXPBXI(a)Z1@Z"); SET(p_vector_base_v4__Internal_grow_to_at_least_with_result, "?_Internal_grow_to_at_least_with_result(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAEIIIP6AXPAXPBXI(a)Z1@Z"); + SET(p_vector_base_v4__Internal_reserve, + "?_Internal_reserve(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAEXIII(a)Z"); + SET(p_vector_base_v4__Internal_resize, + "?_Internal_resize(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAEXIIIP6AXPAXI(a)ZP6AX0PBXI@Z2(a)Z"); #else SET(p__Thrd_current, "_Thrd_current"); @@ -750,6 +769,10 @@ static BOOL init(void) "?_Internal_grow_by(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAAIIIP6AXPAXPBXI(a)Z1@Z"); SET(p_vector_base_v4__Internal_grow_to_at_least_with_result, "?_Internal_grow_to_at_least_with_result(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAAIIIP6AXPAXPBXI(a)Z1@Z"); + SET(p_vector_base_v4__Internal_reserve, + "?_Internal_reserve(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAAXIII(a)Z"); + SET(p_vector_base_v4__Internal_resize, + "?_Internal_resize(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAEXIIIP6AXPAXI(a)ZP6AX0PBXI@Z2(a)Z"); #endif } SET(p__Thrd_equal, @@ -3082,6 +3105,73 @@ static void test_vector_base_v4(void) CHECK_CALLED(concurrent_vector_int_destroy); concurrent_vector_int_dtor(&v2); + /* test for _Internal_reserve */ + concurrent_vector_int_ctor(&v2); + SET_EXPECT(concurrent_vector_int_alloc); + data = call_func3(p_vector_base_v4__Internal_push_back, &v2, sizeof(int), &idx); + CHECK_CALLED(concurrent_vector_int_alloc); + ok(data != NULL, "_Internal_push_back returned NULL\n"); + data = call_func3(p_vector_base_v4__Internal_push_back, &v2, sizeof(int), &idx); + ok(data != NULL, "_Internal_push_back returned NULL\n"); + vector_elem_count += 2; + ok(v2.first_block == 1, "v2.first_block got %ld expected 1\n", (long)v2.first_block); + ok(v2.early_size == 2, "v2.early_size got %ld expected 2\n", (long)v2.early_size); + SET_EXPECT(concurrent_vector_int_alloc); + call_func4(p_vector_base_v4__Internal_reserve, + &v2, 3, sizeof(int), 4); + CHECK_CALLED(concurrent_vector_int_alloc); + ok(v2.first_block == 1, "v2.first_block got %ld expected 1\n", (long)v2.first_block); + ok(v2.early_size == 2, "v2.early_size got %ld expected 2\n", (long)v2.early_size); + size = (size_t)call_func1(p_vector_base_v4__Internal_capacity, &v2); + ok(size == 4, "size of vector got %ld expected 4\n", (long)size); + SET_EXPECT(concurrent_vector_int_alloc); + call_func4(p_vector_base_v4__Internal_reserve, + &v2, 5, sizeof(int), 8); + CHECK_CALLED(concurrent_vector_int_alloc); + ok(v2.first_block == 1, "v2.first_block got %ld expected 1\n", (long)v2.first_block); + ok(v2.early_size == 2, "v2.early_size got %ld expected 2\n", (long)v2.early_size); + size = (size_t)call_func1(p_vector_base_v4__Internal_capacity, &v2); + ok(size == 8, "size of vector got %ld expected 8\n", (long)size); + SET_EXPECT(concurrent_vector_int_destroy); + size = (size_t)call_func2(p_vector_base_v4__Internal_clear, + &v2, concurrent_vector_int_destroy); + ok(size == 3, "_Internal_clear returned %ld expected 3\n", (long)size); + CHECK_CALLED(concurrent_vector_int_destroy); + concurrent_vector_int_dtor(&v2); + + /* test for _Internal_resize */ + concurrent_vector_int_ctor(&v2); + SET_EXPECT(concurrent_vector_int_alloc); + data = call_func3(p_vector_base_v4__Internal_push_back, &v2, sizeof(int), &idx); + CHECK_CALLED(concurrent_vector_int_alloc); + ok(data != NULL, "_Internal_push_back returned NULL\n"); + data = call_func3(p_vector_base_v4__Internal_push_back, &v2, sizeof(int), &idx); + ok(data != NULL, "_Internal_push_back returned NULL\n"); + vector_elem_count += 2; + ok(v2.first_block == 1, "v2.first_block got %ld expected 1\n", (long)v2.first_block); + ok(v2.early_size == 2, "v2.early_size got %ld expected 2\n", (long)v2.early_size); + i = 0; + SET_EXPECT(concurrent_vector_int_destroy); + call_func7(p_vector_base_v4__Internal_resize, + &v2, 1, sizeof(int), 4, concurrent_vector_int_destroy, concurrent_vector_int_copy, &i); + CHECK_CALLED(concurrent_vector_int_destroy); + ok(v2.first_block == 1, "v2.first_block got %ld expected 1\n", (long)v2.first_block); + ok(v2.early_size == 1, "v2.early_size got %ld expected 1\n", (long)v2.early_size); + SET_EXPECT(concurrent_vector_int_alloc); + SET_EXPECT(concurrent_vector_int_copy); + call_func7(p_vector_base_v4__Internal_resize, + &v2, 3, sizeof(int), 4, concurrent_vector_int_destroy, concurrent_vector_int_copy, &i); + CHECK_CALLED(concurrent_vector_int_alloc); + CHECK_CALLED(concurrent_vector_int_copy); + ok(v2.first_block == 1, "v2.first_block got %ld expected 1\n", (long)v2.first_block); + ok(v2.early_size == 3, "v2.early_size got %ld expected 3\n", (long)v2.early_size); + SET_EXPECT(concurrent_vector_int_destroy); + size = (size_t)call_func2(p_vector_base_v4__Internal_clear, + &v2, concurrent_vector_int_destroy); + ok(size == 2, "_Internal_clear returned %ld expected 2\n", (long)size); + CHECK_CALLED(concurrent_vector_int_destroy); + concurrent_vector_int_dtor(&v2); + SET_EXPECT(concurrent_vector_int_destroy); size = (size_t)call_func2(p_vector_base_v4__Internal_clear, &vector, concurrent_vector_int_destroy);
participants (1)
-
Alexandre Julliard