disk, diskdump, pciidex, scsiport.

Modified: trunk/reactos/drivers/storage/disk/disk.c
Modified: trunk/reactos/drivers/storage/diskdump/diskdump.c
Modified: trunk/reactos/drivers/storage/pciidex/miniport.c
Modified: trunk/reactos/drivers/storage/pciidex/pciidex.h
Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c
Modified: trunk/reactos/drivers/storage/scsiport/scsiport_int.h

--- trunk/reactos/drivers/storage/disk/disk.c	2006-01-07 21:53:47 UTC (rev 20674)
+++ trunk/reactos/drivers/storage/disk/disk.c	2006-01-07 21:55:47 UTC (rev 20675)
@@ -41,6 +41,7 @@

 
 #define SCSI_DISK_TIMEOUT	10	/* Default timeout: 10 seconds */
 #define MODE_DATA_SIZE		192

+#define MAX_PATH            260

 
 
 typedef struct _DISK_DATA

--- trunk/reactos/drivers/storage/diskdump/diskdump.c	2006-01-07 21:53:47 UTC (rev 20674)
+++ trunk/reactos/drivers/storage/diskdump/diskdump.c	2006-01-07 21:55:47 UTC (rev 20675)
@@ -367,9 +367,9 @@

 	    }
 	  else // hint-name
 	    {

-	      Name = (PCHAR)((DWORD)DriverBase +

+	      Name = (PCHAR)((ULONG)DriverBase +

 			      *FunctionNameList + 2);

-	      Hint = *(PWORD)((DWORD)DriverBase + *FunctionNameList);

+	      Hint = *(PUSHORT)((ULONG)DriverBase + *FunctionNameList);

 	    }
 #if 0
 	  DPRINT("  Hint:%04x  Name:%s\n", Hint, pName);

--- trunk/reactos/drivers/storage/pciidex/miniport.c	2006-01-07 21:53:47 UTC (rev 20674)
+++ trunk/reactos/drivers/storage/pciidex/miniport.c	2006-01-07 21:55:47 UTC (rev 20675)
@@ -98,7 +98,7 @@

 	IN ULONG BufferLength)
 {
 	PFDO_DEVICE_EXTENSION FdoDeviceExtension;

-	PBYTE CurrentBuffer = NULL;

+	PUCHAR CurrentBuffer = NULL;

 	ULONG i, BytesWritten;
 	NTSTATUS Status;
 
@@ -117,7 +117,7 @@

 		goto cleanup;
 
 	for (i = 0; i < BufferLength; i++)

-		CurrentBuffer[i] = (CurrentBuffer[i] & ~((PBYTE)DataMask)[i]) | (((PBYTE)DataMask)[i] & ((PBYTE)Buffer)[i]);

+		CurrentBuffer[i] = (CurrentBuffer[i] & ~((PUCHAR)DataMask)[i]) | (((PUCHAR)DataMask)[i] & ((PUCHAR)Buffer)[i]);

 
 	FdoDeviceExtension = CONTAINING_RECORD(DeviceExtension, FDO_DEVICE_EXTENSION, MiniControllerExtension);
 	if (!FdoDeviceExtension->BusInterface)

--- trunk/reactos/drivers/storage/pciidex/pciidex.h	2006-01-07 21:53:47 UTC (rev 20674)
+++ trunk/reactos/drivers/storage/pciidex/pciidex.h	2006-01-07 21:55:47 UTC (rev 20675)
@@ -1,5 +1,5 @@

+#include <ntifs.h>

 #include <ntddk.h>

-#include <ntifs.h>

 #include <ide.h>
 #include <wdmguid.h>
 #include <stdio.h>
@@ -34,7 +34,7 @@

 	PDEVICE_OBJECT Pdo[MAX_IDE_CHANNEL];
 	USHORT VendorId;
 	USHORT DeviceId;

-	PBYTE MiniControllerExtension[0];

+	PUCHAR MiniControllerExtension[0];

 } FDO_DEVICE_EXTENSION, *PFDO_DEVICE_EXTENSION;
 
 typedef struct _PDO_DEVICE_EXTENSION

--- trunk/reactos/drivers/storage/scsiport/scsiport.c	2006-01-07 21:53:47 UTC (rev 20674)
+++ trunk/reactos/drivers/storage/scsiport/scsiport.c	2006-01-07 21:55:47 UTC (rev 20675)
@@ -35,6 +35,7 @@

 #include <ntddstor.h>
 #include <ntdddisk.h>
 #include <stdio.h>

+#include <stdarg.h>

 
 #define NDEBUG
 #include <debug.h>

--- trunk/reactos/drivers/storage/scsiport/scsiport_int.h	2006-01-07 21:53:47 UTC (rev 20674)
+++ trunk/reactos/drivers/storage/scsiport/scsiport_int.h	2006-01-07 21:55:47 UTC (rev 20675)
@@ -130,7 +130,7 @@

   ULONG Target;
   SCSI_REQUEST_BLOCK Srb;
   UCHAR DataBuffer[256];

-  BOOL Active;

+  BOOLEAN Active;

 } SCSI_PORT_SCAN_ADAPTER, *PSCSI_PORT_SCAN_ADAPTER;