July 2018 - Wine-devel - list.winehq.org

[PATCH 05/13 v2] msvcp90: Add implementation of _Concurrent_vector_Internal_clear.
by Hua Meng 31 Jul '18

31 Jul '18

Signed-off-by: Hua meng <161220092(a)smail.nju.edu.cn> --- dlls/msvcp90/misc.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 34a30cf5e1..a2baf12567 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1987,8 +1987,22 @@ DEFINE_THISCALL_WRAPPER(_Concurrent_vector_base_v4__Internal_clear, 8) MSVCP_size_t __thiscall _Concurrent_vector_base_v4__Internal_clear( _Concurrent_vector_base_v4 *this, void (__cdecl *clear)(void*, MSVCP_size_t)) { - FIXME("(%p %p) stub\n", this, clear); - return 0; + MSVCP_size_t seg_no, elems; + int i; + + TRACE("(%p %p)\n", this, clear); + + seg_no = this->early_size ? _vector_base_v4__Segment_index_of(this->early_size) + 1 : 0; + for(i = seg_no - 1; i >= 0; i--) { + elems = this->early_size - (1 << i & ~1); + clear(this->segment[i], elems); + this->early_size -= elems; + } + while(seg_no < (this->segment == this->storage ? STORAGE_SIZE : SEGMENT_SIZE)) { + if(!this->segment[seg_no]) break; + seg_no++; + } + return seg_no; } /* ?_Internal_compact(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAEPAXIPAXP6AX0I(a)ZP6AX0PBXI@Z(a)Z */ -- 2.11.0

1 0

[PATCH 04/13 v2] msvcp90: Add implementaion of _Concurrent_vector_Internal_reserve.
by Hua Meng 31 Jul '18

31 Jul '18

Signed-off-by: Hua meng <161220092(a)smail.nju.edu.cn> --- dlls/msvcp90/misc.c | 234 ++++++++++++++++++++++++++++++++++------------------ 1 file changed, 155 insertions(+), 79 deletions(-) diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index c4671d469e..34a30cf5e1 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1771,6 +1771,7 @@ DEFINE_RTTI_DATA0(_Runtime_object, 0, ".?AV_Runtime_object(a)details@Concurrency@@ #endif +#if _MSVCP_VER >= 100 typedef struct __Concurrent_vector_base_v4 { void* (__cdecl *allocator)(struct __Concurrent_vector_base_v4 *, MSVCP_size_t); @@ -1783,6 +1784,122 @@ typedef struct __Concurrent_vector_base_v4 #define STORAGE_SIZE (sizeof(this->storage) / sizeof(this->storage[0])) #define SEGMENT_SIZE (sizeof(void*) * 8) +/* based on wined3d_log2i from wined3d.h */ +/* Return the integer base-2 logarithm of (x|1). Result is 0 for x == 0. */ +static inline unsigned int log2i(unsigned int x) +{ +#ifdef HAVE___BUILTIN_CLZ + return __builtin_clz(x|1) ^ 0x1f; +#else + static const unsigned int l[] = + { + ~0u, 0, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + }; + unsigned int i; + + x |= 1; + return (i = x >> 16) ? (x = i >> 8) ? l[x] + 24 : l[i] + 16 : (i = x >> 8) ? l[i] + 8 : l[x]; +#endif +} + +/* ?_Segment_index_of(a)_Concurrent_vector_base_v4@details(a)Concurrency@@KAII(a)Z */ +/* ?_Segment_index_of(a)_Concurrent_vector_base_v4@details(a)Concurrency@@KA_K_K(a)Z */ +MSVCP_size_t __cdecl _vector_base_v4__Segment_index_of(MSVCP_size_t x) +{ + unsigned int half; + + TRACE("(%lu)\n", x); + + if((sizeof(x) == 8) && (half = x >> 32)) + return log2i(half) + 32; + + 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 < ARRAY_SIZE(exceptions)) + throw_exception(exceptions[idx].type, exceptions[idx].msg); +} + +#ifdef _WIN64 +#define InterlockedCompareExchangeSizeT(dest, exchange, cmp) InterlockedCompareExchangeSize((MSVCP_size_t *)dest, (MSVCP_size_t)exchange, (MSVCP_size_t)cmp) +static MSVCP_size_t InterlockedCompareExchangeSize(MSVCP_size_t volatile *dest, MSVCP_size_t exchange, MSVCP_size_t cmp) +{ + MSVCP_size_t v; + + v = InterlockedCompareExchange64((LONGLONG*)dest, exchange, cmp); + + return v; +} +#else +#define InterlockedCompareExchangeSizeT(dest, exchange, cmp) InterlockedCompareExchange((LONG*)dest, (MSVCP_size_t)exchange, (MSVCP_size_t)cmp) +#endif + +#define SEGMENT_ALLOC_MARKER ((void*)1) + +static void concurrent_vector_alloc_segment(_Concurrent_vector_base_v4 *this, + MSVCP_size_t seg, MSVCP_size_t element_size) +{ + int spin; + + while(!this->segment[seg] || this->segment[seg] == SEGMENT_ALLOC_MARKER) + { + spin = 0; + while(this->segment[seg] == SEGMENT_ALLOC_MARKER) + spin_wait(&spin); + if(!InterlockedCompareExchangeSizeT((this->segment + seg), + SEGMENT_ALLOC_MARKER, 0)) + __TRY + { + if(seg == 0) + this->segment[seg] = this->allocator(this, element_size * (1 << this->first_block)); + else if(seg < this->first_block) + this->segment[seg] = (BYTE**)this->segment[0] + + element_size * (1 << seg); + else + this->segment[seg] = this->allocator(this, element_size * (1 << seg)); + } + __EXCEPT_ALL + { + this->segment[seg] = NULL; + throw_exception(EXCEPTION_RERAISE, NULL); + } + __ENDTRY + if(!this->segment[seg]) + _vector_base_v4__Internal_throw_exception(this, 2); + } +} + /* ??1_Concurrent_vector_base_v4(a)details@Concurrency@@IAE(a)XZ */ /* ??1_Concurrent_vector_base_v4(a)details@Concurrency@@IEAA(a)XZ */ DEFINE_THISCALL_WRAPPER(_Concurrent_vector_base_v4_dtor, 4) @@ -1827,6 +1944,43 @@ MSVCP_size_t __thiscall _Concurrent_vector_base_v4__Internal_capacity( return 1 << i; } +/* ?_Internal_reserve(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAEXIII(a)Z */ +/* ?_Internal_reserve(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEAAX_K00(a)Z */ +DEFINE_THISCALL_WRAPPER(_Concurrent_vector_base_v4__Internal_reserve, 16) +void __thiscall _Concurrent_vector_base_v4__Internal_reserve( + _Concurrent_vector_base_v4 *this, MSVCP_size_t size, + MSVCP_size_t element_size, MSVCP_size_t max_size) +{ + MSVCP_size_t block_idx, capacity; + int i; + void **new_segment; + + TRACE("(%p %ld %ld %ld)\n", this, size, element_size, max_size); + + if(size > max_size) _vector_base_v4__Internal_throw_exception(this, 0); + capacity = _Concurrent_vector_base_v4__Internal_capacity(this); + if(size <= capacity) return; + block_idx = _vector_base_v4__Segment_index_of(size - 1); + if(!this->first_block) + InterlockedCompareExchangeSizeT(&this->first_block, block_idx + 1, 0); + i = _vector_base_v4__Segment_index_of(capacity); + if(this->storage == this->segment) { + for(; i <= block_idx && i < STORAGE_SIZE; i++) + concurrent_vector_alloc_segment(this, i, element_size); + if(block_idx >= STORAGE_SIZE) { + new_segment = malloc(SEGMENT_SIZE * sizeof(void*)); + if(new_segment == NULL) _vector_base_v4__Internal_throw_exception(this, 2); + memset(new_segment, 0, SEGMENT_SIZE * sizeof(void*)); + memcpy(new_segment, this->storage, STORAGE_SIZE * element_size); + if(InterlockedCompareExchangePointer((void*)&this->segment, new_segment, + this->storage) != this->storage) + free(new_segment); + } + } + for(; i <= block_idx; i++) + concurrent_vector_alloc_segment(this, i, element_size); +} + /* ?_Internal_clear(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAEIP6AXPAXI(a)Z@Z */ /* ?_Internal_clear(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEAA_KP6AXPEAX_K(a)Z@Z */ DEFINE_THISCALL_WRAPPER(_Concurrent_vector_base_v4__Internal_clear, 8) @@ -1891,16 +2045,6 @@ void * __thiscall _Concurrent_vector_base_v4__Internal_push_back( return NULL; } -/* ?_Internal_reserve(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAEXIII(a)Z */ -/* ?_Internal_reserve(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEAAX_K00(a)Z */ -DEFINE_THISCALL_WRAPPER(_Concurrent_vector_base_v4__Internal_reserve, 16) -void __thiscall _Concurrent_vector_base_v4__Internal_reserve( - _Concurrent_vector_base_v4 *this, MSVCP_size_t len1, - MSVCP_size_t len2, MSVCP_size_t len3) -{ - FIXME("(%p %ld %ld %ld) stub\n", this, len1, len2, len3); -} - /* ?_Internal_resize(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAEXIIIP6AXPAXI(a)ZP6AX0PBXI@Z2(a)Z */ /* ?_Internal_resize(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEAAX_K00P6AXPEAX0(a)ZP6AX1PEBX0@Z3(a)Z */ DEFINE_THISCALL_WRAPPER(_Concurrent_vector_base_v4__Internal_resize, 28) @@ -1920,6 +2064,7 @@ void __thiscall _Concurrent_vector_base_v4__Internal_swap( { FIXME("(%p %p) stub\n", this, v); } +#endif #ifndef __GNUC__ void __asm_dummy_vtables(void) { @@ -2392,75 +2537,6 @@ _Ph _Ph_11 = {0}, _Ph_12 = {0}, _Ph_13 = {0}, _Ph_14 = {0}, _Ph_15 = {0}; _Ph _Ph_16 = {0}, _Ph_17 = {0}, _Ph_18 = {0}, _Ph_19 = {0}, _Ph_20 = {0}; #endif -#if _MSVCP_VER >= 100 -/* based on wined3d_log2i from wined3d.h */ -/* Return the integer base-2 logarithm of (x|1). Result is 0 for x == 0. */ -static inline unsigned int log2i(unsigned int x) -{ -#ifdef HAVE___BUILTIN_CLZ - return __builtin_clz(x|1) ^ 0x1f; -#else - static const unsigned int l[] = - { - ~0u, 0, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, - 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, - 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, - 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, - 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, - }; - unsigned int i; - - x |= 1; - return (i = x >> 16) ? (x = i >> 8) ? l[x] + 24 : l[i] + 16 : (i = x >> 8) ? l[i] + 8 : l[x]; -#endif -} - -/* ?_Segment_index_of(a)_Concurrent_vector_base_v4@details(a)Concurrency@@KAII(a)Z */ -/* ?_Segment_index_of(a)_Concurrent_vector_base_v4@details(a)Concurrency@@KA_K_K(a)Z */ -MSVCP_size_t __cdecl _vector_base_v4__Segment_index_of(MSVCP_size_t x) -{ - unsigned int half; - - TRACE("(%lu)\n", x); - - if((sizeof(x) == 8) && (half = x >> 32)) - return log2i(half) + 32; - - 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 < ARRAY_SIZE(exceptions)) - throw_exception(exceptions[idx].type, exceptions[idx].msg); -} -#endif - #if _MSVCP_VER >= 140 /* ?_IsNonBlockingThread(a)_Task_impl_base@details(a)Concurrency@@SA_NXZ */ MSVCP_bool __cdecl _Task_impl_base__IsNonBlockingThread(void) -- 2.11.0

1 0

[PATCH 03/13 v2] msvcp90: Add implementation of _Concurrent_vector_Internal_capacity.
by Hua Meng 31 Jul '18

31 Jul '18

Signed-off-by: Hua meng <161220092(a)smail.nju.edu.cn> --- dlls/msvcp90/misc.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 7cd835bf56..c4671d469e 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1780,6 +1780,9 @@ typedef struct __Concurrent_vector_base_v4 void **segment; } _Concurrent_vector_base_v4; +#define STORAGE_SIZE (sizeof(this->storage) / sizeof(this->storage[0])) +#define SEGMENT_SIZE (sizeof(void*) * 8) + /* ??1_Concurrent_vector_base_v4(a)details@Concurrency@@IAE(a)XZ */ /* ??1_Concurrent_vector_base_v4(a)details@Concurrency@@IEAA(a)XZ */ DEFINE_THISCALL_WRAPPER(_Concurrent_vector_base_v4_dtor, 4) @@ -1810,8 +1813,18 @@ DEFINE_THISCALL_WRAPPER(_Concurrent_vector_base_v4__Internal_capacity, 4) MSVCP_size_t __thiscall _Concurrent_vector_base_v4__Internal_capacity( const _Concurrent_vector_base_v4 *this) { - FIXME("(%p) stub\n", this); - return 0; + MSVCP_size_t last_block; + int i; + + TRACE("(%p)\n", this); + + last_block = (this->segment == this->storage ? STORAGE_SIZE : SEGMENT_SIZE); + for(i = 0; i < last_block; i++) + { + if(!this->segment[i]) + return !i ? 0 : 1 << i; + } + return 1 << i; } /* ?_Internal_clear(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAEIP6AXPAXI(a)Z@Z */ -- 2.11.0

1 0

[PATCH 02/13 v2] msvcp90: Add implementation of _Concurrent_vector_dtor.
by Hua Meng 31 Jul '18

31 Jul '18

Signed-off-by: Hua meng <161220092(a)smail.nju.edu.cn> --- dlls/msvcp90/misc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index a1bec86666..7cd835bf56 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1786,7 +1786,10 @@ DEFINE_THISCALL_WRAPPER(_Concurrent_vector_base_v4_dtor, 4) void __thiscall _Concurrent_vector_base_v4_dtor( _Concurrent_vector_base_v4 *this) { - FIXME("(%p) stub\n", this); + TRACE("(%p)\n", this); + + if(this->segment != this->storage) + free(this->segment); } /* ?_Internal_assign(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAEXABV123(a)IP6AXPAXI@ZP6AX1PBXI(a)Z4@Z */ -- 2.11.0

1 0

[PATCH 01/13 v2] msvcp120: Add tests for _Concurrent_vector->segment.
by Hua Meng 31 Jul '18

31 Jul '18

Superseded patch 149073 to patch 149085 v2: fix apply error fix compile warning in win64-bit Signed-off-by: Hua meng <161220092(a)smail.nju.edu.cn> --- dlls/msvcp120/tests/msvcp120.c | 47 ++++++++++++++++++++++++++++++++++++------ 1 file changed, 41 insertions(+), 6 deletions(-) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index db9517d305..d7b82a3aae 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -2868,7 +2868,8 @@ static void test_vector_base_v4(void) (long)vector.first_block); ok(vector.early_size == 1, "vector.early_size got %ld expected 1\n", (long)vector.early_size); - + ok(vector.segment == vector.storage, "vector.segment got %p expected %p\n", + vector.segment, vector.storage); size = (size_t)call_func1(p_vector_base_v4__Internal_capacity, &vector); ok(size == 2, "size of vector got %ld expected 2\n", (long)size); @@ -2892,11 +2893,12 @@ static void test_vector_base_v4(void) ok(idx == 2, "idx got %ld expected 2\n", (long)idx); vector_elem_count++; *data = 3; + ok(vector.segment == vector.storage, "vector.segment got %p expected %p\n", + vector.segment, vector.storage); ok(vector.first_block == 1, "vector.first_block got %ld expected 1\n", (long)vector.first_block); ok(vector.early_size == 3, "vector.early_size got %ld expected 3\n", (long)vector.early_size); - size = (size_t)call_func1(p_vector_base_v4__Internal_capacity, &vector); ok(size == 4, "size of vector got %ld expected %d\n", (long)size, 4); @@ -2912,9 +2914,11 @@ static void test_vector_base_v4(void) data = call_func3(p_vector_base_v4__Internal_push_back, &vector, sizeof(int), &idx); CHECK_CALLED(concurrent_vector_int_alloc); ok(data != NULL, "_Internal_push_back returned NULL\n"); - ok(idx == 4, "idx got %ld expected 2\n", (long)idx); + ok(idx == 4, "idx got %ld expected 4\n", (long)idx); vector_elem_count++; *data = 5; + ok(vector.segment == vector.storage, "vector.segment got %p expected %p\n", + vector.segment, vector.storage); 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); @@ -2929,7 +2933,8 @@ static void test_vector_base_v4(void) (long)v2.first_block); ok(v2.early_size == 5, "v2.early_size got %ld expected 5\n", (long)v2.early_size); - + ok(v2.segment == v2.storage, "v2.segment got %p expected %p\n", + v2.segment, v2.storage); SET_EXPECT(concurrent_vector_int_destroy); size = (size_t)call_func2(p_vector_base_v4__Internal_clear, &v2, concurrent_vector_int_destroy); @@ -2963,7 +2968,8 @@ static void test_vector_base_v4(void) (long)v2.first_block); ok(v2.early_size == 5, "v2.early_size got %ld expected 5\n", (long)v2.early_size); - + ok(v2.segment == v2.storage, "v2.segment got %p expected %p\n", + v2.segment, v2.storage); SET_EXPECT(concurrent_vector_int_destroy); size = (size_t)call_func2(p_vector_base_v4__Internal_clear, &v2, concurrent_vector_int_destroy); @@ -3018,6 +3024,8 @@ static void test_vector_base_v4(void) } ok(v2.first_block == 1, "v2.first_block got %ld expected 1\n", (long)v2.first_block); ok(v2.early_size == 4, "v2.early_size got %ld expected 4\n", (long)v2.early_size); + ok(v2.segment == v2.storage, "v2.segment got %p expected %p\n", + v2.segment, v2.storage); memset(&b, 0xff, sizeof(b)); SET_EXPECT(concurrent_vector_int_alloc); SET_EXPECT(concurrent_vector_int_copy); @@ -3031,6 +3039,8 @@ static void test_vector_base_v4(void) ok(v2.first_block == 2, "v2.first_block got %ld expected 2\n", (long)v2.first_block); ok(v2.early_size == 4,"v2.early_size got %ld expected 4\n", (long)v2.early_size); ok(b.first_block == 1, "b.first_block got %ld expected 1\n", (long)b.first_block); + ok(v2.segment == v2.storage, "v2.segment got %p expected %p\n", + v2.segment, v2.storage); for(i=0; i<2; i++){ ok(b.blocks[i] != NULL, "b.blocks[%d] got NULL\n", i); free(b.blocks[i]); @@ -3055,6 +3065,10 @@ static void test_vector_base_v4(void) vector_elem_count += 5; ok(v2.first_block == 2, "v2.first_block got %ld expected 2\n", (long)v2.first_block); ok(v2.early_size == 9, "v2.early_size got %ld expected 9\n", (long)v2.early_size); + ok(v2.segment != v2.storage, "v2.segment got %p expected %p\n", v2.segment, v2.storage); + for(i = 4;i < 32;i++) + ok(v2.segment[i] == 0, "v2.segment[%d] got %p expected 0\n", + i, v2.segment[i]); memset(&b, 0xff, sizeof(b)); SET_EXPECT(concurrent_vector_int_alloc); SET_EXPECT(concurrent_vector_int_copy); @@ -3068,6 +3082,10 @@ static void test_vector_base_v4(void) ok(v2.first_block == 4, "v2.first_block got %ld expected 4\n", (long)v2.first_block); ok(v2.early_size == 9, "v2.early_size got %ld expected 9\n", (long)v2.early_size); ok(b.first_block == 2, "b.first_block got %ld expected 2\n", (long)b.first_block); + ok(v2.segment != v2.storage, "v2.segment got %p expected %p\n", v2.segment, v2.storage); + for(i = 4;i < 32;i++) + ok(v2.segment[i] == 0, "v2.segment[%d] got %p\n", + i, v2.segment[i]); for(i=0; i<4; i++){ ok(b.blocks[i] != NULL, "b.blocks[%d] got NULL\n", i); /* only b.blocks[0] and b.blocks[>=b.first_block] are used */ @@ -3176,6 +3194,8 @@ static void test_vector_base_v4(void) 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); + ok(v2.segment == v2.storage, "v2.segment got %p expected %p\n", + v2.segment, v2.storage); 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); @@ -3184,12 +3204,27 @@ static void test_vector_base_v4(void) 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); + ok(v2.segment == v2.storage, "v2.segment got %p expected %p\n", + v2.segment, v2.storage); 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_alloc); + call_func4(p_vector_base_v4__Internal_reserve, + &v2, 9, sizeof(int), 16); + 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); + ok(v2.segment != v2.storage, "v2.segment got %p expected %p\n", v2.segment, v2.storage); + for(i = 4;i < 32;i++) + ok(v2.segment[i] == 0, "v2.segment[%d] got %p\n", + i, v2.segment[i]); + size = (size_t)call_func1(p_vector_base_v4__Internal_capacity, &v2); + ok(size == 16, "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); + ok(size == 4, "_Internal_clear returned %ld expected 4\n", (long)size); CHECK_CALLED(concurrent_vector_int_destroy); concurrent_vector_int_dtor(&v2); -- 2.11.0

1 0

Re: [PATCH 04/13] msvcp90: Add implementation of _Concurrent_vector_Internal_reserve.
by Marvin 31 Jul '18

31 Jul '18

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=40326 Your paranoid android. === debian9 (build) === error: patch failed: dlls/msvcp90/misc.c:2224 Task: Patch failed to apply

2 1

[PATCH 1/2] d3dcompiler_43/tests: Load d3dcompiler_43.dll dynamically.
by Jacek Caban 31 Jul '18

31 Jul '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- My motivation for this patch is the later patch. Another nice thing about this is that we could easily run tests on multiple d3dcompiler versions. For example, some tests currently fail if they are ran with d3dcompiler_47. We could just load different DLL versions in a loop and run tests multiple times. dlls/d3dcompiler_43/tests/Makefile.in | 2 +- dlls/d3dcompiler_43/tests/asm.c | 75 ++++++++++++-------- dlls/d3dcompiler_43/tests/blob.c | 122 +++++++++++++++++++-------------- dlls/d3dcompiler_43/tests/hlsl.c | 32 +++++++-- dlls/d3dcompiler_43/tests/reflection.c | 50 +++++++++----- 5 files changed, 179 insertions(+), 102 deletions(-)

3 2

[PATCH] d3dcompiler: Make types array static const.
by Matteo Bruni 31 Jul '18

31 Jul '18

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/d3dcompiler_43/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index b0232f375d6..748501f2074 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -1154,7 +1154,7 @@ static BOOL expr_compatible_data_types(struct hlsl_type *t1, struct hlsl_type *t static enum hlsl_base_type expr_common_base_type(enum hlsl_base_type t1, enum hlsl_base_type t2) { - enum hlsl_base_type types[] = + static const enum hlsl_base_type types[] = { HLSL_TYPE_BOOL, HLSL_TYPE_INT, -- 2.16.4

1 0

[PATCH] d3dxof: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 31 Jul '18

31 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dxof/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dxof/main.c b/dlls/d3dxof/main.c index 572f38831f..385609ace0 100644 --- a/dlls/d3dxof/main.c +++ b/dlls/d3dxof/main.c @@ -195,13 +195,13 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) && ! IsEqualGUID( &IID_IUnknown, riid) ) return E_NOINTERFACE; - for (i=0; i < sizeof(object_creation)/sizeof(object_creation[0]); i++) + for (i = 0; i < ARRAY_SIZE(object_creation); i++) { if (IsEqualGUID(object_creation[i].clsid, rclsid)) break; } - if (i == sizeof(object_creation)/sizeof(object_creation[0])) + if (i == ARRAY_SIZE(object_creation)) { FIXME("%s: no class found.\n", debugstr_guid(rclsid)); return CLASS_E_CLASSNOTAVAILABLE; -- 2.14.4

3 2

[PATCH] d3dcompiler: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 31 Jul '18

31 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dcompiler_43/compiler.c | 2 +- dlls/d3dcompiler_43/utils.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index 36e793ed01..10c6d01878 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -570,7 +570,7 @@ static const struct target_info targets_info[] = { static const struct target_info * get_target_info(const char *target) { LONG min = 0; - LONG max = sizeof(targets_info) / sizeof(targets_info[0]) - 1; + LONG max = ARRAY_SIZE(targets_info) - 1; LONG cur; int res; diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 79f3be8840..b0232f375d 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -1165,7 +1165,7 @@ static enum hlsl_base_type expr_common_base_type(enum hlsl_base_type t1, enum hl }; int t1_idx = -1, t2_idx = -1, i; - for (i = 0; i < sizeof(types) / sizeof(types[0]); ++i) + for (i = 0; i < ARRAY_SIZE(types); ++i) { /* Always convert away from HLSL_TYPE_HALF */ if (t1 == types[i]) @@ -1943,7 +1943,7 @@ static const char *debug_node_type(enum hlsl_ir_node_type type) "HLSL_IR_SWIZZLE", }; - if (type >= sizeof(names) / sizeof(names[0])) + if (type >= ARRAY_SIZE(names)) return "Unexpected node type"; return names[type]; } -- 2.14.4

3 2