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.
This commit is contained in:
Danny Smith 2003-08-15 02:19:54 +00:00
parent 498a5ffce2
commit 37f0dc7a05
4 changed files with 131 additions and 69 deletions

View File

@ -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> 2003-08-10 Danny Smith <dannysmith@users.sourceforge.net>
* lib/uuid.c (CGID_Explorer, CGID_ShellDocView, * lib/uuid.c (CGID_Explorer, CGID_ShellDocView,

View File

@ -1952,6 +1952,7 @@ typedef enum _LPC_TYPE {
LPC_DEBUG_EVENT, LPC_DEBUG_EVENT,
LPC_ERROR_EVENT, LPC_ERROR_EVENT,
LPC_CONNECTION_REQUEST, LPC_CONNECTION_REQUEST,
LPC_CONNECTION_REFUSED,
LPC_MAXIMUM LPC_MAXIMUM
} LPC_TYPE; } LPC_TYPE;

View File

@ -1011,6 +1011,27 @@ typedef struct _IRP *PIRP;
#define DEVICE_TYPE_FROM_CTL_CODE(ctl) (((ULONG) (ctl & 0xffff0000)) >> 16) #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 { typedef struct _DRIVE_LAYOUT_INFORMATION_MBR {
ULONG Signature; ULONG Signature;

View File

@ -1302,6 +1302,8 @@ typedef struct _devicemodeA {
WORD dmSize; WORD dmSize;
WORD dmDriverExtra; WORD dmDriverExtra;
DWORD dmFields; DWORD dmFields;
_ANONYMOUS_UNION union {
_ANONYMOUS_STRUCT struct {
short dmOrientation; short dmOrientation;
short dmPaperSize; short dmPaperSize;
short dmPaperLength; short dmPaperLength;
@ -1310,6 +1312,12 @@ typedef struct _devicemodeA {
short dmCopies; short dmCopies;
short dmDefaultSource; short dmDefaultSource;
short dmPrintQuality; short dmPrintQuality;
} DUMMYSTRUCTNAME;
POINTL dmPosition;
DWORD dmDisplayOrientation;
DWORD dmDisplayFixedOutput;
} DUMMYUNIONNAME;
short dmColor; short dmColor;
short dmDuplex; short dmDuplex;
short dmYResolution; short dmYResolution;
@ -1320,14 +1328,23 @@ typedef struct _devicemodeA {
DWORD dmBitsPerPel; DWORD dmBitsPerPel;
DWORD dmPelsWidth; DWORD dmPelsWidth;
DWORD dmPelsHeight; DWORD dmPelsHeight;
_ANONYMOUS_UNION union {
DWORD dmDisplayFlags; DWORD dmDisplayFlags;
DWORD dmNup;
} DUMMYUNIONNAME2;
DWORD dmDisplayFrequency; DWORD dmDisplayFrequency;
#if(WINVER >= 0x0400)
DWORD dmICMMethod; DWORD dmICMMethod;
DWORD dmICMIntent; DWORD dmICMIntent;
DWORD dmMediaType; DWORD dmMediaType;
DWORD dmDitherType; DWORD dmDitherType;
DWORD dmICCManufacturer; DWORD dmReserved1;
DWORD dmICCModel; DWORD dmReserved2;
#if (WINVER >= 0x0500) || (_WIN32_WINNT >= 0x0400)
DWORD dmPanningWidth;
DWORD dmPanningHeight;
#endif
#endif /* WINVER >= 0x0400 */
} DEVMODEA,*LPDEVMODEA,*PDEVMODEA; } DEVMODEA,*LPDEVMODEA,*PDEVMODEA;
typedef struct _devicemodeW { typedef struct _devicemodeW {
WCHAR dmDeviceName[CCHDEVICENAME]; WCHAR dmDeviceName[CCHDEVICENAME];
@ -1336,6 +1353,8 @@ typedef struct _devicemodeW {
WORD dmSize; WORD dmSize;
WORD dmDriverExtra; WORD dmDriverExtra;
DWORD dmFields; DWORD dmFields;
_ANONYMOUS_UNION union {
_ANONYMOUS_STRUCT struct {
short dmOrientation; short dmOrientation;
short dmPaperSize; short dmPaperSize;
short dmPaperLength; short dmPaperLength;
@ -1344,6 +1363,12 @@ typedef struct _devicemodeW {
short dmCopies; short dmCopies;
short dmDefaultSource; short dmDefaultSource;
short dmPrintQuality; short dmPrintQuality;
} DUMMYSTRUCTNAME;
POINTL dmPosition;
DWORD dmDisplayOrientation;
DWORD dmDisplayFixedOutput;
} DUMMYUNIONNAME;
short dmColor; short dmColor;
short dmDuplex; short dmDuplex;
short dmYResolution; short dmYResolution;
@ -1354,14 +1379,23 @@ typedef struct _devicemodeW {
DWORD dmBitsPerPel; DWORD dmBitsPerPel;
DWORD dmPelsWidth; DWORD dmPelsWidth;
DWORD dmPelsHeight; DWORD dmPelsHeight;
_ANONYMOUS_UNION union {
DWORD dmDisplayFlags; DWORD dmDisplayFlags;
DWORD dmNup;
} DUMMYUNIONNAME2;
DWORD dmDisplayFrequency; DWORD dmDisplayFrequency;
#if(WINVER >= 0x0400)
DWORD dmICMMethod; DWORD dmICMMethod;
DWORD dmICMIntent; DWORD dmICMIntent;
DWORD dmMediaType; DWORD dmMediaType;
DWORD dmDitherType; DWORD dmDitherType;
DWORD dmICCManufacturer; DWORD dmReserved1;
DWORD dmICCModel; DWORD dmReserved2;
#if (WINVER >= 0x0500) || (_WIN32_WINNT >= 0x0400)
DWORD dmPanningWidth;
DWORD dmPanningHeight;
#endif
#endif /* WINVER >= 0x0400 */
} DEVMODEW,*LPDEVMODEW,*PDEVMODEW; } DEVMODEW,*LPDEVMODEW,*PDEVMODEW;
typedef struct tagDIBSECTION { typedef struct tagDIBSECTION {
BITMAP dsBm; BITMAP dsBm;