- get mpu401, parallel and ramdrv to work on msvc.

Modified: trunk/reactos/drivers/dd/mpu401/mpu401.c
Modified: trunk/reactos/drivers/dd/mpu401/mpu401.h
Modified: trunk/reactos/drivers/dd/mpu401/portio.c
Modified: trunk/reactos/drivers/dd/parallel/parallel.c
Modified: trunk/reactos/drivers/dd/ramdrv/ramdrv.c
Modified: trunk/reactos/drivers/lib/bzip2/bzlib.h

--- trunk/reactos/drivers/dd/mpu401/mpu401.c	2006-01-07 05:23:59 UTC (rev 20647)
+++ trunk/reactos/drivers/dd/mpu401/mpu401.c	2006-01-07 05:37:22 UTC (rev 20648)
@@ -23,7 +23,7 @@

 
 /* INTERNAL VARIABLES ******************************************************/
 

-UINT DeviceCount = 0;

+ULONG DeviceCount = 0;

 
 
 /* FUNCTIONS ***************************************************************/
@@ -205,7 +205,7 @@

  * RETURNS: Success or failure
  */
 {

-  UINT Channel;

+  ULONG Channel;

   DPRINT("MPU401Cleanup() called!\n");
 
     // Reset the device (should we do this?)
@@ -240,8 +240,8 @@

 {
     PIO_STACK_LOCATION Stack;
     PDEVICE_EXTENSION DeviceExtension;

-    UINT ByteCount;
-    PBYTE Data;

+    ULONG ByteCount;
+    PUCHAR Data;

 
     DPRINT("MPU401DeviceControl() called!\n");
 
@@ -256,7 +256,7 @@

         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);
 

--- trunk/reactos/drivers/dd/mpu401/mpu401.h	2006-01-07 05:23:59 UTC (rev 20647)
+++ trunk/reactos/drivers/dd/mpu401/mpu401.h	2006-01-07 05:37:22 UTC (rev 20648)
@@ -85,8 +85,8 @@

 {
     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 _CONFIG
 //{

-//    UINT Port;
-//    UINT IRQ;

+//    ULONG Port;
+//    ULONG IRQ;

 //} CONFIG, *PCONFIG;
 
 /*
@@ -126,9 +126,9 @@

     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 :

--- trunk/reactos/drivers/dd/mpu401/portio.c	2006-01-07 05:23:59 UTC (rev 20647)
+++ trunk/reactos/drivers/dd/mpu401/portio.c	2006-01-07 05:37:22 UTC (rev 20648)
@@ -13,7 +13,7 @@

 #include "mpu401.h"
 
 

-BOOLEAN WaitToSend(UINT BasePort)

+BOOLEAN WaitToSend(ULONG BasePort)

 {
     int TimeOut;
 
@@ -37,7 +37,7 @@

 }
 
 

-BOOLEAN WaitToReceive(UINT BasePort)

+BOOLEAN WaitToReceive(ULONG BasePort)

 {
     int TimeOut;
 
@@ -61,9 +61,9 @@

 }
 
 

-BOOLEAN InitUARTMode(UINT BasePort)

+BOOLEAN InitUARTMode(ULONG BasePort)

 {

-    UINT TimeOut;

+    ULONG TimeOut;

     UCHAR Status = 0;
 
     DbgPrint("InitUARTMode() called\n");

--- trunk/reactos/drivers/dd/parallel/parallel.c	2006-01-07 05:23:59 UTC (rev 20647)
+++ trunk/reactos/drivers/dd/parallel/parallel.c	2006-01-07 05:37:22 UTC (rev 20648)
@@ -83,7 +83,7 @@

 {
    PIO_STACK_LOCATION Stack = IoGetCurrentIrpStackLocation(Irp);
    NTSTATUS status;

-   UINT i;

+   ULONG i;

 
    switch (Stack->MajorFunction)
      {

--- trunk/reactos/drivers/dd/ramdrv/ramdrv.c	2006-01-07 05:23:59 UTC (rev 20647)
+++ trunk/reactos/drivers/dd/ramdrv/ramdrv.c	2006-01-07 05:37:22 UTC (rev 20648)
@@ -98,7 +98,7 @@

   void *tbuff;
   unsigned int dstlen = 1024 * 1440;
   FILE_STANDARD_INFORMATION finfo;

-  DWORD err;

+  ULONG err;

 
   DPRINT("Ramdisk driver\n");
 

--- trunk/reactos/drivers/lib/bzip2/bzlib.h	2006-01-07 05:23:59 UTC (rev 20647)
+++ trunk/reactos/drivers/lib/bzip2/bzlib.h	2006-01-07 05:37:22 UTC (rev 20648)
@@ -308,9 +308,9 @@

    );
 #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
 }