Changes to suit addition of a single macro in the types header.

svn path=/trunk/; revision=3779

diff --git a/reactos/include/ddk/cctypes.h b/reactos/include/ddk/cctypes.h
index bd3f0ac..4d61ef8 100644 (file)
--- a/reactos/include/ddk/cctypes.h
+++ b/reactos/include/ddk/cctypes.h
@@ -15,7 +15,7 @@ typedef struct _CC_FILE_SIZES
 } CC_FILE_SIZES, *PCC_FILE_SIZES;
 
 
-typedef VOID STDCALL
+typedef VOID STDCALL_FUNC
 (*PCC_POST_DEFERRED_WRITE)(IN PVOID Context1,
                           IN PVOID Context2);
 
@@ -37,18 +37,18 @@ typedef VOID (*PDIRTY_PAGE_ROUTINE) (
     IN PVOID            Context2
 );
 
-typedef BOOLEAN STDCALL
+typedef BOOLEAN STDCALL_FUNC
 (*PACQUIRE_FOR_LAZY_WRITE)(IN PVOID Context,
                           IN BOOLEAN Wait);
 
-typedef VOID STDCALL
+typedef VOID STDCALL_FUNC
 (*PRELEASE_FROM_LAZY_WRITE)(IN PVOID Context);
 
-typedef BOOLEAN STDCALL
+typedef BOOLEAN STDCALL_FUNC
 (*PACQUIRE_FOR_READ_AHEAD)(IN PVOID Context,
                           IN BOOLEAN Wait);
 
-typedef VOID STDCALL
+typedef VOID STDCALL_FUNC
 (*PRELEASE_FROM_READ_AHEAD)(IN PVOID Context);
 
 typedef struct _CACHE_MANAGER_CALLBACKS
@@ -69,7 +69,7 @@ typedef struct _SECTION_OBJECT_POINTERS
 } SECTION_OBJECT_POINTERS, *PSECTION_OBJECT_POINTERS;
 */
 
-typedef VOID STDCALL
+typedef VOID STDCALL_FUNC
 (*PFLUSH_TO_LSN)(IN PVOID LogHandle,
                 IN LARGE_INTEGER Lsn);
 

diff --git a/reactos/include/ddk/extypes.h b/reactos/include/ddk/extypes.h
index d12e263..06d4693 100644 (file)
--- a/reactos/include/ddk/extypes.h
+++ b/reactos/include/ddk/extypes.h
@@ -1,4 +1,4 @@
-/* $Id: extypes.h,v 1.11 2002/09/08 10:47:43 chorns Exp $ */
+/* $Id: extypes.h,v 1.12 2002/11/24 18:26:40 robd Exp $ */
 
 #ifndef __INCLUDE_DDK_EXTYPES_H
 #define __INCLUDE_DDK_EXTYPES_H
@@ -78,7 +78,7 @@ typedef struct _ZONE_ENTRY
 } ZONE_ENTRY, *PZONE_ENTRY;
 
 
-typedef VOID STDCALL
+typedef VOID STDCALL_FUNC
 (*PWORKER_THREAD_ROUTINE)(PVOID Parameter);
 
 typedef struct _WORK_QUEUE_ITEM
@@ -88,12 +88,12 @@ typedef struct _WORK_QUEUE_ITEM
    PVOID Context;
 } WORK_QUEUE_ITEM, *PWORK_QUEUE_ITEM;
 
-typedef PVOID STDCALL
+typedef PVOID STDCALL_FUNC
 (*PALLOCATE_FUNCTION)(POOL_TYPE PoolType,
                      ULONG NumberOfBytes,
                      ULONG Tag);
 
-typedef VOID STDCALL
+typedef VOID STDCALL_FUNC
 (*PFREE_FUNCTION)(PVOID Buffer);
 
 typedef union _SLIST_HEADER
@@ -153,7 +153,7 @@ typedef struct _PAGED_LOOKASIDE_LIST
 
 typedef struct _CALLBACK_OBJECT *PCALLBACK_OBJECT;
 
-typedef VOID STDCALL
+typedef VOID STDCALL_FUNC
 (*PCALLBACK_FUNCTION)(PVOID CallbackContext,
                      PVOID Argument1,
                      PVOID Argument2);
@@ -166,11 +166,11 @@ typedef enum _TRAVERSE_METHOD {
   TraverseMethodPostorder
 } TRAVERSE_METHOD;
 
-typedef LONG STDCALL
+typedef LONG STDCALL_FUNC
 (*PKEY_COMPARATOR)(IN PVOID  Key1,
   IN PVOID  Key2);
 
-typedef BOOLEAN STDCALL
+typedef BOOLEAN STDCALL_FUNC
 (*PTRAVERSE_ROUTINE)(IN PVOID  Context,
   IN PVOID  Key,
   IN PVOID  Value);

diff --git a/reactos/include/ddk/haltypes.h b/reactos/include/ddk/haltypes.h
index 7ce1e74..a434266 100644 (file)
--- a/reactos/include/ddk/haltypes.h
+++ b/reactos/include/ddk/haltypes.h
@@ -1,4 +1,4 @@
-/* $Id: haltypes.h,v 1.7 2002/11/18 22:39:02 ekohl Exp $
+/* $Id: haltypes.h,v 1.8 2002/11/24 18:26:40 robd Exp $
  *
  * COPYRIGHT:                See COPYING in the top level directory
  * PROJECT:                  ReactOS kernel
@@ -302,23 +302,23 @@ typedef struct _BUS_HANDLER *PBUS_HANDLER;
 typedef struct _DEVICE_HANDLER_OBJECT *PDEVICE_HANDLER_OBJECT;
 
 
-typedef BOOLEAN STDCALL
+typedef BOOLEAN STDCALL_FUNC
 (*PHAL_RESET_DISPLAY_PARAMETERS)(ULONG Columns, ULONG Rows);
 
-typedef NTSTATUS STDCALL
+typedef NTSTATUS STDCALL_FUNC
 (*pHalQuerySystemInformation)(IN HAL_QUERY_INFORMATION_CLASS InformationClass,
                              IN ULONG BufferSize,
                              IN OUT PVOID Buffer,
                              OUT PULONG ReturnedLength);
 
 
-typedef NTSTATUS STDCALL
+typedef NTSTATUS STDCALL_FUNC
 (*pHalSetSystemInformation)(IN HAL_SET_INFORMATION_CLASS InformationClass,
                            IN ULONG BufferSize,
                            IN PVOID Buffer);
 
 
-typedef NTSTATUS STDCALL
+typedef NTSTATUS STDCALL_FUNC
 (*pHalQueryBusSlots)(IN PBUS_HANDLER BusHandler,
                     IN ULONG BufferSize,
                     OUT PULONG SlotNumbers,
@@ -361,11 +361,11 @@ typedef struct _DEVICE_CONTROL_CONTEXT
 } DEVICE_CONTROL_CONTEXT, *PDEVICE_CONTROL_CONTEXT;
 
 
-typedef VOID STDCALL
+typedef VOID STDCALL_FUNC
 (*PDEVICE_CONTROL_COMPLETION)(IN PDEVICE_CONTROL_CONTEXT ControlContext);
 
 
-typedef NTSTATUS STDCALL
+typedef NTSTATUS STDCALL_FUNC
 (*pHalDeviceControl)(IN PDEVICE_HANDLER_OBJECT DeviceHandler,
                     IN PDEVICE_OBJECT DeviceObject,
                     IN ULONG ControlCode,

diff --git a/reactos/include/ddk/iotypes.h b/reactos/include/ddk/iotypes.h
index 1426a4e..3bf3fa6 100644 (file)
--- a/reactos/include/ddk/iotypes.h
+++ b/reactos/include/ddk/iotypes.h
@@ -1,4 +1,4 @@
-/* $Id: iotypes.h,v 1.44 2002/11/07 02:44:49 robd Exp $
+/* $Id: iotypes.h,v 1.45 2002/11/24 18:26:40 robd Exp $
  *
  */
 
@@ -62,12 +62,12 @@ typedef struct _SHARE_ACCESS
 
 /* FUNCTION TYPES ************************************************************/
 
-typedef VOID STDCALL
+typedef VOID STDCALL_FUNC
 (*PDRIVER_REINITIALIZE)(struct _DRIVER_OBJECT* DriverObject,
                        PVOID Context,
                        ULONG Count);
 
-typedef NTSTATUS STDCALL
+typedef NTSTATUS STDCALL_FUNC
 (*PIO_QUERY_DEVICE_ROUTINE)(PVOID Context,
                            PUNICODE_STRING Pathname,
                            INTERFACE_TYPE BusType,
@@ -80,12 +80,12 @@ typedef NTSTATUS STDCALL
                            ULONG PeripheralNumber,
                            PKEY_VALUE_FULL_INFORMATION* PI);
 
-typedef NTSTATUS STDCALL
+typedef NTSTATUS STDCALL_FUNC
 (*PIO_COMPLETION_ROUTINE)(struct _DEVICE_OBJECT* DeviceObject,
                          struct _IRP* Irp,
                          PVOID Context);
 
-typedef VOID STDCALL
+typedef VOID STDCALL_FUNC
 (*PIO_APC_ROUTINE)(PVOID ApcContext,
                   struct _IO_STATUS_BLOCK* IoStatusBlock,
                   ULONG Reserved);
@@ -489,14 +489,14 @@ typedef struct _IO_MAILSLOT_CREATE_BUFFER
 /*
  * Driver entry point declaration
  */
-typedef NTSTATUS STDCALL
+typedef NTSTATUS STDCALL_FUNC
 (*PDRIVER_INITIALIZE)(struct _DRIVER_OBJECT* DriverObject,
                      PUNICODE_STRING RegistryPath);
 
 /*
  * Driver cancel declaration
  */
-typedef NTSTATUS STDCALL
+typedef NTSTATUS STDCALL_FUNC
 (*PDRIVER_CANCEL)(struct _DEVICE_OBJECT* DeviceObject,
                  struct _IRP* RegistryPath);
 
@@ -689,7 +689,7 @@ typedef struct _DEVICE_OBJECT
  */
 //typedef NTSTATUS (*PFAST_IO_DISPATCH)(struct _DEVICE_OBJECT*, IRP*);
 //FIXME : this type is ok for read and write, but not for all routines
-typedef BOOLEAN STDCALL
+typedef BOOLEAN STDCALL_FUNC
 (*PFAST_IO_ROUTINE)(IN struct _FILE_OBJECT *FileObject,
                    IN PLARGE_INTEGER FileOffset,
                    IN ULONG Length,
@@ -733,27 +733,27 @@ typedef struct _FAST_IO_DISPATCH {
 /*
  * Dispatch routine type declaration
  */
-typedef NTSTATUS STDCALL
+typedef NTSTATUS STDCALL_FUNC
 (*PDRIVER_DISPATCH)(IN struct _DEVICE_OBJECT *DeviceObject,
                   IN struct _IRP *Irp);
 
 /*
  * StartIo routine type declaration
  */
-typedef VOID STDCALL
+typedef VOID STDCALL_FUNC
 (*PDRIVER_STARTIO)(IN PDEVICE_OBJECT DeviceObject,
                   IN PIRP Irp);
 
 /*
  * Unload routine type declaration
  */
-typedef VOID STDCALL
+typedef VOID STDCALL_FUNC
 (*PDRIVER_UNLOAD)(IN struct _DRIVER_OBJECT *DriverObject);
 
 /*
  * AddDevice routine type declaration
  */
-typedef NTSTATUS STDCALL
+typedef NTSTATUS STDCALL_FUNC
 (*PDRIVER_ADD_DEVICE)(IN struct _DRIVER_OBJECT *DriverObject,
                      IN struct _DEVICE_OBJECT *PhysicalDeviceObject);
 
@@ -813,13 +813,13 @@ typedef struct _CONFIGURATION_INFORMATION
    BOOLEAN AtDiskSecondaryAddressClaimed;
 } CONFIGURATION_INFORMATION, *PCONFIGURATION_INFORMATION;
 
-typedef VOID STDCALL
+typedef VOID STDCALL_FUNC
 (*PIO_DPC_ROUTINE)(PKDPC Dpc,
                   PDEVICE_OBJECT DeviceObject,
                   PIRP Irp,
                   PVOID Context);
 
-typedef VOID STDCALL
+typedef VOID STDCALL_FUNC
 (*PIO_TIMER_ROUTINE)(PDEVICE_OBJECT DeviceObject,
                     PVOID Context);
 
@@ -848,13 +848,13 @@ typedef struct _DRIVER_LAYOUT_INFORMATION
 } DRIVER_LAYOUT_INFORMATION, *PDRIVER_LAYOUT_INFORMATION;
 
 
-typedef IO_ALLOCATION_ACTION STDCALL
+typedef IO_ALLOCATION_ACTION STDCALL_FUNC
 (*PDRIVER_CONTROL)(PDEVICE_OBJECT DeviceObject,
                   PIRP Irp,
                   PVOID MapRegisterBase,
                   PVOID Context);
 #if (_WIN32_WINNT >= 0x0400)
-typedef VOID STDCALL
+typedef VOID STDCALL_FUNC
 (*PFSDNOTIFICATIONPROC)(IN PDEVICE_OBJECT PtrTargetFileSystemDeviceObject,
                        IN BOOLEAN DriverActive);
 #endif // (_WIN32_WINNT >= 0x0400)

diff --git a/reactos/include/ddk/ketypes.h b/reactos/include/ddk/ketypes.h
index abb87b2..be4b6e4 100644 (file)
--- a/reactos/include/ddk/ketypes.h
+++ b/reactos/include/ddk/ketypes.h
@@ -69,28 +69,27 @@ struct _KMUTANT;
 
 typedef LONG KPRIORITY;
 
-typedef VOID STDCALL
-(*PKBUGCHECK_CALLBACK_ROUTINE)(PVOID Buffer,
-                              ULONG Length);
+typedef VOID STDCALL_FUNC
+(*PKBUGCHECK_CALLBACK_ROUTINE)(PVOID Buffer, ULONG Length);
 
-typedef BOOLEAN STDCALL
+typedef BOOLEAN STDCALL_FUNC
 (*PKSYNCHRONIZE_ROUTINE)(PVOID SynchronizeContext);
 
 struct _KAPC;
 
-typedef VOID STDCALL
+typedef VOID STDCALL_FUNC
 (*PKNORMAL_ROUTINE)(PVOID NormalContext,
                    PVOID SystemArgument1,
                    PVOID SystemArgument2);
 
-typedef VOID STDCALL
+typedef VOID STDCALL_FUNC
 (*PKKERNEL_ROUTINE)(struct _KAPC* Apc,
                    PKNORMAL_ROUTINE* NormalRoutine,
                    PVOID* NormalContext,
                    PVOID* SystemArgument1,
                    PVOID* SystemArgument2);
 
-typedef VOID STDCALL
+typedef VOID STDCALL_FUNC
 (*PKRUNDOWN_ROUTINE)(struct _KAPC* Apc);
 
 struct _DISPATCHER_HEADER;
@@ -222,7 +221,7 @@ struct _KDPC;
  *      SystemArgument[1-2] = Undocumented. 
  * 
  */
-typedef VOID STDCALL
+typedef VOID STDCALL_FUNC
 (*PKDEFERRED_ROUTINE)(struct _KDPC* Dpc,
                      PVOID DeferredContext,
                      PVOID SystemArgument1,
@@ -255,11 +254,12 @@ typedef struct _KDEVICE_QUEUE_ENTRY
 
 typedef struct _WAIT_CONTEXT_BLOCK
 {
+    int unknown;
 } WAIT_CONTEXT_BLOCK, *PWAIT_CONTEXT_BLOCK;
 
 struct _KINTERRUPT;
 
-typedef BOOLEAN STDCALL
+typedef BOOLEAN STDCALL_FUNC
 (*PKSERVICE_ROUTINE)(struct _KINTERRUPT* Interrupt,
                     PVOID ServiceContext);
 

diff --git a/reactos/include/ddk/obtypes.h b/reactos/include/ddk/obtypes.h
index 14b470e..f22c241 100644 (file)
--- a/reactos/include/ddk/obtypes.h
+++ b/reactos/include/ddk/obtypes.h
@@ -1,6 +1,6 @@
 #ifndef _INCLUDE_DDK_OBTYPES_H
 #define _INCLUDE_DDK_OBTYPES_H
-/* $Id: obtypes.h,v 1.18 2002/09/08 10:47:45 chorns Exp $ */
+/* $Id: obtypes.h,v 1.19 2002/11/24 18:26:40 robd Exp $ */
 struct _DIRECTORY_OBJECT;
 struct _OBJECT_ATTRIBUTES;
 
@@ -62,24 +62,24 @@ typedef struct _OBJECT_TYPE
    * PURPOSE: Dumps the object
    * NOTE: To be defined
    */
-  VOID STDCALL (*Dump)(VOID);
+  VOID STDCALL_FUNC (*Dump)(VOID);
   
   /*
    * PURPOSE: Opens the object
    * NOTE: To be defined
    */
-  VOID STDCALL (*Open)(VOID);
+  VOID STDCALL_FUNC (*Open)(VOID);
   
    /*
     * PURPOSE: Called to close an object if OkayToClose returns true
     */
-  VOID STDCALL (*Close)(PVOID ObjectBody,
+  VOID STDCALL_FUNC (*Close)(PVOID ObjectBody,
                        ULONG HandleCount);
   
   /*
    * PURPOSE: Called to delete an object when the last reference is removed
    */
-  VOID STDCALL (*Delete)(PVOID ObjectBody);
+  VOID STDCALL_FUNC (*Delete)(PVOID ObjectBody);
   
   /*
    * PURPOSE: Called when an open attempts to open a file apparently
@@ -89,7 +89,7 @@ typedef struct _OBJECT_TYPE
    *     STATUS_UNSUCCESSFUL  NextObject not found
    *     STATUS_REPARSE       Path changed, restart parsing the path
    */
-   NTSTATUS STDCALL (*Parse)(PVOID ParsedObject,
+   NTSTATUS STDCALL_FUNC (*Parse)(PVOID ParsedObject,
                             PVOID *NextObject,
                             PUNICODE_STRING FullPath,
                             PWSTR *Path,
@@ -97,26 +97,26 @@ typedef struct _OBJECT_TYPE
   
    /*
     */
-  NTSTATUS STDCALL (*Security)(PVOID Object,
+  NTSTATUS STDCALL_FUNC (*Security)(PVOID Object,
                               ULONG InfoClass,
                               PVOID Info,
                               PULONG InfoLength);
   
   /*
    */
-  VOID STDCALL (*QueryName)(VOID);
+  VOID STDCALL_FUNC (*QueryName)(VOID);
    
   /*
    * PURPOSE: Called when a process asks to close the object
    */
-  VOID STDCALL (*OkayToClose)(VOID);
+  VOID STDCALL_FUNC (*OkayToClose)(VOID);
   
-  NTSTATUS STDCALL (*Create)(PVOID ObjectBody,
+  NTSTATUS STDCALL_FUNC (*Create)(PVOID ObjectBody,
                             PVOID Parent,
                             PWSTR RemainingPath,
                             struct _OBJECT_ATTRIBUTES* ObjectAttributes);
 
-  VOID STDCALL (*DuplicationNotify)(PEPROCESS DuplicateTo,
+  VOID STDCALL_FUNC (*DuplicationNotify)(PEPROCESS DuplicateTo,
                                    PEPROCESS DuplicateFrom,
                                    PVOID Object);
 } OBJECT_TYPE, *POBJECT_TYPE;

diff --git a/reactos/include/ddk/pnptypes.h b/reactos/include/ddk/pnptypes.h
index 2ba5453..b402bae 100644 (file)
--- a/reactos/include/ddk/pnptypes.h
+++ b/reactos/include/ddk/pnptypes.h
@@ -148,13 +148,13 @@ typedef enum _IO_NOTIFICATION_EVENT_CATEGORY {
 } IO_NOTIFICATION_EVENT_CATEGORY;
 
 // CallbackRoutine for IoRegisterPlugPlayNotification
-typedef NTSTATUS STDCALL
+typedef NTSTATUS STDCALL_FUNC
 (*PDRIVER_NOTIFICATION_CALLBACK_ROUTINE)(
   IN PVOID NotificationStructure,
   IN PVOID Context);
 
 // Callback for IoReportTargetDeviceChangeAsynchronous
-typedef VOID STDCALL
+typedef VOID STDCALL_FUNC
 (*PDEVICE_CHANGE_COMPLETE_CALLBACK)(
   IN PVOID Context);
 

diff --git a/reactos/include/ddk/potypes.h b/reactos/include/ddk/potypes.h
index ee720e7..06ede74 100644 (file)
--- a/reactos/include/ddk/potypes.h
+++ b/reactos/include/ddk/potypes.h
@@ -59,7 +59,7 @@ typedef enum _POWER_STATE_TYPE {
 } POWER_STATE_TYPE, *PPOWER_STATE_TYPE;
 
 // CompletionFunction for PoRequestPowerIrp
-typedef VOID STDCALL
+typedef VOID STDCALL_FUNC
 (*PREQUEST_POWER_COMPLETE) (
   IN struct _DEVICE_OBJECT *DeviceObject,
   IN UCHAR MinorFunction,
@@ -74,8 +74,8 @@ typedef struct _POWER_SEQUENCE {
   ULONG SequenceD3;
 } POWER_SEQUENCE, *PPOWER_SEQUENCE;
 
-typedef VOID STDCALL (*PINTERFACE_REFERENCE)(PVOID Context);
-typedef VOID STDCALL (*PINTERFACE_DEREFERENCE)(PVOID Context);
+typedef VOID STDCALL_FUNC (*PINTERFACE_REFERENCE)(PVOID Context);
+typedef VOID STDCALL_FUNC (*PINTERFACE_DEREFERENCE)(PVOID Context);
 
 typedef struct _INTERFACE {
   USHORT Size;

diff --git a/reactos/include/ddk/pstypes.h b/reactos/include/ddk/pstypes.h
index 9aae408..25113b8 100644 (file)
--- a/reactos/include/ddk/pstypes.h
+++ b/reactos/include/ddk/pstypes.h
@@ -18,13 +18,13 @@ struct _KPROCESS;
 struct _ETHREAD;
 struct _KTHREAD;
 
-typedef NTSTATUS STDCALL (*PKSTART_ROUTINE)(PVOID StartContext);
+typedef NTSTATUS STDCALL_FUNC (*PKSTART_ROUTINE)(PVOID StartContext);
 
-typedef VOID STDCALL (*PCREATE_PROCESS_NOTIFY_ROUTINE)(HANDLE ParentId,
+typedef VOID STDCALL_FUNC (*PCREATE_PROCESS_NOTIFY_ROUTINE)(HANDLE ParentId,
                                                       HANDLE ProcessId,
                                                       BOOLEAN Create);
 
-typedef VOID STDCALL (*PCREATE_THREAD_NOTIFY_ROUTINE)(HANDLE ProcessId,
+typedef VOID STDCALL_FUNC (*PCREATE_THREAD_NOTIFY_ROUTINE)(HANDLE ProcessId,
                                                      HANDLE ThreadId,
                                                      BOOLEAN Create);
 
@@ -49,9 +49,11 @@ extern struct _EPROCESS* EXPORTED PsInitialSystemProcess;
 extern POBJECT_TYPE EXPORTED PsProcessType;
 extern POBJECT_TYPE EXPORTED PsThreadType;
 #else
+#ifdef __GNU__ // robd
 extern struct _EPROCESS* IMPORTED PsInitialSystemProcess;
 extern POBJECT_TYPE IMPORTED PsProcessType;
 extern POBJECT_TYPE IMPORTED PsThreadType;
 #endif
+#endif
 
 #endif /* __INCLUDE_DDK_PSTYPES_H */

diff --git a/reactos/include/ddk/setypes.h b/reactos/include/ddk/setypes.h
index 0b987ff..23a715f 100644 (file)
--- a/reactos/include/ddk/setypes.h
+++ b/reactos/include/ddk/setypes.h
@@ -1,4 +1,4 @@
-/* $Id: setypes.h,v 1.9 2002/09/08 10:47:45 chorns Exp $
+/* $Id: setypes.h,v 1.10 2002/11/24 18:26:40 robd Exp $
  *
  * COPYRIGHT:         See COPYING in the top level directory for details
  * PROJECT:           ReactOS kernel
@@ -156,7 +156,7 @@ typedef struct _SE_EXPORTS
 } SE_EXPORTS, *PSE_EXPORTS;
 
 
-typedef NTSTATUS STDCALL
+typedef NTSTATUS STDCALL_FUNC
 (*PSE_LOGON_SESSION_TERMINATED_ROUTINE)(IN PLUID LogonId);
 
 #endif