wine-commits January 2024

wine-commits@winehq.org

1 participants
711 discussions

Rémi Bernon : dinput/tests: Enforce ordering of concurrent read IRPs.
by Alexandre Julliard 23 Jan '24

23 Jan '24

Module: wine Branch: master Commit: 3e79b8d6ebdb3372749aed67e5ee19eb5fd40586 URL: https://gitlab.winehq.org/wine/wine/-/commit/3e79b8d6ebdb3372749aed67e5ee19… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Jan 20 22:01:11 2024 +0100 dinput/tests: Enforce ordering of concurrent read IRPs. --- dlls/dinput/tests/driver_bus.c | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/dlls/dinput/tests/driver_bus.c b/dlls/dinput/tests/driver_bus.c index c0d181c58a5..e0943c35294 100644 --- a/dlls/dinput/tests/driver_bus.c +++ b/dlls/dinput/tests/driver_bus.c @@ -348,13 +348,13 @@ static void irp_queue_push( struct irp_queue *queue, IRP *irp ) KeReleaseSpinLock( &queue->lock, irql ); } -static void irp_queue_clear( struct irp_queue *queue ) +static void irp_queue_complete( struct irp_queue *queue, BOOL delete ) { IRP *irp; while ((irp = irp_queue_pop( queue ))) { - irp->IoStatus.Status = STATUS_DELETE_PENDING; + if (delete) irp->IoStatus.Status = STATUS_DELETE_PENDING; IoCompleteRequest( irp, IO_NO_INCREMENT ); } } @@ -373,6 +373,7 @@ struct input_queue struct hid_expect *end; struct hid_expect *buffer; struct irp_queue pending; + struct irp_queue completed; }; static void input_queue_init( struct input_queue *queue, BOOL is_polled ) @@ -384,6 +385,7 @@ static void input_queue_init( struct input_queue *queue, BOOL is_polled ) queue->pos = queue->buffer; queue->end = queue->buffer; irp_queue_init( &queue->pending ); + irp_queue_init( &queue->completed ); } static void input_queue_cleanup( struct input_queue *queue ) @@ -416,7 +418,11 @@ static NTSTATUS input_queue_read( struct input_queue *queue, IRP *irp ) KIRQL irql; KeAcquireSpinLock( &queue->lock, &irql ); - if (input_queue_read_locked( queue, irp )) status = STATUS_SUCCESS; + if (input_queue_read_locked( queue, irp )) + { + irp_queue_push( &queue->completed, irp ); + status = STATUS_SUCCESS; + } else { IoMarkIrpPending( irp ); @@ -430,13 +436,10 @@ static NTSTATUS input_queue_read( struct input_queue *queue, IRP *irp ) static void input_queue_reset( struct input_queue *queue, void *in_buf, ULONG in_size ) { - struct irp_queue completed; ULONG remaining; KIRQL irql; IRP *irp; - irp_queue_init( &completed ); - KeAcquireSpinLock( &queue->lock, &irql ); remaining = queue->end - queue->pos; queue->pos = queue->buffer; @@ -447,13 +450,13 @@ static void input_queue_reset( struct input_queue *queue, void *in_buf, ULONG in while (!queue->is_polled && queue->pos < queue->end && (irp = irp_queue_pop( &queue->pending ))) { input_queue_read_locked( queue, irp ); - irp_queue_push( &completed, irp ); + irp_queue_push( &queue->completed, irp ); } KeReleaseSpinLock( &queue->lock, irql ); if (!queue->is_polled) ok( !remaining, "unread input\n" ); - while ((irp = irp_queue_pop( &completed ))) IoCompleteRequest( irp, IO_NO_INCREMENT ); + irp_queue_complete( &queue->completed, FALSE ); } struct device @@ -721,7 +724,8 @@ static NTSTATUS pdo_pnp( DEVICE_OBJECT *device, IRP *irp ) state = (code == IRP_MN_START_DEVICE || code == IRP_MN_CANCEL_REMOVE_DEVICE) ? 0 : PNP_DEVICE_REMOVED; KeAcquireSpinLock( &impl->base.lock, &irql ); impl->base.state = state; - irp_queue_clear( &impl->input_queue.pending ); + irp_queue_complete( &impl->input_queue.pending, TRUE ); + irp_queue_complete( &impl->input_queue.completed, TRUE ); KeReleaseSpinLock( &impl->base.lock, irql ); if (code != IRP_MN_REMOVE_DEVICE) status = STATUS_SUCCESS; else @@ -1087,7 +1091,10 @@ static NTSTATUS pdo_internal_ioctl( DEVICE_OBJECT *device, IRP *irp ) ok( !in_size, "got input size %lu\n", in_size ); ok( out_size == expected_size, "got output size %lu\n", out_size ); status = input_queue_read( &impl->input_queue, irp ); - break; + irp_queue_complete( &impl->input_queue.completed, FALSE ); + + winetest_pop_context(); + return status; } case IOCTL_HID_WRITE_REPORT: @@ -1277,7 +1284,8 @@ static NTSTATUS pdo_handle_ioctl( struct phys_device *impl, IRP *irp, ULONG code case IOCTL_WINETEST_REMOVE_DEVICE: KeAcquireSpinLock( &impl->base.lock, &irql ); impl->base.state = PNP_DEVICE_REMOVED; - irp_queue_clear( &impl->input_queue.pending ); + irp_queue_complete( &impl->input_queue.pending, TRUE ); + irp_queue_complete( &impl->input_queue.completed, TRUE ); KeReleaseSpinLock( &impl->base.lock, irql ); impl->pending_remove = irp; IoMarkIrpPending( irp );

1 0

Rémi Bernon : dinput/tests: Introduce a new helper to create a foreground window.
by Alexandre Julliard 23 Jan '24

23 Jan '24

Module: wine Branch: master Commit: e2dffb8eb0b68cbd2115d67f970fe38f6fb698eb URL: https://gitlab.winehq.org/wine/wine/-/commit/e2dffb8eb0b68cbd2115d67f970fe3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Jan 20 19:05:18 2024 +0100 dinput/tests: Introduce a new helper to create a foreground window. --- dlls/dinput/tests/device8.c | 65 +++++++++++++++++++++++++------------- dlls/dinput/tests/dinput_test.h | 3 ++ dlls/dinput/tests/force_feedback.c | 6 ++-- dlls/dinput/tests/joystick8.c | 18 ++--------- 4 files changed, 51 insertions(+), 41 deletions(-)

1 0

Hans Leidekker : dssenh: Finalize the hash if necessary in CPVerifySignature().
by Alexandre Julliard 23 Jan '24

23 Jan '24

Module: wine Branch: master Commit: 1d0551ca49fdff68364f7cac42415cea0f586b16 URL: https://gitlab.winehq.org/wine/wine/-/commit/1d0551ca49fdff68364f7cac42415c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 12 13:14:08 2023 +0100 dssenh: Finalize the hash if necessary in CPVerifySignature(). --- dlls/dssenh/main.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/dssenh/main.c b/dlls/dssenh/main.c index 6772d062fc5..365b365f53f 100644 --- a/dlls/dssenh/main.c +++ b/dlls/dssenh/main.c @@ -1012,5 +1012,11 @@ BOOL WINAPI CPVerifySignature( HCRYPTPROV hprov, HCRYPTHASH hhash, const BYTE *s return FALSE; } + if (!hash->finished) + { + if (BCryptFinishHash( hash->handle, hash->value, hash->len, 0 )) return FALSE; + hash->finished = TRUE; + } + return !BCryptVerifySignature( key->handle, NULL, hash->value, hash->len, (UCHAR *)sig, siglen, 0 ); }

1 0

Hans Leidekker : bcrypt: Fix private data size in wow64 thunks.
by Alexandre Julliard 23 Jan '24

23 Jan '24

Module: wine Branch: master Commit: 7231d4586d3ceccdf46f13bdd696d2b3ce0dc675 URL: https://gitlab.winehq.org/wine/wine/-/commit/7231d4586d3ceccdf46f13bdd696d2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jan 22 13:49:37 2024 +0100 bcrypt: Fix private data size in wow64 thunks. --- dlls/bcrypt/bcrypt_internal.h | 3 ++- dlls/bcrypt/gnutls.c | 14 +++++--------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/bcrypt/bcrypt_internal.h b/dlls/bcrypt/bcrypt_internal.h index f6556eb2aaa..f0157e86a73 100644 --- a/dlls/bcrypt/bcrypt_internal.h +++ b/dlls/bcrypt/bcrypt_internal.h @@ -184,11 +184,12 @@ struct key_asymmetric DSSSEED dss_seed; }; +#define PRIVATE_DATA_SIZE 3 struct key { struct object hdr; enum alg_id alg_id; - UINT64 private[3]; /* private data for backend */ + UINT64 private[PRIVATE_DATA_SIZE]; /* private data for backend */ union { struct key_symmetric s; diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index 512731dfcd3..ec1f0fb09ce 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -2741,7 +2741,7 @@ struct key32 { struct object hdr; enum alg_id alg_id; - UINT64 private[2]; /* private data for backend */ + UINT64 private[PRIVATE_DATA_SIZE]; /* private data for backend */ union { struct key_symmetric32 s; @@ -2791,8 +2791,7 @@ static struct key *get_symmetric_key( struct key32 *key32, struct key *key ) { key->hdr = key32->hdr; key->alg_id = key32->alg_id; - key->private[0] = key32->private[0]; - key->private[1] = key32->private[1]; + memcpy( key->private, key32->private, sizeof(key->private) ); key->u.s.mode = key32->u.s.mode; key->u.s.block_size = key32->u.s.block_size; key->u.s.vector = ULongToPtr(key32->u.s.vector); @@ -2806,8 +2805,7 @@ static struct key *get_asymmetric_key( struct key32 *key32, struct key *key ) { key->hdr = key32->hdr; key->alg_id = key32->alg_id; - key->private[0] = key32->private[0]; - key->private[1] = key32->private[1]; + memcpy( key->private, key32->private, sizeof(key->private) ); key->u.a.bitlen = key32->u.a.bitlen; key->u.a.flags = key32->u.a.flags; key->u.a.dss_seed = key32->u.a.dss_seed; @@ -2816,14 +2814,12 @@ static struct key *get_asymmetric_key( struct key32 *key32, struct key *key ) static void put_symmetric_key32( struct key *key, struct key32 *key32 ) { - key32->private[0] = key->private[0]; - key32->private[1] = key->private[1]; + memcpy( key32->private, key->private, sizeof(key32->private) ); } static void put_asymmetric_key32( struct key *key, struct key32 *key32 ) { - key32->private[0] = key->private[0]; - key32->private[1] = key->private[1]; + memcpy( key32->private, key->private, sizeof(key32->private) ); key32->u.a.flags = key->u.a.flags; key32->u.a.dss_seed = key->u.a.dss_seed; }

1 0

Henri Verbeet : vkd3d-shader/ir: Store block names in struct vsir_program.
by Alexandre Julliard 23 Jan '24

23 Jan '24

Module: vkd3d Branch: master Commit: bf628f0c74ae839bb20266cd10e07d1504ebc1bf URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/bf628f0c74ae839bb20266cd10e07… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 18 20:41:27 2024 +0100 vkd3d-shader/ir: Store block names in struct vsir_program. --- libs/vkd3d-shader/dxbc.c | 5 ----- libs/vkd3d-shader/ir.c | 9 +++++++-- libs/vkd3d-shader/spirv.c | 4 ++-- libs/vkd3d-shader/vkd3d_shader_private.h | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index edb65d2e..37ebc73c 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -552,14 +552,9 @@ static int shdr_handler(const struct vkd3d_shader_dxbc_section_desc *section, void free_shader_desc(struct vkd3d_shader_desc *desc) { - size_t i; - shader_signature_cleanup(&desc->input_signature); shader_signature_cleanup(&desc->output_signature); shader_signature_cleanup(&desc->patch_constant_signature); - for (i = 0; i < desc->block_name_count; ++i) - vkd3d_free((void *)desc->block_names[i]); - vkd3d_free(desc->block_names); } int shader_extract_from_dxbc(const struct vkd3d_shader_code *dxbc, diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 537cbe6f..865a292c 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -26,6 +26,11 @@ bool vsir_program_init(struct vsir_program *program, const struct vkd3d_shader_v void vsir_program_cleanup(struct vsir_program *program) { + size_t i; + + for (i = 0; i < program->block_name_count; ++i) + vkd3d_free((void *)program->block_names[i]); + vkd3d_free(program->block_names); shader_instruction_array_destroy(&program->instructions); } @@ -2235,8 +2240,8 @@ static enum vkd3d_result flatten_control_flow_constructs(struct vkd3d_shader_par vkd3d_free(flattener.control_flow_info); /* Simpler to always free these in free_shader_desc(). */ - parser->shader_desc.block_names = flattener.block_names; - parser->shader_desc.block_name_count = flattener.block_name_count; + program->block_names = flattener.block_names; + program->block_name_count = flattener.block_name_count; return result; } diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 668f0c4e..2acf3b27 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -9803,8 +9803,8 @@ static int spirv_compiler_generate_spirv(struct spirv_compiler *compiler, memset(&shader_desc->output_signature, 0, sizeof(shader_desc->output_signature)); memset(&shader_desc->patch_constant_signature, 0, sizeof(shader_desc->patch_constant_signature)); compiler->use_vocp = program->use_vocp; - compiler->block_names = parser->shader_desc.block_names; - compiler->block_name_count = parser->shader_desc.block_name_count; + compiler->block_names = program->block_names; + compiler->block_name_count = program->block_name_count; compiler->input_control_point_count = program->input_control_point_count; compiler->output_control_point_count = program->output_control_point_count; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 5bf40359..9a00b7bc 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -1024,9 +1024,6 @@ struct vkd3d_shader_desc { uint32_t used, external; } flat_constant_count[3]; - - const char **block_names; - size_t block_name_count; }; struct vkd3d_shader_register_semantic @@ -1272,6 +1269,9 @@ struct vsir_program unsigned int temp_count; unsigned int ssa_count; bool use_vocp; + + const char **block_names; + size_t block_name_count; }; bool vsir_program_init(struct vsir_program *program, const struct vkd3d_shader_version *version, unsigned int reserve);

1 0

Henri Verbeet : vkd3d-shader/ir: Store the block count in struct vsir_program.
by Alexandre Julliard 23 Jan '24

23 Jan '24

Module: vkd3d Branch: master Commit: f3c7d2d05c963b6a4103f0c4ea085aaad182ea89 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/f3c7d2d05c963b6a4103f0c4ea085… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 18 20:34:52 2024 +0100 vkd3d-shader/ir: Store the block count in struct vsir_program. --- libs/vkd3d-shader/dxil.c | 2 +- libs/vkd3d-shader/ir.c | 16 +++++++++------- libs/vkd3d-shader/spirv.c | 2 +- libs/vkd3d-shader/vkd3d_shader_private.h | 3 +-- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 6b38f028..2a0ff61c 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -5527,7 +5527,7 @@ static enum vkd3d_result sm6_function_emit_blocks(const struct sm6_function *fun { unsigned int i; - sm6->p.shader_desc.block_count = function->block_count; + sm6->p.program.block_count = function->block_count; for (i = 0; i < function->block_count; ++i) { diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 719a153f..537cbe6f 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -2213,6 +2213,7 @@ static enum vkd3d_result cf_flattener_iterate_instruction_array(struct cf_flatte static enum vkd3d_result flatten_control_flow_constructs(struct vkd3d_shader_parser *parser) { + struct vsir_program *program = &parser->program; struct cf_flattener flattener = {0}; enum vkd3d_result result; @@ -2222,10 +2223,10 @@ static enum vkd3d_result flatten_control_flow_constructs(struct vkd3d_shader_par if (result >= 0) { vkd3d_free(parser->program.instructions.elements); - parser->program.instructions.elements = flattener.instructions; - parser->program.instructions.capacity = flattener.instruction_capacity; - parser->program.instructions.count = flattener.instruction_count; - parser->shader_desc.block_count = flattener.block_id; + program->instructions.elements = flattener.instructions; + program->instructions.capacity = flattener.instruction_capacity; + program->instructions.count = flattener.instruction_count; + program->block_count = flattener.block_id; } else { @@ -2511,9 +2512,10 @@ static void vsir_validate_register(struct validation_context *ctx, /* Index == 0 is invalid, but it is temporarily allowed * for intermediate stages. Once we support validation * dialects we can selectively check for that. */ - if (reg->idx[0].offset > ctx->parser->shader_desc.block_count) - validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_INDEX, "LABEL register index %u exceeds the maximum count %u.", - reg->idx[0].offset, ctx->parser->shader_desc.block_count); + if (reg->idx[0].offset > ctx->program->block_count) + validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_INDEX, + "LABEL register index %u exceeds the maximum count %u.", + reg->idx[0].offset, ctx->program->block_count); break; case VKD3DSPR_NULL: diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 4441db16..668f0c4e 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -9790,7 +9790,7 @@ static int spirv_compiler_generate_spirv(struct spirv_compiler *compiler, compiler->location.column = 0; compiler->location.line = 1; - if (parser->shader_desc.block_count && !spirv_compiler_init_blocks(compiler, parser->shader_desc.block_count)) + if (program->block_count && !spirv_compiler_init_blocks(compiler, program->block_count)) return VKD3D_ERROR_OUT_OF_MEMORY; instructions = program->instructions; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 332b39af..5bf40359 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -1020,8 +1020,6 @@ struct vkd3d_shader_desc struct shader_signature output_signature; struct shader_signature patch_constant_signature; - unsigned int block_count; - struct { uint32_t used, external; @@ -1270,6 +1268,7 @@ struct vsir_program struct vkd3d_shader_instruction_array instructions; unsigned int input_control_point_count, output_control_point_count; + unsigned int block_count; unsigned int temp_count; unsigned int ssa_count; bool use_vocp;

1 0

Henri Verbeet : vkd3d-shader/ir: Store control point counts in struct vsir_program.
by Alexandre Julliard 23 Jan '24

23 Jan '24

Module: vkd3d Branch: master Commit: 98c6e85b339196d6fb4f14319b7fd84a7f771079 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/98c6e85b339196d6fb4f14319b7fd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 17 21:35:22 2024 +0100 vkd3d-shader/ir: Store control point counts in struct vsir_program. --- libs/vkd3d-shader/spirv.c | 4 ++-- libs/vkd3d-shader/tpf.c | 8 ++++---- libs/vkd3d-shader/vkd3d_shader_private.h | 3 +-- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 9286e87d..4441db16 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -9806,8 +9806,8 @@ static int spirv_compiler_generate_spirv(struct spirv_compiler *compiler, compiler->block_names = parser->shader_desc.block_names; compiler->block_name_count = parser->shader_desc.block_name_count; - compiler->input_control_point_count = shader_desc->input_control_point_count; - compiler->output_control_point_count = shader_desc->output_control_point_count; + compiler->input_control_point_count = program->input_control_point_count; + compiler->output_control_point_count = program->output_control_point_count; if (compiler->shader_type != VKD3D_SHADER_TYPE_HULL) spirv_compiler_emit_shader_signature_outputs(compiler); diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index df10cd25..50146c2c 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -1051,7 +1051,7 @@ static void shader_sm4_read_dcl_input_primitive(struct vkd3d_shader_instruction { ins->declaration.primitive_type.type = VKD3D_PT_PATCH; ins->declaration.primitive_type.patch_vertex_count = primitive_type - VKD3D_SM5_INPUT_PT_PATCH1 + 1; - priv->p.shader_desc.input_control_point_count = ins->declaration.primitive_type.patch_vertex_count; + priv->p.program.input_control_point_count = ins->declaration.primitive_type.patch_vertex_count; } else if (primitive_type >= ARRAY_SIZE(input_primitive_type_table)) { @@ -1060,7 +1060,7 @@ static void shader_sm4_read_dcl_input_primitive(struct vkd3d_shader_instruction else { ins->declaration.primitive_type.type = input_primitive_type_table[primitive_type].vkd3d_type; - priv->p.shader_desc.input_control_point_count = input_primitive_type_table[primitive_type].control_point_count; + priv->p.program.input_control_point_count = input_primitive_type_table[primitive_type].control_point_count; } if (ins->declaration.primitive_type.type == VKD3D_PT_UNDEFINED) @@ -1174,9 +1174,9 @@ static void shader_sm5_read_control_point_count(struct vkd3d_shader_instruction >> VKD3D_SM5_CONTROL_POINT_COUNT_SHIFT; if (opcode == VKD3D_SM5_OP_DCL_INPUT_CONTROL_POINT_COUNT) - priv->p.shader_desc.input_control_point_count = ins->declaration.count; + priv->p.program.input_control_point_count = ins->declaration.count; else - priv->p.shader_desc.output_control_point_count = ins->declaration.count; + priv->p.program.output_control_point_count = ins->declaration.count; } static void shader_sm5_read_dcl_tessellator_domain(struct vkd3d_shader_instruction *ins, uint32_t opcode, diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 887c47fc..332b39af 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -1020,8 +1020,6 @@ struct vkd3d_shader_desc struct shader_signature output_signature; struct shader_signature patch_constant_signature; - unsigned int input_control_point_count, output_control_point_count; - unsigned int block_count; struct @@ -1271,6 +1269,7 @@ struct vsir_program struct vkd3d_shader_version shader_version; struct vkd3d_shader_instruction_array instructions; + unsigned int input_control_point_count, output_control_point_count; unsigned int temp_count; unsigned int ssa_count; bool use_vocp;

1 0

Henri Verbeet : vkd3d: Use debugstr_hresult() in vkd3d_init_null_resources().
by Alexandre Julliard 23 Jan '24

23 Jan '24

Module: vkd3d Branch: master Commit: e4cc4a336ebe0c84cf411a3e50104dcae6d130df URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e4cc4a336ebe0c84cf411a3e50104… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 17 17:56:58 2024 +0100 vkd3d: Use debugstr_hresult() in vkd3d_init_null_resources(). --- libs/vkd3d/resource.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index f9e50335..a360b0ef 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -4923,7 +4923,7 @@ HRESULT vkd3d_init_null_resources(struct vkd3d_null_resources *null_resources, return vkd3d_init_null_resources_data(null_resources, device); fail: - ERR("Failed to initialize NULL resources, hr %#x.\n", hr); + ERR("Failed to initialise NULL resources, hr %s.\n", debugstr_hresult(hr)); vkd3d_destroy_null_resources(null_resources, device); return hr; }

1 0

Henri Verbeet : vkd3d: Use debugstr_hresult() in vkd3d_join_thread().
by Alexandre Julliard 23 Jan '24

23 Jan '24

Module: vkd3d Branch: master Commit: d4b329e628ddeed5501fb2a96d8ec773abb680c0 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d4b329e628ddeed5501fb2a96d8ec… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 17 18:06:18 2024 +0100 vkd3d: Use debugstr_hresult() in vkd3d_join_thread(). --- libs/vkd3d/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 88cf9aa1..2b855817 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -4582,7 +4582,7 @@ HRESULT vkd3d_join_thread(struct vkd3d_instance *instance, union vkd3d_thread_ha if (instance->join_thread) { if (FAILED(hr = instance->join_thread(thread->handle))) - ERR("Failed to join thread, hr %#x.\n", hr); + ERR("Failed to join thread, hr %s.\n", debugstr_hresult(hr)); } else {

1 0

Henri Verbeet : vkd3d: Use debugstr_hresult() in d3d12_device_init().
by Alexandre Julliard 23 Jan '24

23 Jan '24

Module: vkd3d Branch: master Commit: e965701776c0ce8cadd46dd97d3430a6cd999410 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e965701776c0ce8cadd46dd97d343… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 17 18:05:31 2024 +0100 vkd3d: Use debugstr_hresult() in d3d12_device_init(). --- libs/vkd3d/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 80fa9d35..88cf9aa1 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -4404,7 +4404,7 @@ static HRESULT d3d12_device_init(struct d3d12_device *device, if (device->use_vk_heaps && FAILED(hr = vkd3d_create_thread(device->vkd3d_instance, device_worker_main, device, &device->worker_thread))) { - WARN("Failed to create worker thread, hr %#x.\n", hr); + WARN("Failed to create worker thread, hr %s.\n", debugstr_hresult(hr)); goto out_cleanup_descriptor_heap_layouts; }

1 0

← Newer
1
...
24
25
26
27
28
29
30
...
72
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2024