[HEADERS]

[reactos.git] / reactos / include / ddk / tdikrnl.h

diff --git a/reactos/include/ddk/tdikrnl.h b/reactos/include/ddk/tdikrnl.h
index ef55f4a..7c5f90d 100644 (file)
--- a/reactos/include/ddk/tdikrnl.h
+++ b/reactos/include/ddk/tdikrnl.h
@@ -23,10 +23,6 @@
 #ifndef __TDIKRNL_H
 #define __TDIKRNL_H
 
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
 #include "tdi.h"
 
 #ifdef __cplusplus
@@ -34,7 +30,7 @@ extern "C" {
 #endif
 
 #if defined(_TDI_)
-  #define TDIKRNLAPI DECLSPEC_EXPORT
+  #define TDIKRNLAPI
 #else
   #define TDIKRNLAPI DECLSPEC_IMPORT
 #endif
@@ -160,8 +156,8 @@ typedef struct _TDI_REQUEST_KERNEL_SET_INFO {
 #define TDI_EVENT_CHAINED_RECEIVE_EXPEDITED 9
 #define TDI_EVENT_ERROR_EX                  10
 
-typedef NTSTATUS DDKAPI
-(*PTDI_IND_CONNECT)(
+typedef NTSTATUS
+(DDKAPI *PTDI_IND_CONNECT)(
   IN PVOID  TdiEventContext,
   IN LONG  RemoteAddressLength,
   IN PVOID  RemoteAddress,
@@ -186,8 +182,8 @@ TdiDefaultConnectHandler(
   OUT CONNECTION_CONTEXT *ConnectionContext,
   OUT PIRP  *AcceptIrp);
 
-typedef NTSTATUS DDKAPI
-(*PTDI_IND_DISCONNECT)(
+typedef NTSTATUS
+(DDKAPI *PTDI_IND_DISCONNECT)(
   IN PVOID  TdiEventContext,
   IN CONNECTION_CONTEXT  ConnectionContext,
   IN LONG  DisconnectDataLength,
@@ -208,13 +204,13 @@ TdiDefaultDisconnectHandler(
   IN PVOID  DisconnectInformation,
   IN ULONG  DisconnectFlags);
 
-typedef NTSTATUS DDKAPI
-(*PTDI_IND_ERROR)(
+typedef NTSTATUS
+(DDKAPI *PTDI_IND_ERROR)(
   IN PVOID  TdiEventContext,
   IN NTSTATUS  Status);
 
-typedef NTSTATUS DDKAPI
-(*PTDI_IND_ERROR_EX)(
+typedef NTSTATUS
+(DDKAPI *PTDI_IND_ERROR_EX)(
   IN PVOID  TdiEventContext,
   IN NTSTATUS  Status,
   IN PVOID  Buffer);
@@ -226,8 +222,8 @@ TdiDefaultErrorHandler(
   IN PVOID  TdiEventContext,
   IN NTSTATUS  Status);
 
-typedef NTSTATUS DDKAPI
-(*PTDI_IND_RECEIVE)(
+typedef NTSTATUS
+(DDKAPI *PTDI_IND_RECEIVE)(
   IN PVOID  TdiEventContext,
   IN CONNECTION_CONTEXT  ConnectionContext,
   IN ULONG  ReceiveFlags,
@@ -250,8 +246,8 @@ TdiDefaultReceiveHandler(
   IN PVOID  Tsdu,
   OUT PIRP  *IoRequestPacket);
 
-typedef NTSTATUS DDKAPI
-(*PTDI_IND_RECEIVE_DATAGRAM)(
+typedef NTSTATUS
+(DDKAPI *PTDI_IND_RECEIVE_DATAGRAM)(
   IN PVOID  TdiEventContext,
   IN LONG  SourceAddressLength,
   IN PVOID  SourceAddress,
@@ -279,8 +275,8 @@ TdiDefaultRcvDatagramHandler(
   IN PVOID  Tsdu,
   OUT PIRP  *IoRequestPacket);
 
-typedef NTSTATUS DDKAPI
-(*PTDI_IND_RECEIVE_EXPEDITED)(
+typedef NTSTATUS
+(DDKAPI *PTDI_IND_RECEIVE_EXPEDITED)(
   IN PVOID  TdiEventContext,
   IN CONNECTION_CONTEXT  ConnectionContext,
   IN ULONG  ReceiveFlags,
@@ -303,8 +299,8 @@ TdiDefaultRcvExpeditedHandler(
   IN PVOID  Tsdu,
   OUT PIRP  *IoRequestPacket);
 
-typedef NTSTATUS DDKAPI
-(*PTDI_IND_CHAINED_RECEIVE)(
+typedef NTSTATUS
+(DDKAPI *PTDI_IND_CHAINED_RECEIVE)(
   IN PVOID  TdiEventContext,
   IN CONNECTION_CONTEXT  ConnectionContext,
   IN ULONG  ReceiveFlags,
@@ -325,8 +321,8 @@ TdiDefaultChainedReceiveHandler(
   IN PMDL  Tsdu,
   IN PVOID  TsduDescriptor);
 
-typedef NTSTATUS DDKAPI
-(*PTDI_IND_CHAINED_RECEIVE_DATAGRAM)(
+typedef NTSTATUS
+(DDKAPI *PTDI_IND_CHAINED_RECEIVE_DATAGRAM)(
   IN PVOID  TdiEventContext,
   IN LONG  SourceAddressLength,
   IN PVOID  SourceAddress,
@@ -353,8 +349,8 @@ TdiDefaultChainedRcvDatagramHandler(
   IN PMDL  Tsdu,
   IN PVOID  TsduDescriptor);
 
-typedef NTSTATUS DDKAPI
-(*PTDI_IND_CHAINED_RECEIVE_EXPEDITED)(
+typedef NTSTATUS
+(DDKAPI *PTDI_IND_CHAINED_RECEIVE_EXPEDITED)(
   IN PVOID  TdiEventContext,
   IN CONNECTION_CONTEXT  ConnectionContext,
   IN ULONG  ReceiveFlags,
@@ -375,8 +371,8 @@ TdiDefaultChainedRcvExpeditedHandler(
   IN PMDL  Tsdu,
   IN PVOID  TsduDescriptor);
 
-typedef NTSTATUS DDKAPI
-(*PTDI_IND_SEND_POSSIBLE)(
+typedef NTSTATUS
+(DDKAPI *PTDI_IND_SEND_POSSIBLE)(
   IN PVOID  TdiEventContext,
   IN PVOID  ConnectionContext,
   IN ULONG  BytesAvailable);
@@ -401,7 +397,9 @@ TdiDefaultSendPossibleHandler(
   bIrpSp->DeviceObject  = (bDevObj);                                      \
   bIrpSp->FileObject    = (bFileObj);                                     \
   if (bCompRoutine)                                                       \
-    IoSetCompletionRoutine(bIrp, bCompRoutine, bContxt, TRUE, TRUE, TRUE) \
+  {                                                                       \
+    IoSetCompletionRoutine(bIrp, bCompRoutine, bContxt, TRUE, TRUE, TRUE);\
+  }                                                                       \
   else                                                                    \
     IoSetCompletionRoutine(bIrp, NULL, NULL, FALSE, FALSE, FALSE);        \
 }
@@ -577,7 +575,7 @@ TdiDefaultSendPossibleHandler(
   IrpSubFunction, DeviceObject,           \
   FileObject, Event, IoStatusBlock)       \
   IoBuildDeviceIoControlRequest(          \
-               0x00000003, DeviceObject,             \
+               IrpSubFunction, DeviceObject,             \
                NULL, 0, NULL, 0,                     \
                TRUE, Event, IoStatusBlock)
 
@@ -870,49 +868,49 @@ typedef struct _TDI_PNP_CONTEXT {
   UCHAR  ContextData[1];
 } TDI_PNP_CONTEXT, *PTDI_PNP_CONTEXT;
 
-typedef VOID DDKAPI
-(*TDI_ADD_ADDRESS_HANDLER)(
+typedef VOID
+(DDKAPI *TDI_ADD_ADDRESS_HANDLER)(
   IN PTA_ADDRESS  Address);
 
-typedef VOID DDKAPI
-(*TDI_ADD_ADDRESS_HANDLER_V2)(
+typedef VOID
+(DDKAPI *TDI_ADD_ADDRESS_HANDLER_V2)(
   IN PTA_ADDRESS  Address,
   IN PUNICODE_STRING  DeviceName,
   IN PTDI_PNP_CONTEXT  Context);
 
-typedef VOID DDKAPI
-(*TDI_BINDING_HANDLER)(
+typedef VOID
+(DDKAPI *TDI_BINDING_HANDLER)(
   IN TDI_PNP_OPCODE  PnPOpcode,
   IN PUNICODE_STRING  DeviceName,
   IN PWSTR  MultiSZBindList);
 
-typedef VOID DDKAPI
-(*TDI_BIND_HANDLER)(
+typedef VOID
+(DDKAPI *TDI_BIND_HANDLER)(
   IN PUNICODE_STRING  DeviceName);
 
-typedef VOID DDKAPI
-(*TDI_DEL_ADDRESS_HANDLER)(
+typedef VOID
+(DDKAPI *TDI_DEL_ADDRESS_HANDLER)(
   IN PTA_ADDRESS  Address);
 
-typedef VOID DDKAPI
-(*TDI_DEL_ADDRESS_HANDLER_V2)(
+typedef VOID
+(DDKAPI *TDI_DEL_ADDRESS_HANDLER_V2)(
   IN PTA_ADDRESS  Address,
   IN PUNICODE_STRING  DeviceName,
   IN PTDI_PNP_CONTEXT  Context);
 
-typedef NTSTATUS DDKAPI
-(*TDI_PNP_POWER_HANDLER)(
+typedef NTSTATUS
+(DDKAPI *TDI_PNP_POWER_HANDLER)(
   IN PUNICODE_STRING  DeviceName,
   IN PNET_PNP_EVENT  PowerEvent,
   IN PTDI_PNP_CONTEXT  Context1,
   IN PTDI_PNP_CONTEXT  Context2);
 
-typedef VOID DDKAPI
-(*TDI_UNBIND_HANDLER)(
+typedef VOID
+(DDKAPI *TDI_UNBIND_HANDLER)(
   IN PUNICODE_STRING  DeviceName);
 
-typedef VOID DDKAPI
-(*ProviderPnPPowerComplete)(
+typedef VOID
+(DDKAPI *ProviderPnPPowerComplete)(
   IN PNET_PNP_EVENT  NetEvent,
   IN NTSTATUS  ProviderStatus);