Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ion] 20657: - GEt TCPIP building with msvc.
by ion＠svn.reactos.org 07 Jan '06

07 Jan '06

- GEt TCPIP building with msvc. Modified: trunk/reactos/drivers/net/tcpip/include/precomp.h Modified: trunk/reactos/drivers/net/tcpip/include/router.h Modified: trunk/reactos/drivers/net/tcpip/recmutex/recmutex.c Modified: trunk/reactos/drivers/net/tcpip/tcpip/dispatch.c Modified: trunk/reactos/drivers/net/tcpip/tcpip/ninfo.c _____ Modified: trunk/reactos/drivers/net/tcpip/include/precomp.h --- trunk/reactos/drivers/net/tcpip/include/precomp.h 2006-01-07 07:40:14 UTC (rev 20656) +++ trunk/reactos/drivers/net/tcpip/include/precomp.h 2006-01-07 07:56:55 UTC (rev 20657) @@ -1,6 +1,8 @@ #include <roscfg.h> #include <limits.h> #include <ntddk.h> +#include <tdi.h> +#include <tdistat.h> #include <../recmutex/recmutex.h> #include <roscfg.h> #include <tcpip.h> _____ Modified: trunk/reactos/drivers/net/tcpip/include/router.h --- trunk/reactos/drivers/net/tcpip/include/router.h 2006-01-07 07:40:14 UTC (rev 20656) +++ trunk/reactos/drivers/net/tcpip/include/router.h 2006-01-07 07:56:55 UTC (rev 20657) @@ -43,7 +43,7 @@ NTSTATUS RouterShutdown( VOID); -UINT CountFIBs(); +UINT CountFIBs(VOID); UINT CopyFIBs( PFIB_ENTRY Target ); _____ Modified: trunk/reactos/drivers/net/tcpip/recmutex/recmutex.c --- trunk/reactos/drivers/net/tcpip/recmutex/recmutex.c 2006-01-07 07:40:14 UTC (rev 20656) +++ trunk/reactos/drivers/net/tcpip/recmutex/recmutex.c 2006-01-07 07:56:55 UTC (rev 20657) @@ -11,7 +11,7 @@ /* NOTE: When we leave, the FAST_MUTEX must have been released. The result * is that we always exit in the same irql as entering */ -UINT RecursiveMutexEnter( PRECURSIVE_MUTEX RecMutex, BOOL ToWrite ) { +SIZE_T RecursiveMutexEnter( PRECURSIVE_MUTEX RecMutex, BOOLEAN ToWrite ) { NTSTATUS Status = STATUS_SUCCESS; PVOID CurrentThread = KeGetCurrentThread(); _____ Modified: trunk/reactos/drivers/net/tcpip/tcpip/dispatch.c --- trunk/reactos/drivers/net/tcpip/tcpip/dispatch.c 2006-01-07 07:40:14 UTC (rev 20656) +++ trunk/reactos/drivers/net/tcpip/tcpip/dispatch.c 2006-01-07 07:56:55 UTC (rev 20657) @@ -160,7 +160,7 @@ DispCancelComplete(DisType->FileObject); } -VOID DDKAPI DispCancelRequest( +VOID NTAPI DispCancelRequest( PDEVICE_OBJECT Device, PIRP Irp) /* @@ -245,7 +245,7 @@ } -VOID DDKAPI DispCancelListenRequest( +VOID NTAPI DispCancelListenRequest( PDEVICE_OBJECT Device, PIRP Irp) /* _____ Modified: trunk/reactos/drivers/net/tcpip/tcpip/ninfo.c --- trunk/reactos/drivers/net/tcpip/tcpip/ninfo.c 2006-01-07 07:40:14 UTC (rev 20656) +++ trunk/reactos/drivers/net/tcpip/tcpip/ninfo.c 2006-01-07 07:56:55 UTC (rev 20657) @@ -16,7 +16,6 @@ TDI_STATUS InfoTdiQueryGetAddrTable( PNDIS_BUFFER Buffer, PUINT BufferSize ) { - IF_LIST_ITER(CurrentIF); TDI_STATUS Status = TDI_INVALID_REQUEST; KIRQL OldIrql; UINT Count = 0; @@ -24,6 +23,7 @@ PIPADDR_ENTRY IpAddress = ExAllocatePool( NonPagedPool, sizeof( IPADDR_ENTRY ) * IfCount ); PIPADDR_ENTRY IpCurrent = IpAddress; + IF_LIST_ITER(CurrentIF); TI_DbgPrint(DEBUG_INFO, ("Called.\n")); @@ -66,8 +66,8 @@ TDI_STATUS InfoTdiQueryGetRouteTable( PNDIS_BUFFER Buffer, PUINT BufferSize ) { TDI_STATUS Status; KIRQL OldIrql; - UINT RtCount = CountFIBs(), - Size = sizeof( IPROUTE_ENTRY ) * RtCount; + UINT RtCount = CountFIBs(); + UINT Size = sizeof( IPROUTE_ENTRY ) * RtCount; PFIB_ENTRY RCache = ExAllocatePool( NonPagedPool, sizeof( FIB_ENTRY ) * RtCount ), RCacheCur = RCache; @@ -142,7 +142,7 @@ PUINT BufferSize ) { IPSNMP_INFO SnmpInfo; UINT IfCount = CountInterfaces(); - UINT RouteCount = CountFIBs( NULL ); + UINT RouteCount = CountFIBs(); TDI_STATUS Status = TDI_INVALID_REQUEST; TI_DbgPrint(DEBUG_INFO, ("Called.\n"));

1 0

[ion] 20656: - Do not generate manifest files for drivers or native apps.
by ion＠svn.reactos.org 07 Jan '06

07 Jan '06

- Do not generate manifest files for drivers or native apps. - Get portcls to compile. - Commit some fixes I forgot. Modified: trunk/reactos/drivers/multimedia/portcls/portcls.c Modified: trunk/reactos/drivers/multimedia/portcls/portcls.h Modified: trunk/reactos/drivers/net/tcpip/include/tcp.h Modified: trunk/reactos/drivers/net/tcpip/include/udp.h Modified: trunk/reactos/drivers/net/tcpip/recmutex/recmutex.h Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp _____ Modified: trunk/reactos/drivers/multimedia/portcls/portcls.c --- trunk/reactos/drivers/multimedia/portcls/portcls.c 2006-01-07 07:33:08 UTC (rev 20655) +++ trunk/reactos/drivers/multimedia/portcls/portcls.c 2006-01-07 07:40:14 UTC (rev 20656) @@ -42,8 +42,8 @@ /* * @implemented */ -DWORD STDCALL -DllInitialize(DWORD Unknown) +ULONG STDCALL +DllInitialize(ULONG Unknown) { return 0; } @@ -51,7 +51,7 @@ /* * @implemented */ -DWORD STDCALL +ULONG STDCALL DllUnload(VOID) { return 0; @@ -63,11 +63,11 @@ */ NTSTATUS STDCALL PcAddAdapterDevice( - DWORD DriverObject, - DWORD PhysicalDeviceObject, - DWORD StartDevice, - DWORD MaxObjects, - DWORD DeviceExtensionSize + ULONG DriverObject, + ULONG PhysicalDeviceObject, + ULONG StartDevice, + ULONG MaxObjects, + ULONG DeviceExtensionSize ) { UNIMPLEMENTED; @@ -79,9 +79,9 @@ */ NTSTATUS STDCALL PcAddContentHandlers( - DWORD ContentId, - DWORD paHandlers, - DWORD NumHandlers + ULONG ContentId, + ULONG paHandlers, + ULONG NumHandlers ) { UNIMPLEMENTED; @@ -93,9 +93,9 @@ */ NTSTATUS STDCALL PcCompleteIrp( - DWORD DeviceObject, - DWORD Irp, - DWORD Status + ULONG DeviceObject, + ULONG Irp, + ULONG Status ) { UNIMPLEMENTED; @@ -107,8 +107,8 @@ */ NTSTATUS STDCALL PcCompletePendingPropertyRequest( - DWORD PropertyRequest, - DWORD NtStatus + ULONG PropertyRequest, + ULONG NtStatus ) { UNIMPLEMENTED; @@ -120,9 +120,9 @@ */ NTSTATUS STDCALL PcCreateContentMixed( - DWORD paContentId, - DWORD cContentId, - DWORD pMixedContentId + ULONG paContentId, + ULONG cContentId, + ULONG pMixedContentId ) { UNIMPLEMENTED; @@ -134,7 +134,7 @@ */ NTSTATUS STDCALL PcDestroyContent( - DWORD ContentId + ULONG ContentId ) { UNIMPLEMENTED; @@ -146,8 +146,8 @@ */ NTSTATUS STDCALL PcDispatchIrp( - DWORD DeviceObject, - DWORD Irp + ULONG DeviceObject, + ULONG Irp ) { UNIMPLEMENTED; @@ -159,9 +159,9 @@ */ NTSTATUS STDCALL PcForwardContentToDeviceObject( - DWORD ContentId, - DWORD Reserved, - DWORD DrmForward + ULONG ContentId, + ULONG Reserved, + ULONG DrmForward ) { UNIMPLEMENTED; @@ -173,8 +173,8 @@ */ NTSTATUS STDCALL PcForwardContentToFileObject( - DWORD ContentId, - DWORD FileObject + ULONG ContentId, + ULONG FileObject ) { UNIMPLEMENTED; @@ -186,9 +186,9 @@ */ NTSTATUS STDCALL PcForwardContentToInterface( - DWORD ContentId, - DWORD Unknown, - DWORD NumMethods + ULONG ContentId, + ULONG Unknown, + ULONG NumMethods ) { UNIMPLEMENTED; @@ -200,8 +200,8 @@ */ NTSTATUS STDCALL PcForwardIrpSynchronous( - DWORD DeviceObject, - DWORD Irp + ULONG DeviceObject, + ULONG Irp ) { UNIMPLEMENTED; @@ -213,8 +213,8 @@ */ NTSTATUS STDCALL PcGetContentRights( - DWORD ContentId, - DWORD DrmRights + ULONG ContentId, + ULONG DrmRights ) { UNIMPLEMENTED; @@ -226,11 +226,11 @@ */ NTSTATUS STDCALL PcGetDeviceProperty( - DWORD DeviceObject, - DWORD DeviceProperty, - DWORD BufferLength, - DWORD PropertyBuffer, - DWORD ResultLength + ULONG DeviceObject, + ULONG DeviceProperty, + ULONG BufferLength, + ULONG PropertyBuffer, + ULONG ResultLength ) { UNIMPLEMENTED; @@ -257,9 +257,9 @@ */ NTSTATUS STDCALL PcInitializeAdapterDriver( - DWORD DriverObject, - DWORD RegistryPathName, - DWORD AddDevice + ULONG DriverObject, + ULONG RegistryPathName, + ULONG AddDevice ) { UNIMPLEMENTED; @@ -271,11 +271,11 @@ */ NTSTATUS STDCALL PcNewDmaChannel( - DWORD OutDmaChannel, - DWORD Unknown, - DWORD PoolType, - DWORD DeviceDescription, - DWORD DeviceObject + ULONG OutDmaChannel, + ULONG Unknown, + ULONG PoolType, + ULONG DeviceDescription, + ULONG DeviceObject ) { UNIMPLEMENTED; @@ -287,11 +287,11 @@ */ NTSTATUS STDCALL PcNewInterruptSync( - DWORD OutInterruptSync, - DWORD Unknown, - DWORD ResourceList, - DWORD ResourceIndex, - DWORD Mode + ULONG OutInterruptSync, + ULONG Unknown, + ULONG ResourceList, + ULONG ResourceIndex, + ULONG Mode ) { UNIMPLEMENTED; @@ -303,8 +303,8 @@ */ NTSTATUS STDCALL PcNewMiniport( - DWORD OutMiniport, - DWORD ClassId + ULONG OutMiniport, + ULONG ClassId ) { UNIMPLEMENTED; @@ -316,8 +316,8 @@ */ NTSTATUS STDCALL PcNewPort( - DWORD OutPort, - DWORD ClassId + ULONG OutPort, + ULONG ClassId ) { UNIMPLEMENTED; @@ -329,15 +329,15 @@ */ NTSTATUS STDCALL PcNewRegistryKey( - DWORD OutRegistryKey, - DWORD Unknown, - DWORD RegistryKeyType, - DWORD DesiredAccess, - DWORD DeviceObject, - DWORD SubDevice, - DWORD ObjectAttributes, - DWORD CreateOptions, - DWORD Disposition + ULONG OutRegistryKey, + ULONG Unknown, + ULONG RegistryKeyType, + ULONG DesiredAccess, + ULONG DeviceObject, + ULONG SubDevice, + ULONG ObjectAttributes, + ULONG CreateOptions, + ULONG Disposition ) { UNIMPLEMENTED; @@ -349,11 +349,11 @@ */ NTSTATUS STDCALL PcNewResourceList( - DWORD OutResourceList, - DWORD Unknown, - DWORD PoolType, - DWORD TranslatedResources, - DWORD UntranslatedResources + ULONG OutResourceList, + ULONG Unknown, + ULONG PoolType, + ULONG TranslatedResources, + ULONG UntranslatedResources ) { UNIMPLEMENTED; @@ -365,11 +365,11 @@ */ NTSTATUS STDCALL PcNewResourceSublist( - DWORD OutResourceList, - DWORD Unknown, - DWORD PoolType, - DWORD ParentList, - DWORD MaximumEntries + ULONG OutResourceList, + ULONG Unknown, + ULONG PoolType, + ULONG ParentList, + ULONG MaximumEntries ) { UNIMPLEMENTED; @@ -381,8 +381,8 @@ */ NTSTATUS STDCALL PcNewServiceGroup( - DWORD OutServiceGroup, - DWORD Unknown + ULONG OutServiceGroup, + ULONG Unknown ) { UNIMPLEMENTED; @@ -394,8 +394,8 @@ */ NTSTATUS STDCALL PcRegisterAdapterPowerManagement( - DWORD Unknown, - DWORD pvContext + ULONG Unknown, + ULONG pvContext ) { UNIMPLEMENTED; @@ -407,9 +407,9 @@ */ NTSTATUS STDCALL PcRegisterIoTimeout( - DWORD pDeviceObject, - DWORD pTimerRoutine, - DWORD pContext + ULONG pDeviceObject, + ULONG pTimerRoutine, + ULONG pContext ) { UNIMPLEMENTED; @@ -421,11 +421,11 @@ */ NTSTATUS STDCALL PcRegisterPhysicalConnection( - DWORD DeviceObject, - DWORD FromUnknown, - DWORD FromPin, - DWORD ToUnknown, - DWORD ToPin + ULONG DeviceObject, + ULONG FromUnknown, + ULONG FromPin, + ULONG ToUnknown, + ULONG ToPin ) { UNIMPLEMENTED; @@ -437,11 +437,11 @@ */ NTSTATUS STDCALL PcRegisterPhysicalConnectionFromExternal( - DWORD DeviceObject, - DWORD FromString, - DWORD FromPin, - DWORD ToUnknown, - DWORD ToPin + ULONG DeviceObject, + ULONG FromString, + ULONG FromPin, + ULONG ToUnknown, + ULONG ToPin ) { UNIMPLEMENTED; @@ -453,11 +453,11 @@ */ NTSTATUS STDCALL PcRegisterPhysicalConnectionToExternal( - DWORD DeviceObject, - DWORD FromUnknown, - DWORD FromPin, - DWORD ToString, - DWORD ToPin + ULONG DeviceObject, + ULONG FromUnknown, + ULONG FromPin, + ULONG ToString, + ULONG ToPin ) { UNIMPLEMENTED; @@ -469,9 +469,9 @@ */ NTSTATUS STDCALL PcRegisterSubdevice( - DWORD DeviceObject, - DWORD SubdevName, - DWORD Unknown + ULONG DeviceObject, + ULONG SubdevName, + ULONG Unknown ) { UNIMPLEMENTED; @@ -483,8 +483,8 @@ */ NTSTATUS STDCALL PcRequestNewPowerState( - DWORD pDeviceObject, - DWORD RequestedNewState + ULONG pDeviceObject, + ULONG RequestedNewState ) { UNIMPLEMENTED; @@ -496,9 +496,9 @@ */ NTSTATUS STDCALL PcUnregisterIoTimeout( - DWORD pDeviceObject, - DWORD pTimerRoutine, - DWORD pContext + ULONG pDeviceObject, + ULONG pTimerRoutine, + ULONG pContext ) { UNIMPLEMENTED; _____ Modified: trunk/reactos/drivers/multimedia/portcls/portcls.h --- trunk/reactos/drivers/multimedia/portcls/portcls.h 2006-01-07 07:33:08 UTC (rev 20655) +++ trunk/reactos/drivers/multimedia/portcls/portcls.h 2006-01-07 07:40:14 UTC (rev 20656) @@ -13,96 +13,98 @@ extern "C" { #endif +/* This header is total bull**** */ + #include <ntddk.h> #define PORTCLASSAPI extern PORTCLASSAPI NTSTATUS STDCALL PcAddAdapterDevice( - DWORD DriverObject, - DWORD PhysicalDeviceObject, - DWORD StartDevice, - DWORD MaxObjects, - DWORD DeviceExtensionSize + ULONG DriverObject, + ULONG PhysicalDeviceObject, + ULONG StartDevice, + ULONG MaxObjects, + ULONG DeviceExtensionSize ); PORTCLASSAPI NTSTATUS STDCALL PcAddContentHandlers( - DWORD ContentId, - DWORD paHandlers, - DWORD NumHandlers + ULONG ContentId, + ULONG paHandlers, + ULONG NumHandlers ); PORTCLASSAPI NTSTATUS STDCALL PcCompleteIrp( - DWORD DeviceObject, - DWORD Irp, - DWORD Status + ULONG DeviceObject, + ULONG Irp, + ULONG Status ); PORTCLASSAPI NTSTATUS STDCALL PcCompletePendingPropertyRequest( - DWORD PropertyRequest, - DWORD NtStatus + ULONG PropertyRequest, + ULONG NtStatus ); PORTCLASSAPI NTSTATUS STDCALL PcCreateContentMixed( - DWORD paContentId, - DWORD cContentId, - DWORD pMixedContentId + ULONG paContentId, + ULONG cContentId, + ULONG pMixedContentId ); PORTCLASSAPI NTSTATUS STDCALL PcDestroyContent( - DWORD ContentId + ULONG ContentId ); PORTCLASSAPI NTSTATUS STDCALL PcDispatchIrp( - DWORD DeviceObject, - DWORD Irp + ULONG DeviceObject, + ULONG Irp ); PORTCLASSAPI NTSTATUS STDCALL PcForwardContentToDeviceObject( - DWORD ContentId, - DWORD Reserved, - DWORD DrmForward + ULONG ContentId, + ULONG Reserved, + ULONG DrmForward ); PORTCLASSAPI NTSTATUS STDCALL PcForwardContentToFileObject( - DWORD ContentId, - DWORD FileObject + ULONG ContentId, + ULONG FileObject ); PORTCLASSAPI NTSTATUS STDCALL PcForwardContentToInterface( - DWORD ContentId, - DWORD Unknown, - DWORD NumMethods + ULONG ContentId, + ULONG Unknown, + ULONG NumMethods ); PORTCLASSAPI NTSTATUS STDCALL PcForwardIrpSynchronous( - DWORD DeviceObject, - DWORD Irp + ULONG DeviceObject, + ULONG Irp ); PORTCLASSAPI NTSTATUS STDCALL PcGetContentRights( - DWORD ContentId, - DWORD DrmRights + ULONG ContentId, + ULONG DrmRights ); PORTCLASSAPI NTSTATUS STDCALL PcGetDeviceProperty( - DWORD DeviceObject, - DWORD DeviceProperty, - DWORD BufferLength, - DWORD PropertyBuffer, - DWORD ResultLength + ULONG DeviceObject, + ULONG DeviceProperty, + ULONG BufferLength, + ULONG PropertyBuffer, + ULONG ResultLength ); PORTCLASSAPI ULONGLONG STDCALL @@ -112,136 +114,136 @@ PORTCLASSAPI NTSTATUS STDCALL PcInitializeAdapterDriver( - DWORD DriverObject, - DWORD RegistryPathName, - DWORD AddDevice + ULONG DriverObject, + ULONG RegistryPathName, + ULONG AddDevice ); PORTCLASSAPI NTSTATUS STDCALL PcNewDmaChannel( - DWORD OutDmaChannel, - DWORD Unknown, - DWORD PoolType, - DWORD DeviceDescription, - DWORD DeviceObject + ULONG OutDmaChannel, + ULONG Unknown, + ULONG PoolType, + ULONG DeviceDescription, + ULONG DeviceObject ); PORTCLASSAPI NTSTATUS STDCALL PcNewInterruptSync( - DWORD OutInterruptSync, - DWORD Unknown, - DWORD ResourceList, - DWORD ResourceIndex, - DWORD Mode + ULONG OutInterruptSync, + ULONG Unknown, + ULONG ResourceList, + ULONG ResourceIndex, + ULONG Mode ); PORTCLASSAPI NTSTATUS STDCALL PcNewMiniport( - DWORD OutMiniport, - DWORD ClassId + ULONG OutMiniport, + ULONG ClassId ); PORTCLASSAPI NTSTATUS STDCALL PcNewPort( - DWORD OutPort, - DWORD ClassId + ULONG OutPort, + ULONG ClassId ); PORTCLASSAPI NTSTATUS STDCALL PcNewRegistryKey( - DWORD OutRegistryKey, - DWORD Unknown, - DWORD RegistryKeyType, - DWORD DesiredAccess, - DWORD DeviceObject, - DWORD SubDevice, - DWORD ObjectAttributes, - DWORD CreateOptions, - DWORD Disposition + ULONG OutRegistryKey, + ULONG Unknown, + ULONG RegistryKeyType, + ULONG DesiredAccess, + ULONG DeviceObject, + ULONG SubDevice, + ULONG ObjectAttributes, + ULONG CreateOptions, + ULONG Disposition ); PORTCLASSAPI NTSTATUS STDCALL PcNewResourceList( - DWORD OutResourceList, - DWORD Unknown, - DWORD PoolType, - DWORD TranslatedResources, - DWORD UntranslatedResources + ULONG OutResourceList, + ULONG Unknown, + ULONG PoolType, + ULONG TranslatedResources, + ULONG UntranslatedResources ); PORTCLASSAPI NTSTATUS STDCALL PcNewResourceSublist( - DWORD OutResourceList, - DWORD Unknown, - DWORD PoolType, - DWORD ParentList, - DWORD MaximumEntries + ULONG OutResourceList, + ULONG Unknown, + ULONG PoolType, + ULONG ParentList, + ULONG MaximumEntries ); PORTCLASSAPI NTSTATUS STDCALL PcNewServiceGroup( - DWORD OutServiceGroup, - DWORD Unknown + ULONG OutServiceGroup, + ULONG Unknown ); PORTCLASSAPI NTSTATUS STDCALL PcRegisterAdapterPowerManagement( - DWORD Unknown, - DWORD pvContext + ULONG Unknown, + ULONG pvContext ); PORTCLASSAPI NTSTATUS STDCALL PcRegisterIoTimeout( - DWORD pDeviceObject, - DWORD pTimerRoutine, - DWORD pContext + ULONG pDeviceObject, + ULONG pTimerRoutine, + ULONG pContext ); PORTCLASSAPI NTSTATUS STDCALL PcRegisterPhysicalConnection( - DWORD DeviceObject, - DWORD FromUnknown, - DWORD FromPin, - DWORD ToUnknown, - DWORD ToPin + ULONG DeviceObject, + ULONG FromUnknown, + ULONG FromPin, + ULONG ToUnknown, + ULONG ToPin ); PORTCLASSAPI NTSTATUS STDCALL PcRegisterPhysicalConnectionFromExternal( - DWORD DeviceObject, - DWORD FromString, - DWORD FromPin, - DWORD ToUnknown, - DWORD ToPin + ULONG DeviceObject, + ULONG FromString, + ULONG FromPin, + ULONG ToUnknown, + ULONG ToPin ); PORTCLASSAPI NTSTATUS STDCALL PcRegisterPhysicalConnectionToExternal( - DWORD DeviceObject, - DWORD FromUnknown, - DWORD FromPin, - DWORD ToString, - DWORD ToPin + ULONG DeviceObject, + ULONG FromUnknown, + ULONG FromPin, + ULONG ToString, + ULONG ToPin ); PORTCLASSAPI NTSTATUS STDCALL PcRegisterSubdevice( - DWORD DeviceObject, - DWORD SubdevName, - DWORD Unknown + ULONG DeviceObject, + ULONG SubdevName, + ULONG Unknown ); PORTCLASSAPI NTSTATUS STDCALL PcRequestNewPowerState( - DWORD pDeviceObject, - DWORD RequestedNewState + ULONG pDeviceObject, + ULONG RequestedNewState ); PORTCLASSAPI NTSTATUS STDCALL PcUnregisterIoTimeout( - DWORD pDeviceObject, - DWORD pTimerRoutine, - DWORD pContext + ULONG pDeviceObject, + ULONG pTimerRoutine, + ULONG pContext ); #ifdef __cplusplus _____ Modified: trunk/reactos/drivers/net/tcpip/include/tcp.h --- trunk/reactos/drivers/net/tcpip/include/tcp.h 2006-01-07 07:33:08 UTC (rev 20655) +++ trunk/reactos/drivers/net/tcpip/include/tcp.h 2006-01-07 07:40:14 UTC (rev 20656) @@ -11,6 +11,7 @@ (*PTCP_COMPLETION_ROUTINE)( PVOID Context, NTSTATUS Status, ULONG Count ); /* TCPv4 header structure */ +#include <pshpack1.h> typedef struct TCPv4_HEADER { USHORT SourcePort; /* Source port */ USHORT DestinationPort; /* Destination port */ @@ -21,7 +22,7 @@ USHORT Window; /* Maximum acceptable receive window */ USHORT Checksum; /* Checksum of segment */ USHORT Urgent; /* Pointer to urgent data */ -} __attribute__((packed)) TCPv4_HEADER, *PTCPv4_HEADER; +} TCPv4_HEADER, *PTCPv4_HEADER; /* TCPv4 header flags */ #define TCP_URG 0x20 @@ -49,7 +50,8 @@ UCHAR Zero; /* Reserved */ UCHAR Protocol; /* Protocol */ USHORT TCPLength; /* Size of TCP segment */ -} __attribute__((packed)) TCPv4_PSEUDO_HEADER, *PTCPv4_PSEUDO_HEADER; +} TCPv4_PSEUDO_HEADER, *PTCPv4_PSEUDO_HEADER; +#include <poppack.h> typedef struct _SLEEPING_THREAD { LIST_ENTRY Entry; _____ Modified: trunk/reactos/drivers/net/tcpip/include/udp.h --- trunk/reactos/drivers/net/tcpip/include/udp.h 2006-01-07 07:33:08 UTC (rev 20655) +++ trunk/reactos/drivers/net/tcpip/include/udp.h 2006-01-07 07:40:14 UTC (rev 20656) @@ -11,12 +11,13 @@ #define UDP_DYNAMIC_PORTS 0x8000 /* UDPv4 header structure */ +#include <pshpack1.h> typedef struct UDP_HEADER { USHORT SourcePort; /* Source port */ USHORT DestPort; /* Destination port */ USHORT Length; /* Size of header and data */ USHORT Checksum; /* Checksum of datagram */ -} __attribute__((packed)) UDP_HEADER, *PUDP_HEADER; +} UDP_HEADER, *PUDP_HEADER; /* UDPv4 pseudo header */ typedef struct UDP_PSEUDO_HEADER { @@ -25,9 +26,9 @@ UCHAR Zero; /* Reserved */ UCHAR Protocol; /* Protocol */ USHORT UDPLength; /* Size of UDP datagram */ -} __attribute__((packed)) UDP_PSEUDO_HEADER, *PUDP_PSEUDO_HEADER; +} UDP_PSEUDO_HEADER, *PUDP_PSEUDO_HEADER; +#include <poppack.h> - typedef struct UDP_STATISTICS { ULONG InputDatagrams; ULONG NumPorts; _____ Modified: trunk/reactos/drivers/net/tcpip/recmutex/recmutex.h --- trunk/reactos/drivers/net/tcpip/recmutex/recmutex.h 2006-01-07 07:33:08 UTC (rev 20655) +++ trunk/reactos/drivers/net/tcpip/recmutex/recmutex.h 2006-01-07 07:40:14 UTC (rev 20656) @@ -5,7 +5,7 @@ /* Lock. */ FAST_MUTEX Mutex; /* Number of times this object was locked */ - UINT LockCount; + SIZE_T LockCount; /* CurrentThread */ PVOID CurrentThread; /* Notification event which signals that another thread can take over */ @@ -21,7 +21,7 @@ } RECURSIVE_MUTEX, *PRECURSIVE_MUTEX; extern VOID RecursiveMutexInit( PRECURSIVE_MUTEX RecMutex ); -extern UINT RecursiveMutexEnter( PRECURSIVE_MUTEX RecMutex, BOOL ToRead ); +extern SIZE_T RecursiveMutexEnter( PRECURSIVE_MUTEX RecMutex, BOOLEAN ToRead ); extern VOID RecursiveMutexLeave( PRECURSIVE_MUTEX RecMutex ); #endif/*_ROSRTL_RECMUTEX_H*/ _____ Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp 2006-01-07 07:33:08 UTC (rev 20655) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp 2006-01-07 07:40:14 UTC (rev 20656) @@ -388,6 +388,7 @@ { fprintf ( OUT, "\t\t\t\tAdditionalOptions=\" /ALIGN:0x20 /SECTION:INIT,D /IGNORE:4001,4037,4039,4065,4070,4078,4087,4089,4096\"\r\n" ); fprintf ( OUT, "\t\t\t\tIgnoreAllDefaultLibraries=\"TRUE\"\r\n" ); + fprintf ( OUT, "\t\t\t\tGenerateManifest=\"FALSE\"\r\n" ); fprintf ( OUT, "\t\t\t\tSubSystem=\"%d\"\r\n", 3 ); fprintf ( OUT, "\t\t\t\tDriver=\"%d\"\r\n", 1 ); fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"%s\"\r\n", module.entrypoint == "" ? "DriverEntry" : module.entrypoint.c_str ()); @@ -399,6 +400,7 @@ { fprintf ( OUT, "\t\t\t\tAdditionalOptions=\" /SECTION:INIT,D /ALIGN:0x80\"\r\n" ); fprintf ( OUT, "\t\t\t\tIgnoreAllDefaultLibraries=\"TRUE\"\r\n" ); + fprintf ( OUT, "\t\t\t\tGenerateManifest=\"FALSE\"\r\n" ); fprintf ( OUT, "\t\t\t\tSubSystem=\"%d\"\r\n", 3 ); fprintf ( OUT, "\t\t\t\tDriver=\"%d\"\r\n", 1 ); fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"KiSystemStartup\"\r\n" ); @@ -408,6 +410,7 @@ { fprintf ( OUT, "\t\t\t\tAdditionalOptions=\" /ALIGN:0x20\"\r\n" ); fprintf ( OUT, "\t\t\t\tSubSystem=\"%d\"\r\n", 1 ); + fprintf ( OUT, "\t\t\t\tGenerateManifest=\"FALSE\"\r\n" ); fprintf ( OUT, "\t\t\t\tIgnoreAllDefaultLibraries=\"TRUE\"\r\n" ); fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"NtProcessStartup\"\r\n" ); fprintf ( OUT, "\t\t\t\tBaseAddress=\"%s\"\r\n", baseaddr.c_str ());

1 0

[ion] 20655: - Get oskittcp to compile on msvc.
by ion＠svn.reactos.org 07 Jan '06

07 Jan '06

- Get oskittcp to compile on msvc. Modified: trunk/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/machine/spl.h Modified: trunk/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/libkern.h Modified: trunk/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/systm.h Modified: trunk/reactos/drivers/lib/oskittcp/include/oskitfreebsd.h Modified: trunk/reactos/drivers/lib/oskittcp/oskittcp/interface.c _____ Modified: trunk/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/machine/spl.h --- trunk/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/machine/spl.h 2006-01-07 07:08:08 UTC (rev 20654) +++ trunk/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/machine/spl.h 2006-01-07 07:33:08 UTC (rev 20655) @@ -177,7 +177,7 @@ static int splhigh() { return 0; } static int splimp() { return 0; } static int splnet() { return 0; } -static int splx() { return 0; } +static int splx(x) { return 0; } static int splclock() { return 0; } #elif defined(__GNUC__) _____ Modified: trunk/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/libkern.h --- trunk/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/libkern.h 2006-01-07 07:08:08 UTC (rev 20654) +++ trunk/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/libkern.h 2006-01-07 07:33:08 UTC (rev 20655) @@ -62,9 +62,4 @@ char *rindex __P((const char *, int)); int scanc __P((u_int, u_char *, u_char *, int)); int skpc __P((int, int, char *)); -char *strcat __P((char *, const char *)); -int strcmp __P((const char *, const char *)); -char *strcpy __P((char *, const char *)); -size_t strlen __P((const char *)); -int strncmp __P((const char *, const char *, size_t)); -char *strncpy __P((char *, const char *, size_t)); + _____ Modified: trunk/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/systm.h --- trunk/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/systm.h 2006-01-07 07:08:08 UTC (rev 20654) +++ trunk/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/systm.h 2006-01-07 07:33:08 UTC (rev 20655) @@ -114,7 +114,7 @@ void *hashinit __P((int count, int type, u_long *hashmask)); void *phashinit __P((int count, int type, u_long *nentries)); -__dead void panic __P((const char *, ...)) __dead2; +//__dead void panic __P((const char *, ...)) __dead2; __dead void boot __P((int)) __dead2; void tablefull __P((const char *)); void addlog __P((const char *, ...)); @@ -126,7 +126,7 @@ #include <oskitdebug.h> -int __cdecl vprintf(const char *, va_list); +//int __cdecl vprintf(const char *, va_list); #define log bsd_log static __inline int bsd_log ( int blah, const char* fmt, ... ) _____ Modified: trunk/reactos/drivers/lib/oskittcp/include/oskitfreebsd.h --- trunk/reactos/drivers/lib/oskittcp/include/oskitfreebsd.h 2006-01-07 07:08:08 UTC (rev 20654) +++ trunk/reactos/drivers/lib/oskittcp/include/oskitfreebsd.h 2006-01-07 07:33:08 UTC (rev 20655) @@ -12,7 +12,6 @@ #define printf DbgPrint #define vprintf DbgVPrint #define ovbcopy(x,y,z) bcopy(x,y,z) -void *memset( void *dest, int c, size_t count ); #define bzero(x,y) memset(x,0,y) #define bcopy(src,dst,n) memcpy(dst,src,n) #ifdef _MSC_VER _____ Modified: trunk/reactos/drivers/lib/oskittcp/oskittcp/interface.c --- trunk/reactos/drivers/lib/oskittcp/oskittcp/interface.c 2006-01-07 07:08:08 UTC (rev 20654) +++ trunk/reactos/drivers/lib/oskittcp/oskittcp/interface.c 2006-01-07 07:33:08 UTC (rev 20655) @@ -30,7 +30,6 @@ struct timeval boottime; void clock_init(); -int isprint(int c); int _snprintf(char * buf, size_t cnt, const char *fmt, ...); void *fbsd_malloc( unsigned int bytes, char *file, unsigned line, ... ) {

1 0

[ion] 20654: - Get IP to compile.
by ion＠svn.reactos.org 07 Jan '06

07 Jan '06

- Get IP to compile. Modified: trunk/reactos/drivers/lib/ip/network/i386/checksum.S Modified: trunk/reactos/drivers/lib/ip/transport/tcp/tcp.c _____ Modified: trunk/reactos/drivers/lib/ip/network/i386/checksum.S --- trunk/reactos/drivers/lib/ip/network/i386/checksum.S 2006-01-07 07:00:31 UTC (rev 20653) +++ trunk/reactos/drivers/lib/ip/network/i386/checksum.S 2006-01-07 07:08:08 UTC (rev 20654) @@ -57,7 +57,7 @@ testl $1, %esi # Check alignment. jz 10f # Jump if alignment is boundary of 2bytes. - # buf is odd + // buf is odd dec %ecx jl 8f movzbl (%esi), %ebx _____ Modified: trunk/reactos/drivers/lib/ip/transport/tcp/tcp.c --- trunk/reactos/drivers/lib/ip/transport/tcp/tcp.c 2006-01-07 07:00:31 UTC (rev 20653) +++ trunk/reactos/drivers/lib/ip/transport/tcp/tcp.c 2006-01-07 07:08:08 UTC (rev 20654) @@ -376,7 +376,7 @@ * 800, 1000 and process the "fast" events at 200, 400, 600, 800, 1000 and the * "slow" events at 500 and 1000. */ -static VOID DDKAPI +static VOID NTAPI TimerThread(PVOID Context) { LARGE_INTEGER Timeout;

1 0

[ion] 20653: - Get chew and csq to compile.
by ion＠svn.reactos.org 07 Jan '06

07 Jan '06

- Get chew and csq to compile. Modified: trunk/reactos/drivers/lib/chew/workqueue.c Modified: trunk/reactos/drivers/lib/csq/csq.c _____ Modified: trunk/reactos/drivers/lib/chew/workqueue.c --- trunk/reactos/drivers/lib/chew/workqueue.c 2006-01-07 06:31:55 UTC (rev 20652) +++ trunk/reactos/drivers/lib/chew/workqueue.c 2006-01-07 07:00:31 UTC (rev 20653) @@ -60,7 +60,7 @@ } BOOLEAN ChewCreate -( PVOID *ItemPtr, UINT Bytes, VOID (*Worker)( PVOID ), PVOID UserSpace ) { +( PVOID *ItemPtr, SIZE_T Bytes, VOID (*Worker)( PVOID ), PVOID UserSpace ) { PWORK_ITEM Item; if( KeGetCurrentIrql() == PASSIVE_LEVEL ) { _____ Modified: trunk/reactos/drivers/lib/csq/csq.c --- trunk/reactos/drivers/lib/csq/csq.c 2006-01-07 06:31:55 UTC (rev 20652) +++ trunk/reactos/drivers/lib/csq/csq.c 2006-01-07 07:00:31 UTC (rev 20653) @@ -26,8 +26,8 @@ /* $Id$ */ #define __NTDRIVER__ +#include <ntifs.h> #include <ntddk.h> -#include <ntifs.h> static VOID NTAPI IopCsqCancelRoutine(PDEVICE_OBJECT DeviceObject,

1 0

[ion] 20652: - Get kbd/mouclass compiling
by ion＠svn.reactos.org 07 Jan '06

07 Jan '06

- Get kbd/mouclass compiling Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.h Modified: trunk/reactos/drivers/input/mouclass/mouclass.h _____ Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.h --- trunk/reactos/drivers/input/kbdclass/kbdclass.h 2006-01-07 06:20:59 UTC (rev 20651) +++ trunk/reactos/drivers/input/kbdclass/kbdclass.h 2006-01-07 06:31:55 UTC (rev 20652) @@ -3,15 +3,7 @@ #include <ntddkbd.h> #include <stdio.h> -#if defined(__GNUC__) - NTSTATUS NTAPI - IoAttachDeviceToDeviceStackSafe( - IN PDEVICE_OBJECT SourceDevice, - IN PDEVICE_OBJECT TargetDevice, - OUT PDEVICE_OBJECT *AttachedToDeviceObject); -#else - #error Unknown compiler! -#endif +#define MAX_PATH 260 typedef enum { _____ Modified: trunk/reactos/drivers/input/mouclass/mouclass.h --- trunk/reactos/drivers/input/mouclass/mouclass.h 2006-01-07 06:20:59 UTC (rev 20651) +++ trunk/reactos/drivers/input/mouclass/mouclass.h 2006-01-07 06:31:55 UTC (rev 20652) @@ -3,16 +3,7 @@ #include <ntddmou.h> #include <stdio.h> -#if defined(__GNUC__) - NTSTATUS NTAPI - IoAttachDeviceToDeviceStackSafe( - IN PDEVICE_OBJECT SourceDevice, - IN PDEVICE_OBJECT TargetDevice, - OUT PDEVICE_OBJECT *AttachedToDeviceObject); -#else - #error Unknown compiler! -#endif - +#define MAX_PATH 260 typedef enum { dsStopped,

1 0

[ion] 20651: - Make NTFS compile on msvc.
by ion＠svn.reactos.org 07 Jan '06

07 Jan '06

- Make NTFS compile on msvc. Modified: trunk/reactos/drivers/fs/ntfs/mft.c Modified: trunk/reactos/drivers/fs/ntfs/ntfs.h Modified: trunk/reactos/drivers/fs/ntfs/volinfo.c _____ Modified: trunk/reactos/drivers/fs/ntfs/mft.c --- trunk/reactos/drivers/fs/ntfs/mft.c 2006-01-07 05:59:22 UTC (rev 20650) +++ trunk/reactos/drivers/fs/ntfs/mft.c 2006-01-07 06:20:59 UTC (rev 20651) @@ -169,6 +169,7 @@ PDEVICE_EXTENSION Vcb, PDEVICE_OBJECT DeviceObject) { + PNONRESIDENT_ATTRIBUTE NresAttr = (PNONRESIDENT_ATTRIBUTE)attr; if (attr->Nonresident == FALSE) { memcpy (buffer, @@ -176,7 +177,6 @@ ((PRESIDENT_ATTRIBUTE)attr)->ValueLength); } - PNONRESIDENT_ATTRIBUTE NresAttr = (PNONRESIDENT_ATTRIBUTE)attr; ReadExternalAttribute(Vcb, NresAttr, 0, (ULONG)(NresAttr->LastVcn) + 1, buffer); } @@ -194,17 +194,14 @@ PVOID p; ULONG BytesPerFileRecord = Vcb->NtfsInfo.BytesPerFileRecord; ULONG clusters = max(BytesPerFileRecord / Vcb->NtfsInfo.BytesPerCluster, 1); - - p = ExAllocatePool(NonPagedPool, clusters * Vcb->NtfsInfo.BytesPerCluster); - ULONGLONG vcn = index * BytesPerFileRecord / Vcb->NtfsInfo.BytesPerCluster; - - ReadVCN (Vcb, Mft, AttributeData, vcn, clusters, p); - LONG m = (Vcb->NtfsInfo.BytesPerCluster / BytesPerFileRecord) - 1; - ULONG n = m > 0 ? (index & m) : 0; + + p = ExAllocatePool(NonPagedPool, clusters * Vcb->NtfsInfo.BytesPerCluster); + ReadVCN (Vcb, Mft, AttributeData, vcn, clusters, p); + memcpy(file, (PVOID)((ULONG_PTR)p + n * BytesPerFileRecord), BytesPerFileRecord); ExFreePool(p); @@ -227,6 +224,7 @@ ULONGLONG runcount; ULONG readcount; ULONG left; + ULONG n; PUCHAR bytes = (PUCHAR)buffer; @@ -238,7 +236,7 @@ readcount = (ULONG)min (runcount, left); - ULONG n = readcount * Vcb->NtfsInfo.BytesPerCluster; + n = readcount * Vcb->NtfsInfo.BytesPerCluster; if (lcn == 0) memset(bytes, 0, n); _____ Modified: trunk/reactos/drivers/fs/ntfs/ntfs.h --- trunk/reactos/drivers/fs/ntfs/ntfs.h 2006-01-07 05:59:22 UTC (rev 20650) +++ trunk/reactos/drivers/fs/ntfs/ntfs.h 2006-01-07 06:20:59 UTC (rev 20651) @@ -1,8 +1,8 @@ #ifndef NTFS_H #define NTFS_H +#include <ntifs.h> #include <ntddk.h> -#include <ntifs.h> #include <ntdddisk.h> #include <ccros.h> @@ -10,8 +10,8 @@ #define CACHEPAGESIZE(pDeviceExt) \ - ((pDeviceExt)->NtfsInfo.BytesPerCluster > PAGE_SIZE ? \ - (pDeviceExt)->NtfsInfo.BytesPerCluster : PAGE_SIZE) + ((pDeviceExt)->NtfsInfo.UCHARsPerCluster > PAGE_SIZE ? \ + (pDeviceExt)->NtfsInfo.UCHARsPerCluster : PAGE_SIZE) #ifndef TAG #define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) @@ -19,7 +19,7 @@ #define ROUND_UP(N, S) ((((N) + (S) - 1) / (S)) * (S)) - +#include <pshpack1.h> typedef struct _BOOT_SECTOR { UCHAR Magic[3]; // 0x00 @@ -37,12 +37,13 @@ ULONGLONG MftLocation; ULONGLONG MftMirrLocation; CHAR ClustersPerMftRecord; - BYTE Unused3[3]; + UCHAR Unused3[3]; CHAR ClustersPerIndexRecord; - BYTE Unused4[3]; + UCHAR Unused4[3]; ULONGLONG SerialNumber; // 0x48 UCHAR BootCode[432]; // 0x50 -} __attribute__((packed)) BOOT_SECTOR, *PBOOT_SECTOR; +} BOOT_SECTOR, *PBOOT_SECTOR; +#include <poppack.h> //typedef struct _BootSector BootSector; @@ -91,6 +92,7 @@ #define FCB_CACHE_INITIALIZED 0x0001 #define FCB_IS_VOLUME_STREAM 0x0002 #define FCB_IS_VOLUME 0x0004 +#define MAX_PATH 260 typedef struct _FCB { @@ -187,7 +189,7 @@ ULONG BytesAllocated; /* Allocated size of the FILE record */ ULONGLONG BaseFileRecord; /* File reference to the base FILE record */ USHORT NextAttributeNumber; /* Next Attribute Id */ - USHORT Pading; /* Align to 4 byte boundary (XP) */ + USHORT Pading; /* Align to 4 UCHAR boundary (XP) */ ULONG MFTRecordNumber; /* Number of this MFT Record (XP) */ } FILE_RECORD_HEADER, *PFILE_RECORD_HEADER; _____ Modified: trunk/reactos/drivers/fs/ntfs/volinfo.c --- trunk/reactos/drivers/fs/ntfs/volinfo.c 2006-01-07 05:59:22 UTC (rev 20650) +++ trunk/reactos/drivers/fs/ntfs/volinfo.c 2006-01-07 06:20:59 UTC (rev 20651) @@ -27,14 +27,11 @@ /* INCLUDES *****************************************************************/ -#include <ntddk.h> +#include "ntfs.h" #define NDEBUG #include <debug.h> -#include "ntfs.h" - - /* FUNCTIONS ****************************************************************/ static NTSTATUS

1 0

[ion] 20650: - Make CDFS work with msvc/ddk.
by ion＠svn.reactos.org 07 Jan '06

07 Jan '06

- Make CDFS work with msvc/ddk. Modified: trunk/reactos/drivers/fs/cdfs/cdfs.h Modified: trunk/reactos/drivers/fs/cdfs/dirctl.c Modified: trunk/reactos/drivers/fs/cdfs/fsctl.c _____ Modified: trunk/reactos/drivers/fs/cdfs/cdfs.h --- trunk/reactos/drivers/fs/cdfs/cdfs.h 2006-01-07 05:47:21 UTC (rev 20649) +++ trunk/reactos/drivers/fs/cdfs/cdfs.h 2006-01-07 05:59:22 UTC (rev 20650) @@ -1,8 +1,8 @@ #ifndef CDFS_H #define CDFS_H +#include <ntifs.h> #include <ntddk.h> -#include <ntifs.h> #include <ntddcdrm.h> #include <ccros.h> @@ -21,6 +21,7 @@ #define VOLUME_PARTITION_DESCRIPTOR_TYPE 3 #define VOLUME_DESCRIPTOR_SET_TERMINATOR 255 +#include <pshpack1.h> struct _DIR_RECORD { UCHAR RecordLength; // 1 @@ -42,7 +43,8 @@ ULONG VolumeSequenceNumber; // 29-32 UCHAR FileIdLength; // 33 UCHAR FileId[1]; // 34 -} __attribute__((packed)); +}; +#include <poppack.h> typedef struct _DIR_RECORD DIR_RECORD, *PDIR_RECORD; @@ -54,12 +56,13 @@ /* Volume Descriptor header*/ +#include <pshpack1.h> struct _VD_HEADER { UCHAR VdType; // 1 UCHAR StandardId[5]; // 2-6 UCHAR VdVersion; // 7 -} __attribute__((packed)); +}; typedef struct _VD_HEADER VD_HEADER, *PVD_HEADER; @@ -93,8 +96,7 @@ /* more data ... */ -} __attribute__((packed)); - +}; typedef struct _PVD PVD, *PPVD; @@ -125,7 +127,8 @@ UCHAR PublisherIdentifier[128]; // 319-446 // more data ... -} __attribute__((packed)); +}; +#include <poppack.h> typedef struct _SVD SVD, *PSVD; @@ -171,6 +174,8 @@ #define FCB_IS_VOLUME_STREAM 0x0002 #define FCB_IS_VOLUME 0x0004 +#define MAX_PATH 260 + typedef struct _FCB { FSRTL_COMMON_FCB_HEADER RFCB; _____ Modified: trunk/reactos/drivers/fs/cdfs/dirctl.c --- trunk/reactos/drivers/fs/cdfs/dirctl.c 2006-01-07 05:47:21 UTC (rev 20649) +++ trunk/reactos/drivers/fs/cdfs/dirctl.c 2006-01-07 05:59:22 UTC (rev 20650) @@ -381,12 +381,12 @@ DPRINT("CdfsGetNameInformation() called\n"); Length = wcslen(Fcb->ObjectName) * sizeof(WCHAR); - if ((sizeof (FILE_BOTH_DIRECTORY_INFORMATION) + Length) > BufferLength) + if ((sizeof (FILE_BOTH_DIR_INFORMATION) + Length) > BufferLength) return(STATUS_BUFFER_OVERFLOW); Info->FileNameLength = Length; Info->NextEntryOffset = - ROUND_UP(sizeof(FILE_BOTH_DIRECTORY_INFORMATION) + Length, 4); + ROUND_UP(sizeof(FILE_BOTH_DIR_INFORMATION) + Length, 4); memcpy(Info->FileName, Fcb->ObjectName, Length); return(STATUS_SUCCESS); @@ -404,12 +404,12 @@ DPRINT("CdfsGetDirectoryInformation() called\n"); Length = wcslen(Fcb->ObjectName) * sizeof(WCHAR); - if ((sizeof (FILE_BOTH_DIRECTORY_INFORMATION) + Length) > BufferLength) + if ((sizeof (FILE_BOTH_DIR_INFORMATION) + Length) > BufferLength) return(STATUS_BUFFER_OVERFLOW); Info->FileNameLength = Length; Info->NextEntryOffset = - ROUND_UP(sizeof(FILE_BOTH_DIRECTORY_INFORMATION) + Length, 4); + ROUND_UP(sizeof(FILE_BOTH_DIR_INFORMATION) + Length, 4); memcpy(Info->FileName, Fcb->ObjectName, Length); /* Convert file times */ @@ -447,7 +447,7 @@ static NTSTATUS CdfsGetFullDirectoryInformation(PFCB Fcb, PDEVICE_EXTENSION DeviceExt, - PFILE_FULL_DIRECTORY_INFORMATION Info, + PFILE_FULL_DIR_INFORMATION Info, ULONG BufferLength) { ULONG Length; @@ -455,12 +455,12 @@ DPRINT("CdfsGetFullDirectoryInformation() called\n"); Length = wcslen(Fcb->ObjectName) * sizeof(WCHAR); - if ((sizeof (FILE_BOTH_DIRECTORY_INFORMATION) + Length) > BufferLength) + if ((sizeof (FILE_BOTH_DIR_INFORMATION) + Length) > BufferLength) return(STATUS_BUFFER_OVERFLOW); Info->FileNameLength = Length; Info->NextEntryOffset = - ROUND_UP(sizeof(FILE_BOTH_DIRECTORY_INFORMATION) + Length, 4); + ROUND_UP(sizeof(FILE_BOTH_DIR_INFORMATION) + Length, 4); memcpy(Info->FileName, Fcb->ObjectName, Length); /* Convert file times */ @@ -500,7 +500,7 @@ static NTSTATUS CdfsGetBothDirectoryInformation(PFCB Fcb, PDEVICE_EXTENSION DeviceExt, - PFILE_BOTH_DIRECTORY_INFORMATION Info, + PFILE_BOTH_DIR_INFORMATION Info, ULONG BufferLength) { ULONG Length; @@ -508,12 +508,12 @@ DPRINT("CdfsGetBothDirectoryInformation() called\n"); Length = wcslen(Fcb->ObjectName) * sizeof(WCHAR); - if ((sizeof (FILE_BOTH_DIRECTORY_INFORMATION) + Length) > BufferLength) + if ((sizeof (FILE_BOTH_DIR_INFORMATION) + Length) > BufferLength) return(STATUS_BUFFER_OVERFLOW); Info->FileNameLength = Length; Info->NextEntryOffset = - ROUND_UP(sizeof(FILE_BOTH_DIRECTORY_INFORMATION) + Length, 4); + ROUND_UP(sizeof(FILE_BOTH_DIR_INFORMATION) + Length, 4); memcpy(Info->FileName, Fcb->ObjectName, Length); /* Convert file times */ @@ -682,14 +682,14 @@ case FileFullDirectoryInformation: Status = CdfsGetFullDirectoryInformation(&TempFcb, DeviceExtension, - (PFILE_FULL_DIRECTORY_INFORMATION)Buffer, + (PFILE_FULL_DIR_INFORMATION)Buffer, BufferLength); break; case FileBothDirectoryInformation: Status = CdfsGetBothDirectoryInformation(&TempFcb, DeviceExtension, - (PFILE_BOTH_DIRECTORY_INFORMATION)Buffer, + (PFILE_BOTH_DIR_INFORMATION)Buffer, BufferLength); break; _____ Modified: trunk/reactos/drivers/fs/cdfs/fsctl.c --- trunk/reactos/drivers/fs/cdfs/fsctl.c 2006-01-07 05:47:21 UTC (rev 20649) +++ trunk/reactos/drivers/fs/cdfs/fsctl.c 2006-01-07 05:59:22 UTC (rev 20650) @@ -36,7 +36,7 @@ /* FUNCTIONS ****************************************************************/ static __inline -int msf_to_lba (BYTE m, BYTE s, BYTE f) +int msf_to_lba (UCHAR m, UCHAR s, UCHAR f) { return (((m * 60) + s) * 75 + f) - 150; }

1 0

[ion] 20649: - get sndblst and sound compiling on msvc.
by ion＠svn.reactos.org 07 Jan '06

07 Jan '06

- get sndblst and sound compiling on msvc. Modified: trunk/reactos/drivers/dd/sndblst/card.c Modified: trunk/reactos/drivers/dd/sndblst/dma.c Modified: trunk/reactos/drivers/dd/sndblst/portio.c Modified: trunk/reactos/drivers/dd/sndblst/sndblst.c Modified: trunk/reactos/drivers/dd/sndblst/sndblst.h Modified: trunk/reactos/drivers/dd/sound/wave.c Modified: trunk/reactos/drivers/dd/sound/wave.h _____ Modified: trunk/reactos/drivers/dd/sndblst/card.c --- trunk/reactos/drivers/dd/sndblst/card.c 2006-01-07 05:37:22 UTC (rev 20648) +++ trunk/reactos/drivers/dd/sndblst/card.c 2006-01-07 05:47:21 UTC (rev 20649) @@ -7,7 +7,7 @@ #include <ntddk.h> #include "sndblst.h" -VOID SetOutputSampleRate(UINT BasePort, UINT SampleRate) +VOID SetOutputSampleRate(ULONG BasePort, ULONG SampleRate) { // This only works for DSP v4.xx ONLY - need a workaround! DPRINT("Setting output sample rate\n"); @@ -22,7 +22,7 @@ } -VOID EnableSpeaker(UINT BasePort, BOOLEAN SpeakerOn) +VOID EnableSpeaker(ULONG BasePort, BOOLEAN SpeakerOn) { DPRINT("Setting speaker status %d\n", SpeakerOn); @@ -33,7 +33,7 @@ } -BOOLEAN IsSpeakerEnabled(UINT BasePort) +BOOLEAN IsSpeakerEnabled(ULONG BasePort) { DPRINT("Obtaining speaker status\n"); @@ -48,7 +48,7 @@ } -VOID BeginPlayback(UINT BasePort, UINT BitDepth, UINT Channels, UINT BlockSize) +VOID BeginPlayback(ULONG BasePort, ULONG BitDepth, ULONG Channels, ULONG BlockSize) { DPRINT("BeginPlayback(%d, %d, %d, %d)\n", BasePort, BitDepth, Channels, BlockSize); _____ Modified: trunk/reactos/drivers/dd/sndblst/dma.c --- trunk/reactos/drivers/dd/sndblst/dma.c 2006-01-07 05:37:22 UTC (rev 20648) +++ trunk/reactos/drivers/dd/sndblst/dma.c 2006-01-07 05:47:21 UTC (rev 20649) @@ -41,7 +41,7 @@ IN PVOID Context) { PDEVICE_EXTENSION Device = DeviceObject->DeviceExtension; - UINT zzz; + ULONG zzz; PUCHAR VirtualAddress = (PUCHAR) MmGetMdlVirtualAddress(Device->Mdl); DPRINT("IoMapTransfer\n"); _____ Modified: trunk/reactos/drivers/dd/sndblst/portio.c --- trunk/reactos/drivers/dd/sndblst/portio.c 2006-01-07 05:37:22 UTC (rev 20648) +++ trunk/reactos/drivers/dd/sndblst/portio.c 2006-01-07 05:47:21 UTC (rev 20649) @@ -12,7 +12,7 @@ #include <ntddk.h> #include "sndblst.h" -BOOLEAN WaitToSend(UINT BasePort) +BOOLEAN WaitToSend(ULONG BasePort) { int TimeOut; @@ -35,7 +35,7 @@ return TRUE; } -BOOLEAN WaitToReceive(UINT BasePort) +BOOLEAN WaitToReceive(ULONG BasePort) { int TimeOut; @@ -59,9 +59,9 @@ } -WORD InitSoundCard(UINT BasePort) +USHORT InitSoundCard(ULONG BasePort) { - UINT TimeOut; + ULONG TimeOut; BOOLEAN Status; UCHAR DSP_Major, DSP_Minor; _____ Modified: trunk/reactos/drivers/dd/sndblst/sndblst.c --- trunk/reactos/drivers/dd/sndblst/sndblst.c 2006-01-07 05:37:22 UTC (rev 20648) +++ trunk/reactos/drivers/dd/sndblst/sndblst.c 2006-01-07 05:47:21 UTC (rev 20649) @@ -20,7 +20,7 @@ /* INTERNAL VARIABLES ******************************************************/ -UINT DeviceCount = 0; +ULONG DeviceCount = 0; /* FUNCTIONS ***************************************************************/ @@ -38,7 +38,7 @@ // CONFIG Config; RTL_QUERY_REGISTRY_TABLE Table[2]; NTSTATUS s; - WORD DSP_Version = 0; + USHORT DSP_Version = 0; UCHAR DSP_Major = 0, DSP_Minor = 0; // This is TEMPORARY, to ensure that we don't process more than 1 device. @@ -228,7 +228,7 @@ * RETURNS: Success or failure */ { - UINT Channel; + ULONG Channel; DPRINT("BlasterCleanup() called!\n"); // Reset the device (should we do this?) @@ -255,8 +255,8 @@ { PIO_STACK_LOCATION Stack; PDEVICE_EXTENSION DeviceExtension; - UINT ByteCount; - PBYTE Data; + ULONG ByteCount; + PUCHAR Data; DPRINT("BlasterWrite() called!\n"); @@ -265,7 +265,7 @@ DPRINT("%d bytes\n", Stack->Parameters.Write.Length); - Data = (PBYTE) Irp->AssociatedIrp.SystemBuffer; + Data = (PUCHAR) Irp->AssociatedIrp.SystemBuffer; for (ByteCount = 0; ByteCount < Stack->Parameters.Write.Length; ByteCount ++) { @@ -307,7 +307,7 @@ /* case IOCTL_MIDI_PLAY : { DPRINT("Received IOCTL_MIDI_PLAY\n"); - Data = (PBYTE) Irp->AssociatedIrp.SystemBuffer; + Data = (PUCHAR) Irp->AssociatedIrp.SystemBuffer; DPRINT("Sending %d bytes of MIDI data to 0x%d:\n", Stack->Parameters.DeviceIoControl.InputBufferLength, DeviceExtension->Port); _____ Modified: trunk/reactos/drivers/dd/sndblst/sndblst.h --- trunk/reactos/drivers/dd/sndblst/sndblst.h 2006-01-07 05:37:22 UTC (rev 20648) +++ trunk/reactos/drivers/dd/sndblst/sndblst.h 2006-01-07 05:47:21 UTC (rev 20649) @@ -96,9 +96,9 @@ { PWSTR RegistryPath; PDRIVER_OBJECT DriverObject; - UINT Port; - UINT IRQ; - UINT DMA; + ULONG Port; + ULONG IRQ; + ULONG DMA; ULONG BufferSize; PADAPTER_OBJECT Adapter; PMDL Mdl; @@ -123,8 +123,8 @@ //typedef struct _CONFIG //{ -// UINT Port; -// UINT IRQ; +// ULONG Port; +// ULONG IRQ; //} CONFIG, *PCONFIG; /* @@ -139,9 +139,9 @@ Prototypes for functions in portio.c : */ -BOOLEAN WaitToSend(UINT BasePort); -BOOLEAN WaitToReceive(UINT BasePort); -WORD InitSoundCard(UINT BasePort); +BOOLEAN WaitToSend(ULONG BasePort); +BOOLEAN WaitToReceive(ULONG BasePort); +USHORT InitSoundCard(ULONG BasePort); /* Prototypes for functions in settings.c : @@ -168,9 +168,9 @@ -VOID SetOutputSampleRate(UINT BasePort, UINT SampleRate); -VOID EnableSpeaker(UINT BasePort, BOOLEAN SpeakerOn); -BOOLEAN IsSpeakerEnabled(UINT BasePort); -VOID BeginPlayback(UINT BasePort, UINT BitDepth, UINT Channels, UINT BlockSize); +VOID SetOutputSampleRate(ULONG BasePort, ULONG SampleRate); +VOID EnableSpeaker(ULONG BasePort, BOOLEAN SpeakerOn); +BOOLEAN IsSpeakerEnabled(ULONG BasePort); +VOID BeginPlayback(ULONG BasePort, ULONG BitDepth, ULONG Channels, ULONG BlockSize); #endif _____ Modified: trunk/reactos/drivers/dd/sound/wave.c --- trunk/reactos/drivers/dd/sound/wave.c 2006-01-07 05:37:22 UTC (rev 20648) +++ trunk/reactos/drivers/dd/sound/wave.c 2006-01-07 05:47:21 UTC (rev 20649) @@ -13,6 +13,7 @@ /* FUNCTIONS **************************************************************/ #include <ntddk.h> +#include <halfuncs.h> #include <string.h> #include <devices.h> @@ -38,7 +39,6 @@ void sb16_play(WAVE_HDR* wave) { - unsigned int eflags; ULONG MappedIrq; KIRQL Dirql; KAFFINITY Affinity; @@ -64,9 +64,7 @@ * saving the previous state of the interrupt flag */ - __asm__("pushf\n\tpop %0\n\tcli\n\t" - : "=m" (eflags) - : ); + _disable(); memcpy(sb16.buffer,(&wave->data),wave->dLen); @@ -82,9 +80,7 @@ // outb(0x21,(mask&~newmask)); // Restore the interrupt flag - __asm__("push %0\n\tpopf\n\t" - : - : "m" (eflags)); + _enable(); _____ Modified: trunk/reactos/drivers/dd/sound/wave.h --- trunk/reactos/drivers/dd/sound/wave.h 2006-01-07 05:37:22 UTC (rev 20648) +++ trunk/reactos/drivers/dd/sound/wave.h 2006-01-07 05:47:21 UTC (rev 20649) @@ -1,23 +1,25 @@ KIRQL irql; KAFFINITY affinity; +#include <pshpack1.h> typedef struct { - unsigned char rID[4] __attribute__((packed)); //4 0 - unsigned int rLen __attribute__((packed)); //4 4 - unsigned char wID[4] __attribute__((packed)); //4 8 - unsigned char fID[4] __attribute__((packed)); //4 12 - unsigned int fLen __attribute__((packed)); //4 16 - unsigned short wFormatTag __attribute__((packed)); //2 18 - unsigned short nChannels __attribute__((packed)); //2 20 - unsigned int nSamplesPerSec __attribute__((packed)); //2 22 - unsigned int nAvgBytesPerSec __attribute__((packed)); //2 24 - unsigned short nBlockAlign __attribute__((packed)); //2 26 - unsigned short FormatSpecific __attribute__((packed)); //2 28 - unsigned char dID[4] __attribute__((packed)); //4 30 - unsigned int dLen __attribute__((packed)); + unsigned char rID[4] ; //4 0 + unsigned int rLen ; //4 4 + unsigned char wID[4] ; //4 8 + unsigned char fID[4] ; //4 12 + unsigned int fLen ; //4 16 + unsigned short wFormatTag ; //2 18 + unsigned short nChannels ; //2 20 + unsigned int nSamplesPerSec ; //2 22 + unsigned int nAvgBytesPerSec ; //2 24 + unsigned short nBlockAlign ; //2 26 + unsigned short FormatSpecific ; //2 28 + unsigned char dID[4] ; //4 30 + unsigned int dLen ; unsigned char* data; }WAVE_HDR; +#include <poppack.h> void sb16_play(WAVE_HDR* wave); void dump_wav(WAVE_HDR* wave);

1 0

[ion] 20648: - get mpu401, parallel and ramdrv to work on msvc.
by ion＠svn.reactos.org 07 Jan '06

07 Jan '06

- get mpu401, parallel and ramdrv to work on msvc. Modified: trunk/reactos/drivers/dd/mpu401/mpu401.c Modified: trunk/reactos/drivers/dd/mpu401/mpu401.h Modified: trunk/reactos/drivers/dd/mpu401/portio.c Modified: trunk/reactos/drivers/dd/parallel/parallel.c Modified: trunk/reactos/drivers/dd/ramdrv/ramdrv.c Modified: trunk/reactos/drivers/lib/bzip2/bzlib.h _____ Modified: trunk/reactos/drivers/dd/mpu401/mpu401.c --- trunk/reactos/drivers/dd/mpu401/mpu401.c 2006-01-07 05:23:59 UTC (rev 20647) +++ trunk/reactos/drivers/dd/mpu401/mpu401.c 2006-01-07 05:37:22 UTC (rev 20648) @@ -23,7 +23,7 @@ /* INTERNAL VARIABLES ******************************************************/ -UINT DeviceCount = 0; +ULONG DeviceCount = 0; /* FUNCTIONS ***************************************************************/ @@ -205,7 +205,7 @@ * RETURNS: Success or failure */ { - UINT Channel; + ULONG Channel; DPRINT("MPU401Cleanup() called!\n"); // Reset the device (should we do this?) @@ -240,8 +240,8 @@ { PIO_STACK_LOCATION Stack; PDEVICE_EXTENSION DeviceExtension; - UINT ByteCount; - PBYTE Data; + ULONG ByteCount; + PUCHAR Data; DPRINT("MPU401DeviceControl() called!\n"); @@ -256,7 +256,7 @@ case IOCTL_MIDI_PLAY : { DPRINT("Received IOCTL_MIDI_PLAY\n"); - Data = (PBYTE) Irp->AssociatedIrp.SystemBuffer; + Data = (PUCHAR) Irp->AssociatedIrp.SystemBuffer; DPRINT("Sending %d bytes of MIDI data to 0x%d:\n", Stack->Parameters.DeviceIoControl.InputBufferLength, DeviceExtension->Port); _____ Modified: trunk/reactos/drivers/dd/mpu401/mpu401.h --- trunk/reactos/drivers/dd/mpu401/mpu401.h 2006-01-07 05:23:59 UTC (rev 20647) +++ trunk/reactos/drivers/dd/mpu401/mpu401.h 2006-01-07 05:37:22 UTC (rev 20648) @@ -85,8 +85,8 @@ { PUNICODE_STRING RegistryPath; PDRIVER_OBJECT DriverObject; - UINT Port; - UINT IRQ; + ULONG Port; + ULONG IRQ; // KDPC Dpc; // KTIMER Timer; // KEVENT Event; @@ -110,8 +110,8 @@ //typedef struct _CONFIG //{ -// UINT Port; -// UINT IRQ; +// ULONG Port; +// ULONG IRQ; //} CONFIG, *PCONFIG; /* @@ -126,9 +126,9 @@ Prototypes for functions in portio.c : */ -BOOLEAN WaitToSend(UINT BasePort); -BOOLEAN WaitToReceive(UINT BasePort); -BOOLEAN InitUARTMode(UINT BasePort); +BOOLEAN WaitToSend(ULONG BasePort); +BOOLEAN WaitToReceive(ULONG BasePort); +BOOLEAN InitUARTMode(ULONG BasePort); /* Prototypes for functions in settings.c : _____ Modified: trunk/reactos/drivers/dd/mpu401/portio.c --- trunk/reactos/drivers/dd/mpu401/portio.c 2006-01-07 05:23:59 UTC (rev 20647) +++ trunk/reactos/drivers/dd/mpu401/portio.c 2006-01-07 05:37:22 UTC (rev 20648) @@ -13,7 +13,7 @@ #include "mpu401.h" -BOOLEAN WaitToSend(UINT BasePort) +BOOLEAN WaitToSend(ULONG BasePort) { int TimeOut; @@ -37,7 +37,7 @@ } -BOOLEAN WaitToReceive(UINT BasePort) +BOOLEAN WaitToReceive(ULONG BasePort) { int TimeOut; @@ -61,9 +61,9 @@ } -BOOLEAN InitUARTMode(UINT BasePort) +BOOLEAN InitUARTMode(ULONG BasePort) { - UINT TimeOut; + ULONG TimeOut; UCHAR Status = 0; DbgPrint("InitUARTMode() called\n"); _____ Modified: trunk/reactos/drivers/dd/parallel/parallel.c --- trunk/reactos/drivers/dd/parallel/parallel.c 2006-01-07 05:23:59 UTC (rev 20647) +++ trunk/reactos/drivers/dd/parallel/parallel.c 2006-01-07 05:37:22 UTC (rev 20648) @@ -83,7 +83,7 @@ { PIO_STACK_LOCATION Stack = IoGetCurrentIrpStackLocation(Irp); NTSTATUS status; - UINT i; + ULONG i; switch (Stack->MajorFunction) { _____ Modified: trunk/reactos/drivers/dd/ramdrv/ramdrv.c --- trunk/reactos/drivers/dd/ramdrv/ramdrv.c 2006-01-07 05:23:59 UTC (rev 20647) +++ trunk/reactos/drivers/dd/ramdrv/ramdrv.c 2006-01-07 05:37:22 UTC (rev 20648) @@ -98,7 +98,7 @@ void *tbuff; unsigned int dstlen = 1024 * 1440; FILE_STANDARD_INFORMATION finfo; - DWORD err; + ULONG err; DPRINT("Ramdisk driver\n"); _____ Modified: trunk/reactos/drivers/lib/bzip2/bzlib.h --- trunk/reactos/drivers/lib/bzip2/bzlib.h 2006-01-07 05:23:59 UTC (rev 20647) +++ trunk/reactos/drivers/lib/bzip2/bzlib.h 2006-01-07 05:37:22 UTC (rev 20648) @@ -308,9 +308,9 @@ ); #endif -extern _stdcall void *(*BZ2_malloc)( unsigned long size ); -extern _stdcall void (*BZ2_free)( void *ptr ); -_stdcall void BZ2_set_malloc_free( _stdcall void *(*malloc)(unsigned long size), _stdcall void (*free)(void *ptr) ); +extern void *(_stdcall *BZ2_malloc)( unsigned long size ); +extern void (*_stdcall BZ2_free)( void *ptr ); +void _stdcall BZ2_set_malloc_free( void *(_stdcall *malloc)(unsigned long size), void (_stdcall *free)(void *ptr) ); #ifdef __cplusplus }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs