@@ -18,26 +18,39 @@
 #import <fcntl.h>
 
 #import "OFTCPSocket.h"
 #import "OFExceptions.h"
 
-#ifndef _WIN32	/* FIXME */
+#ifndef INVALID_SOCKET
+#define INVALID_SOCKET -1
+#endif
+
 @implementation OFTCPSocket
++ (void)startup
+{
+#ifdef _WIN32
+	WSADATA wsa;
+
+	if (WSAStartup(MAKEWORD(2, 0), &wsa))
+		@throw [OFInitializationFailedException newWithClass: self];
+#endif
+}
+
 - init
 {
 	if ((self = [super init])) {
-		sock = -1;
+		sock = INVALID_SOCKET;
 		saddr = NULL;
 		saddr_len = 0;
 	}
 
 	return self;
 }
 
 - free
 {
-	if (sock >= 0)
+	if (sock != INVALID_SOCKET)
 		close(sock);
 
 	return [super free];
 }
 
@@ -64,11 +77,11 @@
 	char portstr[6];
 
 	if (!port)
 		@throw [OFInvalidPortException newWithObject: self];
 
-	if (sock >= 0)
+	if (sock != INVALID_SOCKET)
 		@throw [OFAlreadyConnectedException newWithObject: self];
 
 	memset(&hints, 0, sizeof(struct addrinfo));
 	hints.ai_family = AF_UNSPEC;
 	hints.ai_socktype = SOCK_STREAM;
@@ -81,25 +94,25 @@
 			  andNode: host
 		       andService: portstr];
 
 	for (res = res0; res != NULL; res = res->ai_next) {
 		if ((sock = socket(res->ai_family, res->ai_socktype,
-		    res->ai_protocol)) < 0)
+		    res->ai_protocol)) == INVALID_SOCKET)
 			continue;
 
-		if (connect(sock, res->ai_addr, res->ai_addrlen) < 0) {
+		if (connect(sock, res->ai_addr, res->ai_addrlen) == -1) {
 			close(sock);
-			sock = -1;
+			sock = INVALID_SOCKET;
 			continue;
 		}
 
 		break;
 	}
 
 	freeaddrinfo(res0);
 
-	if (sock < 0)
+	if (sock == INVALID_SOCKET)
 		@throw [OFConnectionFailedException newWithObject: self
 							  andHost: host
 							  andPort: port];
 
 	return self;
@@ -113,14 +126,14 @@
 	char portstr[6];
 
 	if (!port)
 		@throw [OFInvalidPortException newWithObject: self];
 
-	if (sock >= 0)
+	if (sock != INVALID_SOCKET)
 		@throw [OFAlreadyConnectedException newWithObject: self];
 
-	if ((sock = socket(family, SOCK_STREAM, 0)) < 0)
+	if ((sock = socket(family, SOCK_STREAM, 0)) == INVALID_SOCKET)
 		@throw [OFBindFailedException newWithObject: self
 						    andHost: host
 						    andPort: port
 						  andFamily: family];
 
@@ -134,11 +147,11 @@
 		@throw [OFAddressTranslationFailedException
 		    newWithObject: self
 			  andNode: host
 		       andService: portstr];
 
-	if (bind(sock, res->ai_addr, res->ai_addrlen) < 0) {
+	if (bind(sock, res->ai_addr, res->ai_addrlen) == -1) {
 		freeaddrinfo(res);
 		@throw [OFBindFailedException newWithObject: self
 						    andHost: host
 						    andPort: port
 						  andFamily: family];
@@ -149,26 +162,26 @@
 	return self;
 }
 
 - listenWithBackLog: (int)backlog
 {
-	if (sock < 0)
+	if (sock == INVALID_SOCKET)
 		@throw [OFNotConnectedException newWithObject: self];
 
-	if (listen(sock, backlog) < 0)
+	if (listen(sock, backlog) == -1)
 		@throw [OFListenFailedException newWithObject: self
 						   andBackLog: backlog];
 
 	return self;
 }
 
 - listen
 {
-	if (sock < 0)
+	if (sock == INVALID_SOCKET)
 		@throw [OFNotConnectedException newWithObject: self];
 
-	if (listen(sock, 5) < 0)
+	if (listen(sock, 5) == -1)
 		@throw [OFListenFailedException newWithObject: self
 						   andBackLog: 5];
 
 	return self;
 }
@@ -188,11 +201,11 @@
 	} @catch(id e) {
 		[newsock free];
 		@throw e;
 	}
 
-	if ((s = accept(sock, addr, &addrlen)) < 0) {
+	if ((s = accept(sock, addr, &addrlen)) == INVALID_SOCKET) {
 		[newsock free];
 		@throw [OFAcceptFailedException newWithObject: self];
 	}
 
 	[newsock setSocket: s];
@@ -205,26 +218,26 @@
 - (size_t)readNBytes: (size_t)size
 	  intoBuffer: (uint8_t*)buf
 {
 	ssize_t ret;
 
-	if (sock < 0)
+	if (sock == INVALID_SOCKET)
 		@throw [OFNotConnectedException newWithObject: self];
 
-	if ((ret = recv(sock, buf, size, 0)) < 0)
+	if ((ret = recv(sock, (char*)buf, size, 0)) < 1)
 		@throw [OFReadFailedException newWithObject: self
 						    andSize: size];
 
-	/* This is safe, as we already checked < 0 */
+	/* This is safe, as we already checked < 1 */
 	return ret;
 }
 
 - (uint8_t*)readNBytes: (size_t)size
 {
 	uint8_t *ret;
 
-	if (sock < 0)
+	if (sock == INVALID_SOCKET)
 		@throw [OFNotConnectedException newWithObject: self];
 
 	ret = [self getMemWithSize: size];
 
 	@try {
@@ -241,67 +254,74 @@
 - (size_t)writeNBytes: (size_t)size
 	   fromBuffer: (const uint8_t*)buf
 {
 	ssize_t ret;
 
-	if (sock < 0)
+	if (sock == INVALID_SOCKET)
 		@throw [OFNotConnectedException newWithObject: self];
 
-	if ((ret = send(sock, buf, size, 0)) < 0)
+	if ((ret = send(sock, (char*)buf, size, 0)) == -1)
 		@throw [OFWriteFailedException newWithObject: self
 						     andSize: size];
 
-	/* This is safe, as we already checked < 0 */
+	/* This is safe, as we already checked for -1 */
 	return ret;
 }
 
 - (size_t)writeCString: (const char*)str
 {
-	if (sock < 0)
+	if (sock == INVALID_SOCKET)
 		@throw [OFNotConnectedException newWithObject: self];
 
 	return [self writeNBytes: strlen(str)
 		      fromBuffer: (const uint8_t*)str];
 }
 
 - setBlocking: (BOOL)enable
 {
+#ifndef _WIN32
 	int flags;
 
-	if ((flags = fcntl(sock, F_GETFL)) < 0)
+	if ((flags = fcntl(sock, F_GETFL)) == -1)
 		@throw [OFSetOptionFailedException newWithObject: self];
 
 	if (enable)
 		flags &= ~O_NONBLOCK;
 	else
 		flags |= O_NONBLOCK;
 
-	if (fcntl(sock, F_SETFL, flags) < 0)
+	if (fcntl(sock, F_SETFL, flags) == -1)
+		@throw [OFSetOptionFailedException newWithObject: self];
+#else
+	u_long v = enable;
+
+	if (ioctlsocket(sock, FIONBIO, &v) == SOCKET_ERROR)
 		@throw [OFSetOptionFailedException newWithObject: self];
+#endif
 
 	return self;
 }
 
 - enableKeepAlives: (BOOL)enable
 {
-	if (setsockopt(sock, SOL_SOCKET, SO_KEEPALIVE, &enable,
-	    sizeof(enable)) != 0)
+	int v = enable;
+
+	if (setsockopt(sock, SOL_SOCKET, SO_KEEPALIVE, (char*)&v, sizeof(v)))
 		@throw [OFSetOptionFailedException newWithObject: self];
 
 	return self;
 }
 
 - close
 {
-	if (sock < 0)
+	if (sock == INVALID_SOCKET)
 		@throw [OFNotConnectedException newWithObject: self];
 
-	sock = -1;
+	sock = INVALID_SOCKET;
 
 	if (saddr != NULL)
 		[self freeMem: saddr];
 	saddr_len = 0;
 
 	return self;
 }
 @end
-#endif