October 2022 - Wine-commits

Zebediah Figura : vkd3d-shader/hlsl: Parse texture index expressions.
by Alexandre Julliard 19 Oct '22

19 Oct '22

Module: vkd3d Branch: master Commit: fea50d243ccd16df18a448e8475ae120a725ebee URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/fea50d243ccd16df18a448e8475ae… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Aug 12 18:26:53 2021 -0500 vkd3d-shader/hlsl: Parse texture index expressions. --- libs/vkd3d-shader/hlsl.y | 74 ++++++++++++++++++++++++++++++++++++++++-- tests/texture-load.shader_test | 15 +++++++++ 2 files changed, 87 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index dbb9571d..aee12b83 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -747,13 +747,83 @@ static bool add_matrix_index(struct hlsl_ctx *ctx, struct list *instrs, return true; } +static struct hlsl_ir_node *add_zero_mipmap_level(struct hlsl_ctx *ctx, struct list *instrs, + struct hlsl_ir_node *index, unsigned int dim_count, const struct vkd3d_shader_location *loc) +{ + struct hlsl_ir_load *coords_load; + struct hlsl_deref coords_deref; + struct hlsl_ir_constant *zero; + struct hlsl_ir_store *store; + struct hlsl_ir_var *coords; + + if (!(coords = hlsl_new_synthetic_var(ctx, "coords", + hlsl_get_vector_type(ctx, HLSL_TYPE_UINT, dim_count + 1), loc))) + return NULL; + + hlsl_init_simple_deref_from_var(&coords_deref, coords); + if (!(store = hlsl_new_store_index(ctx, &coords_deref, NULL, index, (1u << dim_count) - 1, loc))) + return NULL; + list_add_tail(instrs, &store->node.entry); + + if (!(zero = hlsl_new_uint_constant(ctx, 0, loc))) + return NULL; + list_add_tail(instrs, &zero->node.entry); + + if (!(store = hlsl_new_store_index(ctx, &coords_deref, NULL, &zero->node, 1u << dim_count, loc))) + return NULL; + list_add_tail(instrs, &store->node.entry); + + if (!(coords_load = hlsl_new_var_load(ctx, coords, *loc))) + return NULL; + list_add_tail(instrs, &coords_load->node.entry); + + return &coords_load->node; +} + static bool add_array_load(struct hlsl_ctx *ctx, struct list *instrs, struct hlsl_ir_node *array, struct hlsl_ir_node *index, const struct vkd3d_shader_location *loc) { - const struct hlsl_type *expr_type = array->data_type; + const struct hlsl_type *expr_type = array->data_type, *index_type = index->data_type; struct hlsl_ir_expr *cast; - if (index->data_type->type != HLSL_CLASS_SCALAR) + if (expr_type->type == HLSL_CLASS_OBJECT && expr_type->base_type == HLSL_TYPE_TEXTURE + && expr_type->sampler_dim != HLSL_SAMPLER_DIM_GENERIC) + { + struct hlsl_resource_load_params load_params = {.type = HLSL_RESOURCE_LOAD}; + unsigned int dim_count = hlsl_sampler_dim_count(expr_type->sampler_dim); + /* Only HLSL_IR_LOAD can return an object. */ + struct hlsl_ir_load *object_load = hlsl_ir_load(array); + struct hlsl_ir_resource_load *resource_load; + + if (index_type->type > HLSL_CLASS_VECTOR || index_type->dimx != dim_count) + { + struct vkd3d_string_buffer *string; + + if ((string = hlsl_type_to_string(ctx, expr_type))) + hlsl_error(ctx, &index->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, + "Array index of type '%s' must be of type 'uint%u'.", string->buffer, dim_count); + hlsl_release_string_buffer(ctx, string); + return false; + } + + if (!(index = add_implicit_conversion(ctx, instrs, index, + hlsl_get_vector_type(ctx, HLSL_TYPE_UINT, dim_count), &index->loc))) + return false; + + if (!(index = add_zero_mipmap_level(ctx, instrs, index, dim_count, loc))) + return false; + + load_params.format = expr_type->e.resource_format; + load_params.resource = object_load->src; + load_params.coords = index; + + if (!(resource_load = hlsl_new_resource_load(ctx, &load_params, loc))) + return false; + list_add_tail(instrs, &resource_load->node.entry); + return true; + } + + if (index_type->type != HLSL_CLASS_SCALAR) { hlsl_error(ctx, &index->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, "Array index is not scalar."); return false; diff --git a/tests/texture-load.shader_test b/tests/texture-load.shader_test index 81d06305..7d39fb65 100644 --- a/tests/texture-load.shader_test +++ b/tests/texture-load.shader_test @@ -20,3 +20,18 @@ probe (0, 0) rgba (0.1, 0.2, 0.3, 0.4) probe (1, 0) rgba (0.5, 0.7, 0.6, 0.8) probe (0, 1) rgba (0.6, 0.5, 0.2, 0.1) probe (1, 1) rgba (0.8, 0.0, 0.7, 1.0) + +[pixel shader] +Texture2D t; + +float4 main(float4 pos : sv_position) : sv_target +{ + return t[pos.yx]; +} + +[test] +draw quad +probe (0, 0) rgba (0.1, 0.2, 0.3, 0.4) +probe (1, 0) rgba (0.6, 0.5, 0.2, 0.1) +probe (0, 1) rgba (0.5, 0.7, 0.6, 0.8) +probe (1, 1) rgba (0.8, 0.0, 0.7, 1.0)

1 0

Zebediah Figura : vkd3d-shader/hlsl: Parse UAV types.
by Alexandre Julliard 19 Oct '22

19 Oct '22

Module: vkd3d Branch: master Commit: 0ef04659c747724a8612de9afb16306f12746b35 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/0ef04659c747724a8612de9afb163… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Aug 12 21:03:26 2021 -0500 vkd3d-shader/hlsl: Parse UAV types. --- libs/vkd3d-shader/hlsl.c | 25 ++++++++++++++++++++++++- libs/vkd3d-shader/hlsl.h | 2 ++ libs/vkd3d-shader/hlsl.l | 3 +++ libs/vkd3d-shader/hlsl.y | 33 ++++++++++++++++++++++++++++++++- libs/vkd3d-shader/hlsl_sm4.c | 2 ++ 5 files changed, 63 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 3edbb978..8591fe31 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -525,6 +525,23 @@ struct hlsl_type *hlsl_new_texture_type(struct hlsl_ctx *ctx, enum hlsl_sampler_ return type; } +struct hlsl_type *hlsl_new_uav_type(struct hlsl_ctx *ctx, enum hlsl_sampler_dim dim, struct hlsl_type *format) +{ + struct hlsl_type *type; + + if (!(type = vkd3d_calloc(1, sizeof(*type)))) + return NULL; + type->type = HLSL_CLASS_OBJECT; + type->base_type = HLSL_TYPE_UAV; + type->dimx = format->dimx; + type->dimy = 1; + type->sampler_dim = dim; + type->e.resource_format = format; + hlsl_type_calculate_reg_size(ctx, type); + list_add_tail(&ctx->types, &type->entry); + return type; +} + struct hlsl_type *hlsl_get_type(struct hlsl_scope *scope, const char *name, bool recursive) { struct rb_entry *entry = rb_get(&scope->types, name); @@ -596,7 +613,8 @@ bool hlsl_types_are_equal(const struct hlsl_type *t1, const struct hlsl_type *t2 return false; if (t1->base_type != t2->base_type) return false; - if (t1->base_type == HLSL_TYPE_SAMPLER || t1->base_type == HLSL_TYPE_TEXTURE) + if (t1->base_type == HLSL_TYPE_SAMPLER || t1->base_type == HLSL_TYPE_TEXTURE + || t1->base_type == HLSL_TYPE_UAV) { if (t1->sampler_dim != t2->sampler_dim) return false; @@ -1411,6 +1429,11 @@ struct vkd3d_string_buffer *hlsl_type_to_string(struct hlsl_ctx *ctx, const stru base_types[type->e.resource_format->base_type], type->e.resource_format->dimx); return string; + case HLSL_TYPE_UAV: + vkd3d_string_buffer_printf(string, "RWTexture%s<%s%u>", dimensions[type->sampler_dim], + base_types[type->e.resource_format->base_type], type->e.resource_format->dimx); + return string; + default: vkd3d_string_buffer_printf(string, "<unexpected type>"); return string; diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index e8f01f2b..f237d6c4 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -85,6 +85,7 @@ enum hlsl_base_type HLSL_TYPE_LAST_SCALAR = HLSL_TYPE_BOOL, HLSL_TYPE_SAMPLER, HLSL_TYPE_TEXTURE, + HLSL_TYPE_UAV, HLSL_TYPE_PIXELSHADER, HLSL_TYPE_VERTEXSHADER, HLSL_TYPE_STRING, @@ -787,6 +788,7 @@ struct hlsl_ir_swizzle *hlsl_new_swizzle(struct hlsl_ctx *ctx, DWORD s, unsigned 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_type *hlsl_new_uav_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); struct hlsl_ir_node *hlsl_new_unary_expr(struct hlsl_ctx *ctx, enum hlsl_ir_expr_op op, struct hlsl_ir_node *arg, diff --git a/libs/vkd3d-shader/hlsl.l b/libs/vkd3d-shader/hlsl.l index ff7b712f..69ed9d9d 100644 --- a/libs/vkd3d-shader/hlsl.l +++ b/libs/vkd3d-shader/hlsl.l @@ -102,6 +102,9 @@ RasterizerState {return KW_RASTERIZERSTATE; } RenderTargetView {return KW_RENDERTARGETVIEW; } return {return KW_RETURN; } register {return KW_REGISTER; } +RWTexture1D {return KW_RWTEXTURE1D; } +RWTexture2D {return KW_RWTEXTURE2D; } +RWTexture3D {return KW_RWTEXTURE3D; } sampler {return KW_SAMPLER; } sampler1D {return KW_SAMPLER1D; } sampler2D {return KW_SAMPLER2D; } diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index aee12b83..62d86b9d 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -3031,6 +3031,9 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl %token KW_RETURN %token KW_REGISTER %token KW_ROW_MAJOR +%token KW_RWTEXTURE1D +%token KW_RWTEXTURE2D +%token KW_RWTEXTURE3D %token KW_SAMPLER %token KW_SAMPLER1D %token KW_SAMPLER2D @@ -3168,7 +3171,7 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl %type <reg_reservation> register_opt -%type <sampler_dim> texture_type +%type <sampler_dim> texture_type uav_type %type <semantic> semantic @@ -3592,6 +3595,20 @@ texture_type: $$ = HLSL_SAMPLER_DIM_CUBEARRAY; } +uav_type: + KW_RWTEXTURE1D + { + $$ = HLSL_SAMPLER_DIM_1D; + } + | KW_RWTEXTURE2D + { + $$ = HLSL_SAMPLER_DIM_2D; + } + | KW_RWTEXTURE3D + { + $$ = HLSL_SAMPLER_DIM_3D; + } + type: KW_VECTOR '<' type ',' C_INTEGER '>' { @@ -3697,6 +3714,20 @@ type: } $$ = hlsl_new_texture_type(ctx, $1, $3); } + | uav_type '<' type '>' + { + if ($3->type > HLSL_CLASS_VECTOR) + { + struct vkd3d_string_buffer *string; + + string = hlsl_type_to_string(ctx, $3); + if (string) + hlsl_error(ctx, &@3, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, + "UAV data type %s is not scalar or vector.", string->buffer); + hlsl_release_string_buffer(ctx, string); + } + $$ = hlsl_new_uav_type(ctx, $1, $3); + } | TYPE_IDENTIFIER { $$ = hlsl_get_type(ctx->cur_scope, $1, true); diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 4118ce88..8ca37f3f 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -410,6 +410,8 @@ static D3D_SHADER_INPUT_TYPE sm4_resource_type(const struct hlsl_type *type) return D3D_SIT_SAMPLER; case HLSL_TYPE_TEXTURE: return D3D_SIT_TEXTURE; + case HLSL_TYPE_UAV: + return D3D_SIT_UAV_RWTYPED; default: vkd3d_unreachable(); }

1 0

Eric Pouech : dbghelp: Silence some FIXMEs.
by Alexandre Julliard 19 Oct '22

19 Oct '22

Module: wine Branch: master Commit: 0c3d78269f9a463bf43bebdf08db368aef484cca URL: https://gitlab.winehq.org/wine/wine/-/commit/0c3d78269f9a463bf43bebdf08db36… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Oct 19 17:27:43 2022 +0200 dbghelp: Silence some FIXMEs. In some 32bit modules, MingW/GCC generates in Dwarf debug information, a cfa address to be computed as: deref(register XX + offset) which is too complicated to be expressed through regular DbgHelp APIs. So silence the FIXME, and report a 'too complex' error (instead of 'internal'). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52790 Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/dwarf.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 8d365ba88f1..4671174d3bb 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -3028,7 +3028,7 @@ static const dwarf2_cuhead_t* get_cuhead_from_func(const struct symt_function* f return NULL; } -static BOOL compute_call_frame_cfa(struct module* module, ULONG_PTR ip, struct location* frame); +static enum location_error compute_call_frame_cfa(struct module* module, ULONG_PTR ip, struct location* frame); static enum location_error loc_compute_frame(struct process* pcs, const struct module_format* modfmt, @@ -3071,7 +3071,8 @@ static enum location_error loc_compute_frame(struct process* pcs, } break; case loc_dwarf2_frame_cfa: - if (!compute_call_frame_cfa(modfmt->module, ip + ((struct symt_compiland*)func->container)->address, frame)) return loc_err_internal; + err = compute_call_frame_cfa(modfmt->module, ip + ((struct symt_compiland*)func->container)->address, frame); + if (err < 0) return err; break; default: WARN("Unsupported frame kind %d\n", pframe->kind); @@ -3866,11 +3867,11 @@ BOOL dwarf2_virtual_unwind(struct cpu_stack_walk *csw, ULONG_PTR ip, return TRUE; } -static BOOL compute_call_frame_cfa(struct module* module, ULONG_PTR ip, struct location* frame) +static enum location_error compute_call_frame_cfa(struct module* module, ULONG_PTR ip, struct location* frame) { struct frame_info info; - if (!dwarf2_fetch_frame_info(module, module->cpu, ip, &info)) return FALSE; + if (!dwarf2_fetch_frame_info(module, module->cpu, ip, &info)) return loc_err_internal; /* beginning of function, or no available dwarf information ? */ if (ip == info.ip || info.state.rules[info.retaddr_reg] == RULE_UNSET) @@ -3888,11 +3889,15 @@ static BOOL compute_call_frame_cfa(struct module* module, ULONG_PTR ip, struct l switch (info.state.cfa_rule) { case RULE_EXPRESSION: - FIXME("Too complex expression for frame_CFA resolution (RULE_EXPRESSION)\n"); - return FALSE; + WARN("Too complex expression for frame_CFA resolution (RULE_EXPRESSION)\n"); + return loc_err_too_complex; case RULE_VAL_EXPRESSION: - FIXME("Too complex expression for frame_CFA resolution (RULE_VAL_EXPRESSION)\n"); - return FALSE; + /* unfortunately, we've seen at least construct like: + * cfa := 'breg_x + offset; deref' + * which is an indirection too much for the DbgHelp API. + */ + WARN("Too complex expression for frame_CFA resolution (RULE_VAL_EXPRESSION)\n"); + return loc_err_too_complex; default: frame->kind = loc_regrel; frame->reg = module->cpu->map_dwarf_register(info.state.cfa_reg, module, TRUE); @@ -3900,7 +3905,7 @@ static BOOL compute_call_frame_cfa(struct module* module, ULONG_PTR ip, struct l break; } } - return TRUE; + return 0; } static void dwarf2_location_compute(struct process* pcs,

1 0

Hugh McMaster : kernelbase: Avoid memory leaks in GetConsoleTitleW().
by Alexandre Julliard 19 Oct '22

19 Oct '22

Module: wine Branch: master Commit: e58052d8361fde59fd5d4a1d9386265e1099f633 URL: https://gitlab.winehq.org/wine/wine/-/commit/e58052d8361fde59fd5d4a1d938626… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Oct 19 23:33:34 2022 +1100 kernelbase: Avoid memory leaks in GetConsoleTitleW(). --- dlls/kernelbase/console.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index e3b0ebead9e..7cd87f53b3c 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -1057,16 +1057,17 @@ DWORD WINAPI DECLSPEC_HOTPATCH GetConsoleTitleW( LPWSTR title, DWORD size ) if (!(params = HeapAlloc( GetProcessHeap(), 0, max_size ))) return 0; - if (!console_ioctl( RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle, IOCTL_CONDRV_GET_TITLE, - NULL, 0, params, max_size, &size )) - return 0; - - if (size < sizeof(*params)) return 0; + if (console_ioctl( RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle, IOCTL_CONDRV_GET_TITLE, + NULL, 0, params, max_size, &size ) && + size >= sizeof(*params)) + { + size -= sizeof(*params); + memcpy( title, params->buffer, size ); + title[ size / sizeof(WCHAR) ] = 0; + size = params->title_len; + } + else size = 0; - size -= sizeof(*params); - memcpy( title, params->buffer, size ); - title[ size / sizeof(WCHAR) ] = 0; - size = params->title_len; HeapFree( GetProcessHeap(), 0, params ); return size; }

1 0

Alistair Leslie-Hughes : sapi: Implement ISpObjectToken OpenKey.
by Alexandre Julliard 19 Oct '22

19 Oct '22

Module: wine Branch: master Commit: 9ea45b5a2e26ff64b94a52eb862b2838a13cdc42 URL: https://gitlab.winehq.org/wine/wine/-/commit/9ea45b5a2e26ff64b94a52eb862b28… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Sep 22 19:01:44 2021 +1000 sapi: Implement ISpObjectToken OpenKey. --- dlls/sapi/tests/token.c | 8 ++++++++ dlls/sapi/token.c | 33 +++++++++++++++++++++++++++++++-- 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/dlls/sapi/tests/token.c b/dlls/sapi/tests/token.c index 7778f4e61db..7ef58e697b0 100644 --- a/dlls/sapi/tests/token.c +++ b/dlls/sapi/tests/token.c @@ -194,6 +194,7 @@ static void test_default_token_id(void) static void test_object_token(void) { ISpObjectToken *token; + ISpDataKey *sub_key; HRESULT hr; LPWSTR tempW, token_id; ISpObjectTokenCategory *cat; @@ -253,6 +254,13 @@ static void test_object_token(void) CoTaskMemFree( tempW ); } + hr = ISpObjectToken_OpenKey(token, L"Non-exist", &sub_key); + ok( hr == SPERR_NOT_FOUND, "got %08lx\n", hr ); + + hr = ISpObjectToken_OpenKey(token, L"Classes", &sub_key); + ok( hr == S_OK, "got %08lx\n", hr ); + ISpDataKey_Release(sub_key); + cat = (LPVOID)0xdeadbeef; hr = ISpObjectToken_GetCategory( token, &cat ); todo_wine ok( hr == SPERR_INVALID_REGISTRY_KEY, "got %08lx\n", hr ); diff --git a/dlls/sapi/token.c b/dlls/sapi/token.c index b5cfc45e5a3..476e8d6d248 100644 --- a/dlls/sapi/token.c +++ b/dlls/sapi/token.c @@ -931,8 +931,37 @@ static HRESULT WINAPI token_GetDWORD( ISpObjectToken *iface, static HRESULT WINAPI token_OpenKey( ISpObjectToken *iface, LPCWSTR name, ISpDataKey **sub_key ) { - FIXME( "stub\n" ); - return E_NOTIMPL; + struct object_token *This = impl_from_ISpObjectToken( iface ); + ISpRegDataKey *spregkey; + HRESULT hr; + HKEY key; + LONG ret; + + TRACE( "%p, %s, %p\n", This, debugstr_w(name), sub_key ); + + ret = RegOpenKeyExW (This->token_key, name, 0, KEY_ALL_ACCESS, &key); + if (ret != ERROR_SUCCESS) + return SPERR_NOT_FOUND; + + hr = data_key_create(NULL, &IID_ISpRegDataKey, (void**)&spregkey); + if (FAILED(hr)) + { + RegCloseKey(key); + return hr; + } + + hr = ISpRegDataKey_SetKey(spregkey, key, FALSE); + if (FAILED(hr)) + { + RegCloseKey(key); + ISpRegDataKey_Release(spregkey); + return hr; + } + + hr = ISpRegDataKey_QueryInterface(spregkey, &IID_ISpDataKey, (void**)sub_key); + ISpRegDataKey_Release(spregkey); + + return hr; } static HRESULT WINAPI token_CreateKey( ISpObjectToken *iface,

1 0

Gerald Pfeifer : ntdll: Fix build on systems without ENODATA.
by Alexandre Julliard 19 Oct '22

19 Oct '22

Module: wine Branch: master Commit: d7541508936b9ed776e8a39a0bc2a4cc875514d3 URL: https://gitlab.winehq.org/wine/wine/-/commit/d7541508936b9ed776e8a39a0bc2a4… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Tue Oct 18 23:41:49 2022 +0200 ntdll: Fix build on systems without ENODATA. On FreeBSD 12 and 14 ENODATA is not regularly defined. Cater to that in fd_get_file_info() and get_file_info(). --- dlls/ntdll/unix/file.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index c7ba12a5c13..8a599a289f8 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -1565,10 +1565,15 @@ static int fd_get_file_info( int fd, unsigned int options, struct stat *st, ULON attr_len = xattr_fget( fd, SAMBA_XATTR_DOS_ATTRIB, attr_data, sizeof(attr_data)-1 ); if (attr_len != -1) *attr |= parse_samba_dos_attrib_data( attr_data, attr_len ); - else if (errno != ENODATA && errno != ENOTSUP) + else + { + if (errno == ENOTSUP) return ret; +#ifdef ENODATA + if (errno == ENODATA) return ret; +#endif WARN( "Failed to get extended attribute " SAMBA_XATTR_DOS_ATTRIB ". errno %d (%s)\n", errno, strerror( errno ) ); - + } return ret; } @@ -1653,10 +1658,15 @@ static int get_file_info( const char *path, struct stat *st, ULONG *attr ) attr_len = xattr_get( path, SAMBA_XATTR_DOS_ATTRIB, attr_data, sizeof(attr_data)-1 ); if (attr_len != -1) *attr |= parse_samba_dos_attrib_data( attr_data, attr_len ); - else if (errno != ENODATA && errno != ENOTSUP) + else + { + if (errno == ENOTSUP) return ret; +#ifdef ENODATA + if (errno == ENODATA) return ret; +#endif WARN( "Failed to get extended attribute " SAMBA_XATTR_DOS_ATTRIB " from \"%s\". errno %d (%s)\n", path, errno, strerror( errno ) ); - + } return ret; }

1 0

Piotr Caban : winedump: Handle NULL in get_unicode_str.
by Alexandre Julliard 19 Oct '22

19 Oct '22

Module: wine Branch: master Commit: 9e74a249dfc560133447e62b7e112f7da7eb03e2 URL: https://gitlab.winehq.org/wine/wine/-/commit/9e74a249dfc560133447e62b7e112f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 18 12:09:55 2022 +0200 winedump: Handle NULL in get_unicode_str. --- tools/winedump/dump.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/winedump/dump.c b/tools/winedump/dump.c index f2cb601b295..7d4a1a320d5 100644 --- a/tools/winedump/dump.c +++ b/tools/winedump/dump.c @@ -202,6 +202,7 @@ const char *get_unicode_str( const WCHAR *str, int len ) char *buffer; int i = 0; + if (!str) return "(null)"; if (len == -1) len = strlenW( str ); buffer = dump_want_n( len * 6 + 3); buffer[i++] = '"';

1 0

Piotr Caban : comctl32: Add helper for creating page HWND from HPROPSHEETPAGE.
by Alexandre Julliard 19 Oct '22

19 Oct '22

Module: wine Branch: master Commit: a3b1a9cf6725e5afd69e4f88ae90b2b486ecb59d URL: https://gitlab.winehq.org/wine/wine/-/commit/a3b1a9cf6725e5afd69e4f88ae90b2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 26 12:36:53 2022 +0200 comctl32: Add helper for creating page HWND from HPROPSHEETPAGE. --- dlls/comctl32/propsheet.c | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index a6c1df11d63..62374a96ae9 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -416,6 +416,24 @@ static HICON HPSP_get_icon(HPROPSHEETPAGE hpsp) return ret; } +static HWND HPSP_create_page(HPROPSHEETPAGE hpsp, DLGTEMPLATE *template, HWND parent) +{ + HWND hwnd; + + if(hpsp->psp.dwFlags & PSP_INTERNAL_UNICODE) + { + hwnd = CreateDialogIndirectParamW(hpsp->psp.hInstance, template, + parent, hpsp->psp.pfnDlgProc, (LPARAM)&hpsp->psp); + } + else + { + hwnd = CreateDialogIndirectParamA(hpsp->psp.hInstance, template, + parent, hpsp->psp.pfnDlgProc, (LPARAM)&hpsp->psp); + } + + return hwnd; +} + #define add_flag(a) if (dwFlags & a) {strcat(string, #a );strcat(string," ");} /****************************************************************************** * PROPSHEET_UnImplementedFlags @@ -1429,19 +1447,7 @@ static BOOL PROPSHEET_CreatePage(HWND hwndParent, } HPSP_call_callback(hpsp, PSPCB_CREATE); - - if(HPSP_get_flags(hpsp) & PSP_INTERNAL_UNICODE) - hwndPage = CreateDialogIndirectParamW(hpsp->psp.hInstance, - pTemplateCopy, - hwndParent, - hpsp->psp.pfnDlgProc, - (LPARAM)&hpsp->psp); - else - hwndPage = CreateDialogIndirectParamA(hpsp->psp.hInstance, - pTemplateCopy, - hwndParent, - hpsp->psp.pfnDlgProc, - (LPARAM)&hpsp->psp); + hwndPage = HPSP_create_page(hpsp, pTemplateCopy, hwndParent); /* Free a no more needed copy */ Free(pTemplateCopy);

1 0

Piotr Caban : comctl32: Add helper for getting template from HPROPSHEETPAGE.
by Alexandre Julliard 19 Oct '22

19 Oct '22

Module: wine Branch: master Commit: e270a104239dc1ad30e660ff5f53699a01a057e1 URL: https://gitlab.winehq.org/wine/wine/-/commit/e270a104239dc1ad30e660ff5f5369… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 26 14:48:23 2022 +0200 comctl32: Add helper for getting template from HPROPSHEETPAGE. --- dlls/comctl32/propsheet.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 62374a96ae9..3f004dfe294 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -416,6 +416,11 @@ static HICON HPSP_get_icon(HPROPSHEETPAGE hpsp) return ret; } +static LRESULT HPSP_get_template(HPROPSHEETPAGE hpsp) +{ + return (LRESULT)hpsp->psp.u.pszTemplate; +} + static HWND HPSP_create_page(HPROPSHEETPAGE hpsp, DLGTEMPLATE *template, HWND parent) { HWND hwnd; @@ -517,7 +522,7 @@ static INT PROPSHEET_FindPageByResId(const PropSheetInfo * psInfo, LRESULT resId for (i = 0; i < psInfo->nPages; i++) { /* Fixme: if resource ID is a string shall we use strcmp ??? */ - if (psInfo->proppage[i].hpage->psp.u.pszTemplate == (LPVOID)resId) + if (HPSP_get_template(psInfo->proppage[i].hpage) == resId) break; } @@ -2624,7 +2629,7 @@ static LRESULT PROPSHEET_IdToIndex(HWND hwndDlg, int iPageId) PropSheetInfo * psInfo = GetPropW(hwndDlg, PropSheetInfoStr); TRACE("(%p, %d)\n", hwndDlg, iPageId); for (index = 0; index < psInfo->nPages; index++) { - if (psInfo->proppage[index].hpage->psp.u.pszTemplate == MAKEINTRESOURCEW(iPageId)) + if (HPSP_get_template(psInfo->proppage[index].hpage) == iPageId) return index; } @@ -2637,17 +2642,20 @@ static LRESULT PROPSHEET_IdToIndex(HWND hwndDlg, int iPageId) static LRESULT PROPSHEET_IndexToId(HWND hwndDlg, int iPageIndex) { PropSheetInfo * psInfo = GetPropW(hwndDlg, PropSheetInfoStr); - LPCPROPSHEETPAGEW psp; + HPROPSHEETPAGE hpsp; + LRESULT template; + TRACE("(%p, %d)\n", hwndDlg, iPageIndex); + if (iPageIndex<0 || iPageIndex>=psInfo->nPages) { WARN("%d out of range.\n", iPageIndex); return 0; } - psp = &psInfo->proppage[iPageIndex].hpage->psp; - if (psp->dwFlags & PSP_DLGINDIRECT || !IS_INTRESOURCE(psp->u.pszTemplate)) { + hpsp = psInfo->proppage[iPageIndex].hpage; + template = HPSP_get_template(hpsp); + if (HPSP_get_flags(hpsp) & PSP_DLGINDIRECT || !IS_INTRESOURCE(template)) return 0; - } - return (LRESULT)psp->u.pszTemplate; + return template; } /******************************************************************************

1 0

Piotr Caban : comctl32: Add helper for setting header title in HPROPSHEETPAGE.
by Alexandre Julliard 19 Oct '22

19 Oct '22

Module: wine Branch: master Commit: 9f42a50a0d1f81bed3128fa2166e10daea760429 URL: https://gitlab.winehq.org/wine/wine/-/commit/9f42a50a0d1f81bed3128fa2166e10… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 26 15:34:20 2022 +0200 comctl32: Add helper for setting header title in HPROPSHEETPAGE. --- dlls/comctl32/propsheet.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 3f004dfe294..48b6625c53e 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -439,6 +439,16 @@ static HWND HPSP_create_page(HPROPSHEETPAGE hpsp, DLGTEMPLATE *template, HWND pa return hwnd; } +static void HPSP_set_header_title(HPROPSHEETPAGE hpsp, const WCHAR *title) +{ + if (!IS_INTRESOURCE(hpsp->psp.pszHeaderTitle)) + Free((void *)hpsp->psp.pszHeaderTitle); + + hpsp->psp.pszHeaderTitle = heap_strdupW(title); + hpsp->psp.dwFlags |= PSP_USEHEADERTITLE; +} + + #define add_flag(a) if (dwFlags & a) {strcat(string, #a );strcat(string," ");} /****************************************************************************** * PROPSHEET_UnImplementedFlags @@ -2495,20 +2505,13 @@ static void PROPSHEET_SetWizButtons(HWND hwndDlg, DWORD dwFlags) static void PROPSHEET_SetHeaderTitleW(HWND hwndDlg, UINT page_index, const WCHAR *title) { PropSheetInfo *psInfo = GetPropW(hwndDlg, PropSheetInfoStr); - PROPSHEETPAGEW *page; TRACE("(%p, %u, %s)\n", hwndDlg, page_index, debugstr_w(title)); if (page_index >= psInfo->nPages) return; - page = &psInfo->proppage[page_index].hpage->psp; - - if (!IS_INTRESOURCE(page->pszHeaderTitle)) - Free((void *)page->pszHeaderTitle); - - page->pszHeaderTitle = heap_strdupW(title); - page->dwFlags |= PSP_USEHEADERTITLE; + HPSP_set_header_title(psInfo->proppage[page_index].hpage, title); } /******************************************************************************

1 0