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

[PATCH 08/13 v3] msvcp90: Add implementation of _Concurrent_vector_Internal_grow_by.
by Hua Meng 02 Aug '18

02 Aug '18

Signed-off-by: Hua meng <161220092(a)smail.nju.edu.cn> --- dlls/msvcp90/misc.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 622888541a..8f7d4208d7 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -2100,8 +2100,30 @@ MSVCP_size_t __thiscall _Concurrent_vector_base_v4__Internal_grow_by( _Concurrent_vector_base_v4 *this, MSVCP_size_t count, MSVCP_size_t element_size, void (__cdecl *copy)(void*, const void*, MSVCP_size_t), const void *v) { - FIXME("(%p %ld %ld %p %p) stub\n", this, count, element_size, copy, v); - return 0; + MSVCP_size_t size, seg_no, last_seg_no, remain_size; + + TRACE("(%p %ld %ld %p %p)\n", this, count, element_size, copy, v); + + if(count == 0) return this->early_size; + do { + size = this->early_size; + _Concurrent_vector_base_v4__Internal_reserve(this, size + count, element_size, + MSVCP_SIZE_T_MAX / element_size); + } while(InterlockedCompareExchangeSizeT(&this->early_size, size + count, size) != size); + + seg_no = size ? _vector_base_v4__Segment_index_of(size - 1) : 0; + last_seg_no = _vector_base_v4__Segment_index_of(size + count - 1); + remain_size = min(size + count, 1 << (seg_no + 1)) - size; + if(remain_size > 0) + copy(((BYTE**)this->segment[seg_no] + element_size * (size - ((1 << seg_no) & ~1))), v, + remain_size); + if(seg_no != last_seg_no) + { + for(seg_no++; seg_no < last_seg_no; seg_no++) + copy(this->segment[seg_no], v, 1 << seg_no); + copy(this->segment[last_seg_no], v, size + count - (1 << last_seg_no)); + } + return size; } /* ?_Internal_grow_to_at_least_with_result(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAEIIIP6AXPAXPBXI(a)Z1@Z */ -- 2.11.0

1 0

[PATCH 07/13 v3] msvcp90: Add implementation of _Concurrent_vector_Internal_assign.
by Hua Meng 02 Aug '18

02 Aug '18

Signed-off-by: Hua meng <161220092(a)smail.nju.edu.cn> --- dlls/msvcp90/misc.c | 74 ++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 62 insertions(+), 12 deletions(-) diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index dcb29d4825..622888541a 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1912,18 +1912,6 @@ void __thiscall _Concurrent_vector_base_v4_dtor( free(this->segment); } -/* ?_Internal_assign(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAEXABV123(a)IP6AXPAXI@ZP6AX1PBXI(a)Z4@Z */ -/* ?_Internal_assign(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEAAXAEBV123(a)_KP6AXPEAX1@ZP6AX2PEBX1(a)Z5@Z */ -DEFINE_THISCALL_WRAPPER(_Concurrent_vector_base_v4__Internal_assign, 24) -void __thiscall _Concurrent_vector_base_v4__Internal_assign( - _Concurrent_vector_base_v4 *this, const _Concurrent_vector_base_v4 *v, - MSVCP_size_t len, void (__cdecl *func0)(void*, MSVCP_size_t), - void (__cdecl *func1)(void*, const void*, MSVCP_size_t), - void (__cdecl *func2)(void*, const void*, MSVCP_size_t)) -{ - FIXME("(%p %p %ld %p %p %p) stub\n", this, v, len, func0, func1, func2); -} - /* ?_Internal_capacity(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IBEIXZ */ /* ?_Internal_capacity(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEBA_KXZ */ DEFINE_THISCALL_WRAPPER(_Concurrent_vector_base_v4__Internal_capacity, 4) @@ -2043,6 +2031,68 @@ void __thiscall _Concurrent_vector_base_v4__Internal_copy( this->early_size = v_size; } +/* ?_Internal_assign(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAEXABV123(a)IP6AXPAXI@ZP6AX1PBXI(a)Z4@Z */ +/* ?_Internal_assign(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEAAXAEBV123(a)_KP6AXPEAX1@ZP6AX2PEBX1(a)Z5@Z */ +DEFINE_THISCALL_WRAPPER(_Concurrent_vector_base_v4__Internal_assign, 24) +void __thiscall _Concurrent_vector_base_v4__Internal_assign( + _Concurrent_vector_base_v4 *this, const _Concurrent_vector_base_v4 *v, + MSVCP_size_t element_size, void (__cdecl *clear)(void*, MSVCP_size_t), + void (__cdecl *assign)(void*, const void*, MSVCP_size_t), + void (__cdecl *copy)(void*, const void*, MSVCP_size_t)) +{ + MSVCP_size_t v_size, seg_no, v_seg_no, remain_element; + int i; + + TRACE("(%p %p %ld %p %p %p)\n", this, v, element_size, clear, assign, copy); + + v_size = v->early_size; + if(!v_size) { + _Concurrent_vector_base_v4__Internal_clear(this, clear); + return; + } + if(!this->early_size) { + _Concurrent_vector_base_v4__Internal_copy(this, v, element_size, copy); + return; + } + seg_no = _vector_base_v4__Segment_index_of(this->early_size - 1); + v_seg_no = _vector_base_v4__Segment_index_of(v_size - 1); + + for(i = 0; i < min(seg_no, v_seg_no); i++) + assign(this->segment[i], v->segment[i], i ? 1 <early_size, v_size) - (1 <segment[i], v->segment[i], remain_element); + + if(this->early_size > v_size) + { + if((i ? 1 < 0) + clear((BYTE**)this->segment[i] + element_size * remain_element, + (i ? 1 <segment[i], 1 << i); + clear(this->segment[i], this->early_size - (1 << i)); + } + } + else if(this->early_size < v_size) + { + if((i ? 1 < 0) + copy((BYTE**)this->segment[i] + element_size * remain_element, + (BYTE**)v->segment[i] + element_size * remain_element, + (i ? 1 <segment[i], v->segment[i], 1 << i); + copy(this->segment[i], v->segment[i], v->early_size - (1 << i)); + } + } + this->early_size = v_size; +} + /* ?_Internal_grow_by(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAEIIIP6AXPAXPBXI(a)Z1@Z */ /* ?_Internal_grow_by(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEAA_K_K0P6AXPEAXPEBX0(a)Z2@Z */ DEFINE_THISCALL_WRAPPER(_Concurrent_vector_base_v4__Internal_grow_by, 20) -- 2.11.0

1 0

[PATCH 06/13 v3] msvcp90: Add implementation of _Concurrent_vector_Internal_copy.
by Hua Meng 02 Aug '18

02 Aug '18

Signed-off-by: Hua meng <161220092(a)smail.nju.edu.cn> --- dlls/msvcp90/misc.c | 20 ++++++++++++++++++-- dlls/msvcp90/msvcp90.h | 1 + 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 20df187f66..dcb29d4825 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -2022,9 +2022,25 @@ void * __thiscall _Concurrent_vector_base_v4__Internal_compact( DEFINE_THISCALL_WRAPPER(_Concurrent_vector_base_v4__Internal_copy, 16) void __thiscall _Concurrent_vector_base_v4__Internal_copy( _Concurrent_vector_base_v4 *this, const _Concurrent_vector_base_v4 *v, - MSVCP_size_t len, void (__cdecl *copy)(void*, const void*, MSVCP_size_t)) + MSVCP_size_t element_size, void (__cdecl *copy)(void*, const void*, MSVCP_size_t)) { - FIXME("(%p %p %ld %p) stub\n", this, v, len, copy); + MSVCP_size_t seg_no, v_size; + int i; + + TRACE("(%p %p %ld %p)\n", this, v, element_size, copy); + + v_size = v->early_size; + if(!v_size) { + this->early_size = 0; + return; + } + _Concurrent_vector_base_v4__Internal_reserve(this, v_size, + element_size, MSVCP_SIZE_T_MAX / element_size); + seg_no = _vector_base_v4__Segment_index_of(v_size - 1); + for(i = 0; i < seg_no; i++) + copy(this->segment[i], v->segment[i], i ? 1 <segment[i], v->segment[i], v_size - (1 <early_size = v_size; } /* ?_Internal_grow_by(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAEIIIP6AXPAXPBXI(a)Z1@Z */ diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 16eaa48c53..40fbe4ba80 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -25,6 +25,7 @@ typedef unsigned char MSVCP_bool; typedef SIZE_T MSVCP_size_t; +#define MSVCP_SIZE_T_MAX (~(MSVCP_size_t)0) #if _MSVCP_VER >= 100 typedef __int64 DECLSPEC_ALIGN(8) streamoff; typedef __int64 DECLSPEC_ALIGN(8) streamsize; -- 2.11.0

1 0

[PATCH 05/13 v3] msvcp90: Add implementation of _Concurrent_vector_Internal_clear.
by Hua Meng 02 Aug '18

02 Aug '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 45d242066c..20df187f66 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 <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 v3] msvcp90: Add implementation of _Concurrent_vector_Internal_reserve.
by Hua Meng 02 Aug '18

02 Aug '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..45d242066c 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(*new_segment)); + memcpy(new_segment, this->storage, STORAGE_SIZE * sizeof(*new_segment)); + 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 v3] msvcp90: Add implementation of _Concurrent_vector_Internal_capacity.
by Hua Meng 02 Aug '18

02 Aug '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 v3] msvcp90: Add implementation of _Concurrent_vector_dtor.
by Hua Meng 02 Aug '18

02 Aug '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 v3] msvcp120: Add tests for _Concurrent_vector->segment.
by Hua Meng 02 Aug '18

02 Aug '18

Superseded patch 149109 to 149121 v3: fixed error in _Internal_reserve fixed error in _Internal_compact 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

[PATCH v3] winmm: Don't crash in waveOutOpen when nSamplesPerSec is 0 and add tests
by Fabian Maurer 02 Aug '18

02 Aug '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45530 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- v2: Fix test for XP and older v3: Move check up in code, Move test into existing tests --- dlls/winmm/tests/wave.c | 20 ++++++++++++++++++++ dlls/winmm/waveform.c | 7 +++++++ 2 files changed, 27 insertions(+) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index b402e21917..e490040be5 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -1415,6 +1415,26 @@ static void wave_out_test_device(UINT_PTR device) } else trace("waveOutOpen(%s): 32 bit float samples not supported\n", dev_name(device)); + + /* Test invalid parameters */ + + format.wFormatTag = WAVE_FORMAT_PCM; + format.nChannels = 1; + format.nSamplesPerSec = 11025; + format.nBlockAlign = 1; + format.nAvgBytesPerSec = 11025 * 1; + format.wBitsPerSample = 8; + format.cbSize = 0; + + format.nAvgBytesPerSec = 0; + rc = waveOutOpen(&wout, 0, &format, 0, 0, 0); + ok(rc == MMSYSERR_NOERROR, "Got %d\n", rc); + waveOutClose(wout); + format.nAvgBytesPerSec = 11025 * 1; + + format.nSamplesPerSec = 0; + rc = waveOutOpen(&wout, 0, &format, 0, 0, 0); + ok(rc == MMSYSERR_INVALPARAM || rc == WAVERR_BADFORMAT, "Got %d\n", rc); /* XP and lower return WAVERR_BADFORMAT */ } static void wave_out_tests(void) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 045bf4ac20..0a259c0f74 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -1088,6 +1088,13 @@ static LRESULT WINMM_OpenDevice(WINMM_Device *device, WINMM_OpenInfo *info, } if(info->format->wFormatTag == WAVE_FORMAT_PCM){ + + if (info->format->nSamplesPerSec == 0) + { + ret = MMSYSERR_INVALPARAM; + goto error; + } + /* we aren't guaranteed that the struct in lpFormat is a full * WAVEFORMATEX struct, which IAC::IsFormatSupported requires */ device->orig_fmt = HeapAlloc(GetProcessHeap(), 0, sizeof(WAVEFORMATEX)); -- 2.18.0

1 0

[PATCH v2] winmm: Don't crash in waveOutOpen when nSamplesPerSec is 0 and add tests
by Fabian Maurer 02 Aug '18

02 Aug '18

Fixes bug 45530 v2: Fix test for XP and older Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/winmm/tests/wave.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/winmm/waveform.c | 6 ++++++ 2 files changed, 44 insertions(+) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index b402e21917..cfc4c726be 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -1708,6 +1708,43 @@ static void test_PlaySound(void) DeleteFileA(test_file); } +static void test_waveOutOpen_invalid_parameter(void) +{ + HWAVEOUT handle; + MMRESULT ret; + WAVEFORMATEX wfx; + WAVEFORMATEX const const_wfx = { + .wFormatTag = WAVE_FORMAT_PCM, + .nChannels = 1, + .nSamplesPerSec = 11025, + .nBlockAlign = 1, + .nAvgBytesPerSec = 11025 * 1, + .wBitsPerSample = 8, + .cbSize = 0 + }; + + ret = waveOutOpen(&handle, 0, &const_wfx, 0, 0, 0); + if (ret != MMSYSERR_NOERROR) + { + skip("Could not to invalid parameter test\n"); + return; + } + waveOutClose(handle); + + /* Start actual tests */ + + wfx = const_wfx; + wfx.nAvgBytesPerSec = 0; + ret = waveOutOpen(&handle, 0, &wfx, 0, 0, 0); + ok(ret == MMSYSERR_NOERROR, "Got %d\n", ret); + waveOutClose(handle); + + wfx = const_wfx; + wfx.nSamplesPerSec = 0; + ret = waveOutOpen(&handle, 0, &wfx, 0, 0, 0); + ok(ret == MMSYSERR_INVALPARAM || ret == WAVERR_BADFORMAT, "Got %d\n", ret); /* XP and lower return WAVERR_BADFORMAT */ +} + START_TEST(wave) { test_multiple_waveopens(); @@ -1715,4 +1752,5 @@ START_TEST(wave) test_sndPlaySound(); test_fragmentsize(); test_PlaySound(); + test_waveOutOpen_invalid_parameter(); } diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 045bf4ac20..58f830dad9 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -1106,6 +1106,12 @@ static LRESULT WINMM_OpenDevice(WINMM_Device *device, WINMM_OpenInfo *info, WARN("Fixing bad nAvgBytesPerSec (%u)\n", device->orig_fmt->nAvgBytesPerSec); device->orig_fmt->nAvgBytesPerSec = device->orig_fmt->nSamplesPerSec * device->orig_fmt->nBlockAlign; } + + if (info->format->nSamplesPerSec == 0) + { + ret = MMSYSERR_INVALPARAM; + goto error; + } }else{ device->orig_fmt = HeapAlloc(GetProcessHeap(), 0, sizeof(WAVEFORMATEX) + info->format->cbSize); -- 2.18.0

2 2