[ros-diffs] [akhaldi] 46763: - Fix netstat build. - Improve WSPSelect declarations in msafd. - Include the correct wmilib header in wmi. - Remove a commented out inclusion in ws2san.h

Author: akhaldi
Date: Wed Apr  7 17:16:21 2010
New Revision: 46763

URL: http://svn.reactos.org/svn/reactos?rev=46763&view=rev
Log:
- Fix netstat build.
- Improve WSPSelect declarations in msafd.
- Include the correct wmilib header in wmi.
- Remove a commented out inclusion in ws2san.h

Modified:
    branches/header-work/base/applications/network/netstat/netstat.c
    branches/header-work/dll/win32/msafd/misc/dllmain.c
    branches/header-work/dll/win32/msafd/msafd.h
    branches/header-work/drivers/wmi/wmilib.c
    branches/header-work/include/ddk/ws2san.h

Modified: branches/header-work/base/applications/network/netstat/netstat.c
URL: http://svn.reactos.org/svn/reactos/branches/header-work/base/applications/ne...
==============================================================================
--- branches/header-work/base/applications/network/netstat/netstat.c [iso-8859-1] (original)
+++ branches/header-work/base/applications/network/netstat/netstat.c [iso-8859-1] Wed Apr  7 17:16:21 2010
@@ -14,7 +14,7 @@
  */

#include <windows.h>
-#include <winsock.h>
+#include <winsock2.h>
 #include <tchar.h>
 #include <stdio.h>
 #include <stdlib.h>

Modified: branches/header-work/dll/win32/msafd/misc/dllmain.c
URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/msafd/misc...
==============================================================================
--- branches/header-work/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original)
+++ branches/header-work/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Wed Apr  7 17:16:21 2010
@@ -751,12 +751,12 @@

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;

Modified: branches/header-work/dll/win32/msafd/msafd.h
URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/msafd/msaf...
==============================================================================
--- branches/header-work/dll/win32/msafd/msafd.h [iso-8859-1] (original)
+++ branches/header-work/dll/win32/msafd/msafd.h [iso-8859-1] Wed Apr  7 17:16:21 2010
@@ -325,10 +325,10 @@
 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

Modified: branches/header-work/drivers/wmi/wmilib.c
URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/wmi/wmilib.c...
==============================================================================
--- branches/header-work/drivers/wmi/wmilib.c [iso-8859-1] (original)
+++ branches/header-work/drivers/wmi/wmilib.c [iso-8859-1] Wed Apr  7 17:16:21 2010
@@ -11,7 +11,7 @@

#include <stdio.h>
 #include <ntddk.h>
-#include <wmlib.h>
+#include <wmilib.h>

#define NDEBUG
 #include <debug.h>

Modified: branches/header-work/include/ddk/ws2san.h
URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/ws2san.h...
==============================================================================
--- branches/header-work/include/ddk/ws2san.h [iso-8859-1] (original)
+++ branches/header-work/include/ddk/ws2san.h [iso-8859-1] Wed Apr  7 17:16:21 2010
@@ -21,10 +21,6 @@
  */

#pragma once
-
-/* FIXME
-#include <winsock2.h>
-*/

#ifdef __cplusplus
 extern "C" {