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
5e584e93
Commit
5e584e93
authored
Apr 12, 2017
by
Jacek Caban
Committed by
Alexandre Julliard
Apr 12, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
server: Remove no longer needed blocking argument from read fd op.
Signed-off-by:
Jacek Caban
<
jacek@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
047062b2
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
10 deletions
+10
-10
device.c
server/device.c
+2
-2
fd.c
server/fd.c
+2
-2
file.h
server/file.h
+2
-2
named_pipe.c
server/named_pipe.c
+4
-4
No files found.
server/device.c
View file @
5e584e93
...
...
@@ -174,7 +174,7 @@ static struct fd *device_file_get_fd( struct object *obj );
static
int
device_file_close_handle
(
struct
object
*
obj
,
struct
process
*
process
,
obj_handle_t
handle
);
static
void
device_file_destroy
(
struct
object
*
obj
);
static
enum
server_fd_type
device_file_get_fd_type
(
struct
fd
*
fd
);
static
obj_handle_t
device_file_read
(
struct
fd
*
fd
,
struct
async
*
async
,
int
blocking
,
file_pos_t
pos
);
static
obj_handle_t
device_file_read
(
struct
fd
*
fd
,
struct
async
*
async
,
file_pos_t
pos
);
static
obj_handle_t
device_file_write
(
struct
fd
*
fd
,
struct
async
*
async
,
int
blocking
,
file_pos_t
pos
);
static
obj_handle_t
device_file_flush
(
struct
fd
*
fd
,
struct
async
*
async
,
int
blocking
);
static
obj_handle_t
device_file_ioctl
(
struct
fd
*
fd
,
ioctl_code_t
code
,
struct
async
*
async
);
...
...
@@ -484,7 +484,7 @@ static enum server_fd_type device_file_get_fd_type( struct fd *fd )
return
FD_TYPE_DEVICE
;
}
static
obj_handle_t
device_file_read
(
struct
fd
*
fd
,
struct
async
*
async
,
int
blocking
,
file_pos_t
pos
)
static
obj_handle_t
device_file_read
(
struct
fd
*
fd
,
struct
async
*
async
,
file_pos_t
pos
)
{
struct
device_file
*
file
=
get_fd_user
(
fd
);
struct
irp_call
*
irp
;
...
...
server/fd.c
View file @
5e584e93
...
...
@@ -2158,7 +2158,7 @@ static void unmount_device( struct fd *device_fd )
}
/* default read() routine */
obj_handle_t
no_fd_read
(
struct
fd
*
fd
,
struct
async
*
async
,
int
blocking
,
file_pos_t
pos
)
obj_handle_t
no_fd_read
(
struct
fd
*
fd
,
struct
async
*
async
,
file_pos_t
pos
)
{
set_error
(
STATUS_OBJECT_TYPE_MISMATCH
);
return
0
;
...
...
@@ -2455,7 +2455,7 @@ DECL_HANDLER(read)
async
=
create_async
(
current
,
&
req
->
async
,
iosb
);
if
(
async
)
{
reply
->
wait
=
fd
->
fd_ops
->
read
(
fd
,
async
,
req
->
blocking
,
req
->
pos
);
reply
->
wait
=
fd
->
fd_ops
->
read
(
fd
,
async
,
req
->
pos
);
reply
->
options
=
fd
->
options
;
release_object
(
async
);
}
...
...
server/file.h
View file @
5e584e93
...
...
@@ -52,7 +52,7 @@ struct fd_ops
/* get file information */
enum
server_fd_type
(
*
get_fd_type
)(
struct
fd
*
fd
);
/* perform a read on the file */
obj_handle_t
(
*
read
)(
struct
fd
*
,
struct
async
*
,
int
,
file_pos_t
);
obj_handle_t
(
*
read
)(
struct
fd
*
,
struct
async
*
,
file_pos_t
);
/* perform a write on the file */
obj_handle_t
(
*
write
)(
struct
fd
*
,
struct
async
*
,
int
,
file_pos_t
);
/* flush the object buffers */
...
...
@@ -100,7 +100,7 @@ extern void default_poll_event( struct fd *fd, int event );
extern
int
fd_queue_async
(
struct
fd
*
fd
,
struct
async
*
async
,
int
type
);
extern
void
fd_async_wake_up
(
struct
fd
*
fd
,
int
type
,
unsigned
int
status
);
extern
void
fd_reselect_async
(
struct
fd
*
fd
,
struct
async_queue
*
queue
);
extern
obj_handle_t
no_fd_read
(
struct
fd
*
fd
,
struct
async
*
async
,
int
blocking
,
file_pos_t
pos
);
extern
obj_handle_t
no_fd_read
(
struct
fd
*
fd
,
struct
async
*
async
,
file_pos_t
pos
);
extern
obj_handle_t
no_fd_write
(
struct
fd
*
fd
,
struct
async
*
async
,
int
blocking
,
file_pos_t
pos
);
extern
obj_handle_t
no_fd_flush
(
struct
fd
*
fd
,
struct
async
*
async
,
int
blocking
);
extern
obj_handle_t
no_fd_ioctl
(
struct
fd
*
fd
,
ioctl_code_t
code
,
struct
async
*
async
);
...
...
server/named_pipe.c
View file @
5e584e93
...
...
@@ -153,7 +153,7 @@ static const struct object_ops named_pipe_ops =
};
/* common server and client pipe end functions */
static
obj_handle_t
pipe_end_read
(
struct
fd
*
fd
,
struct
async
*
async
,
int
blocking
,
file_pos_t
pos
);
static
obj_handle_t
pipe_end_read
(
struct
fd
*
fd
,
struct
async
*
async
,
file_pos_t
pos
);
static
obj_handle_t
pipe_end_write
(
struct
fd
*
fd
,
struct
async
*
async_data
,
int
blocking
,
file_pos_t
pos
);
static
void
pipe_end_queue_async
(
struct
fd
*
fd
,
struct
async
*
async
,
int
type
,
int
count
);
static
void
pipe_end_reselect_async
(
struct
fd
*
fd
,
struct
async_queue
*
queue
);
...
...
@@ -811,12 +811,12 @@ static void reselect_write_queue( struct pipe_end *pipe_end )
reselect_read_queue
(
reader
);
}
static
obj_handle_t
pipe_end_read
(
struct
fd
*
fd
,
struct
async
*
async
,
int
blocking
,
file_pos_t
pos
)
static
obj_handle_t
pipe_end_read
(
struct
fd
*
fd
,
struct
async
*
async
,
file_pos_t
pos
)
{
struct
pipe_end
*
pipe_end
=
get_fd_user
(
fd
);
obj_handle_t
handle
=
0
;
if
(
!
use_server_io
(
pipe_end
))
return
no_fd_read
(
fd
,
async
,
blocking
,
pos
);
if
(
!
use_server_io
(
pipe_end
))
return
no_fd_read
(
fd
,
async
,
pos
);
if
(
!
pipe_end
->
connection
&&
list_empty
(
&
pipe_end
->
message_queue
))
{
...
...
@@ -831,7 +831,7 @@ static obj_handle_t pipe_end_read( struct fd *fd, struct async *async, int block
reselect_read_queue
(
pipe_end
);
set_error
(
STATUS_PENDING
);
if
(
!
blocking
)
if
(
!
async_is_blocking
(
async
)
)
{
struct
iosb
*
iosb
;
iosb
=
async_get_iosb
(
async
);
...
...
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