Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-28 17:01:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

- ACPI: Don't redefine standard DDK types

Browse source 
- 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.

svn path=/trunk/; revision=37688
This commit is contained in:
Stefan Ginsberg 2008-11-27 15:02:47 +00:00
parent 21b28d3e0d
commit 67a842b6fe
20 changed files with 58 additions and 108 deletions
Download patch file Download diff file Expand all files Collapse all files

4
reactos/drivers/bus/acpi/include/platform/types.h
View file

@ -16,8 +16,4 @@
#include <ntddk.h>
#include <stdio.h>
typedef UCHAR UINT8;
typedef USHORT UINT16;
typedef ULONGLONG UINT64;
#endif /* __INCLUDE_ACPI_TYPES_H */

4
reactos/drivers/network/ndis/include/miniport.h
View file

@ -28,7 +28,11 @@ typedef struct _NDIS_M_DRIVER_BLOCK {
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

6
reactos/drivers/network/tcpip/datalink/lan.c
View file

@ -166,14 +166,14 @@ VOID FreeAdapter(
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 @@ static NTSTATUS ReadStringFromRegistry( HANDLE RegHandle,
NTSTATUS NTAPI AppendUnicodeString(PUNICODE_STRING ResultFirst,
PUNICODE_STRING Second,
BOOL Deallocate) {
BOOLEAN Deallocate) {
NTSTATUS Status;
UNICODE_STRING Ustr = *ResultFirst;
PWSTR new_string = ExAllocatePoolWithTag

2
reactos/drivers/network/tcpip/include/address.h
View file

@ -69,7 +69,7 @@ PADDRESS_FILE AddrSearchFirst(
PADDRESS_FILE AddrSearchNext(
PAF_SEARCH SearchContext);
unsigned long PASCAL inet_addr(const char*);
unsigned long NTAPI inet_addr(const char*);
ULONG IPv4NToHl( ULONG Address );

2
reactos/drivers/network/tcpip/include/interface.h
View file

@ -14,7 +14,7 @@ NTSTATUS GetInterfaceSpeed( PIP_INTERFACE Interface, PUINT Speed );
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

2
reactos/drivers/network/tcpip/include/lan.h
View file

@ -99,7 +99,7 @@ VOID LANStartup();
VOID LANShutdown();
NTSTATUS TcpipLanGetDwordOid( PIP_INTERFACE Interface, NDIS_OID Oid,
PDWORD Result );
PULONG Result );
NDIS_STATUS NDISCall(
PLAN_ADAPTER Adapter,

2
reactos/drivers/network/tcpip/include/lock.h
View file

@ -14,7 +14,7 @@ extern VOID TcpipAcquireFastMutex( PFAST_MUTEX Mutex );
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*/

2
reactos/drivers/network/tcpip/include/neighbor.h
View file

@ -107,7 +107,7 @@ BOOLEAN NBQueuePacket(
VOID NBRemoveNeighbor(
PNEIGHBOR_CACHE_ENTRY NCE);
DWORD NBCopyNeighbors(
ULONG NBCopyNeighbors(
PIP_INTERFACE Interface,
PIPARP_ENTRY ArpTable);

20
reactos/drivers/network/tcpip/include/titypes.h
View file

@ -176,40 +176,40 @@ typedef struct _ADDRESS_FILE {
/* 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 @@ typedef struct _TRANSPORT_CONTEXT {
CONNECTION_CONTEXT ConnectionContext;
HANDLE ControlChannel;
} Handle;
BOOL CancelIrps;
BOOLEAN CancelIrps;
KEVENT CleanupEvent;
} TRANSPORT_CONTEXT, *PTRANSPORT_CONTEXT;

6
reactos/drivers/network/tcpip/tcpip/iinfo.c
View file

@ -83,8 +83,8 @@ TDI_STATUS InfoTdiQueryGetArptableMIB(TDIEntityID *ID,
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 @@ TDI_STATUS InfoTdiQueryGetArpCapability(TDIEntityID *ID,
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)));

2
reactos/drivers/network/tcpip/tcpip/info.c
View file

@ -143,7 +143,7 @@ TDI_STATUS InfoTdiQueryInformationEx(
UINT i;
PVOID context = NULL;
NTSTATUS Status = TDI_INVALID_PARAMETER;
BOOL FoundEntity = FALSE;
BOOLEAN FoundEntity = FALSE;
InfoRequest_f InfoRequest = NULL;
TI_DbgPrint(DEBUG_INFO,

2
reactos/drivers/network/tcpip/tcpip/lock.c
View file

@ -48,7 +48,7 @@ VOID TcpipRecursiveMutexInit( PRECURSIVE_MUTEX RecMutex ) {
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 );

18
reactos/drivers/network/tcpip/tcpip/main.c
View file

@ -387,7 +387,7 @@ TiDispatchInternal(
*/
{
NTSTATUS Status;
BOOL Complete = TRUE;
BOOLEAN Complete = TRUE;
PIO_STACK_LOCATION IrpSp;
RIRP(Irp);
@ -912,11 +912,11 @@ DriverEntry(
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 @@ IPAddInterface(
VOID NTAPI
IPDelInterface(
DWORD Unknown0)
ULONG Unknown0)
{
UNIMPLEMENTED
}
@ -932,8 +932,8 @@ IPDelInterface(
VOID NTAPI
LookupRoute(
DWORD Unknown0,
DWORD Unknown1)
ULONG Unknown0,
ULONG Unknown1)
{
UNIMPLEMENTED
}

8
reactos/drivers/network/tdi/tdi/stubs.c
View file

@ -103,10 +103,10 @@ TdiMapUserRequest (
VOID
STDCALL
TdiOpenNetbiosAddress (
DWORD Unknown0,
DWORD Unknown1,
DWORD Unknown2,
DWORD Unknown3
ULONG Unknown0,
ULONG Unknown1,
ULONG Unknown2,
ULONG Unknown3
)
{
}

4
reactos/drivers/storage/ide/uniata/id_probe.cpp
View file

@ -504,8 +504,8 @@ UniataEnumBusMasterController__(
/* 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);

2
reactos/drivers/usb/nt4compat/usbdriver/usb.h
View file

@ -4,8 +4,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 */
#define BW_HUB_LS_SETUP 333L /* nanoseconds */

72
reactos/include/ddk/ndis.h
View file

@ -42,6 +42,10 @@
#include "netevent.h"
#include <qos.h>
#if !defined(_WINDEF_H)
typedef unsigned int UINT, *PUINT;
#endif
#ifdef __cplusplus
extern "C" {
#endif
@ -4106,6 +4110,11 @@ typedef struct _NDIS_OPEN_BLOCK NDIS_OPEN_BLOCK, *PNDIS_OPEN_BLOCK;
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 @@ typedef struct _NDIS_MINIPORT_WORK_ITEM {
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 @@ typedef struct _NDIS_BIND_PATHS {
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 @@ typedef VOID (DDKAPI *SEND_PACKETS_HANDLER)(
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 @@ struct _NDIS_OPEN_BLOCK
#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_ */
};

2
reactos/lib/drivers/ip/network/address.c
View file

@ -303,7 +303,7 @@ BOOLEAN AddrIsEqualIPv4(
}
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:

4
reactos/lib/drivers/ip/network/interface.c
View file

@ -39,7 +39,7 @@ NTSTATUS GetInterfaceIPv4Address( PIP_INTERFACE Interface,
}
UINT CountInterfaces() {
DWORD Count = 0;
ULONG Count = 0;
KIRQL OldIrql;
IF_LIST_ITER(CurrentIF);
@ -211,7 +211,7 @@ PIP_INTERFACE FindOnLinkInterface(PIP_ADDRESS Address)
}
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 ) {

2
reactos/lib/drivers/ip/network/neighbor.c
View file

@ -64,7 +64,7 @@ VOID NBSendPackets( PNEIGHBOR_CACHE_ENTRY NCE ) {
/* 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;