fixed compiler warnings and cvsignore files

svn path=/trunk/; revision=6102

diff --git a/reactos/drivers/dd/beep/.cvsignore b/reactos/drivers/dd/beep/.cvsignore
index 26baf49..5f6c85b 100644 (file)
--- a/reactos/drivers/dd/beep/.cvsignore
+++ b/reactos/drivers/dd/beep/.cvsignore
@@ -1,7 +1,7 @@
-base.tmp
-junk.tmp
-temp.exp
-beep.coff
+*.tmp
+*.exp
+*.coff
+*.d
 *.o
 *.sym
 *.sys

diff --git a/reactos/drivers/dd/beep/beep.c b/reactos/drivers/dd/beep/beep.c
index 68ecff5..6e748f6 100644 (file)
--- a/reactos/drivers/dd/beep/beep.c
+++ b/reactos/drivers/dd/beep/beep.c
@@ -1,4 +1,4 @@
-/* $Id: beep.c,v 1.15 2002/10/21 17:05:32 hbirr Exp $
+/* $Id: beep.c,v 1.16 2003/09/20 20:12:43 weiden Exp $
  *
  * COPYRIGHT:            See COPYING in the top level directory
  * PROJECT:              ReactOS kernel
@@ -247,11 +247,11 @@ DriverEntry(PDRIVER_OBJECT DriverObject,
   DPRINT("Beep Device Driver 0.0.3\n");
 
   DriverObject->Flags = 0;
-  DriverObject->MajorFunction[IRP_MJ_CREATE] = BeepCreate;
-  DriverObject->MajorFunction[IRP_MJ_CLOSE] = BeepClose;
-  DriverObject->MajorFunction[IRP_MJ_CLEANUP] = BeepCleanup;
-  DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = BeepDeviceControl;
-  DriverObject->DriverUnload = BeepUnload;
+  DriverObject->MajorFunction[IRP_MJ_CREATE] = (PDRIVER_DISPATCH)BeepCreate;
+  DriverObject->MajorFunction[IRP_MJ_CLOSE] = (PDRIVER_DISPATCH)BeepClose;
+  DriverObject->MajorFunction[IRP_MJ_CLEANUP] = (PDRIVER_DISPATCH)BeepCleanup;
+  DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = (PDRIVER_DISPATCH)BeepDeviceControl;
+  DriverObject->DriverUnload = (PDRIVER_UNLOAD)BeepUnload;
 
   Status = IoCreateDevice(DriverObject,
                          sizeof(DEVICE_EXTENSION),

diff --git a/reactos/drivers/dd/blue/.cvsignore b/reactos/drivers/dd/blue/.cvsignore
index ecc09a6..5f6c85b 100644 (file)
--- a/reactos/drivers/dd/blue/.cvsignore
+++ b/reactos/drivers/dd/blue/.cvsignore
@@ -1,7 +1,7 @@
-base.tmp
-junk.tmp
-temp.exp
-blue.coff
+*.tmp
+*.exp
+*.coff
+*.d
 *.o
 *.sym
 *.sys

diff --git a/reactos/drivers/dd/bootvid/.cvsignore b/reactos/drivers/dd/bootvid/.cvsignore
index 0d00270..5f6c85b 100644 (file)
--- a/reactos/drivers/dd/bootvid/.cvsignore
+++ b/reactos/drivers/dd/bootvid/.cvsignore
@@ -1,8 +1,8 @@
-base.tmp
-junk.tmp
-temp.exp
-bootvid.coff
-*.sym
+*.tmp
+*.exp
+*.coff
+*.d
 *.o
+*.sym
 *.sys
 *.map

diff --git a/reactos/drivers/dd/bootvid/bootvid.c b/reactos/drivers/dd/bootvid/bootvid.c
index edad955..f0d392c 100644 (file)
--- a/reactos/drivers/dd/bootvid/bootvid.c
+++ b/reactos/drivers/dd/bootvid/bootvid.c
@@ -1,4 +1,4 @@
-/* $Id: bootvid.c,v 1.2 2003/08/25 12:27:45 dwelch Exp $
+/* $Id: bootvid.c,v 1.3 2003/09/20 20:12:43 weiden Exp $
  *
  * COPYRIGHT:      See COPYING in the top level directory
  * PROJECT:        ReactOS kernel
@@ -359,7 +359,7 @@ InbvInitVGAMode(VOID)
 }
 
 
-BOOLEAN
+BOOL
 STDCALL
 VidResetDisplay(VOID)
 {

diff --git a/reactos/drivers/dd/debugout/.cvsignore b/reactos/drivers/dd/debugout/.cvsignore
index b6cc672..5f6c85b 100644 (file)
--- a/reactos/drivers/dd/debugout/.cvsignore
+++ b/reactos/drivers/dd/debugout/.cvsignore
@@ -1,8 +1,8 @@
-base.tmp
-junk.tmp
-temp.exp
-debugout.coff
-*.sym
+*.tmp
+*.exp
+*.coff
+*.d
 *.o
+*.sym
 *.sys
 *.map

diff --git a/reactos/drivers/dd/floppy/.cvsignore b/reactos/drivers/dd/floppy/.cvsignore
index a659dd4..5f6c85b 100644 (file)
--- a/reactos/drivers/dd/floppy/.cvsignore
+++ b/reactos/drivers/dd/floppy/.cvsignore
@@ -1,5 +1,8 @@
-floppy.coff
-*.sys
+*.tmp
+*.exp
+*.coff
+*.d
 *.o
 *.sym
+*.sys
 *.map

diff --git a/reactos/drivers/dd/floppy/floppy.c b/reactos/drivers/dd/floppy/floppy.c
index 7694fcd..a3378db 100644 (file)
--- a/reactos/drivers/dd/floppy/floppy.c
+++ b/reactos/drivers/dd/floppy/floppy.c
@@ -541,12 +541,12 @@ DriverEntry(IN PDRIVER_OBJECT DriverObject,
    DPRINT("Floppy driver\n");
    
    /* Export other driver entry points... */
-   DriverObject->MajorFunction[IRP_MJ_CREATE] = FloppyDispatchOpenClose;
-   DriverObject->MajorFunction[IRP_MJ_CLOSE] = FloppyDispatchOpenClose;
-   DriverObject->MajorFunction[IRP_MJ_READ] = FloppyDispatchReadWrite;
-   DriverObject->MajorFunction[IRP_MJ_WRITE] = FloppyDispatchReadWrite;
+   DriverObject->MajorFunction[IRP_MJ_CREATE] = (PDRIVER_DISPATCH)FloppyDispatchOpenClose;
+   DriverObject->MajorFunction[IRP_MJ_CLOSE] = (PDRIVER_DISPATCH)FloppyDispatchOpenClose;
+   DriverObject->MajorFunction[IRP_MJ_READ] = (PDRIVER_DISPATCH)FloppyDispatchReadWrite;
+   DriverObject->MajorFunction[IRP_MJ_WRITE] = (PDRIVER_DISPATCH)FloppyDispatchReadWrite;
    DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] =
-     FloppyDispatchDeviceControl;
+     (PDRIVER_DISPATCH)FloppyDispatchDeviceControl;
    
    /*  Try to detect controller and abort if it fails */
    if (!FloppyCreateController(DriverObject,

diff --git a/reactos/drivers/dd/ide/.cvsignore b/reactos/drivers/dd/ide/.cvsignore
index 5ba849a..5f6c85b 100644 (file)
--- a/reactos/drivers/dd/ide/.cvsignore
+++ b/reactos/drivers/dd/ide/.cvsignore
@@ -1,8 +1,8 @@
-base.tmp
-junk.tmp
-temp.exp
-ide.coff
-*.sys
-*.sym
+*.tmp
+*.exp
+*.coff
+*.d
 *.o
+*.sym
+*.sys
 *.map

diff --git a/reactos/drivers/dd/ide/ide.c b/reactos/drivers/dd/ide/ide.c
index 6fbe1fa..97b12c3 100644 (file)
--- a/reactos/drivers/dd/ide/ide.c
+++ b/reactos/drivers/dd/ide/ide.c
@@ -1,4 +1,4 @@
-/* $Id: ide.c,v 1.58 2003/07/21 21:53:46 royce Exp $
+/* $Id: ide.c,v 1.59 2003/09/20 20:12:43 weiden Exp $
  *
  *  IDE.C - IDE Disk driver 
  *     written by Rex Jolliff
@@ -242,13 +242,13 @@ DriverEntry(IN PDRIVER_OBJECT DriverObject,
 
   /* Export other driver entry points... */
   DriverObject->DriverStartIo = IDEStartIo;
-  DriverObject->MajorFunction[IRP_MJ_CREATE] = IDEDispatchOpenClose;
-  DriverObject->MajorFunction[IRP_MJ_CLOSE] = IDEDispatchOpenClose;
-  DriverObject->MajorFunction[IRP_MJ_READ] = IDEDispatchReadWrite;
-  DriverObject->MajorFunction[IRP_MJ_WRITE] = IDEDispatchReadWrite;
-//  DriverObject->MajorFunction[IRP_MJ_QUERY_INFORMATION] = IDEDispatchQueryInformation;
-//  DriverObject->MajorFunction[IRP_MJ_SET_INFORMATION] = IDEDispatchSetInformation;
-  DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = IDEDispatchDeviceControl;
+  DriverObject->MajorFunction[IRP_MJ_CREATE] = (PDRIVER_DISPATCH)IDEDispatchOpenClose;
+  DriverObject->MajorFunction[IRP_MJ_CLOSE] = (PDRIVER_DISPATCH)IDEDispatchOpenClose;
+  DriverObject->MajorFunction[IRP_MJ_READ] = (PDRIVER_DISPATCH)IDEDispatchReadWrite;
+  DriverObject->MajorFunction[IRP_MJ_WRITE] = (PDRIVER_DISPATCH)IDEDispatchReadWrite;
+//  DriverObject->MajorFunction[IRP_MJ_QUERY_INFORMATION] = (PDRIVER_DISPATCH)IDEDispatchQueryInformation;
+//  DriverObject->MajorFunction[IRP_MJ_SET_INFORMATION] = (PDRIVER_DISPATCH)IDEDispatchSetInformation;
+  DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = (PDRIVER_DISPATCH)IDEDispatchDeviceControl;
 
   Status = IdeFindControllers(DriverObject);
   if (NT_SUCCESS(Status))

diff --git a/reactos/drivers/dd/null/.cvsignore b/reactos/drivers/dd/null/.cvsignore
index 62337ca..5f6c85b 100644 (file)
--- a/reactos/drivers/dd/null/.cvsignore
+++ b/reactos/drivers/dd/null/.cvsignore
@@ -1,8 +1,8 @@
-base.tmp
-junk.tmp
-temp.exp
-null.coff
-*.sym
+*.tmp
+*.exp
+*.coff
+*.d
 *.o
+*.sym
 *.sys
 *.map

diff --git a/reactos/drivers/dd/null/null.c b/reactos/drivers/dd/null/null.c
index 15d3ed2..497fb98 100644 (file)
--- a/reactos/drivers/dd/null/null.c
+++ b/reactos/drivers/dd/null/null.c
@@ -1,4 +1,4 @@
-/* $Id: null.c,v 1.10 2002/09/08 10:22:05 chorns Exp $
+/* $Id: null.c,v 1.11 2003/09/20 20:12:43 weiden Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -105,12 +105,12 @@ DriverEntry(PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath)
  NTSTATUS nErrCode;
 
  /* register driver routines */
- DriverObject->MajorFunction[IRP_MJ_CLOSE] = NullDispatch;
- DriverObject->MajorFunction[IRP_MJ_CREATE] = NullDispatch;
- DriverObject->MajorFunction[IRP_MJ_WRITE] = NullDispatch;
- DriverObject->MajorFunction[IRP_MJ_READ] = NullDispatch;
- /* DriverObject->MajorFunction[IRP_MJ_QUERY_INFORMATION] = NullDispatch; */
- DriverObject->DriverUnload = NullUnload;
+ DriverObject->MajorFunction[IRP_MJ_CLOSE] = (PDRIVER_DISPATCH)NullDispatch;
+ DriverObject->MajorFunction[IRP_MJ_CREATE] = (PDRIVER_DISPATCH)NullDispatch;
+ DriverObject->MajorFunction[IRP_MJ_WRITE] = (PDRIVER_DISPATCH)NullDispatch;
+ DriverObject->MajorFunction[IRP_MJ_READ] = (PDRIVER_DISPATCH)NullDispatch;
+ /* DriverObject->MajorFunction[IRP_MJ_QUERY_INFORMATION] = (PDRIVER_DISPATCH)NullDispatch; */
+ DriverObject->DriverUnload = (PDRIVER_UNLOAD)NullUnload;
 
  /* create null device */
  RtlInitUnicodeStringFromLiteral(&wstrDeviceName, L"\\Device\\Null");

diff --git a/reactos/drivers/dd/parallel/.cvsignore b/reactos/drivers/dd/parallel/.cvsignore
index 08d1092..5f6c85b 100644 (file)
--- a/reactos/drivers/dd/parallel/.cvsignore
+++ b/reactos/drivers/dd/parallel/.cvsignore
@@ -1,8 +1,8 @@
-base.tmp
-junk.tmp
-temp.exp
-parallel.coff
-parallel.sys
-parallel.sys.unstripped
-
+*.tmp
+*.exp
+*.coff
+*.d
+*.o
+*.sym
+*.sys
 *.map

diff --git a/reactos/drivers/dd/parallel/parallel.c b/reactos/drivers/dd/parallel/parallel.c
index e9a4935..cbc8033 100644 (file)
--- a/reactos/drivers/dd/parallel/parallel.c
+++ b/reactos/drivers/dd/parallel/parallel.c
@@ -1,4 +1,4 @@
-/* $Id: parallel.c,v 1.8 2002/08/20 20:37:05 hyperion Exp $
+/* $Id: parallel.c,v 1.9 2003/09/20 20:12:43 weiden Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -145,9 +145,9 @@ DriverEntry(PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath)
      }
 
    DeviceObject->Flags=0;
-   DriverObject->MajorFunction[IRP_MJ_CLOSE] = Dispatch;
-   DriverObject->MajorFunction[IRP_MJ_CREATE] = Dispatch;
-   DriverObject->MajorFunction[IRP_MJ_WRITE] = Dispatch;
+   DriverObject->MajorFunction[IRP_MJ_CLOSE] = (PDRIVER_DISPATCH)Dispatch;
+   DriverObject->MajorFunction[IRP_MJ_CREATE] = (PDRIVER_DISPATCH)Dispatch;
+   DriverObject->MajorFunction[IRP_MJ_WRITE] = (PDRIVER_DISPATCH)Dispatch;
    DriverObject->DriverUnload = NULL;
    
    return(STATUS_SUCCESS);

diff --git a/reactos/drivers/dd/ramdrv/.cvsignore b/reactos/drivers/dd/ramdrv/.cvsignore
index bc24d01..5f6c85b 100644 (file)
--- a/reactos/drivers/dd/ramdrv/.cvsignore
+++ b/reactos/drivers/dd/ramdrv/.cvsignore
@@ -1,8 +1,8 @@
-base.tmp
-junk.tmp
-temp.exp
-ramdrv.coff
-ramdrv.sys
-ramdrv.sys.unstripped
-
+*.tmp
+*.exp
+*.coff
+*.d
+*.o
+*.sym
+*.sys
 *.map

diff --git a/reactos/drivers/dd/ramdrv/ramdrv.c b/reactos/drivers/dd/ramdrv/ramdrv.c
index 1219ae3..bcfa23d 100644 (file)
--- a/reactos/drivers/dd/ramdrv/ramdrv.c
+++ b/reactos/drivers/dd/ramdrv/ramdrv.c
@@ -101,11 +101,11 @@ NTSTATUS STDCALL DriverEntry(IN PDRIVER_OBJECT DriverObject,
   DPRINT("Ramdisk driver\n");
   
   /* Export other driver entry points... */
-  DriverObject->MajorFunction[IRP_MJ_CREATE] = RamdrvDispatchOpenClose;
-  DriverObject->MajorFunction[IRP_MJ_CLOSE] = RamdrvDispatchOpenClose;
-  DriverObject->MajorFunction[IRP_MJ_READ] = RamdrvDispatchReadWrite;
-  DriverObject->MajorFunction[IRP_MJ_WRITE] = RamdrvDispatchReadWrite;
-  DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = RamdrvDispatchDeviceControl;
+  DriverObject->MajorFunction[IRP_MJ_CREATE] = (PDRIVER_DISPATCH)RamdrvDispatchOpenClose;
+  DriverObject->MajorFunction[IRP_MJ_CLOSE] = (PDRIVER_DISPATCH)RamdrvDispatchOpenClose;
+  DriverObject->MajorFunction[IRP_MJ_READ] = (PDRIVER_DISPATCH)RamdrvDispatchReadWrite;
+  DriverObject->MajorFunction[IRP_MJ_WRITE] = (PDRIVER_DISPATCH)RamdrvDispatchReadWrite;
+  DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = (PDRIVER_DISPATCH)RamdrvDispatchDeviceControl;
   
   
   // create device and symbolic link

diff --git a/reactos/drivers/dd/serial/.cvsignore b/reactos/drivers/dd/serial/.cvsignore
index d4ff79c..5f6c85b 100644 (file)
--- a/reactos/drivers/dd/serial/.cvsignore
+++ b/reactos/drivers/dd/serial/.cvsignore
@@ -1,9 +1,8 @@
-base.tmp
-junk.tmp
-temp.exp
+*.tmp
+*.exp
+*.coff
+*.d
 *.o
-serial.coff
-serial.sys
-serial.sym
-serial.nostrip.sys
+*.sym
+*.sys
 *.map

diff --git a/reactos/drivers/dd/vga/display/objects/paint.c b/reactos/drivers/dd/vga/display/objects/paint.c
index be2afe2..16e36d3 100644 (file)
--- a/reactos/drivers/dd/vga/display/objects/paint.c
+++ b/reactos/drivers/dd/vga/display/objects/paint.c
@@ -233,12 +233,13 @@ DrvPaint(IN SURFOBJ *Surface,
       }
    }
 
+/*
 doBitBlt:
 
    // If VGADDIPaint can't do it, VGADDIBitBlt can.. or it might just loop back
    // here and we have a nice infinite loop
 
-/*   return( VGADDIBitBlt(Surface, (SURFOBJ *)NULL, (SURFOBJ *)NULL, ClipRegion,
+   return( VGADDIBitBlt(Surface, (SURFOBJ *)NULL, (SURFOBJ *)NULL, ClipRegion,
                        (XLATEOBJ *)NULL, &ClipRegion->rclBounds,
                        NULL, (POINTL *)NULL, Brush, BrushOrigin,
                        NULL) ); UNIMPLEMENTED */