Commit eada1be3 authored by Zebediah Figura's avatar Zebediah Figura Committed by Alexandre Julliard

http.sys: Use the SOCKET type for Windows sockets.

parent 11b8bbc7
...@@ -209,7 +209,7 @@ struct connection ...@@ -209,7 +209,7 @@ struct connection
{ {
struct list entry; /* in "connections" below */ struct list entry; /* in "connections" below */
int socket; SOCKET socket;
char *buffer; char *buffer;
unsigned int len, size; unsigned int len, size;
...@@ -246,18 +246,18 @@ struct request_queue ...@@ -246,18 +246,18 @@ struct request_queue
LIST_ENTRY irp_queue; LIST_ENTRY irp_queue;
HTTP_URL_CONTEXT context; HTTP_URL_CONTEXT context;
char *url; char *url;
int socket; SOCKET socket;
}; };
static struct list request_queues = LIST_INIT(request_queues); static struct list request_queues = LIST_INIT(request_queues);
static void accept_connection(int socket) static void accept_connection(SOCKET socket)
{ {
struct connection *conn; struct connection *conn;
ULONG true = 1; ULONG true = 1;
int peer; SOCKET peer;
if ((peer = accept(socket, NULL, NULL)) == -1) if ((peer = accept(socket, NULL, NULL)) == INVALID_SOCKET)
return; return;
if (!(conn = heap_alloc_zero(sizeof(*conn)))) if (!(conn = heap_alloc_zero(sizeof(*conn))))
...@@ -1046,10 +1046,11 @@ static NTSTATUS http_add_url(struct request_queue *queue, IRP *irp) ...@@ -1046,10 +1046,11 @@ static NTSTATUS http_add_url(struct request_queue *queue, IRP *irp)
const struct http_add_url_params *params = irp->AssociatedIrp.SystemBuffer; const struct http_add_url_params *params = irp->AssociatedIrp.SystemBuffer;
struct sockaddr_in addr; struct sockaddr_in addr;
struct connection *conn; struct connection *conn;
unsigned int count = 0;
char *url, *endptr; char *url, *endptr;
int s, count = 0;
ULONG true = 1; ULONG true = 1;
const char *p; const char *p;
SOCKET s;
TRACE("host %s, context %s.\n", debugstr_a(params->url), wine_dbgstr_longlong(params->context)); TRACE("host %s, context %s.\n", debugstr_a(params->url), wine_dbgstr_longlong(params->context));
...@@ -1089,7 +1090,7 @@ static NTSTATUS http_add_url(struct request_queue *queue, IRP *irp) ...@@ -1089,7 +1090,7 @@ static NTSTATUS http_add_url(struct request_queue *queue, IRP *irp)
return STATUS_NOT_IMPLEMENTED; return STATUS_NOT_IMPLEMENTED;
} }
if ((s = socket(AF_INET, SOCK_STREAM, 0)) == -1) if ((s = socket(AF_INET, SOCK_STREAM, 0)) == INVALID_SOCKET)
{ {
ERR("Failed to create socket, error %u.\n", WSAGetLastError()); ERR("Failed to create socket, error %u.\n", WSAGetLastError());
LeaveCriticalSection(&http_cs); LeaveCriticalSection(&http_cs);
......
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