Update PDEVOBJ and GRAPHICS_DEVICE fields

[reactos.git] / reactos / subsystems / win32 / win32k / include / pdevobj.h

diff --git a/reactos/subsystems/win32/win32k/include/pdevobj.h b/reactos/subsystems/win32/win32k/include/pdevobj.h
index 879e398..a474a55 100644 (file)
--- a/reactos/subsystems/win32/win32k/include/pdevobj.h
+++ b/reactos/subsystems/win32/win32k/include/pdevobj.h
@@ -39,10 +39,24 @@ typedef struct _GDIPOINTER /* should stay private to ENG? No, part of PDEVOBJ ak
 
 typedef struct _GRAPHICS_DEVICE
 {
-  CHAR szNtDeviceName[CCHDEVICENAME];           /* Yes char AscII */
-  CHAR szWinDeviceName[CCHDEVICENAME];          /* <- chk GetMonitorInfoW MxIxEX.szDevice */
-  struct _GRAPHICS_DEVICE * pNextGraphicsDevice;
-  DWORD StateFlags;                             /* See DISPLAY_DEVICE_* */
+    WCHAR            szNtDeviceName[CCHDEVICENAME/2];
+    WCHAR            szWinDeviceName[CCHDEVICENAME/2];
+    struct _GRAPHICS_DEVICE * pNextGraphicsDevice;
+    struct _GRAPHICS_DEVICE * pVgaDevice;
+    PDEVICE_OBJECT   DeviceObject;
+    PVOID            pDeviceHandle;
+    DWORD            hkClassDriverConfig;
+    DWORD            StateFlags;                     /* See DISPLAY_DEVICE_* */
+    ULONG            cbdevmodeInfo;
+    PVOID            devmodeInfo;
+    DWORD            cbdevmodeInfo1;
+    PVOID            devmodeInfo1;
+    LPWSTR           pwszDeviceNames;
+    LPWSTR           pwszDescription;
+    DWORD            dwUnknown;
+    PVOID            pUnknown;
+    PFILE_OBJECT     FileObject;
+    DWORD            ProtocolType;
 } GRAPHICS_DEVICE, *PGRAPHICS_DEVICE;
 
 typedef struct _PDEVOBJ
@@ -55,7 +69,7 @@ typedef struct _PDEVOBJ
     struct _PDEVOBJ *         ppdevParent;
     FLONG                     flFlags;  // flags
 //  FLONG                     flAccelerated;
-    PERESOURCE                hsemDevLock;    /* Device lock. */
+    HSEMAPHORE                hsemDevLock;    /* Device lock. */
 //  HSEMAPHORE                hsemPointer;
     POINTL                    ptlPointer;
 //  SIZEL                     szlPointer;
@@ -63,7 +77,7 @@ typedef struct _PDEVOBJ
 //  HFONT                     hlfntDefault;
 //  HFONT                     hlfntAnsiVariable;
 //  HFONT                     hlfntAnsiFixed;
-    HSURF                     FillPatterns[HS_DDI_MAX]; // ahsurf[HS_DDI_MAX];
+    HSURF                     ahsurf[HS_DDI_MAX];
 //  PUNICODE_STRING           pusPrtDataFileName;
 //  PVOID                     pDevHTInfo;
 //  RFONT *                   prfntActive;
@@ -85,14 +99,14 @@ typedef struct _PDEVOBJ
 //  PFN_DrvNotify             pfnDrvNotify;
 //  ULONG                     TagSig;
 //  PLDEVOBJ                  pldev;
-    DHPDEV                    hPDev;          /* dhpdev, DHPDEV for device. */
+    DHPDEV                    dhpdev;         /* DHPDEV for device. */
     PVOID                     ppalSurf;       /* PEPALOBJ/PPALETTE for this device. */
-    DEVINFO                   DevInfo; // devinfo
-    GDIINFO                   GDIInfo; // gdiinfo
+    DEVINFO                   devinfo;
+    GDIINFO                   gdiinfo;
     HSURF                     pSurface;       /* SURFACE for this device., FIXME: PSURFACE */
 //  HANDLE                    hSpooler;       /* Handle to spooler, if spooler dev driver. */
 //  PVOID                     pDesktopId;
-    PGRAPHICS_DEVICE          pGraphicsDev;   /* pGraphicsDevice */
+    PGRAPHICS_DEVICE          pGraphicsDevice;
 //  POINTL                    ptlOrigion;
     PVOID                     pdmwDev;        /* Ptr->DEVMODEW.dmSize + dmDriverExtra == alloc size. */
 //  DWORD                     Unknown3;