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

Re: [PATCH 08/13] msvcp90: Add implementation of _Concurrent_vector_Internal_grow_by.
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=40330 Your paranoid android. === debian9 (build) === error: patch failed: dlls/msvcp90/misc.c:2224 Task: Patch failed to apply

1 0

Re: [PATCH 07/13] msvcp90: Add implementation of _Concurrent_vector_Internal_assign.
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=40329 Your paranoid android. === debian9 (build) === error: patch failed: dlls/msvcp90/misc.c:2224 Task: Patch failed to apply

1 0

Re: [PATCH 06/13] msvcp90: Add implementation of _Concurrent_vector_Internal_copy.
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=40328 Your paranoid android. === debian9 (build) === error: patch failed: dlls/msvcp90/misc.c:2224 Task: Patch failed to apply

1 0

Re: [PATCH 05/13] msvcp90: Add implementation of _Concurrent_vector_Internal_clear.
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=40327 Your paranoid android. === debian9 (build) === error: patch failed: dlls/msvcp90/misc.c:2224 Task: Patch failed to apply

1 0

[PATCH 13/13] msvcp90: Add implementation of _Concurrent_vector_Internal_push_back.
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 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 9d2a3ced88..680241dad3 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -2029,10 +2029,24 @@ MSVCP_size_t __thiscall _Concurrent_vector_base_v4__Internal_grow_to_at_least_wi /* ?_Internal_push_back(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEAAPEAX_KAEA_K(a)Z */ DEFINE_THISCALL_WRAPPER(_Concurrent_vector_base_v4__Internal_push_back, 12) void * __thiscall _Concurrent_vector_base_v4__Internal_push_back( - _Concurrent_vector_base_v4 *this, MSVCP_size_t len1, MSVCP_size_t *len2) + _Concurrent_vector_base_v4 *this, MSVCP_size_t element_size, MSVCP_size_t *idx) { - FIXME("(%p %ld %p) stub\n", this, len1, len2); - return NULL; + MSVCP_size_t index, seg, segment_base; + void *data; + + TRACE("(%p %ld %p)\n", this, element_size, idx); + + do { + index = this->early_size; + _Concurrent_vector_base_v4__Internal_reserve(this, index + 1, + element_size, MSVCP_SIZE_T_MAX / element_size); + } while(InterlockedCompareExchangeSizeT(&this->early_size, index + 1, index) != index); + seg = _vector_base_v4__Segment_index_of(index); + segment_base = (seg == 0) ? 0 : (1 << seg); + data = (BYTE*)this->segment[seg] + element_size * (index - segment_base); + *idx = index; + + return data; } /* ?_Internal_resize(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAEXIIIP6AXPAXI(a)ZP6AX0PBXI@Z2(a)Z */ -- 2.11.0

1 0

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

31 Jul '18

Signed-off-by: Hua meng <161220092(a)smail.nju.edu.cn> --- dlls/msvcp90/misc.c | 41 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 38 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 449a3b31eb..9d2a3ced88 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1616,6 +1616,13 @@ typedef struct __Concurrent_vector_base_v4 #define STORAGE_SIZE (sizeof(this->storage) / sizeof(this->storage[0])) #define SEGMENT_SIZE (sizeof(void*) * 8) +typedef struct compact_block +{ + MSVCP_size_t first_block; + void *blocks[SEGMENT_SIZE]; + int size_check; +}compact_block; + /* 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) @@ -1828,12 +1835,40 @@ MSVCP_size_t __thiscall _Concurrent_vector_base_v4__Internal_clear( /* ?_Internal_compact(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEAAPEAX_KPEAXP6AX10(a)ZP6AX1PEBX0@Z(a)Z */ DEFINE_THISCALL_WRAPPER(_Concurrent_vector_base_v4__Internal_compact, 20) void * __thiscall _Concurrent_vector_base_v4__Internal_compact( - _Concurrent_vector_base_v4 *this, MSVCP_size_t len, void *v, + _Concurrent_vector_base_v4 *this, MSVCP_size_t element_size, void *v, void (__cdecl *clear)(void*, MSVCP_size_t), void (__cdecl *copy)(void*, const void*, MSVCP_size_t)) { - FIXME("(%p %ld %p %p %p) stub\n", this, len, v, clear, copy); - return NULL; + compact_block *b; + MSVCP_size_t size, seg_no, copy_element, clear_element; + int i; + + TRACE("(%p %ld %p %p %p)\n", this, element_size, v, clear, copy); + + size = this->early_size; + seg_no = _vector_base_v4__Segment_index_of(size - 1); + if(this->first_block == seg_no + 1) return v; + b = v; + b->first_block = this->first_block; + memset(b->blocks, 0, sizeof(b->blocks)); + memcpy(b->blocks, this->segment, + (this->segment == this->storage ? STORAGE_SIZE : SEGMENT_SIZE) * sizeof(this->segment[0])); + memset(this->segment, 0, + (this->segment == this->storage ? STORAGE_SIZE : SEGMENT_SIZE) * sizeof(this->segment[0])); + this->first_block = 0; + _Concurrent_vector_base_v4__Internal_reserve(this, size, element_size, + MSVCP_SIZE_T_MAX / element_size); + for(i = 0; i < seg_no; i++) + copy(this->segment[i], b->blocks[i], i ? 1 << i : 2); + copy_element = size - ((1 << seg_no) & ~1); + if(copy_element > 0) + copy(this->segment[seg_no], b->blocks[seg_no], copy_element); + for(i = 0; i < seg_no; i++) + clear(b->blocks[i], i ? 1 << i : 2); + clear_element = size - ((1 << seg_no) & ~1); + if(clear_element > 0) + clear(b->blocks[seg_no], clear_element); + return v; } /* ?_Internal_copy(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAEXABV123(a)IP6AXPAXPBXI@Z(a)Z */ -- 2.11.0

1 0

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

31 Jul '18

Signed-off-by: Hua meng <161220092(a)smail.nju.edu.cn> --- dlls/msvcp90/misc.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index bf0f228c6b..449a3b31eb 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -2041,9 +2041,19 @@ void __thiscall _Concurrent_vector_base_v4__Internal_resize( /* ?_Internal_swap(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEAAXAEAV123@@Z */ DEFINE_THISCALL_WRAPPER(_Concurrent_vector_base_v4__Internal_swap, 8) void __thiscall _Concurrent_vector_base_v4__Internal_swap( - _Concurrent_vector_base_v4 *this, const _Concurrent_vector_base_v4 *v) + _Concurrent_vector_base_v4 *this, _Concurrent_vector_base_v4 *v) { - FIXME("(%p %p) stub\n", this, v); + _Concurrent_vector_base_v4 temp; + + TRACE("(%p %p)\n", this, v); + + temp = *this; + *this = *v; + *v = temp; + if(v->segment == this->storage) + v->segment = v->storage; + if(this->segment == v->storage) + this->segment = this->storage; } #endif -- 2.11.0

1 0

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

31 Jul '18

Signed-off-by: Hua meng <161220092(a)smail.nju.edu.cn> --- dlls/msvcp90/misc.c | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 454933d502..bf0f228c6b 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -2004,11 +2004,37 @@ void * __thiscall _Concurrent_vector_base_v4__Internal_push_back( /* ?_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) void __thiscall _Concurrent_vector_base_v4__Internal_resize( - _Concurrent_vector_base_v4 *this, MSVCP_size_t len1, MSVCP_size_t len2, - MSVCP_size_t len3, void (__cdecl *clear)(void*, MSVCP_size_t), + _Concurrent_vector_base_v4 *this, MSVCP_size_t resize, MSVCP_size_t element_size, + MSVCP_size_t max_size, void (__cdecl *clear)(void*, MSVCP_size_t), void (__cdecl *copy)(void*, const void*, MSVCP_size_t), const void *v) { - FIXME("(%p %ld %ld %ld %p %p %p) stub\n", this, len1, len2, len3, clear, copy, v); + MSVCP_size_t size, seg_no, end_seg_no, clear_element; + + TRACE("(%p %ld %ld %ld %p %p %p)\n", this, resize, element_size, max_size, clear, copy, v); + + if(resize > max_size) _vector_base_v4__Internal_throw_exception(this, 0); + size = this->early_size; + if(resize > size) + _Concurrent_vector_base_v4__Internal_grow_to_at_least_with_result(this, + resize, element_size, copy, v); + else if(resize == 0) + _Concurrent_vector_base_v4__Internal_clear(this, clear); + else if(resize < size) + { + seg_no = _vector_base_v4__Segment_index_of(size - 1); + end_seg_no = _vector_base_v4__Segment_index_of(resize - 1); + clear_element = size - (seg_no ? 1 << seg_no : 2); + if(clear_element > 0) + clear(this->segment[seg_no], clear_element); + if(seg_no) seg_no--; + for(; seg_no > end_seg_no; seg_no--) + clear(this->segment[seg_no], 1 << seg_no); + clear_element = (1 << (end_seg_no + 1)) - resize; + if(clear_element > 0) + clear((BYTE**)this->segment[end_seg_no] + element_size * (resize - ((1 << end_seg_no) & ~1)), + clear_element); + this->early_size = resize; + } } /* ?_Internal_swap(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAEXAAV123@@Z */ -- 2.11.0

1 0

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

31 Jul '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 6e54fb0873..454933d502 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1964,8 +1964,30 @@ MSVCP_size_t __thiscall _Concurrent_vector_base_v4__Internal_grow_to_at_least_wi _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); + + _Concurrent_vector_base_v4__Internal_reserve(this, count, element_size, + MSVCP_SIZE_T_MAX / element_size); + do { + size = this->early_size; + if(size >= count) return size; + } while(InterlockedCompareExchangeSizeT(&this->early_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(count - 1); + remain_size = min(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, count - (1 << last_seg_no)); + } + return size; } /* ?_Internal_push_back(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAEPAXIAAI(a)Z */ -- 2.11.0

1 0

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

31 Jul '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 af84a81b00..6e54fb0873 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1931,8 +1931,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