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

Marcin Mikołajczak : po: Updated Polish translation.
by Alexandre Julliard 02 Mar '17

02 Mar '17

Module: wine Branch: master Commit: e918c6fd8b426e8298eca5951d917960e4236d95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e918c6fd8b426e8298eca5951… Author: Marcin Mikołajczak <marcin123407(a)vivaldi.net> Date: Sun Feb 26 14:20:18 2017 +0100 po: Updated Polish translation. Signed-off-by: Marcin Mikołajczak <marcin123407(a)vivaldi.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/pl.po | 360 ++++++++++++++++++++++++--------------------------------------- 1 file changed, 135 insertions(+), 225 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e918c6fd8b426e8298eca…

1 0

Józef Kucia : wined3d: Rename shader_glsl_ld_buffer() to shader_glsl_ld_raw_structured().
by Alexandre Julliard 02 Mar '17

02 Mar '17

Module: wine Branch: master Commit: 27a55f8f49243f0eef0e780b3f10b83596041d4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=27a55f8f49243f0eef0e780b3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 2 00:55:26 2017 +0100 wined3d: Rename shader_glsl_ld_buffer() to shader_glsl_ld_raw_structured(). 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 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c65bc69..b613319 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5122,7 +5122,7 @@ static void shader_glsl_ld_uav(const struct wined3d_shader_instruction *ins) shader_glsl_get_prefix(version->type), uav_idx, image_coord_param.param_str, dst_swizzle); } -static void shader_glsl_ld_buffer(const struct wined3d_shader_instruction *ins) +static void shader_glsl_ld_raw_structured(const struct wined3d_shader_instruction *ins) { const char *prefix = shader_glsl_get_prefix(ins->ctx->reg_maps->shader_version.type); const struct wined3d_shader_src_param *src = &ins->src[ins->src_count - 1]; @@ -9556,8 +9556,8 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_LABEL */ shader_glsl_label, /* WINED3DSIH_LD */ shader_glsl_ld, /* WINED3DSIH_LD2DMS */ NULL, - /* WINED3DSIH_LD_RAW */ shader_glsl_ld_buffer, - /* WINED3DSIH_LD_STRUCTURED */ shader_glsl_ld_buffer, + /* WINED3DSIH_LD_RAW */ shader_glsl_ld_raw_structured, + /* WINED3DSIH_LD_STRUCTURED */ shader_glsl_ld_raw_structured, /* WINED3DSIH_LD_UAV_TYPED */ shader_glsl_ld_uav, /* WINED3DSIH_LIT */ shader_glsl_lit, /* WINED3DSIH_LOD */ NULL,

1 0

Józef Kucia : wined3d: Add support for atomic operations on thread group shared memory.
by Alexandre Julliard 02 Mar '17

02 Mar '17

Module: wine Branch: master Commit: 63b1ad59a39433ba4a4f0a75d984bfba13890a77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63b1ad59a39433ba4a4f0a75d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 2 00:55:27 2017 +0100 wined3d: Add support for atomic operations on thread group shared memory. 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 | 83 +++++++++++++++++++++++++++++++++++----------- 1 file changed, 64 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index b613319..51deae0 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4971,34 +4971,66 @@ static void shader_glsl_atomic(const struct wined3d_shader_instruction *ins) enum wined3d_shader_resource_type resource_type; struct wined3d_string_buffer *address; enum wined3d_data_type data_type; - unsigned int uav_idx, stride; + unsigned int resource_idx, stride; + const char *op, *resource; DWORD coord_mask; - const char *op; + BOOL is_tgsm; - uav_idx = ins->dst[is_imm_instruction].reg.idx[0].offset; - resource_type = reg_maps->uav_resource_info[uav_idx].type; - if (resource_type >= ARRAY_SIZE(resource_type_info)) + resource_idx = ins->dst[is_imm_instruction].reg.idx[0].offset; + is_tgsm = ins->dst[is_imm_instruction].reg.type == WINED3DSPR_GROUPSHAREDMEM; + if (is_tgsm) { - ERR("Unexpected resource type %#x.\n", resource_type); - return; + if (resource_idx >= reg_maps->tgsm_count) + { + ERR("Invalid TGSM index %u.\n", resource_idx); + return; + } + resource = "g"; + data_type = WINED3D_DATA_UINT; + coord_mask = 1; + stride = reg_maps->tgsm[resource_idx].stride; + } + else + { + if (resource_idx >= ARRAY_SIZE(reg_maps->uav_resource_info)) + { + ERR("Invalid UAV index %u.\n", resource_idx); + return; + } + resource_type = reg_maps->uav_resource_info[resource_idx].type; + if (resource_type >= ARRAY_SIZE(resource_type_info)) + { + ERR("Unexpected resource type %#x.\n", resource_type); + return; + } + resource = "image"; + data_type = reg_maps->uav_resource_info[resource_idx].data_type; + coord_mask = (1u << resource_type_info[resource_type].coord_size) - 1; + stride = reg_maps->uav_resource_info[resource_idx].stride; } - data_type = reg_maps->uav_resource_info[uav_idx].data_type; - coord_mask = (1u << resource_type_info[resource_type].coord_size) - 1; - stride = reg_maps->uav_resource_info[uav_idx].stride; switch (ins->handler_idx) { case WINED3DSIH_ATOMIC_AND: case WINED3DSIH_IMM_ATOMIC_AND: - op = "imageAtomicAnd"; + if (is_tgsm) + op = "atomicAnd"; + else + op = "imageAtomicAnd"; break; case WINED3DSIH_ATOMIC_CMP_STORE: case WINED3DSIH_IMM_ATOMIC_CMP_EXCH: - op = "imageAtomicCompSwap"; + if (is_tgsm) + op = "atomicCompSwap"; + else + op = "imageAtomicCompSwap"; break; case WINED3DSIH_ATOMIC_IADD: case WINED3DSIH_IMM_ATOMIC_IADD: - op = "imageAtomicAdd"; + if (is_tgsm) + op = "atomicAdd"; + else + op = "imageAtomicAdd"; break; case WINED3DSIH_ATOMIC_IMAX: case WINED3DSIH_IMM_ATOMIC_IMAX: @@ -5020,7 +5052,10 @@ static void shader_glsl_atomic(const struct wined3d_shader_instruction *ins) break; case WINED3DSIH_ATOMIC_OR: case WINED3DSIH_IMM_ATOMIC_OR: - op = "imageAtomicOr"; + if (is_tgsm) + op = "atomicOr"; + else + op = "imageAtomicOr"; break; case WINED3DSIH_ATOMIC_UMAX: case WINED3DSIH_IMM_ATOMIC_UMAX: @@ -5042,10 +5077,16 @@ static void shader_glsl_atomic(const struct wined3d_shader_instruction *ins) break; case WINED3DSIH_ATOMIC_XOR: case WINED3DSIH_IMM_ATOMIC_XOR: - op = "imageAtomicXor"; + if (is_tgsm) + op = "atomicXor"; + else + op = "imageAtomicXor"; break; case WINED3DSIH_IMM_ATOMIC_EXCH: - op = "imageAtomicExchange"; + if (is_tgsm) + op = "atomicExchange"; + else + op = "imageAtomicExchange"; break; default: ERR("Unhandled opcode %#x.\n", ins->handler_idx); @@ -5063,15 +5104,19 @@ static void shader_glsl_atomic(const struct wined3d_shader_instruction *ins) { shader_glsl_add_src_param(ins, &ins->src[0], coord_mask, &offset); string_buffer_sprintf(address, "%s", offset.param_str); - if (reg_maps->uav_resource_info[uav_idx].flags & WINED3D_VIEW_BUFFER_RAW) + if (reg_maps->uav_resource_info[resource_idx].flags & WINED3D_VIEW_BUFFER_RAW) shader_addline(address, "/ 4"); } if (is_imm_instruction) shader_glsl_append_dst_ext(ins->ctx->buffer, ins, &ins->dst[0], data_type); - shader_addline(buffer, "%s(%s_image%u, %s, ", - op, shader_glsl_get_prefix(version->type), uav_idx, address->buffer); + if (is_tgsm) + shader_addline(buffer, "%s(%s_%s%u[%s], ", + op, shader_glsl_get_prefix(version->type), resource, resource_idx, address->buffer); + else + shader_addline(buffer, "%s(%s_%s%u, %s, ", + op, shader_glsl_get_prefix(version->type), resource, resource_idx, address->buffer); shader_glsl_add_src_param_ext(ins, &ins->src[1], WINED3DSP_WRITEMASK_0, &data, data_type); shader_addline(buffer, "%s", data.param_str);

1 0

Józef Kucia : wined3d: Add support for store_{raw, structured} on thread group shared memory.
by Alexandre Julliard 02 Mar '17

02 Mar '17

Module: wine Branch: master Commit: 5b43b83539e7ac76ef1034a85fd977bddfe81fe6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b43b83539e7ac76ef1034a85… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 2 00:55:28 2017 +0100 wined3d: Add support for store_{raw, structured} on thread group shared memory. 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 | 42 ++++++++++++++++++++++++++++++------------ 1 file changed, 30 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 51deae0..61865c1 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5278,30 +5278,44 @@ static void shader_glsl_store_uav(const struct wined3d_shader_instruction *ins) image_coord_param.param_str, image_data_param.param_str); } -static void shader_glsl_store_buffer(const struct wined3d_shader_instruction *ins) +static void shader_glsl_store_raw_structured(const struct wined3d_shader_instruction *ins) { const char *prefix = shader_glsl_get_prefix(ins->ctx->reg_maps->shader_version.type); const struct wined3d_shader_reg_maps *reg_maps = ins->ctx->reg_maps; struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; struct wined3d_string_buffer *buffer = ins->ctx->buffer; struct glsl_src_param structure_idx, offset, data; + unsigned int i, resource_idx, stride, src_idx = 0; struct wined3d_string_buffer *address; - unsigned int i, uav_idx, src_idx = 0; DWORD write_mask; + BOOL is_tgsm; - uav_idx = ins->dst[0].reg.idx[0].offset; - if (uav_idx >= ARRAY_SIZE(reg_maps->uav_resource_info)) + resource_idx = ins->dst[0].reg.idx[0].offset; + is_tgsm = ins->dst[0].reg.type == WINED3DSPR_GROUPSHAREDMEM; + if (is_tgsm) { - ERR("Invalid UAV index %u.\n", uav_idx); - return; + if (resource_idx >= reg_maps->tgsm_count) + { + ERR("Invalid TGSM index %u.\n", resource_idx); + return; + } + stride = reg_maps->tgsm[resource_idx].stride; + } + else + { + if (resource_idx >= ARRAY_SIZE(reg_maps->uav_resource_info)) + { + ERR("Invalid UAV index %u.\n", resource_idx); + return; + } + stride = reg_maps->uav_resource_info[resource_idx].stride; } address = string_buffer_get(priv->string_buffers); if (ins->handler_idx == WINED3DSIH_STORE_STRUCTURED) { shader_glsl_add_src_param(ins, &ins->src[src_idx++], WINED3DSP_WRITEMASK_0, &structure_idx); - shader_addline(address, "%s * %u + ", structure_idx.param_str, - reg_maps->uav_resource_info[uav_idx].stride); + shader_addline(address, "%s * %u + ", structure_idx.param_str, stride); } shader_glsl_add_src_param(ins, &ins->src[src_idx++], WINED3DSP_WRITEMASK_0, &offset); shader_addline(address, "%s / 4", offset.param_str); @@ -5313,8 +5327,12 @@ static void shader_glsl_store_buffer(const struct wined3d_shader_instruction *in shader_glsl_add_src_param(ins, &ins->src[src_idx], write_mask, &data); - shader_addline(buffer, "imageStore(%s_image%u, %s + %u, uvec4(%s, 0, 0, 0));\n", - prefix, uav_idx, address->buffer, i, data.param_str); + if (is_tgsm) + shader_addline(buffer, "%s_g%u[%s + %u] = %s;\n", + prefix, resource_idx, address->buffer, i, data.param_str); + else + shader_addline(buffer, "imageStore(%s_image%u, %s + %u, uvec4(%s, 0, 0, 0));\n", + prefix, resource_idx, address->buffer, i, data.param_str); } string_buffer_release(priv->string_buffers, address); @@ -9653,8 +9671,8 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_SINCOS */ shader_glsl_sincos, /* WINED3DSIH_SLT */ shader_glsl_compare, /* WINED3DSIH_SQRT */ shader_glsl_map2gl, - /* WINED3DSIH_STORE_RAW */ shader_glsl_store_buffer, - /* WINED3DSIH_STORE_STRUCTURED */ shader_glsl_store_buffer, + /* WINED3DSIH_STORE_RAW */ shader_glsl_store_raw_structured, + /* WINED3DSIH_STORE_STRUCTURED */ shader_glsl_store_raw_structured, /* WINED3DSIH_STORE_UAV_TYPED */ shader_glsl_store_uav, /* WINED3DSIH_SUB */ shader_glsl_binop, /* WINED3DSIH_SWAPC */ NULL,

1 0

Józef Kucia : wined3d: Implement SM5 sync instruction.
by Alexandre Julliard 02 Mar '17

02 Mar '17

Module: wine Branch: master Commit: d853eaedaee9f2757c340113f3974768604a504d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d853eaedaee9f2757c340113f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 2 00:55:29 2017 +0100 wined3d: Implement SM5 sync instruction. 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 | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 61865c1..e5dd567 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5338,6 +5338,27 @@ static void shader_glsl_store_raw_structured(const struct wined3d_shader_instruc string_buffer_release(priv->string_buffers, address); } +static void shader_glsl_sync(const struct wined3d_shader_instruction *ins) +{ + struct wined3d_string_buffer *buffer = ins->ctx->buffer; + unsigned int sync_flags = ins->flags; + + if (sync_flags & WINED3DSSF_THREAD_GROUP) + { + shader_addline(buffer, "barrier();\n"); + sync_flags &= ~(WINED3DSSF_THREAD_GROUP | WINED3DSSF_GROUP_SHARED_MEMORY); + } + + if (sync_flags & WINED3DSSF_GROUP_SHARED_MEMORY) + { + shader_addline(buffer, "memoryBarrierShared();\n"); + sync_flags &= ~WINED3DSSF_GROUP_SHARED_MEMORY; + } + + if (sync_flags) + FIXME("Unhandled sync flags %#x.\n", sync_flags); +} + static void shader_glsl_resinfo(const struct wined3d_shader_instruction *ins) { const struct wined3d_shader_version *version = &ins->ctx->reg_maps->shader_version; @@ -9677,7 +9698,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_SUB */ shader_glsl_binop, /* WINED3DSIH_SWAPC */ NULL, /* WINED3DSIH_SWITCH */ shader_glsl_switch, - /* WINED3DSIH_SYNC */ NULL, + /* WINED3DSIH_SYNC */ shader_glsl_sync, /* WINED3DSIH_TEX */ shader_glsl_tex, /* WINED3DSIH_TEXBEM */ shader_glsl_texbem, /* WINED3DSIH_TEXBEML */ shader_glsl_texbem,

1 0

Józef Kucia : wined3d: Add ARB_shader_storage_buffer_object extension.
by Alexandre Julliard 02 Mar '17

02 Mar '17

Module: wine Branch: master Commit: 700dd3518b5e4f8a18fe9ee953e66cada264fa8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=700dd3518b5e4f8a18fe9ee95… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 2 00:55:30 2017 +0100 wined3d: Add ARB_shader_storage_buffer_object extension. Nvidia binary drivers require the ARB_shader_storage_buffer_object extension to be enabled in order to use atomic operations on compute shader shared variables. 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/directx.c | 4 ++++ dlls/wined3d/glsl_shader.c | 2 ++ dlls/wined3d/wined3d_gl.h | 1 + 3 files changed, 7 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 02df3f0..5fa34e5 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -150,6 +150,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_shader_bit_encoding", ARB_SHADER_BIT_ENCODING }, {"GL_ARB_shader_image_load_store", ARB_SHADER_IMAGE_LOAD_STORE }, {"GL_ARB_shader_image_size", ARB_SHADER_IMAGE_SIZE }, + {"GL_ARB_shader_storage_buffer_object", ARB_SHADER_STORAGE_BUFFER_OBJECT}, {"GL_ARB_shader_texture_lod", ARB_SHADER_TEXTURE_LOD }, {"GL_ARB_shading_language_100", ARB_SHADING_LANGUAGE_100 }, {"GL_ARB_shading_language_420pack", ARB_SHADING_LANGUAGE_420PACK }, @@ -2832,6 +2833,8 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glUniformMatrix4fvARB) USE_GL_FUNC(glUseProgramObjectARB) USE_GL_FUNC(glValidateProgramARB) + /* GL_ARB_shader_storage_buffer_object */ + USE_GL_FUNC(glShaderStorageBlockBinding) /* GL_ARB_sync */ USE_GL_FUNC(glClientWaitSync) USE_GL_FUNC(glDeleteSync) @@ -3774,6 +3777,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, {ARB_ES3_COMPATIBILITY, MAKEDWORD_VERSION(4, 3)}, {ARB_INTERNALFORMAT_QUERY2, MAKEDWORD_VERSION(4, 3)}, {ARB_SHADER_IMAGE_SIZE, MAKEDWORD_VERSION(4, 3)}, + {ARB_SHADER_STORAGE_BUFFER_OBJECT, MAKEDWORD_VERSION(4, 3)}, {ARB_STENCIL_TEXTURING, MAKEDWORD_VERSION(4, 3)}, {ARB_TEXTURE_BUFFER_RANGE, MAKEDWORD_VERSION(4, 3)}, {ARB_TEXTURE_QUERY_LEVELS, MAKEDWORD_VERSION(4, 3)}, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e5dd567..d6bb622 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -6613,6 +6613,8 @@ static void shader_glsl_enable_extensions(struct wined3d_string_buffer *buffer, shader_addline(buffer, "#extension GL_ARB_shader_image_load_store : enable\n"); if (gl_info->supported[ARB_SHADER_IMAGE_SIZE]) shader_addline(buffer, "#extension GL_ARB_shader_image_size : enable\n"); + if (gl_info->supported[ARB_SHADER_STORAGE_BUFFER_OBJECT]) + shader_addline(buffer, "#extension GL_ARB_shader_storage_buffer_object : enable\n"); if (gl_info->supported[ARB_SHADING_LANGUAGE_420PACK]) shader_addline(buffer, "#extension GL_ARB_shading_language_420pack : enable\n"); if (gl_info->supported[ARB_SHADING_LANGUAGE_PACKING]) diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 396f93f..fa5985c 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -83,6 +83,7 @@ enum wined3d_gl_extension ARB_SHADER_BIT_ENCODING, ARB_SHADER_IMAGE_LOAD_STORE, ARB_SHADER_IMAGE_SIZE, + ARB_SHADER_STORAGE_BUFFER_OBJECT, ARB_SHADER_TEXTURE_LOD, ARB_SHADING_LANGUAGE_100, ARB_SHADING_LANGUAGE_420PACK,

1 0

Józef Kucia : d3d11/tests: Add test for thread group shared memory.
by Alexandre Julliard 02 Mar '17

02 Mar '17

Module: wine Branch: master Commit: adb6a9074da340cb35286971eab3fad52dd8441b URL: http://source.winehq.org/git/wine.git/?a=commit;h=adb6a9074da340cb35286971e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 2 00:55:31 2017 +0100 d3d11/tests: Add test for thread group shared memory. 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/tests/d3d11.c | 284 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 284 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=adb6a9074da340cb35286…

1 0

Józef Kucia : wined3d: Don' t leak texture in wined3d_unordered_access_view_destroy_object().
by Alexandre Julliard 02 Mar '17

02 Mar '17

Module: wine Branch: master Commit: b5b26c204f9905d8c2c41817691d1b275d6f9659 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5b26c204f9905d8c2c418176… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 2 09:44:29 2017 +0100 wined3d: Don't leak texture in wined3d_unordered_access_view_destroy_object(). 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/view.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index a74a2ea..a8e69fc 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -673,7 +673,21 @@ ULONG CDECL wined3d_unordered_access_view_incref(struct wined3d_unordered_access static void wined3d_unordered_access_view_destroy_object(void *object) { - HeapFree(GetProcessHeap(), 0, object); + struct wined3d_unordered_access_view *view = object; + + if (view->gl_view.name) + { + const struct wined3d_gl_info *gl_info; + struct wined3d_context *context; + + context = context_acquire(view->resource->device, NULL, 0); + gl_info = context->gl_info; + gl_info->gl_ops.gl.p_glDeleteTextures(1, &view->gl_view.name); + checkGLcall("glDeleteTextures"); + context_release(context); + } + + HeapFree(GetProcessHeap(), 0, view); } ULONG CDECL wined3d_unordered_access_view_decref(struct wined3d_unordered_access_view *view)

1 0

Nikolay Sivov : comctl32/propsheet: Enforce minimal PROPSHEETPAGE structure size when creating a page.
by Alexandre Julliard 02 Mar '17

02 Mar '17

Module: wine Branch: master Commit: a3aa217f030cbc77614c56948615fdba1624fbdc URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3aa217f030cbc77614c56948… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 1 22:47:20 2017 +0300 comctl32/propsheet: Enforce minimal PROPSHEETPAGE structure size when creating a page. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/propsheet.c | 12 ++++++++++-- dlls/comctl32/tests/propsheet.c | 2 -- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index a3a6a5c..88a44cd 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -2957,8 +2957,12 @@ static LPWSTR load_string( HINSTANCE instance, LPCWSTR str ) HPROPSHEETPAGE WINAPI CreatePropertySheetPageA( LPCPROPSHEETPAGEA lpPropSheetPage) { - PROPSHEETPAGEW* ppsp = Alloc(sizeof(PROPSHEETPAGEW)); + PROPSHEETPAGEW *ppsp; + if (lpPropSheetPage->dwSize < PROPSHEETPAGEA_V1_SIZE) + return NULL; + + ppsp = Alloc(sizeof(PROPSHEETPAGEW)); memcpy(ppsp,lpPropSheetPage,min(lpPropSheetPage->dwSize,sizeof(PROPSHEETPAGEA))); ppsp->dwFlags &= ~ PSP_INTERNAL_UNICODE; @@ -3023,8 +3027,12 @@ HPROPSHEETPAGE WINAPI CreatePropertySheetPageA( */ HPROPSHEETPAGE WINAPI CreatePropertySheetPageW(LPCPROPSHEETPAGEW lpPropSheetPage) { - PROPSHEETPAGEW* ppsp = Alloc(sizeof(PROPSHEETPAGEW)); + PROPSHEETPAGEW *ppsp; + + if (lpPropSheetPage->dwSize < PROPSHEETPAGEW_V1_SIZE) + return NULL; + ppsp = Alloc(sizeof(PROPSHEETPAGEW)); memcpy(ppsp,lpPropSheetPage,min(lpPropSheetPage->dwSize,sizeof(PROPSHEETPAGEW))); ppsp->dwFlags |= PSP_INTERNAL_UNICODE; diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index 0b1c45c..8a4e6d1 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -1076,7 +1076,6 @@ static void test_CreatePropertySheetPage(void) hpsp = CreatePropertySheetPageA(&page.u.pageA); if (page.u.pageA.dwSize < PROPSHEETPAGEA_V1_SIZE) - todo_wine ok(hpsp == NULL, "Expected failure, size %u\n", page.u.pageA.dwSize); else { @@ -1108,7 +1107,6 @@ static void test_CreatePropertySheetPage(void) hpsp = CreatePropertySheetPageW(&page.u.pageW); if (page.u.pageW.dwSize < PROPSHEETPAGEW_V1_SIZE) - todo_wine ok(hpsp == NULL, "Expected failure, size %u\n", page.u.pageW.dwSize); else {

1 0

Nikolay Sivov : comctl32/propsheet: Implement PSPCB_ADDREF/ PSPCB_RELEASE notifications.
by Alexandre Julliard 02 Mar '17

02 Mar '17

Module: wine Branch: master Commit: 429705eaf33c9de76530007d8fecb818562064c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=429705eaf33c9de76530007d8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 1 22:47:21 2017 +0300 comctl32/propsheet: Implement PSPCB_ADDREF/PSPCB_RELEASE notifications. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/propsheet.c | 41 +++++++++++++++++++++++++++++++++++------ dlls/comctl32/tests/propsheet.c | 4 ---- 2 files changed, 35 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 88a44cd..0cfc799 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -2962,10 +2962,20 @@ HPROPSHEETPAGE WINAPI CreatePropertySheetPageA( if (lpPropSheetPage->dwSize < PROPSHEETPAGEA_V1_SIZE) return NULL; - ppsp = Alloc(sizeof(PROPSHEETPAGEW)); - memcpy(ppsp,lpPropSheetPage,min(lpPropSheetPage->dwSize,sizeof(PROPSHEETPAGEA))); + /* original data is used for callback notifications */ + if ((lpPropSheetPage->dwFlags & PSP_USECALLBACK) && lpPropSheetPage->pfnCallback) + { + ppsp = Alloc(2 * sizeof(*ppsp)); + memcpy(ppsp, lpPropSheetPage, min(lpPropSheetPage->dwSize, sizeof(PROPSHEETPAGEA))); + memcpy(ppsp + 1, lpPropSheetPage, min(lpPropSheetPage->dwSize, sizeof(PROPSHEETPAGEA))); + } + else + { + ppsp = Alloc(sizeof(*ppsp)); + memcpy(ppsp, lpPropSheetPage, min(lpPropSheetPage->dwSize, sizeof(PROPSHEETPAGEA))); + } - ppsp->dwFlags &= ~ PSP_INTERNAL_UNICODE; + ppsp->dwFlags &= ~PSP_INTERNAL_UNICODE; if ( !(ppsp->dwFlags & PSP_DLGINDIRECT) ) { @@ -3017,6 +3027,9 @@ HPROPSHEETPAGE WINAPI CreatePropertySheetPageA( else ppsp->pszHeaderSubTitle = NULL; + if ((ppsp->dwFlags & PSP_USECALLBACK) && ppsp->dwSize > PROPSHEETPAGEA_V1_SIZE && ppsp->pfnCallback) + ppsp->pfnCallback(0, PSPCB_ADDREF, ppsp + 1); + return (HPROPSHEETPAGE)ppsp; } @@ -3032,10 +3045,20 @@ HPROPSHEETPAGE WINAPI CreatePropertySheetPageW(LPCPROPSHEETPAGEW lpPropSheetPage if (lpPropSheetPage->dwSize < PROPSHEETPAGEW_V1_SIZE) return NULL; - ppsp = Alloc(sizeof(PROPSHEETPAGEW)); - memcpy(ppsp,lpPropSheetPage,min(lpPropSheetPage->dwSize,sizeof(PROPSHEETPAGEW))); + /* original data is used for callback notifications */ + if ((lpPropSheetPage->dwFlags & PSP_USECALLBACK) && lpPropSheetPage->pfnCallback) + { + ppsp = Alloc(2 * sizeof(*ppsp)); + memcpy(ppsp, lpPropSheetPage, min(lpPropSheetPage->dwSize, sizeof(PROPSHEETPAGEW))); + memcpy(ppsp + 1, lpPropSheetPage, min(lpPropSheetPage->dwSize, sizeof(PROPSHEETPAGEW))); + } + else + { + ppsp = Alloc(sizeof(*ppsp)); + memcpy(ppsp, lpPropSheetPage, min(lpPropSheetPage->dwSize, sizeof(PROPSHEETPAGEW))); + } - ppsp->dwFlags |= PSP_INTERNAL_UNICODE; + ppsp->dwFlags |= PSP_INTERNAL_UNICODE; if ( !(ppsp->dwFlags & PSP_DLGINDIRECT) ) { @@ -3067,6 +3090,9 @@ HPROPSHEETPAGE WINAPI CreatePropertySheetPageW(LPCPROPSHEETPAGEW lpPropSheetPage else ppsp->pszHeaderSubTitle = NULL; + if ((ppsp->dwFlags & PSP_USECALLBACK) && ppsp->dwSize > PROPSHEETPAGEW_V1_SIZE && ppsp->pfnCallback) + ppsp->pfnCallback(0, PSPCB_ADDREF, ppsp + 1); + return (HPROPSHEETPAGE)ppsp; } @@ -3088,6 +3114,9 @@ BOOL WINAPI DestroyPropertySheetPage(HPROPSHEETPAGE hPropPage) if (!psp) return FALSE; + if ((psp->dwFlags & PSP_USECALLBACK) && psp->pfnCallback) + psp->pfnCallback(0, PSPCB_RELEASE, psp + 1); + if (!(psp->dwFlags & PSP_DLGINDIRECT) && !IS_INTRESOURCE( psp->u.pszTemplate )) Free ((LPVOID)psp->u.pszTemplate); diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index 8a4e6d1..9405965 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -1080,7 +1080,6 @@ static void test_CreatePropertySheetPage(void) else { ok(hpsp != NULL, "Failed to create a page, size %u\n", page.u.pageA.dwSize); - todo_wine_if(page.u.pageA.dwSize > PROPSHEETPAGEA_V1_SIZE) ok(page.addref_called == (page.u.pageA.dwSize > PROPSHEETPAGEA_V1_SIZE) ? 1 : 0, "Expected ADDREF callback message\n"); } @@ -1089,7 +1088,6 @@ static void test_CreatePropertySheetPage(void) page.release_called = 0; ret = DestroyPropertySheetPage(hpsp); ok(ret, "Failed to destroy a page\n"); - todo_wine ok(page.release_called == 1, "Expected RELEASE callback message\n"); } } @@ -1111,7 +1109,6 @@ static void test_CreatePropertySheetPage(void) else { ok(hpsp != NULL, "Failed to create a page, size %u\n", page.u.pageW.dwSize); - todo_wine_if(page.u.pageW.dwSize > PROPSHEETPAGEW_V1_SIZE) ok(page.addref_called == (page.u.pageW.dwSize > PROPSHEETPAGEW_V1_SIZE) ? 1 : 0, "Expected ADDREF callback message\n"); } @@ -1120,7 +1117,6 @@ static void test_CreatePropertySheetPage(void) page.release_called = 0; ret = DestroyPropertySheetPage(hpsp); ok(ret, "Failed to destroy a page\n"); - todo_wine ok(page.release_called == 1, "Expected RELEASE callback message\n"); } }

1 0