[ros-diffs] [rharabien] 52453: [VIDEOPRT] - Fix MSVC warnings

Author: rharabien
Date: Sat Jun 25 14:10:19 2011
New Revision: 52453

URL: http://svn.reactos.org/svn/reactos?rev=52453&view=rev
Log:
[VIDEOPRT]
- Fix MSVC warnings

Modified:
    trunk/reactos/drivers/video/videoprt/agp.c
    trunk/reactos/drivers/video/videoprt/dma.c
    trunk/reactos/drivers/video/videoprt/int10.c
    trunk/reactos/drivers/video/videoprt/interrupt.c
    trunk/reactos/drivers/video/videoprt/resource.c
    trunk/reactos/drivers/video/videoprt/videoprt.h

Modified: trunk/reactos/drivers/video/videoprt/agp.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/agp…
==============================================================================
--- trunk/reactos/drivers/video/videoprt/agp.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/video/videoprt/agp.c [iso-8859-1] Sat Jun 25 14:10:19 2011
@@ -29,7 +29,7 @@
 IopInitiatePnpIrp(
   PDEVICE_OBJECT DeviceObject,
   PIO_STATUS_BLOCK IoStatusBlock,
-  ULONG MinorFunction,
+  UCHAR MinorFunction,
   PIO_STACK_LOCATION Stack OPTIONAL)
 {
   PDEVICE_OBJECT TopDeviceObject;

Modified: trunk/reactos/drivers/video/videoprt/dma.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/dma…
==============================================================================
--- trunk/reactos/drivers/video/videoprt/dma.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/video/videoprt/dma.c [iso-8859-1] Sat Jun 25 14:10:19 2011
@@ -203,8 +203,7 @@
     ASSERT(VpDmaAdapter->Adapter != NULL);
     ASSERT(VpDmaAdapter->MapRegisters != 0);
 
-    return VideoPortReleaseCommonBuffer(HwDeviceExtension, (PVP_DMA_ADAPTER)VpDmaAdapter,
Length, LogicalAddress, VirtualAddress, CacheEnabled);
-
+    VideoPortReleaseCommonBuffer(HwDeviceExtension, (PVP_DMA_ADAPTER)VpDmaAdapter,
Length, LogicalAddress, VirtualAddress, CacheEnabled);
 }
 
 /*

Modified: trunk/reactos/drivers/video/videoprt/int10.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/int…
==============================================================================
--- trunk/reactos/drivers/video/videoprt/int10.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/video/videoprt/int10.c [iso-8859-1] Sat Jun 25 14:10:19 2011
@@ -60,8 +60,8 @@
       return ERROR_NOT_ENOUGH_MEMORY;
    }
 
-   *Seg = (ULONG)MemoryAddress >> 4;
-   *Off = (ULONG)MemoryAddress & 0xF;
+   *Seg = (USHORT)((ULONG)MemoryAddress >> 4);
+   *Off = (USHORT)((ULONG)MemoryAddress & 0xF);
 
    INFO_(VIDEOPRT, "- Segment: %x\n", (ULONG)MemoryAddress >> 4);
    INFO_(VIDEOPRT, "- Offset: %x\n", (ULONG)MemoryAddress & 0xF);
@@ -182,8 +182,8 @@
     BiosArguments->Esi = BiosContext.Esi;
     BiosArguments->Edi = BiosContext.Edi;
     BiosArguments->Ebp = BiosContext.Ebp;
-    BiosArguments->SegDs = BiosContext.SegDs;
-    BiosArguments->SegEs = BiosContext.SegEs;
+    BiosArguments->SegDs = (USHORT)BiosContext.SegDs;
+    BiosArguments->SegEs = (USHORT)BiosContext.SegEs;
 
     /* Detach and return status */
     IntDetachFromCSRSS(&CallingProcess, &ApcState);

Modified: trunk/reactos/drivers/video/videoprt/interrupt.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/int…
==============================================================================
--- trunk/reactos/drivers/video/videoprt/interrupt.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/video/videoprt/interrupt.c [iso-8859-1] Sat Jun 25 14:10:19
2011
@@ -125,7 +125,7 @@
     }
 
     /* Re-enable the interrupt and return */
-    InterruptValid = HalEnableSystemInterrupt(DeviceExtension->InterruptVector,
+    InterruptValid =
HalEnableSystemInterrupt((UCHAR)DeviceExtension->InterruptVector,
                                               0,
                                               DeviceExtension->InterruptLevel);
 
@@ -162,7 +162,7 @@
     }
 
     /* Disable the interrupt and return */
-    HalDisableSystemInterrupt(DeviceExtension->InterruptVector,
+    HalDisableSystemInterrupt((UCHAR)DeviceExtension->InterruptVector,
                               0);
     return NO_ERROR;
 #else

Modified: trunk/reactos/drivers/video/videoprt/resource.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/res…
==============================================================================
--- trunk/reactos/drivers/video/videoprt/resource.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/video/videoprt/resource.c [iso-8859-1] Sat Jun 25 14:10:19 2011
@@ -79,7 +79,7 @@
    IN PVIDEO_PORT_DEVICE_EXTENSION DeviceExtension,
    IN PHYSICAL_ADDRESS IoAddress,
    IN ULONG NumberOfUchars,
-   IN UCHAR InIoSpace,
+   IN ULONG InIoSpace,
    IN HANDLE ProcessHandle,
    OUT VP_STATUS *Status)
 {

Modified: trunk/reactos/drivers/video/videoprt/videoprt.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/vid…
==============================================================================
--- trunk/reactos/drivers/video/videoprt/videoprt.h [iso-8859-1] (original)
+++ trunk/reactos/drivers/video/videoprt/videoprt.h [iso-8859-1] Sat Jun 25 14:10:19 2011
@@ -116,7 +116,7 @@
 IopInitiatePnpIrp(
   PDEVICE_OBJECT DeviceObject,
   PIO_STATUS_BLOCK IoStatusBlock,
-  ULONG MinorFunction,
+  UCHAR MinorFunction,
   PIO_STACK_LOCATION Stack OPTIONAL);
 
 NTSTATUS NTAPI