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

Re: [PATCH vkd3d v2 2/7] vkd3d-shader/hlsl: Parse logical AND.

by Francisco Casas

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> February 24, 2022 3:45 PM, "Zebediah Figura" <zfigura(a)codeweavers.com> wrote: > From: Giovanni Mascellani <gmascellani(a)codeweavers.com> > > Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> > Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> > --- > v2: Constify the "loc" parameter. > > libs/vkd3d-shader/hlsl.y | 37 ++++++++++++++++++++++++++++++++++++- > 1 file changed, 36 insertions(+), 1 deletion(-) > > diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y > index 01e6b3dfb..bb24e39de 100644 > --- a/libs/vkd3d-shader/hlsl.y > +++ b/libs/vkd3d-shader/hlsl.y > @@ -1136,6 +1136,41 @@ static struct list *add_binary_comparison_expr_merge(struct hlsl_ctx *ctx, > struc > return list1; > } > > +static struct hlsl_ir_expr *add_binary_logical_expr(struct hlsl_ctx *ctx, struct list *instrs, > + enum hlsl_ir_expr_op op, struct hlsl_ir_node *arg1, struct hlsl_ir_node *arg2, > + const struct vkd3d_shader_location *loc) > +{ > + struct hlsl_ir_node *args[HLSL_MAX_OPERANDS] = {0}; > + struct hlsl_type *common_type; > + enum hlsl_type_class type; > + unsigned int dimx, dimy; > + > + if (!expr_common_shape(ctx, arg1->data_type, arg2->data_type, loc, &type, &dimx, &dimy)) > + return NULL; > + > + common_type = hlsl_get_numeric_type(ctx, type, HLSL_TYPE_BOOL, dimx, dimy); > + > + if (!(args[0] = add_implicit_conversion(ctx, instrs, arg1, common_type, loc))) > + return NULL; > + > + if (!(args[1] = add_implicit_conversion(ctx, instrs, arg2, common_type, loc))) > + return NULL; > + > + return add_expr(ctx, instrs, op, args, common_type, loc); > +} > + > +static struct list *add_binary_logical_expr_merge(struct hlsl_ctx *ctx, struct list *list1, struct > list *list2, > + enum hlsl_ir_expr_op op, const struct vkd3d_shader_location *loc) > +{ > + struct hlsl_ir_node *arg1 = node_from_list(list1), *arg2 = node_from_list(list2); > + > + list_move_tail(list1, list2); > + vkd3d_free(list2); > + add_binary_logical_expr(ctx, list1, op, arg1, arg2, loc); > + > + return list1; > +} > + > static enum hlsl_ir_expr_op op_from_assignment(enum parse_assign_op op) > { > static const enum hlsl_ir_expr_op ops[] = > @@ -3664,7 +3699,7 @@ logicand_expr: > bitor_expr > | logicand_expr OP_AND bitor_expr > { > - hlsl_fixme(ctx, &@$, "Logical AND."); > + $$ = add_binary_logical_expr_merge(ctx, $1, $3, HLSL_OP2_LOGIC_AND, &@2); > } > > logicor_expr: > -- > 2.35.1

Feb. 28, 2022

Re: [PATCH] win32u: Fix NtUserCallHooks return value.

by Huw Davies

Signed-off-by: Huw Davies <huw(a)codeweavers.com>

Feb. 28, 2022

[PATCH] win32u: Fix NtUserCallHooks return value.

by Alexandros Frantzis

Return the actual result value of NtUserCallHooks invocations, which also fixes an inadvertent switch statement case fallthrough. Signed-off-by: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> --- dlls/win32u/sysparams.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index b5d82748c71..cd4ff91255e 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -4582,7 +4582,8 @@ ULONG_PTR WINAPI NtUserCallOneParam( ULONG_PTR arg, ULONG code ) case NtUserCallHooks: { const struct win_hook_params *params = (struct win_hook_params *)arg; - call_hooks( params->id, params->code, params->wparam, params->lparam, params->next_unicode ); + return call_hooks( params->id, params->code, params->wparam, params->lparam, + params->next_unicode ); } case NtUserFlushWindowSurfaces: flush_window_surfaces( arg ); -- 2.34.1

Feb. 28, 2022

Re: [PATCH vkd3d v2 1/7] vkd3d-shader/hlsl: Introduce a helper to validate that an instruction has integer type.

by Francisco Casas

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> February 24, 2022 3:45 PM, "Zebediah Figura" <zfigura(a)codeweavers.com> wrote: > Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> > --- > libs/vkd3d-shader/hlsl.y | 46 ++++++++++++++++++++-------------------- > 1 file changed, 23 insertions(+), 23 deletions(-) > > diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y > index 459ad03bf..01e6b3dfb 100644 > --- a/libs/vkd3d-shader/hlsl.y > +++ b/libs/vkd3d-shader/hlsl.y > @@ -1014,6 +1014,27 @@ static struct hlsl_ir_expr *add_expr(struct hlsl_ctx *ctx, struct list > *instrs, > return expr; > } > > +static void check_integer_type(struct hlsl_ctx *ctx, const struct hlsl_ir_node *instr) > +{ > + const struct hlsl_type *type = instr->data_type; > + struct vkd3d_string_buffer *string; > + > + switch (type->base_type) > + { > + case HLSL_TYPE_BOOL: > + case HLSL_TYPE_INT: > + case HLSL_TYPE_UINT: > + break; > + > + default: > + if ((string = hlsl_type_to_string(ctx, type))) > + hlsl_error(ctx, &instr->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, > + "Expression type '%s' is not integer.", string->buffer); > + hlsl_release_string_buffer(ctx, string); > + break; > + } > +} > + > static struct hlsl_ir_expr *add_unary_arithmetic_expr(struct hlsl_ctx *ctx, struct list *instrs, > enum hlsl_ir_expr_op op, struct hlsl_ir_node *arg, const struct vkd3d_shader_location *loc) > { > @@ -1061,29 +1082,8 @@ static struct hlsl_ir_expr *add_binary_bitwise_expr(struct hlsl_ctx *ctx, > struct > enum hlsl_ir_expr_op op, struct hlsl_ir_node *arg1, struct hlsl_ir_node *arg2, > const struct vkd3d_shader_location *loc) > { > - if (arg1->data_type->base_type != HLSL_TYPE_INT && arg1->data_type->base_type != HLSL_TYPE_UINT > - && arg1->data_type->base_type != HLSL_TYPE_BOOL) > - { > - struct vkd3d_string_buffer *type_str = hlsl_type_to_string(ctx, arg1->data_type); > - > - if (type_str) > - hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, > - "The first argument has type '%s', which is not integer.", type_str->buffer); > - hlsl_release_string_buffer(ctx, type_str); > - return NULL; > - } > - > - if (arg2->data_type->base_type != HLSL_TYPE_INT && arg2->data_type->base_type != HLSL_TYPE_UINT > - && arg2->data_type->base_type != HLSL_TYPE_BOOL) > - { > - struct vkd3d_string_buffer *type_str = hlsl_type_to_string(ctx, arg2->data_type); > - > - if (type_str) > - hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, > - "The second argument has type '%s', which is not integer.", type_str->buffer); > - hlsl_release_string_buffer(ctx, type_str); > - return NULL; > - } > + check_integer_type(ctx, arg1); > + check_integer_type(ctx, arg2); > > return add_binary_arithmetic_expr(ctx, instrs, op, arg1, arg2, loc); > } > -- > 2.35.1

Feb. 28, 2022

Re: [PATCH v4 3/9] kernelbase: Add OpenPrivateNamespaceW stub.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=109427 Your paranoid android. === debian11 (64 bit WoW report) === kernel32: change.c:309: Test failed: should be ready change.c:339: Test failed: should be ready

Feb. 28, 2022

Re: [PATCH 11/27] dlls/httpapi/tests: enable compilation with long types

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=109413 Your paranoid android. === w7u_2qxl (32 bit report) === httpapi: httpapi.c:701: Test failed: Response did not end with entity data. httpapi.c:730: Test failed: Response did not end with entity data. === w7u_adm (32 bit report) === httpapi: httpapi.c:701: Test failed: Response did not end with entity data. httpapi.c:730: Test failed: Response did not end with entity data. === w7u_el (32 bit report) === httpapi: httpapi.c:701: Test failed: Response did not end with entity data. httpapi.c:730: Test failed: Response did not end with entity data. === w8 (32 bit report) === httpapi: httpapi.c:701: Test failed: Response did not end with entity data. httpapi.c:730: Test failed: Response did not end with entity data. === w8adm (32 bit report) === httpapi: httpapi.c:701: Test failed: Response did not end with entity data. httpapi.c:730: Test failed: Response did not end with entity data. === w864 (32 bit report) === httpapi: httpapi.c:701: Test failed: Response did not end with entity data. httpapi.c:730: Test failed: Response did not end with entity data. === w1064v1507 (32 bit report) === httpapi: httpapi.c:701: Test failed: Response did not end with entity data. httpapi.c:730: Test failed: Response did not end with entity data. === w1064v1809 (32 bit report) === httpapi: httpapi.c:701: Test failed: Response did not end with entity data. httpapi.c:730: Test failed: Response did not end with entity data. === w1064 (32 bit report) === httpapi: httpapi.c:701: Test failed: Response did not end with entity data. httpapi.c:730: Test failed: Response did not end with entity data. === w1064_tsign (32 bit report) === httpapi: httpapi.c:701: Test failed: Response did not end with entity data. httpapi.c:730: Test failed: Response did not end with entity data. === w10pro64 (32 bit report) === httpapi: httpapi.c:701: Test failed: Response did not end with entity data. httpapi.c:730: Test failed: Response did not end with entity data. === w864 (64 bit report) === httpapi: httpapi.c:701: Test failed: Response did not end with entity data. httpapi.c:730: Test failed: Response did not end with entity data. === w1064v1507 (64 bit report) === httpapi: httpapi.c:701: Test failed: Response did not end with entity data. httpapi.c:730: Test failed: Response did not end with entity data. === w1064v1809 (64 bit report) === httpapi: httpapi.c:701: Test failed: Response did not end with entity data. httpapi.c:730: Test failed: Response did not end with entity data. === w1064 (64 bit report) === httpapi: httpapi.c:701: Test failed: Response did not end with entity data. httpapi.c:730: Test failed: Response did not end with entity data. === w1064_2qxl (64 bit report) === httpapi: httpapi.c:701: Test failed: Response did not end with entity data. httpapi.c:730: Test failed: Response did not end with entity data. === w1064_tsign (64 bit report) === httpapi: httpapi.c:701: Test failed: Response did not end with entity data. httpapi.c:730: Test failed: Response did not end with entity data. === w10pro64 (64 bit report) === httpapi: httpapi.c:701: Test failed: Response did not end with entity data. httpapi.c:730: Test failed: Response did not end with entity data. === w10pro64_ar (64 bit report) === httpapi: httpapi.c:701: Test failed: Response did not end with entity data. httpapi.c:730: Test failed: Response did not end with entity data. === w10pro64_he (64 bit report) === httpapi: httpapi.c:701: Test failed: Response did not end with entity data. httpapi.c:730: Test failed: Response did not end with entity data. === w10pro64_ja (64 bit report) === httpapi: httpapi.c:701: Test failed: Response did not end with entity data. httpapi.c:730: Test failed: Response did not end with entity data. === w10pro64_zh_CN (64 bit report) === httpapi: httpapi.c:701: Test failed: Response did not end with entity data. httpapi.c:730: Test failed: Response did not end with entity data. === debian11 (32 bit report) === httpapi: httpapi.c:701: Test failed: Response did not end with entity data. httpapi.c:730: Test failed: Response did not end with entity data. === debian11 (32 bit Arabic:Morocco report) === httpapi: httpapi.c:701: Test failed: Response did not end with entity data. httpapi.c:730: Test failed: Response did not end with entity data. === debian11 (32 bit German report) === httpapi: httpapi.c:701: Test failed: Response did not end with entity data. httpapi.c:730: Test failed: Response did not end with entity data. === debian11 (32 bit French report) === httpapi: httpapi.c:701: Test failed: Response did not end with entity data. httpapi.c:730: Test failed: Response did not end with entity data. === debian11 (32 bit Hebrew:Israel report) === httpapi: httpapi.c:701: Test failed: Response did not end with entity data. httpapi.c:730: Test failed: Response did not end with entity data. === debian11 (32 bit Hindi:India report) === httpapi: httpapi.c:701: Test failed: Response did not end with entity data. httpapi.c:730: Test failed: Response did not end with entity data. === debian11 (32 bit Japanese:Japan report) === httpapi: httpapi.c:701: Test failed: Response did not end with entity data. httpapi.c:730: Test failed: Response did not end with entity data. === debian11 (32 bit Chinese:China report) === httpapi: httpapi.c:701: Test failed: Response did not end with entity data. httpapi.c:730: Test failed: Response did not end with entity data. === debian11 (32 bit WoW report) === httpapi: httpapi.c:701: Test failed: Response did not end with entity data. httpapi.c:730: Test failed: Response did not end with entity data. === debian11 (64 bit WoW report) === httpapi: httpapi.c:701: Test failed: Response did not end with entity data. httpapi.c:730: Test failed: Response did not end with entity data.

Feb. 28, 2022

[PATCH v2] wusa: Support additional expressions.

by Hans Leidekker

From: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> v2: Avoid goto statements. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- programs/wusa/Makefile.in | 2 +- programs/wusa/main.c | 52 +++++++++++++++++++++++++++++---------- 2 files changed, 40 insertions(+), 14 deletions(-) diff --git a/programs/wusa/Makefile.in b/programs/wusa/Makefile.in index c512d3e63db..9f220fca277 100644 --- a/programs/wusa/Makefile.in +++ b/programs/wusa/Makefile.in @@ -1,5 +1,5 @@ MODULE = wusa.exe -IMPORTS = cabinet shlwapi ole32 oleaut32 advapi32 +IMPORTS = cabinet shlwapi ole32 oleaut32 advapi32 shell32 EXTRADLLFLAGS = -mwindows -municode diff --git a/programs/wusa/main.c b/programs/wusa/main.c index de8387cd575..b3ab6ac523c 100644 --- a/programs/wusa/main.c +++ b/programs/wusa/main.c @@ -23,6 +23,7 @@ #include <fdi.h> #include <shlwapi.h> +#include "shlobj.h" #include "wine/debug.h" #include "wine/list.h" #include "wusa.h" @@ -479,27 +480,52 @@ static BOOL strbuf_append(struct strbuf *buf, const WCHAR *str, DWORD len) static WCHAR *lookup_expression(struct assembly_entry *assembly, const WCHAR *key) { WCHAR path[MAX_PATH]; + int csidl = 0; - if (!wcsicmp(key, L"runtime.system32")) + if (!wcsicmp(key, L"runtime.system32") || !wcsicmp(key, L"runtime.drivers") || !wcsicmp(key, L"runtime.wbem")) { #ifdef __x86_64__ - if (!wcsicmp(assembly->identity.architecture, L"x86")) - { - GetSystemWow64DirectoryW(path, ARRAY_SIZE(path)); - return strdupW(path); - } + if (!wcsicmp(assembly->identity.architecture, L"x86")) csidl = CSIDL_SYSTEMX86; +#endif + if (!csidl) csidl = CSIDL_SYSTEM; + } + else if (!wcsicmp(key, L"runtime.windows") || !wcsicmp(key, L"runtime.inf")) csidl = CSIDL_WINDOWS; + else if (!wcsicmp(key, L"runtime.programfiles")) + { +#ifdef __x86_64__ + if (!wcsicmp(assembly->identity.architecture, L"x86")) csidl = CSIDL_PROGRAM_FILESX86; +#endif + if (!csidl) csidl = CSIDL_PROGRAM_FILES; + } + else if (!wcsicmp(key, L"runtime.commonfiles")) + { +#ifdef __x86_64__ + if (!wcsicmp(assembly->identity.architecture, L"x86")) csidl = CSIDL_PROGRAM_FILES_COMMONX86; #endif - GetSystemDirectoryW(path, ARRAY_SIZE(path)); - return strdupW(path); + if (!csidl) csidl = CSIDL_PROGRAM_FILES_COMMON; } - if (!wcsicmp(key, L"runtime.windows")) +#ifdef __x86_64__ + else if (!wcsicmp(key, L"runtime.programfilesx86")) csidl = CSIDL_PROGRAM_FILESX86; + else if (!wcsicmp(key, L"runtime.commonfilesx86")) csidl = CSIDL_PROGRAM_FILES_COMMONX86; +#endif + else if (!wcsicmp(key, L"runtime.programdata")) csidl = CSIDL_COMMON_APPDATA; + else if (!wcsicmp(key, L"runtime.fonts")) csidl = CSIDL_FONTS; + + if (!csidl) { - GetWindowsDirectoryW(path, ARRAY_SIZE(path)); - return strdupW(path); + FIXME("Unknown expression %s\n", debugstr_w(key)); + return NULL; + } + if (!SHGetSpecialFolderPathW(NULL, path, csidl, TRUE)) + { + ERR("Failed to get folder path for %s\n", debugstr_w(key)); + return NULL; } - FIXME("Unknown expression %s\n", debugstr_w(key)); - return NULL; + if (!wcsicmp(key, L"runtime.inf")) wcscat(path, L"\\inf"); + else if (!wcsicmp(key, L"runtime.drivers")) wcscat(path, L"\\drivers"); + else if (!wcsicmp(key, L"runtime.wbem")) wcscat(path, L"\\wbem"); + return strdupW(path); } static WCHAR *expand_expression(struct assembly_entry *assembly, const WCHAR *expression) -- 2.30.2

Feb. 28, 2022

Re: [PATCH v2 2/3] winhttp: Support sending web socket buffer fragments.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=109451 Your paranoid android. === w8adm (32 bit report) === winhttp: notification.c:256: Test failed: failed to send request 12007 notification.c:258: Test failed: unexpected function 3, expected 4. probably some notifications were missing notification.c:260: Test failed: failed to receive response 12019 notification.c:264: Test failed: failed unexpectedly 12019 notification.c:265: Test failed: request failed unexpectedly 0 notification.c:268: Test failed: unexpected function 3, expected 13. probably some notifications were missing notification.c:116: Test failed: 268: expected status 0x2 got 0x800 notification.c:117: Test failed: 268: expected function 3 got 13 notification: Timeout === w1064v1809 (64 bit report) === winhttp: notification.c:116: Test failed: 1061: expected status 0x100 got 0x800 notification: Timeout

Feb. 28, 2022

Re: [PATCH vkd3d 02/10] vkd3d-shader: Introduce VKD3D_SHADER_COMPILE_OPTION_API_VERSION.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=109449 Your paranoid android. === debian11 (build log) === Task: Patch failed to apply === debian11 (build log) === Task: Patch failed to apply

Feb. 28, 2022

Re: [PATCH vkd3d 01/10] vkd3d-shader/hlsl: Respect the requested target type.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=109448 Your paranoid android. === debian11 (build log) === Task: Patch failed to apply === debian11 (build log) === Task: Patch failed to apply

Feb. 28, 2022