wine-commits July 2020

wine-commits@winehq.org

1 participants
826 discussions

Henri Verbeet : vkd3d-shader: Rename the vkd3d_root_parameter structure to vkd3d_shader_root_parameter.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: vkd3d Branch: master Commit: 4bea4b82e9a0fdabf7c11ee35b094230d29eff42 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=4bea4b82e9a0fdabf7c11ee… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 17 14:32:25 2020 +0430 vkd3d-shader: Rename the vkd3d_root_parameter structure to vkd3d_shader_root_parameter. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 4 ++-- libs/vkd3d-shader/dxbc.c | 18 +++++++++--------- libs/vkd3d-shader/vkd3d_shader_main.c | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index d55a18d..631cbf5 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -467,7 +467,7 @@ enum vkd3d_shader_root_parameter_type VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_ROOT_PARAMETER_TYPE), }; -struct vkd3d_root_parameter +struct vkd3d_shader_root_parameter { enum vkd3d_shader_root_parameter_type parameter_type; union @@ -496,7 +496,7 @@ enum vkd3d_root_signature_flags struct vkd3d_root_signature_desc { unsigned int parameter_count; - const struct vkd3d_root_parameter *parameters; + const struct vkd3d_shader_root_parameter *parameters; unsigned int static_sampler_count; const struct vkd3d_static_sampler_desc *static_samplers; enum vkd3d_root_signature_flags flags; diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index e424aa6..303bedd 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2432,7 +2432,7 @@ static int shader_parse_root_descriptor1(struct root_signature_parser_context *c } static int shader_parse_root_parameters(struct root_signature_parser_context *context, - unsigned int offset, unsigned int count, struct vkd3d_root_parameter *parameters) + unsigned int offset, unsigned int count, struct vkd3d_shader_root_parameter *parameters) { const char *ptr; unsigned int i; @@ -2596,7 +2596,7 @@ static int shader_parse_root_signature(const char *data, unsigned int data_size, v_1_0->parameter_count = count; if (v_1_0->parameter_count) { - struct vkd3d_root_parameter *parameters; + struct vkd3d_shader_root_parameter *parameters; if (!(parameters = vkd3d_calloc(v_1_0->parameter_count, sizeof(*parameters)))) return VKD3D_ERROR_OUT_OF_MEMORY; v_1_0->parameters = parameters; @@ -3181,7 +3181,7 @@ int vkd3d_shader_serialize_root_signature(const struct vkd3d_versioned_root_sign return VKD3D_OK; } -static void free_descriptor_ranges(const struct vkd3d_root_parameter *parameters, unsigned int count) +static void free_descriptor_ranges(const struct vkd3d_shader_root_parameter *parameters, unsigned int count) { unsigned int i; @@ -3190,14 +3190,14 @@ static void free_descriptor_ranges(const struct vkd3d_root_parameter *parameters for (i = 0; i < count; ++i) { - const struct vkd3d_root_parameter *p = &parameters[i]; + const struct vkd3d_shader_root_parameter *p = &parameters[i]; if (p->parameter_type == VKD3D_SHADER_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE) vkd3d_free((void *)p->u.descriptor_table.descriptor_ranges); } } -static int convert_root_parameters_to_v_1_0(struct vkd3d_root_parameter *dst, +static int convert_root_parameters_to_v_1_0(struct vkd3d_shader_root_parameter *dst, const struct vkd3d_root_parameter1 *src, unsigned int count) { const struct vkd3d_shader_descriptor_range1 *ranges1; @@ -3208,7 +3208,7 @@ static int convert_root_parameters_to_v_1_0(struct vkd3d_root_parameter *dst, for (i = 0; i < count; ++i) { const struct vkd3d_root_parameter1 *p1 = &src[i]; - struct vkd3d_root_parameter *p = &dst[i]; + struct vkd3d_shader_root_parameter *p = &dst[i]; p->parameter_type = p1->parameter_type; switch (p->parameter_type) @@ -3264,8 +3264,8 @@ static int convert_root_signature_to_v1_0(struct vkd3d_versioned_root_signature_ { const struct vkd3d_root_signature_desc1 *src_desc = &src->u.v_1_1; struct vkd3d_root_signature_desc *dst_desc = &dst->u.v_1_0; + struct vkd3d_shader_root_parameter *parameters = NULL; struct vkd3d_static_sampler_desc *samplers = NULL; - struct vkd3d_root_parameter *parameters = NULL; int ret; if ((dst_desc->parameter_count = src_desc->parameter_count)) @@ -3317,7 +3317,7 @@ static void free_descriptor_ranges1(const struct vkd3d_root_parameter1 *paramete } static int convert_root_parameters_to_v_1_1(struct vkd3d_root_parameter1 *dst, - const struct vkd3d_root_parameter *src, unsigned int count) + const struct vkd3d_shader_root_parameter *src, unsigned int count) { const struct vkd3d_shader_descriptor_range *ranges; struct vkd3d_shader_descriptor_range1 *ranges1; @@ -3326,7 +3326,7 @@ static int convert_root_parameters_to_v_1_1(struct vkd3d_root_parameter1 *dst, for (i = 0; i < count; ++i) { - const struct vkd3d_root_parameter *p = &src[i]; + const struct vkd3d_shader_root_parameter *p = &src[i]; struct vkd3d_root_parameter1 *p1 = &dst[i]; p1->parameter_type = p->parameter_type; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index f7489f6..8dbd17e 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -484,7 +484,7 @@ static void vkd3d_shader_free_root_signature_v_1_0(struct vkd3d_root_signature_d for (i = 0; i < root_signature->parameter_count; ++i) { - const struct vkd3d_root_parameter *parameter = &root_signature->parameters[i]; + const struct vkd3d_shader_root_parameter *parameter = &root_signature->parameters[i]; if (parameter->parameter_type == VKD3D_SHADER_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE) vkd3d_free((void *)parameter->u.descriptor_table.descriptor_ranges);

1 0

Henri Verbeet : vkd3d-shader: Rename the vkd3d_root_descriptor1 structure to vkd3d_shader_root_descriptor1.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: vkd3d Branch: master Commit: f5e39842fa4fa8e5951aaa62f4a72f26b7e6d14d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f5e39842fa4fa8e5951aaa6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 17 14:32:24 2020 +0430 vkd3d-shader: Rename the vkd3d_root_descriptor1 structure to vkd3d_shader_root_descriptor1. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 4 ++-- libs/vkd3d-shader/dxbc.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 83def2d..d55a18d 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -540,7 +540,7 @@ struct vkd3d_shader_root_descriptor_table1 const struct vkd3d_shader_descriptor_range1 *descriptor_ranges; }; -struct vkd3d_root_descriptor1 +struct vkd3d_shader_root_descriptor1 { unsigned int shader_register; unsigned int register_space; @@ -554,7 +554,7 @@ struct vkd3d_root_parameter1 { struct vkd3d_shader_root_descriptor_table1 descriptor_table; struct vkd3d_shader_root_constants constants; - struct vkd3d_root_descriptor1 descriptor; + struct vkd3d_shader_root_descriptor1 descriptor; } u; enum vkd3d_shader_visibility shader_visibility; }; diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 5df551b..e424aa6 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2396,7 +2396,7 @@ static int shader_parse_root_descriptor(struct root_signature_parser_context *co return VKD3D_OK; } -static void shader_validate_root_descriptor1(const struct vkd3d_root_descriptor1 *descriptor) +static void shader_validate_root_descriptor1(const struct vkd3d_shader_root_descriptor1 *descriptor) { unsigned int unknown_flags = descriptor->flags & ~(VKD3D_SHADER_ROOT_DESCRIPTOR_FLAG_NONE | VKD3D_SHADER_ROOT_DESCRIPTOR_FLAG_DATA_VOLATILE @@ -2408,7 +2408,7 @@ static void shader_validate_root_descriptor1(const struct vkd3d_root_descriptor1 } static int shader_parse_root_descriptor1(struct root_signature_parser_context *context, - unsigned int offset, struct vkd3d_root_descriptor1 *descriptor) + unsigned int offset, struct vkd3d_shader_root_descriptor1 *descriptor) { const char *ptr; @@ -2901,7 +2901,7 @@ static int shader_write_root_descriptor(struct root_signature_writer_context *co } static int shader_write_root_descriptor1(struct root_signature_writer_context *context, - const struct vkd3d_root_descriptor1 *descriptor) + const struct vkd3d_shader_root_descriptor1 *descriptor) { if (!write_dword(context, descriptor->shader_register)) return VKD3D_ERROR_OUT_OF_MEMORY;

1 0

Henri Verbeet : vkd3d-shader: Rename the vkd3d_root_descriptor_table1 structure to vkd3d_shader_root_descriptor_table1.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: vkd3d Branch: master Commit: cb9bf177e9e0b2a5abcc6f8e2ab4cc99a2624415 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=cb9bf177e9e0b2a5abcc6f8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 17 14:32:23 2020 +0430 vkd3d-shader: Rename the vkd3d_root_descriptor_table1 structure to vkd3d_shader_root_descriptor_table1. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 4 ++-- libs/vkd3d-shader/dxbc.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index cbc4562..83def2d 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -534,7 +534,7 @@ struct vkd3d_shader_descriptor_range1 unsigned int descriptor_table_offset; }; -struct vkd3d_root_descriptor_table1 +struct vkd3d_shader_root_descriptor_table1 { unsigned int descriptor_range_count; const struct vkd3d_shader_descriptor_range1 *descriptor_ranges; @@ -552,7 +552,7 @@ struct vkd3d_root_parameter1 enum vkd3d_shader_root_parameter_type parameter_type; union { - struct vkd3d_root_descriptor_table1 descriptor_table; + struct vkd3d_shader_root_descriptor_table1 descriptor_table; struct vkd3d_shader_root_constants constants; struct vkd3d_root_descriptor1 descriptor; } u; diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 4f19b85..5df551b 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2327,7 +2327,7 @@ static int shader_parse_descriptor_table(struct root_signature_parser_context *c } static int shader_parse_descriptor_table1(struct root_signature_parser_context *context, - unsigned int offset, struct vkd3d_root_descriptor_table1 *table) + unsigned int offset, struct vkd3d_shader_root_descriptor_table1 *table) { struct vkd3d_shader_descriptor_range1 *ranges; unsigned int count; @@ -2830,7 +2830,7 @@ static int shader_write_descriptor_ranges(struct root_signature_writer_context * } static int shader_write_descriptor_ranges1(struct root_signature_writer_context *context, - const struct vkd3d_root_descriptor_table1 *table) + const struct vkd3d_shader_root_descriptor_table1 *table) { const struct vkd3d_shader_descriptor_range1 *ranges = table->descriptor_ranges; unsigned int i; @@ -2866,7 +2866,7 @@ static int shader_write_descriptor_table(struct root_signature_writer_context *c } static int shader_write_descriptor_table1(struct root_signature_writer_context *context, - const struct vkd3d_root_descriptor_table1 *table) + const struct vkd3d_shader_root_descriptor_table1 *table) { if (!write_dword(context, table->descriptor_range_count)) return VKD3D_ERROR_OUT_OF_MEMORY; @@ -3072,7 +3072,7 @@ static int validate_descriptor_table_v_1_0(const struct vkd3d_shader_root_descri return VKD3D_OK; } -static int validate_descriptor_table_v_1_1(const struct vkd3d_root_descriptor_table1 *descriptor_table) +static int validate_descriptor_table_v_1_1(const struct vkd3d_shader_root_descriptor_table1 *descriptor_table) { bool have_srv_uav_cbv = false; bool have_sampler = false;

1 0

Henri Verbeet : vkd3d-shader: Rename the vkd3d_static_border_color enumeration to vkd3d_shader_static_border_colour.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: vkd3d Branch: master Commit: 0e9f91419773b4ca3721e67293326b21d3663a9e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0e9f91419773b4ca3721e67… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 17 14:32:22 2020 +0430 vkd3d-shader: Rename the vkd3d_static_border_color enumeration to vkd3d_shader_static_border_colour. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 12 ++++++------ libs/vkd3d-shader/dxbc.c | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index d6f4aea..cbc4562 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -392,13 +392,13 @@ enum vkd3d_shader_comparison_func VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_COMPARISON_FUNC), }; -enum vkd3d_static_border_color +enum vkd3d_shader_static_border_colour { - VKD3D_STATIC_BORDER_COLOR_TRANSPARENT_BLACK = 0, - VKD3D_STATIC_BORDER_COLOR_OPAQUE_BLACK = 1, - VKD3D_STATIC_BORDER_COLOR_OPAQUE_WHITE = 2, + VKD3D_SHADER_STATIC_BORDER_COLOUR_TRANSPARENT_BLACK = 0x0, + VKD3D_SHADER_STATIC_BORDER_COLOUR_OPAQUE_BLACK = 0x1, + VKD3D_SHADER_STATIC_BORDER_COLOUR_OPAQUE_WHITE = 0x2, - VKD3D_FORCE_32_BIT_ENUM(VKD3D_STATIC_BORDER_COLOR), + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_STATIC_BORDER_COLOUR), }; struct vkd3d_static_sampler_desc @@ -410,7 +410,7 @@ struct vkd3d_static_sampler_desc float mip_lod_bias; unsigned int max_anisotropy; enum vkd3d_shader_comparison_func comparison_func; - enum vkd3d_static_border_color border_color; + enum vkd3d_shader_static_border_colour border_colour; float min_lod; float max_lod; unsigned int shader_register; diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 1fb8dc8..4f19b85 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2549,7 +2549,7 @@ static int shader_parse_static_samplers(struct root_signature_parser_context *co read_float(&ptr, &sampler_descs[i].mip_lod_bias); read_dword(&ptr, &sampler_descs[i].max_anisotropy); read_dword(&ptr, &sampler_descs[i].comparison_func); - read_dword(&ptr, &sampler_descs[i].border_color); + read_dword(&ptr, &sampler_descs[i].border_colour); read_float(&ptr, &sampler_descs[i].min_lod); read_float(&ptr, &sampler_descs[i].max_lod); read_dword(&ptr, &sampler_descs[i].shader_register); @@ -2989,7 +2989,7 @@ static int shader_write_static_samplers(struct root_signature_writer_context *co return VKD3D_ERROR_OUT_OF_MEMORY; if (!write_dword(context, samplers[i].comparison_func)) return VKD3D_ERROR_OUT_OF_MEMORY; - if (!write_dword(context, samplers[i].border_color)) + if (!write_dword(context, samplers[i].border_colour)) return VKD3D_ERROR_OUT_OF_MEMORY; if (!write_float(context, samplers[i].min_lod)) return VKD3D_ERROR_OUT_OF_MEMORY;

1 0

Henri Verbeet : vkd3d-shader: Rename the vkd3d_comparison_func enumeration to vkd3d_shader_comparison_func.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: vkd3d Branch: master Commit: a029687d5f36b81baf0e01eb100564d56d9710a5 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a029687d5f36b81baf0e01e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 17 14:32:21 2020 +0430 vkd3d-shader: Rename the vkd3d_comparison_func enumeration to vkd3d_shader_comparison_func. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 20f9678..d6f4aea 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -378,18 +378,18 @@ enum vkd3d_shader_texture_address_mode VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_TEXTURE_ADDRESS_MODE), }; -enum vkd3d_comparison_func +enum vkd3d_shader_comparison_func { - VKD3D_COMPARISON_FUNC_NEVER = 1, - VKD3D_COMPARISON_FUNC_LESS = 2, - VKD3D_COMPARISON_FUNC_EQUAL = 3, - VKD3D_COMPARISON_FUNC_LESS_EQUAL = 4, - VKD3D_COMPARISON_FUNC_GREATER = 5, - VKD3D_COMPARISON_FUNC_NOT_EQUAL = 6, - VKD3D_COMPARISON_FUNC_GREATER_EQUAL = 7, - VKD3D_COMPARISON_FUNC_ALWAYS = 8, + VKD3D_SHADER_COMPARISON_FUNC_NEVER = 0x1, + VKD3D_SHADER_COMPARISON_FUNC_LESS = 0x2, + VKD3D_SHADER_COMPARISON_FUNC_EQUAL = 0x3, + VKD3D_SHADER_COMPARISON_FUNC_LESS_EQUAL = 0x4, + VKD3D_SHADER_COMPARISON_FUNC_GREATER = 0x5, + VKD3D_SHADER_COMPARISON_FUNC_NOT_EQUAL = 0x6, + VKD3D_SHADER_COMPARISON_FUNC_GREATER_EQUAL = 0x7, + VKD3D_SHADER_COMPARISON_FUNC_ALWAYS = 0x8, - VKD3D_FORCE_32_BIT_ENUM(VKD3D_COMPARISON_FUNC), + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_COMPARISON_FUNC), }; enum vkd3d_static_border_color @@ -409,7 +409,7 @@ struct vkd3d_static_sampler_desc enum vkd3d_shader_texture_address_mode address_w; float mip_lod_bias; unsigned int max_anisotropy; - enum vkd3d_comparison_func comparison_func; + enum vkd3d_shader_comparison_func comparison_func; enum vkd3d_static_border_color border_color; float min_lod; float max_lod;

1 0

Jacek Caban : server: Remove support for crating renderer in alloc_console request.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: 9415667cdfbb4c94cdfe03a1e80a87482bee98c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9415667cdfbb4c94cdfe03a1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 16 17:50:42 2020 +0200 server: Remove support for crating renderer in alloc_console request. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/console.c | 34 +++++++++------------------------- 1 file changed, 9 insertions(+), 25 deletions(-) diff --git a/server/console.c b/server/console.c index 4ff433be4e..2785669deb 100644 --- a/server/console.c +++ b/server/console.c @@ -430,7 +430,7 @@ static struct object *create_console_input_events(void) return &evt->obj; } -static struct object *create_console_input( struct thread* renderer, int fd ) +static struct object *create_console_input( int fd ) { struct console_input *console_input; @@ -439,7 +439,7 @@ static struct object *create_console_input( struct thread* renderer, int fd ) if (fd != -1) close( fd ); return NULL; } - console_input->renderer = renderer; + console_input->renderer = NULL; console_input->mode = ENABLE_PROCESSED_INPUT | ENABLE_LINE_INPUT | ENABLE_ECHO_INPUT | ENABLE_MOUSE_INPUT | ENABLE_INSERT_MODE | ENABLE_EXTENDED_FLAGS; @@ -447,7 +447,7 @@ static struct object *create_console_input( struct thread* renderer, int fd ) console_input->active = NULL; console_input->recnum = 0; console_input->records = NULL; - console_input->evt = renderer ? (struct console_input_events *)create_console_input_events() : NULL; + console_input->evt = NULL; console_input->title = NULL; console_input->title_len = 0; console_input->history_size = 50; @@ -462,7 +462,7 @@ static struct object *create_console_input( struct thread* renderer, int fd ) console_input->fd = NULL; init_async_queue( &console_input->read_q ); - if (!console_input->history || (renderer && !console_input->evt) || !console_input->event) + if (!console_input->history || !console_input->event) { if (fd != -1) close( fd ); console_input->history_size = 0; @@ -1844,8 +1844,6 @@ struct object *create_console_device( struct object *root, const struct unicode_ /* allocate a console for the renderer */ DECL_HANDLER(alloc_console) { - obj_handle_t in = 0; - obj_handle_t evt = 0; struct process *process; struct console_input *console; int fd; @@ -1892,31 +1890,17 @@ DECL_HANDLER(alloc_console) { if (fd != -1) close( fd ); set_error( STATUS_ACCESS_DENIED ); - goto the_end; } - - if ((console = (struct console_input*)create_console_input( NULL, fd ))) + else if ((console = (struct console_input*)create_console_input( fd ))) { - if ((in = alloc_handle( current->process, console, req->access, req->attributes ))) + if ((reply->handle_in = alloc_handle( current->process, console, req->access, + req->attributes )) && attach) { - if (!console->evt || - (evt = alloc_handle( current->process, console->evt, SYNCHRONIZE|GENERIC_READ|GENERIC_WRITE, 0 ))) - { - if (attach) - { - process->console = (struct console_input*)grab_object( console ); - console->num_proc++; - } - reply->handle_in = in; - reply->event = evt; - release_object( console ); - goto the_end; - } - close_handle( current->process, in ); + process->console = (struct console_input*)grab_object( console ); + console->num_proc++; } release_object( console ); } - the_end: release_object( process ); }

1 0

Jacek Caban : wineconsole: Use NtCreateFile to create renderer object.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: 919a94aa954f543b49728f1750ea23aab21cc41c URL: https://source.winehq.org/git/wine.git/?a=commit;h=919a94aa954f543b49728f17… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 16 17:50:33 2020 +0200 wineconsole: Use NtCreateFile to create renderer object. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/condrv.h | 7 +++++++ programs/wineconsole/wineconsole.c | 20 +++++++++++++++++++- server/console.c | 12 ++++-------- 3 files changed, 30 insertions(+), 9 deletions(-) diff --git a/include/wine/condrv.h b/include/wine/condrv.h index 80613d6b7f..bf00262d70 100644 --- a/include/wine/condrv.h +++ b/include/wine/condrv.h @@ -46,6 +46,13 @@ /* console handle type */ typedef unsigned int condrv_handle_t; +/* convert an object handle to a server handle */ +static inline condrv_handle_t condrv_handle( HANDLE handle ) +{ + if ((int)(INT_PTR)handle != (INT_PTR)handle) return 0xfffffff0; /* some invalid handle */ + return (INT_PTR)handle; +} + /* structure for console char/attribute info */ typedef struct { diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index 5040800946..4e0309f18b 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -637,10 +637,18 @@ static struct inner_data* WINECON_Init(HINSTANCE hInst, DWORD pid, LPCWSTR appna enum init_return (*backend)(struct inner_data*), INT nCmdShow) { + OBJECT_ATTRIBUTES attr = {sizeof(attr)}; struct inner_data* data = NULL; DWORD ret; struct config_data cfg; STARTUPINFOW si; + UNICODE_STRING string; + IO_STATUS_BLOCK io; + condrv_handle_t h; + NTSTATUS status; + + static const WCHAR renderer_pathW[] = {'\\','D','e','v','i','c','e','\\','C','o','n','D','r','v', + '\\','R','e','n','d','e','r','e','r',0}; data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*data)); if (!data) return 0; @@ -682,12 +690,22 @@ static struct inner_data* WINECON_Init(HINSTANCE hInst, DWORD pid, LPCWSTR appna ret = !wine_server_call_err( req ); data->hConIn = wine_server_ptr_handle( reply->handle_in ); - data->hSynchro = wine_server_ptr_handle( reply->event ); } SERVER_END_REQ; if (!ret) goto error; WINE_TRACE("using hConIn %p, hSynchro event %p\n", data->hConIn, data->hSynchro); + RtlInitUnicodeString(&string, renderer_pathW); + attr.ObjectName = &string; + status = NtCreateFile(&data->hSynchro, FILE_READ_DATA | FILE_WRITE_DATA | FILE_WRITE_PROPERTIES + | FILE_READ_PROPERTIES | SYNCHRONIZE, &attr, &io, NULL, FILE_ATTRIBUTE_NORMAL, + 0, FILE_OPEN, FILE_NON_DIRECTORY_FILE, NULL, 0); + if (status) goto error; + + h = condrv_handle(data->hConIn); + if (!DeviceIoControl(data->hSynchro, IOCTL_CONDRV_ATTACH_RENDERER, &h, sizeof(h), NULL, 0, NULL, NULL)) + goto error; + SERVER_START_REQ(create_console_output) { req->handle_in = wine_server_obj_handle( data->hConIn ); diff --git a/server/console.c b/server/console.c index f56d4ba380..4ff433be4e 100644 --- a/server/console.c +++ b/server/console.c @@ -1847,7 +1847,6 @@ DECL_HANDLER(alloc_console) obj_handle_t in = 0; obj_handle_t evt = 0; struct process *process; - struct thread *renderer; struct console_input *console; int fd; int attach = 0; @@ -1865,8 +1864,7 @@ DECL_HANDLER(alloc_console) switch (req->pid) { case 0: - /* renderer is current, console to be attached to parent process */ - renderer = current; + /* console to be attached to parent process */ if (!(process = get_process_from_id( current->process->parent_id ))) { if (fd != -1) close( fd ); @@ -1876,15 +1874,13 @@ DECL_HANDLER(alloc_console) attach = 1; break; case 0xffffffff: - /* no renderer, console to be attached to current process */ - renderer = NULL; + /* console to be attached to current process */ process = current->process; grab_object( process ); attach = 1; break; default: - /* renderer is current, console to be attached to req->pid */ - renderer = current; + /* console to be attached to req->pid */ if (!(process = get_process_from_id( req->pid ))) { if (fd != -1) close( fd ); @@ -1899,7 +1895,7 @@ DECL_HANDLER(alloc_console) goto the_end; } - if ((console = (struct console_input*)create_console_input( renderer, fd ))) + if ((console = (struct console_input*)create_console_input( NULL, fd ))) { if ((in = alloc_handle( current->process, console, req->access, req->attributes ))) {

1 0

Jacek Caban : server: Introduce IOCTL_CONDRV_ATTACH_RENDERER ioctl.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: c4789b08f3bcc879d3a95b1023626a3e2a3a8967 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4789b08f3bcc879d3a95b10… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 16 17:50:09 2020 +0200 server: Introduce IOCTL_CONDRV_ATTACH_RENDERER ioctl. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/condrv.h | 4 ++++ server/console.c | 23 +++++++++++++++++++++++ server/trace.c | 1 + 3 files changed, 28 insertions(+) diff --git a/include/wine/condrv.h b/include/wine/condrv.h index 606c171c01..80613d6b7f 100644 --- a/include/wine/condrv.h +++ b/include/wine/condrv.h @@ -41,6 +41,10 @@ /* console renderer ioctls */ #define IOCTL_CONDRV_GET_RENDERER_EVENTS CTL_CODE(FILE_DEVICE_CONSOLE, 70, METHOD_BUFFERED, FILE_READ_PROPERTIES) +#define IOCTL_CONDRV_ATTACH_RENDERER CTL_CODE(FILE_DEVICE_CONSOLE, 71, METHOD_BUFFERED, FILE_READ_PROPERTIES) + +/* console handle type */ +typedef unsigned int condrv_handle_t; /* structure for console char/attribute info */ typedef struct diff --git a/server/console.c b/server/console.c index 345dd9b4e5..f56d4ba380 100644 --- a/server/console.c +++ b/server/console.c @@ -1732,6 +1732,29 @@ static int console_input_events_ioctl( struct fd *fd, ioctl_code_t code, struct queue_async( &evts->read_q, async ); return 1; + case IOCTL_CONDRV_ATTACH_RENDERER: + { + struct console_input *console_input; + if (get_req_data_size() != sizeof(condrv_handle_t)) + { + set_error( STATUS_INVALID_PARAMETER ); + return 0; + } + console_input = (struct console_input *)get_handle_obj( current->process, *(condrv_handle_t *)get_req_data(), + 0, &console_input_ops ); + if (!console_input) return 0; + + if (!console_input->evt) + { + console_input->evt = (struct console_input_events *)grab_object( evts ); + console_input->renderer = current; + } + else set_error( STATUS_INVALID_HANDLE ); + + release_object( console_input ); + return !get_error(); + } + default: set_error( STATUS_INVALID_HANDLE ); return 0; diff --git a/server/trace.c b/server/trace.c index 585ac50a0f..a2ee9c10b7 100644 --- a/server/trace.c +++ b/server/trace.c @@ -114,6 +114,7 @@ static void dump_ioctl_code( const char *prefix, const ioctl_code_t *code ) switch(*code) { #define CASE(c) case c: fprintf( stderr, "%s%s", prefix, #c ); break + CASE(IOCTL_CONDRV_ATTACH_RENDERER); CASE(IOCTL_CONDRV_FILL_OUTPUT); CASE(IOCTL_CONDRV_GET_INPUT_INFO); CASE(IOCTL_CONDRV_GET_MODE);

1 0

Jacek Caban : server: Allow creating console renderer with open_file.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: 5a174dd60446effe39f78ec7b4394e80e2522d98 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a174dd60446effe39f78ec7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 16 17:49:55 2020 +0200 server: Allow creating console renderer with open_file. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/console.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/server/console.c b/server/console.c index 17e11bc7ec..345dd9b4e5 100644 --- a/server/console.c +++ b/server/console.c @@ -124,6 +124,8 @@ static const struct fd_ops console_input_fd_ops = static void console_input_events_dump( struct object *obj, int verbose ); static void console_input_events_destroy( struct object *obj ); static struct fd *console_input_events_get_fd( struct object *obj ); +static struct object *console_input_events_open_file( struct object *obj, unsigned int access, + unsigned int sharing, unsigned int options ); struct console_input_events { @@ -152,7 +154,7 @@ static const struct object_ops console_input_events_ops = no_lookup_name, /* lookup_name */ no_link_name, /* link_name */ NULL, /* unlink_name */ - no_open_file, /* open_file */ + console_input_events_open_file, /* open_file */ no_kernel_obj_list, /* get_kernel_obj_list */ no_close_handle, /* close_handle */ console_input_events_destroy /* destroy */ @@ -331,6 +333,12 @@ static struct fd *console_input_events_get_fd( struct object* obj ) return (struct fd*)grab_object( evts->fd ); } +static struct object *console_input_events_open_file( struct object *obj, unsigned int access, + unsigned int sharing, unsigned int options ) +{ + return grab_object( obj ); +} + /* retrieves events from the console's renderer events list */ static int get_renderer_events( struct console_input_events* evts, struct async *async ) { @@ -406,7 +414,7 @@ static void console_input_events_append( struct console_input* console, } } -static struct console_input_events *create_console_input_events(void) +static struct object *create_console_input_events(void) { struct console_input_events* evt; @@ -419,7 +427,7 @@ static struct console_input_events *create_console_input_events(void) release_object( evt ); return NULL; } - return evt; + return &evt->obj; } static struct object *create_console_input( struct thread* renderer, int fd ) @@ -439,7 +447,7 @@ static struct object *create_console_input( struct thread* renderer, int fd ) console_input->active = NULL; console_input->recnum = 0; console_input->records = NULL; - console_input->evt = renderer ? create_console_input_events() : NULL; + console_input->evt = renderer ? (struct console_input_events *)create_console_input_events() : NULL; console_input->title = NULL; console_input->title_len = 0; console_input->history_size = 50; @@ -1747,6 +1755,7 @@ static struct object *console_device_lookup_name( struct object *obj, struct uni static const WCHAR consoleW[] = {'C','o','n','s','o','l','e'}; static const WCHAR current_inW[] = {'C','u','r','r','e','n','t','I','n'}; static const WCHAR current_outW[] = {'C','u','r','r','e','n','t','O','u','t'}; + static const WCHAR rendererW[] = {'R','e','n','d','e','r','e','r'}; if (name->len == sizeof(current_inW) && !memcmp( name->str, current_inW, name->len )) { @@ -1776,6 +1785,12 @@ static struct object *console_device_lookup_name( struct object *obj, struct uni return grab_object( obj ); } + if (name->len == sizeof(rendererW) && !memcmp( name->str, rendererW, name->len )) + { + name->len = 0; + return create_console_input_events(); + } + return NULL; }

1 0

Gijs Vermeulen : qdvd: Support aggregation.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: c37e2ccceb80a12aedc8cd2590e1e8acd96c72c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c37e2ccceb80a12aedc8cd25… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Thu Jul 16 06:16:33 2020 +0200 qdvd: Support aggregation. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/qdvd/graph.c | 61 +++++++++++++--- dlls/qdvd/qdvd_main.c | 8 +-- dlls/qdvd/qdvd_private.h | 2 +- dlls/qdvd/tests/Makefile.in | 5 ++ dlls/qdvd/tests/graph.c | 171 ++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 233 insertions(+), 16 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c37e2ccceb80a12aedc8…

1 0

← Newer
1
...
34
35
36
37
38
39
40
...
83
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2020