X-Git-Url: http://git.jankratochvil.net/?p=reactos.git;a=blobdiff_plain;f=include%2Fntos%2Fgditypes.h;fp=include%2Fntos%2Fgditypes.h;h=10ae3f87a725ca1322df8ae75af626d2fd3b2008;hp=3932cf9ae8abea0eada0b6f1c461e35b5e87de61;hb=a3df8bf1429570e0bd6c6428f6ed80073578cf4b;hpb=7c0db166f81fbe8c8b913d7f26048e337d383605

diff --git a/include/ntos/gditypes.h b/include/ntos/gditypes.h
index 3932cf9..10ae3f8 100644
--- a/include/ntos/gditypes.h
+++ b/include/ntos/gditypes.h
@@ -24,10 +24,21 @@ typedef struct _devicemodeA
 	WORD dmSize;
 	WORD dmDriverExtra;
 	DWORD dmFields;
-	short dmOrientation;
-	short dmPaperSize;
-	short dmPaperLength;
-	short dmPaperWidth;
+	union
+	{
+		struct
+		{
+			short dmOrientation;
+			short dmPaperSize;
+			short dmPaperLength;
+			short dmPaperWidth;
+		};
+		struct
+		{
+			LONG x;
+			LONG y;
+		} dmPosition;
+	};
 	short dmScale;
 	short dmCopies;
 	short dmDefaultSource;
@@ -42,14 +53,28 @@ typedef struct _devicemodeA
 	DWORD dmBitsPerPel;
 	DWORD dmPelsWidth;
 	DWORD dmPelsHeight;
-	DWORD dmDisplayFlags;
+	union
+	{
+		DWORD dmDisplayFlags;
+		DWORD dmNup;
+	};
 	DWORD dmDisplayFrequency;
 	DWORD dmICMMethod;
 	DWORD dmICMIntent;
 	DWORD dmMediaType;
 	DWORD dmDitherType;
-	DWORD dmICCManufacturer;
-	DWORD dmICCModel;
+	union
+	{
+		DWORD dmICCManufacturer;
+		DWORD dmReserved1;
+	};
+	union
+	{
+		DWORD dmICCModel;
+		DWORD dmReserved2;
+	};
+	DWORD dmPanningWidth;
+	DWORD dmPanningHeight;
 } DEVMODEA,*LPDEVMODEA,*PDEVMODEA;
 
 typedef struct _devicemodeW
@@ -60,10 +85,21 @@ typedef struct _devicemodeW
 	WORD dmSize;
 	WORD dmDriverExtra;
 	DWORD dmFields;
-	short dmOrientation;
-	short dmPaperSize;
-	short dmPaperLength;
-	short dmPaperWidth;
+	union
+	{
+		struct
+		{
+			short dmOrientation;
+			short dmPaperSize;
+			short dmPaperLength;
+			short dmPaperWidth;
+		};
+		struct
+		{
+			LONG x;
+			LONG y;
+		} dmPosition;
+	};
 	short dmScale;
 	short dmCopies;
 	short dmDefaultSource;
@@ -78,14 +114,28 @@ typedef struct _devicemodeW
 	DWORD dmBitsPerPel;
 	DWORD dmPelsWidth;
 	DWORD dmPelsHeight;
-	DWORD dmDisplayFlags;
+	union
+	{
+		DWORD dmDisplayFlags;
+		DWORD dmNup;
+	};
 	DWORD dmDisplayFrequency;
 	DWORD dmICMMethod;
 	DWORD dmICMIntent;
 	DWORD dmMediaType;
 	DWORD dmDitherType;
-	DWORD dmICCManufacturer;
-	DWORD dmICCModel;
+	union
+	{
+		DWORD dmICCManufacturer;
+		DWORD dmReserved1;
+	};
+	union
+	{
+		DWORD dmICCModel;
+		DWORD dmReserved2;
+	};
+	DWORD dmPanningWidth;
+	DWORD dmPanningHeight;
 } DEVMODEW,*LPDEVMODEW,*PDEVMODEW;
 
 #endif /* !__USE_W32API */