From: Alex Ionescu <aionescu@gmail.com>
Date: Sat, 7 Jan 2006 21:55:47 +0000 (+0000)
Subject: disk, diskdump, pciidex, scsiport.
X-Git-Tag: backups/expat-rbuild@40467~482
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=9611be1fd46c29954cdcc09269c0810b894c2e13

disk, diskdump, pciidex, scsiport.

svn path=/trunk/; revision=20675
---

diff --git a/reactos/drivers/storage/disk/disk.c b/reactos/drivers/storage/disk/disk.c
index 98f9454d954..58e2b2e20e9 100644
--- a/reactos/drivers/storage/disk/disk.c
+++ b/reactos/drivers/storage/disk/disk.c
@@ -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
diff --git a/reactos/drivers/storage/diskdump/diskdump.c b/reactos/drivers/storage/diskdump/diskdump.c
index 13b92f48684..732d41c1e65 100644
--- a/reactos/drivers/storage/diskdump/diskdump.c
+++ b/reactos/drivers/storage/diskdump/diskdump.c
@@ -367,9 +367,9 @@ DiskDumpPrepare(PDEVICE_OBJECT DeviceObject, PDUMP_POINTERS DumpPointers)
 	    }
 	  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);
diff --git a/reactos/drivers/storage/pciidex/miniport.c b/reactos/drivers/storage/pciidex/miniport.c
index e43ffc210d7..346499a4510 100644
--- a/reactos/drivers/storage/pciidex/miniport.c
+++ b/reactos/drivers/storage/pciidex/miniport.c
@@ -98,7 +98,7 @@ PciIdeXSetBusData(
 	IN ULONG BufferLength)
 {
 	PFDO_DEVICE_EXTENSION FdoDeviceExtension;
-	PBYTE CurrentBuffer = NULL;
+	PUCHAR CurrentBuffer = NULL;
 	ULONG i, BytesWritten;
 	NTSTATUS Status;
 
@@ -117,7 +117,7 @@ PciIdeXSetBusData(
 		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)
diff --git a/reactos/drivers/storage/pciidex/pciidex.h b/reactos/drivers/storage/pciidex/pciidex.h
index c50988781c0..77f732d4e55 100644
--- a/reactos/drivers/storage/pciidex/pciidex.h
+++ b/reactos/drivers/storage/pciidex/pciidex.h
@@ -1,5 +1,5 @@
-#include <ntddk.h>
 #include <ntifs.h>
+#include <ntddk.h>
 #include <ide.h>
 #include <wdmguid.h>
 #include <stdio.h>
@@ -34,7 +34,7 @@ typedef struct _FDO_DEVICE_EXTENSION
 	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
diff --git a/reactos/drivers/storage/scsiport/scsiport.c b/reactos/drivers/storage/scsiport/scsiport.c
index a830581be53..ba40a53fc8b 100644
--- a/reactos/drivers/storage/scsiport/scsiport.c
+++ b/reactos/drivers/storage/scsiport/scsiport.c
@@ -35,6 +35,7 @@
 #include <ntddstor.h>
 #include <ntdddisk.h>
 #include <stdio.h>
+#include <stdarg.h>
 
 #define NDEBUG
 #include <debug.h>
diff --git a/reactos/drivers/storage/scsiport/scsiport_int.h b/reactos/drivers/storage/scsiport/scsiport_int.h
index 5091027ea93..0caa511af2d 100644
--- a/reactos/drivers/storage/scsiport/scsiport_int.h
+++ b/reactos/drivers/storage/scsiport/scsiport_int.h
@@ -130,7 +130,7 @@ typedef struct _SCSI_PORT_SCAN_ADAPTER
   ULONG Target;
   SCSI_REQUEST_BLOCK Srb;
   UCHAR DataBuffer[256];
-  BOOL Active;
+  BOOLEAN Active;
 } SCSI_PORT_SCAN_ADAPTER, *PSCSI_PORT_SCAN_ADAPTER;