January 2023 - Wine-commits

Gerald Pfeifer : wrc: Avoid undefined behavior in the FreeBSD case.
by Alexandre Julliard 13 Jan '23

13 Jan '23

Module: wine Branch: master Commit: f221465a3c689e6c20c29b99f9c9f6a50ec7ff38 URL: https://gitlab.winehq.org/wine/wine/-/commit/f221465a3c689e6c20c29b99f9c9f6… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri Jan 13 13:10:55 2023 +0100 wrc: Avoid undefined behavior in the FreeBSD case. init_argv0_dir has a special case for FreeBSD where one branch led to an unitialized variable and undefined behavior. Initialize properly. --- tools/wrc/wrc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/wrc/wrc.c b/tools/wrc/wrc.c index a1e59c3d2b3..9f231603ad4 100644 --- a/tools/wrc/wrc.c +++ b/tools/wrc/wrc.c @@ -305,6 +305,8 @@ static void init_argv0_dir( const char *argv0 ) char *path = xmalloc( path_size ); if (!sysctl( pathname, ARRAY_SIZE(pathname), path, &path_size, NULL, 0 )) dir = realpath( path, NULL ); + else + dir = NULL; free( path ); #else dir = realpath( argv0, NULL );

1 0

Rémi Bernon : ole32: Use CRT allocation for MIDL_user_(allocate/free).
by Alexandre Julliard 13 Jan '23

13 Jan '23

Module: wine Branch: master Commit: af43e72860722794977d8892b05c0f05136d6299 URL: https://gitlab.winehq.org/wine/wine/-/commit/af43e72860722794977d8892b05c0f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jan 12 20:32:12 2023 +0100 ole32: Use CRT allocation for MIDL_user_(allocate/free). To match combase allocations, as for instance we're freeing pointers returned from InternalIrotRevoke, which are allocated using combase MIDL_user_allocate. --- dlls/ole32/moniker.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c index 09266a33aba..be6150bc7b6 100644 --- a/dlls/ole32/moniker.c +++ b/dlls/ole32/moniker.c @@ -1363,10 +1363,10 @@ HRESULT MonikerMarshal_Create(IMoniker *inner, IUnknown **outer) void * __RPC_USER MIDL_user_allocate(SIZE_T size) { - return HeapAlloc(GetProcessHeap(), 0, size); + return malloc(size); } void __RPC_USER MIDL_user_free(void *p) { - HeapFree(GetProcessHeap(), 0, p); + free(p); }

1 0

Rémi Bernon : ole32: Allocate IEnumSTATDATA data with the process heap.
by Alexandre Julliard 13 Jan '23

13 Jan '23

Module: wine Branch: master Commit: 85fdc7d60eb1f08f1fa169d8bfa5e1abd970c4d6 URL: https://gitlab.winehq.org/wine/wine/-/commit/85fdc7d60eb1f08f1fa169d8bfa5e1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Dec 2 08:45:33 2022 +0100 ole32: Allocate IEnumSTATDATA data with the process heap. It will later be freed in EnumSTATDATA_Release with HeapFree, and the copy code path may allocate the member with HeapAlloc. --- dlls/ole32/datacache.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index e6cea25aca6..b3216992af5 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -2527,7 +2527,7 @@ static HRESULT WINAPI DataCache_EnumCache(IOleCache2 *iface, count++; } - data = CoTaskMemAlloc( count * sizeof(*data) ); + data = HeapAlloc( GetProcessHeap(), 0, count * sizeof(*data) ); if (!data) return E_OUTOFMEMORY; LIST_FOR_EACH_ENTRY( cache_entry, &This->cache_list, DataCacheEntry, entry ) @@ -2559,7 +2559,7 @@ static HRESULT WINAPI DataCache_EnumCache(IOleCache2 *iface, fail: while (i--) CoTaskMemFree( data[i].formatetc.ptd ); - CoTaskMemFree( data ); + HeapFree( GetProcessHeap(), 0, data ); return hr; }

1 0

Rémi Bernon : ole32: Reset IMoniker data pointer to NULL on failure.
by Alexandre Julliard 13 Jan '23

13 Jan '23

Module: wine Branch: master Commit: a547efc094ca89461731c49302883e4d45692eb9 URL: https://gitlab.winehq.org/wine/wine/-/commit/a547efc094ca89461731c49302883e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Dec 2 08:47:56 2022 +0100 ole32: Reset IMoniker data pointer to NULL on failure. To avoid double free when the caller releases the object. --- dlls/ole32/moniker.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c index be6150bc7b6..f98b21bdf2b 100644 --- a/dlls/ole32/moniker.c +++ b/dlls/ole32/moniker.c @@ -161,6 +161,7 @@ static HRESULT get_moniker_comparison_data(IMoniker *pMoniker, MonikerComparison { ERR("Failed to copy comparison data into buffer, hr = %#lx\n", hr); HeapFree(GetProcessHeap(), 0, *moniker_data); + *moniker_data = NULL; return hr; } (*moniker_data)->ulCntData = size;

1 0

Rémi Bernon : ole32: Allocate and free moniker lists with CRT allocations.
by Alexandre Julliard 13 Jan '23

13 Jan '23

Module: wine Branch: master Commit: 93f8819c95407769992c69f75905708178f2b5ce URL: https://gitlab.winehq.org/wine/wine/-/commit/93f8819c95407769992c69f7590570… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jan 12 20:58:16 2023 +0100 ole32: Allocate and free moniker lists with CRT allocations. The RunningObjectTableImpl_EnumRunning codepath returns a list allocated from combase MIDL_user_allocate, which uses msvcrt heap. --- dlls/ole32/moniker.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c index f98b21bdf2b..ec026758b2f 100644 --- a/dlls/ole32/moniker.c +++ b/dlls/ole32/moniker.c @@ -1033,8 +1033,8 @@ static ULONG WINAPI EnumMonikerImpl_Release(IEnumMoniker* iface) TRACE("(%p) Deleting\n",This); for (i = 0; i < This->moniker_list->size; i++) - HeapFree(GetProcessHeap(), 0, This->moniker_list->interfaces[i]); - HeapFree(GetProcessHeap(), 0, This->moniker_list); + free(This->moniker_list->interfaces[i]); + free(This->moniker_list); HeapFree(GetProcessHeap(), 0, This); } @@ -1119,7 +1119,7 @@ static HRESULT WINAPI EnumMonikerImpl_Clone(IEnumMoniker* iface, IEnumMoniker *ppenum = NULL; - moniker_list = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(InterfaceList, interfaces[This->moniker_list->size])); + moniker_list = malloc(FIELD_OFFSET(InterfaceList, interfaces[This->moniker_list->size])); if (!moniker_list) return E_OUTOFMEMORY; @@ -1127,13 +1127,13 @@ static HRESULT WINAPI EnumMonikerImpl_Clone(IEnumMoniker* iface, IEnumMoniker for (i = 0; i < This->moniker_list->size; i++) { SIZE_T size = FIELD_OFFSET(InterfaceData, abData[This->moniker_list->interfaces[i]->ulCntData]); - moniker_list->interfaces[i] = HeapAlloc(GetProcessHeap(), 0, size); + moniker_list->interfaces[i] = malloc(size); if (!moniker_list->interfaces[i]) { ULONG end = i; for (i = 0; i < end; i++) - HeapFree(GetProcessHeap(), 0, moniker_list->interfaces[i]); - HeapFree(GetProcessHeap(), 0, moniker_list); + free(moniker_list->interfaces[i]); + free(moniker_list); return E_OUTOFMEMORY; } memcpy(moniker_list->interfaces[i], This->moniker_list->interfaces[i], size);

1 0

Zebediah Figura : tests: Test specifying a UAV address as an in/out parameter to a function.
by Alexandre Julliard 13 Jan '23

13 Jan '23

Module: vkd3d Branch: master Commit: 22a1a478ea8dbba922df5bdc15aa520d3d0f7299 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/22a1a478ea8dbba922df5bdc15aa5… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Sep 9 21:10:14 2021 -0500 tests: Test specifying a UAV address as an in/out parameter to a function. --- Makefile.am | 1 + tests/uav-out-param.shader_test | 27 +++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/Makefile.am b/Makefile.am index 9459bad9..464b43ae 100644 --- a/Makefile.am +++ b/Makefile.am @@ -144,6 +144,7 @@ vkd3d_shader_tests = \ tests/trigonometry.shader_test \ tests/uav.shader_test \ tests/uav-load.shader_test \ + tests/uav-out-param.shader_test \ tests/writemask-assignop-0.shader_test \ tests/writemask-assignop-1.shader_test \ tests/writemask-assignop-2.shader_test \ diff --git a/tests/uav-out-param.shader_test b/tests/uav-out-param.shader_test new file mode 100644 index 00000000..646d14f6 --- /dev/null +++ b/tests/uav-out-param.shader_test @@ -0,0 +1,27 @@ +[require] +shader model >= 5.0 + +[uav 0] +format r32g32b32a32 float +size (1, 1) + +0.1 0.2 0.3 0.4 + +[compute shader todo] + +RWTexture2D<float4> u; + +void func(inout float4 f) +{ + f.xz += 0.1; +} + + [numthreads(1, 1, 1)] +void main() +{ + func(u[uint2(0, 0)].yzwx); +} + +[test] +todo dispatch 1 1 1 +todo probe uav 0 (0, 0) rgba (0.1, 0.3, 0.3, 0.5)

1 0

Zebediah Figura : vkd3d-shader/hlsl: Avoid assuming that expressions have at least one argument.
by Alexandre Julliard 13 Jan '23

13 Jan '23

Module: vkd3d Branch: master Commit: 30550c083169244c722573a0acb34cda328c0eb0 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/30550c083169244c722573a0acb34… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Sep 10 16:35:54 2021 -0500 vkd3d-shader/hlsl: Avoid assuming that expressions have at least one argument. --- libs/vkd3d-shader/hlsl_codegen.c | 16 +++++++++------- libs/vkd3d-shader/hlsl_constant_ops.c | 2 ++ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index d21e31be..2271e2ac 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -467,12 +467,12 @@ static bool lower_broadcasts(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, v if (instr->type != HLSL_IR_EXPR) return false; cast = hlsl_ir_expr(instr); + if (cast->op != HLSL_OP1_CAST) + return false; src_type = cast->operands[0].node->data_type; dst_type = cast->node.data_type; - if (cast->op == HLSL_OP1_CAST - && src_type->type <= HLSL_CLASS_VECTOR && dst_type->type <= HLSL_CLASS_VECTOR - && src_type->dimx == 1) + if (src_type->type <= HLSL_CLASS_VECTOR && dst_type->type <= HLSL_CLASS_VECTOR && src_type->dimx == 1) { struct hlsl_ir_node *replacement; struct hlsl_ir_swizzle *swizzle; @@ -1050,12 +1050,14 @@ static bool fold_redundant_casts(struct hlsl_ctx *ctx, struct hlsl_ir_node *inst if (instr->type == HLSL_IR_EXPR) { struct hlsl_ir_expr *expr = hlsl_ir_expr(instr); - const struct hlsl_type *src_type = expr->operands[0].node->data_type; const struct hlsl_type *dst_type = expr->node.data_type; + const struct hlsl_type *src_type; if (expr->op != HLSL_OP1_CAST) return false; + src_type = expr->operands[0].node->data_type; + if (hlsl_types_are_equal(src_type, dst_type) || (src_type->base_type == dst_type->base_type && is_vec1(src_type) && is_vec1(dst_type))) { @@ -1213,12 +1215,12 @@ static bool lower_narrowing_casts(struct hlsl_ctx *ctx, struct hlsl_ir_node *ins if (instr->type != HLSL_IR_EXPR) return false; cast = hlsl_ir_expr(instr); + if (cast->op != HLSL_OP1_CAST) + return false; src_type = cast->operands[0].node->data_type; dst_type = cast->node.data_type; - if (cast->op == HLSL_OP1_CAST - && src_type->type <= HLSL_CLASS_VECTOR && dst_type->type <= HLSL_CLASS_VECTOR - && dst_type->dimx < src_type->dimx) + if (src_type->type <= HLSL_CLASS_VECTOR && dst_type->type <= HLSL_CLASS_VECTOR && dst_type->dimx < src_type->dimx) { struct hlsl_ir_swizzle *swizzle; struct hlsl_ir_expr *new_cast; diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c index 858f020c..ea59fb86 100644 --- a/libs/vkd3d-shader/hlsl_constant_ops.c +++ b/libs/vkd3d-shader/hlsl_constant_ops.c @@ -509,6 +509,8 @@ bool hlsl_fold_constant_exprs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, if (instr->type != HLSL_IR_EXPR) return false; expr = hlsl_ir_expr(instr); + if (!expr->operands[0].node) + return false; if (instr->data_type->type > HLSL_CLASS_VECTOR) return false;

1 0

Zebediah Figura : vkd3d-shader/hlsl: Generate IR for user-defined function calls.
by Alexandre Julliard 13 Jan '23

13 Jan '23

Module: vkd3d Branch: master Commit: b29d3489def0ba905ed4e9b4ee0659f8535db9c8 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b29d3489def0ba905ed4e9b4ee065… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Sep 9 21:06:38 2021 -0500 vkd3d-shader/hlsl: Generate IR for user-defined function calls. --- libs/vkd3d-shader/hlsl.c | 55 ++++++++++ libs/vkd3d-shader/hlsl.h | 17 +++ libs/vkd3d-shader/hlsl.y | 126 ++++++++++++++++------ libs/vkd3d-shader/hlsl_codegen.c | 5 + tests/hlsl-function.shader_test | 24 ++--- tests/hlsl-numthreads.shader_test | 2 +- tests/hlsl-return-implicit-conversion.shader_test | 60 +++++------ tests/hlsl-static-initializer.shader_test | 6 +- tests/uav-out-param.shader_test | 4 +- 9 files changed, 220 insertions(+), 79 deletions(-)

1 0

Zebediah Figura : vkd3d-shader/hlsl: Forbid returning void expressions from void functions.
by Alexandre Julliard 13 Jan '23

13 Jan '23

Module: vkd3d Branch: master Commit: 9cc7aaf5a1b3fc4037870635dd305c438ff13361 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/9cc7aaf5a1b3fc4037870635dd305… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Sep 10 16:36:36 2021 -0500 vkd3d-shader/hlsl: Forbid returning void expressions from void functions. --- libs/vkd3d-shader/hlsl.y | 26 +++++++++++++++++--------- tests/hlsl-function.shader_test | 2 +- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index fc0849c7..2d5640aa 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -599,21 +599,29 @@ static struct hlsl_ir_jump *add_return(struct hlsl_ctx *ctx, struct list *instrs struct hlsl_type *return_type = ctx->cur_function->return_type; struct hlsl_ir_jump *jump; - if (return_value) + if (ctx->cur_function->return_var) { - struct hlsl_ir_store *store; + if (return_value) + { + struct hlsl_ir_store *store; - if (!(return_value = add_implicit_conversion(ctx, instrs, return_value, return_type, &loc))) - return NULL; + if (!(return_value = add_implicit_conversion(ctx, instrs, return_value, return_type, &loc))) + return NULL; - if (!(store = hlsl_new_simple_store(ctx, ctx->cur_function->return_var, return_value))) + if (!(store = hlsl_new_simple_store(ctx, ctx->cur_function->return_var, return_value))) + return NULL; + list_add_after(&return_value->entry, &store->node.entry); + } + else + { + hlsl_error(ctx, &loc, VKD3D_SHADER_ERROR_HLSL_INVALID_RETURN, "Non-void functions must return a value."); return NULL; - list_add_after(&return_value->entry, &store->node.entry); + } } - else if (ctx->cur_function->return_var) + else { - hlsl_error(ctx, &loc, VKD3D_SHADER_ERROR_HLSL_INVALID_RETURN, "Non-void function must return a value."); - return NULL; + if (return_value) + hlsl_error(ctx, &loc, VKD3D_SHADER_ERROR_HLSL_INVALID_RETURN, "Void functions cannot return a value."); } if (!(jump = hlsl_new_jump(ctx, HLSL_IR_JUMP_RETURN, loc))) diff --git a/tests/hlsl-function.shader_test b/tests/hlsl-function.shader_test index 3f4908ec..e8bb80c4 100644 --- a/tests/hlsl-function.shader_test +++ b/tests/hlsl-function.shader_test @@ -89,7 +89,7 @@ float4 main() : sv_target return func(); } -[pixel shader fail todo] +[pixel shader fail] void foo() {

1 0

Zebediah Figura : vkd3d-shader/hlsl: Get rid of the "intrinsic" field of struct hlsl_ir_function.
by Alexandre Julliard 13 Jan '23

13 Jan '23

Module: vkd3d Branch: master Commit: 61f0d6d151ecdb95f1a4ff3e960bb44637551a36 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/61f0d6d151ecdb95f1a4ff3e960bb… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Sep 11 17:05:14 2021 -0500 vkd3d-shader/hlsl: Get rid of the "intrinsic" field of struct hlsl_ir_function. We have a different system of generating intrinsics, which makes it easier to deal with "polymorphic" arithmetic functions. Defining and storing intrinsics as hlsl_ir_function_decls would also require more space in memory (and more optimization passes to get rid of the parameter variables), and doesn't really save us any effort in terms of source code. --- libs/vkd3d-shader/hlsl.c | 12 ------------ libs/vkd3d-shader/hlsl.h | 1 - libs/vkd3d-shader/hlsl.y | 2 +- 3 files changed, 1 insertion(+), 14 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 0c3a8a4d..a440aa39 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -2194,17 +2194,6 @@ void hlsl_add_function(struct hlsl_ctx *ctx, char *name, struct hlsl_ir_function if (func_entry) { func = RB_ENTRY_VALUE(func_entry, struct hlsl_ir_function, entry); - if (intrinsic != func->intrinsic) - { - if (intrinsic) - { - ERR("Redeclaring a user defined function as an intrinsic.\n"); - return; - } - func->intrinsic = intrinsic; - rb_destroy(&func->overloads, free_function_decl_rb, NULL); - rb_init(&func->overloads, compare_function_decl_rb); - } decl->func = func; if ((old_entry = rb_get(&func->overloads, decl->parameters))) { @@ -2239,7 +2228,6 @@ void hlsl_add_function(struct hlsl_ctx *ctx, char *name, struct hlsl_ir_function rb_init(&func->overloads, compare_function_decl_rb); decl->func = func; rb_put(&func->overloads, decl->parameters, &decl->entry); - func->intrinsic = intrinsic; rb_put(&ctx->functions, func->name, &func->entry); } diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 39079ac1..14070239 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -374,7 +374,6 @@ struct hlsl_ir_function struct rb_entry entry; const char *name; struct rb_tree overloads; - bool intrinsic; }; struct hlsl_ir_function_decl diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 2d5640aa..019c875c 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -3594,7 +3594,7 @@ hlsl_prog: const struct hlsl_ir_function_decl *decl; decl = get_func_decl(&ctx->functions, $2.name, $2.decl->parameters); - if (decl && !decl->func->intrinsic) + if (decl) { if (decl->has_body && $2.decl->has_body) {

1 0