diff options
author | Danny Smith <dannysmith@users.sourceforge.net> | 2003-08-15 02:19:54 +0000 |
---|---|---|
committer | Danny Smith <dannysmith@users.sourceforge.net> | 2003-08-15 02:19:54 +0000 |
commit | 37f0dc7a056b2e22c1224f2315b084fe898f615c (patch) | |
tree | 3366907466e398258b1a347efbda0c796ab7a3da | |
parent | 498a5ffce20eb075ddb37f0a0cdb11bc04ef2343 (diff) | |
download | newlib-37f0dc7a056b2e22c1224f2315b084fe898f615c.zip newlib-37f0dc7a056b2e22c1224f2315b084fe898f615c.tar.gz newlib-37f0dc7a056b2e22c1224f2315b084fe898f615c.tar.bz2 |
2003-08-15 Andrew Greenwood <lists@silverblade.co.uk>
* include/wingdi.h (DEVMODE[AW]) Correct structure definition.
* include/ddk/ntapi.h (LPC_TYPE): Add LPC_CONNECTION_REFUSED.
* include/ddk/winddk.h (IRP_*): Add constants as anonymous enum.
-rw-r--r-- | winsup/w32api/ChangeLog | 6 | ||||
-rw-r--r-- | winsup/w32api/include/ddk/ntapi.h | 3 | ||||
-rw-r--r-- | winsup/w32api/include/ddk/winddk.h | 23 | ||||
-rw-r--r-- | winsup/w32api/include/wingdi.h | 168 |
4 files changed, 131 insertions, 69 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index 82fb485..725b80b 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,9 @@ +2003-08-15 Andrew Greenwood <lists@silverblade.co.uk> + + * include/wingdi.h (DEVMODE[AW]) Correct structure definition. + * include/ddk/ntapi.h (LPC_TYPE): Add LPC_CONNECTION_REFUSED. + * include/ddk/winddk.h (IRP_*): Add constants as anonymous enum. + 2003-08-10 Danny Smith <dannysmith@users.sourceforge.net> * lib/uuid.c (CGID_Explorer, CGID_ShellDocView, diff --git a/winsup/w32api/include/ddk/ntapi.h b/winsup/w32api/include/ddk/ntapi.h index bc65f9e..a9a6b6e 100644 --- a/winsup/w32api/include/ddk/ntapi.h +++ b/winsup/w32api/include/ddk/ntapi.h @@ -26,7 +26,7 @@ #ifndef __NTAPI_H #define __NTAPI_H -#if __GNUC__ >=3 +#if __GNUC__ >= 3 #pragma GCC system_header #endif @@ -1952,6 +1952,7 @@ typedef enum _LPC_TYPE { LPC_DEBUG_EVENT, LPC_ERROR_EVENT, LPC_CONNECTION_REQUEST, + LPC_CONNECTION_REFUSED, LPC_MAXIMUM } LPC_TYPE; diff --git a/winsup/w32api/include/ddk/winddk.h b/winsup/w32api/include/ddk/winddk.h index e91a8d3..d19774e 100644 --- a/winsup/w32api/include/ddk/winddk.h +++ b/winsup/w32api/include/ddk/winddk.h @@ -23,7 +23,7 @@ #ifndef __WINDDK_H #define __WINDDK_H -#if __GNUC__ >=3 +#if __GNUC__ >= 3 #pragma GCC system_header #endif @@ -1011,6 +1011,27 @@ typedef struct _IRP *PIRP; #define DEVICE_TYPE_FROM_CTL_CODE(ctl) (((ULONG) (ctl & 0xffff0000)) >> 16) +enum +{ + IRP_NOCACHE = 0x1, + IRP_PAGING_IO = 0x2, + IRP_MOUNT_COMPLETION = 0x2, + IRP_SYNCHRONOUS_API = 0x4, + IRP_ASSOCIATED_IRP = 0x8, + IRP_BUFFERED_IO = 0x10, + IRP_DEALLOCATE_BUFFER = 0x20, + IRP_INPUT_OPERATION = 0x40, + IRP_SYNCHRONOUS_PAGING_IO = 0x40, + IRP_CREATE_OPERATION = 0x80, + IRP_READ_OPERATION = 0x100, + IRP_WRITE_OPERATION = 0x200, + IRP_CLOSE_OPERATION = 0x400, + IRP_DEFER_IO_COMPLETION = 0x800, + IRP_OB_QUERY_NAME = 0x1000, + IRP_HOLD_DEVICE_QUEUE = 0x2000, + IRP_RETRY_IO_COMPLETION = 0x4000 +}; + typedef struct _DRIVE_LAYOUT_INFORMATION_MBR { ULONG Signature; diff --git a/winsup/w32api/include/wingdi.h b/winsup/w32api/include/wingdi.h index a8af7f1..e5ecc3c 100644 --- a/winsup/w32api/include/wingdi.h +++ b/winsup/w32api/include/wingdi.h @@ -1,6 +1,6 @@ #ifndef _WINGDI_H #define _WINGDI_H -#if __GNUC__ >=3 +#if __GNUC__ >= 3 #pragma GCC system_header #endif @@ -1295,73 +1295,107 @@ typedef struct tagCOLORADJUSTMENT { SHORT caColorfulness; SHORT caRedGreenTint; } COLORADJUSTMENT,*LPCOLORADJUSTMENT; -typedef struct _devicemodeA { - BYTE dmDeviceName[CCHDEVICENAME]; - WORD dmSpecVersion; - WORD dmDriverVersion; - WORD dmSize; - WORD dmDriverExtra; - DWORD dmFields; - short dmOrientation; - short dmPaperSize; - short dmPaperLength; - short dmPaperWidth; - short dmScale; - short dmCopies; - short dmDefaultSource; - short dmPrintQuality; - short dmColor; - short dmDuplex; - short dmYResolution; - short dmTTOption; - short dmCollate; - BYTE dmFormName[CCHFORMNAME]; - WORD dmLogPixels; - DWORD dmBitsPerPel; - DWORD dmPelsWidth; - DWORD dmPelsHeight; - DWORD dmDisplayFlags; - DWORD dmDisplayFrequency; - DWORD dmICMMethod; - DWORD dmICMIntent; - DWORD dmMediaType; - DWORD dmDitherType; - DWORD dmICCManufacturer; - DWORD dmICCModel; +typedef struct _devicemodeA { + BYTE dmDeviceName[CCHDEVICENAME]; + WORD dmSpecVersion; + WORD dmDriverVersion; + WORD dmSize; + WORD dmDriverExtra; + DWORD dmFields; + _ANONYMOUS_UNION union { + _ANONYMOUS_STRUCT struct { + short dmOrientation; + short dmPaperSize; + short dmPaperLength; + short dmPaperWidth; + short dmScale; + short dmCopies; + short dmDefaultSource; + short dmPrintQuality; + } DUMMYSTRUCTNAME; + POINTL dmPosition; + DWORD dmDisplayOrientation; + DWORD dmDisplayFixedOutput; + } DUMMYUNIONNAME; + + short dmColor; + short dmDuplex; + short dmYResolution; + short dmTTOption; + short dmCollate; + BYTE dmFormName[CCHFORMNAME]; + WORD dmLogPixels; + DWORD dmBitsPerPel; + DWORD dmPelsWidth; + DWORD dmPelsHeight; + _ANONYMOUS_UNION union { + DWORD dmDisplayFlags; + DWORD dmNup; + } DUMMYUNIONNAME2; + DWORD dmDisplayFrequency; +#if(WINVER >= 0x0400) + DWORD dmICMMethod; + DWORD dmICMIntent; + DWORD dmMediaType; + DWORD dmDitherType; + DWORD dmReserved1; + DWORD dmReserved2; +#if (WINVER >= 0x0500) || (_WIN32_WINNT >= 0x0400) + DWORD dmPanningWidth; + DWORD dmPanningHeight; +#endif +#endif /* WINVER >= 0x0400 */ } DEVMODEA,*LPDEVMODEA,*PDEVMODEA; -typedef struct _devicemodeW { - WCHAR dmDeviceName[CCHDEVICENAME]; - WORD dmSpecVersion; - WORD dmDriverVersion; - WORD dmSize; - WORD dmDriverExtra; - DWORD dmFields; - short dmOrientation; - short dmPaperSize; - short dmPaperLength; - short dmPaperWidth; - short dmScale; - short dmCopies; - short dmDefaultSource; - short dmPrintQuality; - short dmColor; - short dmDuplex; - short dmYResolution; - short dmTTOption; - short dmCollate; - WCHAR dmFormName[CCHFORMNAME]; - WORD dmLogPixels; - DWORD dmBitsPerPel; - DWORD dmPelsWidth; - DWORD dmPelsHeight; - DWORD dmDisplayFlags; - DWORD dmDisplayFrequency; - DWORD dmICMMethod; - DWORD dmICMIntent; - DWORD dmMediaType; - DWORD dmDitherType; - DWORD dmICCManufacturer; - DWORD dmICCModel; +typedef struct _devicemodeW { + WCHAR dmDeviceName[CCHDEVICENAME]; + WORD dmSpecVersion; + WORD dmDriverVersion; + WORD dmSize; + WORD dmDriverExtra; + DWORD dmFields; + _ANONYMOUS_UNION union { + _ANONYMOUS_STRUCT struct { + short dmOrientation; + short dmPaperSize; + short dmPaperLength; + short dmPaperWidth; + short dmScale; + short dmCopies; + short dmDefaultSource; + short dmPrintQuality; + } DUMMYSTRUCTNAME; + POINTL dmPosition; + DWORD dmDisplayOrientation; + DWORD dmDisplayFixedOutput; + } DUMMYUNIONNAME; + + short dmColor; + short dmDuplex; + short dmYResolution; + short dmTTOption; + short dmCollate; + WCHAR dmFormName[CCHFORMNAME]; + WORD dmLogPixels; + DWORD dmBitsPerPel; + DWORD dmPelsWidth; + DWORD dmPelsHeight; + _ANONYMOUS_UNION union { + DWORD dmDisplayFlags; + DWORD dmNup; + } DUMMYUNIONNAME2; + DWORD dmDisplayFrequency; +#if(WINVER >= 0x0400) + DWORD dmICMMethod; + DWORD dmICMIntent; + DWORD dmMediaType; + DWORD dmDitherType; + DWORD dmReserved1; + DWORD dmReserved2; +#if (WINVER >= 0x0500) || (_WIN32_WINNT >= 0x0400) + DWORD dmPanningWidth; + DWORD dmPanningHeight; +#endif +#endif /* WINVER >= 0x0400 */ } DEVMODEW,*LPDEVMODEW,*PDEVMODEW; typedef struct tagDIBSECTION { BITMAP dsBm; |