August 2017 - Wine-commits - list.winehq.org

Paul Gofman : d3dx9: Remove case for annotation in get_parameter_element_by_name().
by Alexandre Julliard 08 Aug '17

08 Aug '17

Module: wine Branch: master Commit: ec199c9e0eaf9af6db04e89da152f4b325c1f41c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec199c9e0eaf9af6db04e89da… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed Jul 19 16:43:04 2017 +0300 d3dx9: Remove case for annotation in get_parameter_element_by_name(). Elements or struct members can't have annotations. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 5361b35..937536a 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -830,9 +830,6 @@ static struct d3dx_parameter *get_parameter_element_by_name(struct d3dx_paramete case '.': return get_parameter_by_name(NULL, temp_parameter, part); - case '@': - return get_annotation_by_name(temp_parameter->annotation_count, temp_parameter->annotations, part); - case '\0': TRACE("Returning parameter %p\n", temp_parameter); return temp_parameter;

1 0

Paul Gofman : d3dx9: Return NULL for child parameter' s annotation in get_parameter_by_name().
by Alexandre Julliard 08 Aug '17

08 Aug '17

Module: wine Branch: master Commit: f09bf52d5d2fec66b968bffbdd9a5b3a9027604c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f09bf52d5d2fec66b968bffbd… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed Jul 19 16:43:05 2017 +0300 d3dx9: Return NULL for child parameter's annotation in get_parameter_by_name(). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 937536a..48f5546 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -931,7 +931,9 @@ struct d3dx_parameter *get_parameter_by_name(struct d3dx9_base_effect *base, return get_parameter_by_name(NULL, temp_parameter, part); case '@': - return get_annotation_by_name(temp_parameter->annotation_count, temp_parameter->annotations, part); + return parameter ? NULL + : get_annotation_by_name(temp_parameter->annotation_count, + temp_parameter->annotations, part); case '[': return get_parameter_element_by_name(temp_parameter, part);

1 0

Paul Gofman : d3dx9: Move referenced_param definition from d3dx_parameter to d3dx_state.
by Alexandre Julliard 08 Aug '17

08 Aug '17

Module: wine Branch: master Commit: 3a10679b7a0afd58d3769cd0abcfe2f95403864a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a10679b7a0afd58d3769cd0a… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed Jul 19 16:43:06 2017 +0300 d3dx9: Move referenced_param definition from d3dx_parameter to d3dx_state. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/d3dx9_private.h | 8 ++----- dlls/d3dx9_36/effect.c | 56 ++++++++++++++++++++++--------------------- 2 files changed, 31 insertions(+), 33 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_private.h b/dlls/d3dx9_36/d3dx9_private.h index bf5ad7d..1136d48 100644 --- a/dlls/d3dx9_36/d3dx9_private.h +++ b/dlls/d3dx9_36/d3dx9_private.h @@ -306,11 +306,7 @@ struct d3dx_parameter struct d3dx_param_eval *param_eval; struct d3dx_parameter *top_level_param; - union - { - struct d3dx_parameter *referenced_param; - struct d3dx_shared_data *shared_data; - } u; + struct d3dx_shared_data *shared_data; }; struct d3dx_shared_data @@ -332,7 +328,7 @@ static inline BOOL is_param_dirty(struct d3dx_parameter *param, ULONG64 update_v { struct d3dx_shared_data *shared_data; - if ((shared_data = param->top_level_param->u.shared_data)) + if ((shared_data = param->top_level_param->shared_data)) return update_version < shared_data->update_version; else return update_version < param->top_level_param->update_version; diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 48f5546..d52301c 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -111,6 +111,7 @@ struct d3dx_state UINT index; enum STATE_TYPE type; struct d3dx_parameter parameter; + struct d3dx_parameter *referenced_param; }; struct d3dx_sampler @@ -1030,7 +1031,7 @@ static HRESULT d3dx9_get_param_value_ptr(struct d3dx_pass *pass, struct d3dx_sta switch (state->type) { case ST_PARAMETER: - param = param->u.referenced_param; + param = state->referenced_param; *param_dirty = is_param_dirty(param, pass->update_version); /* fallthrough */ case ST_CONSTANT: @@ -1061,7 +1062,7 @@ static HRESULT d3dx9_get_param_value_ptr(struct d3dx_pass *pass, struct d3dx_sta { array_idx = state->index; } - ref_param = param->u.referenced_param; + ref_param = state->referenced_param; TRACE("Array index %u, stored array index %u, element_count %u.\n", array_idx, state->index, ref_param->element_count); /* According to the tests, native d3dx handles the case of array index evaluated to -1 @@ -1498,7 +1499,7 @@ static void set_dirty(struct d3dx_parameter *param) struct d3dx_parameter *top_param = param->top_level_param; ULONG64 new_update_version = next_update_version(top_param->version_counter); - if ((shared_data = top_param->u.shared_data)) + if ((shared_data = top_param->shared_data)) shared_data->update_version = new_update_version; else top_param->update_version = new_update_version; @@ -3215,7 +3216,7 @@ static HRESULT d3dx_pool_sync_shared_parameter(struct d3dx_effect_pool *pool, st for (j = 0; j < pool->size; ++j) for (k = 0; k < new_alloc[j].count; ++k) - new_alloc[j].parameters[k]->u.shared_data = &new_alloc[j]; + new_alloc[j].parameters[k]->shared_data = &new_alloc[j]; } } pool->shared_data = new_alloc; @@ -3246,7 +3247,7 @@ static HRESULT d3dx_pool_sync_shared_parameter(struct d3dx_effect_pool *pool, st pool->shared_data[i].size = new_size; } - param->u.shared_data = &pool->shared_data[i]; + param->shared_data = &pool->shared_data[i]; pool->shared_data[i].parameters[new_count - 1] = param; TRACE("name %s, parameter idx %u, new refcount %u.\n", param->name, i, @@ -3265,11 +3266,11 @@ static void d3dx_pool_release_shared_parameter(struct d3dx_parameter *param) { unsigned int new_count; - if (!(param->flags & PARAMETER_FLAG_SHARED) || !param->u.shared_data) + if (!(param->flags & PARAMETER_FLAG_SHARED) || !param->shared_data) return; - new_count = --param->u.shared_data->count; + new_count = --param->shared_data->count; - TRACE("param %p, param->u.shared_data %p, new_count %d.\n", param, param->u.shared_data, new_count); + TRACE("param %p, param->shared_data %p, new_count %d.\n", param, param->shared_data, new_count); if (new_count) { @@ -3277,11 +3278,11 @@ static void d3dx_pool_release_shared_parameter(struct d3dx_parameter *param) for (i = 0; i < new_count; ++i) { - if (param->u.shared_data->parameters[i] == param) + if (param->shared_data->parameters[i] == param) { - memmove(&param->u.shared_data->parameters[i], - &param->u.shared_data->parameters[i + 1], - sizeof(param->u.shared_data->parameters[i]) * (new_count - i)); + memmove(&param->shared_data->parameters[i], + &param->shared_data->parameters[i + 1], + sizeof(param->shared_data->parameters[i]) * (new_count - i)); break; } } @@ -3289,10 +3290,10 @@ static void d3dx_pool_release_shared_parameter(struct d3dx_parameter *param) } else { - HeapFree(GetProcessHeap(), 0, param->u.shared_data->parameters); + HeapFree(GetProcessHeap(), 0, param->shared_data->parameters); /* Zeroing table size is required as the entry in pool parameters table can be reused. */ - param->u.shared_data->size = 0; - param->u.shared_data = NULL; + param->shared_data->size = 0; + param->shared_data = NULL; } } @@ -3982,7 +3983,7 @@ static BOOL walk_state_dep(struct d3dx_state *state, walk_parameter_dep_func par } else if (state->type == ST_ARRAY_SELECTOR || state->type == ST_PARAMETER) { - if (walk_parameter_dep(state->parameter.u.referenced_param, param_func, data)) + if (walk_parameter_dep(state->referenced_param, param_func, data)) return TRUE; } return walk_param_eval_dep(state->parameter.param_eval, param_func, data); @@ -5941,10 +5942,11 @@ static HRESULT d3dx9_create_object(struct d3dx9_base_effect *base, struct d3dx_o return D3D_OK; } -static HRESULT d3dx9_parse_array_selector(struct d3dx9_base_effect *base, struct d3dx_parameter *param, +static HRESULT d3dx9_parse_array_selector(struct d3dx9_base_effect *base, struct d3dx_state *state, const char **skip_constants, unsigned int skip_constants_count) { DWORD string_size; + struct d3dx_parameter *param = &state->parameter; struct d3dx_object *object = &base->objects[param->object_id]; char *ptr = object->data; HRESULT ret; @@ -5952,10 +5954,10 @@ static HRESULT d3dx9_parse_array_selector(struct d3dx9_base_effect *base, struct TRACE("Parsing array entry selection state for parameter %p.\n", param); string_size = *(DWORD *)ptr; - param->u.referenced_param = get_parameter_by_name(base, NULL, ptr + 4); - if (param->u.referenced_param) + state->referenced_param = get_parameter_by_name(base, NULL, ptr + 4); + if (state->referenced_param) { - TRACE("Mapping to parameter %s.\n", debugstr_a(param->u.referenced_param->name)); + TRACE("Mapping to parameter %s.\n", debugstr_a(state->referenced_param->name)); } else { @@ -5971,7 +5973,7 @@ static HRESULT d3dx9_parse_array_selector(struct d3dx9_base_effect *base, struct get_version_counter_ptr(base), NULL, 0))) return ret; ret = D3D_OK; - param = param->u.referenced_param; + param = state->referenced_param; if (param->type == D3DXPT_VERTEXSHADER || param->type == D3DXPT_PIXELSHADER) { unsigned int i; @@ -6135,10 +6137,10 @@ static HRESULT d3dx9_parse_resource(struct d3dx9_base_effect *base, const char * return hr; TRACE("Looking for parameter %s.\n", debugstr_a(object->data)); - param->u.referenced_param = get_parameter_by_name(base, NULL, object->data); - if (param->u.referenced_param) + state->referenced_param = get_parameter_by_name(base, NULL, object->data); + if (state->referenced_param) { - struct d3dx_parameter *refpar = param->u.referenced_param; + struct d3dx_parameter *refpar = state->referenced_param; TRACE("Mapping to parameter %p, having object id %u.\n", refpar, refpar->object_id); if (refpar->type == D3DXPT_VERTEXSHADER || refpar->type == D3DXPT_PIXELSHADER) @@ -6165,7 +6167,7 @@ static HRESULT d3dx9_parse_resource(struct d3dx9_base_effect *base, const char * state->type = ST_ARRAY_SELECTOR; if (FAILED(hr = d3dx9_copy_data(base, param->object_id, ptr))) return hr; - hr = d3dx9_parse_array_selector(base, param, skip_constants, skip_constants_count); + hr = d3dx9_parse_array_selector(base, state, skip_constants, skip_constants_count); break; default: @@ -6722,12 +6724,12 @@ static void free_effect_pool(struct d3dx_effect_pool *pool) WARN("Releasing pool with referenced parameters.\n"); param_set_data_pointer(pool->shared_data[i].parameters[0], NULL, FALSE, TRUE); - pool->shared_data[i].parameters[0]->u.shared_data = NULL; + pool->shared_data[i].parameters[0]->shared_data = NULL; for (j = 1; j < pool->shared_data[i].count; ++j) { walk_parameter_tree(pool->shared_data[i].parameters[j], param_zero_data_func, NULL); - pool->shared_data[i].parameters[j]->u.shared_data = NULL; + pool->shared_data[i].parameters[j]->shared_data = NULL; } HeapFree(GetProcessHeap(), 0, pool->shared_data[i].parameters); }

1 0

Paul Gofman : d3dx9: Use distinct structure for top level parameters.
by Alexandre Julliard 08 Aug '17

08 Aug '17

Module: wine Branch: master Commit: 847f772fe1d3d18b0095c6a965c7254554ef4932 URL: http://source.winehq.org/git/wine.git/?a=commit;h=847f772fe1d3d18b0095c6a96… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Aug 3 19:42:08 2017 +0200 d3dx9: Use distinct structure for top level parameters. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/d3dx9_private.h | 33 +++++--- dlls/d3dx9_36/effect.c | 172 ++++++++++++++++++++++-------------------- 2 files changed, 115 insertions(+), 90 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=847f772fe1d3d18b0095c…

1 0

Paul Gofman : d3dx9: Avoid an extra indirection in is_const_tab_input_dirty().
by Alexandre Julliard 08 Aug '17

08 Aug '17

Module: wine Branch: master Commit: d6f36ca18fc47cfd0fc1353feae0886c94f6bd5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6f36ca18fc47cfd0fc1353fe… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed Jul 19 16:43:08 2017 +0300 d3dx9: Avoid an extra indirection in is_const_tab_input_dirty(). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/d3dx9_private.h | 11 ++++++++--- dlls/d3dx9_36/preshader.c | 9 ++++++++- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_private.h b/dlls/d3dx9_36/d3dx9_private.h index 55b7431..2727463 100644 --- a/dlls/d3dx9_36/d3dx9_private.h +++ b/dlls/d3dx9_36/d3dx9_private.h @@ -339,14 +339,19 @@ static inline ULONG64 next_update_version(ULONG64 *version_counter) return ++*version_counter; } -static inline BOOL is_param_dirty(struct d3dx_parameter *param, ULONG64 update_version) +static inline BOOL is_top_level_param_dirty(struct d3dx_top_level_parameter *param, ULONG64 update_version) { struct d3dx_shared_data *shared_data; - if ((shared_data = param->top_level_param->shared_data)) + if ((shared_data = param->shared_data)) return update_version < shared_data->update_version; else - return update_version < param->top_level_param->update_version; + return update_version < param->update_version; +} + +static inline BOOL is_param_dirty(struct d3dx_parameter *param, ULONG64 update_version) +{ + return is_top_level_param_dirty(param->top_level_param, update_version); } struct d3dx_parameter *get_parameter_by_name(struct d3dx9_base_effect *base, diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index f39ddc2..29846a0 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -941,6 +941,12 @@ static HRESULT get_constants_desc(unsigned int *byte_code, struct d3dx_const_tab goto cleanup; } } + if (!is_top_level_parameter(inputs_param[index])) + { + WARN("Expected top level parameter '%s'.\n", debugstr_a(cdesc[index].Name)); + hr = E_FAIL; + goto cleanup; + } for (j = 0; j < skip_constants_count; ++j) { @@ -1618,7 +1624,8 @@ static BOOL is_const_tab_input_dirty(struct d3dx_const_tab *ctab, ULONG64 update update_version = ctab->update_version; for (i = 0; i < ctab->input_count; ++i) { - if (is_param_dirty(ctab->inputs_param[i], update_version)) + if (is_top_level_param_dirty(top_level_parameter_from_parameter(ctab->inputs_param[i]), + update_version)) return TRUE; } return FALSE;

1 0

Akihiro Sagawa : msvcrt/tests: Add tests for mbstowcs and wcstombs with empty strings.
by Alexandre Julliard 08 Aug '17

08 Aug '17

Module: wine Branch: master Commit: 82bf4edf36fd34f9fdadeddb991c6bf03dded871 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82bf4edf36fd34f9fdadeddb9… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Aug 4 23:06:37 2017 +0900 msvcrt/tests: Add tests for mbstowcs and wcstombs with empty strings. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/string.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index a59ed91..87e387a 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -1833,8 +1833,10 @@ static void test_mbstowcs(void) { static const wchar_t wSimple[] = { 't','e','x','t',0 }; static const wchar_t wHiragana[] = { 0x3042,0x3043,0 }; + static const wchar_t wEmpty[] = { 0 }; static const char mSimple[] = "text"; static const char mHiragana[] = { 0x82,0xa0,0x82,0xa1,0 }; + static const char mEmpty[] = { 0 }; const wchar_t *pwstr; wchar_t wOut[6]; @@ -1863,6 +1865,13 @@ static void test_mbstowcs(void) ok(!memcmp(wOut, wSimple, 4*sizeof(wchar_t)), "wOut = %s\n", wine_dbgstr_w(wOut)); ok(wOut[4] == '!', "wOut[4] != \'!\'\n"); + ret = mbstowcs(NULL, mEmpty, 1); + ok(ret == 0, "mbstowcs did not return 0, got %d\n", (int)ret); + + ret = mbstowcs(wOut, mEmpty, 1); + ok(ret == 0, "mbstowcs did not return 0, got %d\n", (int)ret); + ok(!memcmp(wOut, wEmpty, sizeof(wEmpty)), "wOut = %s\n", wine_dbgstr_w(wOut)); + ret = wcstombs(NULL, wSimple, 0); ok(ret == 4, "wcstombs did not return 4\n"); @@ -1874,6 +1883,13 @@ static void test_mbstowcs(void) ok(ret == 2, "wcstombs did not return 2\n"); ok(!memcmp(mOut, mSimple, 5*sizeof(char)), "mOut = %s\n", mOut); + ret = wcstombs(NULL, wEmpty, 1); + ok(ret == 0, "wcstombs did not return 0, got %d\n", (int)ret); + + ret = wcstombs(mOut, wEmpty, 1); + ok(ret == 0, "wcstombs did not return 0, got %d\n", (int)ret); + ok(!memcmp(mOut, mEmpty, sizeof(mEmpty)), "mOut = %s\n", mOut); + if(!setlocale(LC_ALL, "Japanese_Japan.932")) { win_skip("Japanese_Japan.932 locale not available\n"); return; @@ -1883,10 +1899,18 @@ static void test_mbstowcs(void) ok(ret == 2, "mbstowcs did not return 2\n"); ok(!memcmp(wOut, wHiragana, sizeof(wHiragana)), "wOut = %s\n", wine_dbgstr_w(wOut)); + ret = mbstowcs(wOut, mEmpty, 6); + todo_wine ok(ret == 0, "mbstowcs did not return 0, got %d\n", (int)ret); + ok(!memcmp(wOut, wEmpty, sizeof(wEmpty)), "wOut = %s\n", wine_dbgstr_w(wOut)); + ret = wcstombs(mOut, wHiragana, 6); ok(ret == 4, "wcstombs did not return 4\n"); ok(!memcmp(mOut, mHiragana, sizeof(mHiragana)), "mOut = %s\n", mOut); + ret = wcstombs(mOut, wEmpty, 6); + ok(ret == 0, "wcstombs did not return 0, got %d\n", (int)ret); + ok(!memcmp(mOut, mEmpty, sizeof(mEmpty)), "mOut = %s\n", mOut); + if(!pmbstowcs_s || !pwcstombs_s) { setlocale(LC_ALL, "C"); win_skip("mbstowcs_s or wcstombs_s not available\n"); @@ -1903,6 +1927,11 @@ static void test_mbstowcs(void) ok(ret == 3, "mbstowcs_s did not return 3\n"); ok(!memcmp(wOut, wHiragana, sizeof(wHiragana)), "wOut = %s\n", wine_dbgstr_w(wOut)); + err = pmbstowcs_s(&ret, wOut, 6, mEmpty, _TRUNCATE); + todo_wine ok(err == 0, "err = %d\n", err); + todo_wine ok(ret == 1, "mbstowcs_s did not return 1, got %d\n", (int)ret); + ok(!memcmp(wOut, wEmpty, sizeof(wEmpty)), "wOut = %s\n", wine_dbgstr_w(wOut)); + err = pmbstowcs_s(&ret, NULL, 0, mHiragana, 1); ok(err == 0, "err = %d\n", err); ok(ret == 3, "mbstowcs_s did not return 3\n"); @@ -1917,6 +1946,11 @@ static void test_mbstowcs(void) ok(ret == 5, "wcstombs_s did not return 5\n"); ok(!memcmp(mOut, mHiragana, sizeof(mHiragana)), "mOut = %s\n", mOut); + err = pwcstombs_s(&ret, mOut, 6, wEmpty, _TRUNCATE); + ok(err == 0, "err = %d\n", err); + ok(ret == 1, "wcstombs_s did not return 1, got %d\n", (int)ret); + ok(!memcmp(mOut, mEmpty, sizeof(mEmpty)), "mOut = %s\n", mOut); + err = pwcstombs_s(&ret, NULL, 0, wHiragana, 1); ok(err == 0, "err = %d\n", err); ok(ret == 5, "wcstombs_s did not return 5\n");

1 0

Akihiro Sagawa : msvcrt: Fix mbstowcs with empty strings.
by Alexandre Julliard 08 Aug '17

08 Aug '17

Module: wine Branch: master Commit: 967fb744e4af99b61e6af9a7c2ddde4640b54ebf URL: http://source.winehq.org/git/wine.git/?a=commit;h=967fb744e4af99b61e6af9a7c… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Aug 4 23:06:39 2017 +0900 msvcrt: Fix mbstowcs with empty strings. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/mbcs.c | 14 ++++++++------ dlls/msvcrt/tests/string.c | 6 +++--- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 93bb1a7..49d6678 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -2278,12 +2278,14 @@ MSVCRT_size_t CDECL MSVCRT__mbstowcs_l(MSVCRT_wchar_t *wcstr, const char *mbstr, size += (MSVCRT__isleadbyte_l((unsigned char)mbstr[size], locale) ? 2 : 1); } - size = MultiByteToWideChar(locinfo->lc_codepage, 0, - mbstr, size, wcstr, count); - if(!size) { - if(count) wcstr[0] = '\0'; - *MSVCRT__errno() = MSVCRT_EILSEQ; - return -1; + if(size) { + size = MultiByteToWideChar(locinfo->lc_codepage, 0, + mbstr, size, wcstr, count); + if(!size) { + if(count) wcstr[0] = '\0'; + *MSVCRT__errno() = MSVCRT_EILSEQ; + return -1; + } } if(size<count && wcstr) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 87e387a..8de2f43 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -1900,7 +1900,7 @@ static void test_mbstowcs(void) ok(!memcmp(wOut, wHiragana, sizeof(wHiragana)), "wOut = %s\n", wine_dbgstr_w(wOut)); ret = mbstowcs(wOut, mEmpty, 6); - todo_wine ok(ret == 0, "mbstowcs did not return 0, got %d\n", (int)ret); + ok(ret == 0, "mbstowcs did not return 0, got %d\n", (int)ret); ok(!memcmp(wOut, wEmpty, sizeof(wEmpty)), "wOut = %s\n", wine_dbgstr_w(wOut)); ret = wcstombs(mOut, wHiragana, 6); @@ -1928,8 +1928,8 @@ static void test_mbstowcs(void) ok(!memcmp(wOut, wHiragana, sizeof(wHiragana)), "wOut = %s\n", wine_dbgstr_w(wOut)); err = pmbstowcs_s(&ret, wOut, 6, mEmpty, _TRUNCATE); - todo_wine ok(err == 0, "err = %d\n", err); - todo_wine ok(ret == 1, "mbstowcs_s did not return 1, got %d\n", (int)ret); + ok(err == 0, "err = %d\n", err); + ok(ret == 1, "mbstowcs_s did not return 1, got %d\n", (int)ret); ok(!memcmp(wOut, wEmpty, sizeof(wEmpty)), "wOut = %s\n", wine_dbgstr_w(wOut)); err = pmbstowcs_s(&ret, NULL, 0, mHiragana, 1);

1 0

Piotr Caban : msvcrt: Fix strcpy implementation so it works on overlapping buffers.
by Alexandre Julliard 08 Aug '17

08 Aug '17

Module: wine Branch: master Commit: 395a65bdc6c576a084c8008e42c95b9750421e86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=395a65bdc6c576a084c8008e4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Aug 5 18:23:13 2017 +0200 msvcrt: Fix strcpy implementation so it works on overlapping buffers. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/string.c | 10 ++++++++++ dlls/msvcrt/tests/string.c | 15 +++++++++++++-- dlls/ucrtbase/ucrtbase.spec | 2 +- 11 files changed, 32 insertions(+), 11 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 7379774..b6b10ba 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1800,7 +1800,7 @@ @ cdecl strchr(str long) MSVCRT_strchr @ cdecl strcmp(str str) MSVCRT_strcmp @ cdecl strcoll(str str) MSVCRT_strcoll -@ cdecl strcpy(ptr str) ntdll.strcpy +@ cdecl strcpy(ptr str) MSVCRT_strcpy @ cdecl strcpy_s(ptr long str) MSVCRT_strcpy_s @ cdecl strcspn(str str) ntdll.strcspn @ cdecl strerror(long) MSVCRT_strerror diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 0a307ec..b36cb3a 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -2158,7 +2158,7 @@ @ cdecl strchr(str long) MSVCRT_strchr @ cdecl strcmp(str str) MSVCRT_strcmp @ cdecl strcoll(str str) MSVCRT_strcoll -@ cdecl strcpy(ptr str) ntdll.strcpy +@ cdecl strcpy(ptr str) MSVCRT_strcpy @ cdecl strcpy_s(ptr long str) MSVCRT_strcpy_s @ cdecl strcspn(str str) ntdll.strcspn @ cdecl strerror(long) MSVCRT_strerror diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 81bef04..77daf09 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2368,7 +2368,7 @@ @ cdecl strchr(str long) MSVCRT_strchr @ cdecl strcmp(str str) MSVCRT_strcmp @ cdecl strcoll(str str) MSVCRT_strcoll -@ cdecl strcpy(ptr str) ntdll.strcpy +@ cdecl strcpy(ptr str) MSVCRT_strcpy @ cdecl strcpy_s(ptr long str) MSVCRT_strcpy_s @ cdecl strcspn(str str) ntdll.strcspn @ cdecl strerror(long) MSVCRT_strerror diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index 962ec06..bbfbea1 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -813,7 +813,7 @@ @ cdecl strchr(str long) MSVCRT_strchr @ cdecl strcmp(str str) MSVCRT_strcmp @ cdecl strcoll(str str) MSVCRT_strcoll -@ cdecl strcpy(ptr str) ntdll.strcpy +@ cdecl strcpy(ptr str) MSVCRT_strcpy @ cdecl strcspn(str str) ntdll.strcspn @ cdecl strerror(long) MSVCRT_strerror @ cdecl strftime(ptr long str ptr) MSVCRT_strftime diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index b32aac4..f9c5afe 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -809,7 +809,7 @@ @ cdecl strchr(str long) MSVCRT_strchr @ cdecl strcmp(str str) MSVCRT_strcmp @ cdecl strcoll(str str) MSVCRT_strcoll -@ cdecl strcpy(ptr str) ntdll.strcpy +@ cdecl strcpy(ptr str) MSVCRT_strcpy @ cdecl strcspn(str str) ntdll.strcspn @ cdecl strerror(long) MSVCRT_strerror @ cdecl strftime(ptr long str ptr) MSVCRT_strftime diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 744eb64..5bfa4ac 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1480,7 +1480,7 @@ @ cdecl strchr(str long) MSVCRT_strchr @ cdecl strcmp(str str) MSVCRT_strcmp @ cdecl strcoll(str str) MSVCRT_strcoll -@ cdecl strcpy(ptr str) ntdll.strcpy +@ cdecl strcpy(ptr str) MSVCRT_strcpy @ cdecl strcpy_s(ptr long str) MSVCRT_strcpy_s @ cdecl strcspn(str str) ntdll.strcspn @ cdecl strerror(long) MSVCRT_strerror diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index e405b2d..e39fdee 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1453,7 +1453,7 @@ @ cdecl strchr(str long) MSVCRT_strchr @ cdecl strcmp(str str) MSVCRT_strcmp @ cdecl strcoll(str str) MSVCRT_strcoll -@ cdecl strcpy(ptr str) ntdll.strcpy +@ cdecl strcpy(ptr str) MSVCRT_strcpy @ cdecl strcpy_s(ptr long str) MSVCRT_strcpy_s @ cdecl strcspn(str str) ntdll.strcspn @ cdecl strerror(long) MSVCRT_strerror diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index bdef9be..c23c72b 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1421,7 +1421,7 @@ @ cdecl strchr(str long) MSVCRT_strchr @ cdecl strcmp(str str) MSVCRT_strcmp @ cdecl strcoll(str str) MSVCRT_strcoll -@ cdecl strcpy(ptr str) ntdll.strcpy +@ cdecl strcpy(ptr str) MSVCRT_strcpy @ cdecl strcpy_s(ptr long str) MSVCRT_strcpy_s @ cdecl strcspn(str str) ntdll.strcspn @ cdecl strerror(long) MSVCRT_strerror diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 3e765d0..8d6b48c 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -697,6 +697,16 @@ char* __cdecl MSVCRT_strncpy(char *dst, const char *src, MSVCRT_size_t len) } /********************************************************************* + * strcpy (MSVCRT.@) + */ +char* CDECL MSVCRT_strcpy(char *dst, const char *src) +{ + char *ret = dst; + while ((*dst++ = *src++)); + return ret; +} + +/********************************************************************* * strcpy_s (MSVCRT.@) */ int CDECL MSVCRT_strcpy_s( char* dst, MSVCRT_size_t elem, const char* src ) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 8de2f43..04e20c1 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -56,6 +56,7 @@ static void* (__cdecl *pmemcpy)(void *, const void *, size_t n); static int (__cdecl *p_memcpy_s)(void *, size_t, const void *, size_t); static int (__cdecl *p_memmove_s)(void *, size_t, const void *, size_t); static int* (__cdecl *pmemcmp)(void *, const void *, size_t n); +static int (__cdecl *p_strcpy)(char *dst, const char *src); static int (__cdecl *pstrcpy_s)(char *dst, size_t len, const char *src); static int (__cdecl *pstrcat_s)(char *dst, size_t len, const char *src); static int (__cdecl *p_mbscat_s)(unsigned char *dst, size_t size, const unsigned char *src); @@ -493,8 +494,8 @@ static void test_strdup(void) static void test_strcpy_s(void) { char dest[8]; - const char *small = "small"; - const char *big = "atoolongstringforthislittledestination"; + const char small[] = "small"; + const char big[] = "atoolongstringforthislittledestination"; int ret; if(!pstrcpy_s) @@ -543,6 +544,15 @@ static void test_strcpy_s(void) ret = pstrcpy_s(NULL, sizeof(dest), small); ok(ret == EINVAL, "Copying a big string a NULL dest returned %d, expected EINVAL\n", ret); + + /* strcpy overlapping buffers test */ + memset(dest, 'X', sizeof(dest)); + memcpy(dest+1, small, sizeof(small)); + p_strcpy(dest, dest+1); + ok(dest[0] == 's' && dest[1] == 'm' && dest[2] == 'a' && dest[3] == 'l' && + dest[4] == 'l' && dest[5] == '\0' && dest[6] == '\0' && dest[7] == 'X', + "Unexpected return data from strcpy: 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x\n", + dest[0], dest[1], dest[2], dest[3], dest[4], dest[5], dest[6], dest[7]); } #define NUMELMS(array) (sizeof(array)/sizeof((array)[0])) @@ -3199,6 +3209,7 @@ START_TEST(string) SET(pmemcmp,"memcmp"); SET(p_mbctype,"_mbctype"); SET(p__mb_cur_max,"__mb_cur_max"); + SET(p_strcpy, "strcpy"); pstrcpy_s = (void *)GetProcAddress( hMsvcrt,"strcpy_s" ); pstrcat_s = (void *)GetProcAddress( hMsvcrt,"strcat_s" ); p_mbscat_s = (void*)GetProcAddress( hMsvcrt, "_mbscat_s" ); diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index a8e4e21..7a07b71 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2499,7 +2499,7 @@ @ cdecl strchr(str long) MSVCRT_strchr @ cdecl strcmp(str str) MSVCRT_strcmp @ cdecl strcoll(str str) MSVCRT_strcoll -@ cdecl strcpy(ptr str) ntdll.strcpy +@ cdecl strcpy(ptr str) MSVCRT_strcpy @ cdecl strcpy_s(ptr long str) MSVCRT_strcpy_s @ cdecl strcspn(str str) ntdll.strcspn @ cdecl strerror(long) MSVCRT_strerror

1 0

Józef Kucia : wined3d: Factor out context_copy_bo_address() function.
by Alexandre Julliard 08 Aug '17

08 Aug '17

Module: wine Branch: master Commit: 5d71c48cb32ad5de62f0f994b1fff9adc4f5aaa5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d71c48cb32ad5de62f0f994b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Aug 4 19:53:47 2017 +0200 wined3d: Factor out context_copy_bo_address() function. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 50 ++++-------------------------------------- dlls/wined3d/context.c | 48 ++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 3 +++ 3 files changed, 55 insertions(+), 46 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index f9cb251..b299fe7 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1194,68 +1194,26 @@ static void wined3d_buffer_unmap(struct wined3d_buffer *buffer) HRESULT wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_offset, struct wined3d_buffer *src_buffer, unsigned int src_offset, unsigned int size) { - const struct wined3d_gl_info *gl_info; struct wined3d_bo_address dst, src; struct wined3d_context *context; - struct wined3d_device *device; - BYTE *dst_ptr, *src_ptr; DWORD dst_location; buffer_mark_used(dst_buffer); buffer_mark_used(src_buffer); - device = dst_buffer->resource.device; - - context = context_acquire(device, NULL, 0); - gl_info = context->gl_info; - dst_location = wined3d_buffer_get_memory(dst_buffer, &dst, dst_buffer->locations); dst.addr += dst_offset; wined3d_buffer_get_memory(src_buffer, &src, src_buffer->locations); src.addr += src_offset; - if (dst.buffer_object && src.buffer_object) - { - if (gl_info->supported[ARB_COPY_BUFFER]) - { - GL_EXTCALL(glBindBuffer(GL_COPY_READ_BUFFER, src.buffer_object)); - GL_EXTCALL(glBindBuffer(GL_COPY_WRITE_BUFFER, dst.buffer_object)); - GL_EXTCALL(glCopyBufferSubData(GL_COPY_READ_BUFFER, GL_COPY_WRITE_BUFFER, - src_offset, dst_offset, size)); - checkGLcall("direct buffer copy"); - } - else - { - src_ptr = context_map_bo_address(context, &src, size, src_buffer->buffer_type_hint, WINED3D_MAP_READONLY); - dst_ptr = context_map_bo_address(context, &dst, size, dst_buffer->buffer_type_hint, 0); - - memcpy(dst_ptr, src_ptr, size); - - context_unmap_bo_address(context, &dst, dst_buffer->buffer_type_hint); - context_unmap_bo_address(context, &src, src_buffer->buffer_type_hint); - } - } - else if (!dst.buffer_object && src.buffer_object) - { - buffer_bind(src_buffer, context); - GL_EXTCALL(glGetBufferSubData(src_buffer->buffer_type_hint, src_offset, size, dst.addr)); - checkGLcall("buffer download"); - } - else if (dst.buffer_object && !src.buffer_object) - { - buffer_bind(dst_buffer, context); - GL_EXTCALL(glBufferSubData(dst_buffer->buffer_type_hint, dst_offset, size, src.addr)); - checkGLcall("buffer upload"); - } - else - { - memcpy(dst.addr, src.addr, size); - } + context = context_acquire(dst_buffer->resource.device, NULL, 0); + context_copy_bo_address(context, &dst, dst_buffer->buffer_type_hint, + &src, src_buffer->buffer_type_hint, size); + context_release(context); wined3d_buffer_invalidate_range(dst_buffer, ~dst_location, dst_offset, size); - context_release(context); return WINED3D_OK; } diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index e084d1c..a2c0ba4 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2752,6 +2752,54 @@ void context_unmap_bo_address(struct wined3d_context *context, checkGLcall("Unmap buffer object"); } +void context_copy_bo_address(struct wined3d_context *context, + const struct wined3d_bo_address *dst, GLenum dst_binding, + const struct wined3d_bo_address *src, GLenum src_binding, size_t size) +{ + const struct wined3d_gl_info *gl_info; + BYTE *dst_ptr, *src_ptr; + + gl_info = context->gl_info; + + if (dst->buffer_object && src->buffer_object) + { + if (gl_info->supported[ARB_COPY_BUFFER]) + { + GL_EXTCALL(glBindBuffer(GL_COPY_READ_BUFFER, src->buffer_object)); + GL_EXTCALL(glBindBuffer(GL_COPY_WRITE_BUFFER, dst->buffer_object)); + GL_EXTCALL(glCopyBufferSubData(GL_COPY_READ_BUFFER, GL_COPY_WRITE_BUFFER, + (GLintptr)src->addr, (GLintptr)dst->addr, size)); + checkGLcall("direct buffer copy"); + } + else + { + src_ptr = context_map_bo_address(context, src, size, src_binding, WINED3D_MAP_READONLY); + dst_ptr = context_map_bo_address(context, dst, size, dst_binding, 0); + + memcpy(dst_ptr, src_ptr, size); + + context_unmap_bo_address(context, dst, dst_binding); + context_unmap_bo_address(context, src, src_binding); + } + } + else if (!dst->buffer_object && src->buffer_object) + { + context_bind_bo(context, src_binding, src->buffer_object); + GL_EXTCALL(glGetBufferSubData(src_binding, (GLintptr)src->addr, size, dst->addr)); + checkGLcall("buffer download"); + } + else if (dst->buffer_object && !src->buffer_object) + { + context_bind_bo(context, dst_binding, dst->buffer_object); + GL_EXTCALL(glBufferSubData(dst_binding, (GLintptr)dst->addr, size, src->addr)); + checkGLcall("buffer upload"); + } + else + { + memcpy(dst->addr, src->addr, size); + } +} + static void context_set_render_offscreen(struct wined3d_context *context, BOOL offscreen) { if (context->render_offscreen == offscreen) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index eae451b..2270ae0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2073,6 +2073,9 @@ void context_bind_dummy_textures(const struct wined3d_device *device, const struct wined3d_context *context) DECLSPEC_HIDDEN; void context_bind_texture(struct wined3d_context *context, GLenum target, GLuint name) DECLSPEC_HIDDEN; void context_check_fbo_status(const struct wined3d_context *context, GLenum target) DECLSPEC_HIDDEN; +void context_copy_bo_address(struct wined3d_context *context, + const struct wined3d_bo_address *dst, GLenum dst_binding, + const struct wined3d_bo_address *src, GLenum src_binding, size_t size) DECLSPEC_HIDDEN; struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, struct wined3d_texture *target, const struct wined3d_format *ds_format) DECLSPEC_HIDDEN; HGLRC context_create_wgl_attribs(const struct wined3d_gl_info *gl_info, HDC hdc, HGLRC share_ctx) DECLSPEC_HIDDEN;

1 0

Józef Kucia : wined3d: Implement copying UAV counters.
by Alexandre Julliard 08 Aug '17

08 Aug '17

Module: wine Branch: master Commit: 24c39103be95d6fab75be663800ef90c180260c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24c39103be95d6fab75be6638… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Aug 4 19:53:48 2017 +0200 wined3d: Implement copying UAV counters. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/wined3d/device.c | 9 +++++++++ dlls/wined3d/view.c | 21 +++++++++++++++++++++ dlls/wined3d/wined3d.spec | 1 + dlls/wined3d/wined3d_private.h | 4 ++++ include/wine/wined3d.h | 2 ++ 6 files changed, 76 insertions(+) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index c785b72..307cb57 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -70,6 +70,7 @@ enum wined3d_cs_op WINED3D_CS_OP_UPDATE_SUB_RESOURCE, WINED3D_CS_OP_ADD_DIRTY_TEXTURE_REGION, WINED3D_CS_OP_CLEAR_UNORDERED_ACCESS_VIEW, + WINED3D_CS_OP_COPY_UAV_COUNTER, WINED3D_CS_OP_STOP, }; @@ -418,6 +419,14 @@ struct wined3d_cs_clear_unordered_access_view struct wined3d_uvec4 clear_value; }; +struct wined3d_cs_copy_uav_counter +{ + enum wined3d_cs_op opcode; + struct wined3d_buffer *buffer; + unsigned int offset; + struct wined3d_unordered_access_view *view; +}; + struct wined3d_cs_stop { enum wined3d_cs_op opcode; @@ -2228,6 +2237,35 @@ void wined3d_cs_emit_clear_unordered_access_view_uint(struct wined3d_cs *cs, cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); } +static void wined3d_cs_exec_copy_uav_counter(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_cs_copy_uav_counter *op = data; + struct wined3d_unordered_access_view *view = op->view; + struct wined3d_context *context; + + context = context_acquire(cs->device, NULL, 0); + wined3d_unordered_access_view_copy_counter(view, op->buffer, op->offset, context); + context_release(context); + + wined3d_resource_release(&op->buffer->resource); +} + +void wined3d_cs_emit_copy_uav_counter(struct wined3d_cs *cs, struct wined3d_buffer *dst_buffer, + unsigned int offset, struct wined3d_unordered_access_view *uav) +{ + struct wined3d_cs_copy_uav_counter *op; + + op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op->opcode = WINED3D_CS_OP_COPY_UAV_COUNTER; + op->buffer = dst_buffer; + op->offset = offset; + op->view = uav; + + wined3d_resource_acquire(&dst_buffer->resource); + + cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); +} + static void wined3d_cs_emit_stop(struct wined3d_cs *cs) { struct wined3d_cs_stop *op; @@ -2285,6 +2323,7 @@ static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void /* WINED3D_CS_OP_UPDATE_SUB_RESOURCE */ wined3d_cs_exec_update_sub_resource, /* WINED3D_CS_OP_ADD_DIRTY_TEXTURE_REGION */ wined3d_cs_exec_add_dirty_texture_region, /* WINED3D_CS_OP_CLEAR_UNORDERED_ACCESS_VIEW */ wined3d_cs_exec_clear_unordered_access_view, + /* WINED3D_CS_OP_COPY_UAV_COUNTER */ wined3d_cs_exec_copy_uav_counter, }; static void *wined3d_cs_st_require_space(struct wined3d_cs *cs, size_t size, enum wined3d_cs_queue_id queue_id) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3d12e41..18e1b01 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3959,6 +3959,15 @@ float CDECL wined3d_device_get_npatch_mode(const struct wined3d_device *device) return 0.0f; } +void CDECL wined3d_device_copy_uav_counter(struct wined3d_device *device, + struct wined3d_buffer *dst_buffer, unsigned int offset, struct wined3d_unordered_access_view *uav) +{ + TRACE("device %p, dst_buffer %p, offset %u, uav %p.\n", + device, dst_buffer, offset, uav); + + wined3d_cs_emit_copy_uav_counter(device->cs, dst_buffer, offset, uav); +} + void CDECL wined3d_device_copy_resource(struct wined3d_device *device, struct wined3d_resource *dst_resource, struct wined3d_resource *src_resource) { diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index adb43dd..da915ea 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -898,6 +898,27 @@ void wined3d_unordered_access_view_clear_uint(struct wined3d_unordered_access_vi checkGLcall("clear unordered access view"); } +void wined3d_unordered_access_view_copy_counter(struct wined3d_unordered_access_view *view, + struct wined3d_buffer *buffer, unsigned int offset, struct wined3d_context *context) +{ + struct wined3d_bo_address dst, src; + DWORD dst_location; + + if (!view->counter_bo) + return; + + dst_location = wined3d_buffer_get_memory(buffer, &dst, buffer->locations); + dst.addr += offset; + + src.buffer_object = view->counter_bo; + src.addr = NULL; + + context_copy_bo_address(context, &dst, buffer->buffer_type_hint, + &src, GL_ATOMIC_COUNTER_BUFFER, sizeof(GLuint)); + + wined3d_buffer_invalidate_location(buffer, ~dst_location); +} + static void wined3d_unordered_access_view_cs_init(void *object) { struct wined3d_unordered_access_view *view = object; diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 43ec7aa..fa33c57 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -38,6 +38,7 @@ @ cdecl wined3d_device_clear_unordered_access_view_uint(ptr ptr ptr) @ cdecl wined3d_device_copy_resource(ptr ptr ptr) @ cdecl wined3d_device_copy_sub_resource_region(ptr ptr long long long long ptr long ptr) +@ cdecl wined3d_device_copy_uav_counter(ptr ptr long ptr) @ cdecl wined3d_device_create(ptr long long ptr long long ptr ptr) @ cdecl wined3d_device_decref(ptr) @ cdecl wined3d_device_dispatch_compute(ptr long long long) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2270ae0..7d3e697 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3426,6 +3426,8 @@ void wined3d_cs_emit_clear_rendertarget_view(struct wined3d_cs *cs, struct wined const RECT *rect, DWORD flags, const struct wined3d_color *color, float depth, DWORD stencil) DECLSPEC_HIDDEN; void wined3d_cs_emit_clear_unordered_access_view_uint(struct wined3d_cs *cs, struct wined3d_unordered_access_view *view, const struct wined3d_uvec4 *clear_value) DECLSPEC_HIDDEN; +void wined3d_cs_emit_copy_uav_counter(struct wined3d_cs *cs, struct wined3d_buffer *dst_buffer, + unsigned int offset, struct wined3d_unordered_access_view *uav) DECLSPEC_HIDDEN; void wined3d_cs_emit_dispatch(struct wined3d_cs *cs, unsigned int group_count_x, unsigned int group_count_y, unsigned int group_count_z) DECLSPEC_HIDDEN; void wined3d_cs_emit_draw(struct wined3d_cs *cs, GLenum primitive_type, unsigned int patch_vertex_count, @@ -3648,6 +3650,8 @@ struct wined3d_unordered_access_view void wined3d_unordered_access_view_clear_uint(struct wined3d_unordered_access_view *view, const struct wined3d_uvec4 *clear_value, struct wined3d_context *context) DECLSPEC_HIDDEN; +void wined3d_unordered_access_view_copy_counter(struct wined3d_unordered_access_view *view, + struct wined3d_buffer *buffer, unsigned int offset, struct wined3d_context *context) DECLSPEC_HIDDEN; void wined3d_unordered_access_view_invalidate_location(struct wined3d_unordered_access_view *view, DWORD location) DECLSPEC_HIDDEN; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index d176ab1..f83217b 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2209,6 +2209,8 @@ HRESULT __cdecl wined3d_device_copy_sub_resource_region(struct wined3d_device *d struct wined3d_resource *dst_resource, unsigned int dst_sub_resource_idx, unsigned int dst_x, unsigned int dst_y, unsigned int dst_z, struct wined3d_resource *src_resource, unsigned int src_sub_resource_idx, const struct wined3d_box *src_box); +void __cdecl wined3d_device_copy_uav_counter(struct wined3d_device *device, + struct wined3d_buffer *dst_buffer, unsigned int offset, struct wined3d_unordered_access_view *uav); HRESULT __cdecl wined3d_device_create(struct wined3d *wined3d, UINT adapter_idx, enum wined3d_device_type device_type, HWND focus_window, DWORD behaviour_flags, BYTE surface_alignment, struct wined3d_device_parent *device_parent, struct wined3d_device **device);

1 0