[sginsberg] 37690: - Correct numerous structures to work without windef.h (makes them match official DDK, too) and fix some double definitions. - Use same header guard in ddk's ntstatus.h as psdk's to prevent bogus redefinition errors. Also correct some status codes in the psdk version.
Author: sginsberg Date: Thu Nov 27 11:02:09 2008 New Revision: 37690
URL: http://svn.reactos.org/svn/reactos?rev=37690&view=rev Log: - Correct numerous structures to work without windef.h (makes them match official DDK, too) and fix some double definitions. - Use same header guard in ddk's ntstatus.h as psdk's to prevent bogus redefinition errors. Also correct some status codes in the psdk version.
Modified: trunk/reactos/include/ddk/ntdddisk.h trunk/reactos/include/ddk/ntstatus.h trunk/reactos/include/ddk/tdiinfo.h trunk/reactos/include/ddk/tvout.h trunk/reactos/include/ddk/video.h trunk/reactos/include/ddk/winddi.h trunk/reactos/include/psdk/ntstatus.h
Modified: trunk/reactos/include/ddk/ntdddisk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntdddisk.h?rev=... ============================================================================== --- trunk/reactos/include/ddk/ntdddisk.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntdddisk.h [iso-8859-1] Thu Nov 27 11:02:09 2008 @@ -315,9 +315,9 @@ typedef struct _PARTITION_INFORMATION { LARGE_INTEGER StartingOffset; LARGE_INTEGER PartitionLength; - DWORD HiddenSectors; - DWORD PartitionNumber; - BYTE PartitionType; + ULONG HiddenSectors; + ULONG PartitionNumber; + UCHAR PartitionType; BOOLEAN BootIndicator; BOOLEAN RecognizedPartition; BOOLEAN RewritePartition; @@ -429,9 +429,9 @@ } GET_LENGTH_INFORMATION, *PGET_LENGTH_INFORMATION;
typedef struct _REASSIGN_BLOCKS { - WORD Reserved; - WORD Count; - DWORD BlockNumber[1]; + USHORT Reserved; + USHORT Count; + ULONG BlockNumber[1]; } REASSIGN_BLOCKS, *PREASSIGN_BLOCKS;
typedef struct _SET_PARTITION_INFORMATION { @@ -451,7 +451,7 @@
typedef struct _VERIFY_INFORMATION { LARGE_INTEGER StartingOffset; - DWORD Length; + ULONG Length; } VERIFY_INFORMATION, *PVERIFY_INFORMATION;
typedef enum {
Modified: trunk/reactos/include/ddk/ntstatus.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntstatus.h?rev=... ============================================================================== --- trunk/reactos/include/ddk/ntstatus.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntstatus.h [iso-8859-1] Thu Nov 27 11:02:09 2008 @@ -20,8 +20,8 @@ * */
-#ifndef _NTSTATUS_H -#define _NTSTATUS_H +#ifndef _NTSTATUS_ +#define _NTSTATUS_
#if __GNUC__ >=3 #pragma GCC system_header
Modified: trunk/reactos/include/ddk/tdiinfo.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/tdiinfo.h?rev=3... ============================================================================== --- trunk/reactos/include/ddk/tdiinfo.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/tdiinfo.h [iso-8859-1] Thu Nov 27 11:02:09 2008 @@ -97,8 +97,8 @@
typedef struct _TCP_REQUEST_SET_INFORMATION_EX { TDIObjectID ID; - UINT BufferSize; - UCHAR Buffer[1]; + unsigned int BufferSize; + unsigned char Buffer[1]; } TCP_REQUEST_SET_INFORMATION_EX, *PTCP_REQUEST_SET_INFORMATION_EX;
#ifdef __cplusplus
Modified: trunk/reactos/include/ddk/tvout.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/tvout.h?rev=376... ============================================================================== --- trunk/reactos/include/ddk/tvout.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/tvout.h [iso-8859-1] Thu Nov 27 11:02:09 2008 @@ -89,28 +89,28 @@
typedef struct _VIDEOPARAMETERS { GUID Guid; - DWORD dwOffset; - DWORD dwCommand; - DWORD dwFlags; - DWORD dwMode; - DWORD dwTVStandard; - DWORD dwAvailableModes; - DWORD dwAvailableTVStandard; - DWORD dwFlickerFilter; - DWORD dwOverScanX; - DWORD dwOverScanY; - DWORD dwMaxUnscaledX; - DWORD dwMaxUnscaledY; - DWORD dwPositionX; - DWORD dwPositionY; - DWORD dwBrightness; - DWORD dwContrast; - DWORD dwCPType; - DWORD dwCPCommand; - DWORD dwCPStandard; - DWORD dwCPKey; - BYTE bCP_APSTriggerBits; - BYTE bOEMCopyProtection[256]; + ULONG dwOffset; + ULONG dwCommand; + ULONG dwFlags; + ULONG dwMode; + ULONG dwTVStandard; + ULONG dwAvailableModes; + ULONG dwAvailableTVStandard; + ULONG dwFlickerFilter; + ULONG dwOverScanX; + ULONG dwOverScanY; + ULONG dwMaxUnscaledX; + ULONG dwMaxUnscaledY; + ULONG dwPositionX; + ULONG dwPositionY; + ULONG dwBrightness; + ULONG dwContrast; + ULONG dwCPType; + ULONG dwCPCommand; + ULONG dwCPStandard; + ULONG dwCPKey; + ULONG bCP_APSTriggerBits; + UCHAR bOEMCopyProtection[256]; } VIDEOPARAMETERS, *PVIDEOPARAMETERS, FAR *LPVIDEOPARAMETERS;
Modified: trunk/reactos/include/ddk/video.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/video.h?rev=376... ============================================================================== --- trunk/reactos/include/ddk/video.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/video.h [iso-8859-1] Thu Nov 27 11:02:09 2008 @@ -85,6 +85,10 @@ PVOID HwDeviceExtension, PDMA pDma);
+ +#ifdef PAGED_CODE +#undef PAGED_CODE +#endif
#ifdef DBG
Modified: trunk/reactos/include/ddk/winddi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddi.h?rev=37... ============================================================================== --- trunk/reactos/include/ddk/winddi.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/winddi.h [iso-8859-1] Thu Nov 27 11:02:09 2008 @@ -314,11 +314,11 @@ FLONG flGraphicsCaps2; } DEVINFO, *PDEVINFO;
-typedef struct _DRIVEROBJ *PDRIVEROBJ; +struct _DRIVEROBJ;
typedef BOOL (APIENTRY CALLBACK *FREEOBJPROC)( - IN PDRIVEROBJ pDriverObj); + IN struct _DRIVEROBJ *pDriverObj);
typedef struct _DRIVEROBJ { PVOID pvObj; @@ -1110,6 +1110,17 @@ ULONG *pulXlate; } XLATEOBJ;
+/* WNDOBJCHANGEPROC.fl constants */ +#define WOC_RGN_CLIENT_DELTA 0x00000001 +#define WOC_RGN_CLIENT 0x00000002 +#define WOC_RGN_SURFACE_DELTA 0x00000004 +#define WOC_RGN_SURFACE 0x00000008 +#define WOC_CHANGED 0x00000010 +#define WOC_DELETE 0x00000020 +#define WOC_DRAWN 0x00000040 +#define WOC_SPRITE_OVERLAP 0x00000080 +#define WOC_SPRITE_NO_OVERLAP 0x00000100 + typedef VOID (APIENTRY CALLBACK *WNDOBJCHANGEPROC)( IN WNDOBJ *pwo, IN FLONG fl); @@ -3526,23 +3537,6 @@ DrvUnloadFontFile( IN ULONG_PTR iFile);
-/* WNDOBJCHANGEPROC.fl constants */ -#define WOC_RGN_CLIENT_DELTA 0x00000001 -#define WOC_RGN_CLIENT 0x00000002 -#define WOC_RGN_SURFACE_DELTA 0x00000004 -#define WOC_RGN_SURFACE 0x00000008 -#define WOC_CHANGED 0x00000010 -#define WOC_DELETE 0x00000020 -#define WOC_DRAWN 0x00000040 -#define WOC_SPRITE_OVERLAP 0x00000080 -#define WOC_SPRITE_NO_OVERLAP 0x00000100 - -typedef VOID -(APIENTRY CALLBACK * WNDOBJCHANGEPROC)( - WNDOBJ *pwo, - FLONG fl); - - typedef BOOL (APIENTRY *PFN_DrvAlphaBlend)( IN SURFOBJ *psoDest,
Modified: trunk/reactos/include/psdk/ntstatus.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntstatus.h?rev... ============================================================================== --- trunk/reactos/include/psdk/ntstatus.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntstatus.h [iso-8859-1] Thu Nov 27 11:02:09 2008 @@ -47,10 +47,10 @@ */
#define STATUS_SUCCESS ((NTSTATUS)0x00000000) -#define STATUS_SEVERITY_SUCCESS ((NTSTATUS)0x00000000) -#define STATUS_SEVERITY_INFORMATIONAL ((NTSTATUS)0x00000001) -#define STATUS_SEVERITY_WARNING ((NTSTATUS)0x00000002) -#define STATUS_SEVERITY_ERROR ((NTSTATUS)0x00000003) +#define STATUS_SEVERITY_SUCCESS 0x0 +#define STATUS_SEVERITY_INFORMATIONAL 0x1 +#define STATUS_SEVERITY_WARNING 0x2 +#define STATUS_SEVERITY_ERROR 0x3
#define STATUS_WAIT_1 ((NTSTATUS)0x00000001) #define STATUS_WAIT_2 ((NTSTATUS)0x00000002)
-
sginsberg＠svn.reactos.org