wine-devel July 2018

wine-devel@winehq.org

74 participants
637 discussions

[PATCH 07/13] msvcp90: Add implementation of _Concurrent_vector_Internal_assign.
by Hua Meng 31 Jul '18

31 Jul '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 d116ca4df9..af84a81b00 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1743,18 +1743,6 @@ void __thiscall _Concurrent_vector_base_v4_dtor( free(this->segment); } -/* ?_Internal_assign@_Concurrent_vector_base_v4@details@Concurrency@@IAEXABV123@IP6AXPAXI@ZP6AX1PBXI@Z4@Z */ -/* ?_Internal_assign@_Concurrent_vector_base_v4@details@Concurrency@@IEAAXAEBV123@_KP6AXPEAX1@ZP6AX2PEBX1@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@_Concurrent_vector_base_v4@details@Concurrency@@IBEIXZ */ /* ?_Internal_capacity@_Concurrent_vector_base_v4@details@Concurrency@@IEBA_KXZ */ DEFINE_THISCALL_WRAPPER(_Concurrent_vector_base_v4__Internal_capacity, 4) @@ -1874,6 +1862,68 @@ void __thiscall _Concurrent_vector_base_v4__Internal_copy( this->early_size = v_size; } +/* ?_Internal_assign@_Concurrent_vector_base_v4@details@Concurrency@@IAEXABV123@IP6AXPAXI@ZP6AX1PBXI@Z4@Z */ +/* ?_Internal_assign@_Concurrent_vector_base_v4@details@Concurrency@@IEAAXAEBV123@_KP6AXPEAX1@ZP6AX2PEBX1@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@_Concurrent_vector_base_v4@details@Concurrency@@IAEIIIP6AXPAXPBXI@Z1@Z */ /* ?_Internal_grow_by@_Concurrent_vector_base_v4@details@Concurrency@@IEAA_K_K0P6AXPEAXPEBX0@Z2@Z */ DEFINE_THISCALL_WRAPPER(_Concurrent_vector_base_v4__Internal_grow_by, 20) -- 2.11.0

1 0

[PATCH 06/13] msvcp90: Add implementation of _Concurrent_vector_Internal_copy.
by Hua Meng 31 Jul '18

31 Jul '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 c3928099a3..d116ca4df9 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1853,9 +1853,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@_Concurrent_vector_base_v4@details@Concurrency@@IAEIIIP6AXPAXPBXI@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] 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 d629648579..c3928099a3 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1818,8 +1818,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@_Concurrent_vector_base_v4@details@Concurrency@@IAEPAXIPAXP6AX0I@ZP6AX0PBXI@Z@Z */ -- 2.11.0

1 0

[PATCH 04/13] msvcp90: Add implementation 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 | 233 ++++++++++++++++++++++++++++++++++------------------ 1 file changed, 154 insertions(+), 79 deletions(-) diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 2cfe6f7ed2..d629648579 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1603,6 +1603,7 @@ DEFINE_RTTI_DATA0(_Runtime_object, 0, ".?AV_Runtime_object@details@Concurrency@@ #endif +#if _MSVCP_VER >= 100 typedef struct __Concurrent_vector_base_v4 { void* (__cdecl *allocator)(struct __Concurrent_vector_base_v4 *, MSVCP_size_t); @@ -1615,6 +1616,121 @@ 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@_Concurrent_vector_base_v4@details@Concurrency@@KAII@Z */ +/* ?_Segment_index_of@_Concurrent_vector_base_v4@details@Concurrency@@KA_K_K@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@_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); +} + +#ifdef _WIN64 +static MSVCP_size_t InterlockedCompareExchangeSizeT(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@details@Concurrency@@IAE@XZ */ /* ??1_Concurrent_vector_base_v4@details@Concurrency@@IEAA@XZ */ DEFINE_THISCALL_WRAPPER(_Concurrent_vector_base_v4_dtor, 4) @@ -1659,6 +1775,43 @@ MSVCP_size_t __thiscall _Concurrent_vector_base_v4__Internal_capacity( return 1 << i; } +/* ?_Internal_reserve@_Concurrent_vector_base_v4@details@Concurrency@@IAEXIII@Z */ +/* ?_Internal_reserve@_Concurrent_vector_base_v4@details@Concurrency@@IEAAX_K00@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@_Concurrent_vector_base_v4@details@Concurrency@@IAEIP6AXPAXI@Z@Z */ /* ?_Internal_clear@_Concurrent_vector_base_v4@details@Concurrency@@IEAA_KP6AXPEAX_K@Z@Z */ DEFINE_THISCALL_WRAPPER(_Concurrent_vector_base_v4__Internal_clear, 8) @@ -1723,16 +1876,6 @@ void * __thiscall _Concurrent_vector_base_v4__Internal_push_back( return NULL; } -/* ?_Internal_reserve@_Concurrent_vector_base_v4@details@Concurrency@@IAEXIII@Z */ -/* ?_Internal_reserve@_Concurrent_vector_base_v4@details@Concurrency@@IEAAX_K00@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@_Concurrent_vector_base_v4@details@Concurrency@@IAEXIIIP6AXPAXI@ZP6AX0PBXI@Z2@Z */ /* ?_Internal_resize@_Concurrent_vector_base_v4@details@Concurrency@@IEAAX_K00P6AXPEAX0@ZP6AX1PEBX0@Z3@Z */ DEFINE_THISCALL_WRAPPER(_Concurrent_vector_base_v4__Internal_resize, 28) @@ -1752,6 +1895,7 @@ void __thiscall _Concurrent_vector_base_v4__Internal_swap( { FIXME("(%p %p) stub\n", this, v); } +#endif #ifndef __GNUC__ void __asm_dummy_vtables(void) { @@ -2224,75 +2368,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@_Concurrent_vector_base_v4@details@Concurrency@@KAII@Z */ -/* ?_Segment_index_of@_Concurrent_vector_base_v4@details@Concurrency@@KA_K_K@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@_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 - #if _MSVCP_VER >= 140 /* ?_IsNonBlockingThread@_Task_impl_base@details@Concurrency@@SA_NXZ */ MSVCP_bool __cdecl _Task_impl_base__IsNonBlockingThread(void) -- 2.11.0

1 0

[PATCH 03/13] msvcp90: Add implementation of _Concurrent_vector_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 90407f812d..2cfe6f7ed2 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1612,6 +1612,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@details@Concurrency@@IAE@XZ */ /* ??1_Concurrent_vector_base_v4@details@Concurrency@@IEAA@XZ */ DEFINE_THISCALL_WRAPPER(_Concurrent_vector_base_v4_dtor, 4) @@ -1642,8 +1645,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@_Concurrent_vector_base_v4@details@Concurrency@@IAEIP6AXPAXI@Z@Z */ -- 2.11.0

1 0

[PATCH 02/13] 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 701b2334e8..90407f812d 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1618,7 +1618,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@_Concurrent_vector_base_v4@details@Concurrency@@IAEXABV123@IP6AXPAXI@ZP6AX1PBXI@Z4@Z */ -- 2.11.0

1 0

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

31 Jul '18

Signed-off-by: Hua meng <161220092(a)smail.nju.edu.cn> --- dlls/msvcp120/tests/msvcp120.c | 47 ++++++++++++++++++++++++++++++++++++------ 1 file changed, 41 insertions(+), 6 deletions(-) mode change 100644 => 100755 dlls/msvcp120/tests/msvcp120.c diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c old mode 100644 new mode 100755 index 959f7a86da..a67dddf980 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -2818,7 +2818,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); @@ -2842,11 +2843,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); @@ -2862,9 +2864,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); @@ -2879,7 +2883,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); @@ -2912,7 +2917,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); @@ -2965,6 +2971,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); @@ -2978,6 +2986,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]); @@ -3002,6 +3012,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); @@ -3015,6 +3029,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 */ @@ -3122,6 +3140,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); @@ -3130,12 +3150,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] msscript.ocx: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 30 Jul '18

30 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index 746c2d3892..ae5edb7944 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -169,7 +169,7 @@ static void release_typelib(void) if(!typelib) return; - for(i=0; i < sizeof(typeinfos)/sizeof(*typeinfos); i++) + for(i = 0; i < ARRAY_SIZE(typeinfos); i++) if(typeinfos[i]) ITypeInfo_Release(typeinfos[i]); -- 2.14.4

1 0

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

30 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msctf/documentmgr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msctf/documentmgr.c b/dlls/msctf/documentmgr.c index cf4c601cff..9fa6b0f0dd 100644 --- a/dlls/msctf/documentmgr.c +++ b/dlls/msctf/documentmgr.c @@ -188,7 +188,7 @@ static HRESULT WINAPI DocumentMgr_Pop(ITfDocumentMgr *iface, DWORD dwFlags) { int i; - for (i = 0; i < sizeof(This->contextStack)/sizeof(This->contextStack[0]); i++) + for (i = 0; i < ARRAY_SIZE(This->contextStack); i++) if (This->contextStack[i]) { ITfThreadMgrEventSink_OnPopContext(This->ThreadMgrSink, This->contextStack[i]); -- 2.14.4

1 0

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

30 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mscms/profile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mscms/profile.c b/dlls/mscms/profile.c index f0c40877a1..cb4908cb27 100644 --- a/dlls/mscms/profile.c +++ b/dlls/mscms/profile.c @@ -295,7 +295,7 @@ BOOL WINAPI GetColorDirectoryW( PCWSTR machine, PWSTR buffer, PDWORD size ) if (machine || !size) return FALSE; - GetSystemDirectoryW( colordir, sizeof(colordir) / sizeof(WCHAR) ); + GetSystemDirectoryW( colordir, ARRAY_SIZE( colordir )); lstrcatW( colordir, colorsubdir ); len = lstrlenW( colordir ) * sizeof(WCHAR); -- 2.14.4

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
64
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-devel July 2018