From a042b2309365eadddb4c74b140b75f231bf55bf5 Mon Sep 17 00:00:00 2001
From: Timo Kreuzer <timo.kreuzer@reactos.org>
Date: Sat, 29 Jan 2011 14:57:40 +0000
Subject: [PATCH] [VGA_NEW] Fix build with msvc

svn path=/branches/cmake-bringup/; revision=50556
---
 drivers/video/miniport/vga_new/CMakeLists.txt |  4 +++
 drivers/video/miniport/vga_new/vga.c          | 28 +++++++++----------
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/drivers/video/miniport/vga_new/CMakeLists.txt b/drivers/video/miniport/vga_new/CMakeLists.txt
index e57502a7ea3..af382e9dfa6 100644
--- a/drivers/video/miniport/vga_new/CMakeLists.txt
+++ b/drivers/video/miniport/vga_new/CMakeLists.txt
@@ -11,7 +11,11 @@ add_library(vga SHARED ${CMAKE_CURRENT_BINARY_DIR}/vga_vga.h.gch ${SOURCE})
 
 target_link_libraries(vga libcntpr)
 
+if(MSVC)
+set_target_properties(vga PROPERTIES COMPILE_FLAGS "/Gz")
+else()
 set_target_properties(vga PROPERTIES COMPILE_FLAGS "-mrtd -fno-builtin")
+endif()
 
 set_module_type(vga kernelmodedriver)
 add_importlibs(vga videoprt)
diff --git a/drivers/video/miniport/vga_new/vga.c b/drivers/video/miniport/vga_new/vga.c
index a97c64bdecd..866c658d788 100644
--- a/drivers/video/miniport/vga_new/vga.c
+++ b/drivers/video/miniport/vga_new/vga.c
@@ -93,7 +93,7 @@ VgaSetPaletteReg(
     PVIDEO_PALETTE_DATA PaletteBuffer,
     ULONG PaletteBufferSize
     );
-    
+
 VP_STATUS
 VgaSetColorLookup(
     PHW_DEVICE_EXTENSION HwDeviceExtension,
@@ -846,11 +846,11 @@ Return Value:
 
     case IOCTL_VIDEO_QUERY_PUBLIC_ACCESS_RANGES:
         {
-            VideoDebugPrint((2, "VgaStartIO - Query Public Address Ranges\n"));
-        
             PVIDEO_PUBLIC_ACCESS_RANGES portAccess;
             ULONG physicalPortLength;
 
+            VideoDebugPrint((2, "VgaStartIO - Query Public Address Ranges\n"));
+
             if (RequestPacket->OutputBufferLength <
                 sizeof(VIDEO_PUBLIC_ACCESS_RANGES))
             {
@@ -882,7 +882,7 @@ Return Value:
 // eVb: 1.17 [END]
             VideoDebugPrint((2, "VgaStartIO - mapping ports to (%x)\n", portAccess->VirtualAddress));
         }
-        
+
         break;
 
     case IOCTL_VIDEO_FREE_PUBLIC_ACCESS_RANGES:
@@ -891,7 +891,7 @@ Return Value:
 
         status = ERROR_INVALID_FUNCTION;
         break;
-        
+
     //
     // if we get here, an invalid IoControlCode was specified.
     //
@@ -1371,7 +1371,7 @@ Return Value:
 {
     PVIDEOMODE CurrentMode = HwDeviceExtension->CurrentMode;
     USHORT i;
-    
+
     //
     // Check if the size of the data in the input buffer is large enough.
     //
@@ -1400,9 +1400,9 @@ Return Value:
     //
     // Check SVGA mode
     //
-    
+
     if (CurrentMode->bitsPerPlane >= 8) return VbeSetColorLookup(HwDeviceExtension, ClutBuffer);
-// eVb: 1.14 [END]    
+// eVb: 1.14 [END]
     //
     // Path for VGA mode
     //
@@ -1507,11 +1507,11 @@ VgaAcquireResources(
 {
     VP_STATUS Status = NO_ERROR;
     ULONG Ranges, i;
-    
+
     //
     // Try exclusive ranges (vga + ati)
     //
-    
+
     Ranges = NUM_VGA_ACCESS_RANGES;
     for (i = 0; i < Ranges; i++) VgaAccessRange[i].RangeShareable = FALSE;
     if (VideoPortVerifyAccessRanges(DeviceExtension, Ranges, VgaAccessRange) != NO_ERROR)
@@ -1519,14 +1519,14 @@ VgaAcquireResources(
         //
         // Not worked, try vga only
         //
-        
+
         Ranges = 3;
         if (VideoPortVerifyAccessRanges(DeviceExtension, Ranges, VgaAccessRange) != NO_ERROR)
         {
             //
             // Still not, try shared ranges
             //
-            
+
             for (i = 0; i < Ranges; i++) VgaAccessRange[i].RangeShareable = TRUE;
             Status = VideoPortVerifyAccessRanges(DeviceExtension, Ranges, VgaAccessRange);
             if (Status == NO_ERROR)
@@ -1534,7 +1534,7 @@ VgaAcquireResources(
                 //
                 // It did work
                 //
-                
+
                 VideoPortVerifyAccessRanges(DeviceExtension, 0, 0);
                 Status = NO_ERROR;
             }
@@ -1546,7 +1546,7 @@ VgaAcquireResources(
         //
         // Worked with exclusive, also try shared
         //
-        
+
         for (i = 0; i < Ranges; i++) VgaAccessRange[i].RangeShareable = TRUE;
         Status = VideoPortVerifyAccessRanges(DeviceExtension, Ranges, VgaAccessRange);
     }