git://git.jankratochvil.net
/
reactos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update for HEAD-2003091401
[reactos.git]
/
include
/
ntos
/
gditypes.h
diff --git
a/include/ntos/gditypes.h
b/include/ntos/gditypes.h
index
3932cf9
..
10ae3f8
100644
(file)
--- a/
include/ntos/gditypes.h
+++ b/
include/ntos/gditypes.h
@@
-24,10
+24,21
@@
typedef struct _devicemodeA
WORD dmSize;
WORD dmDriverExtra;
DWORD dmFields;
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;
short dmScale;
short dmCopies;
short dmDefaultSource;
@@
-42,14
+53,28
@@
typedef struct _devicemodeA
DWORD dmBitsPerPel;
DWORD dmPelsWidth;
DWORD dmPelsHeight;
DWORD dmBitsPerPel;
DWORD dmPelsWidth;
DWORD dmPelsHeight;
- DWORD dmDisplayFlags;
+ union
+ {
+ DWORD dmDisplayFlags;
+ DWORD dmNup;
+ };
DWORD dmDisplayFrequency;
DWORD dmICMMethod;
DWORD dmICMIntent;
DWORD dmMediaType;
DWORD dmDitherType;
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
} DEVMODEA,*LPDEVMODEA,*PDEVMODEA;
typedef struct _devicemodeW
@@
-60,10
+85,21
@@
typedef struct _devicemodeW
WORD dmSize;
WORD dmDriverExtra;
DWORD dmFields;
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;
short dmScale;
short dmCopies;
short dmDefaultSource;
@@
-78,14
+114,28
@@
typedef struct _devicemodeW
DWORD dmBitsPerPel;
DWORD dmPelsWidth;
DWORD dmPelsHeight;
DWORD dmBitsPerPel;
DWORD dmPelsWidth;
DWORD dmPelsHeight;
- DWORD dmDisplayFlags;
+ union
+ {
+ DWORD dmDisplayFlags;
+ DWORD dmNup;
+ };
DWORD dmDisplayFrequency;
DWORD dmICMMethod;
DWORD dmICMIntent;
DWORD dmMediaType;
DWORD dmDitherType;
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 */
} DEVMODEW,*LPDEVMODEW,*PDEVMODEW;
#endif /* !__USE_W32API */