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

[PATCH] mfplat: Fix playback rate handling in system time source.
by Nikolay Sivov Feb. 17, 2022

Feb. 17, 2022

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/main.c | 49 ++++++++++++++++---------------------- dlls/mfplat/tests/mfplat.c | 25 +++++++++++++++++++ 2 files changed, 46 insertions(+), 28 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 1992776595d..7991152f7a7 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -124,17 +124,20 @@ struct system_time_source MFCLOCK_STATE state; IMFClock *clock; LONGLONG start_offset; + LONGLONG system_time; + LONGLONG clock_time; float rate; int i_rate; CRITICAL_SECTION cs; }; -static void system_time_source_apply_rate(const struct system_time_source *source, LONGLONG *value) +static void system_time_source_update_clock_time(struct system_time_source *source, LONGLONG system_time) { - if (source->i_rate) - *value *= source->i_rate; - else - *value *= source->rate; + LONGLONG diff = system_time - source->system_time; + if (source->i_rate) diff *= source->i_rate; + else if (source->rate != 1.0f) diff *= source->rate; + source->clock_time += diff; + source->system_time = system_time; } static struct system_time_source *impl_from_IMFPresentationTimeSource(IMFPresentationTimeSource *iface) @@ -8076,12 +8079,8 @@ static HRESULT WINAPI system_time_source_GetCorrelatedTime(IMFPresentationTimeSo if (SUCCEEDED(hr = IMFClock_GetCorrelatedTime(source->clock, 0, clock_time, system_time))) { if (source->state == MFCLOCK_STATE_RUNNING) - { - system_time_source_apply_rate(source, clock_time); - *clock_time += source->start_offset; - } - else - *clock_time = source->start_offset; + system_time_source_update_clock_time(source, *system_time); + *clock_time = source->start_offset + source->clock_time; } LeaveCriticalSection(&source->cs); @@ -8220,25 +8219,19 @@ static HRESULT WINAPI system_time_source_sink_OnClockStart(IMFClockStateSink *if state = source->state; if (SUCCEEDED(hr = system_time_source_change_state(source, CLOCK_CMD_START))) { - system_time_source_apply_rate(source, &system_time); if (start_offset == PRESENTATION_CURRENT_POSITION) { - switch (state) + if (state != MFCLOCK_STATE_RUNNING) { - case MFCLOCK_STATE_RUNNING: - break; - case MFCLOCK_STATE_PAUSED: - source->start_offset -= system_time; - break; - default: - source->start_offset = -system_time; - break; - ; + source->start_offset -= system_time; + source->system_time = 0; } } else { - source->start_offset = -system_time + start_offset; + source->start_offset = start_offset; + source->system_time = system_time; + source->clock_time = 0; } } LeaveCriticalSection(&source->cs); @@ -8255,7 +8248,9 @@ static HRESULT WINAPI system_time_source_sink_OnClockStop(IMFClockStateSink *ifa EnterCriticalSection(&source->cs); if (SUCCEEDED(hr = system_time_source_change_state(source, CLOCK_CMD_STOP))) - source->start_offset = 0; + { + source->start_offset = source->system_time = source->clock_time = 0; + } LeaveCriticalSection(&source->cs); return hr; @@ -8271,8 +8266,7 @@ static HRESULT WINAPI system_time_source_sink_OnClockPause(IMFClockStateSink *if EnterCriticalSection(&source->cs); if (SUCCEEDED(hr = system_time_source_change_state(source, CLOCK_CMD_PAUSE))) { - system_time_source_apply_rate(source, &system_time); - source->start_offset += system_time; + system_time_source_update_clock_time(source, system_time); } LeaveCriticalSection(&source->cs); @@ -8289,8 +8283,7 @@ static HRESULT WINAPI system_time_source_sink_OnClockRestart(IMFClockStateSink * EnterCriticalSection(&source->cs); if (SUCCEEDED(hr = system_time_source_change_state(source, CLOCK_CMD_RESTART))) { - system_time_source_apply_rate(source, &system_time); - source->start_offset -= system_time; + source->system_time = system_time; } LeaveCriticalSection(&source->cs); diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index c013b7b5c23..91c9d971a3b 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -3641,6 +3641,31 @@ static void test_system_time_source(void) hr = IMFClockStateSink_OnClockStart(statesink, 0, 0); ok(hr == S_OK, "Failed to start source, hr %#x.\n", hr); + hr = IMFClockStateSink_OnClockSetRate(statesink, 5, 2.0f); + ok(hr == S_OK, "Failed to set rate, hr %#x.\n", hr); + + hr = IMFClockStateSink_OnClockPause(statesink, 6); + ok(hr == S_OK, "Failed to pause source, hr %#x.\n", hr); + + hr = IMFPresentationTimeSource_GetCorrelatedTime(time_source, 0, &time, &systime); + ok(hr == S_OK, "Failed to get time %#x.\n", hr); + ok(time == 12 && !!systime, "Unexpected time stamp %s, %s.\n", wine_dbgstr_longlong(time), + wine_dbgstr_longlong(systime)); + + hr = IMFClockStateSink_OnClockRestart(statesink, 7); + ok(hr == S_OK, "Failed to restart source, hr %#x.\n", hr); + + hr = IMFClockStateSink_OnClockPause(statesink, 8); + ok(hr == S_OK, "Failed to pause source, hr %#x.\n", hr); + + hr = IMFPresentationTimeSource_GetCorrelatedTime(time_source, 0, &time, &systime); + ok(hr == S_OK, "Failed to get time %#x.\n", hr); + ok(time == 14 && !!systime, "Unexpected time stamp %s, %s.\n", wine_dbgstr_longlong(time), + wine_dbgstr_longlong(systime)); + + hr = IMFClockStateSink_OnClockStart(statesink, 0, 0); + ok(hr == S_OK, "Failed to start source, hr %#x.\n", hr); + hr = IMFPresentationTimeSource_GetCorrelatedTime(time_source, 0, &time, &systime); ok(hr == S_OK, "Failed to get time %#x.\n", hr); ok(time == 2 * systime, "Unexpected time stamp %s, %s.\n", wine_dbgstr_longlong(time), -- 2.34.1

2 1

[PATCH vkd3d 6/6] vkd3d-shader/hlsl: Reroute initialization towards a generic variable initializer.
by Francisco Casas Feb. 17, 2022

Feb. 17, 2022

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 103 ++++++++++++++++----------------------- 1 file changed, 42 insertions(+), 61 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 9cb14f52..547eb00b 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1476,14 +1476,6 @@ static void struct_var_initializer(struct hlsl_ctx *ctx, struct hlsl_ir_var *var struct hlsl_struct_field *field; unsigned int i = 0; - if (initializer_size(initializer) != hlsl_type_component_count(type)) - { - hlsl_error(ctx, &var->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, - "Expected %u components in initializer, but got %u.", - hlsl_type_component_count(type), initializer_size(initializer)); - return; - } - LIST_FOR_EACH_ENTRY(field, type->e.elements, struct hlsl_struct_field, entry) { struct hlsl_ir_node *node = initializer->args[i]; @@ -1510,6 +1502,28 @@ static void struct_var_initializer(struct hlsl_ctx *ctx, struct hlsl_ir_var *var } } +static void initialize_generic_var(struct hlsl_ctx *ctx, struct hlsl_ir_var *var, + struct parse_initializer *initializer, unsigned int reg_offset, struct hlsl_type *type, + unsigned int *initializer_offset) +{ + if (type->type <= HLSL_CLASS_LAST_NUMERIC) + { + initialize_numeric_var(ctx, var, initializer, reg_offset, type, initializer_offset); + } + else if (type->type == HLSL_CLASS_STRUCT) + { + struct_var_initializer(ctx, var, initializer); + } + else if (type->type == HLSL_CLASS_ARRAY) + { + hlsl_fixme(ctx, &var->loc, "Initializers for arrays not supported yet."); + } + else if (type->type == HLSL_CLASS_OBJECT) + { + hlsl_fixme(ctx, &var->loc, "Initializers for objects not supported yet."); + } +} + static void free_parse_variable_def(struct parse_variable_def *v) { free_parse_initializer(&v->initializer); @@ -1633,69 +1647,36 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t if (v->initializer.args_count) { - unsigned int size = initializer_size(&v->initializer); - - if (type->type <= HLSL_CLASS_LAST_NUMERIC && v->initializer.args_count != 1 - && type->dimx * type->dimy != size) - { - hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, - "Expected %u components in numeric initializer, but got %u.", - type->dimx * type->dimy, v->initializer.args_count); - free_parse_initializer(&v->initializer); - vkd3d_free(v); - continue; - } - if ((type->type == HLSL_CLASS_STRUCT || type->type == HLSL_CLASS_ARRAY) - && hlsl_type_component_count(type) != size) - { - hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, - "Expected %u components in initializer, but got %u.", hlsl_type_component_count(type), size); - free_parse_initializer(&v->initializer); - vkd3d_free(v); - continue; - } - - if (type->type == HLSL_CLASS_STRUCT) - { - struct_var_initializer(ctx, var, &v->initializer); - list_move_tail(statements_list, v->initializer.instrs); - - free_parse_initializer(&v->initializer); - vkd3d_free(v); - continue; - } - if (type->type > HLSL_CLASS_LAST_NUMERIC) - { - FIXME("Initializers for non scalar/struct variables not supported yet.\n"); - free_parse_initializer(&v->initializer); - if (v->arrays.count) - vkd3d_free(v->arrays.sizes); - vkd3d_free(v); - continue; - } - if (v->arrays.count) - { - hlsl_fixme(ctx, &v->loc, "Array initializer."); - free_parse_initializer(&v->initializer); - vkd3d_free(v->arrays.sizes); - vkd3d_free(v); - continue; - } - if (v->initializer.args_count > 1) { + unsigned int size = initializer_size(&v->initializer); unsigned int initializer_offset = 0; - flatten_parse_initializer(ctx, &v->initializer); - if (v->initializer.args_count != size) + if (hlsl_type_component_count(type) != size) { - hlsl_fixme(ctx, &v->loc, "Could not flatten initializer."); + hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, + "Expected %u components in initializer, but got %u.", hlsl_type_component_count(type), size); free_parse_initializer(&v->initializer); + if (v->arrays.count) + vkd3d_free(v->arrays.sizes); vkd3d_free(v); continue; } - initialize_numeric_var(ctx, var, &v->initializer, 0, type, &initializer_offset); + if (type->type <= HLSL_CLASS_LAST_NUMERIC) + { + flatten_parse_initializer(ctx, &v->initializer); + if (v->initializer.args_count != size) + { + hlsl_fixme(ctx, &v->loc, "Could not flatten initializer."); + free_parse_initializer(&v->initializer); + if (v->arrays.count) + vkd3d_free(v->arrays.sizes); + vkd3d_free(v); + continue; + } + } + initialize_generic_var(ctx, var, &v->initializer, 0, type, &initializer_offset); } else { -- 2.25.1

2 1

[PATCH vkd3d 5/6] vkd3d-shader/hlsl: Remove instruction list parameter in struct_var_initializer().
by Francisco Casas Feb. 17, 2022

Feb. 17, 2022

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index a24192a3..9cb14f52 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1469,7 +1469,7 @@ static void initialize_numeric_var(struct hlsl_ctx *ctx, struct hlsl_ir_var *var } } -static void struct_var_initializer(struct hlsl_ctx *ctx, struct list *list, struct hlsl_ir_var *var, +static void struct_var_initializer(struct hlsl_ctx *ctx, struct hlsl_ir_var *var, struct parse_initializer *initializer) { struct hlsl_type *type = var->data_type; @@ -1481,13 +1481,9 @@ static void struct_var_initializer(struct hlsl_ctx *ctx, struct list *list, stru hlsl_error(ctx, &var->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, "Expected %u components in initializer, but got %u.", hlsl_type_component_count(type), initializer_size(initializer)); - free_parse_initializer(initializer); return; } - list_move_tail(list, initializer->instrs); - vkd3d_free(initializer->instrs); - LIST_FOR_EACH_ENTRY(field, type->e.elements, struct hlsl_struct_field, entry) { struct hlsl_ir_node *node = initializer->args[i]; @@ -1501,19 +1497,17 @@ static void struct_var_initializer(struct hlsl_ctx *ctx, struct list *list, stru { if (!(c = hlsl_new_uint_constant(ctx, field->reg_offset, node->loc))) break; - list_add_tail(list, &c->node.entry); + list_add_tail(initializer->instrs, &c->node.entry); if (!(store = hlsl_new_store(ctx, var, &c->node, node, 0, node->loc))) break; - list_add_tail(list, &store->node.entry); + list_add_tail(initializer->instrs, &store->node.entry); } else { hlsl_fixme(ctx, &node->loc, "Implicit cast in structure initializer."); } } - - vkd3d_free(initializer->args); } static void free_parse_variable_def(struct parse_variable_def *v) @@ -1663,7 +1657,10 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t if (type->type == HLSL_CLASS_STRUCT) { - struct_var_initializer(ctx, statements_list, var, &v->initializer); + struct_var_initializer(ctx, var, &v->initializer); + list_move_tail(statements_list, v->initializer.instrs); + + free_parse_initializer(&v->initializer); vkd3d_free(v); continue; } -- 2.25.1

2 1

[PATCH vkd3d 4/6] vkd3d-shader/hlsl: Flatten initializers.
by Francisco Casas Feb. 17, 2022

Feb. 17, 2022

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 106 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 105 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index bcc9e4d7..a24192a3 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1321,6 +1321,109 @@ static bool add_increment(struct hlsl_ctx *ctx, struct list *instrs, bool decrem return true; } +static void append_node_components(struct hlsl_ctx *ctx, struct list *instrs, + struct hlsl_ir_node *node, struct hlsl_ir_node **comps, unsigned int *comps_count, + const struct vkd3d_shader_location *loc) +{ + struct hlsl_type *type = node->data_type; + + switch (type->type) + { + case HLSL_CLASS_SCALAR: + { + comps[*comps_count] = node; + *comps_count += 1; + break; + } + case HLSL_CLASS_VECTOR: + { + struct hlsl_type *cast_type = hlsl_get_scalar_type(ctx, type->base_type); + struct hlsl_ir_swizzle *swizzle; + struct hlsl_ir_node *cast; + unsigned int i; + + for (i = 0; i < type->dimx; i++) + { + if (!(swizzle = hlsl_new_swizzle(ctx, hlsl_swizzle_from_writemask(1 << i), 1, node, loc))) + return; + list_add_tail(instrs, &swizzle->node.entry); + + if (!(cast = add_implicit_conversion(ctx, instrs, &swizzle->node, cast_type, loc))) + return; + + comps[*comps_count] = cast; + *comps_count += 1; + } + break; + } + case HLSL_CLASS_MATRIX: + { + hlsl_fixme(ctx, loc, "Flattening of matrices."); + break; + } + case HLSL_CLASS_STRUCT: + { + struct hlsl_struct_field *field; + struct hlsl_ir_load *load; + + LIST_FOR_EACH_ENTRY(field, type->e.elements, struct hlsl_struct_field, entry) + { + if (!(load = add_record_load(ctx, instrs, node, field, *loc))) + return; + + append_node_components(ctx, instrs, &load->node, comps, comps_count, loc); + } + break; + } + case HLSL_CLASS_ARRAY: + { + struct hlsl_ir_constant *c; + struct hlsl_ir_load *load; + unsigned int i; + + for (i = 0; i < type->e.array.elements_count; i++) + { + if (!(c = hlsl_new_uint_constant(ctx, i, *loc))) + return; + list_add_tail(instrs, &c->node.entry); + + if (!(load = add_array_load(ctx, instrs, node, &c->node, *loc))) + return; + + append_node_components(ctx, instrs, &load->node, comps, comps_count, loc); + } + break; + } + case HLSL_CLASS_OBJECT: + { + hlsl_fixme(ctx, loc, "Flattening of objects."); + break; + } + } +} + +static void flatten_parse_initializer(struct hlsl_ctx *ctx, struct parse_initializer *initializer) +{ + unsigned int size = initializer_size(initializer); + unsigned int new_args_count = 0; + struct hlsl_ir_node **new_args; + unsigned int i = 0; + + new_args = hlsl_alloc(ctx, size * sizeof(struct hlsl_ir_node *)); + if (!new_args) + return; + + for (i = 0; i < initializer->args_count; i++) + { + append_node_components(ctx, initializer->instrs, initializer->args[i], new_args, + &new_args_count, &initializer->args[i]->loc); + } + + vkd3d_free(initializer->args); + initializer->args = new_args; + initializer->args_count = new_args_count; +} + static void initialize_numeric_var(struct hlsl_ctx *ctx, struct hlsl_ir_var *var, struct parse_initializer *initializer, unsigned int reg_offset, struct hlsl_type *type, unsigned int *initializer_offset) @@ -1586,9 +1689,10 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t { unsigned int initializer_offset = 0; + flatten_parse_initializer(ctx, &v->initializer); if (v->initializer.args_count != size) { - hlsl_fixme(ctx, &v->loc, "Flatten initializer."); + hlsl_fixme(ctx, &v->loc, "Could not flatten initializer."); free_parse_initializer(&v->initializer); vkd3d_free(v); continue; -- 2.25.1

2 1

[PATCH 01/28] programs/cmd: enable compilation with long types
by Eric Pouech Feb. 17, 2022

Feb. 17, 2022

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- programs/cmd/Makefile.in | 1 - programs/cmd/builtins.c | 20 ++++++++++---------- programs/cmd/directory.c | 4 ++-- programs/cmd/wcmdmain.c | 14 +++++++------- 4 files changed, 19 insertions(+), 20 deletions(-) diff --git a/programs/cmd/Makefile.in b/programs/cmd/Makefile.in index 8c8489af727..b3b33aa1413 100644 --- a/programs/cmd/Makefile.in +++ b/programs/cmd/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = cmd.exe IMPORTS = shell32 user32 advapi32 diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 2fc7e07f7aa..963a9eaf361 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -344,7 +344,7 @@ void WCMD_choice (const WCHAR * args) { } if (opt_timeout) - WINE_FIXME("timeout not supported: %c,%d\n", opt_default, opt_timeout); + WINE_FIXME("timeout not supported: %c,%ld\n", opt_default, opt_timeout); if (have_console) SetConsoleMode(GetStdHandle(STD_INPUT_HANDLE), 0); @@ -396,7 +396,7 @@ void WCMD_choice (const WCHAR * args) { SetConsoleMode(GetStdHandle(STD_INPUT_HANDLE), oldmode); errorlevel = (ptr - opt_c) + 1; - WINE_TRACE("answer: %d\n", errorlevel); + WINE_TRACE("answer: %ld\n", errorlevel); heap_free(my_command); return; } @@ -427,12 +427,12 @@ static BOOL WCMD_AppendEOF(WCHAR *filename) OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if (h == INVALID_HANDLE_VALUE) { - WINE_ERR("Failed to open %s (%d)\n", wine_dbgstr_w(filename), GetLastError()); + WINE_ERR("Failed to open %s (%ld)\n", wine_dbgstr_w(filename), GetLastError()); return FALSE; } else { SetFilePointer (h, 0, NULL, FILE_END); if (!WriteFile(h, &eof, 1, &bytes_written, NULL)) { - WINE_ERR("Failed to append EOF to %s (%d)\n", wine_dbgstr_w(filename), GetLastError()); + WINE_ERR("Failed to append EOF to %s (%ld)\n", wine_dbgstr_w(filename), GetLastError()); CloseHandle(h); return FALSE; } @@ -491,7 +491,7 @@ static BOOL WCMD_ManualCopy(WCHAR *srcname, WCHAR *dstname, BOOL ascii, BOOL app in = CreateFileW(srcname, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if (in == INVALID_HANDLE_VALUE) { - WINE_ERR("Failed to open %s (%d)\n", wine_dbgstr_w(srcname), GetLastError()); + WINE_ERR("Failed to open %s (%ld)\n", wine_dbgstr_w(srcname), GetLastError()); return FALSE; } @@ -499,7 +499,7 @@ static BOOL WCMD_ManualCopy(WCHAR *srcname, WCHAR *dstname, BOOL ascii, BOOL app out = CreateFileW(dstname, GENERIC_WRITE, 0, NULL, append?OPEN_EXISTING:CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); if (out == INVALID_HANDLE_VALUE) { - WINE_ERR("Failed to open %s (%d)\n", wine_dbgstr_w(dstname), GetLastError()); + WINE_ERR("Failed to open %s (%ld)\n", wine_dbgstr_w(dstname), GetLastError()); CloseHandle(in); return FALSE; } @@ -526,12 +526,12 @@ static BOOL WCMD_ManualCopy(WCHAR *srcname, WCHAR *dstname, BOOL ascii, BOOL app if (bytesread) { ok = WriteFile(out, buffer, bytesread, &byteswritten, NULL); if (!ok || byteswritten != bytesread) { - WINE_ERR("Unexpected failure writing to %s, rc=%d\n", + WINE_ERR("Unexpected failure writing to %s, rc=%ld\n", wine_dbgstr_w(dstname), GetLastError()); } } } else { - WINE_ERR("Unexpected failure reading from %s, rc=%d\n", + WINE_ERR("Unexpected failure reading from %s, rc=%ld\n", wine_dbgstr_w(srcname), GetLastError()); } } while (ok && bytesread > 0); @@ -2442,7 +2442,7 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { if (useNumbers) { WCHAR thisNum[20]; - WINE_TRACE("FOR /L provided range from %d to %d step %d\n", + WINE_TRACE("FOR /L provided range from %ld to %ld step %ld\n", numbers[0], numbers[2], numbers[1]); for (i=numbers[0]; (numbers[1]<0)? i>=numbers[2] : i<=numbers[2]; @@ -4775,7 +4775,7 @@ void WCMD_assoc (const WCHAR *args, BOOL assoc) { /* Open a key to HKEY_CLASSES_ROOT for enumerating */ if (RegOpenKeyExW(HKEY_CLASSES_ROOT, L"", 0, accessOptions, &key) != ERROR_SUCCESS) { - WINE_FIXME("Unexpected failure opening HKCR key: %d\n", GetLastError()); + WINE_FIXME("Unexpected failure opening HKCR key: %ld\n", GetLastError()); return; } diff --git a/programs/cmd/directory.c b/programs/cmd/directory.c index 807f7b386b1..8417687939a 100644 --- a/programs/cmd/directory.c +++ b/programs/cmd/directory.c @@ -536,7 +536,7 @@ static void WCMD_dir_trailer(WCHAR drive) { driveName[0] = drive; status = GetDiskFreeSpaceExW(driveName, &avail, &total, &freebytes); - WINE_TRACE("Writing trailer for '%s' gave %d(%d)\n", wine_dbgstr_w(driveName), + WINE_TRACE("Writing trailer for '%s' gave %ld(%ld)\n", wine_dbgstr_w(driveName), status, GetLastError()); if (errorlevel==0 && !bare) { @@ -727,7 +727,7 @@ void WCMD_directory (WCHAR *args) p++; } p = p - 1; /* So when step on, move to '/' */ - WINE_TRACE("Result: showattrs %x, bits %x\n", showattrs, attrsbits); + WINE_TRACE("Result: showattrs %lx, bits %lx\n", showattrs, attrsbits); break; default: SetLastError(ERROR_INVALID_PARAMETER); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 65601348b05..af54b209d83 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -132,7 +132,7 @@ void WINAPIV WCMD_output (const WCHAR *format, ...) { format, 0, 0, (LPWSTR)&string, 0, &ap); va_end(ap); if (len == 0 && GetLastError() != ERROR_NO_WORK_DONE) - WINE_FIXME("Could not format string: le=%u, fmt=%s\n", GetLastError(), wine_dbgstr_w(format)); + WINE_FIXME("Could not format string: le=%lu, fmt=%s\n", GetLastError(), wine_dbgstr_w(format)); else { WCMD_output_asis_len(string, len, GetStdHandle(STD_OUTPUT_HANDLE)); @@ -157,7 +157,7 @@ void WINAPIV WCMD_output_stderr (const WCHAR *format, ...) { format, 0, 0, (LPWSTR)&string, 0, &ap); va_end(ap); if (len == 0 && GetLastError() != ERROR_NO_WORK_DONE) - WINE_FIXME("Could not format string: le=%u, fmt=%s\n", GetLastError(), wine_dbgstr_w(format)); + WINE_FIXME("Could not format string: le=%lu, fmt=%s\n", GetLastError(), wine_dbgstr_w(format)); else { WCMD_output_asis_len(string, len, GetStdHandle(STD_ERROR_HANDLE)); @@ -181,7 +181,7 @@ WCHAR* WINAPIV WCMD_format_string (const WCHAR *format, ...) format, 0, 0, (LPWSTR)&string, 0, &ap); va_end(ap); if (len == 0 && GetLastError() != ERROR_NO_WORK_DONE) { - WINE_FIXME("Could not format string: le=%u, fmt=%s\n", GetLastError(), wine_dbgstr_w(format)); + WINE_FIXME("Could not format string: le=%lu, fmt=%s\n", GetLastError(), wine_dbgstr_w(format)); string = (WCHAR*)LocalAlloc(LMEM_FIXED, 2); *string = 0; } @@ -303,7 +303,7 @@ void WCMD_print_error (void) { status = FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, NULL, error_code, 0, (LPWSTR) &lpMsgBuf, 0, NULL); if (!status) { - WINE_FIXME ("Cannot display message for error %d, status %d\n", + WINE_FIXME ("Cannot display message for error %ld, status %ld\n", error_code, GetLastError()); return; } @@ -1462,7 +1462,7 @@ void WCMD_execute (const WCHAR *command, const WCHAR *redirects, GetCurrentProcess(), &h, 0, TRUE, DUPLICATE_SAME_ACCESS) == 0) { - WINE_FIXME("Duplicating handle failed with gle %d\n", GetLastError()); + WINE_FIXME("Duplicating handle failed with gle %ld\n", GetLastError()); } WINE_TRACE("Redirect %d (%p) to %d (%p)\n", handle, GetStdHandle(idx_stdhandles[idx]), idx, h); @@ -1664,7 +1664,7 @@ WCHAR *WCMD_LoadMessage(UINT id) { static WCHAR msg[2048]; if (!LoadStringW(GetModuleHandleW(NULL), id, msg, ARRAY_SIZE(msg))) { - WINE_FIXME("LoadString failed with %d\n", GetLastError()); + WINE_FIXME("LoadString failed with %ld\n", GetLastError()); lstrcpyW(msg, L"Failed!"); } return msg; @@ -2442,7 +2442,7 @@ int __cdecl wmain (int argc, WCHAR *argvW[]) /* Pre initialize some messages */ lstrcpyW(anykey, WCMD_LoadMessage(WCMD_ANYKEY)); - sprintf(osver, "%d.%d.%d", osv.dwMajorVersion, osv.dwMinorVersion, osv.dwBuildNumber); + sprintf(osver, "%ld.%ld.%ld", osv.dwMajorVersion, osv.dwMinorVersion, osv.dwBuildNumber); cmd = WCMD_format_string(WCMD_LoadMessage(WCMD_VERSION), osver); lstrcpyW(version_string, cmd); LocalFree(cmd);

2 29

[PATCH] mf/tests: Add some tests for rate support in SAR.
by Nikolay Sivov Feb. 17, 2022

Feb. 17, 2022

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/tests/mf.c | 110 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 110 insertions(+) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index b3f50665e79..63df50cf3b8 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -3842,6 +3842,108 @@ static void test_quality_manager(void) ok(hr == S_OK, "Shutdown failure, hr %#x.\n", hr); } +static void check_sar_rate_support(IMFMediaSink *sink) +{ + IMFRateSupport *rate_support; + IMFMediaTypeHandler *handler; + IMFStreamSink *stream_sink; + IMFMediaType *media_type; + HRESULT hr; + float rate; + + hr = IMFMediaSink_QueryInterface(sink, &IID_IMFRateSupport, (void **)&rate_support); + todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + if (FAILED(hr)) return; + + hr = IMFMediaSink_GetStreamSinkByIndex(sink, 0, &stream_sink); + if (hr == MF_E_SHUTDOWN) + { + hr = IMFRateSupport_GetSlowestRate(rate_support, MFRATE_FORWARD, FALSE, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFRateSupport_GetSlowestRate(rate_support, MFRATE_FORWARD, FALSE, &rate); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + hr = IMFRateSupport_GetFastestRate(rate_support, MFRATE_FORWARD, FALSE, &rate); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + IMFRateSupport_Release(rate_support); + return; + } + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFStreamSink_GetMediaTypeHandler(stream_sink, &handler); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + IMFStreamSink_Release(stream_sink); + + hr = IMFRateSupport_GetSlowestRate(rate_support, MFRATE_FORWARD, FALSE, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFRateSupport_GetFastestRate(rate_support, MFRATE_FORWARD, FALSE, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_GetCurrentMediaType(handler, &media_type); + if (SUCCEEDED(hr)) + { + hr = IMFRateSupport_GetSlowestRate(rate_support, MFRATE_FORWARD, FALSE, &rate); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFRateSupport_GetSlowestRate(rate_support, MFRATE_FORWARD, TRUE, &rate); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFRateSupport_GetSlowestRate(rate_support, MFRATE_REVERSE, FALSE, &rate); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFRateSupport_GetSlowestRate(rate_support, MFRATE_REVERSE, TRUE, &rate); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFRateSupport_GetFastestRate(rate_support, MFRATE_FORWARD, FALSE, &rate); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFRateSupport_GetFastestRate(rate_support, MFRATE_FORWARD, TRUE, &rate); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFRateSupport_GetFastestRate(rate_support, MFRATE_REVERSE, FALSE, &rate); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFRateSupport_GetFastestRate(rate_support, MFRATE_REVERSE, TRUE, &rate); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + IMFMediaType_Release(media_type); + } + else + { + hr = IMFRateSupport_GetSlowestRate(rate_support, MFRATE_FORWARD, FALSE, &rate); + ok(hr == MF_E_NOT_INITIALIZED, "Unexpected hr %#x.\n", hr); + + hr = IMFRateSupport_GetSlowestRate(rate_support, MFRATE_FORWARD, TRUE, &rate); + ok(hr == MF_E_NOT_INITIALIZED, "Unexpected hr %#x.\n", hr); + + hr = IMFRateSupport_GetSlowestRate(rate_support, MFRATE_REVERSE, FALSE, &rate); + ok(hr == MF_E_NOT_INITIALIZED, "Unexpected hr %#x.\n", hr); + + hr = IMFRateSupport_GetSlowestRate(rate_support, MFRATE_REVERSE, TRUE, &rate); + ok(hr == MF_E_NOT_INITIALIZED, "Unexpected hr %#x.\n", hr); + + hr = IMFRateSupport_GetFastestRate(rate_support, MFRATE_FORWARD, FALSE, &rate); + ok(hr == MF_E_NOT_INITIALIZED, "Unexpected hr %#x.\n", hr); + + hr = IMFRateSupport_GetFastestRate(rate_support, MFRATE_FORWARD, TRUE, &rate); + ok(hr == MF_E_NOT_INITIALIZED, "Unexpected hr %#x.\n", hr); + + hr = IMFRateSupport_GetFastestRate(rate_support, MFRATE_REVERSE, FALSE, &rate); + ok(hr == MF_E_NOT_INITIALIZED, "Unexpected hr %#x.\n", hr); + + hr = IMFRateSupport_GetFastestRate(rate_support, MFRATE_REVERSE, TRUE, &rate); + ok(hr == MF_E_NOT_INITIALIZED, "Unexpected hr %#x.\n", hr); + } + + IMFMediaTypeHandler_Release(handler); + IMFRateSupport_Release(rate_support); +} + static void test_sar(void) { IMFPresentationClock *present_clock, *present_clock2; @@ -4073,9 +4175,13 @@ if (SUCCEEDED(hr)) IMFMediaType_Release(mediatype); + check_sar_rate_support(sink); + hr = IMFMediaTypeHandler_SetCurrentMediaType(handler, mediatype2); ok(hr == S_OK, "Failed to set current type, hr %#x.\n", hr); + check_sar_rate_support(sink); + hr = IMFMediaTypeHandler_GetCurrentMediaType(handler, &mediatype); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(mediatype == mediatype2, "Unexpected instance.\n"); @@ -4184,6 +4290,8 @@ if (SUCCEEDED(hr)) hr = IMFMediaSink_GetPresentationClock(sink, &present_clock2); ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + check_sar_rate_support(sink); + IMFMediaSink_Release(sink); /* Activation */ @@ -4253,6 +4361,8 @@ if (SUCCEEDED(hr)) hr = MFCreateAudioRenderer(attributes, &sink); ok(hr == MF_E_NO_AUDIO_PLAYBACK_DEVICE, "Failed to create a sink, hr %#x.\n", hr); + IMFAttributes_Release(attributes); + CoUninitialize(); } -- 2.34.1

1 0

[PATCH vkd3d 3/6] vkd3d-shader/hlsl: Support complex numeric initializers.
by Francisco Casas Feb. 17, 2022

Feb. 17, 2022

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- Makefile.am | 1 - libs/vkd3d-shader/hlsl.y | 93 +++++++++++++++++++++++++++++++--------- 2 files changed, 73 insertions(+), 21 deletions(-) diff --git a/Makefile.am b/Makefile.am index 491537f6..85611daf 100644 --- a/Makefile.am +++ b/Makefile.am @@ -310,7 +310,6 @@ XFAIL_TESTS = \ tests/hlsl-initializer-invalid-arg-count.shader_test \ tests/hlsl-initializer-local-array.shader_test \ tests/hlsl-initializer-nested.shader_test \ - tests/hlsl-initializer-numeric.shader_test \ tests/hlsl-initializer-static-array.shader_test \ tests/hlsl-initializer-struct.shader_test \ tests/hlsl-bool-cast.shader_test \ diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 4ec36b76..bcc9e4d7 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1321,6 +1321,51 @@ static bool add_increment(struct hlsl_ctx *ctx, struct list *instrs, bool decrem return true; } +static void initialize_numeric_var(struct hlsl_ctx *ctx, struct hlsl_ir_var *var, + struct parse_initializer *initializer, unsigned int reg_offset, struct hlsl_type *type, + unsigned int *initializer_offset) +{ + unsigned int i; + + if (type->type == HLSL_CLASS_MATRIX) + hlsl_fixme(ctx, &var->loc, "Matrix initializer."); + + for (i = 0; i < type->dimx; i++) + { + struct hlsl_ir_store *store; + struct hlsl_ir_constant *c; + struct hlsl_ir_node *node; + + node = initializer->args[*initializer_offset]; + *initializer_offset += 1; + + if (!(node = add_implicit_conversion(ctx, initializer->instrs, node, + hlsl_get_scalar_type(ctx, type->base_type), &node->loc))) + return; + + if (hlsl_type_is_single_reg(var->data_type)) + { + if (!(c = hlsl_new_uint_constant(ctx, reg_offset, node->loc))) + return; + list_add_tail(initializer->instrs, &c->node.entry); + + if (!(store = hlsl_new_store(ctx, var, &c->node, node, (1u << i), node->loc))) + return; + } + else + { + if (!(c = hlsl_new_uint_constant(ctx, reg_offset + i, node->loc))) + return; + list_add_tail(initializer->instrs, &c->node.entry); + + if (!(store = hlsl_new_store(ctx, var, &c->node, node, 0, node->loc))) + return; + } + + list_add_tail(initializer->instrs, &store->node.entry); + } +} + static void struct_var_initializer(struct hlsl_ctx *ctx, struct list *list, struct hlsl_ir_var *var, struct parse_initializer *initializer) { @@ -1492,20 +1537,16 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t if (v->initializer.args_count) { unsigned int size = initializer_size(&v->initializer); - struct hlsl_ir_load *load; - if (type->type <= HLSL_CLASS_LAST_NUMERIC - && type->dimx * type->dimy != size && size != 1) + if (type->type <= HLSL_CLASS_LAST_NUMERIC && v->initializer.args_count != 1 + && type->dimx * type->dimy != size) { - if (size < type->dimx * type->dimy) - { - hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, - "Expected %u components in numeric initializer, but got %u.", - type->dimx * type->dimy, size); - free_parse_initializer(&v->initializer); - vkd3d_free(v); - continue; - } + hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, + "Expected %u components in numeric initializer, but got %u.", + type->dimx * type->dimy, v->initializer.args_count); + free_parse_initializer(&v->initializer); + vkd3d_free(v); + continue; } if ((type->type == HLSL_CLASS_STRUCT || type->type == HLSL_CLASS_ARRAY) && hlsl_type_component_count(type) != size) @@ -1540,23 +1581,35 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t vkd3d_free(v); continue; } + if (v->initializer.args_count > 1) { - hlsl_fixme(ctx, &v->loc, "Complex initializer."); - free_parse_initializer(&v->initializer); - vkd3d_free(v); - continue; + unsigned int initializer_offset = 0; + + if (v->initializer.args_count != size) + { + hlsl_fixme(ctx, &v->loc, "Flatten initializer."); + free_parse_initializer(&v->initializer); + vkd3d_free(v); + continue; + } + + initialize_numeric_var(ctx, var, &v->initializer, 0, type, &initializer_offset); } + else + { + struct hlsl_ir_load *load = hlsl_new_var_load(ctx, var, var->loc); - load = hlsl_new_var_load(ctx, var, var->loc); - list_add_tail(v->initializer.instrs, &load->node.entry); - add_assignment(ctx, v->initializer.instrs, &load->node, ASSIGN_OP_ASSIGN, v->initializer.args[0]); - vkd3d_free(v->initializer.args); + list_add_tail(v->initializer.instrs, &load->node.entry); + add_assignment(ctx, v->initializer.instrs, &load->node, ASSIGN_OP_ASSIGN, v->initializer.args[0]); + } if (modifiers & HLSL_STORAGE_STATIC) list_move_tail(&ctx->static_initializers, v->initializer.instrs); else list_move_tail(statements_list, v->initializer.instrs); + + vkd3d_free(v->initializer.args); vkd3d_free(v->initializer.instrs); } -- 2.25.1

2 4

[tools v2] testbot/SetWinLocale: Simplify sending the Powershell script.
by Francois Gouget Feb. 17, 2022

Feb. 17, 2022

Converting the line endings to CR+LF is not needed. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- v2: Rediffed. I think v1 failed to apply because GetWinProperties() took the place of GetWinSettings(). --- testbot/bin/SetWinLocale | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index 73c774e6e4..670de46043 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -662,20 +662,9 @@ sub RegGetValue($;$) # Show the host's locale settings # -if (open(my $fh, "<", "$0.ps1")) +if (!$TA->SendFile("$0.ps1", "$name0.ps1", 0)) { - my $Script = join("", <$fh>); - close($fh); - - $Script =~ s~\n~\r\n~g; - if (!$TA->SendFileFromString($Script, "$name0.ps1", 0)) - { - FatalError("could not send the batch file:", $TA->GetLastError(), "\n"); - } -} -else -{ - FatalError("could not open '$0.ps1' for reading: $!\n"); + FatalError("could not send the Powershell script:", $TA->GetLastError(), "\n"); } sub GetWinProperties($) -- 2.30.2

1 0

[PATCH 1/5] mf/tests: Add some H264 decoder creation tests.
by Rémi Bernon Feb. 17, 2022

Feb. 17, 2022

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/mf/tests/mf.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index c4d318a9e43..add48be964a 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -6135,6 +6135,65 @@ failed: CoUninitialize(); } +static void test_h264_decoder(void) +{ + static const media_type_desc transform_inputs[] = + { + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), + ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_H264), + }, + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), + ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_H264_ES), + }, + }; + static const media_type_desc transform_outputs[] = + { + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), + ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_NV12), + }, + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), + ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_YV12), + }, + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), + ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_IYUV), + }, + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), + ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_I420), + }, + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), + ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_YUY2), + }, + }; + + MFT_REGISTER_TYPE_INFO input_type = {MFMediaType_Video, MFVideoFormat_H264}; + MFT_REGISTER_TYPE_INFO output_type = {MFMediaType_Video, MFVideoFormat_NV12}; + IMFTransform *transform; + GUID class_id; + HRESULT hr; + ULONG ret; + + hr = CoInitialize(NULL); + ok(hr == S_OK, "Failed to initialize, hr %#x.\n", hr); + + if (!create_transform(MFT_CATEGORY_VIDEO_DECODER, &input_type, &output_type, L"Microsoft H264 Video Decoder MFT", + transform_inputs, ARRAY_SIZE(transform_inputs), transform_outputs, ARRAY_SIZE(transform_outputs), + &transform, &class_id)) + goto failed; + + ret = IMFTransform_Release(transform); + ok(ret == 0, "Release returned %u\n", ret); + +failed: + CoUninitialize(); +} + START_TEST(mf) { init_functions(); @@ -6170,4 +6229,5 @@ START_TEST(mf) test_MFRequireProtectedEnvironment(); test_wma_encoder(); test_wma_decoder(); + test_h264_decoder(); } -- 2.34.1

2 9

[LEGAL] Contributing to comctrl32 with prior access to the Windows Research Kernel
by Angelo Haller Feb. 17, 2022

Feb. 17, 2022

Can someone who has had access to the Windows Research Kernel (WRK) still submit patches to tests and comctrl32? The FAQ [0] states that some can still legally submit changes to certain components in certain cases. Is this one of them? As I understand comctrl32 is not part of the WRK. I have seen some scheduler code of the WRK through an assignment in university >~10 years ago. Nothing else. Can I still send in my fixes/patches regarding comctrl32/listview? Thanks, Angelo [0] https://wiki.winehq.org/Developer_FAQ

2 1

[PATCH 1/4] kernelbase: Allow the two initial slashes to be backslashes in UrlGetPart().
by Zebediah Figura Feb. 17, 2022

Feb. 17, 2022

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/kernelbase/path.c | 8 +++++++- dlls/shlwapi/tests/url.c | 8 ++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index e29ee585123..befdf237c5e 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -4191,6 +4191,11 @@ static const WCHAR *parse_url_element( const WCHAR *url, const WCHAR *separators return url + wcslen( url ); } +static BOOL is_slash( char c ) +{ + return c == '/' || c == '\\'; +} + static void parse_url( const WCHAR *url, struct parsed_url *pl ) { const WCHAR *work; @@ -4200,7 +4205,8 @@ static void parse_url( const WCHAR *url, struct parsed_url *pl ) work = scan_url(pl->scheme, &pl->scheme_len, SCHEME); if (!*work || (*work != ':')) return; work++; - if ((*work != '/') || (*(work+1) != '/')) return; + if (!is_slash( work[0] ) || !is_slash( work[1] )) + return; pl->username = work + 2; work = parse_url_element( pl->username, L":@/\\?#" ); diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 18af0906e08..ae0d0738195 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -661,12 +661,12 @@ static void test_UrlGetPart(void) {"http:/localhost/index.html", URL_PART_HOSTNAME, 0, E_FAIL, .todo_hr = TRUE}, {"http://localhost\\index.html", URL_PART_HOSTNAME, 0, S_OK, "localhost"}, - {"http:/\\localhost/index.html", URL_PART_HOSTNAME, 0, S_OK, "localhost", .todo_hr = TRUE}, - {"http:\\/localhost/index.html", URL_PART_HOSTNAME, 0, S_OK, "localhost", .todo_hr = TRUE}, + {"http:/\\localhost/index.html", URL_PART_HOSTNAME, 0, S_OK, "localhost"}, + {"http:\\/localhost/index.html", URL_PART_HOSTNAME, 0, S_OK, "localhost"}, {"ftp://localhost\\index.html", URL_PART_HOSTNAME, 0, S_OK, "localhost"}, - {"ftp:/\\localhost/index.html", URL_PART_HOSTNAME, 0, S_OK, "localhost", .todo_hr = TRUE}, - {"ftp:\\/localhost/index.html", URL_PART_HOSTNAME, 0, S_OK, "localhost", .todo_hr = TRUE}, + {"ftp:/\\localhost/index.html", URL_PART_HOSTNAME, 0, S_OK, "localhost"}, + {"ftp:\\/localhost/index.html", URL_PART_HOSTNAME, 0, S_OK, "localhost"}, {"http://host?a:b(a)c:d", URL_PART_HOSTNAME, 0, S_OK, "host"}, {"http://host?a:b(a)c:d", URL_PART_QUERY, 0, S_OK, "a:b(a)c:d"}, -- 2.34.1

1 3

[PATCH 1/6] ncrypt: Fix null pointer.
by Santino Mazza Feb. 17, 2022

Feb. 17, 2022

Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> --- dlls/ncrypt/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index 6b1a87ea785..22e2e9089ef 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -322,6 +322,7 @@ static SECURITY_STATUS set_object_property(struct object *object, const WCHAR *n ERR("Error allocating memory."); return NTE_NO_MEMORY; } + property = &object->properties[object->num_properties]; object->num_properties++; } else -- 2.32.0

1 5

[PATCH 1/3] vcomp: Add tests for _vcomp_for_dynamic_init_i8()
by David Koller Feb. 17, 2022

Feb. 17, 2022

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52012 Signed-off-by: David Koller <dk(a)cs.stanford.edu> --- dlls/vcomp/tests/vcomp.c | 247 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 247 insertions(+) diff --git a/dlls/vcomp/tests/vcomp.c b/dlls/vcomp/tests/vcomp.c index a229e0198f7..19d56820450 100644 --- a/dlls/vcomp/tests/vcomp.c +++ b/dlls/vcomp/tests/vcomp.c @@ -87,7 +87,10 @@ static void (CDECL *p_vcomp_enter_critsect)(CRITICAL_SECTION **critsect); static void (CDECL *p_vcomp_flush)(void); static void (CDECL *p_vcomp_for_dynamic_init)(unsigned int flags, unsigned int first, unsigned int last, int step, unsigned int chunksize); +static void (CDECL *p_vcomp_for_dynamic_init_i8)(unsigned int flags, ULONG64 first, ULONG64 last, + LONG64 step, ULONG64 chunksize); static int (CDECL *p_vcomp_for_dynamic_next)(unsigned int *begin, unsigned int *end); +static int (CDECL *p_vcomp_for_dynamic_next_i8)(ULONG64 *begin, ULONG64 *end); static void (CDECL *p_vcomp_for_static_end)(void); static void (CDECL *p_vcomp_for_static_init)(int first, int last, int step, int chunksize, unsigned int *loops, int *begin, int *end, int *next, int *lastchunk); @@ -329,7 +332,9 @@ static BOOL init_vcomp(void) VCOMP_GET_PROC(_vcomp_enter_critsect); VCOMP_GET_PROC(_vcomp_flush); VCOMP_GET_PROC(_vcomp_for_dynamic_init); + VCOMP_GET_PROC(_vcomp_for_dynamic_init_i8); VCOMP_GET_PROC(_vcomp_for_dynamic_next); + VCOMP_GET_PROC(_vcomp_for_dynamic_next_i8); VCOMP_GET_PROC(_vcomp_for_static_end); VCOMP_GET_PROC(_vcomp_for_static_init); VCOMP_GET_PROC(_vcomp_for_static_init_i8); @@ -1546,6 +1551,60 @@ static void CDECL for_dynamic_static_cb(void) ok(ret == FALSE, "expected ret == FALSE, got %d\n", ret); } +static void CDECL for_dynamic_static_i8_cb(void) +{ + ULONG64 my_begin, my_end, begin, end; + int ret; + + begin = end = 0xdeadbeef; + my_for_static_simple_init_i8(TRUE, 0, 1000, 7, TRUE, &my_begin, &my_end); + p_vcomp_for_dynamic_init_i8(VCOMP_DYNAMIC_FLAGS_STATIC | VCOMP_DYNAMIC_FLAGS_INCREMENT, 0, 1000, 7, 1); + ret = p_vcomp_for_dynamic_next_i8(&begin, &end); + ok(ret == TRUE, "expected ret == TRUE, got %d\n", ret); + ok(begin == my_begin, "expected begin == %s, got %s\n", wine_dbgstr_longlong(my_begin), + wine_dbgstr_longlong(begin)); + ok(end == my_end, "expected end == %s, got %s\n", wine_dbgstr_longlong(my_end), + wine_dbgstr_longlong(end)); + ret = p_vcomp_for_dynamic_next_i8(&begin, &end); + ok(ret == FALSE, "expected ret == FALSE, got %d\n", ret); + + begin = end = 0xdeadbeef; + my_for_static_simple_init_i8(TRUE, 1000, 0, 7, FALSE, &my_begin, &my_end); + p_vcomp_for_dynamic_init_i8(VCOMP_DYNAMIC_FLAGS_STATIC, 1000, 0, 7, 1); + ret = p_vcomp_for_dynamic_next_i8(&begin, &end); + ok(ret == TRUE, "expected ret == TRUE, got %d\n", ret); + ok(begin == my_begin, "expected begin == %s, got %s\n", wine_dbgstr_longlong(my_begin), + wine_dbgstr_longlong(begin)); + ok(end == my_end, "expected end == %s, got %s\n", wine_dbgstr_longlong(my_end), + wine_dbgstr_longlong(end)); + ret = p_vcomp_for_dynamic_next_i8(&begin, &end); + ok(ret == FALSE, "expected ret == FALSE, got %d\n", ret); + + begin = end = 0xdeadbeef; + my_for_static_simple_init_i8(TRUE, 0, 1000, 7, TRUE, &my_begin, &my_end); + p_vcomp_for_dynamic_init_i8(VCOMP_DYNAMIC_FLAGS_STATIC | VCOMP_DYNAMIC_FLAGS_INCREMENT, 0, 1000, 7, 5); + ret = p_vcomp_for_dynamic_next_i8(&begin, &end); + ok(ret == TRUE, "expected ret == TRUE, got %d\n", ret); + ok(begin == my_begin, "expected begin == %s, got %s\n", wine_dbgstr_longlong(my_begin), + wine_dbgstr_longlong(begin)); + ok(end == my_end, "expected end == %s, got %s\n", wine_dbgstr_longlong(my_end), + wine_dbgstr_longlong(end)); + ret = p_vcomp_for_dynamic_next_i8(&begin, &end); + ok(ret == FALSE, "expected ret == FALSE, got %d\n", ret); + + begin = end = 0xdeadbeef; + my_for_static_simple_init_i8(TRUE, 1000, 0, 7, FALSE, &my_begin, &my_end); + p_vcomp_for_dynamic_init_i8(VCOMP_DYNAMIC_FLAGS_STATIC, 1000, 0, 7, 5); + ret = p_vcomp_for_dynamic_next_i8(&begin, &end); + ok(ret == TRUE, "expected ret == TRUE, got %d\n", ret); + ok(begin == my_begin, "expected begin == %s, got %s\n", wine_dbgstr_longlong(my_begin), + wine_dbgstr_longlong(begin)); + ok(end == my_end, "expected end == %s, got %s\n", wine_dbgstr_longlong(my_end), + wine_dbgstr_longlong(end)); + ret = p_vcomp_for_dynamic_next_i8(&begin, &end); + ok(ret == FALSE, "expected ret == FALSE, got %d\n", ret); +} + static void CDECL for_dynamic_chunked_cb(LONG *a, LONG *b, LONG *c, LONG *d) { unsigned int begin, end; @@ -1583,6 +1642,47 @@ static void CDECL for_dynamic_chunked_cb(LONG *a, LONG *b, LONG *c, LONG *d) } } +static void CDECL for_dynamic_chunked_i8_cb(LONG64 *a, LONG64 *b, LONG64 *c, LONG64 *d) +{ + ULONG64 begin, end; + + p_vcomp_for_dynamic_init_i8(VCOMP_DYNAMIC_FLAGS_CHUNKED | VCOMP_DYNAMIC_FLAGS_INCREMENT, 0, 1000, 7, 1); + while (p_vcomp_for_dynamic_next_i8(&begin, &end)) + { + if (begin == 994) ok(end == 1000, "expected end == 1000, got %s\n", wine_dbgstr_longlong(end)); + else ok(begin == end, "expected begin == end, got %s and %s\n", wine_dbgstr_longlong(begin), + wine_dbgstr_longlong(end)); + InterlockedExchangeAdd64(a, begin); + } + + p_vcomp_for_dynamic_init_i8(VCOMP_DYNAMIC_FLAGS_CHUNKED, 1000, 0, 7, 1); + while (p_vcomp_for_dynamic_next_i8(&begin, &end)) + { + if (begin == 6) ok(end == 0, "expected end == 0, got %s\n", wine_dbgstr_longlong(end)); + else ok(begin == end, "expected begin == end, got %s and %s\n", wine_dbgstr_longlong(begin), + wine_dbgstr_longlong(end)); + InterlockedExchangeAdd64(b, begin); + } + + p_vcomp_for_dynamic_init_i8(VCOMP_DYNAMIC_FLAGS_CHUNKED | VCOMP_DYNAMIC_FLAGS_INCREMENT, 0, 1000, 7, 5); + while (p_vcomp_for_dynamic_next_i8(&begin, &end)) + { + if (begin == 980) ok(end == 1000, "expected end == 1000, got %s\n", wine_dbgstr_longlong(end)); + else ok(begin + 28 == end, "expected begin + 28 == end, got %s and %s\n", + wine_dbgstr_longlong(begin + 28), wine_dbgstr_longlong(end)); + InterlockedExchangeAdd64(c, begin); + } + + p_vcomp_for_dynamic_init_i8(VCOMP_DYNAMIC_FLAGS_CHUNKED, 1000, 0, 7, 5); + while (p_vcomp_for_dynamic_next_i8(&begin, &end)) + { + if (begin == 20) ok(end == 0, "expected end == 0, got %s\n", wine_dbgstr_longlong(end)); + else ok(begin - 28 == end, "expected begin - 28 == end, got %s and %s\n", + wine_dbgstr_longlong(begin - 28), wine_dbgstr_longlong(end)); + InterlockedExchangeAdd64(d, begin); + } +} + static void CDECL for_dynamic_guided_cb(unsigned int flags, LONG *a, LONG *b, LONG *c, LONG *d) { int num_threads = pomp_get_num_threads(); @@ -1621,6 +1721,48 @@ static void CDECL for_dynamic_guided_cb(unsigned int flags, LONG *a, LONG *b, LO } } +static void CDECL for_dynamic_guided_i8_cb(unsigned int flags, LONG64 *a, LONG64 *b, LONG64 *c, LONG64 *d) +{ + int num_threads = pomp_get_num_threads(); + ULONG64 begin, end; + + p_vcomp_for_dynamic_init_i8(flags | VCOMP_DYNAMIC_FLAGS_INCREMENT, 0, 1000, 7, 1); + while (p_vcomp_for_dynamic_next_i8(&begin, &end)) + { + ok(num_threads != 1 || (begin == 0 && end == 1000), + "expected begin == 0 and end == 1000, got %s and %s\n", wine_dbgstr_longlong(begin), + wine_dbgstr_longlong(end)); + InterlockedExchangeAdd64(a, begin); + } + + p_vcomp_for_dynamic_init_i8(flags, 1000, 0, 7, 1); + while (p_vcomp_for_dynamic_next_i8(&begin, &end)) + { + ok(num_threads != 1 || (begin == 1000 && end == 0), + "expected begin == 1000 and end == 0, got %s and %s\n", wine_dbgstr_longlong(begin), + wine_dbgstr_longlong(end)); + InterlockedExchangeAdd64(b, begin); + } + + p_vcomp_for_dynamic_init_i8(flags | VCOMP_DYNAMIC_FLAGS_INCREMENT, 0, 1000, 7, 5); + while (p_vcomp_for_dynamic_next_i8(&begin, &end)) + { + ok(num_threads != 1 || (begin == 0 && end == 1000), + "expected begin == 0 and end == 1000, got %s and %s\n", wine_dbgstr_longlong(begin), + wine_dbgstr_longlong(end)); + InterlockedExchangeAdd64(c, begin); + } + + p_vcomp_for_dynamic_init_i8(flags, 1000, 0, 7, 5); + while (p_vcomp_for_dynamic_next_i8(&begin, &end)) + { + ok(num_threads != 1 || (begin == 1000 && end == 0), + "expected begin == 1000 and end == 0, got %s and %s\n", wine_dbgstr_longlong(begin), + wine_dbgstr_longlong(end)); + InterlockedExchangeAdd64(d, begin); + } +} + static void test_vcomp_for_dynamic_init(void) { static const int guided_a[] = {0, 6041, 9072, 11179}; @@ -1725,6 +1867,110 @@ static void test_vcomp_for_dynamic_init(void) pomp_set_num_threads(max_threads); } +static void test_vcomp_for_dynamic_init_i8(void) +{ + static const int guided_a[] = {0, 6041, 9072, 11179}; + static const int guided_b[] = {1000, 1959, 2928, 3821}; + static const int guided_c[] = {0, 4067, 6139, 7273}; + static const int guided_d[] = {1000, 1933, 2861, 3727}; + LONG64 a, b, c, d; + int max_threads = pomp_get_max_threads(); + int i; + + /* test static scheduling */ + for_dynamic_static_i8_cb(); + + for (i = 1; i <= 4; i++) + { + pomp_set_num_threads(i); + p_vcomp_fork(TRUE, 0, for_dynamic_static_i8_cb); + p_vcomp_fork(FALSE, 0, for_dynamic_static_i8_cb); + } + + /* test chunked scheduling */ + a = b = c = d = 0; + for_dynamic_chunked_i8_cb(&a, &b, &c, &d); + ok(a == 71071, "expected a == 71071, got %s\n", wine_dbgstr_longlong(a)); + ok(b == 71929, "expected b == 71929, got %s\n", wine_dbgstr_longlong(b)); + ok(c == 14210, "expected c == 14210, got %s\n", wine_dbgstr_longlong(c)); + ok(d == 14790, "expected d == 14790, got %s\n", wine_dbgstr_longlong(d)); + + for (i = 1; i <= 4; i++) + { + pomp_set_num_threads(i); + + a = b = c = d = 0; + p_vcomp_fork(TRUE, 4, for_dynamic_chunked_i8_cb, &a, &b, &c, &d); + ok(a == 71071, "expected a == 71071, got %s\n", wine_dbgstr_longlong(a)); + ok(b == 71929, "expected b == 71929, got %s\n", wine_dbgstr_longlong(b)); + ok(c == 14210, "expected c == 14210, got %s\n", wine_dbgstr_longlong(c)); + ok(d == 14790, "expected d == 14790, got %s\n", wine_dbgstr_longlong(d)); + + a = b = c = d = 0; + p_vcomp_fork(FALSE, 4, for_dynamic_chunked_i8_cb, &a, &b, &c, &d); + ok(a == 71071, "expected a == 71071, got %s\n", wine_dbgstr_longlong(a)); + ok(b == 71929, "expected b == 71929, got %s\n", wine_dbgstr_longlong(b)); + ok(c == 14210, "expected c == 14210, got %s\n", wine_dbgstr_longlong(c)); + ok(d == 14790, "expected d == 14790, got %s\n", wine_dbgstr_longlong(d)); + } + + /* test guided scheduling */ + a = b = c = d = 0; + for_dynamic_guided_i8_cb(VCOMP_DYNAMIC_FLAGS_GUIDED, &a, &b, &c, &d); + ok(a == guided_a[0], "expected a == %d, got %s\n", guided_a[0], wine_dbgstr_longlong(a)); + ok(b == guided_b[0], "expected b == %d, got %s\n", guided_b[0], wine_dbgstr_longlong(b)); + ok(c == guided_c[0], "expected c == %d, got %s\n", guided_c[0], wine_dbgstr_longlong(c)); + ok(d == guided_d[0], "expected d == %d, got %s\n", guided_d[0], wine_dbgstr_longlong(d)); + + for (i = 1; i <= 4; i++) + { + pomp_set_num_threads(i); + + a = b = c = d = 0; + p_vcomp_fork(TRUE, 5, for_dynamic_guided_i8_cb, VCOMP_DYNAMIC_FLAGS_GUIDED, &a, &b, &c, &d); + ok(a == guided_a[i - 1], "expected a == %d, got %s\n", guided_a[i - 1], wine_dbgstr_longlong(a)); + ok(b == guided_b[i - 1], "expected b == %d, got %s\n", guided_b[i - 1], wine_dbgstr_longlong(b)); + ok(c == guided_c[i - 1], "expected c == %d, got %s\n", guided_c[i - 1], wine_dbgstr_longlong(c)); + ok(d == guided_d[i - 1], "expected d == %d, got %s\n", guided_d[i - 1], wine_dbgstr_longlong(d)); + + a = b = c = d = 0; + p_vcomp_fork(FALSE, 5, for_dynamic_guided_i8_cb, VCOMP_DYNAMIC_FLAGS_GUIDED, &a, &b, &c, &d); + ok(a == guided_a[0], "expected a == %d, got %s\n", guided_a[0], wine_dbgstr_longlong(a)); + ok(b == guided_b[0], "expected b == %d, got %s\n", guided_b[0], wine_dbgstr_longlong(b)); + ok(c == guided_c[0], "expected c == %d, got %s\n", guided_c[0], wine_dbgstr_longlong(c)); + ok(d == guided_d[0], "expected d == %d, got %s\n", guided_d[0], wine_dbgstr_longlong(d)); + } + + /* test with empty flags */ + a = b = c = d = 0; + for_dynamic_guided_i8_cb(0, &a, &b, &c, &d); + ok(a == guided_a[0], "expected a == %d, got %s\n", guided_a[0], wine_dbgstr_longlong(a)); + ok(b == guided_b[0], "expected b == %d, got %s\n", guided_b[0], wine_dbgstr_longlong(b)); + ok(c == guided_c[0], "expected c == %d, got %s\n", guided_c[0], wine_dbgstr_longlong(c)); + ok(d == guided_d[0], "expected d == %d, got %s\n", guided_d[0], wine_dbgstr_longlong(d)); + + for (i = 1; i <= 4; i++) + { + pomp_set_num_threads(i); + + a = b = c = d = 0; + p_vcomp_fork(TRUE, 5, for_dynamic_guided_i8_cb, 0, &a, &b, &c, &d); + ok(a == guided_a[i - 1], "expected a == %d, got %s\n", guided_a[i - 1], wine_dbgstr_longlong(a)); + ok(b == guided_b[i - 1], "expected b == %d, got %s\n", guided_b[i - 1], wine_dbgstr_longlong(b)); + ok(c == guided_c[i - 1], "expected c == %d, got %s\n", guided_c[i - 1], wine_dbgstr_longlong(c)); + ok(d == guided_d[i - 1], "expected d == %d, got %s\n", guided_d[i - 1], wine_dbgstr_longlong(d)); + + a = b = c = d = 0; + p_vcomp_fork(FALSE, 5, for_dynamic_guided_i8_cb, 0, &a, &b, &c, &d); + ok(a == guided_a[0], "expected a == %d, got %s\n", guided_a[0], wine_dbgstr_longlong(a)); + ok(b == guided_b[0], "expected b == %d, got %s\n", guided_b[0], wine_dbgstr_longlong(b)); + ok(c == guided_c[0], "expected c == %d, got %s\n", guided_c[0], wine_dbgstr_longlong(c)); + ok(d == guided_d[0], "expected d == %d, got %s\n", guided_d[0], wine_dbgstr_longlong(d)); + } + + pomp_set_num_threads(max_threads); +} + static void CDECL master_cb(HANDLE semaphore) { int num_threads = pomp_get_num_threads(); @@ -2644,6 +2890,7 @@ START_TEST(vcomp) test_vcomp_for_static_simple_init(); test_vcomp_for_static_init(); test_vcomp_for_dynamic_init(); + test_vcomp_for_dynamic_init_i8(); test_vcomp_master_begin(); test_vcomp_single_begin(); test_vcomp_enter_critsect(); -- 2.25.1

2 4

[PATCH 1/2] user32: Test Get/SetWindowPlacement with invalid length.
by Esme Povirk Feb. 16, 2022

Feb. 16, 2022

Signed-off-by: Esme Povirk <esme(a)codeweavers.com> --- dlls/user32/tests/win.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index cb6b61e59c0..b1ef97c01d6 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -12086,6 +12086,17 @@ static void test_window_placement(void) GetWindowRect(hwnd, &rect); ok(EqualRect(&rect, &orig), "got window rect %s\n", wine_dbgstr_rect(&rect)); + ret = SetWindowPlacement(hwnd, &wp); + ok(ret, "failed to set window placement, error %u\n", GetLastError()); + + wp.length = 0; + SetLastError(0xdeadbeef); + ret = SetWindowPlacement(hwnd, &wp); +todo_wine { + ok(!ret, "SetWindowPlacement should have failed\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError()); +} + DestroyWindow(hwnd); } @@ -12245,7 +12256,7 @@ static void test_arrange_iconic_windows(void) static void other_process_proc(HWND hwnd) { HANDLE window_ready_event, test_done_event; - WINDOWPLACEMENT wp; + WINDOWPLACEMENT wp = {0}; DWORD ret; window_ready_event = OpenEventA(EVENT_ALL_ACCESS, FALSE, "test_opw_window"); -- 2.30.2

3 4

[PATCH v3 1/5] winegstreamer: Remove unnecessary DECLSPEC_HIDDEN qualifier.
by Rémi Bernon Feb. 16, 2022

Feb. 16, 2022

On PE internal functions. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51931 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52391 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v3: Remove DECLSPEC_HIDDEN and add a patch first to make it consistent. Reorder patches and improve error handling, prefer NTSTATUS values for error codes. dlls/winegstreamer/gst_private.h | 64 ++++++++++++++++---------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 222bce3b2c7..3584f465218 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -39,7 +39,7 @@ #include "unixlib.h" -bool array_reserve(void **elements, size_t *capacity, size_t count, size_t size) DECLSPEC_HIDDEN; +bool array_reserve(void **elements, size_t *capacity, size_t count, size_t size); static inline const char *debugstr_time(REFERENCE_TIME time) { @@ -64,60 +64,60 @@ static inline const char *debugstr_time(REFERENCE_TIME time) #define MEDIATIME_FROM_BYTES(x) ((LONGLONG)(x) * 10000000) -struct wg_parser *wg_parser_create(enum wg_parser_type type, bool unlimited_buffering) DECLSPEC_HIDDEN; -void wg_parser_destroy(struct wg_parser *parser) DECLSPEC_HIDDEN; +struct wg_parser *wg_parser_create(enum wg_parser_type type, bool unlimited_buffering); +void wg_parser_destroy(struct wg_parser *parser); -HRESULT wg_parser_connect(struct wg_parser *parser, uint64_t file_size) DECLSPEC_HIDDEN; -void wg_parser_disconnect(struct wg_parser *parser) DECLSPEC_HIDDEN; +HRESULT wg_parser_connect(struct wg_parser *parser, uint64_t file_size); +void wg_parser_disconnect(struct wg_parser *parser); -void wg_parser_begin_flush(struct wg_parser *parser) DECLSPEC_HIDDEN; -void wg_parser_end_flush(struct wg_parser *parser) DECLSPEC_HIDDEN; +void wg_parser_begin_flush(struct wg_parser *parser); +void wg_parser_end_flush(struct wg_parser *parser); -bool wg_parser_get_next_read_offset(struct wg_parser *parser, uint64_t *offset, uint32_t *size) DECLSPEC_HIDDEN; -void wg_parser_push_data(struct wg_parser *parser, const void *data, uint32_t size) DECLSPEC_HIDDEN; +bool wg_parser_get_next_read_offset(struct wg_parser *parser, uint64_t *offset, uint32_t *size); +void wg_parser_push_data(struct wg_parser *parser, const void *data, uint32_t size); -uint32_t wg_parser_get_stream_count(struct wg_parser *parser) DECLSPEC_HIDDEN; -struct wg_parser_stream *wg_parser_get_stream(struct wg_parser *parser, uint32_t index) DECLSPEC_HIDDEN; +uint32_t wg_parser_get_stream_count(struct wg_parser *parser); +struct wg_parser_stream *wg_parser_get_stream(struct wg_parser *parser, uint32_t index); -void wg_parser_stream_get_preferred_format(struct wg_parser_stream *stream, struct wg_format *format) DECLSPEC_HIDDEN; -void wg_parser_stream_enable(struct wg_parser_stream *stream, const struct wg_format *format) DECLSPEC_HIDDEN; -void wg_parser_stream_disable(struct wg_parser_stream *stream) DECLSPEC_HIDDEN; +void wg_parser_stream_get_preferred_format(struct wg_parser_stream *stream, struct wg_format *format); +void wg_parser_stream_enable(struct wg_parser_stream *stream, const struct wg_format *format); +void wg_parser_stream_disable(struct wg_parser_stream *stream); -bool wg_parser_stream_get_event(struct wg_parser_stream *stream, struct wg_parser_event *event) DECLSPEC_HIDDEN; +bool wg_parser_stream_get_event(struct wg_parser_stream *stream, struct wg_parser_event *event); bool wg_parser_stream_copy_buffer(struct wg_parser_stream *stream, - void *data, uint32_t offset, uint32_t size) DECLSPEC_HIDDEN; -void wg_parser_stream_release_buffer(struct wg_parser_stream *stream) DECLSPEC_HIDDEN; + void *data, uint32_t offset, uint32_t size); +void wg_parser_stream_release_buffer(struct wg_parser_stream *stream); void wg_parser_stream_notify_qos(struct wg_parser_stream *stream, - bool underflow, double proportion, int64_t diff, uint64_t timestamp) DECLSPEC_HIDDEN; + bool underflow, double proportion, int64_t diff, uint64_t timestamp); /* Returns the duration in 100-nanosecond units. */ -uint64_t wg_parser_stream_get_duration(struct wg_parser_stream *stream) DECLSPEC_HIDDEN; +uint64_t wg_parser_stream_get_duration(struct wg_parser_stream *stream); /* start_pos and stop_pos are in 100-nanosecond units. */ void wg_parser_stream_seek(struct wg_parser_stream *stream, double rate, - uint64_t start_pos, uint64_t stop_pos, DWORD start_flags, DWORD stop_flags) DECLSPEC_HIDDEN; + uint64_t start_pos, uint64_t stop_pos, DWORD start_flags, DWORD stop_flags); unsigned int wg_format_get_max_size(const struct wg_format *format); -HRESULT avi_splitter_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; -HRESULT decodebin_parser_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; -HRESULT mpeg_splitter_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; -HRESULT wave_parser_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; -HRESULT wma_decoder_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; +HRESULT avi_splitter_create(IUnknown *outer, IUnknown **out); +HRESULT decodebin_parser_create(IUnknown *outer, IUnknown **out); +HRESULT mpeg_splitter_create(IUnknown *outer, IUnknown **out); +HRESULT wave_parser_create(IUnknown *outer, IUnknown **out); +HRESULT wma_decoder_create(IUnknown *outer, IUnknown **out); bool amt_from_wg_format(AM_MEDIA_TYPE *mt, const struct wg_format *format, bool wm); bool amt_to_wg_format(const AM_MEDIA_TYPE *mt, struct wg_format *format); -BOOL init_gstreamer(void) DECLSPEC_HIDDEN; +BOOL init_gstreamer(void); -extern HRESULT mfplat_get_class_object(REFCLSID rclsid, REFIID riid, void **obj) DECLSPEC_HIDDEN; -extern HRESULT mfplat_DllRegisterServer(void) DECLSPEC_HIDDEN; +extern HRESULT mfplat_get_class_object(REFCLSID rclsid, REFIID riid, void **obj); +extern HRESULT mfplat_DllRegisterServer(void); -IMFMediaType *mf_media_type_from_wg_format(const struct wg_format *format) DECLSPEC_HIDDEN; -void mf_media_type_to_wg_format(IMFMediaType *type, struct wg_format *format) DECLSPEC_HIDDEN; +IMFMediaType *mf_media_type_from_wg_format(const struct wg_format *format); +void mf_media_type_to_wg_format(IMFMediaType *type, struct wg_format *format); -HRESULT winegstreamer_stream_handler_create(REFIID riid, void **obj) DECLSPEC_HIDDEN; +HRESULT winegstreamer_stream_handler_create(REFIID riid, void **obj); -HRESULT audio_converter_create(REFIID riid, void **ret) DECLSPEC_HIDDEN; +HRESULT audio_converter_create(REFIID riid, void **ret); struct wm_stream { -- 2.34.1

2 9