- Wine-Commits - list.winehq.org

Francisco Casas : vkd3d-shader/hlsl: Sort synthetic separated samplers first for SM4.
by Alexandre Julliard Aug. 15, 2023

Aug. 15, 2023

Module: vkd3d Branch: master Commit: 37cfbe47d7a7aa5c1d8b65f24f9f985405941d30 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/37cfbe47d7a7aa5c1d8b65f24f9f9… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Fri Aug 4 15:02:39 2023 -0400 vkd3d-shader/hlsl: Sort synthetic separated samplers first for SM4. --- libs/vkd3d-shader/hlsl_codegen.c | 39 ++++++++++++++++++++++++++++++++ tests/hlsl/combined-samplers.shader_test | 6 ++--- tests/hlsl/texture-ordering.shader_test | 10 ++++---- 3 files changed, 47 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 9c1c96ae..8adfea0e 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -2191,6 +2191,44 @@ static bool lower_combined_samples(struct hlsl_ctx *ctx, struct hlsl_ir_node *in return true; } +static void insert_ensuring_decreasing_bind_count(struct list *list, struct hlsl_ir_var *to_add, + enum hlsl_regset regset) +{ + struct hlsl_ir_var *var; + + LIST_FOR_EACH_ENTRY(var, list, struct hlsl_ir_var, extern_entry) + { + if (var->bind_count[regset] < to_add->bind_count[regset]) + { + list_add_before(&var->extern_entry, &to_add->extern_entry); + return; + } + } + + list_add_tail(list, &to_add->extern_entry); +} + +static bool sort_synthetic_separated_samplers_first(struct hlsl_ctx *ctx) +{ + struct list separated_resources; + struct hlsl_ir_var *var, *next; + + list_init(&separated_resources); + + LIST_FOR_EACH_ENTRY_SAFE(var, next, &ctx->extern_vars, struct hlsl_ir_var, extern_entry) + { + if (var->is_separated_resource) + { + list_remove(&var->extern_entry); + insert_ensuring_decreasing_bind_count(&separated_resources, var, HLSL_REGSET_TEXTURES); + } + } + + list_move_head(&ctx->extern_vars, &separated_resources); + + return false; +} + /* Lower DIV to RCP + MUL. */ static bool lower_division(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) { @@ -4318,6 +4356,7 @@ int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry if (profile->major_version >= 4) hlsl_transform_ir(ctx, lower_combined_samples, body, NULL); hlsl_transform_ir(ctx, track_object_components_usage, body, NULL); + sort_synthetic_separated_samplers_first(ctx); if (profile->major_version < 4) { diff --git a/tests/hlsl/combined-samplers.shader_test b/tests/hlsl/combined-samplers.shader_test index 16b5438e..16db3129 100644 --- a/tests/hlsl/combined-samplers.shader_test +++ b/tests/hlsl/combined-samplers.shader_test @@ -60,7 +60,7 @@ float4 main() : sv_target [test] draw quad -todo probe all rgba (10, 10, 10, 11) +probe all rgba (10, 10, 10, 11) [pixel shader] @@ -74,7 +74,7 @@ float4 main() : sv_target [test] draw quad -todo probe all rgba (21, 21, 21, 11) +probe all rgba (21, 21, 21, 11) [pixel shader] @@ -105,7 +105,7 @@ float4 main() : sv_target [test] draw quad -todo probe all rgba (104, 104, 104, 111) +probe all rgba (104, 104, 104, 111) % Sampler arrays with components that have different usage dimensions are only forbidden in SM4 upwards. diff --git a/tests/hlsl/texture-ordering.shader_test b/tests/hlsl/texture-ordering.shader_test index b28fea5d..eb3d5c90 100644 --- a/tests/hlsl/texture-ordering.shader_test +++ b/tests/hlsl/texture-ordering.shader_test @@ -131,7 +131,7 @@ float4 main() : sv_target [test] draw quad -todo probe all rgba (450, 139, 876, 333) +probe all rgba (450, 139, 876, 333) % Same as the first test, but inverting the declaration order. @@ -184,7 +184,7 @@ float4 main() : sv_target [test] draw quad -todo probe all rgba (450, 138, 796, 333) +probe all rgba (450, 138, 796, 333) % Same as the first test, but inverting the resource loads order. @@ -237,7 +237,7 @@ float4 main() : sv_target [test] draw quad -todo probe all rgba (478, 913, 256, 333) +probe all rgba (478, 913, 256, 333) % We can conclude that for declared texture arrays, if they are used, the "allocation size" is the @@ -270,7 +270,7 @@ float4 main() : sv_target [test] draw quad -todo probe all rgba (215, 215, 215, 111) +probe all rgba (215, 215, 215, 111) % Test that textures created from SM1-style samples allocation order is in decreasing "bind count". @@ -300,4 +300,4 @@ float4 main() : sv_target [test] draw quad -todo probe all rgba (5, 4, 2, 0) +probe all rgba (5, 4, 2, 0)

1 0

Francisco Casas : vkd3d-shader/hlsl: Simplify computation of allocation size.
by Alexandre Julliard Aug. 15, 2023

Aug. 15, 2023

Module: vkd3d Branch: master Commit: d4a49d788aefd27364770fd6c9a897c875a7cd12 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d4a49d788aefd27364770fd6c9a89… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Mon Aug 7 18:22:10 2023 -0400 vkd3d-shader/hlsl: Simplify computation of allocation size. --- libs/vkd3d-shader/hlsl_codegen.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 8adfea0e..d6279432 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -3331,7 +3331,7 @@ static void calculate_resource_register_counts(struct hlsl_ctx *ctx) { struct hlsl_ir_var *var; struct hlsl_type *type; - unsigned int i, k; + unsigned int k; LIST_FOR_EACH_ENTRY(var, &ctx->extern_vars, struct hlsl_ir_var, extern_entry) { @@ -3339,15 +3339,10 @@ static void calculate_resource_register_counts(struct hlsl_ctx *ctx) for (k = 0; k <= HLSL_REGSET_LAST_OBJECT; ++k) { - for (i = 0; i < type->reg_size[k]; ++i) - { - bool is_separated = var->is_separated_resource; + bool is_separated = var->is_separated_resource; - /* Samplers (and textures separated from them) are only allocated until the last - * used one. */ - if (var->objects_usage[k][i].used) - var->regs[k].allocation_size = (k == HLSL_REGSET_SAMPLERS || is_separated) ? i + 1 : type->reg_size[k]; - } + if (var->bind_count[k] > 0) + var->regs[k].allocation_size = (k == HLSL_REGSET_SAMPLERS || is_separated) ? var->bind_count[k] : type->reg_size[k]; } } }

1 0

Francisco Casas : vkd3d-shader/tpf: Put the actual bind count in the RDEF table.
by Alexandre Julliard Aug. 15, 2023

Aug. 15, 2023

Module: vkd3d Branch: master Commit: 81afe4356904be6bbefb961a12973be4b94c9135 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/81afe4356904be6bbefb961a12973… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Thu Aug 3 21:02:11 2023 -0400 vkd3d-shader/tpf: Put the actual bind count in the RDEF table. --- libs/vkd3d-shader/hlsl.h | 3 +++ libs/vkd3d-shader/hlsl_codegen.c | 2 ++ libs/vkd3d-shader/tpf.c | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index f670aa32..75a1e6e4 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -417,6 +417,9 @@ struct hlsl_ir_var enum hlsl_sampler_dim sampler_dim; struct vkd3d_shader_location first_sampler_dim_loc; } *objects_usage[HLSL_REGSET_LAST_OBJECT + 1]; + /* Minimum number of binds required to include all object components actually used in the shader. + * It may be less than the allocation size, e.g. for texture arrays. */ + unsigned int bind_count[HLSL_REGSET_LAST_OBJECT + 1]; uint32_t is_input_semantic : 1; uint32_t is_output_semantic : 1; diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 884fe68e..9c1c96ae 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -3275,6 +3275,7 @@ static bool track_object_components_usage(struct hlsl_ctx *ctx, struct hlsl_ir_n return false; var->objects_usage[regset][index].used = true; + var->bind_count[regset] = max(var->bind_count[regset], index + 1); if (load->sampler.var) { var = load->sampler.var; @@ -3282,6 +3283,7 @@ static bool track_object_components_usage(struct hlsl_ctx *ctx, struct hlsl_ir_n return false; var->objects_usage[HLSL_REGSET_SAMPLERS][index].used = true; + var->bind_count[HLSL_REGSET_SAMPLERS] = max(var->bind_count[HLSL_REGSET_SAMPLERS], index + 1); } return false; diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index 04cd1fed..550f9b27 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -3192,7 +3192,7 @@ static struct extern_resource *sm4_get_extern_resources(struct hlsl_ctx *ctx, un extern_resources[*count].regset = regset; extern_resources[*count].id = var->regs[regset].id; - extern_resources[*count].bind_count = var->regs[regset].allocation_size; + extern_resources[*count].bind_count = var->bind_count[regset]; ++*count; }

1 0

Francisco Casas : vkd3d-shader/hlsl: Rename hlsl_reg.bind_count to hlsl_reg.allocation_size.
by Alexandre Julliard Aug. 15, 2023

Aug. 15, 2023

Module: vkd3d Branch: master Commit: 7eba06313663df0c5c116d170b8f671e269d5570 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7eba06313663df0c5c116d170b8f6… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Fri Aug 4 13:21:27 2023 -0400 vkd3d-shader/hlsl: Rename hlsl_reg.bind_count to hlsl_reg.allocation_size. We have to distinguish between the "bind count" and the "allocation size" of variables. The "allocation size" affects the starting register id for the resource to be allocated next, while the "bind count" is determined by the last field actually used. The former may be larger than the latter. What we are currently calling hlsl_reg.bind_count is actually the "allocation size", so a rename is in order. The real "bind count", which will be introduced in following patches, is important because it is what should be shown in the RDEF table and some resource allocation rules depend on it. For instance, for this shader: texture2D texs[3]; texture2D tex; float4 main() : sv_target { return texs[0].Load(int3(0, 0, 0)) + tex.Load(int3(0, 0, 0)); } the variable "texs" has a "bind count" of 1, but an "allocation size" of 3: // Resource Bindings: // // Name Type Format Dim HLSL Bind Count // ------------------------------ ---------- ------- ----------- -------------- ------ // texs texture float4 2d t0 1 // tex texture float4 2d t3 1 --- libs/vkd3d-shader/d3dbc.c | 4 ++-- libs/vkd3d-shader/hlsl.h | 2 +- libs/vkd3d-shader/hlsl_codegen.c | 20 ++++++++++---------- libs/vkd3d-shader/tpf.c | 4 ++-- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c index 35e5c454..1156d593 100644 --- a/libs/vkd3d-shader/d3dbc.c +++ b/libs/vkd3d-shader/d3dbc.c @@ -1686,7 +1686,7 @@ static void write_sm1_uniforms(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffe else { put_u32(buffer, vkd3d_make_u32(D3DXRS_SAMPLER, var->regs[r].id)); - put_u32(buffer, var->regs[r].bind_count); + put_u32(buffer, var->regs[r].allocation_size); } put_u32(buffer, 0); /* type */ put_u32(buffer, 0); /* FIXME: default value */ @@ -2033,7 +2033,7 @@ static void write_sm1_sampler_dcls(struct hlsl_ctx *ctx, struct vkd3d_bytecode_b if (!var->regs[HLSL_REGSET_SAMPLERS].allocated) continue; - count = var->regs[HLSL_REGSET_SAMPLERS].bind_count; + count = var->regs[HLSL_REGSET_SAMPLERS].allocation_size; for (i = 0; i < count; ++i) { diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index dbeea1a0..f670aa32 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -257,7 +257,7 @@ struct hlsl_reg /* Number of registers to be allocated. * Unlike the variable's type's regsize, it is not expressed in register components, but rather * in whole registers, and may depend on which components are used within the shader. */ - uint32_t bind_count; + uint32_t allocation_size; /* For numeric registers, a writemask can be provided to indicate the reservation of only some * of the 4 components. */ unsigned int writemask; diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index ec21b984..884fe68e 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -2868,7 +2868,7 @@ static void allocate_register_reservations(struct hlsl_ctx *ctx) continue; regset = hlsl_type_get_regset(var->data_type); - if (var->reg_reservation.reg_type && var->regs[regset].bind_count) + if (var->reg_reservation.reg_type && var->regs[regset].allocation_size) { if (var->reg_reservation.reg_type != get_regset_name(regset)) { @@ -2886,7 +2886,7 @@ static void allocate_register_reservations(struct hlsl_ctx *ctx) var->regs[regset].id = var->reg_reservation.reg_index; TRACE("Allocated reserved %s to %c%u-%c%u.\n", var->name, var->reg_reservation.reg_type, var->reg_reservation.reg_index, var->reg_reservation.reg_type, - var->reg_reservation.reg_index + var->regs[regset].bind_count); + var->reg_reservation.reg_index + var->regs[regset].allocation_size); } } } @@ -3144,7 +3144,7 @@ static struct hlsl_reg allocate_register(struct hlsl_ctx *ctx, struct register_a record_allocation(ctx, allocator, reg_idx, writemask, first_write, last_read); ret.id = reg_idx; - ret.bind_count = 1; + ret.allocation_size = 1; ret.writemask = hlsl_combine_writemasks(writemask, (1u << component_count) - 1); ret.allocated = true; return ret; @@ -3180,7 +3180,7 @@ static struct hlsl_reg allocate_range(struct hlsl_ctx *ctx, struct register_allo record_allocation(ctx, allocator, reg_idx + i, VKD3DSP_WRITEMASK_ALL, first_write, last_read); ret.id = reg_idx; - ret.bind_count = align(reg_size, 4) / 4; + ret.allocation_size = align(reg_size, 4) / 4; ret.allocated = true; return ret; } @@ -3306,7 +3306,7 @@ static void calculate_resource_register_counts(struct hlsl_ctx *ctx) /* Samplers (and textures separated from them) are only allocated until the last * used one. */ if (var->objects_usage[k][i].used) - var->regs[k].bind_count = (k == HLSL_REGSET_SAMPLERS || is_separated) ? i + 1 : type->reg_size[k]; + var->regs[k].allocation_size = (k == HLSL_REGSET_SAMPLERS || is_separated) ? i + 1 : type->reg_size[k]; } } } @@ -3613,7 +3613,7 @@ static void allocate_semantic_register(struct hlsl_ctx *ctx, struct hlsl_ir_var { var->regs[HLSL_REGSET_NUMERIC].allocated = true; var->regs[HLSL_REGSET_NUMERIC].id = (*counter)++; - var->regs[HLSL_REGSET_NUMERIC].bind_count = 1; + var->regs[HLSL_REGSET_NUMERIC].allocation_size = 1; var->regs[HLSL_REGSET_NUMERIC].writemask = (1 << var->data_type->dimx) - 1; TRACE("Allocated %s to %s.\n", var->name, debug_register(output ? 'o' : 'v', var->regs[HLSL_REGSET_NUMERIC], var->data_type)); @@ -3792,7 +3792,7 @@ static void allocate_buffers(struct hlsl_ctx *ctx) } buffer->reg.id = buffer->reservation.reg_index; - buffer->reg.bind_count = 1; + buffer->reg.allocation_size = 1; buffer->reg.allocated = true; TRACE("Allocated reserved %s to cb%u.\n", buffer->name, index); } @@ -3802,7 +3802,7 @@ static void allocate_buffers(struct hlsl_ctx *ctx) ++index; buffer->reg.id = index; - buffer->reg.bind_count = 1; + buffer->reg.allocation_size = 1; buffer->reg.allocated = true; TRACE("Allocated %s to cb%u.\n", buffer->name, index); ++index; @@ -3842,7 +3842,7 @@ static const struct hlsl_ir_var *get_allocated_object(struct hlsl_ctx *ctx, enum else if (var->regs[regset].allocated) { start = var->regs[regset].id; - count = var->regs[regset].bind_count; + count = var->regs[regset].allocation_size; } else { @@ -3873,7 +3873,7 @@ static void allocate_objects(struct hlsl_ctx *ctx, enum hlsl_regset regset) LIST_FOR_EACH_ENTRY(var, &ctx->extern_vars, struct hlsl_ir_var, extern_entry) { - unsigned int count = var->regs[regset].bind_count; + unsigned int count = var->regs[regset].allocation_size; if (count == 0) continue; diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index 39c8b6f6..04cd1fed 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -3119,7 +3119,7 @@ static struct extern_resource *sm4_get_extern_resources(struct hlsl_ctx *ctx, un regset = hlsl_type_get_regset(component_type); regset_offset = hlsl_type_get_component_offset(ctx, var->data_type, regset, k); - if (regset_offset > var->regs[regset].bind_count) + if (regset_offset > var->regs[regset].allocation_size) continue; if (var->objects_usage[regset][regset_offset].used) @@ -3192,7 +3192,7 @@ static struct extern_resource *sm4_get_extern_resources(struct hlsl_ctx *ctx, un extern_resources[*count].regset = regset; extern_resources[*count].id = var->regs[regset].id; - extern_resources[*count].bind_count = var->regs[regset].bind_count; + extern_resources[*count].bind_count = var->regs[regset].allocation_size; ++*count; }

1 0

Francisco Casas : tests: Test texture allocation ordering in complex scenarios.
by Alexandre Julliard Aug. 15, 2023

Aug. 15, 2023

Module: vkd3d Branch: master Commit: 948c4145f56e2adf2d9793e842ac42ea4a083096 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/948c4145f56e2adf2d9793e842ac4… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Tue Jul 25 04:46:54 2023 -0400 tests: Test texture allocation ordering in complex scenarios. --- Makefile.am | 1 + tests/hlsl/texture-ordering.shader_test | 303 ++++++++++++++++++++++++++++++++ tests/shader_runner_d3d12.c | 4 +- 3 files changed, 306 insertions(+), 2 deletions(-)

1 0

Torge Matthies : wintrust: Decode a zero-length OID to an empty string.
by Alexandre Julliard Aug. 14, 2023

Aug. 14, 2023

Module: wine Branch: master Commit: 8f76cc687da9c0fc7fb10e84a8cf36bcad0ef473 URL: https://gitlab.winehq.org/wine/wine/-/commit/8f76cc687da9c0fc7fb10e84a8cf36… Author: Torge Matthies <openglfreak(a)googlemail.com> Date: Mon Aug 7 11:04:34 2023 +0200 wintrust: Decode a zero-length OID to an empty string. Signed-off-by: Torge Matthies <openglfreak(a)googlemail.com> --- dlls/wintrust/asn.c | 9 +++++---- dlls/wintrust/tests/asn.c | 2 -- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/wintrust/asn.c b/dlls/wintrust/asn.c index 87deff72245..f6c4086b508 100644 --- a/dlls/wintrust/asn.c +++ b/dlls/wintrust/asn.c @@ -1878,6 +1878,8 @@ static BOOL WINAPI CRYPT_AsnDecodeOidIgnoreTag(DWORD dwCertEncodingType, } } } + else + bytesNeeded += 1; if (!pvStructInfo) *pcbStructInfo = bytesNeeded; else if (*pcbStructInfo < bytesNeeded) @@ -1888,12 +1890,13 @@ static BOOL WINAPI CRYPT_AsnDecodeOidIgnoreTag(DWORD dwCertEncodingType, } else { + LPSTR pszObjId = *(LPSTR *)pvStructInfo; + + *pszObjId = 0; if (dataLen) { const BYTE *ptr; - LPSTR pszObjId = *(LPSTR *)pvStructInfo; - *pszObjId = 0; pszObjId += sprintf(pszObjId, "%d.%d", pbEncoded[1 + lenBytes] / 40, pbEncoded[1 + lenBytes] - (pbEncoded[1 + lenBytes] / 40) * 40); @@ -1914,8 +1917,6 @@ static BOOL WINAPI CRYPT_AsnDecodeOidIgnoreTag(DWORD dwCertEncodingType, pszObjId += sprintf(pszObjId, ".%d", val); } } - else - *(LPSTR *)pvStructInfo = NULL; *pcbStructInfo = bytesNeeded; } } diff --git a/dlls/wintrust/tests/asn.c b/dlls/wintrust/tests/asn.c index deaaf40e64b..5f75ec3298e 100644 --- a/dlls/wintrust/tests/asn.c +++ b/dlls/wintrust/tests/asn.c @@ -682,13 +682,11 @@ static void test_decodeSPCIndirectDataContent(void) if (ret) { indirectData = (SPC_INDIRECT_DATA_CONTENT *)buf; - todo_wine ok(indirectData->Data.pszObjId != NULL, "Expected non-NULL data objid\n"); if (indirectData->Data.pszObjId) ok(!strcmp(indirectData->Data.pszObjId, ""), "Expected empty data objid\n"); ok(indirectData->Data.Value.cbData == 0, "Expected no data value\n"); - todo_wine ok(indirectData->DigestAlgorithm.pszObjId != NULL, "Expected non-NULL digest algorithm objid\n"); if (indirectData->DigestAlgorithm.pszObjId)

1 0

Torge Matthies : wintrust: Encode SPC_INDIRECT_DATA_CONTENT digest as an octet string.
by Alexandre Julliard Aug. 14, 2023

Aug. 14, 2023

Module: wine Branch: master Commit: 402091048c535e24895cacee8c0105f546849ce8 URL: https://gitlab.winehq.org/wine/wine/-/commit/402091048c535e24895cacee8c0105… Author: Torge Matthies <openglfreak(a)googlemail.com> Date: Mon Aug 7 11:04:33 2023 +0200 wintrust: Encode SPC_INDIRECT_DATA_CONTENT digest as an octet string. Instead of raw data. See SpcIndirectDataContent specification. Signed-off-by: Torge Matthies <openglfreak(a)googlemail.com> --- dlls/wintrust/asn.c | 2 +- dlls/wintrust/tests/asn.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/wintrust/asn.c b/dlls/wintrust/asn.c index 7846ccb5e2e..71a2025c461 100644 --- a/dlls/wintrust/asn.c +++ b/dlls/wintrust/asn.c @@ -702,7 +702,7 @@ static BOOL WINAPI CRYPT_AsnEncodeSPCDigest(DWORD dwCertEncodingType, const struct SPCDigest *digest = pvStructInfo; struct AsnEncodeSequenceItem items[] = { { &digest->DigestAlgorithm, CRYPT_AsnEncodeAlgorithmIdWithNullParams, 0 }, - { &digest->Digest, CRYPT_CopyEncodedBlob, 0 }, + { &digest->Digest, CRYPT_AsnEncodeOctets, 0 }, }; return CRYPT_AsnEncodeSequence(X509_ASN_ENCODING, items, ARRAY_SIZE(items), diff --git a/dlls/wintrust/tests/asn.c b/dlls/wintrust/tests/asn.c index 09a00ea393a..fa0716a2d4d 100644 --- a/dlls/wintrust/tests/asn.c +++ b/dlls/wintrust/tests/asn.c @@ -578,6 +578,7 @@ static void test_encodeSPCIndirectDataContent(void) ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { + todo_wine ok(size == sizeof(emptyIndirectData), "Unexpected size %ld\n", size); if (size == sizeof(emptyIndirectData)) todo_wine @@ -593,6 +594,7 @@ static void test_encodeSPCIndirectDataContent(void) ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { + todo_wine ok(size == sizeof(spcidcWithOnlyDigest), "Unexpected size %ld\n", size); if (size == sizeof(spcidcWithOnlyDigest)) todo_wine @@ -607,7 +609,6 @@ static void test_encodeSPCIndirectDataContent(void) ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { - todo_wine ok(size == sizeof(spcidcWithDigestAndAlgorithm), "Unexpected size %ld\n", size); if (size == sizeof(spcidcWithDigestAndAlgorithm)) @@ -624,7 +625,6 @@ static void test_encodeSPCIndirectDataContent(void) ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { - todo_wine ok(size == sizeof(spcidcWithDigestAndAlgorithmParams), "Unexpected size %ld\n", size); if (size == sizeof(spcidcWithDigestAndAlgorithmParams)) @@ -640,7 +640,6 @@ static void test_encodeSPCIndirectDataContent(void) ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { - todo_wine ok(size == sizeof(spcidcWithEverythingExceptDataValue), "Unexpected size %ld\n", size); if (size == sizeof(spcidcWithEverythingExceptDataValue)) @@ -657,7 +656,6 @@ static void test_encodeSPCIndirectDataContent(void) ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { - todo_wine ok(size == sizeof(spcidcWithEverything), "Unexpected size %ld\n", size); if (size == sizeof(spcidcWithEverything)) ok(!memcmp(buf, spcidcWithEverything, sizeof(spcidcWithEverything)),

1 0

Torge Matthies : wintrust: Encode algorithm id without parameters if pszObjId is NULL.
by Alexandre Julliard Aug. 14, 2023

Aug. 14, 2023

Module: wine Branch: master Commit: c58c42ad93d04034345266c4639734979b3bbcde URL: https://gitlab.winehq.org/wine/wine/-/commit/c58c42ad93d04034345266c4639734… Author: Torge Matthies <openglfreak(a)googlemail.com> Date: Mon Aug 7 11:04:34 2023 +0200 wintrust: Encode algorithm id without parameters if pszObjId is NULL. The only user of this function is CRYPT_AsnEncodeSPCDigest, whose only user is WVTAsn1SpcIndirectDataContentEncode, so this behavior might be specific to that function. Signed-off-by: Torge Matthies <openglfreak(a)googlemail.com> --- dlls/wintrust/asn.c | 8 ++++++-- dlls/wintrust/tests/asn.c | 4 ---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wintrust/asn.c b/dlls/wintrust/asn.c index 71a2025c461..87deff72245 100644 --- a/dlls/wintrust/asn.c +++ b/dlls/wintrust/asn.c @@ -652,6 +652,7 @@ static BOOL WINAPI CRYPT_CopyEncodedBlob(DWORD dwCertEncodingType, return ret; } +/* Different from the one in crypt32 */ static BOOL WINAPI CRYPT_AsnEncodeAlgorithmIdWithNullParams( DWORD dwCertEncodingType, LPCSTR lpszStructType, const void *pvStructInfo, BYTE *pbEncoded, DWORD *pcbEncoded) @@ -665,12 +666,15 @@ static BOOL WINAPI CRYPT_AsnEncodeAlgorithmIdWithNullParams( { algo->pszObjId, CRYPT_AsnEncodeOid, 0 }, { NULL, CRYPT_CopyEncodedBlob, 0 }, }; + DWORD cItem = 2; if (algo->Parameters.cbData) items[1].pvStructInfo = &algo->Parameters; - else + else if (algo->pszObjId) items[1].pvStructInfo = &nullBlob; - ret = CRYPT_AsnEncodeSequence(dwCertEncodingType, items, ARRAY_SIZE(items), + else + cItem -= 1; + ret = CRYPT_AsnEncodeSequence(dwCertEncodingType, items, cItem, pbEncoded, pcbEncoded); return ret; } diff --git a/dlls/wintrust/tests/asn.c b/dlls/wintrust/tests/asn.c index fa0716a2d4d..deaaf40e64b 100644 --- a/dlls/wintrust/tests/asn.c +++ b/dlls/wintrust/tests/asn.c @@ -578,10 +578,8 @@ static void test_encodeSPCIndirectDataContent(void) ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { - todo_wine ok(size == sizeof(emptyIndirectData), "Unexpected size %ld\n", size); if (size == sizeof(emptyIndirectData)) - todo_wine ok(!memcmp(buf, emptyIndirectData, sizeof(emptyIndirectData)), "Unexpected value\n"); LocalFree(buf); @@ -594,10 +592,8 @@ static void test_encodeSPCIndirectDataContent(void) ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { - todo_wine ok(size == sizeof(spcidcWithOnlyDigest), "Unexpected size %ld\n", size); if (size == sizeof(spcidcWithOnlyDigest)) - todo_wine ok(!memcmp(buf, spcidcWithOnlyDigest, sizeof(spcidcWithOnlyDigest)), "Unexpected value\n"); LocalFree(buf);

1 0

Torge Matthies : wintrust: Fix segfault in CRYPT_AsnEncodeAttributeTypeValue.
by Alexandre Julliard Aug. 14, 2023

Aug. 14, 2023

Module: wine Branch: master Commit: a35d2b17a58965974b16fc7960e5a1b10bee6c41 URL: https://gitlab.winehq.org/wine/wine/-/commit/a35d2b17a58965974b16fc7960e5a1… Author: Torge Matthies <openglfreak(a)googlemail.com> Date: Mon Aug 7 11:04:33 2023 +0200 wintrust: Fix segfault in CRYPT_AsnEncodeAttributeTypeValue. Signed-off-by: Torge Matthies <openglfreak(a)googlemail.com> --- dlls/wintrust/asn.c | 2 +- dlls/wintrust/tests/asn.c | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/dlls/wintrust/asn.c b/dlls/wintrust/asn.c index 27a77629b11..7846ccb5e2e 100644 --- a/dlls/wintrust/asn.c +++ b/dlls/wintrust/asn.c @@ -681,7 +681,7 @@ static BOOL WINAPI CRYPT_AsnEncodeAttributeTypeValue(DWORD dwCertEncodingType, { const CRYPT_ATTRIBUTE_TYPE_VALUE *typeValue = pvStructInfo; struct AsnEncodeSequenceItem items[] = { - { &typeValue->pszObjId, CRYPT_AsnEncodeOid, 0 }, + { typeValue->pszObjId, CRYPT_AsnEncodeOid, 0 }, { &typeValue->Value, CRYPT_CopyEncodedBlob, 0 }, }; diff --git a/dlls/wintrust/tests/asn.c b/dlls/wintrust/tests/asn.c index 88778e990f1..09a00ea393a 100644 --- a/dlls/wintrust/tests/asn.c +++ b/dlls/wintrust/tests/asn.c @@ -575,11 +575,9 @@ static void test_encodeSPCIndirectDataContent(void) ret = pCryptEncodeObjectEx(X509_ASN_ENCODING, SPC_INDIRECT_DATA_CONTENT_STRUCT, &indirectData, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - todo_wine ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { - todo_wine ok(size == sizeof(emptyIndirectData), "Unexpected size %ld\n", size); if (size == sizeof(emptyIndirectData)) todo_wine @@ -592,11 +590,9 @@ static void test_encodeSPCIndirectDataContent(void) indirectData.Digest.pbData = fakeDigest; ret = pCryptEncodeObjectEx(X509_ASN_ENCODING, SPC_INDIRECT_DATA_CONTENT_STRUCT, &indirectData, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - todo_wine ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { - todo_wine ok(size == sizeof(spcidcWithOnlyDigest), "Unexpected size %ld\n", size); if (size == sizeof(spcidcWithOnlyDigest)) todo_wine @@ -608,7 +604,6 @@ static void test_encodeSPCIndirectDataContent(void) indirectData.DigestAlgorithm.pszObjId = szOID_OIWSEC_sha1_; ret = pCryptEncodeObjectEx(X509_ASN_ENCODING, SPC_INDIRECT_DATA_CONTENT_STRUCT, &indirectData, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - todo_wine ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { @@ -626,7 +621,6 @@ static void test_encodeSPCIndirectDataContent(void) indirectData.DigestAlgorithm.Parameters.pbData = parameters; ret = pCryptEncodeObjectEx(X509_ASN_ENCODING, SPC_INDIRECT_DATA_CONTENT_STRUCT, &indirectData, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - todo_wine ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { @@ -643,7 +637,6 @@ static void test_encodeSPCIndirectDataContent(void) indirectData.Data.pszObjId = SPC_PE_IMAGE_DATA_OBJID_; ret = pCryptEncodeObjectEx(X509_ASN_ENCODING, SPC_INDIRECT_DATA_CONTENT_STRUCT, &indirectData, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - todo_wine ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { @@ -661,7 +654,6 @@ static void test_encodeSPCIndirectDataContent(void) indirectData.Data.Value.pbData = (void*)emptySequence; ret = pCryptEncodeObjectEx(X509_ASN_ENCODING, SPC_INDIRECT_DATA_CONTENT_STRUCT, &indirectData, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - todo_wine ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) {

1 0

Torge Matthies : wintrust/tests: Add tests for WVTAsn1SpcIndirectDataContentDecode.
by Alexandre Julliard Aug. 14, 2023

Aug. 14, 2023

Module: wine Branch: master Commit: 2f2fbefb69475ac2c08f208ae9ab61ec557350c5 URL: https://gitlab.winehq.org/wine/wine/-/commit/2f2fbefb69475ac2c08f208ae9ab61… Author: Torge Matthies <openglfreak(a)googlemail.com> Date: Mon Aug 7 11:04:33 2023 +0200 wintrust/tests: Add tests for WVTAsn1SpcIndirectDataContentDecode. Signed-off-by: Torge Matthies <openglfreak(a)googlemail.com> --- dlls/wintrust/tests/asn.c | 119 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 114 insertions(+), 5 deletions(-) diff --git a/dlls/wintrust/tests/asn.c b/dlls/wintrust/tests/asn.c index ee70cbabf3b..88778e990f1 100644 --- a/dlls/wintrust/tests/asn.c +++ b/dlls/wintrust/tests/asn.c @@ -552,16 +552,16 @@ static const BYTE spcidcWithEverything[] = { 0x74,0x04,0x14,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d, 0x0e,0x0f,0x10,0x11,0x12,0x13,0x14 }; +static BYTE fakeDigest[] = { + 0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f,0x10, + 0x11,0x12,0x13,0x14 }; +static BYTE parameters[] = { 't','e','s','t' }; + static void test_encodeSPCIndirectDataContent(void) { static char SPC_PE_IMAGE_DATA_OBJID_[] = SPC_PE_IMAGE_DATA_OBJID; static char szOID_OIWSEC_sha1_[] = szOID_OIWSEC_sha1; - static BYTE fakeDigest[] = { - 0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f,0x10, - 0x11,0x12,0x13,0x14 }; - static BYTE parameters[] = { 't','e','s','t' }; - SPC_INDIRECT_DATA_CONTENT indirectData = { { 0 } }; DWORD size = 0; LPBYTE buf; @@ -674,6 +674,114 @@ static void test_encodeSPCIndirectDataContent(void) } } +static void test_decodeSPCIndirectDataContent(void) +{ + static const BYTE asn1Null[] = { 0x05,0x00 }; + + BOOL ret; + LPBYTE buf = NULL; + DWORD size = 0; + SPC_INDIRECT_DATA_CONTENT *indirectData; + + if (!pCryptDecodeObjectEx) + { + win_skip("CryptDecodeObjectEx() is not available. Skipping the decodeSPCIndirectDataContent tests\n"); + return; + } + + ret = pCryptDecodeObjectEx(X509_ASN_ENCODING, SPC_INDIRECT_DATA_CONTENT_STRUCT, + emptyIndirectData, sizeof(emptyIndirectData), + CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); + ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); + if (ret) + { + indirectData = (SPC_INDIRECT_DATA_CONTENT *)buf; + todo_wine + ok(indirectData->Data.pszObjId != NULL, "Expected non-NULL data objid\n"); + if (indirectData->Data.pszObjId) + ok(!strcmp(indirectData->Data.pszObjId, ""), + "Expected empty data objid\n"); + ok(indirectData->Data.Value.cbData == 0, "Expected no data value\n"); + todo_wine + ok(indirectData->DigestAlgorithm.pszObjId != NULL, + "Expected non-NULL digest algorithm objid\n"); + if (indirectData->DigestAlgorithm.pszObjId) + ok(!strcmp(indirectData->DigestAlgorithm.pszObjId, ""), + "Expected empty digest algorithm objid\n"); + ok(indirectData->DigestAlgorithm.Parameters.cbData == 0, + "Expected no digest algorithm parameters\n"); + ok(indirectData->Digest.cbData == 0, "Expected no digest\n"); + LocalFree(buf); + } + ret = pCryptDecodeObjectEx(X509_ASN_ENCODING, SPC_INDIRECT_DATA_CONTENT_STRUCT, + spcidcWithOnlyDigest, sizeof(spcidcWithOnlyDigest), + CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); + ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); + if (ret) + { + indirectData = (SPC_INDIRECT_DATA_CONTENT *)buf; + ok(indirectData->Digest.cbData == sizeof(fakeDigest), + "Unexpected digest size %ld\n", indirectData->Digest.cbData); + if (indirectData->Digest.cbData == sizeof(fakeDigest)) + ok(!memcmp(indirectData->Digest.pbData, fakeDigest, + sizeof(fakeDigest)), + "Unexpected flags\n"); + LocalFree(buf); + } + ret = pCryptDecodeObjectEx(X509_ASN_ENCODING, SPC_INDIRECT_DATA_CONTENT_STRUCT, + spcidcWithDigestAndAlgorithm, sizeof(spcidcWithDigestAndAlgorithm), + CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); + ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); + if (ret) + { + indirectData = (SPC_INDIRECT_DATA_CONTENT *)buf; + ok(indirectData->DigestAlgorithm.pszObjId != NULL, + "Expected non-NULL digest algorithm objid\n"); + if (indirectData->DigestAlgorithm.pszObjId) + ok(!strcmp(indirectData->DigestAlgorithm.pszObjId, szOID_OIWSEC_sha1), + "Expected szOID_OIWSEC_sha1, got \"%s\"\n", + indirectData->DigestAlgorithm.pszObjId); + ok(indirectData->DigestAlgorithm.Parameters.cbData == sizeof(asn1Null), + "Unexpected digest algorithm parameters size %ld\n", + indirectData->DigestAlgorithm.Parameters.cbData); + if (indirectData->DigestAlgorithm.Parameters.cbData == sizeof(asn1Null)) + ok(!memcmp(indirectData->DigestAlgorithm.Parameters.pbData, + asn1Null, sizeof(asn1Null)), + "Unexpected digest algorithm parameters\n"); + ok(indirectData->Digest.cbData == sizeof(fakeDigest), + "Unexpected digest size %ld\n", indirectData->Digest.cbData); + if (indirectData->Digest.cbData == sizeof(fakeDigest)) + ok(!memcmp(indirectData->Digest.pbData, fakeDigest, + sizeof(fakeDigest)), + "Unexpected flags\n"); + LocalFree(buf); + } + ret = pCryptDecodeObjectEx(X509_ASN_ENCODING, SPC_INDIRECT_DATA_CONTENT_STRUCT, + spcidcWithDigestAndAlgorithmParams, sizeof(spcidcWithDigestAndAlgorithmParams), + CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); + /* what? */ + ok(!ret && GetLastError () == CRYPT_E_ASN1_EOD, + "Expected CRYPT_E_ASN1_EOD, got %08lx\n", GetLastError()); + if (ret) + LocalFree(buf); + ret = pCryptDecodeObjectEx(X509_ASN_ENCODING, SPC_INDIRECT_DATA_CONTENT_STRUCT, + spcidcWithEverythingExceptDataValue, sizeof(spcidcWithEverythingExceptDataValue), + CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); + /* huh??? */ + ok(!ret && GetLastError () == CRYPT_E_ASN1_EOD, + "Expected CRYPT_E_ASN1_EOD, got %08lx\n", GetLastError()); + if (ret) + LocalFree(buf); + ret = pCryptDecodeObjectEx(X509_ASN_ENCODING, SPC_INDIRECT_DATA_CONTENT_STRUCT, + spcidcWithEverything, sizeof(spcidcWithEverything), + CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); + /* ?????? */ + ok(!ret && GetLastError () == CRYPT_E_ASN1_EOD, + "Expected CRYPT_E_ASN1_EOD, got %08lx\n", GetLastError()); + if (ret) + LocalFree(buf); +} + static WCHAR foo[] = { 'f','o','o',0 }; static WCHAR guidStr[] = { '{','8','b','c','9','6','b','0','0','-', '8','d','a','1','-','1','1','c','f','-','8','7','3','6','-','0','0', @@ -1096,6 +1204,7 @@ START_TEST(asn) test_encodeSPCPEImage(); test_decodeSPCPEImage(); test_encodeSPCIndirectDataContent(); + test_decodeSPCIndirectDataContent(); test_encodeCatMemberInfo(); test_decodeCatMemberInfo(); test_encodeCatNameValue();

1 0