July 2021 - Wine-Commits - list.winehq.org

Conor McCarthy : vkd3d-shader: Implement DMOV instruction.
by Alexandre Julliard July 28, 2021

July 28, 2021

Module: vkd3d Branch: master Commit: 4e63842a735dbae81b8cf5ec7519da4fdf4dbc50 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=4e63842a735dbae81b8cf5e… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Jul 28 00:26:10 2021 +1000 vkd3d-shader: Implement DMOV instruction. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/dxbc.c | 4 ++++ libs/vkd3d-shader/spirv.c | 10 +++++++--- libs/vkd3d-shader/trace.c | 4 ++++ libs/vkd3d-shader/vkd3d_shader_private.h | 7 +++++++ tests/d3d12.c | 2 +- 5 files changed, 23 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 5bd91d6..6f27cb6 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -311,6 +311,7 @@ enum vkd3d_sm4_opcode VKD3D_SM5_OP_IMM_ATOMIC_UMIN = 0xbd, VKD3D_SM5_OP_SYNC = 0xbe, VKD3D_SM5_OP_DEQ = 0xc3, + VKD3D_SM5_OP_DMOV = 0xc7, VKD3D_SM5_OP_EVAL_SAMPLE_INDEX = 0xcc, VKD3D_SM5_OP_EVAL_CENTROID = 0xcd, VKD3D_SM5_OP_DCL_GS_INSTANCES = 0xce, @@ -1250,6 +1251,7 @@ static const struct vkd3d_sm4_opcode_info opcode_table[] = {VKD3D_SM5_OP_SYNC, VKD3DSIH_SYNC, "", "", shader_sm5_read_sync}, {VKD3D_SM5_OP_DEQ, VKD3DSIH_DEQ, "u", "dd"}, + {VKD3D_SM5_OP_DMOV, VKD3DSIH_DMOV, "d", "d"}, {VKD3D_SM5_OP_EVAL_SAMPLE_INDEX, VKD3DSIH_EVAL_SAMPLE_INDEX, "f", "fi"}, {VKD3D_SM5_OP_EVAL_CENTROID, VKD3DSIH_EVAL_CENTROID, "f", "f"}, {VKD3D_SM5_OP_DCL_GS_INSTANCES, VKD3DSIH_DCL_GS_INSTANCES, "", "", @@ -1804,6 +1806,8 @@ static bool shader_sm4_read_dst_param(struct vkd3d_sm4_data *priv, const DWORD * } dst_param->write_mask = (token & VKD3D_SM4_WRITEMASK_MASK) >> VKD3D_SM4_WRITEMASK_SHIFT; + if (data_type == VKD3D_DATA_DOUBLE) + dst_param->write_mask = vkd3d_write_mask_64_from_32(dst_param->write_mask); /* Scalar registers are declared with no write mask in shader bytecode. */ if (!dst_param->write_mask && shader_sm4_is_scalar_register(&dst_param->reg)) dst_param->write_mask = VKD3DSP_WRITEMASK_0; diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 4fa9482..4c870fb 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3613,6 +3613,7 @@ static void vkd3d_dxbc_compiler_emit_store_reg(struct vkd3d_dxbc_compiler *compi struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; enum vkd3d_shader_component_type component_type; struct vkd3d_shader_register_info reg_info; + unsigned int src_write_mask = write_mask; uint32_t type_id; assert(reg->type != VKD3DSPR_IMMCONST); @@ -3624,14 +3625,16 @@ static void vkd3d_dxbc_compiler_emit_store_reg(struct vkd3d_dxbc_compiler *compi component_type = vkd3d_component_type_from_data_type(reg->data_type); if (component_type != reg_info.component_type) { - unsigned int component_count = vkd3d_write_mask_component_count(write_mask); - type_id = vkd3d_spirv_get_type_id(builder, reg_info.component_type, component_count); + if (reg->data_type == VKD3D_DATA_DOUBLE) + src_write_mask = vkd3d_write_mask_32_from_64(write_mask); + type_id = vkd3d_spirv_get_type_id(builder, reg_info.component_type, + vkd3d_write_mask_component_count(src_write_mask)); val_id = vkd3d_spirv_build_op_bitcast(builder, type_id, val_id); component_type = reg_info.component_type; } vkd3d_dxbc_compiler_emit_store(compiler, - reg_info.id, reg_info.write_mask, component_type, reg_info.storage_class, write_mask, val_id); + reg_info.id, reg_info.write_mask, component_type, reg_info.storage_class, src_write_mask, val_id); } static uint32_t vkd3d_dxbc_compiler_emit_sat(struct vkd3d_dxbc_compiler *compiler, @@ -9349,6 +9352,7 @@ int vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler, case VKD3DSIH_HS_JOIN_PHASE: vkd3d_dxbc_compiler_enter_shader_phase(compiler, instruction); break; + case VKD3DSIH_DMOV: case VKD3DSIH_MOV: vkd3d_dxbc_compiler_emit_mov(compiler, instruction); break; diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 556654e..b80aef6 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -105,6 +105,7 @@ static const char * const shader_opcode_names[] = /* VKD3DSIH_DEFI */ "defi", /* VKD3DSIH_DEQ */ "deq", /* VKD3DSIH_DIV */ "div", + /* VKD3DSIH_DMOV */ "dmov", /* VKD3DSIH_DP2 */ "dp2", /* VKD3DSIH_DP2ADD */ "dp2add", /* VKD3DSIH_DP3 */ "dp3", @@ -1122,6 +1123,9 @@ static void shader_dump_dst_param(struct vkd3d_d3d_asm_compiler *compiler, { static const char write_mask_chars[] = "xyzw"; + if (param->reg.data_type == VKD3D_DATA_DOUBLE) + write_mask = vkd3d_write_mask_32_from_64(write_mask); + shader_addline(buffer, ".%s", compiler->colours.write_mask); if (write_mask & VKD3DSP_WRITEMASK_0) shader_addline(buffer, "%c", write_mask_chars[0]); diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 3603d98..9e40a3b 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -193,6 +193,7 @@ enum vkd3d_shader_opcode VKD3DSIH_DEFI, VKD3DSIH_DEQ, VKD3DSIH_DIV, + VKD3DSIH_DMOV, VKD3DSIH_DP2, VKD3DSIH_DP2ADD, VKD3DSIH_DP3, @@ -1064,6 +1065,12 @@ static inline unsigned int vkd3d_write_mask_from_component_count(unsigned int co return (VKD3DSP_WRITEMASK_0 << component_count) - 1; } +static inline unsigned int vkd3d_write_mask_64_from_32(DWORD write_mask32) +{ + unsigned int write_mask64 = write_mask32 | (write_mask32 >> 1); + return (write_mask64 & VKD3DSP_WRITEMASK_0) | ((write_mask64 & VKD3DSP_WRITEMASK_2) >> 1); +} + static inline unsigned int vkd3d_write_mask_32_from_64(unsigned int write_mask64) { unsigned int write_mask32 = (write_mask64 | (write_mask64 << 1)) diff --git a/tests/d3d12.c b/tests/d3d12.c index fbf14a2..b10f24b 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -9878,7 +9878,7 @@ static void test_shader_instructions(void) {&ps_movc, {{{0, 1, 1, 0}, {1, 2, 3, 4}, {5, 6, 7, 8}}}, {{5, 2, 3, 8}}}, {&ps_movc, {{{1, 1, 1, 1}, {1, 2, 3, 4}, {5, 6, 7, 8}}}, {{1, 2, 3, 4}}}, - {&ps_dmov, {.d = {{2.5 + 1.0e-9, -3.5 - 1.0e-9}}}, {.d = {3.5 + 1.0e-9, -2.5 - 1.0e-9}}, true, true}, + {&ps_dmov, {.d = {{2.5 + 1.0e-9, -3.5 - 1.0e-9}}}, {.d = {3.5 + 1.0e-9, -2.5 - 1.0e-9}}, true}, {&ps_dadd, {.d = {{2.5, 0.0}}}, {.d = {2.5 + 1.0000002433080226, 2.5 + 2.000000481493771}}, true, true}, {&ps_dmin_dmax, {.d = {{-1.0, 1.0}}}, {.d = {-1.0, 1.0}}, true, true}, {&ps_dmovc, {.d = {{0.5, 0.0}}}, {.d = {4.5, 4.5}}, true, true},

1 0

Conor McCarthy : vkd3d-shader: Exclude descriptor arrays from push constant buffer searches.
by Alexandre Julliard July 28, 2021

July 28, 2021

Module: vkd3d Branch: master Commit: e1b334aff8c1f1aa78f13701d24e98d5907455ca URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e1b334aff8c1f1aa78f1370… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Jul 27 23:39:59 2021 +1000 vkd3d-shader: Exclude descriptor arrays from push constant buffer searches. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 584f7c1..2ea7046 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2433,6 +2433,9 @@ static struct vkd3d_push_constant_buffer_binding *vkd3d_dxbc_compiler_find_push_ unsigned int reg_idx = cb->range.first; unsigned int i; + if (cb->range.first != cb->range.last) + return NULL; + for (i = 0; i < compiler->shader_interface.push_constant_buffer_count; ++i) { struct vkd3d_push_constant_buffer_binding *current = &compiler->push_constants[i];

1 0

Zebediah Figura : vkd3d-shader: Use vkd3d_bytecode_buffer helpers directly in shader_write_root_signature_header().
by Alexandre Julliard July 28, 2021

July 28, 2021

Module: vkd3d Branch: master Commit: 743b1fc090cd46b33c79fd6e9b0466e6ab1a0c6b URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=743b1fc090cd46b33c79fd6… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jul 27 16:06:45 2021 -0500 vkd3d-shader: Use vkd3d_bytecode_buffer helpers directly in shader_write_root_signature_header(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/dxbc.c | 48 ++++++++++++------------------------------------ 1 file changed, 12 insertions(+), 36 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 6f27cb6..c076b0f 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2967,43 +2967,23 @@ static size_t get_chunk_offset(struct root_signature_writer_context *context) return bytecode_get_size(&context->buffer) - context->chunk_position; } -static int shader_write_root_signature_header(struct root_signature_writer_context *context) +static void shader_write_root_signature_header(struct root_signature_writer_context *context) { struct vkd3d_bytecode_buffer *buffer = &context->buffer; + unsigned int i; - if (!write_dword(context, TAG_DXBC)) - goto fail; + put_u32(buffer, TAG_DXBC); /* The checksum is computed when all data is generated. */ - if (!write_dwords(context, 4, 0x00000000)) - goto fail; - - if (!write_dword(context, 0x00000001)) - goto fail; - - context->total_size_position = bytecode_get_size(buffer); - if (!write_dword(context, 0xffffffff)) /* total size */ - goto fail; - - if (!write_dword(context, 1)) /* chunk count */ - goto fail; - - /* chunk offset */ - if (!write_dword(context, bytecode_get_size(buffer) + sizeof(uint32_t))) - goto fail; - - if (!write_dword(context, TAG_RTS0)) - goto fail; - if (!write_dword(context, 0xffffffff)) /* chunk size */ - goto fail; + for (i = 0; i < 4; ++i) + put_u32(buffer, 0); + put_u32(buffer, 1); + context->total_size_position = put_u32(buffer, 0xffffffff); + put_u32(buffer, 1); /* chunk count */ + put_u32(buffer, bytecode_get_size(buffer) + sizeof(uint32_t)); /* chunk offset */ + put_u32(buffer, TAG_RTS0); + put_u32(buffer, 0xffffffff); context->chunk_position = bytecode_get_size(buffer); - - return VKD3D_OK; - -fail: - vkd3d_shader_error(&context->message_context, NULL, VKD3D_SHADER_ERROR_RS_OUT_OF_MEMORY, - "Out of memory while writing root signature header."); - return VKD3D_ERROR_OUT_OF_MEMORY; } static int shader_write_descriptor_ranges(struct root_signature_writer_context *context, @@ -3430,11 +3410,7 @@ int vkd3d_shader_serialize_root_signature(const struct vkd3d_shader_versioned_ro goto done; memset(dxbc, 0, sizeof(*dxbc)); - if ((ret = shader_write_root_signature_header(&context)) < 0) - { - vkd3d_free(context.buffer.data); - goto done; - } + shader_write_root_signature_header(&context); if ((ret = shader_write_root_signature(&context, root_signature)) < 0) {

1 0

Conor McCarthy : vkd3d-shader: Include register ranges in descriptor binding error messages.
by Alexandre Julliard July 28, 2021

July 28, 2021

Module: vkd3d Branch: master Commit: dbb715a160e12206ee9e762656f9d006507396bf URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=dbb715a160e12206ee9e762… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Jul 27 23:39:57 2021 +1000 vkd3d-shader: Include register ranges in descriptor binding error messages. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 33 +++++++++++++++++++++++++++++---- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 0407f50..23d1fcc 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2236,6 +2236,8 @@ struct vkd3d_dxbc_compiler struct vkd3d_shader_spec_constant *spec_constants; size_t spec_constants_size; enum vkd3d_shader_compile_option_formatting_flags formatting; + + struct vkd3d_string_buffer_cache string_buffers; }; static bool is_control_point_phase(const struct vkd3d_shader_phase *phase) @@ -2358,6 +2360,8 @@ struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader compiler->scan_descriptor_info = scan_descriptor_info; + vkd3d_string_buffer_cache_init(&compiler->string_buffers); + vkd3d_dxbc_compiler_emit_initial_declarations(compiler); return compiler; @@ -2484,6 +2488,22 @@ static void VKD3D_PRINTF_FUNC(3, 4) vkd3d_dxbc_compiler_error(struct vkd3d_dxbc_ compiler->failed = true; } +static struct vkd3d_string_buffer *vkd3d_shader_register_range_string(struct vkd3d_dxbc_compiler *compiler, + const struct vkd3d_shader_register_range *range) +{ + struct vkd3d_string_buffer *buffer = vkd3d_string_buffer_get(&compiler->string_buffers); + + if (!buffer) + return NULL; + + if (range->last != ~0u) + vkd3d_string_buffer_printf(buffer, "[%u:%u]", range->first, range->last); + else + vkd3d_string_buffer_printf(buffer, "[%u:*]", range->first); + + return buffer; +} + static struct vkd3d_shader_descriptor_binding vkd3d_dxbc_compiler_get_descriptor_binding( struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_register *reg, const struct vkd3d_shader_register_range *range, enum vkd3d_shader_resource_type resource_type, @@ -2576,11 +2596,14 @@ static struct vkd3d_shader_descriptor_binding vkd3d_dxbc_compiler_get_descriptor } if (shader_interface->binding_count) { - FIXME("Could not find binding for type %#x, space %u, register %u, shader type %#x.\n", - descriptor_type, range->space, range->first, compiler->shader_type); + struct vkd3d_string_buffer *buffer = vkd3d_shader_register_range_string(compiler, range); + const char *range_str = buffer ? buffer->buffer : ""; + FIXME("Could not find descriptor binding for type %#x, space %u, registers %s, shader type %#x.\n", + descriptor_type, range->space, range_str, compiler->shader_type); vkd3d_dxbc_compiler_error(compiler, VKD3D_SHADER_ERROR_SPV_DESCRIPTOR_BINDING_NOT_FOUND, - "Could not find descriptor binding for type %#x, space %u, register %u, shader type %#x.", - descriptor_type, range->space, range->first, compiler->shader_type); + "Could not find descriptor binding for type %#x, space %u, registers %s, shader type %#x.", + descriptor_type, range->space, range_str, compiler->shader_type); + vkd3d_string_buffer_release(&compiler->string_buffers, buffer); } } @@ -9611,5 +9634,7 @@ void vkd3d_dxbc_compiler_destroy(struct vkd3d_dxbc_compiler *compiler) vkd3d_free(compiler->shader_phases); vkd3d_free(compiler->spec_constants); + vkd3d_string_buffer_cache_cleanup(&compiler->string_buffers); + vkd3d_free(compiler); }

1 0

Zebediah Figura : vkd3d-shader: Use vkd3d_bytecode_buffer helpers directly in shader_write_descriptor_table1().
by Alexandre Julliard July 28, 2021

July 28, 2021

Module: vkd3d Branch: master Commit: 63fbb62301b2da5e4b43710930b86940ba88f16d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=63fbb62301b2da5e4b43710… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jul 27 16:06:49 2021 -0500 vkd3d-shader: Use vkd3d_bytecode_buffer helpers directly in shader_write_descriptor_table1(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/dxbc.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 0ee4fe2..0bb2287 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -3030,23 +3030,15 @@ static void shader_write_descriptor_table(struct root_signature_writer_context * shader_write_descriptor_ranges(buffer, table); } -static int shader_write_descriptor_table1(struct root_signature_writer_context *context, +static void shader_write_descriptor_table1(struct root_signature_writer_context *context, const struct vkd3d_shader_root_descriptor_table1 *table) { struct vkd3d_bytecode_buffer *buffer = &context->buffer; - if (!write_dword(context, table->descriptor_range_count)) - goto fail; - if (!write_dword(context, get_chunk_offset(context) + sizeof(DWORD))) /* offset */ - goto fail; + put_u32(buffer, table->descriptor_range_count); + put_u32(buffer, get_chunk_offset(context) + sizeof(uint32_t)); /* offset */ shader_write_descriptor_ranges1(buffer, table); - return VKD3D_OK; - -fail: - vkd3d_shader_error(&context->message_context, NULL, VKD3D_SHADER_ERROR_RS_OUT_OF_MEMORY, - "Out of memory while writing root signature root descriptor table."); - return VKD3D_ERROR_OUT_OF_MEMORY; } static int shader_write_root_constants(struct root_signature_writer_context *context, @@ -3133,7 +3125,7 @@ static int shader_write_root_parameters(struct root_signature_writer_context *co if (desc->version == VKD3D_SHADER_ROOT_SIGNATURE_VERSION_1_0) shader_write_descriptor_table(context, &desc->u.v_1_0.parameters[i].u.descriptor_table); else - ret = shader_write_descriptor_table1(context, &desc->u.v_1_1.parameters[i].u.descriptor_table); + shader_write_descriptor_table1(context, &desc->u.v_1_1.parameters[i].u.descriptor_table); break; case VKD3D_SHADER_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS: ret = shader_write_root_constants(context, versioned_root_signature_get_root_constants(desc, i));

1 0

Jacek Caban : gdi32: Use get_dc_attr in SetTextAlign.
by Alexandre Julliard July 27, 2021

July 27, 2021

Module: wine Branch: master Commit: a81d0b97cb79b6a53f5ddcc6d61d184edae6430c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a81d0b97cb79b6a53f5ddcc6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 26 23:29:36 2021 +0200 gdi32: Use get_dc_attr in SetTextAlign. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dc.c | 24 ---------------------- dlls/gdi32/enhmfdrv/dc.c | 4 ++-- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 2 ++ dlls/gdi32/gdidc.c | 19 +++++++++++++++++ dlls/gdi32/mfdrv/dc.c | 4 ++-- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 1 - dlls/gdi32/tests/metafile.c | 40 ++++++++++++++++++++++++++++++++++++ 10 files changed, 67 insertions(+), 32 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index deca9510f20..6ec4a0d1884 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -988,30 +988,6 @@ COLORREF WINAPI SetTextColor( HDC hdc, COLORREF color ) } -/*********************************************************************** - * SetTextAlign (GDI32.@) - */ -UINT WINAPI SetTextAlign( HDC hdc, UINT align ) -{ - UINT ret = GDI_ERROR; - DC *dc = get_dc_ptr( hdc ); - - TRACE("hdc=%p align=%d\n", hdc, align); - - if (dc) - { - PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSetTextAlign ); - align = physdev->funcs->pSetTextAlign( physdev, align ); - if (align != GDI_ERROR) - { - ret = dc->attr->text_align; - dc->attr->text_align = align; - } - release_dc_ptr( dc ); - } - return ret; -} - /*********************************************************************** * GetDCOrgEx (GDI32.@) */ diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index 1e5eed8c276..2c639e9dde3 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -61,13 +61,13 @@ BOOL CDECL EMFDRV_RestoreDC( PHYSDEV dev, INT level ) return ret; } -UINT CDECL EMFDRV_SetTextAlign( PHYSDEV dev, UINT align ) +BOOL EMFDC_SetTextAlign( DC_ATTR *dc_attr, UINT align ) { EMRSETTEXTALIGN emr; emr.emr.iType = EMR_SETTEXTALIGN; emr.emr.nSize = sizeof(emr); emr.iMode = align; - return EMFDRV_WriteRecord( dev, &emr.emr ) ? align : GDI_ERROR; + return EMFDRV_WriteRecord( dc_attr->emf, &emr.emr ); } BOOL CDECL EMFDRV_SetTextJustification(PHYSDEV dev, INT nBreakExtra, INT nBreakCount) diff --git a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h index 6f1ef7c4ad9..e21ff90a119 100644 --- a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h +++ b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h @@ -128,7 +128,6 @@ extern COLORREF CDECL EMFDRV_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color extern INT CDECL EMFDRV_SetPolyFillMode( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN; extern INT CDECL EMFDRV_SetROP2( PHYSDEV dev, INT rop ) DECLSPEC_HIDDEN; extern INT CDECL EMFDRV_SetStretchBltMode( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN; -extern UINT CDECL EMFDRV_SetTextAlign( PHYSDEV dev, UINT align ) DECLSPEC_HIDDEN; extern COLORREF CDECL EMFDRV_SetTextColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_SetTextJustification( PHYSDEV dev, INT nBreakExtra, INT nBreakCount ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_SetViewportExtEx( PHYSDEV dev, INT x, INT y, SIZE *size ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 45ec60c8d33..f4bfc20b687 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -144,7 +144,7 @@ static const struct gdi_dc_funcs emfdrv_driver = EMFDRV_SetROP2, /* pSetROP2 */ NULL, /* pSetRelAbs */ EMFDRV_SetStretchBltMode, /* pSetStretchBltMode */ - EMFDRV_SetTextAlign, /* pSetTextAlign */ + NULL, /* pSetTextAlign */ NULL, /* pSetTextCharacterExtra */ EMFDRV_SetTextColor, /* pSetTextColor */ EMFDRV_SetTextJustification, /* pSetTextJustification */ diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index d9784c31aac..bfc25ab5da1 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -67,6 +67,7 @@ extern BOOL METADC_Rectangle( HDC hdc, INT left, INT top, INT right, INT bottom) extern BOOL METADC_RoundRect( HDC hdc, INT left, INT top, INT right, INT bottom, INT ell_width, INT ell_height ) DECLSPEC_HIDDEN; extern BOOL METADC_SetPixel( HDC hdc, INT x, INT y, COLORREF color ) DECLSPEC_HIDDEN; +extern BOOL METADC_SetTextAlign( HDC hdc, UINT align ) DECLSPEC_HIDDEN; /* enhanced metafiles */ extern BOOL EMFDC_AbortPath( DC_ATTR *dc_attr ) DECLSPEC_HIDDEN; @@ -109,5 +110,6 @@ extern BOOL EMFDC_Rectangle( DC_ATTR *dc_attr, INT left, INT top, INT right, extern BOOL EMFDC_RoundRect( DC_ATTR *dc_attr, INT left, INT top, INT right, INT bottom, INT ell_width, INT ell_height ) DECLSPEC_HIDDEN; extern BOOL EMFDC_SetPixel( DC_ATTR *dc_attr, INT x, INT y, COLORREF color ) DECLSPEC_HIDDEN; +extern BOOL EMFDC_SetTextAlign( DC_ATTR *dc_attr, UINT align ) DECLSPEC_HIDDEN; #endif /* __WINE_GDI_PRIVATE_H */ diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 3cd0b4c26c1..cf53d52277d 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -46,6 +46,25 @@ UINT WINAPI GetTextAlign( HDC hdc ) return dc_attr ? dc_attr->text_align : 0; } +/*********************************************************************** + * SetTextAlign (GDI32.@) + */ +UINT WINAPI SetTextAlign( HDC hdc, UINT align ) +{ + DC_ATTR *dc_attr; + UINT ret; + + TRACE("hdc=%p align=%d\n", hdc, align); + + if (is_meta_dc( hdc )) return METADC_SetTextAlign( hdc, align ); + if (!(dc_attr = get_dc_attr( hdc ))) return GDI_ERROR; + if (dc_attr->emf && !EMFDC_SetTextAlign( dc_attr, align )) return GDI_ERROR; + + ret = dc_attr->text_align; + dc_attr->text_align = align; + return ret; +} + /*********************************************************************** * GetCurrentPositionEx (GDI32.@) */ diff --git a/dlls/gdi32/mfdrv/dc.c b/dlls/gdi32/mfdrv/dc.c index a036efe2d17..a3664365f9c 100644 --- a/dlls/gdi32/mfdrv/dc.c +++ b/dlls/gdi32/mfdrv/dc.c @@ -30,9 +30,9 @@ BOOL CDECL MFDRV_RestoreDC( PHYSDEV dev, INT level ) return MFDRV_MetaParam1( dev, META_RESTOREDC, level ); } -UINT CDECL MFDRV_SetTextAlign( PHYSDEV dev, UINT align ) +BOOL METADC_SetTextAlign( HDC hdc, UINT align ) { - return MFDRV_MetaParam2( dev, META_SETTEXTALIGN, HIWORD(align), LOWORD(align)) ? align : GDI_ERROR; + return metadc_param2( hdc, META_SETTEXTALIGN, HIWORD(align), LOWORD(align) ); } INT CDECL MFDRV_SetBkMode( PHYSDEV dev, INT mode ) diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index 1a647a655f3..7c69ca5d106 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -207,7 +207,7 @@ static const struct gdi_dc_funcs MFDRV_Funcs = MFDRV_SetROP2, /* pSetROP2 */ MFDRV_SetRelAbs, /* pSetRelAbs */ MFDRV_SetStretchBltMode, /* pSetStretchBltMode */ - MFDRV_SetTextAlign, /* pSetTextAlign */ + NULL, /* pSetTextAlign */ MFDRV_SetTextCharacterExtra, /* pSetTextCharacterExtra */ MFDRV_SetTextColor, /* pSetTextColor */ MFDRV_SetTextJustification, /* pSetTextJustification */ diff --git a/dlls/gdi32/mfdrv/metafiledrv.h b/dlls/gdi32/mfdrv/metafiledrv.h index 805c0c2f9d9..9e1ca0fedc1 100644 --- a/dlls/gdi32/mfdrv/metafiledrv.h +++ b/dlls/gdi32/mfdrv/metafiledrv.h @@ -115,7 +115,6 @@ extern INT CDECL MFDRV_SetPolyFillMode( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN extern INT CDECL MFDRV_SetROP2( PHYSDEV dev, INT rop ) DECLSPEC_HIDDEN; extern INT CDECL MFDRV_SetRelAbs( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN; extern INT CDECL MFDRV_SetStretchBltMode( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN; -extern UINT CDECL MFDRV_SetTextAlign( PHYSDEV dev, UINT align ) DECLSPEC_HIDDEN; extern INT CDECL MFDRV_SetTextCharacterExtra( PHYSDEV dev, INT extra ) DECLSPEC_HIDDEN; extern COLORREF CDECL MFDRV_SetTextColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_SetTextJustification( PHYSDEV dev, INT extra, INT breaks ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 9a9a3fa6a5a..fdef4049243 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -3113,6 +3113,25 @@ static void test_mf_SetPixel(void) DeleteMetaFile(mf); } +static void test_mf_attrs(void) +{ + HMETAFILE mf; + UINT attr; + HDC hdc; + + hdc = CreateMetaFileW(NULL); + ok(hdc != 0, "CreateEnhMetaFile failed\n"); + + attr = SetTextAlign(hdc, TA_BOTTOM); + ok(attr == TRUE, "attr = %x\n", attr); + attr = SetTextAlign(hdc, TA_TOP); + ok(attr == TRUE, "attr = %x\n", attr); + + mf = CloseMetaFile(hdc); + ok(mf != 0, "CloseEnhMetaFile failed\n"); + DeleteMetaFile(mf); +} + static void test_enhmetafile_file(void) { char temp_path[MAX_PATH]; @@ -3247,6 +3266,25 @@ static void test_emf_SetPixel(void) DeleteEnhMetaFile(emf); } +static void test_emf_attrs(void) +{ + HENHMETAFILE mf; + UINT attr; + HDC hdc; + + hdc = CreateEnhMetaFileW(NULL, NULL, NULL, NULL); + ok(hdc != 0, "CreateEnhMetaFile failed\n"); + + attr = SetTextAlign(hdc, TA_BOTTOM); + ok(attr == 0, "attr = %x\n", attr); + attr = SetTextAlign(hdc, TA_TOP); + ok(attr == TA_BOTTOM, "attr = %x\n", attr); + + mf = CloseEnhMetaFile(hdc); + ok(mf != 0, "CloseEnhMetaFile failed\n"); + DeleteEnhMetaFile(mf); +} + static void test_CopyMetaFile(void) { HDC hdcMetafile; @@ -6387,6 +6425,7 @@ START_TEST(metafile) test_emf_text_extents(); test_enhmetafile_file(); test_emf_SetPixel(); + test_emf_attrs(); /* For win-format metafiles (mfdrv) */ test_mf_SaveDC(); @@ -6403,6 +6442,7 @@ START_TEST(metafile) test_metafile_file(); test_mf_SetPixel(); test_mf_FloodFill(); + test_mf_attrs(); /* For metafile conversions */ test_mf_conversions();

1 0

Zebediah Figura : wined3d: Check for failure from wined3d_device_context_require_space() in wined3d_device_context_emit_unmap().
by Alexandre Julliard July 27, 2021

July 27, 2021

Module: wine Branch: master Commit: e4502cff812865d8f56ce659595946b7ee49ea45 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4502cff812865d8f56ce659… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jul 26 15:14:09 2021 -0500 wined3d: Check for failure from wined3d_device_context_require_space() in wined3d_device_context_emit_unmap(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51485 Signed-off-by: Zebediah Figura <zfigura(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 | 9 +++++++++ dlls/wined3d/cs.c | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 8d93f827bd4..2213e48e57c 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -33091,6 +33091,15 @@ static void test_deferred_context_map(void) ID3D11CommandList_Release(list); + /* Dead Rising unmaps a resource on the wrong context. */ + + hr = ID3D11DeviceContext_Map(immediate, (ID3D11Resource *)buffer, 0, D3D11_MAP_WRITE_DISCARD, 0, &map_desc); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + ID3D11DeviceContext_Unmap(deferred, (ID3D11Resource *)buffer, 0); + + ID3D11DeviceContext_Unmap(immediate, (ID3D11Resource *)buffer, 0); + /* Test WRITE_NO_OVERWRITE. */ hr = ID3D11DeviceContext_Map(immediate, (ID3D11Resource *)buffer, 0, D3D11_MAP_WRITE_DISCARD, 0, &map_desc); diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 13c0fce5bb1..51e5055c4ab 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2520,7 +2520,8 @@ HRESULT wined3d_device_context_emit_unmap(struct wined3d_device_context *context wined3d_not_from_cs(context->device->cs); - op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_MAP); + if (!(op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_MAP))) + return E_OUTOFMEMORY; op->opcode = WINED3D_CS_OP_UNMAP; op->resource = resource; op->sub_resource_idx = sub_resource_idx;

1 0

Jacek Caban : gdi32: Move background mode to DC_ATTR.
by Alexandre Julliard July 27, 2021

July 27, 2021

Module: wine Branch: master Commit: 4a32a875373cd54ec11925ea904c5a709b2dc431 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a32a875373cd54ec11925ea… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 26 23:29:51 2021 +0200 gdi32: Move background mode to DC_ATTR. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dc.c | 31 +++++-------------------------- dlls/gdi32/dibdrv/objects.c | 6 +++--- dlls/gdi32/font.c | 4 ++-- dlls/gdi32/gdidc.c | 9 +++++++++ dlls/gdi32/ntgdi_private.h | 1 - include/ntgdi.h | 1 + 6 files changed, 20 insertions(+), 32 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 6ec4a0d1884..0f1daa2125b 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -86,7 +86,7 @@ static void set_initial_dc_state( DC *dc ) dc->polyFillMode = ALTERNATE; dc->stretchBltMode = BLACKONWHITE; dc->relAbsMode = ABSOLUTE; - dc->backgroundMode = OPAQUE; + dc->attr->background_mode = OPAQUE; dc->backgroundColor = RGB( 255, 255, 255 ); dc->dcBrushColor = RGB( 255, 255, 255 ); dc->dcPenColor = RGB( 0, 0, 0 ); @@ -392,6 +392,7 @@ INT CDECL nulldrv_SaveDC( PHYSDEV dev ) HeapFree( GetProcessHeap(), 0, newdc ); return 0; } + *newdc->attr = *dc->attr; newdc->layout = dc->layout; newdc->hPen = dc->hPen; newdc->hBrush = dc->hBrush; @@ -402,20 +403,16 @@ INT CDECL nulldrv_SaveDC( PHYSDEV dev ) newdc->polyFillMode = dc->polyFillMode; newdc->stretchBltMode = dc->stretchBltMode; newdc->relAbsMode = dc->relAbsMode; - newdc->backgroundMode = dc->backgroundMode; newdc->backgroundColor = dc->backgroundColor; newdc->textColor = dc->textColor; newdc->dcBrushColor = dc->dcBrushColor; newdc->dcPenColor = dc->dcPenColor; newdc->brush_org = dc->brush_org; newdc->mapperFlags = dc->mapperFlags; - newdc->attr->text_align = dc->attr->text_align; newdc->charExtra = dc->charExtra; newdc->breakExtra = dc->breakExtra; newdc->breakRem = dc->breakRem; newdc->MapMode = dc->MapMode; - newdc->attr->graphics_mode = dc->attr->graphics_mode; - newdc->attr->cur_pos = dc->attr->cur_pos; newdc->ArcDirection = dc->ArcDirection; newdc->xformWorld2Wnd = dc->xformWorld2Wnd; newdc->xformWorld2Vport = dc->xformWorld2Vport; @@ -479,7 +476,7 @@ BOOL CDECL nulldrv_RestoreDC( PHYSDEV dev, INT level ) dc->polyFillMode = dcs->polyFillMode; dc->stretchBltMode = dcs->stretchBltMode; dc->relAbsMode = dcs->relAbsMode; - dc->backgroundMode = dcs->backgroundMode; + dc->attr->background_mode = dcs->attr->background_mode; dc->backgroundColor = dcs->backgroundColor; dc->textColor = dcs->textColor; dc->dcBrushColor = dcs->dcBrushColor; @@ -1558,24 +1555,6 @@ INT WINAPI GetRelAbs( HDC hdc, DWORD dwIgnore ) } - - -/*********************************************************************** - * GetBkMode (GDI32.@) - */ -INT WINAPI GetBkMode( HDC hdc ) -{ - INT ret = 0; - DC * dc = get_dc_ptr( hdc ); - if (dc) - { - ret = dc->backgroundMode; - release_dc_ptr( dc ); - } - return ret; -} - - /*********************************************************************** * SetBkMode (GDI32.@) */ @@ -1595,8 +1574,8 @@ INT WINAPI SetBkMode( HDC hdc, INT mode ) mode = physdev->funcs->pSetBkMode( physdev, mode ); if (mode) { - ret = dc->backgroundMode; - dc->backgroundMode = mode; + ret = dc->attr->background_mode; + dc->attr->background_mode = mode; } release_dc_ptr( dc ); } diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index aa920396463..504e3bc2438 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1230,7 +1230,7 @@ static BOOL dashed_pen_lines(dibdrv_physdev *pdev, int num, POINT *pts, BOOL clo else { get_color_masks( dc, &pdev->dib, dc->ROPmode, pdev->pen_brush.colorref, - pdev->pen_is_ext ? TRANSPARENT : dc->backgroundMode, + pdev->pen_is_ext ? TRANSPARENT : dc->attr->background_mode, &pdev->dash_masks[1], &pdev->dash_masks[0] ); for (i = 0; i < num - 1; i++) @@ -1891,12 +1891,12 @@ static BOOL create_hatch_brush_bits(dibdrv_physdev *pdev, dib_brush *brush, BOOL if (!init_hatch_brush( pdev, brush )) return FALSE; - get_color_masks( dc, &pdev->dib, brush->rop, brush->colorref, dc->backgroundMode, + get_color_masks( dc, &pdev->dib, brush->rop, brush->colorref, dc->attr->background_mode, &fg_mask, &bg_mask ); if (brush->colorref & (1 << 24)) /* PALETTEINDEX */ *needs_reselect = TRUE; - if (dc->backgroundMode != TRANSPARENT && (dc->backgroundColor & (1 << 24))) + if (dc->attr->background_mode != TRANSPARENT && (dc->backgroundColor & (1 << 24))) *needs_reselect = TRUE; brush->dib.funcs->create_rop_masks( &brush->dib, hatches[brush->hatch], diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 6ebdae869f8..63f53926b1f 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -5998,7 +5998,7 @@ BOOL WINAPI NtGdiExtTextOutW( HDC hdc, INT x, INT y, UINT flags, const RECT *lpr TRACE("%p, %d, %d, %08x, %s, %s, %d, %p)\n", hdc, x, y, flags, wine_dbgstr_rect(lprect), debugstr_wn(str, count), count, lpDx); - TRACE("align = %x bkmode = %x mapmode = %x\n", align, dc->backgroundMode, dc->MapMode); + TRACE("align = %x bkmode = %x mapmode = %x\n", align, dc->attr->background_mode, dc->MapMode); if(align & TA_UPDATECP) { @@ -6202,7 +6202,7 @@ BOOL WINAPI NtGdiExtTextOutW( HDC hdc, INT x, INT y, UINT flags, const RECT *lpr break; } - if (dc->backgroundMode != TRANSPARENT) + if (dc->attr->background_mode != TRANSPARENT) { if(!((flags & ETO_CLIPPED) && (flags & ETO_OPAQUE))) { diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index cf53d52277d..b6ae60b45fd 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -65,6 +65,15 @@ UINT WINAPI SetTextAlign( HDC hdc, UINT align ) return ret; } +/*********************************************************************** + * GetBkMode (GDI32.@) + */ +INT WINAPI GetBkMode( HDC hdc ) +{ + DC_ATTR *dc_attr = get_dc_attr( hdc ); + return dc_attr ? dc_attr->background_mode : 0; +} + /*********************************************************************** * GetCurrentPositionEx (GDI32.@) */ diff --git a/dlls/gdi32/ntgdi_private.h b/dlls/gdi32/ntgdi_private.h index dc36789fdec..674c5085a7f 100644 --- a/dlls/gdi32/ntgdi_private.h +++ b/dlls/gdi32/ntgdi_private.h @@ -122,7 +122,6 @@ typedef struct tagDC WORD polyFillMode; WORD stretchBltMode; WORD relAbsMode; - WORD backgroundMode; COLORREF backgroundColor; COLORREF textColor; COLORREF dcBrushColor; diff --git a/include/ntgdi.h b/include/ntgdi.h index a85fec66723..f71c993e67c 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -101,6 +101,7 @@ typedef struct DC_ATTR POINT cur_pos; INT graphics_mode; WORD text_align; + WORD background_mode; void *emf; } DC_ATTR;

1 0

Jacek Caban : gdi32: Use get_dc_attr in SetBkMode.
by Alexandre Julliard July 27, 2021

July 27, 2021

Module: wine Branch: master Commit: 99b591582d9a030d52ee2de8cf3925e9b8268868 URL: https://source.winehq.org/git/wine.git/?a=commit;h=99b591582d9a030d52ee2de8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 26 23:30:20 2021 +0200 gdi32: Use get_dc_attr in SetBkMode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dc.c | 28 ---------------------------- dlls/gdi32/enhmfdrv/dc.c | 4 ++-- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 2 ++ dlls/gdi32/gdidc.c | 23 +++++++++++++++++++++++ dlls/gdi32/mfdrv/dc.c | 4 ++-- dlls/gdi32/mfdrv/init.c | 10 +++++++++- dlls/gdi32/mfdrv/metafiledrv.h | 2 +- dlls/gdi32/tests/dc.c | 7 ++++++- dlls/gdi32/tests/metafile.c | 10 ++++++++++ 11 files changed, 56 insertions(+), 37 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=99b591582d9a030d52ee…

1 0

Hugh McMaster : reg: Support use of registry views in the 'copy' operation.
by Alexandre Julliard July 27, 2021

July 27, 2021

Module: wine Branch: master Commit: 04d52eb83fa5c37cfe1100f435e36c2f78918338 URL: https://source.winehq.org/git/wine.git/?a=commit;h=04d52eb83fa5c37cfe1100f4… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jul 27 21:43:16 2021 +1000 reg: Support use of registry views in the 'copy' operation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50962 Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/copy.c | 26 ++++++++++++++++++++------ programs/reg/tests/copy.c | 16 ++++++++-------- 2 files changed, 28 insertions(+), 14 deletions(-) diff --git a/programs/reg/copy.c b/programs/reg/copy.c index 3ede5440cb6..2970ab81cc1 100644 --- a/programs/reg/copy.c +++ b/programs/reg/copy.c @@ -77,7 +77,7 @@ static enum operation ask_overwrite_value(WCHAR *path, WCHAR *value) } } -static int run_copy(struct key *src, struct key *dest, BOOL recurse, BOOL force) +static int run_copy(struct key *src, struct key *dest, REGSAM sam, BOOL recurse, BOOL force) { LONG rc; DWORD max_subkey_len; @@ -87,14 +87,14 @@ static int run_copy(struct key *src, struct key *dest, BOOL recurse, BOOL force) WCHAR *name = NULL; BYTE *data = NULL; - if ((rc = RegOpenKeyExW(src->root, src->subkey, 0, KEY_READ, &src->hkey))) + if ((rc = RegOpenKeyExW(src->root, src->subkey, 0, KEY_READ|sam, &src->hkey))) { output_error(rc); return 1; } if ((rc = RegCreateKeyExW(dest->root, dest->subkey, 0, NULL, REG_OPTION_NON_VOLATILE, - KEY_READ|KEY_WRITE, NULL, &dest->hkey, &dispos))) + KEY_READ|KEY_WRITE|sam, NULL, &dest->hkey, &dispos))) { RegCloseKey(src->hkey); output_error(rc); @@ -173,7 +173,7 @@ static int run_copy(struct key *src, struct key *dest, BOOL recurse, BOOL force) swprintf(subkey_src.path, path_len, L"%s\\%s", src->path, name); - rc = run_copy(&subkey_src, &subkey_dest, TRUE, force); + rc = run_copy(&subkey_src, &subkey_dest, sam, TRUE, force); free(subkey_src.path); @@ -194,6 +194,7 @@ int reg_copy(int argc, WCHAR *argvW[]) { struct key src, dest; BOOL recurse = FALSE, force = FALSE; + REGSAM sam = 0; int i; if (argc == 3) @@ -214,8 +215,18 @@ int reg_copy(int argc, WCHAR *argvW[]) str = &argvW[i][1]; - if (!lstrcmpiW(str, L"reg:32") || !lstrcmpiW(str, L"reg:64")) + if (!lstrcmpiW(str, L"reg:32")) + { + if (sam & KEY_WOW64_32KEY) goto invalid; + sam |= KEY_WOW64_32KEY; + continue; + } + else if (!lstrcmpiW(str, L"reg:64")) + { + if (sam & KEY_WOW64_64KEY) goto invalid; + sam |= KEY_WOW64_64KEY; continue; + } else if (!str[0] || str[1]) goto invalid; @@ -234,6 +245,9 @@ int reg_copy(int argc, WCHAR *argvW[]) } } + if (sam == (KEY_WOW64_32KEY|KEY_WOW64_64KEY)) + goto invalid; + if (src.root == dest.root && !lstrcmpiW(src.subkey, dest.subkey)) { output_message(STRING_COPY_SRC_DEST_SAME); @@ -242,7 +256,7 @@ int reg_copy(int argc, WCHAR *argvW[]) src.path = src.subkey; - return run_copy(&src, &dest, recurse, force); + return run_copy(&src, &dest, sam, recurse, force); invalid: output_message(STRING_INVALID_SYNTAX); diff --git a/programs/reg/tests/copy.c b/programs/reg/tests/copy.c index 0f9e1221200..bc07c3cafb9 100644 --- a/programs/reg/tests/copy.c +++ b/programs/reg/tests/copy.c @@ -666,11 +666,11 @@ static void test_registry_view_win64(void) verify_key_nonexist(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); run_reg_exe("reg copy HKLM\\" COPY_SRC " HKLM\\" KEY_BASE " /s /f /reg:32", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); run_reg_exe("reg export HKLM\\" KEY_BASE " file.reg /y /reg:32", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine ok(compare_export("file.reg", registry_view_test, 0), "compare_export() failed\n"); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(compare_export("file.reg", registry_view_test, 0), "compare_export() failed\n"); run_reg_exe("reg copy HKLM\\" COPY_SRC " HKLM\\" KEY_BASE " /s /f /reg:64", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); @@ -691,7 +691,7 @@ static void test_registry_view_win64(void) ok(compare_export("file.reg", registry_view_test, 0), "compare_export() failed\n"); run_reg_exe("reg copy HKLM\\" COPY_SRC " HKLM\\" KEY_BASE " /s /f /reg:32", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); delete_tree(HKEY_LOCAL_MACHINE, COPY_SRC, KEY_WOW64_64KEY); delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); @@ -724,7 +724,7 @@ static void test_registry_view_wow64(void) ok(compare_export("file.reg", registry_view_test, 0), "compare_export() failed\n"); run_reg_exe("reg copy HKLM\\" COPY_SRC " HKLM\\" KEY_BASE " /s /f /reg:64", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); delete_tree(HKEY_LOCAL_MACHINE, COPY_SRC, KEY_WOW64_32KEY); delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); @@ -735,11 +735,11 @@ static void test_registry_view_wow64(void) verify_key_nonexist(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); run_reg_exe("reg copy HKLM\\" COPY_SRC " HKLM\\" KEY_BASE " /s /f /reg:64", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); run_reg_exe("reg export HKLM\\" KEY_BASE " file.reg /y /reg:64", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine ok(compare_export("file.reg", registry_view_test, 0), "compare_export() failed\n"); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(compare_export("file.reg", registry_view_test, 0), "compare_export() failed\n"); run_reg_exe("reg copy HKLM\\" COPY_SRC " HKLM\\" KEY_BASE " /s /f /reg:32", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r);

1 0