September 2022 - Wine-Commits

Alexandre Julliard : Revert "oleaut32: Dereference VT_RECORD|VT_BYREF in place.".
by Alexandre Julliard Sept. 27, 2022

Sept. 27, 2022

Module: wine Branch: master Commit: 02ce1008b7876d9f86dfc5844c4be17307b8e055 URL: https://gitlab.winehq.org/wine/wine/-/commit/02ce1008b7876d9f86dfc5844c4be1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 27 09:16:05 2022 +0200 Revert "oleaut32: Dereference VT_RECORD|VT_BYREF in place.". This reverts commit 28e0d8ff3bd0db62e5b15f9b1e3c805b10dd198d. It breaks the tests. --- dlls/oleaut32/tests/vartest.c | 60 ------------------------------------------- dlls/oleaut32/variant.c | 2 +- 2 files changed, 1 insertion(+), 61 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 782142a3ca2..342133d6403 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -902,19 +902,6 @@ static void test_VariantClear(void) ok(recinfo->recordclear == 1, "got %d\n", recinfo->recordclear); ok(recinfo->ref == 1, "got %ld\n", recinfo->ref); IRecordInfo_Release(&recinfo->IRecordInfo_iface); - - /* RECORD BYREF */ - recinfo = get_test_recordinfo(); - V_VT(&v) = VT_RECORD|VT_BYREF; - V_RECORDINFO(&v) = &recinfo->IRecordInfo_iface; - V_RECORD(&v) = recinfo->validsrc; - hres = VariantClear(&v); - ok(hres == S_OK, "ret %08lx\n", hres); - ok(V_VT(&v) == VT_EMPTY, "got vt = %d",V_VT(&v)); - /* BYREF does not own the pointed-to V_RECORD/INFO, so no RecordClear and no Release */ - ok(recinfo->recordclear == 0, "got %d\n", recinfo->recordclear); - ok(recinfo->ref == 1, "got %ld\n", recinfo->ref); - IRecordInfo_Release(&recinfo->IRecordInfo_iface); } static void test_VariantCopy(void) @@ -1082,7 +1069,6 @@ static void test_VariantCopyInd(void) size_t i; BYTE buffer[64]; HRESULT hres, hExpected; - IRecordInfoImpl *recinfo; memset(buffer, 0, sizeof(buffer)); @@ -1273,52 +1259,6 @@ static void test_VariantCopyInd(void) hres = VariantCopyInd(&vDst, &vSrc); ok(hres == E_INVALIDARG, "CopyInd(ref->ref): expected E_INVALIDARG, got 0x%08lx\n", hres); - - /* source data for a deep-copy of VT_BYREF|VT_RECORD... */ - recinfo = get_test_recordinfo(); - V_VT(&vSrc) = VT_RECORD|VT_BYREF; - V_RECORDINFO(&vSrc) = &recinfo->IRecordInfo_iface; - V_RECORD(&vSrc) = recinfo->validsrc; - - /* into a separate vDst */ - VariantInit(&vDst); - hres = VariantCopyInd(&vDst, &vSrc); - ok(hres == S_OK, "VariantCopyInd failed: 0x%08lx\n", hres); - ok(V_VT(&vDst) == VT_RECORD, "got vt = %d|0x%X\n", V_VT(&vDst) & VT_TYPEMASK, V_VT(&vDst) & ~VT_TYPEMASK); - ok(V_RECORDINFO(&vDst) == &recinfo->IRecordInfo_iface, "got %p\n", V_RECORDINFO(&vDst)); - ok(recinfo->recordclear == 0,"got %d\n", recinfo->recordclear); - ok(V_RECORD(&vDst) != recinfo->validsrc, "expected a newly-allocated deep copy\n"); - ok(recinfo->getsize == 1,"got %d\n", recinfo->getsize); - ok(recinfo->recordcopy == 1,"got %d\n", recinfo->recordcopy); - ok(recinfo->ref == 2,"got %ld\n", recinfo->ref); - - VariantClear(&vDst); - ok(recinfo->ref == 1,"got %ld\n", recinfo->ref); - ok(recinfo->recordclear == 1,"got %d\n", recinfo->recordclear); - - recinfo->getsize = 0; - recinfo->recordcopy = 0; - recinfo->recordclear = 0; - - /* and also in-place */ - hres = VariantCopyInd(&vSrc, &vSrc); - ok(V_VT(&vSrc) == VT_RECORD, "got vt = %d|0x%X\n", V_VT(&vSrc) & VT_TYPEMASK, V_VT(&vSrc) & ~VT_TYPEMASK); - ok(V_RECORDINFO(&vSrc) == &recinfo->IRecordInfo_iface, "got %p\n", V_RECORDINFO(&vSrc)); - /* ++ref and no RecordClear, since the source BYREF does not own the V_RECORD/INFO - * which it pointed to, and thus did not free them when overwritten */ - ok(recinfo->ref == 2,"got %ld\n", recinfo->ref); - ok(recinfo->recordclear == 0,"got %d\n", recinfo->recordclear); - - ok(V_RECORD(&vDst) != recinfo->validsrc, "expected a newly-allocated deep copy\n"); - ok(recinfo->getsize == 1,"got %d\n", recinfo->getsize); - ok(recinfo->recordcopy == 1,"got %d\n", recinfo->recordcopy); - - /* but the no-longer-BYREF output owns and will free its copies */ - VariantClear(&vSrc); - ok(recinfo->ref == 1,"got %ld\n", recinfo->ref); - ok(recinfo->recordclear == 1,"got %d\n", recinfo->recordclear); - - IRecordInfo_Release(&recinfo->IRecordInfo_iface); } static HRESULT (WINAPI *pVarParseNumFromStr)(const OLECHAR*,LCID,ULONG,NUMPARSE*,BYTE*); diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index ec0c9544a61..885082cc659 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -879,7 +879,7 @@ HRESULT WINAPI VariantCopyInd(VARIANT* pvargDest, const VARIANTARG* pvargSrc) } else if (V_VT(pSrc) == (VT_RECORD|VT_BYREF)) { - hres = VARIANT_CopyIRecordInfo(pvargDest, pSrc); + hres = VARIANT_CopyIRecordInfo(pvargDest, pvargSrc); } else if (V_VT(pSrc) == (VT_DISPATCH|VT_BYREF) || V_VT(pSrc) == (VT_UNKNOWN|VT_BYREF))

1 0

Zebediah Figura : vkd3d-shader/hlsl: Pass the arguments to hlsl_new_resource_load() as an indirect structure.
by Alexandre Julliard Sept. 27, 2022

Sept. 27, 2022

Module: vkd3d Branch: master Commit: 15a0b44adacdfc050fc7cde2f167e00e049c7066 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/15a0b44adacdfc050fc7cde2f167e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Sep 26 18:20:22 2022 -0500 vkd3d-shader/hlsl: Pass the arguments to hlsl_new_resource_load() as an indirect structure. The function has far too many arguments, including multiple different arguments with the same type. Use a structure for clarity and to avoid errors. Merge hlsl_new_sample_lod() into hlsl_new_resource_load() accordingly. --- libs/vkd3d-shader/hlsl.c | 30 ++++++-------------- libs/vkd3d-shader/hlsl.h | 17 ++++++----- libs/vkd3d-shader/hlsl.y | 73 +++++++++++++++++++++++++----------------------- 3 files changed, 57 insertions(+), 63 deletions(-)

1 0

Zebediah Figura : vkd3d-common: Tweak the WARN for VKD3D_ERROR_INVALID_SHADER.
by Alexandre Julliard Sept. 27, 2022

Sept. 27, 2022

Module: vkd3d Branch: master Commit: 32999fc12b6c3b40f78c0e2794908587939f973e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/32999fc12b6c3b40f78c0e2794908… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Aug 29 14:31:01 2022 -0500 vkd3d-common: Tweak the WARN for VKD3D_ERROR_INVALID_SHADER. vkd3d-shader does not consume only bytecode anymore. --- libs/vkd3d-common/error.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-common/error.c b/libs/vkd3d-common/error.c index 81c1fd97..3572669a 100644 --- a/libs/vkd3d-common/error.c +++ b/libs/vkd3d-common/error.c @@ -26,7 +26,7 @@ HRESULT hresult_from_vkd3d_result(int vkd3d_result) case VKD3D_OK: return S_OK; case VKD3D_ERROR_INVALID_SHADER: - WARN("Invalid shader bytecode.\n"); + WARN("Invalid shader.\n"); /* fall-through */ case VKD3D_ERROR: return E_FAIL;

1 0

Zebediah Figura : vkd3d-shader/hlsl: Pass only a template string to hlsl_new_synthetic_var().
by Alexandre Julliard Sept. 27, 2022

Sept. 27, 2022

Module: vkd3d Branch: master Commit: e3123f5bd0c1aa8d3dcfb795d073472405e38e74 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e3123f5bd0c1aa8d3dcfb795d0734… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Sep 26 17:51:36 2022 -0500 vkd3d-shader/hlsl: Pass only a template string to hlsl_new_synthetic_var(). Synthesize the internal name from the template inside of this function. --- libs/vkd3d-shader/hlsl.c | 19 +++++++++++++--- libs/vkd3d-shader/hlsl.h | 4 ++-- libs/vkd3d-shader/hlsl.y | 57 ++++++++---------------------------------------- 3 files changed, 27 insertions(+), 53 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index fdaf1d97..9fde0b31 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -766,11 +766,24 @@ struct hlsl_ir_var *hlsl_new_var(struct hlsl_ctx *ctx, const char *name, struct return var; } -struct hlsl_ir_var *hlsl_new_synthetic_var(struct hlsl_ctx *ctx, const char *name, struct hlsl_type *type, - const struct vkd3d_shader_location loc) +struct hlsl_ir_var *hlsl_new_synthetic_var(struct hlsl_ctx *ctx, const char *template, + struct hlsl_type *type, const struct vkd3d_shader_location *loc) { - struct hlsl_ir_var *var = hlsl_new_var(ctx, hlsl_strdup(ctx, name), type, loc, NULL, 0, NULL); + struct vkd3d_string_buffer *string; + struct hlsl_ir_var *var; + static LONG counter; + const char *name; + if (!(string = hlsl_get_string_buffer(ctx))) + return NULL; + vkd3d_string_buffer_printf(string, "<%s-%u>", template, InterlockedIncrement(&counter)); + if (!(name = hlsl_strdup(ctx, string->buffer))) + { + hlsl_release_string_buffer(ctx, string); + return NULL; + } + var = hlsl_new_var(ctx, name, type, *loc, NULL, 0, NULL); + hlsl_release_string_buffer(ctx, string); if (var) list_add_tail(&ctx->globals->vars, &var->scope_entry); return var; diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 7d382488..0b698a9a 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -784,8 +784,8 @@ struct hlsl_type *hlsl_new_struct_type(struct hlsl_ctx *ctx, const char *name, struct hlsl_struct_field *fields, size_t field_count); struct hlsl_ir_swizzle *hlsl_new_swizzle(struct hlsl_ctx *ctx, DWORD s, unsigned int components, struct hlsl_ir_node *val, const struct vkd3d_shader_location *loc); -struct hlsl_ir_var *hlsl_new_synthetic_var(struct hlsl_ctx *ctx, const char *name, struct hlsl_type *type, - const struct vkd3d_shader_location loc); +struct hlsl_ir_var *hlsl_new_synthetic_var(struct hlsl_ctx *ctx, const char *template, + struct hlsl_type *type, const struct vkd3d_shader_location *loc); struct hlsl_type *hlsl_new_texture_type(struct hlsl_ctx *ctx, enum hlsl_sampler_dim dim, struct hlsl_type *format); struct hlsl_ir_constant *hlsl_new_uint_constant(struct hlsl_ctx *ctx, unsigned int n, const struct vkd3d_shader_location *loc); diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index b9e7b262..0ca51c73 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -287,8 +287,6 @@ static struct hlsl_ir_node *add_cast(struct hlsl_ctx *ctx, struct list *instrs, if ((src_type->type == HLSL_CLASS_MATRIX || dst_type->type == HLSL_CLASS_MATRIX) && src_type->type <= HLSL_CLASS_LAST_NUMERIC && dst_type->type <= HLSL_CLASS_LAST_NUMERIC) { - struct vkd3d_string_buffer *name; - static unsigned int counter = 0; struct hlsl_deref var_deref; struct hlsl_ir_load *load; struct hlsl_ir_var *var; @@ -303,11 +301,7 @@ static struct hlsl_ir_node *add_cast(struct hlsl_ctx *ctx, struct list *instrs, assert(dst_type->dimy <= src_type->dimy); } - name = vkd3d_string_buffer_get(&ctx->string_buffers); - vkd3d_string_buffer_printf(name, "<cast-%u>", counter++); - var = hlsl_new_synthetic_var(ctx, name->buffer, dst_type, *loc); - vkd3d_string_buffer_release(&ctx->string_buffers, name); - if (!var) + if (!(var = hlsl_new_synthetic_var(ctx, "cast", dst_type, loc))) return NULL; hlsl_init_simple_deref_from_var(&var_deref, var); @@ -635,16 +629,10 @@ static struct hlsl_ir_load *add_load_index(struct hlsl_ctx *ctx, struct list *in } else { - struct vkd3d_string_buffer *name; struct hlsl_ir_store *store; struct hlsl_ir_var *var; - if (!(name = hlsl_get_string_buffer(ctx))) - return NULL; - vkd3d_string_buffer_printf(name, "<deref-%p>", var_instr); - var = hlsl_new_synthetic_var(ctx, name->buffer, var_instr->data_type, var_instr->loc); - hlsl_release_string_buffer(ctx, name); - if (!var) + if (!(var = hlsl_new_synthetic_var(ctx, "deref", var_instr->data_type, &var_instr->loc))) return NULL; if (!(store = hlsl_new_simple_store(ctx, var, var_instr))) @@ -674,16 +662,10 @@ static struct hlsl_ir_load *add_load_component(struct hlsl_ctx *ctx, struct list } else { - struct vkd3d_string_buffer *name; struct hlsl_ir_store *store; struct hlsl_ir_var *var; - if (!(name = hlsl_get_string_buffer(ctx))) - return NULL; - vkd3d_string_buffer_printf(name, "<deref-%p>", var_instr); - var = hlsl_new_synthetic_var(ctx, name->buffer, var_instr->data_type, var_instr->loc); - hlsl_release_string_buffer(ctx, name); - if (!var) + if (!(var = hlsl_new_synthetic_var(ctx, "deref", var_instr->data_type, &var_instr->loc))) return NULL; if (!(store = hlsl_new_simple_store(ctx, var, var_instr))) @@ -722,8 +704,6 @@ static bool add_matrix_index(struct hlsl_ctx *ctx, struct list *instrs, struct hlsl_ir_node *matrix, struct hlsl_ir_node *index, const struct vkd3d_shader_location *loc) { struct hlsl_type *mat_type = matrix->data_type, *ret_type; - struct vkd3d_string_buffer *name; - static unsigned int counter = 0; struct hlsl_deref var_deref; struct hlsl_ir_load *load; struct hlsl_ir_var *var; @@ -734,11 +714,7 @@ static bool add_matrix_index(struct hlsl_ctx *ctx, struct list *instrs, ret_type = hlsl_get_vector_type(ctx, mat_type->base_type, mat_type->dimx); - name = vkd3d_string_buffer_get(&ctx->string_buffers); - vkd3d_string_buffer_printf(name, "<index-%u>", counter++); - var = hlsl_new_synthetic_var(ctx, name->buffer, ret_type, *loc); - vkd3d_string_buffer_release(&ctx->string_buffers, name); - if (!var) + if (!(var = hlsl_new_synthetic_var(ctx, "index", ret_type, loc))) return false; hlsl_init_simple_deref_from_var(&var_deref, var); @@ -1246,8 +1222,6 @@ static struct hlsl_ir_node *add_expr(struct hlsl_ctx *ctx, struct list *instrs, if (type->type == HLSL_CLASS_MATRIX) { - struct vkd3d_string_buffer *name; - static unsigned int counter = 0; struct hlsl_type *vector_type; struct hlsl_deref var_deref; struct hlsl_ir_load *load; @@ -1255,11 +1229,7 @@ static struct hlsl_ir_node *add_expr(struct hlsl_ctx *ctx, struct list *instrs, vector_type = hlsl_get_vector_type(ctx, type->base_type, hlsl_type_minor_size(type)); - name = vkd3d_string_buffer_get(&ctx->string_buffers); - vkd3d_string_buffer_printf(name, "<split_op-%u>", counter++); - var = hlsl_new_synthetic_var(ctx, name->buffer, type, *loc); - vkd3d_string_buffer_release(&ctx->string_buffers, name); - if (!var) + if (!(var = hlsl_new_synthetic_var(ctx, "split_op", type, loc))) return NULL; hlsl_init_simple_deref_from_var(&var_deref, var); @@ -2217,8 +2187,6 @@ static bool intrinsic_mul(struct hlsl_ctx *ctx, enum hlsl_base_type base = expr_common_base_type(arg1->data_type->base_type, arg2->data_type->base_type); struct hlsl_type *cast_type1 = arg1->data_type, *cast_type2 = arg2->data_type, *matrix_type, *ret_type; unsigned int i, j, k, vect_count = 0; - struct vkd3d_string_buffer *name; - static unsigned int counter = 0; struct hlsl_deref var_deref; struct hlsl_ir_load *load; struct hlsl_ir_var *var; @@ -2260,11 +2228,7 @@ static bool intrinsic_mul(struct hlsl_ctx *ctx, if (!(cast2 = add_implicit_conversion(ctx, params->instrs, arg2, cast_type2, loc))) return false; - name = vkd3d_string_buffer_get(&ctx->string_buffers); - vkd3d_string_buffer_printf(name, "<mul-%u>", counter++); - var = hlsl_new_synthetic_var(ctx, name->buffer, matrix_type, *loc); - vkd3d_string_buffer_release(&ctx->string_buffers, name); - if (!var) + if (!(var = hlsl_new_synthetic_var(ctx, "mul", matrix_type, loc))) return false; hlsl_init_simple_deref_from_var(&var_deref, var); @@ -2454,14 +2418,11 @@ static struct list *add_call(struct hlsl_ctx *ctx, const char *name, static struct list *add_constructor(struct hlsl_ctx *ctx, struct hlsl_type *type, struct parse_initializer *params, struct vkd3d_shader_location loc) { - static unsigned int counter; struct hlsl_ir_load *load; struct hlsl_ir_var *var; unsigned int i, idx = 0; - char name[23]; - sprintf(name, "<constructor-%x>", counter++); - if (!(var = hlsl_new_synthetic_var(ctx, name, type, loc))) + if (!(var = hlsl_new_synthetic_var(ctx, "constructor", type, &loc))) return NULL; for (i = 0; i < params->args_count; ++i) @@ -4077,8 +4038,8 @@ primary_expr: struct hlsl_ir_load *load; struct hlsl_ir_var *var; - if (!(var = hlsl_new_synthetic_var(ctx, "<state-block-expr>", - hlsl_get_scalar_type(ctx, HLSL_TYPE_INT), @1))) + if (!(var = hlsl_new_synthetic_var(ctx, "state_block_expr", + hlsl_get_scalar_type(ctx, HLSL_TYPE_INT), &@1))) YYABORT; if (!(load = hlsl_new_var_load(ctx, var, @1))) YYABORT;

1 0

Zebediah Figura : vkd3d: Avoid an unused variable warning when building for Win32.
by Alexandre Julliard Sept. 27, 2022

Sept. 27, 2022

Module: vkd3d Branch: master Commit: 27a6963d6ae27d4494cb445363d490e408d1adab URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/27a6963d6ae27d4494cb445363d49… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Apr 1 15:57:44 2022 -0500 vkd3d: Avoid an unused variable warning when building for Win32. --- libs/vkd3d/device.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 1c29bdc1..1ee6ed37 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -4410,7 +4410,6 @@ HRESULT vkd3d_create_thread(struct vkd3d_instance *instance, PFN_vkd3d_thread thread_main, void *data, union vkd3d_thread_handle *thread) { HRESULT hr = S_OK; - int rc; if (instance->create_thread) { @@ -4437,6 +4436,8 @@ HRESULT vkd3d_create_thread(struct vkd3d_instance *instance, hr = E_FAIL; } #else + int rc; + if ((rc = pthread_create(&thread->pthread, NULL, thread_main, data))) { ERR("Failed to create thread, error %d.\n", rc);

1 0

Zebediah Figura : vkd3d-shader/hlsl: Handle failure from hlsl_copy_deref().
by Alexandre Julliard Sept. 27, 2022

Sept. 27, 2022

Module: vkd3d Branch: master Commit: 991cddd139f58fdbea0c21fa570ea50f7c3fdc57 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/991cddd139f58fdbea0c21fa570ea… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Sep 26 16:56:19 2022 -0500 vkd3d-shader/hlsl: Handle failure from hlsl_copy_deref(). --- libs/vkd3d-shader/hlsl.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index ae8ab185..fdaf1d97 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1047,8 +1047,17 @@ struct hlsl_ir_resource_load *hlsl_new_resource_load(struct hlsl_ctx *ctx, struc return NULL; init_node(&load->node, HLSL_IR_RESOURCE_LOAD, data_type, *loc); load->load_type = type; - hlsl_copy_deref(ctx, &load->resource, resource); - hlsl_copy_deref(ctx, &load->sampler, sampler); + if (!hlsl_copy_deref(ctx, &load->resource, resource)) + { + vkd3d_free(load); + return NULL; + } + if (!hlsl_copy_deref(ctx, &load->sampler, sampler)) + { + hlsl_cleanup_deref(&load->resource); + vkd3d_free(load); + return NULL; + } hlsl_src_from_node(&load->coords, coords); hlsl_src_from_node(&load->texel_offset, texel_offset); return load;

1 0

Zebediah Figura : vkd3d-shader/hlsl: Make the source parameter to hlsl_copy_deref() const.
by Alexandre Julliard Sept. 27, 2022

Sept. 27, 2022

Module: vkd3d Branch: master Commit: fb724d60e399865ce3739fa1431b7bd9f28fd619 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/fb724d60e399865ce3739fa1431b7… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Sep 26 18:19:54 2022 -0500 vkd3d-shader/hlsl: Make the source parameter to hlsl_copy_deref() const. --- libs/vkd3d-shader/hlsl.c | 2 +- libs/vkd3d-shader/hlsl.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 9fde0b31..c696be83 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -794,7 +794,7 @@ static bool type_is_single_reg(const struct hlsl_type *type) return type->type == HLSL_CLASS_SCALAR || type->type == HLSL_CLASS_VECTOR; } -bool hlsl_copy_deref(struct hlsl_ctx *ctx, struct hlsl_deref *deref, struct hlsl_deref *other) +bool hlsl_copy_deref(struct hlsl_ctx *ctx, struct hlsl_deref *deref, const struct hlsl_deref *other) { unsigned int i; diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 0b698a9a..1d44c3e9 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -722,7 +722,7 @@ void hlsl_dump_function(struct hlsl_ctx *ctx, const struct hlsl_ir_function_decl int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_func, enum vkd3d_shader_target_type target_type, struct vkd3d_shader_code *out); -bool hlsl_copy_deref(struct hlsl_ctx *ctx, struct hlsl_deref *deref, struct hlsl_deref *other); +bool hlsl_copy_deref(struct hlsl_ctx *ctx, struct hlsl_deref *deref, const struct hlsl_deref *other); void hlsl_cleanup_deref(struct hlsl_deref *deref); void hlsl_replace_node(struct hlsl_ir_node *old, struct hlsl_ir_node *new);

1 0

Giovanni Mascellani : vkd3d: Add a macro to mark unreachable code.
by Alexandre Julliard Sept. 27, 2022

Sept. 27, 2022

Module: vkd3d Branch: master Commit: d5fd309ef8b3ed10a0f862a1acb1e6c1681a7ca1 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d5fd309ef8b3ed10a0f862a1acb1e… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Aug 31 13:25:24 2022 +0200 vkd3d: Add a macro to mark unreachable code. This should silence warnings about some branches non returning any value without requiring additional "return 0" statement or similar. Also, in theory this might enable to compiler to optimize the program a little bit more, though that's unlikely to have any measurable effect. --- include/private/vkd3d_common.h | 14 ++++++++++++ libs/vkd3d-shader/hlsl.c | 14 +++++------- libs/vkd3d-shader/hlsl.h | 3 +-- libs/vkd3d-shader/hlsl.y | 12 +++++----- libs/vkd3d-shader/hlsl_codegen.c | 9 +++----- libs/vkd3d-shader/hlsl_constant_ops.c | 12 +++------- libs/vkd3d-shader/hlsl_sm1.c | 9 ++++---- libs/vkd3d-shader/hlsl_sm4.c | 42 ++++++++++++----------------------- libs/vkd3d-shader/vkd3d_shader_main.c | 2 +- tests/shader_runner_d3d9.c | 6 ++--- 10 files changed, 52 insertions(+), 71 deletions(-)

1 0

Alexandre Julliard : packaging: Update RPM commands after WineHQ server upgrade.
by Alexandre Julliard Sept. 27, 2022

Sept. 27, 2022

Module: tools Branch: master Commit: c1b2d13d3fdbcf283f6b4526a12028c2221340f6 URL: https://gitlab.winehq.org/winehq/tools/-/commit/c1b2d13d3fdbcf283f6b4526a12… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 26 10:50:39 2022 +0200 packaging: Update RPM commands after WineHQ server upgrade. --- packaging/obs/obs-sync | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packaging/obs/obs-sync b/packaging/obs/obs-sync index 54b8c8f3..5a8e7ad8 100755 --- a/packaging/obs/obs-sync +++ b/packaging/obs/obs-sync @@ -28,7 +28,7 @@ download_packages () # rpm packages find $obs_mirror/Fedora -mtime "+120" -type f -print0 | xargs -0 rm -f - reposync --source -c yum.conf -g -e .cache + dnf reposync --source -c yum.conf -g } # add rpm files for a single Fedora release @@ -116,7 +116,7 @@ index_rpm () dest=dest/fedora/$1 rm -rf $dest/repodata - createrepo -c $basedir/.cache -u https://dl.winehq.org/wine-builds/fedora/$1 $dest + createrepo_c -c $basedir/.cache -u https://dl.winehq.org/wine-builds/fedora/$1 $dest make_repo fedora/$1 >$dest/winehq.repo gpg -u $gpg_user --detach-sign --armor $dest/repodata/repomd.xml }

1 0

Alexandre Julliard : packaging: Remove Debian 10.
by Alexandre Julliard Sept. 27, 2022

Sept. 27, 2022

Module: tools Branch: master Commit: 0712e12f56eb819965ce6720b190c5b2aeec7915 URL: https://gitlab.winehq.org/winehq/tools/-/commit/0712e12f56eb819965ce6720b19… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Sep 24 10:52:47 2022 +0200 packaging: Remove Debian 10. --- packaging/obs/apt-mirror.cfg | 4 ---- packaging/obs/obs-sync | 3 +-- packaging/obs/rsync-filter | 2 -- 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/packaging/obs/apt-mirror.cfg b/packaging/obs/apt-mirror.cfg index a2dd2782..1ea24ded 100644 --- a/packaging/obs/apt-mirror.cfg +++ b/packaging/obs/apt-mirror.cfg @@ -14,10 +14,6 @@ set _tilde 0 # ############# end config ############## -deb-amd64 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/Debian_10 ./ -deb-i386 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/Debian_10 ./ -deb-src https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/Debian_10 ./ - deb-amd64 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/Debian_11 ./ deb-i386 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/Debian_11 ./ deb-src https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/Debian_11 ./ diff --git a/packaging/obs/obs-sync b/packaging/obs/obs-sync index 54fff2ae..54b8c8f3 100755 --- a/packaging/obs/obs-sync +++ b/packaging/obs/obs-sync @@ -199,7 +199,7 @@ publish_files () cd $basedir -distros="35 36 buster bullseye bookworm bionic focal jammy" +distros="35 36 bullseye bookworm bionic focal jammy" dry_run= build=1 @@ -253,7 +253,6 @@ do do case $i in 3?) add_rpm $i Fedora_$i ;; - buster) add_deb debian $i Debian_10 oldstable ;; bullseye) add_deb debian $i Debian_11 stable ;; bookworm) add_deb debian $i Debian_Testing_standard testing ;; bionic) add_deb ubuntu $i xUbuntu_18.04 ;; diff --git a/packaging/obs/rsync-filter b/packaging/obs/rsync-filter index 2675716a..cccb35d0 100644 --- a/packaging/obs/rsync-filter +++ b/packaging/obs/rsync-filter @@ -5,10 +5,8 @@ + /debian + /debian/dists -+ /debian/dists/oldstable + /debian/dists/stable + /debian/dists/testing -+ /debian/dists/buster + /debian/dists/bullseye + /debian/dists/bookworm - /debian/dists/*

1 0