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

Zebediah Figura : vkd3d-shader: Use vkd3d_bytecode_buffer helpers directly in shader_write_descriptor_ranges().
by Alexandre Julliard 28 Jul '21

28 Jul '21

Module: vkd3d Branch: master Commit: a0fc2a20f3ffd8fcab6cee4127258530e06978bb URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a0fc2a20f3ffd8fcab6cee4… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jul 27 16:06:46 2021 -0500 vkd3d-shader: Use vkd3d_bytecode_buffer helpers directly in shader_write_descriptor_ranges(). 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 | 29 ++++++++++------------------- 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index c076b0f..2151869 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2986,7 +2986,7 @@ static void shader_write_root_signature_header(struct root_signature_writer_cont context->chunk_position = bytecode_get_size(buffer); } -static int shader_write_descriptor_ranges(struct root_signature_writer_context *context, +static void shader_write_descriptor_ranges(struct vkd3d_bytecode_buffer *buffer, const struct vkd3d_shader_root_descriptor_table *table) { const struct vkd3d_shader_descriptor_range *ranges = table->descriptor_ranges; @@ -2994,24 +2994,12 @@ static int shader_write_descriptor_ranges(struct root_signature_writer_context * for (i = 0; i < table->descriptor_range_count; ++i) { - if (!write_dword(context, ranges[i].range_type)) - goto fail; - if (!write_dword(context, ranges[i].descriptor_count)) - goto fail; - if (!write_dword(context, ranges[i].base_shader_register)) - goto fail; - if (!write_dword(context, ranges[i].register_space)) - goto fail; - if (!write_dword(context, ranges[i].descriptor_table_offset)) - goto fail; + put_u32(buffer, ranges[i].range_type); + put_u32(buffer, ranges[i].descriptor_count); + put_u32(buffer, ranges[i].base_shader_register); + put_u32(buffer, ranges[i].register_space); + put_u32(buffer, ranges[i].descriptor_table_offset); } - - 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 descriptor ranges."); - return VKD3D_ERROR_OUT_OF_MEMORY; } static int shader_write_descriptor_ranges1(struct root_signature_writer_context *context, @@ -3047,12 +3035,15 @@ fail: static int shader_write_descriptor_table(struct root_signature_writer_context *context, const struct vkd3d_shader_root_descriptor_table *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; - return shader_write_descriptor_ranges(context, table); + shader_write_descriptor_ranges(buffer, table); + return VKD3D_OK; fail: vkd3d_shader_error(&context->message_context, NULL, VKD3D_SHADER_ERROR_RS_OUT_OF_MEMORY,

1 0

Zebediah Figura : vkd3d-shader: Use vkd3d_bytecode_buffer helpers directly in shader_write_descriptor_ranges1().
by Alexandre Julliard 28 Jul '21

28 Jul '21

Module: vkd3d Branch: master Commit: 6f8be6c208e8e80a76a5b77e28c29739e54be6ab URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=6f8be6c208e8e80a76a5b77… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jul 27 16:06:47 2021 -0500 vkd3d-shader: Use vkd3d_bytecode_buffer helpers directly in shader_write_descriptor_ranges1(). 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 | 32 +++++++++++--------------------- 1 file changed, 11 insertions(+), 21 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 2151869..368f59c 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -3002,7 +3002,7 @@ static void shader_write_descriptor_ranges(struct vkd3d_bytecode_buffer *buffer, } } -static int shader_write_descriptor_ranges1(struct root_signature_writer_context *context, +static void shader_write_descriptor_ranges1(struct vkd3d_bytecode_buffer *buffer, const struct vkd3d_shader_root_descriptor_table1 *table) { const struct vkd3d_shader_descriptor_range1 *ranges = table->descriptor_ranges; @@ -3010,26 +3010,13 @@ static int shader_write_descriptor_ranges1(struct root_signature_writer_context for (i = 0; i < table->descriptor_range_count; ++i) { - if (!write_dword(context, ranges[i].range_type)) - goto fail; - if (!write_dword(context, ranges[i].descriptor_count)) - goto fail; - if (!write_dword(context, ranges[i].base_shader_register)) - goto fail; - if (!write_dword(context, ranges[i].register_space)) - goto fail; - if (!write_dword(context, ranges[i].flags)) - goto fail; - if (!write_dword(context, ranges[i].descriptor_table_offset)) - goto fail; + put_u32(buffer, ranges[i].range_type); + put_u32(buffer, ranges[i].descriptor_count); + put_u32(buffer, ranges[i].base_shader_register); + put_u32(buffer, ranges[i].register_space); + put_u32(buffer, ranges[i].flags); + put_u32(buffer, ranges[i].descriptor_table_offset); } - - 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 descriptor ranges."); - return VKD3D_ERROR_OUT_OF_MEMORY; } static int shader_write_descriptor_table(struct root_signature_writer_context *context, @@ -3054,12 +3041,15 @@ fail: static int 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; - return shader_write_descriptor_ranges1(context, table); + shader_write_descriptor_ranges1(buffer, table); + return VKD3D_OK; fail: vkd3d_shader_error(&context->message_context, NULL, VKD3D_SHADER_ERROR_RS_OUT_OF_MEMORY,

1 0

Zebediah Figura : vkd3d-shader: Use vkd3d_bytecode_buffer helpers directly in shader_write_descriptor_table().
by Alexandre Julliard 28 Jul '21

28 Jul '21

Module: vkd3d Branch: master Commit: d1671829d946a7b0e4915a516b39a6a06513e9d9 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d1671829d946a7b0e4915a5… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jul 27 16:06:48 2021 -0500 vkd3d-shader: Use vkd3d_bytecode_buffer helpers directly in shader_write_descriptor_table(). 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 | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 368f59c..0ee4fe2 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -3019,23 +3019,15 @@ static void shader_write_descriptor_ranges1(struct vkd3d_bytecode_buffer *buffer } } -static int shader_write_descriptor_table(struct root_signature_writer_context *context, +static void shader_write_descriptor_table(struct root_signature_writer_context *context, const struct vkd3d_shader_root_descriptor_table *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_ranges(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_descriptor_table1(struct root_signature_writer_context *context, @@ -3131,13 +3123,15 @@ static int shader_write_root_parameters(struct root_signature_writer_context *co for (i = 0; i < parameter_count; ++i) { + ret = VKD3D_OK; + set_u32(buffer, parameters_position + ((3 * i + 2) * sizeof(uint32_t)), get_chunk_offset(context)); switch (versioned_root_signature_get_parameter_type(desc, i)) { case VKD3D_SHADER_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE: if (desc->version == VKD3D_SHADER_ROOT_SIGNATURE_VERSION_1_0) - ret = shader_write_descriptor_table(context, &desc->u.v_1_0.parameters[i].u.descriptor_table); + 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); break;

1 0

Zebediah Figura : vkd3d-shader: Use vkd3d_bytecode_buffer helpers directly in shader_write_descriptor_table1().
by Alexandre Julliard 28 Jul '21

28 Jul '21

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

Chip Davis : vkd3d: Pass vkd3d_pipeline_bind_point values to update_descriptors() calls.
by Alexandre Julliard 28 Jul '21

28 Jul '21

Module: vkd3d Branch: master Commit: 4e383bf0fae39c89d3a08d8746a0a61446ac3326 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=4e383bf0fae39c89d3a08d8… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Tue Jul 27 22:45:54 2021 -0500 vkd3d: Pass vkd3d_pipeline_bind_point values to update_descriptors() calls. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 93c519a..bc502c0 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2933,7 +2933,7 @@ static bool d3d12_command_list_update_compute_state(struct d3d12_command_list *l if (!d3d12_command_list_update_compute_pipeline(list)) return false; - d3d12_command_list_update_descriptors(list, VK_PIPELINE_BIND_POINT_COMPUTE); + d3d12_command_list_update_descriptors(list, VKD3D_PIPELINE_BIND_POINT_COMPUTE); return true; } @@ -2950,7 +2950,7 @@ static bool d3d12_command_list_begin_render_pass(struct d3d12_command_list *list if (!d3d12_command_list_update_current_framebuffer(list)) return false; - d3d12_command_list_update_descriptors(list, VK_PIPELINE_BIND_POINT_GRAPHICS); + d3d12_command_list_update_descriptors(list, VKD3D_PIPELINE_BIND_POINT_GRAPHICS); if (list->current_render_pass != VK_NULL_HANDLE) return true;

1 0

Zebediah Figura : wined3d: Check for failure from wined3d_device_context_require_space() in wined3d_device_context_emit_unmap().
by Alexandre Julliard 27 Jul '21

27 Jul '21

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: Use get_dc_attr in SetTextAlign.
by Alexandre Julliard 27 Jul '21

27 Jul '21

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

Jacek Caban : gdi32: Move background mode to DC_ATTR.
by Alexandre Julliard 27 Jul '21

27 Jul '21

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 27 Jul '21

27 Jul '21

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 27 Jul '21

27 Jul '21

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