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

[PATCH 1/2] riched20/tests: Test for Windows Rich Edit EM_UNDO/EM_REDO status bug.

by Jinoh Kang

From: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- dlls/riched20/tests/editor.c | 50 ++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 03c07829ee4..79ee7007873 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -7079,6 +7079,55 @@ static void test_undo_coalescing(void) DestroyWindow(hwnd); } +static void test_undo_status_bug(void) +{ + HWND hwnd; + LRESULT lresult; + + hwnd = new_richedit(NULL); + + lresult = SendMessageA(hwnd, EM_CANUNDO, 0, 0); + ok(lresult == FALSE, "EM_CANUNDO returned %Id\n", lresult); + lresult = SendMessageA(hwnd, EM_UNDO, 0, 0); + ok(lresult == FALSE, "EM_UNDO returned %Id\n", lresult); + lresult = SendMessageA(hwnd, EM_CANREDO, 0, 0); + ok(lresult == FALSE, "EM_CANREDO returned %Id\n", lresult); + lresult = SendMessageA(hwnd, EM_REDO, 0, 0); + ok(lresult == FALSE, "EM_REDO returned %Id\n", lresult); + + SendMessageA(hwnd, EM_SETSEL, 0, -1); + SendMessageA(hwnd, EM_REPLACESEL, TRUE, (LPARAM)"lorem"); + + lresult = SendMessageA(hwnd, EM_CANREDO, 0, 0); + ok(lresult == FALSE, "EM_CANREDO returned %Id\n", lresult); + lresult = SendMessageA(hwnd, EM_REDO, 0, 0); + ok(lresult == FALSE, "EM_REDO returned %Id\n", lresult); + + lresult = SendMessageA(hwnd, EM_CANUNDO, 0, 0); + ok(lresult == TRUE, "EM_CANUNDO returned %Id\n", lresult); + lresult = SendMessageA(hwnd, EM_UNDO, 0, 0); + ok(lresult == TRUE, "EM_UNDO returned %Id\n", lresult); + + lresult = SendMessageA(hwnd, EM_CANUNDO, 0, 0); + ok(lresult == FALSE, "EM_CANUNDO returned %Id\n", lresult); + lresult = SendMessageA(hwnd, EM_UNDO, 0, 0); + todo_wine + ok(lresult == TRUE, "EM_UNDO returned %Id\n", lresult); + + lresult = SendMessageA(hwnd, EM_CANREDO, 0, 0); + ok(lresult == TRUE, "EM_CANREDO returned %Id\n", lresult); + lresult = SendMessageA(hwnd, EM_REDO, 0, 0); + ok(lresult == TRUE, "EM_REDO returned %Id\n", lresult); + + lresult = SendMessageA(hwnd, EM_CANREDO, 0, 0); + ok(lresult == FALSE, "EM_CANREDO returned %Id\n", lresult); + lresult = SendMessageA(hwnd, EM_REDO, 0, 0); + todo_wine + ok(lresult == TRUE, "EM_REDO returned %Id\n", lresult); + + DestroyWindow(hwnd); +} + static LONG CALLBACK customWordBreakProc(WCHAR *text, int pos, int bytes, int code) { int length; @@ -9080,6 +9129,7 @@ START_TEST( editor ) test_EM_AUTOURLDETECT(); test_eventMask(); test_undo_coalescing(); + test_undo_status_bug(); test_word_movement(); test_EM_CHARFROMPOS(); test_SETPARAFORMAT(); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/326

June 27, 2022

[PATCH 0/2] MR326: riched20: Emulate a Windows bug that ignores undo/redo failure.

by Jinoh Kang (＠iamahuman)

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/326

June 27, 2022

Re: [PATCH v3 0/4] MR310: mf: Fix several reference leaks.

by Rémi Bernon

On Mon Jun 27 15:44:31 2022 +0000, Nikolay Sivov wrote: > Tests commit is a much larger change than subject suggests, could you > limit it to some missing release/shutdown calls? Also some or maybe all > of ShutdownObject are not doing anything. They may not be doing anything for Wine but they are required for the reference count checks on Windows. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/310#note_2783

June 27, 2022

Re: [PATCH 0/1] MR324: vbscript: Use return_null in more places. - approved

by Jacek Caban (＠jacek)

This merge request was approved by Jacek Caban. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/324

June 27, 2022

Re: [PATCH v2 1/2] regedit: Add support for REG_QWORD type.

by Marvin

Hi, It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated. The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=117703 Your paranoid android. === debian11 (build log) === error: patch failed: po/ar.po:68 error: patch failed: po/ast.po:67 error: patch failed: po/bg.po:67 error: patch failed: po/ca.po:66 error: patch failed: po/cs.po:71 error: patch failed: po/da.po:70 error: patch failed: po/de.po:65 error: patch failed: po/el.po:64 error: patch failed: po/en.po:64 error: patch failed: po/en_US.po:64 error: patch failed: po/eo.po:75 error: patch failed: po/es.po:65 error: patch failed: po/fa.po:62 error: patch failed: po/fi.po:63 error: patch failed: po/fr.po:64 error: patch failed: po/he.po:76 error: patch failed: po/hi.po:61 error: patch failed: po/hr.po:70 error: patch failed: po/hu.po:70 error: patch failed: po/it.po:75 error: patch failed: po/ja.po:65 error: patch failed: po/ko.po:63 error: patch failed: po/lt.po:66 error: patch failed: po/ml.po:65 error: patch failed: po/nb_NO.po:65 error: patch failed: po/nl.po:64 error: patch failed: po/or.po:61 error: patch failed: po/pa.po:61 error: patch failed: po/pl.po:69 error: patch failed: po/pt_BR.po:65 error: patch failed: po/pt_PT.po:81 error: patch failed: po/rm.po:62 error: patch failed: po/ro.po:70 error: patch failed: po/ru.po:71 error: patch failed: po/si.po:72 error: patch failed: po/sk.po:75 error: patch failed: po/sl.po:75 error: patch failed: po/sr_RS(a)cyrillic.po:70 error: patch failed: po/sr_RS(a)latin.po:70 error: patch failed: po/sv.po:71 error: patch failed: po/ta.po:63 error: patch failed: po/te.po:61 error: patch failed: po/th.po:65 error: patch failed: po/tr.po:72 error: patch failed: po/uk.po:63 error: patch failed: po/wa.po:63 error: patch failed: po/wine.pot:56 error: patch failed: po/zh_CN.po:62 error: patch failed: po/zh_TW.po:62 error: patch failed: programs/regedit/edit.c:86 error: patch failed: programs/regedit/framewnd.c:158 error: patch failed: programs/regedit/listview.c:245 error: patch failed: programs/regedit/regedit.rc:48 error: patch failed: programs/regedit/resource.h:146 Task: Patch failed to apply === debian11 (build log) === error: patch failed: po/ar.po:68 error: patch failed: po/ast.po:67 error: patch failed: po/bg.po:67 error: patch failed: po/ca.po:66 error: patch failed: po/cs.po:71 error: patch failed: po/da.po:70 error: patch failed: po/de.po:65 error: patch failed: po/el.po:64 error: patch failed: po/en.po:64 error: patch failed: po/en_US.po:64 error: patch failed: po/eo.po:75 error: patch failed: po/es.po:65 error: patch failed: po/fa.po:62 error: patch failed: po/fi.po:63 error: patch failed: po/fr.po:64 error: patch failed: po/he.po:76 error: patch failed: po/hi.po:61 error: patch failed: po/hr.po:70 error: patch failed: po/hu.po:70 error: patch failed: po/it.po:75 error: patch failed: po/ja.po:65 error: patch failed: po/ko.po:63 error: patch failed: po/lt.po:66 error: patch failed: po/ml.po:65 error: patch failed: po/nb_NO.po:65 error: patch failed: po/nl.po:64 error: patch failed: po/or.po:61 error: patch failed: po/pa.po:61 error: patch failed: po/pl.po:69 error: patch failed: po/pt_BR.po:65 error: patch failed: po/pt_PT.po:81 error: patch failed: po/rm.po:62 error: patch failed: po/ro.po:70 error: patch failed: po/ru.po:71 error: patch failed: po/si.po:72 error: patch failed: po/sk.po:75 error: patch failed: po/sl.po:75 error: patch failed: po/sr_RS(a)cyrillic.po:70 error: patch failed: po/sr_RS(a)latin.po:70 error: patch failed: po/sv.po:71 error: patch failed: po/ta.po:63 error: patch failed: po/te.po:61 error: patch failed: po/th.po:65 error: patch failed: po/tr.po:72 error: patch failed: po/uk.po:63 error: patch failed: po/wa.po:63 error: patch failed: po/wine.pot:56 error: patch failed: po/zh_CN.po:62 error: patch failed: po/zh_TW.po:62 error: patch failed: programs/regedit/edit.c:86 error: patch failed: programs/regedit/framewnd.c:158 error: patch failed: programs/regedit/listview.c:245 error: patch failed: programs/regedit/regedit.rc:48 error: patch failed: programs/regedit/resource.h:146 Task: Patch failed to apply

June 27, 2022

[PATCH vkd3d 6/6] vkd3d-shader/hlsl: Fold constant integral bitwise or.

by Giovanni Mascellani

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_constant_ops.c | 30 +++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c index 33dc7001..20384180 100644 --- a/libs/vkd3d-shader/hlsl_constant_ops.c +++ b/libs/vkd3d-shader/hlsl_constant_ops.c @@ -479,6 +479,32 @@ static bool fold_bit_and(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, return true; } +static bool fold_bit_or(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 < dst->node.data_type->dimx; ++k) + { + switch (type) + { + case HLSL_TYPE_INT: + case HLSL_TYPE_UINT: + dst->value[k].u = src1->value[k].u | src2->value[k].u; + break; + + default: + FIXME("Fold bit or for type %s.\n", debug_hlsl_type(ctx, dst->node.data_type)); + return false; + } + } + return true; +} + bool hlsl_fold_constant_exprs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) { struct hlsl_ir_constant *arg1, *arg2 = NULL, *res; @@ -556,6 +582,10 @@ bool hlsl_fold_constant_exprs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, success = fold_bit_and(ctx, res, arg1, arg2); break; + case HLSL_OP2_BIT_OR: + success = fold_bit_or(ctx, res, arg1, arg2); + break; + default: FIXME("Fold \"%s\" expression.\n", debug_hlsl_expr_op(expr->op)); success = false; -- 2.36.1

June 27, 2022

[PATCH vkd3d 5/6] vkd3d-shader/hlsl: Fold constant integral bitwise and.

by Giovanni Mascellani

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_constant_ops.c | 30 +++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c index bea9864e..33dc7001 100644 --- a/libs/vkd3d-shader/hlsl_constant_ops.c +++ b/libs/vkd3d-shader/hlsl_constant_ops.c @@ -453,6 +453,32 @@ static bool fold_bit_xor(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, return true; } +static bool fold_bit_and(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 < dst->node.data_type->dimx; ++k) + { + switch (type) + { + case HLSL_TYPE_INT: + case HLSL_TYPE_UINT: + dst->value[k].u = src1->value[k].u & src2->value[k].u; + break; + + default: + FIXME("Fold bit and for type %s.\n", debug_hlsl_type(ctx, dst->node.data_type)); + return false; + } + } + return true; +} + bool hlsl_fold_constant_exprs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) { struct hlsl_ir_constant *arg1, *arg2 = NULL, *res; @@ -526,6 +552,10 @@ bool hlsl_fold_constant_exprs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, success = fold_bit_xor(ctx, res, arg1, arg2); break; + case HLSL_OP2_BIT_AND: + success = fold_bit_and(ctx, res, arg1, arg2); + break; + default: FIXME("Fold \"%s\" expression.\n", debug_hlsl_expr_op(expr->op)); success = false; -- 2.36.1

June 27, 2022

[PATCH vkd3d 4/6] vkd3d-shader/hlsl: Fold constant integral bitwise xor.

by Giovanni Mascellani

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_constant_ops.c | 30 +++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c index 01f394b8..bea9864e 100644 --- a/libs/vkd3d-shader/hlsl_constant_ops.c +++ b/libs/vkd3d-shader/hlsl_constant_ops.c @@ -427,6 +427,32 @@ static bool fold_min(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, return true; } +static bool fold_bit_xor(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 < dst->node.data_type->dimx; ++k) + { + switch (type) + { + case HLSL_TYPE_INT: + case HLSL_TYPE_UINT: + dst->value[k].u = src1->value[k].u ^ src2->value[k].u; + break; + + default: + FIXME("Fold bit xor for type %s.\n", debug_hlsl_type(ctx, dst->node.data_type)); + return false; + } + } + return true; +} + bool hlsl_fold_constant_exprs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) { struct hlsl_ir_constant *arg1, *arg2 = NULL, *res; @@ -496,6 +522,10 @@ bool hlsl_fold_constant_exprs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, success = fold_min(ctx, res, arg1, arg2); break; + case HLSL_OP2_BIT_XOR: + success = fold_bit_xor(ctx, res, arg1, arg2); + break; + default: FIXME("Fold \"%s\" expression.\n", debug_hlsl_expr_op(expr->op)); success = false; -- 2.36.1

June 27, 2022

[PATCH vkd3d 3/6] vkd3d-shader/hlsl: Fold constant integral min().

by Giovanni Mascellani

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_constant_ops.c | 33 +++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c index 95bed02a..01f394b8 100644 --- a/libs/vkd3d-shader/hlsl_constant_ops.c +++ b/libs/vkd3d-shader/hlsl_constant_ops.c @@ -398,6 +398,35 @@ static bool fold_max(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, return true; } +static bool fold_min(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 < dst->node.data_type->dimx; ++k) + { + switch (type) + { + case HLSL_TYPE_INT: + dst->value[k].i = min(src1->value[k].i, src2->value[k].i); + break; + + case HLSL_TYPE_UINT: + dst->value[k].u = min(src1->value[k].u, src2->value[k].u); + break; + + default: + FIXME("Fold min for type %s.\n", debug_hlsl_type(ctx, dst->node.data_type)); + return false; + } + } + return true; +} + bool hlsl_fold_constant_exprs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) { struct hlsl_ir_constant *arg1, *arg2 = NULL, *res; @@ -463,6 +492,10 @@ bool hlsl_fold_constant_exprs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, success = fold_max(ctx, res, arg1, arg2); break; + case HLSL_OP2_MIN: + success = fold_min(ctx, res, arg1, arg2); + break; + default: FIXME("Fold \"%s\" expression.\n", debug_hlsl_expr_op(expr->op)); success = false; -- 2.36.1

June 27, 2022

[PATCH vkd3d 2/6] vkd3d-shader/hlsl: Fold constant integral max().

by Giovanni Mascellani

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_constant_ops.c | 33 +++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c index 64067397..95bed02a 100644 --- a/libs/vkd3d-shader/hlsl_constant_ops.c +++ b/libs/vkd3d-shader/hlsl_constant_ops.c @@ -369,6 +369,35 @@ static bool fold_mod(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, return true; } +static bool fold_max(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 < dst->node.data_type->dimx; ++k) + { + switch (type) + { + case HLSL_TYPE_INT: + dst->value[k].i = max(src1->value[k].i, src2->value[k].i); + break; + + case HLSL_TYPE_UINT: + dst->value[k].u = max(src1->value[k].u, src2->value[k].u); + break; + + default: + FIXME("Fold max for type %s.\n", debug_hlsl_type(ctx, dst->node.data_type)); + return false; + } + } + return true; +} + bool hlsl_fold_constant_exprs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) { struct hlsl_ir_constant *arg1, *arg2 = NULL, *res; @@ -430,6 +459,10 @@ bool hlsl_fold_constant_exprs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, success = fold_mod(ctx, res, arg1, arg2); break; + case HLSL_OP2_MAX: + success = fold_max(ctx, res, arg1, arg2); + break; + default: FIXME("Fold \"%s\" expression.\n", debug_hlsl_expr_op(expr->op)); success = false; -- 2.36.1

June 27, 2022