From 45ac874e115e097e66dcc3be1dc4193e3d1ef6aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9=20van=20Geldorp?= Date: Tue, 11 May 2004 20:52:10 +0000 Subject: [PATCH] Avoid warnings when using gcc 3.4 svn path=/trunk/; revision=9356 --- reactos/drivers/net/afd/afd/routines.c | 6 +- reactos/drivers/net/dd/ne2000/include/8390.h | 2 +- reactos/drivers/net/dd/ne2000/ne2000/8390.c | 10 +- reactos/drivers/net/dd/ne2000/ne2000/main.c | 30 +- reactos/drivers/net/ndis/ndis/buffer.c | 12 +- reactos/drivers/net/ndis/ndis/miniport.c | 6 +- reactos/drivers/net/ndis/ndis/protocol.c | 8 +- reactos/drivers/net/npf/openclos.c | 8 +- reactos/drivers/net/npf/packet.c | 10 +- reactos/drivers/net/npf/packet.h | 20 +- reactos/drivers/net/npf/read.c | 30 +- reactos/drivers/net/npf/win_bpf_filter.c | 4 +- reactos/drivers/net/npf/win_bpf_filter_init.c | 2 +- reactos/drivers/net/npf/write.c | 4 +- reactos/drivers/net/tcpip/datalink/arp.c | 8 +- reactos/drivers/net/tcpip/datalink/lan.c | 22 +- reactos/drivers/net/tcpip/datalink/loopback.c | 2 +- reactos/drivers/net/tcpip/network/transmit.c | 2 +- reactos/drivers/net/tcpip/tcpip/checksum.c | 2 +- reactos/drivers/net/tcpip/tcpip/fileobjs.c | 2 +- reactos/drivers/net/tcpip/tcpip/routines.c | 16 +- .../net/tcpip/transport/datagram/datagram.c | 2 +- reactos/drivers/net/tcpip/transport/udp/udp.c | 2 +- reactos/include/net/ndis.h | 329 +++++++++--------- 24 files changed, 269 insertions(+), 270 deletions(-) diff --git a/reactos/drivers/net/afd/afd/routines.c b/reactos/drivers/net/afd/afd/routines.c index 741d72bf52d..211ca5be16e 100644 --- a/reactos/drivers/net/afd/afd/routines.c +++ b/reactos/drivers/net/afd/afd/routines.c @@ -193,9 +193,9 @@ ULONG ChecksumCompute( register ULONG Sum = Seed; while (Count > 1) { - Sum += *(PUSHORT)Data; - Count -= 2; - (ULONG_PTR)Data += 2; + Sum += *(PUSHORT)Data; + Count -= 2; + Data = (PVOID) ((ULONG_PTR) Data + 2); } /* Add left-over byte, if any */ diff --git a/reactos/drivers/net/dd/ne2000/include/8390.h b/reactos/drivers/net/dd/ne2000/include/8390.h index 57b3107c03a..445cf94921f 100644 --- a/reactos/drivers/net/dd/ne2000/include/8390.h +++ b/reactos/drivers/net/dd/ne2000/include/8390.h @@ -153,7 +153,7 @@ typedef struct _PACKET_HEADER { NdisRawWritePortUchar((Adapter)->IOBase + PG0_IMR, (Adapter)->InterruptMask); \ } -VOID MiniportHandleInterrupt( +VOID STDCALL MiniportHandleInterrupt( IN NDIS_HANDLE MiniportAdapterContext); #endif /* __8390_H */ diff --git a/reactos/drivers/net/dd/ne2000/ne2000/8390.c b/reactos/drivers/net/dd/ne2000/ne2000/8390.c index 1ea6f92bc48..d99a9781dec 100644 --- a/reactos/drivers/net/dd/ne2000/ne2000/8390.c +++ b/reactos/drivers/net/dd/ne2000/ne2000/8390.c @@ -815,8 +815,8 @@ VOID NICReadData( /* Transfer as many words as we can without exceeding the buffer length */ Tmp = Length & 0xFFFE; NICReadDataAlign(Adapter, (PUSHORT)Target, Source, Tmp); - Source += Tmp; - (ULONG_PTR)Target += Tmp; + Source += Tmp; + Target = (PUCHAR)((ULONG_PTR) Target + Tmp); /* Read one word and keep the LSB */ NICReadDataAlign(Adapter, &Tmp, Source, 0x02); @@ -855,7 +855,7 @@ VOID NICWriteData( NICWriteDataAlign(Adapter, Target - 1, &Tmp, 0x02); /* Update pointers */ - (ULONG_PTR)Source += 1; + Source = (PUCHAR) ((ULONG_PTR) Source + 1); (ULONG_PTR)Target += 1; Length--; } @@ -1030,7 +1030,7 @@ VOID NICWritePacket( NICWriteData(Adapter, DstData, SrcData, BytesToCopy); - (ULONG_PTR)SrcData += BytesToCopy; + SrcData = (PUCHAR)((ULONG_PTR) SrcData + BytesToCopy); SrcSize -= BytesToCopy; DstData += BytesToCopy; DstSize -= BytesToCopy; @@ -1291,7 +1291,7 @@ VOID HandleTransmit( } -VOID MiniportHandleInterrupt( +VOID STDCALL MiniportHandleInterrupt( IN NDIS_HANDLE MiniportAdapterContext) /* * FUNCTION: Handler for deferred processing of interrupts diff --git a/reactos/drivers/net/dd/ne2000/ne2000/main.c b/reactos/drivers/net/dd/ne2000/ne2000/main.c index 6597e3ec395..fa85d5dddb6 100644 --- a/reactos/drivers/net/dd/ne2000/ne2000/main.c +++ b/reactos/drivers/net/dd/ne2000/ne2000/main.c @@ -69,7 +69,7 @@ BOOLEAN MiniportCheckForHang( } -VOID MiniportDisableInterrupt( +VOID STDCALL MiniportDisableInterrupt( IN NDIS_HANDLE MiniportAdapterContext) /* * FUNCTION: Disables interrupts from an adapter @@ -84,7 +84,7 @@ VOID MiniportDisableInterrupt( } -VOID MiniportEnableInterrupt( +VOID STDCALL MiniportEnableInterrupt( IN NDIS_HANDLE MiniportAdapterContext) /* * FUNCTION: Enables interrupts from an adapter @@ -99,7 +99,7 @@ VOID MiniportEnableInterrupt( } -VOID MiniportHalt( +VOID STDCALL MiniportHalt( IN NDIS_HANDLE MiniportAdapterContext) /* * FUNCTION: Deallocates resources for and halts an adapter @@ -139,7 +139,7 @@ VOID MiniportHalt( } -NDIS_STATUS MiniportInitialize( +NDIS_STATUS STDCALL MiniportInitialize( OUT PNDIS_STATUS OpenErrorStatus, OUT PUINT SelectedMediumIndex, IN PNDIS_MEDIUM MediumArray, @@ -347,7 +347,7 @@ NDIS_STATUS MiniportInitialize( } -VOID MiniportISR( +VOID STDCALL MiniportISR( OUT PBOOLEAN InterruptRecognized, OUT PBOOLEAN QueueMiniportHandleInterrupt, IN NDIS_HANDLE MiniportAdapterContext) @@ -372,7 +372,7 @@ VOID MiniportISR( } -NDIS_STATUS MiniportQueryInformation( +NDIS_STATUS STDCALL MiniportQueryInformation( IN NDIS_HANDLE MiniportAdapterContext, IN NDIS_OID Oid, IN PVOID InformationBuffer, @@ -530,7 +530,7 @@ NDIS_STATUS MiniportQueryInformation( } -NDIS_STATUS MiniportReconfigure( +NDIS_STATUS STDCALL MiniportReconfigure( OUT PNDIS_STATUS OpenErrorStatus, IN NDIS_HANDLE MiniportAdapterContext, IN NDIS_HANDLE WrapperConfigurationContext) @@ -553,7 +553,7 @@ NDIS_STATUS MiniportReconfigure( -NDIS_STATUS MiniportReset( +NDIS_STATUS STDCALL MiniportReset( OUT PBOOLEAN AddressingReset, IN NDIS_HANDLE MiniportAdapterContext) /* @@ -573,7 +573,7 @@ NDIS_STATUS MiniportReset( } -NDIS_STATUS MiniportSend( +NDIS_STATUS STDCALL MiniportSend( IN NDIS_HANDLE MiniportAdapterContext, IN PNDIS_PACKET Packet, IN UINT Flags) @@ -614,7 +614,7 @@ NDIS_STATUS MiniportSend( } -NDIS_STATUS MiniportSetInformation( +NDIS_STATUS STDCALL MiniportSetInformation( IN NDIS_HANDLE MiniportAdapterContext, IN NDIS_OID Oid, IN PVOID InformationBuffer, @@ -720,7 +720,7 @@ NDIS_STATUS MiniportSetInformation( } -NDIS_STATUS MiniportTransferData( +NDIS_STATUS STDCALL MiniportTransferData( OUT PNDIS_PACKET Packet, OUT PUINT BytesTransferred, IN NDIS_HANDLE MiniportAdapterContext, @@ -775,10 +775,10 @@ NDIS_STATUS MiniportTransferData( NICReadData(Adapter, DstData, SrcData, BytesToCopy); - BytesCopied += BytesToCopy; - SrcData += BytesToCopy; - (ULONG_PTR)DstData += BytesToCopy; - BytesToTransfer -= BytesToCopy; + BytesCopied += BytesToCopy; + SrcData += BytesToCopy; + DstData = (PUCHAR)((ULONG_PTR) DstData + BytesToCopy); + BytesToTransfer -= BytesToCopy; if (BytesToTransfer == 0) break; diff --git a/reactos/drivers/net/ndis/ndis/buffer.c b/reactos/drivers/net/ndis/ndis/buffer.c index 37b736f4d0a..1fd334c1a39 100644 --- a/reactos/drivers/net/ndis/ndis/buffer.c +++ b/reactos/drivers/net/ndis/ndis/buffer.c @@ -39,8 +39,8 @@ __inline ULONG SkipToOffset( NdisQueryBuffer(Buffer, (PVOID)Data, Size); if (Offset < *Size) { - ((ULONG_PTR)*Data) += Offset; - *Size -= Offset; + *Data = (PUCHAR) ((ULONG_PTR) *Data + Offset); + *Size -= Offset; break; } @@ -87,8 +87,8 @@ UINT CopyBufferToBufferChain( BytesToCopy = MIN(DstSize, Length); RtlCopyMemory((PVOID)DstData, (PVOID)SrcData, BytesToCopy); - BytesCopied += BytesToCopy; - (ULONG_PTR)SrcData += BytesToCopy; + BytesCopied += BytesToCopy; + SrcData = (PUCHAR) ((ULONG_PTR) SrcData + BytesToCopy); Length -= BytesToCopy; if (Length == 0) @@ -146,8 +146,8 @@ UINT CopyBufferChainToBuffer( NDIS_DbgPrint(MAX_TRACE, ("Copying (%d) bytes from 0x%X to 0x%X\n", BytesToCopy, SrcData, DstData)); RtlCopyMemory((PVOID)DstData, (PVOID)SrcData, BytesToCopy); - BytesCopied += BytesToCopy; - (ULONG_PTR)DstData += BytesToCopy; + BytesCopied += BytesToCopy; + DstData = (PUCHAR)((ULONG_PTR) DstData + BytesToCopy); Length -= BytesToCopy; if (Length == 0) diff --git a/reactos/drivers/net/ndis/ndis/miniport.c b/reactos/drivers/net/ndis/ndis/miniport.c index d41366e37f1..575396f4c87 100644 --- a/reactos/drivers/net/ndis/ndis/miniport.c +++ b/reactos/drivers/net/ndis/ndis/miniport.c @@ -306,7 +306,7 @@ MiniIndicateReceivePacket( } -VOID +VOID STDCALL MiniEthReceiveComplete( IN PETH_FILTER Filter) /* @@ -349,7 +349,7 @@ MiniEthReceiveComplete( } -VOID +VOID STDCALL MiniEthReceiveIndication( IN PETH_FILTER Filter, /* shouldn't be NDIS_HANDLE? */ IN NDIS_HANDLE MacReceiveContext, @@ -427,7 +427,7 @@ MiniSendResourcesAvailable( } -VOID +VOID STDCALL MiniTransferDataComplete( IN NDIS_HANDLE MiniportAdapterHandle, IN PNDIS_PACKET Packet, diff --git a/reactos/drivers/net/ndis/ndis/protocol.c b/reactos/drivers/net/ndis/ndis/protocol.c index 059ac0a5a00..6cc859ab264 100644 --- a/reactos/drivers/net/ndis/ndis/protocol.c +++ b/reactos/drivers/net/ndis/ndis/protocol.c @@ -107,7 +107,7 @@ ProIndicatePacket( } -NDIS_STATUS +NDIS_STATUS STDCALL ProRequest( IN NDIS_HANDLE MacBindingHandle, IN PNDIS_REQUEST NdisRequest) @@ -179,7 +179,7 @@ ProRequest( } -NDIS_STATUS +NDIS_STATUS STDCALL ProReset( IN NDIS_HANDLE MacBindingHandle) { @@ -189,7 +189,7 @@ ProReset( } -NDIS_STATUS +NDIS_STATUS STDCALL ProSend( IN NDIS_HANDLE MacBindingHandle, IN PNDIS_PACKET Packet) @@ -383,7 +383,7 @@ ProSendPackets( } -NDIS_STATUS +NDIS_STATUS STDCALL ProTransferData( IN NDIS_HANDLE MacBindingHandle, IN NDIS_HANDLE MacReceiveContext, diff --git a/reactos/drivers/net/npf/openclos.c b/reactos/drivers/net/npf/openclos.c index fbf2edf1df6..ccb4bf4ca57 100644 --- a/reactos/drivers/net/npf/openclos.c +++ b/reactos/drivers/net/npf/openclos.c @@ -208,7 +208,7 @@ NPF_Open(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) Open->Buffer = NULL; Open->Bhead = 0; Open->Btail = 0; - (INT)Open->BLastByte = -1; + Open->BLastByte = (UINT) -1; Open->Dropped = 0; //reset the dropped packets counter Open->Received = 0; //reset the received packets counter Open->Accepted = 0; //reset the accepted packets counter @@ -277,7 +277,7 @@ NPF_Open(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) //------------------------------------------------------------------- -VOID NPF_OpenAdapterComplete( +VOID STDCALL NPF_OpenAdapterComplete( IN NDIS_HANDLE ProtocolBindingContext, IN NDIS_STATUS Status, IN NDIS_STATUS OpenErrorStatus) @@ -487,7 +487,7 @@ NPF_Close(IN PDEVICE_OBJECT DeviceObject,IN PIRP Irp) //------------------------------------------------------------------- -VOID +VOID STDCALL NPF_CloseAdapterComplete(IN NDIS_HANDLE ProtocolBindingContext,IN NDIS_STATUS Status) { POPEN_INSTANCE Open; @@ -640,7 +640,7 @@ NPF_UnbindAdapter( //------------------------------------------------------------------- -VOID +VOID STDCALL NPF_ResetComplete(IN NDIS_HANDLE ProtocolBindingContext,IN NDIS_STATUS Status) { diff --git a/reactos/drivers/net/npf/packet.c b/reactos/drivers/net/npf/packet.c index 4ccc3189f45..7e0882ca61b 100644 --- a/reactos/drivers/net/npf/packet.c +++ b/reactos/drivers/net/npf/packet.c @@ -804,7 +804,7 @@ NPF_IoControl(IN PDEVICE_OBJECT DeviceObject,IN PIRP Irp) //return Open->Bhead = 0; Open->Btail = 0; - (INT)Open->BLastByte = -1; + Open->BLastByte = (UINT) -1; Open->Received = 0; Open->Dropped = 0; Open->Accepted = 0; @@ -951,7 +951,7 @@ NPF_IoControl(IN PDEVICE_OBJECT DeviceObject,IN PIRP Irp) Open->Buffer = tpointer; Open->Bhead = 0; Open->Btail = 0; - (INT)Open->BLastByte = -1; + Open->BLastByte = (UINT) -1; Open->BufSize = (UINT)dim; EXIT_SUCCESS(dim); @@ -1101,7 +1101,7 @@ NPF_IoControl(IN PDEVICE_OBJECT DeviceObject,IN PIRP Irp) //------------------------------------------------------------------- -VOID +VOID STDCALL NPF_RequestComplete( IN NDIS_HANDLE ProtocolBindingContext, IN PNDIS_REQUEST NdisRequest, @@ -1185,7 +1185,7 @@ NPF_RequestComplete( //------------------------------------------------------------------- -VOID +VOID STDCALL NPF_Status( IN NDIS_HANDLE ProtocolBindingContext, IN NDIS_STATUS Status, @@ -1203,7 +1203,7 @@ NPF_Status( //------------------------------------------------------------------- -VOID +VOID STDCALL NPF_StatusComplete( IN NDIS_HANDLE ProtocolBindingContext ) diff --git a/reactos/drivers/net/npf/packet.h b/reactos/drivers/net/npf/packet.h index 062a790b6d5..d5f0064cd14 100644 --- a/reactos/drivers/net/npf/packet.h +++ b/reactos/drivers/net/npf/packet.h @@ -470,7 +470,7 @@ NPF_Open( Callback function associated with the NdisOpenAdapter() NDIS function. It is invoked by NDIS when the NIC driver has finished an open operation that was previously started by NPF_Open(). */ -VOID +VOID STDCALL NPF_OpenAdapterComplete( IN NDIS_HANDLE ProtocolBindingContext, IN NDIS_STATUS Status, @@ -501,7 +501,7 @@ NPF_Close( Callback function associated with the NdisCloseAdapter() NDIS function. It is invoked by NDIS when the NIC driver has finished a close operation that was previously started by NPF_Close(). */ -VOID +VOID STDCALL NPF_CloseAdapterComplete( IN NDIS_HANDLE ProtocolBindingContext, IN NDIS_STATUS Status @@ -529,7 +529,7 @@ NPF_CloseAdapterComplete( along with the filtering ones, that is executed for every incoming packet, therefore it is carefully optimized. */ -NDIS_STATUS +NDIS_STATUS STDCALL NPF_tap( IN NDIS_HANDLE ProtocolBindingContext, IN NDIS_HANDLE MacReceiveContext, @@ -550,7 +550,7 @@ NPF_tap( Callback function associated with the NdisTransferData() NDIS function. It is invoked by NDIS when the NIC driver has finished the transfer of a packet from the NIC driver memory to the NPF circular buffer. */ -VOID +VOID STDCALL NPF_TransferDataComplete( IN NDIS_HANDLE ProtocolBindingContext, IN PNDIS_PACKET Packet, @@ -564,7 +564,7 @@ NPF_TransferDataComplete( does nothing in NPF */ -VOID +VOID STDCALL NPF_ReceiveComplete(IN NDIS_HANDLE ProtocolBindingContext); /*! @@ -606,7 +606,7 @@ NPF_IoControl( Callback function associated with the NdisRequest() NDIS function. It is invoked by NDIS when the NIC driver has finished an OID request operation that was previously started by NPF_IoControl(). */ -VOID +VOID STDCALL NPF_RequestComplete( IN NDIS_HANDLE ProtocolBindingContext, IN PNDIS_REQUEST pRequest, @@ -664,7 +664,7 @@ INT NPF_BufferedWrite(IN PIRP Irp, Callback function associated with the NdisSend() NDIS function. It is invoked by NDIS when the NIC driver has finished an OID request operation that was previously started by NPF_Write(). */ -VOID +VOID STDCALL NPF_SendComplete( IN NDIS_HANDLE ProtocolBindingContext, IN PNDIS_PACKET pPacket, @@ -680,7 +680,7 @@ NPF_SendComplete( driver has finished an OID request operation that was previously started by NPF_IoControl(), in an IOCTL_PROTOCOL_RESET command. */ -VOID +VOID STDCALL NPF_ResetComplete( IN NDIS_HANDLE ProtocolBindingContext, IN NDIS_STATUS Status @@ -689,7 +689,7 @@ NPF_ResetComplete( /*! \brief Callback for NDIS StatusHandler. Not used by NPF */ -VOID +VOID STDCALL NPF_Status( IN NDIS_HANDLE ProtocolBindingContext, IN NDIS_STATUS Status, @@ -701,7 +701,7 @@ NPF_Status( /*! \brief Callback for NDIS StatusCompleteHandler. Not used by NPF */ -VOID +VOID STDCALL NPF_StatusComplete(IN NDIS_HANDLE ProtocolBindingContext); /*! diff --git a/reactos/drivers/net/npf/read.c b/reactos/drivers/net/npf/read.c index 093146f7991..5f9508884ef 100644 --- a/reactos/drivers/net/npf/read.c +++ b/reactos/drivers/net/npf/read.c @@ -70,26 +70,32 @@ void PacketMoveMem(PVOID Destination, PVOID Source, ULONG Length, UINT *Bhead) { ULONG WordLength; UINT n,i,NBlocks; +PULONG ULSrc, ULDest; +PUCHAR UCSrc, UCDest; WordLength=Length>>2; NBlocks=WordLength>>8; - + + ULSrc = (PULONG) Source; + ULDest = (PULONG) Destination; for(n=0;nBhead)); // Reset the buffer NdisAcquireSpinLock( &Open->BufLock ); - (INT)Open->BLastByte = -1; + Open->BLastByte = (UINT) -1; Open->Bhead = 0; NdisReleaseSpinLock( &Open->BufLock ); @@ -325,9 +331,9 @@ NPF_Read(IN PDEVICE_OBJECT DeviceObject,IN PIRP Irp) //------------------------------------------------------------------- -NDIS_STATUS NPF_tap (IN NDIS_HANDLE ProtocolBindingContext,IN NDIS_HANDLE MacReceiveContext, - IN PVOID HeaderBuffer,IN UINT HeaderBufferSize,IN PVOID LookAheadBuffer, - IN UINT LookaheadBufferSize,IN UINT PacketSize) +NDIS_STATUS STDCALL NPF_tap (IN NDIS_HANDLE ProtocolBindingContext,IN NDIS_HANDLE MacReceiveContext, + IN PVOID HeaderBuffer,IN UINT HeaderBufferSize,IN PVOID LookAheadBuffer, + IN UINT LookaheadBufferSize,IN UINT PacketSize) { POPEN_INSTANCE Open; PNDIS_PACKET pPacketb; @@ -641,8 +647,8 @@ NDIS_STATUS NPF_tap (IN NDIS_HANDLE ProtocolBindingContext,IN NDIS_HANDLE MacRec //------------------------------------------------------------------- -VOID NPF_TransferDataComplete (IN NDIS_HANDLE ProtocolBindingContext,IN PNDIS_PACKET pPacket, - IN NDIS_STATUS Status,IN UINT BytesTransfered) +VOID STDCALL NPF_TransferDataComplete (IN NDIS_HANDLE ProtocolBindingContext,IN PNDIS_PACKET pPacket, + IN NDIS_STATUS Status,IN UINT BytesTransfered) { POPEN_INSTANCE Open; @@ -668,7 +674,7 @@ VOID NPF_TransferDataComplete (IN NDIS_HANDLE ProtocolBindingContext,IN PNDIS_PA //------------------------------------------------------------------- -VOID NPF_ReceiveComplete(IN NDIS_HANDLE ProtocolBindingContext) +VOID STDCALL NPF_ReceiveComplete(IN NDIS_HANDLE ProtocolBindingContext) { IF_VERY_LOUD(DbgPrint("NPF: NPF_ReceiveComplete\n");) return; diff --git a/reactos/drivers/net/npf/win_bpf_filter.c b/reactos/drivers/net/npf/win_bpf_filter.c index 39b108d0dd9..d24a8bf038b 100644 --- a/reactos/drivers/net/npf/win_bpf_filter.c +++ b/reactos/drivers/net/npf/win_bpf_filter.c @@ -401,7 +401,7 @@ u_int bpf_filter(pc, p, wirelen, buflen,mem_ex,tme,time_ref) continue; case BPF_ALU|BPF_NEG: - (int)A = -((int)A); + A = (u_int32)(-((int)A)); continue; case BPF_MISC|BPF_TAX: @@ -840,7 +840,7 @@ u_int bpf_filter_with_2_buffers(pc, p, pd, headersize, wirelen, buflen, mem_ex,t continue; case BPF_ALU|BPF_NEG: - (int)A = -((int)A); + A = (u_int32)(-((int)A)); continue; case BPF_MISC|BPF_TAX: diff --git a/reactos/drivers/net/npf/win_bpf_filter_init.c b/reactos/drivers/net/npf/win_bpf_filter_init.c index 51fb5d458ba..f276243e807 100644 --- a/reactos/drivers/net/npf/win_bpf_filter_init.c +++ b/reactos/drivers/net/npf/win_bpf_filter_init.c @@ -602,7 +602,7 @@ uint32 bpf_filter_init(register struct bpf_insn *pc, MEM_TYPE *mem_ex, TME_CORE continue; case BPF_ALU|BPF_NEG: - (int32)A = -((int32)A); + A = (uint32)(-((int32)A)); continue; /* ARITHMETIC INSTRUCTIONS */ diff --git a/reactos/drivers/net/npf/write.c b/reactos/drivers/net/npf/write.c index 291474d7667..857e92ab143 100644 --- a/reactos/drivers/net/npf/write.c +++ b/reactos/drivers/net/npf/write.c @@ -253,7 +253,7 @@ NPF_BufferedWrite( } // Step to the next packet in the buffer - (PCHAR)winpcap_hdr += winpcap_hdr->caplen + sizeof(struct sf_pkthdr); + winpcap_hdr = (struct sf_pkthdr *)((PCHAR)winpcap_hdr + winpcap_hdr->caplen + sizeof(struct sf_pkthdr)); // Check if the end of the user buffer has been reached if( (PCHAR)winpcap_hdr >= EndOfUserBuff ) @@ -296,7 +296,7 @@ NPF_BufferedWrite( //------------------------------------------------------------------- -VOID +VOID STDCALL NPF_SendComplete( IN NDIS_HANDLE ProtocolBindingContext, IN PNDIS_PACKET pPacket, diff --git a/reactos/drivers/net/tcpip/datalink/arp.c b/reactos/drivers/net/tcpip/datalink/arp.c index 01a21b55836..80f5f2c0e35 100644 --- a/reactos/drivers/net/tcpip/datalink/arp.c +++ b/reactos/drivers/net/tcpip/datalink/arp.c @@ -90,19 +90,19 @@ PNDIS_PACKET PrepareARPPacket( /* Our hardware address */ RtlCopyMemory(DataBuffer, SenderLinkAddress, LinkAddressLength); - (ULONG_PTR)DataBuffer += LinkAddressLength; + DataBuffer = (PVOID)((ULONG_PTR)DataBuffer + LinkAddressLength); /* Our protocol address */ RtlCopyMemory(DataBuffer, SenderProtoAddress, ProtoAddressLength); if (TargetLinkAddress) { - (ULONG_PTR)DataBuffer += ProtoAddressLength; + DataBuffer = (PVOID)((ULONG_PTR)DataBuffer + ProtoAddressLength); /* Target hardware address */ RtlCopyMemory(DataBuffer, TargetLinkAddress, LinkAddressLength); - (ULONG_PTR)DataBuffer += LinkAddressLength; + DataBuffer = (PVOID)((ULONG_PTR)DataBuffer + LinkAddressLength); } else /* Don't care about target hardware address */ - (ULONG_PTR)DataBuffer += (ProtoAddressLength + LinkAddressLength); + DataBuffer = (PVOID)((ULONG_PTR)DataBuffer + ProtoAddressLength + LinkAddressLength); /* Target protocol address */ RtlCopyMemory(DataBuffer, TargetProtoAddress, ProtoAddressLength); diff --git a/reactos/drivers/net/tcpip/datalink/lan.c b/reactos/drivers/net/tcpip/datalink/lan.c index fd4aec48218..fb84e4cdc58 100644 --- a/reactos/drivers/net/tcpip/datalink/lan.c +++ b/reactos/drivers/net/tcpip/datalink/lan.c @@ -152,7 +152,7 @@ VOID FreeAdapter( } -VOID ProtocolOpenAdapterComplete( +VOID STDCALL ProtocolOpenAdapterComplete( NDIS_HANDLE BindingContext, NDIS_STATUS Status, NDIS_STATUS OpenErrorStatus) @@ -172,7 +172,7 @@ VOID ProtocolOpenAdapterComplete( } -VOID ProtocolCloseAdapterComplete( +VOID STDCALL ProtocolCloseAdapterComplete( NDIS_HANDLE BindingContext, NDIS_STATUS Status) /* @@ -192,7 +192,7 @@ VOID ProtocolCloseAdapterComplete( } -VOID ProtocolResetComplete( +VOID STDCALL ProtocolResetComplete( NDIS_HANDLE BindingContext, NDIS_STATUS Status) /* @@ -206,7 +206,7 @@ VOID ProtocolResetComplete( } -VOID ProtocolRequestComplete( +VOID STDCALL ProtocolRequestComplete( NDIS_HANDLE BindingContext, PNDIS_REQUEST NdisRequest, NDIS_STATUS Status) @@ -229,7 +229,7 @@ VOID ProtocolRequestComplete( } -VOID ProtocolSendComplete( +VOID STDCALL ProtocolSendComplete( NDIS_HANDLE BindingContext, PNDIS_PACKET Packet, NDIS_STATUS Status) @@ -251,7 +251,7 @@ VOID ProtocolSendComplete( } -VOID ProtocolTransferDataComplete( +VOID STDCALL ProtocolTransferDataComplete( NDIS_HANDLE BindingContext, PNDIS_PACKET Packet, NDIS_STATUS Status, @@ -310,7 +310,7 @@ VOID ProtocolTransferDataComplete( } -NDIS_STATUS ProtocolReceive( +NDIS_STATUS STDCALL ProtocolReceive( NDIS_HANDLE BindingContext, NDIS_HANDLE MacReceiveContext, PVOID HeaderBuffer, @@ -443,7 +443,7 @@ NDIS_STATUS ProtocolReceive( } -VOID ProtocolReceiveComplete( +VOID STDCALL ProtocolReceiveComplete( NDIS_HANDLE BindingContext) /* * FUNCTION: Called by NDIS when we're done receiving data @@ -455,7 +455,7 @@ VOID ProtocolReceiveComplete( } -VOID ProtocolStatus( +VOID STDCALL ProtocolStatus( NDIS_HANDLE BindingContext, NDIS_STATUS GenerelStatus, PVOID StatusBuffer, @@ -473,7 +473,7 @@ VOID ProtocolStatus( } -VOID ProtocolStatusComplete( +VOID STDCALL ProtocolStatusComplete( NDIS_HANDLE NdisBindingContext) /* * FUNCTION: Called by NDIS when a status-change has occurred @@ -484,7 +484,7 @@ VOID ProtocolStatusComplete( TI_DbgPrint(DEBUG_DATALINK, ("Called.\n")); } -VOID ProtocolBindAdapter( +VOID STDCALL ProtocolBindAdapter( OUT PNDIS_STATUS Status, IN NDIS_HANDLE BindContext, IN PNDIS_STRING DeviceName, diff --git a/reactos/drivers/net/tcpip/datalink/loopback.c b/reactos/drivers/net/tcpip/datalink/loopback.c index 2f03aa1815b..beaca01f08b 100644 --- a/reactos/drivers/net/tcpip/datalink/loopback.c +++ b/reactos/drivers/net/tcpip/datalink/loopback.c @@ -27,7 +27,7 @@ PNDIS_PACKET LoopQueueTail = (PNDIS_PACKET)NULL; KSPIN_LOCK LoopQueueLock; -VOID RealTransmit( +VOID STDCALL RealTransmit( PVOID Context) /* * FUNCTION: Transmits one or more packet(s) in loopback queue to ourselves diff --git a/reactos/drivers/net/tcpip/network/transmit.c b/reactos/drivers/net/tcpip/network/transmit.c index 80e561fb222..fc8168ae656 100644 --- a/reactos/drivers/net/tcpip/network/transmit.c +++ b/reactos/drivers/net/tcpip/network/transmit.c @@ -68,7 +68,7 @@ BOOLEAN PrepareNextFragment( Header->Checksum = (USHORT)IPv4Checksum(Header, IFC->HeaderSize, 0); /* Update pointers */ - (ULONG_PTR)IFC->DatagramData += DataSize; + IFC->DatagramData = (PVOID)((ULONG_PTR)IFC->DatagramData + DataSize); IFC->Position += DataSize; IFC->BytesLeft -= DataSize; diff --git a/reactos/drivers/net/tcpip/tcpip/checksum.c b/reactos/drivers/net/tcpip/tcpip/checksum.c index d39a3a8830d..2566b6b82c4 100644 --- a/reactos/drivers/net/tcpip/tcpip/checksum.c +++ b/reactos/drivers/net/tcpip/tcpip/checksum.c @@ -44,7 +44,7 @@ ULONG ChecksumCompute( { Sum += *(PUSHORT)Data; Count -= 2; - (ULONG_PTR)Data += 2; + Data = (PVOID)((ULONG_PTR) Data + 2); } /* Add left-over byte, if any */ diff --git a/reactos/drivers/net/tcpip/tcpip/fileobjs.c b/reactos/drivers/net/tcpip/tcpip/fileobjs.c index d912a56db25..dbfef4f77c4 100644 --- a/reactos/drivers/net/tcpip/tcpip/fileobjs.c +++ b/reactos/drivers/net/tcpip/tcpip/fileobjs.c @@ -173,7 +173,7 @@ VOID DeleteConnectionEndpoint( } -VOID RequestWorker( +VOID STDCALL RequestWorker( PVOID Context) /* * FUNCTION: Worker routine for processing address file object requests diff --git a/reactos/drivers/net/tcpip/tcpip/routines.c b/reactos/drivers/net/tcpip/tcpip/routines.c index 64bf343bff4..dbf303d230b 100644 --- a/reactos/drivers/net/tcpip/tcpip/routines.c +++ b/reactos/drivers/net/tcpip/tcpip/routines.c @@ -141,7 +141,7 @@ __inline INT SkipToOffset( NdisQueryBuffer(Buffer, (PVOID)Data, Size); if (Offset < *Size) { - ((ULONG_PTR)*Data) += Offset; + *Data = (PUCHAR)((ULONG_PTR) *Data + Offset); *Size -= Offset; break; } @@ -189,8 +189,8 @@ UINT CopyBufferToBufferChain( BytesToCopy = MIN(DstSize, Length); RtlCopyMemory((PVOID)DstData, (PVOID)SrcData, BytesToCopy); - BytesCopied += BytesToCopy; - (ULONG_PTR)SrcData += BytesToCopy; + BytesCopied += BytesToCopy; + SrcData = (PUCHAR)((ULONG_PTR)SrcData + BytesToCopy); Length -= BytesToCopy; if (Length == 0) @@ -248,8 +248,8 @@ UINT CopyBufferChainToBuffer( TI_DbgPrint(DEBUG_BUFFER, ("Copying (%d) bytes from 0x%X to 0x%X\n", BytesToCopy, SrcData, DstData)); RtlCopyMemory((PVOID)DstData, (PVOID)SrcData, BytesToCopy); - BytesCopied += BytesToCopy; - (ULONG_PTR)DstData += BytesToCopy; + BytesCopied += BytesToCopy; + DstData = (PUCHAR)((ULONG_PTR)DstData + BytesToCopy); Length -= BytesToCopy; if (Length == 0) @@ -444,9 +444,9 @@ PVOID AdjustPacket( /* If Adjust is zero there is no need to adjust this packet as there is no additional space at start the of first buffer */ if (Adjust != 0) { - (ULONG_PTR)(NdisBuffer->MappedSystemVa) += Adjust; - NdisBuffer->ByteOffset += Adjust; - NdisBuffer->ByteCount -= Adjust; + NdisBuffer->MappedSystemVa = (PVOID) ((ULONG_PTR)(NdisBuffer->MappedSystemVa) + Adjust); + NdisBuffer->ByteOffset += Adjust; + NdisBuffer->ByteCount -= Adjust; } return NdisBuffer->MappedSystemVa; diff --git a/reactos/drivers/net/tcpip/transport/datagram/datagram.c b/reactos/drivers/net/tcpip/transport/datagram/datagram.c index 64d95d841c9..a7beb2746c5 100644 --- a/reactos/drivers/net/tcpip/transport/datagram/datagram.c +++ b/reactos/drivers/net/tcpip/transport/datagram/datagram.c @@ -23,7 +23,7 @@ KSPIN_LOCK DGPendingListLock; WORK_QUEUE_ITEM DGWorkItem; -VOID DatagramWorker( +VOID STDCALL DatagramWorker( PVOID Context) /* * FUNCTION: Handles pending send requests diff --git a/reactos/drivers/net/tcpip/transport/udp/udp.c b/reactos/drivers/net/tcpip/transport/udp/udp.c index ed48779c35f..8fc586e217a 100644 --- a/reactos/drivers/net/tcpip/transport/udp/udp.c +++ b/reactos/drivers/net/tcpip/transport/udp/udp.c @@ -291,7 +291,7 @@ VOID UDPReceive( DataSize = i - sizeof(UDP_HEADER); /* Go to UDP data area */ - (ULONG_PTR)IPPacket->Data += sizeof(UDP_HEADER); + IPPacket->Data = (PVOID)((ULONG_PTR)IPPacket->Data + sizeof(UDP_HEADER)); /* Locate a receive request on destination address file object and deliver the packet if one is found. If there is no receive diff --git a/reactos/include/net/ndis.h b/reactos/include/net/ndis.h index 20ef8f21d16..3dd3dc4b07b 100644 --- a/reactos/include/net/ndis.h +++ b/reactos/include/net/ndis.h @@ -759,8 +759,8 @@ typedef struct _NDIS_PHYSICAL_ADDRESS_UNIT { } NDIS_PHYSICAL_ADDRESS_UNIT, *PNDIS_PHYSICAL_ADDRESS_UNIT; -typedef VOID STDCALL -(*ADAPTER_SHUTDOWN_HANDLER)( +typedef VOID +(STDCALL *ADAPTER_SHUTDOWN_HANDLER)( IN PVOID ShutdownContext); @@ -996,14 +996,12 @@ typedef NDIS_STATUS STDCALL_FUNC (*CM_OPEN_AF_HANDLER)( typedef NDIS_STATUS -STDCALL -(*CM_CLOSE_AF_HANDLER)( +(STDCALL *CM_CLOSE_AF_HANDLER)( IN NDIS_HANDLE CallMgrAfContext); typedef NDIS_STATUS -STDCALL -(*CM_REG_SAP_HANDLER)( +(STDCALL *CM_REG_SAP_HANDLER)( IN NDIS_HANDLE CallMgrAfContext, IN PCO_SAP Sap, IN NDIS_HANDLE NdisSapHandle, @@ -1011,14 +1009,12 @@ STDCALL typedef NDIS_STATUS -STDCALL -(*CM_DEREG_SAP_HANDLER)( +(STDCALL *CM_DEREG_SAP_HANDLER)( IN NDIS_HANDLE CallMgrSapContext); typedef NDIS_STATUS -STDCALL -(*CM_MAKE_CALL_HANDLER)( +(STDCALL *CM_MAKE_CALL_HANDLER)( IN NDIS_HANDLE CallMgrVcContext, IN OUT PCO_CALL_PARAMETERS CallParameters, IN NDIS_HANDLE NdisPartyHandle OPTIONAL, @@ -1026,8 +1022,7 @@ STDCALL typedef NDIS_STATUS -STDCALL -(*CM_CLOSE_CALL_HANDLER)( +(STDCALL *CM_CLOSE_CALL_HANDLER)( IN NDIS_HANDLE CallMgrVcContext, IN NDIS_HANDLE CallMgrPartyContext OPTIONAL, IN PVOID CloseData OPTIONAL, @@ -1035,8 +1030,7 @@ STDCALL typedef VOID -STDCALL -(*CM_INCOMING_CALL_COMPLETE_HANDLER)( +(STDCALL *CM_INCOMING_CALL_COMPLETE_HANDLER)( IN NDIS_STATUS Status, IN NDIS_HANDLE CallMgrVcContext, IN PCO_CALL_PARAMETERS CallParameters); @@ -1075,8 +1069,7 @@ STDCALL_FUNC (*CM_DEACTIVATE_VC_COMPLETE_HANDLER)( typedef NDIS_STATUS -STDCALL -(*CM_MODIFY_CALL_QOS_HANDLER)( +(STDCALL *CM_MODIFY_CALL_QOS_HANDLER)( IN NDIS_HANDLE CallMgrVcContext, IN PCO_CALL_PARAMETERS CallParameters); @@ -1112,81 +1105,81 @@ typedef VOID STDCALL_FUNC (*CL_OPEN_AF_COMPLETE_HANDLER)( IN NDIS_HANDLE ProtocolAfContext, IN NDIS_HANDLE NdisAfHandle); -typedef VOID STDCALL -(*CL_CLOSE_AF_COMPLETE_HANDLER)( +typedef VOID +(STDCALL *CL_CLOSE_AF_COMPLETE_HANDLER)( IN NDIS_STATUS Status, IN NDIS_HANDLE ProtocolAfContext); -typedef VOID STDCALL -(*CL_REG_SAP_COMPLETE_HANDLER)( +typedef VOID +(STDCALL *CL_REG_SAP_COMPLETE_HANDLER)( IN NDIS_STATUS Status, IN NDIS_HANDLE ProtocolSapContext, IN PCO_SAP Sap, IN NDIS_HANDLE NdisSapHandle); -typedef VOID STDCALL -(*CL_DEREG_SAP_COMPLETE_HANDLER)( +typedef VOID +(STDCALL *CL_DEREG_SAP_COMPLETE_HANDLER)( IN NDIS_STATUS Status, IN NDIS_HANDLE ProtocolSapContext); -typedef VOID STDCALL -(*CL_MAKE_CALL_COMPLETE_HANDLER)( +typedef VOID +(STDCALL *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 STDCALL -(*CL_MODIFY_CALL_QOS_COMPLETE_HANDLER)( +typedef VOID +(STDCALL *CL_MODIFY_CALL_QOS_COMPLETE_HANDLER)( IN NDIS_STATUS Status, IN NDIS_HANDLE ProtocolVcContext, IN PCO_CALL_PARAMETERS CallParameters); -typedef VOID STDCALL -(*CL_CLOSE_CALL_COMPLETE_HANDLER)( +typedef VOID +(STDCALL *CL_CLOSE_CALL_COMPLETE_HANDLER)( IN NDIS_STATUS Status, IN NDIS_HANDLE ProtocolVcContext, IN NDIS_HANDLE ProtocolPartyContext OPTIONAL); -typedef VOID STDCALL -(*CL_ADD_PARTY_COMPLETE_HANDLER)( +typedef VOID +(STDCALL *CL_ADD_PARTY_COMPLETE_HANDLER)( IN NDIS_STATUS Status, IN NDIS_HANDLE ProtocolPartyContext, IN NDIS_HANDLE NdisPartyHandle, IN PCO_CALL_PARAMETERS CallParameters); -typedef VOID STDCALL -(*CL_DROP_PARTY_COMPLETE_HANDLER)( +typedef VOID +(STDCALL *CL_DROP_PARTY_COMPLETE_HANDLER)( IN NDIS_STATUS Status, IN NDIS_HANDLE ProtocolPartyContext); -typedef NDIS_STATUS STDCALL -(*CL_INCOMING_CALL_HANDLER)( +typedef NDIS_STATUS +(STDCALL *CL_INCOMING_CALL_HANDLER)( IN NDIS_HANDLE ProtocolSapContext, IN NDIS_HANDLE ProtocolVcContext, IN OUT PCO_CALL_PARAMETERS CallParameters); -typedef VOID STDCALL -(*CL_INCOMING_CALL_QOS_CHANGE_HANDLER)( +typedef VOID +(STDCALL *CL_INCOMING_CALL_QOS_CHANGE_HANDLER)( IN NDIS_HANDLE ProtocolVcContext, IN PCO_CALL_PARAMETERS CallParameters); -typedef VOID STDCALL -(*CL_INCOMING_CLOSE_CALL_HANDLER)( +typedef VOID +(STDCALL *CL_INCOMING_CLOSE_CALL_HANDLER)( IN NDIS_STATUS CloseStatus, IN NDIS_HANDLE ProtocolVcContext, IN PVOID CloseData OPTIONAL, IN UINT Size OPTIONAL); -typedef VOID STDCALL -(*CL_INCOMING_DROP_PARTY_HANDLER)( +typedef VOID +(STDCALL *CL_INCOMING_DROP_PARTY_HANDLER)( IN NDIS_STATUS DropStatus, IN NDIS_HANDLE ProtocolPartyContext, IN PVOID CloseData OPTIONAL, IN UINT Size OPTIONAL); -typedef VOID STDCALL -(*CL_CALL_CONNECTED_HANDLER)( +typedef VOID +(STDCALL *CL_CALL_CONNECTED_HANDLER)( IN NDIS_HANDLE ProtocolVcContext); @@ -1220,64 +1213,64 @@ typedef struct _NDIS_CLIENT_CHARACTERISTICS { /* Prototypes for NDIS 3.0 protocol characteristics */ -typedef VOID STDCALL -(*OPEN_ADAPTER_COMPLETE_HANDLER)( +typedef VOID +(STDCALL *OPEN_ADAPTER_COMPLETE_HANDLER)( IN NDIS_HANDLE ProtocolBindingContext, IN NDIS_STATUS Status, IN NDIS_STATUS OpenErrorStatus); -typedef VOID STDCALL -(*CLOSE_ADAPTER_COMPLETE_HANDLER)( +typedef VOID +(STDCALL *CLOSE_ADAPTER_COMPLETE_HANDLER)( IN NDIS_HANDLE ProtocolBindingContext, IN NDIS_STATUS Status); -typedef VOID STDCALL -(*RESET_COMPLETE_HANDLER)( +typedef VOID +(STDCALL *RESET_COMPLETE_HANDLER)( IN NDIS_HANDLE ProtocolBindingContext, IN NDIS_STATUS Status); -typedef VOID STDCALL -(*REQUEST_COMPLETE_HANDLER)( +typedef VOID +(STDCALL *REQUEST_COMPLETE_HANDLER)( IN NDIS_HANDLE ProtocolBindingContext, IN PNDIS_REQUEST NdisRequest, IN NDIS_STATUS Status); -typedef VOID STDCALL -(*STATUS_HANDLER)( +typedef VOID +(STDCALL *STATUS_HANDLER)( IN NDIS_HANDLE ProtocolBindingContext, IN NDIS_STATUS GeneralStatus, IN PVOID StatusBuffer, IN UINT StatusBufferSize); -typedef VOID STDCALL -(*STATUS_COMPLETE_HANDLER)( +typedef VOID +(STDCALL *STATUS_COMPLETE_HANDLER)( IN NDIS_HANDLE ProtocolBindingContext); -typedef VOID STDCALL -(*SEND_COMPLETE_HANDLER)( +typedef VOID +(STDCALL *SEND_COMPLETE_HANDLER)( IN NDIS_HANDLE ProtocolBindingContext, IN PNDIS_PACKET Packet, IN NDIS_STATUS Status); -typedef VOID STDCALL -(*WAN_SEND_COMPLETE_HANDLER)( +typedef VOID +(STDCALL *WAN_SEND_COMPLETE_HANDLER)( IN NDIS_HANDLE ProtocolBindingContext, IN PNDIS_WAN_PACKET Packet, IN NDIS_STATUS Status); -typedef VOID STDCALL -(*TRANSFER_DATA_COMPLETE_HANDLER)( +typedef VOID +(STDCALL *TRANSFER_DATA_COMPLETE_HANDLER)( IN NDIS_HANDLE ProtocolBindingContext, IN PNDIS_PACKET Packet, IN NDIS_STATUS Status, IN UINT BytesTransferred); -typedef VOID STDCALL -(*WAN_TRANSFER_DATA_COMPLETE_HANDLER)( +typedef VOID +(STDCALL *WAN_TRANSFER_DATA_COMPLETE_HANDLER)( VOID); -typedef NDIS_STATUS STDCALL -(*RECEIVE_HANDLER)( +typedef NDIS_STATUS +(STDCALL *RECEIVE_HANDLER)( IN NDIS_HANDLE ProtocolBindingContext, IN NDIS_HANDLE MacReceiveContext, IN PVOID HeaderBuffer, @@ -1286,14 +1279,14 @@ typedef NDIS_STATUS STDCALL IN UINT LookaheadBufferSize, IN UINT PacketSize); -typedef NDIS_STATUS STDCALL -(*WAN_RECEIVE_HANDLER)( +typedef NDIS_STATUS +(STDCALL *WAN_RECEIVE_HANDLER)( IN NDIS_HANDLE NdisLinkHandle, IN PUCHAR Packet, IN ULONG PacketSize); -typedef VOID STDCALL -(*RECEIVE_COMPLETE_HANDLER)( +typedef VOID +(STDCALL *RECEIVE_COMPLETE_HANDLER)( IN NDIS_HANDLE ProtocolBindingContext); @@ -1368,35 +1361,35 @@ typedef struct _NDIS30_PROTOCOL_CHARACTERISTICS_S { /* Prototypes for NDIS 4.0 protocol characteristics */ -typedef INT STDCALL -(*RECEIVE_PACKET_HANDLER)( +typedef INT +(STDCALL *RECEIVE_PACKET_HANDLER)( IN NDIS_HANDLE ProtocolBindingContext, IN PNDIS_PACKET Packet); -typedef VOID STDCALL -(*BIND_HANDLER)( +typedef VOID +(STDCALL *BIND_HANDLER)( OUT PNDIS_STATUS Status, IN NDIS_HANDLE BindContext, IN PNDIS_STRING DeviceName, IN PVOID SystemSpecific1, IN PVOID SystemSpecific2); -typedef VOID STDCALL -(*UNBIND_HANDLER)( +typedef VOID +(STDCALL *UNBIND_HANDLER)( OUT PNDIS_STATUS Status, IN NDIS_HANDLE ProtocolBindingContext, IN NDIS_HANDLE UnbindContext); -typedef VOID STDCALL -(*TRANSLATE_HANDLER)( +typedef VOID +(STDCALL *TRANSLATE_HANDLER)( OUT PNDIS_STATUS Status, IN NDIS_HANDLE ProtocolBindingContext, OUT PNET_PNP_ID IdList, IN ULONG IdListLength, OUT PULONG BytesReturned); -typedef VOID STDCALL -(*UNLOAD_PROTOCOL_HANDLER)( +typedef VOID +(STDCALL *UNLOAD_PROTOCOL_HANDLER)( VOID); @@ -1430,28 +1423,28 @@ typedef struct _NDIS40_PROTOCOL_CHARACTERISTICS_S { #ifdef NDIS50 -typedef VOID STDCALL -(*CO_SEND_COMPLETE_HANDLER)( +typedef VOID +(STDCALL *CO_SEND_COMPLETE_HANDLER)( IN NDIS_STATUS Status, IN NDIS_HANDLE ProtocolVcContext, IN PNDIS_PACKET Packet); -typedef VOID STDCALL -(*CO_STATUS_HANDLER)( +typedef VOID +(STDCALL *CO_STATUS_HANDLER)( IN NDIS_HANDLE ProtocolBindingContext, IN NDIS_HANDLE ProtocolVcContext OPTIONAL, IN NDIS_STATUS GeneralStatus, IN PVOID StatusBuffer, IN UINT StatusBufferSize); -typedef UINT STDCALL -(*CO_RECEIVE_PACKET_HANDLER)( +typedef UINT +(STDCALL *CO_RECEIVE_PACKET_HANDLER)( IN NDIS_HANDLE ProtocolBindingContext, IN NDIS_HANDLE ProtocolVcContext, IN PNDIS_PACKET Packet); -typedef VOID STDCALL -(*CO_AF_REGISTER_NOTIFY_HANDLER)( +typedef VOID +(STDCALL *CO_AF_REGISTER_NOTIFY_HANDLER)( IN NDIS_HANDLE ProtocolBindingContext, IN PCO_ADDRESS_FAMILY AddressFamily); @@ -3423,28 +3416,28 @@ NdisIMInitializeDeviceInstanceEx( /* Prototypes for NDIS_MINIPORT_CHARACTERISTICS */ -typedef BOOLEAN STDCALL -(*W_CHECK_FOR_HANG_HANDLER)( +typedef BOOLEAN +(STDCALL *W_CHECK_FOR_HANG_HANDLER)( IN NDIS_HANDLE MiniportAdapterContext); -typedef VOID STDCALL -(*W_DISABLE_INTERRUPT_HANDLER)( +typedef VOID +(STDCALL *W_DISABLE_INTERRUPT_HANDLER)( IN NDIS_HANDLE MiniportAdapterContext); -typedef VOID STDCALL -(*W_ENABLE_INTERRUPT_HANDLER)( +typedef VOID +(STDCALL *W_ENABLE_INTERRUPT_HANDLER)( IN NDIS_HANDLE MiniportAdapterContext); -typedef VOID STDCALL -(*W_HALT_HANDLER)( +typedef VOID +(STDCALL *W_HALT_HANDLER)( IN NDIS_HANDLE MiniportAdapterContext); -typedef VOID STDCALL -(*W_HANDLE_INTERRUPT_HANDLER)( +typedef VOID +(STDCALL *W_HANDLE_INTERRUPT_HANDLER)( IN NDIS_HANDLE MiniportAdapterContext); -typedef NDIS_STATUS STDCALL -(*W_INITIALIZE_HANDLER)( +typedef NDIS_STATUS +(STDCALL *W_INITIALIZE_HANDLER)( OUT PNDIS_STATUS OpenErrorStatus, OUT PUINT SelectedMediumIndex, IN PNDIS_MEDIUM MediumArray, @@ -3452,14 +3445,14 @@ typedef NDIS_STATUS STDCALL IN NDIS_HANDLE MiniportAdapterContext, IN NDIS_HANDLE WrapperConfigurationContext); -typedef VOID STDCALL STDCALL -(*W_ISR_HANDLER)( +typedef VOID +(STDCALL *W_ISR_HANDLER)( OUT PBOOLEAN InterruptRecognized, OUT PBOOLEAN QueueMiniportHandleInterrupt, IN NDIS_HANDLE MiniportAdapterContext); -typedef NDIS_STATUS STDCALL -(*W_QUERY_INFORMATION_HANDLER)( +typedef NDIS_STATUS +(STDCALL *W_QUERY_INFORMATION_HANDLER)( IN NDIS_HANDLE MiniportAdapterContext, IN NDIS_OID Oid, IN PVOID InformationBuffer, @@ -3467,31 +3460,31 @@ typedef NDIS_STATUS STDCALL OUT PULONG BytesWritten, OUT PULONG BytesNeeded); -typedef NDIS_STATUS STDCALL -(*W_RECONFIGURE_HANDLER)( +typedef NDIS_STATUS +(STDCALL *W_RECONFIGURE_HANDLER)( OUT PNDIS_STATUS OpenErrorStatus, IN NDIS_HANDLE MiniportAdapterContext, IN NDIS_HANDLE WrapperConfigurationContext); -typedef NDIS_STATUS STDCALL -(*W_RESET_HANDLER)( +typedef NDIS_STATUS +(STDCALL *W_RESET_HANDLER)( OUT PBOOLEAN AddressingReset, IN NDIS_HANDLE MiniportAdapterContext); -typedef NDIS_STATUS STDCALL -(*W_SEND_HANDLER)( +typedef NDIS_STATUS +(STDCALL *W_SEND_HANDLER)( IN NDIS_HANDLE MiniportAdapterContext, IN PNDIS_PACKET Packet, IN UINT Flags); -typedef NDIS_STATUS STDCALL -(*WM_SEND_HANDLER)( +typedef NDIS_STATUS +(STDCALL *WM_SEND_HANDLER)( IN NDIS_HANDLE MiniportAdapterContext, IN NDIS_HANDLE NdisLinkHandle, IN PNDIS_WAN_PACKET Packet); -typedef NDIS_STATUS STDCALL -(*W_SET_INFORMATION_HANDLER)( +typedef NDIS_STATUS +(STDCALL *W_SET_INFORMATION_HANDLER)( IN NDIS_HANDLE MiniportAdapterContext, IN NDIS_OID Oid, IN PVOID InformationBuffer, @@ -3499,8 +3492,8 @@ typedef NDIS_STATUS STDCALL OUT PULONG BytesRead, OUT PULONG BytesNeeded); -typedef NDIS_STATUS STDCALL -(*W_TRANSFER_DATA_HANDLER)( +typedef NDIS_STATUS +(STDCALL *W_TRANSFER_DATA_HANDLER)( OUT PNDIS_PACKET Packet, OUT PUINT BytesTransferred, IN NDIS_HANDLE MiniportAdapterContext, @@ -3508,8 +3501,8 @@ typedef NDIS_STATUS STDCALL IN UINT ByteOffset, IN UINT BytesToTransfer); -typedef NDIS_STATUS STDCALL -(*WM_TRANSFER_DATA_HANDLER)( +typedef NDIS_STATUS +(STDCALL *WM_TRANSFER_DATA_HANDLER)( VOID); @@ -3992,21 +3985,21 @@ typedef struct _NDIS30_MINIPORT_CHARACTERISTICS_S { /* Extensions for NDIS 4.0 miniports */ -typedef VOID STDCALL -(*W_SEND_PACKETS_HANDLER)( +typedef VOID +(STDCALL *W_SEND_PACKETS_HANDLER)( IN NDIS_HANDLE MiniportAdapterContext, IN PPNDIS_PACKET PacketArray, IN UINT NumberOfPackets); #ifdef NDIS40 -typedef VOID STDCALL -(*W_RETURN_PACKET_HANDLER)( +typedef VOID +(STDCALL *W_RETURN_PACKET_HANDLER)( IN NDIS_HANDLE MiniportAdapterContext, IN PNDIS_PACKET Packet); -typedef VOID STDCALL -(*W_ALLOCATE_COMPLETE_HANDLER)( +typedef VOID +(STDCALL *W_ALLOCATE_COMPLETE_HANDLER)( IN NDIS_HANDLE MiniportAdapterContext, IN PVOID VirtualAddress, IN PNDIS_PHYSICAL_ADDRESS PhysicalAddress, @@ -4041,33 +4034,33 @@ typedef struct _NDIS40_MINIPORT_CHARACTERISTICS_S #ifdef NDIS50 -typedef NDIS_STATUS STDCALL -(*W_CO_CREATE_VC_HANDLER)( +typedef NDIS_STATUS +(STDCALL *W_CO_CREATE_VC_HANDLER)( IN NDIS_HANDLE MiniportAdapterContext, IN NDIS_HANDLE NdisVcHandle, OUT PNDIS_HANDLE MiniportVcContext); -typedef NDIS_STATUS STDCALL -(*W_CO_DELETE_VC_HANDLER)( +typedef NDIS_STATUS +(STDCALL *W_CO_DELETE_VC_HANDLER)( IN NDIS_HANDLE MiniportVcContext); -typedef NDIS_STATUS STDCALL -(*W_CO_ACTIVATE_VC_HANDLER)( +typedef NDIS_STATUS +(STDCALL *W_CO_ACTIVATE_VC_HANDLER)( IN NDIS_HANDLE MiniportVcContext, IN OUT PCO_CALL_PARAMETERS CallParameters); -typedef NDIS_STATUS STDCALL -(*W_CO_DEACTIVATE_VC_HANDLER)( +typedef NDIS_STATUS +(STDCALL *W_CO_DEACTIVATE_VC_HANDLER)( IN NDIS_HANDLE MiniportVcContext); -typedef VOID STDCALL -(*W_CO_SEND_PACKETS_HANDLER)( +typedef VOID +(STDCALL *W_CO_SEND_PACKETS_HANDLER)( IN NDIS_HANDLE MiniportVcContext, IN PPNDIS_PACKET PacketArray, IN UINT NumberOfPackets); -typedef NDIS_STATUS STDCALL -(*W_CO_REQUEST_HANDLER)( +typedef NDIS_STATUS +(STDCALL *W_CO_REQUEST_HANDLER)( IN NDIS_HANDLE MiniportAdapterContext, IN NDIS_HANDLE MiniportVcContext OPTIONAL, IN OUT PNDIS_REQUEST NdisRequest); @@ -4124,13 +4117,13 @@ typedef NDIS_MINIPORT_CHARACTERISTICS *PNDIS_MINIPORT_CHARACTERISTICS; -typedef NDIS_STATUS STDCALL -(*SEND_HANDLER)( +typedef NDIS_STATUS +(STDCALL *SEND_HANDLER)( IN NDIS_HANDLE MacBindingHandle, IN PNDIS_PACKET Packet); -typedef NDIS_STATUS STDCALL -(*TRANSFER_DATA_HANDLER)( +typedef NDIS_STATUS +(STDCALL *TRANSFER_DATA_HANDLER)( IN NDIS_HANDLE MacBindingHandle, IN NDIS_HANDLE MacReceiveContext, IN UINT ByteOffset, @@ -4138,12 +4131,12 @@ typedef NDIS_STATUS STDCALL OUT PNDIS_PACKET Packet, OUT PUINT BytesTransferred); -typedef NDIS_STATUS STDCALL -(*RESET_HANDLER)( +typedef NDIS_STATUS +(STDCALL *RESET_HANDLER)( IN NDIS_HANDLE MacBindingHandle); -typedef NDIS_STATUS STDCALL -(*REQUEST_HANDLER)( +typedef NDIS_STATUS +(STDCALL *REQUEST_HANDLER)( IN NDIS_HANDLE MacBindingHandle, IN PNDIS_REQUEST NdisRequest); @@ -4453,12 +4446,12 @@ typedef struct _FILTERDBS { } FILTERDBS, *PFILTERDBS; -typedef VOID STDCALL -(*ETH_RCV_COMPLETE_HANDLER)( +typedef VOID +(STDCALL *ETH_RCV_COMPLETE_HANDLER)( IN PETH_FILTER Filter); -typedef VOID STDCALL -(*ETH_RCV_INDICATE_HANDLER)( +typedef VOID +(STDCALL *ETH_RCV_INDICATE_HANDLER)( IN PETH_FILTER Filter, IN NDIS_HANDLE MacReceiveContext, IN PCHAR Address, @@ -4468,12 +4461,12 @@ typedef VOID STDCALL IN UINT LookaheadBufferSize, IN UINT PacketSize); -typedef VOID STDCALL -(*FDDI_RCV_COMPLETE_HANDLER)( +typedef VOID +(STDCALL *FDDI_RCV_COMPLETE_HANDLER)( IN PFDDI_FILTER Filter); -typedef VOID STDCALL -(*FDDI_RCV_INDICATE_HANDLER)( +typedef VOID +(STDCALL *FDDI_RCV_INDICATE_HANDLER)( IN PFDDI_FILTER Filter, IN NDIS_HANDLE MacReceiveContext, IN PCHAR Address, @@ -4484,18 +4477,18 @@ typedef VOID STDCALL IN UINT LookaheadBufferSize, IN UINT PacketSize); -typedef VOID STDCALL STDCALL -(*FILTER_PACKET_INDICATION_HANDLER)( +typedef VOID +(STDCALL *FILTER_PACKET_INDICATION_HANDLER)( IN NDIS_HANDLE Miniport, IN PPNDIS_PACKET PacketArray, IN UINT NumberOfPackets); -typedef VOID STDCALL -(*TR_RCV_COMPLETE_HANDLER)( +typedef VOID +(STDCALL *TR_RCV_COMPLETE_HANDLER)( IN PTR_FILTER Filter); -typedef VOID STDCALL -(*TR_RCV_INDICATE_HANDLER)( +typedef VOID +(STDCALL *TR_RCV_INDICATE_HANDLER)( IN PTR_FILTER Filter, IN NDIS_HANDLE MacReceiveContext, IN PVOID HeaderBuffer, @@ -4504,13 +4497,13 @@ typedef VOID STDCALL IN UINT LookaheadBufferSize, IN UINT PacketSize); -typedef VOID STDCALL -(*WAN_RCV_COMPLETE_HANDLER)( +typedef VOID +(STDCALL *WAN_RCV_COMPLETE_HANDLER)( IN NDIS_HANDLE MiniportAdapterHandle, IN NDIS_HANDLE NdisLinkContext); -typedef VOID STDCALL -(*WAN_RCV_HANDLER)( +typedef VOID +(STDCALL *WAN_RCV_HANDLER)( OUT PNDIS_STATUS Status, IN NDIS_HANDLE MiniportAdapterHandle, IN NDIS_HANDLE NdisLinkContext, @@ -4555,26 +4548,26 @@ typedef VOID STDCALL_FUNC (*NDIS_M_SEND_RESOURCES_HANDLER)( typedef BOOLEAN (FASTCALL *NDIS_M_START_SENDS)( IN PNDIS_MINIPORT_BLOCK Miniport); -typedef VOID STDCALL -(*NDIS_M_STATUS_HANDLER)( +typedef VOID +(STDCALL *NDIS_M_STATUS_HANDLER)( IN NDIS_HANDLE MiniportHandle, IN NDIS_STATUS GeneralStatus, IN PVOID StatusBuffer, IN UINT StatusBufferSize); -typedef VOID STDCALL -(*NDIS_M_STS_COMPLETE_HANDLER)( +typedef VOID +(STDCALL *NDIS_M_STS_COMPLETE_HANDLER)( IN NDIS_HANDLE MiniportAdapterHandle); -typedef VOID STDCALL -(*NDIS_M_TD_COMPLETE_HANDLER)( +typedef VOID +(STDCALL *NDIS_M_TD_COMPLETE_HANDLER)( IN NDIS_HANDLE MiniportAdapterHandle, IN PNDIS_PACKET Packet, IN NDIS_STATUS Status, IN UINT BytesTransferred); -typedef VOID STDCALL -(*NDIS_WM_SEND_COMPLETE_HANDLER)( +typedef VOID +(STDCALL *NDIS_WM_SEND_COMPLETE_HANDLER)( IN NDIS_HANDLE MiniportAdapterHandle, IN PVOID Packet, IN NDIS_STATUS Status);