Merge from amd64-branch:

[reactos.git] / reactos / drivers / video / displays / vga / main / enable.c

diff --git a/reactos/drivers/video/displays/vga/main/enable.c b/reactos/drivers/video/displays/vga/main/enable.c
index 50df414..80d032c 100644 (file)
--- a/reactos/drivers/video/displays/vga/main/enable.c
+++ b/reactos/drivers/video/displays/vga/main/enable.c
@@ -56,7 +56,7 @@ static DRVFN FuncList[] =
 };
 
 static GDIINFO gaulCap = {
 };
 
 static GDIINFO gaulCap = {

-    GDI_DRIVER_VERSION,
+    GDI_DRIVER_VERSION,    // ulVersion

     DT_RASDISPLAY,         // ulTechnology
     0,                     // ulHorzSize
     0,                     // ulVertSize
     DT_RASDISPLAY,         // ulTechnology
     0,                     // ulHorzSize
     0,                     // ulVertSize


@@ -73,7 +73,7 @@ static GDIINFO gaulCap = {
     TC_RA_ABLE | TC_SCROLLBLT,  // flTextCaps
 
     6,                     // ulDACRed
     TC_RA_ABLE | TC_SCROLLBLT,  // flTextCaps
 
     6,                     // ulDACRed

-    6,                     // ulDACGree
+    6,                     // ulDACGreen

     6,                     // ulDACBlue
 
     0x0024,                // ulAspectX  (one-to-one aspect ratio)
     6,                     // ulDACBlue
 
     0x0024,                // ulAspectX  (one-to-one aspect ratio)


@@ -115,7 +115,18 @@ static GDIINFO gaulCap = {
     8,                                         // ulBltAlignment
     0,                                         // ulPanningHorzRes
     0,                                         // ulPanningVertRes
     8,                                         // ulBltAlignment
     0,                                         // ulPanningHorzRes
     0,                                         // ulPanningVertRes

-  };
+
+    0,                                         // xPanningAlignment
+    0,                                         // yPanningAlignment
+    0,                                         // cxHTPat
+    0,                                         // cyHTPat
+    NULL,                                      // pHTPatA
+    NULL,                                      // pHTPatB
+    NULL,                                      // pHTPatC
+    0,                                         // flShadeBlend
+    0,                                         // ulPhysicalPixelCharacteristics
+    0                                          // ulPhysicalPixelGamma
+};

 
 // Palette for VGA
 
 
 // Palette for VGA
 


@@ -170,7 +181,8 @@ DEVINFO devinfoVGA =
     BMF_4BPP,       // preferred DIB format
     8,              // Width of color dither
     8,              // Height of color dither
     BMF_4BPP,       // preferred DIB format
     8,              // Width of color dither
     8,              // Height of color dither

-    0               // Default palette to use for this device
+    NULL,           // Default palette to use for this device
+    0               // flGraphicsCaps2

 };
 
 BOOL APIENTRY
 };
 
 BOOL APIENTRY


@@ -562,7 +574,7 @@ DrvGetModes(IN HANDLE Driver,
                 /* next DEVMODE entry */
                 OutputModes--;
 
                 /* next DEVMODE entry */
                 OutputModes--;
 

-                DM = (PDEVMODEW) ( ((ULONG)DM) + sizeof(DEVMODEW) + DRIVER_EXTRA_SIZE);
+                DM = (PDEVMODEW) ( ((ULONG_PTR)DM) + sizeof(DEVMODEW) + DRIVER_EXTRA_SIZE);

 
                 OutputSize += (sizeof(DEVMODEW) + DRIVER_EXTRA_SIZE);
             }
 
                 OutputSize += (sizeof(DEVMODEW) + DRIVER_EXTRA_SIZE);
             }