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
830fc41f
Commit
830fc41f
authored
Jun 10, 2021
by
Zebediah Figura
Committed by
Alexandre Julliard
Jun 11, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
server: Do not return the socket state from get_socket_event.
Signed-off-by:
Zebediah Figura
<
z.figura12@gmail.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
c1b80538
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
3 additions
and
8 deletions
+3
-8
server_protocol.h
include/wine/server_protocol.h
+1
-3
protocol.def
server/protocol.def
+0
-1
request.h
server/request.h
+1
-2
sock.c
server/sock.c
+0
-1
trace.c
server/trace.c
+1
-1
No files found.
include/wine/server_protocol.h
View file @
830fc41f
...
...
@@ -1758,9 +1758,7 @@ struct get_socket_event_reply
struct
reply_header
__header
;
unsigned
int
mask
;
unsigned
int
pmask
;
unsigned
int
state
;
/* VARARG(errors,ints); */
char
__pad_20
[
4
];
};
...
...
@@ -6294,7 +6292,7 @@ union generic_reply
/* ### protocol_version begin ### */
#define SERVER_PROTOCOL_VERSION 71
1
#define SERVER_PROTOCOL_VERSION 71
2
/* ### protocol_version end ### */
...
...
server/protocol.def
View file @
830fc41f
...
...
@@ -1441,7 +1441,6 @@ enum server_fd_type
@REPLY
unsigned int mask; /* event mask */
unsigned int pmask; /* pending events */
unsigned int state; /* status bits */
VARARG(errors,ints); /* event errors */
@END
...
...
server/request.h
View file @
830fc41f
...
...
@@ -1052,8 +1052,7 @@ C_ASSERT( FIELD_OFFSET(struct get_socket_event_request, c_event) == 20 );
C_ASSERT
(
sizeof
(
struct
get_socket_event_request
)
==
24
);
C_ASSERT
(
FIELD_OFFSET
(
struct
get_socket_event_reply
,
mask
)
==
8
);
C_ASSERT
(
FIELD_OFFSET
(
struct
get_socket_event_reply
,
pmask
)
==
12
);
C_ASSERT
(
FIELD_OFFSET
(
struct
get_socket_event_reply
,
state
)
==
16
);
C_ASSERT
(
sizeof
(
struct
get_socket_event_reply
)
==
24
);
C_ASSERT
(
sizeof
(
struct
get_socket_event_reply
)
==
16
);
C_ASSERT
(
FIELD_OFFSET
(
struct
get_socket_info_request
,
handle
)
==
12
);
C_ASSERT
(
sizeof
(
struct
get_socket_info_request
)
==
16
);
C_ASSERT
(
FIELD_OFFSET
(
struct
get_socket_info_reply
,
family
)
==
8
);
...
...
server/sock.c
View file @
830fc41f
...
...
@@ -2376,7 +2376,6 @@ DECL_HANDLER(get_socket_event)
if
(
get_unix_fd
(
sock
->
fd
)
==
-
1
)
return
;
reply
->
mask
=
sock
->
mask
;
reply
->
pmask
=
sock
->
pending_events
;
reply
->
state
=
sock
->
state
;
set_reply_data
(
sock
->
errors
,
min
(
get_reply_max_size
(),
sizeof
(
sock
->
errors
)
));
if
(
req
->
service
)
...
...
server/trace.c
View file @
830fc41f
...
...
@@ -2093,7 +2093,6 @@ static void dump_get_socket_event_reply( const struct get_socket_event_reply *re
{
fprintf
(
stderr
,
" mask=%08x"
,
req
->
mask
);
fprintf
(
stderr
,
", pmask=%08x"
,
req
->
pmask
);
fprintf
(
stderr
,
", state=%08x"
,
req
->
state
);
dump_varargs_ints
(
", errors="
,
cur_size
);
}
...
...
@@ -5391,6 +5390,7 @@ static const struct
{
"ABANDONED_WAIT_0"
,
STATUS_ABANDONED_WAIT_0
},
{
"ACCESS_DENIED"
,
STATUS_ACCESS_DENIED
},
{
"ACCESS_VIOLATION"
,
STATUS_ACCESS_VIOLATION
},
{
"ADDRESS_ALREADY_ASSOCIATED"
,
STATUS_ADDRESS_ALREADY_ASSOCIATED
},
{
"ALERTED"
,
STATUS_ALERTED
},
{
"BAD_DEVICE_TYPE"
,
STATUS_BAD_DEVICE_TYPE
},
{
"BAD_IMPERSONATION_LEVEL"
,
STATUS_BAD_IMPERSONATION_LEVEL
},
...
...
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