Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
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-winehq
Commits
ffe6548d
Commit
ffe6548d
authored
Mar 21, 2020
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
server: Store length of console history lines instead of null-terminating them.
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
8d6d5a9b
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
23 additions
and
24 deletions
+23
-24
console.c
server/console.c
+23
-24
No files found.
server/console.c
View file @
ffe6548d
...
@@ -42,6 +42,12 @@
...
@@ -42,6 +42,12 @@
struct
screen_buffer
;
struct
screen_buffer
;
struct
console_input_events
;
struct
console_input_events
;
struct
history_line
{
data_size_t
len
;
WCHAR
text
[
1
];
};
struct
console_input
struct
console_input
{
{
struct
object
obj
;
/* object header */
struct
object
obj
;
/* object header */
...
@@ -54,7 +60,7 @@ struct console_input
...
@@ -54,7 +60,7 @@ struct console_input
struct
console_input_events
*
evt
;
/* synchronization event with renderer */
struct
console_input_events
*
evt
;
/* synchronization event with renderer */
WCHAR
*
title
;
/* console title */
WCHAR
*
title
;
/* console title */
data_size_t
title_len
;
/* length of console title */
data_size_t
title_len
;
/* length of console title */
WCHAR
**
history
;
/* lines history */
struct
history_line
**
history
;
/* lines history */
int
history_size
;
/* number of entries in history array */
int
history_size
;
/* number of entries in history array */
int
history_index
;
/* number of used entries in history array */
int
history_index
;
/* number of used entries in history array */
int
history_mode
;
/* mode of history (non zero means remove doubled strings */
int
history_mode
;
/* mode of history (non zero means remove doubled strings */
...
@@ -342,7 +348,7 @@ static struct object *create_console_input( struct thread* renderer, int fd )
...
@@ -342,7 +348,7 @@ static struct object *create_console_input( struct thread* renderer, int fd )
console_input
->
title
=
NULL
;
console_input
->
title
=
NULL
;
console_input
->
title_len
=
0
;
console_input
->
title_len
=
0
;
console_input
->
history_size
=
50
;
console_input
->
history_size
=
50
;
console_input
->
history
=
calloc
(
console_input
->
history_size
,
sizeof
(
WCHAR
*
)
);
console_input
->
history
=
calloc
(
console_input
->
history_size
,
sizeof
(
*
console_input
->
history
)
);
console_input
->
history_index
=
0
;
console_input
->
history_index
=
0
;
console_input
->
history_mode
=
0
;
console_input
->
history_mode
=
0
;
console_input
->
edition_mode
=
0
;
console_input
->
edition_mode
=
0
;
...
@@ -798,15 +804,13 @@ static int set_console_input_info( const struct set_console_input_info_request *
...
@@ -798,15 +804,13 @@ static int set_console_input_info( const struct set_console_input_info_request *
if
((
req
->
mask
&
SET_CONSOLE_INPUT_INFO_HISTORY_SIZE
)
&&
if
((
req
->
mask
&
SET_CONSOLE_INPUT_INFO_HISTORY_SIZE
)
&&
console
->
history_size
!=
req
->
history_size
)
console
->
history_size
!=
req
->
history_size
)
{
{
WCHAR
**
mem
=
NULL
;
struct
history_line
**
mem
=
NULL
;
int
i
;
int
i
,
delta
;
int
delta
;
if
(
req
->
history_size
)
if
(
req
->
history_size
)
{
{
mem
=
mem_alloc
(
req
->
history_size
*
sizeof
(
WCHAR
*
)
);
if
(
!
(
mem
=
mem_alloc
(
req
->
history_size
*
sizeof
(
*
mem
)
)))
goto
error
;
if
(
!
mem
)
goto
error
;
memset
(
mem
,
0
,
req
->
history_size
*
sizeof
(
*
mem
)
);
memset
(
mem
,
0
,
req
->
history_size
*
sizeof
(
WCHAR
*
)
);
}
}
delta
=
(
console
->
history_index
>
req
->
history_size
)
?
delta
=
(
console
->
history_index
>
req
->
history_size
)
?
...
@@ -1081,31 +1085,26 @@ static int set_console_output_info( struct screen_buffer *screen_buffer,
...
@@ -1081,31 +1085,26 @@ static int set_console_output_info( struct screen_buffer *screen_buffer,
/* appends a new line to history (history is a fixed size array) */
/* appends a new line to history (history is a fixed size array) */
static
void
console_input_append_hist
(
struct
console_input
*
console
,
const
WCHAR
*
buf
,
data_size_t
len
)
static
void
console_input_append_hist
(
struct
console_input
*
console
,
const
WCHAR
*
buf
,
data_size_t
len
)
{
{
WCHAR
*
ptr
=
mem_alloc
(
(
len
+
1
)
*
sizeof
(
WCHAR
)
);
struct
history_line
*
ptr
;
if
(
!
ptr
)
return
;
if
(
!
console
||
!
console
->
history_size
)
if
(
!
console
||
!
console
->
history_size
)
{
{
set_error
(
STATUS_INVALID_PARAMETER
);
/* FIXME */
set_error
(
STATUS_INVALID_PARAMETER
);
/* FIXME */
free
(
ptr
);
return
;
return
;
}
}
memcpy
(
ptr
,
buf
,
len
*
sizeof
(
WCHAR
)
);
len
=
(
len
/
sizeof
(
WCHAR
))
*
sizeof
(
WCHAR
);
ptr
[
len
]
=
0
;
if
(
console
->
history_mode
&&
console
->
history_index
&&
if
(
console
->
history_mode
&&
console
->
history_index
&&
!
strcmpW
(
console
->
history
[
console
->
history_index
-
1
],
ptr
))
console
->
history
[
console
->
history_index
-
1
]
->
len
==
len
&&
!
memcmp
(
console
->
history
[
console
->
history_index
-
1
]
->
text
,
buf
,
len
))
{
{
/* ok, mode ask us to not use twice the same string...
/* don't duplicate entry */
* so just free mem and returns
*/
set_error
(
STATUS_ALIAS_EXISTS
);
set_error
(
STATUS_ALIAS_EXISTS
);
free
(
ptr
);
return
;
return
;
}
}
if
(
!
(
ptr
=
mem_alloc
(
offsetof
(
struct
history_line
,
text
[
len
/
sizeof
(
WCHAR
)]
))))
return
;
ptr
->
len
=
len
;
memcpy
(
ptr
->
text
,
buf
,
len
);
if
(
console
->
history_index
<
console
->
history_size
)
if
(
console
->
history_index
<
console
->
history_size
)
{
{
...
@@ -1115,7 +1114,7 @@ static void console_input_append_hist( struct console_input* console, const WCHA
...
@@ -1115,7 +1114,7 @@ static void console_input_append_hist( struct console_input* console, const WCHA
{
{
free
(
console
->
history
[
0
])
;
free
(
console
->
history
[
0
])
;
memmove
(
&
console
->
history
[
0
],
&
console
->
history
[
1
],
memmove
(
&
console
->
history
[
0
],
&
console
->
history
[
1
],
(
console
->
history_size
-
1
)
*
sizeof
(
WCHAR
*
)
);
(
console
->
history_size
-
1
)
*
sizeof
(
*
console
->
history
)
);
console
->
history
[
console
->
history_size
-
1
]
=
ptr
;
console
->
history
[
console
->
history_size
-
1
]
=
ptr
;
}
}
}
}
...
@@ -1128,8 +1127,8 @@ static data_size_t console_input_get_hist( struct console_input *console, int in
...
@@ -1128,8 +1127,8 @@ static data_size_t console_input_get_hist( struct console_input *console, int in
if
(
index
>=
console
->
history_index
)
set_error
(
STATUS_INVALID_PARAMETER
);
if
(
index
>=
console
->
history_index
)
set_error
(
STATUS_INVALID_PARAMETER
);
else
else
{
{
ret
=
strlenW
(
console
->
history
[
index
]
)
*
sizeof
(
WCHAR
)
;
ret
=
console
->
history
[
index
]
->
len
;
set_reply_data
(
console
->
history
[
index
],
min
(
ret
,
get_reply_max_size
()
));
set_reply_data
(
console
->
history
[
index
]
->
text
,
min
(
ret
,
get_reply_max_size
()
));
}
}
return
ret
;
return
ret
;
}
}
...
...
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