wine-devel

wine-devel@winehq.org

12 participants
84488 discussions

Re: [PATCH v2 4/5] ntdll: Fixup ICMP packet id if SOCK_DGRAM fallback is used.
by Marvin 14 Jul '22

14 Jul '22

1 0

[PATCH vkd3d 09/12] vkd3d-shader/hlsl: Move hlsl_new_offset_from_path_index() to hlsl_codegen.c.
by Francisco Casas 14 Jul '22

14 Jul '22

This can be done now, to help removing register offsets from hlsl.c and hlsl.h. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 76 ------------------------------- libs/vkd3d-shader/hlsl.h | 3 -- libs/vkd3d-shader/hlsl_codegen.c | 77 ++++++++++++++++++++++++++++++++ 3 files changed, 77 insertions(+), 79 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 924121f0..3454e5ee 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -392,82 +392,6 @@ struct hlsl_type *hlsl_get_type_from_path_index(struct hlsl_ctx *ctx, const stru return NULL; } -struct hlsl_ir_node *hlsl_new_offset_from_path_index(struct hlsl_ctx *ctx, struct hlsl_block *block, - struct hlsl_type *type, struct hlsl_ir_node *offset, struct hlsl_ir_node *idx, - const struct vkd3d_shader_location *loc) -{ - struct hlsl_ir_node *idx_offset = NULL; - struct hlsl_ir_constant *c; - - list_init(&block->instrs); - - switch (type->type) - { - case HLSL_CLASS_VECTOR: - { - idx_offset = idx; - break; - } - - case HLSL_CLASS_MATRIX: - { - if (!(c = hlsl_new_uint_constant(ctx, 4, loc))) - return NULL; - list_add_tail(&block->instrs, &c->node.entry); - - if (!(idx_offset = hlsl_new_binary_expr(ctx, HLSL_OP2_MUL, &c->node, idx))) - return NULL; - list_add_tail(&block->instrs, &idx_offset->entry); - - break; - } - - case HLSL_CLASS_ARRAY: - { - unsigned int size = hlsl_type_get_array_element_reg_size(type->e.array.type); - - if (!(c = hlsl_new_uint_constant(ctx, size, loc))) - return NULL; - list_add_tail(&block->instrs, &c->node.entry); - - if (!(idx_offset = hlsl_new_binary_expr(ctx, HLSL_OP2_MUL, &c->node, idx))) - return NULL; - list_add_tail(&block->instrs, &idx_offset->entry); - - break; - } - - case HLSL_CLASS_STRUCT: - { - unsigned int field_i = hlsl_ir_constant(idx)->value[0].u; - struct hlsl_struct_field *field = &type->e.record.fields[field_i]; - - if (!(c = hlsl_new_uint_constant(ctx, field->reg_offset, loc))) - return NULL; - list_add_tail(&block->instrs, &c->node.entry); - - idx_offset = &c->node; - - break; - } - - default: - { - assert(0); - return NULL; - } - } - - if (offset) - { - if (!(idx_offset = hlsl_new_binary_expr(ctx, HLSL_OP2_ADD, offset, idx_offset))) - return NULL; - list_add_tail(&block->instrs, &idx_offset->entry); - } - - return idx_offset; -} - struct hlsl_type *hlsl_new_array_type(struct hlsl_ctx *ctx, struct hlsl_type *basic_type, unsigned int array_size) { struct hlsl_type *type; diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index d3885540..dd5ea1d7 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -737,9 +737,6 @@ struct hlsl_ir_var *hlsl_get_var(struct hlsl_scope *scope, const char *name); struct hlsl_type *hlsl_get_type_from_path_index(struct hlsl_ctx *ctx, const struct hlsl_type *type, struct hlsl_ir_node *node); -struct hlsl_ir_node *hlsl_new_offset_from_path_index(struct hlsl_ctx *ctx, struct hlsl_block *block, - struct hlsl_type *type, struct hlsl_ir_node *offset, struct hlsl_ir_node *idx, - const struct vkd3d_shader_location *loc); struct hlsl_type *hlsl_new_array_type(struct hlsl_ctx *ctx, struct hlsl_type *basic_type, unsigned int array_size); struct hlsl_ir_node *hlsl_new_binary_expr(struct hlsl_ctx *ctx, enum hlsl_ir_expr_op op, struct hlsl_ir_node *arg1, diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 513e599e..67229195 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -21,6 +21,83 @@ #include "hlsl.h" #include <stdio.h> +/* TODO: remove when no longer needed, only used for replace_deref_path_with_offset() */ +static struct hlsl_ir_node *hlsl_new_offset_from_path_index(struct hlsl_ctx *ctx, struct hlsl_block *block, + struct hlsl_type *type, struct hlsl_ir_node *offset, struct hlsl_ir_node *idx, + const struct vkd3d_shader_location *loc) +{ + struct hlsl_ir_node *idx_offset = NULL; + struct hlsl_ir_constant *c; + + list_init(&block->instrs); + + switch (type->type) + { + case HLSL_CLASS_VECTOR: + { + idx_offset = idx; + break; + } + + case HLSL_CLASS_MATRIX: + { + if (!(c = hlsl_new_uint_constant(ctx, 4, loc))) + return NULL; + list_add_tail(&block->instrs, &c->node.entry); + + if (!(idx_offset = hlsl_new_binary_expr(ctx, HLSL_OP2_MUL, &c->node, idx))) + return NULL; + list_add_tail(&block->instrs, &idx_offset->entry); + + break; + } + + case HLSL_CLASS_ARRAY: + { + unsigned int size = hlsl_type_get_array_element_reg_size(type->e.array.type); + + if (!(c = hlsl_new_uint_constant(ctx, size, loc))) + return NULL; + list_add_tail(&block->instrs, &c->node.entry); + + if (!(idx_offset = hlsl_new_binary_expr(ctx, HLSL_OP2_MUL, &c->node, idx))) + return NULL; + list_add_tail(&block->instrs, &idx_offset->entry); + + break; + } + + case HLSL_CLASS_STRUCT: + { + unsigned int field_i = hlsl_ir_constant(idx)->value[0].u; + struct hlsl_struct_field *field = &type->e.record.fields[field_i]; + + if (!(c = hlsl_new_uint_constant(ctx, field->reg_offset, loc))) + return NULL; + list_add_tail(&block->instrs, &c->node.entry); + + idx_offset = &c->node; + + break; + } + + default: + { + assert(0); + return NULL; + } + } + + if (offset) + { + if (!(idx_offset = hlsl_new_binary_expr(ctx, HLSL_OP2_ADD, offset, idx_offset))) + return NULL; + list_add_tail(&block->instrs, &idx_offset->entry); + } + + return idx_offset; +} + /* TODO: remove when no longer needed, only used for transform_deref_paths_into_offsets() */ static void replace_deref_path_with_offset(struct hlsl_ctx *ctx, struct hlsl_deref *deref, struct hlsl_ir_node *instr) -- 2.34.1

3 5

Re: [PATCH 1/1] shell32: Return stub bitmap in IShellItemImageFactory::GetImage.
by Marvin 14 Jul '22

14 Jul '22

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 tests also ran into some preexisting test failures. If you know how to fix them that would be helpful. See the TestBot job for the details: The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=119036 Your paranoid android. === w1064 (32 bit report) === shell32: shlfolder.c:4976: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 2) === w10pro64 (32 bit report) === shell32: shlfolder.c:4967: Test failed: Expected PIDL to be NULL shlfolder.c:4976: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 2) === w1064v1809 (64 bit report) === shell32: shlfolder.c:4959: Test failed: RMDIR: expected notification type 10, got: 40000 === w10pro64_en_AE_u8 (64 bit report) === shell32: shlfolder.c:4976: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 2) shlfolder.c:4959: Test failed: RMDIR: expected notification type 10, got: 40000 === w10pro64_ar (64 bit report) === shell32: shlfolder.c:4959: Test failed: MKDIR: expected notification type 8, got: 40000 === w10pro64_ja (64 bit report) === shell32: shlfolder.c:4959: Test failed: MKDIR: expected notification type 8, got: 40000

1 0

Re: [PATCH v3 2/2] win32u/window: Ignore changing WS_EX_TOPMOST for message-only windows.
by Marvin 14 Jul '22

14 Jul '22

1 0

Re: [PATCH v3 1/2] user32/tests: Check that message-only windows ignore WS_EX_TOPMOST.
by Marvin 14 Jul '22

14 Jul '22

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=119030 Your paranoid android. === w10pro64_en_AE_u8 (64 bit report) === user32: win.c:4400: Test failed: message 0200 available === debian11 (32 bit report) === user32: win.c:8961: Test failed: Last error unexpectedly set to 0 === debian11 (32 bit Arabic:Morocco report) === user32: win.c:8961: Test failed: Last error unexpectedly set to 0 === debian11 (32 bit German report) === user32: win.c:8961: Test failed: Last error unexpectedly set to 0 === debian11 (32 bit French report) === user32: win.c:8961: Test failed: Last error unexpectedly set to 0 === debian11 (32 bit Hebrew:Israel report) === user32: win.c:8961: Test failed: Last error unexpectedly set to 0 === debian11 (32 bit Hindi:India report) === user32: win.c:8961: Test failed: Last error unexpectedly set to 0 === debian11 (32 bit Japanese:Japan report) === user32: win.c:8961: Test failed: Last error unexpectedly set to 0 === debian11 (32 bit Chinese:China report) === user32: win.c:8961: Test failed: Last error unexpectedly set to 0 === debian11 (32 bit WoW report) === user32: win.c:8961: Test failed: Last error unexpectedly set to 0 === debian11 (64 bit WoW report) === user32: win.c:8961: Test failed: Last error unexpectedly set to 0

1 0

Re: [PATCH v2 1/2] rpcrt4/tests: Add I_RpcBindingInqLocalClientPID() tests.
by Marvin 14 Jul '22

14 Jul '22

1 0

Re: [PATCH v2 2/2] rpcrt4: Implement I_RpcBindingInqLocalClientPID().
by Marvin 14 Jul '22

14 Jul '22

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=119011 Your paranoid android. === w8adm (32 bit report) === rpcrt4: server.c:2263: Test failed: RpcBindingFree === w1064 (32 bit report) === rpcrt4: server.c:2263: Test failed: RpcBindingFree === w1064_tsign (32 bit report) === rpcrt4: server.c:2263: Test failed: RpcBindingFree === w10pro64 (32 bit report) === rpcrt4: server.c:2263: Test failed: RpcBindingFree === w1064_adm (64 bit report) === rpcrt4: 1ae0:server: unhandled exception 000006be at 00007FFAE69F4F69 === w1064_tsign (64 bit report) === rpcrt4: server.c:2263: Test failed: RpcBindingFree === w10pro64_en_AE_u8 (64 bit report) === rpcrt4: 0460:server: unhandled exception 000006be at 00007FF99B7B4F69 === w10pro64_zh_CN (64 bit report) === rpcrt4: 16a8:server: unhandled exception 000006be at 00007FFD3A124F69

1 0

Re: [PATCH 1/2] rpcrt4/tests: Add I_RpcBindingInqLocalClientPID() tests.
by Marvin 14 Jul '22

14 Jul '22

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 tests also ran into some preexisting test failures. If you know how to fix them that would be helpful. See the TestBot job for the details: The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=118991 Your paranoid android. === w1064_tsign (32 bit report) === rpcrt4: server.c:2270: Test failed: RpcBindingFree === w1064 (64 bit report) === rpcrt4: server.c:2270: Test failed: RpcBindingFree === w1064_2qxl (64 bit report) === rpcrt4: server.c:2270: Test failed: RpcBindingFree === w1064_tsign (64 bit report) === rpcrt4: server.c:2270: Test failed: RpcBindingFree === w10pro64 (64 bit report) === rpcrt4: server.c:2270: Test failed: RpcBindingFree === w10pro64_en_AE_u8 (64 bit report) === rpcrt4: 0958:server: unhandled exception 000006be at 00007FF99B7B4F69 === w10pro64_ja (64 bit report) === rpcrt4: 0ef4:server: unhandled exception 000006be at 00007FFA40864F69

1 0

Re: [PATCH 7/7] shell32: Implement SHOpenFolderAndSelectItems().
by Marvin 14 Jul '22

14 Jul '22

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 tests also ran into some preexisting test failures. If you know how to fix them that would be helpful. See the TestBot job for the details: The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=118986 Your paranoid android. === w1064v1809 (32 bit report) === shell32: shlfolder.c:4991: Test failed: RMDIR: expected notification type 10, got: 40000 === w1064 (32 bit report) === shell32: shlfolder.c:5008: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 2) === w1064_tsign (32 bit report) === shell32: shlfolder.c:5008: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 2) === w1064v1809 (64 bit report) === shell32: shlfolder.c:5008: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 2) === w1064 (64 bit report) === shell32: shlfolder.c:4991: Test failed: RMDIR: expected notification type 10, got: 40000 === w10pro64_en_AE_u8 (64 bit report) === shell32: shlfolder.c:4991: Test failed: RMDIR: expected notification type 10, got: 40000 === w10pro64_ar (64 bit report) === shell32: shlfolder.c:4991: Test failed: RMDIR: expected notification type 10, got: 4000000 shlfolder.c:4999: Test failed: Expected PIDL to be NULL shlfolder.c:4991: Test failed: RMDIR: expected notification type 10, got: 40000

1 0

Re: [PATCH 6/7] shell32/tests: Add SHOpenFolderAndSelectItems() tests.
by Marvin 14 Jul '22

14 Jul '22

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 tests also ran into some preexisting test failures. If you know how to fix them that would be helpful. See the TestBot job for the details: The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=118985 Your paranoid android. === w1064v1809 (32 bit report) === shell32: shlfolder.c:5008: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 2) === w1064 (64 bit report) === shell32: shlfolder.c:4991: Test failed: RMDIR: expected notification type 10, got: 40000 === w10pro64 (64 bit report) === shell32: shlfolder.c:4991: Test failed: RMDIR: expected notification type 10, got: 4000000 shlfolder.c:4999: Test failed: Expected PIDL to be NULL === w10pro64_en_AE_u8 (64 bit report) === shell32: shlfolder.c:4991: Test failed: RMDIR: expected notification type 10, got: 40000 === w10pro64_ar (64 bit report) === shell32: shlfolder.c:4991: Test failed: RMDIR: expected notification type 10, got: 40000 === w10pro64_ja (64 bit report) === shell32: shlfolder.c:4991: Test failed: RMDIR: expected notification type 10, got: 40000

1 0

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-devel