- Fix compilation errors with GCC 4.0-20041212.

svn path=/trunk/; revision=12225

diff --git a/reactos/drivers/video/videoprt/dispatch.c b/reactos/drivers/video/videoprt/dispatch.c
index e07fb34..ad39616 100644 (file)
--- a/reactos/drivers/video/videoprt/dispatch.c
+++ b/reactos/drivers/video/videoprt/dispatch.c
@@ -18,7 +18,7 @@
  * If not, write to the Free Software Foundation,
  * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
- * $Id: dispatch.c,v 1.6 2004/06/20 16:05:47 navaraf Exp $
+ * $Id: dispatch.c,v 1.7 2004/12/19 15:56:53 navaraf Exp $
  */
 
 #include "videoprt.h"
@@ -132,7 +132,7 @@ IntVideoPortDispatchOpen(
    {
       Irp->IoStatus.Status = STATUS_SUCCESS;
 
-      InterlockedIncrement(&DeviceExtension->DeviceOpened);
+      InterlockedIncrement((PLONG)&DeviceExtension->DeviceOpened);
 
       /*
        * Storing the device extension pointer in a static variable is an
@@ -177,7 +177,7 @@ IntVideoPortDispatchClose(
 
    DeviceExtension = (PVIDEO_PORT_DEVICE_EXTENSION)DeviceObject->DeviceExtension;
    if (DeviceExtension->DeviceOpened >= 1 &&
-       InterlockedDecrement(&DeviceExtension->DeviceOpened) == 0)
+       InterlockedDecrement((PLONG)&DeviceExtension->DeviceOpened) == 0)
    {
       ResetDisplayParametersDeviceExtension = DeviceExtension;
       HalReleaseDisplayOwnership();

diff --git a/reactos/drivers/video/videoprt/videoprt.c b/reactos/drivers/video/videoprt/videoprt.c
index 8a25d54..289b60b 100644 (file)
--- a/reactos/drivers/video/videoprt/videoprt.c
+++ b/reactos/drivers/video/videoprt/videoprt.c
@@ -18,7 +18,7 @@
  * If not, write to the Free Software Foundation,
  * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
- * $Id: videoprt.c,v 1.29 2004/12/19 15:51:51 navaraf Exp $
+ * $Id: videoprt.c,v 1.30 2004/12/19 15:56:53 navaraf Exp $
  */
 
 #include "videoprt.h"
@@ -104,8 +104,8 @@ IntVideoPortGetProcAddress(
       ((ULONG_PTR)BaseAddress + (ULONG_PTR)ExportDir->AddressOfNames);
    for (i = 0; i < ExportDir->NumberOfNames; i++, NamePtr++, OrdinalPtr++)
    {
-      if (!_strnicmp(FunctionName, (char*)(BaseAddress + *NamePtr),
-                     strlen(FunctionName)))
+      if (!_strnicmp((PCHAR)FunctionName, (PCHAR)(BaseAddress + *NamePtr),
+                     strlen((PCHAR)FunctionName)))
       {
          return (PVOID)((ULONG_PTR)BaseAddress + 
                         (ULONG_PTR)AddressPtr[*OrdinalPtr]);     
@@ -841,7 +841,7 @@ VideoPortScanRom(
 
    DPRINT("VideoPortScanRom RomBase %p RomLength 0x%x String %s\n", RomBase, RomLength, String);
 
-   StringLength = strlen(String);
+   StringLength = strlen((PCHAR)String);
    Found = FALSE;
    SearchLocation = RomBase;
    for (SearchLocation = RomBase;