February 2017 - Wine-Commits

Józef Kucia : wined3d: Implement compute pipeline UAV binding.
by Alexandre Julliard Feb. 9, 2017

Feb. 9, 2017

Module: wine Branch: master Commit: 6cc1335adcea2c79ce1998f9e3af30ca9b537cf9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cc1335adcea2c79ce1998f9e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 9 12:00:29 2017 +0100 wined3d: Implement compute pipeline UAV binding. 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/context.c | 19 ++++++++++++++----- dlls/wined3d/cs.c | 31 +++++++++++++++++++++++++++++++ dlls/wined3d/device.c | 26 ++++++++++++++++++++++++++ dlls/wined3d/glsl_shader.c | 3 ++- dlls/wined3d/state.c | 9 +++++++++ dlls/wined3d/stateblock.c | 5 +++++ dlls/wined3d/utils.c | 2 ++ dlls/wined3d/wined3d.spec | 1 + dlls/wined3d/wined3d_private.h | 13 ++++++++++--- include/wine/wined3d.h | 2 ++ 10 files changed, 102 insertions(+), 9 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6cc1335adcea2c79ce199…

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_CSSetUnorderedAccessViews().
by Alexandre Julliard Feb. 9, 2017

Feb. 9, 2017

Module: wine Branch: master Commit: 5fa55fbd324f3e3cc9a28f413f5a88bb2440f021 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fa55fbd324f3e3cc9a28f413… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 9 12:00:31 2017 +0100 d3d11: Implement d3d11_immediate_context_CSSetUnorderedAccessViews(). 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 | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 32c1d28..167fd78 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1200,8 +1200,24 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CSSetShaderResources(ID3D1 static void STDMETHODCALLTYPE d3d11_immediate_context_CSSetUnorderedAccessViews(ID3D11DeviceContext *iface, UINT start_slot, UINT view_count, ID3D11UnorderedAccessView *const *views, const UINT *initial_counts) { - FIXME("iface %p, start_slot %u, view_count %u, views %p, initial_counts %p stub!\n", + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + unsigned int i; + + TRACE("iface %p, start_slot %u, view_count %u, views %p, initial_counts %p.\n", iface, start_slot, view_count, views, initial_counts); + + if (initial_counts) + FIXME("Ignoring initial counts.\n"); + + wined3d_mutex_lock(); + for (i = 0; i < view_count; ++i) + { + struct d3d11_unordered_access_view *view = unsafe_impl_from_ID3D11UnorderedAccessView(views[i]); + + wined3d_device_set_cs_uav(device->wined3d_device, start_slot + i, + view ? view->wined3d_view : NULL); + } + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_CSSetShader(ID3D11DeviceContext *iface,

1 0

Józef Kucia : wined3d: Track current vertex color clamp mode in glsl_context_data.
by Alexandre Julliard Feb. 9, 2017

Feb. 9, 2017

Module: wine Branch: master Commit: ff09c3c5566aae16b860303c1aa0586f23be3ebc URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff09c3c5566aae16b860303c1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 9 12:00:32 2017 +0100 wined3d: Track current vertex color clamp mode in glsl_context_data. In preparation for the next patch, compute GLSL programs do not care about the current vertex color clamp. 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/glsl_shader.c | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index f8446ee..a2b1e6e 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -236,6 +236,7 @@ struct shader_glsl_ctx_priv { struct glsl_context_data { struct glsl_shader_prog_link *glsl_program; + GLenum vertex_color_clamp; }; struct glsl_ps_compiled_shader @@ -8475,22 +8476,13 @@ static void shader_glsl_select(void *shader_priv, struct wined3d_context *contex struct glsl_context_data *ctx_data = context->shader_backend_data; const struct wined3d_gl_info *gl_info = context->gl_info; struct shader_glsl_priv *priv = shader_priv; - GLuint program_id = 0, prev_id = 0; - GLenum old_vertex_color_clamp, current_vertex_color_clamp; + GLenum current_vertex_color_clamp; + GLuint program_id, prev_id; priv->vertex_pipe->vp_enable(gl_info, !use_vs(state)); priv->fragment_pipe->enable_extension(gl_info, !use_ps(state)); - if (ctx_data->glsl_program) - { - prev_id = ctx_data->glsl_program->id; - old_vertex_color_clamp = ctx_data->glsl_program->vs.vertex_color_clamp; - } - else - { - prev_id = 0; - old_vertex_color_clamp = GL_FIXED_ONLY_ARB; - } + prev_id = ctx_data->glsl_program ? ctx_data->glsl_program->id : 0; set_glsl_shader_program(context, state, priv, ctx_data); @@ -8505,8 +8497,9 @@ static void shader_glsl_select(void *shader_priv, struct wined3d_context *contex current_vertex_color_clamp = GL_FIXED_ONLY_ARB; } - if (old_vertex_color_clamp != current_vertex_color_clamp) + if (ctx_data->vertex_color_clamp != current_vertex_color_clamp) { + ctx_data->vertex_color_clamp = current_vertex_color_clamp; if (gl_info->supported[ARB_COLOR_BUFFER_FLOAT]) { GL_EXTCALL(glClampColorARB(GL_CLAMP_VERTEX_COLOR_ARB, current_vertex_color_clamp)); @@ -8514,7 +8507,7 @@ static void shader_glsl_select(void *shader_priv, struct wined3d_context *contex } else { - FIXME("vertex color clamp needs to be changed, but extension not supported.\n"); + FIXME("Vertex color clamp needs to be changed, but extension not supported.\n"); } } @@ -8554,6 +8547,7 @@ static void shader_glsl_invalidate_current_program(struct wined3d_context *conte /* Context activation is done by the caller. */ static void shader_glsl_disable(void *shader_priv, struct wined3d_context *context) { + struct glsl_context_data *ctx_data = context->shader_backend_data; const struct wined3d_gl_info *gl_info = context->gl_info; struct shader_glsl_priv *priv = shader_priv; @@ -8566,6 +8560,7 @@ static void shader_glsl_disable(void *shader_priv, struct wined3d_context *conte if (gl_info->supported[WINED3D_GL_LEGACY_CONTEXT] && gl_info->supported[ARB_COLOR_BUFFER_FLOAT]) { + ctx_data->vertex_color_clamp = GL_FIXED_ONLY_ARB; GL_EXTCALL(glClampColorARB(GL_CLAMP_VERTEX_COLOR_ARB, GL_FIXED_ONLY_ARB)); checkGLcall("glClampColorARB"); } @@ -8836,8 +8831,12 @@ static void shader_glsl_free(struct wined3d_device *device) static BOOL shader_glsl_allocate_context_data(struct wined3d_context *context) { - return !!(context->shader_backend_data = HeapAlloc(GetProcessHeap(), - HEAP_ZERO_MEMORY, sizeof(struct glsl_context_data))); + struct glsl_context_data *ctx_data; + if (!(ctx_data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*ctx_data)))) + return FALSE; + ctx_data->vertex_color_clamp = GL_FIXED_ONLY_ARB; + context->shader_backend_data = ctx_data; + return TRUE; } static void shader_glsl_free_context_data(struct wined3d_context *context)

1 0

Józef Kucia : wined3d: Fix order of command stream functions.
by Alexandre Julliard Feb. 9, 2017

Feb. 9, 2017

Module: wine Branch: master Commit: 5954a4d006ad561e34b82483fc0fe8aebda2eea7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5954a4d006ad561e34b82483f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 9 12:00:28 2017 +0100 wined3d: Fix order of command stream functions. 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 | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 422f3f1..b8fcf59 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1024,13 +1024,14 @@ static void wined3d_cs_exec_set_shader_resource_view(struct wined3d_cs *cs, cons device_invalidate_state(cs->device, STATE_SHADER_RESOURCE_BINDING); } -void wined3d_cs_emit_set_unordered_access_view(struct wined3d_cs *cs, unsigned int view_idx, - struct wined3d_unordered_access_view *view) +void wined3d_cs_emit_set_shader_resource_view(struct wined3d_cs *cs, enum wined3d_shader_type type, + UINT view_idx, struct wined3d_shader_resource_view *view) { - struct wined3d_cs_set_unordered_access_view *op; + struct wined3d_cs_set_shader_resource_view *op; op = cs->ops->require_space(cs, sizeof(*op)); - op->opcode = WINED3D_CS_OP_SET_UNORDERED_ACCESS_VIEW; + op->opcode = WINED3D_CS_OP_SET_SHADER_RESOURCE_VIEW; + op->type = type; op->view_idx = view_idx; op->view = view; @@ -1053,14 +1054,13 @@ static void wined3d_cs_exec_set_unordered_access_view(struct wined3d_cs *cs, con device_invalidate_state(cs->device, STATE_UNORDERED_ACCESS_VIEW_BINDING); } -void wined3d_cs_emit_set_shader_resource_view(struct wined3d_cs *cs, enum wined3d_shader_type type, - UINT view_idx, struct wined3d_shader_resource_view *view) +void wined3d_cs_emit_set_unordered_access_view(struct wined3d_cs *cs, unsigned int view_idx, + struct wined3d_unordered_access_view *view) { - struct wined3d_cs_set_shader_resource_view *op; + struct wined3d_cs_set_unordered_access_view *op; op = cs->ops->require_space(cs, sizeof(*op)); - op->opcode = WINED3D_CS_OP_SET_SHADER_RESOURCE_VIEW; - op->type = type; + op->opcode = WINED3D_CS_OP_SET_UNORDERED_ACCESS_VIEW; op->view_idx = view_idx; op->view = view;

1 0

Hugh McMaster : regedit: Display a dialog message after successful/ unsuccessful file import.
by Alexandre Julliard Feb. 9, 2017

Feb. 9, 2017

Module: wine Branch: master Commit: 9e1d356d78e04db950326156d390afa7d2808f7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e1d356d78e04db950326156d… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Feb 9 11:08:20 2017 +0000 regedit: Display a dialog message after successful/unsuccessful file import. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ar.po | 114 +++++++++++++++++++++++------------------- po/bg.po | 113 +++++++++++++++++++++++------------------- po/ca.po | 117 +++++++++++++++++++++++++------------------- po/cs.po | 114 +++++++++++++++++++++++------------------- po/da.po | 116 ++++++++++++++++++++++++------------------- po/de.po | 117 +++++++++++++++++++++++++------------------- po/el.po | 111 ++++++++++++++++++++++------------------- po/en.po | 112 +++++++++++++++++++++++------------------- po/en_US.po | 112 +++++++++++++++++++++++------------------- po/eo.po | 113 +++++++++++++++++++++++------------------- po/es.po | 116 ++++++++++++++++++++++++------------------- po/fa.po | 112 +++++++++++++++++++++++------------------- po/fi.po | 117 +++++++++++++++++++++++++------------------- po/fr.po | 117 +++++++++++++++++++++++++------------------- po/he.po | 115 ++++++++++++++++++++++++------------------- po/hi.po | 111 ++++++++++++++++++++++------------------- po/hr.po | 115 ++++++++++++++++++++++++------------------- po/hu.po | 115 ++++++++++++++++++++++++------------------- po/it.po | 116 ++++++++++++++++++++++++------------------- po/ja.po | 116 ++++++++++++++++++++++++------------------- po/ko.po | 114 +++++++++++++++++++++++------------------- po/lt.po | 117 +++++++++++++++++++++++++------------------- po/ml.po | 111 ++++++++++++++++++++++------------------- po/nb_NO.po | 117 +++++++++++++++++++++++++------------------- po/nl.po | 116 ++++++++++++++++++++++++------------------- po/or.po | 111 ++++++++++++++++++++++------------------- po/pa.po | 111 ++++++++++++++++++++++------------------- po/pl.po | 114 +++++++++++++++++++++++------------------- po/pt_BR.po | 117 +++++++++++++++++++++++++------------------- po/pt_PT.po | 116 ++++++++++++++++++++++++------------------- po/rm.po | 112 +++++++++++++++++++++++------------------- po/ro.po | 117 +++++++++++++++++++++++++------------------- po/ru.po | 117 +++++++++++++++++++++++++------------------- po/sk.po | 113 +++++++++++++++++++++++------------------- po/sl.po | 114 +++++++++++++++++++++++------------------- po/sr_RS(a)cyrillic.po | 113 +++++++++++++++++++++++------------------- po/sr_RS(a)latin.po | 113 +++++++++++++++++++++++------------------- po/sv.po | 115 ++++++++++++++++++++++++------------------- po/te.po | 111 ++++++++++++++++++++++------------------- po/th.po | 112 +++++++++++++++++++++++------------------- po/tr.po | 117 +++++++++++++++++++++++++------------------- po/uk.po | 117 +++++++++++++++++++++++++------------------- po/wa.po | 112 +++++++++++++++++++++++------------------- po/wine.pot | 111 ++++++++++++++++++++++------------------- po/zh_CN.po | 115 ++++++++++++++++++++++++------------------- po/zh_TW.po | 114 +++++++++++++++++++++++------------------- programs/regedit/framewnd.c | 7 ++- programs/regedit/regedit.rc | 2 + programs/regedit/resource.h | 2 + 49 files changed, 2920 insertions(+), 2347 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9e1d356d78e04db950326…

1 0

Nikolay Sivov : dxgi: Added support for DXGI_SWAP_CHAIN_FLAG_GDI_COMPATIBLE.
by Alexandre Julliard Feb. 9, 2017

Feb. 9, 2017

Module: wine Branch: master Commit: 1a7ddf8dd96f9982c42ac7b8ed8cbfbacf07288c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a7ddf8dd96f9982c42ac7b8e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 9 07:51:56 2017 +0300 dxgi: Added support for DXGI_SWAP_CHAIN_FLAG_GDI_COMPATIBLE. 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/d3d11/device.c | 16 +++++++++++++--- dlls/d3d8/device.c | 12 +++++++----- dlls/d3d9/d3d9_private.h | 2 +- dlls/d3d9/device.c | 32 ++++++++++++++++---------------- dlls/d3d9/texture.c | 4 ++-- dlls/ddraw/ddraw.c | 9 +++++---- dlls/dxgi/device.c | 2 +- dlls/dxgi/tests/device.c | 1 - dlls/dxgi/utils.c | 12 ++++++++++++ dlls/wined3d/device.c | 6 +++++- dlls/wined3d/swapchain.c | 10 +++++++--- include/wine/wined3d.h | 3 ++- 12 files changed, 71 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1a7ddf8dd96f9982c42ac…

1 0

Józef Kucia : wined3d: Acquire unordered access resources for compute dispatches.
by Alexandre Julliard Feb. 9, 2017

Feb. 9, 2017

Module: wine Branch: master Commit: 8962db2aa76a0bf330dd5bd7f25f13e6fe9abb13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8962db2aa76a0bf330dd5bd7f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 9 12:00:30 2017 +0100 wined3d: Acquire unordered access resources for compute dispatches. 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 | 86 ++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 53 insertions(+), 33 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index db94942..83bd60c 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -492,19 +492,63 @@ static void release_shader_resources(const struct wined3d_state *state, unsigned } } +static void acquire_unordered_access_resources(const struct wined3d_shader *shader, + struct wined3d_unordered_access_view * const *views) +{ + unsigned int i; + + if (!shader) + return; + + for (i = 0; i < MAX_UNORDERED_ACCESS_VIEWS; ++i) + { + if (!shader->reg_maps.uav_resource_info[i].type) + continue; + + if (!views[i]) + continue; + + wined3d_resource_acquire(views[i]->resource); + } +} + +static void release_unordered_access_resources(const struct wined3d_shader *shader, + struct wined3d_unordered_access_view * const *views) +{ + unsigned int i; + + if (!shader) + return; + + for (i = 0; i < MAX_UNORDERED_ACCESS_VIEWS; ++i) + { + if (!shader->reg_maps.uav_resource_info[i].type) + continue; + + if (!views[i]) + continue; + + wined3d_resource_release(views[i]->resource); + } +} + static void wined3d_cs_exec_dispatch(struct wined3d_cs *cs, const void *data) { + struct wined3d_state *state = &cs->device->state; const struct wined3d_cs_dispatch *op = data; - dispatch_compute(cs->device, &cs->device->state, + dispatch_compute(cs->device, state, op->group_count_x, op->group_count_y, op->group_count_z); - release_shader_resources(&cs->device->state, 1u << WINED3D_SHADER_TYPE_COMPUTE); + release_shader_resources(state, 1u << WINED3D_SHADER_TYPE_COMPUTE); + release_unordered_access_resources(state->shader[WINED3D_SHADER_TYPE_COMPUTE], + state->compute_unordered_access_view); } void wined3d_cs_emit_dispatch(struct wined3d_cs *cs, unsigned int group_count_x, unsigned int group_count_y, unsigned int group_count_z) { + const struct wined3d_state *state = &cs->device->state; struct wined3d_cs_dispatch *op; op = cs->ops->require_space(cs, sizeof(*op)); @@ -513,7 +557,9 @@ void wined3d_cs_emit_dispatch(struct wined3d_cs *cs, op->group_count_y = group_count_y; op->group_count_z = group_count_z; - acquire_shader_resources(&cs->device->state, 1u << WINED3D_SHADER_TYPE_COMPUTE); + acquire_shader_resources(state, 1u << WINED3D_SHADER_TYPE_COMPUTE); + acquire_unordered_access_resources(state->shader[WINED3D_SHADER_TYPE_COMPUTE], + state->compute_unordered_access_view); cs->ops->submit(cs); } @@ -522,7 +568,6 @@ static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data) { struct wined3d_state *state = &cs->device->state; const struct wined3d_cs_draw *op = data; - struct wined3d_shader *shader; unsigned int i; if (!cs->device->adapter->gl_info.supported[ARB_DRAW_ELEMENTS_BASE_VERTEX] @@ -555,27 +600,14 @@ static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data) if (state->fb->depth_stencil) wined3d_resource_release(state->fb->depth_stencil->resource); release_shader_resources(state, ~(1u << WINED3D_SHADER_TYPE_COMPUTE)); - if ((shader = state->shader[WINED3D_SHADER_TYPE_PIXEL])) - { - struct wined3d_unordered_access_view *view; - for (i = 0; i < MAX_UNORDERED_ACCESS_VIEWS; ++i) - { - if (!shader->reg_maps.uav_resource_info[i].type) - continue; - - if (!(view = state->unordered_access_view[i])) - continue; - - wined3d_resource_release(view->resource); - } - } + release_unordered_access_resources(state->shader[WINED3D_SHADER_TYPE_PIXEL], + state->unordered_access_view); } void wined3d_cs_emit_draw(struct wined3d_cs *cs, int base_vertex_idx, unsigned int start_idx, unsigned int index_count, unsigned int start_instance, unsigned int instance_count, BOOL indexed) { const struct wined3d_state *state = &cs->device->state; - struct wined3d_shader *shader; struct wined3d_cs_draw *op; unsigned int i; @@ -608,20 +640,8 @@ void wined3d_cs_emit_draw(struct wined3d_cs *cs, int base_vertex_idx, unsigned i if (state->fb->depth_stencil) wined3d_resource_acquire(state->fb->depth_stencil->resource); acquire_shader_resources(state, ~(1u << WINED3D_SHADER_TYPE_COMPUTE)); - if ((shader = state->shader[WINED3D_SHADER_TYPE_PIXEL])) - { - struct wined3d_unordered_access_view *view; - for (i = 0; i < MAX_UNORDERED_ACCESS_VIEWS; ++i) - { - if (!shader->reg_maps.uav_resource_info[i].type) - continue; - - if (!(view = state->unordered_access_view[i])) - continue; - - wined3d_resource_acquire(view->resource); - } - } + acquire_unordered_access_resources(state->shader[WINED3D_SHADER_TYPE_PIXEL], + state->unordered_access_view); cs->ops->submit(cs); }

1 0

Henri Verbeet : d3d8: Do not modify the "texture" pointer for D3DFMT_UNKNOWN in d3d8_device_CreateVolumeTexture().
by Alexandre Julliard Feb. 9, 2017

Feb. 9, 2017

Module: wine Branch: master Commit: bb8f4d7a888b791b0dc56e7c281b215d12bd022c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb8f4d7a888b791b0dc56e7c2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 9 12:52:40 2017 +0100 d3d8: Do not modify the "texture" pointer for D3DFMT_UNKNOWN in d3d8_device_CreateVolumeTexture(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 3 +++ dlls/d3d8/tests/device.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index ad5880c..2c8d6cb 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -824,6 +824,9 @@ static HRESULT WINAPI d3d8_device_CreateVolumeTexture(IDirect3DDevice8 *iface, TRACE("iface %p, width %u, height %u, depth %u, levels %u, usage %#x, format %#x, pool %#x, texture %p.\n", iface, width, height, depth, levels, usage, format, pool, texture); + if (!format) + return D3DERR_INVALIDCALL; + *texture = NULL; object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index ff3c9b4..9a9278b 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -8242,7 +8242,7 @@ static void test_format_unknown(void) hr = IDirect3DDevice8_CreateVolumeTexture(device, 64, 64, 1, 1, 0, D3DFMT_UNKNOWN, D3DPOOL_DEFAULT, (IDirect3DVolumeTexture8 **)&iface); ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); - todo_wine ok(iface == (void *)0xdeadbeef, "Got unexpected iface %p.\n", iface); + ok(iface == (void *)0xdeadbeef, "Got unexpected iface %p.\n", iface); refcount = IDirect3DDevice8_Release(device); ok(!refcount, "Device has %u references left.\n", refcount);

1 0

Henri Verbeet : d3d9: Clear the "surface" pointer on error in d3d9_device_CreateDepthStencilSurfaceEx().
by Alexandre Julliard Feb. 9, 2017

Feb. 9, 2017

Module: wine Branch: master Commit: 6b8cc32a1f1b63b4ac7a0924a16cb38d20e06946 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b8cc32a1f1b63b4ac7a0924a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 9 12:52:37 2017 +0100 d3d9: Clear the "surface" pointer on error in d3d9_device_CreateDepthStencilSurfaceEx(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 1 + dlls/d3d9/tests/d3d9ex.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index e646cb7..ec1b985 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3474,6 +3474,7 @@ static HRESULT WINAPI d3d9_device_CreateDepthStencilSurfaceEx(IDirect3DDevice9Ex if (discard) flags |= WINED3D_TEXTURE_CREATE_DISCARD; + *surface = NULL; return d3d9_device_create_surface(device, width, height, format, flags, surface, D3DUSAGE_DEPTHSTENCIL | usage, D3DPOOL_DEFAULT, multisample_type, multisample_quality, NULL); } diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 6348ee7..1dbab26 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -3739,7 +3739,7 @@ static void test_format_unknown(void) hr = IDirect3DDevice9Ex_CreateDepthStencilSurfaceEx(device, 64, 64, D3DFMT_UNKNOWN, D3DMULTISAMPLE_NONE, 0, TRUE, (IDirect3DSurface9 **)&iface, NULL, 0); ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); - todo_wine ok(!iface, "Got unexpected iface %p.\n", iface); + ok(!iface, "Got unexpected iface %p.\n", iface); iface = (void *)0xdeadbeef; hr = IDirect3DDevice9Ex_CreateOffscreenPlainSurface(device, 64, 64,

1 0

Nikolay Sivov : uxtheme: Implement EndBufferedPaint().
by Alexandre Julliard Feb. 9, 2017

Feb. 9, 2017

Module: wine Branch: master Commit: 9d4a00399548f50517d790c7678ebf34327c56d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d4a00399548f50517d790c76… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 9 01:42:35 2017 +0300 uxtheme: Implement EndBufferedPaint(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/buffer.c | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/uxtheme/buffer.c b/dlls/uxtheme/buffer.c index 972df68..9024696 100644 --- a/dlls/uxtheme/buffer.c +++ b/dlls/uxtheme/buffer.c @@ -49,6 +49,13 @@ static void free_paintbuffer(struct paintbuffer *buffer) HeapFree(GetProcessHeap(), 0, buffer); } +static struct paintbuffer *get_buffer_obj(HPAINTBUFFER handle) +{ + if (!handle) + return NULL; + return handle; +} + /*********************************************************************** * BufferedPaintInit (UXTHEME.@) */ @@ -138,9 +145,26 @@ HPAINTBUFFER WINAPI BeginBufferedPaint(HDC targetdc, const RECT *rect, /*********************************************************************** * EndBufferedPaint (UXTHEME.@) */ -HRESULT WINAPI EndBufferedPaint(HPAINTBUFFER hPaintBuffer, BOOL fUpdateTarget) +HRESULT WINAPI EndBufferedPaint(HPAINTBUFFER bufferhandle, BOOL update) { - FIXME("Stub (%p %d)\n", hPaintBuffer, fUpdateTarget); + struct paintbuffer *buffer = get_buffer_obj(bufferhandle); + + TRACE("(%p %d)\n", bufferhandle, update); + + if (!buffer) + return E_INVALIDARG; + + if (update) + { + if (!BitBlt(buffer->targetdc, buffer->rect.left, buffer->rect.top, + buffer->rect.right - buffer->rect.left, buffer->rect.bottom - buffer->rect.top, + buffer->memorydc, 0, 0, SRCCOPY)) + { + WARN("BitBlt() failed\n"); + } + } + + free_paintbuffer(buffer); return S_OK; }

1 0