Ros-diffs

ros-diffs@reactos.org

81390 discussions

[rharabien] 54902: - Fix year in all files copyright info - Replace tabs by spaces
by rharabien＠svn.reactos.org 10 Jan '12

10 Jan '12

Author: rharabien Date: Tue Jan 10 15:34:28 2012 New Revision: 54902 URL: http://svn.reactos.org/svn/reactos?rev=54902&view=rev Log: - Fix year in all files copyright info - Replace tabs by spaces Modified: trunk/reactos/include/reactos/version.rc Modified: trunk/reactos/include/reactos/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/version.rc… ============================================================================== --- trunk/reactos/include/reactos/version.rc [iso-8859-1] (original) +++ trunk/reactos/include/reactos/version.rc [iso-8859-1] Tue Jan 10 15:34:28 2012 @@ -20,7 +20,7 @@ #define REACTOS_DEFAULT_STR_COMPANY_NAME "ReactOS Development Team\0" #define REACTOS_DEFAULT_STR_DESCRIPTION "ReactOS Core Component\0" #define REACTOS_DEFAULT_STR_INTERNAL_NAME "\0" -#define REACTOS_DEFAULT_STR_LEGAL_COPYRIGHT "Copyright 1998-"COPYRIGHT_YEAR" ReactOS Team\0" +#define REACTOS_DEFAULT_STR_LEGAL_COPYRIGHT "Copyright 1998-" COPYRIGHT_YEAR " ReactOS Team\0" #define REACTOS_DEFAULT_STR_PRODUCT_NAME "ReactOS Operating System\0" /* Set defaults for everything, unless overridden */ @@ -106,36 +106,36 @@ /* The version resource itself */ VS_VERSION_INFO VERSIONINFO - FILEVERSION REACTOS_FILEVERSION - PRODUCTVERSION REACTOS_PRODUCTVERSION - FILEFLAGSMASK REACTOS_FILEFLAGSMASK - FILEFLAGS REACTOS_FILEFLAGS - FILEOS REACTOS_FILEOS - FILETYPE REACTOS_FILETYPE - FILESUBTYPE REACTOS_FILESUBTYPE - BEGIN +FILEVERSION REACTOS_FILEVERSION +PRODUCTVERSION REACTOS_PRODUCTVERSION +FILEFLAGSMASK REACTOS_FILEFLAGSMASK +FILEFLAGS REACTOS_FILEFLAGS +FILEOS REACTOS_FILEOS +FILETYPE REACTOS_FILETYPE +FILESUBTYPE REACTOS_FILESUBTYPE +BEGIN BLOCK "StringFileInfo" - BEGIN + BEGIN BLOCK "040904b0" - BEGIN - VALUE "CompanyName", REACTOS_STR_COMPANY_NAME - VALUE "FileDescription", REACTOS_STR_FILE_DESCRIPTION - VALUE "FileVersion", REACTOS_STR_FILE_VERSION - VALUE "InternalName", REACTOS_STR_INTERNAL_NAME + BEGIN + VALUE "CompanyName", REACTOS_STR_COMPANY_NAME + VALUE "FileDescription", REACTOS_STR_FILE_DESCRIPTION + VALUE "FileVersion", REACTOS_STR_FILE_VERSION + VALUE "InternalName", REACTOS_STR_INTERNAL_NAME #ifdef REACTOS_STR_ORIGINAL_COPYRIGHT - VALUE "OriginalCopyright", REACTOS_STR_ORIGINAL_COPYRIGHT + VALUE "OriginalCopyright", REACTOS_STR_ORIGINAL_COPYRIGHT #endif /* REACTOS_STR_ORIGINAL_COPYRIGHT */ - VALUE "LegalCopyright", REACTOS_STR_LEGAL_COPYRIGHT - VALUE "OriginalFilename", REACTOS_STR_ORIGINAL_FILENAME - VALUE "ProductName", REACTOS_STR_PRODUCT_NAME - VALUE "ProductVersion", REACTOS_STR_PRODUCT_VERSION + VALUE "LegalCopyright", REACTOS_STR_LEGAL_COPYRIGHT + VALUE "OriginalFilename", REACTOS_STR_ORIGINAL_FILENAME + VALUE "ProductName", REACTOS_STR_PRODUCT_NAME + VALUE "ProductVersion", REACTOS_STR_PRODUCT_VERSION #ifdef REACTOS_OLESELFREGISTER - VALUE "OLESelfRegister", "" + VALUE "OLESelfRegister", "" #endif /* REACTOS_OLESELFREGISTER */ - END - END + END + END BLOCK "VarFileInfo" - BEGIN + BEGIN VALUE "Translation", 0x409, 1200 - END - END + END +END

1 0

[tkreuzer] 54901: [WIN32K] - Fix parameter to DrvEnablePDEV - improve DPRINTs
by tkreuzer＠svn.reactos.org 10 Jan '12

10 Jan '12

Author: tkreuzer Date: Tue Jan 10 14:59:23 2012 New Revision: 54901 URL: http://svn.reactos.org/svn/reactos?rev=54901&view=rev Log: [WIN32K] - Fix parameter to DrvEnablePDEV - improve DPRINTs Modified: trunk/reactos/subsystems/win32/win32k/eng/pdevobj.c Modified: trunk/reactos/subsystems/win32/win32k/eng/pdevobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/pdevobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/pdevobj.c [iso-8859-1] Tue Jan 10 14:59:23 2012 @@ -125,7 +125,7 @@ HS_DDI_MAX, ppdev->ahsurf, sizeof(GDIINFO), - &ppdev->gdiinfo, + (PULONG)&ppdev->gdiinfo, sizeof(DEVINFO), &ppdev->devinfo, (HDEV)ppdev, @@ -202,19 +202,16 @@ /* Compare asked DEVMODE fields * Only compare those that are valid in both DEVMODE structs */ dwFields = pdmCurrent->dmFields & pdm->dmFields ; + /* For now, we only need those */ if ((dwFields & DM_BITSPERPEL) && - (pdmCurrent->dmBitsPerPel != pdm->dmBitsPerPel)) - continue; + (pdmCurrent->dmBitsPerPel != pdm->dmBitsPerPel)) continue; if ((dwFields & DM_PELSWIDTH) && - (pdmCurrent->dmPelsWidth != pdm->dmPelsWidth)) - continue; + (pdmCurrent->dmPelsWidth != pdm->dmPelsWidth)) continue; if ((dwFields & DM_PELSHEIGHT) && - (pdmCurrent->dmPelsHeight != pdm->dmPelsHeight)) - continue; + (pdmCurrent->dmPelsHeight != pdm->dmPelsHeight)) continue; if ((dwFields & DM_DISPLAYFREQUENCY) && - (pdmCurrent->dmDisplayFrequency != pdm->dmDisplayFrequency)) - continue; + (pdmCurrent->dmDisplayFrequency != pdm->dmDisplayFrequency)) continue; /* Match! Return the DEVMODE */ return pdmCurrent; @@ -232,6 +229,7 @@ { PGRAPHICS_DEVICE pGraphicsDevice; PPDEVOBJ ppdev; + DPRINT("EngpCreatePDEV(%wZ, %p)\n", pustrDeviceName, pdm); /* Try to find the GRAPHICS_DEVICE */ if (pustrDeviceName) @@ -269,8 +267,9 @@ ppdev->pldev = EngLoadImageEx(pdm->dmDeviceName, LDEV_DEVICE_DISPLAY); if (!ppdev->pldev) { - DPRINT1("Could not load display driver '%ls'\n", - pGraphicsDevice->pDiplayDrivers); + DPRINT1("Could not load display driver '%ls', '%s'\n", + pGraphicsDevice->pDiplayDrivers, + pdm->dmDeviceName); ExFreePoolWithTag(ppdev, GDITAG_PDEV); return NULL; }

1 0

[tkreuzer] 54900: [PSDK] - add annotations to winddi.h - use function types for Drv* declarations
by tkreuzer＠svn.reactos.org 10 Jan '12

10 Jan '12

Author: tkreuzer Date: Tue Jan 10 14:47:43 2012 New Revision: 54900 URL: http://svn.reactos.org/svn/reactos?rev=54900&view=rev Log: [PSDK] - add annotations to winddi.h - use function types for Drv* declarations Modified: trunk/reactos/include/psdk/winddi.h 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 Jan 10 14:47:43 2012 @@ -7,6 +7,7 @@ * * Contributors: * Created by Casper S. Hornstrup <chorns(a)users.sourceforge.net> + * Annotations by Timo Kreuzer <timo.kreuzer(a)reactos.org> * * THIS SOFTWARE IS NOT COPYRIGHTED * @@ -29,6 +30,7 @@ #include <ddrawint.h> #include <d3dnthal.h> +#include <specstrings.h> #ifdef __cplusplus extern "C" { @@ -322,7 +324,7 @@ typedef BOOL (APIENTRY CALLBACK *FREEOBJPROC)( - IN struct _DRIVEROBJ *pDriverObj); + _In_ struct _DRIVEROBJ *pDriverObj); typedef struct _DRIVEROBJ { PVOID pvObj; @@ -1039,7 +1041,6 @@ } STROBJ; - /* SURFOBJ.iType constants */ #define STYPE_BITMAP 0L #define STYPE_DEVICE 1L @@ -1127,42 +1128,42 @@ #define WOC_SPRITE_NO_OVERLAP 0x00000100 typedef VOID (APIENTRY CALLBACK *WNDOBJCHANGEPROC)( - IN WNDOBJ *pwo, - IN FLONG fl); + _In_ WNDOBJ *pwo, + _In_ FLONG fl); WIN32KAPI HANDLE APIENTRY BRUSHOBJ_hGetColorTransform( - IN BRUSHOBJ *pbo); + _In_ BRUSHOBJ *pbo); WIN32KAPI PVOID APIENTRY BRUSHOBJ_pvAllocRbrush( - IN BRUSHOBJ *pbo, - IN ULONG cj); + _In_ BRUSHOBJ *pbo, + _In_ ULONG cj); WIN32KAPI PVOID APIENTRY BRUSHOBJ_pvGetRbrush( - IN BRUSHOBJ *pbo); + _In_ BRUSHOBJ *pbo); WIN32KAPI ULONG APIENTRY BRUSHOBJ_ulGetBrushColor( - IN BRUSHOBJ *pbo); + _In_ BRUSHOBJ *pbo); WIN32KAPI BOOL APIENTRY CLIPOBJ_bEnum( - IN CLIPOBJ *pco, - IN ULONG cj, - OUT ULONG *pv); + _In_ CLIPOBJ *pco, + _In_ ULONG cj, + _Out_bytecap_(cj) ULONG *pul); /* CLIPOBJ_cEnumStart.iType constants */ #define CT_RECTANGLES 0L @@ -1180,61 +1181,68 @@ ULONG APIENTRY CLIPOBJ_cEnumStart( - IN CLIPOBJ *pco, - IN BOOL bAll, - IN ULONG iType, - IN ULONG iDirection, - IN ULONG cLimit); + _Inout_ CLIPOBJ *pco, + _In_ BOOL bAll, + _In_ ULONG iType, + _In_ ULONG iDirection, + _In_ ULONG cLimit); WIN32KAPI PATHOBJ* APIENTRY CLIPOBJ_ppoGetPath( - IN CLIPOBJ *pco); + _In_ CLIPOBJ *pco); WIN32KAPI VOID APIENTRY EngAcquireSemaphore( - IN HSEMAPHORE hsem); + _Inout_ HSEMAPHORE hsem); #define FL_ZERO_MEMORY 0x00000001 #define FL_NONPAGED_MEMORY 0x00000002 +_Must_inspect_result_ +_When_(fl & FL_ZERO_MEMORY, _Ret_opt_bytecount_(cjMemSize)) +_When_(!(fl & FL_ZERO_MEMORY), _Ret_opt_bytecap_(cjMemSize)) WIN32KAPI PVOID APIENTRY EngAllocMem( - IN ULONG Flags, - IN ULONG MemSize, - IN ULONG Tag); - + _In_ ULONG fl, + _In_ ULONG cjMemSize, + _In_ ULONG ulTag); + +_Must_inspect_result_ +_Ret_opt_bytecount_(cj) WIN32KAPI PVOID APIENTRY EngAllocPrivateUserMem( - IN PDD_SURFACE_LOCAL psl, - IN SIZE_T cj, - IN ULONG tag); - + _In_ PDD_SURFACE_LOCAL psl, + _In_ SIZE_T cjMemSize, + _In_ ULONG ulTag); + +_Must_inspect_result_ +_Ret_opt_bytecount_(cjMemSize) WIN32KAPI PVOID APIENTRY EngAllocUserMem( - IN SIZE_T cj, - IN ULONG tag); + _In_ SIZE_T cjMemSize, + _In_ ULONG ulTag); WIN32KAPI BOOL APIENTRY EngAlphaBlend( - IN SURFOBJ *psoDest, - IN SURFOBJ *psoSrc, - IN CLIPOBJ *pco, - IN XLATEOBJ *pxlo, - IN RECTL *prclDest, - IN RECTL *prclSrc, - IN BLENDOBJ *pBlendObj); + _Inout_ SURFOBJ *psoDest, + _In_ SURFOBJ *psoSrc, + _In_ CLIPOBJ *pco, + _In_opt_ XLATEOBJ *pxlo, + _In_ RECTL *prclDest, + _In_ RECTL *prclSrc, + _In_ BLENDOBJ *pBlendObj); /* EngAssociateSurface.flHooks constants */ #define HOOK_BITBLT 0x00000001 @@ -1260,45 +1268,45 @@ BOOL APIENTRY EngAssociateSurface( - IN HSURF hsurf, - IN HDEV hdev, - IN FLONG flHooks); + _In_ HSURF hsurf, + _In_ HDEV hdev, + _In_ FLONG flHooks); WIN32KAPI BOOL APIENTRY EngBitBlt( - IN SURFOBJ *psoTrg, - IN SURFOBJ *psoSrc, - IN SURFOBJ *psoMask, - IN CLIPOBJ *pco, - IN XLATEOBJ *pxlo, - IN RECTL *prclTrg, - IN POINTL *pptlSrc, - IN POINTL *pptlMask, - IN BRUSHOBJ *pbo, - IN POINTL *pptlBrush, - IN ROP4 rop4); + _Inout_ SURFOBJ *psoTrg, + _In_opt_ SURFOBJ *psoSrc, + _In_opt_ SURFOBJ *psoMask, + _In_ CLIPOBJ *pco, + _In_opt_ XLATEOBJ *pxlo, + _In_ RECTL *prclTrg, + _When_(psoSrc, _In_) POINTL *pptlSrc, + _When_(psoMask, _In_) POINTL *pptlMask, + _In_opt_ BRUSHOBJ *pbo, + _In_opt_ POINTL *pptlBrush, + _In_ ROP4 rop4); WIN32KAPI BOOL APIENTRY EngCheckAbort( - IN SURFOBJ *pso); + _In_ SURFOBJ *pso); WIN32KAPI VOID APIENTRY EngClearEvent( - IN PEVENT pEvent); + _In_ PEVENT pEvent); WIN32KAPI FD_GLYPHSET* APIENTRY EngComputeGlyphSet( - IN INT nCodePage, - IN INT nFirstChar, - IN INT cChars); + _In_ INT nCodePage, + _In_ INT nFirstChar, + _In_ INT cChars); /* EngControlSprites.fl constants */ #define ECS_TEARDOWN 0x00000001 @@ -1308,67 +1316,66 @@ BOOL APIENTRY EngControlSprites( - IN WNDOBJ *pwo, - IN FLONG fl); + _Inout_ WNDOBJ *pwo, + _In_ FLONG fl); WIN32KAPI BOOL APIENTRY EngCopyBits( - OUT SURFOBJ *psoDest, - IN SURFOBJ *psoSrc, - IN CLIPOBJ *pco, - IN XLATEOBJ *pxlo, - IN RECTL *prclDest, - IN POINTL *pptlSrc); + _In_ SURFOBJ *psoDest, + _In_ SURFOBJ *psoSrc, + _In_ CLIPOBJ *pco, + _In_ XLATEOBJ *pxlo, + _In_ RECTL *prclDest, + _In_ POINTL *pptlSrc); WIN32KAPI HBITMAP APIENTRY EngCreateBitmap( - IN SIZEL sizl, - IN LONG lWidth, - IN ULONG iFormat, - IN FLONG fl, - IN PVOID pvBits); + _In_ SIZEL sizl, + _In_ LONG lWidth, + _In_ ULONG iFormat, + _In_ FLONG fl, + _In_ PVOID pvBits); WIN32KAPI CLIPOBJ* APIENTRY -EngCreateClip( - VOID); +EngCreateClip(VOID); WIN32KAPI HBITMAP APIENTRY EngCreateDeviceBitmap( - IN DHSURF dhsurf, - IN SIZEL sizl, - IN ULONG iFormatCompat); - + _In_ DHSURF dhsurf, + _In_ SIZEL sizl, + _In_ ULONG iFormatCompat); + +_Must_inspect_result_ WIN32KAPI HSURF APIENTRY EngCreateDeviceSurface( - DHSURF dhsurf, - SIZEL sizl, - ULONG iFormatCompat); - -#if 0 + _In_ DHSURF dhsurf, + _In_ SIZEL sizl, + _In_ ULONG iFormatCompat); + +_Must_inspect_result_ WIN32KAPI HDRVOBJ APIENTRY EngCreateDriverObj( - PVOID pvObj, - FREEOBJPROC pFreeObjProc, - HDEV hdev); -#endif + _In_ PVOID pvObj, + _In_opt_ FREEOBJPROC pFreeObjProc, + _In_ HDEV hdev); WIN32KAPI BOOL APIENTRY EngCreateEvent( - OUT PEVENT *ppEvent); + _Deref_out_opt_ PEVENT *ppEvent); /* EngCreatePalette.iMode constants */ #define PAL_INDEXED 0x00000001 @@ -1377,28 +1384,27 @@ #define PAL_BGR 0x00000008 #define PAL_CMYK 0x00000010 +_Must_inspect_result_ WIN32KAPI HPALETTE APIENTRY EngCreatePalette( - 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); WIN32KAPI PATHOBJ* APIENTRY -EngCreatePath( - VOID); +EngCreatePath(VOID); WIN32KAPI HSEMAPHORE APIENTRY -EngCreateSemaphore( - VOID); +EngCreateSemaphore(VOID); /* EngCreateWnd.fl constants */ #define WO_RGN_CLIENT_DELTA 0x00000001 @@ -1411,166 +1417,170 @@ #define WO_SPRITE_NOTIFY 0x00000080 #define WO_RGN_DESKTOP_COORD 0x00000100 +_Must_inspect_result_ WIN32KAPI WNDOBJ* APIENTRY EngCreateWnd( - SURFOBJ *pso, - HWND hwnd, - WNDOBJCHANGEPROC pfn, - FLONG fl, - int iPixelFormat); - -WIN32KAPI -VOID -APIENTRY -EngDebugBreak( - VOID); + _In_ SURFOBJ *pso, + _In_ HWND hwnd, + _In_ WNDOBJCHANGEPROC pfn, + _In_ FLONG fl, + _In_ INT iPixelFormat); + +WIN32KAPI +VOID +APIENTRY +EngDebugBreak(VOID); WIN32KAPI VOID APIENTRY EngDebugPrint( - IN PCHAR StandardPrefix, - IN PCHAR DebugMessage, - IN va_list ap); + _In_z_ PCHAR StandardPrefix, + _In_z_ PCHAR DebugMessage, + _In_ va_list ap); WIN32KAPI VOID APIENTRY EngDeleteClip( - IN CLIPOBJ *pco); + _In_ CLIPOBJ *pco); WIN32KAPI BOOL APIENTRY EngDeleteDriverObj( - IN HDRVOBJ hdo, - IN BOOL bCallBack, - IN BOOL bLocked); + _In_ HDRVOBJ hdo, + _In_ BOOL bCallBack, + _In_ BOOL bLocked); WIN32KAPI BOOL APIENTRY EngDeleteEvent( - IN PEVENT pEvent); + _In_ PEVENT pEvent); WIN32KAPI BOOL APIENTRY EngDeleteFile( - IN LPWSTR pwszFileName); + _In_ LPWSTR pwszFileName); WIN32KAPI BOOL APIENTRY EngDeletePalette( - IN HPALETTE hpal); + _In_ HPALETTE hpal); WIN32KAPI VOID APIENTRY EngDeletePath( - IN PATHOBJ *ppo); + _Inout_ PATHOBJ *ppo); WIN32KAPI VOID APIENTRY EngDeleteSafeSemaphore( - IN OUT ENGSAFESEMAPHORE *pssem); + _Inout_ ENGSAFESEMAPHORE *pssem); WIN32KAPI VOID APIENTRY EngDeleteSemaphore( - IN OUT HSEMAPHORE hsem); + _Inout_ HSEMAPHORE hsem); WIN32KAPI BOOL APIENTRY EngDeleteSurface( - IN HSURF hsurf); + _In_ HSURF hsurf); WIN32KAPI VOID APIENTRY EngDeleteWnd( - IN WNDOBJ *pwo); + _Inout_ WNDOBJ *pwo); WIN32KAPI DWORD APIENTRY EngDeviceIoControl( - IN HANDLE hDevice, - IN DWORD dwIoControlCode, - IN LPVOID lpInBuffer, - IN DWORD nInBufferSize, - IN OUT LPVOID lpOutBuffer, - IN DWORD nOutBufferSize, - OUT LPDWORD lpBytesReturned); + _In_ HANDLE hDevice, + _In_ DWORD dwIoControlCode, + _In_opt_bytecount_(cjInBufferSize) LPVOID lpInBuffer, + _In_ DWORD cjInBufferSize, + _Out_opt_bytecap_(cjOutBufferSize) LPVOID lpOutBuffer, + _In_ DWORD cjOutBufferSize, + _Out_ LPDWORD lpBytesReturned); WIN32KAPI ULONG APIENTRY EngDitherColor( - IN HDEV hdev, - IN ULONG iMode, - IN ULONG rgb, - OUT ULONG *pul); + _In_ HDEV hdev, + _In_ ULONG iMode, + _In_ ULONG rgb, + _When_(iMode == DM_DEFAULT, _Out_writes_bytes_(16*8)) + _When_(iMode == DM_MONOCHROME, _Out_writes_bytes_(8)) + ULONG *pul); WIN32KAPI BOOL APIENTRY EngEnumForms( - IN HANDLE hPrinter, - IN DWORD Level, - OUT LPBYTE pForm, - IN DWORD cbBuf, - OUT LPDWORD pcbNeeded, - OUT LPDWORD pcReturned); + _In_ HANDLE hPrinter, + _In_ DWORD Level, + _Out_writes_bytes_opt_(cbBuf) LPBYTE pForm, + _In_ DWORD cbBuf, + _Out_ LPDWORD pcbNeeded, + _Out_ LPDWORD pcReturned); WIN32KAPI BOOL APIENTRY EngEraseSurface( - IN SURFOBJ *pso, - IN RECTL *prcl, - IN ULONG iColor); + _In_ SURFOBJ *pso, + _In_ RECTL *prcl, + _In_ ULONG iColor); WIN32KAPI BOOL APIENTRY EngFillPath( - IN SURFOBJ *pso, - IN PATHOBJ *ppo, - IN CLIPOBJ *pco, - IN BRUSHOBJ *pbo, - IN POINTL *pptlBrushOrg, - IN MIX mix, - IN FLONG flOptions); + _Inout_ SURFOBJ *pso, + _In_ PATHOBJ *ppo, + _In_ CLIPOBJ *pco, + _In_ BRUSHOBJ *pbo, + _In_ POINTL *pptlBrushOrg, + _In_ MIX mix, + _In_ FLONG flOptions); WIN32KAPI PVOID APIENTRY EngFindImageProcAddress( - IN HANDLE hModule, - IN LPSTR lpProcName); + _In_ HANDLE hModule, + _In_ LPSTR lpProcName); WIN32KAPI PVOID APIENTRY EngFindResource( - IN HANDLE h, - IN int iName, - IN int iType, - OUT PULONG pulSize); - + _In_ HANDLE h, + _In_ INT iName, + _In_ INT iType, + _Out_ PULONG pulSize); + +_Must_inspect_result_ +_Ret_opt_bytecap_(cjSize) WIN32KAPI PVOID APIENTRY EngFntCacheAlloc( - IN ULONG FastCheckSum, - IN ULONG ulSize); + _In_ ULONG ulFastCheckSum, + _In_ ULONG cjSize); /* EngFntCacheFault.iFaultMode constants */ #define ENG_FNT_CACHE_READ_FAULT 0x00000001 @@ -1580,166 +1590,163 @@ VOID APIENTRY EngFntCacheFault( - IN ULONG ulFastCheckSum, - IN ULONG iFaultMode); + _In_ ULONG ulFastCheckSum, + _In_ ULONG iFaultMode); WIN32KAPI PVOID APIENTRY EngFntCacheLookUp( - IN ULONG FastCheckSum, - OUT ULONG *pulSize); + _In_ ULONG FastCheckSum, + _Out_ ULONG *pulSize); WIN32KAPI VOID APIENTRY EngFreeMem( - IN PVOID Mem); + _In_ _Post_ptr_invalid_ PVOID pv); WIN32KAPI VOID APIENTRY EngFreeModule( - IN HANDLE h); + _In_ HANDLE h); WIN32KAPI VOID APIENTRY EngFreePrivateUserMem( - IN PDD_SURFACE_LOCAL psl, - IN PVOID pv); + _In_ PDD_SURFACE_LOCAL psl, + _In_ _Post_ptr_invalid_ PVOID pv); WIN32KAPI VOID APIENTRY EngFreeUserMem( - IN PVOID pv); + _In_ _Post_ptr_invalid_ PVOID pv); WIN32KAPI VOID APIENTRY EngGetCurrentCodePage( - OUT PUSHORT OemCodePage, - OUT PUSHORT AnsiCodePage); + _Out_ PUSHORT OemCodePage, + _Out_ PUSHORT AnsiCodePage); WIN32KAPI HANDLE APIENTRY -EngGetCurrentProcessId( - VOID); +EngGetCurrentProcessId(VOID); WIN32KAPI HANDLE APIENTRY -EngGetCurrentThreadId( - VOID); - +EngGetCurrentThreadId(VOID); + +_Must_inspect_result_ _Ret_z_ WIN32KAPI LPWSTR APIENTRY EngGetDriverName( - IN HDEV hdev); + _In_ HDEV hdev); WIN32KAPI BOOL APIENTRY EngGetFileChangeTime( - IN HANDLE h, - OUT LARGE_INTEGER *pChangeTime); + _In_ HANDLE h, + _Out_ LARGE_INTEGER *pChangeTime); WIN32KAPI BOOL APIENTRY EngGetFilePath( - IN HANDLE h, - OUT WCHAR (*pDest)[MAX_PATH+1]); + _In_ HANDLE h, + _Out_ WCHAR (*pDest)[MAX_PATH+1]); WIN32KAPI BOOL APIENTRY EngGetForm( - IN HANDLE hPrinter, - IN LPWSTR pFormName, - IN DWORD Level, - OUT LPBYTE pForm, - IN DWORD cbBuf, - OUT LPDWORD pcbNeeded); + _In_ HANDLE hPrinter, + _In_ LPWSTR pFormName, + _In_ DWORD Level, + _In_reads_bytes_opt_(cbBuf) LPBYTE pForm, + _In_ DWORD cbBuf, + _Out_ LPDWORD pcbNeeded); WIN32KAPI ULONG APIENTRY -EngGetLastError( - VOID); +EngGetLastError(VOID); WIN32KAPI BOOL APIENTRY EngGetPrinter( - IN HANDLE hPrinter, - IN DWORD dwLevel, - OUT LPBYTE pPrinter, - IN DWORD cbBuf, - OUT LPDWORD pcbNeeded); + _In_ HANDLE hPrinter, + _In_ DWORD dwLevel, + _Out_writes_bytes_opt_(cbBuf) LPBYTE pPrinter, + _In_ DWORD cbBuf, + _Out_ LPDWORD pcbNeeded); WIN32KAPI DWORD APIENTRY EngGetPrinterData( - IN HANDLE hPrinter, - IN LPWSTR pValueName, - OUT LPDWORD pType, - OUT LPBYTE pData, - IN DWORD nSize, - OUT LPDWORD pcbNeeded); + _In_ HANDLE hPrinter, + _In_ LPWSTR pValueName, + _Out_opt_ LPDWORD pType, + _Out_writes_bytes_opt_(cjSize) LPBYTE pData, + _In_ DWORD cjSize, + _Out_ LPDWORD pcjNeeded); WIN32KAPI LPWSTR APIENTRY EngGetPrinterDataFileName( - IN HDEV hdev); + _In_ HDEV hdev); WIN32KAPI BOOL APIENTRY EngGetPrinterDriver( - IN HANDLE hPrinter, - IN LPWSTR pEnvironment, - IN DWORD dwLevel, - OUT BYTE *lpbDrvInfo, - IN DWORD cbBuf, - OUT DWORD *pcbNeeded); + _In_ HANDLE hPrinter, + _In_opt_ LPWSTR pEnvironment, + _In_ DWORD dwLevel, + _Out_writes_bytes_opt_(cjBufSize) BYTE *lpbDrvInfo, + _In_ DWORD cjBufSize, + _Out_ DWORD *pcjNeeded); WIN32KAPI HANDLE APIENTRY -EngGetProcessHandle( - VOID); +EngGetProcessHandle(VOID); WIN32KAPI BOOL APIENTRY EngGetType1FontList( - IN HDEV hdev, - OUT TYPE1_FONT *pType1Buffer, - IN ULONG cjType1Buffer, - OUT PULONG pulLocalFonts, - OUT PULONG pulRemoteFonts, - OUT LARGE_INTEGER *pLastModified); + _In_ HDEV hdev, + _Out_writes_bytes_opt_(cjType1Buffer) TYPE1_FONT *pType1Buffer, + _In_ ULONG cjType1Buffer, + _Out_ PULONG pulLocalFonts, + _Out_ PULONG pulRemoteFonts, + _Out_ LARGE_INTEGER *pLastModified); WIN32KAPI BOOL APIENTRY EngGradientFill( - IN SURFOBJ *psoDest, - IN CLIPOBJ *pco, - IN XLATEOBJ *pxlo, - IN TRIVERTEX *pVertex, - IN ULONG nVertex, - IN PVOID pMesh, - IN ULONG nMesh, - IN RECTL *prclExtents, - IN POINTL *pptlDitherOrg, - IN ULONG ulMode); + _Inout_ SURFOBJ *psoDest, + _In_ CLIPOBJ *pco, + _In_opt_ XLATEOBJ *pxlo, + _In_ TRIVERTEX *pVertex, + _In_ ULONG nVertex, + _In_ PVOID pMesh, + _In_ ULONG nMesh, + _In_ RECTL *prclExtents, + _In_ POINTL *pptlDitherOrg, + _In_ ULONG ulMode); /* EngHangNotification return values */ #define EHN_RESTORED 0x00000000 @@ -1749,130 +1756,131 @@ ULONG APIENTRY EngHangNotification( - IN HDEV hDev, - IN PVOID Reserved); + _In_ HDEV hDev, + _Reserved_ PVOID Reserved); WIN32KAPI BOOL APIENTRY EngInitializeSafeSemaphore( - OUT ENGSAFESEMAPHORE *pssem); + _Out_ ENGSAFESEMAPHORE *pssem); WIN32KAPI BOOL APIENTRY EngIsSemaphoreOwned( - IN HSEMAPHORE hsem); + _In_ HSEMAPHORE hsem); WIN32KAPI BOOL APIENTRY EngIsSemaphoreOwnedByCurrentThread( - IN HSEMAPHORE hsem); + _In_ HSEMAPHORE hsem); WIN32KAPI BOOL APIENTRY EngLineTo( - SURFOBJ *pso, - CLIPOBJ *pco, - BRUSHOBJ *pbo, - LONG x1, - LONG y1, - LONG x2, - LONG y2, - RECTL *prclBounds, - MIX mix); + _Inout_ SURFOBJ *pso, + _In_ CLIPOBJ *pco, + _In_ BRUSHOBJ *pbo, + _In_ LONG x1, + _In_ LONG y1, + _In_ LONG x2, + _In_ LONG y2, + _In_opt_ RECTL *prclBounds, + _In_ MIX mix); WIN32KAPI HANDLE APIENTRY EngLoadImage( - IN LPWSTR pwszDriver); + _In_ LPWSTR pwszDriver); WIN32KAPI HANDLE APIENTRY EngLoadModule( - IN LPWSTR pwsz); + _In_ LPWSTR pwsz); WIN32KAPI HANDLE APIENTRY EngLoadModuleForWrite( - IN LPWSTR pwsz, - IN ULONG cjSizeOfModule); + _In_ LPWSTR pwsz, + _In_ ULONG cjSizeOfModule); WIN32KAPI PDD_SURFACE_LOCAL APIENTRY EngLockDirectDrawSurface( - IN HANDLE hSurface); + _In_ HANDLE hSurface); WIN32KAPI DRIVEROBJ* APIENTRY EngLockDriverObj( - IN HDRVOBJ hdo); + _In_ HDRVOBJ hdo); WIN32KAPI SURFOBJ* APIENTRY EngLockSurface( - IN HSURF hsurf); - -WIN32KAPI -BOOL -APIENTRY -EngLpkInstalled( - VOID); + _In_ HSURF hsurf); + +WIN32KAPI +BOOL +APIENTRY +EngLpkInstalled(VOID); WIN32KAPI PEVENT APIENTRY EngMapEvent( - IN HDEV hDev, - IN HANDLE hUserObject, - IN PVOID Reserved1, - IN PVOID Reserved2, - IN PVOID Reserved3); - + _In_ HDEV hDev, + _In_ HANDLE hUserObject, + _Reserved_ PVOID Reserved1, + _Reserved_ PVOID Reserved2, + _Reserved_ PVOID Reserved3); + +_Success_(return != 0) +_When_(cjSize != 0, _At_(return, _Out_writes_bytes_(cjSize))) WIN32KAPI PVOID APIENTRY EngMapFile( - IN LPWSTR pwsz, - IN ULONG cjSize, - OUT ULONG_PTR *piFile); + _In_ LPWSTR pwsz, + _In_ ULONG cjSize, + _Out_ ULONG_PTR *piFile); WIN32KAPI BOOL APIENTRY EngMapFontFile( - ULONG_PTR iFile, - PULONG *ppjBuf, - ULONG *pcjBuf); + _In_ ULONG_PTR iFile, + _Outptr_result_bytebuffer_(*pcjBuf) PULONG *ppjBuf, + _Out_ ULONG *pcjBuf); WIN32KAPI BOOL APIENTRY EngMapFontFileFD( - IN ULONG_PTR iFile, - OUT PULONG *ppjBuf, - OUT ULONG *pcjBuf); + _In_ ULONG_PTR iFile, + _Outptr_result_bytebuffer_(*pcjBuf) PULONG *ppjBuf, + _Out_ ULONG *pcjBuf); WIN32KAPI PVOID APIENTRY EngMapModule( - IN HANDLE h, - OUT PULONG pSize); + _In_ HANDLE h, + _Out_ PULONG pSize); WIN32KAPI BOOL APIENTRY EngMarkBandingSurface( - IN HSURF hsurf); + _In_ HSURF hsurf); /* EngModifySurface.flSurface constants */ #define MS_NOTSYSTEMMEMORY 0x00000001 @@ -1882,93 +1890,101 @@ BOOL APIENTRY EngModifySurface( - IN HSURF hsurf, - IN HDEV hdev, - IN FLONG flHooks, - IN FLONG flSurface, - IN DHSURF dhsurf, - IN VOID *pvScan0, - IN LONG lDelta, - IN VOID *pvReserved); + _In_ HSURF hsurf, + _In_ HDEV hdev, + _In_ FLONG flHooks, + _In_ FLONG flSurface, + _In_ DHSURF dhsurf, + _In_ PVOID pvScan0, + _In_ LONG lDelta, + _Reserved_ PVOID pvReserved); WIN32KAPI VOID APIENTRY EngMovePointer( - IN SURFOBJ *pso, - IN LONG x, - IN LONG y, - IN RECTL *prcl); - -WIN32KAPI -int + _In_ SURFOBJ *pso, + _In_ LONG x, + _In_ LONG y, + _In_ RECTL *prcl); + +WIN32KAPI +INT APIENTRY EngMulDiv( - IN int a, - IN int b, - IN int c); + _In_ INT a, + _In_ INT b, + _In_ INT c); WIN32KAPI VOID APIENTRY EngMultiByteToUnicodeN( - OUT LPWSTR UnicodeString, - IN ULONG MaxBytesInUnicodeString, - OUT PULONG BytesInUnicodeString, - IN PCHAR MultiByteString, - IN ULONG BytesInMultiByteString); + _Out_writes_bytes_to_(MaxBytesInUnicodeString, *BytesInUnicodeString) LPWSTR UnicodeString, + _In_ ULONG MaxBytesInUnicodeString, + _Out_opt_ PULONG BytesInUnicodeString, + _In_reads_bytes_(BytesInMultiByteString) PCHAR MultiByteString, + _In_ ULONG BytesInMultiByteString); WIN32KAPI INT APIENTRY EngMultiByteToWideChar( - IN UINT CodePage, - OUT LPWSTR WideCharString, - IN INT BytesInWideCharString, - IN LPSTR MultiByteString, - IN INT BytesInMultiByteString); + _In_ UINT CodePage, + _Out_writes_bytes_opt_(cjWideCharString) LPWSTR WideCharString, + _In_ INT cjWideCharString, + _In_reads_bytes_opt_(cjMultiByteString) LPSTR MultiByteString, + _In_ INT cjMultiByteString); WIN32KAPI BOOL APIENTRY EngPaint( - IN SURFOBJ *pso, - IN CLIPOBJ *pco, - IN BRUSHOBJ *pbo, - IN POINTL *pptlBrushOrg, - IN MIX mix); + _In_ SURFOBJ *pso, + _In_ CLIPOBJ *pco, + _In_ BRUSHOBJ *pbo, + _In_ POINTL *pptlBrushOrg, + _In_ MIX mix); WIN32KAPI BOOL APIENTRY EngPlgBlt( - IN SURFOBJ *psoTrg, - IN SURFOBJ *psoSrc, - IN SURFOBJ *psoMsk, - IN CLIPOBJ *pco, - IN XLATEOBJ *pxlo, - IN COLORADJUSTMENT *pca, - IN POINTL *pptlBrushOrg, - IN POINTFIX *pptfx, - IN RECTL *prcl, - IN POINTL *pptl, - IN ULONG iMode); + _In_ SURFOBJ *psoTrg, + _In_ SURFOBJ *psoSrc, + _In_opt_ SURFOBJ *psoMsk, + _In_ CLIPOBJ *pco, + _In_ XLATEOBJ *pxlo, + _In_ COLORADJUSTMENT *pca, + _In_ POINTL *pptlBrushOrg, + _In_ POINTFIX *pptfx, + _In_ RECTL *prcl, + _When_(psoMsk, _In_) POINTL *pptl, + _In_ ULONG iMode); WIN32KAPI VOID APIENTRY EngProbeForRead( - IN PVOID Address, - IN ULONG Length, - IN ULONG Alignment); + _In_reads_bytes_(Length) PVOID Address, +#if (NTDDI_VERSION <= NTDDI_WINXP) + _In_ ULONG Length, +#else + _In_ SIZE_T Length, +#endif + _In_ ULONG Alignment); WIN32KAPI VOID APIENTRY EngProbeForReadAndWrite( - IN PVOID Address, - IN ULONG Length, - IN ULONG Alignment); + _Inout_updates_bytes_(Length) PVOID Address, +#if (NTDDI_VERSION <= NTDDI_WINXP) + _In_ ULONG Length, +#else + _In_ SIZE_T Length, +#endif + _In_ ULONG Alignment); typedef enum _ENG_DEVICE_ATTRIBUTE { QDA_RESERVED = 0, @@ -1979,45 +1995,45 @@ BOOL APIENTRY EngQueryDeviceAttribute( - IN HDEV hdev, - IN ENG_DEVICE_ATTRIBUTE devAttr, - IN VOID *pvIn, - IN ULONG ulInSize, - OUT VOID *pvOut, - OUT ULONG ulOutSize); + _In_ HDEV hdev, + _In_ ENG_DEVICE_ATTRIBUTE devAttr, + _In_reads_bytes_(cjInSize) PVOID pvIn, + _In_ ULONG cjInSize, + _Out_writes_bytes_(cjOutSize) PVOID pvOut, + _Out_ ULONG cjOutSize); WIN32KAPI LARGE_INTEGER APIENTRY EngQueryFileTimeStamp( - IN LPWSTR pwsz); + _In_ LPWSTR pwsz); WIN32KAPI VOID APIENTRY EngQueryLocalTime( - OUT PENG_TIME_FIELDS ptf); + _Out_ PENG_TIME_FIELDS ptf); WIN32KAPI ULONG APIENTRY EngQueryPalette( - IN HPALETTE hPal, - OUT ULONG *piMode, - IN ULONG cColors, - OUT ULONG *pulColors); + _In_ HPALETTE hPal, + _Out_ ULONG *piMode, + _In_ ULONG cColors, + _Out_writes_opt_(cColors) ULONG *pulColors); WIN32KAPI VOID APIENTRY EngQueryPerformanceCounter( - OUT LONGLONG *pPerformanceCount); + _Out_ LONGLONG *pPerformanceCount); WIN32KAPI VOID APIENTRY EngQueryPerformanceFrequency( - OUT LONGLONG *pFrequency); + _Out_ LONGLONG *pFrequency); typedef enum _ENG_SYSTEM_ATTRIBUTE { EngProcessorFeature = 1, @@ -2034,87 +2050,87 @@ BOOL APIENTRY EngQuerySystemAttribute( - IN ENG_SYSTEM_ATTRIBUTE CapNum, - OUT PDWORD pCapability); + _In_ ENG_SYSTEM_ATTRIBUTE CapNum, + _Out_ PDWORD pCapability); WIN32KAPI LONG APIENTRY EngReadStateEvent( - IN PEVENT pEvent); + _In_ PEVENT pEvent); WIN32KAPI VOID APIENTRY EngReleaseSemaphore( - IN HSEMAPHORE hsem); + _In_ HSEMAPHORE hsem); WIN32KAPI BOOL APIENTRY EngRestoreFloatingPointState( - IN VOID *pBuffer); + _In_ VOID *pBuffer); WIN32KAPI ULONG APIENTRY EngSaveFloatingPointState( - OUT VOID *pBuffer, - IN ULONG cjBufferSize); + _Out_ VOID *pBuffer, + _In_ ULONG cjBufferSize); WIN32KAPI HANDLE APIENTRY EngSecureMem( - IN PVOID Address, - IN ULONG Length); + _In_reads_bytes_(cjLength) PVOID Address, + _In_ ULONG cjLength); WIN32KAPI LONG APIENTRY EngSetEvent( - IN PEVENT pEvent); + _In_ PEVENT pEvent); WIN32KAPI VOID APIENTRY EngSetLastError( - IN ULONG iError); + _In_ ULONG iError); WIN32KAPI ULONG APIENTRY EngSetPointerShape( - IN SURFOBJ *pso, - IN SURFOBJ *psoMask, - IN SURFOBJ *psoColor, - IN XLATEOBJ *pxlo, - IN LONG xHot, - IN LONG yHot, - IN LONG x, - IN LONG y, - IN RECTL *prcl, - IN FLONG fl); + _In_ SURFOBJ *pso, + _In_ SURFOBJ *psoMask, + _In_ SURFOBJ *psoColor, + _In_ XLATEOBJ *pxlo, + _In_ LONG xHot, + _In_ LONG yHot, + _In_ LONG x, + _In_ LONG y, + _In_ RECTL *prcl, + _In_ FLONG fl); WIN32KAPI BOOL APIENTRY EngSetPointerTag( - IN HDEV hdev, - IN SURFOBJ *psoMask, - IN SURFOBJ *psoColor, - IN XLATEOBJ *pxlo, - IN FLONG fl); + _In_ HDEV hdev, + _In_ SURFOBJ *psoMask, + _In_ SURFOBJ *psoColor, + _In_ XLATEOBJ *pxlo, + _In_ FLONG fl); WIN32KAPI DWORD APIENTRY EngSetPrinterData( - IN HANDLE hPrinter, - IN LPWSTR pType, - IN DWORD dwType, - IN LPBYTE lpbPrinterData, - IN DWORD cjPrinterData); + _In_ HANDLE hPrinter, + _In_ LPWSTR pType, + _In_ DWORD dwType, + _In_reads_bytes_(cjPrinterData) LPBYTE lpbPrinterData, + _In_ DWORD cjPrinterData); typedef int (CDECL *SORTCOMP)(const void *pv1, const void *pv2); @@ -2122,349 +2138,349 @@ VOID APIENTRY EngSort( - IN OUT PBYTE pjBuf, - IN ULONG c, - IN ULONG cjElem, - IN SORTCOMP pfnComp); + _Inout_updates_bytes_(c * cjElem) PBYTE pjBuf, + _In_ ULONG c, + _In_ ULONG cjElem, + _In_ SORTCOMP pfnComp); WIN32KAPI BOOL APIENTRY EngStretchBlt( - 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_ CLIPOBJ *pco, + _In_ XLATEOBJ *pxlo, + _In_ COLORADJUSTMENT *pca, + _In_ POINTL *pptlHTOrg, + _In_ RECTL *prclDest, + _In_ RECTL *prclSrc, + _When_(psoMask, _In_) POINTL *pptlMask, + _In_ ULONG iMode); WIN32KAPI BOOL APIENTRY EngStretchBltROP( - 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 BRUSHOBJ *pbo, - IN DWORD rop4); + _In_ SURFOBJ *psoDest, + _In_ SURFOBJ *psoSrc, + _In_opt_ SURFOBJ *psoMask, + _In_ CLIPOBJ *pco, + _In_ XLATEOBJ *pxlo, + _In_ COLORADJUSTMENT *pca, + _In_ POINTL *pptlHTOrg, + _In_ RECTL *prclDest, + _In_ RECTL *prclSrc, + _When_(psoMask, _In_) POINTL *pptlMask, + _In_ ULONG iMode, + _In_ BRUSHOBJ *pbo, + _In_ DWORD rop4); WIN32KAPI BOOL APIENTRY EngStrokeAndFillPath( - IN SURFOBJ *pso, - IN PATHOBJ *ppo, - IN CLIPOBJ *pco, - IN XFORMOBJ *pxo, - IN BRUSHOBJ *pboStroke, - IN LINEATTRS *plineattrs, - IN BRUSHOBJ *pboFill, - IN POINTL *pptlBrushOrg, - IN MIX mixFill, - IN FLONG flOptions); + _Inout_ SURFOBJ *pso, + _In_ PATHOBJ *ppo, + _In_ CLIPOBJ *pco, + _In_ XFORMOBJ *pxo, + _In_ BRUSHOBJ *pboStroke, + _In_ LINEATTRS *plineattrs, + _In_ BRUSHOBJ *pboFill, + _In_ POINTL *pptlBrushOrg, + _In_ MIX mixFill, + _In_ FLONG flOptions); WIN32KAPI BOOL APIENTRY EngStrokePath( - IN SURFOBJ *pso, - IN PATHOBJ *ppo, - IN CLIPOBJ *pco, - IN XFORMOBJ *pxo, - IN BRUSHOBJ *pbo, - IN POINTL *pptlBrushOrg, - IN LINEATTRS *plineattrs, - IN MIX mix); + _In_ SURFOBJ *pso, + _In_ PATHOBJ *ppo, + _In_ CLIPOBJ *pco, + _In_ XFORMOBJ *pxo, + _In_ BRUSHOBJ *pbo, + _In_ POINTL *pptlBrushOrg, + _In_ LINEATTRS *plineattrs, + _In_ MIX mix); WIN32KAPI BOOL APIENTRY EngTextOut( - IN SURFOBJ *pso, - IN STROBJ *pstro, - IN FONTOBJ *pfo, - IN CLIPOBJ *pco, - IN RECTL *prclExtra, - IN RECTL *prclOpaque, - IN BRUSHOBJ *pboFore, - IN BRUSHOBJ *pboOpaque, - IN POINTL *pptlOrg, - IN MIX mix); + _In_ SURFOBJ *pso, + _In_ STROBJ *pstro, + _In_ FONTOBJ *pfo, + _In_ CLIPOBJ *pco, + _Null_ RECTL *prclExtra, + _In_opt_ RECTL *prclOpaque, + _In_ BRUSHOBJ *pboFore, + _In_ BRUSHOBJ *pboOpaque, + _In_ POINTL *pptlOrg, + _In_ MIX mix); WIN32KAPI BOOL APIENTRY EngTransparentBlt( - IN SURFOBJ *psoDst, - IN SURFOBJ *psoSrc, - IN CLIPOBJ *pco, - IN XLATEOBJ *pxlo, - IN RECTL *prclDst, - IN RECTL *prclSrc, - IN ULONG iTransColor, - IN ULONG ulReserved); + _In_ SURFOBJ *psoDst, + _In_ SURFOBJ *psoSrc, + _In_ CLIPOBJ *pco, + _In_ XLATEOBJ *pxlo, + _In_ RECTL *prclDst, + _In_ RECTL *prclSrc, + _In_ ULONG iTransColor, + _In_ ULONG ulReserved); WIN32KAPI VOID APIENTRY EngUnicodeToMultiByteN( - OUT PCHAR MultiByteString, - IN ULONG MaxBytesInMultiByteString, - OUT PULONG BytesInMultiByteString, - IN PWSTR UnicodeString, - IN ULONG BytesInUnicodeString); + _Out_writes_bytes_to_(cjMultiByteBuf, *pcjMultiByteString) PCHAR pchMultiByteString, + _In_ ULONG cjMultiByteBuf, + _Out_opt_ PULONG pcjMultiByteString, + _In_reads_bytes_(cjUnicodeString) PWSTR pwszUnicodeString, + _In_ ULONG cjUnicodeString); WIN32KAPI VOID APIENTRY EngUnloadImage( - IN HANDLE hModule); + _In_ HANDLE hModule); WIN32KAPI BOOL APIENTRY EngUnlockDirectDrawSurface( - IN PDD_SURFACE_LOCAL pSurface); + _In_ PDD_SURFACE_LOCAL pSurface); WIN32KAPI BOOL APIENTRY EngUnlockDriverObj( - IN HDRVOBJ hdo); + _In_ HDRVOBJ hdo); WIN32KAPI VOID APIENTRY EngUnlockSurface( - IN SURFOBJ *pso); + _In_ SURFOBJ *pso); WIN32KAPI BOOL APIENTRY EngUnmapEvent( - IN PEVENT pEvent); + _In_ PEVENT pEvent); WIN32KAPI BOOL APIENTRY EngUnmapFile( - IN ULONG_PTR iFile); + _In_ ULONG_PTR iFile); WIN32KAPI VOID APIENTRY EngUnmapFontFile( - ULONG_PTR iFile); + _In_ ULONG_PTR iFile); WIN32KAPI VOID APIENTRY EngUnmapFontFileFD( - IN ULONG_PTR iFile); + _In_ ULONG_PTR iFile); WIN32KAPI VOID APIENTRY EngUnsecureMem( - IN HANDLE hSecure); + _In_ HANDLE hSecure); WIN32KAPI BOOL APIENTRY EngWaitForSingleObject( - IN PEVENT pEvent, - IN PLARGE_INTEGER pTimeOut); + _In_ PEVENT pEvent, + _In_ PLARGE_INTEGER pTimeOut); WIN32KAPI INT APIENTRY EngWideCharToMultiByte( - IN UINT CodePage, - IN LPWSTR WideCharString, - IN INT BytesInWideCharString, - OUT LPSTR MultiByteString, - IN INT BytesInMultiByteString); + _In_ UINT CodePage, + _In_reads_bytes_opt_(cjWideCharString) LPWSTR pwszWideCharString, + _In_ INT cjWideCharString, + _Out_z_bytecap_(cjMultiByteString) LPSTR pszMultiByteString, + _In_ INT cjMultiByteString); WIN32KAPI BOOL APIENTRY EngWritePrinter( - IN HANDLE hPrinter, - IN LPVOID pBuf, - IN DWORD cbBuf, - OUT LPDWORD pcWritten); + _In_ HANDLE hPrinter, + _In_reads_bytes_(cjBuf) LPVOID pvBuf, + _In_ DWORD cjBuf, + _Out_ LPDWORD pcWritten); #if defined(_X86_) && !defined(USERMODE_DRIVER) WIN32KAPI VOID APIENTRY FLOATOBJ_Add( - IN OUT PFLOATOBJ pf, - IN PFLOATOBJ pf1); + _Inout_ PFLOATOBJ pf, + _In_ PFLOATOBJ pf1); WIN32KAPI VOID APIENTRY FLOATOBJ_AddFloat( - IN OUT PFLOATOBJ pf, - IN FLOATL f); + _Inout_ PFLOATOBJ pf, + _In_ FLOATL f); WIN32KAPI VOID APIENTRY FLOATOBJ_AddLong( - IN OUT PFLOATOBJ pf, - IN LONG l); + _Inout_ PFLOATOBJ pf, + _In_ LONG l); WIN32KAPI VOID APIENTRY FLOATOBJ_Div( - IN OUT PFLOATOBJ pf, - IN PFLOATOBJ pf1); + _Inout_ PFLOATOBJ pf, + _In_ PFLOATOBJ pf1); WIN32KAPI VOID APIENTRY FLOATOBJ_DivFloat( - IN OUT PFLOATOBJ pf, - IN FLOATL f); + _Inout_ PFLOATOBJ pf, + _In_ FLOATL f); WIN32KAPI VOID APIENTRY FLOATOBJ_DivLong( - IN OUT PFLOATOBJ pf, - IN LONG l); + _Inout_ PFLOATOBJ pf, + _In_ LONG l); WIN32KAPI BOOL APIENTRY FLOATOBJ_Equal( - IN PFLOATOBJ pf, - IN PFLOATOBJ pf1); + _In_ PFLOATOBJ pf, + _In_ PFLOATOBJ pf1); WIN32KAPI BOOL APIENTRY FLOATOBJ_EqualLong( - IN PFLOATOBJ pf, - IN LONG l); + _In_ PFLOATOBJ pf, + _In_ LONG l); WIN32KAPI LONG APIENTRY FLOATOBJ_GetFloat( - IN PFLOATOBJ pf); + _In_ PFLOATOBJ pf); WIN32KAPI LONG APIENTRY FLOATOBJ_GetLong( - IN PFLOATOBJ pf); + _In_ PFLOATOBJ pf); WIN32KAPI BOOL APIENTRY FLOATOBJ_GreaterThan( - IN PFLOATOBJ pf, - IN PFLOATOBJ pf1); + _In_ PFLOATOBJ pf, + _In_ PFLOATOBJ pf1); WIN32KAPI BOOL APIENTRY FLOATOBJ_GreaterThanLong( - IN PFLOATOBJ pf, - IN LONG l); + _In_ PFLOATOBJ pf, + _In_ LONG l); WIN32KAPI BOOL APIENTRY FLOATOBJ_LessThan( - IN PFLOATOBJ pf, - IN PFLOATOBJ pf1); + _In_ PFLOATOBJ pf, + _In_ PFLOATOBJ pf1); WIN32KAPI BOOL APIENTRY FLOATOBJ_LessThanLong( - IN PFLOATOBJ pf, - IN LONG l); + _In_ PFLOATOBJ pf, + _In_ LONG l); WIN32KAPI VOID APIENTRY FLOATOBJ_Mul( - IN OUT PFLOATOBJ pf, - IN PFLOATOBJ pf1); + _Inout_ PFLOATOBJ pf, + _In_ PFLOATOBJ pf1); WIN32KAPI VOID APIENTRY FLOATOBJ_MulFloat( - IN OUT PFLOATOBJ pf, - IN FLOATL f); + _Inout_ PFLOATOBJ pf, + _In_ FLOATL f); WIN32KAPI VOID APIENTRY FLOATOBJ_MulLong( - IN OUT PFLOATOBJ pf, - IN LONG l); + _Inout_ PFLOATOBJ pf, + _In_ LONG l); WIN32KAPI VOID APIENTRY FLOATOBJ_Neg( - IN OUT PFLOATOBJ pf); + _Inout_ PFLOATOBJ pf); WIN32KAPI VOID APIENTRY FLOATOBJ_SetFloat( - OUT PFLOATOBJ pf, - IN FLOATL f); + _Out_ PFLOATOBJ pf, + _In_ FLOATL f); WIN32KAPI VOID APIENTRY FLOATOBJ_SetLong( - OUT PFLOATOBJ pf, - IN LONG l); + _Out_ PFLOATOBJ pf, + _In_ LONG l); WIN32KAPI VOID APIENTRY FLOATOBJ_Sub( - IN OUT PFLOATOBJ pf, - IN PFLOATOBJ pf1); + _Inout_ PFLOATOBJ pf, + _In_ PFLOATOBJ pf1); WIN32KAPI VOID APIENTRY FLOATOBJ_SubFloat( - IN OUT PFLOATOBJ pf, - IN FLOATL f); + _Inout_ PFLOATOBJ pf, + _In_ FLOATL f); WIN32KAPI VOID APIENTRY FLOATOBJ_SubLong( - IN OUT PFLOATOBJ pf, - IN LONG l); + _Inout_ PFLOATOBJ pf, + _In_ LONG l); #else @@ -2498,73 +2514,75 @@ ULONG APIENTRY FONTOBJ_cGetAllGlyphHandles( - IN FONTOBJ *pfo, - OUT HGLYPH *phg); + _In_ FONTOBJ *pfo, + _Out_opt_bytecap_(return) HGLYPH *phg); WIN32KAPI ULONG APIENTRY FONTOBJ_cGetGlyphs( - IN FONTOBJ *pfo, - IN ULONG iMode, - IN ULONG cGlyph, - IN HGLYPH *phg, - OUT PVOID *ppvGlyph); + _In_ FONTOBJ *pfo, + _In_ ULONG iMode, + _In_ ULONG cGlyph, + _In_count_(cGlyph) HGLYPH *phg, + _Out_ PVOID *ppvGlyph); WIN32KAPI FD_GLYPHSET* APIENTRY FONTOBJ_pfdg( - IN FONTOBJ *pfo); + _In_ FONTOBJ *pfo); WIN32KAPI IFIMETRICS* APIENTRY FONTOBJ_pifi( - IN FONTOBJ *pfo); - + _In_ FONTOBJ *pfo); + +_Ret_opt_bytecount_(*pcjTable) WIN32KAPI PBYTE APIENTRY FONTOBJ_pjOpenTypeTablePointer( - IN FONTOBJ *pfo, - IN ULONG ulTag, - OUT ULONG *pcjTable); + _In_ FONTOBJ *pfo, + _In_ ULONG ulTag, + _Out_ ULONG *pcjTable); WIN32KAPI PFD_GLYPHATTR APIENTRY FONTOBJ_pQueryGlyphAttrs( - IN FONTOBJ *pfo, - IN ULONG iMode); - + _In_ FONTOBJ *pfo, + _In_ ULONG iMode); + +_Ret_opt_bytecount_(*pcjFile) WIN32KAPI PVOID APIENTRY FONTOBJ_pvTrueTypeFontFile( - IN FONTOBJ *pfo, - OUT ULONG *pcjFile); + _In_ FONTOBJ *pfo, + _Out_ ULONG *pcjFile); WIN32KAPI LPWSTR APIENTRY FONTOBJ_pwszFontFilePaths( - IN FONTOBJ *pfo, - OUT ULONG *pcwc); + _In_ FONTOBJ *pfo, + _Out_ ULONG *pcwc); WIN32KAPI XFORMOBJ* APIENTRY FONTOBJ_pxoGetXform( - IN FONTOBJ *pfo); + _In_ FONTOBJ *pfo); WIN32KAPI VOID APIENTRY FONTOBJ_vGetInfo( - IN FONTOBJ *pfo, - IN ULONG cjSize, - OUT FONTINFO *pfi); + _In_ FONTOBJ *pfo, + _In_ ULONG cjSize, + _Out_bytecap_(cjSize) FONTINFO *pfi); @@ -2572,187 +2590,187 @@ LONG APIENTRY HT_ComputeRGBGammaTable( - IN USHORT GammaTableEntries, - IN USHORT GammaTableType, - IN USHORT RedGamma, - IN USHORT GreenGamma, - IN USHORT BlueGamma, - OUT LPBYTE pGammaTable); + _In_ USHORT GammaTableEntries, + _In_ USHORT GammaTableType, + _In_ USHORT RedGamma, + _In_ USHORT GreenGamma, + _In_ USHORT BlueGamma, + _Out_writes_bytes_(GammaTableEntries * 3) LPBYTE pGammaTable); WIN32KAPI LONG APIENTRY HT_Get8BPPFormatPalette( - OUT LPPALETTEENTRY pPaletteEntry, - IN USHORT RedGamma, - IN USHORT GreenGamma, - IN USHORT BlueGamma); + _Out_opt_ LPPALETTEENTRY pPaletteEntry, + _In_ USHORT RedGamma, + _In_ USHORT GreenGamma, + _In_ USHORT BlueGamma); WIN32KAPI LONG APIENTRY HT_Get8BPPMaskPalette( - IN OUT LPPALETTEENTRY pPaletteEntry, - IN BOOL Use8BPPMaskPal, - IN BYTE CMYMask, - IN USHORT RedGamma, - IN USHORT GreenGamma, - IN USHORT BlueGamma); + _Out_opt_ LPPALETTEENTRY pPaletteEntry, + _In_ BOOL Use8BPPMaskPal, + _In_ BYTE CMYMask, + _In_ USHORT RedGamma, + _In_ USHORT GreenGamma, + _In_ USHORT BlueGamma); WIN32KAPI LONG APIENTRY HTUI_DeviceColorAdjustment( - IN LPSTR pDeviceName, - OUT PDEVHTADJDATA pDevHTAdjData); + _In_ LPSTR pDeviceName, + _Out_ PDEVHTADJDATA pDevHTAdjData); WIN32KAPI ULONG APIENTRY PALOBJ_cGetColors( - IN PALOBJ *ppalo, - IN ULONG iStart, - IN ULONG cColors, - OUT ULONG *pulColors); + _In_ PALOBJ *ppalo, + _In_ ULONG iStart, + _In_ ULONG cColors, + _Out_writes_(cColors) ULONG *pulColors); WIN32KAPI BOOL APIENTRY PATHOBJ_bCloseFigure( - IN PATHOBJ *ppo); + _In_ PATHOBJ *ppo); WIN32KAPI BOOL APIENTRY PATHOBJ_bEnum( - IN PATHOBJ *ppo, - OUT PATHDATA *ppd); + _In_ PATHOBJ *ppo, + _Out_ PATHDATA *ppd); WIN32KAPI BOOL APIENTRY PATHOBJ_bEnumClipLines( - IN PATHOBJ *ppo, - IN ULONG cb, - OUT CLIPLINE *pcl); + _In_ PATHOBJ *ppo, + _In_ ULONG cj, + _Out_bytecap_(cj) CLIPLINE *pcl); WIN32KAPI BOOL APIENTRY PATHOBJ_bMoveTo( - IN PATHOBJ *ppo, - IN POINTFIX ptfx); + _In_ PATHOBJ *ppo, + _In_ POINTFIX ptfx); WIN32KAPI BOOL APIENTRY PATHOBJ_bPolyBezierTo( - IN PATHOBJ *ppo, - IN POINTFIX *pptfx, - IN ULONG cptfx); + _In_ PATHOBJ *ppo, + _In_ POINTFIX *pptfx, + _In_ ULONG cptfx); WIN32KAPI BOOL APIENTRY PATHOBJ_bPolyLineTo( - IN PATHOBJ *ppo, - IN POINTFIX *pptfx, - IN ULONG cptfx); + _In_ PATHOBJ *ppo, + _In_ POINTFIX *pptfx, + _In_ ULONG cptfx); WIN32KAPI VOID APIENTRY PATHOBJ_vEnumStart( - IN PATHOBJ *ppo); + _Inout_ PATHOBJ *ppo); WIN32KAPI VOID APIENTRY PATHOBJ_vEnumStartClipLines( - IN PATHOBJ *ppo, - IN CLIPOBJ *pco, - IN SURFOBJ *pso, - IN LINEATTRS *pla); + _Inout_ PATHOBJ *ppo, + _In_ CLIPOBJ *pco, + _In_ SURFOBJ *pso, + _In_ LINEATTRS *pla); WIN32KAPI VOID APIENTRY PATHOBJ_vGetBounds( - IN PATHOBJ *ppo, - OUT PRECTFX prectfx); + _In_ PATHOBJ *ppo, + _Out_ PRECTFX prectfx); WIN32KAPI BOOL APIENTRY STROBJ_bEnum( - IN STROBJ *pstro, - OUT ULONG *pc, - OUT PGLYPHPOS *ppgpos); + _Inout_ STROBJ *pstro, + _Out_ ULONG *pc, + _Out_ PGLYPHPOS *ppgpos); // FIXME_ size? WIN32KAPI BOOL APIENTRY STROBJ_bEnumPositionsOnly( - IN STROBJ *pstro, - OUT ULONG *pc, - OUT PGLYPHPOS *ppgpos); + _In_ STROBJ *pstro, + _Out_ ULONG *pc, + _Out_ PGLYPHPOS *ppgpos); // FIXME_ size? WIN32KAPI BOOL APIENTRY STROBJ_bGetAdvanceWidths( - IN STROBJ *pso, - IN ULONG iFirst, - IN ULONG c, - OUT POINTQF *pptqD); + _In_ STROBJ *pso, + _In_ ULONG iFirst, + _In_ ULONG c, + _Out_cap_(c) POINTQF *pptqD); WIN32KAPI DWORD APIENTRY STROBJ_dwGetCodePage( - IN STROBJ *pstro); + _In_ STROBJ *pstro); WIN32KAPI FIX APIENTRY STROBJ_fxBreakExtra( - IN STROBJ *pstro); + _In_ STROBJ *pstro); WIN32KAPI FIX APIENTRY STROBJ_fxCharacterExtra( - IN STROBJ *pstro); + _In_ STROBJ *pstro); WIN32KAPI VOID APIENTRY STROBJ_vEnumStart( - IN STROBJ *pstro); + _In_ STROBJ *pstro); WIN32KAPI BOOL APIENTRY WNDOBJ_bEnum( - IN WNDOBJ *pwo, - IN ULONG cj, - OUT ULONG *pul); + _Inout_ WNDOBJ *pwo, + _In_ ULONG cj, + _Out_bytecap_(cj) ULONG *pul); WIN32KAPI ULONG APIENTRY WNDOBJ_cEnumStart( - IN WNDOBJ *pwo, - IN ULONG iType, - IN ULONG iDirection, - IN ULONG cLimit); + _Inout_ WNDOBJ *pwo, + _In_ ULONG iType, + _In_ ULONG iDirection, + _In_ ULONG cLimit); WIN32KAPI VOID APIENTRY WNDOBJ_vSetConsumer( - IN WNDOBJ *pwo, - IN PVOID pvConsumer); + _Inout_ WNDOBJ *pwo, + _In_ PVOID pvConsumer); /* XFORMOBJ_bApplyXform.iMode constants */ #define XF_LTOL 0L @@ -2764,25 +2782,25 @@ BOOL APIENTRY XFORMOBJ_bApplyXform( - IN XFORMOBJ *pxo, - IN ULONG iMode, - IN ULONG cPoints, - IN PVOID pvIn, - OUT PVOID pvOut); + _In_ XFORMOBJ *pxo, + _In_ ULONG iMode, + _In_ ULONG cPoints, + _In_reads_bytes_(cPoints * sizeof(POINTL)) PVOID pvIn, + _Out_writes_bytes_(cPoints * sizeof(POINTL)) PVOID pvOut); WIN32KAPI ULONG APIENTRY XFORMOBJ_iGetFloatObjXform( - IN XFORMOBJ *pxo, - OUT FLOATOBJ_XFORM *pxfo); + _In_ XFORMOBJ *pxo, + _Out_ FLOATOBJ_XFORM *pxfo); WIN32KAPI ULONG APIENTRY XFORMOBJ_iGetXform( - IN XFORMOBJ *pxo, - OUT XFORML *pxform); + _In_ XFORMOBJ *pxo, + _Out_ XFORML *pxform); /* XLATEOBJ_cGetPalette.iPal constants */ #define XO_SRCPALETTE 1 @@ -2795,424 +2813,465 @@ ULONG APIENTRY XLATEOBJ_cGetPalette( - IN XLATEOBJ *pxlo, - IN ULONG iPal, - IN ULONG cPal, - OUT ULONG *pPal); + _In_ XLATEOBJ *pxlo, + _In_ ULONG iPal, + _In_ ULONG cPal, + _Out_cap_(cPal) ULONG *pPal); WIN32KAPI HANDLE APIENTRY XLATEOBJ_hGetColorTransform( - IN XLATEOBJ *pxlo); + _In_ XLATEOBJ *pxlo); WIN32KAPI ULONG APIENTRY XLATEOBJ_iXlate( - IN XLATEOBJ *pxlo, - IN ULONG iColor); + _In_ XLATEOBJ *pxlo, + _In_ ULONG iColor); WIN32KAPI ULONG* APIENTRY XLATEOBJ_piVector( - IN XLATEOBJ *pxlo); - + _In_ XLATEOBJ *pxlo); /* Graphics Driver Functions */ -BOOL -APIENTRY -DrvAlphaBlend( - IN SURFOBJ *psoDest, - IN SURFOBJ *psoSrc, - IN CLIPOBJ *pco, - IN XLATEOBJ *pxlo, - IN RECTL *prclDest, - IN RECTL *prclSrc, - IN BLENDOBJ *pBlendObj); - -BOOL -APIENTRY -DrvAssertMode( - IN DHPDEV dhpdev, - IN BOOL bEnable); - -BOOL -APIENTRY -DrvBitBlt( - IN SURFOBJ *psoTrg, - IN SURFOBJ *psoSrc, - IN SURFOBJ *psoMask, - IN CLIPOBJ *pco, - IN XLATEOBJ *pxlo, - IN RECTL *prclTrg, - IN POINTL *pptlSrc, - IN POINTL *pptlMask, - IN BRUSHOBJ *pbo, - IN POINTL *pptlBrush, - IN ROP4 rop4); - -VOID -APIENTRY -DrvCompletePDEV( - IN DHPDEV dhpdev, - IN HDEV hdev); - -BOOL -APIENTRY -DrvCopyBits( - IN SURFOBJ *psoDest, - IN SURFOBJ *psoSrc, - IN CLIPOBJ *pco, - IN XLATEOBJ *pxlo, - IN RECTL *prclDest, - IN POINTL *pptlSrc); - -HBITMAP -APIENTRY -DrvCreateDeviceBitmap( - IN DHPDEV dhpdev, - IN SIZEL sizl, - IN ULONG iFormat); - -VOID -APIENTRY -DrvDeleteDeviceBitmap( - IN DHSURF dhsurf); - -HBITMAP -APIENTRY -DrvDeriveSurface( - DD_DIRECTDRAW_GLOBAL *pDirectDraw, - DD_SURFACE_LOCAL *pSurface); - -LONG -APIENTRY -DrvDescribePixelFormat( - IN DHPDEV dhpdev, - IN LONG iPixelFormat, - IN ULONG cjpfd, - OUT PIXELFORMATDESCRIPTOR *ppfd); - -VOID -APIENTRY -DrvDestroyFont( - IN FONTOBJ *pfo); - -VOID -APIENTRY -DrvDisableDriver( - VOID); - -VOID -APIENTRY -DrvDisablePDEV( - IN DHPDEV dhpdev); - -VOID -APIENTRY -DrvDisableSurface( - IN DHPDEV dhpdev); +typedef BOOL +(APIENTRY FN_DrvAlphaBlend)( + _Inout_ SURFOBJ *psoDest, + _In_ SURFOBJ *psoSrc, + _In_ CLIPOBJ *pco, + _In_opt_ XLATEOBJ *pxlo, + _In_ RECTL *prclDest, + _In_ RECTL *prclSrc, + _In_ BLENDOBJ *pBlendObj); +typedef FN_DrvAlphaBlend *PFN_DrvAlphaBlend; +extern FN_DrvAlphaBlend DrvAlphaBlend; + +typedef BOOL +(APIENTRY FN_DrvAssertMode)( + _In_ DHPDEV dhpdev, + _In_ BOOL bEnable); +typedef FN_DrvAssertMode *PFN_DrvAssertMode; +extern FN_DrvAssertMode DrvAssertMode; + +typedef BOOL +(APIENTRY FN_DrvBitBlt)( + _Inout_ SURFOBJ *psoTrg, + _In_opt_ SURFOBJ *psoSrc, + _In_opt_ SURFOBJ *psoMask, + _In_ CLIPOBJ *pco, + _In_opt_ XLATEOBJ *pxlo, + _In_ RECTL *prclTrg, + _In_opt_ POINTL *pptlSrc, + _In_opt_ POINTL *pptlMask, + _In_opt_ BRUSHOBJ *pbo, + _In_opt_ POINTL *pptlBrush, + _In_ ROP4 rop4); +typedef FN_DrvBitBlt *PFN_DrvBitBlt; +extern FN_DrvBitBlt DrvBitBlt; + +typedef VOID +(APIENTRY FN_DrvCompletePDEV)( + _In_ DHPDEV dhpdev, + _In_ HDEV hdev); +typedef FN_DrvCompletePDEV *PFN_DrvCompletePDEV; +extern FN_DrvCompletePDEV DrvCompletePDEV; + +typedef BOOL +(APIENTRY FN_DrvCopyBits)( + _In_ SURFOBJ *psoDest, + _In_ SURFOBJ *psoSrc, + _In_ CLIPOBJ *pco, + _In_ XLATEOBJ *pxlo, + _In_ RECTL *prclDest, + _In_ POINTL *pptlSrc); +typedef FN_DrvCopyBits *PFN_DrvCopyBits; +extern FN_DrvCopyBits DrvCopyBits; + +typedef HBITMAP +(APIENTRY FN_DrvCreateDeviceBitmap)( + _In_ DHPDEV dhpdev, + _In_ SIZEL sizl, + _In_ ULONG iFormat); +typedef FN_DrvCreateDeviceBitmap *PFN_DrvCreateDeviceBitmap; +extern FN_DrvCreateDeviceBitmap DrvCreateDeviceBitmap; + +typedef VOID +(APIENTRY FN_DrvDeleteDeviceBitmap)( + _In_ DHSURF dhsurf); +typedef FN_DrvDeleteDeviceBitmap *PFN_DrvDeleteDeviceBitmap; +extern FN_DrvDeleteDeviceBitmap DrvDeleteDeviceBitmap; + +typedef HBITMAP +(APIENTRY FN_DrvDeriveSurface)( + _In_ DD_DIRECTDRAW_GLOBAL *pDirectDraw, + _In_ DD_SURFACE_LOCAL *pSurface); +typedef FN_DrvDeriveSurface *PFN_DrvDeriveSurface; +extern FN_DrvDeriveSurface DrvDeriveSurface; + +typedef LONG +(APIENTRY FN_DrvDescribePixelFormat)( + _In_ DHPDEV dhpdev, + _In_ LONG iPixelFormat, + _In_ ULONG cjpfd, + _Out_ PIXELFORMATDESCRIPTOR *ppfd); +typedef FN_DrvDescribePixelFormat *PFN_DrvDescribePixelFormat; +extern FN_DrvDescribePixelFormat DrvDescribePixelFormat; + +typedef VOID +(APIENTRY FN_DrvDestroyFont)( + _In_ FONTOBJ *pfo); +typedef FN_DrvDestroyFont *PFN_DrvDestroyFont; +extern FN_DrvDestroyFont DrvDestroyFont; + +typedef VOID +(APIENTRY FN_DrvDisableDriver)(VOID); +typedef FN_DrvDisableDriver *PFN_DrvDisableDriver; +extern FN_DrvDisableDriver DrvDisableDriver; + +typedef VOID +(APIENTRY FN_DrvDisablePDEV)( + _In_ DHPDEV dhpdev); +typedef FN_DrvDisablePDEV *PFN_DrvDisablePDEV; +extern FN_DrvDisablePDEV DrvDisablePDEV; + +typedef VOID +(APIENTRY FN_DrvDisableSurface)( + _In_ DHPDEV dhpdev); +typedef FN_DrvDisableSurface *PFN_DrvDisableSurface; +extern FN_DrvDisableSurface DrvDisableSurface; #define DM_DEFAULT 0x00000001 #define DM_MONOCHROME 0x00000002 -ULONG -APIENTRY -DrvDitherColor( - IN DHPDEV dhpdev, - IN ULONG iMode, - IN ULONG rgb, - OUT ULONG *pul); - -ULONG -APIENTRY -DrvDrawEscape( - IN SURFOBJ *pso, - IN ULONG iEsc, - IN CLIPOBJ *pco, - IN RECTL *prcl, - IN ULONG cjIn, - IN PVOID pvIn); - -BOOL -APIENTRY -DrvEnableDriver( - IN ULONG iEngineVersion, - IN ULONG cj, - OUT DRVENABLEDATA *pded); - -DHPDEV -APIENTRY -DrvEnablePDEV( - IN DEVMODEW *pdm, - IN LPWSTR pwszLogAddress, - IN ULONG cPat, - OUT HSURF *phsurfPatterns, - IN ULONG cjCaps, - OUT ULONG *pdevcaps, - IN ULONG cjDevInfo, - OUT DEVINFO *pdi, - IN HDEV hdev, - IN LPWSTR pwszDeviceName, - IN HANDLE hDriver); - -HSURF -APIENTRY -DrvEnableSurface( - IN DHPDEV dhpdev); +typedef ULONG +(APIENTRY FN_DrvDitherColor)( + _In_ DHPDEV dhpdev, + _In_ ULONG iMode, + _In_ ULONG rgb, + _Inout_updates_(8 * 8) ULONG *pul); // FIXME: compare EngDitherColor +typedef FN_DrvDitherColor *PFN_DrvDitherColor; +extern FN_DrvDitherColor DrvDitherColor; + +typedef ULONG +(APIENTRY FN_DrvDrawEscape)( + _In_ SURFOBJ *pso, + _In_ ULONG iEsc, + _In_ CLIPOBJ *pco, + _In_ RECTL *prcl, + _In_ ULONG cjIn, + _In_reads_bytes_(cjIn) PVOID pvIn); +typedef FN_DrvDrawEscape *PFN_DrvDrawEscape; +extern FN_DrvDrawEscape DrvDrawEscape; + +typedef BOOL +(APIENTRY FN_DrvEnableDriver)( + _In_ ULONG iEngineVersion, + _In_ ULONG cj, + _Inout_bytecount_(cj) DRVENABLEDATA *pded); // Zero initialized +typedef FN_DrvEnableDriver *PFN_DrvEnableDriver; +extern FN_DrvEnableDriver DrvEnableDriver; + +typedef DHPDEV +(APIENTRY FN_DrvEnablePDEV)( + _In_ DEVMODEW *pdm, + _In_ LPWSTR pwszLogAddress, + _In_ ULONG cPat, + _Out_opt_cap_(cPat) HSURF *phsurfPatterns, + _In_ ULONG cjCaps, + _Out_bytecap_(cjCaps) ULONG *pdevcaps, + _In_ ULONG cjDevInfo, + _Out_ DEVINFO *pdi, + _In_ HDEV hdev, + _In_ LPWSTR pwszDeviceName, + _In_ HANDLE hDriver); +typedef FN_DrvEnablePDEV *PFN_DrvEnablePDEV; +extern FN_DrvEnablePDEV DrvEnablePDEV; + +typedef HSURF +(APIENTRY FN_DrvEnableSurface)( + _In_ DHPDEV dhpdev); +typedef FN_DrvEnableSurface *PFN_DrvEnableSurface; +extern FN_DrvEnableSurface DrvEnableSurface; /* DrvEndDoc.fl constants */ #define ED_ABORTDOC 0x00000001 -BOOL -APIENTRY -DrvEndDoc( - IN SURFOBJ *pso, - IN FLONG fl); - -ULONG -APIENTRY -DrvEscape( - IN SURFOBJ *pso, - IN ULONG iEsc, - IN ULONG cjIn, - IN PVOID pvIn, - IN ULONG cjOut, - OUT PVOID pvOut); - -BOOL -APIENTRY -DrvFillPath( - IN SURFOBJ *pso, - IN PATHOBJ *ppo, - IN CLIPOBJ *pco, - IN BRUSHOBJ *pbo, - IN POINTL *pptlBrushOrg, - IN MIX mix, - IN FLONG flOptions); - -ULONG -APIENTRY -DrvFontManagement( - IN SURFOBJ *pso, - IN FONTOBJ *pfo, - IN ULONG iMode, - IN ULONG cjIn, - IN PVOID pvIn, - IN ULONG cjOut, - OUT PVOID pvOut); - -VOID -APIENTRY -DrvFree( - IN PVOID pv, - IN ULONG_PTR id); +typedef BOOL +(APIENTRY FN_DrvEndDoc)( + _In_ SURFOBJ *pso, + _In_ FLONG fl); +typedef FN_DrvEndDoc *PFN_DrvEndDoc; +extern FN_DrvEndDoc DrvEndDoc; + +typedef ULONG +(APIENTRY FN_DrvEscape)( + _In_ SURFOBJ *pso, + _In_ ULONG iEsc, + _In_ ULONG cjIn, + _In_bytecount_(cjIn) PVOID pvIn, + _In_ ULONG cjOut, + _Out_bytecap_(cjOut) PVOID pvOut); +typedef FN_DrvEscape *PFN_DrvEscape; +extern FN_DrvEscape DrvEscape; + +typedef BOOL +(APIENTRY FN_DrvFillPath)( + _Inout_ SURFOBJ *pso, + _In_ PATHOBJ *ppo, + _In_ CLIPOBJ *pco, + _In_ BRUSHOBJ *pbo, + _In_ POINTL *pptlBrushOrg, + _In_ MIX mix, + _In_ FLONG flOptions); +typedef FN_DrvFillPath *PFN_DrvFillPath; +extern FN_DrvFillPath DrvFillPath; + +typedef ULONG +(APIENTRY FN_DrvFontManagement)( + _In_ SURFOBJ *pso, + _In_opt_ FONTOBJ *pfo, + _In_ ULONG iMode, + _In_ ULONG cjIn, + _In_bytecount_(cjIn) PVOID pvIn, + _In_ ULONG cjOut, + _Out_bytecap_(cjOut) PVOID pvOut); +typedef FN_DrvFontManagement *PFN_DrvFontManagement; +extern FN_DrvFontManagement DrvFontManagement; + +typedef VOID +(APIENTRY FN_DrvFree)( + _In_ _Post_ptr_invalid_ PVOID pv, + _In_ ULONG_PTR id); +typedef FN_DrvFree *PFN_DrvFree; +extern FN_DrvFree DrvFree; /* DrvGetGlyphMode return values */ #define FO_HGLYPHS 0L #define FO_GLYPHBITS 1L #define FO_PATHOBJ 2L -ULONG -APIENTRY -DrvGetGlyphMode( - IN DHPDEV dhpdev, - IN FONTOBJ *pfo); - -ULONG -APIENTRY -DrvGetModes( - IN HANDLE hDriver, - IN ULONG cjSize, - OUT DEVMODEW *pdm); - -PVOID -APIENTRY -DrvGetTrueTypeFile( - IN ULONG_PTR iFile, - IN ULONG *pcj); - -BOOL -APIENTRY -DrvGradientFill( - IN SURFOBJ *psoDest, - IN CLIPOBJ *pco, - IN XLATEOBJ *pxlo, - IN TRIVERTEX *pVertex, - IN ULONG nVertex, - IN PVOID pMesh, - IN ULONG nMesh, - IN RECTL *prclExtents, - IN POINTL *pptlDitherOrg, - IN ULONG ulMode); - -BOOL -APIENTRY -DrvIcmCheckBitmapBits( - IN DHPDEV dhpdev, - IN HANDLE hColorTransform, - IN SURFOBJ *pso, - OUT PBYTE paResults); - -HANDLE -APIENTRY -DrvIcmCreateColorTransform( - IN DHPDEV dhpdev, - IN LPLOGCOLORSPACEW pLogColorSpace, - IN PVOID pvSourceProfile, - IN ULONG cjSourceProfile, - IN PVOID pvDestProfile, - IN ULONG cjDestProfile, - IN PVOID pvTargetProfile, - IN ULONG cjTargetProfile, - IN DWORD dwReserved); - -BOOL -APIENTRY -DrvIcmDeleteColorTransform( - IN DHPDEV dhpdev, - IN HANDLE hcmXform); +typedef ULONG +(APIENTRY FN_DrvGetGlyphMode)( + _In_ DHPDEV dhpdev, + _In_ FONTOBJ *pfo); +typedef FN_DrvGetGlyphMode *PFN_DrvGetGlyphMode; +extern FN_DrvGetGlyphMode DrvGetGlyphMode; + +typedef ULONG +(APIENTRY FN_DrvGetModes)( + _In_ HANDLE hDriver, + _In_ ULONG cjSize, + _Out_opt_bytecap_(cjSize) DEVMODEW *pdm); +typedef FN_DrvGetModes *PFN_DrvGetModes; +extern FN_DrvGetModes DrvGetModes; + +typedef PVOID +(APIENTRY FN_DrvGetTrueTypeFile)( + _In_ ULONG_PTR iFile, + _In_ ULONG *pcj); +typedef FN_DrvGetTrueTypeFile *PFN_DrvGetTrueTypeFile; +extern FN_DrvGetTrueTypeFile DrvGetTrueTypeFile; + +typedef BOOL +(APIENTRY FN_DrvGradientFill)( + _Inout_ SURFOBJ *psoDest, + _In_ CLIPOBJ *pco, + _In_opt_ XLATEOBJ *pxlo, + _In_ TRIVERTEX *pVertex, + _In_ ULONG nVertex, + _In_ PVOID pMesh, + _In_ ULONG nMesh, + _In_ RECTL *prclExtents, + _In_ POINTL *pptlDitherOrg, + _In_ ULONG ulMode); +typedef FN_DrvGradientFill *PFN_DrvGradientFill; +extern FN_DrvGradientFill DrvGradientFill; + +typedef BOOL +(APIENTRY FN_DrvIcmCheckBitmapBits)( + _In_ DHPDEV dhpdev, + _In_ HANDLE hColorTransform, + _In_ SURFOBJ *pso, + _Out_bytecap_(pso->sizlBitmap.cx * pso->sizlBitmap.cy) PBYTE paResults); +typedef FN_DrvIcmCheckBitmapBits *PFN_DrvIcmCheckBitmapBits; +extern FN_DrvIcmCheckBitmapBits DrvIcmCheckBitmapBits; + +typedef HANDLE +(APIENTRY FN_DrvIcmCreateColorTransform)( + _In_ DHPDEV dhpdev, + _In_ LPLOGCOLORSPACEW pLogColorSpace, + _In_reads_bytes_opt_(cjSourceProfile) PVOID pvSourceProfile, + _In_ ULONG cjSourceProfile, + _In_reads_bytes_(cjDestProfile) PVOID pvDestProfile, + _In_ ULONG cjDestProfile, + _In_reads_bytes_opt_(cjTargetProfile) PVOID pvTargetProfile, + _In_ ULONG cjTargetProfile, + _In_ DWORD dwReserved); +typedef FN_DrvIcmCreateColorTransform *PFN_DrvIcmCreateColorTransform; +extern FN_DrvIcmCreateColorTransform DrvIcmCreateColorTransform; + +typedef BOOL +(APIENTRY FN_DrvIcmDeleteColorTransform)( + _In_ DHPDEV dhpdev, + _In_ HANDLE hcmXform); +typedef FN_DrvIcmDeleteColorTransform *PFN_DrvIcmDeleteColorTransform; +extern FN_DrvIcmDeleteColorTransform DrvIcmDeleteColorTransform; /* DrvIcmSetDeviceGammaRamp.iFormat constants */ #define IGRF_RGB_256BYTES 0x00000000 #define IGRF_RGB_256WORDS 0x00000001 -BOOL -APIENTRY -DrvIcmSetDeviceGammaRamp( - IN DHPDEV dhpdev, - IN ULONG iFormat, - IN LPVOID lpRamp); - -BOOL -APIENTRY -DrvLineTo( - SURFOBJ *pso, - CLIPOBJ *pco, - BRUSHOBJ *pbo, - LONG x1, - LONG y1, - LONG x2, - LONG y2, - RECTL *prclBounds, - MIX mix); - -ULONG_PTR -APIENTRY -DrvLoadFontFile( - ULONG cFiles, - ULONG_PTR *piFile, - PVOID *ppvView, - ULONG *pcjView, - DESIGNVECTOR *pdv, - ULONG ulLangID, - ULONG ulFastCheckSum); - -VOID -APIENTRY -DrvMovePointer( - IN SURFOBJ *pso, - IN LONG x, - IN LONG y, - IN RECTL *prcl); - -BOOL -APIENTRY -DrvNextBand( - IN SURFOBJ *pso, - IN POINTL *pptl); - -VOID -APIENTRY -DrvNotify( - IN SURFOBJ *pso, - IN ULONG iType, - IN PVOID pvData); - -BOOL -APIENTRY -DrvOffset( - IN SURFOBJ *pso, - IN LONG x, - IN LONG y, - IN FLONG flReserved); - -BOOL -APIENTRY -DrvPaint( - IN SURFOBJ *pso, - IN CLIPOBJ *pco, - IN BRUSHOBJ *pbo, - IN POINTL *pptlBrushOrg, - IN MIX mix); - -BOOL -APIENTRY -DrvPlgBlt( - IN SURFOBJ *psoTrg, - IN SURFOBJ *psoSrc, - IN SURFOBJ *psoMsk, - IN CLIPOBJ *pco, - IN XLATEOBJ *pxlo, - IN COLORADJUSTMENT *pca, - IN POINTL *pptlBrushOrg, - IN POINTFIX *pptfx, - IN RECTL *prcl, - IN POINTL *pptl, - IN ULONG iMode); +typedef BOOL +(APIENTRY FN_DrvIcmSetDeviceGammaRamp)( + _In_ DHPDEV dhpdev, + _In_ ULONG iFormat, + _In_bytecount_(sizeof(GAMMARAMP)) LPVOID lpRamp); +typedef FN_DrvIcmSetDeviceGammaRamp *PFN_DrvIcmSetDeviceGammaRamp; +extern FN_DrvIcmSetDeviceGammaRamp DrvIcmSetDeviceGammaRamp; + +typedef BOOL +(APIENTRY FN_DrvLineTo)( + _Inout_ SURFOBJ *pso, + _In_ CLIPOBJ *pco, + _In_ BRUSHOBJ *pbo, + _In_ LONG x1, + _In_ LONG y1, + _In_ LONG x2, + _In_ LONG y2, + _In_opt_ RECTL *prclBounds, + _In_ MIX mix); +typedef FN_DrvLineTo *PFN_DrvLineTo; +extern FN_DrvLineTo DrvLineTo; + +typedef ULONG_PTR +(APIENTRY FN_DrvLoadFontFile)( + _In_ ULONG cFiles, + _In_ ULONG_PTR *piFile, + _In_count_(cFiles) PVOID *ppvView, + _In_count_(cFiles) ULONG *pcjView, + _In_opt_ DESIGNVECTOR *pdv, + _In_ ULONG ulLangID, + _In_ ULONG ulFastCheckSum); +typedef FN_DrvLoadFontFile *PFN_DrvLoadFontFile; +extern FN_DrvLoadFontFile DrvLoadFontFile; + +typedef VOID +(APIENTRY FN_DrvMovePointer)( + _In_ SURFOBJ *pso, + _In_ LONG x, + _In_ LONG y, + _In_opt_ RECTL *prcl); +typedef FN_DrvMovePointer *PFN_DrvMovePointer; +extern FN_DrvMovePointer DrvMovePointer; + +typedef BOOL +(APIENTRY FN_DrvNextBand)( + _In_ SURFOBJ *pso, + _In_ POINTL *pptl); +typedef FN_DrvNextBand *PFN_DrvNextBand; +extern FN_DrvNextBand DrvNextBand; + +typedef VOID +(APIENTRY FN_DrvNotify)( + _In_ SURFOBJ *pso, + _In_ ULONG iType, + _In_opt_ PVOID pvData); +typedef FN_DrvNotify *PFN_DrvNotify; +extern FN_DrvNotify DrvNotify; + +typedef BOOL +(APIENTRY FN_DrvOffset)( + _In_ SURFOBJ *pso, + _In_ LONG x, + _In_ LONG y, + _In_ FLONG flReserved); +typedef FN_DrvOffset *PFN_DrvOffset; +extern FN_DrvOffset DrvOffset; + +typedef BOOL +(APIENTRY FN_DrvPaint)( + _Inout_ SURFOBJ *pso, + _In_ CLIPOBJ *pco, + _In_ BRUSHOBJ *pbo, + _In_ POINTL *pptlBrushOrg, + _In_ MIX mix); +typedef FN_DrvPaint *PFN_DrvPaint; +extern FN_DrvPaint DrvPaint; + +typedef BOOL +(APIENTRY FN_DrvPlgBlt)( + _Inout_ SURFOBJ *psoTrg, + _Inout_ SURFOBJ *psoSrc, + _In_opt_ SURFOBJ *psoMsk, + _In_ CLIPOBJ *pco, + _In_opt_ XLATEOBJ *pxlo, + _In_opt_ COLORADJUSTMENT *pca, + _In_opt_ POINTL *pptlBrushOrg, + _In_ POINTFIX *pptfx, + _In_ RECTL *prcl, + _In_opt_ POINTL *pptl, + _In_ ULONG iMode); +typedef FN_DrvPlgBlt *PFN_DrvPlgBlt; +extern FN_DrvPlgBlt DrvPlgBlt; /* DrvQueryAdvanceWidths.iMode constants */ #define QAW_GETWIDTHS 0 #define QAW_GETEASYWIDTHS 1 -BOOL -APIENTRY -DrvQueryAdvanceWidths( - IN DHPDEV dhpdev, - IN FONTOBJ *pfo, - IN ULONG iMode, - IN HGLYPH *phg, - OUT PVOID pvWidths, - IN ULONG cGlyphs); +typedef BOOL +(APIENTRY FN_DrvQueryAdvanceWidths)( + _In_ DHPDEV dhpdev, + _In_ FONTOBJ *pfo, + _In_ ULONG iMode, + _In_count_(cGlyphs) HGLYPH *phg, + _Out_bytecap_(cGlyphs * sizeof(USHORT)) PVOID pvWidths, // CHECKME + _In_ ULONG cGlyphs); +typedef FN_DrvQueryAdvanceWidths *PFN_DrvQueryAdvanceWidths; +extern FN_DrvQueryAdvanceWidths DrvQueryAdvanceWidths; /* DrvQueryDeviceSupport.iType constants */ #define QDS_CHECKJPEGFORMAT 0x00000000 #define QDS_CHECKPNGFORMAT 0x00000001 -BOOL -APIENTRY -DrvQueryDeviceSupport( - SURFOBJ *pso, - XLATEOBJ *pxlo, - XFORMOBJ *pxo, - ULONG iType, - ULONG cjIn, - PVOID pvIn, - ULONG cjOut, - PVOID pvOut); +typedef BOOL +(APIENTRY FN_DrvQueryDeviceSupport)( + _In_ SURFOBJ *pso, + _In_ XLATEOBJ *pxlo, + _In_ XFORMOBJ *pxo, + _In_ ULONG iType, + _In_ ULONG cjIn, + _In_bytecount_(cjIn) PVOID pvIn, + _In_ ULONG cjOut, + _Out_bytecap_(cjOut) PVOID pvOut); +typedef FN_DrvQueryDeviceSupport *PFN_DrvQueryDeviceSupport; +extern FN_DrvQueryDeviceSupport DrvQueryDeviceSupport; /* DrvQueryDriverInfo.dwMode constants */ #define DRVQUERY_USERMODE 0x00000001 -BOOL -APIENTRY -DrvQueryDriverInfo( - DWORD dwMode, - PVOID pBuffer, - DWORD cbBuf, - PDWORD pcbNeeded); - -PIFIMETRICS -APIENTRY -DrvQueryFont( - IN DHPDEV dhpdev, - IN ULONG_PTR iFile, - IN ULONG iFace, - IN ULONG_PTR *pid); +typedef BOOL +(APIENTRY FN_DrvQueryDriverInfo)( + _In_ DWORD dwMode, + _Out_bytecap_(cjBuf) PVOID pBuffer, + _In_ DWORD cjBuf, + _Out_ PDWORD pcbNeeded); +typedef FN_DrvQueryDriverInfo *PFN_DrvQueryDriverInfo; +extern FN_DrvQueryDriverInfo DrvQueryDriverInfo; + +typedef PIFIMETRICS +(APIENTRY FN_DrvQueryFont)( + _In_ DHPDEV dhpdev, + _In_ ULONG_PTR iFile, + _In_ ULONG iFace, + _Out_ ULONG_PTR *pid); +typedef FN_DrvQueryFont *PFN_DrvQueryFont; +extern FN_DrvQueryFont DrvQueryFont; /* DrvQueryFontCaps.pulCaps constants */ #define QC_OUTLINES 0x00000001 @@ -3221,11 +3280,12 @@ #define QC_FONTDRIVERCAPS (QC_OUTLINES | QC_1BIT | QC_4BIT) -LONG -APIENTRY -DrvQueryFontCaps( - IN ULONG culCaps, - OUT ULONG *pulCaps); +typedef LONG +(APIENTRY FN_DrvQueryFontCaps)( + _In_ ULONG culCaps, + _Out_cap_(culCaps) ULONG *pulCaps); +typedef FN_DrvQueryFontCaps *PFN_DrvQueryFontCaps; +extern FN_DrvQueryFontCaps DrvQueryFontCaps; /* DrvQueryFontData.iMode constants */ #define QFD_GLYPHANDBITMAP 1L @@ -3239,28 +3299,30 @@ #define QFD_TT_MONO_BITMAP QFD_TT_GRAY1_BITMAP -LONG -APIENTRY -DrvQueryFontData( - IN DHPDEV dhpdev, - IN FONTOBJ *pfo, - IN ULONG iMode, - IN HGLYPH hg, - IN OUT GLYPHDATA *pgd, - IN OUT PVOID pv, - IN ULONG cjSize); +typedef LONG +(APIENTRY FN_DrvQueryFontData)( + _In_ DHPDEV dhpdev, + _In_ FONTOBJ *pfo, + _In_ ULONG iMode, + _In_ HGLYPH hg, + _In_opt_ GLYPHDATA *pgd, + _Out_bytecap_(cjSize) PVOID pv, + _In_ ULONG cjSize); +typedef FN_DrvQueryFontData *PFN_DrvQueryFontData; +extern FN_DrvQueryFontData DrvQueryFontData; /* DrvQueryFontFile.ulMode constants */ #define QFF_DESCRIPTION 0x00000001 #define QFF_NUMFACES 0x00000002 -LONG -APIENTRY -DrvQueryFontFile( - IN ULONG_PTR iFile, - IN ULONG ulMode, - IN ULONG cjBuf, - IN ULONG *pulBuf); +typedef LONG +(APIENTRY FN_DrvQueryFontFile)( + _In_ ULONG_PTR iFile, + _In_ ULONG ulMode, + _In_ ULONG cjBuf, + _Out_bytecap_(cjBuf) ULONG *pulBuf); +typedef FN_DrvQueryFontFile *PFN_DrvQueryFontFile; +extern FN_DrvQueryFontFile DrvQueryFontFile; /* DrvQueryFontTree.iMode constants */ #define QFT_UNICODE 0L @@ -3268,119 +3330,135 @@ #define QFT_KERNPAIRS 2L #define QFT_GLYPHSET 3L -PVOID -APIENTRY -DrvQueryFontTree( - IN DHPDEV dhpdev, - IN ULONG_PTR iFile, - IN ULONG iFace, - IN ULONG iMode, - IN ULONG_PTR *pid); - -PFD_GLYPHATTR -APIENTRY -DrvQueryGlyphAttrs( - IN FONTOBJ *pfo, - IN ULONG iMode); - -ULONG -APIENTRY -DrvQueryPerBandInfo( - IN SURFOBJ *pso, - IN OUT PERBANDINFO *pbi); +typedef PVOID +(APIENTRY FN_DrvQueryFontTree)( + _In_ DHPDEV dhpdev, + _In_ ULONG_PTR iFile, + _In_ ULONG iFace, + _In_ ULONG iMode, + _Out_ ULONG_PTR *pid); +typedef FN_DrvQueryFontTree *PFN_DrvQueryFontTree; +extern FN_DrvQueryFontTree DrvQueryFontTree; + +typedef PFD_GLYPHATTR +(APIENTRY FN_DrvQueryGlyphAttrs)( + _In_ FONTOBJ *pfo, + _In_ ULONG iMode); +typedef FN_DrvQueryGlyphAttrs *PFN_DrvQueryGlyphAttrs; +extern FN_DrvQueryGlyphAttrs DrvQueryGlyphAttrs; + +typedef ULONG +(APIENTRY FN_DrvQueryPerBandInfo)( + _In_ SURFOBJ *pso, + _Inout_ PERBANDINFO *pbi); +typedef FN_DrvQueryPerBandInfo *PFN_DrvQueryPerBandInfo; +extern FN_DrvQueryPerBandInfo DrvQueryPerBandInfo; /* DrvQueryTrueTypeOutline.bMetricsOnly constants */ #define TTO_METRICS_ONLY 0x00000001 #define TTO_QUBICS 0x00000002 #define TTO_UNHINTED 0x00000004 -LONG -APIENTRY -DrvQueryTrueTypeOutline( - IN DHPDEV dhpdev, - IN FONTOBJ *pfo, - IN HGLYPH hglyph, - IN BOOL bMetricsOnly, - IN GLYPHDATA *pgldt, - IN ULONG cjBuf, - OUT TTPOLYGONHEADER *ppoly); - -LONG -APIENTRY -DrvQueryTrueTypeTable( - IN ULONG_PTR iFile, - IN ULONG ulFont, - IN ULONG ulTag, - IN PTRDIFF dpStart, - IN ULONG cjBuf, - OUT BYTE *pjBuf, - OUT PBYTE *ppjTable, - OUT ULONG *pcjTable); +typedef LONG +(APIENTRY FN_DrvQueryTrueTypeOutline)( + _In_ DHPDEV dhpdev, + _In_ FONTOBJ *pfo, + _In_ HGLYPH hglyph, + _In_ BOOL bMetricsOnly, + _Out_opt_ GLYPHDATA *pgldt, + _In_ ULONG cjBuf, + _Out_bytecap_(cjBuf) TTPOLYGONHEADER *ppoly); +typedef FN_DrvQueryTrueTypeOutline *PFN_DrvQueryTrueTypeOutline; +extern FN_DrvQueryTrueTypeOutline DrvQueryTrueTypeOutline; + +typedef LONG +(APIENTRY FN_DrvQueryTrueTypeTable)( + _In_ ULONG_PTR iFile, + _In_ ULONG ulFont, + _In_ ULONG ulTag, + _In_ PTRDIFF dpStart, + _In_ ULONG cjBuf, + _Out_opt_bytecap_(cjBuf) BYTE *pjBuf, + _Out_opt_ PBYTE *ppjTable, + _Out_opt_ ULONG *pcjTable); +typedef FN_DrvQueryTrueTypeTable *PFN_DrvQueryTrueTypeTable; +extern FN_DrvQueryTrueTypeTable DrvQueryTrueTypeTable; /* DrvRealizeBrush.iHatch constants */ #define RB_DITHERCOLOR 0x80000000L #define HS_DDI_MAX 6 -BOOL -APIENTRY -DrvRealizeBrush( - IN BRUSHOBJ *pbo, - IN SURFOBJ *psoTarget, - IN SURFOBJ *psoPattern, - IN SURFOBJ *psoMask, - IN XLATEOBJ *pxlo, - IN ULONG iHatch); +typedef BOOL +(APIENTRY FN_DrvRealizeBrush)( + _In_ BRUSHOBJ *pbo, + _Inout_ SURFOBJ *psoTarget, // CHECKME + _In_ SURFOBJ *psoPattern, + _In_ SURFOBJ *psoMask, + _In_ XLATEOBJ *pxlo, + _In_ ULONG iHatch); +typedef FN_DrvRealizeBrush *PFN_DrvRealizeBrush; +extern FN_DrvRealizeBrush DrvRealizeBrush; /* DrvResetDevice return values */ #define DRD_SUCCESS 0 #define DRD_ERROR 1 -ULONG -APIENTRY -DrvResetDevice( - IN DHPDEV dhpdev, - IN PVOID Reserved); - -BOOL -APIENTRY -DrvResetPDEV( - DHPDEV dhpdevOld, - DHPDEV dhpdevNew); +typedef ULONG +(APIENTRY FN_DrvResetDevice)( + _In_ DHPDEV dhpdev, + _Reserved_ PVOID Reserved); +typedef FN_DrvResetDevice *PFN_DrvResetDevice; +extern FN_DrvResetDevice DrvResetDevice; + +typedef BOOL +(APIENTRY FN_DrvResetPDEV)( + _In_ DHPDEV dhpdevOld, + _In_ DHPDEV dhpdevNew); +typedef FN_DrvResetPDEV *PFN_DrvResetPDEV; +extern FN_DrvResetPDEV DrvResetPDEV; /* DrvSaveScreenBits.iMode constants */ #define SS_SAVE 0x00000000 #define SS_RESTORE 0x00000001 #define SS_FREE 0x00000002 -ULONG_PTR -APIENTRY -DrvSaveScreenBits( - IN SURFOBJ *pso, - IN ULONG iMode, - IN ULONG_PTR ident, - IN RECTL *prcl); - -BOOL -APIENTRY -DrvSendPage( - IN SURFOBJ *pso); - -BOOL -APIENTRY -DrvSetPalette( - IN DHPDEV dhpdev, - IN PALOBJ *ppalo, - IN FLONG fl, - IN ULONG iStart, - IN ULONG cColors); - -BOOL -APIENTRY -DrvSetPixelFormat( - IN SURFOBJ *pso, - IN LONG iPixelFormat, - IN HWND hwnd); +typedef ULONG_PTR +(APIENTRY FN_DrvSaveScreenBits)( + _In_ SURFOBJ *pso, + _In_ ULONG iMode, + _In_ ULONG_PTR ident, + _In_ RECTL *prcl); +typedef FN_DrvSaveScreenBits *PFN_DrvSaveScreenBits; +extern FN_DrvSaveScreenBits DrvSaveScreenBits; + +typedef BOOL +(APIENTRY FN_DrvSendPage)( + _In_ SURFOBJ *pso); +typedef FN_DrvSendPage *PFN_DrvSendPage; +extern FN_DrvSendPage DrvSendPage; + +/* DrvSetPalette range */ +#define WINDDI_MAXSETPALETTECOLORS 256 +#define WINDDI_MAXSETPALETTECOLORINDEX 255 + +typedef BOOL +(APIENTRY FN_DrvSetPalette)( + _In_ DHPDEV dhpdev, + _In_ PALOBJ *ppalo, + _In_ FLONG fl, + _In_range_(0, WINDDI_MAXSETPALETTECOLORINDEX) ULONG iStart, + _In_range_(0, WINDDI_MAXSETPALETTECOLORS - iStart) ULONG cColors); +typedef FN_DrvSetPalette *PFN_DrvSetPalette; +extern FN_DrvSetPalette DrvSetPalette; + +typedef BOOL +(APIENTRY FN_DrvSetPixelFormat)( + _In_ SURFOBJ *pso, + _In_ LONG iPixelFormat, + _In_ HWND hwnd); +typedef FN_DrvSetPixelFormat *PFN_DrvSetPixelFormat; +extern FN_DrvSetPixelFormat DrvSetPixelFormat; /* DrvSetPointerShape return values */ #define SPS_ERROR 0x00000000 @@ -3398,761 +3476,198 @@ #define SPS_LENGTHMASK 0x00000F00L #define SPS_FREQMASK 0x000FF000L -ULONG -APIENTRY -DrvSetPointerShape( - IN SURFOBJ *pso, - IN SURFOBJ *psoMask, - IN SURFOBJ *psoColor, - IN XLATEOBJ *pxlo, - IN LONG xHot, - IN LONG yHot, - IN LONG x, - IN LONG y, - IN RECTL *prcl, - IN FLONG fl); - -BOOL -APIENTRY -DrvStartBanding( - IN SURFOBJ *pso, - IN POINTL *pptl); - -BOOL -APIENTRY -DrvStartDoc( - IN SURFOBJ *pso, - IN LPWSTR pwszDocName, - IN DWORD dwJobId); - -BOOL -APIENTRY -DrvStartPage( - IN SURFOBJ *pso); - -BOOL -APIENTRY -DrvStretchBlt( - 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); - -BOOL -APIENTRY -DrvStretchBltROP( - 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 BRUSHOBJ *pbo, - IN DWORD rop4); - -BOOL -APIENTRY -DrvStrokeAndFillPath( - IN SURFOBJ *pso, - IN PATHOBJ *ppo, - IN CLIPOBJ *pco, - IN XFORMOBJ *pxo, - IN BRUSHOBJ *pboStroke, - IN LINEATTRS *plineattrs, - IN BRUSHOBJ *pboFill, - IN POINTL *pptlBrushOrg, - IN MIX mixFill, - IN FLONG flOptions); - -BOOL -APIENTRY -DrvStrokePath( - IN SURFOBJ *pso, - IN PATHOBJ *ppo, - IN CLIPOBJ *pco, - IN XFORMOBJ *pxo, - IN BRUSHOBJ *pbo, - IN POINTL *pptlBrushOrg, - IN LINEATTRS *plineattrs, - IN MIX mix); - -BOOL -APIENTRY -DrvSwapBuffers( - IN SURFOBJ *pso, - IN WNDOBJ *pwo); - -VOID -APIENTRY -DrvSynchronize( - IN DHPDEV dhpdev, - IN RECTL *prcl); +typedef ULONG +(APIENTRY FN_DrvSetPointerShape)( + _In_ SURFOBJ *pso, + _In_opt_ SURFOBJ *psoMask, + _In_opt_ SURFOBJ *psoColor, + _In_ XLATEOBJ *pxlo, + _In_ LONG xHot, + _In_ LONG yHot, + _In_ LONG x, + _In_ LONG y, + _In_ RECTL *prcl, + _In_ FLONG fl); +typedef FN_DrvSetPointerShape *PFN_DrvSetPointerShape; +extern FN_DrvSetPointerShape DrvSetPointerShape; + +typedef BOOL +(APIENTRY FN_DrvStartBanding)( + _In_ SURFOBJ *pso, + _In_ POINTL *pptl); +typedef FN_DrvStartBanding *PFN_DrvStartBanding; +extern FN_DrvStartBanding DrvStartBanding; + +typedef BOOL +(APIENTRY FN_DrvStartDoc)( + _In_ SURFOBJ *pso, + _In_ LPWSTR pwszDocName, + _In_ DWORD dwJobId); +typedef FN_DrvStartDoc *PFN_DrvStartDoc; +extern FN_DrvStartDoc DrvStartDoc; + +typedef BOOL +(APIENTRY FN_DrvStartPage)( + _In_ SURFOBJ *pso); +typedef FN_DrvStartPage *PFN_DrvStartPage; +extern FN_DrvStartPage DrvStartPage; + +typedef BOOL +(APIENTRY FN_DrvStretchBlt)( + _Inout_ SURFOBJ *psoDest, + _Inout_ SURFOBJ *psoSrc, + _In_opt_ SURFOBJ *psoMask, + _In_ 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); +typedef FN_DrvStretchBlt *PFN_DrvStretchBlt; +extern FN_DrvStretchBlt DrvStretchBlt; + +typedef BOOL +(APIENTRY FN_DrvStretchBltROP)( + _Inout_ SURFOBJ *psoDest, + _Inout_ SURFOBJ *psoSrc, + _In_opt_ SURFOBJ *psoMask, + _In_ 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, + _In_ BRUSHOBJ *pbo, + _In_ DWORD rop4); +typedef FN_DrvStretchBltROP *PFN_DrvStretchBltROP; +extern FN_DrvStretchBltROP DrvStretchBltROP; + +typedef BOOL +(APIENTRY FN_DrvStrokeAndFillPath)( + _Inout_ SURFOBJ *pso, + _Inout_ PATHOBJ *ppo, + _In_ CLIPOBJ *pco, + _In_opt_ XFORMOBJ *pxo, + _In_ BRUSHOBJ *pboStroke, + _In_ LINEATTRS *plineattrs, + _In_ BRUSHOBJ *pboFill, + _In_ POINTL *pptlBrushOrg, + _In_ MIX mixFill, + _In_ FLONG flOptions); +typedef FN_DrvStrokeAndFillPath *PFN_DrvStrokeAndFillPath; +extern FN_DrvStrokeAndFillPath DrvStrokeAndFillPath; + +typedef BOOL +(APIENTRY FN_DrvStrokePath)( + _Inout_ SURFOBJ *pso, + _In_ PATHOBJ *ppo, + _In_ CLIPOBJ *pco, + _In_opt_ XFORMOBJ *pxo, + _In_ BRUSHOBJ *pbo, + _In_ POINTL *pptlBrushOrg, + _In_ LINEATTRS *plineattrs, + _In_ MIX mix); +typedef FN_DrvStrokePath *PFN_DrvStrokePath; +extern FN_DrvStrokePath DrvStrokePath; + +typedef BOOL +(APIENTRY FN_DrvSwapBuffers)( + _In_ SURFOBJ *pso, + _In_ WNDOBJ *pwo); +typedef FN_DrvSwapBuffers *PFN_DrvSwapBuffers; +extern FN_DrvSwapBuffers DrvSwapBuffers; + +typedef VOID +(APIENTRY FN_DrvSynchronize)( + _In_ DHPDEV dhpdev, + _In_count_c_(0) RECTL *prcl); // should be ignored +typedef FN_DrvSynchronize *PFN_DrvSynchronize; +extern FN_DrvSynchronize DrvSynchronize; /* DrvSynchronizeSurface.fl constants */ #define DSS_TIMER_EVENT 0x00000001 #define DSS_FLUSH_EVENT 0x00000002 -VOID -APIENTRY -DrvSynchronizeSurface( - IN SURFOBJ *pso, - IN RECTL *prcl, - IN FLONG fl); - -BOOL -APIENTRY -DrvTextOut( - IN SURFOBJ *pso, - IN STROBJ *pstro, - IN FONTOBJ *pfo, - IN CLIPOBJ *pco, - IN RECTL *prclExtra, - IN RECTL *prclOpaque, - IN BRUSHOBJ *pboFore, - IN BRUSHOBJ *pboOpaque, - IN POINTL *pptlOrg, - IN MIX mix); - -BOOL -APIENTRY -DrvTransparentBlt( - IN SURFOBJ *psoDst, - IN SURFOBJ *psoSrc, - IN CLIPOBJ *pco, - IN XLATEOBJ *pxlo, - IN RECTL *prclDst, - IN RECTL *prclSrc, - IN ULONG iTransColor, - IN ULONG ulReserved); - -BOOL -APIENTRY -DrvUnloadFontFile( - IN ULONG_PTR iFile); - -typedef BOOL -(APIENTRY *PFN_DrvAlphaBlend)( - IN SURFOBJ *psoDest, - IN SURFOBJ *psoSrc, - IN CLIPOBJ *pco, - IN XLATEOBJ *pxlo, - IN RECTL *prclDest, - IN RECTL *prclSrc, - IN BLENDOBJ *pBlendObj); - -typedef BOOL -(APIENTRY *PFN_DrvAssertMode)( - IN DHPDEV dhpdev, - IN BOOL bEnable); - -typedef BOOL -(APIENTRY *PFN_DrvBitBlt)( - IN SURFOBJ *psoTrg, - IN SURFOBJ *psoSrc, - IN SURFOBJ *psoMask, - IN CLIPOBJ *pco, - IN XLATEOBJ *pxlo, - IN RECTL *prclTrg, - IN POINTL *pptlSrc, - IN POINTL *pptlMask, - IN BRUSHOBJ *pbo, - IN POINTL *pptlBrush, - IN ROP4 rop4); - typedef VOID -(APIENTRY *PFN_DrvCompletePDEV)( - IN DHPDEV dhpdev, - IN HDEV hdev); - -typedef BOOL -(APIENTRY *PFN_DrvCopyBits)( - IN SURFOBJ *psoDest, - IN SURFOBJ *psoSrc, - IN CLIPOBJ *pco, - IN XLATEOBJ *pxlo, - IN RECTL *prclDest, - IN POINTL *pptlSrc); - -typedef HBITMAP -(APIENTRY *PFN_DrvCreateDeviceBitmap)( - IN DHPDEV dhpdev, - IN SIZEL sizl, - IN ULONG iFormat); +(APIENTRY FN_DrvSynchronizeSurface)( + _In_ SURFOBJ *pso, + _In_opt_ RECTL *prcl, + _In_ FLONG fl); +typedef FN_DrvSynchronizeSurface *PFN_DrvSynchronizeSurface; +extern FN_DrvSynchronizeSurface DrvSynchronizeSurface; + +typedef BOOL +(APIENTRY FN_DrvTextOut)( + _In_ SURFOBJ *pso, + _In_ STROBJ *pstro, + _In_ FONTOBJ *pfo, + _In_ CLIPOBJ *pco, + _Null_ RECTL *prclExtra, + _In_opt_ RECTL *prclOpaque, + _In_ BRUSHOBJ *pboFore, + _In_ BRUSHOBJ *pboOpaque, + _In_ POINTL *pptlOrg, + _In_ MIX mix); +typedef FN_DrvTextOut *PFN_DrvTextOut; +extern FN_DrvTextOut DrvTextOut; + +typedef BOOL +(APIENTRY FN_DrvTransparentBlt)( + _Inout_ SURFOBJ *psoDst, + _In_ SURFOBJ *psoSrc, + _In_ CLIPOBJ *pco, + _In_opt_ XLATEOBJ *pxlo, + _In_ RECTL *prclDst, + _In_ RECTL *prclSrc, + _In_ ULONG iTransColor, + _In_ ULONG ulReserved); +typedef FN_DrvTransparentBlt *PFN_DrvTransparentBlt; +extern FN_DrvTransparentBlt DrvTransparentBlt; + +typedef BOOL +(APIENTRY FN_DrvUnloadFontFile)( + _In_ ULONG_PTR iFile); +typedef FN_DrvUnloadFontFile *PFN_DrvUnloadFontFile; +extern FN_DrvUnloadFontFile DrvUnloadFontFile; + +/* Direct draw */ typedef VOID -(APIENTRY *PFN_DrvDeleteDeviceBitmap)( - IN DHSURF dhsurf); - -typedef HBITMAP -(APIENTRY *PFN_DrvDeriveSurface)( - DD_DIRECTDRAW_GLOBAL *pDirectDraw, - DD_SURFACE_LOCAL *pSurface); - -typedef LONG -(APIENTRY *PFN_DrvDescribePixelFormat)( - IN DHPDEV dhpdev, - IN LONG iPixelFormat, - IN ULONG cjpfd, - OUT PIXELFORMATDESCRIPTOR *ppfd); - -typedef VOID -(APIENTRY *PFN_DrvDestroyFont)( - IN FONTOBJ *pfo); - -typedef VOID -(APIENTRY *PFN_DrvDisableDriver)( - VOID); - -typedef VOID -(APIENTRY *PFN_DrvDisablePDEV)( - IN DHPDEV dhpdev); - -typedef VOID -(APIENTRY *PFN_DrvDisableSurface)( - IN DHPDEV dhpdev); - -typedef ULONG -(APIENTRY *PFN_DrvDitherColor)( - IN DHPDEV dhpdev, - IN ULONG iMode, - IN ULONG rgb, - OUT ULONG *pul); - -typedef ULONG -(APIENTRY *PFN_DrvDrawEscape)( - IN SURFOBJ *pso, - IN ULONG iEsc, - IN CLIPOBJ *pco, - IN RECTL *prcl, - IN ULONG cjIn, - IN PVOID pvIn); - -typedef BOOL -(APIENTRY *PFN_DrvEnableDriver)( - IN ULONG iEngineVersion, - IN ULONG cj, - OUT DRVENABLEDATA *pded); - -typedef DHPDEV -(APIENTRY *PFN_DrvEnablePDEV)( - IN DEVMODEW *pdm, - IN LPWSTR pwszLogAddress, - IN ULONG cPat, - OUT HSURF *phsurfPatterns, - IN ULONG cjCaps, - GDIINFO *pdevcaps, - IN ULONG cjDevInfo, - OUT DEVINFO *pdi, - IN HDEV hdev, - IN LPWSTR pwszDeviceName, - IN HANDLE hDriver); - -typedef HSURF -(APIENTRY *PFN_DrvEnableSurface)( - IN DHPDEV dhpdev); - -typedef BOOL -(APIENTRY *PFN_DrvEndDoc)( - IN SURFOBJ *pso, - IN FLONG fl); - -typedef ULONG -(APIENTRY *PFN_DrvEscape)( - IN SURFOBJ *pso, - IN ULONG iEsc, - IN ULONG cjIn, - IN PVOID pvIn, - IN ULONG cjOut, - OUT PVOID pvOut); - -typedef BOOL -(APIENTRY *PFN_DrvFillPath)( - IN SURFOBJ *pso, - IN PATHOBJ *ppo, - IN CLIPOBJ *pco, - IN BRUSHOBJ *pbo, - IN POINTL *pptlBrushOrg, - IN MIX mix, - IN FLONG flOptions); - -typedef ULONG -(APIENTRY *PFN_DrvFontManagement)( - IN SURFOBJ *pso, - IN FONTOBJ *pfo, - IN ULONG iMode, - IN ULONG cjIn, - IN PVOID pvIn, - IN ULONG cjOut, - OUT PVOID pvOut); - -typedef VOID -(APIENTRY *PFN_DrvFree)( - IN PVOID pv, - IN ULONG_PTR id); - -typedef ULONG -(APIENTRY *PFN_DrvGetGlyphMode)( - IN DHPDEV dhpdev, - IN FONTOBJ *pfo); - -typedef ULONG -(APIENTRY *PFN_DrvGetModes)( - IN HANDLE hDriver, - IN ULONG cjSize, - OUT DEVMODEW *pdm); - -typedef PVOID -(APIENTRY *PFN_DrvGetTrueTypeFile)( - IN ULONG_PTR iFile, - IN ULONG *pcj); - -typedef BOOL -(APIENTRY *PFN_DrvGradientFill)( - IN SURFOBJ *psoDest, - IN CLIPOBJ *pco, - IN XLATEOBJ *pxlo, - IN TRIVERTEX *pVertex, - IN ULONG nVertex, - IN PVOID pMesh, - IN ULONG nMesh, - IN RECTL *prclExtents, - IN POINTL *pptlDitherOrg, - IN ULONG ulMode); - -typedef BOOL -(APIENTRY *PFN_DrvIcmCheckBitmapBits)( - IN DHPDEV dhpdev, - IN HANDLE hColorTransform, - IN SURFOBJ *pso, - OUT PBYTE paResults); - -typedef HANDLE -(APIENTRY *PFN_DrvIcmCreateColorTransform)( - IN DHPDEV dhpdev, - IN LPLOGCOLORSPACEW pLogColorSpace, - IN PVOID pvSourceProfile, - IN ULONG cjSourceProfile, - IN PVOID pvDestProfile, - IN ULONG cjDestProfile, - IN PVOID pvTargetProfile, - IN ULONG cjTargetProfile, - IN DWORD dwReserved); - -typedef BOOL -(APIENTRY *PFN_DrvIcmDeleteColorTransform)( - IN DHPDEV dhpdev, - IN HANDLE hcmXform); - -typedef BOOL -(APIENTRY *PFN_DrvIcmSetDeviceGammaRamp)( - IN DHPDEV dhpdev, - IN ULONG iFormat, - IN LPVOID lpRamp); - -typedef BOOL -(APIENTRY *PFN_DrvLineTo)( - SURFOBJ *pso, - CLIPOBJ *pco, - BRUSHOBJ *pbo, - LONG x1, - LONG y1, - LONG x2, - LONG y2, - RECTL *prclBounds, - MIX mix); - -typedef ULONG_PTR -(APIENTRY *PFN_DrvLoadFontFile)( - ULONG cFiles, - ULONG_PTR *piFile, - PVOID *ppvView, - ULONG *pcjView, - DESIGNVECTOR *pdv, - ULONG ulLangID, - ULONG ulFastCheckSum); - -typedef VOID -(APIENTRY *PFN_DrvMovePointer)( - IN SURFOBJ *pso, - IN LONG x, - IN LONG y, - IN RECTL *prcl); - -typedef BOOL -(APIENTRY *PFN_DrvNextBand)( - IN SURFOBJ *pso, - IN POINTL *pptl); - -typedef VOID -(APIENTRY *PFN_DrvNotify)( - IN SURFOBJ *pso, - IN ULONG iType, - IN PVOID pvData); - -typedef BOOL -(APIENTRY *PFN_DrvOffset)( - IN SURFOBJ *pso, - IN LONG x, - IN LONG y, - IN FLONG flReserved); - -typedef BOOL -(APIENTRY *PFN_DrvPaint)( - IN SURFOBJ *pso, - IN CLIPOBJ *pco, - IN BRUSHOBJ *pbo, - IN POINTL *pptlBrushOrg, - IN MIX mix); - -typedef BOOL -(APIENTRY *PFN_DrvPlgBlt)( - IN SURFOBJ *psoTrg, - IN SURFOBJ *psoSrc, - IN SURFOBJ *psoMsk, - IN CLIPOBJ *pco, - IN XLATEOBJ *pxlo, - IN COLORADJUSTMENT *pca, - IN POINTL *pptlBrushOrg, - IN POINTFIX *pptfx, - IN RECTL *prcl, - IN POINTL *pptl, - IN ULONG iMode); - -typedef BOOL -(APIENTRY *PFN_DrvQueryAdvanceWidths)( - IN DHPDEV dhpdev, - IN FONTOBJ *pfo, - IN ULONG iMode, - IN HGLYPH *phg, - OUT PVOID pvWidths, - IN ULONG cGlyphs); - -typedef BOOL -(APIENTRY *PFN_DrvQueryDeviceSupport)( - SURFOBJ *pso, - XLATEOBJ *pxlo, - XFORMOBJ *pxo, - ULONG iType, - ULONG cjIn, - PVOID pvIn, - ULONG cjOut, - PVOID pvOut); - -typedef BOOL -(APIENTRY *PFN_DrvQueryDriverInfo)( - DWORD dwMode, - PVOID pBuffer, - DWORD cbBuf, - PDWORD pcbNeeded); - -typedef PIFIMETRICS -(APIENTRY *PFN_DrvQueryFont)( - IN DHPDEV dhpdev, - IN ULONG_PTR iFile, - IN ULONG iFace, - IN ULONG_PTR *pid); - -typedef LONG -(APIENTRY *PFN_DrvQueryFontCaps)( - IN ULONG culCaps, - OUT ULONG *pulCaps); - -typedef LONG -(APIENTRY *PFN_DrvQueryFontData)( - IN DHPDEV dhpdev, - IN FONTOBJ *pfo, - IN ULONG iMode, - IN HGLYPH hg, - IN OUT GLYPHDATA *pgd, - IN OUT PVOID pv, - IN ULONG cjSize); - -typedef LONG -(APIENTRY *PFN_DrvQueryFontFile)( - IN ULONG_PTR iFile, - IN ULONG ulMode, - IN ULONG cjBuf, - IN ULONG *pulBuf); - -typedef PVOID -(APIENTRY *PFN_DrvQueryFontTree)( - IN DHPDEV dhpdev, - IN ULONG_PTR iFile, - IN ULONG iFace, - IN ULONG iMode, - IN ULONG_PTR *pid); - -typedef PFD_GLYPHATTR -(APIENTRY *PFN_DrvQueryGlyphAttrs)( - IN FONTOBJ *pfo, - IN ULONG iMode); - -typedef ULONG -(APIENTRY *PFN_DrvQueryPerBandInfo)( - IN SURFOBJ *pso, - IN OUT PERBANDINFO *pbi); - -typedef LONG -(APIENTRY *PFN_DrvQueryTrueTypeOutline)( - IN DHPDEV dhpdev, - IN FONTOBJ *pfo, - IN HGLYPH hglyph, - IN BOOL bMetricsOnly, - IN GLYPHDATA *pgldt, - IN ULONG cjBuf, - OUT TTPOLYGONHEADER *ppoly); - -typedef LONG -(APIENTRY *PFN_DrvQueryTrueTypeTable)( - IN ULONG_PTR iFile, - IN ULONG ulFont, - IN ULONG ulTag, - IN PTRDIFF dpStart, - IN ULONG cjBuf, - OUT BYTE *pjBuf, - OUT PBYTE *ppjTable, - OUT ULONG *pcjTable); - -typedef BOOL -(APIENTRY *PFN_DrvRealizeBrush)( - IN BRUSHOBJ *pbo, - IN SURFOBJ *psoTarget, - IN SURFOBJ *psoPattern, - IN SURFOBJ *psoMask, - IN XLATEOBJ *pxlo, - IN ULONG iHatch); - -typedef ULONG -(APIENTRY *PFN_DrvResetDevice)( - IN DHPDEV dhpdev, - IN PVOID Reserved); - -typedef BOOL -(APIENTRY *PFN_DrvResetPDEV)( - DHPDEV dhpdevOld, - DHPDEV dhpdevNew); - -typedef ULONG_PTR -(APIENTRY *PFN_DrvSaveScreenBits)( - IN SURFOBJ *pso, - IN ULONG iMode, - IN ULONG_PTR ident, - IN RECTL *prcl); - -typedef BOOL -(APIENTRY *PFN_DrvSendPage)( - IN SURFOBJ *pso); - -typedef BOOL -(APIENTRY *PFN_DrvSetPalette)( - IN DHPDEV dhpdev, - IN PALOBJ *ppalo, - IN FLONG fl, - IN ULONG iStart, - IN ULONG cColors); - -typedef BOOL -(APIENTRY *PFN_DrvSetPixelFormat)( - IN SURFOBJ *pso, - IN LONG iPixelFormat, - IN HWND hwnd); - -typedef ULONG -(APIENTRY *PFN_DrvSetPointerShape)( - IN SURFOBJ *pso, - IN SURFOBJ *psoMask, - IN SURFOBJ *psoColor, - IN XLATEOBJ *pxlo, - IN LONG xHot, - IN LONG yHot, - IN LONG x, - IN LONG y, - IN RECTL *prcl, - IN FLONG fl); - -typedef BOOL -(APIENTRY *PFN_DrvStartBanding)( - IN SURFOBJ *pso, - IN POINTL *pptl); - -typedef BOOL -(APIENTRY *PFN_DrvStartDoc)( - IN SURFOBJ *pso, - IN LPWSTR pwszDocName, - IN DWORD dwJobId); - -typedef BOOL -(APIENTRY *PFN_DrvStartPage)( - IN SURFOBJ *pso); - -typedef BOOL -(APIENTRY *PFN_DrvStretchBlt)( - 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); - -typedef BOOL -(APIENTRY *PFN_DrvStretchBltROP)( - 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 BRUSHOBJ *pbo, - IN DWORD rop4); - -typedef BOOL -(APIENTRY *PFN_DrvStrokeAndFillPath)( - IN SURFOBJ *pso, - IN PATHOBJ *ppo, - IN CLIPOBJ *pco, - IN XFORMOBJ *pxo, - IN BRUSHOBJ *pboStroke, - IN LINEATTRS *plineattrs, - IN BRUSHOBJ *pboFill, - IN POINTL *pptlBrushOrg, - IN MIX mixFill, - IN FLONG flOptions); - -typedef BOOL -(APIENTRY *PFN_DrvStrokePath)( - IN SURFOBJ *pso, - IN PATHOBJ *ppo, - IN CLIPOBJ *pco, - IN XFORMOBJ *pxo, - IN BRUSHOBJ *pbo, - IN POINTL *pptlBrushOrg, - IN LINEATTRS *plineattrs, - IN MIX mix); - -typedef BOOL -(APIENTRY *PFN_DrvSwapBuffers)( - IN SURFOBJ *pso, - IN WNDOBJ *pwo); - -typedef VOID -(APIENTRY *PFN_DrvSynchronize)( - IN DHPDEV dhpdev, - IN RECTL *prcl); - -typedef VOID -(APIENTRY *PFN_DrvSynchronizeSurface)( - IN SURFOBJ *pso, - IN RECTL *prcl, - IN FLONG fl); - -typedef BOOL -(APIENTRY *PFN_DrvTextOut)( - IN SURFOBJ *pso, - IN STROBJ *pstro, - IN FONTOBJ *pfo, - IN CLIPOBJ *pco, - IN RECTL *prclExtra, - IN RECTL *prclOpaque, - IN BRUSHOBJ *pboFore, - IN BRUSHOBJ *pboOpaque, - IN POINTL *pptlOrg, - IN MIX mix); - -typedef BOOL -(APIENTRY *PFN_DrvTransparentBlt)( - IN SURFOBJ *psoDst, - IN SURFOBJ *psoSrc, - IN CLIPOBJ *pco, - IN XLATEOBJ *pxlo, - IN RECTL *prclDst, - IN RECTL *prclSrc, - IN ULONG iTransColor, - IN ULONG ulReserved); - -typedef BOOL -(APIENTRY *PFN_DrvUnloadFontFile)( - IN ULONG_PTR iFile); - - -WIN32KAPI -VOID -APIENTRY -DrvDisableDirectDraw( - IN DHPDEV dhpdev); - -typedef VOID -(APIENTRY *PFN_DrvDisableDirectDraw)( - IN DHPDEV dhpdev); - -WIN32KAPI -BOOL -APIENTRY -DrvEnableDirectDraw( - IN DHPDEV dhpdev, - OUT DD_CALLBACKS *pCallBacks, - OUT DD_SURFACECALLBACKS *pSurfaceCallBacks, - OUT DD_PALETTECALLBACKS *pPaletteCallBacks); - -typedef BOOL -(APIENTRY *PFN_DrvEnableDirectDraw)( - IN DHPDEV dhpdev, - OUT DD_CALLBACKS *pCallBacks, - OUT DD_SURFACECALLBACKS *pSurfaceCallBacks, - OUT DD_PALETTECALLBACKS *pPaletteCallBacks); - -WIN32KAPI -BOOL -APIENTRY -DrvGetDirectDrawInfo( - IN DHPDEV dhpdev, - OUT DD_HALINFO *pHalInfo, - OUT DWORD *pdwNumHeaps, - OUT VIDEOMEMORY *pvmList, - OUT DWORD *pdwNumFourCCCodes, - OUT DWORD *pdwFourCC); - -typedef BOOL -(APIENTRY *PFN_DrvGetDirectDrawInfo)( - IN DHPDEV dhpdev, - OUT DD_HALINFO *pHalInfo, - OUT DWORD *pdwNumHeaps, - OUT VIDEOMEMORY *pvmList, - OUT DWORD *pdwNumFourCCCodes, - OUT DWORD *pdwFourCC); - -//DECLSPEC_DEPRECATED_DDK -BOOL -APIENTRY -DrvQuerySpoolType( - IN DHPDEV dhpdev, - IN LPWSTR pwchType); - -typedef BOOL -(APIENTRY *PFN_DrvQuerySpoolType)( - IN DHPDEV dhpdev, - IN LPWSTR pwchType); +(APIENTRY FN_DrvDisableDirectDraw)( + _In_ DHPDEV dhpdev); +typedef FN_DrvDisableDirectDraw *PFN_DrvDisableDirectDraw; +extern FN_DrvDisableDirectDraw DrvDisableDirectDraw; + +typedef BOOL +(APIENTRY FN_DrvEnableDirectDraw)( + _In_ DHPDEV dhpdev, + _Out_ DD_CALLBACKS *pCallBacks, + _Out_ DD_SURFACECALLBACKS *pSurfaceCallBacks, + _Out_ DD_PALETTECALLBACKS *pPaletteCallBacks); +typedef FN_DrvEnableDirectDraw *PFN_DrvEnableDirectDraw; +extern FN_DrvEnableDirectDraw DrvEnableDirectDraw; + +typedef BOOL +(APIENTRY FN_DrvGetDirectDrawInfo)( + _In_ DHPDEV dhpdev, + _Out_ DD_HALINFO *pHalInfo, + _Out_ DWORD *pdwNumHeaps, + _Out_ VIDEOMEMORY *pvmList, + _Out_ DWORD *pdwNumFourCCCodes, + _Out_ DWORD *pdwFourCC); +typedef FN_DrvGetDirectDrawInfo *PFN_DrvGetDirectDrawInfo; +extern FN_DrvGetDirectDrawInfo DrvGetDirectDrawInfo; + +typedef BOOL //DECLSPEC_DEPRECATED_DDK +(APIENTRY FN_DrvQuerySpoolType)( + _In_ DHPDEV dhpdev, + _In_ LPWSTR pwchType); +typedef FN_DrvQuerySpoolType *PFN_DrvQuerySpoolType; +extern FN_DrvQuerySpoolType DrvQuerySpoolType; #ifdef __cplusplus

1 0

[cgutman] 54899: [DHCPCSVC] - Make AdapterDiscoveryThread run in its own thread (duh?)
by cgutman＠svn.reactos.org 10 Jan '12

10 Jan '12

Author: cgutman Date: Tue Jan 10 02:18:04 2012 New Revision: 54899 URL: http://svn.reactos.org/svn/reactos?rev=54899&view=rev Log: [DHCPCSVC] - Make AdapterDiscoveryThread run in its own thread (duh?) Modified: branches/wlan-bringup/dll/win32/dhcpcsvc/dhcp/adapter.c Modified: branches/wlan-bringup/dll/win32/dhcpcsvc/dhcp/adapter.c URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/dll/win32/dhcpcsvc… ============================================================================== --- branches/wlan-bringup/dll/win32/dhcpcsvc/dhcp/adapter.c [iso-8859-1] (original) +++ branches/wlan-bringup/dll/win32/dhcpcsvc/dhcp/adapter.c [iso-8859-1] Tue Jan 10 02:18:04 2012 @@ -361,14 +361,13 @@ } HANDLE StartAdapterDiscovery(VOID) { - HANDLE /* ThreadHandle, */ EventHandle; + HANDLE ThreadHandle, EventHandle; EventHandle = CreateEvent(NULL, FALSE, FALSE, NULL); -#if 0 ThreadHandle = CreateThread(NULL, 0, AdapterDiscoveryThread, @@ -380,9 +379,6 @@ return NULL; CloseHandle(ThreadHandle); -#else - AdapterDiscoveryThread((LPVOID)EventHandle); -#endif return EventHandle; }

1 0

[cgutman] 54898: [WLANCONF] - Return to using OID_GEN_PHYSICAL_MEDIUM to determine if an adapter supports WLAN
by cgutman＠svn.reactos.org 10 Jan '12

10 Jan '12

Author: cgutman Date: Tue Jan 10 02:09:56 2012 New Revision: 54898 URL: http://svn.reactos.org/svn/reactos?rev=54898&view=rev Log: [WLANCONF] - Return to using OID_GEN_PHYSICAL_MEDIUM to determine if an adapter supports WLAN Modified: branches/wlan-bringup/base/applications/network/wlanconf/wlanconf.c Modified: branches/wlan-bringup/base/applications/network/wlanconf/wlanconf.c URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/base/applications/… ============================================================================== --- branches/wlan-bringup/base/applications/network/wlanconf/wlanconf.c [iso-8859-1] (original) +++ branches/wlan-bringup/base/applications/network/wlanconf/wlanconf.c [iso-8859-1] Tue Jan 10 02:09:56 2012 @@ -91,30 +91,23 @@ { BOOL bSuccess; DWORD dwBytesReturned; - PNDISUIO_QUERY_OID QueryOid; - DWORD QueryOidSize; - - QueryOidSize = FIELD_OFFSET(NDISUIO_QUERY_OID, Data) + sizeof(NDIS_802_11_SSID); - QueryOid = HeapAlloc(GetProcessHeap(), 0, QueryOidSize); - if (!QueryOid) - return FALSE; - - /* We're just going to do a OID_802_11_SSID query. WLAN drivers should - * always succeed this query (returning SsidLength = 0 if not associated) */ - QueryOid->Oid = OID_802_11_SSID; - - bSuccess = DeviceIoControl(hAdapter, - IOCTL_NDISUIO_QUERY_OID_VALUE, - QueryOid, - QueryOidSize, - QueryOid, - QueryOidSize, - &dwBytesReturned, - NULL); - - HeapFree(GetProcessHeap(), 0, QueryOid); - - return bSuccess; + NDISUIO_QUERY_OID QueryOid; + + /* WLAN drivers must support this OID */ + QueryOid.Oid = OID_GEN_PHYSICAL_MEDIUM; + + bSuccess = DeviceIoControl(hAdapter, + IOCTL_NDISUIO_QUERY_OID_VALUE, + &QueryOid, + sizeof(QueryOid), + &QueryOid, + sizeof(QueryOid), + &dwBytesReturned, + NULL); + if (!bSuccess || *(PULONG)QueryOid.Data != NdisPhysicalMediumWirelessLan) + return FALSE; + + return TRUE; } HANDLE

1 0

[cgutman] 54897: [NDISUIO] - Store the correct length in Irp->IoStatus.Information so bytes don't get chopped off - Fix multiple bugs in the receive path (which now works correctly) [WLANCONF] - Us...
by cgutman＠svn.reactos.org 10 Jan '12

10 Jan '12

Author: cgutman Date: Tue Jan 10 01:52:18 2012 New Revision: 54897 URL: http://svn.reactos.org/svn/reactos?rev=54897&view=rev Log: [NDISUIO] - Store the correct length in Irp->IoStatus.Information so bytes don't get chopped off - Fix multiple bugs in the receive path (which now works correctly) [WLANCONF] - Use the correct length for NDIS requests - Indicate success to the console for -c or -d - Print current association info if called with no parameters Modified: branches/wlan-bringup/base/applications/network/wlanconf/wlanconf.c branches/wlan-bringup/drivers/network/ndisuio/ioctl.c branches/wlan-bringup/drivers/network/ndisuio/ndisuio.h branches/wlan-bringup/drivers/network/ndisuio/protocol.c Modified: branches/wlan-bringup/base/applications/network/wlanconf/wlanconf.c URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/base/applications/… ============================================================================== --- branches/wlan-bringup/base/applications/network/wlanconf/wlanconf.c [iso-8859-1] (original) +++ branches/wlan-bringup/base/applications/network/wlanconf/wlanconf.c [iso-8859-1] Tue Jan 10 01:52:18 2012 @@ -94,7 +94,7 @@ PNDISUIO_QUERY_OID QueryOid; DWORD QueryOidSize; - QueryOidSize = sizeof(NDISUIO_QUERY_OID) + sizeof(NDIS_802_11_SSID); + QueryOidSize = FIELD_OFFSET(NDISUIO_QUERY_OID, Data) + sizeof(NDIS_802_11_SSID); QueryOid = HeapAlloc(GetProcessHeap(), 0, QueryOidSize); if (!QueryOid) return FALSE; @@ -216,8 +216,11 @@ 0, &dwBytesReturned, NULL); - - return bSuccess; + if (!bSuccess) + return FALSE; + + _tprintf(_T("The operation completed successfully.\n")); + return TRUE; } static @@ -266,6 +269,263 @@ } BOOL +WlanPrintCurrentStatus(HANDLE hAdapter) +{ + PNDISUIO_QUERY_OID QueryOid; + DWORD QueryOidSize; + BOOL bSuccess; + DWORD dwBytesReturned; + PNDIS_802_11_SSID SsidInfo; + CHAR SsidBuffer[NDIS_802_11_LENGTH_SSID + 1]; + DWORD i; + + QueryOidSize = FIELD_OFFSET(NDISUIO_QUERY_OID, Data) + sizeof(NDIS_802_11_SSID); + QueryOid = HeapAlloc(GetProcessHeap(), 0, QueryOidSize); + if (!QueryOid) + return FALSE; + + QueryOid->Oid = OID_802_11_SSID; + SsidInfo = (PNDIS_802_11_SSID)QueryOid->Data; + + bSuccess = DeviceIoControl(hAdapter, + IOCTL_NDISUIO_QUERY_OID_VALUE, + QueryOid, + QueryOidSize, + QueryOid, + QueryOidSize, + &dwBytesReturned, + NULL); + if (!bSuccess) + { + HeapFree(GetProcessHeap(), 0, QueryOid); + return FALSE; + } + + if (SsidInfo->SsidLength == 0) + { + _tprintf(_T("\nWLAN disconnected\n")); + HeapFree(GetProcessHeap(), 0, QueryOid); + return TRUE; + } + else + { + _tprintf(_T("\nCurrent wireless association information:\n\n")); + } + + /* Copy the SSID to our internal buffer and terminate it */ + RtlCopyMemory(SsidBuffer, SsidInfo->Ssid, SsidInfo->SsidLength); + SsidBuffer[SsidInfo->SsidLength] = 0; + + _tprintf(_T("SSID: %s\n"), SsidBuffer); + + HeapFree(GetProcessHeap(), 0, QueryOid); + QueryOidSize = FIELD_OFFSET(NDISUIO_QUERY_OID, Data) + sizeof(NDIS_802_11_MAC_ADDRESS); + QueryOid = HeapAlloc(GetProcessHeap(), 0, QueryOidSize); + if (!QueryOid) + return FALSE; + + QueryOid->Oid = OID_802_11_BSSID; + + bSuccess = DeviceIoControl(hAdapter, + IOCTL_NDISUIO_QUERY_OID_VALUE, + QueryOid, + QueryOidSize, + QueryOid, + QueryOidSize, + &dwBytesReturned, + NULL); + if (!bSuccess) + { + HeapFree(GetProcessHeap(), 0, QueryOid); + return FALSE; + } + + _tprintf(_T("BSSID: ")); + for (i = 0; i < sizeof(NDIS_802_11_MAC_ADDRESS); i++) + { + UINT BssidData = QueryOid->Data[i]; + + _tprintf(_T("%.2x"), BssidData); + + if (i != sizeof(NDIS_802_11_MAC_ADDRESS) - 1) + _tprintf(_T(":")); + } + _tprintf(_T("\n")); + + HeapFree(GetProcessHeap(), 0, QueryOid); + QueryOidSize = sizeof(NDISUIO_QUERY_OID); + QueryOid = HeapAlloc(GetProcessHeap(), 0, QueryOidSize); + if (!QueryOid) + return FALSE; + + QueryOid->Oid = OID_802_11_INFRASTRUCTURE_MODE; + + bSuccess = DeviceIoControl(hAdapter, + IOCTL_NDISUIO_QUERY_OID_VALUE, + QueryOid, + QueryOidSize, + QueryOid, + QueryOidSize, + &dwBytesReturned, + NULL); + if (!bSuccess) + { + HeapFree(GetProcessHeap(), 0, QueryOid); + return FALSE; + } + + _tprintf(_T("Network mode: %s\n"), (*(PUINT)QueryOid->Data == Ndis802_11IBSS) ? "Adhoc" : "Infrastructure"); + + QueryOid->Oid = OID_802_11_WEP_STATUS; + + bSuccess = DeviceIoControl(hAdapter, + IOCTL_NDISUIO_QUERY_OID_VALUE, + QueryOid, + QueryOidSize, + QueryOid, + QueryOidSize, + &dwBytesReturned, + NULL); + if (!bSuccess) + { + HeapFree(GetProcessHeap(), 0, QueryOid); + return FALSE; + } + + _tprintf(_T("WEP enabled: %s\n"), (*(PUINT)QueryOid->Data == Ndis802_11WEPEnabled) ? "Yes" : "No"); + + _tprintf("\n"); + QueryOid->Oid = OID_802_11_RSSI; + + bSuccess = DeviceIoControl(hAdapter, + IOCTL_NDISUIO_QUERY_OID_VALUE, + QueryOid, + QueryOidSize, + QueryOid, + QueryOidSize, + &dwBytesReturned, + NULL); + if (bSuccess) + { + /* This OID is optional */ + _tprintf(_T("RSSI: %i dBm\n"), *(PINT)QueryOid->Data); + } + + QueryOid->Oid = OID_802_11_TX_POWER_LEVEL; + + bSuccess = DeviceIoControl(hAdapter, + IOCTL_NDISUIO_QUERY_OID_VALUE, + QueryOid, + QueryOidSize, + QueryOid, + QueryOidSize, + &dwBytesReturned, + NULL); + if (bSuccess) + { + /* This OID is optional */ + _tprintf(_T("Transmission power: %d mW\n"), *(PUINT)QueryOid->Data); + } + + _tprintf(_T("\n")); + + QueryOid->Oid = OID_802_11_NUMBER_OF_ANTENNAS; + + bSuccess = DeviceIoControl(hAdapter, + IOCTL_NDISUIO_QUERY_OID_VALUE, + QueryOid, + QueryOidSize, + QueryOid, + QueryOidSize, + &dwBytesReturned, + NULL); + if (bSuccess) + { + /* This OID is optional */ + _tprintf(_T("Antenna count: %d\n"), *(PUINT)QueryOid->Data); + } + + QueryOid->Oid = OID_802_11_TX_ANTENNA_SELECTED; + + bSuccess = DeviceIoControl(hAdapter, + IOCTL_NDISUIO_QUERY_OID_VALUE, + QueryOid, + QueryOidSize, + QueryOid, + QueryOidSize, + &dwBytesReturned, + NULL); + if (bSuccess) + { + UINT TransmitAntenna = *(PUINT)QueryOid->Data; + + if (TransmitAntenna != 0xFFFFFFFF) + _tprintf(_T("Transmit antenna: %d\n"), TransmitAntenna); + else + _tprintf(_T("Transmit antenna: Any\n")); + } + + QueryOid->Oid = OID_802_11_RX_ANTENNA_SELECTED; + + bSuccess = DeviceIoControl(hAdapter, + IOCTL_NDISUIO_QUERY_OID_VALUE, + QueryOid, + QueryOidSize, + QueryOid, + QueryOidSize, + &dwBytesReturned, + NULL); + if (bSuccess) + { + UINT ReceiveAntenna = *(PUINT)QueryOid->Data; + + if (ReceiveAntenna != 0xFFFFFFFF) + _tprintf(_T("Receive antenna: %d\n"), ReceiveAntenna); + else + _tprintf(_T("Receive antenna: Any\n")); + } + + _tprintf(_T("\n")); + + QueryOid->Oid = OID_802_11_FRAGMENTATION_THRESHOLD; + + bSuccess = DeviceIoControl(hAdapter, + IOCTL_NDISUIO_QUERY_OID_VALUE, + QueryOid, + QueryOidSize, + QueryOid, + QueryOidSize, + &dwBytesReturned, + NULL); + if (bSuccess) + { + /* This OID is optional */ + _tprintf(_T("Fragmentation threshold: %d bytes\n"), *(PUINT)QueryOid->Data); + } + + QueryOid->Oid = OID_802_11_RTS_THRESHOLD; + + bSuccess = DeviceIoControl(hAdapter, + IOCTL_NDISUIO_QUERY_OID_VALUE, + QueryOid, + QueryOidSize, + QueryOid, + QueryOidSize, + &dwBytesReturned, + NULL); + if (bSuccess) + { + /* This OID is optional */ + _tprintf(_T("RTS threshold: %d bytes\n"), *(PUINT)QueryOid->Data); + } + + HeapFree(GetProcessHeap(), 0, QueryOid); + + _tprintf(_T("\n")); + return TRUE; +} + +BOOL WlanConnect(HANDLE hAdapter) { BOOL bSuccess; @@ -321,7 +581,8 @@ HeapFree(GetProcessHeap(), 0, SetOid); - SetOidSize = sizeof(NDISUIO_SET_OID) + FIELD_OFFSET(NDIS_802_11_WEP, KeyMaterial) + + SetOidSize = FIELD_OFFSET(NDISUIO_SET_OID, Data) + + FIELD_OFFSET(NDIS_802_11_WEP, KeyMaterial) + (strlen(sWepKey) >> 1); SetOid = HeapAlloc(GetProcessHeap(), 0, SetOidSize); if (!SetOid) @@ -378,7 +639,7 @@ } HeapFree(GetProcessHeap(), 0, SetOid); - SetOidSize = sizeof(NDISUIO_SET_OID) + sizeof(NDIS_802_11_MAC_ADDRESS); + SetOidSize = FIELD_OFFSET(NDISUIO_SET_OID, Data) + sizeof(NDIS_802_11_MAC_ADDRESS); SetOid = HeapAlloc(GetProcessHeap(), 0, SetOidSize); if (!SetOid) return FALSE; @@ -402,7 +663,7 @@ } HeapFree(GetProcessHeap(), 0, SetOid); - SetOidSize = sizeof(NDISUIO_SET_OID) + sizeof(NDIS_802_11_SSID); + SetOidSize = FIELD_OFFSET(NDISUIO_SET_OID, Data) + sizeof(NDIS_802_11_SSID); SetOid = HeapAlloc(GetProcessHeap(), 0, SetOidSize); if (!SetOid) return FALSE; @@ -425,7 +686,11 @@ HeapFree(GetProcessHeap(), 0, SetOid); - return bSuccess; + if (!bSuccess) + return FALSE; + + _tprintf(_T("The operation completed successfully.\n")); + return TRUE; } BOOL @@ -546,7 +811,8 @@ " -w WEP Specifies a WEP key to use.\n" " -a Specifies the target network is ad-hoc\n" " -d Disconnects from the current AP.\n" - " -s Scans and displays a list of access points in range.\n")); + " -s Scans and displays a list of access points in range.\n\n" + " Passing no parameters will print information about the current WLAN connection\n")); } @@ -599,12 +865,6 @@ } } - if (!bScan && !bDisconnect && !bConnect) - { - Usage(); - return FALSE; - } - return TRUE; } @@ -640,7 +900,7 @@ return -1; } } - else + else if (bConnect) { if (!WlanConnect(hAdapter)) { @@ -649,6 +909,15 @@ return -1; } } + else + { + if (!WlanPrintCurrentStatus(hAdapter)) + { + DoFormatMessage(GetLastError()); + CloseHandle(hAdapter); + return -1; + } + } CloseHandle(hAdapter); return 0; Modified: branches/wlan-bringup/drivers/network/ndisuio/ioctl.c URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/drivers/network/nd… ============================================================================== --- branches/wlan-bringup/drivers/network/ndisuio/ioctl.c [iso-8859-1] (original) +++ branches/wlan-bringup/drivers/network/ndisuio/ioctl.c [iso-8859-1] Tue Jan 10 01:52:18 2012 @@ -160,8 +160,16 @@ /* Setup the NDIS request */ Request.RequestType = NdisRequestSetInformation; Request.DATA.SET_INFORMATION.Oid = SetOidRequest->Oid; - Request.DATA.SET_INFORMATION.InformationBuffer = SetOidRequest->Data; Request.DATA.SET_INFORMATION.InformationBufferLength = RequestLength - sizeof(NDIS_OID); + if (Request.DATA.SET_INFORMATION.InformationBufferLength != 0) + { + Request.DATA.SET_INFORMATION.InformationBuffer = SetOidRequest->Data; + } + else + { + Request.DATA.SET_INFORMATION.InformationBuffer = NULL; + } + Request.DATA.SET_INFORMATION.BytesRead = 0; DPRINT("Setting OID 0x%x on adapter %wZ\n", SetOidRequest->Oid, &AdapterContext->DeviceName); @@ -182,7 +190,9 @@ } /* Return the bytes read */ - if (NT_SUCCESS(Status)) Irp->IoStatus.Information = Request.DATA.SET_INFORMATION.BytesRead; + if (NT_SUCCESS(Status)) Irp->IoStatus.Information = sizeof(NDIS_OID) + Request.DATA.SET_INFORMATION.BytesRead; + + DPRINT("Final request status: 0x%x (%d)\n", Status, Irp->IoStatus.Information); } else { @@ -216,9 +226,17 @@ /* Setup the NDIS request */ Request.RequestType = NdisRequestQueryInformation; Request.DATA.QUERY_INFORMATION.Oid = QueryOidRequest->Oid; - Request.DATA.QUERY_INFORMATION.InformationBuffer = QueryOidRequest->Data; Request.DATA.QUERY_INFORMATION.InformationBufferLength = RequestLength - sizeof(NDIS_OID); - + if (Request.DATA.QUERY_INFORMATION.InformationBufferLength != 0) + { + Request.DATA.QUERY_INFORMATION.InformationBuffer = QueryOidRequest->Data; + } + else + { + Request.DATA.QUERY_INFORMATION.InformationBuffer = NULL; + } + Request.DATA.QUERY_INFORMATION.BytesWritten = 0; + DPRINT("Querying OID 0x%x on adapter %wZ\n", QueryOidRequest->Oid, &AdapterContext->DeviceName); /* Dispatch the request */ @@ -238,7 +256,9 @@ } /* Return the bytes written */ - if (NT_SUCCESS(Status)) Irp->IoStatus.Information = Request.DATA.QUERY_INFORMATION.BytesWritten; + if (NT_SUCCESS(Status)) Irp->IoStatus.Information = sizeof(NDIS_OID) + Request.DATA.QUERY_INFORMATION.BytesWritten; + + DPRINT("Final request status: 0x%x (%d)\n", Status, Irp->IoStatus.Information); } else { Modified: branches/wlan-bringup/drivers/network/ndisuio/ndisuio.h URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/drivers/network/nd… ============================================================================== --- branches/wlan-bringup/drivers/network/ndisuio/ndisuio.h [iso-8859-1] (original) +++ branches/wlan-bringup/drivers/network/ndisuio/ndisuio.h [iso-8859-1] Tue Jan 10 01:52:18 2012 @@ -36,6 +36,9 @@ /* Receive packet list */ LIST_ENTRY PacketList; KEVENT PacketReadEvent; + + /* Mac options */ + ULONG MacOptions; /* Device name */ UNICODE_STRING DeviceName; Modified: branches/wlan-bringup/drivers/network/ndisuio/protocol.c URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/drivers/network/nd… ============================================================================== --- branches/wlan-bringup/drivers/network/ndisuio/protocol.c [iso-8859-1] (original) +++ branches/wlan-bringup/drivers/network/ndisuio/protocol.c [iso-8859-1] Tue Jan 10 01:52:18 2012 @@ -116,13 +116,15 @@ PNDIS_PACKET Packet; NDIS_STATUS Status; UINT BytesTransferred; + + DPRINT("Received a %d byte packet\n", PacketSize); /* Discard if nobody is waiting for it */ if (AdapterContext->OpenCount == 0) return NDIS_STATUS_NOT_ACCEPTED; /* Allocate a buffer to hold the packet data and header */ - PacketBuffer = ExAllocatePool(NonPagedPool, PacketSize); + PacketBuffer = ExAllocatePool(NonPagedPool, PacketSize + HeaderBufferSize); if (!PacketBuffer) return NDIS_STATUS_NOT_ACCEPTED; @@ -137,13 +139,167 @@ } /* Transfer the packet data into our data buffer */ - NdisTransferData(&Status, - AdapterContext->BindingHandle, - MacReceiveContext, - 0, - PacketSize, - Packet, - &BytesTransferred); + if (LookaheadBufferSize == PacketSize) + { + NdisCopyLookaheadData((PVOID)((PUCHAR)PacketBuffer + HeaderBufferSize), + LookAheadBuffer, + PacketSize, + AdapterContext->MacOptions); + BytesTransferred = PacketSize; + } + else + { + NdisTransferData(&Status, + AdapterContext->BindingHandle, + MacReceiveContext, + 0, + PacketSize, + Packet, + &BytesTransferred); + if (Status == NDIS_STATUS_PENDING) + { + KeWaitForSingleObject(&AdapterContext->AsyncEvent, + Executive, + KernelMode, + FALSE, + NULL); + Status = AdapterContext->AsyncStatus; + } + if (Status != NDIS_STATUS_SUCCESS) + { + DPRINT1("Failed to transfer data with status 0x%x\n", Status); + CleanupAndFreePacket(Packet, TRUE); + return NDIS_STATUS_NOT_ACCEPTED; + } + } + + /* Copy the header data */ + RtlCopyMemory(PacketBuffer, HeaderBuffer, HeaderBufferSize); + + /* Free the packet descriptor and buffers + but not the pool because we still need it */ + CleanupAndFreePacket(Packet, FALSE); + + /* Allocate a packet entry from pool */ + PacketEntry = ExAllocatePool(NonPagedPool, sizeof(NDISUIO_PACKET_ENTRY) + BytesTransferred + HeaderBufferSize - 1); + if (!PacketEntry) + { + ExFreePool(PacketBuffer); + return NDIS_STATUS_RESOURCES; + } + + /* Initialize the packet entry and copy in packet data */ + PacketEntry->PacketLength = BytesTransferred + HeaderBufferSize; + RtlCopyMemory(PacketEntry->PacketData, PacketBuffer, PacketEntry->PacketLength); + + /* Free the old buffer */ + ExFreePool(PacketBuffer); + + /* Insert the packet on the adapter's packet list */ + ExInterlockedInsertTailList(&AdapterContext->PacketList, + &PacketEntry->ListEntry, + &AdapterContext->Spinlock); + + /* Signal the read event */ + KeSetEvent(&AdapterContext->PacketReadEvent, + IO_NETWORK_INCREMENT, + FALSE); + + return NDIS_STATUS_SUCCESS; +} + +VOID +NTAPI +NduReceiveComplete(NDIS_HANDLE ProtocolBindingContext) +{ + /* No op */ +} + +VOID +NTAPI +NduStatus(NDIS_HANDLE ProtocolBindingContext, + NDIS_STATUS GeneralStatus, + PVOID StatusBuffer, + UINT StatusBufferSize) +{ + /* FIXME: Implement status tracking */ +} + +VOID +NTAPI +NduStatusComplete(NDIS_HANDLE ProtocolBindingContext) +{ + /* FIXME: Implement status tracking */ +} + +static +NDIS_STATUS +UnbindAdapterByContext(PNDISUIO_ADAPTER_CONTEXT AdapterContext) +{ + KIRQL OldIrql; + PLIST_ENTRY CurrentEntry; + PNDISUIO_OPEN_ENTRY OpenEntry; + PNDISUIO_PACKET_ENTRY PacketEntry; + NDIS_STATUS Status; + + DPRINT("Unbinding adapter %wZ\n", &AdapterContext->DeviceName); + + /* FIXME: We don't do anything with outstanding reads */ + + /* Remove the adapter context from the global list */ + KeAcquireSpinLock(&GlobalAdapterListLock, &OldIrql); + RemoveEntryList(&AdapterContext->ListEntry); + KeReleaseSpinLock(&GlobalAdapterListLock, OldIrql); + + /* Free the device name string */ + RtlFreeUnicodeString(&AdapterContext->DeviceName); + + /* Invalidate all handles to this adapter */ + CurrentEntry = AdapterContext->OpenEntryList.Flink; + while (CurrentEntry != &AdapterContext->OpenEntryList) + { + OpenEntry = CONTAINING_RECORD(CurrentEntry, NDISUIO_OPEN_ENTRY, ListEntry); + + /* Make sure the entry is sane */ + ASSERT(OpenEntry->FileObject); + + /* Remove the adapter context pointer */ + ASSERT(AdapterContext == OpenEntry->FileObject->FsContext); + OpenEntry->FileObject->FsContext = NULL; + AdapterContext->OpenCount--; + + /* Remove the open entry pointer */ + ASSERT(OpenEntry == OpenEntry->FileObject->FsContext2); + OpenEntry->FileObject->FsContext2 = NULL; + + /* Move to the next entry */ + CurrentEntry = CurrentEntry->Flink; + + /* Free the open entry */ + ExFreePool(OpenEntry); + } + + /* If this fails, we have a refcount mismatch somewhere */ + ASSERT(AdapterContext->OpenCount == 0); + + /* Free all pending packet entries */ + CurrentEntry = AdapterContext->PacketList.Flink; + while (CurrentEntry != &AdapterContext->PacketList) + { + PacketEntry = CONTAINING_RECORD(CurrentEntry, NDISUIO_PACKET_ENTRY, ListEntry); + + /* Move to the next entry */ + CurrentEntry = CurrentEntry->Flink; + + /* Free the packet entry */ + ExFreePool(PacketEntry); + } + + /* Send the close request */ + NdisCloseAdapter(&Status, + AdapterContext->BindingHandle); + + /* Wait for a pending close */ if (Status == NDIS_STATUS_PENDING) { KeWaitForSingleObject(&AdapterContext->AsyncEvent, @@ -153,149 +309,6 @@ NULL); Status = AdapterContext->AsyncStatus; } - if (Status != NDIS_STATUS_SUCCESS) - { - DPRINT1("Failed to transfer data with status 0x%x\n", Status); - CleanupAndFreePacket(Packet, TRUE); - return NDIS_STATUS_NOT_ACCEPTED; - } - - /* Copy the header data */ - RtlCopyMemory(PacketBuffer, HeaderBuffer, HeaderBufferSize); - - /* Free the packet descriptor and buffers - but not the pool because we still need it */ - CleanupAndFreePacket(Packet, FALSE); - - /* Allocate a packet entry from pool */ - PacketEntry = ExAllocatePool(NonPagedPool, sizeof(NDISUIO_PACKET_ENTRY) + BytesTransferred + HeaderBufferSize - 1); - if (!PacketEntry) - { - ExFreePool(PacketBuffer); - return NDIS_STATUS_RESOURCES; - } - - /* Initialize the packet entry and copy in packet data */ - PacketEntry->PacketLength = BytesTransferred + HeaderBufferSize; - RtlCopyMemory(&PacketEntry->PacketData[0], PacketBuffer, PacketEntry->PacketLength); - - /* Free the old buffer */ - ExFreePool(PacketBuffer); - - /* Insert the packet on the adapter's packet list */ - ExInterlockedInsertTailList(&AdapterContext->PacketList, - &PacketEntry->ListEntry, - &AdapterContext->Spinlock); - - /* Signal the read event */ - KeSetEvent(&AdapterContext->PacketReadEvent, - IO_NETWORK_INCREMENT, - FALSE); - - return NDIS_STATUS_SUCCESS; -} - -VOID -NTAPI -NduReceiveComplete(NDIS_HANDLE ProtocolBindingContext) -{ - /* No op */ -} - -VOID -NTAPI -NduStatus(NDIS_HANDLE ProtocolBindingContext, - NDIS_STATUS GeneralStatus, - PVOID StatusBuffer, - UINT StatusBufferSize) -{ - /* FIXME: Implement status tracking */ -} - -VOID -NTAPI -NduStatusComplete(NDIS_HANDLE ProtocolBindingContext) -{ - /* FIXME: Implement status tracking */ -} - -static -NDIS_STATUS -UnbindAdapterByContext(PNDISUIO_ADAPTER_CONTEXT AdapterContext) -{ - KIRQL OldIrql; - PLIST_ENTRY CurrentEntry; - PNDISUIO_OPEN_ENTRY OpenEntry; - PNDISUIO_PACKET_ENTRY PacketEntry; - NDIS_STATUS Status; - - DPRINT("Unbinding adapter %wZ\n", &AdapterContext->DeviceName); - - /* FIXME: We don't do anything with outstanding reads */ - - /* Remove the adapter context from the global list */ - KeAcquireSpinLock(&GlobalAdapterListLock, &OldIrql); - RemoveEntryList(&AdapterContext->ListEntry); - KeReleaseSpinLock(&GlobalAdapterListLock, OldIrql); - - /* Free the device name string */ - RtlFreeUnicodeString(&AdapterContext->DeviceName); - - /* Invalidate all handles to this adapter */ - CurrentEntry = AdapterContext->OpenEntryList.Flink; - while (CurrentEntry != &AdapterContext->OpenEntryList) - { - OpenEntry = CONTAINING_RECORD(CurrentEntry, NDISUIO_OPEN_ENTRY, ListEntry); - - /* Make sure the entry is sane */ - ASSERT(OpenEntry->FileObject); - - /* Remove the adapter context pointer */ - ASSERT(AdapterContext == OpenEntry->FileObject->FsContext); - OpenEntry->FileObject->FsContext = NULL; - AdapterContext->OpenCount--; - - /* Remove the open entry pointer */ - ASSERT(OpenEntry == OpenEntry->FileObject->FsContext2); - OpenEntry->FileObject->FsContext2 = NULL; - - /* Move to the next entry */ - CurrentEntry = CurrentEntry->Flink; - - /* Free the open entry */ - ExFreePool(OpenEntry); - } - - /* If this fails, we have a refcount mismatch somewhere */ - ASSERT(AdapterContext->OpenCount == 0); - - /* Free all pending packet entries */ - CurrentEntry = AdapterContext->PacketList.Flink; - while (CurrentEntry != &AdapterContext->PacketList) - { - PacketEntry = CONTAINING_RECORD(CurrentEntry, NDISUIO_PACKET_ENTRY, ListEntry); - - /* Move to the next entry */ - CurrentEntry = CurrentEntry->Flink; - - /* Free the packet entry */ - ExFreePool(PacketEntry); - } - - /* Send the close request */ - NdisCloseAdapter(&Status, - AdapterContext->BindingHandle); - - /* Wait for a pending close */ - if (Status == NDIS_STATUS_PENDING) - { - KeWaitForSingleObject(&AdapterContext->AsyncEvent, - Executive, - KernelMode, - FALSE, - NULL); - Status = AdapterContext->AsyncStatus; - } /* Free the context */ ExFreePool(AdapterContext); @@ -312,6 +325,7 @@ NDIS_MEDIUM SupportedMedia[1] = {NdisMedium802_3}; UINT SelectedMedium; NDIS_STATUS Status; + NDIS_REQUEST Request; /* Allocate the adapter context */ AdapterContext = ExAllocatePool(NonPagedPool, sizeof(*AdapterContext)); @@ -404,6 +418,51 @@ return Status; } + /* Get the MAC options */ + Request.RequestType = NdisRequestQueryInformation; + Request.DATA.QUERY_INFORMATION.Oid = OID_GEN_MAC_OPTIONS; + Request.DATA.QUERY_INFORMATION.InformationBuffer = &AdapterContext->MacOptions; + Request.DATA.QUERY_INFORMATION.InformationBufferLength = sizeof(ULONG); + NdisRequest(&Status, + AdapterContext->BindingHandle, + &Request); + + /* Wait for a pending request */ + if (Status == NDIS_STATUS_PENDING) + { + KeWaitForSingleObject(&AdapterContext->AsyncEvent, + Executive, + KernelMode, + FALSE, + NULL); + Status = AdapterContext->AsyncStatus; + } + + /* Check the final status */ + if (Status != NDIS_STATUS_SUCCESS) + { + NDIS_STATUS CloseStatus; + + DPRINT1("Failed to get MAC options with status 0x%x\n", Status); + + NdisCloseAdapter(&CloseStatus, + AdapterContext->BindingHandle); + if (CloseStatus == NDIS_STATUS_PENDING) + { + KeWaitForSingleObject(&AdapterContext->AsyncEvent, + Executive, + KernelMode, + FALSE, + NULL); + } + + NdisFreePacketPool(AdapterContext->PacketPoolHandle); + NdisFreeBufferPool(AdapterContext->BufferPoolHandle); + RtlFreeUnicodeString(&AdapterContext->DeviceName); + ExFreePool(AdapterContext); + return Status; + } + /* Add the adapter context to the global list */ ExInterlockedInsertTailList(&GlobalAdapterList, &AdapterContext->ListEntry,

1 0

[cgutman] 54896: [NDIS] - NdisGetCurrentSystemTime can be called at any IRQL - Fixes assertions running the RTL8185 driver
by cgutman＠svn.reactos.org 10 Jan '12

10 Jan '12

Author: cgutman Date: Tue Jan 10 01:23:35 2012 New Revision: 54896 URL: http://svn.reactos.org/svn/reactos?rev=54896&view=rev Log: [NDIS] - NdisGetCurrentSystemTime can be called at any IRQL - Fixes assertions running the RTL8185 driver Modified: branches/wlan-bringup/drivers/network/ndis/ndis/time.c Modified: branches/wlan-bringup/drivers/network/ndis/ndis/time.c URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/drivers/network/nd… ============================================================================== --- branches/wlan-bringup/drivers/network/ndis/ndis/time.c [iso-8859-1] (original) +++ branches/wlan-bringup/drivers/network/ndis/ndis/time.c [iso-8859-1] Tue Jan 10 01:23:35 2012 @@ -57,10 +57,9 @@ * ARGUMENTS: * pSystemTime: pointer to the returned system time * NOTES: - * - call at IRQL <= DISPATCH_LEVEL - */ -{ - ASSERT_IRQL(DISPATCH_LEVEL); + * - call at any IRQL + */ +{ ASSERT(pSystemTime); KeQuerySystemTime (pSystemTime);

1 0

[cgutman] 54895: [PCNET] - Apply the same hack for OID_GEN_MEDIA_CONNECT_STATUS as we did for OID_GEN_HARDWARE_STATUS (since media state detection is broken for certain adapters) [DHCPCSVC] - Keep ...
by cgutman＠svn.reactos.org 10 Jan '12

10 Jan '12

Author: cgutman Date: Tue Jan 10 00:44:16 2012 New Revision: 54895 URL: http://svn.reactos.org/svn/reactos?rev=54895&view=rev Log: [PCNET] - Apply the same hack for OID_GEN_MEDIA_CONNECT_STATUS as we did for OID_GEN_HARDWARE_STATUS (since media state detection is broken for certain adapters) [DHCPCSVC] - Keep the adapter thread running to handle media state changes [TCPIP] - Fix media state detection which was totally broken because it was using the wrong OID Modified: branches/wlan-bringup/dll/win32/dhcpcsvc/dhcp/adapter.c branches/wlan-bringup/drivers/network/dd/pcnet/requests.c branches/wlan-bringup/drivers/network/tcpip/datalink/lan.c branches/wlan-bringup/lib/drivers/ip/network/interface.c Modified: branches/wlan-bringup/dll/win32/dhcpcsvc/dhcp/adapter.c URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/dll/win32/dhcpcsvc… ============================================================================== --- branches/wlan-bringup/dll/win32/dhcpcsvc/dhcp/adapter.c [iso-8859-1] (original) +++ branches/wlan-bringup/dll/win32/dhcpcsvc/dhcp/adapter.c [iso-8859-1] Tue Jan 10 00:44:16 2012 @@ -345,15 +345,12 @@ DH_DbgPrint(MID_TRACE,("Adapter %d was rejected\n", Table->table[i].dwIndex)); } +#if 0 Error = NotifyAddrChange(NULL, NULL); -#if 0 if (Error != NO_ERROR) break; #else - if (AdapterCount) - break; - else - Sleep(3000); + Sleep(3000); #endif } while (TRUE); Modified: branches/wlan-bringup/drivers/network/dd/pcnet/requests.c URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/drivers/network/dd… ============================================================================== --- branches/wlan-bringup/drivers/network/dd/pcnet/requests.c [iso-8859-1] (original) +++ branches/wlan-bringup/drivers/network/dd/pcnet/requests.c [iso-8859-1] Tue Jan 10 00:44:16 2012 @@ -266,7 +266,7 @@ case OID_GEN_MEDIA_CONNECT_STATUS: { - GenericULONG = Adapter->MediaState; + GenericULONG = (ULONG)NdisMediaStateConnected; /* Adapter->MediaState */ break; } Modified: branches/wlan-bringup/drivers/network/tcpip/datalink/lan.c URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/drivers/network/tc… ============================================================================== --- branches/wlan-bringup/drivers/network/tcpip/datalink/lan.c [iso-8859-1] (original) +++ branches/wlan-bringup/drivers/network/tcpip/datalink/lan.c [iso-8859-1] Tue Jan 10 00:44:16 2012 @@ -185,7 +185,9 @@ case OID_GEN_HARDWARE_STATUS: *Result = NdisHardwareStatusReady; return STATUS_SUCCESS; - + case OID_GEN_MEDIA_CONNECT_STATUS: + *Result = NdisMediaStateConnected; + return STATUS_SUCCESS; default: return STATUS_INVALID_PARAMETER; } Modified: branches/wlan-bringup/lib/drivers/ip/network/interface.c URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/lib/drivers/ip/net… ============================================================================== --- branches/wlan-bringup/lib/drivers/ip/network/interface.c [iso-8859-1] (original) +++ branches/wlan-bringup/lib/drivers/ip/network/interface.c [iso-8859-1] Tue Jan 10 00:44:16 2012 @@ -196,27 +196,26 @@ return NULL; } -NTSTATUS GetInterfaceConnectionStatus -( PIP_INTERFACE Interface, PULONG Result ) { - NTSTATUS Status = TcpipLanGetDwordOid - ( Interface, OID_GEN_HARDWARE_STATUS, Result ); - if( NT_SUCCESS(Status) ) switch( *Result ) { - case NdisHardwareStatusReady: +NTSTATUS GetInterfaceConnectionStatus(PIP_INTERFACE Interface, PULONG Result) +{ + NTSTATUS Status; + + /* Query OID_GEN_MEDIA_CONNECT_STATUS for connection status information */ + Status = TcpipLanGetDwordOid(Interface, OID_GEN_MEDIA_CONNECT_STATUS, Result); + if (!NT_SUCCESS(Status)) + return Status; + + /* Translate the result into MIB_IF_OPER_STATUS_XXX */ + if (*Result == NdisMediaStateConnected) + { + /* Up and running */ *Result = MIB_IF_OPER_STATUS_OPERATIONAL; - break; - case NdisHardwareStatusInitializing: - *Result = MIB_IF_OPER_STATUS_CONNECTING; - break; - case NdisHardwareStatusReset: + } + else + { + /* Down */ *Result = MIB_IF_OPER_STATUS_DISCONNECTED; - break; - case NdisHardwareStatusNotReady: - *Result = MIB_IF_OPER_STATUS_DISCONNECTED; - break; - case NdisHardwareStatusClosing: - default: - *Result = MIB_IF_OPER_STATUS_NON_OPERATIONAL; - break; - } - return Status; -} + } + + return STATUS_SUCCESS; +}

1 0

[rharabien] 54894: [SHELL32] - Add item icons to New menu - Fix some leaks in New menu - Properly handle New Folder and New Link items
by rharabien＠svn.reactos.org 09 Jan '12

09 Jan '12

Author: rharabien Date: Mon Jan 9 23:01:01 2012 New Revision: 54894 URL: http://svn.reactos.org/svn/reactos?rev=54894&view=rev Log: [SHELL32] - Add item icons to New menu - Fix some leaks in New menu - Properly handle New Folder and New Link items Modified: trunk/reactos/dll/win32/shell32/newmenu.cpp trunk/reactos/dll/win32/shell32/newmenu.h trunk/reactos/dll/win32/shell32/openwithmenu.cpp trunk/reactos/dll/win32/shell32/openwithmenu.h Modified: trunk/reactos/dll/win32/shell32/newmenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/newmenu.… ============================================================================== --- trunk/reactos/dll/win32/shell32/newmenu.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/newmenu.cpp [iso-8859-1] Mon Jan 9 23:01:01 2012 @@ -3,6 +3,7 @@ * * Copyright 2007 Johannes Anderwald (janderwald(a)reactos.org) * Copyright 2009 Andrew Hill + * Copyright 2012 Rafal Harabien * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -26,132 +27,83 @@ CNewMenu::CNewMenu() { m_wszPath = NULL; - m_pShellItems = NULL; + m_pItems = NULL; + m_pLinkItem = NULL; m_pSite = NULL; + m_hbmFolder = NULL; + m_hbmLink = NULL; } CNewMenu::~CNewMenu() { - UnloadShellItems(); - if (m_hSubMenu) - CleanupMenu(); -} - -void CNewMenu::CleanupMenu() -{ - INT Count, Index; - MENUITEMINFOW mii; - - /* get item count */ - Count = GetMenuItemCount(m_hSubMenu); - if (Count == -1) - return; - - /* setup menuitem info */ - ZeroMemory(&mii, sizeof(mii)); - mii.cbSize = sizeof(mii); - mii.fMask = MIIM_DATA | MIIM_FTYPE | MIIM_CHECKMARKS; - - for(Index = 0; Index < Count; Index++) - { - if (GetMenuItemInfoW(m_hSubMenu, Index, TRUE, &mii)) - { - if (mii.hbmpChecked) - DeleteObject(mii.hbmpChecked); - } - } + UnloadAllItems(); + if (m_hbmFolder) + DeleteObject(m_hbmFolder); + if (m_hbmLink) + DeleteObject(m_hbmLink); } void CNewMenu::UnloadItem(SHELLNEW_ITEM *pItem) { - // bail if the item is clearly invalid - if (NULL == pItem) - return; - - if (NULL != pItem->pwszTarget) - free(pItem->pwszTarget); - + /* Note: free allows NULL as argument */ + free(pItem->pData); free(pItem->pwszDesc); - free(pItem->pwszIcon); free(pItem->pwszExt); + if (pItem->hBitmap) + DeleteObject(pItem->hBitmap); + HeapFree(GetProcessHeap(), 0, pItem); } -void CNewMenu::UnloadShellItems() +void CNewMenu::UnloadAllItems() { SHELLNEW_ITEM *pCurItem; - while (m_pShellItems) - { - pCurItem = m_pShellItems; - m_pShellItems = m_pShellItems->pNext; + /* Unload normal items */ + while (m_pItems) + { + pCurItem = m_pItems; + m_pItems = m_pItems->pNext; UnloadItem(pCurItem); } -} - -BOOL CNewMenu::GetKeyDescription(LPCWSTR pwszExt, LPWSTR pwszResult) + + /* Unload link item */ + if (m_pLinkItem) + UnloadItem(m_pLinkItem); + m_pLinkItem = NULL; +} + +static HBITMAP IconToBitmap(HICON hIcon) +{ + HDC hdc, hdcScr; + HBITMAP hbm, hbmOld; + RECT rc; + + hdcScr = GetDC(NULL); + hdc = CreateCompatibleDC(hdcScr); + SetRect(&rc, 0, 0, GetSystemMetrics(SM_CXMENUCHECK), GetSystemMetrics(SM_CYMENUCHECK)); + hbm = CreateCompatibleBitmap(hdcScr, rc.right, rc.bottom); + ReleaseDC(NULL, hdcScr); + + hbmOld = (HBITMAP)SelectObject(hdc, hbm); + FillRect(hdc, &rc, (HBRUSH)(COLOR_MENU + 1)); + if (!DrawIconEx(hdc, 0, 0, hIcon, rc.right, rc.bottom, 0, NULL, DI_NORMAL)) + ERR("DrawIcon failed: %x\n", GetLastError()); + SelectObject(hdc, hbmOld); + + DeleteDC(hdc); + + return hbm; +} + +CNewMenu::SHELLNEW_ITEM *CNewMenu::LoadItem(LPCWSTR pwszExt) { HKEY hKey; - DWORD cbDesc; - WCHAR wszDesc[100]; - LONG Result; - - TRACE("GetKeyDescription: keyname %s\n", debugstr_w(pwszExt)); - - if (RegOpenKeyExW(HKEY_CLASSES_ROOT, pwszExt, 0, KEY_READ, &hKey) != ERROR_SUCCESS) - return FALSE; - - /* Get user friendly name */ - if (RegLoadMUIStringW(hKey, L"\\FriendlyTypeName", pwszResult, MAX_PATH, &cbDesc, 0, NULL) == ERROR_SUCCESS) - { - TRACE("result %s\n", debugstr_w(pwszResult)); - RegCloseKey(hKey); - return TRUE; - } - - /* Fetch default value */ - cbDesc = sizeof(wszDesc); - Result = RegGetValueW(hKey, NULL, L"", RRF_RT_REG_SZ, NULL, wszDesc, &cbDesc); - if(Result == ERROR_SUCCESS) - { - if (wcscmp(pwszExt, wszDesc) != 0) - { - /* recurse for to a linked key */ - if (!GetKeyDescription(wszDesc, pwszResult)) - { - /* use description */ - wcscpy(pwszResult, wszDesc); - } - } - else - { - /* use default value as description */ - wcscpy(pwszResult, wszDesc); - } - } - else - { - /* registry key w/o default key?? */ - ERR("RegGetValue failed with %x\n", Result); - wcscpy(pwszResult, pwszExt); - } - - RegCloseKey(hKey); - return TRUE; -} - -CNewMenu::SHELLNEW_ITEM *CNewMenu::LoadItem(LPCWSTR pwszExt) -{ - HKEY hKey; - DWORD dwIndex = 0; WCHAR wszBuf[MAX_PATH]; - WCHAR wszCommand[MAX_PATH]; - WCHAR wszDesc[MAX_PATH] = L""; - WCHAR wszIcon[MAX_PATH] = L""; - DWORD cchName, cbCommand; - SHELLNEW_ITEM *pNewItem = NULL; + BYTE *pData = NULL; + DWORD cbData; StringCbPrintfW(wszBuf, sizeof(wszBuf), L"%s\\ShellNew", pwszExt); @@ -164,59 +116,68 @@ } /* Find first valid value */ - while (TRUE) - { - cchName = _countof(wszBuf); - cbCommand = sizeof(wszCommand); - if (RegEnumValueW(hKey, dwIndex++, wszBuf, &cchName, NULL, NULL, (LPBYTE)wszCommand, &cbCommand) != ERROR_SUCCESS) - break; - - SHELLNEW_TYPE Type = SHELLNEW_TYPE_INVALID; - LPWSTR pwszTarget = wszCommand; - - TRACE("wszBuf %s wszCommand %s\n", debugstr_w(wszBuf), debugstr_w(wszCommand)); - - /* Handle different types */ - if (!wcsicmp(wszBuf, L"Command")) - Type = SHELLNEW_TYPE_COMMAND; - else if (!wcsicmp(wszBuf, L"Data")) - Type = SHELLNEW_TYPE_DATA; - else if (!wcsicmp(wszBuf, L"FileName")) - Type = SHELLNEW_TYPE_FILENAME; - else if (!wcsicmp(wszBuf, L"NullFile")) + struct + { + LPCSTR pszName; + SHELLNEW_TYPE Type; + BOOL bNeedData; + BOOL bStr; + } Types[] = { + {"FileName", SHELLNEW_TYPE_FILENAME, TRUE, TRUE}, + {"Command", SHELLNEW_TYPE_COMMAND, TRUE, TRUE}, + {"Data", SHELLNEW_TYPE_DATA, TRUE, FALSE}, + {"NullFile", SHELLNEW_TYPE_NULLFILE, FALSE}, + {NULL} + }; + UINT i; + + for (i = 0; Types[i].pszName; ++i) + { + /* Note: We are using ANSI function because strings can be treated as data */ + cbData = 0; + DWORD dwFlags = Types[i].bStr ? RRF_RT_REG_SZ|RRF_RT_REG_EXPAND_SZ : RRF_RT_ANY; + if (RegGetValueA(hKey, NULL, Types[i].pszName, dwFlags, NULL, NULL, &cbData) == ERROR_SUCCESS) { - Type = SHELLNEW_TYPE_NULLFILE; - pwszTarget = NULL; - } - - /* Create new item */ - if (Type != SHELLNEW_TYPE_INVALID) - { - pNewItem = (SHELLNEW_ITEM *)HeapAlloc(GetProcessHeap(), 0, sizeof(SHELLNEW_ITEM)); - if (!pNewItem) - break; - - pNewItem->Type = Type; - if (pwszTarget) - pNewItem->pwszTarget = _wcsdup(pwszTarget); - else - pNewItem->pwszTarget = NULL; - - GetKeyDescription(pwszExt, wszDesc); - pNewItem->pwszDesc = _wcsdup(wszDesc); - pNewItem->pwszIcon = _wcsdup(wszIcon); - pNewItem->pwszExt = _wcsdup(pwszExt); - pNewItem->pNext = NULL; + if (Types[i].bNeedData && cbData > 0) + { + pData = (BYTE*)malloc(cbData); + RegGetValueA(hKey, NULL, Types[i].pszName, dwFlags, NULL, pData, &cbData); + } break; } } - RegCloseKey(hKey); + + /* Was any key found? */ + if (!Types[i].pszName) + return NULL; + + SHFILEINFO fi; + if (!SHGetFileInfoW(pwszExt, FILE_ATTRIBUTE_NORMAL, &fi, sizeof(fi), SHGFI_USEFILEATTRIBUTES|SHGFI_TYPENAME|SHGFI_ICON|SHGFI_SMALLICON)) + return NULL; + + /* Create new item */ + SHELLNEW_ITEM *pNewItem = (SHELLNEW_ITEM *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(SHELLNEW_ITEM)); + if (!pNewItem) + { + free(pData); + return NULL; + } + + TRACE("new item %ls\n", fi.szTypeName); + pNewItem->Type = Types[i].Type; + pNewItem->pData = pData; + pNewItem->cbData = pData ? cbData : 0; + pNewItem->pwszExt = _wcsdup(pwszExt); + pNewItem->pwszDesc = _wcsdup(fi.szTypeName); + if (fi.hIcon) + pNewItem->hBitmap = IconToBitmap(fi.hIcon); + return pNewItem; } BOOL -CNewMenu::LoadShellNewItems() +CNewMenu::LoadAllItems() { DWORD dwIndex = 0; WCHAR wszName[MAX_PATH]; @@ -224,28 +185,21 @@ SHELLNEW_ITEM *pCurItem = NULL; /* If there are any unload them */ - UnloadShellItems(); + UnloadAllItems(); /* Enumerate all extesions */ while (RegEnumKeyW(HKEY_CLASSES_ROOT, dwIndex++, wszName, _countof(wszName)) == ERROR_SUCCESS) { - if (wszName[0] != '.' || wcsicmp(wszName, L".lnk") == 0) + if (wszName[0] != L'.') continue; pNewItem = LoadItem(wszName); if (pNewItem) { - if (!wcsicmp(pNewItem->pwszExt, L".lnk")) - { - /* FIXME: Should we load them? - Add lnk handlers to begin of the list */ - if (m_pShellItems) - { - pNewItem->pNext = m_pShellItems; - m_pShellItems = pNewItem; - } - else - m_pShellItems = pCurItem = pNewItem; + if (wcsicmp(pNewItem->pwszExt, L".lnk") == 0) + { + /* Link handler */ + m_pLinkItem = pNewItem; } else { @@ -256,51 +210,38 @@ pCurItem = pNewItem; } else - pCurItem = m_pShellItems = pNewItem; + pCurItem = m_pItems = pNewItem; } } } - if (m_pShellItems == NULL) + if (!m_pLinkItem) + { + m_pLinkItem = (SHELLNEW_ITEM *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(SHELLNEW_ITEM)); + if (m_pLinkItem) + { + m_pLinkItem->Type = SHELLNEW_TYPE_NULLFILE; + m_pLinkItem->pwszDesc = _wcsdup(L"Link"); + m_pLinkItem->pwszExt = _wcsdup(L".lnk"); + } + } + + if (m_pItems == NULL) return FALSE; else return TRUE; } -static HBITMAP IconToBitmap(HICON hIcon) -{ - HDC hdc, hdcScr; - HBITMAP hbm, hbmOld; - RECT rc; - - hdcScr = GetDC(NULL); - hdc = CreateCompatibleDC(hdcScr); - SetRect(&rc, 0, 0, GetSystemMetrics(SM_CXMENUCHECK), GetSystemMetrics(SM_CYMENUCHECK)); - hbm = CreateCompatibleBitmap(hdcScr, rc.right, rc.bottom); - ReleaseDC(NULL, hdcScr); - - hbmOld = (HBITMAP)SelectObject(hdc, hbm); - FillRect(hdc, &rc, (HBRUSH)(COLOR_MENU + 1)); - if (!DrawIconEx(hdc, 0, 0, hIcon, rc.right, rc.bottom, 0, NULL, DI_NORMAL)) - ERR("DrawIcon failed: %x\n", GetLastError()); - SelectObject(hdc, hbmOld); - - DeleteDC(hdc); - - return hbm; -} - UINT CNewMenu::InsertShellNewItems(HMENU hMenu, UINT idCmdFirst, UINT Pos) { MENUITEMINFOW mii; WCHAR wszBuf[256]; - HICON hIcon; UINT idCmd = idCmdFirst; - if (m_pShellItems == NULL) - { - if (!LoadShellNewItems()) + if (m_pItems == NULL) + { + if (!LoadAllItems()) return 0; } @@ -315,11 +256,10 @@ mii.dwTypeData = wszBuf; mii.cch = wcslen(mii.dwTypeData); mii.wID = idCmd; - hIcon = (HICON)LoadImage(shell32_hInstance, MAKEINTRESOURCE(IDI_SHELL_FOLDER), IMAGE_ICON, 0, 0, 0); - if (hIcon) + if (m_hbmFolder) { mii.fMask |= MIIM_CHECKMARKS; - mii.hbmpChecked = mii.hbmpUnchecked = IconToBitmap(hIcon); + mii.hbmpChecked = mii.hbmpUnchecked = m_hbmFolder; } if (InsertMenuItemW(hMenu, Pos++, TRUE, &mii)) ++idCmd; @@ -329,12 +269,11 @@ wszBuf[0] = 0; mii.dwTypeData = wszBuf; mii.cch = wcslen(mii.dwTypeData); - mii.wID = idCmdFirst++; - hIcon = (HICON)LoadImage(shell32_hInstance, MAKEINTRESOURCE(IDI_SHELL_SHORTCUT), IMAGE_ICON, 0, 0, 0); - if (hIcon) + mii.wID = idCmd; + if (m_hbmLink) { mii.fMask |= MIIM_CHECKMARKS; - mii.hbmpChecked = mii.hbmpUnchecked = IconToBitmap(hIcon); + mii.hbmpChecked = mii.hbmpUnchecked = m_hbmLink; } if (InsertMenuItemW(hMenu, Pos++, TRUE, &mii)) ++idCmd; @@ -346,22 +285,22 @@ InsertMenuItemW(hMenu, Pos++, TRUE, &mii); /* Insert rest of items */ - mii.fMask = MIIM_ID | MIIM_TYPE | MIIM_STATE | MIIM_DATA; - /* - * FIXME: - * implement loading of icons - * and using MFT_OWNERDRAWN - */ mii.fType = MFT_STRING; mii.fState = MFS_ENABLED; - SHELLNEW_ITEM *pCurItem = m_pShellItems; + SHELLNEW_ITEM *pCurItem = m_pItems; while (pCurItem) { TRACE("szDesc %s\n", debugstr_w(pCurItem->pwszDesc)); + mii.fMask = MIIM_ID | MIIM_TYPE | MIIM_STATE | MIIM_DATA; mii.dwTypeData = pCurItem->pwszDesc; mii.cch = wcslen(mii.dwTypeData); mii.wID = idCmd; + if (pCurItem->hBitmap) + { + mii.fMask |= MIIM_CHECKMARKS; + mii.hbmpChecked = mii.hbmpUnchecked = pCurItem->hBitmap; + } if (InsertMenuItemW(hMenu, Pos++, TRUE, &mii)) ++idCmd; pCurItem = pCurItem->pNext; @@ -370,34 +309,86 @@ return idCmd - idCmdFirst; } -HRESULT -CNewMenu::DoShellNewCmd(LPCMINVOKECOMMANDINFO lpcmi, IShellView *psv) -{ - SHELLNEW_ITEM *pCurItem = m_pShellItems; +CNewMenu::SHELLNEW_ITEM *CNewMenu::FindItemFromIdOffset(UINT IdOffset) +{ + if (IdOffset == 0) + return NULL; /* Folder */ + + if (IdOffset == 1) + return m_pLinkItem; /* shortcut */ + + /* Find shell new item */ + SHELLNEW_ITEM *pItem = m_pItems; + for (UINT i = 2; pItem; ++i) + { + if (i == IdOffset) + break; + + pItem = pItem->pNext; + } + + return pItem; +} + +HRESULT CNewMenu::CreateNewFolder(IShellView *psv) +{ + WCHAR wszName[MAX_PATH]; + CComPtr<ISFHelper> psfhlp; + CComPtr<IFolderView> pFolderView; + CComPtr<IShellFolder> pParentFolder; + HRESULT hr; + + //if (m_pSite == NULL) + // return E_FAIL; + + /* Get current folder */ + hr = IUnknown_QueryService(psv, SID_IFolderView, IID_IFolderView, (void **)&pFolderView); + if (FAILED(hr)) + return hr; + + hr = pFolderView->GetFolder(IID_IShellFolder, (void **)&pParentFolder); + if (FAILED(hr)) + return hr; + + hr = pParentFolder->QueryInterface(IID_ISFHelper, (LPVOID*)&psfhlp); + if (FAILED(hr)) + return hr; + + LPITEMIDLIST pidl; + + /* Get unique name and create a folder */ + hr = psfhlp->GetUniqueName(wszName, _countof(wszName)); + if (hr != S_OK) + return hr; + hr = psfhlp->AddFolder(0, wszName, &pidl); + if (hr != S_OK) + { + WCHAR wszBuf[256]; + StringCbPrintfW(wszBuf, sizeof(wszBuf), L"Cannot create folder: %s", wszName); + MessageBoxW(NULL, wszBuf, L"Cannot create folder", MB_OK|MB_ICONERROR); + return hr; + } + + /* Do a labeledit */ + psv->Refresh(); + psv->SelectItem(pidl, SVSI_DESELECTOTHERS | SVSI_EDIT | SVSI_ENSUREVISIBLE | + SVSI_FOCUSED | SVSI_SELECT); + + SHFree(pidl); + return S_OK; +} + +HRESULT CNewMenu::CreateNewItem(SHELLNEW_ITEM *pItem, LPCMINVOKECOMMANDINFO lpcmi, IShellView *psv) +{ LPITEMIDLIST pidl; STRRET strTemp; WCHAR wszBuf[MAX_PATH]; WCHAR wszPath[MAX_PATH]; - UINT i, idCmd = LOWORD(lpcmi->lpVerb); CComPtr<IFolderView> pFolderView; CComPtr<IShellFolder> pParentFolder; CComPtr<IPersistFolder3> psf; HRESULT hr; - /* Find shell new item */ - for (i = 1; pCurItem; ++i) - { - if (i == idCmd) - break; - - pCurItem = pCurItem->pNext; - } - - if (!pCurItem) - return E_UNEXPECTED; - //if (m_pSite == NULL) - // return E_FAIL; - /* Get current folder */ hr = IUnknown_QueryService(psv, SID_IFolderView, IID_IFolderView, (void **)&pFolderView); if (FAILED(hr)) @@ -427,7 +418,7 @@ } StrRetToBufW(&strTemp, pidl, wszPath, _countof(wszPath)); - switch (pCurItem->Type) + switch (pItem->Type) { case SHELLNEW_TYPE_COMMAND: { @@ -436,7 +427,7 @@ STARTUPINFOW si; PROCESS_INFORMATION pi; - if (!ExpandEnvironmentStringsW(pCurItem->pwszTarget, wszBuf, MAX_PATH)) + if (!ExpandEnvironmentStringsW((LPWSTR)pItem->pData, wszBuf, MAX_PATH)) { TRACE("ExpandEnvironmentStrings failed\n"); break; @@ -475,41 +466,35 @@ /* Build new file name */ LoadStringW(shell32_hInstance, FCIDM_SHVIEW_NEW, wszBuf, _countof(wszBuf)); StringCchCatExW(wszPath, _countof(wszPath), L"\\", &pwszFilename, &cchFilenameMax, 0); - StringCchPrintfW(pwszFilename, cchFilenameMax, L"%s %s%s", wszBuf, pCurItem->pwszDesc, pCurItem->pwszExt); + StringCchPrintfW(pwszFilename, cchFilenameMax, L"%s %s%s", wszBuf, pItem->pwszDesc, pItem->pwszExt); /* Find unique name */ - for (i = 2; PathFileExistsW(wszPath); ++i) - { - StringCchPrintfW(pwszFilename, cchFilenameMax, L"%s %s (%u)%s", wszBuf, pCurItem->pwszDesc, i, pCurItem->pwszExt); + for (UINT i = 2; PathFileExistsW(wszPath); ++i) + { + StringCchPrintfW(pwszFilename, cchFilenameMax, L"%s %s (%u)%s", wszBuf, pItem->pwszDesc, i, pItem->pwszExt); TRACE("New Filename %ls\n", pwszFilename); } - if (pCurItem->Type == SHELLNEW_TYPE_DATA || pCurItem->Type == SHELLNEW_TYPE_NULLFILE) - { - /* Create new file */ - HANDLE hFile = CreateFileW(wszPath, GENERIC_WRITE, 0, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL); - if (hFile != INVALID_HANDLE_VALUE) + /* Create new file */ + HANDLE hFile = CreateFileW(wszPath, GENERIC_WRITE, 0, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL); + if (hFile != INVALID_HANDLE_VALUE) + { + if (pItem->Type == SHELLNEW_TYPE_DATA) { - if (pCurItem->Type == SHELLNEW_TYPE_DATA) - { - /* Write a content */ - CHAR szTemp[256]; - DWORD cbWritten, cbTemp = WideCharToMultiByte(CP_ACP, 0, pCurItem->pwszTarget, -1, szTemp, _countof(szTemp), NULL, NULL); - if (cbTemp) - WriteFile(hFile, (LPCVOID)szTemp, cbTemp, &cbWritten, NULL); - else - ERR("WideCharToMultiByte failed\n"); - } - - /* Close file now */ - CloseHandle(hFile); + /* Write a content */ + DWORD cbWritten; + WriteFile(hFile, pItem->pData, pItem->cbData, &cbWritten, NULL); } - else bSuccess = FALSE; - } - else if (pCurItem->Type == SHELLNEW_TYPE_FILENAME) + + /* Close file now */ + CloseHandle(hFile); + } else + bSuccess = FALSE; + + if (pItem->Type == SHELLNEW_TYPE_FILENAME) { /* Copy file */ - bSuccess = CopyFileW(pCurItem->pwszTarget, wszPath, FALSE); + bSuccess = CopyFileW((LPWSTR)pItem->pData, wszPath, FALSE); } /* Show message if we failed */ @@ -517,6 +502,15 @@ { TRACE("Notifying fs %s\n", debugstr_w(wszPath)); SHChangeNotify(SHCNE_CREATE, SHCNF_PATHW, (LPCVOID)wszPath, NULL); + psv->Refresh(); + + LPITEMIDLIST pidl; + hr = _ILCreateFromPathW(wszPath, &pidl); + if (SUCCEEDED(hr)) + { + psv->SelectItem(pidl, SVSI_DESELECTOTHERS|SVSI_EDIT|SVSI_ENSUREVISIBLE|SVSI_FOCUSED|SVSI_SELECT); + ILFree(pidl); + } } else { @@ -529,52 +523,8 @@ ERR("Invalid type\n"); break; } + return S_OK; -} - -void CNewMenu::CreateNewFolder(IShellView *psv) -{ - WCHAR wszName[MAX_PATH]; - CComPtr<ISFHelper> psfhlp; - CComPtr<IFolderView> pFolderView; - CComPtr<IShellFolder> pParentFolder; - HRESULT hr; - - //if (m_pSite == NULL) - // return; - - /* Get current folder */ - hr = IUnknown_QueryService(psv, SID_IFolderView, IID_IFolderView, (void **)&pFolderView); - if (FAILED(hr)) - return; - - hr = pFolderView->GetFolder(IID_IShellFolder, (void **)&pParentFolder); - if (FAILED(hr)) - return; - - hr = pParentFolder->QueryInterface(IID_ISFHelper, (LPVOID*)&psfhlp); - if (SUCCEEDED(hr)) - { - LPITEMIDLIST pidl; - - /* Get unique name and create a folder */ - if (psfhlp->GetUniqueName(wszName, _countof(wszName)) != S_OK) - return; - if (psfhlp->AddFolder(0, wszName, &pidl) != S_OK) - { - WCHAR wszBuf[256]; - StringCbPrintfW(wszBuf, sizeof(wszBuf), L"Cannot create folder: %s", wszName); - MessageBoxW(NULL, wszBuf, L"Cannot create folder", MB_OK|MB_ICONERROR); - return; - } - - /* Do a labeledit */ - psv->Refresh(); - psv->SelectItem(pidl, SVSI_DESELECTOTHERS | SVSI_EDIT | SVSI_ENSUREVISIBLE | - SVSI_FOCUSED | SVSI_SELECT); - - SHFree(pidl); - } } HRESULT STDMETHODCALLTYPE CNewMenu::SetSite(IUnknown *pUnkSite) @@ -612,21 +562,20 @@ return E_FAIL; m_hSubMenu = CreateMenu(); + if (!m_hSubMenu) + return E_FAIL; + + cItems = InsertShellNewItems(m_hSubMenu, idCmdFirst, 0); + memset(&mii, 0, sizeof(mii)); mii.cbSize = sizeof(mii); - mii.fMask = MIIM_TYPE | MIIM_ID | MIIM_STATE; + mii.fMask = MIIM_TYPE | MIIM_ID | MIIM_STATE | MIIM_SUBMENU; mii.fType = MFT_STRING; mii.wID = -1; mii.dwTypeData = wszNew; mii.cch = wcslen(mii.dwTypeData); mii.fState = MFS_ENABLED; - - if (m_hSubMenu) - { - cItems = InsertShellNewItems(m_hSubMenu, idCmdFirst, 0); - mii.fMask |= MIIM_SUBMENU; - mii.hSubMenu = m_hSubMenu; - } + mii.hSubMenu = m_hSubMenu; if (!InsertMenuItemW(hMenu, indexMenu, TRUE, &mii)) return E_FAIL; @@ -638,23 +587,23 @@ WINAPI CNewMenu::InvokeCommand(LPCMINVOKECOMMANDINFO lpici) { - LPSHELLBROWSER lpSB; - LPSHELLVIEW lpSV = NULL; - HRESULT hr; - + IShellBrowser *lpSB = NULL; + CComPtr<IShellView> lpSV = NULL; + HRESULT hr = E_FAIL; + + /* Note: CWM_GETISHELLBROWSER returns shell browser without adding reference */ lpSB = (LPSHELLBROWSER)SendMessageA(lpici->hwnd, CWM_GETISHELLBROWSER, 0, 0); if (lpSB) lpSB->QueryActiveShellView(&lpSV); if (LOWORD(lpici->lpVerb) == 0) - { - CreateNewFolder(lpSV); - return S_OK; - } - - hr = DoShellNewCmd(lpici, lpSV); - if (SUCCEEDED(hr) && lpSV) - lpSV->Refresh(); + hr = CreateNewFolder(lpSV); + else + { + SHELLNEW_ITEM *pItem = FindItemFromIdOffset(LOWORD(lpici->lpVerb)); + if (pItem) + hr = CreateNewItem(pItem, lpici, lpSV); + } TRACE("CNewMenu::InvokeCommand %x\n", hr); return hr; @@ -676,11 +625,8 @@ HRESULT WINAPI -CNewMenu::HandleMenuMsg(UINT uMsg, - WPARAM wParam, - LPARAM lParam) -{ - UNIMPLEMENTED; +CNewMenu::HandleMenuMsg(UINT uMsg, WPARAM wParam, LPARAM lParam) +{ return S_OK; } @@ -688,5 +634,10 @@ CNewMenu::Initialize(LPCITEMIDLIST pidlFolder, IDataObject *pdtobj, HKEY hkeyProgID) { + HICON hIcon = (HICON)LoadImage(shell32_hInstance, MAKEINTRESOURCE(IDI_SHELL_FOLDER), IMAGE_ICON, 0, 0, LR_SHARED); + m_hbmFolder = hIcon ? IconToBitmap(hIcon) : NULL; + hIcon = (HICON)LoadImage(shell32_hInstance, MAKEINTRESOURCE(IDI_SHELL_SHORTCUT), IMAGE_ICON, 0, 0, LR_SHARED); + m_hbmLink = hIcon ? IconToBitmap(hIcon) : NULL; + return S_OK; } Modified: trunk/reactos/dll/win32/shell32/newmenu.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/newmenu.… ============================================================================== --- trunk/reactos/dll/win32/shell32/newmenu.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/newmenu.h [iso-8859-1] Mon Jan 9 23:01:01 2012 @@ -3,6 +3,7 @@ * * Copyright 2007 Johannes Anderwald (janderwald(a)reactos.org) * Copyright 2009 Andrew Hill + * Copyright 2012 Rafal Harabien * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -43,26 +44,28 @@ { SHELLNEW_TYPE Type; LPWSTR pwszExt; - LPWSTR pwszTarget; + PBYTE pData; + ULONG cbData; LPWSTR pwszDesc; - LPWSTR pwszIcon; + HBITMAP hBitmap; SHELLNEW_ITEM *pNext; }; LPWSTR m_wszPath; - SHELLNEW_ITEM *m_pShellItems; + SHELLNEW_ITEM *m_pItems; + SHELLNEW_ITEM *m_pLinkItem; IUnknown *m_pSite; HMENU m_hSubMenu; + HBITMAP m_hbmFolder, m_hbmLink; - void CleanupMenu(); - static BOOL GetKeyDescription(LPCWSTR pwszExt, LPWSTR pwszResult); SHELLNEW_ITEM *LoadItem(LPCWSTR pwszExt); void UnloadItem(SHELLNEW_ITEM *pItem); - void UnloadShellItems(); - BOOL LoadShellNewItems(); + void UnloadAllItems(); + BOOL LoadAllItems(); UINT InsertShellNewItems(HMENU hMenu, UINT idFirst, UINT idMenu); - HRESULT DoShellNewCmd(LPCMINVOKECOMMANDINFO lpcmi, IShellView *psv); - void CreateNewFolder(IShellView *psv); + SHELLNEW_ITEM *FindItemFromIdOffset(UINT IdOffset); + HRESULT CreateNewFolder(IShellView *psv); + HRESULT CreateNewItem(SHELLNEW_ITEM *pItem, LPCMINVOKECOMMANDINFO lpcmi, IShellView *psv); public: CNewMenu(); Modified: trunk/reactos/dll/win32/shell32/openwithmenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/openwith… ============================================================================== --- trunk/reactos/dll/win32/shell32/openwithmenu.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/openwithmenu.cpp [iso-8859-1] Mon Jan 9 23:01:01 2012 @@ -3,6 +3,7 @@ * * Copyright 2007 Johannes Anderwald <janderwald(a)reactos.org> * Copyright 2009 Andrew Hill + * Copyright 2012 Rafal Harabien * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/reactos/dll/win32/shell32/openwithmenu.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/openwith… ============================================================================== --- trunk/reactos/dll/win32/shell32/openwithmenu.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/openwithmenu.h [iso-8859-1] Mon Jan 9 23:01:01 2012 @@ -3,6 +3,7 @@ * * Copyright 2007 Johannes Anderwald <janderwald(a)reactos.org> * Copyright 2009 Andrew Hill + * Copyright 2012 Rafal Harabien * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public

1 0

[spetreolle] 54893: [SVCHOST] Convert to Unicode. Fix buffer overruns and bad maths when UNICODE is defined. Patch by Samuel Serapion.
by spetreolle＠svn.reactos.org 09 Jan '12

09 Jan '12

Author: spetreolle Date: Mon Jan 9 22:47:16 2012 New Revision: 54893 URL: http://svn.reactos.org/svn/reactos?rev=54893&view=rev Log: [SVCHOST] Convert to Unicode. Fix buffer overruns and bad maths when UNICODE is defined. Patch by Samuel Serapion. Modified: trunk/reactos/base/services/svchost/CMakeLists.txt trunk/reactos/base/services/svchost/svchost.c trunk/reactos/base/services/svchost/svchost.rbuild Modified: trunk/reactos/base/services/svchost/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/svchost/CMak… ============================================================================== --- trunk/reactos/base/services/svchost/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/services/svchost/CMakeLists.txt [iso-8859-1] Mon Jan 9 22:47:16 2012 @@ -1,6 +1,6 @@ add_executable(svchost svchost.c svchost.rc) -set_module_type(svchost win32cui) +set_module_type(svchost win32cui UNICODE) add_importlibs(svchost advapi32 msvcrt kernel32 ntdll) add_cd_file(TARGET svchost DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/services/svchost/svchost.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/svchost/svch… ============================================================================== --- trunk/reactos/base/services/svchost/svchost.c [iso-8859-1] (original) +++ trunk/reactos/base/services/svchost/svchost.c [iso-8859-1] Mon Jan 9 22:47:16 2012 @@ -93,7 +93,7 @@ } /* Convert possible %SystemRoot% to a real path */ - BufferSize = ExpandEnvironmentStrings(Buffer, DllPath, sizeof(DllPath)); + BufferSize = ExpandEnvironmentStrings(Buffer, DllPath, _countof(DllPath)); if (0 == BufferSize) { DPRINT1("Invalid ServiceDll path: %s\n", Buffer); @@ -124,7 +124,7 @@ } memset(Service, 0, sizeof(SERVICE)); - Service->Name = HeapAlloc(GetProcessHeap(), 0, _tcslen(ServiceName) + sizeof(TCHAR)); + Service->Name = HeapAlloc(GetProcessHeap(), 0, (_tcslen(ServiceName)+1) * sizeof(TCHAR)); if (NULL == Service->Name) { DPRINT1("Not enough memory for service: %s\n", ServiceName); @@ -199,7 +199,7 @@ if (TRUE == PrepareService(ServiceName)) ++NrOfServices; - BufferIndex += (Length + 1) * sizeof(TCHAR); + BufferIndex += Length + 1; ServiceName = &Buffer[BufferIndex]; } @@ -238,7 +238,7 @@ PSERVICE Service = FirstService; /* Fill the service table */ - for (i = 0; i < NrOfServices; ++i) + for (i = 0; i < NrOfServices; i++) { DPRINT("Loading service: %s\n", Service->Name); ServiceTable[i].lpServiceName = Service->Name; @@ -251,7 +251,7 @@ ServiceTable[i].lpServiceProc = NULL; if (FALSE == StartServiceCtrlDispatcher(ServiceTable)) - printf("Failed to start service control dispatcher, ErrorCode: %lu\n", GetLastError()); + DPRINT1("Failed to start service control dispatcher, ErrorCode: %lu\n", GetLastError()); HeapFree(GetProcessHeap(), 0, ServiceTable); } @@ -260,7 +260,7 @@ DPRINT1("Not enough memory for the service table, trying to allocate %u bytes\n", sizeof(SERVICE_TABLE_ENTRY) * (NrOfServices + 1)); } - DPRINT1("Freeing services...\n"); + DPRINT("Freeing services...\n"); FreeServices(); return 0; Modified: trunk/reactos/base/services/svchost/svchost.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/svchost/svch… ============================================================================== --- trunk/reactos/base/services/svchost/svchost.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/services/svchost/svchost.rbuild [iso-8859-1] Mon Jan 9 22:47:16 2012 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="svchost" type="win32cui" installbase="system32" installname="svchost.exe"> +<module name="svchost" type="win32cui" installbase="system32" installname="svchost.exe" unicode="yes"> <include base="svchost">.</include> <library>advapi32</library> <file>svchost.c</file>

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs