Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-06 18:31:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Remove several assumptions that the default calling convention is stdcall (it isn't under gcc)

Browse source 
- Fix even more definitions of function pointer protypes to define the calling convention compatibly for MSVC
- Don't use dllexport in scsiport -- fixes linking under msvc

svn path=/trunk/; revision=42800
This commit is contained in:
Stefan Ginsberg 2009-08-20 12:09:16 +00:00
parent 7a862d7907
commit 71820568a2
17 changed files with 126 additions and 126 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/dll/win32/psapi/psapi.c
View file

@ -587,7 +587,7 @@ typedef struct _INTERNAL_ENUM_PAGE_FILES_CONTEXT
} INTERNAL_ENUM_PAGE_FILES_CONTEXT, *PINTERNAL_ENUM_PAGE_FILES_CONTEXT; } INTERNAL_ENUM_PAGE_FILES_CONTEXT, *PINTERNAL_ENUM_PAGE_FILES_CONTEXT;
static BOOL static BOOL CALLBACK
InternalAnsiPageFileCallback(LPVOID pContext, InternalAnsiPageFileCallback(LPVOID pContext,
PENUM_PAGE_FILE_INFORMATION pPageFileInfo, PENUM_PAGE_FILE_INFORMATION pPageFileInfo,
LPCWSTR lpFilename) LPCWSTR lpFilename)

16
reactos/include/ddk/ntddpcm.h
View file

@ -90,8 +90,8 @@ DEFINE_GUID(GUID_PCMCIA_INTERFACE_STANDARD, \
typedef ULONG MEMORY_SPACE; typedef ULONG MEMORY_SPACE;
typedef ULONG NTAPI typedef ULONG
(*PPCMCIA_READ_WRITE_CONFIG)( (NTAPI *PPCMCIA_READ_WRITE_CONFIG)(
IN PVOID Context, IN PVOID Context,
IN ULONG WhichSpace, IN ULONG WhichSpace,
IN PUCHAR Buffer, IN PUCHAR Buffer,
@ -117,8 +117,8 @@ typedef struct _PCMCIA_BUS_INTERFACE_STANDARD {
#define PCMCIA_MEMORY_8BIT_ACCESS 0 #define PCMCIA_MEMORY_8BIT_ACCESS 0
#define PCMCIA_MEMORY_16BIT_ACCESS 1 #define PCMCIA_MEMORY_16BIT_ACCESS 1
typedef BOOLEAN NTAPI typedef BOOLEAN
(*PPCMCIA_MODIFY_MEMORY_WINDOW)( (NTAPI *PPCMCIA_MODIFY_MEMORY_WINDOW)(
IN PVOID Context, IN PVOID Context,
IN ULONGLONG HostBase, IN ULONGLONG HostBase,
IN ULONGLONG CardBase, IN ULONGLONG CardBase,
@ -132,13 +132,13 @@ typedef BOOLEAN NTAPI
#define PCMCIA_VPP_12V 1 #define PCMCIA_VPP_12V 1
#define PCMCIA_VPP_IS_VCC 2 #define PCMCIA_VPP_IS_VCC 2
typedef BOOLEAN NTAPI typedef BOOLEAN
(*PPCMCIA_SET_VPP)( (NTAPI *PPCMCIA_SET_VPP)(
IN PVOID Context, IN PVOID Context,
IN UCHAR VppLevel); IN UCHAR VppLevel);
typedef BOOLEAN NTAPI typedef BOOLEAN
(*PPCMCIA_IS_WRITE_PROTECTED)( (NTAPI *PPCMCIA_IS_WRITE_PROTECTED)(
IN PVOID Context); IN PVOID Context);
typedef struct _PCMCIA_INTERFACE_STANDARD { typedef struct _PCMCIA_INTERFACE_STANDARD {

6
reactos/include/ddk/ntifs.h
View file

@ -2378,7 +2378,7 @@ CcFlushCache (
OUT PIO_STATUS_BLOCK IoStatus OPTIONAL OUT PIO_STATUS_BLOCK IoStatus OPTIONAL
); );
typedef VOID (*PDIRTY_PAGE_ROUTINE) ( typedef VOID (NTAPI *PDIRTY_PAGE_ROUTINE) (
IN PFILE_OBJECT FileObject, IN PFILE_OBJECT FileObject,
IN PLARGE_INTEGER FileOffset, IN PLARGE_INTEGER FileOffset,
IN ULONG Length, IN ULONG Length,
@ -3601,7 +3601,7 @@ FsRtlNotifyCleanup (
IN PVOID FsContext IN PVOID FsContext
); );
typedef BOOLEAN (*PCHECK_FOR_TRAVERSE_ACCESS) ( typedef BOOLEAN (NTAPI *PCHECK_FOR_TRAVERSE_ACCESS) (
IN PVOID NotifyContext, IN PVOID NotifyContext,
IN PVOID TargetContext, IN PVOID TargetContext,
IN PSECURITY_SUBJECT_CONTEXT SubjectContext IN PSECURITY_SUBJECT_CONTEXT SubjectContext
@ -5522,7 +5522,7 @@ SeQuerySessionIdToken (
((PSECURITY_SUBJECT_CONTEXT) SubjectContext)->ClientToken : \ ((PSECURITY_SUBJECT_CONTEXT) SubjectContext)->ClientToken : \
((PSECURITY_SUBJECT_CONTEXT) SubjectContext)->PrimaryToken ) ((PSECURITY_SUBJECT_CONTEXT) SubjectContext)->PrimaryToken )
typedef NTSTATUS (*PSE_LOGON_SESSION_TERMINATED_ROUTINE) ( typedef NTSTATUS (NTAPI *PSE_LOGON_SESSION_TERMINATED_ROUTINE) (
IN PLUID LogonId IN PLUID LogonId
); );

72
reactos/include/ddk/parallel.h
View file

@ -79,28 +79,28 @@ typedef struct _MORE_PARALLEL_PORT_INFORMATION {
KINTERRUPT_MODE InterruptMode; KINTERRUPT_MODE InterruptMode;
} MORE_PARALLEL_PORT_INFORMATION, *PMORE_PARALLEL_PORT_INFORMATION; } MORE_PARALLEL_PORT_INFORMATION, *PMORE_PARALLEL_PORT_INFORMATION;
typedef NTSTATUS DDKAPI typedef NTSTATUS
(*PPARALLEL_SET_CHIP_MODE)( (DDKAPI *PPARALLEL_SET_CHIP_MODE)(
IN PVOID SetChipContext, IN PVOID SetChipContext,
IN UCHAR ChipMode); IN UCHAR ChipMode);
typedef NTSTATUS DDKAPI typedef NTSTATUS
(*PPARALLEL_CLEAR_CHIP_MODE)( (DDKAPI *PPARALLEL_CLEAR_CHIP_MODE)(
IN PVOID ClearChipContext, IN PVOID ClearChipContext,
IN UCHAR ChipMode); IN UCHAR ChipMode);
typedef NTSTATUS DDKAPI typedef NTSTATUS
(*PPARCHIP_CLEAR_CHIP_MODE)( (DDKAPI *PPARCHIP_CLEAR_CHIP_MODE)(
IN PVOID ClearChipContext, IN PVOID ClearChipContext,
IN UCHAR ChipMode); IN UCHAR ChipMode);
typedef NTSTATUS DDKAPI typedef NTSTATUS
(*PPARALLEL_TRY_SELECT_ROUTINE)( (DDKAPI *PPARALLEL_TRY_SELECT_ROUTINE)(
IN PVOID TrySelectContext, IN PVOID TrySelectContext,
IN PVOID TrySelectCommand); IN PVOID TrySelectCommand);
typedef NTSTATUS DDKAPI typedef NTSTATUS
(*PPARALLEL_DESELECT_ROUTINE)( (DDKAPI *PPARALLEL_DESELECT_ROUTINE)(
IN PVOID DeselectContext, IN PVOID DeselectContext,
IN PVOID DeselectCommand); IN PVOID DeselectCommand);
@ -133,16 +133,16 @@ typedef struct _PARALLEL_PNP_INFORMATION {
PWSTR PortName; PWSTR PortName;
} PARALLEL_PNP_INFORMATION, *PPARALLEL_PNP_INFORMATION; } PARALLEL_PNP_INFORMATION, *PPARALLEL_PNP_INFORMATION;
typedef BOOLEAN DDKAPI typedef BOOLEAN
(*PPARALLEL_TRY_ALLOCATE_ROUTINE)( (DDKAPI *PPARALLEL_TRY_ALLOCATE_ROUTINE)(
IN PVOID TryAllocateContext); IN PVOID TryAllocateContext);
typedef VOID DDKAPI typedef VOID
(*PPARALLEL_FREE_ROUTINE)( (DDKAPI *PPARALLEL_FREE_ROUTINE)(
IN PVOID FreeContext); IN PVOID FreeContext);
typedef ULONG DDKAPI typedef ULONG
(*PPARALLEL_QUERY_WAITERS_ROUTINE)( (DDKAPI *PPARALLEL_QUERY_WAITERS_ROUTINE)(
IN PVOID QueryAllocsContext); IN PVOID QueryAllocsContext);
typedef struct _PARALLEL_PORT_INFORMATION { typedef struct _PARALLEL_PORT_INFORMATION {
@ -164,8 +164,8 @@ typedef struct _PARALLEL_CHIP_MODE {
BOOLEAN success; BOOLEAN success;
} PARALLEL_CHIP_MODE, *PPARALLEL_CHIP_MODE; } PARALLEL_CHIP_MODE, *PPARALLEL_CHIP_MODE;
typedef VOID DDKAPI typedef VOID
(*PPARALLEL_DEFERRED_ROUTINE)( (DDKAPI *PPARALLEL_DEFERRED_ROUTINE)(
IN PVOID DeferredContext); IN PVOID DeferredContext);
typedef struct _PARALLEL_INTERRUPT_SERVICE_ROUTINE { typedef struct _PARALLEL_INTERRUPT_SERVICE_ROUTINE {
@ -191,8 +191,8 @@ typedef struct _PARALLEL_INTERRUPT_SERVICE_ROUTINE {
#define IOCTL_INTERNAL_UNLOCK_PORT_NO_DESELECT \ #define IOCTL_INTERNAL_UNLOCK_PORT_NO_DESELECT \
CTL_CODE (FILE_DEVICE_PARALLEL_PORT, 53, METHOD_BUFFERED, FILE_ANY_ACCESS) CTL_CODE (FILE_DEVICE_PARALLEL_PORT, 53, METHOD_BUFFERED, FILE_ANY_ACCESS)
typedef USHORT DDKAPI typedef USHORT
(*PDETERMINE_IEEE_MODES)( (DDKAPI *PDETERMINE_IEEE_MODES)(
IN PVOID Context); IN PVOID Context);
typedef enum _PARALLEL_SAFETY { typedef enum _PARALLEL_SAFETY {
@ -200,49 +200,49 @@ typedef enum _PARALLEL_SAFETY {
UNSAFE_MODE UNSAFE_MODE
} PARALLEL_SAFETY; } PARALLEL_SAFETY;
typedef NTSTATUS DDKAPI typedef NTSTATUS
(*PNEGOTIATE_IEEE_MODE)( (DDKAPI *PNEGOTIATE_IEEE_MODE)(
IN PVOID Context, IN PVOID Context,
IN USHORT ModeMaskFwd, IN USHORT ModeMaskFwd,
IN USHORT ModeMaskRev, IN USHORT ModeMaskRev,
IN PARALLEL_SAFETY ModeSafety, IN PARALLEL_SAFETY ModeSafety,
IN BOOLEAN IsForward); IN BOOLEAN IsForward);
typedef NTSTATUS DDKAPI typedef NTSTATUS
(*PTERMINATE_IEEE_MODE)( (DDKAPI *PTERMINATE_IEEE_MODE)(
IN PVOID Context); IN PVOID Context);
typedef NTSTATUS DDKAPI typedef NTSTATUS
(*PPARALLEL_IEEE_FWD_TO_REV)( (DDKAPI *PPARALLEL_IEEE_FWD_TO_REV)(
IN PVOID Context); IN PVOID Context);
typedef NTSTATUS DDKAPI typedef NTSTATUS
(*PPARALLEL_IEEE_REV_TO_FWD)( (DDKAPI *PPARALLEL_IEEE_REV_TO_FWD)(
IN PVOID Context); IN PVOID Context);
typedef NTSTATUS DDKAPI typedef NTSTATUS
(*PPARALLEL_READ)( (DDKAPI *PPARALLEL_READ)(
IN PVOID Context, IN PVOID Context,
OUT PVOID Buffer, OUT PVOID Buffer,
IN ULONG NumBytesToRead, IN ULONG NumBytesToRead,
OUT PULONG NumBytesRead, OUT PULONG NumBytesRead,
IN UCHAR Channel); IN UCHAR Channel);
typedef NTSTATUS DDKAPI typedef NTSTATUS
(*PPARALLEL_WRITE)( (DDKAPI *PPARALLEL_WRITE)(
IN PVOID Context, IN PVOID Context,
OUT PVOID Buffer, OUT PVOID Buffer,
IN ULONG NumBytesToWrite, IN ULONG NumBytesToWrite,
OUT PULONG NumBytesWritten, OUT PULONG NumBytesWritten,
IN UCHAR Channel); IN UCHAR Channel);
typedef NTSTATUS DDKAPI typedef NTSTATUS
(*PPARALLEL_TRYSELECT_DEVICE)( (DDKAPI *PPARALLEL_TRYSELECT_DEVICE)(
IN PVOID Context, IN PVOID Context,
IN PARALLEL_1284_COMMAND Command); IN PARALLEL_1284_COMMAND Command);
typedef NTSTATUS DDKAPI typedef NTSTATUS
(*PPARALLEL_DESELECT_DEVICE)( (DDKAPI *PPARALLEL_DESELECT_DEVICE)(
IN PVOID Context, IN PVOID Context,
IN PARALLEL_1284_COMMAND Command); IN PARALLEL_1284_COMMAND Command);

4
reactos/include/ddk/pfhook.h
View file

@ -41,8 +41,8 @@ typedef enum _PF_FORWARD_ACTION {
PF_ICMP_ON_DROP = 3 PF_ICMP_ON_DROP = 3
} PF_FORWARD_ACTION; } PF_FORWARD_ACTION;
typedef PF_FORWARD_ACTION NTAPI typedef PF_FORWARD_ACTION
(*PacketFilterExtensionPtr)( (NTAPI *PacketFilterExtensionPtr)(
IN unsigned char *PacketHeader, IN unsigned char *PacketHeader,
IN unsigned char *Packet, IN unsigned char *Packet,
IN unsigned int PacketLength, IN unsigned int PacketLength,

20
reactos/include/ddk/smbus.h
View file

@ -82,8 +82,8 @@ typedef struct _SMB_REQUEST {
UCHAR Data[SMB_MAX_DATA_SIZE]; UCHAR Data[SMB_MAX_DATA_SIZE];
} SMB_REQUEST, *PSMB_REQUEST; } SMB_REQUEST, *PSMB_REQUEST;
typedef VOID NTAPI typedef VOID
(*SMB_ALARM_NOTIFY)( (NTAPI *SMB_ALARM_NOTIFY)(
PVOID Context, PVOID Context,
UCHAR Address, UCHAR Address,
USHORT Data); USHORT Data);
@ -99,18 +99,18 @@ typedef struct _SMB_REGISTER_ALARM {
#define SMB_CLASS_MAJOR_VERSION 0x0001 #define SMB_CLASS_MAJOR_VERSION 0x0001
#define SMB_CLASS_MINOR_VERSION 0x0000 #define SMB_CLASS_MINOR_VERSION 0x0000
typedef NTSTATUS DDKAPI typedef NTSTATUS
(*SMB_RESET_DEVICE)( (DDKAPI *SMB_RESET_DEVICE)(
IN struct _SMB_CLASS *SmbClass, IN struct _SMB_CLASS *SmbClass,
IN PVOID SmbMiniport); IN PVOID SmbMiniport);
typedef VOID DDKAPI typedef VOID
(*SMB_START_IO)( (DDKAPI *SMB_START_IO)(
IN struct _SMB_CLASS *SmbClass, IN struct _SMB_CLASS *SmbClass,
IN PVOID SmbMiniport); IN PVOID SmbMiniport);
typedef NTSTATUS DDKAPI typedef NTSTATUS
(*SMB_STOP_DEVICE)( (DDKAPI *SMB_STOP_DEVICE)(
IN struct _SMB_CLASS *SmbClass, IN struct _SMB_CLASS *SmbClass,
IN PVOID SmbMiniport); IN PVOID SmbMiniport);
@ -142,8 +142,8 @@ DDKAPI
SmbClassCompleteRequest( SmbClassCompleteRequest(
IN PSMB_CLASS SmbClass); IN PSMB_CLASS SmbClass);
typedef NTSTATUS DDKAPI typedef NTSTATUS
(*PSMB_INITIALIZE_MINIPORT)( (DDKAPI *PSMB_INITIALIZE_MINIPORT)(
IN PSMB_CLASS SmbClass, IN PSMB_CLASS SmbClass,
IN PVOID MiniportExtension, IN PVOID MiniportExtension,
IN PVOID MiniportContext); IN PVOID MiniportContext);

2
reactos/include/ddk/srb.h
View file

@ -28,7 +28,7 @@ extern "C" {
#endif #endif
#if defined(_SCSIPORT_) #if defined(_SCSIPORT_)
#define SCSIPORTAPI DECLSPEC_EXPORT #define SCSIPORTAPI
#else #else
#define SCSIPORTAPI DECLSPEC_IMPORT #define SCSIPORTAPI DECLSPEC_IMPORT
#endif #endif

4
reactos/include/ddk/storport.h
View file

@ -391,8 +391,8 @@ StorPortGetScatterGatherList(
IN PVOID DeviceExtension, IN PVOID DeviceExtension,
IN PSCSI_REQUEST_BLOCK Srb); IN PSCSI_REQUEST_BLOCK Srb);
typedef BOOLEAN DDKAPI typedef BOOLEAN
(*PSTOR_SYNCHRONIZED_ACCESS)( (DDKAPI *PSTOR_SYNCHRONIZED_ACCESS)(
IN PVOID HwDeviceExtension, IN PVOID HwDeviceExtension,
IN PVOID Context); IN PVOID Context);

104
reactos/include/ddk/usbcamdi.h
View file

@ -74,23 +74,23 @@ typedef enum {
USBCAMD_CamControlFlag_EnableDeviceEvents = 8 USBCAMD_CamControlFlag_EnableDeviceEvents = 8
} USBCAMD_CamControlFlags; } USBCAMD_CamControlFlags;
typedef NTSTATUS DDKAPI typedef NTSTATUS
(*PCAM_ALLOCATE_BW_ROUTINE)( (DDKAPI *PCAM_ALLOCATE_BW_ROUTINE)(
PDEVICE_OBJECT BusDeviceObject, PDEVICE_OBJECT BusDeviceObject,
PVOID DeviceContext, PVOID DeviceContext,
PULONG RawFrameLength, PULONG RawFrameLength,
PVOID Format); PVOID Format);
typedef NTSTATUS DDKAPI typedef NTSTATUS
(*PCAM_ALLOCATE_BW_ROUTINE_EX)( (DDKAPI *PCAM_ALLOCATE_BW_ROUTINE_EX)(
PDEVICE_OBJECT BusDeviceObject, PDEVICE_OBJECT BusDeviceObject,
PVOID DeviceContext, PVOID DeviceContext,
PULONG RawFrameLength, PULONG RawFrameLength,
PVOID Format, PVOID Format,
ULONG StreamNumber); ULONG StreamNumber);
typedef NTSTATUS DDKAPI typedef NTSTATUS
(*PCAM_CONFIGURE_ROUTINE)( (DDKAPI *PCAM_CONFIGURE_ROUTINE)(
PDEVICE_OBJECT BusDeviceObject, PDEVICE_OBJECT BusDeviceObject,
PVOID DeviceContext, PVOID DeviceContext,
PUSBD_INTERFACE_INFORMATION Interface, PUSBD_INTERFACE_INFORMATION Interface,
@ -98,8 +98,8 @@ typedef NTSTATUS DDKAPI
PLONG DataPipeIndex, PLONG DataPipeIndex,
PLONG SyncPipeIndex); PLONG SyncPipeIndex);
typedef NTSTATUS DDKAPI typedef NTSTATUS
(*PCAM_CONFIGURE_ROUTINE_EX)( (DDKAPI *PCAM_CONFIGURE_ROUTINE_EX)(
PDEVICE_OBJECT BusDeviceObject, PDEVICE_OBJECT BusDeviceObject,
PVOID DeviceContext, PVOID DeviceContext,
PUSBD_INTERFACE_INFORMATION Interface, PUSBD_INTERFACE_INFORMATION Interface,
@ -108,36 +108,36 @@ typedef NTSTATUS DDKAPI
PUSBCAMD_Pipe_Config_Descriptor PipeConfig, PUSBCAMD_Pipe_Config_Descriptor PipeConfig,
PUSB_DEVICE_DESCRIPTOR DeviceDescriptor); PUSB_DEVICE_DESCRIPTOR DeviceDescriptor);
typedef NTSTATUS DDKAPI typedef NTSTATUS
(*PCAM_FREE_BW_ROUTINE)( (DDKAPI *PCAM_FREE_BW_ROUTINE)(
PDEVICE_OBJECT BusDeviceObject, PDEVICE_OBJECT BusDeviceObject,
PVOID DeviceContext); PVOID DeviceContext);
typedef NTSTATUS DDKAPI typedef NTSTATUS
(*PCAM_FREE_BW_ROUTINE_EX)( (DDKAPI *PCAM_FREE_BW_ROUTINE_EX)(
PDEVICE_OBJECT BusDeviceObject, PDEVICE_OBJECT BusDeviceObject,
PVOID DeviceContext, PVOID DeviceContext,
ULONG StreamNumber); ULONG StreamNumber);
typedef NTSTATUS DDKAPI typedef NTSTATUS
(*PCAM_INITIALIZE_ROUTINE)( (DDKAPI *PCAM_INITIALIZE_ROUTINE)(
PDEVICE_OBJECT BusDeviceObject, PDEVICE_OBJECT BusDeviceObject,
PVOID DeviceContext); PVOID DeviceContext);
typedef VOID DDKAPI typedef VOID
(*PCAM_NEW_FRAME_ROUTINE)( (DDKAPI *PCAM_NEW_FRAME_ROUTINE)(
PVOID DeviceContext, PVOID DeviceContext,
PVOID FrameContext); PVOID FrameContext);
typedef VOID DDKAPI typedef VOID
(*PCAM_NEW_FRAME_ROUTINE_EX)( (DDKAPI *PCAM_NEW_FRAME_ROUTINE_EX)(
PVOID DeviceContext, PVOID DeviceContext,
PVOID FrameContext, PVOID FrameContext,
ULONG StreamNumber, ULONG StreamNumber,
PULONG FrameLength); PULONG FrameLength);
typedef NTSTATUS DDKAPI typedef NTSTATUS
(*PCAM_PROCESS_RAW_FRAME_ROUTINE)( (DDKAPI *PCAM_PROCESS_RAW_FRAME_ROUTINE)(
PDEVICE_OBJECT BusDeviceObject, PDEVICE_OBJECT BusDeviceObject,
PVOID DeviceContext, PVOID DeviceContext,
PVOID FrameContext, PVOID FrameContext,
@ -148,8 +148,8 @@ typedef NTSTATUS DDKAPI
ULONG NumberOfPackets, ULONG NumberOfPackets,
PULONG BytesReturned); PULONG BytesReturned);
typedef NTSTATUS DDKAPI typedef NTSTATUS
(*PCAM_PROCESS_RAW_FRAME_ROUTINE_EX)( (DDKAPI *PCAM_PROCESS_RAW_FRAME_ROUTINE_EX)(
PDEVICE_OBJECT BusDeviceObject, PDEVICE_OBJECT BusDeviceObject,
PVOID DeviceContext, PVOID DeviceContext,
PVOID FrameContext, PVOID FrameContext,
@ -162,8 +162,8 @@ typedef NTSTATUS DDKAPI
ULONG ActualRawFrameLength, ULONG ActualRawFrameLength,
ULONG StreamNumber); ULONG StreamNumber);
typedef ULONG DDKAPI typedef ULONG
(*PCAM_PROCESS_PACKET_ROUTINE)( (DDKAPI *PCAM_PROCESS_PACKET_ROUTINE)(
PDEVICE_OBJECT BusDeviceObject, PDEVICE_OBJECT BusDeviceObject,
PVOID DeviceContext, PVOID DeviceContext,
PVOID CurrentFrameContext, PVOID CurrentFrameContext,
@ -174,8 +174,8 @@ typedef ULONG DDKAPI
PBOOLEAN FrameComplete, PBOOLEAN FrameComplete,
PBOOLEAN NextFrameIsStill); PBOOLEAN NextFrameIsStill);
typedef ULONG DDKAPI typedef ULONG
(*PCAM_PROCESS_PACKET_ROUTINE_EX)( (DDKAPI *PCAM_PROCESS_PACKET_ROUTINE_EX)(
PDEVICE_OBJECT BusDeviceObject, PDEVICE_OBJECT BusDeviceObject,
PVOID DeviceContext, PVOID DeviceContext,
PVOID CurrentFrameContext, PVOID CurrentFrameContext,
@ -187,29 +187,29 @@ typedef ULONG DDKAPI
PULONG PacketFlag, PULONG PacketFlag,
PULONG ValidDataOffset); PULONG ValidDataOffset);
typedef NTSTATUS DDKAPI typedef NTSTATUS
(*PCAM_STATE_ROUTINE)( (DDKAPI *PCAM_STATE_ROUTINE)(
PDEVICE_OBJECT BusDeviceObject, PDEVICE_OBJECT BusDeviceObject,
PVOID DeviceContext); PVOID DeviceContext);
typedef NTSTATUS DDKAPI typedef NTSTATUS
(*PCAM_START_CAPTURE_ROUTINE)( (DDKAPI *PCAM_START_CAPTURE_ROUTINE)(
PDEVICE_OBJECT BusDeviceObject, PDEVICE_OBJECT BusDeviceObject,
PVOID DeviceContext); PVOID DeviceContext);
typedef NTSTATUS DDKAPI typedef NTSTATUS
(*PCAM_START_CAPTURE_ROUTINE_EX)( (DDKAPI *PCAM_START_CAPTURE_ROUTINE_EX)(
PDEVICE_OBJECT BusDeviceObject, PDEVICE_OBJECT BusDeviceObject,
PVOID DeviceContext, PVOID DeviceContext,
ULONG StreamNumber); ULONG StreamNumber);
typedef NTSTATUS DDKAPI typedef NTSTATUS
(*PCAM_STOP_CAPTURE_ROUTINE)( (DDKAPI *PCAM_STOP_CAPTURE_ROUTINE)(
PDEVICE_OBJECT BusDeviceObject, PDEVICE_OBJECT BusDeviceObject,
PVOID DeviceContext); PVOID DeviceContext);
typedef NTSTATUS DDKAPI typedef NTSTATUS
(*PCAM_STOP_CAPTURE_ROUTINE_EX)( (DDKAPI *PCAM_STOP_CAPTURE_ROUTINE_EX)(
PDEVICE_OBJECT BusDeviceObject, PDEVICE_OBJECT BusDeviceObject,
PVOID DeviceContext, PVOID DeviceContext,
ULONG StreamNumber); ULONG StreamNumber);
@ -255,14 +255,14 @@ USBCAMD_InitializeNewInterface(
IN ULONG Version, IN ULONG Version,
IN ULONG CamControlFlag); IN ULONG CamControlFlag);
typedef VOID DDKAPI typedef VOID
(*PCOMMAND_COMPLETE_FUNCTION)( (DDKAPI *PCOMMAND_COMPLETE_FUNCTION)(
PVOID DeviceContext, PVOID DeviceContext,
PVOID CommandContext, PVOID CommandContext,
NTSTATUS NtStatus); NTSTATUS NtStatus);
typedef NTSTATUS DDKAPI typedef NTSTATUS
(*PFNUSBCAMD_BulkReadWrite)( (DDKAPI *PFNUSBCAMD_BulkReadWrite)(
IN PVOID DeviceContext, IN PVOID DeviceContext,
IN USHORT PipeIndex, IN USHORT PipeIndex,
IN PVOID Buffer, IN PVOID Buffer,
@ -270,23 +270,23 @@ typedef NTSTATUS DDKAPI
IN PCOMMAND_COMPLETE_FUNCTION CommandComplete, IN PCOMMAND_COMPLETE_FUNCTION CommandComplete,
IN PVOID CommandContext); IN PVOID CommandContext);
typedef NTSTATUS DDKAPI typedef NTSTATUS
(*PFNUSBCAMD_SetIsoPipeState)( (DDKAPI *PFNUSBCAMD_SetIsoPipeState)(
IN PVOID DeviceContext, IN PVOID DeviceContext,
IN ULONG PipeStateFlags); IN ULONG PipeStateFlags);
typedef NTSTATUS DDKAPI typedef NTSTATUS
(*PFNUSBCAMD_CancelBulkReadWrite)( (DDKAPI *PFNUSBCAMD_CancelBulkReadWrite)(
IN PVOID DeviceContext, IN PVOID DeviceContext,
IN ULONG PipeIndex); IN ULONG PipeIndex);
typedef NTSTATUS DDKAPI typedef NTSTATUS
(*PFNUSBCAMD_SetVideoFormat)( (DDKAPI *PFNUSBCAMD_SetVideoFormat)(
IN PVOID DeviceContext, IN PVOID DeviceContext,
IN PHW_STREAM_REQUEST_BLOCK pSrb); IN PHW_STREAM_REQUEST_BLOCK pSrb);
typedef NTSTATUS DDKAPI typedef NTSTATUS
(*PFNUSBCAMD_WaitOnDeviceEvent)( (DDKAPI *PFNUSBCAMD_WaitOnDeviceEvent)(
IN PVOID DeviceContext, IN PVOID DeviceContext,
IN ULONG PipeIndex, IN ULONG PipeIndex,
IN PVOID Buffer, IN PVOID Buffer,
@ -318,8 +318,8 @@ USBCAMD_ControlVendorCommand(
IN PCOMMAND_COMPLETE_FUNCTION CommandComplete, IN PCOMMAND_COMPLETE_FUNCTION CommandComplete,
IN PVOID CommandContext); IN PVOID CommandContext);
typedef VOID DDKAPI typedef VOID
(*PADAPTER_RECEIVE_PACKET_ROUTINE)( (DDKAPI *PADAPTER_RECEIVE_PACKET_ROUTINE)(
IN PHW_STREAM_REQUEST_BLOCK Srb); IN PHW_STREAM_REQUEST_BLOCK Srb);
USBCAMAPI USBCAMAPI
@ -360,8 +360,8 @@ typedef struct _USBCAMD_INTERFACE {
PFNUSBCAMD_CancelBulkReadWrite USBCAMD_CancelBulkReadWrite; PFNUSBCAMD_CancelBulkReadWrite USBCAMD_CancelBulkReadWrite;
} USBCAMD_INTERFACE, *PUSBCAMD_INTERFACE; } USBCAMD_INTERFACE, *PUSBCAMD_INTERFACE;
typedef VOID DDKAPI typedef VOID
(*PSTREAM_RECEIVE_PACKET)( (DDKAPI *PSTREAM_RECEIVE_PACKET)(
IN PVOID Srb, IN PVOID Srb,
IN PVOID DeviceContext, IN PVOID DeviceContext,
IN PBOOLEAN Completed); IN PBOOLEAN Completed);

2
reactos/include/ddk/video.h
View file

@ -76,7 +76,7 @@ typedef enum _HW_DMA_RETURN {
} HW_DMA_RETURN, *PHW_DMA_RETURN; } HW_DMA_RETURN, *PHW_DMA_RETURN;
typedef HW_DMA_RETURN typedef HW_DMA_RETURN
(*PVIDEO_HW_START_DMA)( (DDKAPI *PVIDEO_HW_START_DMA)(
PVOID HwDeviceExtension, PVOID HwDeviceExtension,
PDMA pDma); PDMA pDma);

2
reactos/include/ddk/winddk.h
View file

@ -4948,7 +4948,7 @@ typedef struct _PHYSICAL_MEMORY_RANGE {
} PHYSICAL_MEMORY_RANGE, *PPHYSICAL_MEMORY_RANGE; } PHYSICAL_MEMORY_RANGE, *PPHYSICAL_MEMORY_RANGE;
typedef ULONG_PTR typedef ULONG_PTR
(*PDRIVER_VERIFIER_THUNK_ROUTINE)( (NTAPI *PDRIVER_VERIFIER_THUNK_ROUTINE)(
IN PVOID Context); IN PVOID Context);
typedef struct _DRIVER_VERIFIER_THUNK_PAIRS { typedef struct _DRIVER_VERIFIER_THUNK_PAIRS {

2
reactos/include/ndk/ldrtypes.h
View file

@ -156,7 +156,7 @@ typedef struct _LDR_DLL_LOADED_NOTIFICATION_DATA
} LDR_DLL_LOADED_NOTIFICATION_DATA, *PLDR_DLL_LOADED_NOTIFICATION_DATA; } LDR_DLL_LOADED_NOTIFICATION_DATA, *PLDR_DLL_LOADED_NOTIFICATION_DATA;
typedef VOID typedef VOID
(*PLDR_DLL_LOADED_NOTIFICATION_CALLBACK)( (NTAPI *PLDR_DLL_LOADED_NOTIFICATION_CALLBACK)(
IN BOOLEAN Type, IN BOOLEAN Type,
IN struct _LDR_DLL_LOADED_NOTIFICATION_DATA *Data IN struct _LDR_DLL_LOADED_NOTIFICATION_DATA *Data
); );

2
reactos/include/ndk/rtltypes.h
View file

@ -435,7 +435,7 @@ extern const PRTL_REALLOCATE_STRING_ROUTINE RtlReallocateStringRoutine;
// Callback for RTL Heap Enumeration // Callback for RTL Heap Enumeration
// //
typedef NTSTATUS typedef NTSTATUS
(*PHEAP_ENUMERATION_ROUTINE)( (NTAPI *PHEAP_ENUMERATION_ROUTINE)(
IN PVOID HeapHandle, IN PVOID HeapHandle,
IN PVOID UserParam IN PVOID UserParam
); );

6
reactos/include/psdk/ntsecapi.h
View file

@ -728,10 +728,10 @@ NTSTATUS NTAPI LsaSetTrustedDomainInfoByName(LSA_HANDLE,PLSA_UNICODE_STRING,
TRUSTED_INFORMATION_CLASS,PVOID); TRUSTED_INFORMATION_CLASS,PVOID);
NTSTATUS NTAPI LsaStorePrivateData(LSA_HANDLE,PLSA_UNICODE_STRING, NTSTATUS NTAPI LsaStorePrivateData(LSA_HANDLE,PLSA_UNICODE_STRING,
PLSA_UNICODE_STRING); PLSA_UNICODE_STRING);
typedef NTSTATUS (*PSAM_PASSWORD_NOTIFICATION_ROUTINE)(PUNICODE_STRING, typedef NTSTATUS (NTAPI *PSAM_PASSWORD_NOTIFICATION_ROUTINE)(PUNICODE_STRING,
ULONG,PUNICODE_STRING); ULONG,PUNICODE_STRING);
typedef BOOLEAN (*PSAM_INIT_NOTIFICATION_ROUTINE)(void); typedef BOOLEAN (NTAPI *PSAM_INIT_NOTIFICATION_ROUTINE)(void);
typedef BOOLEAN (*PSAM_PASSWORD_FILTER_ROUTINE)(PUNICODE_STRING,PUNICODE_STRING, typedef BOOLEAN (NTAPI *PSAM_PASSWORD_FILTER_ROUTINE)(PUNICODE_STRING,PUNICODE_STRING,
PUNICODE_STRING,BOOLEAN); PUNICODE_STRING,BOOLEAN);
#ifdef __cplusplus #ifdef __cplusplus
} }

4
reactos/include/psdk/psapi.h
View file

@ -72,8 +72,8 @@ typedef struct _ENUM_PAGE_FILE_INFORMATION {
SIZE_T PeakUsage; SIZE_T PeakUsage;
} ENUM_PAGE_FILE_INFORMATION, *PENUM_PAGE_FILE_INFORMATION; } ENUM_PAGE_FILE_INFORMATION, *PENUM_PAGE_FILE_INFORMATION;
typedef BOOL (*PENUM_PAGE_FILE_CALLBACKA)(LPVOID, PENUM_PAGE_FILE_INFORMATION, LPCSTR); typedef BOOL (CALLBACK *PENUM_PAGE_FILE_CALLBACKA)(LPVOID, PENUM_PAGE_FILE_INFORMATION, LPCSTR);
typedef BOOL (*PENUM_PAGE_FILE_CALLBACKW)(LPVOID, PENUM_PAGE_FILE_INFORMATION, LPCWSTR); typedef BOOL (CALLBACK *PENUM_PAGE_FILE_CALLBACKW)(LPVOID, PENUM_PAGE_FILE_INFORMATION, LPCWSTR);
/* Grouped by application,not in alphabetical order. */ /* Grouped by application,not in alphabetical order. */
BOOL WINAPI EnumProcesses(DWORD *,DWORD,DWORD *); BOOL WINAPI EnumProcesses(DWORD *,DWORD,DWORD *);

2
reactos/include/psdk/wintrust.h
View file

@ -371,7 +371,7 @@ typedef struct _CRYPT_PROVIDER_DATA {
#define CPD_UISTATE_MODE_ALLOW 0x00000002 #define CPD_UISTATE_MODE_ALLOW 0x00000002
#define CPD_UISTATE_MODE_MASK 0x00000003 #define CPD_UISTATE_MODE_MASK 0x00000003
typedef BOOL (*PFN_PROVUI_CALL)(HWND hWndSecurityDialog, typedef BOOL (CALLBACK *PFN_PROVUI_CALL)(HWND hWndSecurityDialog,
struct _CRYPT_PROVIDER_DATA *pProvData); struct _CRYPT_PROVIDER_DATA *pProvData);
typedef struct _CRYPT_PROVUI_FUNCS { typedef struct _CRYPT_PROVUI_FUNCS {

2
reactos/include/psdk/winwlx.h
View file

@ -633,7 +633,7 @@ struct _WLX_DISPATCH_VERSION_1_4
/* non-GINA notification DLLs*/ /* non-GINA notification DLLs*/
typedef typedef
DWORD (*PFNMSGECALLBACK)( DWORD (CALLBACK *PFNMSGECALLBACK)(
BOOL bVerbose, BOOL bVerbose,
LPWSTR lpMessage); LPWSTR lpMessage);