- Fixed declaration of DRIVER_OBJECT and friends.

reactos/drivers/input/sermouse

diff -u -r1.16 -r1.17
--- sermouse.c	19 Feb 2004 17:54:05 -0000	1.16
+++ sermouse.c	12 Mar 2004 19:40:40 -0000	1.17
@@ -247,7 +247,7 @@

 	return TRUE;
 }
 

-VOID STDCALL

+NTSTATUS STDCALL

 SerialMouseStartIo(PDEVICE_OBJECT DeviceObject, PIRP Irp)
 {
 	PDEVICE_EXTENSION DeviceExtension = DeviceObject->DeviceExtension;

@@ -270,6 +270,8 @@

 			IoStartNextPacket (DeviceObject, FALSE);
 		}
 	}

+
+	return STATUS_SUCCESS;

 }
 
 NTSTATUS STDCALL

@@ -652,9 +654,9 @@

 		return STATUS_UNSUCCESSFUL;
 	}
 

-	DriverObject->MajorFunction[IRP_MJ_CREATE] = (PDRIVER_DISPATCH)SerialMouseDispatch;
-	DriverObject->MajorFunction[IRP_MJ_CLOSE] = (PDRIVER_DISPATCH)SerialMouseDispatch;
-	DriverObject->MajorFunction[IRP_MJ_INTERNAL_DEVICE_CONTROL] = (PDRIVER_DISPATCH)SerialMouseInternalDeviceControl;

+	DriverObject->MajorFunction[IRP_MJ_CREATE] = SerialMouseDispatch;
+	DriverObject->MajorFunction[IRP_MJ_CLOSE] = SerialMouseDispatch;
+	DriverObject->MajorFunction[IRP_MJ_INTERNAL_DEVICE_CONTROL] = SerialMouseInternalDeviceControl;

 	DriverObject->DriverStartIo = SerialMouseStartIo;
 
 	return STATUS_SUCCESS;

reactos/w32api/include/ddk

diff -u -r1.2 -r1.3
--- winddk.h	2 Mar 2004 16:49:22 -0000	1.2
+++ winddk.h	12 Mar 2004 19:40:40 -0000	1.3
@@ -428,100 +428,100 @@

   DeallocateObjectKeepRegisters
 } IO_ALLOCATION_ACTION, *PIO_ALLOCATION_ACTION;
 

-typedef IO_ALLOCATION_ACTION DDKAPI
-(*PDRIVER_CONTROL)(

+typedef IO_ALLOCATION_ACTION
+(DDKAPI *PDRIVER_CONTROL)(

   IN struct _DEVICE_OBJECT  *DeviceObject,
   IN struct _IRP  *Irp,
   IN PVOID  MapRegisterBase,
   IN PVOID  Context);
 

-typedef VOID DDKAPI
-(*PDRIVER_LIST_CONTROL)(

+typedef VOID
+(DDKAPI *PDRIVER_LIST_CONTROL)(

   IN struct _DEVICE_OBJECT  *DeviceObject,
   IN struct _IRP  *Irp,
   IN struct _SCATTER_GATHER_LIST  *ScatterGather,
   IN PVOID  Context);
 

-typedef NTSTATUS DDKAPI
-(*PDRIVER_ADD_DEVICE)(

+typedef NTSTATUS
+(DDKAPI *PDRIVER_ADD_DEVICE)(

   IN struct _DRIVER_OBJECT  *DriverObject,
   IN struct _DEVICE_OBJECT  *PhysicalDeviceObject);
 

-typedef NTSTATUS DDKAPI
-(*PIO_COMPLETION_ROUTINE)(

+typedef NTSTATUS
+(DDKAPI *PIO_COMPLETION_ROUTINE)(

   IN struct _DEVICE_OBJECT  *DeviceObject,
   IN struct _IRP  *Irp,
   IN PVOID  Context);
 

-typedef VOID DDKAPI
-(*PDRIVER_CANCEL)(

+typedef VOID
+(DDKAPI *PDRIVER_CANCEL)(

   IN struct _DEVICE_OBJECT  *DeviceObject,
   IN struct _IRP  *Irp);
 

-typedef VOID DDKAPI
-(*PKDEFERRED_ROUTINE)(

+typedef VOID
+(DDKAPI *PKDEFERRED_ROUTINE)(

   IN struct _KDPC  *Dpc,
   IN PVOID  DeferredContext,
   IN PVOID  SystemArgument1,
   IN PVOID  SystemArgument2);
 

-typedef NTSTATUS DDKAPI
-(*PDRIVER_DISPATCH)(

+typedef NTSTATUS
+(DDKAPI *PDRIVER_DISPATCH)(

   IN struct _DEVICE_OBJECT  *DeviceObject,
   IN struct _IRP  *Irp);
 

-typedef VOID DDKAPI
-(*PIO_DPC_ROUTINE)(

+typedef VOID
+(DDKAPI *PIO_DPC_ROUTINE)(

   IN struct _KDPC  *Dpc,
   IN struct _DEVICE_OBJECT  *DeviceObject,
   IN struct _IRP  *Irp,
   IN PVOID  Context);
 

-typedef NTSTATUS DDKAPI
-(*PMM_DLL_INITIALIZE)(

+typedef NTSTATUS
+(DDKAPI *PMM_DLL_INITIALIZE)(

   IN PUNICODE_STRING  RegistryPath);
 

-typedef NTSTATUS DDKAPI
-(*PMM_DLL_UNLOAD)(

+typedef NTSTATUS
+(DDKAPI *PMM_DLL_UNLOAD)(

   VOID);
 

-typedef NTSTATUS DDKAPI
-(*PDRIVER_ENTRY)( 

+typedef NTSTATUS
+(DDKAPI *PDRIVER_ENTRY)( 

   IN struct _DRIVER_OBJECT  *DriverObject, 
   IN PUNICODE_STRING  RegistryPath); 
 

-typedef NTSTATUS DDKAPI
-(*PDRIVER_INITIALIZE)(

+typedef NTSTATUS
+(DDKAPI *PDRIVER_INITIALIZE)(

   IN struct _DRIVER_OBJECT  *DriverObject, 
   IN PUNICODE_STRING  RegistryPath);
 

-typedef BOOLEAN DDKAPI
-(*PKSERVICE_ROUTINE)(

+typedef BOOLEAN
+(DDKAPI *PKSERVICE_ROUTINE)(

   IN struct _KINTERRUPT  *Interrupt,
   IN PVOID  ServiceContext);
 

-typedef VOID DDKAPI
-(*PIO_TIMER_ROUTINE)(

+typedef VOID
+(DDKAPI *PIO_TIMER_ROUTINE)(

   IN struct _DEVICE_OBJECT  *DeviceObject,
   IN PVOID  Context);
 

-typedef VOID DDKAPI
-(*PDRIVER_REINITIALIZE)( 

+typedef VOID
+(DDKAPI *PDRIVER_REINITIALIZE)( 

   IN struct _DRIVER_OBJECT  *DriverObject, 
   IN PVOID  Context, 
   IN ULONG  Count); 
 

-typedef NTSTATUS DDKAPI
-(*PDRIVER_STARTIO)(

+typedef NTSTATUS
+(DDKAPI *PDRIVER_STARTIO)(

   IN struct _DEVICE_OBJECT  *DeviceObject,
   IN struct _IRP  *Irp);
 

-typedef BOOLEAN DDKAPI
-(*PKSYNCHRONIZE_ROUTINE)(

+typedef BOOLEAN
+(DDKAPI *PKSYNCHRONIZE_ROUTINE)(

   IN PVOID  SynchronizeContext);
 

-typedef VOID DDKAPI
-(*PDRIVER_UNLOAD)( 

+typedef VOID
+(DDKAPI *PDRIVER_UNLOAD)( 

   IN struct _DRIVER_OBJECT  *DriverObject); 
 
 

@@ -2331,7 +2331,6 @@

   PFAST_IO_RELEASE_FOR_CCFLUSH  ReleaseForCcFlush;
 } FAST_IO_DISPATCH, *PFAST_IO_DISPATCH;
 

-/* NOTE: PVOID for methods to avoid 'assignment from incompatible pointer type' warning */

 typedef struct _DRIVER_OBJECT {
   CSHORT  Type;
   CSHORT  Size;

@@ -2343,11 +2342,11 @@

   PDRIVER_EXTENSION  DriverExtension;
   UNICODE_STRING  DriverName;
   PUNICODE_STRING  HardwareDatabase;

-  PVOID  FastIoDispatch;
-  PVOID  DriverInit;
-  PVOID  DriverStartIo;
-  PVOID  DriverUnload;
-  PVOID  MajorFunction[IRP_MJ_MAXIMUM_FUNCTION + 1];

+  PFAST_IO_DISPATCH  FastIoDispatch;
+  PDRIVER_INITIALIZE  DriverInit;
+  PDRIVER_STARTIO  DriverStartIo;
+  PDRIVER_UNLOAD  DriverUnload;
+  PDRIVER_DISPATCH  MajorFunction[IRP_MJ_MAXIMUM_FUNCTION + 1];

 } DRIVER_OBJECT;
 typedef struct _DRIVER_OBJECT *PDRIVER_OBJECT;
 

@@ -3703,6 +3702,7 @@

 #define LOW_LEVEL                          0
 #define APC_LEVEL                          1
 #define DISPATCH_LEVEL                     2

+#define SYNCH_LEVEL                       27

 #define PROFILE_LEVEL                     27
 #define CLOCK1_LEVEL                      28
 #define CLOCK2_LEVEL                      28

@@ -5790,8 +5790,6 @@

   IN PUSHORT  Register,
   IN USHORT  Value);
 

-
-

 /** I/O manager routines **/
 
 NTOSAPI

@@ -7318,12 +7316,6 @@

   VOID);
 
 NTOSAPI

-VOID
-DDKAPI
-KeLowerIrql(
-  IN KIRQL  NewIrql);
-
-NTOSAPI

 NTSTATUS
 DDKAPI
 KePulseEvent(

@@ -7368,19 +7360,6 @@

   VOID);
 
 NTOSAPI

-VOID
-DDKAPI
-KeRaiseIrql(
-  IN KIRQL  NewIrql,
-  OUT PKIRQL  OldIrql);
-
-NTOSAPI
-KIRQL
-DDKAPI
-KeRaiseIrqlToDpcLevel(
-  VOID);
-
-NTOSAPI

 LONG
 DDKAPI
 KeReadStateEvent(

@@ -7606,7 +7585,44 @@

   IN BOOLEAN  Alertable,
   IN PLARGE_INTEGER  Timeout  OPTIONAL);
 

+#if defined(_X86_)
+
+NTOSAPI
+VOID
+FASTCALL
+KfLowerIrql(
+  IN KIRQL  NewIrql);
+
+NTOSAPI
+KIRQL
+FASTCALL
+KfRaiseIrql(
+  IN KIRQL  NewIrql);
+
+#define KeLowerIrql(a) KfLowerIrql(a)
+#define KeRaiseIrql(a,b) *(b) = KfRaiseIrql(a)

+#else
+
+NTOSAPI
+VOID
+DDKAPI
+KeLowerIrql(
+  IN KIRQL  NewIrql);
+
+NTOSAPI
+KIRQL
+DDKAPI
+KeRaiseIrql(
+  IN KIRQL  NewIrql);
+
+#endif
+
+NTOSAPI
+KIRQL
+DDKAPI
+KeRaiseIrqlToDpcLevel(
+  VOID);

 
 /** Memory manager routines **/