February 2022 - Wine-Devel - list.winehq.org

[PATCH vkd3d v4 3/3] vkd3d-shader/hlsl: Cover all numeric types in constant folding operations.
by Matteo Bruni Feb. 17, 2022

Feb. 17, 2022

From: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- Makefile.am | 1 - libs/vkd3d-shader/hlsl_constant_ops.c | 331 ++++++++++++++++++-------- 2 files changed, 232 insertions(+), 100 deletions(-) diff --git a/Makefile.am b/Makefile.am index 94fa522a..8617a09d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -96,7 +96,6 @@ vkd3d_shader_tests = \ tests/hlsl-vector-indexing.shader_test \ tests/hlsl-vector-indexing-uniform.shader_test \ tests/math.shader_test \ - tests/max.shader_test \ tests/pow.shader_test \ tests/preproc-if.shader_test \ tests/preproc-ifdef.shader_test \ diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c index 9e19cef4..51cee179 100644 --- a/libs/vkd3d-shader/hlsl_constant_ops.c +++ b/libs/vkd3d-shader/hlsl_constant_ops.c @@ -20,11 +20,216 @@ #include "hlsl.h" +static bool fold_cast(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, struct hlsl_ir_constant *src) +{ + unsigned int k; + uint32_t u; + int32_t i; + double d; + float f; + bool b; + + if (dst->node.data_type->dimx != src->node.data_type->dimx + || dst->node.data_type->dimy != src->node.data_type->dimy) + { + FIXME("Cast from %s to %s.\n", debug_hlsl_type(ctx, src->node.data_type), + debug_hlsl_type(ctx, dst->node.data_type)); + return false; + } + + for (k = 0; k < 4; ++k) + { + switch (src->node.data_type->base_type) + { + case HLSL_TYPE_FLOAT: + case HLSL_TYPE_HALF: + u = src->value[k].f; + i = src->value[k].f; + f = src->value[k].f; + d = src->value[k].f; + b = src->value[k].f; + break; + + case HLSL_TYPE_DOUBLE: + u = src->value[k].d; + i = src->value[k].d; + f = src->value[k].d; + d = src->value[k].d; + b = src->value[k].d; + break; + + case HLSL_TYPE_INT: + u = src->value[k].i; + i = src->value[k].i; + f = src->value[k].i; + d = src->value[k].i; + b = src->value[k].i; + break; + + case HLSL_TYPE_UINT: + u = src->value[k].u; + i = src->value[k].u; + f = src->value[k].u; + d = src->value[k].u; + b = src->value[k].u; + break; + + case HLSL_TYPE_BOOL: + u = src->value[k].b; + i = src->value[k].b; + f = src->value[k].b; + d = src->value[k].b; + b = src->value[k].b; + break; + + default: + FIXME("Cast from %s to %s.\n", debug_hlsl_type(ctx, src->node.data_type), + debug_hlsl_type(ctx, dst->node.data_type)); + return false; + } + + switch (dst->node.data_type->base_type) + { + case HLSL_TYPE_FLOAT: + case HLSL_TYPE_HALF: + dst->value[k].f = f; + break; + + case HLSL_TYPE_DOUBLE: + dst->value[k].d = d; + break; + + case HLSL_TYPE_INT: + dst->value[k].i = i; + break; + + case HLSL_TYPE_UINT: + dst->value[k].u = u; + break; + + case HLSL_TYPE_BOOL: + dst->value[k].b = b; + break; + + default: + FIXME("Cast from %s to %s.\n", debug_hlsl_type(ctx, src->node.data_type), + debug_hlsl_type(ctx, dst->node.data_type)); + return false; + } + } + return true; +} + +static bool fold_neg(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, struct hlsl_ir_constant *src) +{ + enum hlsl_base_type type = dst->node.data_type->base_type; + unsigned int k; + + assert(type == src->node.data_type->base_type); + + for (k = 0; k < 4; ++k) + { + switch (type) + { + case HLSL_TYPE_FLOAT: + case HLSL_TYPE_HALF: + dst->value[k].f = -src->value[k].f; + break; + + case HLSL_TYPE_DOUBLE: + dst->value[k].d = -src->value[k].d; + break; + + case HLSL_TYPE_INT: + case HLSL_TYPE_UINT: + dst->value[k].u = -src->value[k].u; + break; + + default: + FIXME("Fold negation for type %s.\n", debug_hlsl_type(ctx, dst->node.data_type)); + return false; + } + } + return true; +} + +static bool fold_add(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, struct hlsl_ir_constant *src1, + struct hlsl_ir_constant *src2) +{ + enum hlsl_base_type type = dst->node.data_type->base_type; + unsigned int k; + + assert(type == src1->node.data_type->base_type); + assert(type == src2->node.data_type->base_type); + + for (k = 0; k < 4; ++k) + { + switch (type) + { + case HLSL_TYPE_FLOAT: + case HLSL_TYPE_HALF: + dst->value[k].f = src1->value[k].f + src2->value[k].f; + break; + + case HLSL_TYPE_DOUBLE: + dst->value[k].d = src1->value[k].d + src2->value[k].d; + break; + + /* Handling HLSL_TYPE_INT through the unsigned field to avoid + * undefined behavior with signed integers in C. */ + case HLSL_TYPE_INT: + case HLSL_TYPE_UINT: + dst->value[k].u = src1->value[k].u + src2->value[k].u; + break; + + default: + FIXME("Fold addition for type %s.\n", debug_hlsl_type(ctx, dst->node.data_type)); + return false; + } + } + return true; +} + +static bool fold_mul(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, + struct hlsl_ir_constant *src1, struct hlsl_ir_constant *src2) +{ + enum hlsl_base_type type = dst->node.data_type->base_type; + + assert(type == src1->node.data_type->base_type); + assert(type == src2->node.data_type->base_type); + + for (int k = 0; k < 4; ++k) + { + switch (type) + { + case HLSL_TYPE_FLOAT: + case HLSL_TYPE_HALF: + dst->value[k].f = src1->value[k].f * src2->value[k].f; + break; + + case HLSL_TYPE_DOUBLE: + dst->value[k].d = src1->value[k].d * src2->value[k].d; + break; + + case HLSL_TYPE_INT: + case HLSL_TYPE_UINT: + dst->value[k].u = src1->value[k].u * src2->value[k].u; + break; + + default: + FIXME("Fold multiplication for type %s.\n", debug_hlsl_type(ctx, dst->node.data_type)); + return false; + } + } + return true; +} + bool hlsl_fold_constants(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) { struct hlsl_ir_constant *arg1, *arg2 = NULL, *res; struct hlsl_ir_expr *expr; - unsigned int i, dimx; + unsigned int i; + bool success; if (instr->type != HLSL_IR_EXPR) return false; @@ -38,115 +243,43 @@ bool hlsl_fold_constants(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void arg1 = hlsl_ir_constant(expr->operands[0].node); if (expr->operands[1].node) arg2 = hlsl_ir_constant(expr->operands[1].node); - dimx = instr->data_type->dimx; if (!(res = hlsl_alloc(ctx, sizeof(*res)))) return false; init_node(&res->node, HLSL_IR_CONSTANT, instr->data_type, instr->loc); - switch (instr->data_type->base_type) + switch (expr->op) { - case HLSL_TYPE_FLOAT: - { - switch (expr->op) - { - case HLSL_OP1_CAST: - if (instr->data_type->dimx != arg1->node.data_type->dimx - || instr->data_type->dimy != arg1->node.data_type->dimy) - { - FIXME("Cast from %s to %s.\n", debug_hlsl_type(ctx, arg1->node.data_type), - debug_hlsl_type(ctx, instr->data_type)); - vkd3d_free(res); - return false; - } - - switch (arg1->node.data_type->base_type) - { - case HLSL_TYPE_INT: - for (i = 0; i < dimx; ++i) - res->value[i].f = arg1->value[i].i; - break; - - case HLSL_TYPE_UINT: - for (i = 0; i < dimx; ++i) - res->value[i].f = arg1->value[i].u; - break; - - default: - FIXME("Cast from %s to %s.\n", debug_hlsl_type(ctx, arg1->node.data_type), - debug_hlsl_type(ctx, instr->data_type)); - vkd3d_free(res); - return false; - } - break; - - default: - FIXME("Fold float op %#x.\n", expr->op); - vkd3d_free(res); - return false; - } + case HLSL_OP1_CAST: + success = fold_cast(ctx, res, arg1); break; - } - case HLSL_TYPE_UINT: - { - switch (expr->op) - { - case HLSL_OP1_CAST: - if (instr->data_type->dimx != arg1->node.data_type->dimx - || instr->data_type->dimy != arg1->node.data_type->dimy) - { - FIXME("Cast from %s to %s.\n", debug_hlsl_type(ctx, arg1->node.data_type), - debug_hlsl_type(ctx, instr->data_type)); - vkd3d_free(res); - return false; - } - - switch (arg1->node.data_type->base_type) - { - case HLSL_TYPE_INT: - for (i = 0; i < dimx; ++i) - res->value[i].i = arg1->value[i].u; - break; - - default: - FIXME("Cast from %s to %s.\n", debug_hlsl_type(ctx, arg1->node.data_type), - debug_hlsl_type(ctx, instr->data_type)); - vkd3d_free(res); - return false; - } - break; - - case HLSL_OP1_NEG: - for (i = 0; i < instr->data_type->dimx; ++i) - res->value[i].u = -arg1->value[i].u; - break; - - case HLSL_OP2_ADD: - for (i = 0; i < instr->data_type->dimx; ++i) - res->value[i].u = arg1->value[i].u + arg2->value[i].u; - break; - - case HLSL_OP2_MUL: - for (i = 0; i < instr->data_type->dimx; ++i) - res->value[i].u = arg1->value[i].u * arg2->value[i].u; - break; - - default: - FIXME("Fold uint op %#x.\n", expr->op); - vkd3d_free(res); - return false; - } + case HLSL_OP1_NEG: + success = fold_neg(ctx, res, arg1); + break; + + case HLSL_OP2_ADD: + success = fold_add(ctx, res, arg1, arg2); + break; + + case HLSL_OP2_MUL: + success = fold_mul(ctx, res, arg1, arg2); break; - } default: - FIXME("Fold type %#x op %#x.\n", instr->data_type->base_type, expr->op); - vkd3d_free(res); - return false; + FIXME("Fold \"%s\" expression.\n", debug_hlsl_expr_op(expr->op)); + success = false; + break; } - list_add_before(&expr->node.entry, &res->node.entry); - hlsl_replace_node(&expr->node, &res->node); - return true; + if (success) + { + list_add_before(&expr->node.entry, &res->node.entry); + hlsl_replace_node(&expr->node, &res->node); + } + else + { + vkd3d_free(res); + } + return success; } -- 2.34.1

3 2

[PATCH vkd3d v3 1/3] vkd3d-shader/hlsl: Move replace_node() to hlsl.c.
by Zebediah Figura Feb. 17, 2022

Feb. 17, 2022

From: Francisco Casas <fcasas(a)codeweavers.com> Also rename it to hlsl_replace_node(). Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 14 ++++++++++++++ libs/vkd3d-shader/hlsl.h | 2 ++ libs/vkd3d-shader/hlsl_codegen.c | 25 ++++++------------------- 3 files changed, 22 insertions(+), 19 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 8a0f4b017..a9a427707 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1400,6 +1400,20 @@ void hlsl_dump_function(struct hlsl_ctx *ctx, const struct hlsl_ir_function_decl vkd3d_string_buffer_cleanup(&buffer); } +void hlsl_replace_node(struct hlsl_ir_node *old, struct hlsl_ir_node *new) +{ + struct hlsl_src *src, *next; + + LIST_FOR_EACH_ENTRY_SAFE(src, next, &old->uses, struct hlsl_src, entry) + { + hlsl_src_remove(src); + hlsl_src_from_node(src, new); + } + list_remove(&old->entry); + hlsl_free_instr(old); +} + + void hlsl_free_type(struct hlsl_type *type) { struct hlsl_struct_field *field, *next_field; diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 3a69165e5..67fe1a8d5 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -713,6 +713,8 @@ void hlsl_dump_function(struct hlsl_ctx *ctx, const struct hlsl_ir_function_decl int hlsl_emit_dxbc(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_func, struct vkd3d_shader_code *out); +void hlsl_replace_node(struct hlsl_ir_node *old, struct hlsl_ir_node *new); + void hlsl_free_instr(struct hlsl_ir_node *node); void hlsl_free_instr_list(struct list *list); void hlsl_free_type(struct hlsl_type *type); diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index eac3513c9..77ddd979a 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -224,19 +224,6 @@ static bool transform_ir(struct hlsl_ctx *ctx, bool (*func)(struct hlsl_ctx *ctx return progress; } -static void replace_node(struct hlsl_ir_node *old, struct hlsl_ir_node *new) -{ - struct hlsl_src *src, *next; - - LIST_FOR_EACH_ENTRY_SAFE(src, next, &old->uses, struct hlsl_src, entry) - { - hlsl_src_remove(src); - hlsl_src_from_node(src, new); - } - list_remove(&old->entry); - hlsl_free_instr(old); -} - /* Lower casts from vec1 to vecN to swizzles. */ static bool lower_broadcasts(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) { @@ -267,7 +254,7 @@ static bool lower_broadcasts(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, v return false; list_add_after(&new_cast->node.entry, &swizzle->node.entry); - replace_node(&cast->node, &swizzle->node); + hlsl_replace_node(&cast->node, &swizzle->node); return true; } @@ -437,7 +424,7 @@ static bool copy_propagation_transform_load(struct hlsl_ctx *ctx, list_add_before(&node->entry, &swizzle_node->node.entry); new_node = &swizzle_node->node; } - replace_node(node, new_node); + hlsl_replace_node(node, new_node); return true; } @@ -566,7 +553,7 @@ static bool fold_redundant_casts(struct hlsl_ctx *ctx, struct hlsl_ir_node *inst if (hlsl_types_are_equal(src_type, dst_type) || (src_type->base_type == dst_type->base_type && is_vec1(src_type) && is_vec1(dst_type))) { - replace_node(&expr->node, expr->operands[0].node); + hlsl_replace_node(&expr->node, expr->operands[0].node); return true; } } @@ -708,7 +695,7 @@ static bool lower_narrowing_casts(struct hlsl_ctx *ctx, struct hlsl_ir_node *ins return false; list_add_after(&new_cast->node.entry, &swizzle->node.entry); - replace_node(&cast->node, &swizzle->node); + hlsl_replace_node(&cast->node, &swizzle->node); return true; } @@ -842,7 +829,7 @@ static bool fold_constants(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, voi } list_add_before(&expr->node.entry, &res->node.entry); - replace_node(&expr->node, &res->node); + hlsl_replace_node(&expr->node, &res->node); return true; } @@ -862,7 +849,7 @@ static bool remove_trivial_swizzles(struct hlsl_ctx *ctx, struct hlsl_ir_node *i if (((swizzle->swizzle >> (2 * i)) & 3) != i) return false; - replace_node(instr, swizzle->val.node); + hlsl_replace_node(instr, swizzle->val.node); return true; } -- 2.34.1

4 9

[v2 PATCH vkd3d] vkd3d-shader/hlsl: Fix floating point literals matching.
by Nikolay Sivov Feb. 17, 2022

Feb. 17, 2022

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: as far as I can tell from testing, it's not allowed to have float literal suffixes without decimal point or exponent. libs/vkd3d-shader/hlsl.l | 2 +- tests/hlsl-initializer-numeric.shader_test | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.l b/libs/vkd3d-shader/hlsl.l index e9281ec..1cc19ad 100644 --- a/libs/vkd3d-shader/hlsl.l +++ b/libs/vkd3d-shader/hlsl.l @@ -192,7 +192,7 @@ row_major {return KW_ROW_MAJOR; } yylval->floatval = atof(yytext); return C_FLOAT; } -[0-9]+([eE][+-]?[0-9]+)?[h|H|f|F] { +[0-9]+[eE][+-]?[0-9]+[h|H|f|F]? { yylval->floatval = atof(yytext); return C_FLOAT; } diff --git a/tests/hlsl-initializer-numeric.shader_test b/tests/hlsl-initializer-numeric.shader_test index 2fce390..4057688 100644 --- a/tests/hlsl-initializer-numeric.shader_test +++ b/tests/hlsl-initializer-numeric.shader_test @@ -33,3 +33,16 @@ float4 main() : sv_target [test] draw quad probe all rgba (1.0, 2.0, 3.0, 4.0) 4 + + +[pixel shader] +float4 main() : sv_target +{ + float4 aa = { 1e1, 1e-1, 1., 2.f }; + float4 bb = { .1, .1e1, .2f, 1.e-1f }; + return aa + bb; +} + +[test] +draw quad +probe all rgba (10.1, 1.1, 1.2, 2.1) 4 -- 2.34.1

5 4

[PATCH] scrrun: Add a stub for pipe-based text stream.
by Nikolay Sivov Feb. 17, 2022

Feb. 17, 2022

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/scrrun/filesystem.c | 138 +++++++++++++++++++++++++++++++-- dlls/scrrun/tests/filesystem.c | 23 ++++-- 2 files changed, 145 insertions(+), 16 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index d16ecb722dc..4794437a71d 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -706,20 +706,21 @@ static HRESULT WINAPI textstream_SkipLine(ITextStream *iface) static HRESULT WINAPI textstream_Close(ITextStream *iface) { - struct textstream *This = impl_from_ITextStream(iface); + struct textstream *stream = impl_from_ITextStream(iface); HRESULT hr = S_OK; - TRACE("(%p)\n", This); + TRACE("%p.\n", iface); - if(!CloseHandle(This->file)) + if (!CloseHandle(stream->file)) hr = S_FALSE; - This->file = NULL; + stream->file = NULL; return hr; } -static const ITextStreamVtbl textstreamvtbl = { +static const ITextStreamVtbl textstreamvtbl = +{ textstream_QueryInterface, textstream_AddRef, textstream_Release, @@ -742,6 +743,114 @@ static const ITextStreamVtbl textstreamvtbl = { textstream_Close }; +static HRESULT WINAPI pipestream_get_Line(ITextStream *iface, LONG *line) +{ + FIXME("%p, %p.\n", iface, line); + + return E_NOTIMPL; +} + +static HRESULT WINAPI pipestream_get_Column(ITextStream *iface, LONG *column) +{ + FIXME("%p, %p.\n", iface, column); + + return E_NOTIMPL; +} + +static HRESULT WINAPI pipestream_get_AtEndOfStream(ITextStream *iface, VARIANT_BOOL *eos) +{ + FIXME("%p, %p.\n", iface, eos); + + return E_NOTIMPL; +} + +static HRESULT WINAPI pipestream_get_AtEndOfLine(ITextStream *iface, VARIANT_BOOL *eol) +{ + FIXME("%p, %p.\n", iface, eol); + + return E_NOTIMPL; +} + +static HRESULT WINAPI pipestream_Read(ITextStream *iface, LONG len, BSTR *text) +{ + FIXME("%p, %ld, %p.\n", iface, len, text); + + return E_NOTIMPL; +} + +static HRESULT WINAPI pipestream_ReadLine(ITextStream *iface, BSTR *text) +{ + FIXME("%p, %p.\n", iface, text); + + return E_NOTIMPL; +} + +static HRESULT WINAPI pipestream_ReadAll(ITextStream *iface, BSTR *text) +{ + FIXME("%p, %p.\n", iface, text); + + return E_NOTIMPL; +} + +static HRESULT WINAPI pipestream_Write(ITextStream *iface, BSTR text) +{ + FIXME("%p, %s.\n", iface, debugstr_w(text)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI pipestream_WriteLine(ITextStream *iface, BSTR text) +{ + FIXME("%p, %s.\n", iface, debugstr_w(text)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI pipestream_WriteBlankLines(ITextStream *iface, LONG lines) +{ + FIXME("%p, %ld.\n", iface, lines); + + return E_NOTIMPL; +} + +static HRESULT WINAPI pipestream_Skip(ITextStream *iface, LONG count) +{ + FIXME("%p, %ld.\n", iface, count); + + return E_NOTIMPL; +} + +static HRESULT WINAPI pipestream_SkipLine(ITextStream *iface) +{ + FIXME("%p.\n", iface); + + return E_NOTIMPL; +} + +static const ITextStreamVtbl pipestreamvtbl = +{ + textstream_QueryInterface, + textstream_AddRef, + textstream_Release, + textstream_GetTypeInfoCount, + textstream_GetTypeInfo, + textstream_GetIDsOfNames, + textstream_Invoke, + pipestream_get_Line, + pipestream_get_Column, + pipestream_get_AtEndOfStream, + pipestream_get_AtEndOfLine, + pipestream_Read, + pipestream_ReadLine, + pipestream_ReadAll, + pipestream_Write, + pipestream_WriteLine, + pipestream_WriteBlankLines, + pipestream_Skip, + pipestream_SkipLine, + textstream_Close +}; + static HRESULT create_textstream(const WCHAR *filename, DWORD disposition, IOMode mode, Tristate format, ITextStream **ret) { static const unsigned short utf16bom = 0xfeff; @@ -839,11 +948,24 @@ static HRESULT create_textstream(const WCHAR *filename, DWORD disposition, IOMod return S_OK; } -HRESULT WINAPI DoOpenPipeStream(HANDLE pipe, IOMode mode, ITextStream **stream) +HRESULT WINAPI DoOpenPipeStream(HANDLE pipe, IOMode mode, ITextStream **ret) { - FIXME("%p, %d, %p.\n", pipe, mode, stream); + struct textstream *stream; - return E_NOTIMPL; + TRACE("%p, %d, %p.\n", pipe, mode, ret); + + if (!(stream = calloc(1, sizeof(*stream)))) + return E_OUTOFMEMORY; + + stream->ITextStream_iface.lpVtbl = &pipestreamvtbl; + stream->ref = 1; + stream->mode = mode; + stream->file = pipe; + + init_classinfo(&CLSID_TextStream, (IUnknown *)&stream->ITextStream_iface, &stream->classinfo); + *ret = &stream->ITextStream_iface; + + return S_OK; } static HRESULT WINAPI drive_QueryInterface(IDrive *iface, REFIID riid, void **obj) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 098060a90bb..894b6251f34 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -2613,7 +2613,6 @@ static void test_DoOpenPipeStream(void) ok(ret, "Failed to create pipes.\n"); hr = pDoOpenPipeStream(piperead, ForReading, &stream_read); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); if (SUCCEEDED(hr)) { @@ -2624,9 +2623,13 @@ static void test_DoOpenPipeStream(void) ok(written == sizeof(testdata), "Write to anonymous pipe wrote %ld bytes.\n", written); hr = ITextStream_Read(stream_read, 4, &str); + todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - ok(!wcscmp(str, L"test"), "Unexpected data read %s.\n", wine_dbgstr_w(str)); - SysFreeString(str); + if (SUCCEEDED(hr)) + { + ok(!wcscmp(str, L"test"), "Unexpected data read %s.\n", wine_dbgstr_w(str)); + SysFreeString(str); + } ITextStream_Release(stream_read); } @@ -2635,7 +2638,6 @@ static void test_DoOpenPipeStream(void) ok(ret, "Unexpected return value.\n"); /* Stream takes ownership. */ ret = CloseHandle(piperead); - todo_wine ok(!ret, "Unexpected return value.\n"); /* Streams on both ends. */ @@ -2644,32 +2646,37 @@ static void test_DoOpenPipeStream(void) stream_read = NULL; hr = pDoOpenPipeStream(piperead, ForReading, &stream_read); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); stream_write = NULL; hr = pDoOpenPipeStream(pipewrite, ForWriting, &stream_write); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); if (SUCCEEDED(hr)) { str = SysAllocString(L"data"); hr = ITextStream_Write(stream_write, str); + todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = ITextStream_Write(stream_read, str); + todo_wine ok(hr == CTL_E_BADFILEMODE, "Unexpected hr %#lx.\n", hr); SysFreeString(str); hr = ITextStream_Read(stream_write, 1, &str); + todo_wine ok(hr == CTL_E_BADFILEMODE, "Unexpected hr %#lx.\n", hr); hr = ITextStream_Read(stream_read, 4, &str); + todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - ok(!wcscmp(str, L"data"), "Unexpected data.\n"); - SysFreeString(str); + if (SUCCEEDED(hr)) + { + ok(!wcscmp(str, L"data"), "Unexpected data.\n"); + SysFreeString(str); + } } if (stream_read) -- 2.34.1

1 0

[PATCH 0/3] Better support of 32bit debuggees in 64bit winedbg
by Eric Pouech Feb. 17, 2022

Feb. 17, 2022

This serie fixes a couple of bugs in 64bit instance of winedbg handling a 64 bit target. The third one is mostly cosmetic (don't print 16 digits for 32 bit addresses). A+ --- Eric Pouech (3): programs/winedbg: correctly read register values dlls/dbghelp: correctly promote to 64bit register relative offsets programs/winedbg: rework printing of pointer values dlls/dbghelp/symbol.c | 2 +- programs/winedbg/be_i386.c | 8 +++--- programs/winedbg/be_x86_64.c | 9 ++++--- programs/winedbg/break.c | 14 +++++----- programs/winedbg/debugger.h | 6 ++--- programs/winedbg/gdbproxy.c | 9 ++++--- programs/winedbg/info.c | 17 ++++++------ programs/winedbg/memory.c | 49 +++++++---------------------------- programs/winedbg/stack.c | 11 ++++---- programs/winedbg/symbol.c | 10 +++---- programs/winedbg/tgt_active.c | 41 +++++++++++++++-------------- programs/winedbg/winedbg.c | 3 ++- 12 files changed, 78 insertions(+), 101 deletions(-)

1 3

[PATCH 1/5] dlls/ntdll/tests: fully allocate SYSTEM_FIRMWARE_TABLE_INFORMATION
by Eric Pouech Feb. 17, 2022

Feb. 17, 2022

this prevents mingw-gcc version 11 to generate warnings (-Warray-bounds) Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/ntdll/tests/info.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index e9d42127c3e..d6b323dd9d7 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -1461,7 +1461,7 @@ static void test_query_firmware(void) NTSTATUS status; SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti; - sfti = HeapAlloc(GetProcessHeap(), 0, min_sfti_len); + sfti = HeapAlloc(GetProcessHeap(), 0, sizeof(*sfti)); ok(!!sfti, "Failed to allocate memory\n"); sfti->ProviderSignature = 0;

1 4

[PATCH v2 4/4] ncrypt: Add NCryptVerifySignature stub.
by Hans Leidekker Feb. 17, 2022

Feb. 17, 2022

From: Santino Mazza <mazzasantino1206(a)gmail.com> With this change now some applications which uses ncrypt for signature validation work. For example, the visual studio installer (using dotnet from winetricks). Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/ncrypt/main.c | 8 ++++++++ dlls/ncrypt/ncrypt.spec | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index 2c2a0dc6f56..2a804109dec 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -367,3 +367,11 @@ SECURITY_STATUS WINAPI NCryptSetProperty(NCRYPT_HANDLE handle, const WCHAR *name return set_object_property(object, name, input, insize); } + +SECURITY_STATUS NCryptVerifySignature(NCRYPT_KEY_HANDLE handle, void *padding, BYTE *hash, DWORD hash_size, + BYTE *signature, DWORD signature_size, DWORD flags) +{ + FIXME("(%#Ix, %p, %p, %lu, %p, %lu, %#lx): stub\n", handle, padding, hash, hash_size, signature, + signature_size, flags); + return ERROR_SUCCESS; +} diff --git a/dlls/ncrypt/ncrypt.spec b/dlls/ncrypt/ncrypt.spec index 0e92609790c..bb914616373 100644 --- a/dlls/ncrypt/ncrypt.spec +++ b/dlls/ncrypt/ncrypt.spec @@ -101,7 +101,7 @@ @ stub NCryptUnprotectKey @ stub NCryptUnprotectSecret @ stub NCryptVerifyClaim -@ stub NCryptVerifySignature +@ stdcall NCryptVerifySignature(ptr ptr ptr long ptr long long) @ stub SslChangeNotify @ stub SslComputeClientAuthHash @ stub SslComputeEapKeyBlock -- 2.30.2

1 0

[PATCH v2 3/4] ncrypt: NCryptGetProperty should always fill result size.
by Hans Leidekker Feb. 17, 2022

Feb. 17, 2022

From: Santino Mazza <mazzasantino1206(a)gmail.com> Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/ncrypt/main.c | 7 ++----- dlls/ncrypt/tests/ncrypt.c | 2 -- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index 82ce7a0b4dc..2c2a0dc6f56 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -165,11 +165,8 @@ SECURITY_STATUS WINAPI NCryptGetProperty(NCRYPT_HANDLE handle, const WCHAR *name if (flags) FIXME("flags %#lx not supported\n", flags); if (!(property = get_object_property(object, name))) return NTE_INVALID_PARAMETER; - if (!output) - { - *result = property->value_size; - return ERROR_SUCCESS; - } + *result = property->value_size; + if (!output) return ERROR_SUCCESS; if (outsize < property->value_size) return NTE_BUFFER_TOO_SMALL; memcpy(output, property->value, property->value_size); diff --git a/dlls/ncrypt/tests/ncrypt.c b/dlls/ncrypt/tests/ncrypt.c index 070b0c3f13e..891e5b60254 100644 --- a/dlls/ncrypt/tests/ncrypt.c +++ b/dlls/ncrypt/tests/ncrypt.c @@ -186,9 +186,7 @@ static void test_get_property(void) value[0] = 0; ret = NCryptGetProperty(key, NCRYPT_ALGORITHM_GROUP_PROPERTY, (BYTE *)value, sizeof(value), &size, 0); ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); - todo_wine { ok(size == 8, "got %lu\n", size); - } ok(!lstrcmpW(value, L"RSA"), "The string doesn't match with 'RSA'\n"); size = 0; -- 2.30.2

1 0

[PATCH v2 2/4] ncrypt: Set a couple of key properties.
by Hans Leidekker Feb. 17, 2022

Feb. 17, 2022

From: Santino Mazza <mazzasantino1206(a)gmail.com> v2: Initialize test variables and change title to better reflect the patch. Squash patch 5 into this one. Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/ncrypt/main.c | 100 ++++++++++++++++++---------------- dlls/ncrypt/ncrypt_internal.h | 1 + dlls/ncrypt/tests/ncrypt.c | 22 ++++++-- include/ncrypt.h | 34 ++++++++++++ 4 files changed, 104 insertions(+), 53 deletions(-) diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index ca70b2d92c3..82ce7a0b4dc 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -184,6 +184,53 @@ static struct object *allocate_object(enum object_type type) return ret; } +static SECURITY_STATUS set_object_property(struct object *object, const WCHAR *name, BYTE *value, DWORD value_size) +{ + struct object_property *property; + + FIXME("check duplicates\n"); + if (!object->num_properties) + { + if (!(object->properties = malloc(sizeof(*property)))) + { + ERR("Error allocating memory."); + return NTE_NO_MEMORY; + } + property = &object->properties[object->num_properties++]; + } + else + { + struct object_property *tmp; + if (!(tmp = realloc(object->properties, sizeof(*property) * (object->num_properties + 1)))) + { + ERR("Error allocating memory."); + return NTE_NO_MEMORY; + } + object->properties = tmp; + property = &object->properties[object->num_properties++]; + } + + memset(property, 0, sizeof(*property)); + if (!(property->key = malloc((lstrlenW(name) + 1) * sizeof(WCHAR)))) + { + ERR("Error allocating memory."); + return NTE_NO_MEMORY; + } + + lstrcpyW(property->key, name); + property->value_size = value_size; + if (!(property->value = malloc(value_size))) + { + ERR("Error allocating memory."); + free(property->key); + property->key = NULL; + return NTE_NO_MEMORY; + } + + memcpy(property->value, value, value_size); + return ERROR_SUCCESS; +} + SECURITY_STATUS WINAPI NCryptImportKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_HANDLE decrypt_key, const WCHAR *type, NCryptBufferDesc *params, NCRYPT_KEY_HANDLE *handle, BYTE *data, DWORD datasize, DWORD flags) @@ -244,6 +291,7 @@ SECURITY_STATUS WINAPI NCryptImportKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_H key = &object->key; key->alg = RSA; + key->rsa.bit_length = rsaheader->BitLength; key->rsa.public_exp_size = rsaheader->cbPublicExp; key->rsa.modulus_size = rsaheader->cbModulus; if (!(key->rsa.public_exp = malloc(rsaheader->cbPublicExp))) @@ -261,10 +309,13 @@ SECURITY_STATUS WINAPI NCryptImportKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_H } public_exp = &data[sizeof(*rsaheader)]; /* The public exp is after the header. */ - modulus = &public_exp[rsaheader->cbPublicExp]; /* The modulus is after the public exp. */ + modulus = &public_exp[rsaheader->cbPublicExp]; /* The modulus is after the public exponent. */ memcpy(key->rsa.public_exp, public_exp, rsaheader->cbPublicExp); memcpy(key->rsa.modulus, modulus, rsaheader->cbModulus); + set_object_property(object, NCRYPT_ALGORITHM_GROUP_PROPERTY, (BYTE *)L"RSA", sizeof(L"RSA")); + set_object_property(object, NCRYPT_LENGTH_PROPERTY, (BYTE *)&key->rsa.bit_length, sizeof(key->rsa.bit_length)); + set_object_property(object, NCRYPT_PROVIDER_HANDLE_PROPERTY, (BYTE *)&provider, sizeof(provider)); *handle = (NCRYPT_KEY_HANDLE)object; break; } @@ -310,53 +361,6 @@ SECURITY_STATUS WINAPI NCryptOpenStorageProvider(NCRYPT_PROV_HANDLE *provider, c return ERROR_SUCCESS; } -static SECURITY_STATUS set_object_property(struct object *object, const WCHAR *name, BYTE *value, DWORD value_size) -{ - struct object_property *property; - - FIXME("check duplicates\n"); - if (!object->num_properties) - { - if (!(object->properties = malloc(sizeof(*property)))) - { - ERR("Error allocating memory."); - return NTE_NO_MEMORY; - } - property = &object->properties[object->num_properties++]; - } - else - { - struct object_property *tmp; - if (!(tmp = realloc(object->properties, sizeof(*property) * (object->num_properties + 1)))) - { - ERR("Error allocating memory."); - return NTE_NO_MEMORY; - } - object->properties = tmp; - property = &object->properties[object->num_properties++]; - } - - memset(property, 0, sizeof(*property)); - if (!(property->key = malloc((lstrlenW(name) + 1) * sizeof(WCHAR)))) - { - ERR("Error allocating memory."); - return NTE_NO_MEMORY; - } - - lstrcpyW(property->key, name); - property->value_size = value_size; - if (!(property->value = malloc(value_size))) - { - ERR("Error allocating memory."); - free(property->key); - property->key = NULL; - return NTE_NO_MEMORY; - } - - memcpy(property->value, value, value_size); - return ERROR_SUCCESS; -} - SECURITY_STATUS WINAPI NCryptSetProperty(NCRYPT_HANDLE handle, const WCHAR *name, BYTE *input, DWORD insize, DWORD flags) { struct object *object = (struct object *)handle; diff --git a/dlls/ncrypt/ncrypt_internal.h b/dlls/ncrypt/ncrypt_internal.h index fe5f27ea1eb..3966dd73ed6 100644 --- a/dlls/ncrypt/ncrypt_internal.h +++ b/dlls/ncrypt/ncrypt_internal.h @@ -26,6 +26,7 @@ enum key_algorithm struct rsa_key { + DWORD bit_length; DWORD public_exp_size; BYTE *public_exp; DWORD modulus_size; diff --git a/dlls/ncrypt/tests/ncrypt.c b/dlls/ncrypt/tests/ncrypt.c index 23205d989f0..070b0c3f13e 100644 --- a/dlls/ncrypt/tests/ncrypt.c +++ b/dlls/ncrypt/tests/ncrypt.c @@ -169,7 +169,7 @@ static void test_get_property(void) NCRYPT_KEY_HANDLE key; SECURITY_STATUS ret; WCHAR value[4]; - DWORD size; + DWORD keylength, size; ret = NCryptOpenStorageProvider(&prov, NULL, 0); ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); @@ -177,17 +177,29 @@ static void test_get_property(void) ret = NCryptImportKey(prov, 0, BCRYPT_RSAPUBLIC_BLOB, NULL, &key, rsa_key_blob, sizeof(rsa_key_blob), 0); ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); - todo_wine { - ret = NCryptGetProperty(key, L"Algorithm Group", NULL, 0, &size, 0); + size = 0; + ret = NCryptGetProperty(key, NCRYPT_ALGORITHM_GROUP_PROPERTY, NULL, 0, &size, 0); ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); ok(size == 8, "got %lu\n", size); size = 0; - ret = NCryptGetProperty(key, L"Algorithm Group", (BYTE *)value, sizeof(value), &size, 0); + value[0] = 0; + ret = NCryptGetProperty(key, NCRYPT_ALGORITHM_GROUP_PROPERTY, (BYTE *)value, sizeof(value), &size, 0); ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); + todo_wine { ok(size == 8, "got %lu\n", size); - ok(!lstrcmpW(value, L"RSA"), "The string doesn't match with 'RSA'\n"); } + ok(!lstrcmpW(value, L"RSA"), "The string doesn't match with 'RSA'\n"); + + size = 0; + ret = NCryptGetProperty(key, NCRYPT_LENGTH_PROPERTY, NULL, 0, &size, 0); + ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); + ok(size == sizeof(DWORD), "got %lu\n", size); + + keylength = 0; + ret = NCryptGetProperty(key, NCRYPT_LENGTH_PROPERTY, (BYTE *)&keylength, size, &size, 0); + ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); + ok(keylength == 1024, "got %lu\n", keylength); NCryptFreeObject(prov); } diff --git a/include/ncrypt.h b/include/ncrypt.h index 5a8ba7e88fc..f7372b30621 100644 --- a/include/ncrypt.h +++ b/include/ncrypt.h @@ -71,6 +71,40 @@ typedef ULONG_PTR NCRYPT_SECRET_HANDLE; #define NCRYPT_SILENT_FLAG 0x00000040 +#define NCRYPT_NAME_PROPERTY L"Name" +#define NCRYPT_UNIQUE_NAME_PROPERTY L"Unique Name" +#define NCRYPT_ALGORITHM_PROPERTY L"Algorithm Name" +#define NCRYPT_LENGTH_PROPERTY L"Length" +#define NCRYPT_LENGTHS_PROPERTY L"Lengths" +#define NCRYPT_BLOCK_LENGTH_PROPERTY L"Block Length" +#define NCRYPT_UI_POLICY_PROPERTY L"UI Policy" +#define NCRYPT_EXPORT_POLICY_PROPERTY L"Export Policy" +#define NCRYPT_WINDOW_HANDLE_PROPERTY L"HWND Handle" +#define NCRYPT_USE_CONTEXT_PROPERTY L"Use Context" +#define NCRYPT_IMPL_TYPE_PROPERTY L"Impl Type" +#define NCRYPT_KEY_USAGE_PROPERTY L"Key Usage" +#define NCRYPT_KEY_TYPE_PROPERTY L"Key Type" +#define NCRYPT_VERSION_PROPERTY L"Version" +#define NCRYPT_SECURITY_DESCR_SUPPORT_PROPERTY L"Security Descr Support" +#define NCRYPT_SECURITY_DESCR_PROPERTY L"Security Descr" +#define NCRYPT_USE_COUNT_ENABLED_PROPERTY L"Enabled Use Count" +#define NCRYPT_USE_COUNT_PROPERTY L"Use Count" +#define NCRYPT_LAST_MODIFIED_PROPERTY L"Modified" +#define NCRYPT_MAX_NAME_LENGTH_PROPERTY L"Max Name Length" +#define NCRYPT_ALGORITHM_GROUP_PROPERTY L"Algorithm Group" +#define NCRYPT_PROVIDER_HANDLE_PROPERTY L"Provider Handle" +#define NCRYPT_PIN_PROPERTY L"SmartCardPin" +#define NCRYPT_READER_PROPERTY L"SmartCardReader" +#define NCRYPT_SMARTCARD_GUID_PROPERTY L"SmartCardGuid" +#define NCRYPT_CERTIFICATE_PROPERTY L"SmartCardKeyCertificate" +#define NCRYPT_PIN_PROMPT_PROPERTY L"SmartCardPinPrompt" +#define NCRYPT_USER_CERTSTORE_PROPERTY L"SmartCardUserCertStore" +#define NCRYPT_ROOT_CERTSTORE_PROPERTY L"SmartcardRootCertStore" +#define NCRYPT_SECURE_PIN_PROPERTY L"SmartCardSecurePin" +#define NCRYPT_ASSOCIATED_ECDH_KEY L"SmartCardAssociatedECDHKey" +#define NCRYPT_SCARD_PIN_ID L"SmartCardPinId" +#define NCRYPT_SCARD_PIN_INFO L"SmartCardPinInfo" + SECURITY_STATUS WINAPI NCryptCreatePersistedKey(NCRYPT_PROV_HANDLE, NCRYPT_KEY_HANDLE *, const WCHAR *, const WCHAR *, DWORD, DWORD); SECURITY_STATUS WINAPI NCryptDecrypt(NCRYPT_KEY_HANDLE, BYTE *, DWORD, void *, BYTE *, DWORD, DWORD *, DWORD); SECURITY_STATUS WINAPI NCryptEncrypt(NCRYPT_KEY_HANDLE, BYTE *, DWORD, void *, BYTE *, DWORD, DWORD *, DWORD); -- 2.30.2

1 0

[PATCH v2 1/4] ncrypt: Fix resizing property array.
by Hans Leidekker Feb. 17, 2022

Feb. 17, 2022

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/ncrypt/main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index 6b1a87ea785..ca70b2d92c3 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -312,7 +312,7 @@ SECURITY_STATUS WINAPI NCryptOpenStorageProvider(NCRYPT_PROV_HANDLE *provider, c static SECURITY_STATUS set_object_property(struct object *object, const WCHAR *name, BYTE *value, DWORD value_size) { - struct object_property *property = &object->properties[object->num_properties]; + struct object_property *property; FIXME("check duplicates\n"); if (!object->num_properties) @@ -322,18 +322,18 @@ static SECURITY_STATUS set_object_property(struct object *object, const WCHAR *n ERR("Error allocating memory."); return NTE_NO_MEMORY; } - object->num_properties++; + property = &object->properties[object->num_properties++]; } else { struct object_property *tmp; - if (!(tmp = realloc(object->properties, sizeof(*property) * object->num_properties + 1))) + if (!(tmp = realloc(object->properties, sizeof(*property) * (object->num_properties + 1)))) { ERR("Error allocating memory."); return NTE_NO_MEMORY; } object->properties = tmp; - object->num_properties++; + property = &object->properties[object->num_properties++]; } memset(property, 0, sizeof(*property)); -- 2.30.2

1 0