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
52ef52e0
Commit
52ef52e0
authored
May 01, 2013
by
Hans Leidekker
Committed by
Alexandre Julliard
May 01, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
winhttp: Get rid of the flags parameter to netconn_send.
parent
ae0d8b5e
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
9 deletions
+7
-9
net.c
dlls/winhttp/net.c
+2
-4
request.c
dlls/winhttp/request.c
+4
-4
winhttp_private.h
dlls/winhttp/winhttp_private.h
+1
-1
No files found.
dlls/winhttp/net.c
View file @
52ef52e0
...
@@ -531,7 +531,7 @@ static BOOL send_ssl_chunk(netconn_t *conn, const void *msg, size_t size)
...
@@ -531,7 +531,7 @@ static BOOL send_ssl_chunk(netconn_t *conn, const void *msg, size_t size)
return
TRUE
;
return
TRUE
;
}
}
BOOL
netconn_send
(
netconn_t
*
conn
,
const
void
*
msg
,
size_t
len
,
int
flags
,
int
*
sent
)
BOOL
netconn_send
(
netconn_t
*
conn
,
const
void
*
msg
,
size_t
len
,
int
*
sent
)
{
{
if
(
!
netconn_connected
(
conn
))
return
FALSE
;
if
(
!
netconn_connected
(
conn
))
return
FALSE
;
if
(
conn
->
secure
)
if
(
conn
->
secure
)
...
@@ -539,8 +539,6 @@ BOOL netconn_send( netconn_t *conn, const void *msg, size_t len, int flags, int
...
@@ -539,8 +539,6 @@ BOOL netconn_send( netconn_t *conn, const void *msg, size_t len, int flags, int
const
BYTE
*
ptr
=
msg
;
const
BYTE
*
ptr
=
msg
;
size_t
chunk_size
;
size_t
chunk_size
;
if
(
flags
)
FIXME
(
"flags %08x not supported in SSL
\n
"
,
flags
);
*
sent
=
0
;
*
sent
=
0
;
while
(
len
)
{
while
(
len
)
{
...
@@ -555,7 +553,7 @@ BOOL netconn_send( netconn_t *conn, const void *msg, size_t len, int flags, int
...
@@ -555,7 +553,7 @@ BOOL netconn_send( netconn_t *conn, const void *msg, size_t len, int flags, int
return
TRUE
;
return
TRUE
;
}
}
if
((
*
sent
=
send
(
conn
->
socket
,
msg
,
len
,
flags
))
==
-
1
)
if
((
*
sent
=
send
(
conn
->
socket
,
msg
,
len
,
0
))
==
-
1
)
{
{
set_last_error
(
sock_get_error
(
errno
)
);
set_last_error
(
sock_get_error
(
errno
)
);
return
FALSE
;
return
FALSE
;
...
...
dlls/winhttp/request.c
View file @
52ef52e0
...
@@ -900,7 +900,7 @@ static BOOL secure_proxy_connect( request_t *request )
...
@@ -900,7 +900,7 @@ static BOOL secure_proxy_connect( request_t *request )
{
{
int
len
=
strlen
(
req_ascii
),
bytes_sent
;
int
len
=
strlen
(
req_ascii
),
bytes_sent
;
ret
=
netconn_send
(
&
request
->
netconn
,
req_ascii
,
len
,
0
,
&
bytes_sent
);
ret
=
netconn_send
(
&
request
->
netconn
,
req_ascii
,
len
,
&
bytes_sent
);
heap_free
(
req_ascii
);
heap_free
(
req_ascii
);
if
(
ret
)
if
(
ret
)
ret
=
read_reply
(
request
);
ret
=
read_reply
(
request
);
...
@@ -1120,13 +1120,13 @@ static BOOL send_request( request_t *request, LPCWSTR headers, DWORD headers_len
...
@@ -1120,13 +1120,13 @@ static BOOL send_request( request_t *request, LPCWSTR headers, DWORD headers_len
send_callback
(
&
request
->
hdr
,
WINHTTP_CALLBACK_STATUS_SENDING_REQUEST
,
NULL
,
0
);
send_callback
(
&
request
->
hdr
,
WINHTTP_CALLBACK_STATUS_SENDING_REQUEST
,
NULL
,
0
);
ret
=
netconn_send
(
&
request
->
netconn
,
req_ascii
,
len
,
0
,
&
bytes_sent
);
ret
=
netconn_send
(
&
request
->
netconn
,
req_ascii
,
len
,
&
bytes_sent
);
heap_free
(
req_ascii
);
heap_free
(
req_ascii
);
if
(
!
ret
)
goto
end
;
if
(
!
ret
)
goto
end
;
if
(
optional_len
)
if
(
optional_len
)
{
{
if
(
!
netconn_send
(
&
request
->
netconn
,
optional
,
optional_len
,
0
,
&
bytes_sent
))
goto
end
;
if
(
!
netconn_send
(
&
request
->
netconn
,
optional
,
optional_len
,
&
bytes_sent
))
goto
end
;
request
->
optional
=
optional
;
request
->
optional
=
optional
;
request
->
optional_len
=
optional_len
;
request
->
optional_len
=
optional_len
;
len
+=
optional_len
;
len
+=
optional_len
;
...
@@ -2494,7 +2494,7 @@ static BOOL write_data( request_t *request, LPCVOID buffer, DWORD to_write, LPDW
...
@@ -2494,7 +2494,7 @@ static BOOL write_data( request_t *request, LPCVOID buffer, DWORD to_write, LPDW
BOOL
ret
;
BOOL
ret
;
int
num_bytes
;
int
num_bytes
;
ret
=
netconn_send
(
&
request
->
netconn
,
buffer
,
to_write
,
0
,
&
num_bytes
);
ret
=
netconn_send
(
&
request
->
netconn
,
buffer
,
to_write
,
&
num_bytes
);
if
(
async
)
if
(
async
)
{
{
...
...
dlls/winhttp/winhttp_private.h
View file @
52ef52e0
...
@@ -268,7 +268,7 @@ BOOL netconn_query_data_available( netconn_t *, DWORD * ) DECLSPEC_HIDDEN;
...
@@ -268,7 +268,7 @@ BOOL netconn_query_data_available( netconn_t *, DWORD * ) DECLSPEC_HIDDEN;
BOOL
netconn_recv
(
netconn_t
*
,
void
*
,
size_t
,
int
,
int
*
)
DECLSPEC_HIDDEN
;
BOOL
netconn_recv
(
netconn_t
*
,
void
*
,
size_t
,
int
,
int
*
)
DECLSPEC_HIDDEN
;
BOOL
netconn_resolve
(
WCHAR
*
,
INTERNET_PORT
,
struct
sockaddr
*
,
socklen_t
*
,
int
)
DECLSPEC_HIDDEN
;
BOOL
netconn_resolve
(
WCHAR
*
,
INTERNET_PORT
,
struct
sockaddr
*
,
socklen_t
*
,
int
)
DECLSPEC_HIDDEN
;
BOOL
netconn_secure_connect
(
netconn_t
*
,
WCHAR
*
)
DECLSPEC_HIDDEN
;
BOOL
netconn_secure_connect
(
netconn_t
*
,
WCHAR
*
)
DECLSPEC_HIDDEN
;
BOOL
netconn_send
(
netconn_t
*
,
const
void
*
,
size_t
,
int
,
int
*
)
DECLSPEC_HIDDEN
;
BOOL
netconn_send
(
netconn_t
*
,
const
void
*
,
size_t
,
int
*
)
DECLSPEC_HIDDEN
;
DWORD
netconn_set_timeout
(
netconn_t
*
,
BOOL
,
int
)
DECLSPEC_HIDDEN
;
DWORD
netconn_set_timeout
(
netconn_t
*
,
BOOL
,
int
)
DECLSPEC_HIDDEN
;
const
void
*
netconn_get_certificate
(
netconn_t
*
)
DECLSPEC_HIDDEN
;
const
void
*
netconn_get_certificate
(
netconn_t
*
)
DECLSPEC_HIDDEN
;
int
netconn_get_cipher_strength
(
netconn_t
*
)
DECLSPEC_HIDDEN
;
int
netconn_get_cipher_strength
(
netconn_t
*
)
DECLSPEC_HIDDEN
;
...
...
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