ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msvcp120: Fix function passed to _Concurrent_vector_base_v4::_Internal_clear. 

Signed-off-by: Piotr Caban <piotr@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Piotr Caban 2018-06-14 12:38:56 +02:00 committed by Alexandre Julliard
parent c61a70be2f
commit 905aa3cb0d
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
dlls/msvcp120/tests/msvcp120.c
View File

@ -36,7 +36,7 @@ struct expect_struct {
DEFINE_EXPECT(queue_char__Copy_item); DEFINE_EXPECT(queue_char__Copy_item);
DEFINE_EXPECT(queue_char__Assign_and_destroy_item); DEFINE_EXPECT(queue_char__Assign_and_destroy_item);
DEFINE_EXPECT(concurrent_vector_int_alloc); DEFINE_EXPECT(concurrent_vector_int_alloc);
DEFINE_EXPECT(concurrent_vector_int_free); DEFINE_EXPECT(concurrent_vector_int_destroy);
}; };
#define SET_EXPECT(func) \ #define SET_EXPECT(func) \
@ -2454,10 +2454,10 @@ static void* __cdecl concurrent_vector_int_alloc(vector_base_v4 *this, size_t n)
return malloc(n*sizeof(int)); return malloc(n*sizeof(int));
} }
static void __cdecl concurrent_vector_int_free(void *ptr, size_t n) static void __cdecl concurrent_vector_int_destroy(void *ptr, size_t n)
{ {
CHECK_EXPECT2(concurrent_vector_int_free); CHECK_EXPECT2(concurrent_vector_int_destroy);
free(ptr); memset(ptr, 0xff, sizeof(int)*n);
} }
static void concurrent_vector_int_ctor(vector_base_v4 *this) static void concurrent_vector_int_ctor(vector_base_v4 *this)
@ -2467,6 +2467,20 @@ static void concurrent_vector_int_ctor(vector_base_v4 *this)
this->segment = &this->storage[0]; this->segment = &this->storage[0];
} }
static void concurrent_vector_int_dtor(vector_base_v4 *this)
{
size_t blocks;
blocks = (size_t)call_func2(p_vector_base_v4__Internal_clear,
this, concurrent_vector_int_destroy);
while(this->first_block && blocks >= this->first_block) {
free(this->segment[blocks - this->first_block]);
blocks--;
}
call_func1(p_vector_base_v4_dtor, this);
}
static void test_queue_base_v4(void) static void test_queue_base_v4(void)
{ {
queue_base_v4 queue; queue_base_v4 queue;
@ -2731,16 +2745,16 @@ static void test_vector_base_v4(void)
size = (size_t)call_func1(p_vector_base_v4__Internal_capacity, &vector); size = (size_t)call_func1(p_vector_base_v4__Internal_capacity, &vector);
ok(size == 8, "size of vector got %ld expected 8\n", (long)size); ok(size == 8, "size of vector got %ld expected 8\n", (long)size);
SET_EXPECT(concurrent_vector_int_free); SET_EXPECT(concurrent_vector_int_destroy);
size = (size_t)call_func2(p_vector_base_v4__Internal_clear, size = (size_t)call_func2(p_vector_base_v4__Internal_clear,
&vector, concurrent_vector_int_free); &vector, concurrent_vector_int_destroy);
CHECK_CALLED(concurrent_vector_int_free); CHECK_CALLED(concurrent_vector_int_destroy);
ok(size == 3, "_Internal_clear returned %ld\n", (long)size); ok(size == 3, "_Internal_clear returned %ld\n", (long)size);
ok(vector.first_block == 1, "vector.first_block got %ld expected 1\n", ok(vector.first_block == 1, "vector.first_block got %ld expected 1\n",
(long)vector.first_block); (long)vector.first_block);
ok(vector.early_size == 0, "vector.early_size got %ld expected 0\n", ok(vector.early_size == 0, "vector.early_size got %ld expected 0\n",
(long)vector.early_size); (long)vector.early_size);
call_func1(p_vector_base_v4_dtor, &vector); concurrent_vector_int_dtor(&vector);
} }
START_TEST(msvcp120) START_TEST(msvcp120)