- RamdiskWorkerThread: Don't return IoCompleteRequest as we return void (IoCompleteRe...
authorStefan Ginsberg <stefanginsberg@gmail.com>
Sat, 25 Jul 2009 20:24:50 +0000 (20:24 +0000)
committerStefan Ginsberg <stefanginsberg@gmail.com>
Sat, 25 Jul 2009 20:24:50 +0000 (20:24 +0000)
- Fix calling convention declaration for scsi function prototypes

svn path=/trunk/; revision=42219

reactos/drivers/storage/class/ramdisk/ramdisk.c
reactos/include/ddk/scsiwmi.h
reactos/include/ddk/srb.h

index 9d28c4c..9cf36bd 100644 (file)
@@ -1012,7 +1012,8 @@ RamdiskWorkerThread(IN PDEVICE_OBJECT DeviceObject,
         IoReleaseRemoveLock(&DeviceExtension->RemoveLock, Irp);
         Irp->IoStatus.Status = Status;
         Irp->IoStatus.Information = 0;
-        return IoCompleteRequest(Irp, IO_DISK_INCREMENT);
+        IoCompleteRequest(Irp, IO_DISK_INCREMENT);
+        return;
     }
     
     //
@@ -1020,7 +1021,8 @@ RamdiskWorkerThread(IN PDEVICE_OBJECT DeviceObject,
     //
     Irp->IoStatus.Status = Status;
     Irp->IoStatus.Information = 0;
-    return IoCompleteRequest(Irp, IO_NO_INCREMENT);
+    IoCompleteRequest(Irp, IO_NO_INCREMENT);
+    return;
 }
 
 NTSTATUS
index feff725..c599f48 100644 (file)
@@ -60,14 +60,14 @@ typedef struct _SCSIWMIGUIDREGINFO {
   ULONG  Flags;
 } SCSIWMIGUIDREGINFO, *PSCSIWMIGUIDREGINFO;
 
-typedef UCHAR DDKAPI
-(*PSCSIWMI_QUERY_REGINFO)(
+typedef UCHAR
+(DDKAPI *PSCSIWMI_QUERY_REGINFO)(
        IN PVOID  DeviceContext,
        IN PSCSIWMI_REQUEST_CONTEXT  RequestContext,
        OUT PWCHAR  *MofResourceName);
 
-typedef BOOLEAN DDKAPI
-(*PSCSIWMI_QUERY_DATABLOCK)(
+typedef BOOLEAN
+(DDKAPI *PSCSIWMI_QUERY_DATABLOCK)(
   IN PVOID  Context,
   IN PSCSIWMI_REQUEST_CONTEXT  DispatchContext,
   IN ULONG  GuidIndex,
@@ -77,8 +77,8 @@ typedef BOOLEAN DDKAPI
   IN ULONG  BufferAvail,
   OUT PUCHAR  Buffer);
 
-typedef BOOLEAN DDKAPI
-(*PSCSIWMI_SET_DATABLOCK)(
+typedef BOOLEAN
+(DDKAPI *PSCSIWMI_SET_DATABLOCK)(
   IN PVOID  DeviceContext,
   IN PSCSIWMI_REQUEST_CONTEXT  RequestContext,
   IN ULONG  GuidIndex,
@@ -86,8 +86,8 @@ typedef BOOLEAN DDKAPI
   IN ULONG  BufferSize,
   IN PUCHAR  Buffer);
 
-typedef BOOLEAN DDKAPI
-(*PSCSIWMI_SET_DATAITEM)(
+typedef BOOLEAN
+(DDKAPI *PSCSIWMI_SET_DATAITEM)(
   IN PVOID  DeviceContext,
   IN PSCSIWMI_REQUEST_CONTEXT  RequestContext,
   IN ULONG  GuidIndex,
@@ -96,8 +96,8 @@ typedef BOOLEAN DDKAPI
   IN ULONG  BufferSize,
   IN PUCHAR  Buffer);
 
-typedef BOOLEAN DDKAPI
-(*PSCSIWMI_EXECUTE_METHOD)(
+typedef BOOLEAN
+(DDKAPI *PSCSIWMI_EXECUTE_METHOD)(
   IN PVOID  DeviceContext,
   IN PSCSIWMI_REQUEST_CONTEXT  RequestContext,
   IN ULONG  GuidIndex,
@@ -112,8 +112,8 @@ typedef enum _SCSIWMI_ENABLE_DISABLE_CONTROL {
        ScsiWmiDataBlockControl
 } SCSIWMI_ENABLE_DISABLE_CONTROL;
 
-typedef BOOLEAN DDKAPI
-(*PSCSIWMI_FUNCTION_CONTROL)(
+typedef BOOLEAN
+(DDKAPI *PSCSIWMI_FUNCTION_CONTROL)(
   IN PVOID  DeviceContext,
   IN PSCSIWMI_REQUEST_CONTEXT  RequestContext,
   IN ULONG  GuidIndex,
index 468cbb2..5ec2093 100644 (file)
@@ -300,14 +300,14 @@ typedef struct _SCSI_SUPPORTED_CONTROL_TYPE_LIST {
        BOOLEAN SupportedTypeList[0];
 } SCSI_SUPPORTED_CONTROL_TYPE_LIST, *PSCSI_SUPPORTED_CONTROL_TYPE_LIST;
 
-typedef SCSI_ADAPTER_CONTROL_STATUS DDKAPI
-(*PHW_ADAPTER_CONTROL)(
+typedef SCSI_ADAPTER_CONTROL_STATUS
+(DDKAPI *PHW_ADAPTER_CONTROL)(
        IN PVOID DeviceExtension,
        IN SCSI_ADAPTER_CONTROL_TYPE ControlType,
        IN PVOID Parameters);
 
-typedef BOOLEAN DDKAPI
-(*PHW_ADAPTER_STATE)(
+typedef BOOLEAN
+(DDKAPI *PHW_ADAPTER_STATE)(
        IN PVOID DeviceExtension,
        IN PVOID Context,
        IN BOOLEAN SaveState);
@@ -317,8 +317,8 @@ typedef BOOLEAN DDKAPI
 #define SP_RETURN_ERROR                   2
 #define SP_RETURN_BAD_CONFIG              3
 
-typedef ULONG DDKAPI
-(*PHW_FIND_ADAPTER)(
+typedef ULONG
+(DDKAPI *PHW_FIND_ADAPTER)(
        IN PVOID DeviceExtension,
        IN PVOID HwContext,
        IN PVOID BusInformation,
@@ -326,30 +326,30 @@ typedef ULONG DDKAPI
        IN OUT PPORT_CONFIGURATION_INFORMATION ConfigInfo,
        OUT PBOOLEAN Again);
 
-typedef BOOLEAN DDKAPI
-(*PHW_INITIALIZE)(
+typedef BOOLEAN
+(DDKAPI *PHW_INITIALIZE)(
   IN PVOID DeviceExtension);
 
-typedef BOOLEAN DDKAPI
-(*PHW_INTERRUPT)(
+typedef BOOLEAN
+(DDKAPI *PHW_INTERRUPT)(
   IN PVOID DeviceExtension);
 
-typedef BOOLEAN DDKAPI
-(*PHW_RESET_BUS)(
+typedef BOOLEAN
+(DDKAPI *PHW_RESET_BUS)(
   IN PVOID DeviceExtension,
   IN ULONG PathId);
 
-typedef VOID DDKAPI
-(*PHW_DMA_STARTED)(
+typedef VOID
+(DDKAPI *PHW_DMA_STARTED)(
   IN PVOID DeviceExtension);
 
-typedef BOOLEAN DDKAPI
-(*PHW_STARTIO)(
+typedef BOOLEAN
+(DDKAPI *PHW_STARTIO)(
   IN PVOID DeviceExtension,
   IN PSCSI_REQUEST_BLOCK Srb);
 
-typedef VOID DDKAPI
-(*PHW_TIMER)(
+typedef VOID
+(DDKAPI *PHW_TIMER)(
   IN PVOID DeviceExtension);
 
 typedef struct _HW_INITIALIZATION_DATA {