March 2020 - Wine-commits - list.winehq.org

Zebediah Figura : d3dcompiler/tests: Add more tests for swizzles.
by Alexandre Julliard 12 Mar '20

12 Mar '20

Module: wine Branch: master Commit: e886c03680771baa4b28cf723c44ddf4b1a17784 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e886c03680771baa4b28cf72… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Mar 6 17:17:32 2020 -0600 d3dcompiler/tests: Add more tests for swizzles. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/tests/hlsl_d3d9.c | 40 +++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c index 525de9910b..ce63d3ea5d 100644 --- a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c +++ b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c @@ -307,6 +307,21 @@ static void test_swizzle(void) " return ret;\n" "}"; + static const char ps_multiple_lhs_source[] = + "float4 main() : COLOR\n" + "{\n" + " float4 ret = float4(0.1, 0.2, 0.3, 0.4);\n" + " ret.wyz.yx = float2(0.5, 0.6).yx;\n" + " return ret;\n" + "}"; + + static const char ps_multiple_rhs_source[] = + "float4 main() : COLOR\n" + "{\n" + " float4 ret = float4(0.1, 0.2, 0.3, 0.4).ywxz.zyyz;\n" + " return ret;\n" + "}"; + if (!init_test_context(&test_context)) return; device = test_context.device; @@ -328,6 +343,31 @@ static void test_swizzle(void) ID3D10Blob_Release(ps_code); } + + todo_wine ps_code = compile_shader(ps_multiple_lhs_source, "ps_2_0"); + if (ps_code) + { + draw_quad(device, ps_code); + + v = get_color_vec4(device, 0, 0); + ok(compare_vec4(&v, 0.1f, 0.6f, 0.3f, 0.5f, 0), + "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v.x, v.y, v.z, v.w); + + ID3D10Blob_Release(ps_code); + } + + todo_wine ps_code = compile_shader(ps_multiple_rhs_source, "ps_2_0"); + if (ps_code) + { + draw_quad(device, ps_code); + + v = get_color_vec4(device, 0, 0); + ok(compare_vec4(&v, 0.1f, 0.4f, 0.4f, 0.1f, 0), + "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v.x, v.y, v.z, v.w); + + ID3D10Blob_Release(ps_code); + } + release_test_context(&test_context); }

1 0

Zebediah Figura : d3dcompiler: Unwrap swizzles from the left-hand side of an assignment.
by Alexandre Julliard 12 Mar '20

12 Mar '20

Module: wine Branch: master Commit: bdbf0b43b729b09e7acbdd9b680d34d0cf582ef7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bdbf0b43b729b09e7acbdd9b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Mar 6 17:17:33 2020 -0600 d3dcompiler: Unwrap swizzles from the left-hand side of an assignment. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/tests/hlsl_d3d9.c | 5 +- dlls/d3dcompiler_43/utils.c | 104 ++++++++++++++++++++++++++++------ 2 files changed, 88 insertions(+), 21 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c index ce63d3ea5d..7f391833f3 100644 --- a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c +++ b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c @@ -828,10 +828,9 @@ static void test_fail(void) compiled = errors = NULL; hr = ppD3DCompile(tests[i], strlen(tests[i]), NULL, NULL, NULL, "test", targets[j], 0, 0, &compiled, &errors); todo_wine ok(hr == E_FAIL, "Test %u, target %s, got unexpected hr %#x.\n", i, targets[j], hr); - todo_wine_if (i == 1) ok(!!errors, "Test %u, target %s, expected non-NULL error blob.\n", i, targets[j]); + ok(!!errors, "Test %u, target %s, expected non-NULL error blob.\n", i, targets[j]); ok(!compiled, "Test %u, target %s, expected no compiled shader blob.\n", i, targets[j]); - if (errors) - ID3D10Blob_Release(errors); + ID3D10Blob_Release(errors); } } } diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 1b572aa0ae..9c38800808 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -1422,13 +1422,46 @@ static enum hlsl_ir_expr_op op_from_assignment(enum parse_assign_op op) return ops[op]; } -struct hlsl_ir_node *make_assignment(struct hlsl_ir_node *left, enum parse_assign_op assign_op, - struct hlsl_ir_node *right) +static unsigned int invert_swizzle(unsigned int *swizzle, unsigned int writemask) +{ + unsigned int i, j, bit = 0, inverted = 0, components, new_writemask = 0, new_swizzle = 0; + + /* Apply the writemask to the swizzle to get a new writemask and swizzle. */ + for (i = 0; i < 4; ++i) + { + if (writemask & (1 << i)) + { + unsigned int s = (*swizzle >> (i * 2)) & 3; + new_swizzle |= s << (bit++ * 2); + if (new_writemask & (1 << s)) + return 0; + new_writemask |= 1 << s; + } + } + components = bit; + + /* Invert the swizzle. */ + bit = 0; + for (i = 0; i < 4; ++i) + { + for (j = 0; j < components; ++j) + { + unsigned int s = (new_swizzle >> (j * 2)) & 3; + if (s == i) + inverted |= j << (bit++ * 2); + } + } + + *swizzle = inverted; + return new_writemask; +} + +struct hlsl_ir_node *make_assignment(struct hlsl_ir_node *lhs, enum parse_assign_op assign_op, + struct hlsl_ir_node *rhs) { struct hlsl_ir_assignment *assign = d3dcompiler_alloc(sizeof(*assign)); - DWORD writemask = BWRITERSP_WRITEMASK_ALL; + DWORD writemask = (1 << lhs->data_type->dimx) - 1; struct hlsl_type *type; - struct hlsl_ir_node *lhs, *rhs; if (!assign) { @@ -1436,46 +1469,81 @@ struct hlsl_ir_node *make_assignment(struct hlsl_ir_node *left, enum parse_assig return NULL; } + while (lhs->type != HLSL_IR_DEREF) + { + struct hlsl_ir_node *lhs_inner; + + if (lhs->type == HLSL_IR_EXPR && expr_from_node(lhs)->op == HLSL_IR_UNOP_CAST) + { + FIXME("Cast on the lhs.\n"); + d3dcompiler_free(assign); + return NULL; + } + else if (lhs->type == HLSL_IR_SWIZZLE) + { + struct hlsl_ir_swizzle *swizzle = swizzle_from_node(lhs); + + if (lhs->data_type->type == HLSL_CLASS_MATRIX) + FIXME("Assignments with writemasks and matrices on lhs are not supported yet.\n"); + + lhs_inner = swizzle->val; + list_remove(&lhs->entry); + + list_add_after(&rhs->entry, &lhs->entry); + swizzle->val = rhs; + if (!(writemask = invert_swizzle(&swizzle->swizzle, writemask))) + { + hlsl_report_message(lhs->loc, HLSL_LEVEL_ERROR, "invalid writemask"); + d3dcompiler_free(assign); + return NULL; + } + rhs = &swizzle->node; + } + else + { + hlsl_report_message(lhs->loc, HLSL_LEVEL_ERROR, "invalid lvalue"); + d3dcompiler_free(assign); + return NULL; + } + + lhs = lhs_inner; + } + TRACE("Creating proper assignment expression.\n"); - rhs = right; if (writemask == BWRITERSP_WRITEMASK_ALL) - type = left->data_type; + type = lhs->data_type; else { unsigned int dimx = 0; DWORD bitmask; enum hlsl_type_class type_class; - if (left->data_type->type > HLSL_CLASS_LAST_NUMERIC) + if (lhs->data_type->type > HLSL_CLASS_LAST_NUMERIC) { - hlsl_report_message(left->loc, HLSL_LEVEL_ERROR, + hlsl_report_message(lhs->loc, HLSL_LEVEL_ERROR, "writemask on a non scalar/vector/matrix type"); d3dcompiler_free(assign); return NULL; } - bitmask = writemask & ((1 << left->data_type->dimx) - 1); + bitmask = writemask & ((1 << lhs->data_type->dimx) - 1); while (bitmask) { if (bitmask & 1) dimx++; bitmask >>= 1; } - if (left->data_type->type == HLSL_CLASS_MATRIX) + if (lhs->data_type->type == HLSL_CLASS_MATRIX) FIXME("Assignments with writemasks and matrices on lhs are not supported yet.\n"); if (dimx == 1) type_class = HLSL_CLASS_SCALAR; else - type_class = left->data_type->type; - type = new_hlsl_type(NULL, type_class, left->data_type->base_type, dimx, 1); + type_class = lhs->data_type->type; + type = new_hlsl_type(NULL, type_class, lhs->data_type->base_type, dimx, 1); } assign->node.type = HLSL_IR_ASSIGNMENT; - assign->node.loc = left->loc; + assign->node.loc = lhs->loc; assign->node.data_type = type; assign->writemask = writemask; - FIXME("Check for casts in the lhs.\n"); - - lhs = left; - /* FIXME: check for invalid writemasks on the lhs. */ rhs = implicit_conversion(rhs, type, &rhs->loc); @@ -1485,7 +1553,7 @@ struct hlsl_ir_node *make_assignment(struct hlsl_ir_node *left, enum parse_assig enum hlsl_ir_expr_op op = op_from_assignment(assign_op); struct hlsl_ir_node *expr; - if (lhs->type != HLSL_IR_DEREF || deref_from_node(lhs)->type != HLSL_IR_DEREF_VAR) + if (deref_from_node(lhs)->type != HLSL_IR_DEREF_VAR) { FIXME("LHS expression not supported in compound assignments yet.\n"); assign->rhs = rhs;

1 0

Zebediah Figura : d3dcompiler: Separate out an hlsl_deref structure and store it in hlsl_ir_assignment directly.
by Alexandre Julliard 12 Mar '20

12 Mar '20

Module: wine Branch: master Commit: 54387427b0aec5012aa0dae12a7c72f189d3c3a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=54387427b0aec5012aa0dae1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Mar 6 17:17:34 2020 -0600 d3dcompiler: Separate out an hlsl_deref structure and store it in hlsl_ir_assignment directly. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/d3dcompiler_private.h | 25 +++++++++++++++---------- dlls/d3dcompiler_43/hlsl.y | 6 +++--- dlls/d3dcompiler_43/utils.c | 25 +++++++++++++++---------- 3 files changed, 33 insertions(+), 23 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 04878c7046..830434c9ff 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -796,14 +796,6 @@ struct hlsl_ir_loop struct list *body; }; -struct hlsl_ir_assignment -{ - struct hlsl_ir_node node; - struct hlsl_ir_node *lhs; - struct hlsl_ir_node *rhs; - unsigned char writemask; -}; - enum hlsl_ir_expr_op { HLSL_IR_UNOP_BIT_NOT = 0, HLSL_IR_UNOP_LOGIC_NOT, @@ -907,9 +899,8 @@ enum hlsl_ir_deref_type HLSL_IR_DEREF_RECORD, }; -struct hlsl_ir_deref +struct hlsl_deref { - struct hlsl_ir_node node; enum hlsl_ir_deref_type type; union { @@ -927,6 +918,20 @@ struct hlsl_ir_deref } v; }; +struct hlsl_ir_deref +{ + struct hlsl_ir_node node; + struct hlsl_deref src; +}; + +struct hlsl_ir_assignment +{ + struct hlsl_ir_node node; + struct hlsl_deref lhs; + struct hlsl_ir_node *rhs; + unsigned char writemask; +}; + struct hlsl_ir_constant { struct hlsl_ir_node node; diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 591f755a7b..a24d29e5df 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -2123,9 +2123,9 @@ postfix_expr: primary_expr free_instr_list($3); YYABORT; } - deref->type = HLSL_IR_DEREF_ARRAY; - deref->v.array.array = node_from_list($1); - deref->v.array.index = node_from_list($3); + deref->src.type = HLSL_IR_DEREF_ARRAY; + deref->src.v.array.array = node_from_list($1); + deref->src.v.array.index = node_from_list($3); $$ = append_binop($1, $3, &deref->node); } diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 9c38800808..29b35c3d7e 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -1380,8 +1380,8 @@ struct hlsl_ir_deref *new_var_deref(struct hlsl_ir_var *var) } deref->node.type = HLSL_IR_DEREF; deref->node.data_type = var->data_type; - deref->type = HLSL_IR_DEREF_VAR; - deref->v.var = var; + deref->src.type = HLSL_IR_DEREF_VAR; + deref->src.v.var = var; return deref; } @@ -1396,9 +1396,9 @@ struct hlsl_ir_deref *new_record_deref(struct hlsl_ir_node *record, struct hlsl_ } deref->node.type = HLSL_IR_DEREF; deref->node.data_type = field->type; - deref->type = HLSL_IR_DEREF_RECORD; - deref->v.record.record = record; - deref->v.record.field = field; + deref->src.type = HLSL_IR_DEREF_RECORD; + deref->src.v.record.record = record; + deref->src.v.record.field = field; return deref; } @@ -1547,13 +1547,13 @@ struct hlsl_ir_node *make_assignment(struct hlsl_ir_node *lhs, enum parse_assign rhs = implicit_conversion(rhs, type, &rhs->loc); - assign->lhs = lhs; + assign->lhs = deref_from_node(lhs)->src; if (assign_op != ASSIGN_OP_ASSIGN) { enum hlsl_ir_expr_op op = op_from_assignment(assign_op); struct hlsl_ir_node *expr; - if (deref_from_node(lhs)->type != HLSL_IR_DEREF_VAR) + if (assign->lhs.type != HLSL_IR_DEREF_VAR) { FIXME("LHS expression not supported in compound assignments yet.\n"); assign->rhs = rhs; @@ -1567,7 +1567,12 @@ struct hlsl_ir_node *make_assignment(struct hlsl_ir_node *lhs, enum parse_assign } } else + { + list_remove(&lhs->entry); + /* Don't recursively free the deref; we just copied its members. */ + d3dcompiler_free(lhs); assign->rhs = rhs; + } return &assign->node; } @@ -1860,7 +1865,7 @@ static void debug_dump_ir_var(const struct hlsl_ir_var *var) wine_dbg_printf(" : %s", debugstr_a(var->semantic)); } -static void debug_dump_ir_deref(const struct hlsl_ir_deref *deref) +static void debug_dump_deref(const struct hlsl_deref *deref) { switch (deref->type) { @@ -2048,7 +2053,7 @@ static const char *debug_writemask(DWORD writemask) static void debug_dump_ir_assignment(const struct hlsl_ir_assignment *assign) { wine_dbg_printf("= ("); - debug_dump_src(assign->lhs); + debug_dump_deref(&assign->lhs); if (assign->writemask != BWRITERSP_WRITEMASK_ALL) wine_dbg_printf("%s", debug_writemask(assign->writemask)); wine_dbg_printf(" "); @@ -2129,7 +2134,7 @@ static void debug_dump_instr(const struct hlsl_ir_node *instr) debug_dump_ir_expr(expr_from_node(instr)); break; case HLSL_IR_DEREF: - debug_dump_ir_deref(deref_from_node(instr)); + debug_dump_deref(&deref_from_node(instr)->src); break; case HLSL_IR_CONSTANT: debug_dump_ir_constant(constant_from_node(instr));

1 0

Jacek Caban : dbghelp: Use Windows API to map ELF files.
by Alexandre Julliard 12 Mar '20

12 Mar '20

Module: wine Branch: master Commit: a60b3985bf37827fd0b0f7583c31dcf52069b4a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a60b3985bf37827fd0b0f758… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 12 16:18:39 2020 +0100 dbghelp: Use Windows API to map ELF files. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/elf_module.c | 168 ++++++++++++++++++++++++------------------- dlls/dbghelp/image_private.h | 2 +- 2 files changed, 94 insertions(+), 76 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a60b3985bf37827fd0b0…

1 0

Nikolay Sivov : mfplat: Add MFGetStrideForBitmapInfoHeader().
by Alexandre Julliard 12 Mar '20

12 Mar '20

Module: wine Branch: master Commit: d62f8f645a0a7a4b138b36a203916c00c4aa44ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=d62f8f645a0a7a4b138b36a2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 12 18:39:10 2020 +0300 mfplat: Add MFGetStrideForBitmapInfoHeader(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mediatype.c | 120 +++++++++++++++++++++++++++++++++++---------- dlls/mfplat/mfplat.spec | 2 +- dlls/mfplat/tests/mfplat.c | 73 +++++++++++++++++++++++++-- include/mfapi.h | 1 + 4 files changed, 166 insertions(+), 30 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d62f8f645a0a7a4b138b…

1 0

Nikolay Sivov : mf/tests: Use wide string literals.
by Alexandre Julliard 12 Mar '20

12 Mar '20

Module: wine Branch: master Commit: 36543adbe72bbc1c46af7299e603b6557ef30348 URL: https://source.winehq.org/git/wine.git/?a=commit;h=36543adbe72bbc1c46af7299… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 12 18:39:11 2020 +0300 mf/tests: Use wide string literals. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 8ebfd0ddee..d799446676 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1230,8 +1230,6 @@ static const IMFSampleGrabberSinkCallbackVtbl test_grabber_callback_vtbl = static void test_topology_loader(void) { IMFSampleGrabberSinkCallback test_grabber_callback = { &test_grabber_callback_vtbl }; - static const WCHAR wavW[] = {'a','u','d','i','o','/','w','a','v',0}; - static const WCHAR nameW[] = {'t','e','s','t','.','w','a','v',0}; IMFTopology *topology, *topology2, *full_topology; IMFTopologyNode *src_node, *sink_node; IMFPresentationDescriptor *pd; @@ -1271,13 +1269,13 @@ todo_wine hr = MFCreateSourceResolver(&resolver); ok(hr == S_OK, "Failed to create source resolver, hr %#x.\n", hr); - filename = load_resource(nameW); + filename = load_resource(L"test.wav"); hr = MFCreateFile(MF_ACCESSMODE_READ, MF_OPENMODE_FAIL_IF_NOT_EXIST, MF_FILEFLAGS_NONE, filename, &stream); ok(hr == S_OK, "Failed to create file stream, hr %#x.\n", hr); IMFByteStream_QueryInterface(stream, &IID_IMFAttributes, (void **)&attr); - IMFAttributes_SetString(attr, &MF_BYTESTREAM_CONTENT_TYPE, wavW); + IMFAttributes_SetString(attr, &MF_BYTESTREAM_CONTENT_TYPE, L"audio/wav"); IMFAttributes_Release(attr); hr = IMFSourceResolver_CreateObjectFromByteStream(resolver, stream, NULL, MF_RESOLUTION_MEDIASOURCE, NULL,

1 0

Nikolay Sivov : mfplat: Add a stub for 2D system memory buffer object.
by Alexandre Julliard 12 Mar '20

12 Mar '20

Module: wine Branch: master Commit: 1fb20f67d8670a661c8a2904669dc233827eff9f URL: https://source.winehq.org/git/wine.git/?a=commit;h=1fb20f67d8670a661c8a2904… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 12 18:39:12 2020 +0300 mfplat: Add a stub for 2D system memory buffer object. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/buffer.c | 233 ++++++++++++++++++++++++++++++++++++++++--- dlls/mfplat/mediatype.c | 6 ++ dlls/mfplat/mfplat.spec | 1 + dlls/mfplat/mfplat_private.h | 2 + dlls/mfplat/tests/mfplat.c | 49 +++++++++ include/mfapi.h | 1 + include/mfobjects.idl | 26 +++++ 7 files changed, 306 insertions(+), 12 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1fb20f67d8670a661c8a…

1 0

Jacek Caban : ucrtbase/tests: Link to ucrtbase.
by Alexandre Julliard 12 Mar '20

12 Mar '20

Module: wine Branch: master Commit: 6b52c24d2f4b67038352afa9ab3035fea1cf7863 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b52c24d2f4b67038352afa9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 12 17:21:24 2020 +0100 ucrtbase/tests: Link to ucrtbase. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/tests/Makefile.in | 1 + dlls/ucrtbase/tests/string.c | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/ucrtbase/tests/Makefile.in b/dlls/ucrtbase/tests/Makefile.in index 116bdcc7b6..126cafd66d 100644 --- a/dlls/ucrtbase/tests/Makefile.in +++ b/dlls/ucrtbase/tests/Makefile.in @@ -1,4 +1,5 @@ TESTDLL = ucrtbase.dll +IMPORTS = ucrtbase C_SRCS = \ cpp.c \ diff --git a/dlls/ucrtbase/tests/string.c b/dlls/ucrtbase/tests/string.c index c0b2336322..aff37efc6f 100644 --- a/dlls/ucrtbase/tests/string.c +++ b/dlls/ucrtbase/tests/string.c @@ -215,21 +215,21 @@ static void test__memicmp(void) errno = 0xdeadbeef; ret = p__memicmp(NULL, NULL, 1); ok(ret == _NLSCMPERROR, "got %d\n", ret); - ok(errno == 0xdeadbeef, "Unexpected errno = %d\n", errno); + ok(errno == EINVAL, "Unexpected errno = %d\n", errno); CHECK_CALLED(invalid_parameter_handler); SET_EXPECT(invalid_parameter_handler); errno = 0xdeadbeef; ret = p__memicmp(s1, NULL, 1); ok(ret == _NLSCMPERROR, "got %d\n", ret); - ok(errno == 0xdeadbeef, "Unexpected errno = %d\n", errno); + ok(errno == EINVAL, "Unexpected errno = %d\n", errno); CHECK_CALLED(invalid_parameter_handler); SET_EXPECT(invalid_parameter_handler); errno = 0xdeadbeef; ret = p__memicmp(NULL, s2, 1); ok(ret == _NLSCMPERROR, "got %d\n", ret); - ok(errno == 0xdeadbeef, "Unexpected errno = %d\n", errno); + ok(errno == EINVAL, "Unexpected errno = %d\n", errno); CHECK_CALLED(invalid_parameter_handler); ret = p__memicmp(s1, s2, 2); @@ -258,21 +258,21 @@ static void test__memicmp_l(void) errno = 0xdeadbeef; ret = p__memicmp_l(NULL, NULL, 1, NULL); ok(ret == _NLSCMPERROR, "got %d\n", ret); - ok(errno == 0xdeadbeef, "Unexpected errno = %d\n", errno); + ok(errno == EINVAL, "Unexpected errno = %d\n", errno); CHECK_CALLED(invalid_parameter_handler); SET_EXPECT(invalid_parameter_handler); errno = 0xdeadbeef; ret = p__memicmp_l(s1, NULL, 1, NULL); ok(ret == _NLSCMPERROR, "got %d\n", ret); - ok(errno == 0xdeadbeef, "Unexpected errno = %d\n", errno); + ok(errno == EINVAL, "Unexpected errno = %d\n", errno); CHECK_CALLED(invalid_parameter_handler); SET_EXPECT(invalid_parameter_handler); errno = 0xdeadbeef; ret = p__memicmp_l(NULL, s2, 1, NULL); ok(ret == _NLSCMPERROR, "got %d\n", ret); - ok(errno == 0xdeadbeef, "Unexpected errno = %d\n", errno); + ok(errno == EINVAL, "Unexpected errno = %d\n", errno); CHECK_CALLED(invalid_parameter_handler); ret = p__memicmp_l(s1, s2, 2, NULL);

1 0

Jacek Caban : ucrtbase/tests: Use public _CRT_INTERNAL_PRINTF_* defines.
by Alexandre Julliard 12 Mar '20

12 Mar '20

Module: wine Branch: master Commit: 01bc7e09bda1fdc719007f3fc1deda5883926fb5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=01bc7e09bda1fdc719007f3f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 12 17:21:35 2020 +0100 ucrtbase/tests: Use public _CRT_INTERNAL_PRINTF_* defines. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/tests/printf.c | 38 ++++++++++++++++---------------------- 1 file changed, 16 insertions(+), 22 deletions(-) diff --git a/dlls/ucrtbase/tests/printf.c b/dlls/ucrtbase/tests/printf.c index 9c6ece9808..e743397331 100644 --- a/dlls/ucrtbase/tests/printf.c +++ b/dlls/ucrtbase/tests/printf.c @@ -62,12 +62,6 @@ DEFINE_EXPECT(invalid_parameter_handler); #undef errno #define errno (*p_errno()) -#define UCRTBASE_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION (0x0001) -#define UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR (0x0002) -#define UCRTBASE_PRINTF_LEGACY_WIDE_SPECIFIERS (0x0004) -#define UCRTBASE_PRINTF_LEGACY_MSVCRT_COMPATIBILITY (0x0008) -#define UCRTBASE_PRINTF_LEGACY_THREE_DIGIT_EXPONENTS (0x0010) - static inline float __port_ind(void) { static const unsigned __ind_bytes = 0xffc00000; @@ -162,7 +156,7 @@ static void test_snprintf (void) for (i = 0; i < ARRAY_SIZE(tests); i++) { const char *fmt = tests[i]; const int expect = strlen(fmt) > bufsiz ? -1 : strlen(fmt); - const int n = vsprintf_wrapper (UCRTBASE_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION, buffer, bufsiz, fmt); + const int n = vsprintf_wrapper (_CRT_INTERNAL_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION, buffer, bufsiz, fmt); const int valid = n < 0 ? bufsiz : (n == bufsiz ? n : n+1); ok (n == expect, "\"%s\": expected %d, returned %d\n", @@ -175,7 +169,7 @@ static void test_snprintf (void) for (i = 0; i < ARRAY_SIZE(tests); i++) { const char *fmt = tests[i]; const int expect = strlen(fmt); - const int n = vsprintf_wrapper (UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR, buffer, bufsiz, fmt); + const int n = vsprintf_wrapper (_CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR, buffer, bufsiz, fmt); const int valid = n >= bufsiz ? bufsiz - 1 : n < 0 ? 0 : n; ok (n == expect, "\"%s\": expected %d, returned %d\n", @@ -201,9 +195,9 @@ static void test_snprintf (void) "\"%s\": Missing null termination (ret %d) - is %d\n", fmt, n, buffer[valid]); } - ok (vsprintf_wrapper (UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR, NULL, 0, "abcd") == 4, + ok (vsprintf_wrapper (_CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR, NULL, 0, "abcd") == 4, "Failure to snprintf to NULL\n"); - ok (vsprintf_wrapper (UCRTBASE_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION, NULL, 0, "abcd") == 4, + ok (vsprintf_wrapper (_CRT_INTERNAL_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION, NULL, 0, "abcd") == 4, "Failure to snprintf to NULL\n"); ok (vsprintf_wrapper (0, NULL, 0, "abcd") == 4, "Failure to snprintf to NULL\n"); @@ -237,7 +231,7 @@ static void test_swprintf (void) for (i = 0; i < ARRAY_SIZE(tests); i++) { const wchar_t *fmt = tests[i]; const int expect = wcslen(fmt) > bufsiz ? -1 : wcslen(fmt); - const int n = vswprintf_wrapper (UCRTBASE_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION, buffer, bufsiz, fmt); + const int n = vswprintf_wrapper (_CRT_INTERNAL_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION, buffer, bufsiz, fmt); const int valid = n < 0 ? bufsiz : (n == bufsiz ? n : n+1); WideCharToMultiByte (CP_ACP, 0, buffer, -1, narrow, sizeof(narrow), NULL, NULL); @@ -252,7 +246,7 @@ static void test_swprintf (void) for (i = 0; i < ARRAY_SIZE(tests); i++) { const wchar_t *fmt = tests[i]; const int expect = wcslen(fmt); - const int n = vswprintf_wrapper (UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR, buffer, bufsiz, fmt); + const int n = vswprintf_wrapper (_CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR, buffer, bufsiz, fmt); const int valid = n >= bufsiz ? bufsiz - 1 : n < 0 ? 0 : n; WideCharToMultiByte (CP_ACP, 0, buffer, -1, narrow, sizeof(narrow), NULL, NULL); @@ -282,9 +276,9 @@ static void test_swprintf (void) "\"%s\": Missing null termination (ret %d) - is %d\n", narrow_fmt, n, buffer[valid]); } - ok (vswprintf_wrapper (UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR, NULL, 0, str_short) == 5, + ok (vswprintf_wrapper (_CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR, NULL, 0, str_short) == 5, "Failure to swprintf to NULL\n"); - ok (vswprintf_wrapper (UCRTBASE_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION, NULL, 0, str_short) == 5, + ok (vswprintf_wrapper (_CRT_INTERNAL_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION, NULL, 0, str_short) == 5, "Failure to swprintf to NULL\n"); ok (vswprintf_wrapper (0, NULL, 0, str_short) == 5, "Failure to swprintf to NULL\n"); @@ -587,13 +581,13 @@ static void test_printf_legacy_wide(void) vsprintf_wrapper(0, buffer, sizeof(buffer), narrow_fmt, narrow, wide); ok(!strcmp(buffer, out), "buffer wrong, got=%s\n", buffer); - vsprintf_wrapper(UCRTBASE_PRINTF_LEGACY_WIDE_SPECIFIERS, buffer, sizeof(buffer), narrow_fmt, narrow, wide); + vsprintf_wrapper(_CRT_INTERNAL_PRINTF_LEGACY_WIDE_SPECIFIERS, buffer, sizeof(buffer), narrow_fmt, narrow, wide); ok(!strcmp(buffer, out), "buffer wrong, got=%s\n", buffer); vswprintf_wrapper(0, wbuffer, sizeof(wbuffer), std_wide_fmt, narrow, wide); WideCharToMultiByte(CP_ACP, 0, wbuffer, -1, buffer, sizeof(buffer), NULL, NULL); ok(!strcmp(buffer, out), "buffer wrong, got=%s\n", buffer); - vswprintf_wrapper(UCRTBASE_PRINTF_LEGACY_WIDE_SPECIFIERS, wbuffer, sizeof(wbuffer), legacy_wide_fmt, narrow, wide); + vswprintf_wrapper(_CRT_INTERNAL_PRINTF_LEGACY_WIDE_SPECIFIERS, wbuffer, sizeof(wbuffer), legacy_wide_fmt, narrow, wide); WideCharToMultiByte(CP_ACP, 0, wbuffer, -1, buffer, sizeof(buffer), NULL, NULL); ok(!strcmp(buffer, out), "buffer wrong, got=%s\n", buffer); } @@ -607,20 +601,20 @@ static void test_printf_legacy_msvcrt(void) * a length modifier. */ vsprintf_wrapper(0, buf, sizeof(buf), "%F", 1.23); ok(!strcmp(buf, "1.230000"), "buf = %s\n", buf); - vsprintf_wrapper(UCRTBASE_PRINTF_LEGACY_MSVCRT_COMPATIBILITY, buf, sizeof(buf), "%Fd %Nd", 123, 456); + vsprintf_wrapper(_CRT_INTERNAL_PRINTF_LEGACY_MSVCRT_COMPATIBILITY, buf, sizeof(buf), "%Fd %Nd", 123, 456); ok(!strcmp(buf, "123 456"), "buf = %s\n", buf); vsprintf_wrapper(0, buf, sizeof(buf), "%f %F %f %e %E %g %G", INFINITY, INFINITY, -INFINITY, INFINITY, INFINITY, INFINITY, INFINITY); ok(!strcmp(buf, "inf INF -inf inf INF inf INF"), "buf = %s\n", buf); - vsprintf_wrapper(UCRTBASE_PRINTF_LEGACY_MSVCRT_COMPATIBILITY, buf, sizeof(buf), "%f", INFINITY); + vsprintf_wrapper(_CRT_INTERNAL_PRINTF_LEGACY_MSVCRT_COMPATIBILITY, buf, sizeof(buf), "%f", INFINITY); ok(!strcmp(buf, "1.#INF00"), "buf = %s\n", buf); vsprintf_wrapper(0, buf, sizeof(buf), "%f %F", NAN, NAN); ok(!strcmp(buf, "nan NAN"), "buf = %s\n", buf); - vsprintf_wrapper(UCRTBASE_PRINTF_LEGACY_MSVCRT_COMPATIBILITY, buf, sizeof(buf), "%f", NAN); + vsprintf_wrapper(_CRT_INTERNAL_PRINTF_LEGACY_MSVCRT_COMPATIBILITY, buf, sizeof(buf), "%f", NAN); ok(!strcmp(buf, "1.#QNAN0"), "buf = %s\n", buf); vsprintf_wrapper(0, buf, sizeof(buf), "%f %F", IND, IND); ok(!strcmp(buf, "-nan(ind) -NAN(IND)"), "buf = %s\n", buf); - vsprintf_wrapper(UCRTBASE_PRINTF_LEGACY_MSVCRT_COMPATIBILITY, buf, sizeof(buf), "%f", IND); + vsprintf_wrapper(_CRT_INTERNAL_PRINTF_LEGACY_MSVCRT_COMPATIBILITY, buf, sizeof(buf), "%f", IND); ok(!strcmp(buf, "-1.#IND00"), "buf = %s\n", buf); } @@ -630,7 +624,7 @@ static void test_printf_legacy_three_digit_exp(void) vsprintf_wrapper(0, buf, sizeof(buf), "%E", 1.23); ok(!strcmp(buf, "1.230000E+00"), "buf = %s\n", buf); - vsprintf_wrapper(UCRTBASE_PRINTF_LEGACY_THREE_DIGIT_EXPONENTS, buf, sizeof(buf), "%E", 1.23); + vsprintf_wrapper(_CRT_INTERNAL_PRINTF_LEGACY_THREE_DIGIT_EXPONENTS, buf, sizeof(buf), "%E", 1.23); ok(!strcmp(buf, "1.230000E+000"), "buf = %s\n", buf); vsprintf_wrapper(0, buf, sizeof(buf), "%E", 1.23e+123); ok(!strcmp(buf, "1.230000E+123"), "buf = %s\n", buf); @@ -645,7 +639,7 @@ static void test_printf_c99(void) * as size_t size for integers. */ for (i = 0; i < 2; i++) { unsigned __int64 options = (i == 0) ? 0 : - UCRTBASE_PRINTF_LEGACY_MSVCRT_COMPATIBILITY; + _CRT_INTERNAL_PRINTF_LEGACY_MSVCRT_COMPATIBILITY; /* z modifier accepts size_t argument */ vsprintf_wrapper(options, buf, sizeof(buf), "%zx %d", SIZE_MAX, 1);

1 0

Jacek Caban : ucrtbase/tests: Directly use __stdio_common_* functions.
by Alexandre Julliard 12 Mar '20

12 Mar '20

Module: wine Branch: master Commit: cd030f752f34c8ff21ae183114ee11268cf1ad22 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd030f752f34c8ff21ae1831… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 12 17:21:41 2020 +0100 ucrtbase/tests: Directly use __stdio_common_* functions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/tests/printf.c | 37 +++++++------------------------------ 1 file changed, 7 insertions(+), 30 deletions(-) diff --git a/dlls/ucrtbase/tests/printf.c b/dlls/ucrtbase/tests/printf.c index e743397331..3e0a9a7b4d 100644 --- a/dlls/ucrtbase/tests/printf.c +++ b/dlls/ucrtbase/tests/printf.c @@ -69,21 +69,6 @@ static inline float __port_ind(void) } #define IND __port_ind() -static int (__cdecl *p_vfprintf)(unsigned __int64 options, FILE *file, const char *format, - void *locale, __ms_va_list valist); -static int (__cdecl *p_vfwprintf)(unsigned __int64 options, FILE *file, const wchar_t *format, - void *locale, __ms_va_list valist); -static int (__cdecl *p_vsprintf)(unsigned __int64 options, char *str, size_t len, const char *format, - void *locale, __ms_va_list valist); -static int (__cdecl *p_vsnprintf_s)(unsigned __int64 options, char *str, size_t sizeOfBuffer, size_t count, const char *format, - void *locale, __ms_va_list valist); -static int (__cdecl *p_vsprintf_s)(unsigned __int64 options, char *str, size_t count, const char *format, - void *locale, __ms_va_list valist); -static int (__cdecl *p_vswprintf)(unsigned __int64 options, wchar_t *str, size_t len, const wchar_t *format, - void *locale, __ms_va_list valist); -static int (__cdecl *p_vsnwprintf_s)(unsigned __int64 options, WCHAR *str, size_t sizeOfBuffer, size_t count, const WCHAR *format, - void *locale, __ms_va_list valist); - static FILE *(__cdecl *p_fopen)(const char *name, const char *mode); static int (__cdecl *p_fclose)(FILE *file); static long (__cdecl *p_ftell)(FILE *file); @@ -115,14 +100,6 @@ static BOOL init( void ) return FALSE; } - p_vfprintf = (void *)GetProcAddress(hmod, "__stdio_common_vfprintf"); - p_vfwprintf = (void *)GetProcAddress(hmod, "__stdio_common_vfwprintf"); - p_vsprintf = (void *)GetProcAddress(hmod, "__stdio_common_vsprintf"); - p_vsnprintf_s = (void *)GetProcAddress(hmod, "__stdio_common_vsnprintf_s"); - p_vsnwprintf_s = (void *)GetProcAddress(hmod, "__stdio_common_vsnwprintf_s"); - p_vsprintf_s = (void *)GetProcAddress(hmod, "__stdio_common_vsprintf_s"); - p_vswprintf = (void *)GetProcAddress(hmod, "__stdio_common_vswprintf"); - p_fopen = (void *)GetProcAddress(hmod, "fopen"); p_fclose = (void *)GetProcAddress(hmod, "fclose"); p_ftell = (void *)GetProcAddress(hmod, "ftell"); @@ -140,7 +117,7 @@ static int WINAPIV vsprintf_wrapper(unsigned __int64 options, char *str, int ret; __ms_va_list valist; __ms_va_start(valist, format); - ret = p_vsprintf(options, str, len, format, NULL, valist); + ret = __stdio_common_vsprintf(options, str, len, format, NULL, valist); __ms_va_end(valist); return ret; } @@ -209,7 +186,7 @@ static int WINAPIV vswprintf_wrapper(unsigned __int64 options, wchar_t *str, int ret; __ms_va_list valist; __ms_va_start(valist, format); - ret = p_vswprintf(options, str, len, format, NULL, valist); + ret = __stdio_common_vswprintf(options, str, len, format, NULL, valist); __ms_va_end(valist); return ret; } @@ -290,7 +267,7 @@ static int WINAPIV vfprintf_wrapper(FILE *file, int ret; __ms_va_list valist; __ms_va_start(valist, format); - ret = p_vfprintf(0, file, format, NULL, valist); + ret = __stdio_common_vfprintf(0, file, format, NULL, valist); __ms_va_end(valist); return ret; } @@ -363,7 +340,7 @@ static int WINAPIV vfwprintf_wrapper(FILE *file, int ret; __ms_va_list valist; __ms_va_start(valist, format); - ret = p_vfwprintf(0, file, format, NULL, valist); + ret = __stdio_common_vfwprintf(0, file, format, NULL, valist); __ms_va_end(valist); return ret; } @@ -454,7 +431,7 @@ static void test_fwprintf(void) /* format using % with NULL arglist*/ /* crashes on Windows */ - /* ret = p_vfwprintf(0, fp, cont_fmt, NULL, NULL); */ + /* ret = __stdio_common_vfwprintf(0, fp, cont_fmt, NULL, NULL); */ ok(p_set_invalid_parameter_handler(NULL) == test_invalid_parameter_handler, "Cannot reset invalid parameter handler\n"); @@ -466,7 +443,7 @@ static int WINAPIV _vsnprintf_s_wrapper(char *str, size_t sizeOfBuffer, int ret; __ms_va_list valist; __ms_va_start(valist, format); - ret = p_vsnprintf_s(0, str, sizeOfBuffer, count, format, NULL, valist); + ret = __stdio_common_vsnprintf_s(0, str, sizeOfBuffer, count, format, NULL, valist); __ms_va_end(valist); return ret; } @@ -518,7 +495,7 @@ static int WINAPIV _vsnwprintf_s_wrapper(WCHAR *str, size_t sizeOfBuffer, int ret; __ms_va_list valist; __ms_va_start(valist, format); - ret = p_vsnwprintf_s(0, str, sizeOfBuffer, count, format, NULL, valist); + ret = __stdio_common_vsnwprintf_s(0, str, sizeOfBuffer, count, format, NULL, valist); __ms_va_end(valist); return ret; }

1 0