July 2020 - Wine-commits - list.winehq.org

Henri Verbeet : vkd3d-shader: Rename the vkd3d_sysval_semantic enumeration to vkd3d_shader_sysval_semantic.
by Alexandre Julliard 10 Jul '20

10 Jul '20

Module: vkd3d Branch: master Commit: 3a9eb1839eabaff8a6167d5112b2562fc761870d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3a9eb1839eabaff8a6167d5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 10 17:02:01 2020 +0430 vkd3d-shader: Rename the vkd3d_sysval_semantic enumeration to vkd3d_shader_sysval_semantic. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 44 ++++++++++++++++++++++---------------------- libs/vkd3d-shader/spirv.c | 32 ++++++++++++++++---------------- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 61785be..054b512 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -650,27 +650,27 @@ enum vkd3d_shader_component_type VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_COMPONENT_TYPE), }; -enum vkd3d_sysval_semantic -{ - VKD3D_SV_NONE = 0, - VKD3D_SV_POSITION = 1, - VKD3D_SV_CLIP_DISTANCE = 2, - VKD3D_SV_CULL_DISTANCE = 3, - VKD3D_SV_RENDER_TARGET_ARRAY_INDEX = 4, - VKD3D_SV_VIEWPORT_ARRAY_INDEX = 5, - VKD3D_SV_VERTEX_ID = 6, - VKD3D_SV_PRIMITIVE_ID = 7, - VKD3D_SV_INSTANCE_ID = 8, - VKD3D_SV_IS_FRONT_FACE = 9, - VKD3D_SV_SAMPLE_INDEX = 10, - VKD3D_SV_TESS_FACTOR_QUADEDGE = 11, - VKD3D_SV_TESS_FACTOR_QUADINT = 12, - VKD3D_SV_TESS_FACTOR_TRIEDGE = 13, - VKD3D_SV_TESS_FACTOR_TRIINT = 14, - VKD3D_SV_TESS_FACTOR_LINEDET = 15, - VKD3D_SV_TESS_FACTOR_LINEDEN = 16, - - VKD3D_FORCE_32_BIT_ENUM(VKD3D_SYSVAL_SEMANTIC), +enum vkd3d_shader_sysval_semantic +{ + VKD3D_SHADER_SV_NONE = 0x00, + VKD3D_SHADER_SV_POSITION = 0x01, + VKD3D_SHADER_SV_CLIP_DISTANCE = 0x02, + VKD3D_SHADER_SV_CULL_DISTANCE = 0x03, + VKD3D_SHADER_SV_RENDER_TARGET_ARRAY_INDEX = 0x04, + VKD3D_SHADER_SV_VIEWPORT_ARRAY_INDEX = 0x05, + VKD3D_SHADER_SV_VERTEX_ID = 0x06, + VKD3D_SHADER_SV_PRIMITIVE_ID = 0x07, + VKD3D_SHADER_SV_INSTANCE_ID = 0x08, + VKD3D_SHADER_SV_IS_FRONT_FACE = 0x09, + VKD3D_SHADER_SV_SAMPLE_INDEX = 0x0a, + VKD3D_SHADER_SV_TESS_FACTOR_QUADEDGE = 0x0b, + VKD3D_SHADER_SV_TESS_FACTOR_QUADINT = 0x0c, + VKD3D_SHADER_SV_TESS_FACTOR_TRIEDGE = 0x0d, + VKD3D_SHADER_SV_TESS_FACTOR_TRIINT = 0x0e, + VKD3D_SHADER_SV_TESS_FACTOR_LINEDET = 0x0f, + VKD3D_SHADER_SV_TESS_FACTOR_LINEDEN = 0x10, + + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_SYSVAL_SEMANTIC), }; enum vkd3d_shader_minimum_precision @@ -687,7 +687,7 @@ struct vkd3d_shader_signature_element const char *semantic_name; unsigned int semantic_index; unsigned int stream_index; - enum vkd3d_sysval_semantic sysval_semantic; + enum vkd3d_shader_sysval_semantic sysval_semantic; enum vkd3d_shader_component_type component_type; unsigned int register_index; unsigned int mask; diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 257b443..667d851 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -132,30 +132,30 @@ static const void *vkd3d_find_struct_(const struct vkd3d_struct *chain, return NULL; } -static enum vkd3d_shader_input_sysval_semantic vkd3d_siv_from_sysval_indexed(enum vkd3d_sysval_semantic sysval, +static enum vkd3d_shader_input_sysval_semantic vkd3d_siv_from_sysval_indexed(enum vkd3d_shader_sysval_semantic sysval, unsigned int index) { switch (sysval) { - case VKD3D_SV_NONE: + case VKD3D_SHADER_SV_NONE: return VKD3D_SIV_NONE; - case VKD3D_SV_POSITION: + case VKD3D_SHADER_SV_POSITION: return VKD3D_SIV_POSITION; - case VKD3D_SV_CLIP_DISTANCE: + case VKD3D_SHADER_SV_CLIP_DISTANCE: return VKD3D_SIV_CLIP_DISTANCE; - case VKD3D_SV_CULL_DISTANCE: + case VKD3D_SHADER_SV_CULL_DISTANCE: return VKD3D_SIV_CULL_DISTANCE; - case VKD3D_SV_TESS_FACTOR_QUADEDGE: + case VKD3D_SHADER_SV_TESS_FACTOR_QUADEDGE: return VKD3D_SIV_QUAD_U0_TESS_FACTOR + index; - case VKD3D_SV_TESS_FACTOR_QUADINT: + case VKD3D_SHADER_SV_TESS_FACTOR_QUADINT: return VKD3D_SIV_QUAD_U_INNER_TESS_FACTOR + index; - case VKD3D_SV_TESS_FACTOR_TRIEDGE: + case VKD3D_SHADER_SV_TESS_FACTOR_TRIEDGE: return VKD3D_SIV_TRIANGLE_U_TESS_FACTOR + index; - case VKD3D_SV_TESS_FACTOR_TRIINT: + case VKD3D_SHADER_SV_TESS_FACTOR_TRIINT: return VKD3D_SIV_TRIANGLE_INNER_TESS_FACTOR; - case VKD3D_SV_TESS_FACTOR_LINEDET: + case VKD3D_SHADER_SV_TESS_FACTOR_LINEDET: return VKD3D_SIV_LINE_DETAIL_TESS_FACTOR; - case VKD3D_SV_TESS_FACTOR_LINEDEN: + case VKD3D_SHADER_SV_TESS_FACTOR_LINEDEN: return VKD3D_SIV_LINE_DENSITY_TESS_FACTOR; default: FIXME("Unhandled sysval %#x, index %u.\n", sysval, index); @@ -163,7 +163,7 @@ static enum vkd3d_shader_input_sysval_semantic vkd3d_siv_from_sysval_indexed(enu } } -static enum vkd3d_shader_input_sysval_semantic vkd3d_siv_from_sysval(enum vkd3d_sysval_semantic sysval) +static enum vkd3d_shader_input_sysval_semantic vkd3d_siv_from_sysval(enum vkd3d_shader_sysval_semantic sysval) { return vkd3d_siv_from_sysval_indexed(sysval, 0); } @@ -4325,11 +4325,11 @@ static void vkd3d_dxbc_compiler_emit_shader_signature_outputs(struct vkd3d_dxbc_ switch (e->sysval_semantic) { - case VKD3D_SV_CLIP_DISTANCE: + case VKD3D_SHADER_SV_CLIP_DISTANCE: calculate_clip_or_cull_distance_mask(e, &clip_distance_mask); break; - case VKD3D_SV_CULL_DISTANCE: + case VKD3D_SHADER_SV_CULL_DISTANCE: calculate_clip_or_cull_distance_mask(e, &cull_distance_mask); break; @@ -4360,13 +4360,13 @@ static void vkd3d_dxbc_compiler_emit_shader_signature_outputs(struct vkd3d_dxbc_ switch (e->sysval_semantic) { - case VKD3D_SV_CLIP_DISTANCE: + case VKD3D_SHADER_SV_CLIP_DISTANCE: compiler->output_info[i].id = clip_distance_id; compiler->output_info[i].component_type = VKD3D_SHADER_COMPONENT_FLOAT; compiler->output_info[i].array_element_mask = clip_distance_mask; break; - case VKD3D_SV_CULL_DISTANCE: + case VKD3D_SHADER_SV_CULL_DISTANCE: compiler->output_info[i].id = cull_distance_id; compiler->output_info[i].component_type = VKD3D_SHADER_COMPONENT_FLOAT; compiler->output_info[i].array_element_mask = cull_distance_mask;

1 0

Henri Verbeet : vkd3d-shader: Rename the VKD3D_SWIZZLE macro to VKD3D_SHADER_SWIZZLE.
by Alexandre Julliard 10 Jul '20

10 Jul '20

Module: vkd3d Branch: master Commit: edd585ea44c5e03616d18ce55c97fc75ad96125f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=edd585ea44c5e03616d18ce… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 10 17:02:02 2020 +0430 vkd3d-shader: Rename the VKD3D_SWIZZLE macro to VKD3D_SHADER_SWIZZLE. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 33 ++++++++++++++++---------------- libs/vkd3d-shader/dxbc.c | 7 ++++--- libs/vkd3d-shader/spirv.c | 16 ++++++++-------- libs/vkd3d-shader/trace.c | 10 +++++----- libs/vkd3d-shader/vkd3d_shader_private.h | 4 ++-- libs/vkd3d/state.c | 7 ++++--- 6 files changed, 40 insertions(+), 37 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=edd585ea44c5e03616d…

1 0

Henri Verbeet : vkd3d-shader: Rename the vkd3d_descriptor_range_type enumeration to vkd3d_shader_descriptor_range_type.
by Alexandre Julliard 10 Jul '20

10 Jul '20

Module: vkd3d Branch: master Commit: 6e0ab34564fdd3e9690ff809d4a20dd182fd4522 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=6e0ab34564fdd3e9690ff80… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 10 17:02:03 2020 +0430 vkd3d-shader: Rename the vkd3d_descriptor_range_type enumeration to vkd3d_shader_descriptor_range_type. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 16 ++++++++-------- libs/vkd3d-shader/dxbc.c | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index d00ec45..50c64ca 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -418,19 +418,19 @@ struct vkd3d_static_sampler_desc enum vkd3d_shader_visibility shader_visibility; }; -enum vkd3d_descriptor_range_type +enum vkd3d_shader_descriptor_range_type { - VKD3D_DESCRIPTOR_RANGE_TYPE_SRV = 0, - VKD3D_DESCRIPTOR_RANGE_TYPE_UAV = 1, - VKD3D_DESCRIPTOR_RANGE_TYPE_CBV = 2, - VKD3D_DESCRIPTOR_RANGE_TYPE_SAMPLER = 3, + VKD3D_SHADER_DESCRIPTOR_RANGE_TYPE_SRV = 0x0, + VKD3D_SHADER_DESCRIPTOR_RANGE_TYPE_UAV = 0x1, + VKD3D_SHADER_DESCRIPTOR_RANGE_TYPE_CBV = 0x2, + VKD3D_SHADER_DESCRIPTOR_RANGE_TYPE_SAMPLER = 0x3, - VKD3D_FORCE_32_BIT_ENUM(VKD3D_DESCRIPTOR_RANGE_TYPE), + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_DESCRIPTOR_RANGE_TYPE), }; struct vkd3d_descriptor_range { - enum vkd3d_descriptor_range_type range_type; + enum vkd3d_shader_descriptor_range_type range_type; unsigned int descriptor_count; unsigned int base_shader_register; unsigned int register_space; @@ -522,7 +522,7 @@ enum vkd3d_descriptor_range_flags struct vkd3d_descriptor_range1 { - enum vkd3d_descriptor_range_type range_type; + enum vkd3d_shader_descriptor_range_type range_type; unsigned int descriptor_count; unsigned int base_shader_register; unsigned int register_space; diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 5fba83b..a0f03cf 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -3046,13 +3046,13 @@ static int validate_descriptor_table_v_1_0(const struct vkd3d_root_descriptor_ta { const struct vkd3d_descriptor_range *r = &descriptor_table->descriptor_ranges[i]; - if (r->range_type == VKD3D_DESCRIPTOR_RANGE_TYPE_SRV - || r->range_type == VKD3D_DESCRIPTOR_RANGE_TYPE_UAV - || r->range_type == VKD3D_DESCRIPTOR_RANGE_TYPE_CBV) + if (r->range_type == VKD3D_SHADER_DESCRIPTOR_RANGE_TYPE_SRV + || r->range_type == VKD3D_SHADER_DESCRIPTOR_RANGE_TYPE_UAV + || r->range_type == VKD3D_SHADER_DESCRIPTOR_RANGE_TYPE_CBV) { have_srv_uav_cbv = true; } - else if (r->range_type == VKD3D_DESCRIPTOR_RANGE_TYPE_SAMPLER) + else if (r->range_type == VKD3D_SHADER_DESCRIPTOR_RANGE_TYPE_SAMPLER) { have_sampler = true; } @@ -3082,13 +3082,13 @@ static int validate_descriptor_table_v_1_1(const struct vkd3d_root_descriptor_ta { const struct vkd3d_descriptor_range1 *r = &descriptor_table->descriptor_ranges[i]; - if (r->range_type == VKD3D_DESCRIPTOR_RANGE_TYPE_SRV - || r->range_type == VKD3D_DESCRIPTOR_RANGE_TYPE_UAV - || r->range_type == VKD3D_DESCRIPTOR_RANGE_TYPE_CBV) + if (r->range_type == VKD3D_SHADER_DESCRIPTOR_RANGE_TYPE_SRV + || r->range_type == VKD3D_SHADER_DESCRIPTOR_RANGE_TYPE_UAV + || r->range_type == VKD3D_SHADER_DESCRIPTOR_RANGE_TYPE_CBV) { have_srv_uav_cbv = true; } - else if (r->range_type == VKD3D_DESCRIPTOR_RANGE_TYPE_SAMPLER) + else if (r->range_type == VKD3D_SHADER_DESCRIPTOR_RANGE_TYPE_SAMPLER) { have_sampler = true; }

1 0

Jacek Caban : kernel32: Use IOCTL_CONDRV_GET_OUTPUT_INFO in get_console_font_size.
by Alexandre Julliard 09 Jul '20

09 Jul '20

Module: wine Branch: master Commit: 0c3c89b74decfdab8e0227d87e5eecdb3380806c URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c3c89b74decfdab8e0227d8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 9 19:28:20 2020 +0200 kernel32: Use IOCTL_CONDRV_GET_OUTPUT_INFO in get_console_font_size. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index e919fcf3f1..0a45a0e294 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -1391,6 +1391,7 @@ BOOL WINAPI GetCurrentConsoleFont(HANDLE hConsole, BOOL maxwindow, CONSOLE_FONT_ static COORD get_console_font_size(HANDLE hConsole, DWORD index) { + struct condrv_output_info info; COORD c = {0,0}; if (index >= GetNumberOfConsoleFonts()) @@ -1399,16 +1400,12 @@ static COORD get_console_font_size(HANDLE hConsole, DWORD index) return c; } - SERVER_START_REQ(get_console_output_info) + if (DeviceIoControl( hConsole, IOCTL_CONDRV_GET_OUTPUT_INFO, NULL, 0, &info, sizeof(info), NULL, NULL )) { - req->handle = console_handle_unmap(hConsole); - if (!wine_server_call_err(req)) - { - c.X = reply->font_width; - c.Y = reply->font_height; - } + c.X = info.font_width; + c.Y = info.font_height; } - SERVER_END_REQ; + else SetLastError( ERROR_INVALID_HANDLE ); return c; }

1 0

Jacek Caban : kernel32: Use IOCT_CONDRV_GET_OUTPUT_INFO in GetCurrentConsoleFontEx.
by Alexandre Julliard 09 Jul '20

09 Jul '20

Module: wine Branch: master Commit: 2789787f011e1a923dc22b6884433826e9350725 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2789787f011e1a923dc22b68… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 9 19:28:32 2020 +0200 kernel32: Use IOCT_CONDRV_GET_OUTPUT_INFO in GetCurrentConsoleFontEx. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 57 ++++++++++++++++++++++--------------------------- 1 file changed, 25 insertions(+), 32 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 0a45a0e294..e21c8a890e 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -1326,11 +1326,11 @@ BOOL WINAPI SetConsoleKeyShortcuts(BOOL set, BYTE keys, VOID *a, DWORD b) BOOL WINAPI GetCurrentConsoleFontEx(HANDLE hConsole, BOOL maxwindow, CONSOLE_FONT_INFOEX *fontinfo) { - BOOL ret; + DWORD size; struct { - unsigned int color_map[16]; - WCHAR face_name[LF_FACESIZE]; + struct condrv_output_info info; + WCHAR face_name[LF_FACESIZE - 1]; } data; if (fontinfo->cbSize != sizeof(CONSOLE_FONT_INFOEX)) @@ -1339,37 +1339,30 @@ BOOL WINAPI GetCurrentConsoleFontEx(HANDLE hConsole, BOOL maxwindow, CONSOLE_FON return FALSE; } - SERVER_START_REQ(get_console_output_info) + if (!DeviceIoControl( hConsole, IOCTL_CONDRV_GET_OUTPUT_INFO, NULL, 0, + &data, sizeof(data), &size, NULL )) { - req->handle = console_handle_unmap(hConsole); - wine_server_set_reply( req, &data, sizeof(data) - sizeof(WCHAR) ); - if ((ret = !wine_server_call_err(req))) - { - fontinfo->nFont = 0; - if (maxwindow) - { - fontinfo->dwFontSize.X = min(reply->width, reply->max_width); - fontinfo->dwFontSize.Y = min(reply->height, reply->max_height); - } - else - { - fontinfo->dwFontSize.X = reply->win_right - reply->win_left + 1; - fontinfo->dwFontSize.Y = reply->win_bottom - reply->win_top + 1; - } - if (wine_server_reply_size( reply ) > sizeof(data.color_map)) - { - data_size_t len = wine_server_reply_size( reply ) - sizeof(data.color_map); - memcpy( fontinfo->FaceName, data.face_name, len ); - fontinfo->FaceName[len / sizeof(WCHAR)] = 0; - } - else - fontinfo->FaceName[0] = 0; - fontinfo->FontFamily = reply->font_pitch_family; - fontinfo->FontWeight = reply->font_weight; - } + SetLastError( ERROR_INVALID_HANDLE ); + return FALSE; } - SERVER_END_REQ; - return ret; + + fontinfo->nFont = 0; + if (maxwindow) + { + fontinfo->dwFontSize.X = min( data.info.width, data.info.max_width ); + fontinfo->dwFontSize.Y = min( data.info.height, data.info.max_height ); + } + else + { + fontinfo->dwFontSize.X = data.info.win_right - data.info.win_left + 1; + fontinfo->dwFontSize.Y = data.info.win_bottom - data.info.win_top + 1; + } + size -= sizeof(data.info); + if (size) memcpy( fontinfo->FaceName, data.face_name, size ); + fontinfo->FaceName[size / sizeof(WCHAR)] = 0; + fontinfo->FontFamily = data.info.font_pitch_family; + fontinfo->FontWeight = data.info.font_weight; + return TRUE; } BOOL WINAPI GetCurrentConsoleFont(HANDLE hConsole, BOOL maxwindow, CONSOLE_FONT_INFO *fontinfo)

1 0

Jacek Caban : kernelbase: Use IOCTL_CONDRV_GET_OUTPUT_INFO in GetLargestConsoleWindowSize.
by Alexandre Julliard 09 Jul '20

09 Jul '20

Module: wine Branch: master Commit: d25a267978de5949a283c5f76405175316f8f773 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d25a267978de5949a283c5f7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 9 19:28:42 2020 +0200 kernelbase: Use IOCTL_CONDRV_GET_OUTPUT_INFO in GetLargestConsoleWindowSize. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index f5612de407..83cbce38d5 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -159,18 +159,17 @@ static void fill_console_output( HANDLE handle, int i, int j, int len, CHAR_INFO /* helper function for GetLargestConsoleWindowSize */ static COORD get_largest_console_window_size( HANDLE handle ) { + struct condrv_output_info info; COORD c = { 0, 0 }; - SERVER_START_REQ( get_console_output_info ) + if (!DeviceIoControl( handle, IOCTL_CONDRV_GET_OUTPUT_INFO, NULL, 0, &info, sizeof(info), NULL, NULL )) { - req->handle = console_handle_unmap( handle ); - if (!wine_server_call_err( req )) - { - c.X = reply->max_width; - c.Y = reply->max_height; - } + SetLastError( ERROR_INVALID_HANDLE ); + return c; } - SERVER_END_REQ; + + c.X = info.max_width; + c.Y = info.max_height; TRACE( "(%p), returning %dx%d\n", handle, c.X, c.Y ); return c; }

1 0

Jacek Caban : kernelbase: Use IOCTL_CONDRV_GET_OUTPUT_INFO in GetConsoleCursorInfo.
by Alexandre Julliard 09 Jul '20

09 Jul '20

Module: wine Branch: master Commit: 547855e623c561c23b205f18d017e53d5ee75b7b URL: https://source.winehq.org/git/wine.git/?a=commit;h=547855e623c561c23b205f18… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 9 19:28:48 2020 +0200 kernelbase: Use IOCTL_CONDRV_GET_OUTPUT_INFO in GetConsoleCursorInfo. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 83cbce38d5..fe4b798988 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -541,26 +541,22 @@ UINT WINAPI DECLSPEC_HOTPATCH GetConsoleCP(void) */ BOOL WINAPI DECLSPEC_HOTPATCH GetConsoleCursorInfo( HANDLE handle, CONSOLE_CURSOR_INFO *info ) { - BOOL ret; + struct condrv_output_info condrv_info; - SERVER_START_REQ( get_console_output_info ) + if (!DeviceIoControl( handle, IOCTL_CONDRV_GET_OUTPUT_INFO, NULL, 0, &condrv_info, sizeof(condrv_info), NULL, NULL )) { - req->handle = console_handle_unmap( handle ); - ret = !wine_server_call_err( req ); - if (ret && info) - { - info->dwSize = reply->cursor_size; - info->bVisible = reply->cursor_visible; - } + SetLastError( ERROR_INVALID_HANDLE ); + return FALSE; } - SERVER_END_REQ; - if (!ret) return FALSE; if (!info) { SetLastError( ERROR_INVALID_ACCESS ); return FALSE; } + + info->dwSize = condrv_info.cursor_size; + info->bVisible = condrv_info.cursor_visible; TRACE("(%p) returning (%d,%d)\n", handle, info->dwSize, info->bVisible); return TRUE; }

1 0

Jacek Caban : kernelbase: Use IOCTL_CONDRV_GET_OUTPUT_INFO in GetConsoleScreenBufferInfo.
by Alexandre Julliard 09 Jul '20

09 Jul '20

Module: wine Branch: master Commit: 587ca81f8de4fec07217b4e55e370f3fb6095773 URL: https://source.winehq.org/git/wine.git/?a=commit;h=587ca81f8de4fec07217b4e5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 9 19:28:57 2020 +0200 kernelbase: Use IOCTL_CONDRV_GET_OUTPUT_INFO in GetConsoleScreenBufferInfo. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index fe4b798988..15f6ea7d3e 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -634,33 +634,32 @@ UINT WINAPI DECLSPEC_HOTPATCH GetConsoleOutputCP(void) */ BOOL WINAPI DECLSPEC_HOTPATCH GetConsoleScreenBufferInfo( HANDLE handle, CONSOLE_SCREEN_BUFFER_INFO *info ) { - BOOL ret; + struct condrv_output_info condrv_info; - SERVER_START_REQ( get_console_output_info ) + if (!DeviceIoControl( handle , IOCTL_CONDRV_GET_OUTPUT_INFO, NULL, 0, + &condrv_info, sizeof(condrv_info), NULL, NULL )) { - req->handle = console_handle_unmap( handle ); - if ((ret = !wine_server_call_err( req ))) - { - info->dwSize.X = reply->width; - info->dwSize.Y = reply->height; - info->dwCursorPosition.X = reply->cursor_x; - info->dwCursorPosition.Y = reply->cursor_y; - info->wAttributes = reply->attr; - info->srWindow.Left = reply->win_left; - info->srWindow.Right = reply->win_right; - info->srWindow.Top = reply->win_top; - info->srWindow.Bottom = reply->win_bottom; - info->dwMaximumWindowSize.X = min(reply->width, reply->max_width); - info->dwMaximumWindowSize.Y = min(reply->height, reply->max_height); - } + SetLastError( ERROR_INVALID_HANDLE ); + return FALSE; } - SERVER_END_REQ; + + info->dwSize.X = condrv_info.width; + info->dwSize.Y = condrv_info.height; + info->dwCursorPosition.X = condrv_info.cursor_x; + info->dwCursorPosition.Y = condrv_info.cursor_y; + info->wAttributes = condrv_info.attr; + info->srWindow.Left = condrv_info.win_left; + info->srWindow.Right = condrv_info.win_right; + info->srWindow.Top = condrv_info.win_top; + info->srWindow.Bottom = condrv_info.win_bottom; + info->dwMaximumWindowSize.X = min(condrv_info.width, condrv_info.max_width); + info->dwMaximumWindowSize.Y = min(condrv_info.height, condrv_info.max_height); TRACE( "(%p,(%d,%d) (%d,%d) %d (%d,%d-%d,%d) (%d,%d)\n", handle, info->dwSize.X, info->dwSize.Y, info->dwCursorPosition.X, info->dwCursorPosition.Y, - info->wAttributes, info->srWindow.Left, info->srWindow.Top, info->srWindow.Right, + info->wAttributes, info->srWindow.Left, info->srWindow.Top, info->srWindow.Right, info->srWindow.Bottom, info->dwMaximumWindowSize.X, info->dwMaximumWindowSize.Y ); - return ret; + return TRUE; }

1 0

Jacek Caban : kernelbase: Use IOCTL_CONDRV_GET_OUTPUT_INFO in GetConsoleScreenBufferInfoEx.
by Alexandre Julliard 09 Jul '20

09 Jul '20

Module: wine Branch: master Commit: 94c1640bb38edd76bab13b29f1444bce20edcacc URL: https://source.winehq.org/git/wine.git/?a=commit;h=94c1640bb38edd76bab13b29… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 9 19:29:05 2020 +0200 kernelbase: Use IOCTL_CONDRV_GET_OUTPUT_INFO in GetConsoleScreenBufferInfoEx. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 43 +++++++++++++++++++++---------------------- 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 15f6ea7d3e..37ca8b599b 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -669,7 +669,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetConsoleScreenBufferInfo( HANDLE handle, CONSOLE BOOL WINAPI DECLSPEC_HOTPATCH GetConsoleScreenBufferInfoEx( HANDLE handle, CONSOLE_SCREEN_BUFFER_INFOEX *info ) { - BOOL ret; + struct condrv_output_info condrv_info; if (info->cbSize != sizeof(CONSOLE_SCREEN_BUFFER_INFOEX)) { @@ -677,29 +677,28 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetConsoleScreenBufferInfoEx( HANDLE handle, return FALSE; } - SERVER_START_REQ( get_console_output_info ) + if (!DeviceIoControl( handle, IOCTL_CONDRV_GET_OUTPUT_INFO, NULL, 0, &condrv_info, + sizeof(condrv_info), NULL, NULL )) { - req->handle = console_handle_unmap( handle ); - wine_server_set_reply( req, info->ColorTable, sizeof(info->ColorTable) ); - if ((ret = !wine_server_call_err( req ))) - { - info->dwSize.X = reply->width; - info->dwSize.Y = reply->height; - info->dwCursorPosition.X = reply->cursor_x; - info->dwCursorPosition.Y = reply->cursor_y; - info->wAttributes = reply->attr; - info->srWindow.Left = reply->win_left; - info->srWindow.Top = reply->win_top; - info->srWindow.Right = reply->win_right; - info->srWindow.Bottom = reply->win_bottom; - info->dwMaximumWindowSize.X = min( reply->width, reply->max_width ); - info->dwMaximumWindowSize.Y = min( reply->height, reply->max_height ); - info->wPopupAttributes = reply->popup_attr; - info->bFullscreenSupported = FALSE; - } + SetLastError( ERROR_INVALID_HANDLE ); + return FALSE; } - SERVER_END_REQ; - return ret; + + info->dwSize.X = condrv_info.width; + info->dwSize.Y = condrv_info.height; + info->dwCursorPosition.X = condrv_info.cursor_x; + info->dwCursorPosition.Y = condrv_info.cursor_y; + info->wAttributes = condrv_info.attr; + info->srWindow.Left = condrv_info.win_left; + info->srWindow.Top = condrv_info.win_top; + info->srWindow.Right = condrv_info.win_right; + info->srWindow.Bottom = condrv_info.win_bottom; + info->dwMaximumWindowSize.X = min( condrv_info.width, condrv_info.max_width ); + info->dwMaximumWindowSize.Y = min( condrv_info.height, condrv_info.max_height ); + info->wPopupAttributes = condrv_info.popup_attr; + info->bFullscreenSupported = FALSE; + memcpy( info->ColorTable, condrv_info.color_map, sizeof(info->ColorTable) ); + return TRUE; }

1 0

Jacek Caban : wineconsole: Use IOCTL_CONDRV_GET_OUTPUT_INFO in WINECON_GetServerConfig.
by Alexandre Julliard 09 Jul '20

09 Jul '20

Module: wine Branch: master Commit: 56ee3a8ad12b02e2c53a2f3737bcd6ba15fd4737 URL: https://source.winehq.org/git/wine.git/?a=commit;h=56ee3a8ad12b02e2c53a2f37… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 9 19:29:12 2020 +0200 wineconsole: Use IOCTL_CONDRV_GET_OUTPUT_INFO in WINECON_GetServerConfig. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineconsole/wineconsole.c | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index 6ccba13c8a..88c9ca400a 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -611,7 +611,7 @@ static void WINECON_Delete(struct inner_data* data) static BOOL WINECON_GetServerConfig(struct inner_data* data) { struct condrv_input_info input_info; - BOOL ret; + struct condrv_output_info output_info; DWORD mode; if (!DeviceIoControl(data->hConIn, IOCTL_CONDRV_GET_INPUT_INFO, NULL, 0, @@ -625,22 +625,19 @@ static BOOL WINECON_GetServerConfig(struct inner_data* data) data->curcfg.insert_mode = (mode & (ENABLE_INSERT_MODE|ENABLE_EXTENDED_FLAGS)) == (ENABLE_INSERT_MODE|ENABLE_EXTENDED_FLAGS); - SERVER_START_REQ(get_console_output_info) - { - req->handle = wine_server_obj_handle( data->hConOut ); - ret = !wine_server_call_err( req ); - data->curcfg.cursor_size = reply->cursor_size; - data->curcfg.cursor_visible = reply->cursor_visible; - data->curcfg.def_attr = reply->attr; - data->curcfg.sb_width = reply->width; - data->curcfg.sb_height = reply->height; - data->curcfg.win_width = reply->win_right - reply->win_left + 1; - data->curcfg.win_height = reply->win_bottom - reply->win_top + 1; - } - SERVER_END_REQ; - WINECON_DumpConfig("first cfg: ", &data->curcfg); + if (!DeviceIoControl(data->hConOut, IOCTL_CONDRV_GET_OUTPUT_INFO, NULL, 0, + &output_info, sizeof(output_info), NULL, NULL)) + return FALSE; + data->curcfg.cursor_size = output_info.cursor_size; + data->curcfg.cursor_visible = output_info.cursor_visible; + data->curcfg.def_attr = output_info.attr; + data->curcfg.sb_width = output_info.width; + data->curcfg.sb_height = output_info.height; + data->curcfg.win_width = output_info.win_right - output_info.win_left + 1; + data->curcfg.win_height = output_info.win_bottom - output_info.win_top + 1; - return ret; + WINECON_DumpConfig("first cfg: ", &data->curcfg); + return TRUE; } /******************************************************************

1 0