From 0deeaa0d839f29865bd23723605dfcf94915a617 Mon Sep 17 00:00:00 2001
From: Rex Jolliff <rex@lvcablemodem.com>
Date: Fri, 28 May 1999 20:40:05 +0000
Subject: [PATCH] fixes for some compiler errors.

svn path=/trunk/; revision=526
---
 reactos/drivers/dd/vidport/vidport.c | 28 ++++++++++++++--------------
 reactos/drivers/dd/vidport/vidport.h |  4 +++-
 reactos/include/ddk/ntddvid.h        |  9 +--------
 reactos/subsys/win32k/main/dllmain.c |  8 +++++++-
 4 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/reactos/drivers/dd/vidport/vidport.c b/reactos/drivers/dd/vidport/vidport.c
index 27bef2d8352..c8dc506658d 100644
--- a/reactos/drivers/dd/vidport/vidport.c
+++ b/reactos/drivers/dd/vidport/vidport.c
@@ -117,7 +117,7 @@ VideoPortGetDeviceBase(IN PVOID  HwDeviceExtension,
 {
   if (InIoSpace)
     {
-      return  MmMapIoSpace(IoAddress, NumberOfUChars, FALSE);
+      return  MmMapIoSpace(IoAddress, NumberOfUchars, FALSE);
     }
   else
     {
@@ -166,16 +166,16 @@ VideoPortInitialize(IN PVOID  Context1,
 {
   UCHAR  Again;
   WCHAR  UnicodeBuffer[18];
-  NTSTATUS  RC;
+  NTSTATUS  Status;
   ANSI_STRING  AnsiName;
   UNICODE_STRING  UnicodeName;
   PDRIVER_OBJECT  MPDriverObject = (PDRIVER_OBJECT) Context1;
   PDEVICE_OBJECT  MPDeviceObject;
   VIDEO_PORT_CONFIG_INFO  ConfigInfo;
-  VIDEOPORT_DEVICE_EXTENSION_DATA  ExtensionData;
+  PVIDEOPORT_EXTENSION_DATA  ExtensionData;
 
   /*  Build Dispatch table from passed data  */
-  MPDriverObject->DriverStartIo = HwInitializationData->HwStartIO;
+  MPDriverObject->DriverStartIo = (PDRIVER_STARTIO) HwInitializationData->HwStartIO;
 
   /*  Create a unicode device name  */
   do
@@ -187,18 +187,18 @@ VideoPortInitialize(IN PVOID  Context1,
       RtlAnsiStringToUnicodeString(&UnicodeName, &AnsiName, FALSE);
 
       /*  Create the device  */
-      RC = IoCreateDevice(MPDriverObject, 
-                          HwInitializationData->HwDeviceExtensionSize +
-                            sizeof VIDEOPORT_EXTENSION_DATA,
-                          &UnicodeName, 
-                          FILE_DEVICE_VIDEO, 
-                          0, 
-                          TRUE, 
-                          &MPDeviceObject);
-      if (!NT_SUCCESS(RC)) 
+      Status = IoCreateDevice(MPDriverObject, 
+                              HwInitializationData->HwDeviceExtensionSize +
+                                sizeof(VIDEOPORT_EXTENSION_DATA),
+                              &UnicodeName, 
+                              FILE_DEVICE_VIDEO, 
+                              0, 
+                              TRUE, 
+                              &MPDeviceObject);
+      if (!NT_SUCCESS(Status)) 
         {
           DbgPrint("IoCreateDevice call failed\n",0);
-          return RC;
+          return Status;
         }
       ExtensionData = 
         (PVIDEOPORT_EXTENSION_DATA) MPDeviceObject->DeviceExtension;
diff --git a/reactos/drivers/dd/vidport/vidport.h b/reactos/drivers/dd/vidport/vidport.h
index fa6fccccbcc..9418c424753 100644
--- a/reactos/drivers/dd/vidport/vidport.h
+++ b/reactos/drivers/dd/vidport/vidport.h
@@ -10,5 +10,7 @@ typedef struct _VIDEOPORT_EXTENSTION_DATA
 } VIDEOPORT_EXTENSION_DATA, *PVIDEOPORT_EXTENSION_DATA;
 
 #define MPExtensionToVPExtension(MPX) \
-  (PVIDEOPORT_EXTENSION_DATA) ((DWORD) (MPX) - sizeof VIDEOPORT_EXTENSION_DATA)
+  ((PVIDEOPORT_EXTENSION_DATA) ((DWORD) (MPX) - sizeof(VIDEOPORT_EXTENSION_DATA)))
+#define VPExtensionToMPExtension(VPX) \
+  ((PVOID) ((DWORD) (VPX) + sizeof(VIDEOPORT_EXTENSION_DATA)))
 
diff --git a/reactos/include/ddk/ntddvid.h b/reactos/include/ddk/ntddvid.h
index 79251b14224..38d595f6c37 100644
--- a/reactos/include/ddk/ntddvid.h
+++ b/reactos/include/ddk/ntddvid.h
@@ -27,12 +27,7 @@
  *  interrupts are handled the same as KM drivers.
  */
 
-typedef enum _VP_STATUS
-{
-  NO_ERROR,
-  ERROR_DEV_NOT_EXIST,
-  ERROR_INVALID_PARAMETER
-} VP_STATUS, *PVP_STATUS;
+typedef LONG VP_STATUS, *PVP_STATUS;
 
 #define VIDEO_MEMORY_SPACE_MEMORY    0x00
 #define VIDEO_MEMORY_SPACE_IO        0x01
@@ -56,8 +51,6 @@ typedef enum _VIDEO_SYNCHRONIZE_PRIORITY
   VpHighPriority
 } VIDEO_SYNCHRONIZE_PRIORITY, *PVIDEO_SYNCHRONIZE_PRIORITY;
 
-typedef LONG VP_STATUS, *PVP_STATUS;
-
 typedef struct _STATUS_BLOCK 
 {
   VP_STATUS  Status;
diff --git a/reactos/subsys/win32k/main/dllmain.c b/reactos/subsys/win32k/main/dllmain.c
index e4cda178fbf..3ef68b9448e 100644
--- a/reactos/subsys/win32k/main/dllmain.c
+++ b/reactos/subsys/win32k/main/dllmain.c
@@ -5,7 +5,8 @@
 #include <windows.h>
 #include <ddk/ntddk.h>
 
-#include "../include/vectors.h"
+#if 0
+#include "win32k/vectors.h"
 
 PFN Win32kVectors[] =
 {
@@ -289,6 +290,7 @@ PFN Win32kVectors[] =
   (PFN) W32kWidenPath,
   (PFN) W32kgdiPlaySpoolStream
 };
+#endif
 
 WINBOOL STDCALL  DllMain(HANDLE hInst, 
                          ULONG ul_reason_for_call,
@@ -303,6 +305,10 @@ WINBOOL STDCALL  DllMain(HANDLE hInst,
 
 PVOID  W32kGetVectors(VOID)
 {
+  DbgPrint("Unimplemented\n");
+  return 0;
+#if 0
   return Win32kVectors;
+#endif
 }