- Remove several assumptions that the default calling convention is stdcall (it isn...

- 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

diff --git a/reactos/dll/win32/psapi/psapi.c b/reactos/dll/win32/psapi/psapi.c
index 8ea0f15..df0b8fe 100644 (file)
--- a/reactos/dll/win32/psapi/psapi.c
+++ b/reactos/dll/win32/psapi/psapi.c
@@ -587,7 +587,7 @@ typedef struct _INTERNAL_ENUM_PAGE_FILES_CONTEXT
 } INTERNAL_ENUM_PAGE_FILES_CONTEXT, *PINTERNAL_ENUM_PAGE_FILES_CONTEXT;
 
 
-static BOOL
+static BOOL CALLBACK
 InternalAnsiPageFileCallback(LPVOID pContext,
                              PENUM_PAGE_FILE_INFORMATION pPageFileInfo,
                              LPCWSTR lpFilename)

diff --git a/reactos/include/ddk/ntddpcm.h b/reactos/include/ddk/ntddpcm.h
index e2872e2..7c6e55c 100644 (file)
--- a/reactos/include/ddk/ntddpcm.h
+++ b/reactos/include/ddk/ntddpcm.h
@@ -90,8 +90,8 @@ DEFINE_GUID(GUID_PCMCIA_INTERFACE_STANDARD, \
 
 typedef ULONG MEMORY_SPACE;
 
-typedef ULONG NTAPI
-(*PPCMCIA_READ_WRITE_CONFIG)(
+typedef ULONG
+(NTAPI *PPCMCIA_READ_WRITE_CONFIG)(
   IN PVOID  Context,
   IN ULONG  WhichSpace,
   IN PUCHAR  Buffer,
@@ -117,8 +117,8 @@ typedef struct _PCMCIA_BUS_INTERFACE_STANDARD {
 #define PCMCIA_MEMORY_8BIT_ACCESS         0
 #define PCMCIA_MEMORY_16BIT_ACCESS        1
 
-typedef BOOLEAN NTAPI
-(*PPCMCIA_MODIFY_MEMORY_WINDOW)(
+typedef BOOLEAN
+(NTAPI *PPCMCIA_MODIFY_MEMORY_WINDOW)(
   IN PVOID  Context,
   IN ULONGLONG  HostBase,
   IN ULONGLONG  CardBase,
@@ -132,13 +132,13 @@ typedef BOOLEAN NTAPI
 #define PCMCIA_VPP_12V                    1
 #define PCMCIA_VPP_IS_VCC                 2
 
-typedef BOOLEAN NTAPI
-(*PPCMCIA_SET_VPP)(
+typedef BOOLEAN
+(NTAPI *PPCMCIA_SET_VPP)(
   IN PVOID  Context,
   IN UCHAR  VppLevel);
 
-typedef BOOLEAN NTAPI
-(*PPCMCIA_IS_WRITE_PROTECTED)(
+typedef BOOLEAN
+(NTAPI *PPCMCIA_IS_WRITE_PROTECTED)(
   IN PVOID  Context);
 
 typedef struct _PCMCIA_INTERFACE_STANDARD {

diff --git a/reactos/include/ddk/ntifs.h b/reactos/include/ddk/ntifs.h
index 8ba9aa6..cf8be0f 100644 (file)
--- a/reactos/include/ddk/ntifs.h
+++ b/reactos/include/ddk/ntifs.h
@@ -2378,7 +2378,7 @@ CcFlushCache (
     OUT PIO_STATUS_BLOCK        IoStatus OPTIONAL
 );
 
-typedef VOID (*PDIRTY_PAGE_ROUTINE) (
+typedef VOID (NTAPI *PDIRTY_PAGE_ROUTINE) (
     IN PFILE_OBJECT     FileObject,
     IN PLARGE_INTEGER   FileOffset,
     IN ULONG            Length,
@@ -3601,7 +3601,7 @@ FsRtlNotifyCleanup (
     IN PVOID        FsContext
 );
 
-typedef BOOLEAN (*PCHECK_FOR_TRAVERSE_ACCESS) (
+typedef BOOLEAN (NTAPI *PCHECK_FOR_TRAVERSE_ACCESS) (
     IN PVOID                        NotifyContext,
     IN PVOID                        TargetContext,
     IN PSECURITY_SUBJECT_CONTEXT    SubjectContext
@@ -5522,7 +5522,7 @@ SeQuerySessionIdToken (
     ((PSECURITY_SUBJECT_CONTEXT) SubjectContext)->ClientToken :     \
     ((PSECURITY_SUBJECT_CONTEXT) SubjectContext)->PrimaryToken )
 
-typedef NTSTATUS (*PSE_LOGON_SESSION_TERMINATED_ROUTINE) (
+typedef NTSTATUS (NTAPI *PSE_LOGON_SESSION_TERMINATED_ROUTINE) (
     IN PLUID LogonId
 );
 

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

diff --git a/reactos/include/ddk/pfhook.h b/reactos/include/ddk/pfhook.h
index d092d07..5c7644a 100644 (file)
--- a/reactos/include/ddk/pfhook.h
+++ b/reactos/include/ddk/pfhook.h
@@ -41,8 +41,8 @@ typedef enum _PF_FORWARD_ACTION {
        PF_ICMP_ON_DROP = 3
 } PF_FORWARD_ACTION;
 
-typedef PF_FORWARD_ACTION NTAPI
-(*PacketFilterExtensionPtr)(
+typedef PF_FORWARD_ACTION
+(NTAPI *PacketFilterExtensionPtr)(
   IN unsigned char  *PacketHeader,
   IN unsigned char  *Packet,
   IN unsigned int  PacketLength,

diff --git a/reactos/include/ddk/smbus.h b/reactos/include/ddk/smbus.h
index 0ce8d5d..96bbafc 100644 (file)
--- a/reactos/include/ddk/smbus.h
+++ b/reactos/include/ddk/smbus.h
@@ -82,8 +82,8 @@ typedef struct _SMB_REQUEST {
   UCHAR  Data[SMB_MAX_DATA_SIZE];
 } SMB_REQUEST, *PSMB_REQUEST;
 
-typedef VOID NTAPI
-(*SMB_ALARM_NOTIFY)(
+typedef VOID
+(NTAPI *SMB_ALARM_NOTIFY)(
   PVOID  Context,
   UCHAR  Address,
   USHORT  Data);
@@ -99,18 +99,18 @@ typedef struct _SMB_REGISTER_ALARM {
 #define SMB_CLASS_MAJOR_VERSION           0x0001
 #define SMB_CLASS_MINOR_VERSION           0x0000
 
-typedef NTSTATUS DDKAPI
-(*SMB_RESET_DEVICE)(
+typedef NTSTATUS
+(DDKAPI *SMB_RESET_DEVICE)(
   IN struct _SMB_CLASS  *SmbClass,
   IN PVOID  SmbMiniport);
 
-typedef VOID DDKAPI
-(*SMB_START_IO)(
+typedef VOID
+(DDKAPI *SMB_START_IO)(
   IN struct _SMB_CLASS  *SmbClass,
   IN PVOID  SmbMiniport);
 
-typedef NTSTATUS DDKAPI
-(*SMB_STOP_DEVICE)(
+typedef NTSTATUS
+(DDKAPI *SMB_STOP_DEVICE)(
   IN struct _SMB_CLASS  *SmbClass,
   IN PVOID  SmbMiniport);
 
@@ -142,8 +142,8 @@ DDKAPI
 SmbClassCompleteRequest(
   IN PSMB_CLASS  SmbClass);
 
-typedef NTSTATUS DDKAPI
-(*PSMB_INITIALIZE_MINIPORT)(
+typedef NTSTATUS
+(DDKAPI *PSMB_INITIALIZE_MINIPORT)(
   IN PSMB_CLASS  SmbClass,
   IN PVOID  MiniportExtension,
   IN PVOID  MiniportContext);

diff --git a/reactos/include/ddk/srb.h b/reactos/include/ddk/srb.h
index 5ec2093..7d7fc51 100644 (file)
--- a/reactos/include/ddk/srb.h
+++ b/reactos/include/ddk/srb.h
@@ -28,7 +28,7 @@ extern "C" {
 #endif
 
 #if defined(_SCSIPORT_)
-  #define SCSIPORTAPI DECLSPEC_EXPORT
+  #define SCSIPORTAPI
 #else
   #define SCSIPORTAPI DECLSPEC_IMPORT
 #endif

diff --git a/reactos/include/ddk/storport.h b/reactos/include/ddk/storport.h
index d4112fa..07ea436 100644 (file)
--- a/reactos/include/ddk/storport.h
+++ b/reactos/include/ddk/storport.h
@@ -391,8 +391,8 @@ StorPortGetScatterGatherList(
   IN PVOID  DeviceExtension,
   IN PSCSI_REQUEST_BLOCK  Srb);
 
-typedef BOOLEAN DDKAPI
-(*PSTOR_SYNCHRONIZED_ACCESS)(
+typedef BOOLEAN
+(DDKAPI *PSTOR_SYNCHRONIZED_ACCESS)(
   IN PVOID  HwDeviceExtension,
   IN PVOID  Context);
 

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

diff --git a/reactos/include/ddk/video.h b/reactos/include/ddk/video.h
index aa68c1e..fcf4d4a 100644 (file)
--- a/reactos/include/ddk/video.h
+++ b/reactos/include/ddk/video.h
@@ -76,7 +76,7 @@ typedef enum _HW_DMA_RETURN {
 } HW_DMA_RETURN, *PHW_DMA_RETURN;
 
 typedef HW_DMA_RETURN
-(*PVIDEO_HW_START_DMA)(
+(DDKAPI *PVIDEO_HW_START_DMA)(
     PVOID  HwDeviceExtension,
     PDMA  pDma);
 

diff --git a/reactos/include/ddk/winddk.h b/reactos/include/ddk/winddk.h
index 2677ec7..38d20b0 100644 (file)
--- a/reactos/include/ddk/winddk.h
+++ b/reactos/include/ddk/winddk.h
@@ -4948,7 +4948,7 @@ typedef struct _PHYSICAL_MEMORY_RANGE {
 } PHYSICAL_MEMORY_RANGE, *PPHYSICAL_MEMORY_RANGE;
 
 typedef ULONG_PTR
-(*PDRIVER_VERIFIER_THUNK_ROUTINE)(
+(NTAPI *PDRIVER_VERIFIER_THUNK_ROUTINE)(
   IN PVOID  Context);
 
 typedef struct _DRIVER_VERIFIER_THUNK_PAIRS {

diff --git a/reactos/include/ndk/ldrtypes.h b/reactos/include/ndk/ldrtypes.h
index e274294..62edb6c 100644 (file)
--- a/reactos/include/ndk/ldrtypes.h
+++ b/reactos/include/ndk/ldrtypes.h
@@ -156,7 +156,7 @@ typedef struct _LDR_DLL_LOADED_NOTIFICATION_DATA
 } LDR_DLL_LOADED_NOTIFICATION_DATA, *PLDR_DLL_LOADED_NOTIFICATION_DATA;
 
 typedef VOID
-(*PLDR_DLL_LOADED_NOTIFICATION_CALLBACK)(
+(NTAPI *PLDR_DLL_LOADED_NOTIFICATION_CALLBACK)(
     IN BOOLEAN Type,
     IN struct _LDR_DLL_LOADED_NOTIFICATION_DATA *Data
 );

diff --git a/reactos/include/ndk/rtltypes.h b/reactos/include/ndk/rtltypes.h
index 59f4067..70aa3ed 100644 (file)
--- a/reactos/include/ndk/rtltypes.h
+++ b/reactos/include/ndk/rtltypes.h
@@ -435,7 +435,7 @@ extern const PRTL_REALLOCATE_STRING_ROUTINE RtlReallocateStringRoutine;
 // Callback for RTL Heap Enumeration
 //
 typedef NTSTATUS
-(*PHEAP_ENUMERATION_ROUTINE)(
+(NTAPI *PHEAP_ENUMERATION_ROUTINE)(
     IN PVOID HeapHandle,
     IN PVOID UserParam
 );

diff --git a/reactos/include/psdk/ntsecapi.h b/reactos/include/psdk/ntsecapi.h
index 57a4944..4f47573 100644 (file)
--- a/reactos/include/psdk/ntsecapi.h
+++ b/reactos/include/psdk/ntsecapi.h
@@ -728,10 +728,10 @@ NTSTATUS NTAPI LsaSetTrustedDomainInfoByName(LSA_HANDLE,PLSA_UNICODE_STRING,
                             TRUSTED_INFORMATION_CLASS,PVOID);
 NTSTATUS NTAPI LsaStorePrivateData(LSA_HANDLE,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);
-typedef BOOLEAN (*PSAM_INIT_NOTIFICATION_ROUTINE)(void);
-typedef BOOLEAN (*PSAM_PASSWORD_FILTER_ROUTINE)(PUNICODE_STRING,PUNICODE_STRING,
+typedef BOOLEAN (NTAPI *PSAM_INIT_NOTIFICATION_ROUTINE)(void);
+typedef BOOLEAN (NTAPI *PSAM_PASSWORD_FILTER_ROUTINE)(PUNICODE_STRING,PUNICODE_STRING,
                             PUNICODE_STRING,BOOLEAN);
 #ifdef __cplusplus
 }

diff --git a/reactos/include/psdk/psapi.h b/reactos/include/psdk/psapi.h
index 6365f93..15c9df5 100644 (file)
--- a/reactos/include/psdk/psapi.h
+++ b/reactos/include/psdk/psapi.h
@@ -72,8 +72,8 @@ typedef struct _ENUM_PAGE_FILE_INFORMATION {
        SIZE_T PeakUsage;
 } ENUM_PAGE_FILE_INFORMATION, *PENUM_PAGE_FILE_INFORMATION;
 
-typedef BOOL (*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_CALLBACKA)(LPVOID, PENUM_PAGE_FILE_INFORMATION, LPCSTR);
+typedef BOOL (CALLBACK *PENUM_PAGE_FILE_CALLBACKW)(LPVOID, PENUM_PAGE_FILE_INFORMATION, LPCWSTR);
 
 /* Grouped by application,not in alphabetical order. */
 BOOL WINAPI EnumProcesses(DWORD *,DWORD,DWORD *);

diff --git a/reactos/include/psdk/wintrust.h b/reactos/include/psdk/wintrust.h
index 228d868..6ec3c40 100644 (file)
--- a/reactos/include/psdk/wintrust.h
+++ b/reactos/include/psdk/wintrust.h
@@ -371,7 +371,7 @@ typedef struct _CRYPT_PROVIDER_DATA {
 #define CPD_UISTATE_MODE_ALLOW  0x00000002
 #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);
 
 typedef struct _CRYPT_PROVUI_FUNCS {

diff --git a/reactos/include/psdk/winwlx.h b/reactos/include/psdk/winwlx.h
index 6a22ff8..cf06e2e 100644 (file)
--- a/reactos/include/psdk/winwlx.h
+++ b/reactos/include/psdk/winwlx.h
@@ -633,7 +633,7 @@ struct _WLX_DISPATCH_VERSION_1_4
 /* non-GINA notification DLLs*/
 
 typedef
-DWORD (*PFNMSGECALLBACK)(
+DWORD (CALLBACK *PFNMSGECALLBACK)(
        BOOL bVerbose,
        LPWSTR lpMessage);