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

Conor McCarthy : vkd3d-shader/dxil: Emit the shader instructions.
by Alexandre Julliard 20 Jul '23

20 Jul '23

Module: vkd3d Branch: master Commit: 3e553aaaa7a5cba0dec4b23148c13a05d3920ee4 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/3e553aaaa7a5cba0dec4b23148c13… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon May 22 16:21:46 2023 +1000 vkd3d-shader/dxil: Emit the shader instructions. Sufficient for compiling a no-op pixel shader. --- libs/vkd3d-shader/dxil.c | 47 ++++++++++++++++++++++++++++++++ libs/vkd3d-shader/ir.c | 2 +- libs/vkd3d-shader/vkd3d_shader_private.h | 2 ++ 3 files changed, 50 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 7011cd56..9dee9c40 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -1737,6 +1737,27 @@ static enum vkd3d_result sm6_parser_constants_init(struct sm6_parser *sm6, const return VKD3D_OK; } +static struct vkd3d_shader_instruction *sm6_parser_require_space(struct sm6_parser *sm6, size_t extra) +{ + if (!shader_instruction_array_reserve(&sm6->p.instructions, sm6->p.instructions.count + extra)) + { + ERR("Failed to allocate instruction.\n"); + return NULL; + } + return &sm6->p.instructions.elements[sm6->p.instructions.count]; +} + +/* Space should be reserved before calling this. It is intended to require no checking of the returned pointer. */ +static struct vkd3d_shader_instruction *sm6_parser_add_instruction(struct sm6_parser *sm6, + enum vkd3d_shader_opcode handler_idx) +{ + struct vkd3d_shader_instruction *ins = sm6_parser_require_space(sm6, 1); + assert(ins); + shader_instruction_init(ins, handler_idx); + ++sm6->p.instructions.count; + return ins; +} + static enum vkd3d_result sm6_parser_globals_init(struct sm6_parser *sm6) { const struct dxil_block *block = &sm6->root_block; @@ -1932,6 +1953,21 @@ static enum vkd3d_result sm6_parser_function_init(struct sm6_parser *sm6, const return VKD3D_OK; } +static bool sm6_block_emit_instructions(struct sm6_block *block, struct sm6_parser *sm6) +{ + struct vkd3d_shader_instruction *ins = sm6_parser_require_space(sm6, block->instruction_count + 1); + + if (!ins) + return false; + + memcpy(ins, block->instructions, block->instruction_count * sizeof(*block->instructions)); + sm6->p.instructions.count += block->instruction_count; + + sm6_parser_add_instruction(sm6, VKD3DSIH_RET); + + return true; +} + static enum vkd3d_result sm6_parser_module_init(struct sm6_parser *sm6, const struct dxil_block *block, unsigned int level) { @@ -2066,6 +2102,7 @@ static enum vkd3d_result sm6_parser_init(struct sm6_parser *sm6, const uint32_t struct vkd3d_shader_version version; struct dxil_block *block; enum vkd3d_result ret; + unsigned int i; count = byte_code_size / sizeof(*byte_code); if (count < 6) @@ -2255,6 +2292,16 @@ static enum vkd3d_result sm6_parser_init(struct sm6_parser *sm6, const uint32_t return ret; } + for (i = 0; i < sm6->function_count; ++i) + { + if (!sm6_block_emit_instructions(sm6->functions[i].blocks[0], sm6)) + { + vkd3d_shader_error(message_context, &location, VKD3D_SHADER_ERROR_DXIL_OUT_OF_MEMORY, + "Out of memory emitting shader instructions."); + return VKD3D_ERROR_OUT_OF_MEMORY; + } + } + dxil_block_destroy(&sm6->root_block); return VKD3D_OK; diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 11c2da5b..d74f81af 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -247,7 +247,7 @@ static void shader_register_init(struct vkd3d_shader_register *reg, enum vkd3d_s reg->immconst_type = VKD3D_IMMCONST_SCALAR; } -static void shader_instruction_init(struct vkd3d_shader_instruction *ins, enum vkd3d_shader_opcode handler_idx) +void shader_instruction_init(struct vkd3d_shader_instruction *ins, enum vkd3d_shader_opcode handler_idx) { memset(ins, 0, sizeof(*ins)); ins->handler_idx = handler_idx; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 49ad7b3e..233f3c86 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -976,6 +976,8 @@ struct vkd3d_shader_instruction } declaration; }; +void shader_instruction_init(struct vkd3d_shader_instruction *ins, enum vkd3d_shader_opcode handler_idx); + static inline bool vkd3d_shader_instruction_has_texel_offset(const struct vkd3d_shader_instruction *ins) { return ins->texel_offset.u || ins->texel_offset.v || ins->texel_offset.w;

1 0

Conor McCarthy : vkd3d-shader/spirv: Introduce an undefined register type.
by Alexandre Julliard 20 Jul '23

20 Jul '23

Module: vkd3d Branch: master Commit: 402c93fa68e47a1b85d0b227d26a6ebb7aa85d4a URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/402c93fa68e47a1b85d0b227d26a6… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon May 22 23:40:39 2023 +1000 vkd3d-shader/spirv: Introduce an undefined register type. --- libs/vkd3d-shader/spirv.c | 70 ++++++++++++++++++++++++++++++-- libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 2 files changed, 67 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index dcf957ea..d71f0a69 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -199,6 +199,21 @@ enum vkd3d_shader_input_sysval_semantic vkd3d_siv_from_sysval_indexed(enum vkd3d } } +static inline bool register_is_undef(const struct vkd3d_shader_register *reg) +{ + return reg->type == VKD3DSPR_UNDEF; +} + +static inline bool register_is_constant(const struct vkd3d_shader_register *reg) +{ + return (reg->type == VKD3DSPR_IMMCONST || reg->type == VKD3DSPR_IMMCONST64); +} + +static inline bool register_is_constant_or_undef(const struct vkd3d_shader_register *reg) +{ + return register_is_constant(reg) || register_is_undef(reg); +} + #define VKD3D_SPIRV_VERSION 0x00010000 #define VKD3D_SPIRV_GENERATOR_ID 18 #define VKD3D_SPIRV_GENERATOR_VERSION 8 @@ -1746,6 +1761,38 @@ static uint32_t vkd3d_spirv_get_type_id(struct vkd3d_spirv_builder *builder, } } +static uint32_t vkd3d_spirv_get_type_id_for_data_type(struct vkd3d_spirv_builder *builder, + enum vkd3d_data_type data_type, unsigned int component_count) +{ + uint32_t scalar_id; + + if (component_count == 1) + { + switch (data_type) + { + case VKD3D_DATA_FLOAT: + case VKD3D_DATA_SNORM: + case VKD3D_DATA_UNORM: + return vkd3d_spirv_get_op_type_float(builder, 32); + break; + case VKD3D_DATA_INT: + case VKD3D_DATA_UINT: + return vkd3d_spirv_get_op_type_int(builder, 32, data_type == VKD3D_DATA_INT); + break; + case VKD3D_DATA_DOUBLE: + return vkd3d_spirv_get_op_type_float(builder, 64); + default: + FIXME("Unhandled data type %#x.\n", data_type); + return 0; + } + } + else + { + scalar_id = vkd3d_spirv_get_type_id_for_data_type(builder, data_type, 1); + return vkd3d_spirv_get_op_type_vector(builder, scalar_id, component_count); + } +} + static void vkd3d_spirv_builder_init(struct vkd3d_spirv_builder *builder, const char *entry_point) { vkd3d_spirv_stream_init(&builder->debug_stream); @@ -3204,7 +3251,7 @@ static bool spirv_compiler_get_register_info(const struct spirv_compiler *compil struct vkd3d_symbol reg_symbol, *symbol; struct rb_entry *entry; - assert(reg->type != VKD3DSPR_IMMCONST && reg->type != VKD3DSPR_IMMCONST64); + assert(!register_is_constant_or_undef(reg)); if (reg->type == VKD3DSPR_TEMP) { @@ -3546,6 +3593,19 @@ static uint32_t spirv_compiler_emit_load_constant64(struct spirv_compiler *compi vkd3d_component_type_from_data_type(reg->data_type), component_count, values); } +static uint32_t spirv_compiler_emit_load_undef(struct spirv_compiler *compiler, + const struct vkd3d_shader_register *reg, DWORD write_mask) +{ + unsigned int component_count = vkd3d_write_mask_component_count(write_mask); + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + uint32_t type_id; + + assert(reg->type == VKD3DSPR_UNDEF); + + type_id = vkd3d_spirv_get_type_id_for_data_type(builder, reg->data_type, component_count); + return vkd3d_spirv_build_op_undef(builder, &builder->global_stream, type_id); +} + static uint32_t spirv_compiler_emit_load_scalar(struct spirv_compiler *compiler, const struct vkd3d_shader_register *reg, DWORD swizzle, DWORD write_mask, const struct vkd3d_shader_register_info *reg_info) @@ -3556,7 +3616,7 @@ static uint32_t spirv_compiler_emit_load_scalar(struct spirv_compiler *compiler, enum vkd3d_shader_component_type component_type; unsigned int skipped_component_mask; - assert(reg->type != VKD3DSPR_IMMCONST && reg->type != VKD3DSPR_IMMCONST64); + assert(!register_is_constant_or_undef(reg)); assert(vkd3d_write_mask_component_count(write_mask) == 1); component_idx = vkd3d_write_mask_get_component_idx(write_mask); @@ -3608,6 +3668,8 @@ static uint32_t spirv_compiler_emit_load_reg(struct spirv_compiler *compiler, return spirv_compiler_emit_load_constant(compiler, reg, swizzle, write_mask); else if (reg->type == VKD3DSPR_IMMCONST64) return spirv_compiler_emit_load_constant64(compiler, reg, swizzle, write_mask); + else if (reg->type == VKD3DSPR_UNDEF) + return spirv_compiler_emit_load_undef(compiler, reg, write_mask); component_count = vkd3d_write_mask_component_count(write_mask); component_type = vkd3d_component_type_from_data_type(reg->data_type); @@ -3820,7 +3882,7 @@ static void spirv_compiler_emit_store_reg(struct spirv_compiler *compiler, unsigned int src_write_mask = write_mask; uint32_t type_id; - assert(reg->type != VKD3DSPR_IMMCONST && reg->type != VKD3DSPR_IMMCONST64); + assert(!register_is_constant_or_undef(reg)); if (!spirv_compiler_get_register_info(compiler, reg, &reg_info)) return; @@ -6640,7 +6702,7 @@ static void spirv_compiler_emit_mov(struct spirv_compiler *compiler, uint32_t components[VKD3D_VEC4_SIZE]; unsigned int i, component_count; - if (src->reg.type == VKD3DSPR_IMMCONST || src->reg.type == VKD3DSPR_IMMCONST64 || dst->modifiers || src->modifiers) + if (register_is_constant_or_undef(&src->reg) || dst->modifiers || src->modifiers) goto general_implementation; spirv_compiler_get_register_info(compiler, &dst->reg, &dst_reg_info); diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 233f3c86..d35f49a6 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -507,6 +507,7 @@ enum vkd3d_shader_register_type VKD3DSPR_DEPTHOUTLE, VKD3DSPR_RASTERIZER, VKD3DSPR_OUTSTENCILREF, + VKD3DSPR_UNDEF, VKD3DSPR_INVALID = ~0u, };

1 0

Conor McCarthy : vkd3d-shader/dxil: Emit undefined constants.
by Alexandre Julliard 20 Jul '23

20 Jul '23

Module: vkd3d Branch: master Commit: c0a2bb1095c5794e6b2aee2ec58a47d386fcba56 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c0a2bb1095c5794e6b2aee2ec58a4… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue May 23 16:23:24 2023 +1000 vkd3d-shader/dxil: Emit undefined constants. --- libs/vkd3d-shader/dxil.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 9dee9c40..f9efe47f 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -208,6 +208,7 @@ struct sm6_value { const struct sm6_type *type; enum sm6_value_type value_type; + bool is_undefined; union { struct sm6_function_data function; @@ -1726,8 +1727,16 @@ static enum vkd3d_result sm6_parser_constants_init(struct sm6_parser *sm6, const WARN("Unhandled constant array.\n"); break; + case CST_CODE_UNDEF: + dxil_record_validate_operand_max_count(record, 0, sm6); + dst->u.reg.type = VKD3DSPR_UNDEF; + /* Mark as explicitly undefined, not the result of a missing constant code or instruction. */ + dst->is_undefined = true; + break; + default: FIXME("Unhandled constant code %u.\n", record->code); + dst->u.reg.type = VKD3DSPR_UNDEF; break; }

1 0

Zhiyi Zhang : winex11.drv: Move the dummy parent window to (0, 0).
by Alexandre Julliard 19 Jul '23

19 Jul '23

Module: wine Branch: master Commit: 35193586f78863810f6bb886abca2bc940890acd URL: https://gitlab.winehq.org/wine/wine/-/commit/35193586f78863810f6bb886abca2b… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jul 19 17:25:46 2023 +0800 winex11.drv: Move the dummy parent window to (0, 0). Move the dummy parent window from (-1, -1) to (0, 0) so that the window is considered visible by Wayland. The X11 window region is set to an empty rectangle so that the window is still in fact invisible. If Xshape support is not compiled in, then fall back to using (-1, -1). This fixes poor performance when running Office 2016 on Xwayland. It's caused by glXWaitForSbcOML() in glxdrv_wglSwapBuffers() taking 1 second every time it gets called. The timeout is from TIMER_LEN_FLIP (1000ms) in xwl_present_reset_timer() in the xserver source code hw/xwayland/xwayland-present.c. Xwayland doesn't actually know when a frame is visible on screen[1][2]. It relies on a timer to simulate the process and when the window is invisible it uses a timer with a 1000ms timeout. This patch makes the dummy parent window visible so that Xwayland will use the timer with a 17ms timeout(~60fps), which also means that there will still be a 60fps limit for some windows when running on Xwayland. [1]: https://gitlab.freedesktop.org/xorg/xserver/-/issues/971 [2]: https://gitlab.freedesktop.org/xorg/xserver/-/issues/973 --- dlls/winex11.drv/window.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 14490ecd028..9ada6a63d59 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1512,9 +1512,22 @@ Window get_dummy_parent(void) attrib.override_redirect = True; attrib.border_pixel = 0; attrib.colormap = default_colormap; + +#ifdef HAVE_LIBXSHAPE + { + static XRectangle empty_rect; + dummy_parent = XCreateWindow( gdi_display, root_window, 0, 0, 1, 1, 0, + default_visual.depth, InputOutput, default_visual.visual, + CWColormap | CWBorderPixel | CWOverrideRedirect, &attrib ); + XShapeCombineRectangles( gdi_display, dummy_parent, ShapeBounding, 0, 0, &empty_rect, 1, + ShapeSet, YXBanded ); + } +#else dummy_parent = XCreateWindow( gdi_display, root_window, -1, -1, 1, 1, 0, default_visual.depth, InputOutput, default_visual.visual, CWColormap | CWBorderPixel | CWOverrideRedirect, &attrib ); + WARN("Xshape support is not compiled in. Applications under XWayland may have poor performance."); +#endif XMapWindow( gdi_display, dummy_parent ); } return dummy_parent;

1 0

Brendan Shanks : winecoreaudio: Fix missing struct member in get_position() Wow64 thunk.
by Alexandre Julliard 19 Jul '23

19 Jul '23

Module: wine Branch: master Commit: de18372065589e88d14f947897a711532cfefb9a URL: https://gitlab.winehq.org/wine/wine/-/commit/de18372065589e88d14f947897a711… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Jul 19 11:06:02 2023 -0700 winecoreaudio: Fix missing struct member in get_position() Wow64 thunk. --- dlls/winecoreaudio.drv/coreaudio.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index fcf02401429..18b70738215 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -2112,6 +2112,7 @@ static NTSTATUS unix_wow64_get_position(void *args) struct { stream_handle stream; + BOOL device; HRESULT result; PTR32 pos; PTR32 qpctime; @@ -2119,6 +2120,7 @@ static NTSTATUS unix_wow64_get_position(void *args) struct get_position_params params = { .stream = params32->stream, + .device = params32->device, .pos = ULongToPtr(params32->pos), .qpctime = ULongToPtr(params32->qpctime) };

1 0

Alexandre Julliard : cryptui/tests: Use nameless unions/structs.
by Alexandre Julliard 19 Jul '23

19 Jul '23

Module: wine Branch: master Commit: d98b09183c2ee7d5cffd69a08ec8c7faf4e9c5f0 URL: https://gitlab.winehq.org/wine/wine/-/commit/d98b09183c2ee7d5cffd69a08ec8c7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 19 12:18:26 2023 +0200 cryptui/tests: Use nameless unions/structs. --- dlls/cryptui/tests/cryptui.c | 59 ++++++++++++++++++++++---------------------- 1 file changed, 29 insertions(+), 30 deletions(-) diff --git a/dlls/cryptui/tests/cryptui.c b/dlls/cryptui/tests/cryptui.c index 111115a16ce..8a4706de358 100644 --- a/dlls/cryptui/tests/cryptui.c +++ b/dlls/cryptui/tests/cryptui.c @@ -19,7 +19,6 @@ */ #include <stdarg.h> #include <stdio.h> -#define NONAMELESSUNION #include <windef.h> #include <winbase.h> #include <winerror.h> @@ -307,9 +306,9 @@ static BOOL find_and_delete_cert_in_store(HCERTSTORE store, PCCERT_CONTEXT cert) PCCERT_CONTEXT found; id.dwIdChoice = CERT_ID_ISSUER_SERIAL_NUMBER; - memcpy(&id.u.IssuerSerialNumber.Issuer, + memcpy(&id.IssuerSerialNumber.Issuer, &cert->pCertInfo->Issuer, sizeof(CERT_NAME_BLOB)); - memcpy(&id.u.IssuerSerialNumber.SerialNumber, + memcpy(&id.IssuerSerialNumber.SerialNumber, &cert->pCertInfo->SerialNumber, sizeof(CRYPT_INTEGER_BLOB)); found = CertFindCertificateInStore(store, X509_ASN_ENCODING, 0, CERT_FIND_CERT_ID, &id, NULL); @@ -371,28 +370,28 @@ static void test_crypt_ui_wiz_import(void) ok(!ret && GetLastError() == E_INVALIDARG, "expected E_INVALIDARG, got %08lx\n", GetLastError()); /* Check allowed vs. given type mismatches */ - info.u.pCertContext = CertCreateCertificateContext(X509_ASN_ENCODING, + info.pCertContext = CertCreateCertificateContext(X509_ASN_ENCODING, v1CertWithValidPubKey, sizeof(v1CertWithValidPubKey)); SetLastError(0xdeadbeef); ret = pCryptUIWizImport(CRYPTUI_WIZ_NO_UI | CRYPTUI_WIZ_IMPORT_ALLOW_CRL, 0, NULL, &info, NULL); ok(!ret && GetLastError() == E_INVALIDARG, "expected E_INVALIDARG, got %08lx\n", GetLastError()); - CertFreeCertificateContext(info.u.pCertContext); + CertFreeCertificateContext(info.pCertContext); info.dwSubjectChoice = CRYPTUI_WIZ_IMPORT_SUBJECT_CRL_CONTEXT; - info.u.pCRLContext = CertCreateCRLContext(X509_ASN_ENCODING, + info.pCRLContext = CertCreateCRLContext(X509_ASN_ENCODING, signedCRL, sizeof(signedCRL)); SetLastError(0xdeadbeef); ret = pCryptUIWizImport(CRYPTUI_WIZ_NO_UI | CRYPTUI_WIZ_IMPORT_ALLOW_CERT, 0, NULL, &info, NULL); ok(!ret && GetLastError() == E_INVALIDARG, "expected E_INVALIDARG, got %08lx\n", GetLastError()); - CertFreeCRLContext(info.u.pCRLContext); + CertFreeCRLContext(info.pCRLContext); /* Imports the following cert--self-signed, with no basic constraints set-- * to the CA store. Puts up a dialog at the end if it succeeds or fails. */ info.dwSubjectChoice = CRYPTUI_WIZ_IMPORT_SUBJECT_CERT_CONTEXT; - info.u.pCertContext = CertCreateCertificateContext(X509_ASN_ENCODING, + info.pCertContext = CertCreateCertificateContext(X509_ASN_ENCODING, v1CertWithValidPubKey, sizeof(v1CertWithValidPubKey)); ret = pCryptUIWizImport(CRYPTUI_WIZ_NO_UI, 0, NULL, &info, NULL); ok(ret, "CryptUIWizImport failed: %08lx\n", GetLastError()); @@ -403,19 +402,19 @@ static void test_crypt_ui_wiz_import(void) if (ca) { - ret = find_and_delete_cert_in_store(ca, info.u.pCertContext); + ret = find_and_delete_cert_in_store(ca, info.pCertContext); ok(ret || broken(!ret) /* Win9x/NT4 */, "expected to find v1CertWithValidPubKey in CA store\n"); CertCloseStore(ca, 0); } } - CertFreeCertificateContext(info.u.pCertContext); + CertFreeCertificateContext(info.pCertContext); /* Imports the following cert--not self-signed, with a basic constraints2 * extensions--to the "AddressBook" store. Puts up a dialog at the end if * it succeeds or fails. */ - info.u.pCertContext = CertCreateCertificateContext(X509_ASN_ENCODING, + info.pCertContext = CertCreateCertificateContext(X509_ASN_ENCODING, iTunesCert3, sizeof(iTunesCert3)); ret = pCryptUIWizImport(CRYPTUI_WIZ_NO_UI, 0, NULL, &info, NULL); ok(ret, "CryptUIWizImport failed: %08lx\n", GetLastError()); @@ -427,7 +426,7 @@ static void test_crypt_ui_wiz_import(void) if (addressBook) { ret = find_and_delete_cert_in_store(addressBook, - info.u.pCertContext); + info.pCertContext); ok(ret || broken(!ret), /* Windows 2000 and earlier */ "expected to find iTunesCert3 in AddressBook store\n"); @@ -460,14 +459,14 @@ static void test_crypt_ui_wiz_import(void) ret = pCryptUIWizImport(CRYPTUI_WIZ_NO_UI | CRYPTUI_WIZ_IMPORT_NO_CHANGE_DEST_STORE, 0, NULL, &info, store); ok(ret, "CryptUIWizImport failed: %08lx\n", GetLastError()); - ret = find_and_delete_cert_in_store(store, info.u.pCertContext); + ret = find_and_delete_cert_in_store(store, info.pCertContext); ok(ret || broken(!ret) /* Win9x/NT4 */, "expected to find iTunesCert3 in memory store\n"); - CertFreeCertificateContext(info.u.pCertContext); + CertFreeCertificateContext(info.pCertContext); CertCloseStore(store, 0); - info.u.pCertContext = CertCreateCertificateContext(X509_ASN_ENCODING, + info.pCertContext = CertCreateCertificateContext(X509_ASN_ENCODING, iTunesCert1, sizeof(iTunesCert1)); ret = pCryptUIWizImport(CRYPTUI_WIZ_NO_UI, 0, NULL, &info, NULL); ok(ret, "CryptUIWizImport failed: %08lx\n", GetLastError()); @@ -479,16 +478,16 @@ static void test_crypt_ui_wiz_import(void) if (addressBook) { ret = find_and_delete_cert_in_store(addressBook, - info.u.pCertContext); + info.pCertContext); ok(ret || broken(!ret), /* Windows 2000 and earlier */ "expected to find iTunesCert1 in AddressBook store\n"); CertCloseStore(addressBook, 0); } } - CertFreeCertificateContext(info.u.pCertContext); + CertFreeCertificateContext(info.pCertContext); - info.u.pCertContext = CertCreateCertificateContext(X509_ASN_ENCODING, + info.pCertContext = CertCreateCertificateContext(X509_ASN_ENCODING, iTunesCert2, sizeof(iTunesCert2)); ret = pCryptUIWizImport(CRYPTUI_WIZ_NO_UI, 0, NULL, &info, NULL); ok(ret, "CryptUIWizImport failed: %08lx\n", GetLastError()); @@ -499,21 +498,21 @@ static void test_crypt_ui_wiz_import(void) if (ca) { - ret = find_and_delete_cert_in_store(ca, info.u.pCertContext); + ret = find_and_delete_cert_in_store(ca, info.pCertContext); ok(ret || broken(!ret) /* Win9x/NT4 */, "expected to find iTunesCert2 in CA store\n"); CertCloseStore(ca, 0); } } - CertFreeCertificateContext(info.u.pCertContext); + CertFreeCertificateContext(info.pCertContext); - info.u.hCertStore = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, + info.hCertStore = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); - CertAddEncodedCertificateToStore(info.u.hCertStore, X509_ASN_ENCODING, + CertAddEncodedCertificateToStore(info.hCertStore, X509_ASN_ENCODING, v1CertWithValidPubKey, sizeof(v1CertWithValidPubKey), CERT_STORE_ADD_ALWAYS, NULL); - CertAddEncodedCRLToStore(info.u.hCertStore, X509_ASN_ENCODING, signedCRL, + CertAddEncodedCRLToStore(info.hCertStore, X509_ASN_ENCODING, signedCRL, sizeof(signedCRL), CERT_STORE_ADD_ALWAYS, NULL); info.dwSubjectChoice = CRYPTUI_WIZ_IMPORT_SUBJECT_CERT_STORE; /* The ALLOW flags aren't allowed with a store as the source if the source @@ -557,14 +556,14 @@ static void test_crypt_ui_wiz_import(void) ok(count == 1, "expected 1 CRL, got %ld\n", count); } CertCloseStore(store, 0); - CertCloseStore(info.u.hCertStore, 0); + CertCloseStore(info.hCertStore, 0); /* If the ALLOW flags match the content of the store, the store can be * imported. */ - info.u.hCertStore = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, + info.hCertStore = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); - CertAddEncodedCertificateToStore(info.u.hCertStore, X509_ASN_ENCODING, + CertAddEncodedCertificateToStore(info.hCertStore, X509_ASN_ENCODING, v1CertWithValidPubKey, sizeof(v1CertWithValidPubKey), CERT_STORE_ADD_ALWAYS, NULL); store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, @@ -598,14 +597,14 @@ static void test_crypt_ui_wiz_import(void) ok(!ret && GetLastError() == E_INVALIDARG, "expected E_INVALIDARG, got %08lx\n", GetLastError()); CertCloseStore(store, 0); - CertCloseStore(info.u.hCertStore, 0); + CertCloseStore(info.hCertStore, 0); /* Again, if the ALLOW flags match the content of the store, the store can * be imported. */ - info.u.hCertStore = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, + info.hCertStore = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); - CertAddEncodedCRLToStore(info.u.hCertStore, X509_ASN_ENCODING, signedCRL, + CertAddEncodedCRLToStore(info.hCertStore, X509_ASN_ENCODING, signedCRL, sizeof(signedCRL), CERT_STORE_ADD_ALWAYS, NULL); store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); @@ -638,7 +637,7 @@ static void test_crypt_ui_wiz_import(void) ok(!ret && GetLastError() == E_INVALIDARG, "expected E_INVALIDARG, got %08lx\n", GetLastError()); CertCloseStore(store, 0); - CertCloseStore(info.u.hCertStore, 0); + CertCloseStore(info.hCertStore, 0); UnhookWindowsHookEx(hook); }

1 0

Alexandre Julliard : devenum/tests: Use nameless unions/structs.
by Alexandre Julliard 19 Jul '23

19 Jul '23

Module: wine Branch: master Commit: af2bda32bb9293cd40812da63006d9b248087c6e URL: https://gitlab.winehq.org/wine/wine/-/commit/af2bda32bb9293cd40812da63006d9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 19 12:20:04 2023 +0200 devenum/tests: Use nameless unions/structs. --- dlls/devenum/tests/devenum.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/devenum/tests/devenum.c b/dlls/devenum/tests/devenum.c index b3ef3da0356..52a96c122b8 100644 --- a/dlls/devenum/tests/devenum.c +++ b/dlls/devenum/tests/devenum.c @@ -269,7 +269,7 @@ static void test_register_filter(void) rgf2.dwVersion = 2; rgf2.dwMerit = MERIT_UNLIKELY; - S2(U(rgf2)).cPins2 = 0; + rgf2.cPins2 = 0; hr = IFilterMapper2_RegisterFilter(mapper2, &CLSID_TestFilter, L"devenum test", &mon, NULL, NULL, &rgf2);

1 0

Alexandre Julliard : dmsynth/tests: Use nameless unions/structs.
by Alexandre Julliard 19 Jul '23

19 Jul '23

Module: wine Branch: master Commit: 6fe186468c317c1ee8d62519ce6d266ad3bdd1d6 URL: https://gitlab.winehq.org/wine/wine/-/commit/6fe186468c317c1ee8d62519ce6d26… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 19 12:20:19 2023 +0200 dmsynth/tests: Use nameless unions/structs. --- dlls/dmsynth/tests/dmsynth.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/dmsynth/tests/dmsynth.c b/dlls/dmsynth/tests/dmsynth.c index a8bf65cd73e..f21e543705a 100644 --- a/dlls/dmsynth/tests/dmsynth.c +++ b/dlls/dmsynth/tests/dmsynth.c @@ -108,30 +108,30 @@ static void test_dmsynth(void) hr = IDirectMusicSynth_QueryInterface(dmsynth, &IID_IKsControl, (LPVOID*)&control_synth); ok(hr == S_OK, "IDirectMusicSynth_QueryInterface returned: %#lx\n", hr); - S(U(property)).Id = 0; - S(U(property)).Flags = KSPROPERTY_TYPE_GET; + property.Id = 0; + property.Flags = KSPROPERTY_TYPE_GET; - S(U(property)).Set = GUID_DMUS_PROP_INSTRUMENT2; + property.Set = GUID_DMUS_PROP_INSTRUMENT2; hr = IKsControl_KsProperty(control_synth, &property, sizeof(property), &value, sizeof(value), &bytes); ok(hr == S_OK, "IKsControl_KsProperty returned: %#lx\n", hr); ok(bytes == sizeof(DWORD), "Returned bytes: %lu, should be 4\n", bytes); ok(value == TRUE, "Return value: %lu, should be 1\n", value); - S(U(property)).Set = GUID_DMUS_PROP_DLS2; + property.Set = GUID_DMUS_PROP_DLS2; hr = IKsControl_KsProperty(control_synth, &property, sizeof(property), &value, sizeof(value), &bytes); ok(hr == S_OK, "IKsControl_KsProperty returned: %#lx\n", hr); ok(bytes == sizeof(DWORD), "Returned bytes: %lu, should be 4\n", bytes); ok(value == TRUE, "Return value: %lu, should be 1\n", value); - S(U(property)).Set = GUID_DMUS_PROP_GM_Hardware; + property.Set = GUID_DMUS_PROP_GM_Hardware; hr = IKsControl_KsProperty(control_synth, &property, sizeof(property), &value, sizeof(value), &bytes); ok(hr == S_OK, "IKsControl_KsProperty returned: %#lx\n", hr); ok(bytes == sizeof(DWORD), "Returned bytes: %lu, should be 4\n", bytes); ok(value == FALSE, "Return value: %lu, should be 0\n", value); - S(U(property)).Set = GUID_DMUS_PROP_GS_Hardware; + property.Set = GUID_DMUS_PROP_GS_Hardware; hr = IKsControl_KsProperty(control_synth, &property, sizeof(property), &value, sizeof(value), &bytes); ok(hr == S_OK, "IKsControl_KsProperty returned: %#lx\n", hr); ok(bytes == sizeof(DWORD), "Returned bytes: %lu, should be 4\n", bytes); ok(value == FALSE, "Return value: %lu, should be 0\n", value); - S(U(property)).Set = GUID_DMUS_PROP_XG_Hardware; + property.Set = GUID_DMUS_PROP_XG_Hardware; hr = IKsControl_KsProperty(control_synth, &property, sizeof(property), &value, sizeof(value), &bytes); ok(hr == S_OK, "IKsControl_KsProperty returned: %#lx\n", hr); ok(bytes == sizeof(DWORD), "Returned bytes: %lu, should be 4\n", bytes); @@ -140,7 +140,7 @@ static void test_dmsynth(void) hr = IDirectMusicSynthSink_QueryInterface(dmsynth_sink, &IID_IKsControl, (LPVOID*)&control_sink); ok(hr == S_OK, "IDirectMusicSynthSink_QueryInterface returned: %#lx\n", hr); - S(U(property)).Set = GUID_DMUS_PROP_SinkUsesDSound; + property.Set = GUID_DMUS_PROP_SinkUsesDSound; hr = IKsControl_KsProperty(control_sink, &property, sizeof(property), &value, sizeof(value), &bytes); ok(hr == S_OK, "IKsControl_KsProperty returned: %#lx\n", hr); ok(bytes == sizeof(DWORD), "Returned bytes: %lu, should be 4\n", bytes);

1 0

Alexandre Julliard : dplayx/tests: Use nameless unions/structs.
by Alexandre Julliard 19 Jul '23

19 Jul '23

Module: wine Branch: master Commit: b150f9ad590c08c5e0a0bf16ac6d423226f2d2c5 URL: https://gitlab.winehq.org/wine/wine/-/commit/b150f9ad590c08c5e0a0bf16ac6d42… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 19 12:20:45 2023 +0200 dplayx/tests: Use nameless unions/structs. --- dlls/dplayx/tests/dplayx.c | 110 ++++++++++++++++++++++----------------------- 1 file changed, 55 insertions(+), 55 deletions(-)

1 0

Alexandre Julliard : fusion/tests: Use nameless unions/structs.
by Alexandre Julliard 19 Jul '23

19 Jul '23

Module: wine Branch: master Commit: 49a177acc99cc9fe5340184c1c6f7a1ce0c238d7 URL: https://gitlab.winehq.org/wine/wine/-/commit/49a177acc99cc9fe5340184c1c6f7a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 19 12:21:26 2023 +0200 fusion/tests: Use nameless unions/structs. --- dlls/fusion/tests/asmcache.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/fusion/tests/asmcache.c b/dlls/fusion/tests/asmcache.c index 2b79cf57d29..a57e23b74a6 100644 --- a/dlls/fusion/tests/asmcache.c +++ b/dlls/fusion/tests/asmcache.c @@ -820,12 +820,12 @@ static void create_assembly(LPCSTR file) assembly.tableshdr.MaskValid.u.LowPart = 0x00000005; assembly.tableshdr.MaskSorted.u.HighPart = 0x1600; assembly.tableshdr.MaskSorted.u.LowPart = 0x3301FA00; - U(assembly.labelres).Name = 0x10; - U2(assembly.labelres).OffsetToData = 0x80000018; - U(assembly.label11res).Name = 0x1; - U2(assembly.label11res).OffsetToData = 0x80000030; - U(assembly.label10res).Name = 0x0; - U2(assembly.label10res).OffsetToData = 0x48; + assembly.labelres.Name = 0x10; + assembly.labelres.OffsetToData = 0x80000018; + assembly.label11res.Name = 0x1; + assembly.label11res.OffsetToData = 0x80000030; + assembly.label10res.Name = 0x0; + assembly.label10res.OffsetToData = 0x48; hfile = CreateFileA(file, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0);

1 0