[tkreuzer] 57004: [DDK/XDK] - Fix some annotations in wdm.h [PSDK] - Fix some annotations in winddi.h - Add annotations to ntgdi.h (incomplete)

Author: tkreuzer
Date: Tue Jul 31 18:20:09 2012
New Revision: 57004

URL: http://svn.reactos.org/svn/reactos?rev=57004&view=rev
Log:
[DDK/XDK]
- Fix some annotations in wdm.h

[PSDK]
- Fix some annotations in winddi.h
- Add annotations to ntgdi.h (incomplete)

Modified:
    trunk/reactos/include/ddk/wdm.h
    trunk/reactos/include/psdk/ntgdi.h
    trunk/reactos/include/psdk/winddi.h
    trunk/reactos/include/xdk/kefuncs.h

Modified: trunk/reactos/include/ddk/wdm.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/wdm.h?rev=5700…
==============================================================================
--- trunk/reactos/include/ddk/wdm.h [iso-8859-1] (original)
+++ trunk/reactos/include/ddk/wdm.h [iso-8859-1] Tue Jul 31 18:20:09 2012
@@ -10102,7 +10102,7 @@
 VOID
 NTAPI
 ProbeForWrite(
-  __in_data_source(USER_MODE) _Inout_updates_bytes_(Length) PVOID Address,
+  __in_data_source(USER_MODE) _Out_writes_bytes_(Length) PVOID Address,
   _In_ SIZE_T Length,
   _In_ ULONG Alignment);
 
@@ -10504,8 +10504,8 @@
   _In_opt_ __drv_aliasesMem PVOID SynchronizeContext);
 
 _IRQL_requires_min_(PASSIVE_LEVEL)
-_When_((Timeout==NULL || *Timeout!=0), _IRQL_requires_max_(APC_LEVEL))
-_When_((Timeout!=NULL && *Timeout==0), _IRQL_requires_max_(DISPATCH_LEVEL))
+_When_((Timeout==NULL || Timeout->QuadPart!=0), _IRQL_requires_max_(APC_LEVEL))
+_When_((Timeout!=NULL && Timeout->QuadPart==0),
_IRQL_requires_max_(DISPATCH_LEVEL))
 NTKERNELAPI
 NTSTATUS
 NTAPI
@@ -10522,8 +10522,8 @@
 #define KeWaitForMutexObject KeWaitForSingleObject
 
 _IRQL_requires_min_(PASSIVE_LEVEL)
-_When_((Timeout==NULL || *Timeout!=0), _IRQL_requires_max_(APC_LEVEL))
-_When_((Timeout!=NULL && *Timeout==0), _IRQL_requires_max_(DISPATCH_LEVEL))
+_When_((Timeout==NULL || Timeout->QuadPart!=0), _IRQL_requires_max_(APC_LEVEL))
+_When_((Timeout!=NULL && Timeout->QuadPart==0),
_IRQL_requires_max_(DISPATCH_LEVEL))
 NTKERNELAPI
 NTSTATUS
 NTAPI

Modified: trunk/reactos/include/psdk/ntgdi.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntgdi.h?rev=5…
==============================================================================
--- trunk/reactos/include/psdk/ntgdi.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/ntgdi.h [iso-8859-1] Tue Jul 31 18:20:09 2012
@@ -86,22 +86,22 @@
 INT
 APIENTRY
 NtGdiSetDIBitsToDeviceInternal(
-    IN HDC hdcDest,
-    IN INT xDst,
-    IN INT yDst,
-    IN DWORD cx,
-    IN DWORD cy,
-    IN INT xSrc,
-    IN INT ySrc,
-    IN DWORD iStartScan,
-    IN DWORD cNumScan,
+    _In_ HDC hdcDest,
+    _In_ INT xDst,
+    _In_ INT yDst,
+    _In_ DWORD cx,
+    _In_ DWORD cy,
+    _In_ INT xSrc,
+    _In_ INT ySrc,
+    _In_ DWORD iStartScan,
+    _In_ DWORD cNumScan,
     IN LPBYTE pInitBits,
     IN LPBITMAPINFO pbmi,
-    IN DWORD iUsage,
-    IN UINT cjMaxBits,
-    IN UINT cjMaxInfo,
-    IN BOOL bTransformCoordinates,
-    IN OPTIONAL HANDLE hcmXform
+    _In_ DWORD iUsage,
+    _In_ UINT cjMaxBits,
+    _In_ UINT cjMaxInfo,
+    _In_ BOOL bTransformCoordinates,
+    _In_opt_ HANDLE hcmXform
 );
 
 W32KAPI
@@ -109,35 +109,35 @@
 APIENTRY
 NtGdiGetFontResourceInfoInternalW(
     IN LPWSTR pwszFiles,
-    IN ULONG cwc,
-    IN ULONG cFiles,
-    IN UINT cjIn,
+    _In_ ULONG cwc,
+    _In_ ULONG cFiles,
+    _In_ UINT cjIn,
     OUT LPDWORD pdwBytes,
     OUT LPVOID pvBuf,
-    IN DWORD iType
+    _In_ DWORD iType
 );
 
 W32KAPI
 DWORD
 APIENTRY
 NtGdiGetGlyphIndicesW(
-    IN HDC hdc,
+    _In_ HDC hdc,
     IN OPTIONAL LPWSTR pwc,
-    IN INT cwc,
+    _In_ INT cwc,
     OUT OPTIONAL LPWORD pgi,
-    IN DWORD iMode
+    _In_ DWORD iMode
 );
 
 W32KAPI
 DWORD
 APIENTRY
 NtGdiGetGlyphIndicesWInternal(
-    IN HDC hdc,
+    _In_ HDC hdc,
     IN OPTIONAL LPWSTR pwc,
-    IN INT cwc,
+    _In_ INT cwc,
     OUT OPTIONAL LPWORD pgi,
-    IN DWORD iMode,
-    IN BOOL bSubset
+    _In_ DWORD iMode,
+    _In_ BOOL bSubset
 );
 
 W32KAPI
@@ -145,114 +145,107 @@
 APIENTRY
 NtGdiCreatePaletteInternal(
     IN LPLOGPALETTE pLogPal,
-    IN UINT cEntries
+    _In_ UINT cEntries
 );
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiArcInternal(
-    IN ARCTYPE arctype,
-    IN HDC hdc,
-    IN INT x1,
-    IN INT y1,
-    IN INT x2,
-    IN INT y2,
-    IN INT x3,
-    IN INT y3,
-    IN INT x4,
-    IN INT y4
-);
+    _In_ ARCTYPE arctype,
+    _In_ HDC hdc,
+    _In_ INT x1,
+    _In_ INT y1,
+    _In_ INT x2,
+    _In_ INT y2,
+    _In_ INT x3,
+    _In_ INT y3,
+    _In_ INT x4,
+    _In_ INT y4);
 
 W32KAPI
 INT
 APIENTRY
 NtGdiStretchDIBitsInternal(
-    IN HDC hdc,
-    IN INT xDst,
-    IN INT yDst,
-    IN INT cxDst,
-    IN INT cyDst,
-    IN INT xSrc,
-    IN INT ySrc,
-    IN INT cxSrc,
-    IN INT cySrc,
-    IN OPTIONAL LPBYTE pjInit,
-    IN LPBITMAPINFO pbmi,
-    IN DWORD dwUsage,
-    IN DWORD dwRop4,
-    IN UINT cjMaxInfo,
-    IN UINT cjMaxBits,
-    IN HANDLE hcmXform
-);
+    _In_ HDC hdc,
+    _In_ INT xDst,
+    _In_ INT yDst,
+    _In_ INT cxDst,
+    _In_ INT cyDst,
+    _In_ INT xSrc,
+    _In_ INT ySrc,
+    _In_ INT cxSrc,
+    _In_ INT cySrc,
+    _In_opt_ LPBYTE pjInit,
+    _In_ LPBITMAPINFO pbmi,
+    _In_ DWORD dwUsage,
+    _In_ DWORD dwRop4,
+    _In_ UINT cjMaxInfo,
+    _In_ UINT cjMaxBits,
+    _In_opt_ HANDLE hcmXform);
 
 W32KAPI
 ULONG
 APIENTRY
 NtGdiGetOutlineTextMetricsInternalW(
-    IN HDC hdc,
-    IN ULONG cjotm,
-    OUT OPTIONAL OUTLINETEXTMETRICW *potmw,
-    OUT TMDIFF *ptmd
-);
-
-W32KAPI
-BOOL
+    _In_ HDC hdc,
+    _In_ ULONG cjotm,
+    _Out_opt_ OUTLINETEXTMETRICW *potmw,
+    _Out_ TMDIFF *ptmd);
+
+W32KAPI
+BOOL _Success_(return != FALSE)
 APIENTRY
 NtGdiGetAndSetDCDword(
-    IN HDC hdc,
-    IN UINT u,
-    IN DWORD dwIn,
-    OUT DWORD *pdwResult
-);
+    _In_ HDC hdc,
+    _In_ UINT u,
+    _In_ DWORD dwIn,
+    _Out_ DWORD *pdwResult);
 
 W32KAPI
 HANDLE
 APIENTRY
 NtGdiGetDCObject(
-    IN  HDC hdc,
-    IN  INT itype
-);
+    _In_ HDC hdc,
+    _In_ INT itype);
 
 W32KAPI
 HDC
 APIENTRY
 NtGdiGetDCforBitmap(
-    IN HBITMAP hsurf
-);
+    _In_ HBITMAP hsurf);
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiGetMonitorID(
-    IN  HDC hdc,
-    IN  DWORD dwSize,
-    OUT LPWSTR pszMonitorID
-);
+    _In_ HDC hdc,
+    _In_ DWORD dwSize,
+    _Out_ LPWSTR pszMonitorID);
 
 W32KAPI
 INT
 APIENTRY
 NtGdiGetLinkedUFIs(
-    IN HDC hdc,
+    _In_ HDC hdc,
     OUT OPTIONAL PUNIVERSAL_FONT_ID pufiLinkedUFIs,
-    IN INT BufferSize
+    _In_ INT BufferSize
 );
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiSetLinkedUFIs(
-    IN HDC hdc,
+    _In_ HDC hdc,
     IN PUNIVERSAL_FONT_ID pufiLinks,
-    IN ULONG uNumUFIs
+    _In_ ULONG uNumUFIs
 );
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiGetUFI(
-    IN  HDC hdc,
+    _In_ HDC hdc,
     OUT PUNIVERSAL_FONT_ID pufi,
     OUT OPTIONAL DESIGNVECTOR *pdv,
     OUT ULONG *pcjDV,
@@ -264,7 +257,7 @@
 BOOL
 APIENTRY
 NtGdiForceUFIMapping(
-    IN HDC hdc,
+    _In_ HDC hdc,
     IN PUNIVERSAL_FONT_ID pufi
 );
 
@@ -276,7 +269,7 @@
     OUT OPTIONAL ULONG* pcwc,
     OUT OPTIONAL LPWSTR pwszPathname,
     OUT OPTIONAL ULONG* pcNumFiles,
-    IN FLONG fl,
+    _In_ FLONG fl,
     OUT OPTIONAL BOOL *pbMemFont,
     OUT OPTIONAL ULONG *pcjView,
     OUT OPTIONAL PVOID pvView,
@@ -288,9 +281,9 @@
 BOOL
 APIENTRY
 NtGdiAddRemoteFontToDC(
-    IN HDC hdc,
-    IN PVOID pvBuffer,
-    IN ULONG cjBuffer,
+    _In_ HDC hdc,
+    _In_ PVOID pvBuffer,
+    _In_ ULONG cjBuffer,
     IN OPTIONAL PUNIVERSAL_FONT_ID pufi
 );
 
@@ -298,10 +291,10 @@
 HANDLE
 APIENTRY
 NtGdiAddFontMemResourceEx(
-    IN PVOID pvBuffer,
-    IN DWORD cjBuffer,
+    _In_ PVOID pvBuffer,
+    _In_ DWORD cjBuffer,
     IN DESIGNVECTOR *pdv,
-    IN ULONG cjDV,
+    _In_ ULONG cjDV,
     OUT DWORD *pNumFonts
 );
 
@@ -309,36 +302,32 @@
 BOOL
 APIENTRY
 NtGdiRemoveFontMemResourceEx(
-    IN HANDLE hMMFont
-);
+    _In_ HANDLE hMMFont);
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiUnmapMemFont(
-    IN PVOID pvView
-);
+    _In_ PVOID pvView);
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiRemoveMergeFont(
-    IN HDC hdc,
+    _In_ HDC hdc,
     IN UNIVERSAL_FONT_ID *pufi
 );
 
 W32KAPI
 BOOL
 APIENTRY
-NtGdiAnyLinkedFonts(
-    VOID
-);
+NtGdiAnyLinkedFonts(VOID);
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiGetEmbUFI(
-    IN HDC hdc,
+    _In_ HDC hdc,
     OUT PUNIVERSAL_FONT_ID pufi,
     OUT OPTIONAL DESIGNVECTOR *pdv,
     OUT ULONG *pcjDV,
@@ -350,23 +339,21 @@
 W32KAPI
 ULONG
 APIENTRY
-NtGdiGetEmbedFonts(
-    VOID
-);
+NtGdiGetEmbedFonts(VOID);
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiChangeGhostFont(
     IN KERNEL_PVOID *pfontID,
-    IN BOOL bLoad
+    _In_ BOOL bLoad
 );
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiAddEmbFontToDC(
-    IN HDC hdc,
+    _In_ HDC hdc,
     IN VOID **pFontID
 );
 
@@ -374,92 +361,86 @@
 BOOL
 APIENTRY
 NtGdiFontIsLinked(
-    IN HDC hdc
-);
+    _In_ HDC hdc);
 
 W32KAPI
 ULONG_PTR
 APIENTRY
 NtGdiPolyPolyDraw(
-    IN HDC hdc,
-    IN PPOINT ppt,
-    IN PULONG pcpt,
-    IN ULONG ccpt,
-    IN INT iFunc
-);
+    _In_ HDC hdc,
+    _In_ PPOINT ppt,
+    _In_ PULONG pcpt,
+    _In_ ULONG ccpt,
+    _In_ INT iFunc);
 
 W32KAPI
 LONG
 APIENTRY
 NtGdiDoPalette(
-    IN HGDIOBJ hObj,
-    IN WORD iStart,
-    IN WORD cEntries,
-    IN LPVOID pEntries,
-    IN DWORD iFunc,
-    IN BOOL bInbound
-);
+    _In_ HGDIOBJ hObj,
+    _In_ WORD iStart,
+    _In_ WORD cEntries,
+    _When_((iFunc == GdiPalGetEntries) || (iFunc == GdiPalGetSystemEntries),
_Out_writes_bytes_(cEntries*sizeof(PALETTEENTRY)))
+    _When_((iFunc != GdiPalGetEntries) && (iFunc != GdiPalGetSystemEntries),
_In_reads_bytes_(cEntries*sizeof(PALETTEENTRY))) LPVOID pEntries,
+    _In_ DWORD iFunc,
+    _In_ BOOL bInbound);
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiComputeXformCoefficients(
-    IN HDC hdc
-);
+    _In_ HDC hdc);
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiGetWidthTable(
-    IN HDC hdc,
-    IN ULONG cSpecial,
+    _In_ HDC hdc,
+    _In_ ULONG cSpecial,
     IN WCHAR *pwc,
-    IN ULONG cwc,
+    _In_ ULONG cwc,
     OUT USHORT *psWidth,
     OUT OPTIONAL WIDTHDATA *pwd,
     OUT FLONG *pflInfo
 );
 
 W32KAPI
+INT _Success_(return != 0)
+APIENTRY
+NtGdiDescribePixelFormat(
+    _In_ HDC hdc,
+    _In_ INT ipfd,
+    _In_ UINT cjpfd,
+    _When_(cjpfd != 0, _Out_) PPIXELFORMATDESCRIPTOR ppfd);
+
+W32KAPI
+BOOL
+APIENTRY
+NtGdiSetPixelFormat(
+    _In_ HDC hdc,
+    _In_ INT ipfd);
+
+W32KAPI
+BOOL
+APIENTRY
+NtGdiSwapBuffers(
+    _In_ HDC hdc);
+
+W32KAPI
 INT
 APIENTRY
-NtGdiDescribePixelFormat(
-    IN HDC hdc,
-    IN INT ipfd,
-    IN UINT cjpfd,
-    OUT PPIXELFORMATDESCRIPTOR ppfd
-);
-
-W32KAPI
-BOOL
-APIENTRY
-NtGdiSetPixelFormat(
-    IN HDC hdc,
-    IN INT ipfd
-);
-
-W32KAPI
-BOOL
-APIENTRY
-NtGdiSwapBuffers(
-    IN HDC hdc
-);
-
-W32KAPI
-INT
-APIENTRY
 NtGdiSetupPublicCFONT(
-    IN HDC hdc,
+    _In_ HDC hdc,
     IN OPTIONAL HFONT hf,
-    IN ULONG ulAve
+    _In_ ULONG ulAve
 );
 
 W32KAPI
 DWORD
 APIENTRY
 NtGdiDxgGenericThunk(
-    IN ULONG_PTR ulIndex,
-    IN ULONG_PTR ulHandle,
+    _In_ ULONG_PTR ulIndex,
+    _In_ ULONG_PTR ulHandle,
     IN OUT SIZE_T *pdwSizeOfPtr1,
     IN OUT  PVOID pvPtr1,
     IN OUT SIZE_T *pdwSizeOfPtr2,
@@ -470,8 +451,8 @@
 DWORD
 APIENTRY
 NtGdiDdAddAttachedSurface(
-    IN HANDLE hSurface,
-    IN HANDLE hSurfaceAttached,
+    _In_ HANDLE hSurface,
+    _In_ HANDLE hSurfaceAttached,
     IN OUT PDD_ADDATTACHEDSURFACEDATA puAddAttachedSurfaceData
 );
 
@@ -479,16 +460,15 @@
 BOOL
 APIENTRY
 NtGdiDdAttachSurface(
-    IN HANDLE  hSurfaceFrom,
-    IN HANDLE  hSurfaceTo
-);
+    _In_ HANDLE hSurfaceFrom,
+    _In_ HANDLE hSurfaceTo);
 
 W32KAPI
 DWORD
 APIENTRY
 NtGdiDdBlt(
-    IN HANDLE hSurfaceDest,
-    IN HANDLE hSurfaceSrc,
+    _In_ HANDLE hSurfaceDest,
+    _In_ HANDLE hSurfaceSrc,
     IN OUT PDD_BLTDATA puBltData
 );
 
@@ -496,7 +476,7 @@
 DWORD
 APIENTRY
 NtGdiDdCanCreateSurface(
-    IN HANDLE hDirectDraw,
+    _In_ HANDLE hDirectDraw,
     IN OUT PDD_CANCREATESURFACEDATA puCanCreateSurfaceData
 );
 
@@ -504,7 +484,7 @@
 DWORD
 APIENTRY
 NtGdiDdColorControl(
-    IN HANDLE hSurface,
+    _In_ HANDLE hSurface,
     IN OUT PDD_COLORCONTROLDATA puColorControlData
 );
 
@@ -512,14 +492,13 @@
 HANDLE
 APIENTRY
 NtGdiDdCreateDirectDrawObject(
-    IN HDC hdc
-);
+    _In_ HDC hdc);
 
 W32KAPI
 DWORD
 APIENTRY
 NtGdiDdCreateSurface(
-    IN HANDLE hDirectDraw,
+    _In_ HANDLE hDirectDraw,
     IN HANDLE* hSurface,
     IN OUT DDSURFACEDESC* puSurfaceDescription,
     IN OUT DD_SURFACE_GLOBAL* puSurfaceGlobalData,
@@ -533,44 +512,41 @@
 HANDLE
 APIENTRY
 NtGdiDdCreateSurfaceObject(
-    IN HANDLE hDirectDrawLocal,
-    IN HANDLE hSurface,
+    _In_ HANDLE hDirectDrawLocal,
+    _In_ HANDLE hSurface,
     IN PDD_SURFACE_LOCAL puSurfaceLocal,
     IN PDD_SURFACE_MORE puSurfaceMore,
     IN PDD_SURFACE_GLOBAL puSurfaceGlobal,
-    IN BOOL bComplete
+    _In_ BOOL bComplete
 );
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiDdDeleteSurfaceObject(
-    IN HANDLE hSurface
-);
+    _In_ HANDLE hSurface);
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiDdDeleteDirectDrawObject(
-    IN HANDLE hDirectDrawLocal
-);
+    _In_ HANDLE hDirectDrawLocal);
 
 W32KAPI
 DWORD
 APIENTRY
 NtGdiDdDestroySurface(
-    IN HANDLE hSurface,
-    IN BOOL bRealDestroy
-);
+    _In_ HANDLE hSurface,
+    _In_ BOOL bRealDestroy);
 
 W32KAPI
 DWORD
 APIENTRY
 NtGdiDdFlip(
-    IN HANDLE hSurfaceCurrent,
-    IN HANDLE hSurfaceTarget,
-    IN HANDLE hSurfaceCurrentLeft,
-    IN HANDLE hSurfaceTargetLeft,
+    _In_ HANDLE hSurfaceCurrent,
+    _In_ HANDLE hSurfaceTarget,
+    _In_ HANDLE hSurfaceCurrentLeft,
+    _In_ HANDLE hSurfaceTargetLeft,
     IN OUT PDD_FLIPDATA puFlipData
 );
 
@@ -578,7 +554,7 @@
 DWORD
 APIENTRY
 NtGdiDdGetAvailDriverMemory(
-    IN HANDLE hDirectDraw,
+    _In_ HANDLE hDirectDraw,
     IN OUT PDD_GETAVAILDRIVERMEMORYDATA puGetAvailDriverMemoryData
 );
 
@@ -586,7 +562,7 @@
 DWORD
 APIENTRY
 NtGdiDdGetBltStatus(
-    IN HANDLE hSurface,
+    _In_ HANDLE hSurface,
     IN OUT PDD_GETBLTSTATUSDATA puGetBltStatusData
 );
 
@@ -594,7 +570,7 @@
 HDC
 APIENTRY
 NtGdiDdGetDC(
-    IN HANDLE hSurface,
+    _In_ HANDLE hSurface,
     IN PALETTEENTRY* puColorTable
 );
 
@@ -602,7 +578,7 @@
 DWORD
 APIENTRY
 NtGdiDdGetDriverInfo(
-    IN HANDLE hDirectDraw,
+    _In_ HANDLE hDirectDraw,
     IN OUT PDD_GETDRIVERINFODATA puGetDriverInfoData
 );
 
@@ -610,7 +586,7 @@
 DWORD
 APIENTRY
 NtGdiDdGetFlipStatus(
-    IN HANDLE hSurface,
+    _In_ HANDLE hSurface,
     IN OUT PDD_GETFLIPSTATUSDATA puGetFlipStatusData
 );
 
@@ -618,7 +594,7 @@
 DWORD
 APIENTRY
 NtGdiDdGetScanLine(
-    IN HANDLE hDirectDraw,
+    _In_ HANDLE hDirectDraw,
     IN OUT PDD_GETSCANLINEDATA puGetScanLineData
 );
 
@@ -626,7 +602,7 @@
 DWORD
 APIENTRY
 NtGdiDdSetExclusiveMode(
-    IN HANDLE hDirectDraw,
+    _In_ HANDLE hDirectDraw,
     IN OUT PDD_SETEXCLUSIVEMODEDATA puSetExclusiveModeData
 );
 
@@ -634,7 +610,7 @@
 DWORD
 APIENTRY
 NtGdiDdFlipToGDISurface(
-    IN HANDLE hDirectDraw,
+    _In_ HANDLE hDirectDraw,
     IN OUT PDD_FLIPTOGDISURFACEDATA puFlipToGDISurfaceData
 );
 
@@ -642,16 +618,16 @@
 DWORD
 APIENTRY
 NtGdiDdLock(
-    IN HANDLE hSurface,
+    _In_ HANDLE hSurface,
     IN OUT PDD_LOCKDATA puLockData,
-    IN HDC hdcClip
+    _In_ HDC hdcClip
 );
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiDdQueryDirectDrawObject(
-    IN HANDLE hDirectDrawLocal,
+    _In_ HANDLE hDirectDrawLocal,
     OUT PDD_HALINFO pHalInfo,
     OUT DWORD* pCallBackFlags,
     OUT OPTIONAL LPD3DNTHAL_CALLBACKS puD3dCallbacks,
@@ -668,7 +644,7 @@
 BOOL
 APIENTRY
 NtGdiDdReenableDirectDrawObject(
-    IN HANDLE hDirectDrawLocal,
+    _In_ HANDLE hDirectDrawLocal,
     IN OUT BOOL* pubNewMode
 );
 
@@ -676,22 +652,20 @@
 BOOL
 APIENTRY
 NtGdiDdReleaseDC(
-    IN HANDLE hSurface
-);
+    _In_ HANDLE hSurface);
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiDdResetVisrgn(
-    IN HANDLE hSurface,
-    IN HWND hwnd
-);
+    _In_ HANDLE hSurface,
+    _In_ HWND hwnd);
 
 W32KAPI
 DWORD
 APIENTRY
 NtGdiDdSetColorKey(
-    IN HANDLE hSurface,
+    _In_ HANDLE hSurface,
     IN OUT PDD_SETCOLORKEYDATA puSetColorKeyData
 );
 
@@ -699,8 +673,8 @@
 DWORD
 APIENTRY
 NtGdiDdSetOverlayPosition(
-    IN HANDLE hSurfaceSource,
-    IN HANDLE hSurfaceDestination,
+    _In_ HANDLE hSurfaceSource,
+    _In_ HANDLE hSurfaceDestination,
     IN OUT PDD_SETOVERLAYPOSITIONDATA puSetOverlayPositionData
 );
 
@@ -708,15 +682,15 @@
 DWORD
 APIENTRY
 NtGdiDdUnattachSurface(
-    IN HANDLE hSurface,
-    IN HANDLE hSurfaceAttached
+    _In_ HANDLE hSurface,
+    _In_ HANDLE hSurfaceAttached
 );
 
 W32KAPI
 DWORD
 APIENTRY
 NtGdiDdUnlock(
-    IN HANDLE hSurface,
+    _In_ HANDLE hSurface,
     IN OUT PDD_UNLOCKDATA puUnlockData
 );
 
@@ -724,8 +698,8 @@
 DWORD
 APIENTRY
 NtGdiDdUpdateOverlay(
-    IN HANDLE hSurfaceDestination,
-    IN HANDLE hSurfaceSource,
+    _In_ HANDLE hSurfaceDestination,
+    _In_ HANDLE hSurfaceSource,
     IN OUT PDD_UPDATEOVERLAYDATA puUpdateOverlayData
 );
 
@@ -733,7 +707,7 @@
 DWORD
 APIENTRY
 NtGdiDdWaitForVerticalBlank(
-    IN HANDLE hDirectDraw,
+    _In_ HANDLE hDirectDraw,
     IN OUT PDD_WAITFORVERTICALBLANKDATA puWaitForVerticalBlankData
 );
 
@@ -741,25 +715,23 @@
 HANDLE
 APIENTRY
 NtGdiDdGetDxHandle(
-    IN OPTIONAL HANDLE hDirectDraw,
-    IN OPTIONAL HANDLE hSurface,
-    IN BOOL bRelease
-);
+    _In_opt_ HANDLE hDirectDraw,
+    _In_opt_ HANDLE hSurface,
+    _In_ BOOL bRelease);
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiDdSetGammaRamp(
-    IN HANDLE hDirectDraw,
-    IN HDC hdc,
-    IN LPVOID lpGammaRamp
-);
+    _In_ HANDLE hDirectDraw,
+    _In_ HDC hdc,
+    _In_ LPVOID lpGammaRamp);
 
 W32KAPI
 DWORD
 APIENTRY
 NtGdiDdLockD3D(
-    IN HANDLE hSurface,
+    _In_ HANDLE hSurface,
     IN OUT PDD_LOCKDATA puLockData
 );
 
@@ -767,7 +739,7 @@
 DWORD
 APIENTRY
 NtGdiDdUnlockD3D(
-    IN HANDLE hSurface,
+    _In_ HANDLE hSurface,
     IN OUT PDD_UNLOCKDATA puUnlockData
 );
 
@@ -775,7 +747,7 @@
 DWORD
 APIENTRY
 NtGdiDdCreateD3DBuffer(
-    IN HANDLE hDirectDraw,
+    _In_ HANDLE hDirectDraw,
     IN OUT HANDLE* hSurface,
     IN OUT DDSURFACEDESC* puSurfaceDescription,
     IN OUT DD_SURFACE_GLOBAL* puSurfaceGlobalData,
@@ -789,7 +761,7 @@
 DWORD
 APIENTRY
 NtGdiDdCanCreateD3DBuffer(
-    IN HANDLE hDirectDraw,
+    _In_ HANDLE hDirectDraw,
     IN OUT PDD_CANCREATESURFACEDATA puCanCreateSurfaceData
 );
 
@@ -797,16 +769,15 @@
 DWORD
 APIENTRY
 NtGdiDdDestroyD3DBuffer(
-    IN HANDLE hSurface
-);
+    _In_ HANDLE hSurface);
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiD3dContextCreate(
-    IN HANDLE hDirectDrawLocal,
-    IN HANDLE hSurfColor,
-    IN HANDLE hSurfZ,
+    _In_ HANDLE hDirectDrawLocal,
+    _In_ HANDLE hSurfColor,
+    _In_ HANDLE hSurfZ,
     IN OUT D3DNTHAL_CONTEXTCREATEI *pdcci
 );
 
@@ -835,8 +806,8 @@
 DWORD
 APIENTRY
 NtGdiD3dDrawPrimitives2(
-    IN HANDLE hCmdBuf,
-    IN HANDLE hVBuf,
+    _In_ HANDLE hCmdBuf,
+    _In_ HANDLE hVBuf,
     IN OUT LPD3DNTHAL_DRAWPRIMITIVES2DATA pded,
     IN OUT FLATPTR* pfpVidMemCmd,
     IN OUT DWORD* pdwSizeCmd,
@@ -855,16 +826,16 @@
 DWORD
 APIENTRY
 NtGdiDdCreateSurfaceEx(
-    IN HANDLE hDirectDraw,
-    IN HANDLE hSurface,
-    IN DWORD dwSurfaceHandle
+    _In_ HANDLE hDirectDraw,
+    _In_ HANDLE hSurface,
+    _In_ DWORD dwSurfaceHandle
 );
 
 W32KAPI
 DWORD
 APIENTRY
 NtGdiDvpCanCreateVideoPort(
-    IN HANDLE hDirectDraw,
+    _In_ HANDLE hDirectDraw,
     IN OUT PDD_CANCREATEVPORTDATA puCanCreateVPortData
 );
 
@@ -872,7 +843,7 @@
 DWORD
 APIENTRY
 NtGdiDvpColorControl(
-    IN HANDLE hVideoPort,
+    _In_ HANDLE hVideoPort,
     IN OUT PDD_VPORTCOLORDATA puVPortColorData
 );
 
@@ -880,7 +851,7 @@
 HANDLE
 APIENTRY
 NtGdiDvpCreateVideoPort(
-    IN HANDLE hDirectDraw,
+    _In_ HANDLE hDirectDraw,
     IN OUT PDD_CREATEVPORTDATA puCreateVPortData
 );
 
@@ -888,7 +859,7 @@
 DWORD
 APIENTRY
 NtGdiDvpDestroyVideoPort(
-    IN HANDLE hVideoPort,
+    _In_ HANDLE hVideoPort,
     IN OUT PDD_DESTROYVPORTDATA puDestroyVPortData
 );
 
@@ -896,9 +867,9 @@
 DWORD
 APIENTRY
 NtGdiDvpFlipVideoPort(
-    IN HANDLE hVideoPort,
-    IN HANDLE hDDSurfaceCurrent,
-    IN HANDLE hDDSurfaceTarget,
+    _In_ HANDLE hVideoPort,
+    _In_ HANDLE hDDSurfaceCurrent,
+    _In_ HANDLE hDDSurfaceTarget,
     IN OUT PDD_FLIPVPORTDATA puFlipVPortData
 );
 
@@ -906,7 +877,7 @@
 DWORD
 APIENTRY
 NtGdiDvpGetVideoPortBandwidth(
-    IN HANDLE hVideoPort,
+    _In_ HANDLE hVideoPort,
     IN OUT PDD_GETVPORTBANDWIDTHDATA puGetVPortBandwidthData
 );
 
@@ -914,7 +885,7 @@
 DWORD
 APIENTRY
 NtGdiDvpGetVideoPortField(
-    IN HANDLE hVideoPort,
+    _In_ HANDLE hVideoPort,
     IN OUT PDD_GETVPORTFIELDDATA puGetVPortFieldData
 );
 
@@ -922,7 +893,7 @@
 DWORD
 APIENTRY
 NtGdiDvpGetVideoPortFlipStatus(
-    IN HANDLE hDirectDraw,
+    _In_ HANDLE hDirectDraw,
     IN OUT PDD_GETVPORTFLIPSTATUSDATA puGetVPortFlipStatusData
 );
 
@@ -930,7 +901,7 @@
 DWORD
 APIENTRY
 NtGdiDvpGetVideoPortInputFormats(
-    IN HANDLE hVideoPort,
+    _In_ HANDLE hVideoPort,
     IN OUT PDD_GETVPORTINPUTFORMATDATA puGetVPortInputFormatData
 );
 
@@ -938,7 +909,7 @@
 DWORD
 APIENTRY
 NtGdiDvpGetVideoPortLine(
-    IN HANDLE hVideoPort,
+    _In_ HANDLE hVideoPort,
     IN OUT PDD_GETVPORTLINEDATA puGetVPortLineData
 );
 
@@ -946,7 +917,7 @@
 DWORD
 APIENTRY
 NtGdiDvpGetVideoPortOutputFormats(
-    IN HANDLE hVideoPort,
+    _In_ HANDLE hVideoPort,
     IN OUT PDD_GETVPORTOUTPUTFORMATDATA puGetVPortOutputFormatData
 );
 
@@ -954,7 +925,7 @@
 DWORD
 APIENTRY
 NtGdiDvpGetVideoPortConnectInfo(
-    IN HANDLE hDirectDraw,
+    _In_ HANDLE hDirectDraw,
     IN OUT PDD_GETVPORTCONNECTDATA puGetVPortConnectData
 );
 
@@ -962,7 +933,7 @@
 DWORD
 APIENTRY
 NtGdiDvpGetVideoSignalStatus(
-    IN HANDLE hVideoPort,
+    _In_ HANDLE hVideoPort,
     IN OUT PDD_GETVPORTSIGNALDATA puGetVPortSignalData
 );
 
@@ -970,7 +941,7 @@
 DWORD
 APIENTRY
 NtGdiDvpUpdateVideoPort(
-    IN HANDLE hVideoPort,
+    _In_ HANDLE hVideoPort,
     IN HANDLE* phSurfaceVideo,
     IN HANDLE* phSurfaceVbi,
     IN OUT PDD_UPDATEVPORTDATA puUpdateVPortData
@@ -980,7 +951,7 @@
 DWORD
 APIENTRY
 NtGdiDvpWaitForVideoPortSync(
-    IN HANDLE hVideoPort,
+    _In_ HANDLE hVideoPort,
     IN OUT PDD_WAITFORVPORTSYNCDATA puWaitForVPortSyncData
 );
 
@@ -988,7 +959,7 @@
 DWORD
 APIENTRY
 NtGdiDvpAcquireNotification(
-    IN HANDLE hVideoPort,
+    _In_ HANDLE hVideoPort,
     IN OUT HANDLE* hEvent,
     IN LPDDVIDEOPORTNOTIFY pNotify
 );
@@ -997,15 +968,14 @@
 DWORD
 APIENTRY
 NtGdiDvpReleaseNotification(
-    IN HANDLE hVideoPort,
-    IN HANDLE hEvent
-);
+    _In_ HANDLE hVideoPort,
+    _In_ HANDLE hEvent);
 
 W32KAPI
 DWORD
 APIENTRY
 NtGdiDdGetMoCompGuids(
-    IN HANDLE hDirectDraw,
+    _In_ HANDLE hDirectDraw,
     IN OUT PDD_GETMOCOMPGUIDSDATA puGetMoCompGuidsData
 );
 
@@ -1013,7 +983,7 @@
 DWORD
 APIENTRY
 NtGdiDdGetMoCompFormats(
-    IN HANDLE hDirectDraw,
+    _In_ HANDLE hDirectDraw,
     IN OUT PDD_GETMOCOMPFORMATSDATA puGetMoCompFormatsData
 );
 
@@ -1021,7 +991,7 @@
 DWORD
 APIENTRY
 NtGdiDdGetMoCompBuffInfo(
-    IN HANDLE hDirectDraw,
+    _In_ HANDLE hDirectDraw,
     IN OUT PDD_GETMOCOMPCOMPBUFFDATA puGetBuffData
 );
 
@@ -1029,7 +999,7 @@
 DWORD
 APIENTRY
 NtGdiDdGetInternalMoCompInfo(
-    IN HANDLE hDirectDraw,
+    _In_ HANDLE hDirectDraw,
     IN OUT PDD_GETINTERNALMOCOMPDATA puGetInternalData
 );
 
@@ -1037,7 +1007,7 @@
 HANDLE
 APIENTRY
 NtGdiDdCreateMoComp(
-    IN HANDLE hDirectDraw,
+    _In_ HANDLE hDirectDraw,
     IN OUT PDD_CREATEMOCOMPDATA puCreateMoCompData
 );
 
@@ -1045,7 +1015,7 @@
 DWORD
 APIENTRY
 NtGdiDdDestroyMoComp(
-    IN HANDLE hMoComp,
+    _In_ HANDLE hMoComp,
     IN OUT PDD_DESTROYMOCOMPDATA puDestroyMoCompData
 );
 
@@ -1053,7 +1023,7 @@
 DWORD
 APIENTRY
 NtGdiDdBeginMoCompFrame(
-    IN HANDLE hMoComp,
+    _In_ HANDLE hMoComp,
     IN OUT PDD_BEGINMOCOMPFRAMEDATA puBeginFrameData
 );
 
@@ -1061,7 +1031,7 @@
 DWORD
 APIENTRY
 NtGdiDdEndMoCompFrame(
-    IN HANDLE hMoComp,
+    _In_ HANDLE hMoComp,
     IN OUT PDD_ENDMOCOMPFRAMEDATA puEndFrameData
 );
 
@@ -1069,7 +1039,7 @@
 DWORD
 APIENTRY
 NtGdiDdRenderMoComp(
-    IN HANDLE hMoComp,
+    _In_ HANDLE hMoComp,
     IN OUT PDD_RENDERMOCOMPDATA puRenderMoCompData
 );
 
@@ -1077,7 +1047,7 @@
 DWORD
 APIENTRY
 NtGdiDdQueryMoCompStatus(
-    IN HANDLE hMoComp,
+    _In_ HANDLE hMoComp,
     IN OUT PDD_QUERYMOCOMPSTATUSDATA puQueryMoCompStatusData
 );
 
@@ -1085,8 +1055,8 @@
 DWORD
 APIENTRY
 NtGdiDdAlphaBlt(
-    IN HANDLE hSurfaceDest,
-    IN OPTIONAL HANDLE hSurfaceSrc,
+    _In_ HANDLE hSurfaceDest,
+    _In_opt_ HANDLE hSurfaceSrc,
     IN OUT PDD_BLTDATA puBltData
 );
 
@@ -1094,96 +1064,88 @@
 BOOL
 APIENTRY
 NtGdiAlphaBlend(
-    IN HDC hdcDst,
-    IN LONG DstX,
-    IN LONG DstY,
-    IN LONG DstCx,
-    IN LONG DstCy,
-    IN HDC hdcSrc,
-    IN LONG SrcX,
-    IN LONG SrcY,
-    IN LONG SrcCx,
-    IN LONG SrcCy,
-    IN BLENDFUNCTION BlendFunction,
-    IN HANDLE hcmXform
-);
+    _In_ HDC hdcDst,
+    _In_ LONG DstX,
+    _In_ LONG DstY,
+    _In_ LONG DstCx,
+    _In_ LONG DstCy,
+    _In_ HDC hdcSrc,
+    _In_ LONG SrcX,
+    _In_ LONG SrcY,
+    _In_ LONG SrcCx,
+    _In_ LONG SrcCy,
+    _In_ BLENDFUNCTION BlendFunction,
+    _In_ HANDLE hcmXform);
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiGradientFill(
-    IN HDC hdc,
-    IN PTRIVERTEX pVertex,
-    IN ULONG nVertex,
-    IN PVOID pMesh,
-    IN ULONG nMesh,
-    IN ULONG ulMode
-);
+    _In_ HDC hdc,
+    _In_ PTRIVERTEX pVertex,
+    _In_ ULONG nVertex,
+    _In_ PVOID pMesh,
+    _In_ ULONG nMesh,
+    _In_ ULONG ulMode);
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiSetIcmMode(
-    IN HDC hdc,
-    IN ULONG nCommand,
-    IN ULONG ulMode
-);
+    _In_ HDC hdc,
+    _In_ ULONG nCommand,
+    _In_ ULONG ulMode);
 
 W32KAPI
 HANDLE
 APIENTRY
 NtGdiCreateColorSpace(
-    IN PLOGCOLORSPACEEXW pLogColorSpace
-);
+    _In_ PLOGCOLORSPACEEXW pLogColorSpace);
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiDeleteColorSpace(
-    IN HANDLE hColorSpace
-);
+    _In_ HANDLE hColorSpace);
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiSetColorSpace(
-    IN HDC hdc,
-    IN HCOLORSPACE hColorSpace
-);
+    _In_ HDC hdc,
+    _In_ HCOLORSPACE hColorSpace);
 
 W32KAPI
 HANDLE
 APIENTRY
 NtGdiCreateColorTransform(
-    IN HDC hdc,
-    IN LPLOGCOLORSPACEW pLogColorSpaceW,
-    IN OPTIONAL PVOID pvSrcProfile,
-    IN ULONG cjSrcProfile,
-    IN OPTIONAL PVOID pvDestProfile,
-    IN ULONG cjDestProfile,
-    IN OPTIONAL PVOID pvTargetProfile,
-    IN ULONG cjTargetProfile
-);
+    _In_ HDC hdc,
+    _In_ LPLOGCOLORSPACEW pLogColorSpaceW,
+    _In_reads_bytes_opt_(cjSrcProfile) PVOID pvSrcProfile,
+    _In_ ULONG cjSrcProfile,
+    _In_reads_bytes_opt_(cjDestProfile) PVOID pvDestProfile,
+    _In_ ULONG cjDestProfile,
+    _In_reads_bytes_opt_(cjTargetProfile) PVOID pvTargetProfile,
+    _In_ ULONG cjTargetProfile);
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiDeleteColorTransform(
-    IN HDC hdc,
-    IN HANDLE hColorTransform
-);
+    _In_ HDC hdc,
+    _In_ HANDLE hColorTransform);
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiCheckBitmapBits(
-    IN HDC hdc,
-    IN HANDLE hColorTransform,
-    IN PVOID pvBits,
-    IN ULONG bmFormat,
-    IN DWORD dwWidth,
-    IN DWORD dwHeight,
-    IN DWORD dwStride,
+    _In_ HDC hdc,
+    _In_ HANDLE hColorTransform,
+    _In_ PVOID pvBits,
+    _In_ ULONG bmFormat,
+    _In_ DWORD dwWidth,
+    _In_ DWORD dwHeight,
+    _In_ DWORD dwStride,
     OUT PBYTE paResults
 );
 
@@ -1191,49 +1153,46 @@
 ULONG
 APIENTRY
 NtGdiColorCorrectPalette(
-    IN HDC hdc,
-    IN HPALETTE hpal,
-    IN ULONG FirstEntry,
-    IN ULONG NumberOfEntries,
+    _In_ HDC hdc,
+    _In_ HPALETTE hpal,
+    _In_ ULONG FirstEntry,
+    _In_ ULONG NumberOfEntries,
     IN OUT PALETTEENTRY *ppalEntry,
-    IN ULONG Command
+    _In_ ULONG Command
 );
 
 W32KAPI
 ULONG_PTR
 APIENTRY
 NtGdiGetColorSpaceforBitmap(
-    IN HBITMAP hsurf
-);
+    _In_ HBITMAP hsurf);
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiGetDeviceGammaRamp(
-    IN HDC hdc,
-    OUT LPVOID lpGammaRamp
-);
+    _In_ HDC hdc,
+    _Out_writes_bytes_(sizeof(GAMMARAMP)) LPVOID lpGammaRamp);
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiSetDeviceGammaRamp(
-    IN HDC hdc,
-    IN LPVOID lpGammaRamp
-);
+    _In_ HDC hdc,
+    _In_reads_bytes_(sizeof(GAMMARAMP)) LPVOID lpGammaRamp);
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiIcmBrushInfo(
-    IN HDC hdc,
-    IN HBRUSH hbrush,
+    _In_ HDC hdc,
+    _In_ HBRUSH hbrush,
     IN OUT PBITMAPINFO pbmiDIB,
     IN OUT PVOID pvBits,
     IN OUT ULONG *pulBits,
     OUT OPTIONAL DWORD *piUsage,
     OUT OPTIONAL BOOL *pbAlreadyTran,
-    IN ULONG Command
+    _In_ ULONG Command
 );
 
 W32KAPI
@@ -1245,37 +1204,33 @@
 HDC
 APIENTRY
 NtGdiCreateMetafileDC(
-    IN HDC hdc
-);
+    _In_ HDC hdc);
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiMakeInfoDC(
-    IN HDC hdc,
-    IN BOOL bSet
-);
+    _In_ HDC hdc,
+    _In_ BOOL bSet);
 
 W32KAPI
 HANDLE
 APIENTRY
 NtGdiCreateClientObj(
-    IN ULONG ulType
-);
+    _In_ ULONG ulType);
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiDeleteClientObj(
-    IN HANDLE h
-);
+    _In_ HANDLE h);
 
 W32KAPI
 LONG
 APIENTRY
 NtGdiGetBitmapBits(
-    IN HBITMAP hbm,
-    IN ULONG cjMax,
+    _In_ HBITMAP hbm,
+    _In_ ULONG cjMax,
     OUT OPTIONAL PBYTE pjOut
 );
 
@@ -1283,193 +1238,177 @@
 BOOL
 APIENTRY
 NtGdiDeleteObjectApp(
-    IN HANDLE hobj
-);
+    _In_ HANDLE hobj);
 
 W32KAPI
 INT
 APIENTRY
 NtGdiGetPath(
-    IN HDC hdc,
+    _In_ HDC hdc,
     OUT OPTIONAL LPPOINT pptlBuf,
     OUT OPTIONAL LPBYTE pjTypes,
-    IN INT cptBuf
+    _In_ INT cptBuf
 );
 
 W32KAPI
 HDC
 APIENTRY
 NtGdiCreateCompatibleDC(
-    IN HDC hdc
-);
+    _In_opt_ HDC hdc);
 
 W32KAPI
 HBITMAP
 APIENTRY
 NtGdiCreateDIBitmapInternal(
-    IN HDC hdc,
-    IN INT cx,
-    IN INT cy,
-    IN DWORD fInit,
-    IN OPTIONAL LPBYTE pjInit,
-    IN OPTIONAL LPBITMAPINFO pbmi,
-    IN DWORD iUsage,
-    IN UINT cjMaxInitInfo,
-    IN UINT cjMaxBits,
-    IN FLONG f,
-    IN HANDLE hcmXform
-);
+    _In_ HDC hdc,
+    _In_ INT cx,
+    _In_ INT cy,
+    _In_ DWORD fInit,
+    _In_opt_ LPBYTE pjInit,
+    _In_opt_ LPBITMAPINFO pbmi,
+    _In_ DWORD iUsage,
+    _In_ UINT cjMaxInitInfo,
+    _In_ UINT cjMaxBits,
+    _In_ FLONG f,
+    _In_ HANDLE hcmXform);
 
 W32KAPI
 HBITMAP
 APIENTRY
 NtGdiCreateDIBSection(
-    IN HDC hdc,
-    IN OPTIONAL HANDLE hSectionApp,
-    IN DWORD dwOffset,
-    IN LPBITMAPINFO pbmi,
-    IN DWORD iUsage,
-    IN UINT cjHeader,
-    IN FLONG fl,
-    IN ULONG_PTR dwColorSpace,
-    OUT PVOID *ppvBits
-);
+    _In_ HDC hdc,
+    _In_opt_ HANDLE hSectionApp,
+    _In_ DWORD dwOffset,
+    _In_ LPBITMAPINFO pbmi,
+    _In_ DWORD iUsage,
+    _In_ UINT cjHeader,
+    _In_ FLONG fl,
+    _In_ ULONG_PTR dwColorSpace,
+    _Out_opt_ PVOID *ppvBits);
 
 W32KAPI
 HBRUSH
 APIENTRY
 NtGdiCreateSolidBrush(
-    IN COLORREF cr,
-    IN OPTIONAL HBRUSH hbr
-);
+    _In_ COLORREF cr,
+    _In_opt_ HBRUSH hbr);
 
 W32KAPI
 HBRUSH
 APIENTRY
 NtGdiCreateDIBBrush(
-    IN PVOID pv,
-    IN FLONG fl,
-    IN UINT  cj,
-    IN BOOL  b8X8,
-    IN BOOL bPen,
-    IN PVOID pClient
-);
+    _In_ PVOID pv,
+    _In_ FLONG fl,
+    _In_ UINT  cj,
+    _In_ BOOL  b8X8,
+    _In_ BOOL bPen,
+    _In_ PVOID pClient);
 
 W32KAPI
 HBRUSH
 APIENTRY
 NtGdiCreatePatternBrushInternal(
-    IN HBITMAP hbm,
-    IN BOOL bPen,
-    IN BOOL b8X8
-);
+    _In_ HBITMAP hbm,
+    _In_ BOOL bPen,
+    _In_ BOOL b8X8);
 
 W32KAPI
 HBRUSH
 APIENTRY
 NtGdiCreateHatchBrushInternal(
-    IN ULONG ulStyle,
-    IN COLORREF clrr,
-    IN BOOL bPen
-);
+    _In_ ULONG ulStyle,
+    _In_ COLORREF clrr,
+    _In_ BOOL bPen);
 
 W32KAPI
 HPEN
 APIENTRY
 NtGdiExtCreatePen(
-    IN ULONG flPenStyle,
-    IN ULONG ulWidth,
-    IN ULONG iBrushStyle,
-    IN ULONG ulColor,
-    IN ULONG_PTR lClientHatch,
-    IN ULONG_PTR lHatch,
-    IN ULONG cstyle,
-    IN OPTIONAL PULONG pulStyle,
-    IN ULONG cjDIB,
-    IN BOOL bOldStylePen,
-    IN OPTIONAL HBRUSH hbrush
-);
+    _In_ ULONG flPenStyle,
+    _In_ ULONG ulWidth,
+    _In_ ULONG iBrushStyle,
+    _In_ ULONG ulColor,
+    _In_ ULONG_PTR lClientHatch,
+    _In_ ULONG_PTR lHatch,
+    _In_ ULONG cstyle,
+    _In_opt_ PULONG pulStyle,
+    _In_ ULONG cjDIB,
+    _In_ BOOL bOldStylePen,
+    _In_opt_ HBRUSH hbrush);
 
 W32KAPI
 HRGN
 APIENTRY
 NtGdiCreateEllipticRgn(
-    IN INT xLeft,
-    IN INT yTop,
-    IN INT xRight,
-    IN INT yBottom
-);
+    _In_ INT xLeft,
+    _In_ INT yTop,
+    _In_ INT xRight,
+    _In_ INT yBottom);
 
 W32KAPI
 HRGN
 APIENTRY
 NtGdiCreateRoundRectRgn(
-    IN INT xLeft,
-    IN INT yTop,
-    IN INT xRight,
-    IN INT yBottom,
-    IN INT xWidth,
-    IN INT yHeight
-);
+    _In_ INT xLeft,
+    _In_ INT yTop,
+    _In_ INT xRight,
+    _In_ INT yBottom,
+    _In_ INT xWidth,
+    _In_ INT yHeight);
 
 W32KAPI
 HANDLE
 APIENTRY
 NtGdiCreateServerMetaFile(
-    IN DWORD iType,
-    IN ULONG cjData,
-    IN LPBYTE pjData,
-    IN DWORD mm,
-    IN DWORD xExt,
-    IN DWORD yExt
-);
+    _In_ DWORD iType,
+    _In_ ULONG cjData,
+    _In_reads_bytes_(cjData) LPBYTE pjData,
+    _In_ DWORD mm,
+    _In_ DWORD xExt,
+    _In_ DWORD yExt);
 
 W32KAPI
 HRGN
 APIENTRY
 NtGdiExtCreateRegion(
-    IN OPTIONAL LPXFORM px,
-    IN DWORD cj,
-    IN LPRGNDATA prgn
-);
+    _In_opt_ LPXFORM px,
+    _In_ DWORD cj,
+    _In_ LPRGNDATA prgn);
 
 W32KAPI
 ULONG
 APIENTRY
 NtGdiMakeFontDir(
-    IN FLONG flEmbed,
-    OUT PBYTE pjFontDir,
-    IN unsigned cjFontDir,
-    IN LPWSTR pwszPathname,
-    IN unsigned cjPathname
-);
+    _In_ FLONG flEmbed,
+    _Out_writes_bytes_(cjFontDir) PBYTE pjFontDir,
+    _In_ unsigned cjFontDir,
+    _In_z_bytecount_(cjPathname) LPWSTR pwszPathname,
+    _In_ unsigned cjPathname);
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiPolyDraw(
-    IN HDC hdc,
-    IN LPPOINT ppt,
-    IN LPBYTE pjAttr,
-    IN ULONG cpt
-);
+    _In_ HDC hdc,
+    _In_count_(cpt) LPPOINT ppt,
+    _In_count_(cpt) LPBYTE pjAttr,
+    _In_ ULONG cpt);
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiPolyTextOutW(
-    IN HDC hdc,
-    IN POLYTEXTW *pptw,
-    IN UINT cStr,
-    IN DWORD dwCodePage
-);
+    _In_ HDC hdc,
+    _In_ POLYTEXTW *pptw,
+    _In_ UINT cStr,
+    _In_ DWORD dwCodePage);
 
 W32KAPI
 ULONG
 APIENTRY
 NtGdiGetServerMetaFileBits(
-    IN HANDLE hmo,
-    IN ULONG cjData,
+    _In_ HANDLE hmo,
+    _In_ ULONG cjData,
     OUT OPTIONAL LPBYTE pjData,
     OUT PDWORD piType,
     OUT PDWORD pmm,
@@ -1481,129 +1420,118 @@
 BOOL
 APIENTRY
 NtGdiEqualRgn(
-    IN HRGN hrgn1,
-    IN HRGN hrgn2
-);
-
+    _In_ HRGN hrgn1,
+    _In_ HRGN hrgn2);
+
+_Must_inspect_result_
 W32KAPI
 BOOL
 APIENTRY
 NtGdiGetBitmapDimension(
-    IN HBITMAP hbm,
-    OUT LPSIZE psize
-);
+    _In_ HBITMAP hbm,
+    _When_(return != FALSE, _Out_) LPSIZE psize);
 
 W32KAPI
 UINT
 APIENTRY
 NtGdiGetNearestPaletteIndex(
-    IN HPALETTE hpal,
-    IN COLORREF crColor
-);
+    _In_ HPALETTE hpal,
+    _In_ COLORREF crColor);
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiPtVisible(
-    IN HDC hdc,
-    IN INT x,
-    IN INT y
-);
+    _In_ HDC hdc,
+    _In_ INT x,
+    _In_ INT y);
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiRectVisible(
-    IN HDC hdc,
-    IN LPRECT prc
-);
+    _In_ HDC hdc,
+    _In_ LPRECT prc);
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiRemoveFontResourceW(
-    IN WCHAR *pwszFiles,
-    IN ULONG cwc,
-    IN ULONG cFiles,
-    IN ULONG fl,
-    IN DWORD dwPidTid,
-    IN OPTIONAL DESIGNVECTOR *pdv
-);
+    _In_z_count_(cwc) WCHAR *pwszFiles,
+    _In_ ULONG cwc,
+    _In_ ULONG cFiles,
+    _In_ ULONG fl,
+    _In_ DWORD dwPidTid,
+    _In_opt_ DESIGNVECTOR *pdv);
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiResizePalette(
-    IN HPALETTE hpal,
-    IN UINT cEntry
-);
+    _In_ HPALETTE hpal,
+    _In_ UINT cEntry);
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiSetBitmapDimension(
-    IN HBITMAP hbm,
-    IN INT cx,
-    IN INT cy,
-    OUT OPTIONAL LPSIZE psizeOut
-);
+    _In_ HBITMAP hbm,
+    _In_ INT cx,
+    _In_ INT cy,
+    _In_opt_ LPSIZE psizeOut);
 
 W32KAPI
 INT
 APIENTRY
 NtGdiOffsetClipRgn(
-    IN HDC hdc,
-    IN INT x,
-    IN INT y
-);
+    _In_ HDC hdc,
+    _In_ INT x,
+    _In_ INT y);
 
 W32KAPI
 INT
 APIENTRY
 NtGdiSetMetaRgn(
-    IN HDC hdc
-);
+    _In_ HDC hdc);
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiSetTextJustification(
-    IN HDC hdc,
-    IN INT lBreakExtra,
-    IN INT cBreak
-);
+    _In_ HDC hdc,
+    _In_ INT lBreakExtra,
+    _In_ INT cBreak);
 
 W32KAPI
 INT
 APIENTRY
 NtGdiGetAppClipBox(
-    IN HDC hdc,
-    OUT LPRECT prc
-);
+    _In_ HDC hdc,
+    _Out_ LPRECT prc);
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiGetTextExtentExW(
-    IN HDC hdc,
+    _In_ HDC hdc,
     IN OPTIONAL LPWSTR lpwsz,
-    IN ULONG cwc,
-    IN ULONG dxMax,
+    _In_ ULONG cwc,
+    _In_ ULONG dxMax,
     OUT OPTIONAL ULONG *pcCh,
     OUT OPTIONAL PULONG pdxOut,
     OUT LPSIZE psize,
-    IN FLONG fl
+    _In_ FLONG fl
 );
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiGetCharABCWidthsW(
-    IN HDC hdc,
-    IN UINT wchFirst,
-    IN ULONG cwch,
+    _In_ HDC hdc,
+    _In_ UINT wchFirst,
+    _In_ ULONG cwch,
     IN OPTIONAL PWCHAR pwch,
-    IN FLONG fl,
+    _In_ FLONG fl,
     OUT PVOID pvBuf
 );
 
@@ -1611,96 +1539,85 @@
 DWORD
 APIENTRY
 NtGdiGetCharacterPlacementW(
-    IN HDC hdc,
+    _In_ HDC hdc,
     IN LPWSTR pwsz,
-    IN INT nCount,
-    IN INT nMaxExtent,
+    _In_ INT nCount,
+    _In_ INT nMaxExtent,
     IN OUT LPGCP_RESULTSW pgcpw,
-    IN DWORD dwFlags
+    _In_ DWORD dwFlags
 );
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiAngleArc(
-    IN HDC hdc,
-    IN INT x,
-    IN INT y,
-    IN DWORD dwRadius,
-    IN DWORD dwStartAngle,
-    IN DWORD dwSweepAngle
-);
+    _In_ HDC hdc,
+    _In_ INT x,
+    _In_ INT y,
+    _In_ DWORD dwRadius,
+    _In_ DWORD dwStartAngle,
+    _In_ DWORD dwSweepAngle);
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiBeginPath(
-    IN HDC hdc
-);
+    _In_ HDC hdc);
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiSelectClipPath(
-    IN HDC hdc,
-    IN INT iMode
-);
+    _In_ HDC hdc,
+    _In_ INT iMode);
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiCloseFigure(
-    IN HDC hdc
-);
+    _In_ HDC hdc);
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiEndPath(
-    IN HDC hdc
-);
+    _In_ HDC hdc);
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiAbortPath(
-    IN HDC hdc
-);
+    _In_ HDC hdc);
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiFillPath(
-    IN HDC hdc
-);
+    _In_ HDC hdc);
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiStrokeAndFillPath(
-    IN HDC hdc
-);
+    _In_ HDC hdc);
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiStrokePath(
-    IN HDC hdc
-);
+    _In_ HDC hdc);
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiWidenPath(
-    IN HDC hdc
-);
+    _In_ HDC hdc);
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiFlattenPath(
-    IN HDC hdc
-);
+    _In_ HDC hdc);
 
 W32KAPI
 NTSTATUS
@@ -1711,210 +1628,191 @@
 HRGN
 APIENTRY
 NtGdiPathToRegion(
-    IN HDC hdc
-);
+    _In_ HDC hdc);
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiSetMiterLimit(
-    IN HDC hdc,
-    IN DWORD dwNew,
-    IN OUT OPTIONAL PDWORD pdwOut
-);
+    _In_ HDC hdc,
+    _In_ DWORD dwNew,
+    _Out_opt_ PDWORD pdwOut);
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiSetFontXform(
-    IN HDC hdc,
-    IN DWORD dwxScale,
-    IN DWORD dwyScale
-);
-
-W32KAPI
-BOOL
+    _In_ HDC hdc,
+    _In_ DWORD dwxScale,
+    _In_ DWORD dwyScale);
+
+W32KAPI
+BOOL _Success_(return != FALSE)
 APIENTRY
 NtGdiGetMiterLimit(
-    IN HDC hdc,
-    OUT PDWORD pdwOut
-);
+    _In_ HDC hdc,
+    _Out_ PDWORD pdwOut);
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiEllipse(
-    IN HDC hdc,
-    IN INT xLeft,
-    IN INT yTop,
-    IN INT xRight,
-    IN INT yBottom
-);
+    _In_ HDC hdc,
+    _In_ INT xLeft,
+    _In_ INT yTop,
+    _In_ INT xRight,
+    _In_ INT yBottom);
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiRectangle(
-    IN HDC hdc,
-    IN INT xLeft,
-    IN INT yTop,
-    IN INT xRight,
-    IN INT yBottom
-);
+    _In_ HDC hdc,
+    _In_ INT xLeft,
+    _In_ INT yTop,
+    _In_ INT xRight,
+    _In_ INT yBottom);
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiRoundRect(
-    IN HDC hdc,
-    IN INT x1,
-    IN INT y1,
-    IN INT x2,
-    IN INT y2,
-    IN INT x3,
-    IN INT y3
-);
+    _In_ HDC hdc,
+    _In_ INT x1,
+    _In_ INT y1,
+    _In_ INT x2,
+    _In_ INT y2,
+    _In_ INT x3,
+    _In_ INT y3);
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiPlgBlt(
-    IN HDC hdcTrg,
-    IN LPPOINT pptlTrg,
-    IN HDC hdcSrc,
-    IN INT xSrc,
-    IN INT ySrc,
-    IN INT cxSrc,
-    IN INT cySrc,
-    IN HBITMAP hbmMask,
-    IN INT xMask,
-    IN INT yMask,
-    IN DWORD crBackColor
-);
+    _In_ HDC hdcTrg,
+    _In_ LPPOINT pptlTrg,
+    _In_ HDC hdcSrc,
+    _In_ INT xSrc,
+    _In_ INT ySrc,
+    _In_ INT cxSrc,
+    _In_ INT cySrc,
+    _In_ HBITMAP hbmMask,
+    _In_ INT xMask,
+    _In_ INT yMask,
+    _In_ DWORD crBackColor);
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiMaskBlt(
-    IN HDC hdc,
-    IN INT xDst,
-    IN INT yDst,
-    IN INT cx,
-    IN INT cy,
-    IN HDC hdcSrc,
-    IN INT xSrc,
-    IN INT ySrc,
-    IN HBITMAP hbmMask,
-    IN INT xMask,
-    IN INT yMask,
-    IN DWORD dwRop4,
-    IN DWORD crBackColor
-);
+    _In_ HDC hdc,
+    _In_ INT xDst,
+    _In_ INT yDst,
+    _In_ INT cx,
+    _In_ INT cy,
+    _In_ HDC hdcSrc,
+    _In_ INT xSrc,
+    _In_ INT ySrc,
+    _In_opt_ HBITMAP hbmMask,
+    _In_ INT xMask,
+    _In_ INT yMask,
+    _In_ DWORD dwRop4,
+    _In_ DWORD crBackColor);
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiExtFloodFill(
-    IN HDC hdc,
-    IN INT x,
-    IN INT y,
-    IN COLORREF crColor,
-    IN UINT iFillType
-);
+    _In_ HDC hdc,
+    _In_ INT x,
+    _In_ INT y,
+    _In_ COLORREF crColor,
+    _In_ UINT iFillType);
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiFillRgn(
-    IN HDC hdc,
-    IN HRGN hrgn,
-    IN HBRUSH hbrush
-);
+    _In_ HDC hdc,
+    _In_ HRGN hrgn,
+    _In_ HBRUSH hbrush);
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiFrameRgn(
-    IN HDC hdc,
-    IN HRGN hrgn,
-    IN HBRUSH hbrush,
-    IN INT xWidth,
-    IN INT yHeight
-);
+    _In_ HDC hdc,
+    _In_ HRGN hrgn,
+    _In_ HBRUSH hbrush,
+    _In_ INT xWidth,
+    _In_ INT yHeight);
 
 W32KAPI
 COLORREF
 APIENTRY
 NtGdiSetPixel(
-    IN HDC hdcDst,
-    IN INT x,
-    IN INT y,
-    IN COLORREF crColor
-);
+    _In_ HDC hdcDst,
+    _In_ INT x,
+    _In_ INT y,
+    _In_ COLORREF crColor);
 
 W32KAPI
 DWORD
 APIENTRY
 NtGdiGetPixel(
-    IN HDC hdc,
-    IN INT x,
-    IN INT y
-);
+    _In_ HDC hdc,
+    _In_ INT x,
+    _In_ INT y);
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiStartPage(
-    IN HDC hdc
-);
+    _In_ HDC hdc);
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiEndPage(
-    IN HDC hdc
-);
+    _In_ HDC hdc);
 
 W32KAPI
 INT
 APIENTRY
 NtGdiStartDoc(
-    IN HDC hdc,
+    _In_ HDC hdc,
     IN DOCINFOW *pdi,
     OUT BOOL *pbBanding,
-    IN INT iJob
+    _In_ INT iJob
 );
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiEndDoc(
-    IN HDC hdc
-);
+    _In_ HDC hdc);
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiAbortDoc(
-    IN HDC hdc
-);
+    _In_ HDC hdc);
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiUpdateColors(
-    IN HDC hdc
-);
+    _In_ HDC hdc);
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiGetCharWidthW(
-    IN HDC hdc,
-    IN UINT wcFirst,
-    IN UINT cwc,
+    _In_ HDC hdc,
+    _In_ UINT wcFirst,
+    _In_ UINT cwc,
     IN OPTIONAL PWCHAR pwc,
-    IN FLONG fl,
+    _In_ FLONG fl,
     OUT PVOID pvBuf
 );
 
@@ -1922,7 +1820,7 @@
 BOOL
 APIENTRY
 NtGdiGetCharWidthInfo(
-    IN HDC hdc,
+    _In_ HDC hdc,
     OUT PCHWIDTHINFO pChWidthInfo
 );
 
@@ -1930,9 +1828,9 @@
 INT
 APIENTRY
 NtGdiDrawEscape(
-    IN HDC hdc,
-    IN INT iEsc,
-    IN INT cjIn,
+    _In_ HDC hdc,
+    _In_ INT iEsc,
+    _In_ INT cjIn,
     IN OPTIONAL LPSTR pjIn
 );
 
@@ -1940,13 +1838,13 @@
 INT
 APIENTRY
 NtGdiExtEscape(
-    IN HDC hdc,
+    _In_ HDC hdc,
     IN OPTIONAL PWCHAR pDriver,
-    IN INT nDriver,
-    IN INT iEsc,
-    IN INT cjIn,
+    _In_ INT nDriver,
+    _In_ INT iEsc,
+    _In_ INT cjIn,
     IN OPTIONAL LPSTR pjIn,
-    IN INT cjOut,
+    _In_ INT cjOut,
     OUT OPTIONAL LPSTR pjOut
 );
 
@@ -1954,32 +1852,32 @@
 ULONG
 APIENTRY
 NtGdiGetFontData(
-    IN HDC hdc,
-    IN DWORD dwTable,
-    IN DWORD dwOffset,
+    _In_ HDC hdc,
+    _In_ DWORD dwTable,
+    _In_ DWORD dwOffset,
     OUT OPTIONAL PVOID pvBuf,
-    IN ULONG cjBuf
+    _In_ ULONG cjBuf
 );
 
 W32KAPI
 ULONG
 APIENTRY
 NtGdiGetGlyphOutline(
-    IN HDC hdc,
+    _In_ HDC hdc,
     IN WCHAR wch,
-    IN UINT iFormat,
+    _In_ UINT iFormat,
     OUT LPGLYPHMETRICS pgm,
-    IN ULONG cjBuf,
+    _In_ ULONG cjBuf,
     OUT OPTIONAL PVOID pvBuf,
     IN LPMAT2 pmat2,
-    IN BOOL bIgnoreRotation
+    _In_ BOOL bIgnoreRotation
 );
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiGetETM(
-    IN HDC hdc,
+    _In_ HDC hdc,
     OUT EXTTEXTMETRIC *petm
 );
 
@@ -1988,15 +1886,15 @@
 APIENTRY
 NtGdiGetRasterizerCaps(
     OUT LPRASTERIZER_STATUS praststat,
-    IN ULONG cjBytes
+    _In_ ULONG cjBytes
 );
 
 W32KAPI
 ULONG
 APIENTRY
 NtGdiGetKerningPairs(
-    IN HDC hdc,
-    IN ULONG cPairs,
+    _In_ HDC hdc,
+    _In_ ULONG cPairs,
     OUT OPTIONAL KERNINGPAIR *pkpDst
 );
 
@@ -2004,14 +1902,13 @@
 BOOL
 APIENTRY
 NtGdiMonoBitmap(
-    IN HBITMAP hbm
-);
+    _In_ HBITMAP hbm);
 
 W32KAPI
 HBITMAP
 APIENTRY
 NtGdiGetObjectBitmapHandle(
-    IN HBRUSH hbr,
+    _In_ HBRUSH hbr,
     OUT UINT *piUsage
 );
 
@@ -2019,9 +1916,9 @@
 ULONG
 APIENTRY
 NtGdiEnumObjects(
-    IN HDC hdc,
-    IN INT iObjectType,
-    IN ULONG cjBuf,
+    _In_ HDC hdc,
+    _In_ INT iObjectType,
+    _In_ ULONG cjBuf,
     OUT OPTIONAL PVOID pvBuf
 );
 
@@ -2038,8 +1935,8 @@
 BOOL
 APIENTRY
 NtGdiResetDC(
-    IN HDC hdc,
-    IN LPDEVMODEW pdm,
+    _In_ HDC hdc,
+    _In_ LPDEVMODEW pdm,
     OUT PBOOL pbBanding,
     IN OPTIONAL VOID *pDriverInfo2, // this is "typedef struct _DRIVER_INFO_2W
DRIVER_INFO_2W;"
     OUT VOID *ppUMdhpdev
@@ -2049,33 +1946,29 @@
 DWORD
 APIENTRY
 NtGdiSetBoundsRect(
-    IN HDC hdc,
-    IN LPRECT prc,
-    IN DWORD f
-);
+    _In_ HDC hdc,
+    _In_ LPRECT prc,
+    _In_ DWORD f);
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiGetColorAdjustment(
-    IN HDC hdc,
-    OUT PCOLORADJUSTMENT pcaOut
-);
+    _In_ HDC hdc,
+    _Out_ PCOLORADJUSTMENT pcaOut);
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiSetColorAdjustment(
-    IN HDC hdc,
-    IN PCOLORADJUSTMENT pca
-);
+    _In_ HDC hdc,
+    _In_ PCOLORADJUSTMENT pca);
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiCancelDC(
-    IN HDC hdc
-);
+    _In_ HDC hdc);
 
 W32KAPI
 HDC
@@ -2084,8 +1977,8 @@
     IN OPTIONAL PUNICODE_STRING pustrDevice,
     IN DEVMODEW *pdm,  // See note for NtGdiResetDC
     IN PUNICODE_STRING pustrLogAddr,
-    IN ULONG iType,
-    IN BOOL bDisplay,
+    _In_ ULONG iType,
+    _In_ BOOL bDisplay,
     IN OPTIONAL HANDLE hspool,
     IN OPTIONAL VOID *pDriverInfo2, // this is  "typedef struct _DRIVER_INFO_2W
DRIVER_INFO_2W;"
     OUT VOID *pUMdhpdev
@@ -2095,8 +1988,8 @@
 BOOL
 APIENTRY
 NtGdiGetDCDword(
-    IN HDC hdc,
-    IN UINT u,
+    _In_ HDC hdc,
+    _In_ UINT u,
     OUT DWORD *Result
 );
 
@@ -2104,20 +1997,19 @@
 BOOL
 APIENTRY
 NtGdiGetDCPoint(
-    IN HDC hdc,
-    IN UINT iPoint,
-    OUT PPOINTL pptOut
-);
+    _In_ HDC hdc,
+    _In_ UINT iPoint,
+    _Out_ PPOINTL pptOut);
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiScaleViewportExtEx(
-    IN HDC hdc,
-    IN INT xNum,
-    IN INT xDenom,
-    IN INT yNum,
-    IN INT yDenom,
+    _In_ HDC hdc,
+    _In_ INT xNum,
+    _In_ INT xDenom,
+    _In_ INT yNum,
+    _In_ INT yDenom,
     OUT OPTIONAL LPSIZE pszOut
 );
 
@@ -2125,11 +2017,11 @@
 BOOL
 APIENTRY
 NtGdiScaleWindowExtEx(
-    IN HDC hdc,
-    IN INT xNum,
-    IN INT xDenom,
-    IN INT yNum,
-    IN INT yDenom,
+    _In_ HDC hdc,
+    _In_ INT xNum,
+    _In_ INT xDenom,
+    _In_ INT yNum,
+    _In_ INT yDenom,
     OUT OPTIONAL LPSIZE pszOut
 );
 
@@ -2137,83 +2029,76 @@
 BOOL
 APIENTRY
 NtGdiSetVirtualResolution(
-    IN HDC hdc,
-    IN INT cxVirtualDevicePixel,
-    IN INT cyVirtualDevicePixel,
-    IN INT cxVirtualDeviceMm,
-    IN INT cyVirtualDeviceMm
-);
+    _In_ HDC hdc,
+    _In_ INT cxVirtualDevicePixel,
+    _In_ INT cyVirtualDevicePixel,
+    _In_ INT cxVirtualDeviceMm,
+    _In_ INT cyVirtualDeviceMm);
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiSetSizeDevice(
-    IN HDC hdc,
-    IN INT cxVirtualDevice,
-    IN INT cyVirtualDevice
-);
+    _In_ HDC hdc,
+    _In_ INT cxVirtualDevice,
+    _In_ INT cyVirtualDevice);
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiGetTransform(
-    IN HDC hdc,
-    IN DWORD iXform,
-    OUT LPXFORM pxf
-);
+    _In_ HDC hdc,
+    _In_ DWORD iXform,
+    _Out_ LPXFORM pxf);
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiModifyWorldTransform(
-    IN HDC hdc,
-    IN OPTIONAL LPXFORM pxf,
-    IN DWORD iXform
-);
+    _In_ HDC hdc,
+    _In_opt_ LPXFORM pxf,
+    _In_ DWORD iXform);
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiCombineTransform(
-    OUT LPXFORM pxfDst,
-    IN LPXFORM pxfSrc1,
-    IN LPXFORM pxfSrc2
-);
+    _Out_ LPXFORM pxfDst,
+    _In_ LPXFORM pxfSrc1,
+    _In_ LPXFORM pxfSrc2);
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiTransformPoints(
-    IN HDC hdc,
-    IN PPOINT pptIn,
-    OUT PPOINT pptOut,
-    IN INT c,
-    IN INT iMode
-);
+    _In_ HDC hdc,
+    _In_reads_(c) PPOINT pptIn,
+    _Out_writes_(c) PPOINT pptOut,
+    _In_ INT c,
+    _In_ INT iMode);
 
 W32KAPI
 LONG
 APIENTRY
 NtGdiConvertMetafileRect(
-    IN HDC hdc,
-    IN OUT PRECTL prect
-);
+    _In_ HDC hdc,
+    _Inout_ PRECTL prect);
 
 W32KAPI
 INT
 APIENTRY
 NtGdiGetTextCharsetInfo(
-    IN HDC hdc,
+    _In_ HDC hdc,
     OUT OPTIONAL LPFONTSIGNATURE lpSig,
-    IN DWORD dwFlags
+    _In_ DWORD dwFlags
 );
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiDoBanding(
-    IN HDC hdc,
-    IN BOOL bStart,
+    _In_ HDC hdc,
+    _In_ BOOL bStart,
     OUT POINTL *pptl,
     OUT PSIZE pSize
 );
@@ -2222,7 +2107,7 @@
 ULONG
 APIENTRY
 NtGdiGetPerBandInfo(
-    IN HDC hdc,
+    _In_ HDC hdc,
     IN OUT PERBANDINFO *ppbi
 );
 
@@ -2230,545 +2115,490 @@
 NTSTATUS
 APIENTRY
 NtGdiGetStats(
-    IN HANDLE hProcess,
-    IN INT iIndex,
-    IN INT iPidType,
+    _In_ HANDLE hProcess,
+    _In_ INT iIndex,
+    _In_ INT iPidType,
     OUT PVOID pResults,
-    IN UINT cjResultSize
+    _In_ UINT cjResultSize
 );
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiSetMagicColors(
-    IN HDC hdc,
+    _In_ HDC hdc,
     IN PALETTEENTRY peMagic,
-    IN ULONG Index
+    _In_ ULONG Index
 );
 
 W32KAPI
 HBRUSH
 APIENTRY
 NtGdiSelectBrush(
-    IN HDC hdc,
-    IN HBRUSH hbrush
+    _In_ HDC hdc,
+    _In_ HBRUSH hbrush
 );
 
 W32KAPI
 HPEN
 APIENTRY
 NtGdiSelectPen(
-    IN HDC hdc,
-    IN HPEN hpen
-);
+    _In_ HDC hdc,
+    _In_ HPEN hpen);
 
 W32KAPI
 HBITMAP
 APIENTRY
 NtGdiSelectBitmap(
-    IN HDC hdc,
-    IN HBITMAP hbm
-);
+    _In_ HDC hdc,
+    _In_ HBITMAP hbm);
 
 W32KAPI
 HFONT
 APIENTRY
 NtGdiSelectFont(
-    IN HDC hdc,
-    IN HFONT hf
-);
+    _In_ HDC hdc,
+    _In_ HFONT hf);
 
 W32KAPI
 INT
 APIENTRY
 NtGdiExtSelectClipRgn(
-    IN HDC hdc,
-    IN HRGN hrgn,
-    IN INT iMode
-);
+    _In_ HDC hdc,
+    _In_ HRGN hrgn,
+    _In_ INT iMode);
 
 W32KAPI
 HPEN
 APIENTRY
 NtGdiCreatePen(
-    IN INT iPenStyle,
-    IN INT iPenWidth,
-    IN COLORREF cr,
-    IN HBRUSH hbr
-);
+    _In_ INT iPenStyle,
+    _In_ INT iPenWidth,
+    _In_ COLORREF cr,
+    _In_ HBRUSH hbr);
 
 #ifdef _WINDOWBLT_NOTIFICATION_
 W32KAPI
 BOOL
 APIENTRY
 NtGdiBitBlt(
-    IN HDC hdcDst,
-    IN INT x,
-    IN INT y,
-    IN INT cx,
-    IN INT cy,
-    IN HDC hdcSrc,
-    IN INT xSrc,
-    IN INT ySrc,
-    IN DWORD rop4,
-    IN DWORD crBackColor,
-    IN FLONG fl
-);
+    _In_ HDC hdcDst,
+    _In_ INT x,
+    _In_ INT y,
+    _In_ INT cx,
+    _In_ INT cy,
+    _In_ HDC hdcSrc,
+    _In_ INT xSrc,
+    _In_ INT ySrc,
+    _In_ DWORD rop4,
+    _In_ DWORD crBackColor,
+    _In_ FLONG fl);
 #else
 W32KAPI
 BOOL
 APIENTRY
 NtGdiBitBlt(
-    IN HDC hdcDst,
-    IN INT x,
-    IN INT y,
-    IN INT cx,
-    IN INT cy,
-    IN HDC hdcSrc,
-    IN INT xSrc,
-    IN INT ySrc,
-    IN DWORD rop4,
-    IN DWORD crBackColor
-);
+    _In_ HDC hdcDst,
+    _In_ INT x,
+    _In_ INT y,
+    _In_ INT cx,
+    _In_ INT cy,
+    _In_ HDC hdcSrc,
+    _In_ INT xSrc,
+    _In_ INT ySrc,
+    _In_ DWORD rop4,
+    _In_ DWORD crBackColor);
 #endif
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiTileBitBlt(
-    IN HDC hdcDst,
-    IN RECTL * prectDst,
-    IN HDC hdcSrc,
-    IN RECTL * prectSrc,
-    IN POINTL * pptlOrigin,
-    IN DWORD rop4,
-    IN DWORD crBackColor
-);
+    _In_ HDC hdcDst,
+    _In_ RECTL *prectDst,
+    _In_ HDC hdcSrc,
+    _In_ RECTL *prectSrc,
+    _In_ POINTL *pptlOrigin,
+    _In_ DWORD rop4,
+    _In_ DWORD crBackColor);
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiTransparentBlt(
-    IN HDC hdcDst,
-    IN INT xDst,
-    IN INT yDst,
-    IN INT cxDst,
-    IN INT cyDst,
-    IN HDC hdcSrc,
-    IN INT xSrc,
-    IN INT ySrc,
-    IN INT cxSrc,
-    IN INT cySrc,
-    IN COLORREF TransColor
-);
+    _In_ HDC hdcDst,
+    _In_ INT xDst,
+    _In_ INT yDst,
+    _In_ INT cxDst,
+    _In_ INT cyDst,
+    _In_ HDC hdcSrc,
+    _In_ INT xSrc,
+    _In_ INT ySrc,
+    _In_ INT cxSrc,
+    _In_ INT cySrc,
+    _In_ COLORREF TransColor);
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiGetTextExtent(
-    IN HDC hdc,
-    IN LPWSTR lpwsz,
-    IN INT cwc,
-    OUT LPSIZE psize,
-    IN UINT flOpts
-);
+    _In_ HDC hdc,
+    _In_z_count_(cwc) LPWSTR lpwsz,
+    _In_ INT cwc,
+    _Out_ LPSIZE psize,
+    _In_ UINT flOpts);
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiGetTextMetricsW(
-    IN HDC hdc,
-    OUT TMW_INTERNAL * ptm,
-    IN ULONG cj
-);
+    _In_ HDC hdc,
+    _Out_bytecap_(cj) TMW_INTERNAL * ptm,
+    _In_ ULONG cj);
 
 W32KAPI
 INT
 APIENTRY
 NtGdiGetTextFaceW(
-    IN HDC hdc,
-    IN INT cChar,
+    _In_ HDC hdc,
+    _In_ INT cChar,
     OUT OPTIONAL LPWSTR pszOut,
-    IN BOOL bAliasName
+    _In_ BOOL bAliasName
 );
 
 W32KAPI
 INT
 APIENTRY
 NtGdiGetRandomRgn(
-    IN HDC hdc,
-    IN HRGN hrgn,
-    IN INT iRgn
-);
+    _In_ HDC hdc,
+    _In_ HRGN hrgn,
+    _In_ INT iRgn);
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiExtTextOutW(
-    IN HDC hdc,
-    IN INT x,
-    IN INT y,
-    IN UINT flOpts,
+    _In_ HDC hdc,
+    _In_ INT x,
+    _In_ INT y,
+    _In_ UINT flOpts,
     IN OPTIONAL LPRECT prcl,
-    IN LPWSTR pwsz,
-    IN INT cwc,
+    _In_z_count_(cwc) LPWSTR pwsz,
+    _In_ INT cwc,
     IN OPTIONAL LPINT pdx,
-    IN DWORD dwCodePage
+    _In_ DWORD dwCodePage
 );
 
 W32KAPI
 INT
 APIENTRY
 NtGdiIntersectClipRect(
-    IN HDC hdc,
-    IN INT xLeft,
-    IN INT yTop,
-    IN INT xRight,
-    IN INT yBottom
-);
+    _In_ HDC hdc,
+    _In_ INT xLeft,
+    _In_ INT yTop,
+    _In_ INT xRight,
+    _In_ INT yBottom);
 
 W32KAPI
 HRGN
 APIENTRY
 NtGdiCreateRectRgn(
-    IN INT xLeft,
-    IN INT yTop,
-    IN INT xRight,
-    IN INT yBottom
-);
+    _In_ INT xLeft,
+    _In_ INT yTop,
+    _In_ INT xRight,
+    _In_ INT yBottom);
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiPatBlt(
-    IN HDC hdcDst,
-    IN INT x,
-    IN INT y,
-    IN INT cx,
-    IN INT cy,
-    IN DWORD rop4
-);
+    _In_ HDC hdcDest,
+    _In_ INT x,
+    _In_ INT y,
+    _In_ INT cx,
+    _In_ INT cy,
+    _In_ DWORD dwRop);
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiPolyPatBlt(
-    IN HDC hdc,
-    IN DWORD rop4,
-    IN PPOLYPATBLT pPoly,
-    IN DWORD Count,
-    IN DWORD Mode
-);
+    _In_ HDC hdc,
+    _In_ DWORD rop4,
+    _In_ PPOLYPATBLT pPoly,
+    _In_ DWORD Count,
+    _In_ DWORD Mode);
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiUnrealizeObject(
-    IN HANDLE h
-);
+    _In_ HANDLE h);
 
 W32KAPI
 HANDLE
 APIENTRY
 NtGdiGetStockObject(
-    IN INT iObject
-);
+    _In_ INT iObject);
 
 W32KAPI
 HBITMAP
 APIENTRY
 NtGdiCreateCompatibleBitmap(
-    IN HDC hdc,
-    IN INT cx,
-    IN INT cy
-);
+    _In_ HDC hdc,
+    _In_ INT cx,
+    _In_ INT cy);
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiLineTo(
-    IN HDC hdc,
-    IN INT x,
-    IN INT y
-);
-
-W32KAPI
-BOOL
+    _In_ HDC hdc,
+    _In_ INT x,
+    _In_ INT y);
+
+W32KAPI
+BOOL _Success_(return != FALSE)
 APIENTRY
 NtGdiMoveTo(
-    IN HDC hdc,
-    IN INT x,
-    IN INT y,
-    OUT OPTIONAL LPPOINT pptOut
-);
+    _In_ HDC hdc,
+    _In_ INT x,
+    _In_ INT y,
+    _Out_opt_ LPPOINT pptOut);
 
 W32KAPI
 INT
 APIENTRY
 NtGdiExtGetObjectW(
-    IN HANDLE h,
-    IN INT cj,
-    OUT OPTIONAL LPVOID pvOut
-);
+    _In_ HANDLE h,
+    _In_ INT cj,
+    _Out_opt_bytecap_(cj) LPVOID pvOut);
 
 W32KAPI
 INT
 APIENTRY
 NtGdiGetDeviceCaps(
-    IN HDC hdc,
-    IN INT i
-);
+    _In_ HDC hdc,
+    _In_ INT i);
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiGetDeviceCapsAll (
-    IN HDC hdc,
-    OUT PDEVCAPS pDevCaps
-);
+    _In_ HDC hdc,
+    _Out_ PDEVCAPS pDevCaps);
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiStretchBlt(
-    IN HDC hdcDst,
-    IN INT xDst,
-    IN INT yDst,
-    IN INT cxDst,
-    IN INT cyDst,
-    IN HDC hdcSrc,
-    IN INT xSrc,
-    IN INT ySrc,
-    IN INT cxSrc,
-    IN INT cySrc,
-    IN DWORD dwRop,
-    IN DWORD dwBackColor
-);
-
-W32KAPI
-BOOL
+    _In_ HDC hdcDst,
+    _In_ INT xDst,
+    _In_ INT yDst,
+    _In_ INT cxDst,
+    _In_ INT cyDst,
+    _In_ HDC hdcSrc,
+    _In_ INT xSrc,
+    _In_ INT ySrc,
+    _In_ INT cxSrc,
+    _In_ INT cySrc,
+    _In_ DWORD dwRop,
+    _In_ DWORD dwBackColor);
+
+W32KAPI
+BOOL _Success_(return != FALSE)
 APIENTRY
 NtGdiSetBrushOrg(
-    IN HDC hdc,
-    IN INT x,
-    IN INT y,
-    OUT LPPOINT pptOut
-);
+    _In_ HDC hdc,
+    _In_ INT x,
+    _In_ INT y,
+    _Out_opt_ LPPOINT pptOut);
 
 W32KAPI
 HBITMAP
 APIENTRY
 NtGdiCreateBitmap(
-    IN INT cx,
-    IN INT cy,
-    IN UINT cPlanes,
-    IN UINT cBPP,
-    IN OPTIONAL LPBYTE pjInit
-);
+    _In_ INT cx,
+    _In_ INT cy,
+    _In_ UINT cPlanes,
+    _In_ UINT cBPP,
+    _In_opt_ LPBYTE pjInit);
 
 W32KAPI
 HPALETTE
 APIENTRY
 NtGdiCreateHalftonePalette(
-    IN HDC hdc
-);
+    _In_ HDC hdc);
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiRestoreDC(
-    IN HDC hdc,
-    IN INT iLevel
-);
+    _In_ HDC hdc,
+    _In_ INT iLevel);
 
 W32KAPI
 INT
 APIENTRY
 NtGdiExcludeClipRect(
-    IN HDC hdc,
-    IN INT xLeft,
-    IN INT yTop,
-    IN INT xRight,
-    IN INT yBottom
-);
+    _In_ HDC hdc,
+    _In_ INT xLeft,
+    _In_ INT yTop,
+    _In_ INT xRight,
+    _In_ INT yBottom);
 
 W32KAPI
 INT
 APIENTRY
 NtGdiSaveDC(
-    IN HDC hdc
-);
+    _In_ HDC hdc);
 
 W32KAPI
 INT
 APIENTRY
 NtGdiCombineRgn(
-    IN HRGN hrgnDst,
-    IN HRGN hrgnSrc1,
-    IN HRGN hrgnSrc2,
-    IN INT iMode
-);
+    _In_ HRGN hrgnDst,
+    _In_ HRGN hrgnSrc1,
+    _In_opt_ HRGN hrgnSrc2,
+    _In_ INT iMode);
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiSetRectRgn(
-    IN HRGN hrgn,
-    IN INT xLeft,
-    IN INT yTop,
-    IN INT xRight,
-    IN INT yBottom
-);
+    _In_ HRGN hrgn,
+    _In_ INT xLeft,
+    _In_ INT yTop,
+    _In_ INT xRight,
+    _In_ INT yBottom);
 
 W32KAPI
 LONG
 APIENTRY
 NtGdiSetBitmapBits(
-    IN HBITMAP hbm,
-    IN ULONG cj,
-    IN PBYTE pjInit
-);
+    _In_ HBITMAP hbm,
+    _In_ ULONG cj,
+    _In_bytecount_(cj) PBYTE pjInit);
 
 W32KAPI
 INT
 APIENTRY
 NtGdiGetDIBitsInternal(
-    IN HDC hdc,
-    IN HBITMAP hbm,
-    IN UINT iStartScan,
-    IN UINT cScans,
-    OUT OPTIONAL LPBYTE pBits,
-    IN OUT LPBITMAPINFO pbmi,
-    IN UINT iUsage,
-    IN UINT cjMaxBits,
-    IN UINT cjMaxInfo
-);
+    _In_ HDC hdc,
+    _In_ HBITMAP hbm,
+    _In_ UINT iStartScan,
+    _In_ UINT cScans,
+    _Out_opt_ LPBYTE pBits,
+    _Inout_ LPBITMAPINFO pbmi,
+    _In_ UINT iUsage,
+    _In_ UINT cjMaxBits,
+    _In_ UINT cjMaxInfo);
 
 W32KAPI
 INT
 APIENTRY
 NtGdiOffsetRgn(
-    IN HRGN hrgn,
-    IN INT cx,
-    IN INT cy
-);
+    _In_ HRGN hrgn,
+    _In_ INT cx,
+    _In_ INT cy);
 
 W32KAPI
 INT
 APIENTRY
-NtGdiGetRandomRgn(
-    IN HDC hDC,
-    OUT HRGN hDest,
-    IN INT iCode
-);
-
-W32KAPI
+NtGdiGetRgnBox(
+    _In_ HRGN hrgn,
+    _Out_ LPRECT prcOut);
+
+W32KAPI
+BOOL
+APIENTRY
+NtGdiRectInRegion(
+    _In_ HRGN hrgn,
+    IN OUT LPRECT prcl
+);
+
+W32KAPI
+DWORD
+APIENTRY
+NtGdiGetBoundsRect(
+    _In_ HDC hdc,
+    _Out_ LPRECT prc,
+    _In_ DWORD f);
+
+W32KAPI
+BOOL
+APIENTRY
+NtGdiPtInRegion(
+    _In_ HRGN hrgn,
+    _In_ INT x,
+    _In_ INT y);
+
+W32KAPI
+COLORREF
+APIENTRY
+NtGdiGetNearestColor(
+    _In_ HDC hdc,
+    _In_ COLORREF cr);
+
+W32KAPI
+UINT
+APIENTRY
+NtGdiGetSystemPaletteUse(
+    _In_ HDC hdc);
+
+W32KAPI
+UINT
+APIENTRY
+NtGdiSetSystemPaletteUse(
+    _In_ HDC hdc,
+    _In_ UINT ui);
+
+W32KAPI
+DWORD
+APIENTRY
+NtGdiGetRegionData(
+    _In_ HRGN hrgn,
+    _In_ DWORD nCount,
+    _Out_opt_ LPRGNDATA lpRgnData);
+
+W32KAPI
+BOOL
+APIENTRY
+NtGdiInvertRgn(
+    _In_ HDC hdc,
+    _In_ HRGN hrgn);
+
 INT
-APIENTRY
-NtGdiGetRgnBox(
-    IN HRGN hrgn,
-    OUT LPRECT prcOut
-);
-
-W32KAPI
-BOOL
-APIENTRY
-NtGdiRectInRegion(
-    IN HRGN hrgn,
-    IN OUT LPRECT prcl
-);
-
-W32KAPI
-DWORD
-APIENTRY
-NtGdiGetBoundsRect(
-    IN HDC hdc,
-    OUT LPRECT prc,
-    IN DWORD f
-);
-
-W32KAPI
-BOOL
-APIENTRY
-NtGdiPtInRegion(
-    IN HRGN hrgn,
-    IN INT x,
-    IN INT y
-);
-
-W32KAPI
-COLORREF
-APIENTRY
-NtGdiGetNearestColor(
-    IN HDC hdc,
-    IN COLORREF cr
-);
-
-W32KAPI
-UINT
-APIENTRY
-NtGdiGetSystemPaletteUse(
-    IN HDC hdc
-);
-
-W32KAPI
-UINT
-APIENTRY
-NtGdiSetSystemPaletteUse(
-    IN HDC hdc,
-    IN UINT ui
-);
-
-W32KAPI
-DWORD
-APIENTRY
-NtGdiGetRegionData(
-    IN HRGN hrgn,
-    IN DWORD nCount,
-    OUT OPTIONAL LPRGNDATA lpRgnData
-);
-
-W32KAPI
-BOOL
-APIENTRY
-NtGdiInvertRgn(
-    IN HDC hdc,
-    IN HRGN hrgn
-);
-
-INT
 W32KAPI
 APIENTRY
 NtGdiAddFontResourceW(
-    IN WCHAR *pwszFiles,
-    IN ULONG cwc,
-    IN ULONG cFiles,
-    IN FLONG f,
-    IN DWORD dwPidTid,
-    IN OPTIONAL DESIGNVECTOR *pdv
-);
+    _In_z_count_(cwc) WCHAR *pwszFiles,
+    _In_ ULONG cwc,
+    _In_ ULONG cFiles,
+    _In_ FLONG f,
+    _In_ DWORD dwPidTid,
+    _In_opt_ DESIGNVECTOR *pdv);
 
 #if (_WIN32_WINNT >= 0x0500)
 W32KAPI
 HFONT
 APIENTRY
 NtGdiHfontCreate(
-    IN ENUMLOGFONTEXDVW *pelfw,
-    IN ULONG cjElfw,
-    IN LFTYPE lft,
-    IN FLONG  fl,
-    IN PVOID pvCliData
-);
+    _In_bytecount_(cjElfw) ENUMLOGFONTEXDVW *pelfw,
+    _In_ ULONG cjElfw,
+    _In_ LFTYPE lft,
+    _In_ FLONG fl,
+    _In_ PVOID pvCliData);
 #else
 W32KAPI
 HFONT
 APIENTRY
 NtGdiHfontCreate(
-    IN LPEXTLOGFONTW pelfw,
-    IN ULONG cjElfw,
-    IN LFTYPE lft,
-    IN FLONG fl,
-    IN PVOID pvCliData
+    _In_bytecount_(cjElfw) LPEXTLOGFONTW pelfw,
+    _In_ ULONG cjElfw,
+    _In_ LFTYPE lft,
+    _In_ FLONG fl,
+    _In_ PVOID pvCliData
 );
 #endif
 
@@ -2776,24 +2606,22 @@
 ULONG
 APIENTRY
 NtGdiSetFontEnumeration(
-    IN ULONG ulType
-);
+    _In_ ULONG ulType);
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiEnumFontClose(
-    IN ULONG_PTR idEnum
-);
+    _In_ ULONG_PTR idEnum);
 
 #if (_WIN32_WINNT >= 0x0500)
 W32KAPI
 BOOL
 APIENTRY
 NtGdiEnumFontChunk(
-    IN HDC hdc,
-    IN ULONG_PTR idEnum,
-    IN ULONG cjEfdw,
+    _In_ HDC hdc,
+    _In_ ULONG_PTR idEnum,
+    _In_ ULONG cjEfdw,
     OUT ULONG *pcjEfdw,
     OUT PENUMFONTDATAW pefdw
 );
@@ -2803,12 +2631,12 @@
 ULONG_PTR
 APIENTRY
 NtGdiEnumFontOpen(
-    IN HDC hdc,
-    IN ULONG iEnumType,
-    IN FLONG flWin31Compat,
-    IN ULONG cwchMax,
+    _In_ HDC hdc,
+    _In_ ULONG iEnumType,
+    _In_ FLONG flWin31Compat,
+    _In_ ULONG cwchMax,
     IN OPTIONAL LPWSTR pwszFaceName,
-    IN ULONG lfCharSet,
+    _In_ ULONG lfCharSet,
     OUT ULONG *pulCount
 );
 
@@ -2817,7 +2645,7 @@
 APIENTRY
 NtGdiQueryFonts(
     OUT PUNIVERSAL_FONT_ID pufiFontList,
-    IN ULONG nBufferSize,
+    _In_ ULONG nBufferSize,
     OUT PLARGE_INTEGER pTimeStamp
 );
 
@@ -2825,11 +2653,10 @@
 BOOL
 APIENTRY
 NtGdiConsoleTextOut(
-    IN HDC hdc,
-    IN POLYTEXTW *lpto,
-    IN UINT nStrings,
-    IN RECTL *prclBounds
-);
+    _In_ HDC hdc,
+    _In_ POLYTEXTW *lpto,
+    _In_ UINT nStrings,
+    _In_ RECTL *prclBounds);
 
 W32KAPI
 NTSTATUS
@@ -2837,7 +2664,7 @@
 NtGdiFullscreenControl(
     IN FULLSCREENCONTROL FullscreenCommand,
     IN PVOID FullscreenInput,
-    IN DWORD FullscreenInputLength,
+    _In_ DWORD FullscreenInputLength,
     OUT PVOID FullscreenOutput,
     IN OUT PULONG FullscreenOutputLength
 );
@@ -2846,64 +2673,59 @@
 DWORD
 APIENTRY
 NtGdiGetCharSet(
-    IN HDC hdc
-);
+    _In_ HDC hdc);
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiEnableEudc(
-    IN BOOL
-);
+    _In_ BOOL b);
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiEudcLoadUnloadLink(
     IN OPTIONAL LPCWSTR pBaseFaceName,
-    IN UINT cwcBaseFaceName,
+    _In_ UINT cwcBaseFaceName,
     IN LPCWSTR pEudcFontPath,
-    IN UINT cwcEudcFontPath,
-    IN INT iPriority,
-    IN INT iFontLinkType,
-    IN BOOL bLoadLin
+    _In_ UINT cwcEudcFontPath,
+    _In_ INT iPriority,
+    _In_ INT iFontLinkType,
+    _In_ BOOL bLoadLin
 );
 
 W32KAPI
 UINT
 APIENTRY
 NtGdiGetStringBitmapW(
-    IN HDC hdc,
+    _In_ HDC hdc,
     IN LPWSTR pwsz,
-    IN UINT cwc,
+    _In_ UINT cwc,
     OUT BYTE *lpSB,
-    IN UINT cj
+    _In_ UINT cj
 );
 
 W32KAPI
 ULONG
 APIENTRY
 NtGdiGetEudcTimeStampEx(
-    IN OPTIONAL LPWSTR lpBaseFaceName,
-    IN ULONG cwcBaseFaceName,
-    IN BOOL bSystemTimeStamp
-);
+    _In_opt_z_count_(cwcBaseFaceName) LPWSTR lpBaseFaceName,
+    _In_ ULONG cwcBaseFaceName,
+    _In_ BOOL bSystemTimeStamp);
 
 W32KAPI
 ULONG
 APIENTRY
 NtGdiQueryFontAssocInfo(
-    IN HDC hdc
-);
+    _In_ HDC hdc);
 
 #if (_WIN32_WINNT >= 0x0500)
 W32KAPI
 DWORD
 APIENTRY
 NtGdiGetFontUnicodeRanges(
-    IN HDC hdc,
-    OUT OPTIONAL LPGLYPHSET pgs
-);
+    _In_ HDC hdc,
+    _Out_opt_ LPGLYPHSET pgs);
 #endif
 
 #ifdef LANGPACK
@@ -2911,185 +2733,167 @@
 BOOL
 APIENTRY
 NtGdiGetRealizationInfo(
-    IN HDC hdc,
-    OUT PREALIZATION_INFO pri,
-    IN HFONT hf
-);
+    _In_ HDC hdc,
+    _Out_ PREALIZATION_INFO pri,
+    _In_ HFONT hf);
 #endif
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiAddRemoteMMInstanceToDC(
-    IN HDC hdc,
-    IN DOWNLOADDESIGNVECTOR *pddv,
-    IN ULONG cjDDV
-);
+    _In_ HDC hdc,
+    _In_ DOWNLOADDESIGNVECTOR *pddv,
+    _In_ ULONG cjDDV);
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiUnloadPrinterDriver(
-    IN LPWSTR pDriverName,
-    IN ULONG cbDriverName
-);
+    _In_z_bytecount_(cbDriverName) LPWSTR pDriverName,
+    _In_ ULONG cbDriverName);
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiEngAssociateSurface(
-    IN HSURF hsurf,
-    IN HDEV hdev,
-    IN FLONG flHooks
-);
+    _In_ HSURF hsurf,
+    _In_ HDEV hdev,
+    _In_ FLONG flHooks);
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiEngEraseSurface(
-    IN SURFOBJ *pso,
-    IN RECTL *prcl,
-    IN ULONG iColor
-);
+    _In_ SURFOBJ *pso,
+    _In_ RECTL *prcl,
+    _In_ ULONG iColor);
 
 W32KAPI
 HBITMAP
 APIENTRY
 NtGdiEngCreateBitmap(
-    IN SIZEL sizl,
-    IN LONG lWidth,
-    IN ULONG iFormat,
-    IN FLONG fl,
-    IN OPTIONAL PVOID pvBits
-);
+    _In_ SIZEL sizl,
+    _In_ LONG lWidth,
+    _In_ ULONG iFormat,
+    _In_ FLONG fl,
+    _In_opt_ PVOID pvBits);
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiEngDeleteSurface(
-    IN HSURF hsurf
-);
+    _In_ HSURF hsurf);
 
 W32KAPI
 SURFOBJ*
 APIENTRY
 NtGdiEngLockSurface(
-    IN HSURF hsurf
-);
+    _In_ HSURF hsurf);
 
 W32KAPI
 VOID
 APIENTRY
 NtGdiEngUnlockSurface(
-    IN SURFOBJ *
-);
+    _In_ SURFOBJ *pso);
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiEngMarkBandingSurface(
-    IN HSURF hsurf
-);
+    _In_ HSURF hsurf);
 
 W32KAPI
 HSURF
 APIENTRY
 NtGdiEngCreateDeviceSurface(
-    IN DHSURF dhsurf,
-    IN SIZEL sizl,
-    IN ULONG iFormatCompat
-);
+    _In_ DHSURF dhsurf,
+    _In_ SIZEL sizl,
+    _In_ ULONG iFormatCompat);
 
 W32KAPI
 HBITMAP
 APIENTRY
 NtGdiEngCreateDeviceBitmap(
-    IN DHSURF dhsurf,
-    IN SIZEL sizl,
-    IN ULONG iFormatCompat
-);
+    _In_ DHSURF dhsurf,
+    _In_ SIZEL sizl,
+    _In_ ULONG iFormatCompat);
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiEngCopyBits(
-    IN SURFOBJ *psoDst,
-    IN SURFOBJ *psoSrc,
-    IN OPTIONAL CLIPOBJ *pco,
-    IN XLATEOBJ *pxlo,
-    IN RECTL *prclDst,
-    IN POINTL *pptlSrc
-);
+    _In_ SURFOBJ *psoDst,
+    _In_ SURFOBJ *psoSrc,
+    _In_opt_ CLIPOBJ *pco,
+    _In_opt_ XLATEOBJ *pxlo,
+    _In_ RECTL *prclDst,
+    _In_ POINTL *pptlSrc);
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiEngStretchBlt(
-    IN SURFOBJ *psoDest,
-    IN SURFOBJ *psoSrc,
-    IN SURFOBJ *psoMask,
-    IN CLIPOBJ *pco,
-    IN XLATEOBJ *pxlo,
-    IN COLORADJUSTMENT *pca,
-    IN POINTL *pptlHTOrg,
-    IN RECTL *prclDest,
-    IN RECTL *prclSrc,
-    IN POINTL *pptlMask,
-    IN ULONG iMode
-);
+    _In_ SURFOBJ *psoDest,
+    _In_ SURFOBJ *psoSrc,
+    _In_opt_ SURFOBJ *psoMask,
+    _In_opt_ CLIPOBJ *pco,
+    _In_opt_ XLATEOBJ *pxlo,
+    _In_opt_ COLORADJUSTMENT *pca,
+    _In_ POINTL *pptlHTOrg,
+    _In_ RECTL *prclDest,
+    _In_ RECTL *prclSrc,
+    _When_(psoMask, _In_) POINTL *pptlMask,
+    _In_ ULONG iMode);
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiEngBitBlt(
-    IN SURFOBJ *psoDst,
-    IN SURFOBJ *psoSrc,
-    IN SURFOBJ *psoMask,
-    IN CLIPOBJ *pco,
-    IN XLATEOBJ *pxlo,
-    IN RECTL *prclDst,
-    IN POINTL *pptlSrc,
-    IN POINTL *pptlMask,
-    IN BRUSHOBJ *pbo,
-    IN POINTL *pptlBrush,
-    IN ROP4 rop4
-);
+    _In_ SURFOBJ *psoTrg,
+    _In_opt_ SURFOBJ *psoSrc,
+    _In_opt_ SURFOBJ *psoMask,
+    _In_opt_ CLIPOBJ *pco,
+    _In_opt_ XLATEOBJ *pxlo,
+    _In_ RECTL *prclTrg,
+    _When_(psoSrc, _In_) POINTL *pptlSrc,
+    _When_(psoMask, _In_) POINTL *pptlMask,
+    _In_opt_ BRUSHOBJ *pbo,
+    _When_(pbo, _In_) POINTL *pptlBrush,
+    _In_ ROP4 rop4);
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiEngPlgBlt(
-    IN SURFOBJ *psoTrg,
-    IN SURFOBJ *psoSrc,
-    IN OPTIONAL SURFOBJ *psoMsk,
-    IN CLIPOBJ *pco,
-    IN XLATEOBJ *pxlo,
-    IN COLORADJUSTMENT *pca,
-    IN POINTL *pptlBrushOrg,
-    IN POINTFIX *pptfxDest,
-    IN RECTL *prclSrc,
-    IN OPTIONAL POINTL *pptlMask,
-    IN ULONG iMode
-);
+    _In_ SURFOBJ *psoTrg,
+    _In_ SURFOBJ *psoSrc,
+    _In_opt_ SURFOBJ *psoMsk,
+    _In_ CLIPOBJ *pco,
+    _In_opt_ XLATEOBJ *pxlo,
+    _In_ COLORADJUSTMENT *pca,
+    _In_ POINTL *pptlBrushOrg,
+    _In_ POINTFIX *pptfx,
+    _In_ RECTL *prcl,
+    _When_(psoMsk, _In_) POINTL *pptl,
+    _In_ ULONG iMode);
 
 W32KAPI
 HPALETTE
 APIENTRY
 NtGdiEngCreatePalette(
-    IN ULONG iMode,
-    IN ULONG cColors,
-    IN ULONG *pulColors,
-    IN FLONG flRed,
-    IN FLONG flGreen,
-    IN FLONG flBlue
-);
+    _In_ ULONG iMode,
+    _In_ ULONG cColors,
+    _In_ ULONG *pulColors,
+    _In_ FLONG flRed,
+    _In_ FLONG flGreen,
+    _In_ FLONG flBlue);
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiEngDeletePalette(
-    IN HPALETTE hPal
-);
+    _In_ HPALETTE hPal);
 
 W32KAPI
 BOOL
@@ -3151,10 +2955,10 @@
     IN SURFOBJ *pso,
     IN CLIPOBJ *pco,
     IN BRUSHOBJ *pbo,
-    IN LONG x1,
-    IN LONG y1,
-    IN LONG x2,
-    IN LONG y2,
+    _In_ LONG x1,
+    _In_ LONG y1,
+    _In_ LONG x2,
+    _In_ LONG y2,
     IN RECTL *prclBounds,
     IN MIX mix
 );
@@ -3180,12 +2984,12 @@
     IN CLIPOBJ *pco,
     IN XLATEOBJ *pxlo,
     IN TRIVERTEX *pVertex,
-    IN ULONG nVertex,
+    _In_ ULONG nVertex,
     IN PVOID pMesh,
-    IN ULONG nMesh,
+    _In_ ULONG nMesh,
     IN RECTL *prclExtents,
     IN POINTL *pptlDitherOrg,
-    IN ULONG ulMode
+    _In_ ULONG ulMode
 );
 
 W32KAPI
@@ -3198,8 +3002,8 @@
     IN XLATEOBJ *pxlo,
     IN RECTL *prclDst,
     IN RECTL *prclSrc,
-    IN ULONG iTransColor,
-    IN ULONG ulReserved
+    _In_ ULONG iTransColor,
+    _In_ ULONG ulReserved
 );
 
 W32KAPI
@@ -3232,7 +3036,7 @@
     IN RECTL *prclTrg,
     IN RECTL *prclSrc,
     IN POINTL *pptlMask,
-    IN ULONG iMode,
+    _In_ ULONG iMode,
     IN BRUSHOBJ *pbo,
     IN ROP4 rop4
 );
@@ -3242,8 +3046,8 @@
 APIENTRY
 NtGdiXLATEOBJ_cGetPalette(
     IN XLATEOBJ *pxlo,
-    IN ULONG iPal,
-    IN ULONG cPal,
+    _In_ ULONG iPal,
+    _In_ ULONG cPal,
     OUT ULONG *pPal
 );
 
@@ -3252,10 +3056,10 @@
 APIENTRY
 NtGdiCLIPOBJ_cEnumStart(
     IN CLIPOBJ *pco,
-    IN BOOL bAll,
-    IN ULONG iType,
-    IN ULONG iDirection,
-    IN ULONG cLimit
+    _In_ BOOL bAll,
+    _In_ ULONG iType,
+    _In_ ULONG iDirection,
+    _In_ ULONG cLimit
 );
 
 W32KAPI
@@ -3263,7 +3067,7 @@
 APIENTRY
 NtGdiCLIPOBJ_bEnum(
     IN CLIPOBJ *pco,
-    IN ULONG cj,
+    _In_ ULONG cj,
     OUT ULONG *pul
 );
 
@@ -3291,7 +3095,7 @@
 APIENTRY
 NtGdiBRUSHOBJ_pvAllocRbrush(
     IN BRUSHOBJ *pbo,
-    IN ULONG cj
+    _In_ ULONG cj
 );
 
 W32KAPI
@@ -3320,8 +3124,8 @@
 APIENTRY
 NtGdiXFORMOBJ_bApplyXform(
     IN XFORMOBJ *pxo,
-    IN ULONG iMode,
-    IN ULONG cPoints,
+    _In_ ULONG iMode,
+    _In_ ULONG cPoints,
     IN  PVOID pvIn,
     OUT PVOID pvOut
 );
@@ -3339,7 +3143,7 @@
 APIENTRY
 NtGdiFONTOBJ_vGetInfo(
     IN FONTOBJ *pfo,
-    IN ULONG cjSize,
+    _In_ ULONG cjSize,
     OUT FONTINFO *pfi
 );
 
@@ -3348,8 +3152,8 @@
 APIENTRY
 NtGdiFONTOBJ_cGetGlyphs(
     IN FONTOBJ *pfo,
-    IN ULONG iMode,
-    IN ULONG cGlyph,
+    _In_ ULONG iMode,
+    _In_ ULONG cGlyph,
     IN HGLYPH *phg,
     OUT PVOID *ppvGlyph
 );
@@ -3396,7 +3200,7 @@
 APIENTRY
 NtGdiFONTOBJ_pQueryGlyphAttrs(
     IN FONTOBJ *pfo,
-    IN ULONG iMode
+    _In_ ULONG iMode
 );
 
 W32KAPI
@@ -3421,8 +3225,7 @@
 VOID
 APIENTRY
 NtGdiSTROBJ_vEnumStart(
-    IN STROBJ *pstro
-);
+    _Inout_ STROBJ *pstro);
 
 W32KAPI
 DWORD
@@ -3436,8 +3239,8 @@
 APIENTRY
 NtGdiSTROBJ_bGetAdvanceWidths(
     IN STROBJ*pstro,
-    IN ULONG iFirst,
-    IN ULONG c,
+    _In_ ULONG iFirst,
+    _In_ ULONG c,
     OUT POINTQF*pptqD
 );
 
@@ -3445,9 +3248,9 @@
 FD_GLYPHSET*
 APIENTRY
 NtGdiEngComputeGlyphSet(
-    IN INT nCodePage,
-    IN INT nFirstChar,
-    IN INT cChars
+    _In_ INT nCodePage,
+    _In_ INT nFirstChar,
+    _In_ INT cChars
 );
 
 W32KAPI
@@ -3455,7 +3258,7 @@
 APIENTRY
 NtGdiXLATEOBJ_iXlate(
     IN XLATEOBJ *pxlo,
-    IN ULONG iColor
+    _In_ ULONG iColor
 );
 
 W32KAPI
@@ -3510,7 +3313,7 @@
 APIENTRY
 NtGdiPATHOBJ_bEnumClipLines(
     IN PATHOBJ *ppo,
-    IN ULONG cb,
+    _In_ ULONG cb,
     OUT CLIPLINE *pcl
 );
 
@@ -3543,7 +3346,7 @@
 APIENTRY
 NtGdiHT_Get8BPPMaskPalette(
     OUT OPTIONAL LPPALETTEENTRY pPaletteEntry,
-    IN BOOL Use8BPPMaskPal,
+    _In_ BOOL Use8BPPMaskPal,
     IN BYTE CMYMask,
     IN USHORT RedGamma,
     IN USHORT GreenGamma,
@@ -3554,30 +3357,30 @@
 BOOL
 APIENTRY
 NtGdiUpdateTransform(
-    IN HDC hdc
+    _In_ HDC hdc
 );
 
 W32KAPI
 DWORD
 APIENTRY
 NtGdiSetLayout(
-    IN HDC hdc,
-    IN LONG wox,
-    IN DWORD dwLayout
+    _In_ HDC hdc,
+    _In_ LONG wox,
+    _In_ DWORD dwLayout
 );
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiMirrorWindowOrg(
-    IN HDC hdc
+    _In_ HDC hdc
 );
 
 W32KAPI
 LONG
 APIENTRY
 NtGdiGetDeviceWidth(
-    IN HDC hdc
+    _In_ HDC hdc
 );
 
 W32KAPI
@@ -3585,7 +3388,7 @@
 APIENTRY
 NtGdiSetPUMPDOBJ(
     IN HUMPD humpd,
-    IN BOOL bStoreID,
+    _In_ BOOL bStoreID,
     OUT HUMPD *phumpd,
     OUT BOOL *pbWOW64
 );
@@ -3610,7 +3413,7 @@
 APIENTRY
 NtGdiSetBitmapAttributes(
     IN HBITMAP hbm,
-    IN DWORD dwFlags
+    _In_ DWORD dwFlags
 );
 
 W32KAPI
@@ -3618,31 +3421,31 @@
 APIENTRY
 NtGdiClearBitmapAttributes(
     IN HBITMAP hbm,
-    IN DWORD dwFlags
+    _In_ DWORD dwFlags
 );
 
 W32KAPI
 HBRUSH
 APIENTRY
 NtGdiSetBrushAttributes(
-    IN HBRUSH hbm,
-    IN DWORD dwFlags
+    _In_ HBRUSH hbm,
+    _In_ DWORD dwFlags
 );
 
 W32KAPI
 HBRUSH
 APIENTRY
 NtGdiClearBrushAttributes(
-    IN HBRUSH hbm,
-    IN DWORD dwFlags
+    _In_ HBRUSH hbm,
+    _In_ DWORD dwFlags
 );
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiDrawStream(
-    IN HDC hdcDst,
-    IN ULONG cjIn,
+    _In_ HDC hdcDst,
+    _In_ ULONG cjIn,
     IN VOID *pvIn
 );
 
@@ -3650,15 +3453,15 @@
 BOOL
 APIENTRY
 NtGdiMakeObjectXferable(
-    IN HANDLE h,
-    IN DWORD dwProcessId
+    _In_ HANDLE h,
+    _In_ DWORD dwProcessId
 );
 
 W32KAPI
 BOOL
 APIENTRY
 NtGdiMakeObjectUnXferable(
-    IN HANDLE h
+    _In_ HANDLE h
 );
 
 W32KAPI

Modified: trunk/reactos/include/psdk/winddi.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winddi.h?rev=…
==============================================================================
--- trunk/reactos/include/psdk/winddi.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/winddi.h [iso-8859-1] Tue Jul 31 18:20:09 2012
@@ -1324,16 +1324,16 @@
 BOOL
 APIENTRY
 EngBitBlt(
-    _Inout_ SURFOBJ *psoTrg,
+    _In_ SURFOBJ *psoTrg,
     _In_opt_ SURFOBJ *psoSrc,
     _In_opt_ SURFOBJ *psoMask,
     _In_opt_ CLIPOBJ *pco,
     _In_opt_ XLATEOBJ *pxlo,
     _In_ RECTL *prclTrg,
-    _When_(psoSrc, _In_) POINTL *pptlSrc,
-    _When_(psoMask, _In_) POINTL *pptlMask,
+    _In_opt_ POINTL *pptlSrc,
+    _In_opt_ POINTL *pptlMask,
     _In_opt_ BRUSHOBJ *pbo,
-    _When_(pbo, _In_) POINTL *pptlBrush,
+    _In_opt_ POINTL *pptlBrush,
     _In_ ROP4 rop4);
 
 WIN32KAPI
@@ -1420,11 +1420,13 @@
     _In_opt_ FREEOBJPROC pFreeObjProc,
     _In_ HDEV hdev);
 
+_Must_inspect_result_
+_Success_(return != FALSE)
 WIN32KAPI
 BOOL
 APIENTRY
 EngCreateEvent(
-    _Deref_out_opt_ PEVENT *ppEvent);
+    _When_(return != FALSE, _Outptr_) PEVENT *ppEvent);
 
 /* EngCreatePalette.iMode constants */
 #define PAL_INDEXED                       0x00000001
@@ -2126,7 +2128,7 @@
 APIENTRY
 EngQuerySystemAttribute(
     _In_ ENG_SYSTEM_ATTRIBUTE CapNum,
-    _Out_ PDWORD pCapability);
+    _When_(return != FALSE, _Out_) PDWORD pCapability);
 
 WIN32KAPI
 LONG
@@ -2150,7 +2152,7 @@
 ULONG
 APIENTRY
 EngSaveFloatingPointState(
-    _Out_ VOID *pBuffer,
+    _Inout_ VOID *pBuffer,
     _In_ ULONG cjBufferSize);
 
 WIN32KAPI
@@ -2253,7 +2255,7 @@
     _In_ RECTL *prclSrc,
     _When_(psoMask, _In_) POINTL *pptlMask,
     _In_ ULONG iMode,
-    _In_ BRUSHOBJ *pbo,
+    _In_opt_ BRUSHOBJ *pbo,
     _In_ DWORD rop4);
 
 WIN32KAPI
@@ -2594,7 +2596,7 @@
 APIENTRY
 FONTOBJ_cGetAllGlyphHandles(
     _In_ FONTOBJ *pfo,
-    _Out_opt_bytecap_(return) HGLYPH *phg);
+    _Out_opt_ HGLYPH *phg);
 
 WIN32KAPI
 ULONG
@@ -2830,7 +2832,7 @@
 VOID
 APIENTRY
 STROBJ_vEnumStart(
-    _In_ STROBJ *pstro);
+    _Inout_ STROBJ *pstro);
 
 WIN32KAPI
 BOOL
@@ -2955,10 +2957,10 @@
     _In_ CLIPOBJ *pco,
     _In_opt_ XLATEOBJ *pxlo,
     _In_ RECTL *prclTrg,
-    _When_(psoSrc, _In_) POINTL *pptlSrc,
-    _When_(psoMask, _In_) POINTL *pptlMask,
+    _In_opt_ POINTL *pptlSrc,
+    _In_opt_ POINTL *pptlMask,
     _In_opt_ BRUSHOBJ *pbo,
-    _When_(pbo, _In_) POINTL *pptlBrush,
+    _In_opt_ POINTL *pptlBrush,
     _In_ ROP4 rop4);
 typedef FN_DrvBitBlt *PFN_DrvBitBlt;
 extern FN_DrvBitBlt DrvBitBlt;
@@ -3007,7 +3009,7 @@
     _In_ DHPDEV dhpdev,
     _In_ LONG iPixelFormat,
     _In_ ULONG cjpfd,
-    _Out_ PIXELFORMATDESCRIPTOR *ppfd);
+    _Out_opt_ PIXELFORMATDESCRIPTOR *ppfd);
 typedef FN_DrvDescribePixelFormat *PFN_DrvDescribePixelFormat;
 extern FN_DrvDescribePixelFormat DrvDescribePixelFormat;
 

Modified: trunk/reactos/include/xdk/kefuncs.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/kefuncs.h?rev=…
==============================================================================
--- trunk/reactos/include/xdk/kefuncs.h [iso-8859-1] (original)
+++ trunk/reactos/include/xdk/kefuncs.h [iso-8859-1] Tue Jul 31 18:20:09 2012
@@ -79,7 +79,7 @@
 VOID
 NTAPI
 ProbeForWrite(
-  __in_data_source(USER_MODE) _Inout_updates_bytes_(Length) PVOID Address,
+  __in_data_source(USER_MODE) _Out_writes_bytes_(Length) PVOID Address,
   _In_ SIZE_T Length,
   _In_ ULONG Alignment);
 
@@ -550,8 +550,8 @@
   _In_opt_ __drv_aliasesMem PVOID SynchronizeContext);
 
 _IRQL_requires_min_(PASSIVE_LEVEL)
-_When_((Timeout==NULL || *Timeout!=0), _IRQL_requires_max_(APC_LEVEL))
-_When_((Timeout!=NULL && *Timeout==0), _IRQL_requires_max_(DISPATCH_LEVEL))
+_When_((Timeout==NULL || Timeout->QuadPart!=0), _IRQL_requires_max_(APC_LEVEL))
+_When_((Timeout!=NULL && Timeout->QuadPart==0),
_IRQL_requires_max_(DISPATCH_LEVEL))
 NTKERNELAPI
 NTSTATUS
 NTAPI
@@ -568,8 +568,8 @@
 #define KeWaitForMutexObject KeWaitForSingleObject
 
 _IRQL_requires_min_(PASSIVE_LEVEL)
-_When_((Timeout==NULL || *Timeout!=0), _IRQL_requires_max_(APC_LEVEL))
-_When_((Timeout!=NULL && *Timeout==0), _IRQL_requires_max_(DISPATCH_LEVEL))
+_When_((Timeout==NULL || Timeout->QuadPart!=0), _IRQL_requires_max_(APC_LEVEL))
+_When_((Timeout!=NULL && Timeout->QuadPart==0),
_IRQL_requires_max_(DISPATCH_LEVEL))
 NTKERNELAPI
 NTSTATUS
 NTAPI