From 6b36b1e871b01af52b7491d47cccdc3ad0a7c74c Mon Sep 17 00:00:00 2001
From: Alex Ionescu <aionescu@gmail.com>
Date: Sat, 7 Jan 2006 05:37:22 +0000
Subject: [PATCH] - get mpu401, parallel and ramdrv to work on msvc.

svn path=/trunk/; revision=20648
---
 reactos/drivers/dd/mpu401/mpu401.c     | 10 +++++-----
 reactos/drivers/dd/mpu401/mpu401.h     | 14 +++++++-------
 reactos/drivers/dd/mpu401/portio.c     |  8 ++++----
 reactos/drivers/dd/parallel/parallel.c |  2 +-
 reactos/drivers/dd/ramdrv/ramdrv.c     |  2 +-
 reactos/drivers/lib/bzip2/bzlib.h      |  6 +++---
 6 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/reactos/drivers/dd/mpu401/mpu401.c b/reactos/drivers/dd/mpu401/mpu401.c
index 437841b4e4f..cebd2f3e2b5 100644
--- a/reactos/drivers/dd/mpu401/mpu401.c
+++ b/reactos/drivers/dd/mpu401/mpu401.c
@@ -23,7 +23,7 @@
 
 /* INTERNAL VARIABLES ******************************************************/
 
-UINT DeviceCount = 0;
+ULONG DeviceCount = 0;
 
 
 /* FUNCTIONS ***************************************************************/
@@ -205,7 +205,7 @@ MPU401Cleanup(PDEVICE_OBJECT DeviceObject,
  * RETURNS: Success or failure
  */
 {
-  UINT Channel;
+  ULONG Channel;
   DPRINT("MPU401Cleanup() called!\n");
 
     // Reset the device (should we do this?)
@@ -240,8 +240,8 @@ MPU401DeviceControl(PDEVICE_OBJECT DeviceObject,
 {
     PIO_STACK_LOCATION Stack;
     PDEVICE_EXTENSION DeviceExtension;
-    UINT ByteCount;
-    PBYTE Data;
+    ULONG ByteCount;
+    PUCHAR Data;
 
     DPRINT("MPU401DeviceControl() called!\n");
 
@@ -256,7 +256,7 @@ MPU401DeviceControl(PDEVICE_OBJECT DeviceObject,
         case IOCTL_MIDI_PLAY :
         {
             DPRINT("Received IOCTL_MIDI_PLAY\n");
-            Data = (PBYTE) Irp->AssociatedIrp.SystemBuffer;
+            Data = (PUCHAR) Irp->AssociatedIrp.SystemBuffer;
 
             DPRINT("Sending %d bytes of MIDI data to 0x%d:\n", Stack->Parameters.DeviceIoControl.InputBufferLength, DeviceExtension->Port);
 
diff --git a/reactos/drivers/dd/mpu401/mpu401.h b/reactos/drivers/dd/mpu401/mpu401.h
index 21aa13bf408..1802626bbf1 100644
--- a/reactos/drivers/dd/mpu401/mpu401.h
+++ b/reactos/drivers/dd/mpu401/mpu401.h
@@ -85,8 +85,8 @@ typedef struct _DEVICE_EXTENSION
 {
     PUNICODE_STRING RegistryPath;
     PDRIVER_OBJECT DriverObject;
-    UINT Port;
-    UINT IRQ;
+    ULONG Port;
+    ULONG IRQ;
 //  KDPC Dpc;
 //  KTIMER Timer;
 //  KEVENT Event;
@@ -110,8 +110,8 @@ typedef struct _DEVICE_INSTANCE
 
 //typedef struct _CONFIG
 //{
-//    UINT Port;
-//    UINT IRQ;
+//    ULONG Port;
+//    ULONG IRQ;
 //} CONFIG, *PCONFIG;
 
 /*
@@ -126,9 +126,9 @@ typedef REGISTRY_CALLBACK_ROUTINE *PREGISTRY_CALLBACK_ROUTINE;
     Prototypes for functions in portio.c :
 */
 
-BOOLEAN WaitToSend(UINT BasePort);
-BOOLEAN WaitToReceive(UINT BasePort);
-BOOLEAN InitUARTMode(UINT BasePort);
+BOOLEAN WaitToSend(ULONG BasePort);
+BOOLEAN WaitToReceive(ULONG BasePort);
+BOOLEAN InitUARTMode(ULONG BasePort);
 
 /*
     Prototypes for functions in settings.c :
diff --git a/reactos/drivers/dd/mpu401/portio.c b/reactos/drivers/dd/mpu401/portio.c
index 94a9aca500e..5f540c43eda 100644
--- a/reactos/drivers/dd/mpu401/portio.c
+++ b/reactos/drivers/dd/mpu401/portio.c
@@ -13,7 +13,7 @@
 #include "mpu401.h"
 
 
-BOOLEAN WaitToSend(UINT BasePort)
+BOOLEAN WaitToSend(ULONG BasePort)
 {
     int TimeOut;
 
@@ -37,7 +37,7 @@ BOOLEAN WaitToSend(UINT BasePort)
 }
 
 
-BOOLEAN WaitToReceive(UINT BasePort)
+BOOLEAN WaitToReceive(ULONG BasePort)
 {
     int TimeOut;
 
@@ -61,9 +61,9 @@ BOOLEAN WaitToReceive(UINT BasePort)
 }
 
 
-BOOLEAN InitUARTMode(UINT BasePort)
+BOOLEAN InitUARTMode(ULONG BasePort)
 {
-    UINT TimeOut;
+    ULONG TimeOut;
     UCHAR Status = 0;
 
     DbgPrint("InitUARTMode() called\n");
diff --git a/reactos/drivers/dd/parallel/parallel.c b/reactos/drivers/dd/parallel/parallel.c
index ecf1228e32c..41f5af36fd4 100644
--- a/reactos/drivers/dd/parallel/parallel.c
+++ b/reactos/drivers/dd/parallel/parallel.c
@@ -83,7 +83,7 @@ Dispatch(PDEVICE_OBJECT DeviceObject, PIRP Irp)
 {
    PIO_STACK_LOCATION Stack = IoGetCurrentIrpStackLocation(Irp);
    NTSTATUS status;
-   UINT i;
+   ULONG i;
 
    switch (Stack->MajorFunction)
      {
diff --git a/reactos/drivers/dd/ramdrv/ramdrv.c b/reactos/drivers/dd/ramdrv/ramdrv.c
index 5e2e0b675c7..57f1b7a0fe2 100644
--- a/reactos/drivers/dd/ramdrv/ramdrv.c
+++ b/reactos/drivers/dd/ramdrv/ramdrv.c
@@ -98,7 +98,7 @@ NTSTATUS STDCALL DriverEntry(IN PDRIVER_OBJECT DriverObject,
   void *tbuff;
   unsigned int dstlen = 1024 * 1440;
   FILE_STANDARD_INFORMATION finfo;
-  DWORD err;
+  ULONG err;
 
   DPRINT("Ramdisk driver\n");
 
diff --git a/reactos/drivers/lib/bzip2/bzlib.h b/reactos/drivers/lib/bzip2/bzlib.h
index d33a768568f..0d8fd6b77e9 100644
--- a/reactos/drivers/lib/bzip2/bzlib.h
+++ b/reactos/drivers/lib/bzip2/bzlib.h
@@ -308,9 +308,9 @@ BZ_EXTERN const char * BZ_API(BZ2_bzerror) (
    );
 #endif
 
-extern _stdcall void *(*BZ2_malloc)( unsigned long size );
-extern _stdcall void (*BZ2_free)( void *ptr );
-_stdcall void BZ2_set_malloc_free( _stdcall void *(*malloc)(unsigned long size), _stdcall void (*free)(void *ptr) );
+extern void *(_stdcall *BZ2_malloc)( unsigned long size );
+extern void (*_stdcall BZ2_free)( void *ptr );
+void _stdcall BZ2_set_malloc_free(  void *(_stdcall *malloc)(unsigned long size), void (_stdcall *free)(void *ptr) );
 
 #ifdef __cplusplus
 }
-- 
2.17.1