Ros-diffs July 2009

ros-diffs@reactos.org

27 participants
605 discussions

[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
by sginsberg＠svn.reactos.org 25 Jul '09

25 Jul '09

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/m… ============================================================================== --- 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/lo… ============================================================================== --- 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/… ============================================================================== --- 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=422… ============================================================================== --- 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=… ============================================================================== --- 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);

1 0

[sginsberg] 42209: - Revert 42206 change to ddraw.h as it breaks dxapi
by sginsberg＠svn.reactos.org 25 Jul '09

25 Jul '09

Author: sginsberg Date: Sat Jul 25 16:32:06 2009 New Revision: 42209 URL: http://svn.reactos.org/svn/reactos?rev=42209&view=rev Log: - Revert 42206 change to ddraw.h as it breaks dxapi Modified: trunk/reactos/include/dxsdk/ddraw.h Modified: trunk/reactos/include/dxsdk/ddraw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/ddraw.h?rev=… ============================================================================== --- trunk/reactos/include/dxsdk/ddraw.h [iso-8859-1] (original) +++ trunk/reactos/include/dxsdk/ddraw.h [iso-8859-1] Sat Jul 25 16:32:06 2009 @@ -8,8 +8,8 @@ #include <objbase.h> #else #define IUnknown void -#if !defined(NT_BUILD_ENVIRONMENT) && !defined(_WINNT_H) - #define CO_E_NOTINITIALIZED 0x800401F0L +#if !defined(NT_BUILD_ENVIRONMENT) && !defined(WINNT) + #define CO_E_NOTINITIALIZED 0x800401F0 #endif #endif @@ -37,7 +37,7 @@ #endif #endif -#if defined(_WINNT_H) || !defined(WIN32) +#if defined(WINNT) || !defined(WIN32) #ifndef _HRESULT_DEFINED #define _HRESULT_DEFINED typedef long HRESULT;

1 0

[sginsberg] 42208: - Make ks and portcls compile under msvc
by sginsberg＠svn.reactos.org 25 Jul '09

25 Jul '09

Author: sginsberg Date: Sat Jul 25 16:06:06 2009 New Revision: 42208 URL: http://svn.reactos.org/svn/reactos?rev=42208&view=rev Log: - Make ks and portcls compile under msvc Modified: trunk/reactos/drivers/ksfilter/ks/irp.c trunk/reactos/drivers/wdm/audio/backpln/portcls/interrupt.c trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h trunk/reactos/include/ddk/portcls.h trunk/reactos/include/ddk/stdunk.h trunk/reactos/include/psdk/ks.h Modified: trunk/reactos/drivers/ksfilter/ks/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/irp.c?… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/irp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/irp.c [iso-8859-1] Sat Jul 25 16:06:06 2009 @@ -1206,8 +1206,8 @@ return STATUS_NOT_FOUND; } -NTAPI -NTSTATUS +NTSTATUS +NTAPI KspCreate( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) @@ -1390,8 +1390,8 @@ } -NTAPI -NTSTATUS +NTSTATUS +NTAPI KspDeviceControl( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) @@ -1425,8 +1425,8 @@ return ObjectHeader->DispatchTable.DeviceIoControl(DeviceObject, Irp); } -NTAPI -NTSTATUS +NTSTATUS +NTAPI KspDispatchIrp( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/interrupt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/interrupt.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/interrupt.c [iso-8859-1] Sat Jul 25 16:06:06 2009 @@ -154,8 +154,8 @@ return STATUS_UNSUCCESSFUL; } -NTAPI PKINTERRUPT +NTAPI IInterruptSync_fnGetKInterrupt( IN IInterruptSync * iface) { Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h [iso-8859-1] Sat Jul 25 16:06:06 2009 @@ -25,11 +25,6 @@ #define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) #define TAG_PORTCLASS TAG('P', 'C', 'L', 'S') - -#ifdef _MSC_VER - #define STDCALL - #define DDKAPI -#endif #define ASSERT_IRQL(x) ASSERT(KeGetCurrentIrql() <= (x)) Modified: trunk/reactos/include/ddk/portcls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/portcls.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/portcls.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/portcls.h [iso-8859-1] Sat Jul 25 16:06:06 2009 @@ -239,7 +239,7 @@ typedef struct _PCPROPERTY_REQUEST PCPROPERTY_REQUEST, *PPCPROPERTY_REQUEST; -typedef NTSTATUS NTAPI(*PCPFNPROPERTY_HANDLER)( +typedef NTSTATUS (NTAPI *PCPFNPROPERTY_HANDLER)( IN PPCPROPERTY_REQUEST PropertyRequest); typedef struct @@ -281,7 +281,7 @@ struct _PCEVENT_REQUEST; -typedef NTSTATUS NTAPI(*PCPFNEVENT_HANDLER)( +typedef NTSTATUS (NTAPI *PCPFNEVENT_HANDLER)( IN struct _PCEVENT_REQUEST* EventRequest); typedef struct _PCEVENT_ITEM @@ -307,7 +307,7 @@ struct _PCMETHOD_REQUEST; -typedef NTSTATUS NTAPI(*PCPFNMETHOD_HANDLER)( +typedef NTSTATUS (NTAPI *PCPFNMETHOD_HANDLER)( IN struct _PCMETHOD_REQUEST* MethodRequest); typedef struct _PCMETHOD_ITEM @@ -834,7 +834,7 @@ struct IInterruptSync; -typedef NTSTATUS NTAPI(*PINTERRUPTSYNCROUTINE)( +typedef NTSTATUS (NTAPI *PINTERRUPTSYNCROUTINE)( IN struct IInterruptSync* InterruptSync, IN PVOID DynamicContext); @@ -2048,7 +2048,7 @@ PortCls API Functions */ -typedef NTSTATUS NTAPI(*PCPFNSTARTDEVICE)( +typedef NTSTATUS (NTAPI *PCPFNSTARTDEVICE)( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN PRESOURCELIST ResourceList); Modified: trunk/reactos/include/ddk/stdunk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/stdunk.h?rev=4… ============================================================================== --- trunk/reactos/include/ddk/stdunk.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/stdunk.h [iso-8859-1] Sat Jul 25 16:06:06 2009 @@ -94,20 +94,20 @@ #else /* Not C++ - this is probably very buggy... */ +NTSTATUS STDMETHODCALLTYPE -NTSTATUS Unknown_QueryInterface( IUnknown* this, IN REFIID refiid, OUT PVOID* output); +ULONG STDMETHODCALLTYPE -ULONG Unknown_AddRef( IUnknown* unknown_this); +ULONG STDMETHODCALLTYPE -ULONG Unknown_Release( IUnknown* unknown_this); Modified: trunk/reactos/include/psdk/ks.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ks.h?rev=4220… ============================================================================== --- trunk/reactos/include/psdk/ks.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ks.h [iso-8859-1] Sat Jul 25 16:06:06 2009 @@ -1104,7 +1104,7 @@ #if defined(_NTDDK_) /* MOVE ME */ -typedef NTSTATUS NTAPI NTAPI (*PFNKSCONTEXT_DISPATCH)( +typedef NTSTATUS (NTAPI *PFNKSCONTEXT_DISPATCH)( IN PVOID Context, IN PIRP Irp); #endif @@ -1260,21 +1260,19 @@ typedef VOID -NTAPI -(*PFNREFERENCEDEVICEOBJECT)( +(NTAPI *PFNREFERENCEDEVICEOBJECT)( IN PVOID Context ); typedef VOID -NTAPI -(*PFNDEREFERENCEDEVICEOBJECT)( +(NTAPI *PFNDEREFERENCEDEVICEOBJECT)( IN PVOID Context ); typedef NTSTATUS -(*PFNQUERYREFERENCESTRING)( +(NTAPI *PFNQUERYREFERENCESTRING)( IN PVOID Context, IN OUT PWCHAR *String ); @@ -1438,7 +1436,7 @@ } KSPROPERTY_VALUES, *PKSPROPERTY_VALUES; #if defined(_NTDDK_) -typedef NTSTATUS NTAPI(*PFNKSHANDLER)( +typedef NTSTATUS (NTAPI *PFNKSHANDLER)( IN PIRP Irp, IN PKSIDENTIFIER Request, IN OUT PVOID Data); @@ -1467,8 +1465,7 @@ typedef BOOLEAN -NTAPI -(*PFNKSFASTHANDLER)( +(NTAPI *PFNKSFASTHANDLER)( IN PFILE_OBJECT FileObject, IN PKSIDENTIFIER Request, IN ULONG RequestLength, @@ -1870,15 +1867,14 @@ LONGLONG Interval; } KSEVENT_TIME_INTERVAL, *PKSEVENT_TIME_INTERVAL; -typedef NTSTATUS NTAPI (*PFNKSADDEVENT)( +typedef NTSTATUS (NTAPI *PFNKSADDEVENT)( IN PIRP Irp, IN PKSEVENTDATA EventData, IN struct _KSEVENT_ENTRY* EventEntry); typedef VOID -NTAPI -(*PFNKSREMOVEEVENT)( +(NTAPI *PFNKSREMOVEEVENT)( IN PFILE_OBJECT FileObject, IN struct _KSEVENT_ENTRY* EventEntry ); @@ -1941,8 +1937,7 @@ typedef NTSTATUS -NTAPI -(*PFNKSPINHANDSHAKE)( +(NTAPI *PFNKSPINHANDSHAKE)( IN PKSPIN Pin, IN PKSHANDSHAKE In, IN PKSHANDSHAKE Out @@ -1950,16 +1945,14 @@ typedef void -NTAPI -(*PFNKSPINPOWER)( +(NTAPI *PFNKSPINPOWER)( IN PKSPIN Pin, IN DEVICE_POWER_STATE State ); typedef void -NTAPI -(*PFNKSPINFRAMERETURN)( +(NTAPI *PFNKSPINFRAMERETURN)( IN PKSPIN Pin, IN PVOID Data OPTIONAL, IN ULONG Size OPTIONAL, @@ -1970,38 +1963,33 @@ typedef void -NTAPI -(*PFNKSPINIRPCOMPLETION)( +(NTAPI *PFNKSPINIRPCOMPLETION)( IN PKSPIN Pin, IN PIRP Irp ); typedef NTSTATUS -NTAPI -(*PFNKSPINIRP)( +(NTAPI *PFNKSPINIRP)( IN PKSPIN Pin, IN PIRP Irp ); typedef NTSTATUS -NTAPI -(*PFNKSPIN)( +(NTAPI *PFNKSPIN)( IN PKSPIN Pin ); typedef void -NTAPI -(*PFNKSPINVOID)( +(NTAPI *PFNKSPINVOID)( IN PKSPIN Pin ); typedef void -NTAPI -(*PFNKSSTREAMPOINTER)( +(NTAPI *PFNKSSTREAMPOINTER)( IN PKSSTREAM_POINTER StreamPointer ); @@ -2012,8 +2000,7 @@ typedef NTSTATUS -NTAPI -(*PFNKSPINSETDATAFORMAT)( +(NTAPI *PFNKSPINSETDATAFORMAT)( IN PKSPIN Pin, IN PKSDATAFORMAT OldFormat OPTIONAL, IN PKSMULTIPLE_ITEM OldAttributeList OPTIONAL, @@ -2023,8 +2010,7 @@ typedef NTSTATUS -NTAPI -(*PFNKSPINSETDEVICESTATE)( +(NTAPI *PFNKSPINSETDEVICESTATE)( IN PKSPIN Pin, IN KSSTATE ToState, IN KSSTATE FromState @@ -2049,7 +2035,7 @@ typedef BOOLEAN -NTAPI (*PFNKSPINSETTIMER)( +(NTAPI *PFNKSPINSETTIMER)( IN PKSPIN Pin, IN PKTIMER Timer, IN LARGE_INTEGER DueTime, @@ -2058,7 +2044,7 @@ typedef BOOLEAN -NTAPI (*PFNKSPINCANCELTIMER)( +(NTAPI *PFNKSPINCANCELTIMER)( IN PKSPIN Pin, IN PKTIMER Timer ); @@ -2072,7 +2058,7 @@ typedef void -NTAPI (*PFNKSPINRESOLUTION)( +(NTAPI *PFNKSPINRESOLUTION)( IN PKSPIN Pin, OUT PKSRESOLUTION Resolution ); @@ -2086,19 +2072,19 @@ typedef NTSTATUS -NTAPI (*PFNKSPININITIALIZEALLOCATOR)( +(NTAPI *PFNKSPININITIALIZEALLOCATOR)( IN PKSPIN Pin, IN PKSALLOCATOR_FRAMING AllocatorFraming, OUT PVOID* Context ); -typedef PVOID NTAPI (*PFNKSDELETEALLOCATOR)( +typedef PVOID (NTAPI *PFNKSDELETEALLOCATOR)( IN PVOID Context); -typedef PVOID NTAPI (*PFNKSDEFAULTALLOCATE)( +typedef PVOID (NTAPI *PFNKSDEFAULTALLOCATE)( IN PVOID Context); -typedef PVOID NTAPI (*PFNKSDEFAULTFREE)( +typedef PVOID (NTAPI *PFNKSDEFAULTFREE)( IN PVOID Context, IN PVOID Buffer); @@ -2150,7 +2136,7 @@ typedef NTSTATUS -NTAPI (*PFNKSINTERSECTHANDLER)( +(NTAPI *PFNKSINTERSECTHANDLER)( IN PIRP Irp, IN PKSP_PIN Pin, IN PKSDATARANGE DataRange, @@ -2159,7 +2145,7 @@ typedef NTSTATUS -NTAPI (*PFNKSINTERSECTHANDLEREX)( +(NTAPI *PFNKSINTERSECTHANDLEREX)( IN PVOID Context, IN PIRP Irp, IN PKSP_PIN Pin, @@ -2380,7 +2366,7 @@ typedef void -NTAPI (*PFNKSFREE)( +(NTAPI *PFNKSFREE)( IN PVOID Data ); @@ -2472,18 +2458,18 @@ /* TODO */ typedef void* UNKNOWN; -typedef PVOID NTAPI(*PFNKSINITIALIZEALLOCATOR)( +typedef PVOID (NTAPI *PFNKSINITIALIZEALLOCATOR)( IN PVOID InitialContext, IN PKSALLOCATOR_FRAMING AllocatorFraming, OUT PVOID* Context); #if defined(_NTDDK_) -typedef NTSTATUS NTAPI (*PFNKSALLOCATOR)( +typedef NTSTATUS (NTAPI *PFNKSALLOCATOR)( IN PIRP Irp, IN ULONG BufferSize, IN BOOLEAN InputOperation); -typedef NTSTATUS NTAPI (*PFNKINTERSECTHANDLEREX)( +typedef NTSTATUS (NTAPI *PFNKINTERSECTHANDLEREX)( IN PVOID Context, IN PIRP Irp, IN PKSP_PIN Pin, @@ -2496,16 +2482,14 @@ typedef NTSTATUS -NTAPI -NTAPI (*PFNALLOCATOR_ALLOCATEFRAME)( +(NTAPI *PFNALLOCATOR_ALLOCATEFRAME)( IN PFILE_OBJECT FileObject, PVOID *Frame ); typedef VOID -NTAPI -NTAPI (*PFNALLOCATOR_FREEFRAME)( +(NTAPI *PFNALLOCATOR_FREEFRAME)( IN PFILE_OBJECT FileObject, IN PVOID Frame ); @@ -2632,32 +2616,32 @@ typedef struct _KSFILTER_DESCRIPTOR KSFILTER_DESCRIPTOR, *PKSFILTER_DESCRIPTOR; typedef struct _KSDEVICE_DESCRIPTOR KSDEVICE_DESCRIPTOR, *PKSDEVICE_DESCRIPTOR; -typedef NTSTATUS NTAPI (*PFNKSDEVICECREATE)( +typedef NTSTATUS (NTAPI *PFNKSDEVICECREATE)( IN PKSDEVICE Device); -typedef NTSTATUS NTAPI (*PFNKSDEVICEPNPSTART)( +typedef NTSTATUS (NTAPI *PFNKSDEVICEPNPSTART)( IN PKSDEVICE Device, IN PIRP Irp, IN PCM_RESOURCE_LIST TranslatedResourceList OPTIONAL, IN PCM_RESOURCE_LIST UntranslatedResourceList OPTIONAL); -typedef NTSTATUS NTAPI (*PFNKSDEVICE)( +typedef NTSTATUS (NTAPI *PFNKSDEVICE)( IN PKSDEVICE Device); -typedef NTSTATUS NTAPI (*PFNKSDEVICEIRP)( +typedef NTSTATUS (NTAPI *PFNKSDEVICEIRP)( IN PKSDEVICE Device, IN PIRP Irp); -typedef VOID NTAPI (*PFNKSDEVICEIRPVOID)( +typedef VOID (NTAPI *PFNKSDEVICEIRPVOID)( IN PKSDEVICE Device, IN PIRP Irp); -typedef NTSTATUS NTAPI (*PFNKSDEVICEQUERYCAPABILITIES)( +typedef NTSTATUS (NTAPI *PFNKSDEVICEQUERYCAPABILITIES)( IN PKSDEVICE Device, IN PIRP Irp, IN OUT PDEVICE_CAPABILITIES Capabilities); -typedef NTSTATUS NTAPI (*PFNKSDEVICEQUERYPOWER)( +typedef NTSTATUS (NTAPI *PFNKSDEVICEQUERYPOWER)( IN PKSDEVICE Device, IN PIRP Irp, IN DEVICE_POWER_STATE DeviceTo, @@ -2666,7 +2650,7 @@ IN SYSTEM_POWER_STATE SystemFrom, IN POWER_ACTION Action); -typedef VOID NTAPI (*PFNKSDEVICESETPOWER)( +typedef VOID (NTAPI *PFNKSDEVICESETPOWER)( IN PKSDEVICE Device, IN PIRP Irp, IN DEVICE_POWER_STATE To, @@ -2721,20 +2705,20 @@ typedef void -NTAPI (*PFNKSFILTERPOWER)( +(NTAPI *PFNKSFILTERPOWER)( IN PKSFILTER Filter, IN DEVICE_POWER_STATE State ); -typedef NTSTATUS NTAPI (*PFNKSFILTERIRP)( +typedef NTSTATUS (NTAPI *PFNKSFILTERIRP)( IN PKSFILTER Filter, IN PIRP Irp); -typedef NTSTATUS NTAPI (*PFNKSFILTERPROCESS)( +typedef NTSTATUS (NTAPI *PFNKSFILTERPROCESS)( IN PKSFILTER Filter, IN PKSPROCESSPIN_INDEXENTRY ProcessPinsIndex); -typedef NTSTATUS NTAPI (*PFNKSFILTERVOID)( +typedef NTSTATUS (NTAPI *PFNKSFILTERVOID)( IN PKSFILTER Filter); struct _KSFILTER_DISPATCH @@ -2792,12 +2776,12 @@ Minidriver Callbacks */ #if defined(_NTDDK_) -typedef NTSTATUS NTAPI (*KStrMethodHandler)( +typedef NTSTATUS (NTAPI *KStrMethodHandler)( IN PIRP Irp, IN PKSIDENTIFIER Request, IN OUT PVOID Data); -typedef NTSTATUS NTAPI (*KStrSupportHandler)( +typedef NTSTATUS (NTAPI *KStrSupportHandler)( IN PIRP Irp, IN PKSIDENTIFIER Request, IN OUT PVOID Data); @@ -2842,13 +2826,13 @@ Clock Functions */ #if defined(_NTDDK_) -typedef BOOLEAN NTAPI (*PFNKSSETTIMER)( +typedef BOOLEAN (NTAPI *PFNKSSETTIMER)( IN PVOID Context, IN PKTIMER Timer, IN LARGE_INTEGER DueTime, IN PKDPC Dpc); -typedef BOOLEAN NTAPI (*PFNKSCANCELTIMER)( +typedef BOOLEAN (NTAPI *PFNKSCANCELTIMER)( IN PVOID Context, IN PKTIMER Timer); @@ -3014,7 +2998,7 @@ typedef BOOLEAN -NTAPI (*PFNKSGENERATEEVENTCALLBACK)( +(NTAPI *PFNKSGENERATEEVENTCALLBACK)( IN PVOID Context, IN PKSEVENT_ENTRY EventEntry ); @@ -3165,7 +3149,7 @@ IRP Helper Functions */ -typedef NTSTATUS NTAPI (*PFNKSIRPLISTCALLBACK)( +typedef NTSTATUS (NTAPI *PFNKSIRPLISTCALLBACK)( IN PIRP Irp, IN PVOID Context); @@ -3598,7 +3582,7 @@ IN const KSDEVICE_DESCRIPTOR* Descriptor OPTIONAL); -typedef void NTAPI (*PFNKSFILTERFACTORYPOWER)( +typedef void (NTAPI *PFNKSFILTERFACTORYPOWER)( IN PKSFILTERFACTORY FilterFactory, IN DEVICE_POWER_STATE State); @@ -3886,7 +3870,7 @@ KsFilterAddTopologyConnections( IN PKSFILTER Filter, IN ULONG NewConnectionsCount, - IN const KSTOPOLOGY_CONNECTION* NewTopologyConnections); + IN const KSTOPOLOGY_CONNECTION *const NewTopologyConnections); KSDDKAPI VOID @@ -3900,7 +3884,7 @@ NTAPI KsFilterCreateNode( IN PKSFILTER Filter, - IN const KSNODE_DESCRIPTOR* NodeDescriptor, + IN const KSNODE_DESCRIPTOR *const NodeDescriptor, OUT PULONG NodeID); KSDDKAPI @@ -3908,7 +3892,7 @@ NTAPI KsFilterCreatePinFactory( IN PKSFILTER Filter, - IN const KSPIN_DESCRIPTOR_EX* PinDescriptor, + IN const KSPIN_DESCRIPTOR_EX *const PinDescriptor, OUT PULONG PinID); KSDDKAPI

1 0

[fireball] 42207: - Actually just add RtlNtStatusToDosError declaration to wineserver_call_err to kill dependency on complex header sets.
by fireball＠svn.reactos.org 25 Jul '09

25 Jul '09

Author: fireball Date: Sat Jul 25 15:17:38 2009 New Revision: 42207 URL: http://svn.reactos.org/svn/reactos?rev=42207&view=rev Log: - Actually just add RtlNtStatusToDosError declaration to wineserver_call_err to kill dependency on complex header sets. Modified: branches/arwinss/reactos/include/reactos/wine/server.h Modified: branches/arwinss/reactos/include/reactos/wine/server.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos… ============================================================================== --- branches/arwinss/reactos/include/reactos/wine/server.h [iso-8859-1] (original) +++ branches/arwinss/reactos/include/reactos/wine/server.h [iso-8859-1] Sat Jul 25 15:17:38 2009 @@ -58,6 +58,8 @@ /* do a server call and set the last error code */ static inline unsigned int wine_server_call_err( void *req_ptr ) { + NTSYSAPI ULONG NTAPI RtlNtStatusToDosError(IN NTSTATUS Status); + unsigned int res = wine_server_call( req_ptr ); if (res) SetLastError( RtlNtStatusToDosError(res) ); return res;

1 0

[sginsberg] 42206: - Make most of the the video stack compile with msvc
by sginsberg＠svn.reactos.org 25 Jul '09

25 Jul '09

Author: sginsberg Date: Sat Jul 25 15:15:22 2009 New Revision: 42206 URL: http://svn.reactos.org/svn/reactos?rev=42206&view=rev Log: - Make most of the the video stack compile with msvc Modified: trunk/reactos/drivers/video/displays/framebuf/pointer.c trunk/reactos/drivers/video/font/bmfd/bmfd.h trunk/reactos/drivers/video/font/ftfd/ftfd.h trunk/reactos/drivers/video/videoprt/agp.c trunk/reactos/include/ddk/miniport.h trunk/reactos/include/ddk/video.h trunk/reactos/include/dxsdk/ddraw.h Modified: trunk/reactos/drivers/video/displays/framebuf/pointer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra… ============================================================================== --- trunk/reactos/drivers/video/displays/framebuf/pointer.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/displays/framebuf/pointer.c [iso-8859-1] Sat Jul 25 15:15:22 2009 @@ -65,7 +65,7 @@ IN LONG y, IN RECTL *prcl) { - return EngMovePointer(pso, x, y, prcl); + EngMovePointer(pso, x, y, prcl); } #else Modified: trunk/reactos/drivers/video/font/bmfd/bmfd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/font/bmfd/bm… ============================================================================== --- trunk/reactos/drivers/video/font/bmfd/bmfd.h [iso-8859-1] (original) +++ trunk/reactos/drivers/video/font/bmfd/bmfd.h [iso-8859-1] Sat Jul 25 15:15:22 2009 @@ -263,11 +263,15 @@ ULONG DbgPrint(IN PCHAR Format, IN ...); -static __inline__ -void -DbgBreakPoint(void) -{ +FORCEINLINE +VOID +DbgBreakPoint(VOID) +{ +#ifdef __GNUC__ asm volatile ("int $3"); +#else + __asm int 3; +#endif } DHPDEV Modified: trunk/reactos/drivers/video/font/ftfd/ftfd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/font/ftfd/ft… ============================================================================== --- trunk/reactos/drivers/video/font/ftfd/ftfd.h [iso-8859-1] (original) +++ trunk/reactos/drivers/video/font/ftfd/ftfd.h [iso-8859-1] Sat Jul 25 15:15:22 2009 @@ -52,11 +52,15 @@ ULONG DbgPrint(IN PCHAR Format, IN ...); -static __inline__ -void -DbgBreakPoint(void) +FORCEINLINE +VOID +DbgBreakPoint(VOID) { +#ifdef __GNUC__ asm volatile ("int $3"); +#else + __asm int 3; +#endif } DHPDEV Modified: trunk/reactos/drivers/video/videoprt/agp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/agp… ============================================================================== --- trunk/reactos/drivers/video/videoprt/agp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/videoprt/agp.c [iso-8859-1] Sat Jul 25 15:15:22 2009 @@ -253,6 +253,7 @@ { PVIDEO_PORT_AGP_VIRTUAL_MAPPING VirtualMapping; PVOID BaseAddress = NULL; + PHYSICAL_ADDRESS PhysicalAddress; NTSTATUS Status; TRACE_(VIDEOPRT, "AgpCommitVirtual - VirtualContext: 0x%x Pages: %d, Offset: 0x%x\n", @@ -279,7 +280,7 @@ ULONG OffsetInBytes = Offset * PAGE_SIZE; BaseAddress = (PVOID)((ULONG_PTR)VirtualMapping->MappedAddress + OffsetInBytes); - PHYSICAL_ADDRESS PhysicalAddress = VirtualMapping->AgpMapping->PhysicalAddress; + PhysicalAddress = VirtualMapping->AgpMapping->PhysicalAddress; PhysicalAddress.QuadPart += OffsetInBytes; Status = ZwFreeVirtualMemory(VirtualMapping->ProcessHandle, Modified: trunk/reactos/include/ddk/miniport.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/miniport.h?rev… ============================================================================== --- trunk/reactos/include/ddk/miniport.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/miniport.h [iso-8859-1] Sat Jul 25 15:15:22 2009 @@ -58,8 +58,8 @@ } VIDEO_ACCESS_RANGE, *PVIDEO_ACCESS_RANGE; #endif -typedef VOID DDKAPI -(*PBANKED_SECTION_ROUTINE)( +typedef VOID +(DDKAPI *PBANKED_SECTION_ROUTINE)( IN ULONG ReadBank, IN ULONG WriteBank, IN PVOID Context); Modified: trunk/reactos/include/ddk/video.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/video.h?rev=42… ============================================================================== --- trunk/reactos/include/ddk/video.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/video.h [iso-8859-1] Sat Jul 25 15:15:22 2009 @@ -143,15 +143,15 @@ VP_SCATTER_GATHER_ELEMENT Elements[0]; } VP_SCATTER_GATHER_LIST, *PVP_SCATTER_GATHER_LIST; -typedef VOID DDKAPI -(*PEXECUTE_DMA)( +typedef VOID +(DDKAPI *PEXECUTE_DMA)( IN PVOID HwDeviceExtension, IN PVP_DMA_ADAPTER VpDmaAdapter, IN PVP_SCATTER_GATHER_LIST SGList, IN PVOID Context); -typedef PVOID DDKAPI -(*PVIDEO_PORT_GET_PROC_ADDRESS)( +typedef PVOID +(DDKAPI *PVIDEO_PORT_GET_PROC_ADDRESS)( IN PVOID HwDeviceExtension, IN PUCHAR FunctionName); @@ -187,16 +187,16 @@ ULONGLONG SystemMemorySize; } VIDEO_PORT_CONFIG_INFO, *PVIDEO_PORT_CONFIG_INFO; -typedef VP_STATUS DDKAPI -(*PVIDEO_HW_FIND_ADAPTER)( +typedef VP_STATUS +(DDKAPI *PVIDEO_HW_FIND_ADAPTER)( IN PVOID HwDeviceExtension, IN PVOID HwContext, IN PWSTR ArgumentString, IN OUT PVIDEO_PORT_CONFIG_INFO ConfigInfo, OUT PUCHAR Again); -typedef VP_STATUS DDKAPI -(*PVIDEO_HW_POWER_GET)( +typedef VP_STATUS +(DDKAPI *PVIDEO_HW_POWER_GET)( IN PVOID HwDeviceExtension, IN ULONG HwId, IN OUT PVIDEO_POWER_MANAGEMENT VideoPowerControl); @@ -256,15 +256,15 @@ } VIDEO_ACCESS_RANGE, *PVIDEO_ACCESS_RANGE; #endif -typedef VOID DDKAPI -(*PVIDEO_HW_LEGACYRESOURCES)( +typedef VOID +(DDKAPI *PVIDEO_HW_LEGACYRESOURCES)( IN ULONG VendorId, IN ULONG DeviceId, IN OUT PVIDEO_ACCESS_RANGE *LegacyResourceList, IN OUT PULONG LegacyResourceCount); -typedef VP_STATUS DDKAPI -(*PMINIPORT_QUERY_DEVICE_ROUTINE)( +typedef VP_STATUS +(DDKAPI *PMINIPORT_QUERY_DEVICE_ROUTINE)( IN PVOID HwDeviceExtension, IN PVOID Context, IN VIDEO_DEVICE_DATA_TYPE DeviceDataType, Modified: trunk/reactos/include/dxsdk/ddraw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/ddraw.h?rev=… ============================================================================== --- trunk/reactos/include/dxsdk/ddraw.h [iso-8859-1] (original) +++ trunk/reactos/include/dxsdk/ddraw.h [iso-8859-1] Sat Jul 25 15:15:22 2009 @@ -8,8 +8,8 @@ #include <objbase.h> #else #define IUnknown void -#if !defined(NT_BUILD_ENVIRONMENT) && !defined(WINNT) - #define CO_E_NOTINITIALIZED 0x800401F0 +#if !defined(NT_BUILD_ENVIRONMENT) && !defined(_WINNT_H) + #define CO_E_NOTINITIALIZED 0x800401F0L #endif #endif @@ -37,7 +37,7 @@ #endif #endif -#if defined(WINNT) || !defined(WIN32) +#if defined(_WINNT_H) || !defined(WIN32) #ifndef _HRESULT_DEFINED #define _HRESULT_DEFINED typedef long HRESULT;

1 0

[sginsberg] 42205: - Make mp HAL MSC compatible
by sginsberg＠svn.reactos.org 25 Jul '09

25 Jul '09

Author: sginsberg Date: Sat Jul 25 13:44:27 2009 New Revision: 42205 URL: http://svn.reactos.org/svn/reactos?rev=42205&view=rev Log: - Make mp HAL MSC compatible Modified: trunk/reactos/hal/halx86/mp/apic.c trunk/reactos/hal/halx86/mp/mpsirql.c Modified: trunk/reactos/hal/halx86/mp/apic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/mp/apic.c?rev=4… ============================================================================== --- trunk/reactos/hal/halx86/mp/apic.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/mp/apic.c [iso-8859-1] Sat Jul 25 13:44:27 2009 @@ -351,7 +351,7 @@ BOOLEAN VerifyLocalAPIC(VOID) { SIZE_T reg0, reg1; - ULONG l, h; + ULONG l = 0, h = 0; /* The version register is read-only in a real APIC */ reg0 = APICRead(APIC_VER); DPRINT1("Getting VERSION: %x\n", reg0); @@ -416,7 +416,7 @@ #ifdef CONFIG_SMP VOID APICSendIPI(ULONG Target, ULONG Mode) { - ULONG tmp, i, flags; + ULONG tmp, i, flags = 0; /* save flags and disable interrupts */ Ke386SaveFlags(flags); Modified: trunk/reactos/hal/halx86/mp/mpsirql.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/mp/mpsirql.c?re… ============================================================================== --- trunk/reactos/hal/halx86/mp/mpsirql.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/mp/mpsirql.c [iso-8859-1] Sat Jul 25 13:44:27 2009 @@ -28,7 +28,7 @@ */ { KIRQL irql; - ULONG Flags; + ULONG Flags = 0; Ke386SaveFlags(Flags); _disable(); @@ -53,7 +53,7 @@ * PURPOSE: Sets the current irq level without taking any action */ { - ULONG Flags; + ULONG Flags = 0; if (NewIrql > HIGH_LEVEL) { DPRINT1 ("NewIrql %x\n", NewIrql); @@ -71,7 +71,7 @@ VOID HalpLowerIrql(KIRQL NewIrql, BOOLEAN FromHalEndSystemInterrupt) { - ULONG Flags; + ULONG Flags = 0; UCHAR DpcRequested; if (NewIrql >= DISPATCH_LEVEL) { @@ -188,7 +188,7 @@ KfRaiseIrql (KIRQL NewIrql) { KIRQL OldIrql; - ULONG Flags; + ULONG Flags = 0; Ke386SaveFlags(Flags); _disable(); @@ -295,7 +295,7 @@ ULONG Vector, PKIRQL OldIrql) { - ULONG Flags; + ULONG Flags = 0; DPRINT("Vector (0x%X) Irql (0x%X)\n", Vector, Irql); if (KeGetCurrentIrql () >= Irql) @@ -324,7 +324,7 @@ * FUNCTION: Finish a system interrupt and restore the specified irq level. */ { - ULONG Flags; + ULONG Flags = 0; Ke386SaveFlags(Flags); if (Flags & EFLAGS_INTERRUPT_MASK)

1 0

[sginsberg] 42204: - Fix some kernel MSC compilation issues: - ShutdownThreadMain: Define SMP-only variables compatibly - MmArmInitSystem: Define MiNonPagedPoolStart and MiNonPagedPoolLength externs compatibly - KdbpCallMainLoop: Add VOID to parameter list
by sginsberg＠svn.reactos.org 25 Jul '09

25 Jul '09

Author: sginsberg Date: Sat Jul 25 13:43:48 2009 New Revision: 42204 URL: http://svn.reactos.org/svn/reactos?rev=42204&view=rev Log: - Fix some kernel MSC compilation issues: - ShutdownThreadMain: Define SMP-only variables compatibly - MmArmInitSystem: Define MiNonPagedPoolStart and MiNonPagedPoolLength externs compatibly - KdbpCallMainLoop: Add VOID to parameter list Modified: trunk/reactos/ntoskrnl/ex/shutdown.c trunk/reactos/ntoskrnl/kdbg/kdb.c trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c Modified: trunk/reactos/ntoskrnl/ex/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/shutdown.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ex/shutdown.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/shutdown.c [iso-8859-1] Sat Jul 25 13:43:48 2009 @@ -133,6 +133,10 @@ "<Place your Ad here>\n" }; LARGE_INTEGER Now; +#ifdef CONFIG_SMP + LONG i; + KIRQL OldIrql; +#endif /* Run the thread on the boot processor */ KeSetSystemAffinityThread(1); @@ -172,9 +176,6 @@ HalReturnToFirmware (FIRMWARE_OFF); #else #ifdef CONFIG_SMP - LONG i; - KIRQL OldIrql; - OldIrql = KeRaiseIrqlToDpcLevel(); /* Halt all other processors */ for (i = 0; i < KeNumberProcessors; i++) Modified: trunk/reactos/ntoskrnl/kdbg/kdb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb.c?rev=42… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb.c [iso-8859-1] Sat Jul 25 13:43:48 2009 @@ -1175,7 +1175,7 @@ /*!\brief Calls the main loop ... */ static VOID -KdbpCallMainLoop() +KdbpCallMainLoop(VOID) { KdbpCliMainLoop(KdbEnteredOnSingleStep); } Modified: trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/i386/init… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] Sat Jul 25 13:43:48 2009 @@ -94,6 +94,12 @@ PVOID MmNonPagedPoolStart; PVOID MmNonPagedPoolExpansionStart; PVOID MmNonPagedPoolEnd = MI_NONPAGED_POOL_END; + +// +// Old ReactOS Mm nonpaged pool +// +extern PVOID MiNonPagedPoolStart; +extern ULONG MiNonPagedPoolLength; // // This is where paged pool starts by default @@ -1211,8 +1217,6 @@ // // Print the memory layout // - extern PVOID MiNonPagedPoolStart; - extern ULONG MiNonPagedPoolLength; DPRINT1(" 0x%p - 0x%p\t%s\n", MmSystemRangeStart, (ULONG_PTR)MmSystemRangeStart + MmBootImageSize,

1 0

[fireball] 42203: - Merge 42202: Create a solid black brush for background color of a ConsoleWindowClass.
by fireball＠svn.reactos.org 25 Jul '09

25 Jul '09

Author: fireball Date: Sat Jul 25 12:27:27 2009 New Revision: 42203 URL: http://svn.reactos.org/svn/reactos?rev=42203&view=rev Log: - Merge 42202: Create a solid black brush for background color of a ConsoleWindowClass. Modified: branches/arwinss/reactos/subsystems/win32/csrss/win32csr/guiconsole.c Modified: branches/arwinss/reactos/subsystems/win32/csrss/win32csr/guiconsole.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/csrss/win32csr/guiconsole.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/csrss/win32csr/guiconsole.c [iso-8859-1] Sat Jul 25 12:27:27 2009 @@ -1998,7 +1998,7 @@ wc.hInstance = (HINSTANCE) GetModuleHandleW(NULL); wc.hIcon = LoadIconW(GetModuleHandleW(L"win32csr"), MAKEINTRESOURCEW(1)); wc.hCursor = LoadCursorW(NULL, (LPCWSTR) IDC_ARROW); - wc.hbrBackground = NULL; + wc.hbrBackground = CreateSolidBrush(RGB(0,0,0)); wc.lpszMenuName = NULL; wc.cbClsExtra = 0; wc.cbWndExtra = 0;

1 0

[fireball] 42202: - Create a solid black brush for background color of a ConsoleWindowClass.
by fireball＠svn.reactos.org 25 Jul '09

25 Jul '09

Author: fireball Date: Sat Jul 25 12:24:41 2009 New Revision: 42202 URL: http://svn.reactos.org/svn/reactos?rev=42202&view=rev Log: - Create a solid black brush for background color of a ConsoleWindowClass. Modified: trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c Modified: trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c [iso-8859-1] Sat Jul 25 12:24:41 2009 @@ -1998,7 +1998,7 @@ wc.hInstance = (HINSTANCE) GetModuleHandleW(NULL); wc.hIcon = LoadIconW(GetModuleHandleW(L"win32csr"), MAKEINTRESOURCEW(1)); wc.hCursor = LoadCursorW(NULL, (LPCWSTR) IDC_ARROW); - wc.hbrBackground = NULL; + wc.hbrBackground = CreateSolidBrush(RGB(0,0,0)); wc.lpszMenuName = NULL; wc.cbClsExtra = 0; wc.cbWndExtra = 0;

1 0

[fireball] 42201: - Hack atom support in kernel32 to call user server for global atom information. Ugly, crappy, will be deprecated once the move to proper atoms support happens. But for now it provides consistency with win32k/user32.
by fireball＠svn.reactos.org 25 Jul '09

25 Jul '09

Author: fireball Date: Sat Jul 25 11:56:27 2009 New Revision: 42201 URL: http://svn.reactos.org/svn/reactos?rev=42201&view=rev Log: - Hack atom support in kernel32 to call user server for global atom information. Ugly, crappy, will be deprecated once the move to proper atoms support happens. But for now it provides consistency with win32k/user32. Modified: branches/arwinss/reactos/dll/win32/kernel32/kernel32.rbuild branches/arwinss/reactos/dll/win32/kernel32/misc/atom.c Modified: branches/arwinss/reactos/dll/win32/kernel32/kernel32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/kerne… ============================================================================== --- branches/arwinss/reactos/dll/win32/kernel32/kernel32.rbuild [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/kernel32/kernel32.rbuild [iso-8859-1] Sat Jul 25 11:56:27 2009 @@ -146,6 +146,7 @@ <library>kernel32_base</library> <library>wine</library> <library>pseh</library> + <library>win32ksys</library> <file>kernel32.rc</file> Modified: branches/arwinss/reactos/dll/win32/kernel32/misc/atom.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/kerne… ============================================================================== --- branches/arwinss/reactos/dll/win32/kernel32/misc/atom.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/kernel32/misc/atom.c [iso-8859-1] Sat Jul 25 11:56:27 2009 @@ -8,6 +8,7 @@ /* INCLUDES ******************************************************************/ #include <k32.h> +#include "wine/server.h" #define NDEBUG #include <debug.h> @@ -15,6 +16,206 @@ /* GLOBALS *******************************************************************/ PRTL_ATOM_TABLE BaseLocalAtomTable = NULL; + +/* DEAR GOD, FORGIVE ME ******************************************************/ + +#define MAX_ATOM_LEN 255 + +/****************************************************************** + * is_integral_atom + * Returns STATUS_SUCCESS if integral atom and 'pAtom' is filled + * STATUS_INVALID_PARAMETER if 'atomstr' is too long + * STATUS_MORE_ENTRIES otherwise + */ +static NTSTATUS is_integral_atom( LPCWSTR atomstr, size_t len, RTL_ATOM* pAtom ) +{ + RTL_ATOM atom; + + if (HIWORD( atomstr )) + { + const WCHAR* ptr = atomstr; + if (!len) return STATUS_OBJECT_NAME_INVALID; + + if (*ptr++ == '#') + { + atom = 0; + while (ptr < atomstr + len && *ptr >= '0' && *ptr <= '9') + { + atom = atom * 10 + *ptr++ - '0'; + } + if (ptr > atomstr + 1 && ptr == atomstr + len) goto done; + } + if (len > MAX_ATOM_LEN) return STATUS_INVALID_PARAMETER; + return STATUS_MORE_ENTRIES; + } + else atom = LOWORD( atomstr ); +done: + if (!atom || atom >= MAXINTATOM) return STATUS_INVALID_PARAMETER; + *pAtom = atom; + return STATUS_SUCCESS; +} + +/****************************************************************** + * integral_atom_name (internal) + * + * Helper for fetching integral (local/global) atoms names. + */ +static ULONG integral_atom_name(WCHAR* buffer, ULONG len, RTL_ATOM atom) +{ + static const WCHAR fmt[] = {'#','%','u',0}; + WCHAR tmp[16]; + int ret; + + ret = swprintf( tmp, fmt, atom ); + if (!len) return ret * sizeof(WCHAR); + if (len <= ret) ret = len - 1; + memcpy( buffer, tmp, ret * sizeof(WCHAR) ); + buffer[ret] = 0; + return ret * sizeof(WCHAR); +} + +/************************************************* + * Global handle table management + *************************************************/ + +/****************************************************************** + * NtAddAtom (NTDLL.@) + */ +NTSTATUS WINAPI WineNtAddAtom( const WCHAR* name, ULONG length, RTL_ATOM* atom ) +{ + NTSTATUS status; + + status = is_integral_atom( name, length / sizeof(WCHAR), atom ); + if (status == STATUS_MORE_ENTRIES) + { + SERVER_START_REQ( add_atom ) + { + wine_server_add_data( req, name, length ); + req->table = 0; + status = wine_server_call( req ); + *atom = reply->atom; + } + SERVER_END_REQ; + } + //TRACE( "%s -> %x\n", + // debugstr_wn(name, length/sizeof(WCHAR)), status == STATUS_SUCCESS ? *atom : 0 ); + return status; +} + +/****************************************************************** + * NtDeleteAtom (NTDLL.@) + */ +NTSTATUS WINAPI WineNtDeleteAtom(RTL_ATOM atom) +{ + NTSTATUS status; + + SERVER_START_REQ( delete_atom ) + { + req->atom = atom; + req->table = 0; + status = wine_server_call( req ); + } + SERVER_END_REQ; + return status; +} + +/****************************************************************** + * NtFindAtom (NTDLL.@) + */ +NTSTATUS WINAPI WineNtFindAtom( const WCHAR* name, ULONG length, RTL_ATOM* atom ) +{ + NTSTATUS status; + + status = is_integral_atom( name, length / sizeof(WCHAR), atom ); + if (status == STATUS_MORE_ENTRIES) + { + SERVER_START_REQ( find_atom ) + { + wine_server_add_data( req, name, length ); + req->table = 0; + status = wine_server_call( req ); + *atom = reply->atom; + } + SERVER_END_REQ; + } + //TRACE( "%s -> %x\n", + // debugstr_wn(name, length/sizeof(WCHAR)), status == STATUS_SUCCESS ? *atom : 0 ); + return status; +} + +/****************************************************************** + * NtQueryInformationAtom (NTDLL.@) + */ +NTSTATUS WINAPI WineNtQueryInformationAtom( RTL_ATOM atom, ATOM_INFORMATION_CLASS class, + PVOID ptr, ULONG size, PULONG psize ) +{ + NTSTATUS status; + + switch (class) + { + case AtomBasicInformation: + { + ULONG name_len; + ATOM_BASIC_INFORMATION* abi = ptr; + + if (size < sizeof(ATOM_BASIC_INFORMATION)) + return STATUS_INVALID_PARAMETER; + name_len = size - sizeof(ATOM_BASIC_INFORMATION); + + if (atom < MAXINTATOM) + { + if (atom) + { + abi->NameLength = integral_atom_name( abi->Name, name_len, atom ); + status = (name_len) ? STATUS_SUCCESS : STATUS_BUFFER_TOO_SMALL; + //abi->ReferenceCount = 1; + //abi->Pinned = 1; + } + else status = STATUS_INVALID_PARAMETER; + } + else + { + SERVER_START_REQ( get_atom_information ) + { + req->atom = atom; + req->table = 0; + if (name_len) wine_server_set_reply( req, abi->Name, name_len ); + status = wine_server_call( req ); + if (status == STATUS_SUCCESS) + { + name_len = wine_server_reply_size( reply ); + if (name_len) + { + abi->NameLength = name_len; + abi->Name[name_len / sizeof(WCHAR)] = '\0'; + } + else + { + name_len = reply->total; + abi->NameLength = name_len; + status = STATUS_BUFFER_TOO_SMALL; + } + //abi->ReferenceCount = reply->count; + //abi->Pinned = reply->pinned; + } + else name_len = 0; + } + SERVER_END_REQ; + } + //TRACE( "%x -> %s (%u)\n", + // atom, debugstr_wn(abi->Name, abi->NameLength / sizeof(WCHAR)), + // status ); + if (psize) + *psize = sizeof(ATOM_BASIC_INFORMATION) + name_len; + } + break; + default: + DPRINT1( "Unsupported class %u\n", class ); + status = STATUS_INVALID_INFO_CLASS; + break; + } + return status; +} /* FUNCTIONS *****************************************************************/ @@ -38,6 +239,11 @@ UNICODE_STRING UnicodeString; PUNICODE_STRING AtomNameString; ATOM Atom = INVALID_ATOM; + + if (Unicode) + DPRINT("InternalAddAtom local %d name %S\n", Local, AtomName); + else + DPRINT("InternalAddAtom local %d name %s\n", Local, AtomName); /* Check if it's an integer atom */ if ((ULONG_PTR)AtomName <= 0xFFFF) @@ -109,7 +315,7 @@ else { /* Do a global add */ - Status = NtAddAtom(AtomNameString->Buffer, + Status = WineNtAddAtom(AtomNameString->Buffer, AtomNameString->Length, &Atom); } @@ -139,6 +345,11 @@ UNICODE_STRING UnicodeString; PUNICODE_STRING AtomNameString; ATOM Atom = INVALID_ATOM; + + if (Unicode) + DPRINT("InternalFindAtom local %d name %S\n", Local, AtomName); + else + DPRINT("InternalFindAtom local %d name %s\n", Local, AtomName); /* Check if it's an integer atom */ if ((ULONG_PTR)AtomName <= 0xFFFF) @@ -220,7 +431,7 @@ else { /* Call the global function */ - Status = NtFindAtom(AtomNameString->Buffer, + Status = WineNtFindAtom(AtomNameString->Buffer, AtomNameString->Length, &Atom); } @@ -247,6 +458,8 @@ { NTSTATUS Status; + DPRINT("InternalDeleteAtom local %d atom %x\n", Local, Atom); + /* Validate it */ if (Atom >= MAXINTATOM) { @@ -259,7 +472,7 @@ else { /* Delete it globall */ - Status = NtDeleteAtom(Atom); + Status = WineNtDeleteAtom(Atom); } /* Check for success */ @@ -293,6 +506,8 @@ ULONG AtomNameLength; PATOM_BASIC_INFORMATION AtomInfo; + DPRINT("InternalGetAtomName local %d atom %x size %x\n", Local, Atom, Size); + /* Normalize the size as not to overflow */ if (!Unicode && Size > 0x7000) Size = 0x7000; @@ -347,7 +562,7 @@ } /* Query the name */ - Status = NtQueryInformationAtom(Atom, + Status = WineNtQueryInformationAtom(Atom, AtomBasicInformation, AtomInfo, AtomInfoLength, @@ -415,6 +630,11 @@ SetLastErrorByStatus(Status); } + if (Unicode) + DPRINT("InternalGetAtomName name %S\n", AtomName); + else + DPRINT("InternalGetAtomName name %s\n", AtomName); + /* Return length */ return RetVal; }

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
61
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2009