[ros-diffs] [ion] 20657: - GEt TCPIP building with msvc.

[ion at svn.reactos.org]

- GEt TCPIP building with msvc.
Modified: trunk/reactos/drivers/net/tcpip/include/precomp.h
Modified: trunk/reactos/drivers/net/tcpip/include/router.h
Modified: trunk/reactos/drivers/net/tcpip/recmutex/recmutex.c
Modified: trunk/reactos/drivers/net/tcpip/tcpip/dispatch.c
Modified: trunk/reactos/drivers/net/tcpip/tcpip/ninfo.c
  _____  

Modified: trunk/reactos/drivers/net/tcpip/include/precomp.h
--- trunk/reactos/drivers/net/tcpip/include/precomp.h	2006-01-07
07:40:14 UTC (rev 20656)
+++ trunk/reactos/drivers/net/tcpip/include/precomp.h	2006-01-07
07:56:55 UTC (rev 20657)
@@ -1,6 +1,8 @@

 #include <roscfg.h>
 #include <limits.h>
 #include <ntddk.h>
+#include <tdi.h>
+#include <tdistat.h>
 #include <../recmutex/recmutex.h>
 #include <roscfg.h>
 #include <tcpip.h>
  _____  

Modified: trunk/reactos/drivers/net/tcpip/include/router.h
--- trunk/reactos/drivers/net/tcpip/include/router.h	2006-01-07
07:40:14 UTC (rev 20656)
+++ trunk/reactos/drivers/net/tcpip/include/router.h	2006-01-07
07:56:55 UTC (rev 20657)
@@ -43,7 +43,7 @@

 NTSTATUS RouterShutdown(
     VOID);
 
-UINT CountFIBs();
+UINT CountFIBs(VOID);
 
 UINT CopyFIBs( PFIB_ENTRY Target );
 
  _____  

Modified: trunk/reactos/drivers/net/tcpip/recmutex/recmutex.c
--- trunk/reactos/drivers/net/tcpip/recmutex/recmutex.c	2006-01-07
07:40:14 UTC (rev 20656)
+++ trunk/reactos/drivers/net/tcpip/recmutex/recmutex.c	2006-01-07
07:56:55 UTC (rev 20657)
@@ -11,7 +11,7 @@

 
 /* NOTE: When we leave, the FAST_MUTEX must have been released.  The
result
  * is that we always exit in the same irql as entering */
-UINT RecursiveMutexEnter( PRECURSIVE_MUTEX RecMutex, BOOL ToWrite ) {
+SIZE_T RecursiveMutexEnter( PRECURSIVE_MUTEX RecMutex, BOOLEAN ToWrite
) {
     NTSTATUS Status = STATUS_SUCCESS;
     PVOID CurrentThread = KeGetCurrentThread();
 
  _____  

Modified: trunk/reactos/drivers/net/tcpip/tcpip/dispatch.c
--- trunk/reactos/drivers/net/tcpip/tcpip/dispatch.c	2006-01-07
07:40:14 UTC (rev 20656)
+++ trunk/reactos/drivers/net/tcpip/tcpip/dispatch.c	2006-01-07
07:56:55 UTC (rev 20657)
@@ -160,7 +160,7 @@

     DispCancelComplete(DisType->FileObject);
 }
 
-VOID DDKAPI DispCancelRequest(
+VOID NTAPI DispCancelRequest(
     PDEVICE_OBJECT Device,
     PIRP Irp)
 /*
@@ -245,7 +245,7 @@
 }
 
 
-VOID DDKAPI DispCancelListenRequest(
+VOID NTAPI DispCancelListenRequest(
     PDEVICE_OBJECT Device,
     PIRP Irp)
 /*
  _____  

Modified: trunk/reactos/drivers/net/tcpip/tcpip/ninfo.c
--- trunk/reactos/drivers/net/tcpip/tcpip/ninfo.c	2006-01-07
07:40:14 UTC (rev 20656)
+++ trunk/reactos/drivers/net/tcpip/tcpip/ninfo.c	2006-01-07
07:56:55 UTC (rev 20657)
@@ -16,7 +16,6 @@

 TDI_STATUS InfoTdiQueryGetAddrTable( PNDIS_BUFFER Buffer,
 				     PUINT BufferSize ) {
 
-    IF_LIST_ITER(CurrentIF);
     TDI_STATUS Status = TDI_INVALID_REQUEST;
     KIRQL OldIrql;
     UINT Count = 0;
@@ -24,6 +23,7 @@
     PIPADDR_ENTRY IpAddress =
 	ExAllocatePool( NonPagedPool, sizeof( IPADDR_ENTRY ) * IfCount
);
     PIPADDR_ENTRY IpCurrent = IpAddress;
+    IF_LIST_ITER(CurrentIF);
 
     TI_DbgPrint(DEBUG_INFO, ("Called.\n"));
 
@@ -66,8 +66,8 @@
 TDI_STATUS InfoTdiQueryGetRouteTable( PNDIS_BUFFER Buffer, PUINT
BufferSize ) {
     TDI_STATUS Status;
     KIRQL OldIrql;
-    UINT RtCount = CountFIBs(),
-	Size = sizeof( IPROUTE_ENTRY ) * RtCount;
+    UINT RtCount = CountFIBs();
+    UINT Size = sizeof( IPROUTE_ENTRY ) * RtCount;
     PFIB_ENTRY RCache =
 	ExAllocatePool( NonPagedPool, sizeof( FIB_ENTRY ) * RtCount ),
 	RCacheCur = RCache;
@@ -142,7 +142,7 @@
 				      PUINT BufferSize ) {
     IPSNMP_INFO SnmpInfo;
     UINT IfCount = CountInterfaces();
-    UINT RouteCount = CountFIBs( NULL );
+    UINT RouteCount = CountFIBs();
     TDI_STATUS Status = TDI_INVALID_REQUEST;
 
     TI_DbgPrint(DEBUG_INFO, ("Called.\n"));
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://www.reactos.org/pipermail/ros-diffs/attachments/20060107/9de687c4/attachment.html