From 7b99b108be759b83eab56052a72fe0e2dbef9dda Mon Sep 17 00:00:00 2001 From: Christoph von Wittich Date: Sun, 8 Jul 2007 19:34:23 +0000 Subject: [PATCH] -fix some more compilation issues svn path=/trunk/; revision=27511 --- .../wdm/audio/backpln/portcls/adapter.c | 4 +-- .../drivers/wdm/audio/backpln/portcls/drm.c | 14 ++++---- .../drivers/wdm/audio/backpln/portcls/irp.c | 6 ++-- .../wdm/audio/backpln/portcls/private.h | 4 +++ .../drivers/wdm/audio/backpln/portcls/stubs.c | 32 +++++++++---------- .../drivers/wdm/audio/backpln/portcls/undoc.c | 12 +++---- 6 files changed, 36 insertions(+), 36 deletions(-) diff --git a/reactos/drivers/wdm/audio/backpln/portcls/adapter.c b/reactos/drivers/wdm/audio/backpln/portcls/adapter.c index 11cdf4db5a7..da69ecc7307 100644 --- a/reactos/drivers/wdm/audio/backpln/portcls/adapter.c +++ b/reactos/drivers/wdm/audio/backpln/portcls/adapter.c @@ -21,7 +21,7 @@ The AddDevice parameter is a driver-supplied pointer to a function which typically then calls PcAddAdapterDevice (see below.) */ -PORTCLASSAPI NTSTATUS NTAPI +NTSTATUS NTAPI PcInitializeAdapterDriver( IN PDRIVER_OBJECT DriverObject, IN PUNICODE_STRING RegistryPathName, @@ -89,7 +89,7 @@ PcInitializeAdapterDriver( The StartDevice parameter is a driver-supplied function which gets called in response to IRP_MJ_PNP / IRP_MN_START_DEVICE. */ -PORTCLASSAPI NTSTATUS NTAPI +NTSTATUS NTAPI PcAddAdapterDevice( IN PDRIVER_OBJECT DriverObject, IN PDEVICE_OBJECT PhysicalDeviceObject, diff --git a/reactos/drivers/wdm/audio/backpln/portcls/drm.c b/reactos/drivers/wdm/audio/backpln/portcls/drm.c index 2c37d88afef..c5b4b4de5aa 100644 --- a/reactos/drivers/wdm/audio/backpln/portcls/drm.c +++ b/reactos/drivers/wdm/audio/backpln/portcls/drm.c @@ -14,7 +14,7 @@ #include #include -PORTCLASSAPI NTSTATUS NTAPI +NTSTATUS NTAPI PcAddContentHandlers( IN ULONG ContentId, IN PVOID *paHandlers, @@ -23,7 +23,7 @@ PcAddContentHandlers( return DrmAddContentHandlers(ContentId, paHandlers, NumHandlers); } -PORTCLASSAPI NTSTATUS NTAPI +NTSTATUS NTAPI PcCreateContentMixed( IN PULONG paContentId, IN ULONG cContentId, @@ -32,14 +32,14 @@ PcCreateContentMixed( return DrmCreateContentMixed(paContentId, cContentId, pMixedContentId); } -PORTCLASSAPI NTSTATUS NTAPI +NTSTATUS NTAPI PcDestroyContent( IN ULONG ContentId) { return DrmDestroyContent(ContentId); } -PORTCLASSAPI NTSTATUS NTAPI +NTSTATUS NTAPI PcForwardContentToDeviceObject( IN ULONG ContentId, IN PVOID Reserved, @@ -48,7 +48,7 @@ PcForwardContentToDeviceObject( return DrmForwardContentToDeviceObject(ContentId, Reserved, DrmForward); } -PORTCLASSAPI NTSTATUS NTAPI +NTSTATUS NTAPI PcForwardContentToFileObject( IN ULONG ContentId, IN PFILE_OBJECT FileObject) @@ -56,7 +56,7 @@ PcForwardContentToFileObject( return DrmForwardContentToFileObject(ContentId, FileObject); } -PORTCLASSAPI NTSTATUS NTAPI +NTSTATUS NTAPI PcForwardContentToInterface( IN ULONG ContentId, IN PUNKNOWN pUnknown, @@ -65,7 +65,7 @@ PcForwardContentToInterface( return DrmForwardContentToInterface(ContentId, pUnknown, NumMethods); } -PORTCLASSAPI NTSTATUS NTAPI +NTSTATUS NTAPI PcGetContentRights( IN ULONG ContentId, OUT PDRMRIGHTS DrmRights) diff --git a/reactos/drivers/wdm/audio/backpln/portcls/irp.c b/reactos/drivers/wdm/audio/backpln/portcls/irp.c index e6a1e415639..3844ec296a7 100644 --- a/reactos/drivers/wdm/audio/backpln/portcls/irp.c +++ b/reactos/drivers/wdm/audio/backpln/portcls/irp.c @@ -198,7 +198,7 @@ PortClsSysControl( Drivers may implement their own IRP handlers. If a driver decides to let PortCls handle the IRP, it can do so by calling this. */ -PORTCLASSAPI NTSTATUS NTAPI +NTSTATUS NTAPI PcDispatchIrp( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) @@ -251,7 +251,7 @@ PcDispatchIrp( /* * @unimplemented */ -PORTCLASSAPI NTSTATUS NTAPI +NTSTATUS NTAPI PcCompleteIrp( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -264,7 +264,7 @@ PcCompleteIrp( /* * @unimplemented */ -PORTCLASSAPI NTSTATUS NTAPI +NTSTATUS NTAPI PcForwardIrpSynchronous( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) diff --git a/reactos/drivers/wdm/audio/backpln/portcls/private.h b/reactos/drivers/wdm/audio/backpln/portcls/private.h index dd224bed043..5385602392b 100644 --- a/reactos/drivers/wdm/audio/backpln/portcls/private.h +++ b/reactos/drivers/wdm/audio/backpln/portcls/private.h @@ -7,7 +7,11 @@ #ifndef PORTCLS_PRIVATE_H #define PORTCLS_PRIVATE_H +/* windows.h should no be included my drivers at all */ +#ifndef _MSC_VER #include +#endif + #include #include diff --git a/reactos/drivers/wdm/audio/backpln/portcls/stubs.c b/reactos/drivers/wdm/audio/backpln/portcls/stubs.c index 0389ba10b3e..a8232cd94bf 100644 --- a/reactos/drivers/wdm/audio/backpln/portcls/stubs.c +++ b/reactos/drivers/wdm/audio/backpln/portcls/stubs.c @@ -19,7 +19,7 @@ /* * @unimplemented */ -PORTCLASSAPI NTSTATUS NTAPI +NTSTATUS NTAPI PcNewDmaChannel( OUT PDMACHANNEL* OutDmaChannel, IN PUNKNOWN OuterUnknown OPTIONAL, @@ -34,7 +34,7 @@ PcNewDmaChannel( /* * @unimplemented */ -PORTCLASSAPI NTSTATUS NTAPI +NTSTATUS NTAPI PcNewInterruptSync( OUT PINTERRUPTSYNC* OUtInterruptSync, IN PUNKNOWN OuterUnknown OPTIONAL, @@ -49,7 +49,7 @@ PcNewInterruptSync( /* * @unimplemented */ -PORTCLASSAPI NTSTATUS NTAPI +NTSTATUS NTAPI PcNewMiniport( OUT PMINIPORT* OutMiniport, IN REFCLSID ClassId) @@ -61,7 +61,7 @@ PcNewMiniport( /* * @unimplemented */ -PORTCLASSAPI NTSTATUS NTAPI +NTSTATUS NTAPI PcNewRegistryKey( OUT PREGISTRYKEY* OutRegistryKey, IN PUNKNOWN OuterUnknown OPTIONAL, @@ -80,7 +80,7 @@ PcNewRegistryKey( /* * @unimplemented */ -PORTCLASSAPI NTSTATUS NTAPI +NTSTATUS NTAPI PcNewServiceGroup( OUT PSERVICEGROUP* OutServiceGroup, IN PUNKNOWN OuterUnknown OPTIONAL) @@ -97,7 +97,7 @@ PcNewServiceGroup( /* * @unimplemented */ -PORTCLASSAPI NTSTATUS NTAPI +NTSTATUS NTAPI PcRegisterAdapterPowerManagement( IN PUNKNOWN pUnknown, IN PVOID pvContext1) @@ -109,7 +109,7 @@ PcRegisterAdapterPowerManagement( /* * @unimplemented */ -PORTCLASSAPI NTSTATUS NTAPI +NTSTATUS NTAPI PcRequestNewPowerState( IN PDEVICE_OBJECT pDeviceObject, IN DEVICE_POWER_STATE RequestedNewState) @@ -126,7 +126,7 @@ PcRequestNewPowerState( /* * @unimplemented */ -PORTCLASSAPI NTSTATUS NTAPI +NTSTATUS NTAPI PcGetDeviceProperty( IN PVOID DeviceObject, IN DEVICE_REGISTRY_PROPERTY DeviceProperty, @@ -141,7 +141,7 @@ PcGetDeviceProperty( /* * @unimplemented */ -PORTCLASSAPI NTSTATUS NTAPI +NTSTATUS NTAPI PcCompletePendingPropertyRequest( IN PPCPROPERTY_REQUEST PropertyRequest, IN NTSTATUS NtStatus) @@ -158,7 +158,7 @@ PcCompletePendingPropertyRequest( /* * @unimplemented */ -PORTCLASSAPI NTSTATUS NTAPI +NTSTATUS NTAPI PcRegisterIoTimeout( IN PDEVICE_OBJECT pDeviceObject, IN PIO_TIMER_ROUTINE pTimerRoutine, @@ -171,7 +171,7 @@ PcRegisterIoTimeout( /* * @unimplemented */ -PORTCLASSAPI NTSTATUS NTAPI +NTSTATUS NTAPI PcUnregisterIoTimeout( IN PDEVICE_OBJECT pDeviceObject, IN PIO_TIMER_ROUTINE pTimerRoutine, @@ -189,7 +189,7 @@ PcUnregisterIoTimeout( /* * @unimplemented */ -PORTCLASSAPI NTSTATUS NTAPI +NTSTATUS NTAPI PcRegisterPhysicalConnection( IN PDEVICE_OBJECT DeviceObject, IN PUNKNOWN FromUnknown, @@ -204,7 +204,7 @@ PcRegisterPhysicalConnection( /* * @unimplemented */ -PORTCLASSAPI NTSTATUS NTAPI +NTSTATUS NTAPI PcRegisterPhysicalConnectionFromExternal( IN PDEVICE_OBJECT DeviceObject, IN PUNICODE_STRING FromString, @@ -219,7 +219,7 @@ PcRegisterPhysicalConnectionFromExternal( /* * @unimplemented */ -PORTCLASSAPI NTSTATUS NTAPI +NTSTATUS NTAPI PcRegisterPhysicalConnectionToExternal( IN PDEVICE_OBJECT DeviceObject, IN PUNKNOWN FromUnknown, @@ -239,7 +239,7 @@ PcRegisterPhysicalConnectionToExternal( /* * @unimplemented */ -PORTCLASSAPI ULONGLONG NTAPI +ULONGLONG NTAPI PcGetTimeInterval( IN ULONGLONG Since) { @@ -250,7 +250,7 @@ PcGetTimeInterval( /* * @unimplemented */ -PORTCLASSAPI NTSTATUS NTAPI +NTSTATUS NTAPI PcRegisterSubdevice( IN PDEVICE_OBJECT DeviceObject, IN PWCHAR Name, diff --git a/reactos/drivers/wdm/audio/backpln/portcls/undoc.c b/reactos/drivers/wdm/audio/backpln/portcls/undoc.c index 29cd2bf3cd4..13000f08da7 100644 --- a/reactos/drivers/wdm/audio/backpln/portcls/undoc.c +++ b/reactos/drivers/wdm/audio/backpln/portcls/undoc.c @@ -5,26 +5,26 @@ #include "private.h" #include -PORTCLASSAPI NTSTATUS +NTSTATUS KsoDispatchCreateWithGenericFactory( LONG Unknown, PIRP Irp) { } -PORTCLASSAPI void +void KsoGetIrpTargetFromFileObject( LONG Unknown) { } -PORTCLASSAPI void +void KsoGetIrpTargetFromIrp( LONG Unknown) { } -PORTCLASSAPI void +void PcAcquireFormatResources( LONG Unknown, LONG Unknown2, @@ -33,7 +33,6 @@ PcAcquireFormatResources( { } -PORTCLASSAPI NTSTATUS PcAddToEventTable( PVOID Ptr, @@ -47,7 +46,6 @@ PcAddToEventTable( { } -PORTCLASSAPI NTSTATUS PcAddToPropertyTable( PVOID Ptr, @@ -58,7 +56,6 @@ PcAddToPropertyTable( { } -PORTCLASSAPI NTSTATUS PcCaptureFormat( LONG Unknown, @@ -68,7 +65,6 @@ PcCaptureFormat( { } -PORTCLASSAPI NTSTATUS PcCreateSubdeviceDescriptor( /* TODO */ )