Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-cw
Commits
ef2e281d
Commit
ef2e281d
authored
Oct 14, 2020
by
Jacek Caban
Committed by
Alexandre Julliard
Oct 14, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
conhost: Remove no longer needed SET_CONSOLE_OUTPUT_INFO flags.
Signed-off-by:
Jacek Caban
<
jacek@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
d7e831c1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
28 deletions
+1
-28
condrv.h
include/wine/condrv.h
+1
-3
conhost.c
programs/conhost/conhost.c
+0
-25
No files found.
include/wine/condrv.h
View file @
ef2e281d
...
...
@@ -154,9 +154,7 @@ struct condrv_output_info_params
#define SET_CONSOLE_OUTPUT_INFO_ATTR 0x0008
#define SET_CONSOLE_OUTPUT_INFO_DISPLAY_WINDOW 0x0010
#define SET_CONSOLE_OUTPUT_INFO_MAX_SIZE 0x0020
#define SET_CONSOLE_OUTPUT_INFO_FONT 0x0040
#define SET_CONSOLE_OUTPUT_INFO_COLORTABLE 0x0080
#define SET_CONSOLE_OUTPUT_INFO_POPUP_ATTR 0x0100
#define SET_CONSOLE_OUTPUT_INFO_POPUP_ATTR 0x0040
/* IOCTL_CONDRV_FILL_OUTPUT params */
struct
condrv_fill_output_params
...
...
programs/conhost/conhost.c
View file @
ef2e281d
...
...
@@ -1731,7 +1731,6 @@ static NTSTATUS set_output_info( struct screen_buffer *screen_buffer,
const
struct
condrv_output_info_params
*
params
,
size_t
extra_size
)
{
const
struct
condrv_output_info
*
info
=
&
params
->
info
;
WCHAR
*
font_name
;
NTSTATUS
status
;
TRACE
(
"%p
\n
"
,
screen_buffer
);
...
...
@@ -1825,30 +1824,6 @@ static NTSTATUS set_output_info( struct screen_buffer *screen_buffer,
screen_buffer
->
max_width
=
info
->
max_width
;
screen_buffer
->
max_height
=
info
->
max_height
;
}
if
(
params
->
mask
&
SET_CONSOLE_OUTPUT_INFO_COLORTABLE
)
{
memcpy
(
screen_buffer
->
color_map
,
info
->
color_map
,
sizeof
(
screen_buffer
->
color_map
)
);
}
if
(
params
->
mask
&
SET_CONSOLE_OUTPUT_INFO_FONT
)
{
screen_buffer
->
font
.
width
=
info
->
font_width
;
screen_buffer
->
font
.
height
=
info
->
font_height
;
screen_buffer
->
font
.
weight
=
info
->
font_weight
;
screen_buffer
->
font
.
pitch_family
=
info
->
font_pitch_family
;
if
(
extra_size
)
{
const
WCHAR
*
params_font
=
(
const
WCHAR
*
)(
params
+
1
);
extra_size
=
extra_size
/
sizeof
(
WCHAR
)
*
sizeof
(
WCHAR
);
font_name
=
malloc
(
extra_size
);
if
(
font_name
)
{
memcpy
(
font_name
,
params_font
,
extra_size
);
free
(
screen_buffer
->
font
.
face_name
);
screen_buffer
->
font
.
face_name
=
font_name
;
screen_buffer
->
font
.
face_len
=
extra_size
;
}
}
}
if
(
is_active
(
screen_buffer
))
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment