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

Józef Kucia : wined3d: Factor out context_copy_bo_address() function.
by Alexandre Julliard Aug. 8, 2017

Aug. 8, 2017

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

Akihiro Sagawa : msvcrt/tests: Add tests for mbstowcs and wcstombs with empty strings.
by Alexandre Julliard Aug. 8, 2017

Aug. 8, 2017

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

Paul Gofman : d3dx9: Use distinct structure for top level parameters.
by Alexandre Julliard Aug. 8, 2017

Aug. 8, 2017

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: Remove case for annotation in get_parameter_element_by_name().
by Alexandre Julliard Aug. 8, 2017

Aug. 8, 2017

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: Move referenced_param definition from d3dx_parameter to d3dx_state.
by Alexandre Julliard Aug. 8, 2017

Aug. 8, 2017

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

Nikolay Sivov : d2d1: Fix trace message typo.
by Alexandre Julliard Aug. 8, 2017

Aug. 8, 2017

Module: wine Branch: master Commit: b9a03b70afd5753fb9b1a6cd8d4d7c6e5effef1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9a03b70afd5753fb9b1a6cd8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 7 10:31:53 2017 +0300 d2d1: Fix trace message typo. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/render_target.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index cf559c1..2ac62e4 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -766,7 +766,7 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawGeometry(ID2D1RenderTarg iface, geometry, brush, stroke_width, stroke_style); if (stroke_style) - FIXME("Ignoring stoke style %p.\n", stroke_style); + FIXME("Ignoring stroke style %p.\n", stroke_style); d2d_rt_draw_geometry(render_target, geometry_impl, brush_impl, stroke_width); }

1 0

Alistair Leslie-Hughes : ntdll/tests: Use standard wine_dbgstr_longlong.
by Alexandre Julliard Aug. 8, 2017

Aug. 8, 2017

Module: wine Branch: master Commit: 3b05f552e214e4b809986e250bc808329a10efae URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b05f552e214e4b809986e250… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Aug 6 23:31:31 2017 +0000 ntdll/tests: Use standard wine_dbgstr_longlong. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/directory.c | 16 +++++----- dlls/ntdll/tests/info.c | 2 +- dlls/ntdll/tests/large_int.c | 50 ++++++++++++++--------------- dlls/ntdll/tests/rtl.c | 20 ++++++------ dlls/ntdll/tests/rtlbitmap.c | 16 +++++----- dlls/ntdll/tests/string.c | 75 +++++++++++++++++++++----------------------- 6 files changed, 86 insertions(+), 93 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3b05f552e214e4b809986…

1 0

André Hentschel : winebuild: Improved position independent code generation.
by Alexandre Julliard Aug. 8, 2017

Aug. 8, 2017

Module: wine Branch: master Commit: db848fa76764d2464ded18aeb06fcbe0b82ff494 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db848fa76764d2464ded18aeb… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Aug 6 14:31:09 2017 +0200 winebuild: Improved position independent code generation. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/import.c | 34 ++++++++++++++-------------------- tools/winebuild/spec32.c | 4 ++-- 2 files changed, 16 insertions(+), 22 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index e7bad72..43dfa50 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -668,15 +668,14 @@ static void output_import_thunk( const char *name, const char *table, int pos ) output( "1:\t.long %s+%u-(1b+4)\n", table, pos ); break; case CPU_ARM64: - output( "\tadr x9, 1f\n" ); - output( "\tldur x9, [x9, #0]\n" ); + output( "\tadrp x9, %s\n", table ); + output( "\tadd x9, x9, #:lo12:%s\n", table ); if (pos & 0xf000) output( "\tadd x9, x9, #%u\n", pos & 0xf000 ); if (pos & 0x0f00) output( "\tadd x9, x9, #%u\n", pos & 0x0f00 ); if (pos & 0x00f0) output( "\tadd x9, x9, #%u\n", pos & 0x00f0 ); if (pos & 0x000f) output( "\tadd x9, x9, #%u\n", pos & 0x000f ); output( "\tldur x9, [x9, #0]\n" ); output( "\tbr x9\n" ); - output( "1:\t.quad %s\n", table ); break; case CPU_POWERPC: output( "\tmr %s, %s\n", ppc_reg(0), ppc_reg(31) ); @@ -980,8 +979,8 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) case CPU_ARM64: output( "\tstp x29, x30, [sp,#-16]!\n" ); output( "\tmov x29, sp\n" ); - output( "\tadr x9, 1f\n" ); - output( "\tldur x9, [x9, #0]\n" ); + output( "\tadrp x9, %s\n", asm_name("__wine_spec_delay_load") ); + output( "\tadd x9, x9, #:lo12:%s\n", asm_name("__wine_spec_delay_load") ); output( "\tblr x9\n" ); output( "\tmov x9, x0\n" ); output( "\tldp x29, x30, [sp],#16\n" ); @@ -990,7 +989,6 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) output( "\tldp x4, x5, [sp,#48]\n" ); output( "\tldp x6, x7, [sp],#80\n" ); output( "\tbr x9\n" ); /* or "ret x9" */ - output( "1:\t.quad %s\n", asm_name("__wine_spec_delay_load") ); break; case CPU_POWERPC: if (target_platform == PLATFORM_APPLE) extra_stack_storage = 56; @@ -1089,10 +1087,8 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) output( "\tmul x1, x0, x1\n" ); output( "\tmov x0, x1\n" ); output( "\tadd x0, x0, #%d\n", j ); - output( "\tadr x9, 1f\n" ); - output( "\tldur x9, [x9, #0]\n" ); + output( "\tadr x9, %s\n", asm_name("__wine_delay_load_asm") ); output( "\tbr x9\n" ); - output( "1:\t.quad %s\n", asm_name("__wine_delay_load_asm") ); break; case CPU_POWERPC: switch(target_platform) @@ -1281,21 +1277,19 @@ void output_stubs( DLLSPEC *spec ) else output( "\t.long %u\n", odp->ordinal ); break; case CPU_ARM64: - output( "\tadr x0, 2f\n" ); - output( "\tldur x0, [x0, #0]\n" ); - output( "\tadr x1, 2f+8\n" ); - output( "\tldur x1, [x1, #0]\n" ); - output( "\tadr x2, 1f\n" ); - output( "\tldur x2, [x2, #0]\n" ); - output( "\tblr x2\n" ); - output( "1:\t.quad %s\n", asm_name("__wine_spec_unimplemented_stub") ); - output( "2:\t.quad %s\n", asm_name("__wine_spec_file_name") ); + output( "\tadrp x0, %s\n", asm_name("__wine_spec_file_name") ); + output( "\tadd x0, x0, #:lo12:%s\n", asm_name("__wine_spec_file_name") ); if (exp_name) { - output( "\t.quad .L%s_string\n", name ); + output( "\tadrp x1, .L%s_string\n", name ); + output( "\tadd x1, x1, #:lo12:.L%s_string\n", name ); count++; } - else output( "\t.quad %u\n", odp->ordinal ); + else + output( "\tmov x1, %u\n", odp->ordinal ); + output( "\tadrp x2, %s\n", asm_name("__wine_spec_unimplemented_stub") ); + output( "\tadd x2, x2, #:lo12:%s\n", asm_name("__wine_spec_unimplemented_stub") ); + output( "\tblr x2\n" ); break; default: assert(0); diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 4a01238..83a48b6 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -257,14 +257,14 @@ static void output_relay_debug( DLLSPEC *spec ) output( "\tmov w1, #%u\n", (flags << 24) ); if (args) output( "\tadd w1, w1, #%u\n", (args << 16) ); if (i - spec->base) output( "\tadd w1, w1, #%u\n", i - spec->base ); - output( "\tldr x0, 1f\n"); + output( "\tadrp x0, .L__wine_spec_relay_descr\n"); + output( "\tadd x0, x0, #:lo12:.L__wine_spec_relay_descr\n"); output( "\tldr x3, [x0, #8]\n"); output( "\tblr x3\n"); output( "\tadd SP, SP, #16\n" ); output( "\tldp x29, x30, [SP], #16\n" ); if (args) output( "\tadd SP, SP, #%u\n", 8 * ((min(args, 8) + 1) & 0xe) ); output( "\tret\n"); - output( "\t1: .quad .L__wine_spec_relay_descr\n"); break; case CPU_x86_64:

1 0

Hugh McMaster : reg/tests: Add tests for importing Windows 3.1 registry data.
by Alexandre Julliard Aug. 8, 2017

Aug. 8, 2017

Module: wine Branch: master Commit: f95f3fb1bf6abb4e6f2767f557bedd2377edb4d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f95f3fb1bf6abb4e6f2767f55… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Aug 7 12:28:35 2017 +0000 reg/tests: Add tests for importing Windows 3.1 registry data. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 118 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 118 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 941d325..a2728ca 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -4053,6 +4053,123 @@ static void test_unicode_import_with_whitespace(void) todo_wine ok(err == ERROR_SUCCESS, "RegDeleteKeyA failed: got %d, expected 0\n", err); } +static void test_import_31(void) +{ + LONG err; + HKEY hkey; + DWORD r; + + err = RegDeleteKeyA(HKEY_CLASSES_ROOT, KEY_BASE); + ok(err == ERROR_SUCCESS || err == ERROR_FILE_NOT_FOUND, "RegDeleteKeyA failed: %d\n", err); + + /* Check if reg.exe is running with elevated privileges */ + err = RegCreateKeyExA(HKEY_CLASSES_ROOT, KEY_BASE, 0, NULL, REG_OPTION_NON_VOLATILE, + KEY_READ|KEY_SET_VALUE, NULL, &hkey, NULL); + if (err == ERROR_ACCESS_DENIED) + { + win_skip("reg.exe is not running with elevated privileges; " + "skipping Windows 3.1 import tests\n"); + return; + } + + /* Test simple value */ + test_import_str("REGEDIT\r\n" + "HKEY_CLASSES_ROOT\\" KEY_BASE " = Value0\r\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "", REG_SZ, "Value0", 7, 0); + + /* Test proper handling of spaces and equals signs */ + test_import_str("REGEDIT\r\n" + "HKEY_CLASSES_ROOT\\" KEY_BASE " =Value1\r\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "", REG_SZ, "Value1", 7, 0); + + test_import_str("REGEDIT\r\n" + "HKEY_CLASSES_ROOT\\" KEY_BASE " = Value2\r\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "", REG_SZ, " Value2", 8, 0); + + test_import_str("REGEDIT\r\n" + "HKEY_CLASSES_ROOT\\" KEY_BASE " = Value3 \r\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "", REG_SZ, "Value3 ", 8, 0); + + test_import_str("REGEDIT\r\n" + "HKEY_CLASSES_ROOT\\" KEY_BASE " Value4\r\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "", REG_SZ, "Value4", 7, 0); + + test_import_str("REGEDIT\r\n" + "HKEY_CLASSES_ROOT\\" KEY_BASE " Value5\r\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "", REG_SZ, "Value5", 7, 0); + + test_import_str("REGEDIT\r\n" + "HKEY_CLASSES_ROOT\\" KEY_BASE "\r\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "", REG_SZ, "", 1, 0); + + test_import_str("REGEDIT\r\n" + "HKEY_CLASSES_ROOT\\" KEY_BASE " \r\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "", REG_SZ, "", 1, 0); + + test_import_str("REGEDIT\r\n" + "HKEY_CLASSES_ROOT\\" KEY_BASE " = No newline", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "", REG_SZ, "No newline", 11, 0); + + err = RegDeleteValueW(hkey, NULL); + todo_wine ok(err == ERROR_SUCCESS, "RegDeleteValue failed: %d\n", err); + + /* Test character validity at the start of the line */ + test_import_str("REGEDIT\r\n" + " HKEY_CLASSES_ROOT\\" KEY_BASE " = Value1a\r\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, ""); + + test_import_str("REGEDIT\r\n" + " HKEY_CLASSES_ROOT\\" KEY_BASE " = Value1b\r\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, ""); + + test_import_str("REGEDIT\r\n" + "\tHKEY_CLASSES_ROOT\\" KEY_BASE " = Value1c\r\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, ""); + + test_import_str("REGEDIT\r\n" + ";HKEY_CLASSES_ROOT\\" KEY_BASE " = Value2a\r\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, ""); + + test_import_str("REGEDIT\r\n" + "#HKEY_CLASSES_ROOT\\" KEY_BASE " = Value2b\r\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, ""); + + /* Test case sensitivity */ + test_import_str("REGEDIT\r\n" + "hkey_classes_root\\" KEY_BASE " = Value3a\r\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, ""); + + test_import_str("REGEDIT\r\n" + "hKEY_CLASSES_ROOT\\" KEY_BASE " = Value3b\r\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, ""); + + test_import_str("REGEDIT\r\n" + "Hkey_Classes_Root\\" KEY_BASE " = Value3c\r\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, ""); + + RegCloseKey(hkey); + + err = RegDeleteKeyA(HKEY_CLASSES_ROOT, KEY_BASE); + ok(err == ERROR_SUCCESS, "RegDeleteKeyA failed: %d\n", err); +} + START_TEST(reg) { DWORD r; @@ -4069,4 +4186,5 @@ START_TEST(reg) test_unicode_import(); test_import_with_whitespace(); test_unicode_import_with_whitespace(); + test_import_31(); }

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_CopyStructureCount().
by Alexandre Julliard Aug. 8, 2017

Aug. 8, 2017

Module: wine Branch: master Commit: be3baca9a64db969cfb596a4af4f1176a07dddfe URL: http://source.winehq.org/git/wine.git/?a=commit;h=be3baca9a64db969cfb596a4a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Aug 4 19:53:49 2017 +0200 d3d11: Implement d3d11_immediate_context_CopyStructureCount(). 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/d3d11/device.c | 14 +++++++++++++- dlls/d3d11/tests/d3d11.c | 4 ++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 14e21f9..3fea1bb 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1025,8 +1025,20 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_UpdateSubresource(ID3D11De static void STDMETHODCALLTYPE d3d11_immediate_context_CopyStructureCount(ID3D11DeviceContext *iface, ID3D11Buffer *dst_buffer, UINT dst_offset, ID3D11UnorderedAccessView *src_view) { - FIXME("iface %p, dst_buffer %p, dst_offset %u, src_view %p stub!\n", + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d11_unordered_access_view *uav; + struct d3d_buffer *buffer_impl; + + TRACE("iface %p, dst_buffer %p, dst_offset %u, src_view %p.\n", iface, dst_buffer, dst_offset, src_view); + + buffer_impl = unsafe_impl_from_ID3D11Buffer(dst_buffer); + uav = unsafe_impl_from_ID3D11UnorderedAccessView(src_view); + + wined3d_mutex_lock(); + wined3d_device_copy_uav_counter(device->wined3d_device, + buffer_impl->wined3d_buffer, dst_offset, uav->wined3d_view); + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_ClearRenderTargetView(ID3D11DeviceContext *iface, diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 9af9f87..73269ed 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -17983,7 +17983,7 @@ static void test_uav_counters(void) /* produce */ ID3D11DeviceContext_Dispatch(context, 16, 1, 1); data = read_uav_counter(context, staging_buffer, uav); - todo_wine ok(data == 64, "Got unexpected value %u.\n", data); + ok(data == 64, "Got unexpected value %u.\n", data); get_buffer_readback(buffer, &rb); memcpy(id, rb.map_desc.pData, 64 * sizeof(*id)); release_resource_readback(&rb); @@ -18027,7 +18027,7 @@ static void test_uav_counters(void) todo_wine ok(data == 4, "Got unexpected value %u.\n", data); ID3D11DeviceContext_Dispatch(context, 1, 1, 1); data = read_uav_counter(context, staging_buffer, uav); - ok(!data, "Got unexpected value %u.\n", data); + todo_wine ok(!data, "Got unexpected value %u.\n", data); get_buffer_readback(buffer2, &rb); for (i = 0; i < 8; ++i) {

1 0