Commit 6ecd01b8 authored by Hans Leidekker's avatar Hans Leidekker Committed by Alexandre Julliard

winhttp: The last parameter of WinHttpQueryDataAvailable and WinHttpReadData is optional.

parent 6fe2edb5
...@@ -1149,6 +1149,7 @@ BOOL WINAPI WinHttpReceiveResponse( HINTERNET hrequest, LPVOID reserved ) ...@@ -1149,6 +1149,7 @@ BOOL WINAPI WinHttpReceiveResponse( HINTERNET hrequest, LPVOID reserved )
BOOL WINAPI WinHttpQueryDataAvailable( HINTERNET hrequest, LPDWORD available ) BOOL WINAPI WinHttpQueryDataAvailable( HINTERNET hrequest, LPDWORD available )
{ {
BOOL ret; BOOL ret;
DWORD num_bytes;
request_t *request; request_t *request;
TRACE("%p, %p\n", hrequest, available); TRACE("%p, %p\n", hrequest, available);
...@@ -1165,8 +1166,9 @@ BOOL WINAPI WinHttpQueryDataAvailable( HINTERNET hrequest, LPDWORD available ) ...@@ -1165,8 +1166,9 @@ BOOL WINAPI WinHttpQueryDataAvailable( HINTERNET hrequest, LPDWORD available )
return FALSE; return FALSE;
} }
ret = netconn_query_data_available( &request->netconn, available ); ret = netconn_query_data_available( &request->netconn, &num_bytes );
if (ret && available) *available = num_bytes;
release_object( &request->hdr ); release_object( &request->hdr );
return ret; return ret;
} }
...@@ -1255,7 +1257,7 @@ BOOL WINAPI WinHttpReadData( HINTERNET hrequest, LPVOID buffer, DWORD to_read, L ...@@ -1255,7 +1257,7 @@ BOOL WINAPI WinHttpReadData( HINTERNET hrequest, LPVOID buffer, DWORD to_read, L
BOOL ret; BOOL ret;
request_t *request; request_t *request;
WCHAR encoding[20]; WCHAR encoding[20];
DWORD buflen = sizeof(encoding); DWORD num_bytes, buflen = sizeof(encoding);
TRACE("%p, %p, %d, %p\n", hrequest, buffer, to_read, read); TRACE("%p, %p, %d, %p\n", hrequest, buffer, to_read, read);
...@@ -1274,11 +1276,12 @@ BOOL WINAPI WinHttpReadData( HINTERNET hrequest, LPVOID buffer, DWORD to_read, L ...@@ -1274,11 +1276,12 @@ BOOL WINAPI WinHttpReadData( HINTERNET hrequest, LPVOID buffer, DWORD to_read, L
if (query_headers( request, WINHTTP_QUERY_TRANSFER_ENCODING, NULL, encoding, &buflen, NULL ) && if (query_headers( request, WINHTTP_QUERY_TRANSFER_ENCODING, NULL, encoding, &buflen, NULL ) &&
!strcmpiW( encoding, chunked )) !strcmpiW( encoding, chunked ))
{ {
ret = read_data_chunked( request, buffer, to_read, read, request->hdr.flags & WINHTTP_FLAG_ASYNC ); ret = read_data_chunked( request, buffer, to_read, &num_bytes, request->hdr.flags & WINHTTP_FLAG_ASYNC );
} }
else else
ret = read_data( request, buffer, to_read, read, request->hdr.flags & WINHTTP_FLAG_ASYNC ); ret = read_data( request, buffer, to_read, &num_bytes, request->hdr.flags & WINHTTP_FLAG_ASYNC );
if (ret && read) *read = num_bytes;
release_object( &request->hdr ); release_object( &request->hdr );
return ret; return ret;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment