wine-commits July 2020

wine-commits@winehq.org

1 participants
826 discussions

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

17 Jul '20

Module: vkd3d Branch: master Commit: d1849b86ea9225aa0c4d65cffc26bdf9702310f3 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d1849b86ea9225aa0c4d65c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 16 14:56:47 2020 +0430 vkd3d-shader: Rename the vkd3d_filter enumeration to vkd3d_shader_filter. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 82 +++++++++++++++++++++++++------------------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index b2c3dc9..2ae35ae 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -325,46 +325,46 @@ struct vkd3d_shader_spirv_domain_shader_target_info }; /* root signature 1.0 */ -enum vkd3d_filter -{ - VKD3D_FILTER_MIN_MAG_MIP_POINT = 0x0, - VKD3D_FILTER_MIN_MAG_POINT_MIP_LINEAR = 0x1, - VKD3D_FILTER_MIN_POINT_MAG_LINEAR_MIP_POINT = 0x4, - VKD3D_FILTER_MIN_POINT_MAG_MIP_LINEAR = 0x5, - VKD3D_FILTER_MIN_LINEAR_MAG_MIP_POINT = 0x10, - VKD3D_FILTER_MIN_LINEAR_MAG_POINT_MIP_LINEAR = 0x11, - VKD3D_FILTER_MIN_MAG_LINEAR_MIP_POINT = 0x14, - VKD3D_FILTER_MIN_MAG_MIP_LINEAR = 0x15, - VKD3D_FILTER_ANISOTROPIC = 0x55, - VKD3D_FILTER_COMPARISON_MIN_MAG_MIP_POINT = 0x80, - VKD3D_FILTER_COMPARISON_MIN_MAG_POINT_MIP_LINEAR = 0x81, - VKD3D_FILTER_COMPARISON_MIN_POINT_MAG_LINEAR_MIP_POINT = 0x84, - VKD3D_FILTER_COMPARISON_MIN_POINT_MAG_MIP_LINEAR = 0x85, - VKD3D_FILTER_COMPARISON_MIN_LINEAR_MAG_MIP_POINT = 0x90, - VKD3D_FILTER_COMPARISON_MIN_LINEAR_MAG_POINT_MIP_LINEAR = 0x91, - VKD3D_FILTER_COMPARISON_MIN_MAG_LINEAR_MIP_POINT = 0x94, - VKD3D_FILTER_COMPARISON_MIN_MAG_MIP_LINEAR = 0x95, - VKD3D_FILTER_COMPARISON_ANISOTROPIC = 0xd5, - VKD3D_FILTER_MINIMUM_MIN_MAG_MIP_POINT = 0x100, - VKD3D_FILTER_MINIMUM_MIN_MAG_POINT_MIP_LINEAR = 0x101, - VKD3D_FILTER_MINIMUM_MIN_POINT_MAG_LINEAR_MIP_POINT = 0x104, - VKD3D_FILTER_MINIMUM_MIN_POINT_MAG_MIP_LINEAR = 0x105, - VKD3D_FILTER_MINIMUM_MIN_LINEAR_MAG_MIP_POINT = 0x110, - VKD3D_FILTER_MINIMUM_MIN_LINEAR_MAG_POINT_MIP_LINEAR = 0x111, - VKD3D_FILTER_MINIMUM_MIN_MAG_LINEAR_MIP_POINT = 0x114, - VKD3D_FILTER_MINIMUM_MIN_MAG_MIP_LINEAR = 0x115, - VKD3D_FILTER_MINIMUM_ANISOTROPIC = 0x155, - VKD3D_FILTER_MAXIMUM_MIN_MAG_MIP_POINT = 0x180, - VKD3D_FILTER_MAXIMUM_MIN_MAG_POINT_MIP_LINEAR = 0x181, - VKD3D_FILTER_MAXIMUM_MIN_POINT_MAG_LINEAR_MIP_POINT = 0x184, - VKD3D_FILTER_MAXIMUM_MIN_POINT_MAG_MIP_LINEAR = 0x185, - VKD3D_FILTER_MAXIMUM_MIN_LINEAR_MAG_MIP_POINT = 0x190, - VKD3D_FILTER_MAXIMUM_MIN_LINEAR_MAG_POINT_MIP_LINEAR = 0x191, - VKD3D_FILTER_MAXIMUM_MIN_MAG_LINEAR_MIP_POINT = 0x194, - VKD3D_FILTER_MAXIMUM_MIN_MAG_MIP_LINEAR = 0x195, - VKD3D_FILTER_MAXIMUM_ANISOTROPIC = 0x1d5, - - VKD3D_FORCE_32_BIT_ENUM(VKD3D_FILTER), +enum vkd3d_shader_filter +{ + VKD3D_SHADER_FILTER_MIN_MAG_MIP_POINT = 0x000, + VKD3D_SHADER_FILTER_MIN_MAG_POINT_MIP_LINEAR = 0x001, + VKD3D_SHADER_FILTER_MIN_POINT_MAG_LINEAR_MIP_POINT = 0x004, + VKD3D_SHADER_FILTER_MIN_POINT_MAG_MIP_LINEAR = 0x005, + VKD3D_SHADER_FILTER_MIN_LINEAR_MAG_MIP_POINT = 0x010, + VKD3D_SHADER_FILTER_MIN_LINEAR_MAG_POINT_MIP_LINEAR = 0x011, + VKD3D_SHADER_FILTER_MIN_MAG_LINEAR_MIP_POINT = 0x014, + VKD3D_SHADER_FILTER_MIN_MAG_MIP_LINEAR = 0x015, + VKD3D_SHADER_FILTER_ANISOTROPIC = 0x055, + VKD3D_SHADER_FILTER_COMPARISON_MIN_MAG_MIP_POINT = 0x080, + VKD3D_SHADER_FILTER_COMPARISON_MIN_MAG_POINT_MIP_LINEAR = 0x081, + VKD3D_SHADER_FILTER_COMPARISON_MIN_POINT_MAG_LINEAR_MIP_POINT = 0x084, + VKD3D_SHADER_FILTER_COMPARISON_MIN_POINT_MAG_MIP_LINEAR = 0x085, + VKD3D_SHADER_FILTER_COMPARISON_MIN_LINEAR_MAG_MIP_POINT = 0x090, + VKD3D_SHADER_FILTER_COMPARISON_MIN_LINEAR_MAG_POINT_MIP_LINEAR = 0x091, + VKD3D_SHADER_FILTER_COMPARISON_MIN_MAG_LINEAR_MIP_POINT = 0x094, + VKD3D_SHADER_FILTER_COMPARISON_MIN_MAG_MIP_LINEAR = 0x095, + VKD3D_SHADER_FILTER_COMPARISON_ANISOTROPIC = 0x0d5, + VKD3D_SHADER_FILTER_MINIMUM_MIN_MAG_MIP_POINT = 0x100, + VKD3D_SHADER_FILTER_MINIMUM_MIN_MAG_POINT_MIP_LINEAR = 0x101, + VKD3D_SHADER_FILTER_MINIMUM_MIN_POINT_MAG_LINEAR_MIP_POINT = 0x104, + VKD3D_SHADER_FILTER_MINIMUM_MIN_POINT_MAG_MIP_LINEAR = 0x105, + VKD3D_SHADER_FILTER_MINIMUM_MIN_LINEAR_MAG_MIP_POINT = 0x110, + VKD3D_SHADER_FILTER_MINIMUM_MIN_LINEAR_MAG_POINT_MIP_LINEAR = 0x111, + VKD3D_SHADER_FILTER_MINIMUM_MIN_MAG_LINEAR_MIP_POINT = 0x114, + VKD3D_SHADER_FILTER_MINIMUM_MIN_MAG_MIP_LINEAR = 0x115, + VKD3D_SHADER_FILTER_MINIMUM_ANISOTROPIC = 0x155, + VKD3D_SHADER_FILTER_MAXIMUM_MIN_MAG_MIP_POINT = 0x180, + VKD3D_SHADER_FILTER_MAXIMUM_MIN_MAG_POINT_MIP_LINEAR = 0x181, + VKD3D_SHADER_FILTER_MAXIMUM_MIN_POINT_MAG_LINEAR_MIP_POINT = 0x184, + VKD3D_SHADER_FILTER_MAXIMUM_MIN_POINT_MAG_MIP_LINEAR = 0x185, + VKD3D_SHADER_FILTER_MAXIMUM_MIN_LINEAR_MAG_MIP_POINT = 0x190, + VKD3D_SHADER_FILTER_MAXIMUM_MIN_LINEAR_MAG_POINT_MIP_LINEAR = 0x191, + VKD3D_SHADER_FILTER_MAXIMUM_MIN_MAG_LINEAR_MIP_POINT = 0x194, + VKD3D_SHADER_FILTER_MAXIMUM_MIN_MAG_MIP_LINEAR = 0x195, + VKD3D_SHADER_FILTER_MAXIMUM_ANISOTROPIC = 0x1d5, + + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_FILTER), }; enum vkd3d_texture_address_mode @@ -403,7 +403,7 @@ enum vkd3d_static_border_color struct vkd3d_static_sampler_desc { - enum vkd3d_filter filter; + enum vkd3d_shader_filter filter; enum vkd3d_texture_address_mode address_u; enum vkd3d_texture_address_mode address_v; enum vkd3d_texture_address_mode address_w;

1 0

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

17 Jul '20

Module: vkd3d Branch: master Commit: 0f5dc670157713c2dd76be33b59a7773d4f310ba URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0f5dc670157713c2dd76be3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 16 14:56:46 2020 +0430 vkd3d-shader: Rename the vkd3d_root_descriptor structure to vkd3d_shader_root_descriptor. 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 | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 0323766..b2c3dc9 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -450,7 +450,7 @@ struct vkd3d_shader_root_constants unsigned int value_count; }; -struct vkd3d_root_descriptor +struct vkd3d_shader_root_descriptor { unsigned int shader_register; unsigned int register_space; @@ -474,7 +474,7 @@ struct vkd3d_root_parameter { struct vkd3d_shader_root_descriptor_table descriptor_table; struct vkd3d_shader_root_constants constants; - struct vkd3d_root_descriptor descriptor; + struct vkd3d_shader_root_descriptor descriptor; } u; enum vkd3d_shader_visibility shader_visibility; }; diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index a247d5c..1fb8dc8 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2376,7 +2376,7 @@ static int shader_parse_root_constants(struct root_signature_parser_context *con } static int shader_parse_root_descriptor(struct root_signature_parser_context *context, - unsigned int offset, struct vkd3d_root_descriptor *descriptor) + unsigned int offset, struct vkd3d_shader_root_descriptor *descriptor) { const char *ptr; @@ -2890,7 +2890,7 @@ static int shader_write_root_constants(struct root_signature_writer_context *con } static int shader_write_root_descriptor(struct root_signature_writer_context *context, - const struct vkd3d_root_descriptor *descriptor) + const struct vkd3d_shader_root_descriptor *descriptor) { if (!write_dword(context, descriptor->shader_register)) return VKD3D_ERROR_OUT_OF_MEMORY;

1 0

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

17 Jul '20

Module: vkd3d Branch: master Commit: 270b31a7db0c3f7131f968eccd9fdfd9d7133031 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=270b31a7db0c3f7131f968e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 16 14:56:45 2020 +0430 vkd3d-shader: Rename the vkd3d_root_constants structure to vkd3d_shader_root_constants. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 6 +++--- libs/vkd3d-shader/dxbc.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 6fa2505..0323766 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -443,7 +443,7 @@ struct vkd3d_shader_root_descriptor_table const struct vkd3d_shader_descriptor_range *descriptor_ranges; }; -struct vkd3d_root_constants +struct vkd3d_shader_root_constants { unsigned int shader_register; unsigned int register_space; @@ -473,7 +473,7 @@ struct vkd3d_root_parameter union { struct vkd3d_shader_root_descriptor_table descriptor_table; - struct vkd3d_root_constants constants; + struct vkd3d_shader_root_constants constants; struct vkd3d_root_descriptor descriptor; } u; enum vkd3d_shader_visibility shader_visibility; @@ -553,7 +553,7 @@ struct vkd3d_root_parameter1 union { struct vkd3d_root_descriptor_table1 descriptor_table; - struct vkd3d_root_constants constants; + struct vkd3d_shader_root_constants constants; struct vkd3d_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 0848c04..a247d5c 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2354,7 +2354,7 @@ static int shader_parse_descriptor_table1(struct root_signature_parser_context * } static int shader_parse_root_constants(struct root_signature_parser_context *context, - unsigned int offset, struct vkd3d_root_constants *constants) + unsigned int offset, struct vkd3d_shader_root_constants *constants) { const char *ptr; @@ -2696,7 +2696,7 @@ static enum vkd3d_shader_visibility versioned_root_signature_get_parameter_shade return desc->u.v_1_1.parameters[i].shader_visibility; } -static const struct vkd3d_root_constants *versioned_root_signature_get_root_constants( +static const struct vkd3d_shader_root_constants *versioned_root_signature_get_root_constants( const struct vkd3d_versioned_root_signature_desc *desc, unsigned int i) { if (desc->version == VKD3D_ROOT_SIGNATURE_VERSION_1_0) @@ -2877,7 +2877,7 @@ static int shader_write_descriptor_table1(struct root_signature_writer_context * } static int shader_write_root_constants(struct root_signature_writer_context *context, - const struct vkd3d_root_constants *constants) + const struct vkd3d_shader_root_constants *constants) { if (!write_dword(context, constants->shader_register)) return VKD3D_ERROR_OUT_OF_MEMORY;

1 0

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

17 Jul '20

Module: vkd3d Branch: master Commit: 36d21277650f821b7532dd5e89c86500ae39bedc URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=36d21277650f821b7532dd5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 16 14:56:44 2020 +0430 vkd3d-shader: Rename the vkd3d_root_descriptor_table structure to vkd3d_shader_root_descriptor_table. 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 1ce701c..6fa2505 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -437,7 +437,7 @@ struct vkd3d_shader_descriptor_range unsigned int descriptor_table_offset; }; -struct vkd3d_root_descriptor_table +struct vkd3d_shader_root_descriptor_table { unsigned int descriptor_range_count; const struct vkd3d_shader_descriptor_range *descriptor_ranges; @@ -472,7 +472,7 @@ struct vkd3d_root_parameter enum vkd3d_shader_root_parameter_type parameter_type; union { - struct vkd3d_root_descriptor_table descriptor_table; + struct vkd3d_shader_root_descriptor_table descriptor_table; struct vkd3d_root_constants constants; struct vkd3d_root_descriptor descriptor; } u; diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 6297a04..0848c04 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2300,7 +2300,7 @@ static int shader_parse_descriptor_ranges1(struct root_signature_parser_context } static int shader_parse_descriptor_table(struct root_signature_parser_context *context, - unsigned int offset, struct vkd3d_root_descriptor_table *table) + unsigned int offset, struct vkd3d_shader_root_descriptor_table *table) { struct vkd3d_shader_descriptor_range *ranges; unsigned int count; @@ -2807,7 +2807,7 @@ static int shader_write_root_signature_header(struct root_signature_writer_conte } static int shader_write_descriptor_ranges(struct root_signature_writer_context *context, - const struct vkd3d_root_descriptor_table *table) + const struct vkd3d_shader_root_descriptor_table *table) { const struct vkd3d_shader_descriptor_range *ranges = table->descriptor_ranges; unsigned int i; @@ -2855,7 +2855,7 @@ static int shader_write_descriptor_ranges1(struct root_signature_writer_context } static int shader_write_descriptor_table(struct root_signature_writer_context *context, - const struct vkd3d_root_descriptor_table *table) + const struct vkd3d_shader_root_descriptor_table *table) { if (!write_dword(context, table->descriptor_range_count)) return VKD3D_ERROR_OUT_OF_MEMORY; @@ -3036,7 +3036,7 @@ static int shader_write_root_signature(struct root_signature_writer_context *con return shader_write_static_samplers(context, desc); } -static int validate_descriptor_table_v_1_0(const struct vkd3d_root_descriptor_table *descriptor_table) +static int validate_descriptor_table_v_1_0(const struct vkd3d_shader_root_descriptor_table *descriptor_table) { bool have_srv_uav_cbv = false; bool have_sampler = false;

1 0

Jacek Caban : ntdll: Silence server_ioctl_file debug traces.
by Alexandre Julliard 15 Jul '20

15 Jul '20

Module: wine Branch: master Commit: 42cb7d2ad1caba08de235e6319b9967296b5d554 URL: https://source.winehq.org/git/wine.git/?a=commit;h=42cb7d2ad1caba08de235e63… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 15 17:34:47 2020 +0200 ntdll: Silence server_ioctl_file debug traces. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index bf435f109f..b202864e66 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -4743,8 +4743,8 @@ static NTSTATUS server_ioctl_file( HANDLE handle, HANDLE event, SERVER_END_REQ; if (status == STATUS_NOT_SUPPORTED) - FIXME("Unsupported ioctl %x (device=%x access=%x func=%x method=%x)\n", - code, code >> 16, (code >> 14) & 3, (code >> 2) & 0xfff, code & 3); + WARN("Unsupported ioctl %x (device=%x access=%x func=%x method=%x)\n", + code, code >> 16, (code >> 14) & 3, (code >> 2) & 0xfff, code & 3); if (status != STATUS_PENDING) free( async );

1 0

Jacek Caban : server: Trace console ioctls.
by Alexandre Julliard 15 Jul '20

15 Jul '20

Module: wine Branch: master Commit: 823c55ad2755c36f55cce1f0cf5f0ee6dcaf9d76 URL: https://source.winehq.org/git/wine.git/?a=commit;h=823c55ad2755c36f55cce1f0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 15 17:34:41 2020 +0200 server: Trace console ioctls. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/trace.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/server/trace.c b/server/trace.c index a35b6c1918..7acab95efe 100644 --- a/server/trace.c +++ b/server/trace.c @@ -38,6 +38,7 @@ #include "winternl.h" #include "winuser.h" #include "winioctl.h" +#include "wine/condrv.h" #include "ddk/wdm.h" #include "ddk/ntddser.h" #define USE_WS_PREFIX @@ -113,6 +114,17 @@ 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_FILL_OUTPUT); + CASE(IOCTL_CONDRV_GET_INPUT_INFO); + CASE(IOCTL_CONDRV_GET_MODE); + CASE(IOCTL_CONDRV_GET_OUTPUT_INFO); + CASE(IOCTL_CONDRV_GET_RENDERER_EVENTS); + CASE(IOCTL_CONDRV_GET_TITLE); + CASE(IOCTL_CONDRV_PEEK); + CASE(IOCTL_CONDRV_READ_INPUT); + CASE(IOCTL_CONDRV_SET_MODE); + CASE(IOCTL_CONDRV_SET_OUTPUT_INFO); + CASE(IOCTL_CONDRV_WRITE_INPUT); CASE(FSCTL_DISMOUNT_VOLUME); CASE(FSCTL_PIPE_DISCONNECT); CASE(FSCTL_PIPE_LISTEN);

1 0

Jacek Caban : wineconsole: Use IOCTL_CONDRV_GET_TITLE in WINECON_GetConsoleTitle.
by Alexandre Julliard 15 Jul '20

15 Jul '20

Module: wine Branch: master Commit: ffa52880f2519c885ce61b89b847c82e0531c032 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ffa52880f2519c885ce61b89… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 15 17:34:34 2020 +0200 wineconsole: Use IOCTL_CONDRV_GET_TITLE in WINECON_GetConsoleTitle. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineconsole/wineconsole.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index 94ef6c3dec..5040800946 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -173,22 +173,13 @@ static void WINECON_SetInsertMode(HANDLE hConIn, unsigned int enable) */ BOOL WINECON_GetConsoleTitle(HANDLE hConIn, WCHAR* buffer, size_t len) { - BOOL ret; + DWORD size; - if (len < sizeof(WCHAR)) return FALSE; + if (!DeviceIoControl(hConIn, IOCTL_CONDRV_GET_TITLE, NULL, 0, buffer, len - sizeof(WCHAR), &size, NULL)) + return FALSE; - SERVER_START_REQ( get_console_input_info ) - { - req->handle = wine_server_obj_handle( hConIn ); - wine_server_set_reply( req, buffer, len - sizeof(WCHAR) ); - if ((ret = !wine_server_call_err( req ))) - { - len = wine_server_reply_size( reply ); - buffer[len / sizeof(WCHAR)] = 0; - } - } - SERVER_END_REQ; - return ret; + buffer[size / sizeof(WCHAR)] = 0; + return TRUE; } /******************************************************************

1 0

Jacek Caban : server: Introduce IOCTL_CONDRV_GET_TITLE ioctl.
by Alexandre Julliard 15 Jul '20

15 Jul '20

Module: wine Branch: master Commit: 037b91620c4caafae943e7cd304f0d9df4335d21 URL: https://source.winehq.org/git/wine.git/?a=commit;h=037b91620c4caafae943e7cd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 15 18:02:26 2020 +0200 server: Introduce IOCTL_CONDRV_GET_TITLE ioctl. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/condrv.h | 1 + server/console.c | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/include/wine/condrv.h b/include/wine/condrv.h index 2ead8a2f29..606c171c01 100644 --- a/include/wine/condrv.h +++ b/include/wine/condrv.h @@ -32,6 +32,7 @@ #define IOCTL_CONDRV_WRITE_INPUT CTL_CODE(FILE_DEVICE_CONSOLE, 11, METHOD_BUFFERED, FILE_WRITE_PROPERTIES) #define IOCTL_CONDRV_PEEK CTL_CODE(FILE_DEVICE_CONSOLE, 12, METHOD_BUFFERED, FILE_READ_ACCESS) #define IOCTL_CONDRV_GET_INPUT_INFO CTL_CODE(FILE_DEVICE_CONSOLE, 13, METHOD_BUFFERED, FILE_READ_PROPERTIES) +#define IOCTL_CONDRV_GET_TITLE CTL_CODE(FILE_DEVICE_CONSOLE, 15, METHOD_BUFFERED, FILE_READ_PROPERTIES) /* console output ioctls */ #define IOCTL_CONDRV_GET_OUTPUT_INFO CTL_CODE(FILE_DEVICE_CONSOLE, 32, METHOD_BUFFERED, FILE_READ_PROPERTIES) diff --git a/server/console.c b/server/console.c index 739664bf8e..17e11bc7ec 100644 --- a/server/console.c +++ b/server/console.c @@ -1600,6 +1600,10 @@ static int console_input_ioctl( struct fd *fd, ioctl_code_t code, struct async * return set_reply_data( &info, sizeof(info) ) != NULL; } + case IOCTL_CONDRV_GET_TITLE: + if (!console->title_len) return 1; + return set_reply_data( console->title, min( console->title_len, get_reply_max_size() )) != NULL; + default: set_error( STATUS_INVALID_HANDLE ); return 0;

1 0

Zebediah Figura : kernel32/tests: Add tests for profile registry mapping.
by Alexandre Julliard 15 Jul '20

15 Jul '20

Module: wine Branch: master Commit: 4ea42892539d84e6fd5bb864d18ef26d0e2038d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ea42892539d84e6fd5bb864… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jul 12 20:32:13 2020 -0500 kernel32/tests: Add tests for profile registry mapping. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/profile.c | 419 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 419 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4ea42892539d84e6fd5b…

1 0

Zebediah Figura : kernel32: Implement deleting mapped sections.
by Alexandre Julliard 15 Jul '20

15 Jul '20

Module: wine Branch: master Commit: 6e9d3d2014145930f688f4c5c9043d5112d41b6e URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e9d3d2014145930f688f4c5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jul 12 20:32:12 2020 -0500 kernel32: Implement deleting mapped sections. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/profile.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 64 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index d4f2b32654..bfaba6cdeb 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -1263,6 +1263,68 @@ static DWORD get_section( const WCHAR *filename, const WCHAR *section, return ret; } +static void delete_key_values( HKEY key ) +{ + WCHAR *entry; + + while ((entry = enum_key( key, 0 ))) + { + RegDeleteValueW( key, entry ); + HeapFree( GetProcessHeap(), 0, entry ); + } +} + +static BOOL delete_section( const WCHAR *filename, const WCHAR *section ) +{ + HKEY key, subkey, section_key; + + if ((key = open_file_mapping_key( filename ))) + { + if (!RegOpenKeyExW( key, section, 0, KEY_READ, &subkey )) + { + WCHAR *entry, *path; + HKEY entry_key; + DWORD i; + + for (i = 0; (entry = enum_key( subkey, i )); ++i) + { + if (!(path = get_key_value( subkey, entry ))) + { + HeapFree( GetProcessHeap(), 0, path ); + continue; + } + + entry_key = open_mapped_key( path, TRUE ); + HeapFree( GetProcessHeap(), 0, path ); + if (!entry_key) + { + HeapFree( GetProcessHeap(), 0, entry ); + continue; + } + + if (entry[0]) + RegDeleteValueW( entry_key, entry ); + else + delete_key_values( entry_key ); + + HeapFree( GetProcessHeap(), 0, entry ); + RegCloseKey( entry_key ); + } + + RegCloseKey( subkey ); + } + else if (get_mapped_section_key( filename, section, NULL, TRUE, &section_key )) + { + delete_key_values( section_key ); + RegCloseKey( section_key ); + } + + RegCloseKey( key ); + } + + return PROFILE_DeleteSection( filename, section ); +} + /********************* API functions **********************************/ @@ -1608,7 +1670,7 @@ BOOL WINAPI WritePrivateProfileStringW( LPCWSTR section, LPCWSTR entry, LeaveCriticalSection( &PROFILE_CritSect ); return FALSE; } - if (!entry) return PROFILE_DeleteSection( filename, section ); + if (!entry) return delete_section( filename, section ); if (get_mapped_section_key( filename, section, entry, TRUE, &key )) { @@ -1686,7 +1748,7 @@ BOOL WINAPI WritePrivateProfileSectionW( LPCWSTR section, LeaveCriticalSection( &PROFILE_CritSect ); return FALSE; } - if (!string) return PROFILE_DeleteSection( filename, section ); + if (!string) return delete_section( filename, section ); if ((key = open_file_mapping_key( filename ))) {

1 0

← Newer
1
...
41
42
43
44
45
46
47
...
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