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
e5493e34
Commit
e5493e34
authored
Jul 06, 2020
by
Jacek Caban
Committed by
Alexandre Julliard
Jul 06, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
server: Always create fd for console_input object.
Signed-off-by:
Jacek Caban
<
jacek@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
5376bc5e
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
12 deletions
+14
-12
console.c
server/console.c
+14
-12
No files found.
server/console.c
View file @
e5493e34
...
...
@@ -258,10 +258,7 @@ static struct fd *console_input_get_fd( struct object* obj )
{
struct
console_input
*
console_input
=
(
struct
console_input
*
)
obj
;
assert
(
obj
->
ops
==
&
console_input_ops
);
if
(
console_input
->
fd
)
return
(
struct
fd
*
)
grab_object
(
console_input
->
fd
);
set_error
(
STATUS_OBJECT_TYPE_MISMATCH
);
return
NULL
;
return
(
struct
fd
*
)
grab_object
(
console_input
->
fd
);
}
static
enum
server_fd_type
console_get_fd_type
(
struct
fd
*
fd
)
...
...
@@ -400,15 +397,20 @@ static struct object *create_console_input( struct thread* renderer, int fd )
}
if
(
fd
!=
-
1
)
/* bare console */
{
if
(
!
(
console_input
->
fd
=
create_anonymous_fd
(
&
console_fd_ops
,
fd
,
&
console_input
->
obj
,
FILE_SYNCHRONOUS_IO_NONALERT
)))
{
release_object
(
console_input
);
return
NULL
;
}
allow_fd_caching
(
console_input
->
fd
);
console_input
->
fd
=
create_anonymous_fd
(
&
console_fd_ops
,
fd
,
&
console_input
->
obj
,
FILE_SYNCHRONOUS_IO_NONALERT
);
}
else
{
console_input
->
fd
=
alloc_pseudo_fd
(
&
console_fd_ops
,
&
console_input
->
obj
,
FILE_SYNCHRONOUS_IO_NONALERT
);
}
if
(
!
console_input
->
fd
)
{
release_object
(
console_input
);
return
NULL
;
}
allow_fd_caching
(
console_input
->
fd
);
return
&
console_input
->
obj
;
}
...
...
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