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
18f9d030
Commit
18f9d030
authored
Mar 09, 2017
by
Jacek Caban
Committed by
Alexandre Julliard
Mar 10, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wininet: Get rid of no longer needed BLOCKING_WAITALL.
Signed-off-by:
Jacek Caban
<
jacek@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
7eaadabc
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
15 deletions
+7
-15
http.c
dlls/wininet/http.c
+7
-15
No files found.
dlls/wininet/http.c
View file @
18f9d030
...
...
@@ -382,8 +382,7 @@ static WCHAR *get_host_header( http_request_t *req )
typedef
enum
{
BLOCKING_ALLOW
,
BLOCKING_DISALLOW
,
BLOCKING_WAITALL
BLOCKING_DISALLOW
}
blocking_mode_t
;
struct
data_stream_vtbl_t
{
...
...
@@ -2658,27 +2657,20 @@ static DWORD netconn_read(data_stream_t *stream, http_request_t *req, BYTE *buf,
{
netconn_stream_t
*
netconn_stream
=
(
netconn_stream_t
*
)
stream
;
DWORD
res
=
ERROR_SUCCESS
;
int
len
=
0
,
ret
=
0
;
int
ret
=
0
;
size
=
min
(
size
,
netconn_stream
->
content_length
-
netconn_stream
->
content_read
);
if
(
size
&&
is_valid_netconn
(
req
->
netconn
))
{
while
((
res
=
NETCON_recv
(
req
->
netconn
,
buf
+
ret
,
size
-
ret
,
blocking_mode
!=
BLOCKING_DISALLOW
,
&
len
))
==
ERROR_SUCCESS
)
{
if
(
!
len
)
{
res
=
NETCON_recv
(
req
->
netconn
,
buf
,
size
,
blocking_mode
!=
BLOCKING_DISALLOW
,
&
ret
);
if
(
res
==
ERROR_SUCCESS
)
{
if
(
!
ret
)
netconn_stream
->
content_length
=
netconn_stream
->
content_read
;
break
;
netconn_stream
->
content_read
+=
ret
;
}
ret
+=
len
;
netconn_stream
->
content_read
+=
len
;
if
(
blocking_mode
!=
BLOCKING_WAITALL
||
size
==
ret
)
break
;
}
if
(
res
==
WSAEWOULDBLOCK
&&
ret
)
res
=
ERROR_SUCCESS
;
}
TRACE
(
"re
ad %u bytes
\n
"
,
ret
);
TRACE
(
"re
s %u read %u bytes
\n
"
,
res
,
ret
);
*
read
=
ret
;
return
res
;
}
...
...
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