[ros-diffs] [sginsberg] 37688: - ACPI: Don't redefine standard DDK types - TCPIP/IP/TDI/Uniata: Don't use user mode types - USBDRIVER: Remove a peculiar redefinition of ULONG_PTR - NDIS: Remove duplicate (and undocumented) types from ndis.h, defined in an internal NDIS header long ago. Also fix some warnings, define UINT as appropriate, and add a clever (not really) workaround for a gcc/msvc incompatibility. -- For some obnoxious reason msvc is fine with redeclaring types compatibly, while gcc treats it as an error. PSDK and DDK require this, so we need...extended header checks.
sginsberg at svn.reactos.org
sginsberg at svn.reactos.org
Thu Nov 27 16:02:47 CET 2008
Author: sginsberg
Date: Thu Nov 27 09:02:47 2008
New Revision: 37688
URL: http://svn.reactos.org/svn/reactos?rev=37688&view=rev
Log:
- ACPI: Don't redefine standard DDK types
- TCPIP/IP/TDI/Uniata: Don't use user mode types
- USBDRIVER: Remove a peculiar redefinition of ULONG_PTR
- NDIS: Remove duplicate (and undocumented) types from ndis.h, defined in an internal NDIS header long ago. Also fix some warnings, define UINT as appropriate, and add a clever (not really) workaround for a gcc/msvc incompatibility. -- For some obnoxious reason msvc is fine with redeclaring types compatibly, while gcc treats it as an error. PSDK and DDK require this, so we need...extended header checks.
Modified:
trunk/reactos/drivers/bus/acpi/include/platform/types.h
trunk/reactos/drivers/network/ndis/include/miniport.h
trunk/reactos/drivers/network/tcpip/datalink/lan.c
trunk/reactos/drivers/network/tcpip/include/address.h
trunk/reactos/drivers/network/tcpip/include/interface.h
trunk/reactos/drivers/network/tcpip/include/lan.h
trunk/reactos/drivers/network/tcpip/include/lock.h
trunk/reactos/drivers/network/tcpip/include/neighbor.h
trunk/reactos/drivers/network/tcpip/include/titypes.h
trunk/reactos/drivers/network/tcpip/tcpip/iinfo.c
trunk/reactos/drivers/network/tcpip/tcpip/info.c
trunk/reactos/drivers/network/tcpip/tcpip/lock.c
trunk/reactos/drivers/network/tcpip/tcpip/main.c
trunk/reactos/drivers/network/tdi/tdi/stubs.c
trunk/reactos/drivers/storage/ide/uniata/id_probe.cpp
trunk/reactos/drivers/usb/nt4compat/usbdriver/usb.h
trunk/reactos/include/ddk/ndis.h
trunk/reactos/lib/drivers/ip/network/address.c
trunk/reactos/lib/drivers/ip/network/interface.c
trunk/reactos/lib/drivers/ip/network/neighbor.c
Modified: trunk/reactos/drivers/bus/acpi/include/platform/types.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/include/platform/types.h?rev=37688&r1=37687&r2=37688&view=diff
==============================================================================
--- trunk/reactos/drivers/bus/acpi/include/platform/types.h [iso-8859-1] (original)
+++ trunk/reactos/drivers/bus/acpi/include/platform/types.h [iso-8859-1] Thu Nov 27 09:02:47 2008
@@ -16,8 +16,4 @@
#include <ntddk.h>
#include <stdio.h>
-typedef UCHAR UINT8;
-typedef USHORT UINT16;
-typedef ULONGLONG UINT64;
-
#endif /* __INCLUDE_ACPI_TYPES_H */
Modified: trunk/reactos/drivers/network/ndis/include/miniport.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/include/miniport.h?rev=37688&r1=37687&r2=37688&view=diff
==============================================================================
--- trunk/reactos/drivers/network/ndis/include/miniport.h [iso-8859-1] (original)
+++ trunk/reactos/drivers/network/ndis/include/miniport.h [iso-8859-1] Thu Nov 27 09:02:47 2008
@@ -28,7 +28,11 @@
PDRIVER_OBJECT DriverObject; /* Driver object of miniport */
LIST_ENTRY DeviceList; /* Adapters created by miniport */
PUNICODE_STRING RegistryPath; /* SCM Registry key */
+#if !defined(_MSC_VER) && defined(__NDIS_H)
+} NDIS_M_DRIVER_BLOCK_COMPATIBILITY_HACK_DONT_USE;
+#else
} NDIS_M_DRIVER_BLOCK, *PNDIS_M_DRIVER_BLOCK;
+#endif
/* resources allocated on behalf on the miniport */
#define MINIPORT_RESOURCE_TYPE_MEMORY 0
Modified: trunk/reactos/drivers/network/tcpip/datalink/lan.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/datalink/lan.c?rev=37688&r1=37687&r2=37688&view=diff
==============================================================================
--- trunk/reactos/drivers/network/tcpip/datalink/lan.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/network/tcpip/datalink/lan.c [iso-8859-1] Thu Nov 27 09:02:47 2008
@@ -166,14 +166,14 @@
NTSTATUS TcpipLanGetDwordOid
( PIP_INTERFACE Interface,
NDIS_OID Oid,
- PDWORD Result ) {
+ PULONG Result ) {
/* Get maximum frame size */
if( Interface->Context ) {
return NDISCall((PLAN_ADAPTER)Interface->Context,
NdisRequestQueryInformation,
Oid,
Result,
- sizeof(DWORD));
+ sizeof(ULONG));
} else switch( Oid ) { /* Loopback Case */
case OID_GEN_HARDWARE_STATUS:
*Result = NdisHardwareStatusReady;
@@ -782,7 +782,7 @@
NTSTATUS NTAPI AppendUnicodeString(PUNICODE_STRING ResultFirst,
PUNICODE_STRING Second,
- BOOL Deallocate) {
+ BOOLEAN Deallocate) {
NTSTATUS Status;
UNICODE_STRING Ustr = *ResultFirst;
PWSTR new_string = ExAllocatePoolWithTag
Modified: trunk/reactos/drivers/network/tcpip/include/address.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/include/address.h?rev=37688&r1=37687&r2=37688&view=diff
==============================================================================
--- trunk/reactos/drivers/network/tcpip/include/address.h [iso-8859-1] (original)
+++ trunk/reactos/drivers/network/tcpip/include/address.h [iso-8859-1] Thu Nov 27 09:02:47 2008
@@ -69,7 +69,7 @@
PADDRESS_FILE AddrSearchNext(
PAF_SEARCH SearchContext);
-unsigned long PASCAL inet_addr(const char*);
+unsigned long NTAPI inet_addr(const char*);
ULONG IPv4NToHl( ULONG Address );
Modified: trunk/reactos/drivers/network/tcpip/include/interface.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/include/interface.h?rev=37688&r1=37687&r2=37688&view=diff
==============================================================================
--- trunk/reactos/drivers/network/tcpip/include/interface.h [iso-8859-1] (original)
+++ trunk/reactos/drivers/network/tcpip/include/interface.h [iso-8859-1] Thu Nov 27 09:02:47 2008
@@ -14,7 +14,7 @@
NTSTATUS GetInterfaceName( PIP_INTERFACE Interface, PCHAR NameBuffer,
UINT NameMaxLen );
NTSTATUS GetInterfaceConnectionStatus( PIP_INTERFACE Interface,
- PDWORD OperStatus );
+ PULONG OperStatus );
PIP_INTERFACE FindOnLinkInterface(PIP_ADDRESS Address);
#endif//_TCPIP_INTERFACE_H
Modified: trunk/reactos/drivers/network/tcpip/include/lan.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/include/lan.h?rev=37688&r1=37687&r2=37688&view=diff
==============================================================================
--- trunk/reactos/drivers/network/tcpip/include/lan.h [iso-8859-1] (original)
+++ trunk/reactos/drivers/network/tcpip/include/lan.h [iso-8859-1] Thu Nov 27 09:02:47 2008
@@ -99,7 +99,7 @@
VOID LANShutdown();
NTSTATUS TcpipLanGetDwordOid( PIP_INTERFACE Interface, NDIS_OID Oid,
- PDWORD Result );
+ PULONG Result );
NDIS_STATUS NDISCall(
PLAN_ADAPTER Adapter,
Modified: trunk/reactos/drivers/network/tcpip/include/lock.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/include/lock.h?rev=37688&r1=37687&r2=37688&view=diff
==============================================================================
--- trunk/reactos/drivers/network/tcpip/include/lock.h [iso-8859-1] (original)
+++ trunk/reactos/drivers/network/tcpip/include/lock.h [iso-8859-1] Thu Nov 27 09:02:47 2008
@@ -14,7 +14,7 @@
extern VOID TcpipReleaseFastMutex( PFAST_MUTEX Mutex );
extern VOID TcpipRecursiveMutexInit( PRECURSIVE_MUTEX RecMutex );
extern UINT TcpipRecursiveMutexEnter( PRECURSIVE_MUTEX RecMutex,
- BOOL ToWrite );
+ BOOLEAN ToWrite );
extern VOID TcpipRecursiveMutexLeave( PRECURSIVE_MUTEX RecMutex );
#endif/*_LOCK_H*/
Modified: trunk/reactos/drivers/network/tcpip/include/neighbor.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/include/neighbor.h?rev=37688&r1=37687&r2=37688&view=diff
==============================================================================
--- trunk/reactos/drivers/network/tcpip/include/neighbor.h [iso-8859-1] (original)
+++ trunk/reactos/drivers/network/tcpip/include/neighbor.h [iso-8859-1] Thu Nov 27 09:02:47 2008
@@ -107,7 +107,7 @@
VOID NBRemoveNeighbor(
PNEIGHBOR_CACHE_ENTRY NCE);
-DWORD NBCopyNeighbors(
+ULONG NBCopyNeighbors(
PIP_INTERFACE Interface,
PIPARP_ENTRY ArpTable);
Modified: trunk/reactos/drivers/network/tcpip/include/titypes.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/include/titypes.h?rev=37688&r1=37687&r2=37688&view=diff
==============================================================================
--- trunk/reactos/drivers/network/tcpip/include/titypes.h [iso-8859-1] (original)
+++ trunk/reactos/drivers/network/tcpip/include/titypes.h [iso-8859-1] Thu Nov 27 09:02:47 2008
@@ -176,40 +176,40 @@
/* Connection indication handler */
PTDI_IND_CONNECT ConnectHandler;
PVOID ConnectHandlerContext;
- BOOL RegisteredConnectHandler;
+ BOOLEAN RegisteredConnectHandler;
/* Disconnect indication handler */
PTDI_IND_DISCONNECT DisconnectHandler;
PVOID DisconnectHandlerContext;
- BOOL RegisteredDisconnectHandler;
+ BOOLEAN RegisteredDisconnectHandler;
/* Error indication handler */
PTDI_IND_ERROR ErrorHandler;
PVOID ErrorHandlerContext;
PVOID ErrorHandlerOwner;
- BOOL RegisteredErrorHandler;
+ BOOLEAN RegisteredErrorHandler;
/* Receive indication handler */
PTDI_IND_RECEIVE ReceiveHandler;
PVOID ReceiveHandlerContext;
- BOOL RegisteredReceiveHandler;
+ BOOLEAN RegisteredReceiveHandler;
/* Receive datagram indication handler */
PTDI_IND_RECEIVE_DATAGRAM ReceiveDatagramHandler;
PVOID ReceiveDatagramHandlerContext;
- BOOL RegisteredReceiveDatagramHandler;
+ BOOLEAN RegisteredReceiveDatagramHandler;
/* Expedited receive indication handler */
PTDI_IND_RECEIVE_EXPEDITED ExpeditedReceiveHandler;
PVOID ExpeditedReceiveHandlerContext;
- BOOL RegisteredExpeditedReceiveHandler;
+ BOOLEAN RegisteredExpeditedReceiveHandler;
/* Chained receive indication handler */
PTDI_IND_CHAINED_RECEIVE ChainedReceiveHandler;
PVOID ChainedReceiveHandlerContext;
- BOOL RegisteredChainedReceiveHandler;
+ BOOLEAN RegisteredChainedReceiveHandler;
/* Chained receive datagram indication handler */
PTDI_IND_CHAINED_RECEIVE_DATAGRAM ChainedReceiveDatagramHandler;
PVOID ChainedReceiveDatagramHandlerContext;
- BOOL RegisteredChainedReceiveDatagramHandler;
+ BOOLEAN RegisteredChainedReceiveDatagramHandler;
/* Chained expedited receive indication handler */
PTDI_IND_CHAINED_RECEIVE_EXPEDITED ChainedReceiveExpeditedHandler;
PVOID ChainedReceiveExpeditedHandlerContext;
- BOOL RegisteredChainedReceiveExpeditedHandler;
+ BOOLEAN RegisteredChainedReceiveExpeditedHandler;
} ADDRESS_FILE, *PADDRESS_FILE;
/* Address File Flag constants */
@@ -334,7 +334,7 @@
CONNECTION_CONTEXT ConnectionContext;
HANDLE ControlChannel;
} Handle;
- BOOL CancelIrps;
+ BOOLEAN CancelIrps;
KEVENT CleanupEvent;
} TRANSPORT_CONTEXT, *PTRANSPORT_CONTEXT;
Modified: trunk/reactos/drivers/network/tcpip/tcpip/iinfo.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpip/iinfo.c?rev=37688&r1=37687&r2=37688&view=diff
==============================================================================
--- trunk/reactos/drivers/network/tcpip/tcpip/iinfo.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/network/tcpip/tcpip/iinfo.c [iso-8859-1] Thu Nov 27 09:02:47 2008
@@ -83,8 +83,8 @@
PNDIS_BUFFER Buffer,
PUINT BufferSize) {
NTSTATUS Status;
- DWORD NumNeighbors = NBCopyNeighbors( Interface, NULL );
- DWORD MemSize = NumNeighbors * sizeof(IPARP_ENTRY);
+ ULONG NumNeighbors = NBCopyNeighbors( Interface, NULL );
+ ULONG MemSize = NumNeighbors * sizeof(IPARP_ENTRY);
PIPARP_ENTRY ArpEntries =
ExAllocatePoolWithTag
( NonPagedPool, MemSize, FOURCC('A','R','P','t') );
@@ -104,7 +104,7 @@
PNDIS_BUFFER Buffer,
PUINT BufferSize) {
NTSTATUS Status;
- DWORD Capability = 0x280;
+ ULONG Capability = 0x280;
TI_DbgPrint(MID_TRACE,("Copying out %d bytes (AT_ENTITY capability)\n",
sizeof(Capability)));
Modified: trunk/reactos/drivers/network/tcpip/tcpip/info.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpip/info.c?rev=37688&r1=37687&r2=37688&view=diff
==============================================================================
--- trunk/reactos/drivers/network/tcpip/tcpip/info.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/network/tcpip/tcpip/info.c [iso-8859-1] Thu Nov 27 09:02:47 2008
@@ -143,7 +143,7 @@
UINT i;
PVOID context = NULL;
NTSTATUS Status = TDI_INVALID_PARAMETER;
- BOOL FoundEntity = FALSE;
+ BOOLEAN FoundEntity = FALSE;
InfoRequest_f InfoRequest = NULL;
TI_DbgPrint(DEBUG_INFO,
Modified: trunk/reactos/drivers/network/tcpip/tcpip/lock.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpip/lock.c?rev=37688&r1=37687&r2=37688&view=diff
==============================================================================
--- trunk/reactos/drivers/network/tcpip/tcpip/lock.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/network/tcpip/tcpip/lock.c [iso-8859-1] Thu Nov 27 09:02:47 2008
@@ -48,7 +48,7 @@
RecursiveMutexInit( RecMutex );
}
-UINT TcpipRecursiveMutexEnter( PRECURSIVE_MUTEX RecMutex, BOOL ToWrite ) {
+UINT TcpipRecursiveMutexEnter( PRECURSIVE_MUTEX RecMutex, BOOLEAN ToWrite ) {
UINT Ret;
//TI_DbgPrint(DEBUG_LOCK,("Locking\n"));
Ret = RecursiveMutexEnter( RecMutex, ToWrite );
Modified: trunk/reactos/drivers/network/tcpip/tcpip/main.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpip/main.c?rev=37688&r1=37687&r2=37688&view=diff
==============================================================================
--- trunk/reactos/drivers/network/tcpip/tcpip/main.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/network/tcpip/tcpip/main.c [iso-8859-1] Thu Nov 27 09:02:47 2008
@@ -387,7 +387,7 @@
*/
{
NTSTATUS Status;
- BOOL Complete = TRUE;
+ BOOLEAN Complete = TRUE;
PIO_STACK_LOCATION IrpSp;
RIRP(Irp);
@@ -912,11 +912,11 @@
VOID NTAPI
IPAddInterface(
- DWORD Unknown0,
- DWORD Unknown1,
- DWORD Unknown2,
- DWORD Unknown3,
- DWORD Unknown4)
+ ULONG Unknown0,
+ ULONG Unknown1,
+ ULONG Unknown2,
+ ULONG Unknown3,
+ ULONG Unknown4)
{
UNIMPLEMENTED
}
@@ -924,7 +924,7 @@
VOID NTAPI
IPDelInterface(
- DWORD Unknown0)
+ ULONG Unknown0)
{
UNIMPLEMENTED
}
@@ -932,8 +932,8 @@
VOID NTAPI
LookupRoute(
- DWORD Unknown0,
- DWORD Unknown1)
+ ULONG Unknown0,
+ ULONG Unknown1)
{
UNIMPLEMENTED
}
Modified: trunk/reactos/drivers/network/tdi/tdi/stubs.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tdi/tdi/stubs.c?rev=37688&r1=37687&r2=37688&view=diff
==============================================================================
--- trunk/reactos/drivers/network/tdi/tdi/stubs.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/network/tdi/tdi/stubs.c [iso-8859-1] Thu Nov 27 09:02:47 2008
@@ -103,10 +103,10 @@
VOID
STDCALL
TdiOpenNetbiosAddress (
- DWORD Unknown0,
- DWORD Unknown1,
- DWORD Unknown2,
- DWORD Unknown3
+ ULONG Unknown0,
+ ULONG Unknown1,
+ ULONG Unknown2,
+ ULONG Unknown3
)
{
}
Modified: trunk/reactos/drivers/storage/ide/uniata/id_probe.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata/id_probe.cpp?rev=37688&r1=37687&r2=37688&view=diff
==============================================================================
--- trunk/reactos/drivers/storage/ide/uniata/id_probe.cpp [iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/ide/uniata/id_probe.cpp [iso-8859-1] Thu Nov 27 09:02:47 2008
@@ -504,8 +504,8 @@
/* if(known) {
RtlCopyMemory(newBMListPtr, (PVOID)&(BusMasterAdapters[i]), sizeof(BUSMASTER_CONTROLLER_INFORMATION));
} else {*/
- sprintf((PCHAR)vendorStrPtr, "%4.4x", (UINT)VendorID);
- sprintf((PCHAR)deviceStrPtr, "%4.4x", (UINT)DeviceID);
+ sprintf((PCHAR)vendorStrPtr, "%4.4x", (UINT32)VendorID);
+ sprintf((PCHAR)deviceStrPtr, "%4.4x", (UINT32)DeviceID);
RtlCopyMemory(&(newBMListPtr->VendorIdStr), (PCHAR)vendorStrPtr, 4);
RtlCopyMemory(&(newBMListPtr->DeviceIdStr), (PCHAR)deviceStrPtr, 4);
Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/usb.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbdriver/usb.h?rev=37688&r1=37687&r2=37688&view=diff
==============================================================================
--- trunk/reactos/drivers/usb/nt4compat/usbdriver/usb.h [iso-8859-1] (original)
+++ trunk/reactos/drivers/usb/nt4compat/usbdriver/usb.h [iso-8859-1] Thu Nov 27 09:02:47 2008
@@ -3,8 +3,6 @@
/*
* Some USB bandwidth allocation constants.
*/
-
-typedef unsigned long ULONG_PTR, *PULONG_PTR;
#define USB2_HOST_DELAY 5 /* nsec, guess */
#define BW_HOST_DELAY 1000L /* nanoseconds */
Modified: trunk/reactos/include/ddk/ndis.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ndis.h?rev=37688&r1=37687&r2=37688&view=diff
==============================================================================
--- trunk/reactos/include/ddk/ndis.h [iso-8859-1] (original)
+++ trunk/reactos/include/ddk/ndis.h [iso-8859-1] Thu Nov 27 09:02:47 2008
@@ -41,6 +41,10 @@
#include "netpnp.h"
#include "netevent.h"
#include <qos.h>
+
+#if !defined(_WINDEF_H)
+typedef unsigned int UINT, *PUINT;
+#endif
#ifdef __cplusplus
extern "C" {
@@ -4106,6 +4110,11 @@
typedef struct _NDIS_M_DRIVER_BLOCK NDIS_M_DRIVER_BLOCK, *PNDIS_M_DRIVER_BLOCK;
typedef struct _NDIS_AF_LIST NDIS_AF_LIST, *PNDIS_AF_LIST;
+//
+// FIXME: Should be typedef struct _X_FILTER ETH_FILTER, *PETH_FILTER;
+//
+typedef PVOID ETH_FILTER, *PETH_FILTER;
+
typedef struct _NDIS_MINIPORT_INTERRUPT {
PKINTERRUPT InterruptObject;
@@ -4165,11 +4174,8 @@
PVOID WorkItemContext;
} NDIS_MINIPORT_WORK_ITEM, *PNDIS_MINIPORT_WORK_ITEM;
-/* Forward declare to pick up a consistent type */
-typedef struct _NDIS_WORK_ITEM;
-#pragma warning(push)
-typedef VOID (*NDIS_PROC)(struct _NDIS_WORK_ITEM *, PVOID);
-#pragma warning(pop)
+struct _NDIS_WORK_ITEM;
+typedef VOID (*NDIS_PROC)(struct _NDIS_WORK_ITEM *, PVOID);
typedef struct _NDIS_WORK_ITEM
{
PVOID Context;
@@ -4182,43 +4188,6 @@
NDIS_STRING Paths[1];
} NDIS_BIND_PATHS, *PNDIS_BIND_PATHS;
-#define DECLARE_UNKNOWN_STRUCT(BaseName) \
- typedef struct _##BaseName BaseName, *P##BaseName;
-
-#define DECLARE_UNKNOWN_PROTOTYPE(Name) \
- typedef VOID (*(Name))(VOID);
-
-#define ETH_LENGTH_OF_ADDRESS 6
-
-DECLARE_UNKNOWN_STRUCT(ETH_BINDING_INFO)
-
-DECLARE_UNKNOWN_PROTOTYPE(ETH_ADDRESS_CHANGE)
-DECLARE_UNKNOWN_PROTOTYPE(ETH_FILTER_CHANGE)
-DECLARE_UNKNOWN_PROTOTYPE(ETH_DEFERRED_CLOSE)
-
-typedef struct _ETH_FILTER {
- PNDIS_SPIN_LOCK Lock;
- CHAR (*MCastAddressBuf)[ETH_LENGTH_OF_ADDRESS];
- struct _NDIS_MINIPORT_BLOCK *Miniport;
- UINT CombinedPacketFilter;
- PETH_BINDING_INFO OpenList;
- ETH_ADDRESS_CHANGE AddressChangeAction;
- ETH_FILTER_CHANGE FilterChangeAction;
- ETH_DEFERRED_CLOSE CloseAction;
- UINT MaxMulticastAddresses;
- UINT NumAddresses;
- UCHAR AdapterAddress[ETH_LENGTH_OF_ADDRESS];
- UINT OldCombinedPacketFilter;
- CHAR (*OldMCastAddressBuf)[ETH_LENGTH_OF_ADDRESS];
- UINT OldNumAddresses;
- PETH_BINDING_INFO DirectedList;
- PETH_BINDING_INFO BMList;
- PETH_BINDING_INFO MCastSet;
-#if defined(NDIS_WRAPPER)
- UINT NumOpens;
- PVOID BindListLock;
-#endif
-} ETH_FILTER, *PETH_FILTER;
typedef VOID DDKAPI
(*ETH_RCV_COMPLETE_HANDLER)(
@@ -4624,7 +4593,7 @@
PVOID MacHandle; \
NDIS_HANDLE BindingHandle; \
PNDIS_MINIPORT_BLOCK MiniportHandle; \
- PNDIS_PROTOCOL_BLOCK ProtocolHandle; \
+ PNDIS_PROTOCOL_BLOCK ProtocolHandle; \
NDIS_HANDLE ProtocolBindingContext; \
PNDIS_OPEN_BLOCK MiniportNextOpen; \
PNDIS_OPEN_BLOCK ProtocolNextOpen; \
@@ -4667,23 +4636,6 @@
#else
NDIS_COMMON_OPEN_BLOCK_S
#endif
-#if defined(NDIS_WRAPPER)
- struct _NDIS_OPEN_CO
- {
- struct _NDIS_CO_AF_BLOCK * NextAf;
- W_CO_CREATE_VC_HANDLER MiniportCoCreateVcHandler;
- W_CO_REQUEST_HANDLER MiniportCoRequestHandler;
- CO_CREATE_VC_HANDLER CoCreateVcHandler;
- CO_DELETE_VC_HANDLER CoDeleteVcHandler;
- PVOID CmActivateVcCompleteHandler;
- PVOID CmDeactivateVcCompleteHandler;
- PVOID CoRequestCompleteHandler;
- LIST_ENTRY ActiveVcHead;
- LIST_ENTRY InactiveVcHead;
- LONG PendingAfNotifications;
- PKEVENT AfNotifyCompleteEvent;
- };
-#endif /* _NDIS_ */
};
Modified: trunk/reactos/lib/drivers/ip/network/address.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/address.c?rev=37688&r1=37687&r2=37688&view=diff
==============================================================================
--- trunk/reactos/lib/drivers/ip/network/address.c [iso-8859-1] (original)
+++ trunk/reactos/lib/drivers/ip/network/address.c [iso-8859-1] Thu Nov 27 09:02:47 2008
@@ -303,7 +303,7 @@
}
-unsigned long PASCAL inet_addr(const char *AddrString)
+unsigned long NTAPI inet_addr(const char *AddrString)
/*
* Convert an ansi string dotted-quad address to a ulong
* NOTES:
Modified: trunk/reactos/lib/drivers/ip/network/interface.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/interface.c?rev=37688&r1=37687&r2=37688&view=diff
==============================================================================
--- trunk/reactos/lib/drivers/ip/network/interface.c [iso-8859-1] (original)
+++ trunk/reactos/lib/drivers/ip/network/interface.c [iso-8859-1] Thu Nov 27 09:02:47 2008
@@ -39,7 +39,7 @@
}
UINT CountInterfaces() {
- DWORD Count = 0;
+ ULONG Count = 0;
KIRQL OldIrql;
IF_LIST_ITER(CurrentIF);
@@ -211,7 +211,7 @@
}
NTSTATUS GetInterfaceConnectionStatus
-( PIP_INTERFACE Interface, PDWORD Result ) {
+( PIP_INTERFACE Interface, PULONG Result ) {
NTSTATUS Status = TcpipLanGetDwordOid
( Interface, OID_GEN_HARDWARE_STATUS, Result );
if( NT_SUCCESS(Status) ) switch( *Result ) {
Modified: trunk/reactos/lib/drivers/ip/network/neighbor.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/neighbor.c?rev=37688&r1=37687&r2=37688&view=diff
==============================================================================
--- trunk/reactos/lib/drivers/ip/network/neighbor.c [iso-8859-1] (original)
+++ trunk/reactos/lib/drivers/ip/network/neighbor.c [iso-8859-1] Thu Nov 27 09:02:47 2008
@@ -64,7 +64,7 @@
/* Must be called with table lock acquired */
VOID NBFlushPacketQueue( PNEIGHBOR_CACHE_ENTRY NCE,
- BOOL CallComplete,
+ BOOLEAN CallComplete,
NTSTATUS ErrorCode ) {
PLIST_ENTRY PacketEntry;
PNEIGHBOR_PACKET Packet;
More information about the Ros-diffs
mailing list