From 4e795c1f4c55a4610925a52742e541f36a3fb05c Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Wed, 7 Apr 2010 15:16:21 +0000
Subject: [PATCH] - Fix netstat build. - Improve WSPSelect declarations in
 msafd. - Include the correct wmilib header in wmi. - Remove a commented out
 inclusion in ws2san.h

svn path=/branches/header-work/; revision=46763
---
 base/applications/network/netstat/netstat.c |  2 +-
 dll/win32/msafd/misc/dllmain.c              | 12 ++++++------
 dll/win32/msafd/msafd.h                     |  8 ++++----
 drivers/wmi/wmilib.c                        |  2 +-
 include/ddk/ws2san.h                        |  4 ----
 5 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/base/applications/network/netstat/netstat.c b/base/applications/network/netstat/netstat.c
index 45ff2fd7fa4..fbffe08db8e 100644
--- a/base/applications/network/netstat/netstat.c
+++ b/base/applications/network/netstat/netstat.c
@@ -14,7 +14,7 @@
  */
 
 #include <windows.h>
-#include <winsock.h>
+#include <winsock2.h>
 #include <tchar.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/dll/win32/msafd/misc/dllmain.c b/dll/win32/msafd/misc/dllmain.c
index e43ab505bfd..c832a856fdd 100644
--- a/dll/win32/msafd/misc/dllmain.c
+++ b/dll/win32/msafd/misc/dllmain.c
@@ -751,12 +751,12 @@ WSPListen(SOCKET Handle,
 
 int
 WSPAPI
-WSPSelect(int nfds,
-          fd_set *readfds,
-          fd_set *writefds,
-          fd_set *exceptfds,
-          const LPTIMEVAL timeout,
-          LPINT lpErrno)
+WSPSelect(IN int nfds,
+          IN OUT fd_set *readfds OPTIONAL,
+          IN OUT fd_set *writefds OPTIONAL,
+          IN OUT fd_set *exceptfds OPTIONAL,
+          IN const struct timeval *timeout OPTIONAL,
+          OUT LPINT lpErrno)
 {
     IO_STATUS_BLOCK     IOSB;
     PAFD_POLL_INFO      PollInfo;
diff --git a/dll/win32/msafd/msafd.h b/dll/win32/msafd/msafd.h
index fbef176ab47..d0423b71ee6 100755
--- a/dll/win32/msafd/msafd.h
+++ b/dll/win32/msafd/msafd.h
@@ -325,10 +325,10 @@ INT
 WSPAPI
 WSPSelect(
     IN      INT nfds,
-    IN OUT  LPFD_SET readfds,
-    IN OUT  LPFD_SET writefds,
-    IN OUT  LPFD_SET exceptfds,
-    IN      CONST LPTIMEVAL timeout,
+    IN OUT  fd_set *readfds,
+    IN OUT  fd_set *writefds,
+    IN OUT  fd_set *exceptfds,
+    IN      CONST struct timeval *timeout,
     OUT     LPINT lpErrno);
 
 INT
diff --git a/drivers/wmi/wmilib.c b/drivers/wmi/wmilib.c
index 0fd0fa6bc32..69938ac12a3 100644
--- a/drivers/wmi/wmilib.c
+++ b/drivers/wmi/wmilib.c
@@ -11,7 +11,7 @@
 
 #include <stdio.h>
 #include <ntddk.h>
-#include <wmlib.h>
+#include <wmilib.h>
 
 #define NDEBUG
 #include <debug.h>
diff --git a/include/ddk/ws2san.h b/include/ddk/ws2san.h
index 5288a844610..4148194e93e 100644
--- a/include/ddk/ws2san.h
+++ b/include/ddk/ws2san.h
@@ -22,10 +22,6 @@
 
 #pragma once
 
-/* FIXME
-#include <winsock2.h>
-*/
-
 #ifdef __cplusplus
 extern "C" {
 #endif