[sginsberg] 42210: - Fix most of the network stack for msvc (except tcpip and oskittcp) - Fix calling convention definitions for ntdd8042.h - Fix msfs' calling convention
Author: sginsberg Date: Sat Jul 25 16:51:56 2009 New Revision: 42210
URL: http://svn.reactos.org/svn/reactos?rev=42210&view=rev Log: - Fix most of the network stack for msvc (except tcpip and oskittcp) - Fix calling convention definitions for ntdd8042.h - Fix msfs' calling convention
Modified: trunk/reactos/drivers/filesystems/msfs/msfs.h trunk/reactos/drivers/network/afd/afd/lock.c trunk/reactos/drivers/network/ndis/ndis/misc.c trunk/reactos/include/ddk/ndis.h trunk/reactos/include/ddk/ntdd8042.h trunk/reactos/include/ddk/tdikrnl.h
Modified: trunk/reactos/drivers/filesystems/msfs/msfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/msfs/ms... ============================================================================== --- trunk/reactos/drivers/filesystems/msfs/msfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/msfs/msfs.h [iso-8859-1] Sat Jul 25 16:51:56 2009 @@ -12,21 +12,7 @@ #include <ntifs.h> #include <iotypes.h>
-/* - * FIXME: GCC doesn't have a working option for defaulting to a calling - * convention. It will always default to cdecl. The MS DDK was designed - * for compilers which support this option, and thus some of their headers - * do not specify STDCALL or NTAPI everywhere. As such, callbacks will be - * interpreted as cdecl on gcc, while they should be stdcall. Defining - * NTAPI manually won't work either, since msvc will realize that the - * two definitions are different. So we have to use something to close - * the compatibility gap, until someone fixes gcc. - */ -#ifdef _MSC_VER -#define DEFAULTAPI -#else -#define DEFAULTAPI __stdcall -#endif +#define DEFAULTAPI NTAPI
typedef struct _MSFS_DEVICE_EXTENSION {
Modified: trunk/reactos/drivers/network/afd/afd/lock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/loc... ============================================================================== --- trunk/reactos/drivers/network/afd/afd/lock.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/lock.c [iso-8859-1] Sat Jul 25 16:51:56 2009 @@ -73,13 +73,14 @@ UINT Size = sizeof(AFD_WSABUF) * (Count + Lock); PAFD_WSABUF NewBuf = ExAllocatePool( PagedPool, Size * 2 ); BOOLEAN LockFailed = FALSE; + PAFD_MAPBUF MapBuf;
AFD_DbgPrint(MID_TRACE,("Called(%08x)\n", NewBuf));
if( NewBuf ) { RtlZeroMemory(NewBuf, Size * 2);
- PAFD_MAPBUF MapBuf = (PAFD_MAPBUF)(NewBuf + Count + Lock); + MapBuf = (PAFD_MAPBUF)(NewBuf + Count + Lock);
_SEH2_TRY { RtlCopyMemory( NewBuf, Buf, sizeof(AFD_WSABUF) * Count );
Modified: trunk/reactos/drivers/network/ndis/ndis/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/m... ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/misc.c [iso-8859-1] Sat Jul 25 16:51:56 2009 @@ -462,8 +462,8 @@ pNdisItem->Routine(pNdisItem, pNdisItem->Context); }
-EXPORT NDIS_STATUS +EXPORT NdisScheduleWorkItem( IN PNDIS_WORK_ITEM pWorkItem) {
Modified: trunk/reactos/include/ddk/ndis.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ndis.h?rev=4221... ============================================================================== --- trunk/reactos/include/ddk/ndis.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ndis.h [iso-8859-1] Sat Jul 25 16:51:56 2009 @@ -258,8 +258,8 @@
/* Timer */
-typedef VOID DDKAPI -(*PNDIS_TIMER_FUNCTION)( +typedef VOID +(DDKAPI *PNDIS_TIMER_FUNCTION)( IN PVOID SystemSpecific1, IN PVOID FunctionContext, IN PVOID SystemSpecific2, @@ -635,17 +635,17 @@ } NDIS_WAN_LINE_UP, *PNDIS_WAN_LINE_UP;
-typedef VOID DDKAPI -(*ADAPTER_SHUTDOWN_HANDLER)( +typedef VOID +(DDKAPI *ADAPTER_SHUTDOWN_HANDLER)( IN PVOID ShutdownContext);
-typedef NTSTATUS DDKAPI -(*TDI_REGISTER_CALLBACK)( +typedef NTSTATUS +(DDKAPI *TDI_REGISTER_CALLBACK)( IN PUNICODE_STRING DeviceName, OUT HANDLE* TdiHandle);
-typedef NTSTATUS DDKAPI -(*TDI_PNP_HANDLER)( +typedef NTSTATUS +(DDKAPI *TDI_PNP_HANDLER)( IN PUNICODE_STRING UpperComponent, IN PUNICODE_STRING LowerComponent, IN PUNICODE_STRING BindList, @@ -1072,97 +1072,97 @@
/* Call Manager */
-typedef VOID DDKAPI -(*CM_ACTIVATE_VC_COMPLETE_HANDLER)( +typedef VOID +(DDKAPI *CM_ACTIVATE_VC_COMPLETE_HANDLER)( IN NDIS_STATUS Status, IN NDIS_HANDLE CallMgrVcContext, IN PCO_CALL_PARAMETERS CallParameters);
-typedef NDIS_STATUS DDKAPI -(*CM_ADD_PARTY_HANDLER)( +typedef NDIS_STATUS +(DDKAPI *CM_ADD_PARTY_HANDLER)( IN NDIS_HANDLE CallMgrVcContext, IN OUT PCO_CALL_PARAMETERS CallParameters, IN NDIS_HANDLE NdisPartyHandle, OUT PNDIS_HANDLE CallMgrPartyContext);
-typedef NDIS_STATUS DDKAPI -(*CM_CLOSE_AF_HANDLER)( +typedef NDIS_STATUS +(DDKAPI *CM_CLOSE_AF_HANDLER)( IN NDIS_HANDLE CallMgrAfContext);
-typedef NDIS_STATUS DDKAPI -(*CM_CLOSE_CALL_HANDLER)( +typedef NDIS_STATUS +(DDKAPI *CM_CLOSE_CALL_HANDLER)( IN NDIS_HANDLE CallMgrVcContext, IN NDIS_HANDLE CallMgrPartyContext OPTIONAL, IN PVOID CloseData OPTIONAL, IN UINT Size OPTIONAL);
-typedef NDIS_STATUS DDKAPI -(*CM_DEREG_SAP_HANDLER)( +typedef NDIS_STATUS +(DDKAPI *CM_DEREG_SAP_HANDLER)( IN NDIS_HANDLE CallMgrSapContext);
-typedef VOID DDKAPI -(*CM_DEACTIVATE_VC_COMPLETE_HANDLER)( +typedef VOID +(DDKAPI *CM_DEACTIVATE_VC_COMPLETE_HANDLER)( IN NDIS_STATUS Status, IN NDIS_HANDLE CallMgrVcContext);
-typedef NDIS_STATUS DDKAPI -(*CM_DROP_PARTY_HANDLER)( +typedef NDIS_STATUS +(DDKAPI *CM_DROP_PARTY_HANDLER)( IN NDIS_HANDLE CallMgrPartyContext, IN PVOID CloseData OPTIONAL, IN UINT Size OPTIONAL);
-typedef VOID DDKAPI -(*CM_INCOMING_CALL_COMPLETE_HANDLER)( +typedef VOID +(DDKAPI *CM_INCOMING_CALL_COMPLETE_HANDLER)( IN NDIS_STATUS Status, IN NDIS_HANDLE CallMgrVcContext, IN PCO_CALL_PARAMETERS CallParameters);
-typedef NDIS_STATUS DDKAPI -(*CM_MAKE_CALL_HANDLER)( +typedef NDIS_STATUS +(DDKAPI *CM_MAKE_CALL_HANDLER)( IN NDIS_HANDLE CallMgrVcContext, IN OUT PCO_CALL_PARAMETERS CallParameters, IN NDIS_HANDLE NdisPartyHandle OPTIONAL, OUT PNDIS_HANDLE CallMgrPartyContext OPTIONAL);
-typedef NDIS_STATUS DDKAPI -(*CM_MODIFY_CALL_QOS_HANDLER)( +typedef NDIS_STATUS +(DDKAPI *CM_MODIFY_CALL_QOS_HANDLER)( IN NDIS_HANDLE CallMgrVcContext, IN PCO_CALL_PARAMETERS CallParameters);
-typedef NDIS_STATUS DDKAPI -(*CM_OPEN_AF_HANDLER)( +typedef NDIS_STATUS +(DDKAPI *CM_OPEN_AF_HANDLER)( IN NDIS_HANDLE CallMgrBindingContext, IN PCO_ADDRESS_FAMILY AddressFamily, IN NDIS_HANDLE NdisAfHandle, OUT PNDIS_HANDLE CallMgrAfContext);
-typedef NDIS_STATUS DDKAPI -(*CM_REG_SAP_HANDLER)( +typedef NDIS_STATUS +(DDKAPI *CM_REG_SAP_HANDLER)( IN NDIS_HANDLE CallMgrAfContext, IN PCO_SAP Sap, IN NDIS_HANDLE NdisSapHandle, OUT PNDIS_HANDLE CallMgrSapContext);
-typedef NDIS_STATUS DDKAPI -(*CO_CREATE_VC_HANDLER)( +typedef NDIS_STATUS +(DDKAPI *CO_CREATE_VC_HANDLER)( IN NDIS_HANDLE ProtocolAfContext, IN NDIS_HANDLE NdisVcHandle, OUT PNDIS_HANDLE ProtocolVcContext);
-typedef NDIS_STATUS DDKAPI -(*CO_DELETE_VC_HANDLER)( +typedef NDIS_STATUS +(DDKAPI *CO_DELETE_VC_HANDLER)( IN NDIS_HANDLE ProtocolVcContext);
-typedef VOID DDKAPI -(*CO_REQUEST_COMPLETE_HANDLER)( +typedef VOID +(DDKAPI *CO_REQUEST_COMPLETE_HANDLER)( IN NDIS_STATUS Status, IN NDIS_HANDLE ProtocolAfContext OPTIONAL, IN NDIS_HANDLE ProtocolVcContext OPTIONAL, IN NDIS_HANDLE ProtocolPartyContext OPTIONAL, IN PNDIS_REQUEST NdisRequest);
-typedef NDIS_STATUS DDKAPI -(*CO_REQUEST_HANDLER)( +typedef NDIS_STATUS +(DDKAPI *CO_REQUEST_HANDLER)( IN NDIS_HANDLE ProtocolAfContext, IN NDIS_HANDLE ProtocolVcContext OPTIONAL, IN NDIS_HANDLE ProtocolPartyContext OPTIONAL, @@ -1200,81 +1200,81 @@ IN NDIS_HANDLE ProtocolAfContext, IN NDIS_HANDLE NdisAfHandle);
-typedef VOID DDKAPI -(*CL_CLOSE_AF_COMPLETE_HANDLER)( +typedef VOID +(DDKAPI *CL_CLOSE_AF_COMPLETE_HANDLER)( IN NDIS_STATUS Status, IN NDIS_HANDLE ProtocolAfContext);
-typedef VOID DDKAPI -(*CL_REG_SAP_COMPLETE_HANDLER)( +typedef VOID +(DDKAPI *CL_REG_SAP_COMPLETE_HANDLER)( IN NDIS_STATUS Status, IN NDIS_HANDLE ProtocolSapContext, IN PCO_SAP Sap, IN NDIS_HANDLE NdisSapHandle);
-typedef VOID DDKAPI -(*CL_DEREG_SAP_COMPLETE_HANDLER)( +typedef VOID +(DDKAPI *CL_DEREG_SAP_COMPLETE_HANDLER)( IN NDIS_STATUS Status, IN NDIS_HANDLE ProtocolSapContext);
-typedef VOID DDKAPI -(*CL_MAKE_CALL_COMPLETE_HANDLER)( +typedef VOID +(DDKAPI *CL_MAKE_CALL_COMPLETE_HANDLER)( IN NDIS_STATUS Status, IN NDIS_HANDLE ProtocolVcContext, IN NDIS_HANDLE NdisPartyHandle OPTIONAL, IN PCO_CALL_PARAMETERS CallParameters);
-typedef VOID DDKAPI -(*CL_MODIFY_CALL_QOS_COMPLETE_HANDLER)( +typedef VOID +(DDKAPI *CL_MODIFY_CALL_QOS_COMPLETE_HANDLER)( IN NDIS_STATUS Status, IN NDIS_HANDLE ProtocolVcContext, IN PCO_CALL_PARAMETERS CallParameters);
-typedef VOID DDKAPI -(*CL_CLOSE_CALL_COMPLETE_HANDLER)( +typedef VOID +(DDKAPI *CL_CLOSE_CALL_COMPLETE_HANDLER)( IN NDIS_STATUS Status, IN NDIS_HANDLE ProtocolVcContext, IN NDIS_HANDLE ProtocolPartyContext OPTIONAL);
-typedef VOID DDKAPI -(*CL_ADD_PARTY_COMPLETE_HANDLER)( +typedef VOID +(DDKAPI *CL_ADD_PARTY_COMPLETE_HANDLER)( IN NDIS_STATUS Status, IN NDIS_HANDLE ProtocolPartyContext, IN NDIS_HANDLE NdisPartyHandle, IN PCO_CALL_PARAMETERS CallParameters);
-typedef VOID DDKAPI -(*CL_DROP_PARTY_COMPLETE_HANDLER)( +typedef VOID +(DDKAPI *CL_DROP_PARTY_COMPLETE_HANDLER)( IN NDIS_STATUS Status, IN NDIS_HANDLE ProtocolPartyContext);
-typedef NDIS_STATUS DDKAPI -(*CL_INCOMING_CALL_HANDLER)( +typedef NDIS_STATUS +(DDKAPI *CL_INCOMING_CALL_HANDLER)( IN NDIS_HANDLE ProtocolSapContext, IN NDIS_HANDLE ProtocolVcContext, IN OUT PCO_CALL_PARAMETERS CallParameters);
-typedef VOID DDKAPI -(*CL_INCOMING_CALL_QOS_CHANGE_HANDLER)( +typedef VOID +(DDKAPI *CL_INCOMING_CALL_QOS_CHANGE_HANDLER)( IN NDIS_HANDLE ProtocolVcContext, IN PCO_CALL_PARAMETERS CallParameters);
-typedef VOID DDKAPI -(*CL_INCOMING_CLOSE_CALL_HANDLER)( +typedef VOID +(DDKAPI *CL_INCOMING_CLOSE_CALL_HANDLER)( IN NDIS_STATUS CloseStatus, IN NDIS_HANDLE ProtocolVcContext, IN PVOID CloseData OPTIONAL, IN UINT Size OPTIONAL);
-typedef VOID DDKAPI -(*CL_INCOMING_DROP_PARTY_HANDLER)( +typedef VOID +(DDKAPI *CL_INCOMING_DROP_PARTY_HANDLER)( IN NDIS_STATUS DropStatus, IN NDIS_HANDLE ProtocolPartyContext, IN PVOID CloseData OPTIONAL, IN UINT Size OPTIONAL);
-typedef VOID DDKAPI -(*CL_CALL_CONNECTED_HANDLER)( +typedef VOID +(DDKAPI *CL_CALL_CONNECTED_HANDLER)( IN NDIS_HANDLE ProtocolVcContext);
@@ -1308,65 +1308,65 @@
/* Prototypes for NDIS 3.0 protocol characteristics */
-typedef VOID DDKAPI -(*OPEN_ADAPTER_COMPLETE_HANDLER)( +typedef VOID +(DDKAPI *OPEN_ADAPTER_COMPLETE_HANDLER)( IN NDIS_HANDLE ProtocolBindingContext, IN NDIS_STATUS Status, IN NDIS_STATUS OpenErrorStatus);
-typedef VOID DDKAPI -(*CLOSE_ADAPTER_COMPLETE_HANDLER)( +typedef VOID +(DDKAPI *CLOSE_ADAPTER_COMPLETE_HANDLER)( IN NDIS_HANDLE ProtocolBindingContext, IN NDIS_STATUS Status);
-typedef VOID DDKAPI -(*RESET_COMPLETE_HANDLER)( +typedef VOID +(DDKAPI *RESET_COMPLETE_HANDLER)( IN NDIS_HANDLE ProtocolBindingContext, IN NDIS_STATUS Status);
-typedef VOID DDKAPI -(*REQUEST_COMPLETE_HANDLER)( +typedef VOID +(DDKAPI *REQUEST_COMPLETE_HANDLER)( IN NDIS_HANDLE ProtocolBindingContext, IN PNDIS_REQUEST NdisRequest, IN NDIS_STATUS Status);
-typedef VOID DDKAPI -(*STATUS_HANDLER)( +typedef VOID +(DDKAPI *STATUS_HANDLER)( IN NDIS_HANDLE ProtocolBindingContext, IN NDIS_STATUS GeneralStatus, IN PVOID StatusBuffer, IN UINT StatusBufferSize);
-typedef VOID DDKAPI -(*STATUS_COMPLETE_HANDLER)( +typedef VOID +(DDKAPI *STATUS_COMPLETE_HANDLER)( IN NDIS_HANDLE ProtocolBindingContext);
-typedef VOID DDKAPI -(*SEND_COMPLETE_HANDLER)( +typedef VOID +(DDKAPI *SEND_COMPLETE_HANDLER)( IN NDIS_HANDLE ProtocolBindingContext, IN PNDIS_PACKET Packet, IN NDIS_STATUS Status);
-typedef VOID DDKAPI -(*WAN_SEND_COMPLETE_HANDLER)( +typedef VOID +(DDKAPI *WAN_SEND_COMPLETE_HANDLER)( IN NDIS_HANDLE ProtocolBindingContext, IN PNDIS_WAN_PACKET Packet, IN NDIS_STATUS Status);
-typedef VOID DDKAPI -(*TRANSFER_DATA_COMPLETE_HANDLER)( +typedef VOID +(DDKAPI *TRANSFER_DATA_COMPLETE_HANDLER)( IN NDIS_HANDLE ProtocolBindingContext, IN PNDIS_PACKET Packet, IN NDIS_STATUS Status, IN UINT BytesTransferred);
-typedef VOID DDKAPI -(*WAN_TRANSFER_DATA_COMPLETE_HANDLER)( +typedef VOID +(DDKAPI *WAN_TRANSFER_DATA_COMPLETE_HANDLER)( VOID);
-typedef NDIS_STATUS DDKAPI -(*RECEIVE_HANDLER)( +typedef NDIS_STATUS +(DDKAPI *RECEIVE_HANDLER)( IN NDIS_HANDLE ProtocolBindingContext, IN NDIS_HANDLE MacReceiveContext, IN PVOID HeaderBuffer, @@ -1375,14 +1375,14 @@ IN UINT LookaheadBufferSize, IN UINT PacketSize);
-typedef NDIS_STATUS DDKAPI -(*WAN_RECEIVE_HANDLER)( +typedef NDIS_STATUS +(DDKAPI *WAN_RECEIVE_HANDLER)( IN NDIS_HANDLE NdisLinkHandle, IN PUCHAR Packet, IN ULONG PacketSize);
-typedef VOID DDKAPI -(*RECEIVE_COMPLETE_HANDLER)( +typedef VOID +(DDKAPI *RECEIVE_COMPLETE_HANDLER)( IN NDIS_HANDLE ProtocolBindingContext);
@@ -1424,32 +1424,32 @@
/* Prototypes for NDIS 4.0 protocol characteristics */
-typedef INT DDKAPI -(*RECEIVE_PACKET_HANDLER)( +typedef INT +(DDKAPI *RECEIVE_PACKET_HANDLER)( IN NDIS_HANDLE ProtocolBindingContext, IN PNDIS_PACKET Packet);
-typedef VOID DDKAPI -(*BIND_HANDLER)( +typedef VOID +(DDKAPI *BIND_HANDLER)( OUT PNDIS_STATUS Status, IN NDIS_HANDLE BindContext, IN PNDIS_STRING DeviceName, IN PVOID SystemSpecific1, IN PVOID SystemSpecific2);
-typedef VOID DDKAPI -(*UNBIND_HANDLER)( +typedef VOID +(DDKAPI *UNBIND_HANDLER)( OUT PNDIS_STATUS Status, IN NDIS_HANDLE ProtocolBindingContext, IN NDIS_HANDLE UnbindContext);
-typedef NDIS_STATUS DDKAPI -(*PNP_EVENT_HANDLER)( +typedef NDIS_STATUS +(DDKAPI *PNP_EVENT_HANDLER)( IN NDIS_HANDLE ProtocolBindingContext, IN PNET_PNP_EVENT NetPnPEvent);
-typedef VOID DDKAPI -(*UNLOAD_PROTOCOL_HANDLER)( +typedef VOID +(DDKAPI *UNLOAD_PROTOCOL_HANDLER)( VOID);
@@ -1483,28 +1483,28 @@
/* Prototypes for NDIS 5.0 protocol characteristics */
-typedef VOID DDKAPI -(*CO_SEND_COMPLETE_HANDLER)( +typedef VOID +(DDKAPI *CO_SEND_COMPLETE_HANDLER)( IN NDIS_STATUS Status, IN NDIS_HANDLE ProtocolVcContext, IN PNDIS_PACKET Packet);
-typedef VOID DDKAPI -(*CO_STATUS_HANDLER)( +typedef VOID +(DDKAPI *CO_STATUS_HANDLER)( IN NDIS_HANDLE ProtocolBindingContext, IN NDIS_HANDLE ProtocolVcContext OPTIONAL, IN NDIS_STATUS GeneralStatus, IN PVOID StatusBuffer, IN UINT StatusBufferSize);
-typedef UINT DDKAPI -(*CO_RECEIVE_PACKET_HANDLER)( +typedef UINT +(DDKAPI *CO_RECEIVE_PACKET_HANDLER)( IN NDIS_HANDLE ProtocolBindingContext, IN NDIS_HANDLE ProtocolVcContext, IN PNDIS_PACKET Packet);
-typedef VOID DDKAPI -(*CO_AF_REGISTER_NOTIFY_HANDLER)( +typedef VOID +(DDKAPI *CO_AF_REGISTER_NOTIFY_HANDLER)( IN NDIS_HANDLE ProtocolBindingContext, IN PCO_ADDRESS_FAMILY AddressFamily);
@@ -1536,7 +1536,7 @@
#if defined(NDIS50) || defined(NDIS51) typedef struct _NDIS_PROTOCOL_CHARACTERISTICS { - NDIS50_PROTOCOL_CHARACTERISTICS_S; + NDIS50_PROTOCOL_CHARACTERISTICS_S } NDIS_PROTOCOL_CHARACTERISTICS, *PNDIS_PROTOCOL_CHARACTERISTICS; #elif defined(NDIS40) typedef struct _NDIS_PROTOCOL_CHARACTERISTICS { @@ -2452,8 +2452,8 @@ #define NdisZeroMemory(Destination, Length) \ RtlZeroMemory(Destination, Length)
-typedef VOID DDKAPI -(*NDIS_BLOCK_INITIALIZER) ( +typedef VOID +(DDKAPI *NDIS_BLOCK_INITIALIZER) ( IN PUCHAR Block, IN SIZE_T NumberOfBytes ); @@ -3646,28 +3646,28 @@
/* Prototypes for NDIS_MINIPORT_CHARACTERISTICS */
-typedef BOOLEAN DDKAPI -(*W_CHECK_FOR_HANG_HANDLER)( +typedef BOOLEAN +(DDKAPI *W_CHECK_FOR_HANG_HANDLER)( IN NDIS_HANDLE MiniportAdapterContext);
-typedef VOID DDKAPI -(*W_DISABLE_INTERRUPT_HANDLER)( +typedef VOID +(DDKAPI *W_DISABLE_INTERRUPT_HANDLER)( IN NDIS_HANDLE MiniportAdapterContext);
-typedef VOID DDKAPI -(*W_ENABLE_INTERRUPT_HANDLER)( +typedef VOID +(DDKAPI *W_ENABLE_INTERRUPT_HANDLER)( IN NDIS_HANDLE MiniportAdapterContext);
-typedef VOID DDKAPI -(*W_HALT_HANDLER)( +typedef VOID +(DDKAPI *W_HALT_HANDLER)( IN NDIS_HANDLE MiniportAdapterContext);
-typedef VOID DDKAPI -(*W_HANDLE_INTERRUPT_HANDLER)( +typedef VOID +(DDKAPI *W_HANDLE_INTERRUPT_HANDLER)( IN NDIS_HANDLE MiniportAdapterContext);
-typedef NDIS_STATUS DDKAPI -(*W_INITIALIZE_HANDLER)( +typedef NDIS_STATUS +(DDKAPI *W_INITIALIZE_HANDLER)( OUT PNDIS_STATUS OpenErrorStatus, OUT PUINT SelectedMediumIndex, IN PNDIS_MEDIUM MediumArray, @@ -3675,14 +3675,14 @@ IN NDIS_HANDLE MiniportAdapterContext, IN NDIS_HANDLE WrapperConfigurationContext);
-typedef VOID DDKAPI -(*W_ISR_HANDLER)( +typedef VOID +(DDKAPI *W_ISR_HANDLER)( OUT PBOOLEAN InterruptRecognized, OUT PBOOLEAN QueueMiniportHandleInterrupt, IN NDIS_HANDLE MiniportAdapterContext);
-typedef NDIS_STATUS DDKAPI -(*W_QUERY_INFORMATION_HANDLER)( +typedef NDIS_STATUS +(DDKAPI *W_QUERY_INFORMATION_HANDLER)( IN NDIS_HANDLE MiniportAdapterContext, IN NDIS_OID Oid, IN PVOID InformationBuffer, @@ -3690,31 +3690,31 @@ OUT PULONG BytesWritten, OUT PULONG BytesNeeded);
-typedef NDIS_STATUS DDKAPI -(*W_RECONFIGURE_HANDLER)( +typedef NDIS_STATUS +(DDKAPI *W_RECONFIGURE_HANDLER)( OUT PNDIS_STATUS OpenErrorStatus, IN NDIS_HANDLE MiniportAdapterContext, IN NDIS_HANDLE WrapperConfigurationContext);
-typedef NDIS_STATUS DDKAPI -(*W_RESET_HANDLER)( +typedef NDIS_STATUS +(DDKAPI *W_RESET_HANDLER)( OUT PBOOLEAN AddressingReset, IN NDIS_HANDLE MiniportAdapterContext);
-typedef NDIS_STATUS DDKAPI -(*W_SEND_HANDLER)( +typedef NDIS_STATUS +(DDKAPI *W_SEND_HANDLER)( IN NDIS_HANDLE MiniportAdapterContext, IN PNDIS_PACKET Packet, IN UINT Flags);
-typedef NDIS_STATUS DDKAPI -(*WM_SEND_HANDLER)( +typedef NDIS_STATUS +(DDKAPI *WM_SEND_HANDLER)( IN NDIS_HANDLE MiniportAdapterContext, IN NDIS_HANDLE NdisLinkHandle, IN PNDIS_WAN_PACKET Packet);
-typedef NDIS_STATUS DDKAPI -(*W_SET_INFORMATION_HANDLER)( +typedef NDIS_STATUS +(DDKAPI *W_SET_INFORMATION_HANDLER)( IN NDIS_HANDLE MiniportAdapterContext, IN NDIS_OID Oid, IN PVOID InformationBuffer, @@ -3722,8 +3722,8 @@ OUT PULONG BytesRead, OUT PULONG BytesNeeded);
-typedef NDIS_STATUS DDKAPI -(*W_TRANSFER_DATA_HANDLER)( +typedef NDIS_STATUS +(DDKAPI *W_TRANSFER_DATA_HANDLER)( OUT PNDIS_PACKET Packet, OUT PUINT BytesTransferred, IN NDIS_HANDLE MiniportAdapterContext, @@ -3731,8 +3731,8 @@ IN UINT ByteOffset, IN UINT BytesToTransfer);
-typedef NDIS_STATUS DDKAPI -(*WM_TRANSFER_DATA_HANDLER)( +typedef NDIS_STATUS +(DDKAPI *WM_TRANSFER_DATA_HANDLER)( VOID);
@@ -3763,19 +3763,19 @@
/* Extensions for NDIS 4.0 miniports */
-typedef VOID DDKAPI -(*W_SEND_PACKETS_HANDLER)( +typedef VOID +(DDKAPI *W_SEND_PACKETS_HANDLER)( IN NDIS_HANDLE MiniportAdapterContext, IN PPNDIS_PACKET PacketArray, IN UINT NumberOfPackets);
-typedef VOID DDKAPI -(*W_RETURN_PACKET_HANDLER)( +typedef VOID +(DDKAPI *W_RETURN_PACKET_HANDLER)( IN NDIS_HANDLE MiniportAdapterContext, IN PNDIS_PACKET Packet);
-typedef VOID DDKAPI -(*W_ALLOCATE_COMPLETE_HANDLER)( +typedef VOID +(DDKAPI *W_ALLOCATE_COMPLETE_HANDLER)( IN NDIS_HANDLE MiniportAdapterContext, IN PVOID VirtualAddress, IN PNDIS_PHYSICAL_ADDRESS PhysicalAddress, @@ -3807,33 +3807,33 @@
/* Extensions for NDIS 5.0 miniports */
-typedef NDIS_STATUS DDKAPI -(*W_CO_CREATE_VC_HANDLER)( +typedef NDIS_STATUS +(DDKAPI *W_CO_CREATE_VC_HANDLER)( IN NDIS_HANDLE MiniportAdapterContext, IN NDIS_HANDLE NdisVcHandle, OUT PNDIS_HANDLE MiniportVcContext);
-typedef NDIS_STATUS DDKAPI -(*W_CO_DELETE_VC_HANDLER)( +typedef NDIS_STATUS +(DDKAPI *W_CO_DELETE_VC_HANDLER)( IN NDIS_HANDLE MiniportVcContext);
-typedef NDIS_STATUS DDKAPI -(*W_CO_ACTIVATE_VC_HANDLER)( +typedef NDIS_STATUS +(DDKAPI *W_CO_ACTIVATE_VC_HANDLER)( IN NDIS_HANDLE MiniportVcContext, IN OUT PCO_CALL_PARAMETERS CallParameters);
-typedef NDIS_STATUS DDKAPI -(*W_CO_DEACTIVATE_VC_HANDLER)( +typedef NDIS_STATUS +(DDKAPI *W_CO_DEACTIVATE_VC_HANDLER)( IN NDIS_HANDLE MiniportVcContext);
-typedef VOID DDKAPI -(*W_CO_SEND_PACKETS_HANDLER)( +typedef VOID +(DDKAPI *W_CO_SEND_PACKETS_HANDLER)( IN NDIS_HANDLE MiniportVcContext, IN PPNDIS_PACKET PacketArray, IN UINT NumberOfPackets);
-typedef NDIS_STATUS DDKAPI -(*W_CO_REQUEST_HANDLER)( +typedef NDIS_STATUS +(DDKAPI *W_CO_REQUEST_HANDLER)( IN NDIS_HANDLE MiniportAdapterContext, IN NDIS_HANDLE MiniportVcContext OPTIONAL, IN OUT PNDIS_REQUEST NdisRequest); @@ -3869,20 +3869,20 @@
/* Extensions for NDIS 5.1 miniports */
-typedef VOID DDKAPI -(*W_CANCEL_SEND_PACKETS_HANDLER)( +typedef VOID +(DDKAPI *W_CANCEL_SEND_PACKETS_HANDLER)( IN NDIS_HANDLE MiniportAdapterContext, IN PVOID CancelId);
-typedef VOID DDKAPI -(*W_PNP_EVENT_NOTIFY_HANDLER)( +typedef VOID +(DDKAPI *W_PNP_EVENT_NOTIFY_HANDLER)( IN NDIS_HANDLE MiniportAdapterContext, IN NDIS_DEVICE_PNP_EVENT PnPEvent, IN PVOID InformationBuffer, IN ULONG InformationBufferLength);
-typedef VOID DDKAPI -(*W_MINIPORT_SHUTDOWN_HANDLER)( +typedef VOID +(DDKAPI *W_MINIPORT_SHUTDOWN_HANDLER)( IN PVOID ShutdownContext);
#ifdef __cplusplus @@ -3926,13 +3926,13 @@ #endif
-typedef NDIS_STATUS DDKAPI -(*SEND_HANDLER)( +typedef NDIS_STATUS +(DDKAPI *SEND_HANDLER)( IN NDIS_HANDLE MacBindingHandle, IN PNDIS_PACKET Packet);
-typedef NDIS_STATUS DDKAPI -(*TRANSFER_DATA_HANDLER)( +typedef NDIS_STATUS +(DDKAPI *TRANSFER_DATA_HANDLER)( IN NDIS_HANDLE MacBindingHandle, IN NDIS_HANDLE MacReceiveContext, IN UINT ByteOffset, @@ -3940,12 +3940,12 @@ OUT PNDIS_PACKET Packet, OUT PUINT BytesTransferred);
-typedef NDIS_STATUS DDKAPI -(*RESET_HANDLER)( +typedef NDIS_STATUS +(DDKAPI *RESET_HANDLER)( IN NDIS_HANDLE MacBindingHandle);
-typedef NDIS_STATUS DDKAPI -(*REQUEST_HANDLER)( +typedef NDIS_STATUS +(DDKAPI *REQUEST_HANDLER)( IN NDIS_HANDLE MacBindingHandle, IN PNDIS_REQUEST NdisRequest);
@@ -3953,12 +3953,12 @@
/* Structures available only to full MAC drivers */
-typedef BOOLEAN DDKAPI -(*PNDIS_INTERRUPT_SERVICE)( +typedef BOOLEAN +(DDKAPI *PNDIS_INTERRUPT_SERVICE)( IN PVOID InterruptContext);
-typedef VOID DDKAPI -(*PNDIS_DEFERRED_PROCESSING)( +typedef VOID +(DDKAPI *PNDIS_DEFERRED_PROCESSING)( IN PVOID SystemSpecific1, IN PVOID InterruptContext, IN PVOID SystemSpecific2, @@ -4051,12 +4051,12 @@ } NDIS_BIND_PATHS, *PNDIS_BIND_PATHS;
-typedef VOID DDKAPI -(*ETH_RCV_COMPLETE_HANDLER)( +typedef VOID +(DDKAPI *ETH_RCV_COMPLETE_HANDLER)( IN PETH_FILTER Filter);
-typedef VOID DDKAPI -(*ETH_RCV_INDICATE_HANDLER)( +typedef VOID +(DDKAPI *ETH_RCV_INDICATE_HANDLER)( IN PETH_FILTER Filter, IN NDIS_HANDLE MacReceiveContext, IN PCHAR Address, @@ -4066,12 +4066,12 @@ IN UINT LookaheadBufferSize, IN UINT PacketSize);
-typedef VOID DDKAPI -(*FDDI_RCV_COMPLETE_HANDLER)( +typedef VOID +(DDKAPI *FDDI_RCV_COMPLETE_HANDLER)( IN PFDDI_FILTER Filter);
-typedef VOID DDKAPI -(*FDDI_RCV_INDICATE_HANDLER)( +typedef VOID +(DDKAPI *FDDI_RCV_INDICATE_HANDLER)( IN PFDDI_FILTER Filter, IN NDIS_HANDLE MacReceiveContext, IN PCHAR Address, @@ -4082,18 +4082,18 @@ IN UINT LookaheadBufferSize, IN UINT PacketSize);
-typedef VOID DDKAPI -(*FILTER_PACKET_INDICATION_HANDLER)( +typedef VOID +(DDKAPI *FILTER_PACKET_INDICATION_HANDLER)( IN NDIS_HANDLE Miniport, IN PPNDIS_PACKET PacketArray, IN UINT NumberOfPackets);
-typedef VOID DDKAPI -(*TR_RCV_COMPLETE_HANDLER)( +typedef VOID +(DDKAPI *TR_RCV_COMPLETE_HANDLER)( IN PTR_FILTER Filter);
-typedef VOID DDKAPI -(*TR_RCV_INDICATE_HANDLER)( +typedef VOID +(DDKAPI *TR_RCV_INDICATE_HANDLER)( IN PTR_FILTER Filter, IN NDIS_HANDLE MacReceiveContext, IN PVOID HeaderBuffer, @@ -4102,75 +4102,75 @@ IN UINT LookaheadBufferSize, IN UINT PacketSize);
-typedef VOID DDKAPI -(*WAN_RCV_COMPLETE_HANDLER)( +typedef VOID +(DDKAPI *WAN_RCV_COMPLETE_HANDLER)( IN NDIS_HANDLE MiniportAdapterHandle, IN NDIS_HANDLE NdisLinkContext);
-typedef VOID DDKAPI -(*WAN_RCV_HANDLER)( +typedef VOID +(DDKAPI *WAN_RCV_HANDLER)( OUT PNDIS_STATUS Status, IN NDIS_HANDLE MiniportAdapterHandle, IN NDIS_HANDLE NdisLinkContext, IN PUCHAR Packet, IN ULONG PacketSize);
-typedef VOID FASTCALL -(*NDIS_M_DEQUEUE_WORK_ITEM)( +typedef VOID +(FASTCALL *NDIS_M_DEQUEUE_WORK_ITEM)( IN PNDIS_MINIPORT_BLOCK Miniport, IN NDIS_WORK_ITEM_TYPE WorkItemType, OUT PVOID *WorkItemContext);
-typedef NDIS_STATUS FASTCALL -(*NDIS_M_QUEUE_NEW_WORK_ITEM)( +typedef NDIS_STATUS +(FASTCALL *NDIS_M_QUEUE_NEW_WORK_ITEM)( IN PNDIS_MINIPORT_BLOCK Miniport, IN NDIS_WORK_ITEM_TYPE WorkItemType, IN PVOID WorkItemContext);
-typedef NDIS_STATUS FASTCALL -(*NDIS_M_QUEUE_WORK_ITEM)( +typedef NDIS_STATUS +(FASTCALL *NDIS_M_QUEUE_WORK_ITEM)( IN PNDIS_MINIPORT_BLOCK Miniport, IN NDIS_WORK_ITEM_TYPE WorkItemType, IN PVOID WorkItemContext);
-typedef VOID DDKAPI -(*NDIS_M_REQ_COMPLETE_HANDLER)( +typedef VOID +(DDKAPI *NDIS_M_REQ_COMPLETE_HANDLER)( IN NDIS_HANDLE MiniportAdapterHandle, IN NDIS_STATUS Status);
-typedef VOID DDKAPI -(*NDIS_M_RESET_COMPLETE_HANDLER)( +typedef VOID +(DDKAPI *NDIS_M_RESET_COMPLETE_HANDLER)( IN NDIS_HANDLE MiniportAdapterHandle, IN NDIS_STATUS Status, IN BOOLEAN AddressingReset);
-typedef VOID DDKAPI -(*NDIS_M_SEND_COMPLETE_HANDLER)( +typedef VOID +(DDKAPI *NDIS_M_SEND_COMPLETE_HANDLER)( IN NDIS_HANDLE MiniportAdapterHandle, IN PNDIS_PACKET Packet, IN NDIS_STATUS Status);
-typedef VOID DDKAPI -(*NDIS_M_SEND_RESOURCES_HANDLER)( +typedef VOID +(DDKAPI *NDIS_M_SEND_RESOURCES_HANDLER)( IN NDIS_HANDLE MiniportAdapterHandle);
-typedef BOOLEAN FASTCALL -(*NDIS_M_START_SENDS)( +typedef BOOLEAN +(FASTCALL *NDIS_M_START_SENDS)( IN PNDIS_MINIPORT_BLOCK Miniport);
-typedef VOID DDKAPI -(*NDIS_M_STATUS_HANDLER)( +typedef VOID +(DDKAPI *NDIS_M_STATUS_HANDLER)( IN NDIS_HANDLE MiniportHandle, IN NDIS_STATUS GeneralStatus, IN PVOID StatusBuffer, IN UINT StatusBufferSize);
-typedef VOID DDKAPI -(*NDIS_M_STS_COMPLETE_HANDLER)( +typedef VOID +(DDKAPI *NDIS_M_STS_COMPLETE_HANDLER)( IN NDIS_HANDLE MiniportAdapterHandle);
-typedef VOID DDKAPI -(*NDIS_M_TD_COMPLETE_HANDLER)( +typedef VOID +(DDKAPI *NDIS_M_TD_COMPLETE_HANDLER)( IN NDIS_HANDLE MiniportAdapterHandle, IN PNDIS_PACKET Packet, IN NDIS_STATUS Status,
Modified: trunk/reactos/include/ddk/ntdd8042.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntdd8042.h?rev=... ============================================================================== --- trunk/reactos/include/ddk/ntdd8042.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntdd8042.h [iso-8859-1] Sat Jul 25 16:51:56 2009 @@ -133,38 +133,38 @@ ULONG Reserved[8]; } INTERNAL_I8042_START_INFORMATION, *PINTERNAL_I8042_START_INFORMATION;
-typedef VOID DDKAPI -(*PI8042_ISR_WRITE_PORT)( +typedef VOID +(DDKAPI *PI8042_ISR_WRITE_PORT)( IN PVOID Context, IN UCHAR Value);
-typedef VOID DDKAPI -(*PI8042_QUEUE_PACKET)( +typedef VOID +(DDKAPI *PI8042_QUEUE_PACKET)( IN PVOID Context);
-typedef NTSTATUS DDKAPI -(*PI8042_SYNCH_READ_PORT) ( +typedef NTSTATUS +(DDKAPI *PI8042_SYNCH_READ_PORT) ( IN PVOID Context, OUT PUCHAR Value, IN BOOLEAN WaitForACK);
-typedef NTSTATUS DDKAPI -(*PI8042_SYNCH_WRITE_PORT)( +typedef NTSTATUS +(DDKAPI *PI8042_SYNCH_WRITE_PORT)( IN PVOID Context, IN UCHAR Value, IN BOOLEAN WaitForACK);
-typedef NTSTATUS DDKAPI -(*PI8042_KEYBOARD_INITIALIZATION_ROUTINE)( +typedef NTSTATUS +(DDKAPI *PI8042_KEYBOARD_INITIALIZATION_ROUTINE)( IN PVOID InitializationContext, IN PVOID SynchFuncContext, IN PI8042_SYNCH_READ_PORT ReadPort, IN PI8042_SYNCH_WRITE_PORT WritePort, OUT PBOOLEAN TurnTranslationOn);
-typedef BOOLEAN DDKAPI -(*PI8042_KEYBOARD_ISR)( +typedef BOOLEAN +(DDKAPI *PI8042_KEYBOARD_ISR)( PVOID IsrContext, PKEYBOARD_INPUT_DATA CurrentInput, POUTPUT_PACKET CurrentOutput, @@ -182,8 +182,8 @@ IN PVOID CallContext; } INTERNAL_I8042_HOOK_KEYBOARD, *PINTERNAL_I8042_HOOK_KEYBOARD;
-typedef BOOLEAN DDKAPI -(*PI8042_MOUSE_ISR)( +typedef BOOLEAN +(DDKAPI *PI8042_MOUSE_ISR)( PVOID IsrContext, PMOUSE_INPUT_DATA CurrentInput, POUTPUT_PACKET CurrentOutput,
Modified: trunk/reactos/include/ddk/tdikrnl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/tdikrnl.h?rev=4... ============================================================================== --- trunk/reactos/include/ddk/tdikrnl.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/tdikrnl.h [iso-8859-1] Sat Jul 25 16:51:56 2009 @@ -156,8 +156,8 @@ #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, @@ -182,8 +182,8 @@ 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, @@ -204,13 +204,13 @@ 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); @@ -222,8 +222,8 @@ 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, @@ -246,8 +246,8 @@ 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, @@ -275,8 +275,8 @@ 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, @@ -299,8 +299,8 @@ 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, @@ -321,8 +321,8 @@ 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, @@ -349,8 +349,8 @@ 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, @@ -371,8 +371,8 @@ 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); @@ -866,49 +866,49 @@ 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);
-
sginsberg＠svn.reactos.org