wine-commits May 2021

wine-commits@winehq.org

2 participants
770 discussions

Zebediah Figura : vkd3d-shader: Write SM1 negation instructions.
by Alexandre Julliard 20 May '21

20 May '21

Module: vkd3d Branch: master Commit: 3a9f547be3ea9db804b285db027c0c0e482ab558 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3a9f547be3ea9db804b285d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue May 18 15:55:25 2021 -0500 vkd3d-shader: Write SM1 negation instructions. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_codegen.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 6491066..c2cedd2 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1618,6 +1618,28 @@ static void write_sm1_binary_op(struct hlsl_ctx *ctx, struct bytecode_buffer *bu write_sm1_instruction(ctx, buffer, &instr); } +static void write_sm1_unary_op(struct hlsl_ctx *ctx, struct bytecode_buffer *buffer, + D3DSHADER_INSTRUCTION_OPCODE_TYPE opcode, const struct hlsl_reg *dst, + const struct hlsl_reg *src, D3DSHADER_PARAM_SRCMOD_TYPE src_mod) +{ + const struct sm1_instruction instr = + { + .opcode = opcode, + + .dst.type = D3DSPR_TEMP, + .dst.writemask = dst->writemask, + .dst.reg = dst->id, + .has_dst = 1, + + .srcs[0].type = D3DSPR_TEMP, + .srcs[0].swizzle = swizzle_from_writemask(src->writemask), + .srcs[0].reg = src->id, + .srcs[0].mod = src_mod, + .src_count = 1, + }; + write_sm1_instruction(ctx, buffer, &instr); +} + static void write_sm1_constant_defs(struct hlsl_ctx *ctx, struct bytecode_buffer *buffer) { unsigned int i, x; @@ -1745,6 +1767,10 @@ static void write_sm1_expr(struct hlsl_ctx *ctx, struct bytecode_buffer *buffer, write_sm1_binary_op(ctx, buffer, D3DSIO_MUL, &instr->reg, &arg1->reg, &arg2->reg); break; + case HLSL_IR_UNOP_NEG: + write_sm1_unary_op(ctx, buffer, D3DSIO_MOV, &instr->reg, &arg1->reg, D3DSPSM_NEG); + break; + default: FIXME("Unhandled op %u.\n", expr->op); break;

1 0

Zebediah Figura : vkd3d-shader: Write SM1 multiplication instructions.
by Alexandre Julliard 20 May '21

20 May '21

Module: vkd3d Branch: master Commit: a35b0fc32114616ae0f4d1cb2a72b794de8bb954 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a35b0fc32114616ae0f4d1c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue May 18 15:55:24 2021 -0500 vkd3d-shader: Write SM1 multiplication instructions. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_codegen.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 166e5f5..6491066 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1741,6 +1741,10 @@ static void write_sm1_expr(struct hlsl_ctx *ctx, struct bytecode_buffer *buffer, write_sm1_binary_op(ctx, buffer, D3DSIO_ADD, &instr->reg, &arg1->reg, &arg2->reg); break; + case HLSL_IR_BINOP_MUL: + write_sm1_binary_op(ctx, buffer, D3DSIO_MUL, &instr->reg, &arg1->reg, &arg2->reg); + break; + default: FIXME("Unhandled op %u.\n", expr->op); break;

1 0

Zebediah Figura : vkd3d-shader: Write SM1 addition instructions.
by Alexandre Julliard 20 May '21

20 May '21

Module: vkd3d Branch: master Commit: dfaa3824605df43318a4bc3773a3dc55c1620647 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=dfaa3824605df43318a4bc3… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue May 18 15:55:23 2021 -0500 vkd3d-shader: Write SM1 addition instructions. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_codegen.c | 54 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 5717314..166e5f5 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1594,6 +1594,30 @@ static void write_sm1_instruction(struct hlsl_ctx *ctx, struct bytecode_buffer * write_sm1_src_register(buffer, &instr->srcs[i], instr->dst.writemask); }; +static void write_sm1_binary_op(struct hlsl_ctx *ctx, struct bytecode_buffer *buffer, + D3DSHADER_INSTRUCTION_OPCODE_TYPE opcode, const struct hlsl_reg *dst, + const struct hlsl_reg *src1, const struct hlsl_reg *src2) +{ + const struct sm1_instruction instr = + { + .opcode = opcode, + + .dst.type = D3DSPR_TEMP, + .dst.writemask = dst->writemask, + .dst.reg = dst->id, + .has_dst = 1, + + .srcs[0].type = D3DSPR_TEMP, + .srcs[0].swizzle = swizzle_from_writemask(src1->writemask), + .srcs[0].reg = src1->id, + .srcs[1].type = D3DSPR_TEMP, + .srcs[1].swizzle = swizzle_from_writemask(src2->writemask), + .srcs[1].reg = src2->id, + .src_count = 2, + }; + write_sm1_instruction(ctx, buffer, &instr); +} + static void write_sm1_constant_defs(struct hlsl_ctx *ctx, struct bytecode_buffer *buffer) { unsigned int i, x; @@ -1697,6 +1721,32 @@ static void write_sm1_constant(struct hlsl_ctx *ctx, struct bytecode_buffer *buf write_sm1_instruction(ctx, buffer, &sm1_instr); } +static void write_sm1_expr(struct hlsl_ctx *ctx, struct bytecode_buffer *buffer, const struct hlsl_ir_node *instr) +{ + struct hlsl_ir_expr *expr = hlsl_ir_expr(instr); + struct hlsl_ir_node *arg1 = expr->operands[0].node; + struct hlsl_ir_node *arg2 = expr->operands[1].node; + + assert(instr->reg.allocated); + + if (instr->data_type->base_type != HLSL_TYPE_FLOAT) + { + FIXME("Non-float operations need to be lowered.\n"); + return; + } + + switch (expr->op) + { + case HLSL_IR_BINOP_ADD: + write_sm1_binary_op(ctx, buffer, D3DSIO_ADD, &instr->reg, &arg1->reg, &arg2->reg); + break; + + default: + FIXME("Unhandled op %u.\n", expr->op); + break; + } +} + static void write_sm1_load(struct hlsl_ctx *ctx, struct bytecode_buffer *buffer, const struct hlsl_ir_node *instr) { const struct hlsl_ir_load *load = hlsl_ir_load(instr); @@ -1831,6 +1881,10 @@ static void write_sm1_instructions(struct hlsl_ctx *ctx, struct bytecode_buffer write_sm1_constant(ctx, buffer, instr); break; + case HLSL_IR_EXPR: + write_sm1_expr(ctx, buffer, instr); + break; + case HLSL_IR_LOAD: write_sm1_load(ctx, buffer, instr); break;

1 0

Zebediah Figura : vkd3d-shader: Write SM1 swizzle instructions.
by Alexandre Julliard 20 May '21

20 May '21

Module: vkd3d Branch: master Commit: 2bef48f33bbdbac1a2632002ccf4465fc5503238 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=2bef48f33bbdbac1a263200… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue May 18 15:55:22 2021 -0500 vkd3d-shader: Write SM1 swizzle instructions. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_codegen.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index f6628a2..5717314 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1159,6 +1159,17 @@ static unsigned int combine_writemasks(unsigned int first, unsigned int second) return ret; } +static unsigned int combine_swizzles(unsigned int first, unsigned int second, unsigned int dim) +{ + unsigned int ret = 0, i; + for (i = 0; i < dim; ++i) + { + unsigned int s = (second >> (i * 2)) & 3; + ret |= ((first >> (s * 2)) & 3) << (i * 2); + } + return ret; +} + static bool type_is_single_reg(const struct hlsl_type *type) { return type->type == HLSL_CLASS_SCALAR || type->type == HLSL_CLASS_VECTOR; @@ -1771,6 +1782,31 @@ static void write_sm1_store(struct hlsl_ctx *ctx, struct bytecode_buffer *buffer write_sm1_instruction(ctx, buffer, &sm1_instr); } +static void write_sm1_swizzle(struct hlsl_ctx *ctx, struct bytecode_buffer *buffer, const struct hlsl_ir_node *instr) +{ + const struct hlsl_ir_swizzle *swizzle = hlsl_ir_swizzle(instr); + const struct hlsl_ir_node *val = swizzle->val.node; + struct sm1_instruction sm1_instr = + { + .opcode = D3DSIO_MOV, + + .dst.type = D3DSPR_TEMP, + .dst.reg = instr->reg.id, + .dst.writemask = instr->reg.writemask, + .has_dst = 1, + + .srcs[0].type = D3DSPR_TEMP, + .srcs[0].reg = val->reg.id, + .srcs[0].swizzle = combine_swizzles(swizzle_from_writemask(val->reg.writemask), + swizzle->swizzle, instr->data_type->dimx), + .src_count = 1, + }; + + assert(instr->reg.allocated); + assert(val->reg.allocated); + write_sm1_instruction(ctx, buffer, &sm1_instr); +} + static void write_sm1_instructions(struct hlsl_ctx *ctx, struct bytecode_buffer *buffer, const struct hlsl_ir_function_decl *entry_func) { @@ -1803,6 +1839,10 @@ static void write_sm1_instructions(struct hlsl_ctx *ctx, struct bytecode_buffer write_sm1_store(ctx, buffer, instr); break; + case HLSL_IR_SWIZZLE: + write_sm1_swizzle(ctx, buffer, instr); + break; + default: FIXME("Unhandled instruction type %s.\n", hlsl_node_type_to_string(instr->type)); }

1 0

Zebediah Figura : vkd3d-shader: Write SM1 constant instructions.
by Alexandre Julliard 20 May '21

20 May '21

Module: vkd3d Branch: master Commit: cd21ba703b02ac37fbebede09decb542f2f48c93 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=cd21ba703b02ac37fbebede… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue May 18 15:55:21 2021 -0500 vkd3d-shader: Write SM1 constant instructions. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_codegen.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 05aea21..f6628a2 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1663,6 +1663,29 @@ static void write_sm1_semantic_dcls(struct hlsl_ctx *ctx, struct bytecode_buffer } } +static void write_sm1_constant(struct hlsl_ctx *ctx, struct bytecode_buffer *buffer, const struct hlsl_ir_node *instr) +{ + const struct hlsl_ir_constant *constant = hlsl_ir_constant(instr); + struct sm1_instruction sm1_instr = + { + .opcode = D3DSIO_MOV, + + .dst.type = D3DSPR_TEMP, + .dst.reg = instr->reg.id, + .dst.writemask = instr->reg.writemask, + .has_dst = 1, + + .srcs[0].type = D3DSPR_CONST, + .srcs[0].reg = constant->reg.id, + .srcs[0].swizzle = swizzle_from_writemask(constant->reg.writemask), + .src_count = 1, + }; + + assert(instr->reg.allocated); + assert(constant->reg.allocated); + write_sm1_instruction(ctx, buffer, &sm1_instr); +} + static void write_sm1_load(struct hlsl_ctx *ctx, struct bytecode_buffer *buffer, const struct hlsl_ir_node *instr) { const struct hlsl_ir_load *load = hlsl_ir_load(instr); @@ -1768,6 +1791,10 @@ static void write_sm1_instructions(struct hlsl_ctx *ctx, struct bytecode_buffer switch (instr->type) { + case HLSL_IR_CONSTANT: + write_sm1_constant(ctx, buffer, instr); + break; + case HLSL_IR_LOAD: write_sm1_load(ctx, buffer, instr); break;

1 0

Nikolay Sivov : dwrite/layout: Remove duplicated helper.
by Alexandre Julliard 19 May '21

19 May '21

Module: wine Branch: master Commit: 44b30c42cbb231e3ea54a47f6ecc19e641e5f889 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44b30c42cbb231e3ea54a47f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 19 17:34:07 2021 +0300 dwrite/layout: Remove duplicated helper. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 48741bf0847..26744e1b303 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -1471,11 +1471,6 @@ static inline IUnknown *layout_get_effect_from_pos(struct dwrite_textlayout *lay return ((struct layout_range_iface*)h)->iface; } -static inline BOOL layout_is_erun_rtl(const struct layout_effective_run *erun) -{ - return erun->run->u.regular.run.bidiLevel & 1; -} - /* A set of parameters that additionally splits resulting runs. It happens after shaping and all text processing, no glyph changes are possible. It's understandable for drawing effects, because DrawGlyphRun() reports them as one of the arguments, but it also happens for decorations, so every effective run has uniform @@ -1594,7 +1589,7 @@ static HRESULT layout_add_effective_run(struct dwrite_textlayout *layout, const /* Check if run direction matches paragraph direction, if it doesn't adjust by run width */ - if (layout_is_erun_rtl(run) ^ is_rtl) + if (is_run_rtl(run) ^ is_rtl) run->origin.x = is_rtl ? origin_x - run->width : origin_x + run->width; else run->origin.x = origin_x;

1 0

Nikolay Sivov : dwrite/tests: Add some tests for HitTestTextRange().
by Alexandre Julliard 19 May '21

19 May '21

Module: wine Branch: master Commit: ada2543e68a976a1d646c45176cc5755cf07cc05 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ada2543e68a976a1d646c451… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 19 16:06:20 2021 +0300 dwrite/tests: Add some tests for HitTestTextRange(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/layout.c | 106 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 106 insertions(+) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 43a00b7e22e..3fe149927ca 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -6384,6 +6384,111 @@ static void test_layout_range_length(void) IDWriteFactory_Release(factory); } +static void test_HitTestTextRange(void) +{ + DWRITE_HIT_TEST_METRICS metrics[10]; + IDWriteInlineObject *inlineobj; + DWRITE_LINE_METRICS line; + IDWriteTextFormat *format; + IDWriteTextLayout *layout; + DWRITE_TEXT_RANGE range; + IDWriteFactory *factory; + unsigned int count; + HRESULT hr; + + factory = create_factory(); + + hr = IDWriteFactory_CreateTextFormat(factory, L"Tahoma", NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 10.0f, L"ru", &format); + ok(hr == S_OK, "Failed to create text format, hr %#x.\n", hr); + + hr = IDWriteFactory_CreateTextLayout(factory, L"string", 6, format, 100.0f, 100.0f, &layout); + ok(hr == S_OK, "Failed to create text layout, hr %#x.\n", hr); + + /* Start index exceeding layout text length, dummy range returned. */ + count = 0; + hr = IDWriteTextLayout_HitTestTextRange(layout, 7, 10, 0.0f, 0.0f, metrics, ARRAY_SIZE(metrics), &count); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); +if (SUCCEEDED(hr)) +{ + ok(count == 1, "Unexpected metrics count %u.\n", count); + ok(metrics[0].textPosition == 6 && metrics[0].length == 0, "Unexpected metrics range %u, %u.\n", + metrics[0].textPosition, metrics[0].length); + ok(!!metrics[0].isText, "Expected text range.\n"); +} + /* Length exceeding layout text length, trimmed. */ + count = 0; + hr = IDWriteTextLayout_HitTestTextRange(layout, 0, 10, 0.0f, 0.0f, metrics, ARRAY_SIZE(metrics), &count); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); +if (SUCCEEDED(hr)) +{ + ok(count == 1, "Unexpected metrics count %u.\n", count); + ok(metrics[0].textPosition == 0 && metrics[0].length == 6, "Unexpected metrics range %u, %u.\n", + metrics[0].textPosition, metrics[0].length); + ok(!!metrics[0].isText, "Expected text range.\n"); +} + /* Change font size for second half. */ + range.startPosition = 3; + range.length = 3; + hr = IDWriteTextLayout_SetFontSize(layout, 20.0f, range); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + count = 0; + hr = IDWriteTextLayout_HitTestTextRange(layout, 0, 6, 0.0f, 0.0f, metrics, ARRAY_SIZE(metrics), &count); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); +if (SUCCEEDED(hr)) +{ + ok(count == 1, "Unexpected metrics count %u.\n", count); + ok(metrics[0].textPosition == 0 && metrics[0].length == 6, "Unexpected metrics range %u, %u.\n", + metrics[0].textPosition, metrics[0].length); + ok(!!metrics[0].isText, "Expected text range.\n"); + + hr = IDWriteTextLayout_GetLineMetrics(layout, &line, 1, &count); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(line.height == metrics[0].height, "Unexpected range height.\n"); +} + /* With inline object. */ + hr = IDWriteFactory_CreateEllipsisTrimmingSign(factory, format, &inlineobj); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IDWriteTextLayout_SetInlineObject(layout, inlineobj, range); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + count = 0; + hr = IDWriteTextLayout_HitTestTextRange(layout, 0, 6, 0.0f, 0.0f, metrics, ARRAY_SIZE(metrics), &count); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); +if (SUCCEEDED(hr)) +{ + ok(count == 2, "Unexpected metrics count %u.\n", count); + ok(metrics[0].textPosition == 0 && metrics[0].length == 3, "Unexpected metrics range %u, %u.\n", + metrics[0].textPosition, metrics[0].length); + ok(!!metrics[0].isText, "Expected text range.\n"); + ok(metrics[1].textPosition == 3 && metrics[1].length == 3, "Unexpected metrics range %u, %u.\n", + metrics[1].textPosition, metrics[1].length); + ok(!metrics[1].isText, "Unexpected text range.\n"); +} + count = 0; + hr = IDWriteTextLayout_HitTestTextRange(layout, 7, 10, 0.0f, 0.0f, metrics, ARRAY_SIZE(metrics), &count); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); +if (SUCCEEDED(hr)) +{ + ok(count == 1, "Unexpected metrics count %u.\n", count); + ok(metrics[0].textPosition == 6 && metrics[0].length == 0, "Unexpected metrics range %u, %u.\n", + metrics[0].textPosition, metrics[0].length); + ok(!metrics[0].isText, "Unexpected text range.\n"); +} + IDWriteInlineObject_Release(inlineobj); + IDWriteTextLayout_Release(layout); + IDWriteTextFormat_Release(format); + + IDWriteFactory_Release(factory); +} + START_TEST(layout) { IDWriteFactory *factory; @@ -6438,6 +6543,7 @@ START_TEST(layout) test_automatic_font_axes(); test_text_format_axes(); test_layout_range_length(); + test_HitTestTextRange(); IDWriteFactory_Release(factory); }

1 0

Huw Davies : winspool/tests: Add tests for GetFormA().
by Alexandre Julliard 19 May '21

19 May '21

Module: wine Branch: master Commit: 837660e04bac18ffda78e6727dc7b03405b65184 URL: https://source.winehq.org/git/wine.git/?a=commit;h=837660e04bac18ffda78e672… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed May 19 14:43:13 2021 +0100 winspool/tests: Add tests for GetFormA(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winspool.drv/tests/info.c | 45 +++++++++++++++++++++++++++++------------- 1 file changed, 31 insertions(+), 14 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index b95180ee558..a9fbe727453 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -866,28 +866,45 @@ static void test_EnumForms(LPSTR pName) ok(res, "(%d) returned %d with %d (expected '!=0')\n", level, res, GetLastError()); - if (winetest_debug > 1) { - trace("dumping %d forms level %d\n", pcReturned, level); - pFI_1a = (PFORM_INFO_1A)buffer; - pFI_2a = (PFORM_INFO_2A)buffer; - for (i = 0; i < pcReturned; i++) - { - /* first part is same in FORM_INFO_1 and FORM_INFO_2 */ - formtype = (pFI_1a->Flags <= FORMTYPE_MAX) ? formtypes[pFI_1a->Flags] : formtypes[3]; + pFI_1a = (PFORM_INFO_1A)buffer; + pFI_2a = (PFORM_INFO_2A)buffer; + for (i = 0; i < pcReturned; i++) + { + /* first part is same in FORM_INFO_1 and FORM_INFO_2 */ + formtype = (pFI_1a->Flags <= FORMTYPE_MAX) ? formtypes[pFI_1a->Flags] : formtypes[3]; + if (winetest_debug > 1) trace("%u (%s): %.03fmm x %.03fmm, %s\n", i, pFI_1a->pName, (float)pFI_1a->Size.cx/1000, (float)pFI_1a->Size.cy/1000, formtype); - if (level == 1) pFI_1a ++; - else { - /* output additional FORM_INFO_2 fields */ + if (level == 1) pFI_1a++; + else + { + BYTE get_buffer[1000]; + FORM_INFO_2A *get_form = (FORM_INFO_2A *)get_buffer; + DWORD get_needed; + + /* output additional FORM_INFO_2 fields */ + if (winetest_debug > 1) trace("\tkeyword=%s strtype=%u muidll=%s resid=%u dispname=%s langid=%u\n", pFI_2a->pKeyword, pFI_2a->StringType, pFI_2a->pMuiDll, pFI_2a->dwResourceId, pFI_2a->pDisplayName, pFI_2a->wLangId); - /* offset pointer pFI_1a by 1*sizeof(FORM_INFO_2A) Bytes */ - pFI_2a ++; - pFI_1a = (PFORM_INFO_1A)pFI_2a; + if (pName && i == 0) /* GetForm() appears only to work on a printer handle */ + { + res = GetFormA( hprinter, pFI_1a->pName, level, NULL, 0, &get_needed ); + ok( !res && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %d gle %d\n", res, GetLastError() ); + if (get_needed <= sizeof(get_buffer)) + { + res = GetFormA( hprinter, pFI_1a->pName, level, get_buffer, get_needed, &get_needed ); + ok( res, "got %d\n", res ); + ok( !strcmp( pFI_2a->pName, get_form->pName ), "name mismatch\n" ); + res = GetFormA( hprinter, pFI_1a->pName, level, get_buffer, get_needed - 1, &get_needed ); + ok( !res && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %d gle %d\n", res, GetLastError() ); + } } + /* offset pointer pFI_1a by 1*sizeof(FORM_INFO_2A) Bytes */ + pFI_2a++; + pFI_1a = (PFORM_INFO_1A)pFI_2a; } }

1 0

Huw Davies : winspool: Forward EnumFormsA() to EnumFormsW().
by Alexandre Julliard 19 May '21

19 May '21

Module: wine Branch: master Commit: 0cddf6fe210c9783f6abb8be37adf4e256ec6476 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0cddf6fe210c9783f6abb8be… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed May 19 14:43:12 2021 +0100 winspool: Forward EnumFormsA() to EnumFormsW(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winspool.drv/info.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index d6b66e86bf6..d6aa60a028f 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -7457,12 +7457,20 @@ BOOL WINAPI DeletePrintProvidorW(LPWSTR pName, LPWSTR pEnvironment, LPWSTR pPrin /****************************************************************************** * EnumFormsA (WINSPOOL.@) */ -BOOL WINAPI EnumFormsA( HANDLE hPrinter, DWORD Level, LPBYTE pForm, - DWORD cbBuf, LPDWORD pcbNeeded, LPDWORD pcReturned ) +BOOL WINAPI EnumFormsA( HANDLE printer, DWORD level, BYTE *form, DWORD size, DWORD *needed, DWORD *count ) { - FIXME("%p %x %p %x %p %p\n", hPrinter, Level, pForm, cbBuf, pcbNeeded, pcReturned); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + const DWORD *string_info = form_string_info( level ); + BOOL ret; + DWORD i; + + if (!string_info) return FALSE; + + ret = EnumFormsW( printer, level, form, size, needed, count ); + if (ret) + for (i = 0; i < *count; i++) + packed_struct_WtoA( form + i * string_info[0], string_info ); + + return ret; } /******************************************************************************

1 0

Huw Davies : winspool: Forward GetFormA() to GetFormW().
by Alexandre Julliard 19 May '21

19 May '21

Module: wine Branch: master Commit: fc947eef193f42c9984d948287b6fc35b3d53f20 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc947eef193f42c9984d9482… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed May 19 14:43:11 2021 +0100 winspool: Forward GetFormA() to GetFormW(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winspool.drv/info.c | 75 ++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 70 insertions(+), 5 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index b42a1af8dcb..d6b66e86bf6 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -119,6 +119,7 @@ #include "wine/unicode.h" #include "wine/debug.h" #include "wine/list.h" +#include "wine/heap.h" #include "winnls.h" #include "ddk/winsplp.h" @@ -443,6 +444,61 @@ static DEVMODEA *DEVMODEdupWtoA( const DEVMODEW *dmW ) return dmA; } +static void packed_string_WtoA( WCHAR *strW ) +{ + DWORD len = strlenW( strW ), size = (len + 1) * sizeof(WCHAR), ret; + char *str; + + if (!len) return; + str = heap_alloc( size ); + ret = WideCharToMultiByte( CP_ACP, 0, strW, len, str, size - 1, NULL, NULL ); + memcpy( strW, str, ret ); + memset( (BYTE *)strW + ret, 0, size - ret ); + heap_free( str ); +} + +/********************************************************************* + * packed_struct_WtoA + * + * Convert a packed struct from W to A overwriting the unicode strings + * with their ansi equivalents. + */ +static void packed_struct_WtoA( BYTE *data, const DWORD *string_info ) +{ + WCHAR *strW; + + string_info++; /* sizeof */ + while (*string_info != ~0u) + { + strW = *(WCHAR **)(data + *string_info); + if (strW) packed_string_WtoA( strW ); + string_info++; + } +} + +static inline const DWORD *form_string_info( DWORD level ) +{ + static const DWORD info_1[] = + { + sizeof( FORM_INFO_1W ), + FIELD_OFFSET( FORM_INFO_1W, pName ), + ~0u + }; + static const DWORD info_2[] = + { + sizeof( FORM_INFO_2W ), + FIELD_OFFSET( FORM_INFO_2W, pName ), + FIELD_OFFSET( FORM_INFO_2W, pMuiDll ), + FIELD_OFFSET( FORM_INFO_2W, pDisplayName ), + ~0u + }; + + if (level == 1) return info_1; + if (level == 2) return info_2; + + SetLastError( ERROR_INVALID_LEVEL ); + return NULL; +} /****************************************************************** * verify, that the filename is a local file @@ -3894,12 +3950,21 @@ BOOL WINAPI StartPagePrinter(HANDLE hPrinter) /***************************************************************************** * GetFormA [WINSPOOL.@] */ -BOOL WINAPI GetFormA(HANDLE hPrinter, LPSTR pFormName, DWORD Level, - LPBYTE pForm, DWORD cbBuf, LPDWORD pcbNeeded) +BOOL WINAPI GetFormA( HANDLE printer, char *name, DWORD level, BYTE *form, DWORD size, DWORD *needed ) { - FIXME("(%p,%s,%d,%p,%d,%p): stub\n",hPrinter,pFormName, - Level,pForm,cbBuf,pcbNeeded); - return FALSE; + UNICODE_STRING nameW; + const DWORD *string_info = form_string_info( level ); + BOOL ret; + + if (!string_info) return FALSE; + + asciitounicode( &nameW, name ); + + ret = GetFormW( printer, nameW.Buffer, level, form, size, needed ); + if (ret) packed_struct_WtoA( form, string_info ); + + RtlFreeUnicodeString( &nameW ); + return ret; } /*****************************************************************************

1 0

← Newer
1
...
25
26
27
28
29
30
31
...
77
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2021