- Wine-Commits - list.winehq.org

Zebediah Figura : vkd3d-shader: Get rid of the uav_ranges array.
by Alexandre Julliard Aug. 14, 2023

Aug. 14, 2023

Module: vkd3d Branch: master Commit: 983d01df8c4f6e83d289be3ac5ccca2bd13da87e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/983d01df8c4f6e83d289be3ac5ccc… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jul 31 19:10:37 2023 -0500 vkd3d-shader: Get rid of the uav_ranges array. This is now redundant; the register ID is encoded into the scan descriptors. --- libs/vkd3d-shader/vkd3d_shader_main.c | 35 +++-------------------------------- 1 file changed, 3 insertions(+), 32 deletions(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 2309cd29..3a2432c1 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -599,14 +599,6 @@ struct vkd3d_shader_scan_context size_t cf_info_size; size_t cf_info_count; - struct - { - unsigned int id; - unsigned int descriptor_idx; - } *uav_ranges; - size_t uav_ranges_size; - size_t uav_range_count; - enum vkd3d_shader_api_version api_version; }; @@ -635,7 +627,6 @@ static void vkd3d_shader_scan_context_init(struct vkd3d_shader_scan_context *con static void vkd3d_shader_scan_context_cleanup(struct vkd3d_shader_scan_context *context) { - vkd3d_free(context->uav_ranges); vkd3d_free(context->cf_info); } @@ -712,11 +703,11 @@ static void vkd3d_shader_scan_add_uav_flag(const struct vkd3d_shader_scan_contex if (!context->scan_descriptor_info) return; - for (i = 0; i < context->uav_range_count; ++i) + for (i = 0; i < context->scan_descriptor_info->descriptor_count; ++i) { - if (context->uav_ranges[i].id == range_id) + if (context->scan_descriptor_info->descriptors[i].register_id == range_id) { - context->scan_descriptor_info->descriptors[context->uav_ranges[i].descriptor_idx].flags |= flag; + context->scan_descriptor_info->descriptors[i].flags |= flag; break; } } @@ -793,23 +784,6 @@ static bool vkd3d_shader_scan_add_descriptor(struct vkd3d_shader_scan_context *c return true; } -static bool vkd3d_shader_scan_add_uav_range(struct vkd3d_shader_scan_context *context, - unsigned int id, unsigned int descriptor_idx) -{ - if (!vkd3d_array_reserve((void **)&context->uav_ranges, &context->uav_ranges_size, - context->uav_range_count + 1, sizeof(*context->uav_ranges))) - { - ERR("Failed to allocate UAV range.\n"); - return false; - } - - context->uav_ranges[context->uav_range_count].id = id; - context->uav_ranges[context->uav_range_count].descriptor_idx = descriptor_idx; - ++context->uav_range_count; - - return true; -} - static void vkd3d_shader_scan_constant_buffer_declaration(struct vkd3d_shader_scan_context *context, const struct vkd3d_shader_instruction *instruction) { @@ -854,9 +828,6 @@ static void vkd3d_shader_scan_resource_declaration(struct vkd3d_shader_scan_cont type = VKD3D_SHADER_DESCRIPTOR_TYPE_SRV; vkd3d_shader_scan_add_descriptor(context, type, &resource->reg.reg, &resource->range, resource_type, resource_data_type, 0); - if (type == VKD3D_SHADER_DESCRIPTOR_TYPE_UAV) - vkd3d_shader_scan_add_uav_range(context, resource->reg.reg.idx[0].offset, - context->scan_descriptor_info->descriptor_count - 1); } static void vkd3d_shader_scan_typed_resource_declaration(struct vkd3d_shader_scan_context *context,

1 0

Nikolay Sivov : vkd3d-shader: Add constant folding for 'dp2add' operation.
by Alexandre Julliard Aug. 14, 2023

Aug. 14, 2023

Module: vkd3d Branch: master Commit: 7e99188dc700d258c8899b7560668326639cab0f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7e99188dc700d258c8899b7560668… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 18 23:19:02 2023 +0200 vkd3d-shader: Add constant folding for 'dp2add' operation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_constant_ops.c | 38 ++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c index 5501b6e9..8b191de9 100644 --- a/libs/vkd3d-shader/hlsl_constant_ops.c +++ b/libs/vkd3d-shader/hlsl_constant_ops.c @@ -376,6 +376,36 @@ static bool fold_dot(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, cons return true; } +static bool fold_dp2add(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, const struct hlsl_type *dst_type, + const struct hlsl_ir_constant *src1, const struct hlsl_ir_constant *src2, const struct hlsl_ir_constant *src3) +{ + enum hlsl_base_type type = dst_type->base_type; + unsigned int k; + + assert(type == src1->node.data_type->base_type); + assert(type == src2->node.data_type->base_type); + assert(type == src3->node.data_type->base_type); + assert(src1->node.data_type->dimx == src2->node.data_type->dimx); + assert(src3->node.data_type->dimx == 1); + + dst->u[0].f = src3->value.u[0].f; + for (k = 0; k < src1->node.data_type->dimx; ++k) + { + switch (type) + { + case HLSL_TYPE_FLOAT: + case HLSL_TYPE_HALF: + dst->u[0].f += src1->value.u[k].f * src2->value.u[k].f; + break; + default: + FIXME("Fold 'dp2add' for type %s.\n", debug_hlsl_type(ctx, dst_type)); + return false; + } + } + + return true; +} + static bool fold_div(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, const struct hlsl_type *dst_type, const struct hlsl_ir_constant *src1, const struct hlsl_ir_constant *src2, const struct vkd3d_shader_location *loc) @@ -751,7 +781,7 @@ static bool fold_nequal(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, c bool hlsl_fold_constant_exprs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) { - struct hlsl_ir_constant *arg1, *arg2 = NULL; + struct hlsl_ir_constant *arg1, *arg2 = NULL, *arg3 = NULL; struct hlsl_constant_value res = {0}; struct hlsl_ir_node *res_node; struct hlsl_ir_expr *expr; @@ -779,6 +809,8 @@ bool hlsl_fold_constant_exprs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, arg1 = hlsl_ir_constant(expr->operands[0].node); if (expr->operands[1].node) arg2 = hlsl_ir_constant(expr->operands[1].node); + if (expr->operands[2].node) + arg3 = hlsl_ir_constant(expr->operands[2].node); switch (expr->op) { @@ -856,6 +888,10 @@ bool hlsl_fold_constant_exprs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, success = fold_nequal(ctx, &res, instr->data_type, arg1, arg2); break; + case HLSL_OP3_DP2ADD: + success = fold_dp2add(ctx, &res, instr->data_type, arg1, arg2, arg3); + break; + default: FIXME("Fold \"%s\" expression.\n", debug_hlsl_expr_op(expr->op)); success = false;

1 0

Zebediah Figura : vkd3d-shader: Centralize cleanup on error in scan_with_parser().
by Alexandre Julliard Aug. 14, 2023

Aug. 14, 2023

Module: vkd3d Branch: master Commit: fd4a820c4be13ce75e29496aba67332005576906 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/fd4a820c4be13ce75e29496aba673… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jul 31 18:36:30 2023 -0500 vkd3d-shader: Centralize cleanup on error in scan_with_parser(). --- libs/vkd3d-shader/vkd3d_shader_main.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 4d45e1e2..569409cc 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -1132,11 +1132,7 @@ static int scan_with_parser(const struct vkd3d_shader_compile_info *compile_info { instruction = &parser->instructions.elements[i]; if ((ret = vkd3d_shader_scan_instruction(&context, instruction)) < 0) - { - if (scan_descriptor_info) - vkd3d_shader_free_scan_descriptor_info(scan_descriptor_info); break; - } } for (i = 0; i < ARRAY_SIZE(parser->shader_desc.flat_constant_count); ++i) @@ -1156,13 +1152,17 @@ static int scan_with_parser(const struct vkd3d_shader_compile_info *compile_info || !vkd3d_shader_signature_from_shader_signature(&signature_info->patch_constant, &parser->shader_desc.patch_constant_signature)) { - vkd3d_shader_free_scan_signature_info(signature_info); - if (scan_descriptor_info) - vkd3d_shader_free_scan_descriptor_info(scan_descriptor_info); ret = VKD3D_ERROR_OUT_OF_MEMORY; } } + if (ret < 0) + { + if (scan_descriptor_info) + vkd3d_shader_free_scan_descriptor_info(scan_descriptor_info); + if (signature_info) + vkd3d_shader_free_scan_signature_info(signature_info); + } vkd3d_shader_scan_context_cleanup(&context); return ret; }

1 0

Zebediah Figura : vkd3d-shader: Add register ID to struct vkd3d_shader_descriptor_info1.
by Alexandre Julliard Aug. 14, 2023

Aug. 14, 2023

Module: vkd3d Branch: master Commit: 7d029225411d4224a4a132e66ab5cec43cc163dd URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7d029225411d4224a4a132e66ab5c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jul 31 18:59:16 2023 -0500 vkd3d-shader: Add register ID to struct vkd3d_shader_descriptor_info1. --- libs/vkd3d-shader/vkd3d_shader_main.c | 17 ++++++++++------- libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 087da718..2309cd29 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -765,9 +765,9 @@ static void vkd3d_shader_scan_record_uav_atomic_op(struct vkd3d_shader_scan_cont } static bool vkd3d_shader_scan_add_descriptor(struct vkd3d_shader_scan_context *context, - enum vkd3d_shader_descriptor_type type, const struct vkd3d_shader_register_range *range, - enum vkd3d_shader_resource_type resource_type, enum vkd3d_shader_resource_data_type resource_data_type, - unsigned int flags) + enum vkd3d_shader_descriptor_type type, const struct vkd3d_shader_register *reg, + const struct vkd3d_shader_register_range *range, enum vkd3d_shader_resource_type resource_type, + enum vkd3d_shader_resource_data_type resource_data_type, unsigned int flags) { struct vkd3d_shader_scan_descriptor_info1 *info = context->scan_descriptor_info; struct vkd3d_shader_descriptor_info1 *d; @@ -781,6 +781,7 @@ static bool vkd3d_shader_scan_add_descriptor(struct vkd3d_shader_scan_context *c d = &info->descriptors[info->descriptor_count]; d->type = type; + d->register_id = reg->idx[0].offset; d->register_space = range->space; d->register_index = range->first; d->resource_type = resource_type; @@ -817,7 +818,7 @@ static void vkd3d_shader_scan_constant_buffer_declaration(struct vkd3d_shader_sc if (!context->scan_descriptor_info) return; - vkd3d_shader_scan_add_descriptor(context, VKD3D_SHADER_DESCRIPTOR_TYPE_CBV, &cb->range, + vkd3d_shader_scan_add_descriptor(context, VKD3D_SHADER_DESCRIPTOR_TYPE_CBV, &cb->src.reg, &cb->range, VKD3D_SHADER_RESOURCE_BUFFER, VKD3D_SHADER_RESOURCE_DATA_UINT, 0); } @@ -834,7 +835,7 @@ static void vkd3d_shader_scan_sampler_declaration(struct vkd3d_shader_scan_conte flags = VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_SAMPLER_COMPARISON_MODE; else flags = 0; - vkd3d_shader_scan_add_descriptor(context, VKD3D_SHADER_DESCRIPTOR_TYPE_SAMPLER, &sampler->range, + vkd3d_shader_scan_add_descriptor(context, VKD3D_SHADER_DESCRIPTOR_TYPE_SAMPLER, &sampler->src.reg, &sampler->range, VKD3D_SHADER_RESOURCE_NONE, VKD3D_SHADER_RESOURCE_DATA_UINT, flags); } @@ -851,7 +852,8 @@ static void vkd3d_shader_scan_resource_declaration(struct vkd3d_shader_scan_cont type = VKD3D_SHADER_DESCRIPTOR_TYPE_UAV; else type = VKD3D_SHADER_DESCRIPTOR_TYPE_SRV; - vkd3d_shader_scan_add_descriptor(context, type, &resource->range, resource_type, resource_data_type, 0); + vkd3d_shader_scan_add_descriptor(context, type, &resource->reg.reg, &resource->range, + resource_type, resource_data_type, 0); if (type == VKD3D_SHADER_DESCRIPTOR_TYPE_UAV) vkd3d_shader_scan_add_uav_range(context, resource->reg.reg.idx[0].offset, context->scan_descriptor_info->descriptor_count - 1); @@ -1178,9 +1180,10 @@ static int scan_with_parser(const struct vkd3d_shader_compile_info *compile_info for (i = 0; i < ARRAY_SIZE(parser->shader_desc.flat_constant_count); ++i) { struct vkd3d_shader_register_range range = {.space = 0, .first = i, .last = i}; + struct vkd3d_shader_register reg = {.idx[0].offset = i, .idx_count = 1}; if (parser->shader_desc.flat_constant_count[i].external) - vkd3d_shader_scan_add_descriptor(&context, VKD3D_SHADER_DESCRIPTOR_TYPE_CBV, + vkd3d_shader_scan_add_descriptor(&context, VKD3D_SHADER_DESCRIPTOR_TYPE_CBV, &reg, &range, VKD3D_SHADER_RESOURCE_BUFFER, VKD3D_SHADER_RESOURCE_DATA_UINT, 0); } diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 7c91cb07..c0fd460f 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -1115,6 +1115,7 @@ struct vkd3d_shader_descriptor_info1 enum vkd3d_shader_descriptor_type type; unsigned int register_space; unsigned int register_index; + unsigned int register_id; enum vkd3d_shader_resource_type resource_type; enum vkd3d_shader_resource_data_type resource_data_type; unsigned int flags;

1 0

Zebediah Figura : vkd3d-shader: Introduce struct vkd3d_shader_scan_descriptor_info1.
by Alexandre Julliard Aug. 14, 2023

Aug. 14, 2023

Module: vkd3d Branch: master Commit: 4e9798f6f703fc50683156b03cb957e54f398a4f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/4e9798f6f703fc50683156b03cb95… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jul 31 18:52:21 2023 -0500 vkd3d-shader: Introduce struct vkd3d_shader_scan_descriptor_info1. --- libs/vkd3d-shader/spirv.c | 18 +++---- libs/vkd3d-shader/vkd3d_shader_main.c | 90 ++++++++++++++++++++++++-------- libs/vkd3d-shader/vkd3d_shader_private.h | 19 ++++++- 3 files changed, 95 insertions(+), 32 deletions(-)

1 0

Zebediah Figura : vkd3d-shader: Factor more code into vkd3d_shader_scan_get_uav_descriptor_info().
by Alexandre Julliard Aug. 14, 2023

Aug. 14, 2023

Module: vkd3d Branch: master Commit: 9c5cb2de189e837d2a73c5763c903135b507f09c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/9c5cb2de189e837d2a73c5763c903… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jul 31 17:59:09 2023 -0500 vkd3d-shader: Factor more code into vkd3d_shader_scan_get_uav_descriptor_info(). --- libs/vkd3d-shader/vkd3d_shader_main.c | 39 ++++++++++++----------------------- 1 file changed, 13 insertions(+), 26 deletions(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index e6ffb84d..4d45e1e2 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -703,18 +703,23 @@ static struct vkd3d_shader_cf_info *vkd3d_shader_scan_find_innermost_loop_cf_inf return NULL; } -static struct vkd3d_shader_descriptor_info *vkd3d_shader_scan_get_uav_descriptor_info( - const struct vkd3d_shader_scan_context *context, unsigned int range_id) +static void vkd3d_shader_scan_add_uav_flag(const struct vkd3d_shader_scan_context *context, + const struct vkd3d_shader_register *reg, uint32_t flag) { + unsigned int range_id = reg->idx[0].offset; unsigned int i; + if (!context->scan_descriptor_info) + return; + for (i = 0; i < context->uav_range_count; ++i) { if (context->uav_ranges[i].id == range_id) - return &context->scan_descriptor_info->descriptors[context->uav_ranges[i].descriptor_idx]; + { + context->scan_descriptor_info->descriptors[context->uav_ranges[i].descriptor_idx].flags |= flag; + break; + } } - - return NULL; } static bool vkd3d_shader_instruction_is_uav_read(const struct vkd3d_shader_instruction *instruction) @@ -730,13 +735,7 @@ static bool vkd3d_shader_instruction_is_uav_read(const struct vkd3d_shader_instr static void vkd3d_shader_scan_record_uav_read(struct vkd3d_shader_scan_context *context, const struct vkd3d_shader_register *reg) { - struct vkd3d_shader_descriptor_info *d; - - if (!context->scan_descriptor_info) - return; - - d = vkd3d_shader_scan_get_uav_descriptor_info(context, reg->idx[0].offset); - d->flags |= VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_UAV_READ; + vkd3d_shader_scan_add_uav_flag(context, reg, VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_UAV_READ); } static bool vkd3d_shader_instruction_is_uav_counter(const struct vkd3d_shader_instruction *instruction) @@ -749,13 +748,7 @@ static bool vkd3d_shader_instruction_is_uav_counter(const struct vkd3d_shader_in static void vkd3d_shader_scan_record_uav_counter(struct vkd3d_shader_scan_context *context, const struct vkd3d_shader_register *reg) { - struct vkd3d_shader_descriptor_info *d; - - if (!context->scan_descriptor_info) - return; - - d = vkd3d_shader_scan_get_uav_descriptor_info(context, reg->idx[0].offset); - d->flags |= VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_UAV_COUNTER; + vkd3d_shader_scan_add_uav_flag(context, reg, VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_UAV_COUNTER); } static bool vkd3d_shader_instruction_is_uav_atomic_op(const struct vkd3d_shader_instruction *instruction) @@ -768,13 +761,7 @@ static bool vkd3d_shader_instruction_is_uav_atomic_op(const struct vkd3d_shader_ static void vkd3d_shader_scan_record_uav_atomic_op(struct vkd3d_shader_scan_context *context, const struct vkd3d_shader_register *reg) { - struct vkd3d_shader_descriptor_info *d; - - if (!context->scan_descriptor_info) - return; - - d = vkd3d_shader_scan_get_uav_descriptor_info(context, reg->idx[0].offset); - d->flags |= VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_UAV_ATOMICS; + vkd3d_shader_scan_add_uav_flag(context, reg, VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_UAV_ATOMICS); } static bool vkd3d_shader_scan_add_descriptor(struct vkd3d_shader_scan_context *context,

1 0

Ilia Docin : sane.ds: Use BGR order to store 24 bit color DIB pixels.
by Alexandre Julliard Aug. 14, 2023

Aug. 14, 2023

Module: wine Branch: master Commit: b8c38f418699bf71896de5f5cbbd6dd07082b390 URL: https://gitlab.winehq.org/wine/wine/-/commit/b8c38f418699bf71896de5f5cbbd6d… Author: Ilia Docin <ilya.docin(a)contentai.ru> Date: Sun Aug 6 14:25:23 2023 +0300 sane.ds: Use BGR order to store 24 bit color DIB pixels. --- dlls/sane.ds/ds_image.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/sane.ds/ds_image.c b/dlls/sane.ds/ds_image.c index 93193abc69f..2c52184a056 100644 --- a/dlls/sane.ds/ds_image.c +++ b/dlls/sane.ds/ds_image.c @@ -301,10 +301,11 @@ TW_UINT16 SANE_ImageNativeXferGet (pTW_IDENTITY pOrigin, BITMAPINFOHEADER *header = NULL; int dib_bytes; int dib_bytes_per_line; - BYTE *line; + BYTE *line, color_buffer; RGBQUAD *colors; + RGBTRIPLE *pixels; int color_size = 0; - int i; + int i, j; BYTE *p; TRACE("DG_IMAGE/DAT_IMAGENATIVEXFER/MSG_GET\n"); @@ -425,6 +426,17 @@ TW_UINT16 SANE_ImageNativeXferGet (pTW_IDENTITY pOrigin, twRC = SANE_CALL( read_data, &params ); if (twRC != TWCC_SUCCESS) break; if (retlen < activeDS.frame_params.bytes_per_line) break; + /* TWAIN: for 24 bit color DIBs, the pixels are stored in BGR order */ + if (activeDS.frame_params.format == FMT_RGB && activeDS.frame_params.depth == 8) + { + pixels = (RGBTRIPLE *) line; + for (j = 0; j < activeDS.frame_params.pixels_per_line; ++j) + { + color_buffer = pixels[j].rgbtRed; + pixels[j].rgbtRed = pixels[j].rgbtBlue; + pixels[j].rgbtBlue = color_buffer; + } + } line -= dib_bytes_per_line; } activeDS.progressWnd = ScanningDialogBox(activeDS.progressWnd, -1);

1 0

Alistair Leslie-Hughes : wmp: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard Aug. 14, 2023

Aug. 14, 2023

Module: wine Branch: master Commit: 90081ca8432d1bc3a11c6043d1c4f7be46fcb402 URL: https://gitlab.winehq.org/wine/wine/-/commit/90081ca8432d1bc3a11c6043d1c4f7… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Jul 29 18:17:03 2023 +1000 wmp: Remove DECLSPEC_HIDDEN usage. --- dlls/wmp/wmp_private.h | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/wmp/wmp_private.h b/dlls/wmp/wmp_private.h index ffeaca09a47..b5e580d91ca 100644 --- a/dlls/wmp/wmp_private.h +++ b/dlls/wmp/wmp_private.h @@ -36,7 +36,7 @@ TID_LIST LAST_tid } typeinfo_id; -HRESULT get_typeinfo(typeinfo_id tid, ITypeInfo **typeinfo) DECLSPEC_HIDDEN; +HRESULT get_typeinfo(typeinfo_id tid, ITypeInfo **typeinfo); typedef struct { IConnectionPoint IConnectionPoint_iface; @@ -111,22 +111,22 @@ struct WindowsMediaPlayer { HWND msg_window; }; -BOOL init_player(WindowsMediaPlayer*) DECLSPEC_HIDDEN; -void destroy_player(WindowsMediaPlayer*) DECLSPEC_HIDDEN; -WMPMedia *unsafe_impl_from_IWMPMedia(IWMPMedia *iface) DECLSPEC_HIDDEN; -WMPPlaylist *unsafe_impl_from_IWMPPlaylist(IWMPPlaylist *iface) DECLSPEC_HIDDEN; -HRESULT create_media_from_url(BSTR url, double duration, IWMPMedia **ppMedia) DECLSPEC_HIDDEN; -HRESULT create_playlist(BSTR name, BSTR url, LONG count, IWMPPlaylist **ppPlaylist) DECLSPEC_HIDDEN; -void ConnectionPointContainer_Init(WindowsMediaPlayer *wmp) DECLSPEC_HIDDEN; -void ConnectionPointContainer_Destroy(WindowsMediaPlayer *wmp) DECLSPEC_HIDDEN; -void call_sink(ConnectionPoint *This, DISPID dispid, DISPPARAMS *dispparams) DECLSPEC_HIDDEN; +BOOL init_player(WindowsMediaPlayer*); +void destroy_player(WindowsMediaPlayer*); +WMPMedia *unsafe_impl_from_IWMPMedia(IWMPMedia *iface); +WMPPlaylist *unsafe_impl_from_IWMPPlaylist(IWMPPlaylist *iface); +HRESULT create_media_from_url(BSTR url, double duration, IWMPMedia **ppMedia); +HRESULT create_playlist(BSTR name, BSTR url, LONG count, IWMPPlaylist **ppPlaylist); +void ConnectionPointContainer_Init(WindowsMediaPlayer *wmp); +void ConnectionPointContainer_Destroy(WindowsMediaPlayer *wmp); +void call_sink(ConnectionPoint *This, DISPID dispid, DISPPARAMS *dispparams); -HRESULT WINAPI WMPFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; +HRESULT WINAPI WMPFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**); -void unregister_wmp_class(void) DECLSPEC_HIDDEN; -void unregister_player_msg_class(void) DECLSPEC_HIDDEN; +void unregister_wmp_class(void); +void unregister_player_msg_class(void); -extern HINSTANCE wmp_instance DECLSPEC_HIDDEN; +extern HINSTANCE wmp_instance; static inline HRESULT return_bstr(const WCHAR *value, BSTR *p) {

1 0

Alistair Leslie-Hughes : setupapi: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard Aug. 14, 2023

Aug. 14, 2023

Module: wine Branch: master Commit: f54646d7a91219008f5b3e2d7b6e6efad37509ec URL: https://gitlab.winehq.org/wine/wine/-/commit/f54646d7a91219008f5b3e2d7b6e6e… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Jul 29 18:17:03 2023 +1000 setupapi: Remove DECLSPEC_HIDDEN usage. --- dlls/setupapi/setupapi_private.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/setupapi/setupapi_private.h b/dlls/setupapi/setupapi_private.h index df218314d6e..9d3d19c84c0 100644 --- a/dlls/setupapi/setupapi_private.h +++ b/dlls/setupapi/setupapi_private.h @@ -45,7 +45,7 @@ #define PNF_HEADER L"Wine PNF header\n" -extern HINSTANCE SETUPAPI_hInstance DECLSPEC_HIDDEN; +extern HINSTANCE SETUPAPI_hInstance; static inline char *strdupWtoA( const WCHAR *str ) { @@ -82,9 +82,9 @@ char * WINAPI UnicodeToMultiByte( const WCHAR *str, UINT code_page ) __WINE_DEA /* string substitutions */ struct inf_file; -extern const WCHAR *DIRID_get_string( int dirid ) DECLSPEC_HIDDEN; -extern const WCHAR *PARSER_get_inf_filename( HINF hinf ) DECLSPEC_HIDDEN; -extern WCHAR *PARSER_get_dest_dir( INFCONTEXT *context ) DECLSPEC_HIDDEN; +extern const WCHAR *DIRID_get_string( int dirid ); +extern const WCHAR *PARSER_get_inf_filename( HINF hinf ); +extern WCHAR *PARSER_get_dest_dir( INFCONTEXT *context ); /* support for ANSI queue callback functions */ @@ -94,11 +94,11 @@ struct callback_WtoA_context PSP_FILE_CALLBACK_A orig_handler; }; -UINT CALLBACK QUEUE_callback_WtoA( void *context, UINT notification, UINT_PTR, UINT_PTR ) DECLSPEC_HIDDEN; +UINT CALLBACK QUEUE_callback_WtoA( void *context, UINT notification, UINT_PTR, UINT_PTR ); -extern OSVERSIONINFOW OsVersionInfo DECLSPEC_HIDDEN; +extern OSVERSIONINFOW OsVersionInfo; -extern BOOL create_fake_dll( const WCHAR *name, const WCHAR *source ) DECLSPEC_HIDDEN; -extern void cleanup_fake_dlls(void) DECLSPEC_HIDDEN; +extern BOOL create_fake_dll( const WCHAR *name, const WCHAR *source ); +extern void cleanup_fake_dlls(void); #endif /* __SETUPAPI_PRIVATE_H */

1 0

Zhiyi Zhang : mfmediaengine: Implement media_engine_GetSeekable().
by Alexandre Julliard Aug. 14, 2023

Aug. 14, 2023

Module: wine Branch: master Commit: 5daa21f9618765c2dd588ee1cd6593b3752444f3 URL: https://gitlab.winehq.org/wine/wine/-/commit/5daa21f9618765c2dd588ee1cd6593… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Aug 10 11:30:42 2023 +0800 mfmediaengine: Implement media_engine_GetSeekable(). --- dlls/mfmediaengine/main.c | 22 ++++++++++++-- dlls/mfmediaengine/tests/mfmediaengine.c | 51 ++++++++++++-------------------- 2 files changed, 39 insertions(+), 34 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 2ef1cb8413a..1395eb9bffc 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -1899,17 +1899,35 @@ static HRESULT WINAPI media_engine_GetPlayed(IMFMediaEngineEx *iface, IMFMediaTi static HRESULT WINAPI media_engine_GetSeekable(IMFMediaEngineEx *iface, IMFMediaTimeRange **seekable) { struct media_engine *engine = impl_from_IMFMediaEngineEx(iface); - HRESULT hr = E_NOTIMPL; + IMFMediaTimeRange *time_range = NULL; + DWORD flags; + HRESULT hr; - FIXME("(%p, %p): stub.\n", iface, seekable); + TRACE("%p, %p.\n", iface, seekable); EnterCriticalSection(&engine->cs); if (engine->flags & FLAGS_ENGINE_SHUT_DOWN) hr = MF_E_SHUTDOWN; + else + { + hr = create_time_range(&time_range); + if (SUCCEEDED(hr) && !isnan(engine->duration) && engine->presentation.source) + { + hr = IMFMediaSource_GetCharacteristics(engine->presentation.source, &flags); + if (SUCCEEDED(hr) && (flags & MFBYTESTREAM_IS_SEEKABLE)) + hr = IMFMediaTimeRange_AddRange(time_range, 0.0, engine->duration); + } + } LeaveCriticalSection(&engine->cs); + if (FAILED(hr) && time_range) + { + IMFMediaTimeRange_Release(time_range); + time_range = NULL; + } + *seekable = time_range; return hr; } diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index 815f637d1cb..318684dc4f9 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -2285,15 +2285,11 @@ static void test_GetSeekable(void) /* Media engine is not ready */ hr = IMFMediaEngineEx_GetSeekable(media_engine, &time_range); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - if (SUCCEEDED(hr)) - { - count = IMFMediaTimeRange_GetLength(time_range); - ok(!count, "Unexpected count %lu.\n", count); - refcount = IMFMediaTimeRange_Release(time_range); - ok(!refcount, "Got unexpected refcount %lu.\n", refcount); - } + count = IMFMediaTimeRange_GetLength(time_range); + ok(!count, "Unexpected count %lu.\n", count); + refcount = IMFMediaTimeRange_Release(time_range); + ok(!refcount, "Got unexpected refcount %lu.\n", refcount); hr = IMFMediaEngineEx_Play(media_engine); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); @@ -2307,22 +2303,18 @@ static void test_GetSeekable(void) /* Media engine is ready */ hr = IMFMediaEngineEx_GetSeekable(media_engine, &time_range); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - if (SUCCEEDED(hr)) - { - count = IMFMediaTimeRange_GetLength(time_range); - ok(count == 1, "Unexpected count %lu.\n", count); - hr = IMFMediaTimeRange_GetStart(time_range, 0, &start); - ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - ok(start == 0, "Unexpected start %lf.\n", start); - hr = IMFMediaTimeRange_GetEnd(time_range, 0, &end); - ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - duration = IMFMediaEngineEx_GetDuration(media_engine); - ok(end == duration, "Unexpected end %lf.\n", end); - refcount = IMFMediaTimeRange_Release(time_range); - ok(!refcount, "Got unexpected refcount %lu.\n", refcount); - } + count = IMFMediaTimeRange_GetLength(time_range); + ok(count == 1, "Unexpected count %lu.\n", count); + hr = IMFMediaTimeRange_GetStart(time_range, 0, &start); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(start == 0, "Unexpected start %lf.\n", start); + hr = IMFMediaTimeRange_GetEnd(time_range, 0, &end); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + duration = IMFMediaEngineEx_GetDuration(media_engine); + ok(end == duration, "Unexpected end %lf.\n", end); + refcount = IMFMediaTimeRange_Release(time_range); + ok(!refcount, "Got unexpected refcount %lu.\n", refcount); /* Media engine is shut down */ hr = IMFMediaEngineEx_Shutdown(media_engine); @@ -2331,7 +2323,6 @@ static void test_GetSeekable(void) time_range = (IMFMediaTimeRange *)0xdeadbeef; hr = IMFMediaEngineEx_GetSeekable(media_engine, &time_range); ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); - todo_wine ok(time_range == NULL || broken(time_range == (IMFMediaTimeRange *)0xdeadbeef) /* <= Win10 1507 */, "Got unexpected pointer.\n"); @@ -2357,15 +2348,11 @@ static void test_GetSeekable(void) ok(res == S_OK, "Unexpected res %#lx.\n", res); hr = IMFMediaEngineEx_GetSeekable(media_engine, &time_range); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - if (SUCCEEDED(hr)) - { - count = IMFMediaTimeRange_GetLength(time_range); - ok(!count, "Unexpected count %lu.\n", count); - refcount = IMFMediaTimeRange_Release(time_range); - ok(!refcount, "Got unexpected refcount %lu.\n", refcount); - } + count = IMFMediaTimeRange_GetLength(time_range); + ok(!count, "Unexpected count %lu.\n", count); + refcount = IMFMediaTimeRange_Release(time_range); + ok(!refcount, "Got unexpected refcount %lu.\n", refcount); done: hr = IMFMediaEngineEx_Shutdown(media_engine);

1 0