Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 66641: [PSDK] Update ntgdi.h: - Change some return types from VOID to NTSTATUS. This was done recently on Windows, but there shouldn't be a compatibility issue with returning an NTSTATUS...
by tkreuzer＠svn.reactos.org 10 Mar '15

10 Mar '15

Author: tkreuzer Date: Tue Mar 10 00:10:33 2015 New Revision: 66641 URL: http://svn.reactos.org/svn/reactos?rev=66641&view=rev Log: [PSDK] Update ntgdi.h: - Change some return types from VOID to NTSTATUS. This was done recently on Windows, but there shouldn't be a compatibility issue with returning an NTSTATUS value instead of the random contents of the eax register. - Change 2 parameters from VOID* to DRIVER_INFO_2W* and 2 parameters from VOID* to POINTL* - Add annotations Modified: trunk/reactos/include/psdk/ntgdi.h trunk/reactos/win32ss/gdi/eng/surface.c trunk/reactos/win32ss/gdi/eng/umpdstubs.c trunk/reactos/win32ss/gdi/ntgdi/dclife.c trunk/reactos/win32ss/gdi/ntgdi/dcstate.c trunk/reactos/win32ss/gdi/ntgdi/gdibatch.c trunk/reactos/win32ss/reactx/ntddraw/ddsurf.c Modified: trunk/reactos/include/psdk/ntgdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntgdi.h?rev=6… ============================================================================== --- trunk/reactos/include/psdk/ntgdi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntgdi.h [iso-8859-1] Tue Mar 10 00:10:33 2015 @@ -1,6 +1,7 @@ /* * NtGdi Entrypoints */ +#pragma once #ifndef _NTGDI_ #define _NTGDI_ @@ -10,6 +11,10 @@ #ifndef _WINDOWBLT_NOTIFICATION_ #define _WINDOWBLT_NOTIFICATION_ +#endif + +#ifdef COMBOX_SANDBOX +#define DX_LONGHORN_PRESERVEDC #endif #define TRACE_SURFACE_ALLOCS (DBG || 0) @@ -77,11 +82,32 @@ DESIGNVECTOR dv; } DOWNLOADDESIGNVECTOR; -W32KAPI -BOOL -APIENTRY -NtGdiInit(VOID); - +/* NtGdiResetDC */ +typedef struct _DRIVER_INFO_2W DRIVER_INFO_2W; + +#if 0 +typedef struct _HLSURF_INFORMATION_PROBE { + union { + HLSURF_INFORMATION_SURFACE Surface; + HLSURF_INFORMATION_PRESENTFLAGS PresentFlags; + HLSURF_INFORMATION_TOKENUPDATEID UpdateId; + HLSURF_INFORMATION_SET_SIGNALING SetSignaling; + DWMSURFACEDATA SurfaceData; + HLSURF_INFORMATION_DIRTYREGIONS DirtyRegions; + HLSURF_INFORMATION_REDIRSTYLE RedirStyle; + HLSURF_INFORMATION_SET_GERNERATE_MOVE_DATA SetGenerateMoveData; + } u; +} HLSURF_INFORMATION_PROBE, *PHLSURF_INFORMATION_PROBE; +#endif // 0 + +__kernel_entry +W32KAPI +BOOL +APIENTRY +NtGdiInit( + VOID); + +__kernel_entry W32KAPI INT APIENTRY @@ -104,6 +130,23 @@ _In_opt_ HANDLE hcmXform ); +#if WINVER >= 0x601 +__kernel_entry +W32KAPI +HBITMAP +APIENTRY +NtGdiCreateSessionMappedDIBSection( + _In_opt_ HDC hdc, + _In_opt_ HANDLE hSectionApp, + _In_ DWORD dwOffset, + _In_reads_bytes_opt_(cjHeader) LPBITMAPINFO pbmi, + _In_ DWORD iUsage, + _In_ UINT cjHeader, + _In_ FLONG fl, + _In_ ULONG_PTR dwColorSpace); +#endif + +__kernel_entry W32KAPI BOOL APIENTRY @@ -114,40 +157,40 @@ _In_ UINT cjBuf, _Out_ LPDWORD pdwBytes, _Out_writes_bytes_(cjBuf) LPVOID pvBuf, - _In_ DWORD iType -); - + _In_ DWORD iType); + +__kernel_entry W32KAPI DWORD APIENTRY NtGdiGetGlyphIndicesW( _In_ HDC hdc, - IN OPTIONAL LPWSTR pwc, + _In_reads_opt_(cwc) LPWSTR pwc, _In_ INT cwc, - OUT OPTIONAL LPWORD pgi, - _In_ DWORD iMode -); - + _Out_writes_opt_(cwc) LPWORD pgi, + _In_ DWORD iMode); + +__kernel_entry W32KAPI DWORD APIENTRY NtGdiGetGlyphIndicesWInternal( _In_ HDC hdc, - IN OPTIONAL LPWSTR pwc, + _In_reads_opt_(cwc) LPWSTR pwc, _In_ INT cwc, - OUT OPTIONAL LPWORD pgi, + _Out_writes_opt_(cwc) LPWORD pgi, _In_ DWORD iMode, - _In_ BOOL bSubset -); - + _In_ BOOL bSubset); + +__kernel_entry W32KAPI HPALETTE APIENTRY NtGdiCreatePaletteInternal( - IN LPLOGPALETTE pLogPal, - _In_ UINT cEntries -); - + _In_reads_bytes_(cEntries * 4 + 4) LPLOGPALETTE pLogPal, + _In_ UINT cEntries); + +__kernel_entry W32KAPI BOOL APIENTRY @@ -163,6 +206,7 @@ _In_ INT x4, _In_ INT y4); +__kernel_entry W32KAPI INT APIENTRY @@ -176,7 +220,7 @@ _In_ INT ySrc, _In_ INT cxSrc, _In_ INT cySrc, - _In_opt_ LPBYTE pjInit, + _In_reads_bytes_opt_(cjMaxBits) LPBYTE pjInit, _In_ LPBITMAPINFO pbmi, _In_ DWORD dwUsage, _In_ DWORD dwRop4, @@ -184,16 +228,18 @@ _In_ UINT cjMaxBits, _In_opt_ HANDLE hcmXform); +__kernel_entry W32KAPI ULONG APIENTRY NtGdiGetOutlineTextMetricsInternalW( _In_ HDC hdc, _In_ ULONG cjotm, - _Out_opt_ OUTLINETEXTMETRICW *potmw, + _Out_writes_bytes_opt_(cjotm) OUTLINETEXTMETRICW *potmw, _Out_ TMDIFF *ptmd); _Success_(return != FALSE) +__kernel_entry W32KAPI BOOL APIENTRY @@ -203,6 +249,7 @@ _In_ DWORD dwIn, _Out_ DWORD *pdwResult); +__kernel_entry W32KAPI HANDLE APIENTRY @@ -210,170 +257,181 @@ _In_ HDC hdc, _In_ INT itype); +__kernel_entry W32KAPI HDC APIENTRY NtGdiGetDCforBitmap( _In_ HBITMAP hsurf); +__kernel_entry W32KAPI BOOL APIENTRY NtGdiGetMonitorID( _In_ HDC hdc, - _In_ DWORD dwSize, - _Out_ LPWSTR pszMonitorID); - + _In_ DWORD cjSize, + _Out_writes_bytes_(cjSize) LPWSTR pszMonitorID); + +__kernel_entry W32KAPI INT APIENTRY NtGdiGetLinkedUFIs( _In_ HDC hdc, - OUT OPTIONAL PUNIVERSAL_FONT_ID pufiLinkedUFIs, - _In_ INT BufferSize -); - + _Out_writes_opt_(cBufferSize) PUNIVERSAL_FONT_ID pufiLinkedUFIs, + _In_ INT cBufferSize); + +__kernel_entry W32KAPI BOOL APIENTRY NtGdiSetLinkedUFIs( _In_ HDC hdc, - IN PUNIVERSAL_FONT_ID pufiLinks, - _In_ ULONG uNumUFIs -); - + _In_reads_(uNumUFIs) PUNIVERSAL_FONT_ID pufiLinks, + _In_ ULONG uNumUFIs); + +__kernel_entry W32KAPI BOOL APIENTRY NtGdiGetUFI( _In_ HDC hdc, - OUT PUNIVERSAL_FONT_ID pufi, - OUT OPTIONAL DESIGNVECTOR *pdv, - OUT ULONG *pcjDV, - OUT ULONG *pulBaseCheckSum, - OUT FLONG *pfl -); - + _Out_ PUNIVERSAL_FONT_ID pufi, + _Out_opt_ DESIGNVECTOR *pdv, + _Out_ ULONG *pcjDV, + _Out_ ULONG *pulBaseCheckSum, + _Out_ FLONG *pfl); + +__kernel_entry W32KAPI BOOL APIENTRY NtGdiForceUFIMapping( _In_ HDC hdc, - IN PUNIVERSAL_FONT_ID pufi -); - + _In_ PUNIVERSAL_FONT_ID pufi); + +__kernel_entry W32KAPI BOOL APIENTRY NtGdiGetUFIPathname( - IN PUNIVERSAL_FONT_ID pufi, - OUT OPTIONAL ULONG* pcwc, - OUT OPTIONAL LPWSTR pwszPathname, - OUT OPTIONAL ULONG* pcNumFiles, + _In_ PUNIVERSAL_FONT_ID pufi, + _Deref_out_range_(0, MAX_PATH * 3) ULONG* pcwc, + _Out_writes_to_opt_(MAX_PATH * 3, *pcwc) LPWSTR pwszPathname, + _Out_opt_ ULONG* pcNumFiles, _In_ FLONG fl, - OUT OPTIONAL BOOL *pbMemFont, - OUT OPTIONAL ULONG *pcjView, - OUT OPTIONAL PVOID pvView, - OUT OPTIONAL BOOL *pbTTC, - OUT OPTIONAL ULONG *piTTC -); - + _Out_opt_ BOOL *pbMemFont, + _Out_opt_ ULONG *pcjView, + _Out_opt_ PVOID pvView, + _Out_opt_ BOOL *pbTTC, + _Out_opt_ ULONG *piTTC); + +__kernel_entry W32KAPI BOOL APIENTRY NtGdiAddRemoteFontToDC( _In_ HDC hdc, - _In_ PVOID pvBuffer, + _In_reads_bytes_(cjBuffer) PVOID pvBuffer, _In_ ULONG cjBuffer, - IN OPTIONAL PUNIVERSAL_FONT_ID pufi -); - + _In_opt_ PUNIVERSAL_FONT_ID pufi); + +__kernel_entry W32KAPI HANDLE APIENTRY NtGdiAddFontMemResourceEx( - _In_ PVOID pvBuffer, + _In_reads_bytes_(cjBuffer) PVOID pvBuffer, _In_ DWORD cjBuffer, - IN DESIGNVECTOR *pdv, + _In_reads_bytes_opt_(cjDV) DESIGNVECTOR *pdv, _In_ ULONG cjDV, - OUT DWORD *pNumFonts -); - + _Out_ DWORD *pNumFonts); + +__kernel_entry W32KAPI BOOL APIENTRY NtGdiRemoveFontMemResourceEx( _In_ HANDLE hMMFont); +__kernel_entry W32KAPI BOOL APIENTRY NtGdiUnmapMemFont( _In_ PVOID pvView); +__kernel_entry W32KAPI BOOL APIENTRY NtGdiRemoveMergeFont( _In_ HDC hdc, - IN UNIVERSAL_FONT_ID *pufi -); - -W32KAPI -BOOL -APIENTRY -NtGdiAnyLinkedFonts(VOID); - + _In_ UNIVERSAL_FONT_ID *pufi); + +__kernel_entry +W32KAPI +BOOL +APIENTRY +NtGdiAnyLinkedFonts( + VOID); + +__kernel_entry W32KAPI BOOL APIENTRY NtGdiGetEmbUFI( _In_ HDC hdc, - OUT PUNIVERSAL_FONT_ID pufi, - OUT OPTIONAL DESIGNVECTOR *pdv, - OUT ULONG *pcjDV, - OUT ULONG *pulBaseCheckSum, - OUT FLONG *pfl, - OUT KERNEL_PVOID *embFontID -); - + _Out_ PUNIVERSAL_FONT_ID pufi, + _Out_opt_ DESIGNVECTOR *pdv, + _Out_ ULONG *pcjDV, + _Out_ ULONG *pulBaseCheckSum, + _Out_ FLONG *pfl, + _Out_ KERNEL_PVOID *embFontID); + +__kernel_entry W32KAPI ULONG APIENTRY -NtGdiGetEmbedFonts(VOID); - +NtGdiGetEmbedFonts( + VOID); + +__kernel_entry W32KAPI BOOL APIENTRY NtGdiChangeGhostFont( - IN KERNEL_PVOID *pfontID, - _In_ BOOL bLoad -); - + _In_ KERNEL_PVOID *pfontID, + _In_ BOOL bLoad); + +__kernel_entry W32KAPI BOOL APIENTRY NtGdiAddEmbFontToDC( _In_ HDC hdc, - IN VOID **pFontID -); - + _In_ PVOID *pFontID); + +__kernel_entry W32KAPI BOOL APIENTRY NtGdiFontIsLinked( _In_ HDC hdc); +__kernel_entry W32KAPI ULONG_PTR APIENTRY NtGdiPolyPolyDraw( _In_ HDC hdc, _In_ PPOINT ppt, - _In_ PULONG pcpt, + _In_reads_(ccpt) PULONG pcpt, _In_ ULONG ccpt, _In_ INT iFunc); +__kernel_entry W32KAPI LONG APIENTRY @@ -386,26 +444,28 @@ _In_ DWORD iFunc, _In_ BOOL bInbound); +__kernel_entry W32KAPI BOOL APIENTRY NtGdiComputeXformCoefficients( _In_ HDC hdc); +__kernel_entry W32KAPI BOOL APIENTRY NtGdiGetWidthTable( _In_ HDC hdc, _In_ ULONG cSpecial, - IN WCHAR *pwc, + _In_reads_(cwc) WCHAR *pwc, _In_ ULONG cwc, - OUT USHORT *psWidth, - OUT OPTIONAL WIDTHDATA *pwd, - OUT FLONG *pflInfo -); + _Out_writes_(cwc) USHORT *psWidth, + _Out_opt_ WIDTHDATA *pwd, + _Out_ FLONG *pflInfo); _Success_(return != 0) +__kernel_entry W32KAPI INT APIENTRY @@ -413,8 +473,9 @@ _In_ HDC hdc, _In_ INT ipfd, _In_ UINT cjpfd, - _When_(cjpfd != 0, _Out_) PPIXELFORMATDESCRIPTOR ppfd); - + _Out_writes_bytes_(cjpfd) PPIXELFORMATDESCRIPTOR ppfd); + +__kernel_entry W32KAPI BOOL APIENTRY @@ -422,42 +483,45 @@ _In_ HDC hdc, _In_ INT ipfd); +__kernel_entry W32KAPI BOOL APIENTRY NtGdiSwapBuffers( _In_ HDC hdc); +/* Not in MS ntgdi.h */ +__kernel_entry W32KAPI INT APIENTRY NtGdiSetupPublicCFONT( _In_ HDC hdc, - IN OPTIONAL HFONT hf, - _In_ ULONG ulAve -); - + _In_opt_ HFONT hf, + _In_ ULONG ulAve); + +__kernel_entry W32KAPI DWORD APIENTRY NtGdiDxgGenericThunk( _In_ ULONG_PTR ulIndex, _In_ ULONG_PTR ulHandle, - IN OUT SIZE_T *pdwSizeOfPtr1, - IN OUT PVOID pvPtr1, - IN OUT SIZE_T *pdwSizeOfPtr2, - IN OUT PVOID pvPtr2 -); - + _Inout_ SIZE_T *pdwSizeOfPtr1, + _Inout_ PVOID pvPtr1, + _Inout_ SIZE_T *pdwSizeOfPtr2, + _Inout_ PVOID pvPtr2); + +__kernel_entry W32KAPI DWORD APIENTRY NtGdiDdAddAttachedSurface( _In_ HANDLE hSurface, _In_ HANDLE hSurfaceAttached, - IN OUT PDD_ADDATTACHEDSURFACEDATA puAddAttachedSurfaceData -); - + _Inout_ PDD_ADDATTACHEDSURFACEDATA puAddAttachedSurfaceData); + +__kernel_entry W32KAPI BOOL APIENTRY @@ -465,75 +529,89 @@ _In_ HANDLE hSurfaceFrom, _In_ HANDLE hSurfaceTo); +__kernel_entry W32KAPI DWORD APIENTRY NtGdiDdBlt( _In_ HANDLE hSurfaceDest, _In_ HANDLE hSurfaceSrc, - IN OUT PDD_BLTDATA puBltData -); - + _Inout_ PDD_BLTDATA puBltData); + +__kernel_entry W32KAPI DWORD APIENTRY NtGdiDdCanCreateSurface( _In_ HANDLE hDirectDraw, - IN OUT PDD_CANCREATESURFACEDATA puCanCreateSurfaceData -); - + _Inout_ PDD_CANCREATESURFACEDATA puCanCreateSurfaceData); + +__kernel_entry W32KAPI DWORD APIENTRY NtGdiDdColorControl( _In_ HANDLE hSurface, - IN OUT PDD_COLORCONTROLDATA puColorControlData -); - + _Inout_ PDD_COLORCONTROLDATA puColorControlData); + +__kernel_entry W32KAPI HANDLE APIENTRY NtGdiDdCreateDirectDrawObject( _In_ HDC hdc); +__kernel_entry W32KAPI DWORD APIENTRY NtGdiDdCreateSurface( _In_ HANDLE hDirectDraw, - IN HANDLE* hSurface, - IN OUT DDSURFACEDESC* puSurfaceDescription, - IN OUT DD_SURFACE_GLOBAL* puSurfaceGlobalData, - IN OUT DD_SURFACE_LOCAL* puSurfaceLocalData, - IN OUT DD_SURFACE_MORE* puSurfaceMoreData, - IN OUT DD_CREATESURFACEDATA* puCreateSurfaceData, - OUT HANDLE* puhSurface -); - + _In_ HANDLE* hSurface, + _Inout_ DDSURFACEDESC* puSurfaceDescription, + _Inout_ DD_SURFACE_GLOBAL* puSurfaceGlobalData, + _Inout_ DD_SURFACE_LOCAL* puSurfaceLocalData, + _Inout_ DD_SURFACE_MORE* puSurfaceMoreData, + _Inout_ DD_CREATESURFACEDATA* puCreateSurfaceData, + _Out_ HANDLE* puhSurface); + +#ifdef DX_LONGHORN_PRESERVEDC +__kernel_entry +W32KAPI +DWORD +APIENTRY +NtGdiDdChangeSurfacePointer( + _In_ HANDLE hSurface, + _In_ PVOID pSurfacePointer); +#endif /* DX_LONGHORN_PRESERVEDC */ + +__kernel_entry W32KAPI HANDLE APIENTRY NtGdiDdCreateSurfaceObject( _In_ HANDLE hDirectDrawLocal, _In_ HANDLE hSurface, - IN PDD_SURFACE_LOCAL puSurfaceLocal, - IN PDD_SURFACE_MORE puSurfaceMore, - IN PDD_SURFACE_GLOBAL puSurfaceGlobal, - _In_ BOOL bComplete -); - + _In_ PDD_SURFACE_LOCAL puSurfaceLocal, + _In_ PDD_SURFACE_MORE puSurfaceMore, + _In_ PDD_SURFACE_GLOBAL puSurfaceGlobal, + _In_ BOOL bComplete); + +__kernel_entry W32KAPI BOOL APIENTRY NtGdiDdDeleteSurfaceObject( _In_ HANDLE hSurface); +__kernel_entry W32KAPI BOOL APIENTRY NtGdiDdDeleteDirectDrawObject( _In_ HANDLE hDirectDrawLocal); +__kernel_entry W32KAPI DWORD APIENTRY @@ -541,6 +619,7 @@ _In_ HANDLE hSurface, _In_ BOOL bRealDestroy); +__kernel_entry W32KAPI DWORD APIENTRY @@ -549,113 +628,114 @@ _In_ HANDLE hSurfaceTarget, _In_ HANDLE hSurfaceCurrentLeft, _In_ HANDLE hSurfaceTargetLeft, - IN OUT PDD_FLIPDATA puFlipData -); - + _Inout_ PDD_FLIPDATA puFlipData); + +__kernel_entry W32KAPI DWORD APIENTRY NtGdiDdGetAvailDriverMemory( _In_ HANDLE hDirectDraw, - IN OUT PDD_GETAVAILDRIVERMEMORYDATA puGetAvailDriverMemoryData -); - + _Inout_ PDD_GETAVAILDRIVERMEMORYDATA puGetAvailDriverMemoryData); + +__kernel_entry W32KAPI DWORD APIENTRY NtGdiDdGetBltStatus( _In_ HANDLE hSurface, - IN OUT PDD_GETBLTSTATUSDATA puGetBltStatusData -); - + _Inout_ PDD_GETBLTSTATUSDATA puGetBltStatusData); + +__kernel_entry W32KAPI HDC APIENTRY NtGdiDdGetDC( _In_ HANDLE hSurface, - IN PALETTEENTRY* puColorTable -); - + _In_ PALETTEENTRY* puColorTable); + +__kernel_entry W32KAPI DWORD APIENTRY NtGdiDdGetDriverInfo( _In_ HANDLE hDirectDraw, - IN OUT PDD_GETDRIVERINFODATA puGetDriverInfoData -); - + _Inout_ PDD_GETDRIVERINFODATA puGetDriverInfoData); + +__kernel_entry W32KAPI DWORD APIENTRY NtGdiDdGetFlipStatus( _In_ HANDLE hSurface, - IN OUT PDD_GETFLIPSTATUSDATA puGetFlipStatusData -); - + _Inout_ PDD_GETFLIPSTATUSDATA puGetFlipStatusData); + +__kernel_entry W32KAPI DWORD APIENTRY NtGdiDdGetScanLine( _In_ HANDLE hDirectDraw, - IN OUT PDD_GETSCANLINEDATA puGetScanLineData -); - + _Inout_ PDD_GETSCANLINEDATA puGetScanLineData); + +__kernel_entry W32KAPI DWORD APIENTRY NtGdiDdSetExclusiveMode( _In_ HANDLE hDirectDraw, - IN OUT PDD_SETEXCLUSIVEMODEDATA puSetExclusiveModeData -); - + _Inout_ PDD_SETEXCLUSIVEMODEDATA puSetExclusiveModeData); + +__kernel_entry W32KAPI DWORD APIENTRY NtGdiDdFlipToGDISurface( _In_ HANDLE hDirectDraw, - IN OUT PDD_FLIPTOGDISURFACEDATA puFlipToGDISurfaceData -); - + _Inout_ PDD_FLIPTOGDISURFACEDATA puFlipToGDISurfaceData); + +__kernel_entry W32KAPI DWORD APIENTRY NtGdiDdLock( _In_ HANDLE hSurface, - IN OUT PDD_LOCKDATA puLockData, - _In_ HDC hdcClip -); - + _Inout_ PDD_LOCKDATA puLockData, + _In_ HDC hdcClip); + +__kernel_entry W32KAPI BOOL APIENTRY NtGdiDdQueryDirectDrawObject( _In_ HANDLE hDirectDrawLocal, - OUT PDD_HALINFO pHalInfo, - OUT DWORD* pCallBackFlags, - OUT OPTIONAL LPD3DNTHAL_CALLBACKS puD3dCallbacks, - OUT OPTIONAL LPD3DNTHAL_GLOBALDRIVERDATA puD3dDriverData, - OUT OPTIONAL PDD_D3DBUFCALLBACKS puD3dBufferCallbacks, - OUT OPTIONAL LPDDSURFACEDESC puD3dTextureFormats, - OUT DWORD* puNumHeaps, - OUT OPTIONAL VIDEOMEMORY* puvmList, - OUT DWORD* puNumFourCC, - OUT OPTIONAL DWORD* puFourCC -); - + _Out_ PDD_HALINFO pHalInfo, + _Out_writes_(3) DWORD* pCallBackFlags, + _Out_opt_ LPD3DNTHAL_CALLBACKS puD3dCallbacks, + _Out_opt_ LPD3DNTHAL_GLOBALDRIVERDATA puD3dDriverData, + _Out_opt_ PDD_D3DBUFCALLBACKS puD3dBufferCallbacks, + _Out_opt_ LPDDSURFACEDESC puD3dTextureFormats, + _Out_ DWORD* puNumHeaps, + _Out_opt_ VIDEOMEMORY* puvmList, + _Out_ DWORD* puNumFourCC, + _Out_opt_ DWORD* puFourCC); + +__kernel_entry W32KAPI BOOL APIENTRY NtGdiDdReenableDirectDrawObject( _In_ HANDLE hDirectDrawLocal, - IN OUT BOOL* pubNewMode -); - + _Inout_ BOOL* pubNewMode); + +__kernel_entry W32KAPI BOOL APIENTRY NtGdiDdReleaseDC( _In_ HANDLE hSurface); +__kernel_entry W32KAPI BOOL APIENTRY @@ -663,56 +743,57 @@ _In_ HANDLE hSurface, _In_ HWND hwnd); +__kernel_entry W32KAPI DWORD APIENTRY NtGdiDdSetColorKey( _In_ HANDLE hSurface, - IN OUT PDD_SETCOLORKEYDATA puSetColorKeyData -); - + _Inout_ PDD_SETCOLORKEYDATA puSetColorKeyData); + +__kernel_entry W32KAPI DWORD APIENTRY NtGdiDdSetOverlayPosition( _In_ HANDLE hSurfaceSource, _In_ HANDLE hSurfaceDestination, - IN OUT PDD_SETOVERLAYPOSITIONDATA puSetOverlayPositionData -); - -W32KAPI -DWORD + _Inout_ PDD_SETOVERLAYPOSITIONDATA puSetOverlayPositionData); + +__kernel_entry +W32KAPI +NTSTATUS APIENTRY NtGdiDdUnattachSurface( _In_ HANDLE hSurface, - _In_ HANDLE hSurfaceAttached -); - + _In_ HANDLE hSurfaceAttached); + +__kernel_entry W32KAPI DWORD APIENTRY NtGdiDdUnlock( _In_ HANDLE hSurface, - IN OUT PDD_UNLOCKDATA puUnlockData -); - + _Inout_ PDD_UNLOCKDATA puUnlockData); + +__kernel_entry W32KAPI DWORD APIENTRY NtGdiDdUpdateOverlay( _In_ HANDLE hSurfaceDestination, _In_ HANDLE hSurfaceSource, - IN OUT PDD_UPDATEOVERLAYDATA puUpdateOverlayData -); - + _Inout_ PDD_UPDATEOVERLAYDATA puUpdateOverlayData); + +__kernel_entry W32KAPI DWORD APIENTRY NtGdiDdWaitForVerticalBlank( _In_ HANDLE hDirectDraw, - IN OUT PDD_WAITFORVERTICALBLANKDATA puWaitForVerticalBlankData -); - + _Inout_ PDD_WAITFORVERTICALBLANKDATA puWaitForVerticalBlankData); + +__kernel_entry W32KAPI HANDLE APIENTRY @@ -721,58 +802,61 @@ _In_opt_ HANDLE hSurface, _In_ BOOL bRelease); +__kernel_entry W32KAPI BOOL APIENTRY NtGdiDdSetGammaRamp( _In_ HANDLE hDirectDraw, _In_ HDC hdc, - _In_ LPVOID lpGammaRamp); - + _In_reads_bytes_(sizeof(GAMMARAMP)) LPVOID lpGammaRamp); + +__kernel_entry W32KAPI DWORD APIENTRY NtGdiDdLockD3D( _In_ HANDLE hSurface, - IN OUT PDD_LOCKDATA puLockData -); - + _Inout_ PDD_LOCKDATA puLockData); + +__kernel_entry W32KAPI DWORD APIENTRY NtGdiDdUnlockD3D( _In_ HANDLE hSurface, - IN OUT PDD_UNLOCKDATA puUnlockData -); - + _Inout_ PDD_UNLOCKDATA puUnlockData); + +__kernel_entry W32KAPI DWORD APIENTRY NtGdiDdCreateD3DBuffer( _In_ HANDLE hDirectDraw, - IN OUT HANDLE* hSurface, - IN OUT DDSURFACEDESC* puSurfaceDescription, - IN OUT DD_SURFACE_GLOBAL* puSurfaceGlobalData, - IN OUT DD_SURFACE_LOCAL* puSurfaceLocalData, - IN OUT DD_SURFACE_MORE* puSurfaceMoreData, - IN OUT DD_CREATESURFACEDATA* puCreateSurfaceData, - IN OUT HANDLE* puhSurface -); - + _Inout_ HANDLE* hSurface, + _Inout_ DDSURFACEDESC* puSurfaceDescription, + _Inout_ DD_SURFACE_GLOBAL* puSurfaceGlobalData, + _Inout_ DD_SURFACE_LOCAL* puSurfaceLocalData, + _Inout_ DD_SURFACE_MORE* puSurfaceMoreData, + _Inout_ DD_CREATESURFACEDATA* puCreateSurfaceData, + _Inout_ HANDLE* puhSurface); + +__kernel_entry W32KAPI DWORD APIENTRY NtGdiDdCanCreateD3DBuffer( _In_ HANDLE hDirectDraw, - IN OUT PDD_CANCREATESURFACEDATA puCanCreateSurfaceData -); - + _Inout_ PDD_CANCREATESURFACEDATA puCanCreateSurfaceData); + +__kernel_entry W32KAPI DWORD APIENTRY NtGdiDdDestroyD3DBuffer( _In_ HANDLE hSurface); +__kernel_entry W32KAPI BOOL APIENTRY @@ -780,91 +864,91 @@ _In_ HANDLE hDirectDrawLocal, _In_ HANDLE hSurfColor, _In_ HANDLE hSurfZ, - IN OUT D3DNTHAL_CONTEXTCREATEI *pdcci -); - + _Inout_ D3DNTHAL_CONTEXTCREATEI *pdcci); + +__kernel_entry W32KAPI DWORD APIENTRY NtGdiD3dContextDestroy( - IN LPD3DNTHAL_CONTEXTDESTROYDATA pdcdd -); - + _In_ LPD3DNTHAL_CONTEXTDESTROYDATA pdcdd); + +__kernel_entry W32KAPI DWORD APIENTRY NtGdiD3dContextDestroyAll( - OUT LPD3DNTHAL_CONTEXTDESTROYALLDATA pdcdad -); - + _Out_ LPD3DNTHAL_CONTEXTDESTROYALLDATA pdcdad); + +__kernel_entry W32KAPI DWORD APIENTRY NtGdiD3dValidateTextureStageState( - IN OUT LPD3DNTHAL_VALIDATETEXTURESTAGESTATEDATA pData -); - + _Inout_ LPD3DNTHAL_VALIDATETEXTURESTAGESTATEDATA pData); + +__kernel_entry W32KAPI DWORD APIENTRY NtGdiD3dDrawPrimitives2( _In_ HANDLE hCmdBuf, _In_ HANDLE hVBuf, - IN OUT LPD3DNTHAL_DRAWPRIMITIVES2DATA pded, - IN OUT FLATPTR* pfpVidMemCmd, - IN OUT DWORD* pdwSizeCmd, - IN OUT FLATPTR* pfpVidMemVtx, - IN OUT DWORD* pdwSizeVtx -); - + _Inout_ LPD3DNTHAL_DRAWPRIMITIVES2DATA pded, + _Inout_ FLATPTR* pfpVidMemCmd, + _Inout_ DWORD* pdwSizeCmd, + _Inout_ FLATPTR* pfpVidMemVtx, + _Inout_ DWORD* pdwSizeVtx); + +__kernel_entry W32KAPI DWORD APIENTRY NtGdiDdGetDriverState( - IN OUT PDD_GETDRIVERSTATEDATA pdata -); - + _Inout_ PDD_GETDRIVERSTATEDATA pdata); + +__kernel_entry W32KAPI DWORD APIENTRY NtGdiDdCreateSurfaceEx( _In_ HANDLE hDirectDraw, _In_ HANDLE hSurface, - _In_ DWORD dwSurfaceHandle -); - + _In_ DWORD dwSurfaceHandle); + +__kernel_entry W32KAPI DWORD APIENTRY NtGdiDvpCanCreateVideoPort( _In_ HANDLE hDirectDraw, - IN OUT PDD_CANCREATEVPORTDATA puCanCreateVPortData -); - + _Inout_ PDD_CANCREATEVPORTDATA puCanCreateVPortData); + +__kernel_entry W32KAPI DWORD APIENTRY NtGdiDvpColorControl( _In_ HANDLE hVideoPort, - IN OUT PDD_VPORTCOLORDATA puVPortColorData -); - + _Inout_ PDD_VPORTCOLORDATA puVPortColorData); + +__kernel_entry W32KAPI HANDLE APIENTRY NtGdiDvpCreateVideoPort( _In_ HANDLE hDirectDraw, - IN OUT PDD_CREATEVPORTDATA puCreateVPortData -); - + _Inout_ PDD_CREATEVPORTDATA puCreateVPortData); + +__kernel_entry W32KAPI DWORD APIENTRY NtGdiDvpDestroyVideoPort( _In_ HANDLE hVideoPort, - IN OUT PDD_DESTROYVPORTDATA puDestroyVPortData -); - + _Inout_ PDD_DESTROYVPORTDATA puDestroyVPortData); + +__kernel_entry W32KAPI DWORD APIENTRY @@ -872,100 +956,100 @@ _In_ HANDLE hVideoPort, _In_ HANDLE hDDSurfaceCurrent, _In_ HANDLE hDDSurfaceTarget, - IN OUT PDD_FLIPVPORTDATA puFlipVPortData -); - + _Inout_ PDD_FLIPVPORTDATA puFlipVPortData); + +__kernel_entry W32KAPI DWORD APIENTRY NtGdiDvpGetVideoPortBandwidth( _In_ HANDLE hVideoPort, - IN OUT PDD_GETVPORTBANDWIDTHDATA puGetVPortBandwidthData -); - + _Inout_ PDD_GETVPORTBANDWIDTHDATA puGetVPortBandwidthData); + +__kernel_entry W32KAPI DWORD APIENTRY NtGdiDvpGetVideoPortField( _In_ HANDLE hVideoPort, - IN OUT PDD_GETVPORTFIELDDATA puGetVPortFieldData -); - + _Inout_ PDD_GETVPORTFIELDDATA puGetVPortFieldData); + +__kernel_entry W32KAPI DWORD APIENTRY NtGdiDvpGetVideoPortFlipStatus( _In_ HANDLE hDirectDraw, - IN OUT PDD_GETVPORTFLIPSTATUSDATA puGetVPortFlipStatusData -); - + _Inout_ PDD_GETVPORTFLIPSTATUSDATA puGetVPortFlipStatusData); + +__kernel_entry W32KAPI DWORD APIENTRY NtGdiDvpGetVideoPortInputFormats( _In_ HANDLE hVideoPort, - IN OUT PDD_GETVPORTINPUTFORMATDATA puGetVPortInputFormatData -); - + _Inout_ PDD_GETVPORTINPUTFORMATDATA puGetVPortInputFormatData); + +__kernel_entry W32KAPI DWORD APIENTRY NtGdiDvpGetVideoPortLine( _In_ HANDLE hVideoPort, - IN OUT PDD_GETVPORTLINEDATA puGetVPortLineData -); - + _Inout_ PDD_GETVPORTLINEDATA puGetVPortLineData); + +__kernel_entry W32KAPI DWORD APIENTRY NtGdiDvpGetVideoPortOutputFormats( _In_ HANDLE hVideoPort, - IN OUT PDD_GETVPORTOUTPUTFORMATDATA puGetVPortOutputFormatData -); - + _Inout_ PDD_GETVPORTOUTPUTFORMATDATA puGetVPortOutputFormatData); + +__kernel_entry W32KAPI DWORD APIENTRY NtGdiDvpGetVideoPortConnectInfo( _In_ HANDLE hDirectDraw, - IN OUT PDD_GETVPORTCONNECTDATA puGetVPortConnectData -); - + _Inout_ PDD_GETVPORTCONNECTDATA puGetVPortConnectData); + +__kernel_entry W32KAPI DWORD APIENTRY NtGdiDvpGetVideoSignalStatus( _In_ HANDLE hVideoPort, - IN OUT PDD_GETVPORTSIGNALDATA puGetVPortSignalData -); - + _Inout_ PDD_GETVPORTSIGNALDATA puGetVPortSignalData); + +__kernel_entry W32KAPI DWORD APIENTRY NtGdiDvpUpdateVideoPort( _In_ HANDLE hVideoPort, - IN HANDLE* phSurfaceVideo, - IN HANDLE* phSurfaceVbi, - IN OUT PDD_UPDATEVPORTDATA puUpdateVPortData -); - + _In_ HANDLE* phSurfaceVideo, + _In_ HANDLE* phSurfaceVbi, + _Inout_ PDD_UPDATEVPORTDATA puUpdateVPortData); + +__kernel_entry W32KAPI DWORD APIENTRY NtGdiDvpWaitForVideoPortSync( _In_ HANDLE hVideoPort, - IN OUT PDD_WAITFORVPORTSYNCDATA puWaitForVPortSyncData -); - + _Inout_ PDD_WAITFORVPORTSYNCDATA puWaitForVPortSyncData); + +__kernel_entry W32KAPI DWORD APIENTRY NtGdiDvpAcquireNotification( _In_ HANDLE hVideoPort, - IN OUT HANDLE* hEvent, - IN LPDDVIDEOPORTNOTIFY pNotify -); - + _Inout_ HANDLE* hEvent, + _In_ LPDDVIDEOPORTNOTIFY pNotify); + +__kernel_entry W32KAPI DWORD APIENTRY @@ -973,95 +1057,96 @@ _In_ HANDLE hVideoPort, _In_ HANDLE hEvent); +__kernel_entry W32KAPI DWORD APIENTRY NtGdiDdGetMoCompGuids( _In_ HANDLE hDirectDraw, - IN OUT PDD_GETMOCOMPGUIDSDATA puGetMoCompGuidsData -); - + _Inout_ PDD_GETMOCOMPGUIDSDATA puGetMoCompGuidsData); + +__kernel_entry W32KAPI DWORD APIENTRY NtGdiDdGetMoCompFormats( _In_ HANDLE hDirectDraw, - IN OUT PDD_GETMOCOMPFORMATSDATA puGetMoCompFormatsData -); - + _Inout_ PDD_GETMOCOMPFORMATSDATA puGetMoCompFormatsData); + +__kernel_entry W32KAPI DWORD APIENTRY NtGdiDdGetMoCompBuffInfo( _In_ HANDLE hDirectDraw, - IN OUT PDD_GETMOCOMPCOMPBUFFDATA puGetBuffData -); - + _Inout_ PDD_GETMOCOMPCOMPBUFFDATA puGetBuffData); + +__kernel_entry W32KAPI DWORD APIENTRY NtGdiDdGetInternalMoCompInfo( _In_ HANDLE hDirectDraw, - IN OUT PDD_GETINTERNALMOCOMPDATA puGetInternalData -); - + _Inout_ PDD_GETINTERNALMOCOMPDATA puGetInternalData); + +__kernel_entry W32KAPI HANDLE APIENTRY NtGdiDdCreateMoComp( _In_ HANDLE hDirectDraw, - IN OUT PDD_CREATEMOCOMPDATA puCreateMoCompData -); - + _Inout_ PDD_CREATEMOCOMPDATA puCreateMoCompData); + +__kernel_entry W32KAPI DWORD APIENTRY NtGdiDdDestroyMoComp( _In_ HANDLE hMoComp, - IN OUT PDD_DESTROYMOCOMPDATA puDestroyMoCompData -); - + _Inout_ PDD_DESTROYMOCOMPDATA puDestroyMoCompData); + +__kernel_entry W32KAPI DWORD APIENTRY NtGdiDdBeginMoCompFrame( _In_ HANDLE hMoComp, - IN OUT PDD_BEGINMOCOMPFRAMEDATA puBeginFrameData -); - + _Inout_ PDD_BEGINMOCOMPFRAMEDATA puBeginFrameData); + +__kernel_entry W32KAPI DWORD APIENTRY NtGdiDdEndMoCompFrame( _In_ HANDLE hMoComp, - IN OUT PDD_ENDMOCOMPFRAMEDATA puEndFrameData -); - + _Inout_ PDD_ENDMOCOMPFRAMEDATA puEndFrameData); + +__kernel_entry W32KAPI DWORD APIENTRY NtGdiDdRenderMoComp( _In_ HANDLE hMoComp, - IN OUT PDD_RENDERMOCOMPDATA puRenderMoCompData -); - + _Inout_ PDD_RENDERMOCOMPDATA puRenderMoCompData); + +__kernel_entry W32KAPI DWORD APIENTRY NtGdiDdQueryMoCompStatus( _In_ HANDLE hMoComp, - IN OUT PDD_QUERYMOCOMPSTATUSDATA puQueryMoCompStatusData -); - + _Inout_ PDD_QUERYMOCOMPSTATUSDATA puQueryMoCompStatusData); + +__kernel_entry W32KAPI DWORD APIENTRY NtGdiDdAlphaBlt( _In_ HANDLE hSurfaceDest, _In_opt_ HANDLE hSurfaceSrc, - IN OUT PDD_BLTDATA puBltData -); - + _Inout_ PDD_BLTDATA puBltData); + +__kernel_entry W32KAPI BOOL APIENTRY @@ -1079,6 +1164,7 @@ _In_ BLENDFUNCTION BlendFunction, _In_ HANDLE hcmXform); +__kernel_entry W32KAPI BOOL APIENTRY @@ -1090,6 +1176,7 @@ _In_ ULONG nMesh, _In_ ULONG ulMode); +__kernel_entry W32KAPI BOOL APIENTRY @@ -1098,18 +1185,21 @@ _In_ ULONG nCommand, _In_ ULONG ulMode); +__kernel_entry W32KAPI HANDLE APIENTRY NtGdiCreateColorSpace( _In_ PLOGCOLORSPACEEXW pLogColorSpace); +__kernel_entry W32KAPI BOOL APIENTRY NtGdiDeleteColorSpace( _In_ HANDLE hColorSpace); +__kernel_entry W32KAPI BOOL APIENTRY @@ -1117,6 +1207,7 @@ _In_ HDC hdc, _In_ HCOLORSPACE hColorSpace); +__kernel_entry W32KAPI HANDLE APIENTRY @@ -1130,6 +1221,7 @@ _In_reads_bytes_opt_(cjTargetProfile) PVOID pvTargetProfile, _In_ ULONG cjTargetProfile); +__kernel_entry W32KAPI BOOL APIENTRY @@ -1137,39 +1229,41 @@ _In_ HDC hdc, _In_ HANDLE hColorTransform); +__kernel_entry W32KAPI BOOL APIENTRY NtGdiCheckBitmapBits( _In_ HDC hdc, _In_ HANDLE hColorTransform, - _In_ PVOID pvBits, + _In_reads_bytes_(dwStride * dwHeight) PVOID pvBits, _In_ ULONG bmFormat, _In_ DWORD dwWidth, _In_ DWORD dwHeight, _In_ DWORD dwStride, - OUT PBYTE paResults -); - + _Out_writes_bytes_(dwWidth * dwHeight) PBYTE paResults); + +__kernel_entry W32KAPI ULONG APIENTRY NtGdiColorCorrectPalette( _In_ HDC hdc, _In_ HPALETTE hpal, - _In_ ULONG FirstEntry, - _In_ ULONG NumberOfEntries, - IN OUT PALETTEENTRY *ppalEntry, - _In_ ULONG Command -); - + _In_ ULONG uFirstEntry, + _In_ ULONG cPalEntries, + _Inout_updates_(cPalEntries) PALETTEENTRY *ppalEntry, + _In_ ULONG uCommand); + +__kernel_entry W32KAPI ULONG_PTR APIENTRY NtGdiGetColorSpaceforBitmap( _In_ HBITMAP hsurf); -_Success_(return != FALSE) +_Success_(return!=FALSE) +__kernel_entry W32KAPI BOOL APIENTRY @@ -1177,6 +1271,7 @@ _In_ HDC hdc, _Out_writes_bytes_(sizeof(GAMMARAMP)) LPVOID lpGammaRamp); +__kernel_entry W32KAPI BOOL APIENTRY @@ -1184,31 +1279,35 @@ _In_ HDC hdc, _In_reads_bytes_(sizeof(GAMMARAMP)) LPVOID lpGammaRamp); +__kernel_entry W32KAPI BOOL APIENTRY NtGdiIcmBrushInfo( _In_ HDC hdc, _In_ HBRUSH hbrush, - IN OUT PBITMAPINFO pbmiDIB, - IN OUT PVOID pvBits, - IN OUT ULONG *pulBits, - OUT OPTIONAL DWORD *piUsage, - OUT OPTIONAL BOOL *pbAlreadyTran, - _In_ ULONG Command -); - -W32KAPI -VOID -APIENTRY -NtGdiFlush(VOID); - + _Inout_updates_bytes_(sizeof(BITMAPINFO) + ((/*MAX_COLORTABLE*/256 - 1) * sizeof(RGBQUAD))) PBITMAPINFO pbmiDIB, + _Inout_updates_bytes_(*pulBits) PVOID pvBits, + _Inout_ ULONG *pulBits, + _Out_opt_ DWORD *piUsage, + _Out_opt_ BOOL *pbAlreadyTran, + _In_ ULONG Command); + +__kernel_entry +W32KAPI +NTSTATUS +APIENTRY +NtGdiFlush( + VOID); + +__kernel_entry W32KAPI HDC APIENTRY NtGdiCreateMetafileDC( _In_ HDC hdc); +__kernel_entry W32KAPI BOOL APIENTRY @@ -1216,49 +1315,54 @@ _In_ HDC hdc, _In_ BOOL bSet); +__kernel_entry W32KAPI HANDLE APIENTRY NtGdiCreateClientObj( _In_ ULONG ulType); +__kernel_entry W32KAPI BOOL APIENTRY NtGdiDeleteClientObj( _In_ HANDLE h); +__kernel_entry W32KAPI LONG APIENTRY NtGdiGetBitmapBits( _In_ HBITMAP hbm, _In_ ULONG cjMax, - OUT OPTIONAL PBYTE pjOut -); - + _Out_writes_bytes_opt_(cjMax) PBYTE pjOut); + +__kernel_entry W32KAPI BOOL APIENTRY NtGdiDeleteObjectApp( _In_ HANDLE hobj); +__kernel_entry W32KAPI INT APIENTRY NtGdiGetPath( _In_ HDC hdc, - OUT OPTIONAL LPPOINT pptlBuf, - OUT OPTIONAL LPBYTE pjTypes, - _In_ INT cptBuf -); - + _Out_writes_opt_(cptBuf) LPPOINT pptlBuf, + _Out_writes_opt_(cptBuf) LPBYTE pjTypes, + _In_ INT cptBuf); + +__kernel_entry W32KAPI HDC APIENTRY NtGdiCreateCompatibleDC( _In_opt_ HDC hdc); +__kernel_entry W32KAPI HBITMAP APIENTRY @@ -1267,14 +1371,15 @@ _In_ INT cx, _In_ INT cy, _In_ DWORD fInit, - _In_opt_ LPBYTE pjInit, - _In_opt_ LPBITMAPINFO pbmi, + _In_reads_bytes_opt_(cjMaxBits) LPBYTE pjInit, + _In_reads_bytes_opt_(cjMaxInitInfo) LPBITMAPINFO pbmi, _In_ DWORD iUsage, _In_ UINT cjMaxInitInfo, _In_ UINT cjMaxBits, _In_ FLONG f, _In_ HANDLE hcmXform); +__kernel_entry W32KAPI HBITMAP APIENTRY @@ -1282,13 +1387,14 @@ _In_ HDC hdc, _In_opt_ HANDLE hSectionApp, _In_ DWORD dwOffset, - _In_ LPBITMAPINFO pbmi, + _In_reads_bytes_opt_(cjHeader) LPBITMAPINFO pbmi, _In_ DWORD iUsage, _In_ UINT cjHeader, _In_ FLONG fl, _In_ ULONG_PTR dwColorSpace, - _Out_opt_ PVOID *ppvBits); - + _Outptr_ PVOID *ppvBits); + +__kernel_entry W32KAPI HBRUSH APIENTRY @@ -1296,17 +1402,19 @@ _In_ COLORREF cr, _In_opt_ HBRUSH hbr); +__kernel_entry W32KAPI HBRUSH APIENTRY NtGdiCreateDIBBrush( - _In_ PVOID pv, + _In_reads_bytes_(cj) PVOID pv, _In_ FLONG fl, _In_ UINT cj, _In_ BOOL b8X8, _In_ BOOL bPen, _In_ PVOID pClient); +__kernel_entry W32KAPI HBRUSH APIENTRY @@ -1315,6 +1423,7 @@ _In_ BOOL bPen, _In_ BOOL b8X8); +__kernel_entry W32KAPI HBRUSH APIENTRY @@ -1323,6 +1432,7 @@ _In_ COLORREF clrr, _In_ BOOL bPen); +__kernel_entry W32KAPI HPEN APIENTRY @@ -1334,11 +1444,12 @@ _In_ ULONG_PTR lClientHatch, _In_ ULONG_PTR lHatch, _In_ ULONG cstyle, - _In_opt_ PULONG pulStyle, + _In_reads_opt_(cstyle) PULONG pulStyle, _In_ ULONG cjDIB, _In_ BOOL bOldStylePen, _In_opt_ HBRUSH hbrush); +__kernel_entry W32KAPI HRGN APIENTRY @@ -1348,6 +1459,7 @@ _In_ INT xRight, _In_ INT yBottom); +__kernel_entry W32KAPI HRGN APIENTRY @@ -1359,6 +1471,7 @@ _In_ INT xWidth, _In_ INT yHeight); +__kernel_entry W32KAPI HANDLE APIENTRY @@ -1370,55 +1483,60 @@ _In_ DWORD xExt, _In_ DWORD yExt); +__kernel_entry W32KAPI HRGN APIENTRY NtGdiExtCreateRegion( _In_opt_ LPXFORM px, _In_ DWORD cj, - _In_ LPRGNDATA prgn); - + _In_reads_bytes_(cj) LPRGNDATA prgndata); + +__kernel_entry W32KAPI ULONG APIENTRY NtGdiMakeFontDir( _In_ FLONG flEmbed, _Out_writes_bytes_(cjFontDir) PBYTE pjFontDir, - _In_ unsigned cjFontDir, - _In_z_bytecount_(cjPathname) LPWSTR pwszPathname, - _In_ unsigned cjPathname); - + _In_ UINT cjFontDir, + _In_reads_bytes_(cjPathname) LPWSTR pwszPathname, + _In_ UINT cjPathname); + +__kernel_entry W32KAPI BOOL APIENTRY NtGdiPolyDraw( _In_ HDC hdc, - _In_count_(cpt) LPPOINT ppt, - _In_count_(cpt) LPBYTE pjAttr, + _In_reads_(cpt) LPPOINT ppt, + _In_reads_(cpt) LPBYTE pjAttr, _In_ ULONG cpt); +__kernel_entry W32KAPI BOOL APIENTRY NtGdiPolyTextOutW( _In_ HDC hdc, - _In_ POLYTEXTW *pptw, + _In_reads_(cStr) POLYTEXTW *pptw, _In_ UINT cStr, _In_ DWORD dwCodePage); +__kernel_entry W32KAPI ULONG APIENTRY NtGdiGetServerMetaFileBits( _In_ HANDLE hmo, _In_ ULONG cjData, - OUT OPTIONAL LPBYTE pjData, - OUT PDWORD piType, - OUT PDWORD pmm, - OUT PDWORD pxExt, - OUT PDWORD pyExt -); - + _Out_writes_bytes_opt_(cjData) LPBYTE pjData, + _Out_ PDWORD piType, + _Out_ PDWORD pmm, + _Out_ PDWORD pxExt, + _Out_ PDWORD pyExt); + +__kernel_entry W32KAPI BOOL APIENTRY @@ -1427,13 +1545,16 @@ _In_ HRGN hrgn2); _Must_inspect_result_ +_Success_(return!=FALSE) +__kernel_entry W32KAPI BOOL APIENTRY NtGdiGetBitmapDimension( _In_ HBITMAP hbm, - _When_(return != FALSE, _Out_) LPSIZE psize); - + _Out_ LPSIZE psize); + +__kernel_entry W32KAPI UINT APIENTRY @@ -1441,6 +1562,7 @@ _In_ HPALETTE hpal, _In_ COLORREF crColor); +__kernel_entry W32KAPI BOOL APIENTRY @@ -1449,6 +1571,7 @@ _In_ INT x, _In_ INT y); +__kernel_entry W32KAPI BOOL APIENTRY @@ -1456,17 +1579,19 @@ _In_ HDC hdc, _In_ LPRECT prc); +__kernel_entry W32KAPI BOOL APIENTRY NtGdiRemoveFontResourceW( - _In_z_count_(cwc) WCHAR *pwszFiles, + _In_reads_(cwc) WCHAR *pwszFiles, _In_ ULONG cwc, _In_ ULONG cFiles, _In_ ULONG fl, _In_ DWORD dwPidTid, _In_opt_ DESIGNVECTOR *pdv); +__kernel_entry W32KAPI BOOL APIENTRY @@ -1474,6 +1599,7 @@ _In_ HPALETTE hpal, _In_ UINT cEntry); +__kernel_entry W32KAPI BOOL APIENTRY @@ -1483,6 +1609,7 @@ _In_ INT cy, _In_opt_ LPSIZE psizeOut); +__kernel_entry W32KAPI INT APIENTRY @@ -1491,12 +1618,14 @@ _In_ INT x, _In_ INT y); +__kernel_entry W32KAPI INT APIENTRY NtGdiSetMetaRgn( _In_ HDC hdc); +__kernel_entry W32KAPI BOOL APIENTRY @@ -1505,6 +1634,8 @@ _In_ INT lBreakExtra, _In_ INT cBreak); +_Success_(return!=ERROR) +__kernel_entry W32KAPI INT APIENTRY @@ -1512,20 +1643,21 @@ _In_ HDC hdc, _Out_ LPRECT prc); +__kernel_entry W32KAPI BOOL APIENTRY NtGdiGetTextExtentExW( _In_ HDC hdc, - IN OPTIONAL LPWSTR lpwsz, + _In_reads_opt_(cwc) LPWSTR pwsz, _In_ ULONG cwc, _In_ ULONG dxMax, - OUT OPTIONAL ULONG *pcCh, - OUT OPTIONAL PULONG pdxOut, - OUT LPSIZE psize, - _In_ FLONG fl -); - + _Out_opt_ ULONG *pcCh, + _Out_writes_to_opt_(cwc, *pcCh) PULONG pdxOut, + _Out_ LPSIZE psize, + _In_ FLONG fl); + +__kernel_entry W32KAPI BOOL APIENTRY @@ -1533,23 +1665,23 @@ _In_ HDC hdc, _In_ UINT wchFirst, _In_ ULONG cwch, - IN OPTIONAL PWCHAR pwch, + _In_reads_opt_(cwch) PWCHAR pwch, _In_ FLONG fl, - OUT PVOID pvBuf -); - + _Out_writes_bytes_(cwch * sizeof(ABC)) PVOID pvBuf); + +__kernel_entry W32KAPI DWORD APIENTRY NtGdiGetCharacterPlacementW( _In_ HDC hdc, - IN LPWSTR pwsz, + _In_reads_z_(nCount) LPWSTR pwsz, _In_ INT nCount, _In_ INT nMaxExtent, - IN OUT LPGCP_RESULTSW pgcpw, - _In_ DWORD dwFlags -); - + _Inout_ LPGCP_RESULTSW pgcpw, + _In_ DWORD dwFlags); + +__kernel_entry W32KAPI BOOL APIENTRY @@ -1561,12 +1693,14 @@ _In_ DWORD dwStartAngle, _In_ DWORD dwSweepAngle); +__kernel_entry W32KAPI BOOL APIENTRY NtGdiBeginPath( _In_ HDC hdc); +__kernel_entry W32KAPI BOOL APIENTRY @@ -1574,73 +1708,87 @@ _In_ HDC hdc, _In_ INT iMode); +__kernel_entry W32KAPI BOOL APIENTRY NtGdiCloseFigure( _In_ HDC hdc); +__kernel_entry W32KAPI BOOL APIENTRY NtGdiEndPath( _In_ HDC hdc); +__kernel_entry W32KAPI BOOL APIENTRY NtGdiAbortPath( _In_ HDC hdc); +__kernel_entry W32KAPI BOOL APIENTRY NtGdiFillPath( _In_ HDC hdc); +__kernel_entry W32KAPI BOOL APIENTRY NtGdiStrokeAndFillPath( _In_ HDC hdc); +__kernel_entry W32KAPI BOOL APIENTRY NtGdiStrokePath( _In_ HDC hdc); +__kernel_entry W32KAPI BOOL APIENTRY NtGdiWidenPath( _In_ HDC hdc); +__kernel_entry W32KAPI BOOL APIENTRY NtGdiFlattenPath( _In_ HDC hdc); +/* Not in MS ntgdi.h */ +__kernel_entry W32KAPI NTSTATUS APIENTRY -NtGdiFlushUserBatch(VOID); - +NtGdiFlushUserBatch( + VOID); + +__kernel_entry W32KAPI HRGN APIENTRY NtGdiPathToRegion( _In_ HDC hdc); +__kernel_entry W32KAPI BOOL APIENTRY NtGdiSetMiterLimit( _In_ HDC hdc, _In_ DWORD dwNew, - _Out_opt_ PDWORD pdwOut); - + _Inout_opt_ PDWORD pdwOut); + +__kernel_entry W32KAPI BOOL APIENTRY @@ -1650,6 +1798,7 @@ _In_ DWORD dwyScale); _Success_(return != FALSE) +__kernel_entry W32KAPI BOOL APIENTRY @@ -1657,6 +1806,7 @@ _In_ HDC hdc, _Out_ PDWORD pdwOut); +__kernel_entry W32KAPI BOOL APIENTRY @@ -1667,6 +1817,7 @@ _In_ INT xRight, _In_ INT yBottom); +__kernel_entry W32KAPI BOOL APIENTRY @@ -1677,6 +1828,7 @@ _In_ INT xRight, _In_ INT yBottom); +__kernel_entry W32KAPI BOOL APIENTRY @@ -1689,22 +1841,24 @@ _In_ INT x3, _In_ INT y3); +__kernel_entry W32KAPI BOOL APIENTRY NtGdiPlgBlt( _In_ HDC hdcTrg, - _In_ LPPOINT pptlTrg, + _In_reads_(3) LPPOINT pptlTrg, _In_ HDC hdcSrc, _In_ INT xSrc, _In_ INT ySrc, _In_ INT cxSrc, _In_ INT cySrc, - _In_ HBITMAP hbmMask, + _In_opt_ HBITMAP hbmMask, _In_ INT xMask, _In_ INT yMask, _In_ DWORD crBackColor); +__kernel_entry W32KAPI BOOL APIENTRY @@ -1723,6 +1877,7 @@ _In_ DWORD dwRop4, _In_ DWORD crBackColor); +__kernel_entry W32KAPI BOOL APIENTRY @@ -1733,6 +1888,7 @@ _In_ COLORREF crColor, _In_ UINT iFillType); +__kernel_entry W32KAPI BOOL APIENTRY @@ -1741,6 +1897,7 @@ _In_ HRGN hrgn, _In_ HBRUSH hbrush); +__kernel_entry W32KAPI BOOL APIENTRY @@ -1751,6 +1908,7 @@ _In_ INT xWidth, _In_ INT yHeight); +__kernel_entry W32KAPI COLORREF APIENTRY @@ -1760,6 +1918,7 @@ _In_ INT y, _In_ COLORREF crColor); +__kernel_entry W32KAPI DWORD APIENTRY @@ -1768,46 +1927,52 @@ _In_ INT x, _In_ INT y); +__kernel_entry W32KAPI BOOL APIENTRY NtGdiStartPage( _In_ HDC hdc); +__kernel_entry W32KAPI BOOL APIENTRY NtGdiEndPage( _In_ HDC hdc); +__kernel_entry W32KAPI INT APIENTRY NtGdiStartDoc( _In_ HDC hdc, - IN DOCINFOW *pdi, - OUT BOOL *pbBanding, - _In_ INT iJob -); - + _In_ DOCINFOW *pdi, + _Out_ BOOL *pbBanding, + _In_ INT iJob); + +__kernel_entry W32KAPI BOOL APIENTRY NtGdiEndDoc( _In_ HDC hdc); +__kernel_entry W32KAPI BOOL APIENTRY NtGdiAbortDoc( _In_ HDC hdc); +__kernel_entry W32KAPI BOOL APIENTRY NtGdiUpdateColors( _In_ HDC hdc); +__kernel_entry W32KAPI BOOL APIENTRY @@ -1815,19 +1980,19 @@ _In_ HDC hdc, _In_ UINT wcFirst, _In_ UINT cwc, - IN OPTIONAL PWCHAR pwc, + _In_reads_opt_(cwc) PWCHAR pwc, _In_ FLONG fl, - OUT PVOID pvBuf -); - + _Out_writes_bytes_(cwc * sizeof(ULONG)) PVOID pvBuf); + +__kernel_entry W32KAPI BOOL APIENTRY NtGdiGetCharWidthInfo( _In_ HDC hdc, - OUT PCHWIDTHINFO pChWidthInfo -); - + _Out_ PCHWIDTHINFO pChWidthInfo); + +__kernel_entry W32KAPI INT APIENTRY @@ -1835,23 +2000,24 @@ _In_ HDC hdc, _In_ INT iEsc, _In_ INT cjIn, - IN OPTIONAL LPSTR pjIn -); - + _In_reads_bytes_opt_(cjIn) LPSTR pjIn); + +__kernel_entry W32KAPI INT APIENTRY NtGdiExtEscape( - _In_ HDC hdc, - IN OPTIONAL PWCHAR pDriver, - _In_ INT nDriver, + _In_opt_ HDC hdc, + _In_reads_opt_(cwcDriver) PWCHAR pDriver, + _In_ INT cwcDriver, _In_ INT iEsc, _In_ INT cjIn, - IN OPTIONAL LPSTR pjIn, + _In_reads_bytes_opt_(cjIn) LPSTR pjIn, _In_ INT cjOut, - OUT OPTIONAL LPSTR pjOut -); - + _Out_writes_bytes_opt_(cjOut) LPSTR pjOut); + +_Success_(return != GDI_ERROR) +__kernel_entry W32KAPI ULONG APIENTRY @@ -1859,63 +2025,88 @@ _In_ HDC hdc, _In_ DWORD dwTable, _In_ DWORD dwOffset, - OUT OPTIONAL PVOID pvBuf, - _In_ ULONG cjBuf -); - + _Out_writes_bytes_to_opt_(cjBuf, return) PVOID pvBuf, + _In_ ULONG cjBuf); + +__kernel_entry +W32KAPI +DWORD +APIENTRY +NtGdiGetFontFileData( + _In_ UINT uFileCollectionID, + _In_ UINT uFileIndex, + _In_ PULONGLONG pullFileOffset, + _Out_writes_bytes_(cjBuf) PVOID pvBuf, + _In_ SIZE_T cjBuf); + +#if (_WIN32_WINNT >= _WIN32_WINNT_WIN7) +__kernel_entry +W32KAPI +DWORD +APIENTRY +NtGdiGetFontFileInfo( + _In_ UINT uFileCollectionID, + _In_ UINT uFileIndex, + _Out_writes_bytes_(cjSize) PFONT_FILE_INFO pffi, + _In_ SIZE_T cjSize, + _Out_opt_ PSIZE_T pcjActualSize); +#endif /* (_WIN32_WINNT >= _WIN32_WINNT_WIN7) */ + +__kernel_entry W32KAPI ULONG APIENTRY NtGdiGetGlyphOutline( _In_ HDC hdc, - IN WCHAR wch, + _In_ WCHAR wch, _In_ UINT iFormat, - OUT LPGLYPHMETRICS pgm, + _Out_ LPGLYPHMETRICS pgm, _In_ ULONG cjBuf, - OUT OPTIONAL PVOID pvBuf, - IN LPMAT2 pmat2, - _In_ BOOL bIgnoreRotation -); - + _Out_writes_bytes_opt_(cjBuf) PVOID pvBuf, + _In_ LPMAT2 pmat2, + _In_ BOOL bIgnoreRotation); + +__kernel_entry W32KAPI BOOL APIENTRY NtGdiGetETM( _In_ HDC hdc, - OUT EXTTEXTMETRIC *petm -); - + _Out_opt_ EXTTEXTMETRIC *petm); + +__kernel_entry W32KAPI BOOL APIENTRY NtGdiGetRasterizerCaps( - OUT LPRASTERIZER_STATUS praststat, - _In_ ULONG cjBytes -); - + _Out_writes_bytes_(cjBytes) LPRASTERIZER_STATUS praststat, + _In_ ULONG cjBytes); + +__kernel_entry W32KAPI ULONG APIENTRY NtGdiGetKerningPairs( _In_ HDC hdc, _In_ ULONG cPairs, - OUT OPTIONAL KERNINGPAIR *pkpDst -); - + _Out_writes_to_opt_(cPairs, return) KERNINGPAIR *pkpDst); + +__kernel_entry W32KAPI BOOL APIENTRY NtGdiMonoBitmap( _In_ HBITMAP hbm); +__kernel_entry W32KAPI HBITMAP APIENTRY NtGdiGetObjectBitmapHandle( _In_ HBRUSH hbr, - OUT UINT *piUsage -); - + _Out_ UINT *piUsage); + +__kernel_entry W32KAPI ULONG APIENTRY @@ -1923,29 +2114,20 @@ _In_ HDC hdc, _In_ INT iObjectType, _In_ ULONG cjBuf, - OUT OPTIONAL PVOID pvBuf -); - -// Note from SDK: -// -// NtGdiResetDC -// The exact size of the buffer at pdm is pdm->dmSize + pdm->dmDriverExtra. -// But this can't be specified with current annotation language. -// -// typedef struct _DRIVER_INFO_2W DRIVER_INFO_2W; -// -// :end note. + _Out_writes_bytes_opt_(cjBuf) PVOID pvBuf); + +__kernel_entry W32KAPI BOOL APIENTRY NtGdiResetDC( _In_ HDC hdc, _In_ LPDEVMODEW pdm, - OUT PBOOL pbBanding, - IN OPTIONAL VOID *pDriverInfo2, // this is "typedef struct _DRIVER_INFO_2W DRIVER_INFO_2W;" - OUT VOID *ppUMdhpdev -); - + _Out_ PBOOL pbBanding, + _In_opt_ DRIVER_INFO_2W *pDriverInfo2, + _At_((PUMDHPDEV*)ppUMdhpdev, _Out_) PVOID ppUMdhpdev); + +__kernel_entry W32KAPI DWORD APIENTRY @@ -1954,6 +2136,7 @@ _In_ LPRECT prc, _In_ DWORD f); +__kernel_entry W32KAPI BOOL APIENTRY @@ -1961,6 +2144,7 @@ _In_ HDC hdc, _Out_ PCOLORADJUSTMENT pcaOut); +__kernel_entry W32KAPI BOOL APIENTRY @@ -1968,36 +2152,38 @@ _In_ HDC hdc, _In_ PCOLORADJUSTMENT pca); +__kernel_entry W32KAPI BOOL APIENTRY NtGdiCancelDC( _In_ HDC hdc); +__kernel_entry W32KAPI HDC APIENTRY NtGdiOpenDCW( - IN OPTIONAL PUNICODE_STRING pustrDevice, - IN DEVMODEW *pdm, // See note for NtGdiResetDC - IN PUNICODE_STRING pustrLogAddr, + _In_opt_ PUNICODE_STRING pustrDevice, + _In_ DEVMODEW *pdm, + _In_ PUNICODE_STRING pustrLogAddr, _In_ ULONG iType, _In_ BOOL bDisplay, - IN OPTIONAL HANDLE hspool, - IN OPTIONAL VOID *pDriverInfo2, // this is "typedef struct _DRIVER_INFO_2W DRIVER_INFO_2W;" - OUT VOID *pUMdhpdev -); - + _In_opt_ HANDLE hspool, + _In_opt_ DRIVER_INFO_2W *pDriverInfo2, + _At_((PUMDHPDEV*)pUMdhpdev, _Out_) PVOID pUMdhpdev); + +__kernel_entry W32KAPI BOOL APIENTRY NtGdiGetDCDword( _In_ HDC hdc, _In_ UINT u, - OUT DWORD *Result -); + _Out_ DWORD *Result); _Success_(return!=FALSE) +__kernel_entry W32KAPI BOOL APIENTRY @@ -2006,6 +2192,7 @@ _In_ UINT iPoint, _Out_ PPOINTL pptOut); +__kernel_entry W32KAPI BOOL APIENTRY @@ -2015,9 +2202,9 @@ _In_ INT xDenom, _In_ INT yNum, _In_ INT yDenom, - OUT OPTIONAL LPSIZE pszOut -); - + _Out_opt_ LPSIZE pszOut); + +__kernel_entry W32KAPI BOOL APIENTRY @@ -2027,9 +2214,9 @@ _In_ INT xDenom, _In_ INT yNum, _In_ INT yDenom, - OUT OPTIONAL LPSIZE pszOut -); - + _Out_opt_ LPSIZE pszOut); + +__kernel_entry W32KAPI BOOL APIENTRY @@ -2040,6 +2227,7 @@ _In_ INT cxVirtualDeviceMm, _In_ INT cyVirtualDeviceMm); +__kernel_entry W32KAPI BOOL APIENTRY @@ -2049,6 +2237,7 @@ _In_ INT cyVirtualDevice); _Success_(return !=FALSE) +__kernel_entry W32KAPI BOOL APIENTRY @@ -2057,6 +2246,7 @@ _In_ DWORD iXform, _Out_ LPXFORM pxf); +__kernel_entry W32KAPI BOOL APIENTRY @@ -2065,6 +2255,7 @@ _In_opt_ LPXFORM pxf, _In_ DWORD iXform); +__kernel_entry W32KAPI BOOL APIENTRY @@ -2073,6 +2264,7 @@ _In_ LPXFORM pxfSrc1, _In_ LPXFORM pxfSrc2); +__kernel_entry W32KAPI BOOL APIENTRY @@ -2083,6 +2275,7 @@ _In_ INT c, _In_ INT iMode); +__kernel_entry W32KAPI LONG APIENTRY @@ -2090,33 +2283,34 @@ _In_ HDC hdc, _Inout_ PRECTL prect); +__kernel_entry W32KAPI INT APIENTRY NtGdiGetTextCharsetInfo( _In_ HDC hdc, - OUT OPTIONAL LPFONTSIGNATURE lpSig, - _In_ DWORD dwFlags -); - + _Out_opt_ LPFONTSIGNATURE lpSig, + _In_ DWORD dwFlags); + +__kernel_entry W32KAPI BOOL APIENTRY NtGdiDoBanding( _In_ HDC hdc, _In_ BOOL bStart, - OUT POINTL *pptl, - OUT PSIZE pSize -); - + _Out_ POINTL *pptl, + _Out_ PSIZE pSize); + +__kernel_entry W32KAPI ULONG APIENTRY NtGdiGetPerBandInfo( _In_ HDC hdc, - IN OUT PERBANDINFO *ppbi -); - + _Inout_ PERBANDINFO *ppbi); + +__kernel_entry W32KAPI NTSTATUS APIENTRY @@ -2124,27 +2318,27 @@ _In_ HANDLE hProcess, _In_ INT iIndex, _In_ INT iPidType, - OUT PVOID pResults, - _In_ UINT cjResultSize -); - + _Out_writes_bytes_(cjResultSize) PVOID pResults, + _In_ UINT cjResultSize); + +__kernel_entry W32KAPI BOOL APIENTRY NtGdiSetMagicColors( _In_ HDC hdc, - IN PALETTEENTRY peMagic, - _In_ ULONG Index -); - + _In_ PALETTEENTRY peMagic, + _In_ ULONG Index); + +__kernel_entry W32KAPI HBRUSH APIENTRY NtGdiSelectBrush( _In_ HDC hdc, - _In_ HBRUSH hbrush -); - + _In_ HBRUSH hbrush); + +__kernel_entry W32KAPI HPEN APIENTRY @@ -2152,6 +2346,7 @@ _In_ HDC hdc, _In_ HPEN hpen); +__kernel_entry W32KAPI HBITMAP APIENTRY @@ -2159,6 +2354,7 @@ _In_ HDC hdc, _In_ HBITMAP hbm); +__kernel_entry W32KAPI HFONT APIENTRY @@ -2166,14 +2362,16 @@ _In_ HDC hdc, _In_ HFONT hf); +__kernel_entry W32KAPI INT APIENTRY NtGdiExtSelectClipRgn( _In_ HDC hdc, - _In_ HRGN hrgn, + _In_opt_ HRGN hrgn, _In_ INT iMode); +__kernel_entry W32KAPI HPEN APIENTRY @@ -2181,9 +2379,10 @@ _In_ INT iPenStyle, _In_ INT iPenWidth, _In_ COLORREF cr, - _In_ HBRUSH hbr); + _In_opt_ HBRUSH hbr); #ifdef _WINDOWBLT_NOTIFICATION_ +__kernel_entry W32KAPI BOOL APIENTRY @@ -2193,13 +2392,14 @@ _In_ INT y, _In_ INT cx, _In_ INT cy, - _In_ HDC hdcSrc, + _In_opt_ HDC hdcSrc, _In_ INT xSrc, _In_ INT ySrc, _In_ DWORD rop4, _In_ DWORD crBackColor, _In_ FLONG fl); #else +__kernel_entry W32KAPI BOOL APIENTRY @@ -2209,13 +2409,14 @@ _In_ INT y, _In_ INT cx, _In_ INT cy, - _In_ HDC hdcSrc, + _In_opt_ HDC hdcSrc, _In_ INT xSrc, _In_ INT ySrc, _In_ DWORD rop4, _In_ DWORD crBackColor); #endif +__kernel_entry W32KAPI BOOL APIENTRY @@ -2228,6 +2429,7 @@ _In_ DWORD rop4, _In_ DWORD crBackColor); +__kernel_entry W32KAPI BOOL APIENTRY @@ -2244,35 +2446,38 @@ _In_ INT cySrc, _In_ COLORREF TransColor); +__kernel_entry W32KAPI BOOL APIENTRY NtGdiGetTextExtent( _In_ HDC hdc, - _In_z_count_(cwc) LPWSTR lpwsz, + _In_reads_(cwc) LPWSTR lpwsz, _In_ INT cwc, _Out_ LPSIZE psize, _In_ UINT flOpts); _Success_(return != FALSE) +__kernel_entry W32KAPI BOOL APIENTRY NtGdiGetTextMetricsW( _In_ HDC hdc, - _Out_bytecap_(cj) TMW_INTERNAL * ptm, + _Out_writes_bytes_(cj) TMW_INTERNAL *ptm, _In_ ULONG cj); +__kernel_entry W32KAPI INT APIENTRY NtGdiGetTextFaceW( _In_ HDC hdc, _In_ INT cChar, - OUT OPTIONAL LPWSTR pszOut, - _In_ BOOL bAliasName -); - + _Out_writes_to_opt_(cChar, return) LPWSTR pszOut, + _In_ BOOL bAliasName); + +__kernel_entry W32KAPI INT APIENTRY @@ -2281,6 +2486,7 @@ _In_ HRGN hrgn, _In_ INT iRgn); +__kernel_entry W32KAPI BOOL APIENTRY @@ -2289,13 +2495,13 @@ _In_ INT x, _In_ INT y, _In_ UINT flOpts, - IN OPTIONAL LPRECT prcl, - _In_z_count_(cwc) LPWSTR pwsz, - _In_ INT cwc, - IN OPTIONAL LPINT pdx, - _In_ DWORD dwCodePage -); - + _In_opt_ LPRECT prcl, + _In_reads_opt_(cwc) LPWSTR pwsz, + _In_range_(0, 0xffff) INT cwc, + _In_reads_opt_(_Inexpressible_(cwc)) LPINT pdx, + _In_ DWORD dwCodePage); + +__kernel_entry W32KAPI INT APIENTRY @@ -2306,6 +2512,7 @@ _In_ INT xRight, _In_ INT yBottom); +__kernel_entry W32KAPI HRGN APIENTRY @@ -2315,6 +2522,7 @@ _In_ INT xRight, _In_ INT yBottom); +__kernel_entry W32KAPI BOOL APIENTRY @@ -2326,28 +2534,32 @@ _In_ INT cy, _In_ DWORD dwRop); +__kernel_entry W32KAPI BOOL APIENTRY NtGdiPolyPatBlt( _In_ HDC hdc, _In_ DWORD rop4, - _In_ PPOLYPATBLT pPoly, - _In_ DWORD Count, - _In_ DWORD Mode); - + _In_reads_(cPoly) PPOLYPATBLT pPoly, + _In_ DWORD cPoly, + _In_ DWORD dwMode); + +__kernel_entry W32KAPI BOOL APIENTRY NtGdiUnrealizeObject( _In_ HANDLE h); +__kernel_entry W32KAPI HANDLE APIENTRY NtGdiGetStockObject( _In_ INT iObject); +__kernel_entry W32KAPI HBITMAP APIENTRY @@ -2356,6 +2568,50 @@ _In_ INT cx, _In_ INT cy); +__kernel_entry +W32KAPI +HBITMAP +APIENTRY +NtGdiCreateBitmapFromDxSurface( + _In_ HDC hdc, + _In_ UINT uiWidth, + _In_ UINT uiHeight, + _In_ DWORD Format, + _In_opt_ HANDLE hDxSharedSurface); + +__kernel_entry +W32KAPI +HBITMAP +APIENTRY +NtGdiCreateBitmapFromDxSurface2( + _In_ HDC hdc, + _In_ UINT uiWidth, + _In_ UINT uiHeight, + _In_ DWORD Format, + _In_ DWORD SubresourceIndex, + _In_ BOOL bSharedSurfaceNtHandle, + _In_opt_ HANDLE hDxSharedSurface); + +__kernel_entry +W32KAPI +BOOL +APIENTRY +NtGdiBeginGdiRendering( + _In_ HBITMAP hbm, + _In_ BOOL bDiscard, + _In_ PVOID KernelModeDeviceHandle); + +__kernel_entry +W32KAPI +BOOL +APIENTRY +NtGdiEndGdiRendering( + _In_ HBITMAP hbm, + _In_ BOOL bDiscard, + _Out_ BOOL* pbDeviceRemoved, + _In_ PVOID KernelModeDeviceHandle); + +__kernel_entry W32KAPI BOOL APIENTRY @@ -2365,6 +2621,7 @@ _In_ INT y); _Success_(return != FALSE) +__kernel_entry W32KAPI BOOL APIENTRY @@ -2375,14 +2632,16 @@ _Out_opt_ LPPOINT pptOut); _Success_(return != 0) +__kernel_entry W32KAPI INT APIENTRY NtGdiExtGetObjectW( _In_ HANDLE h, _In_ INT cj, - _Out_opt_bytecap_(cj) LPVOID pvOut); - + _Out_writes_bytes_opt_(cj) LPVOID pvOut); + +__kernel_entry W32KAPI INT APIENTRY @@ -2391,13 +2650,15 @@ _In_ INT i); _Success_(return!=FALSE) +__kernel_entry W32KAPI BOOL APIENTRY NtGdiGetDeviceCapsAll ( - _In_ HDC hdc, + _In_opt_ HDC hdc, _Out_ PDEVCAPS pDevCaps); +__kernel_entry W32KAPI BOOL APIENTRY @@ -2407,7 +2668,7 @@ _In_ INT yDst, _In_ INT cxDst, _In_ INT cyDst, - _In_ HDC hdcSrc, + _In_opt_ HDC hdcSrc, _In_ INT xSrc, _In_ INT ySrc, _In_ INT cxSrc, @@ -2415,7 +2676,8 @@ _In_ DWORD dwRop, _In_ DWORD dwBackColor); -_Success_(return != FALSE) +_Success_(return!=FALSE) +__kernel_entry W32KAPI BOOL APIENTRY @@ -2425,6 +2687,7 @@ _In_ INT y, _Out_opt_ LPPOINT pptOut); +__kernel_entry W32KAPI HBITMAP APIENTRY @@ -2435,12 +2698,14 @@ _In_ UINT cBPP, _In_opt_ LPBYTE pjInit); +__kernel_entry W32KAPI HPALETTE APIENTRY NtGdiCreateHalftonePalette( _In_ HDC hdc); +__kernel_entry W32KAPI BOOL APIENTRY @@ -2448,6 +2713,7 @@ _In_ HDC hdc, _In_ INT iLevel); +__kernel_entry W32KAPI INT APIENTRY @@ -2458,12 +2724,14 @@ _In_ INT xRight, _In_ INT yBottom); +__kernel_entry W32KAPI INT APIENTRY NtGdiSaveDC( _In_ HDC hdc); +__kernel_entry W32KAPI INT APIENTRY @@ -2473,6 +2741,7 @@ _In_opt_ HRGN hrgnSrc2, _In_ INT iMode); +__kernel_entry W32KAPI BOOL APIENTRY @@ -2483,14 +2752,17 @@ _In_ INT xRight, _In_ INT yBottom); +__kernel_entry W32KAPI LONG APIENTRY NtGdiSetBitmapBits( _In_ HBITMAP hbm, _In_ ULONG cj, - _In_bytecount_(cj) PBYTE pjInit); - + _In_reads_bytes_(cj) PBYTE pjInit); + +_Success_(return!=0) +__kernel_entry W32KAPI INT APIENTRY @@ -2499,12 +2771,13 @@ _In_ HBITMAP hbm, _In_ UINT iStartScan, _In_ UINT cScans, - _Out_opt_ LPBYTE pBits, + _Out_writes_bytes_opt_(cjMaxBits) LPBYTE pjBits, _Inout_ LPBITMAPINFO pbmi, _In_ UINT iUsage, _In_ UINT cjMaxBits, _In_ UINT cjMaxInfo); +__kernel_entry W32KAPI INT APIENTRY @@ -2514,6 +2787,7 @@ _In_ INT cy); _Success_(return!=ERROR) +__kernel_entry W32KAPI INT APIENTRY @@ -2521,15 +2795,16 @@ _In_ HRGN hrgn, _Out_ LPRECT prcOut); +__kernel_entry W32KAPI BOOL APIENTRY NtGdiRectInRegion( _In_ HRGN hrgn, - IN OUT LPRECT prcl -); + _Inout_ LPRECT prcl); _Success_(return!=0) +__kernel_entry W32KAPI DWORD APIENTRY @@ -2538,6 +2813,7 @@ _Out_ LPRECT prc, _In_ DWORD f); +__kernel_entry W32KAPI BOOL APIENTRY @@ -2546,6 +2822,7 @@ _In_ INT x, _In_ INT y); +__kernel_entry W32KAPI COLORREF APIENTRY @@ -2553,12 +2830,14 @@ _In_ HDC hdc, _In_ COLORREF cr); +__kernel_entry W32KAPI UINT APIENTRY NtGdiGetSystemPaletteUse( _In_ HDC hdc); +__kernel_entry W32KAPI UINT APIENTRY @@ -2567,14 +2846,16 @@ _In_ UINT ui); _Success_(return!=0) +__kernel_entry W32KAPI ULONG APIENTRY NtGdiGetRegionData( _In_ HRGN hrgn, _In_ ULONG cjBuffer, - _Out_opt_bytecap_(cjBuffer) LPRGNDATA lpRgnData); - + _Out_writes_bytes_to_opt_(cjBuffer, return) LPRGNDATA lpRgnData); + +__kernel_entry W32KAPI BOOL APIENTRY @@ -2582,53 +2863,58 @@ _In_ HDC hdc, _In_ HRGN hrgn); +__kernel_entry INT W32KAPI APIENTRY NtGdiAddFontResourceW( - _In_z_count_(cwc) WCHAR *pwszFiles, + _In_reads_(cwc) WCHAR *pwszFiles, _In_ ULONG cwc, _In_ ULONG cFiles, _In_ FLONG f, _In_ DWORD dwPidTid, _In_opt_ DESIGNVECTOR *pdv); -#if (_WIN32_WINNT >= 0x0500) +__kernel_entry W32KAPI HFONT APIENTRY NtGdiHfontCreate( - _In_bytecount_(cjElfw) ENUMLOGFONTEXDVW *pelfw, + _In_reads_bytes_(cjElfw) ENUMLOGFONTEXDVW *pelfw, _In_ ULONG cjElfw, _In_ LFTYPE lft, _In_ FLONG fl, _In_ PVOID pvCliData); -#else -W32KAPI -HFONT -APIENTRY -NtGdiHfontCreate( - _In_bytecount_(cjElfw) LPEXTLOGFONTW pelfw, - _In_ ULONG cjElfw, - _In_ LFTYPE lft, - _In_ FLONG fl, - _In_ PVOID pvCliData -); -#endif - + +__kernel_entry W32KAPI ULONG APIENTRY NtGdiSetFontEnumeration( _In_ ULONG ulType); +__kernel_entry +W32KAPI +BOOL +APIENTRY +NtGdiEnumFonts( + _In_ HDC hdc, + _In_ ULONG iEnumType, + _In_ FLONG flWin31Compat, + _In_ ULONG cchFaceName, + _In_reads_opt_(cchFaceName) LPCWSTR pwszFaceName, + _In_ ULONG lfCharSet, + _Inout_ ULONG *pulCount, + _Out_writes_bytes_opt_(*pulCount) PVOID pvUserModeBuffer); + +__kernel_entry W32KAPI BOOL APIENTRY NtGdiEnumFontClose( _In_ ULONG_PTR idEnum); -#if (_WIN32_WINNT >= 0x0500) +__kernel_entry W32KAPI BOOL APIENTRY @@ -2636,11 +2922,10 @@ _In_ HDC hdc, _In_ ULONG_PTR idEnum, _In_ ULONG cjEfdw, - OUT ULONG *pcjEfdw, - OUT PENUMFONTDATAW pefdw -); -#endif - + _Out_ ULONG *pcjEfdw, + _Out_ PENUMFONTDATAW pefdw); + +__kernel_entry W32KAPI ULONG_PTR APIENTRY @@ -2649,20 +2934,20 @@ _In_ ULONG iEnumType, _In_ FLONG flWin31Compat, _In_ ULONG cwchMax, - IN OPTIONAL LPWSTR pwszFaceName, + _In_opt_ LPWSTR pwszFaceName, _In_ ULONG lfCharSet, - OUT ULONG *pulCount -); - + _Out_ ULONG *pulCount); + +__kernel_entry W32KAPI INT APIENTRY NtGdiQueryFonts( - OUT PUNIVERSAL_FONT_ID pufiFontList, + _Out_writes_(nBufferSize) PUNIVERSAL_FONT_ID pufiFontList, _In_ ULONG nBufferSize, - OUT PLARGE_INTEGER pTimeStamp -); - + _Out_ PLARGE_INTEGER pTimeStamp); + +__kernel_entry W32KAPI BOOL APIENTRY @@ -2672,77 +2957,89 @@ _In_ UINT nStrings, _In_ RECTL *prclBounds); +__kernel_entry W32KAPI NTSTATUS APIENTRY NtGdiFullscreenControl( - IN FULLSCREENCONTROL FullscreenCommand, - IN PVOID FullscreenInput, + _In_ FULLSCREENCONTROL FullscreenCommand, + _In_ PVOID FullscreenInput, _In_ DWORD FullscreenInputLength, - OUT PVOID FullscreenOutput, - IN OUT PULONG FullscreenOutputLength -); - + _Out_ PVOID FullscreenOutput, + _Inout_ PULONG FullscreenOutputLength); + +__kernel_entry W32KAPI DWORD APIENTRY NtGdiGetCharSet( _In_ HDC hdc); +__kernel_entry W32KAPI BOOL APIENTRY NtGdiEnableEudc( _In_ BOOL b); +__kernel_entry W32KAPI BOOL APIENTRY NtGdiEudcLoadUnloadLink( - IN OPTIONAL LPCWSTR pBaseFaceName, + _In_reads_opt_(cwcBaseFaceName) LPCWSTR pBaseFaceName, _In_ UINT cwcBaseFaceName, - IN LPCWSTR pEudcFontPath, + _In_reads_(cwcEudcFontPath) LPCWSTR pEudcFontPath, _In_ UINT cwcEudcFontPath, _In_ INT iPriority, _In_ INT iFontLinkType, - _In_ BOOL bLoadLin -); - + _In_ BOOL bLoadLin); + +__kernel_entry W32KAPI UINT APIENTRY NtGdiGetStringBitmapW( _In_ HDC hdc, - IN LPWSTR pwsz, + _In_ LPWSTR pwsz, _In_ UINT cwc, - OUT BYTE *lpSB, - _In_ UINT cj -); - + _Out_writes_bytes_(cj) BYTE *lpSB, + _In_ UINT cj); + +__kernel_entry W32KAPI ULONG APIENTRY NtGdiGetEudcTimeStampEx( - _In_opt_z_count_(cwcBaseFaceName) LPWSTR lpBaseFaceName, + _In_reads_opt_(cwcBaseFaceName) LPWSTR lpBaseFaceName, _In_ ULONG cwcBaseFaceName, _In_ BOOL bSystemTimeStamp); +__kernel_entry W32KAPI ULONG APIENTRY NtGdiQueryFontAssocInfo( _In_ HDC hdc); -#if (_WIN32_WINNT >= 0x0500) +__kernel_entry W32KAPI DWORD APIENTRY NtGdiGetFontUnicodeRanges( _In_ HDC hdc, - _Out_opt_ LPGLYPHSET pgs); -#endif + _Out_ _Post_bytecount_(return) LPGLYPHSET pgs); #ifdef LANGPACK +#if (_WIN32_WINNT >= _WIN32_WINNT_WIN7) +__kernel_entry +W32KAPI +BOOL +NtGdiGetRealizationInfo( + _In_ HDC hdc, + _Out_ PFONT_REALIZATION_INFO pri); +#else +__kernel_entry W32KAPI BOOL APIENTRY @@ -2751,22 +3048,43 @@ _Out_ PREALIZATION_INFO pri, _In_ HFONT hf); #endif - +#endif + +__kernel_entry W32KAPI BOOL APIENTRY NtGdiAddRemoteMMInstanceToDC( _In_ HDC hdc, - _In_ DOWNLOADDESIGNVECTOR *pddv, + _In_reads_bytes_(cjDDV) DOWNLOADDESIGNVECTOR *pddv, _In_ ULONG cjDDV); +__kernel_entry W32KAPI BOOL APIENTRY NtGdiUnloadPrinterDriver( - _In_z_bytecount_(cbDriverName) LPWSTR pDriverName, + _In_reads_bytes_(cbDriverName) LPWSTR pDriverName, _In_ ULONG cbDriverName); +__kernel_entry +W32KAPI +BOOL +APIENTRY +NtGdiInitSpool( + VOID); + +__kernel_entry +W32KAPI +INT +APIENTRY +NtGdiGetSpoolMessage( + DWORD u1, + DWORD u2, + DWORD u3, + DWORD u4); + +__kernel_entry W32KAPI BOOL APIENTRY @@ -2775,6 +3093,7 @@ _In_ HDEV hdev, _In_ FLONG flHooks); +__kernel_entry W32KAPI BOOL APIENTRY @@ -2783,6 +3102,7 @@ _In_ RECTL *prcl, _In_ ULONG iColor); +__kernel_entry W32KAPI HBITMAP APIENTRY @@ -2793,30 +3113,35 @@ _In_ FLONG fl, _In_opt_ PVOID pvBits); +__kernel_entry W32KAPI BOOL APIENTRY NtGdiEngDeleteSurface( _In_ HSURF hsurf); +__kernel_entry W32KAPI SURFOBJ* APIENTRY NtGdiEngLockSurface( _In_ HSURF hsurf); -W32KAPI -VOID +__kernel_entry +W32KAPI +NTSTATUS APIENTRY NtGdiEngUnlockSurface( _In_ SURFOBJ *pso); +__kernel_entry W32KAPI BOOL APIENTRY NtGdiEngMarkBandingSurface( _In_ HSURF hsurf); +__kernel_entry W32KAPI HSURF APIENTRY @@ -2825,6 +3150,7 @@ _In_ SIZEL sizl, _In_ ULONG iFormatCompat); +__kernel_entry W32KAPI HBITMAP APIENTRY @@ -2833,6 +3159,7 @@ _In_ SIZEL sizl, _In_ ULONG iFormatCompat); +__kernel_entry W32KAPI BOOL APIENTRY @@ -2844,6 +3171,7 @@ _In_ RECTL *prclDst, _In_ POINTL *pptlSrc); +__kernel_entry W32KAPI BOOL APIENTRY @@ -2857,9 +3185,10 @@ _In_ POINTL *pptlHTOrg, _In_ RECTL *prclDest, _In_ RECTL *prclSrc, - _When_(psoMask, _In_) POINTL *pptlMask, + _In_opt_ POINTL *pptlMask, _In_ ULONG iMode); +__kernel_entry W32KAPI BOOL APIENTRY @@ -2870,12 +3199,13 @@ _In_opt_ CLIPOBJ *pco, _In_opt_ XLATEOBJ *pxlo, _In_ RECTL *prclTrg, - _When_(psoSrc, _In_) POINTL *pptlSrc, - _When_(psoMask, _In_) POINTL *pptlMask, + _In_opt_ POINTL *pptlSrc, + _In_opt_ POINTL *pptlMask, _In_opt_ BRUSHOBJ *pbo, - _When_(pbo, _In_) POINTL *pptlBrush, + _In_opt_ POINTL *pptlBrush, _In_ ROP4 rop4); +__kernel_entry W32KAPI BOOL APIENTRY @@ -2889,9 +3219,10 @@ _In_ POINTL *pptlBrushOrg, _In_ POINTFIX *pptfx, _In_ RECTL *prcl, - _When_(psoMsk, _In_) POINTL *pptl, + _In_opt_ POINTL *pptl, _In_ ULONG iMode); +__kernel_entry W32KAPI HPALETTE APIENTRY @@ -2903,592 +3234,688 @@ _In_ FLONG flGreen, _In_ FLONG flBlue); +__kernel_entry W32KAPI BOOL APIENTRY NtGdiEngDeletePalette( _In_ HPALETTE hPal); +__kernel_entry W32KAPI BOOL APIENTRY NtGdiEngStrokePath( - 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); + +__kernel_entry W32KAPI BOOL APIENTRY NtGdiEngFillPath( - IN SURFOBJ *pso, - IN PATHOBJ *ppo, - IN CLIPOBJ *pco, - IN BRUSHOBJ *pbo, - IN POINTL *pptlBrushOrg, - IN MIX mix, - IN FLONG flOptions -); - + _In_ SURFOBJ *pso, + _In_ PATHOBJ *ppo, + _In_ CLIPOBJ *pco, + _In_ BRUSHOBJ *pbo, + _In_ POINTL *pptlBrushOrg, + _In_ MIX mix, + _In_ FLONG flOptions); + +__kernel_entry W32KAPI BOOL APIENTRY NtGdiEngStrokeAndFillPath( - 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 mix, - IN FLONG flOptions -); - + _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 mix, + _In_ FLONG flOptions); + +__kernel_entry W32KAPI BOOL APIENTRY NtGdiEngPaint( - 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); + +__kernel_entry W32KAPI BOOL APIENTRY NtGdiEngLineTo( - IN SURFOBJ *pso, - IN CLIPOBJ *pco, - IN BRUSHOBJ *pbo, + _In_ SURFOBJ *pso, + _In_ CLIPOBJ *pco, + _In_ BRUSHOBJ *pbo, _In_ LONG x1, _In_ LONG y1, _In_ LONG x2, _In_ LONG y2, - IN RECTL *prclBounds, - IN MIX mix -); - + _In_ RECTL *prclBounds, + _In_ MIX mix); + +__kernel_entry W32KAPI BOOL APIENTRY NtGdiEngAlphaBlend( - IN SURFOBJ *psoDest, - IN SURFOBJ *psoSrc, - IN CLIPOBJ *pco, - IN XLATEOBJ *pxlo, - IN RECTL *prclDest, - IN RECTL *prclSrc, - IN BLENDOBJ *pBlendObj -); - + _In_ SURFOBJ *psoDest, + _In_ SURFOBJ *psoSrc, + _In_ CLIPOBJ *pco, + _In_ XLATEOBJ *pxlo, + _In_ RECTL *prclDest, + _In_ RECTL *prclSrc, + _In_ BLENDOBJ *pBlendObj); + +__kernel_entry W32KAPI BOOL APIENTRY NtGdiEngGradientFill( - IN SURFOBJ *psoDest, - IN CLIPOBJ *pco, - IN XLATEOBJ *pxlo, - IN TRIVERTEX *pVertex, + _In_ SURFOBJ *psoDest, + _In_ CLIPOBJ *pco, + _In_ XLATEOBJ *pxlo, + _In_reads_(nVertex) TRIVERTEX *pVertex, _In_ ULONG nVertex, - IN PVOID pMesh, + _In_ /* _In_reads_(nMesh) */ PVOID pMesh, _In_ ULONG nMesh, - IN RECTL *prclExtents, - IN POINTL *pptlDitherOrg, - _In_ ULONG ulMode -); - + _In_ RECTL *prclExtents, + _In_ POINTL *pptlDitherOrg, + _In_ ULONG ulMode); + +__kernel_entry W32KAPI BOOL APIENTRY NtGdiEngTransparentBlt( - IN SURFOBJ *psoDst, - IN SURFOBJ *psoSrc, - IN CLIPOBJ *pco, - IN XLATEOBJ *pxlo, - IN RECTL *prclDst, - IN RECTL *prclSrc, + _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_ ULONG ulReserved); + +__kernel_entry W32KAPI BOOL APIENTRY NtGdiEngTextOut( - 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, + _In_ RECTL *prclExtra, + _In_ RECTL *prclOpaque, + _In_ BRUSHOBJ *pboFore, + _In_ BRUSHOBJ *pboOpaque, + _In_ POINTL *pptlOrg, + _In_ MIX mix); + +__kernel_entry W32KAPI BOOL APIENTRY NtGdiEngStretchBltROP( - IN SURFOBJ *psoTrg, - IN SURFOBJ *psoSrc, - IN SURFOBJ *psoMask, - IN CLIPOBJ *pco, - IN XLATEOBJ *pxlo, - IN COLORADJUSTMENT *pca, - IN POINTL *pptlBrushOrg, - IN RECTL *prclTrg, - IN RECTL *prclSrc, - IN POINTL *pptlMask, + _In_ SURFOBJ *psoTrg, + _In_ SURFOBJ *psoSrc, + _In_ SURFOBJ *psoMask, + _In_ CLIPOBJ *pco, + _In_ XLATEOBJ *pxlo, + _In_ COLORADJUSTMENT *pca, + _In_ POINTL *pptlBrushOrg, + _In_ RECTL *prclTrg, + _In_ RECTL *prclSrc, + _In_ POINTL *pptlMask, _In_ ULONG iMode, - IN BRUSHOBJ *pbo, - IN ROP4 rop4 -); - + _In_ BRUSHOBJ *pbo, + _In_ ROP4 rop4); + +__kernel_entry W32KAPI ULONG APIENTRY NtGdiXLATEOBJ_cGetPalette( - IN XLATEOBJ *pxlo, + _In_ XLATEOBJ *pxlo, _In_ ULONG iPal, _In_ ULONG cPal, - OUT ULONG *pPal -); - + _Out_writes_(cPal) ULONG *pPal); + +__kernel_entry W32KAPI ULONG APIENTRY NtGdiCLIPOBJ_cEnumStart( - IN CLIPOBJ *pco, + _In_ CLIPOBJ *pco, _In_ BOOL bAll, _In_ ULONG iType, _In_ ULONG iDirection, - _In_ ULONG cLimit -); - + _In_ ULONG cLimit); + +__kernel_entry W32KAPI BOOL APIENTRY NtGdiCLIPOBJ_bEnum( - IN CLIPOBJ *pco, + _In_ CLIPOBJ *pco, _In_ ULONG cj, - OUT ULONG *pul -); - + _Out_writes_bytes_(cj) ULONG *pul); + +__kernel_entry W32KAPI PATHOBJ* APIENTRY NtGdiCLIPOBJ_ppoGetPath( - IN CLIPOBJ *pco -); - + _In_ CLIPOBJ *pco); + +__kernel_entry W32KAPI CLIPOBJ* APIENTRY -NtGdiEngCreateClip(VOID); - -W32KAPI -VOID +NtGdiEngCreateClip( + VOID); + +__kernel_entry +W32KAPI +NTSTATUS APIENTRY NtGdiEngDeleteClip( - IN CLIPOBJ*pco -); - + _In_ CLIPOBJ*pco); + +__kernel_entry W32KAPI PVOID APIENTRY NtGdiBRUSHOBJ_pvAllocRbrush( - IN BRUSHOBJ *pbo, - _In_ ULONG cj -); - + _In_ BRUSHOBJ *pbo, + _In_ ULONG cj); + +__kernel_entry W32KAPI PVOID APIENTRY NtGdiBRUSHOBJ_pvGetRbrush( - IN BRUSHOBJ *pbo -); - + _In_ BRUSHOBJ *pbo); + +__kernel_entry W32KAPI ULONG APIENTRY NtGdiBRUSHOBJ_ulGetBrushColor( - IN BRUSHOBJ *pbo -); - + _In_ BRUSHOBJ *pbo); + +__kernel_entry W32KAPI HANDLE APIENTRY NtGdiBRUSHOBJ_hGetColorTransform( - IN BRUSHOBJ *pbo -); - + _In_ BRUSHOBJ *pbo); + +__kernel_entry W32KAPI BOOL APIENTRY NtGdiXFORMOBJ_bApplyXform( - IN XFORMOBJ *pxo, + _In_ XFORMOBJ *pxo, _In_ ULONG iMode, _In_ ULONG cPoints, - IN PVOID pvIn, - OUT PVOID pvOut -); - + _In_reads_(cPoints) PPOINTL pptIn, + _Out_writes_(cPoints) PPOINTL pptOut); + +__kernel_entry W32KAPI ULONG APIENTRY NtGdiXFORMOBJ_iGetXform( - IN XFORMOBJ *pxo, - OUT OPTIONAL XFORML *pxform -); - -W32KAPI -VOID + _In_ XFORMOBJ *pxo, + _Out_opt_ XFORML *pxform); + +__kernel_entry +W32KAPI +NTSTATUS APIENTRY NtGdiFONTOBJ_vGetInfo( - IN FONTOBJ *pfo, + _In_ FONTOBJ *pfo, _In_ ULONG cjSize, - OUT FONTINFO *pfi -); - + _Out_writes_bytes_(cjSize) FONTINFO *pfi); + +__kernel_entry W32KAPI ULONG APIENTRY NtGdiFONTOBJ_cGetGlyphs( - IN FONTOBJ *pfo, + _In_ FONTOBJ *pfo, _In_ ULONG iMode, _In_ ULONG cGlyph, - IN HGLYPH *phg, - OUT PVOID *ppvGlyph -); - + _In_ HGLYPH *phg, + _At_((GLYPHDATA**)ppvGlyph, _Outptr_) PVOID *ppvGlyph); + +__kernel_entry W32KAPI XFORMOBJ* APIENTRY NtGdiFONTOBJ_pxoGetXform( - IN FONTOBJ *pfo -); - + _In_ FONTOBJ *pfo); + +__kernel_entry W32KAPI IFIMETRICS* APIENTRY NtGdiFONTOBJ_pifi( - IN FONTOBJ *pfo -); - + _In_ FONTOBJ *pfo); + +__kernel_entry W32KAPI FD_GLYPHSET* APIENTRY NtGdiFONTOBJ_pfdg( - IN FONTOBJ *pfo -); - + _In_ FONTOBJ *pfo); + +__kernel_entry W32KAPI ULONG APIENTRY NtGdiFONTOBJ_cGetAllGlyphHandles( - IN FONTOBJ *pfo, - OUT OPTIONAL HGLYPH *phg -); - + _In_ FONTOBJ *pfo, + _Out_opt_ _Post_count_(return) HGLYPH *phg); + +__kernel_entry W32KAPI PVOID APIENTRY NtGdiFONTOBJ_pvTrueTypeFontFile( - IN FONTOBJ *pfo, - OUT ULONG *pcjFile -); - + _In_ FONTOBJ *pfo, + _Out_ ULONG *pcjFile); + +__kernel_entry W32KAPI PFD_GLYPHATTR APIENTRY NtGdiFONTOBJ_pQueryGlyphAttrs( - IN FONTOBJ *pfo, - _In_ ULONG iMode -); - + _In_ FONTOBJ *pfo, + _In_ ULONG iMode); + +__kernel_entry W32KAPI BOOL APIENTRY NtGdiSTROBJ_bEnum( - IN STROBJ *pstro, - OUT ULONG *pc, - OUT PGLYPHPOS *ppgpos -); - + _In_ STROBJ *pstro, + _Out_ ULONG *pc, + _Outptr_result_buffer_(*pc) PGLYPHPOS *ppgpos); + +__kernel_entry W32KAPI BOOL APIENTRY NtGdiSTROBJ_bEnumPositionsOnly( - IN STROBJ *pstro, - OUT ULONG *pc, - OUT PGLYPHPOS *ppgpos -); - -W32KAPI -VOID + _In_ STROBJ *pstro, + _Out_ ULONG *pc, + _Outptr_result_buffer_(*pc) PGLYPHPOS *ppgpos); + +__kernel_entry +W32KAPI +NTSTATUS APIENTRY NtGdiSTROBJ_vEnumStart( _Inout_ STROBJ *pstro); +__kernel_entry W32KAPI DWORD APIENTRY NtGdiSTROBJ_dwGetCodePage( - IN STROBJ *pstro -); - + _In_ STROBJ *pstro); + +__kernel_entry W32KAPI BOOL APIENTRY NtGdiSTROBJ_bGetAdvanceWidths( - IN STROBJ*pstro, + _In_ STROBJ*pstro, _In_ ULONG iFirst, _In_ ULONG c, - OUT POINTQF*pptqD -); - + _Out_writes_(c) POINTQF*pptqD); + +__kernel_entry W32KAPI FD_GLYPHSET* APIENTRY NtGdiEngComputeGlyphSet( _In_ INT nCodePage, _In_ INT nFirstChar, - _In_ INT cChars -); - + _In_ INT cChars); + +__kernel_entry W32KAPI ULONG APIENTRY NtGdiXLATEOBJ_iXlate( - IN XLATEOBJ *pxlo, - _In_ ULONG iColor -); - + _In_ XLATEOBJ *pxlo, + _In_ ULONG iColor); + +__kernel_entry W32KAPI HANDLE APIENTRY NtGdiXLATEOBJ_hGetColorTransform( - IN XLATEOBJ *pxlo -); - -W32KAPI -VOID + _In_ XLATEOBJ *pxlo); + +__kernel_entry +W32KAPI +NTSTATUS APIENTRY NtGdiPATHOBJ_vGetBounds( - IN PATHOBJ *ppo, - OUT PRECTFX prectfx -); - + _In_ PATHOBJ *ppo, + _Out_ PRECTFX prectfx); + +__kernel_entry W32KAPI BOOL APIENTRY NtGdiPATHOBJ_bEnum( - IN PATHOBJ *ppo, - OUT PATHDATA *ppd -); - -W32KAPI -VOID + _In_ PATHOBJ *ppo, + _Out_ PATHDATA *ppd); + +__kernel_entry +W32KAPI +NTSTATUS APIENTRY NtGdiPATHOBJ_vEnumStart( - IN PATHOBJ *ppo -); - -W32KAPI -VOID + _In_ PATHOBJ *ppo); + +__kernel_entry +W32KAPI +NTSTATUS APIENTRY NtGdiEngDeletePath( - IN PATHOBJ *ppo -); - -W32KAPI -VOID + _In_ PATHOBJ *ppo); + +__kernel_entry +W32KAPI +NTSTATUS APIENTRY NtGdiPATHOBJ_vEnumStartClipLines( - IN PATHOBJ *ppo, - IN CLIPOBJ *pco, - IN SURFOBJ *pso, - IN LINEATTRS *pla -); - + _In_ PATHOBJ *ppo, + _In_ CLIPOBJ *pco, + _In_ SURFOBJ *pso, + _In_ LINEATTRS *pla); + +__kernel_entry W32KAPI BOOL APIENTRY NtGdiPATHOBJ_bEnumClipLines( - IN PATHOBJ *ppo, + _In_ PATHOBJ *ppo, _In_ ULONG cb, - OUT CLIPLINE *pcl -); - + _Out_writes_bytes_(cb) CLIPLINE *pcl); + +__kernel_entry W32KAPI BOOL APIENTRY NtGdiEngCheckAbort( - IN SURFOBJ *pso -); - + _In_ SURFOBJ *pso); + +__kernel_entry W32KAPI DHPDEV APIENTRY NtGdiGetDhpdev( - IN HDEV hdev -); - + _In_ HDEV hdev); + +__kernel_entry W32KAPI LONG APIENTRY NtGdiHT_Get8BPPFormatPalette( - OUT OPTIONAL LPPALETTEENTRY pPaletteEntry, - IN USHORT RedGamma, - IN USHORT GreenGamma, - IN USHORT BlueGamma -); - + _Out_opt_ _Post_count_(return) LPPALETTEENTRY pPaletteEntry, + _In_ USHORT RedGamma, + _In_ USHORT GreenGamma, + _In_ USHORT BlueGamma); + +__kernel_entry W32KAPI LONG APIENTRY NtGdiHT_Get8BPPMaskPalette( - OUT OPTIONAL LPPALETTEENTRY pPaletteEntry, + _Out_opt_ _Post_count_(return) LPPALETTEENTRY pPaletteEntry, _In_ BOOL Use8BPPMaskPal, - IN BYTE CMYMask, - IN USHORT RedGamma, - IN USHORT GreenGamma, - IN USHORT BlueGamma -); - + _In_ BYTE CMYMask, + _In_ USHORT RedGamma, + _In_ USHORT GreenGamma, + _In_ USHORT BlueGamma); + +__kernel_entry W32KAPI BOOL APIENTRY NtGdiUpdateTransform( - _In_ HDC hdc -); - + _In_ HDC hdc); + +__kernel_entry W32KAPI DWORD APIENTRY NtGdiSetLayout( _In_ HDC hdc, _In_ LONG wox, - _In_ DWORD dwLayout -); - + _In_ DWORD dwLayout); + +__kernel_entry W32KAPI BOOL APIENTRY NtGdiMirrorWindowOrg( - _In_ HDC hdc -); - + _In_ HDC hdc); + +__kernel_entry W32KAPI LONG APIENTRY NtGdiGetDeviceWidth( - _In_ HDC hdc -); - + _In_ HDC hdc); + +__kernel_entry +W32KAPI +NTSTATUS +APIENTRY +NtGdiSetUMPDSandboxState( + _In_ BOOL bEnabled); + +__kernel_entry W32KAPI BOOL APIENTRY NtGdiSetPUMPDOBJ( - IN HUMPD humpd, + _In_opt_ HUMPD humpd, _In_ BOOL bStoreID, - OUT HUMPD *phumpd, - OUT BOOL *pbWOW64 -); - + _Inout_opt_ HUMPD *phumpd, + _Out_opt_ BOOL *pbWOW64); + +__kernel_entry W32KAPI BOOL APIENTRY NtGdiBRUSHOBJ_DeleteRbrush( - IN BRUSHOBJ *pbo, - IN BRUSHOBJ *pboB -); - + _In_opt_ BRUSHOBJ *pbo, + _In_opt_ BRUSHOBJ *pboB); + +__kernel_entry W32KAPI BOOL APIENTRY NtGdiUMPDEngFreeUserMem( - IN KERNEL_PVOID *ppv -); - + _In_ KERNEL_PVOID *ppv); + +__kernel_entry W32KAPI HBITMAP APIENTRY NtGdiSetBitmapAttributes( - IN HBITMAP hbm, - _In_ DWORD dwFlags -); - + _In_ HBITMAP hbm, + _In_ DWORD dwFlags); + +__kernel_entry W32KAPI HBITMAP APIENTRY NtGdiClearBitmapAttributes( - IN HBITMAP hbm, - _In_ DWORD dwFlags -); - + _In_ HBITMAP hbm, + _In_ DWORD dwFlags); + +__kernel_entry W32KAPI HBRUSH APIENTRY NtGdiSetBrushAttributes( _In_ HBRUSH hbm, - _In_ DWORD dwFlags -); - + _In_ DWORD dwFlags); + +__kernel_entry W32KAPI HBRUSH APIENTRY NtGdiClearBrushAttributes( _In_ HBRUSH hbm, - _In_ DWORD dwFlags -); - + _In_ DWORD dwFlags); + +__kernel_entry W32KAPI BOOL APIENTRY NtGdiDrawStream( _In_ HDC hdcDst, _In_ ULONG cjIn, - IN VOID *pvIn -); - + _In_reads_bytes_(cjIn) VOID *pvIn); + +__kernel_entry W32KAPI BOOL APIENTRY NtGdiMakeObjectXferable( _In_ HANDLE h, - _In_ DWORD dwProcessId -); - + _In_ DWORD dwProcessId); + +__kernel_entry W32KAPI BOOL APIENTRY NtGdiMakeObjectUnXferable( - _In_ HANDLE h -); - -W32KAPI -BOOL -APIENTRY -NtGdiInitSpool(VOID); - -/* FIXME wrong prototypes fix the build */ -W32KAPI -INT -APIENTRY -NtGdiGetSpoolMessage( DWORD u1, - DWORD u2, - DWORD u3, - DWORD u4); -#endif + _In_ HANDLE h); + +#ifdef PRIVATE_DWM_INTERFACE + +__kernel_entry +W32KAPI +BOOL +NtGdiSfmRegisterLogicalSurfaceForSignaling( + _In_ HLSURF hlsurf, + BOOL fSignalOnDirty); + +__kernel_entry +W32KAPI +BOOL +NtGdiDwmGetHighColorMode( + _Out_ DXGI_FORMAT* pdxgiFormat); + +__kernel_entry +W32KAPI +BOOL +NtGdiDwmSetHighColorMode( + _In_ DXGI_FORMAT dxgiFormat); + +__kernel_entry +W32KAPI +HANDLE +NtGdiDwmCaptureScreen( + _In_ const RECT* prcCapture, + _In_ DXGI_FORMAT dxgiFormat); + +__kernel_entry +W32KAPI +NTSTATUS +APIENTRY +NtGdiDdCreateFullscreenSprite( + _In_ HDC hdc, + _In_ COLORREF crKey, + _Out_ HANDLE* phSprite, + _Out_ HDC* phdcSprite); + +__kernel_entry +W32KAPI +NTSTATUS +APIENTRY +NtGdiDdNotifyFullscreenSpriteUpdate( + _In_ HDC hdc, + _In_ HANDLE hSprite); + +__kernel_entry +W32KAPI +NTSTATUS +APIENTRY +NtGdiDdDestroyFullscreenSprite( + _In_ HDC hdc, + _In_ HANDLE hSprite); + +__kernel_entry +W32KAPI +ULONG +APIENTRY +NtGdiDdQueryVisRgnUniqueness( + VOID); + +__kernel_entry +W32KAPI +BOOL +APIENTRY +NtGdiHLSurfGetInformation( + _In_ HLSURF hlsurf, + _In_ HLSURF_INFORMATION_CLASS InformationClass, + _In_reads_bytes_opt_(*pcjInfoBuffer) PVOID pvInfoBuffer, + _Inout_ PULONG pcjInfoBuffer); + +__kernel_entry +W32KAPI +BOOL +APIENTRY +NtGdiHLSurfSetInformation( + _In_ HLSURF hlsurf, + _In_ HLSURF_INFORMATION_CLASS InformationClass, + _In_reads_bytes_opt_(cjInfoBuffer) PVOID pvInfoBuffer, + _In_ ULONG cjInfoBuffer); + +__kernel_entry +W32KAPI +BOOL +APIENTRY +NtGdiDwmCreatedBitmapRemotingOutput( + VOID); + +__kernel_entry +W32KAPI +NTSTATUS +APIENTRY +NtGdiGetCurrentDpiInfo( + _In_ HMONITOR hmon, + _Out_ PVOID pvStruct); + +#endif /* PRIVATE_DWM_INTERFACE */ + +#endif /* _NTGDI_ */ Modified: trunk/reactos/win32ss/gdi/eng/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/surface.c?… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/surface.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/surface.c [iso-8859-1] Tue Mar 10 00:10:33 2015 @@ -606,12 +606,15 @@ return psurf ? &psurf->SurfObj : NULL; } -VOID -APIENTRY -NtGdiEngUnlockSurface(IN SURFOBJ *pso) +__kernel_entry +NTSTATUS +APIENTRY +NtGdiEngUnlockSurface( + _In_ SURFOBJ *pso) { UNIMPLEMENTED; ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; } VOID Modified: trunk/reactos/win32ss/gdi/eng/umpdstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/umpdstubs.… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/umpdstubs.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/umpdstubs.c [iso-8859-1] Tue Mar 10 00:10:33 2015 @@ -206,12 +206,13 @@ return NULL; } -VOID +NTSTATUS APIENTRY NtGdiEngDeleteClip( CLIPOBJ *pco) { UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } BOOL @@ -223,12 +224,13 @@ return FALSE; } -VOID +NTSTATUS APIENTRY NtGdiEngDeletePath( IN PATHOBJ *ppo) { UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } BOOL @@ -431,7 +433,7 @@ return FALSE; } -VOID +NTSTATUS APIENTRY NtGdiFONTOBJ_vGetInfo( IN FONTOBJ *pfo, @@ -439,6 +441,7 @@ OUT FONTINFO *pfi) { UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } XFORMOBJ* @@ -537,13 +540,14 @@ return FALSE; } -VOID +NTSTATUS APIENTRY NtGdiPATHOBJ_vGetBounds( IN PATHOBJ *ppo, OUT PRECTFX prectfx) { UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } BOOL @@ -556,15 +560,16 @@ return FALSE; } -VOID +NTSTATUS APIENTRY NtGdiPATHOBJ_vEnumStart( IN PATHOBJ *ppo) { UNIMPLEMENTED; -} - -VOID + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS APIENTRY NtGdiPATHOBJ_vEnumStartClipLines( IN PATHOBJ *ppo, @@ -573,6 +578,7 @@ IN LINEATTRS *pla) { UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } BOOL @@ -620,12 +626,13 @@ return FALSE; } -VOID +NTSTATUS APIENTRY NtGdiSTROBJ_vEnumStart( IN STROBJ *pstro) { UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } DWORD @@ -643,8 +650,8 @@ IN XFORMOBJ *pxo, IN ULONG iMode, IN ULONG cPoints, - IN PVOID pvIn, - OUT PVOID pvOut) + _In_reads_(cPoints) PPOINTL pptIn, + _Out_writes_(cPoints) PPOINTL pptOut) { UNIMPLEMENTED; return FALSE; Modified: trunk/reactos/win32ss/gdi/ntgdi/dclife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dclife.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dclife.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dclife.c [iso-8859-1] Tue Mar 10 00:10:33 2015 @@ -679,7 +679,7 @@ ULONG iType, BOOL bDisplay, HANDLE hspool, - VOID *pDriverInfo2, + DRIVER_INFO_2W *pDriverInfo2, VOID *pUMdhpdev) { UNICODE_STRING ustrDevice; Modified: trunk/reactos/win32ss/gdi/ntgdi/dcstate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dcstate.… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dcstate.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dcstate.c [iso-8859-1] Tue Mar 10 00:10:33 2015 @@ -105,14 +105,13 @@ return TRUE; } - BOOL APIENTRY NtGdiResetDC( IN HDC hdc, IN LPDEVMODEW pdm, OUT PBOOL pbBanding, - IN OPTIONAL VOID *pDriverInfo2, + IN OPTIONAL DRIVER_INFO_2W *pDriverInfo2, OUT VOID *ppUMdhpdev) { UNIMPLEMENTED; Modified: trunk/reactos/win32ss/gdi/ntgdi/gdibatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/gdibatch… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/gdibatch.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/gdibatch.c [iso-8859-1] Tue Mar 10 00:10:33 2015 @@ -146,11 +146,14 @@ * * Flushes the calling thread's current batch. */ -VOID +__kernel_entry +NTSTATUS APIENTRY -NtGdiFlush(VOID) -{ - SynchonizeDriver(GCAPS2_SYNCFLUSH); +NtGdiFlush( + VOID) +{ + SynchonizeDriver(GCAPS2_SYNCFLUSH); + return STATUS_SUCCESS; } /* Modified: trunk/reactos/win32ss/reactx/ntddraw/ddsurf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/reactx/ntddraw/dds… ============================================================================== --- trunk/reactos/win32ss/reactx/ntddraw/ddsurf.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/reactx/ntddraw/ddsurf.c [iso-8859-1] Tue Mar 10 00:10:33 2015 @@ -19,7 +19,7 @@ NtGdiDdDestroySurface(HANDLE hSurface, BOOL bRealDestroy) { PGD_DXDDDESTROYSURFACE pfnDdDestroySurface = (PGD_DXDDDESTROYSURFACE)gpDxFuncs[DXG_INDEX_DxDdDestroySurface].pfn; - + if (pfnDdDestroySurface == NULL) { DPRINT1("Warning: no pfnDdDestroySurface"); @@ -42,7 +42,7 @@ PDD_FLIPDATA puFlipData) { PGD_DXDDFLIP pfnDdDdFlip = (PGD_DXDDFLIP)gpDxFuncs[DXG_INDEX_DxDdFlip].pfn; - + if (pfnDdDdFlip == NULL) { DPRINT1("Warning: no pfnDdDdFlip"); @@ -63,7 +63,7 @@ HDC hdcClip) { PGD_DXDDLOCK pfnDdLock = (PGD_DXDDLOCK)gpDxFuncs[DXG_INDEX_DxDdLock].pfn; - + if (pfnDdLock == NULL) { DPRINT1("Warning: no pfnDdLock"); @@ -79,11 +79,11 @@ /************************************************************************/ DWORD APIENTRY -NtGdiDdUnlock(HANDLE hSurface, +NtGdiDdUnlock(HANDLE hSurface, PDD_UNLOCKDATA puUnlockData) { PGD_DXDDUNLOCK pfnDdUnlock = (PGD_DXDDUNLOCK)gpDxFuncs[DXG_INDEX_DxDdUnlock].pfn; - + if (pfnDdUnlock == NULL) { DPRINT1("Warning: no pfnDdUnlock"); @@ -104,7 +104,7 @@ PDD_BLTDATA puBltData) { PGD_DDBLT pfnDdBlt = (PGD_DDBLT)gpDxFuncs[DXG_INDEX_DxDdBlt].pfn; - + if (pfnDdBlt == NULL) { DPRINT1("Warning: no pfnDdBlt"); @@ -124,7 +124,7 @@ PDD_SETCOLORKEYDATA puSetColorKeyData) { PGD_DXDDSETCOLORKEY pfnDdSetColorKey = (PGD_DXDDSETCOLORKEY)gpDxFuncs[DXG_INDEX_DxDdSetColorKey].pfn; - + if (pfnDdSetColorKey == NULL) { DPRINT1("Warning: no pfnDdSetColorKey"); @@ -147,7 +147,7 @@ PDD_ADDATTACHEDSURFACEDATA puAddAttachedSurfaceData) { PGD_DDADDATTACHEDSURFACE pfnDdAddAttachedSurface = (PGD_DDADDATTACHEDSURFACE)gpDxFuncs[DXG_INDEX_DxDdAddAttachedSurface].pfn; - + if (pfnDdAddAttachedSurface == NULL) { DPRINT1("Warning: no pfnDdAddAttachedSurface"); @@ -167,7 +167,7 @@ PDD_GETBLTSTATUSDATA puGetBltStatusData) { PGD_DXDDGETBLTSTATUS pfnDdGetBltStatus = (PGD_DXDDGETBLTSTATUS)gpDxFuncs[DXG_INDEX_DxDdGetBltStatus].pfn; - + if (pfnDdGetBltStatus == NULL) { DPRINT1("Warning: no pfnDdGetBltStatus"); @@ -187,7 +187,7 @@ PDD_GETFLIPSTATUSDATA puGetFlipStatusData) { PGD_DXDDGETFLIPSTATUS pfnDdGetFlipStatus = (PGD_DXDDGETFLIPSTATUS)gpDxFuncs[DXG_INDEX_DxDdGetFlipStatus].pfn; - + if (pfnDdGetFlipStatus == NULL) { DPRINT1("Warning: no pfnDdGetFlipStatus"); @@ -208,7 +208,7 @@ PDD_UPDATEOVERLAYDATA puUpdateOverlayData) { PGD_DXDDUPDATEOVERLAY pfnDdUpdateOverlay = (PGD_DXDDUPDATEOVERLAY)gpDxFuncs[DXG_INDEX_DxDdUpdateOverlay].pfn; - + if (pfnDdUpdateOverlay == NULL) { DPRINT1("Warning: no pfnDdUpdateOverlay"); @@ -230,7 +230,7 @@ PDD_SETOVERLAYPOSITIONDATA puSetOverlayPositionData) { PGD_DXDDSETOVERLAYPOSITION pfnDdSetOverlayPosition = (PGD_DXDDSETOVERLAYPOSITION)gpDxFuncs[DXG_INDEX_DxDdSetOverlayPosition].pfn; - + if (pfnDdSetOverlayPosition == NULL) { DPRINT1("Warning: no pfnDdSetOverlayPosition"); @@ -257,7 +257,7 @@ PDD_BLTDATA puBltData) { PGD_DDALPHABLT pfnDdAlphaBlt = (PGD_DDALPHABLT)gpDxFuncs[DXG_INDEX_DxDdAlphaBlt].pfn; - + if (pfnDdAlphaBlt == NULL) { DPRINT1("Warning: no pfnDdAlphaBlt"); @@ -278,7 +278,7 @@ ) { PGD_DDATTACHSURFACE pfnDdAttachSurface = (PGD_DDATTACHSURFACE)gpDxFuncs[DXG_INDEX_DxDdAttachSurface].pfn; - + if (pfnDdAttachSurface == NULL) { DPRINT1("Warning: no pfnDdAttachSurface"); @@ -296,16 +296,17 @@ But it say it return either DDHAL_DRIVER_NOTHANDLED or DDHAL_DRIVER_HANDLED so I guess it is a typo in MSDN for this prototype for the info contradicts itself. */ -DWORD +NTSTATUS APIENTRY NtGdiDdUnattachSurface(HANDLE hSurface, HANDLE hSurfaceAttached) { - PGD_DXDDUNATTACHSURFACE pfnDdUnattachSurface = (PGD_DXDDUNATTACHSURFACE)gpDxFuncs[DXG_INDEX_DxDdUnattachSurface].pfn; + PGD_DXDDUNATTACHSURFACE pfnDdUnattachSurface = (PGD_DXDDUNATTACHSURFACE)gpDxFuncs[DXG_INDEX_DxDdUnattachSurface].pfn; if (pfnDdUnattachSurface == NULL) { DPRINT1("Warning: no pfnDdUnattachSurface"); - return DDHAL_DRIVER_NOTHANDLED; + //return DDHAL_DRIVER_NOTHANDLED; + return STATUS_NOT_IMPLEMENTED; } DPRINT1("Calling on dxg.sys pfnDdUnattachSurface");

1 0

[tkreuzer] 66640: [PSDK] struct _DRVENABLEDATA -> struct tagDRVENABLEDATA
by tkreuzer＠svn.reactos.org 10 Mar '15

10 Mar '15

Author: tkreuzer Date: Tue Mar 10 00:10:09 2015 New Revision: 66640 URL: http://svn.reactos.org/svn/reactos?rev=66640&view=rev Log: [PSDK] struct _DRVENABLEDATA -> struct tagDRVENABLEDATA 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 Mar 10 00:10:09 2015 @@ -538,7 +538,7 @@ #define DDI_DRIVER_VERSION_NT5_01 0x00030100 #define DDI_DRIVER_VERSION_NT5_01_SP1 0x00030101 -typedef struct _DRVENABLEDATA { +typedef struct tagDRVENABLEDATA { ULONG iDriverVersion; ULONG c; DRVFN *pdrvfn; @@ -2351,8 +2351,7 @@ BOOL APIENTRY EngRestoreFloatingPointState( - _In_reads_(_Inexpressible_(statesize)) - PVOID pBuffer); + _In_reads_(_Inexpressible_(statesize)) PVOID pBuffer); _Check_return_ _Success_(((pBuffer != NULL && cjBufferSize != 0) && return == 1) ||

1 0

[tkreuzer] 66639: [CMAKE] Make warning C4716 (function must return a value) an error on MSVC
by tkreuzer＠svn.reactos.org 10 Mar '15

10 Mar '15

Author: tkreuzer Date: Tue Mar 10 00:09:58 2015 New Revision: 66639 URL: http://svn.reactos.org/svn/reactos?rev=66639&view=rev Log: [CMAKE] Make warning C4716 (function must return a value) an error on MSVC Modified: trunk/reactos/cmake/msvc.cmake Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=66639… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Tue Mar 10 00:09:58 2015 @@ -57,7 +57,8 @@ # - C4229: modifiers on data are ignored # - C4700: uninitialized variable usage # - C4603: macro is not defined or definition is different after precompiled header use -add_compile_flags("/we4013 /we4020 /we4022 /we4047 /we4098 /we4113 /we4129 /we4163 /we4229 /we4700 /we4603") +# - C4716: function must return a value +add_compile_flags("/we4013 /we4020 /we4022 /we4047 /we4098 /we4113 /we4129 /we4163 /we4229 /we4700 /we4603 /we4716") # Enable warnings above the default level, but don't treat them as errors: # - C4115: named type definition in parentheses

1 0

[tkreuzer] 66638: [WIN32K] Fix bug in EngMapEvent
by tkreuzer＠svn.reactos.org 10 Mar '15

10 Mar '15

Author: tkreuzer Date: Tue Mar 10 00:09:41 2015 New Revision: 66638 URL: http://svn.reactos.org/svn/reactos?rev=66638&view=rev Log: [WIN32K] Fix bug in EngMapEvent Modified: trunk/reactos/win32ss/gdi/eng/engevent.c Modified: trunk/reactos/win32ss/gdi/eng/engevent.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/engevent.c… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/engevent.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/engevent.c [iso-8859-1] Tue Mar 10 00:09:41 2015 @@ -119,6 +119,7 @@ _Reserved_ PVOID Reserved3) { PENG_EVENT EngEvent; + PVOID pvEvent; NTSTATUS Status; /* Allocate memory for the event structure */ @@ -132,16 +133,17 @@ EngEvent->pKEvent = NULL; /* Create a handle, and have Ob fill out the pKEvent field */ - Status = ObReferenceObjectByHandle(EngEvent, + Status = ObReferenceObjectByHandle(hUserObject, EVENT_ALL_ACCESS, *ExEventObjectType, UserMode, - &EngEvent->pKEvent, + &pvEvent, NULL); if (NT_SUCCESS(Status)) { /* Pulse the event and set that it's mapped by user */ - KePulseEvent(EngEvent->pKEvent, EVENT_INCREMENT, FALSE); + KePulseEvent(pvEvent, EVENT_INCREMENT, FALSE); + EngEvent->pKEvent = pvEvent; EngEvent->fFlags |= ENG_EVENT_USERMAPPED; } else

1 0

[tkreuzer] 66637: [PSDK] Fix NULL-termination bugs in ntstrunsafe.h
by tkreuzer＠svn.reactos.org 10 Mar '15

10 Mar '15

Author: tkreuzer Date: Tue Mar 10 00:09:30 2015 New Revision: 66637 URL: http://svn.reactos.org/svn/reactos?rev=66637&view=rev Log: [PSDK] Fix NULL-termination bugs in ntstrunsafe.h Modified: trunk/reactos/include/ddk/ntstrsafe.h Modified: trunk/reactos/include/ddk/ntstrsafe.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntstrsafe.h?re… ============================================================================== --- trunk/reactos/include/ddk/ntstrsafe.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntstrsafe.h [iso-8859-1] Tue Mar 10 00:09:30 2015 @@ -117,7 +117,14 @@ _In_ size_t cchDest, _In_ NTSTRSAFE_PCSTR pszSrc) { - return (cchDest > NTSTRSAFE_MAX_CCH ? STATUS_INVALID_PARAMETER : RtlStringCopyWorkerA(pszDest,cchDest,pszSrc)); + if (cchDest > NTSTRSAFE_MAX_CCH) + { + if (cchDest > 0) + *pszDest = '\0'; + return STATUS_INVALID_PARAMETER; + } + + return RtlStringCopyWorkerA(pszDest, cchDest, pszSrc); } NTSTRSAFEAPI @@ -127,7 +134,12 @@ _In_ NTSTRSAFE_PCWSTR pszSrc) { if (cchDest > NTSTRSAFE_MAX_CCH) - return STATUS_INVALID_PARAMETER; + { + if (cchDest > 0) + *pszDest = '\0'; + return STATUS_INVALID_PARAMETER; + } + return RtlStringCopyWorkerW(pszDest,cchDest,pszSrc); } @@ -149,8 +161,13 @@ _In_ size_t cbDest, _In_ NTSTRSAFE_PCSTR pszSrc) { - if (cbDest > NTSTRSAFE_MAX_CCH) - return STATUS_INVALID_PARAMETER; + size_t cchDest = cbDest / sizeof(char); + if (cchDest > NTSTRSAFE_MAX_CCH) + { + if (cchDest > 0) + *pszDest = '\0'; + return STATUS_INVALID_PARAMETER; + } return RtlStringCopyWorkerA(pszDest,cbDest,pszSrc); } @@ -162,7 +179,11 @@ { size_t cchDest = cbDest / sizeof(wchar_t); if (cchDest > NTSTRSAFE_MAX_CCH) - return STATUS_INVALID_PARAMETER; + { + if (cchDest > 0) + *pszDest = '\0'; + return STATUS_INVALID_PARAMETER; + } return RtlStringCopyWorkerW(pszDest,cchDest,pszSrc); } @@ -194,7 +215,11 @@ _In_ STRSAFE_DWORD dwFlags) { if (cchDest > NTSTRSAFE_MAX_CCH) - return STATUS_INVALID_PARAMETER; + { + if (cchDest > 0) + *pszDest = '\0'; + return STATUS_INVALID_PARAMETER; + } return RtlStringCopyExWorkerA(pszDest,cchDest,cchDest,pszSrc,ppszDestEnd,pcchRemaining,dwFlags); } @@ -207,10 +232,15 @@ _Out_opt_ size_t *pcchRemaining, _In_ STRSAFE_DWORD dwFlags) { - size_t cbDest; - if (cchDest > NTSTRSAFE_MAX_CCH) - return STATUS_INVALID_PARAMETER; - cbDest = cchDest * sizeof(wchar_t); + size_t cbDest = cchDest * sizeof(wchar_t); + + if (cchDest > NTSTRSAFE_MAX_CCH) + { + if (cchDest > 0) + *pszDest = L'\0'; + return STATUS_INVALID_PARAMETER; + } + return RtlStringCopyExWorkerW(pszDest,cchDest,cbDest,pszSrc,ppszDestEnd,pcchRemaining,dwFlags); } @@ -242,9 +272,16 @@ _In_ STRSAFE_DWORD dwFlags) { NTSTATUS Status; + size_t cchDest = cbDest / sizeof(char); size_t cchRemaining = 0; - if (cbDest > NTSTRSAFE_MAX_CCH) - return STATUS_INVALID_PARAMETER; + + if (cchDest > NTSTRSAFE_MAX_CCH) + { + if (cchDest > 0) + *pszDest = '\0'; + return STATUS_INVALID_PARAMETER; + } + Status = RtlStringCopyExWorkerA(pszDest,cbDest,cbDest,pszSrc,ppszDestEnd,&cchRemaining,dwFlags); if (NT_SUCCESS(Status) || Status == STATUS_BUFFER_OVERFLOW) { @@ -268,7 +305,12 @@ size_t cchRemaining = 0; if (cchDest > NTSTRSAFE_MAX_CCH) - return STATUS_INVALID_PARAMETER; + { + if (cchDest > 0) + *pszDest = L'\0'; + return STATUS_INVALID_PARAMETER; + } + Status = RtlStringCopyExWorkerW(pszDest,cchDest,cbDest,pszSrc,ppszDestEnd,&cchRemaining,dwFlags); if (NT_SUCCESS(Status) || (Status==STATUS_BUFFER_OVERFLOW)) { @@ -301,7 +343,12 @@ _In_ size_t cchToCopy) { if (cchDest > NTSTRSAFE_MAX_CCH || cchToCopy > NTSTRSAFE_MAX_CCH) - return STATUS_INVALID_PARAMETER; + { + if (cchDest > 0) + *pszDest = '\0'; + return STATUS_INVALID_PARAMETER; + } + return RtlStringCopyNWorkerA(pszDest,cchDest,pszSrc,cchToCopy); } @@ -313,7 +360,12 @@ _In_ size_t cchToCopy) { if (cchDest > NTSTRSAFE_MAX_CCH || cchToCopy > NTSTRSAFE_MAX_CCH) - return STATUS_INVALID_PARAMETER; + { + if (cchDest > 0) + *pszDest = L'\0'; + return STATUS_INVALID_PARAMETER; + } + return RtlStringCopyNWorkerW(pszDest,cchDest,pszSrc,cchToCopy); } @@ -338,9 +390,17 @@ _In_reads_bytes_(cbToCopy) STRSAFE_LPCSTR pszSrc, _In_ size_t cbToCopy) { - if (cbDest > NTSTRSAFE_MAX_CCH || cbToCopy > NTSTRSAFE_MAX_CCH) - return STATUS_INVALID_PARAMETER; - return RtlStringCopyNWorkerA(pszDest,cbDest,pszSrc,cbToCopy); + size_t cchDest = cbDest / sizeof(char); + size_t cchToCopy = cbToCopy / sizeof(char); + + if (cchDest > NTSTRSAFE_MAX_CCH || cchToCopy > NTSTRSAFE_MAX_CCH) + { + if (cchDest > 0) + *pszDest = '\0'; + return STATUS_INVALID_PARAMETER; + } + + return RtlStringCopyNWorkerA(pszDest, cchDest, pszSrc, cchToCopy); } NTSTRSAFEAPI @@ -352,9 +412,15 @@ { size_t cchDest = cbDest / sizeof(wchar_t); size_t cchToCopy = cbToCopy / sizeof(wchar_t); + if (cchDest > NTSTRSAFE_MAX_CCH || cchToCopy > NTSTRSAFE_MAX_CCH) - return STATUS_INVALID_PARAMETER; - return RtlStringCopyNWorkerW(pszDest,cchDest,pszSrc,cchToCopy); + { + if (cchDest > 0) + *pszDest = L'\0'; + return STATUS_INVALID_PARAMETER; + } + + return RtlStringCopyNWorkerW(pszDest, cchDest, pszSrc, cchToCopy); } NTSTRSAFEAPI @@ -388,8 +454,13 @@ _In_ STRSAFE_DWORD dwFlags) { if (cchDest > NTSTRSAFE_MAX_CCH) - return STATUS_INVALID_PARAMETER; - return RtlStringCopyNExWorkerA(pszDest,cchDest,cchDest,pszSrc,cchToCopy,ppszDestEnd,pcchRemaining,dwFlags); + { + if (cchDest > 0) + *pszDest = '\0'; + return STATUS_INVALID_PARAMETER; + } + + return RtlStringCopyNExWorkerA(pszDest, cchDest, cchDest, pszSrc, cchToCopy, ppszDestEnd, pcchRemaining, dwFlags); } NTSTRSAFEAPI @@ -403,8 +474,13 @@ _In_ STRSAFE_DWORD dwFlags) { if (cchDest > NTSTRSAFE_MAX_CCH) - return STATUS_INVALID_PARAMETER; - return RtlStringCopyNExWorkerW(pszDest,cchDest,cchDest * sizeof(wchar_t),pszSrc,cchToCopy,ppszDestEnd,pcchRemaining,dwFlags); + { + if (cchDest > 0) + *pszDest = L'\0'; + return STATUS_INVALID_PARAMETER; + } + + return RtlStringCopyNExWorkerW(pszDest,cchDest,cchDest * sizeof(wchar_t), pszSrc, cchToCopy, ppszDestEnd, pcchRemaining, dwFlags); } NTSTRSAFEAPI @@ -439,10 +515,15 @@ { NTSTATUS Status; size_t cchRemaining = 0; + if (cbDest > NTSTRSAFE_MAX_CCH) - Status = STATUS_INVALID_PARAMETER; - else - Status = RtlStringCopyNExWorkerA(pszDest,cbDest,cbDest,pszSrc,cbToCopy,ppszDestEnd,&cchRemaining,dwFlags); + { + if ((pszDest != NULL) && (cbDest > 0)) + *pszDest = L'\0'; + return STATUS_INVALID_PARAMETER; + } + + Status = RtlStringCopyNExWorkerA(pszDest,cbDest,cbDest,pszSrc,cbToCopy,ppszDestEnd,&cchRemaining,dwFlags); if ((NT_SUCCESS(Status) || Status == STATUS_BUFFER_OVERFLOW) && pcbRemaining) *pcbRemaining = cchRemaining; return Status; @@ -465,9 +546,13 @@ cchDest = cbDest / sizeof(wchar_t); cchToCopy = cbToCopy / sizeof(wchar_t); if (cchDest > NTSTRSAFE_MAX_CCH) - Status = STATUS_INVALID_PARAMETER; - else - Status = RtlStringCopyNExWorkerW(pszDest,cchDest,cbDest,pszSrc,cchToCopy,ppszDestEnd,&cchRemaining,dwFlags); + { + if ((pszDest != NULL) && (cbDest > 0)) + *pszDest = L'\0'; + return STATUS_INVALID_PARAMETER; + } + + Status = RtlStringCopyNExWorkerW(pszDest,cchDest,cbDest,pszSrc,cchToCopy,ppszDestEnd,&cchRemaining,dwFlags); if ((NT_SUCCESS(Status) || Status == STATUS_BUFFER_OVERFLOW) && pcbRemaining) *pcbRemaining = (cchRemaining*sizeof(wchar_t)) + (cbDest % sizeof(wchar_t)); return Status; @@ -864,7 +949,12 @@ _In_ va_list argList) { if (cchDest > NTSTRSAFE_MAX_CCH) - return STATUS_INVALID_PARAMETER; + { + if (cchDest > 0) + *pszDest = '\0'; + return STATUS_INVALID_PARAMETER; + } + return RtlStringVPrintfWorkerA(pszDest,cchDest,pszFormat,argList); } @@ -876,7 +966,11 @@ _In_ va_list argList) { if (cchDest > NTSTRSAFE_MAX_CCH) - return STATUS_INVALID_PARAMETER; + { + if (cchDest > 0) + *pszDest = L'\0'; + return STATUS_INVALID_PARAMETER; + } return RtlStringVPrintfWorkerW(pszDest,cchDest,pszFormat,argList); } @@ -902,7 +996,11 @@ _In_ va_list argList) { if (cbDest > NTSTRSAFE_MAX_CCH) - return STATUS_INVALID_PARAMETER; + { + if (cbDest > 0) + *pszDest = '\0'; + return STATUS_INVALID_PARAMETER; + } return RtlStringVPrintfWorkerA(pszDest,cbDest,pszFormat,argList); } @@ -915,7 +1013,11 @@ { size_t cchDest = cbDest / sizeof(wchar_t); if (cchDest > NTSTRSAFE_MAX_CCH) - return STATUS_INVALID_PARAMETER; + { + if (cchDest > 0) + *pszDest = L'\0'; + return STATUS_INVALID_PARAMETER; + } return RtlStringVPrintfWorkerW(pszDest,cchDest,pszFormat,argList); } @@ -943,7 +1045,11 @@ NTSTATUS Status; va_list argList; if (cchDest > NTSTRSAFE_MAX_CCH) - return STATUS_INVALID_PARAMETER; + { + if (cchDest > 0) + *pszDest = '\0'; + return STATUS_INVALID_PARAMETER; + } va_start(argList,pszFormat); Status = RtlStringVPrintfWorkerA(pszDest,cchDest,pszFormat,argList); va_end(argList); @@ -960,7 +1066,11 @@ NTSTATUS Status; va_list argList; if (cchDest > NTSTRSAFE_MAX_CCH) - return STATUS_INVALID_PARAMETER; + { + if (cchDest > 0) + *pszDest = L'\0'; + return STATUS_INVALID_PARAMETER; + } va_start(argList,pszFormat); Status = RtlStringVPrintfWorkerW(pszDest,cchDest,pszFormat,argList); va_end(argList); @@ -991,7 +1101,11 @@ NTSTATUS Status; va_list argList; if (cbDest > NTSTRSAFE_MAX_CCH) - return STATUS_INVALID_PARAMETER; + { + if (cbDest > 0) + *pszDest = '\0'; + return STATUS_INVALID_PARAMETER; + } va_start(argList,pszFormat); Status = RtlStringVPrintfWorkerA(pszDest,cbDest,pszFormat,argList); va_end(argList); @@ -1009,7 +1123,11 @@ va_list argList; size_t cchDest = cbDest / sizeof(wchar_t); if (cchDest > NTSTRSAFE_MAX_CCH) - return STATUS_INVALID_PARAMETER; + { + if (cchDest > 0) + *pszDest = L'\0'; + return STATUS_INVALID_PARAMETER; + } va_start(argList,pszFormat); Status = RtlStringVPrintfWorkerW(pszDest,cchDest,pszFormat,argList); va_end(argList); @@ -1049,7 +1167,11 @@ NTSTATUS Status; va_list argList; if (cchDest > NTSTRSAFE_MAX_CCH) - return STATUS_INVALID_PARAMETER; + { + if (cchDest > 0) + *pszDest = '\0'; + return STATUS_INVALID_PARAMETER; + } va_start(argList,pszFormat); Status = RtlStringVPrintfExWorkerA(pszDest,cchDest,cchDest,ppszDestEnd,pcchRemaining,dwFlags,pszFormat,argList); va_end(argList); @@ -1070,7 +1192,11 @@ size_t cbDest = cchDest * sizeof(wchar_t); va_list argList; if (cchDest > NTSTRSAFE_MAX_CCH) - return STATUS_INVALID_PARAMETER; + { + if (cchDest > 0) + *pszDest = L'\0'; + return STATUS_INVALID_PARAMETER; + } va_start(argList,pszFormat); Status = RtlStringVPrintfExWorkerW(pszDest,cchDest,cbDest,ppszDestEnd,pcchRemaining,dwFlags,pszFormat,argList); va_end(argList); @@ -1110,10 +1236,15 @@ NTSTATUS Status; size_t cchDest; size_t cchRemaining = 0; + cchDest = cbDest / sizeof(char); if (cchDest > NTSTRSAFE_MAX_CCH) - Status = STATUS_INVALID_PARAMETER; - else + { + if (cchDest > 0) + *pszDest = '\0'; + return STATUS_INVALID_PARAMETER; + } + { va_list argList; va_start(argList,pszFormat); @@ -1145,8 +1276,12 @@ size_t cchRemaining = 0; cchDest = cbDest / sizeof(wchar_t); if (cchDest > NTSTRSAFE_MAX_CCH) - Status = STATUS_INVALID_PARAMETER; - else + { + if (cchDest > 0) + *pszDest = L'\0'; + return STATUS_INVALID_PARAMETER; + } + { va_list argList; va_start(argList,pszFormat); @@ -1195,8 +1330,12 @@ { NTSTATUS Status; if (cchDest > NTSTRSAFE_MAX_CCH) - Status = STATUS_INVALID_PARAMETER; - else + { + if (cchDest > 0) + *pszDest = '\0'; + return STATUS_INVALID_PARAMETER; + } + { size_t cbDest; cbDest = cchDest*sizeof(char); @@ -1217,8 +1356,12 @@ { NTSTATUS Status; if (cchDest > NTSTRSAFE_MAX_CCH) - Status = STATUS_INVALID_PARAMETER; - else + { + if (cchDest > 0) + *pszDest = L'\0'; + return STATUS_INVALID_PARAMETER; + } + { size_t cbDest; cbDest = cchDest*sizeof(wchar_t);

1 0

[tkreuzer] 66636: [DDK/XDK] - Fix some prototypes in wdm.h (PMDLX -> PMDL) - Fix annotations for ExFreePool(WithTag)
by tkreuzer＠svn.reactos.org 10 Mar '15

10 Mar '15

Author: tkreuzer Date: Tue Mar 10 00:09:20 2015 New Revision: 66636 URL: http://svn.reactos.org/svn/reactos?rev=66636&view=rev Log: [DDK/XDK] - Fix some prototypes in wdm.h (PMDLX -> PMDL) - Fix annotations for ExFreePool(WithTag) Modified: trunk/reactos/include/ddk/wdm.h trunk/reactos/include/xdk/exfuncs.h trunk/reactos/include/xdk/mmfuncs.h trunk/reactos/win32ss/gdi/eng/mem.c Modified: trunk/reactos/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/wdm.h?rev=6663… ============================================================================== --- trunk/reactos/include/ddk/wdm.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/wdm.h [iso-8859-1] Tue Mar 10 00:09:20 2015 @@ -11593,7 +11593,7 @@ VOID NTAPI MmBuildMdlForNonPagedPool( - _Inout_ PMDLX MemoryDescriptorList); + _Inout_ PMDL MemoryDescriptorList); //DECLSPEC_DEPRECATED_DDK NTKERNELAPI @@ -11626,7 +11626,7 @@ VOID NTAPI MmFreePagesFromMdl( - _Inout_ PMDLX MemoryDescriptorList); + _Inout_ PMDL MemoryDescriptorList); _IRQL_requires_max_(PASSIVE_LEVEL) NTKERNELAPI @@ -11681,7 +11681,7 @@ PVOID NTAPI MmMapLockedPagesSpecifyCache( - _Inout_ PMDLX MemoryDescriptorList, + _Inout_ PMDL MemoryDescriptorList, _In_ __drv_strictType(KPROCESSOR_MODE/enum _MODE,__drv_typeConst) KPROCESSOR_MODE AccessMode, _In_ __drv_strictTypeMatch(__drv_typeCond) MEMORY_CACHING_TYPE CacheType, @@ -11703,7 +11703,7 @@ VOID NTAPI MmProbeAndLockPages( - _Inout_ PMDLX MemoryDescriptorList, + _Inout_ PMDL MemoryDescriptorList, _In_ KPROCESSOR_MODE AccessMode, _In_ LOCK_OPERATION Operation); @@ -11738,7 +11738,7 @@ VOID NTAPI MmUnlockPages( - _Inout_ PMDLX MemoryDescriptorList); + _Inout_ PMDL MemoryDescriptorList); _IRQL_requires_max_(DISPATCH_LEVEL) NTKERNELAPI @@ -11789,7 +11789,7 @@ NTSTATUS NTAPI MmAdvanceMdl( - _Inout_ PMDLX Mdl, + _Inout_ PMDL Mdl, _In_ ULONG NumberOfBytes); _Must_inspect_result_ @@ -11829,7 +11829,7 @@ MmMapLockedPagesWithReservedMapping( _In_ PVOID MappingAddress, _In_ ULONG PoolTag, - _Inout_ PMDLX MemoryDescriptorList, + _Inout_ PMDL MemoryDescriptorList, _In_ __drv_strictTypeMatch(__drv_typeCond) MEMORY_CACHING_TYPE CacheType); @@ -11839,7 +11839,7 @@ NTSTATUS NTAPI MmProtectMdlSystemAddress( - _In_ PMDLX MemoryDescriptorList, + _In_ PMDL MemoryDescriptorList, _In_ ULONG NewProtect); _IRQL_requires_max_(DISPATCH_LEVEL) @@ -11849,7 +11849,7 @@ MmUnmapReservedMapping( _In_ PVOID BaseAddress, _In_ ULONG PoolTag, - _Inout_ PMDLX MemoryDescriptorList); + _Inout_ PMDL MemoryDescriptorList); _IRQL_requires_max_ (APC_LEVEL) NTKERNELAPI @@ -14799,14 +14799,14 @@ VOID NTAPI ExFreePool( - _In_ __drv_freesMem(Mem) PVOID P); + _Pre_notnull_ __drv_freesMem(Mem) PVOID P); _IRQL_requires_max_(DISPATCH_LEVEL) NTKERNELAPI VOID NTAPI ExFreePoolWithTag( - _In_ __drv_freesMem(Mem) PVOID P, + _Pre_notnull_ __drv_freesMem(Mem) PVOID P, _In_ ULONG Tag); _IRQL_requires_max_(DISPATCH_LEVEL) Modified: trunk/reactos/include/xdk/exfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/exfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/xdk/exfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/exfuncs.h [iso-8859-1] Tue Mar 10 00:09:20 2015 @@ -606,14 +606,14 @@ VOID NTAPI ExFreePool( - _In_ __drv_freesMem(Mem) PVOID P); + _Pre_not __drv_freesMem(Mem) PVOID P); _IRQL_requires_max_(DISPATCH_LEVEL) NTKERNELAPI VOID NTAPI ExFreePoolWithTag( - _In_ __drv_freesMem(Mem) PVOID P, + _Pre_not __drv_freesMem(Mem) PVOID P, _In_ ULONG Tag); _IRQL_requires_max_(DISPATCH_LEVEL) Modified: trunk/reactos/include/xdk/mmfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/mmfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/xdk/mmfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/mmfuncs.h [iso-8859-1] Tue Mar 10 00:09:20 2015 @@ -232,7 +232,7 @@ VOID NTAPI MmBuildMdlForNonPagedPool( - _Inout_ PMDLX MemoryDescriptorList); + _Inout_ PMDL MemoryDescriptorList); //DECLSPEC_DEPRECATED_DDK NTKERNELAPI @@ -265,7 +265,7 @@ VOID NTAPI MmFreePagesFromMdl( - _Inout_ PMDLX MemoryDescriptorList); + _Inout_ PMDL MemoryDescriptorList); _IRQL_requires_max_(PASSIVE_LEVEL) NTKERNELAPI @@ -320,7 +320,7 @@ PVOID NTAPI MmMapLockedPagesSpecifyCache( - _Inout_ PMDLX MemoryDescriptorList, + _Inout_ PMDL MemoryDescriptorList, _In_ __drv_strictType(KPROCESSOR_MODE/enum _MODE,__drv_typeConst) KPROCESSOR_MODE AccessMode, _In_ __drv_strictTypeMatch(__drv_typeCond) MEMORY_CACHING_TYPE CacheType, @@ -342,7 +342,7 @@ VOID NTAPI MmProbeAndLockPages( - _Inout_ PMDLX MemoryDescriptorList, + _Inout_ PMDL MemoryDescriptorList, _In_ KPROCESSOR_MODE AccessMode, _In_ LOCK_OPERATION Operation); @@ -377,7 +377,7 @@ VOID NTAPI MmUnlockPages( - _Inout_ PMDLX MemoryDescriptorList); + _Inout_ PMDL MemoryDescriptorList); _IRQL_requires_max_(DISPATCH_LEVEL) NTKERNELAPI @@ -629,7 +629,7 @@ NTSTATUS NTAPI MmAdvanceMdl( - _Inout_ PMDLX Mdl, + _Inout_ PMDL Mdl, _In_ ULONG NumberOfBytes); _Must_inspect_result_ @@ -669,7 +669,7 @@ MmMapLockedPagesWithReservedMapping( _In_ PVOID MappingAddress, _In_ ULONG PoolTag, - _Inout_ PMDLX MemoryDescriptorList, + _Inout_ PMDL MemoryDescriptorList, _In_ __drv_strictTypeMatch(__drv_typeCond) MEMORY_CACHING_TYPE CacheType); @@ -679,7 +679,7 @@ NTSTATUS NTAPI MmProtectMdlSystemAddress( - _In_ PMDLX MemoryDescriptorList, + _In_ PMDL MemoryDescriptorList, _In_ ULONG NewProtect); _IRQL_requires_max_(DISPATCH_LEVEL) @@ -689,7 +689,7 @@ MmUnmapReservedMapping( _In_ PVOID BaseAddress, _In_ ULONG PoolTag, - _Inout_ PMDLX MemoryDescriptorList); + _Inout_ PMDL MemoryDescriptorList); _IRQL_requires_max_ (APC_LEVEL) NTKERNELAPI Modified: trunk/reactos/win32ss/gdi/eng/mem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/mem.c?rev=… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/mem.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/mem.c [iso-8859-1] Tue Mar 10 00:09:20 2015 @@ -14,16 +14,20 @@ /* * @implemented */ +_Must_inspect_result_ +_When_(fl & FL_ZERO_MEMORY, _Ret_opt_bytecount_(cjMemSize)) +_When_(!(fl & FL_ZERO_MEMORY), _Ret_opt_bytecap_(cjMemSize)) +ENGAPI PVOID APIENTRY EngAllocMem( - ULONG Flags, - ULONG cjMemSize, - ULONG ulTag) + _In_ ULONG fl, + _In_ ULONG cjMemSize, + _In_ ULONG ulTag) { PVOID pvBaseAddress; - pvBaseAddress = ExAllocatePoolWithTag((Flags & FL_NONPAGED_MEMORY) ? + pvBaseAddress = ExAllocatePoolWithTag((fl & FL_NONPAGED_MEMORY) ? NonPagedPool : PagedPool, cjMemSize, ulTag); @@ -31,7 +35,7 @@ if (pvBaseAddress == NULL) return NULL; - if (Flags & FL_ZERO_MEMORY) + if (fl & FL_ZERO_MEMORY) RtlZeroMemory(pvBaseAddress, cjMemSize); return pvBaseAddress; @@ -55,9 +59,14 @@ /* * @implemented */ +_Must_inspect_result_ +_Ret_opt_bytecount_(cjMemSize) +ENGAPI PVOID APIENTRY -EngAllocUserMem(SIZE_T cjSize, ULONG ulTag) +EngAllocUserMem( + _In_ SIZE_T cjMemSize, + _In_ ULONG ulTag) { PVOID pvBaseAddress = NULL; NTSTATUS Status; @@ -65,7 +74,7 @@ Status = ZwAllocateVirtualMemory(NtCurrentProcess(), &pvBaseAddress, 0, - &cjSize, + &cjMemSize, MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE); @@ -77,7 +86,7 @@ /* TODO: Add allocation info to AVL tree (stored inside W32PROCESS structure) */ //hSecure = EngSecureMem(pvBaseAddress, cj); - return pvBaseAddress; + return pvBaseAddress; } /* @@ -96,7 +105,6 @@ /* TODO: Remove allocation info from AVL tree */ } - PVOID APIENTRY

1 0

[tkreuzer] 66635: [WIN32K] Fix some annotations
by tkreuzer＠svn.reactos.org 10 Mar '15

10 Mar '15

Author: tkreuzer Date: Tue Mar 10 00:08:54 2015 New Revision: 66635 URL: http://svn.reactos.org/svn/reactos?rev=66635&view=rev Log: [WIN32K] Fix some annotations Modified: trunk/reactos/win32ss/gdi/eng/device.c trunk/reactos/win32ss/gdi/ntgdi/gdidebug.h trunk/reactos/win32ss/include/ntuser.h trunk/reactos/win32ss/user/ntuser/cursoricon.c trunk/reactos/win32ss/user/ntuser/useratom.c Modified: trunk/reactos/win32ss/gdi/eng/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/device.c?r… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/device.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/device.c [iso-8859-1] Tue Mar 10 00:08:54 2015 @@ -212,7 +212,7 @@ pdm->dmBitsPerPel, pdm->dmDisplayFrequency); /* Compare with the default entry */ - if (!bModeMatch && + if (!bModeMatch && pdm->dmBitsPerPel == pdmDefault->dmBitsPerPel && pdm->dmPelsWidth == pdmDefault->dmPelsWidth && pdm->dmPelsHeight == pdmDefault->dmPelsHeight) @@ -438,13 +438,15 @@ /* * @implemented */ -DWORD APIENTRY +_Success_(return==0) +DWORD +APIENTRY EngDeviceIoControl( _In_ HANDLE hDevice, _In_ DWORD dwIoControlCode, - _In_opt_bytecount_(cjInBufferSize) LPVOID lpInBuffer, + _In_reads_bytes_opt_(cjInBufferSize) LPVOID lpInBuffer, _In_ DWORD cjInBufferSize, - _Out_opt_bytecap_(cjOutBufferSize) LPVOID lpOutBuffer, + _Out_writes_bytes_opt_(cjOutBufferSize) LPVOID lpOutBuffer, _In_ DWORD cjOutBufferSize, _Out_ LPDWORD lpBytesReturned) { Modified: trunk/reactos/win32ss/gdi/ntgdi/gdidebug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/gdidebug… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/gdidebug.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/gdidebug.h [iso-8859-1] Tue Mar 10 00:08:54 2015 @@ -10,14 +10,6 @@ #define ASSERT_NOGDILOCKS() #define KeRosDumpStackFrames(Frames, Count) #endif - -NTSYSAPI -ULONG -APIENTRY -RtlWalkFrameChain( - _Out_ PVOID *Callers, - _In_ ULONG Count, - _In_ ULONG Flags); ULONG NTAPI Modified: trunk/reactos/win32ss/include/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/include/ntuser.h?r… ============================================================================== --- trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] Tue Mar 10 00:08:54 2015 @@ -2982,8 +2982,8 @@ NTAPI NtUserSetCursorIconData( _In_ HCURSOR hCursor, - _In_ PUNICODE_STRING pustrModule, - _In_ PUNICODE_STRING puSrcName, + _In_opt_ PUNICODE_STRING pustrModule, + _In_opt_ PUNICODE_STRING puSrcName, _In_ const CURSORDATA *pCursorData); typedef struct _tagFINDEXISTINGCURICONPARAM Modified: trunk/reactos/win32ss/user/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/cursor… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/cursoricon.c [iso-8859-1] Tue Mar 10 00:08:54 2015 @@ -395,15 +395,16 @@ /* * @implemented */ +_Success_(return != FALSE) BOOL -APIENTRY +NTAPI NtUserGetIconInfo( - _In_ HANDLE hCurIcon, - _Out_opt_ PICONINFO IconInfo, - _Out_opt_ PUNICODE_STRING lpModule, // Optional - _Out_opt_ PUNICODE_STRING lpResName, // Optional - _Out_opt_ LPDWORD pbpp, // Optional - _In_ BOOL bInternal) + _In_ HANDLE hCurIcon, + _Out_opt_ PICONINFO IconInfo, + _Inout_opt_ PUNICODE_STRING lpModule, + _Inout_opt_ PUNICODE_STRING lpResName, + _Out_opt_ LPDWORD pbpp, + _In_ BOOL bInternal) { ICONINFO ii; PCURICON_OBJECT CurIcon; Modified: trunk/reactos/win32ss/user/ntuser/useratom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/userat… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/useratom.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/useratom.c [iso-8859-1] Tue Mar 10 00:08:54 2015 @@ -91,8 +91,8 @@ * \note The function does not aquire any global lock, since synchronisation is * handled by the RtlAtom function. */ -_Success_(return!=0) -_At_(pustrName->Buffer, _Out_z_bytecap_post_bytecount_(pustrName->MaximumLength, return*2+2)) +_Success_(return != 0) +_At_(pustrName->Buffer, _Out_z_bytecap_post_bytecount_(pustrName->MaximumLength, return * 2 + 2)) ULONG APIENTRY NtUserGetAtomName(

1 0

[akhaldi] 66634: [VMWINST] Use StringCb{Copy, Cat} instead of wcs{cpy, cat} to ensure that no buffer overflows occur. CID 514272s and 515210. By Ricardo Hanke. CORE-9347
by akhaldi＠svn.reactos.org 09 Mar '15

09 Mar '15

Author: akhaldi Date: Mon Mar 9 20:50:42 2015 New Revision: 66634 URL: http://svn.reactos.org/svn/reactos?rev=66634&view=rev Log: [VMWINST] Use StringCb{Copy,Cat} instead of wcs{cpy,cat} to ensure that no buffer overflows occur. CID 514272s and 515210. By Ricardo Hanke. CORE-9347 Modified: trunk/reactos/base/setup/vmwinst/vmwinst.c Modified: trunk/reactos/base/setup/vmwinst/vmwinst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/vmwinst… ============================================================================== --- trunk/reactos/base/setup/vmwinst/vmwinst.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/vmwinst/vmwinst.c [iso-8859-1] Mon Mar 9 20:50:42 2015 @@ -31,6 +31,7 @@ #include <winreg.h> #include <wingdi.h> #include <winuser.h> +#include <strsafe.h> #include <newdev.h> #include <pseh/pseh2.h> #include <debug.h> @@ -124,8 +125,8 @@ HANDLE FileHandle; FileName[0] = L'\0'; - wcscat(FileName, Path); - wcscat(FileName, File); + StringCbCat(FileName, sizeof(FileName), Path); + StringCbCat(FileName, sizeof(FileName), File); FileHandle = CreateFile(FileName, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); @@ -495,8 +496,8 @@ if(AbortInstall != 0) goto done; PostMessage(hInstallationNotifyWnd, WM_INSTSTATUSUPDATE, IDS_COPYINGFILES, 0); - wcscpy(InfFileName, SrcPath); - wcscat(InfFileName, L"vmx_svga.inf"); + StringCbCopy(InfFileName, sizeof(InfFileName), SrcPath); + StringCbCat(InfFileName, sizeof(InfFileName), L"vmx_svga.inf"); DPRINT1("Calling UpdateDriverForPlugAndPlayDevices()\n"); if (!UpdateDriverForPlugAndPlayDevices( hInstallationNotifyWnd, @@ -1071,11 +1072,11 @@ lc += GetSystemDirectory(DestinationPath, MAX_PATH) - 1; if(lc >= DestinationPath && *lc != L'\\') { - wcscat(DestinationPath, L"\\"); + StringCbCat(DestinationPath, sizeof(DestinationPath), L"\\"); } DestinationDriversPath[0] = L'\0'; - wcscat(DestinationDriversPath, DestinationPath); - wcscat(DestinationDriversPath, L"drivers\\"); + StringCbCat(DestinationDriversPath, sizeof(DestinationDriversPath), DestinationPath); + StringCbCat(DestinationDriversPath, sizeof(DestinationDriversPath), L"drivers\\"); SetCurrentDirectory(DestinationPath);

1 0

[akhaldi] 66633: [MSI_WINETEST] Sync with Wine Staging 1.7.37. CORE-9246
by akhaldi＠svn.reactos.org 09 Mar '15

09 Mar '15

Author: akhaldi Date: Mon Mar 9 20:28:54 2015 New Revision: 66633 URL: http://svn.reactos.org/svn/reactos?rev=66633&view=rev Log: [MSI_WINETEST] Sync with Wine Staging 1.7.37. CORE-9246 Modified: trunk/rostests/winetests/msi/action.c trunk/rostests/winetests/msi/automation.c trunk/rostests/winetests/msi/db.c trunk/rostests/winetests/msi/install.c trunk/rostests/winetests/msi/msi.c trunk/rostests/winetests/msi/package.c trunk/rostests/winetests/msi/source.c Modified: trunk/rostests/winetests/msi/action.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/action.c?re… ============================================================================== --- trunk/rostests/winetests/msi/action.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msi/action.c [iso-8859-1] Mon Mar 9 20:28:54 2015 @@ -182,7 +182,8 @@ "SERVNAME2\tTestService2\n" "SERVDISP\tTestServiceDisp\n" "SERVDISP2\tTestServiceDisp2\n" - "MSIFASTINSTALL\t1\n"; + "MSIFASTINSTALL\t1\n" + "regdata15\t#x01\n"; static const char environment_dat[] = "Environment\tName\tValue\tComponent_\n" @@ -242,7 +243,10 @@ "ServiceControl\tName\tEvent\tArguments\tWait\tComponent_\n" "s72\tl255\ti2\tL255\tI2\ts72\n" "ServiceControl\tServiceControl\n" - "ServiceControl\tSpooler\t1\t\t0\tservice_comp"; + "ServiceControl\tSpooler\t1\t\t1\tservice_comp\n" + "ServiceControl2\tSpooler\t2\t\t1\tservice_comp\n" + "ServiceControl3\tSpooler\t16\t\t1\tservice_comp\n" + "ServiceControl4\tSpooler\t32\t\t1\tservice_comp\n"; static const char sss_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" @@ -255,11 +259,15 @@ "CostFinalize\t\t1000\n" "InstallValidate\t\t1400\n" "InstallInitialize\t\t1500\n" + "StopServices\t\t4000\n" "DeleteServices\t\t5000\n" "MoveFiles\t\t5100\n" "InstallFiles\t\t5200\n" "DuplicateFiles\t\t5300\n" "StartServices\t\t5400\n" + "RegisterProduct\t\t5500\n" + "PublishFeatures\t\t5600\n" + "PublishProduct\t\t5700\n" "InstallFinalize\t\t6000\n"; static const char sds_install_exec_seq_dat[] = @@ -510,7 +518,11 @@ "regdata8\t2\tSOFTWARE\\Wine\\msitest\tValue4\tone[~]two\taugustus\n" "regdata9\t2\tSOFTWARE\\Wine\\msitest\tValue5\t[~]one[~]two[~]three\taugustus\n" "regdata10\t2\tSOFTWARE\\Wine\\msitest\tValue6\t[~]\taugustus\n" - "regdata11\t2\tSOFTWARE\\Wine\\msitest\tValue7\t[~]two\taugustus\n"; + "regdata11\t2\tSOFTWARE\\Wine\\msitest\tValue7\t[~]two\taugustus\n" + "regdata12\t2\tSOFTWARE\\Wine\\msitest\tValue8\t#1\taugustus\n" + "regdata13\t2\tSOFTWARE\\Wine\\msitest\tValue9\t#x1\taugustus\n" + "regdata14\t2\tSOFTWARE\\Wine\\msitest\tValue10\t#x01\taugustus\n" + "regdata15\t2\tSOFTWARE\\Wine\\msitest\tValue11\t[regdata15]\taugustus\n"; static const char cf_directory_dat[] = "Directory\tDirectory_Parent\tDefaultDir\n" @@ -2706,7 +2718,7 @@ } if (!expected) - ok_(__FILE__, line)(lstrlenA(val) == 0, "Expected empty string, got %s\n", val); + ok_(__FILE__, line)(!val[0], "Expected empty string, got %s\n", val); else { if (bcase) @@ -4919,6 +4931,7 @@ HKEY hkey; DWORD type, size; CHAR path[MAX_PATH]; + BYTE buf[8]; if (is_process_limited()) { @@ -5050,6 +5063,42 @@ ok(!memcmp(path, "two\0", size), "Wrong multi-sz data\n"); ok(size == 5, "Expected 5, got %d\n", size); ok(type == REG_MULTI_SZ, "Expected REG_MULTI_SZ, got %d\n", type); + + size = sizeof(buf); + type = 0xdeadbeef; + memset(buf, 0, size); + res = RegQueryValueExA(hkey, "Value8", NULL, &type, buf, &size); + ok(res == ERROR_SUCCESS, "got %u\n", res); + ok(*(DWORD *)buf == 1, "got %u\n", *(DWORD *)buf); + ok(size == 4, "got %u\n", size); + ok(type == REG_DWORD, "got %u\n", type); + + size = sizeof(buf); + type = 0xdeadbeef; + memset(buf, 0, size); + res = RegQueryValueExA(hkey, "Value9", NULL, &type, buf, &size); + ok(res == ERROR_SUCCESS, "got %u\n", res); + ok(buf[0] == 1, "got %u\n", buf[0]); + ok(size == 1, "got %u\n", size); + ok(type == REG_BINARY, "got %u\n", type); + + size = sizeof(buf); + type = 0xdeadbeef; + memset(buf, 0, size); + res = RegQueryValueExA(hkey, "Value10", NULL, &type, buf, &size); + ok(res == ERROR_SUCCESS, "got %u\n", res); + ok(buf[0] == 1, "got %u\n", buf[0]); + ok(size == 1, "got %u\n", size); + ok(type == REG_BINARY, "got %u\n", type); + + size = sizeof(buf); + type = 0xdeadbeef; + memset(buf, 0, size); + res = RegQueryValueExA(hkey, "Value11", NULL, &type, buf, &size); + ok(res == ERROR_SUCCESS, "got %u\n", res); + ok(buf[0] == 1, "got %u\n", buf[0]); + ok(size == 1, "got %u\n", size); + ok(type == REG_BINARY, "got %u\n", type); RegDeleteValueA(hkey, "Value"); RegDeleteValueA(hkey, "Value1"); @@ -5059,6 +5108,10 @@ RegDeleteValueA(hkey, "Value5"); RegDeleteValueA(hkey, "Value6"); RegDeleteValueA(hkey, "Value7"); + RegDeleteValueA(hkey, "Value8"); + RegDeleteValueA(hkey, "Value9"); + RegDeleteValueA(hkey, "Value10"); + RegDeleteValueA(hkey, "Value11"); RegCloseKey(hkey); RegDeleteKeyA(HKEY_LOCAL_MACHINE, "SOFTWARE\\Wine\\msitest"); @@ -5260,7 +5313,7 @@ DeleteFileA(msifile); } -static void test_start_services(void) +static void test_start_stop_services(void) { UINT r; SC_HANDLE scm, service; @@ -5307,6 +5360,23 @@ MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); r = MsiInstallProductA(msifile, NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + if (error == ERROR_SUCCESS) + { + SERVICE_STATUS status; + + scm = OpenSCManagerA(NULL, NULL, SC_MANAGER_ALL_ACCESS); + service = OpenServiceA(scm, "Spooler", SC_MANAGER_ALL_ACCESS); + + ret = ControlService(service, SERVICE_CONTROL_STOP, &status); + ok(ret, "ControlService failed %u\n", GetLastError()); + + CloseServiceHandle(service); + CloseServiceHandle(scm); + } + + r = MsiInstallProductA(msifile, "REMOVE=ALL"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); ok(delete_pf("msitest\\cabout\\new\\five.txt", TRUE), "File not installed\n"); @@ -5323,22 +5393,22 @@ ok(delete_pf("msitest\\service2.exe", TRUE), "File not installed\n"); ok(delete_pf("msitest", FALSE), "Directory not created\n"); + if (error == ERROR_SUCCESS) + { + SERVICE_STATUS status; + + scm = OpenSCManagerA(NULL, NULL, SC_MANAGER_ALL_ACCESS); + service = OpenServiceA(scm, "Spooler", SC_MANAGER_ALL_ACCESS); + + ret = ControlService(service, SERVICE_CONTROL_STOP, &status); + ok(ret, "ControlService failed %u\n", GetLastError()); + + CloseServiceHandle(service); + CloseServiceHandle(scm); + } + delete_test_files(); DeleteFileA(msifile); - - if (error == ERROR_SUCCESS) - { - SERVICE_STATUS status; - - scm = OpenSCManagerA(NULL, NULL, SC_MANAGER_ALL_ACCESS); - service = OpenServiceA(scm, "Spooler", SC_MANAGER_ALL_ACCESS); - - ret = ControlService(service, SERVICE_CONTROL_STOP, &status); - ok(ret, "ControlService failed %u\n", GetLastError()); - - CloseServiceHandle(service); - CloseServiceHandle(scm); - } } static void test_delete_services(void) @@ -6819,7 +6889,7 @@ test_write_registry_values(); test_envvar(); test_create_remove_folder(); - test_start_services(); + test_start_stop_services(); test_delete_services(); test_install_services(); test_self_registration(); Modified: trunk/rostests/winetests/msi/automation.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/automation.… ============================================================================== --- trunk/rostests/winetests/msi/automation.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msi/automation.c [iso-8859-1] Mon Mar 9 20:28:54 2015 @@ -1934,7 +1934,7 @@ hr = Session_ModePut(pSession, MSIRUNMODE_REBOOTNOW, TRUE); ok(hr == S_OK, "Session_ModePut failed, hresult 0x%08x\n", hr); - if (hr == DISP_E_EXCEPTION) ok_exception(hr, szModeFlag); + ok_exception(hr, szModeFlag); hr = Session_ModeGet(pSession, MSIRUNMODE_REBOOTNOW, &bool); ok(hr == S_OK, "Session_ModeGet failed, hresult 0x%08x\n", hr); @@ -1942,7 +1942,7 @@ hr = Session_ModePut(pSession, MSIRUNMODE_REBOOTNOW, FALSE); /* set it again so we don't reboot */ ok(hr == S_OK, "Session_ModePut failed, hresult 0x%08x\n", hr); - if (hr == DISP_E_EXCEPTION) ok_exception(hr, szModeFlag); + ok_exception(hr, szModeFlag); hr = Session_ModePut(pSession, MSIRUNMODE_MAINTENANCE, TRUE); ok(hr == DISP_E_EXCEPTION, "Session_ModePut failed, hresult 0x%08x\n", hr); Modified: trunk/rostests/winetests/msi/db.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/db.c?rev=66… ============================================================================== --- trunk/rostests/winetests/msi/db.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msi/db.c [iso-8859-1] Mon Mar 9 20:28:54 2015 @@ -1670,6 +1670,28 @@ MsiViewClose( view ); MsiCloseHandle( view ); + /* try again */ + create_file( "test1.txt" ); + + rec = MsiCreateRecord( 2 ); + MsiRecordSetStringA( rec, 1, "data1" ); + + r = MsiRecordSetStreamA( rec, 2, "test1.txt" ); + ok( r == ERROR_SUCCESS, "Failed to add stream data to the record: %d\n", r ); + + DeleteFileA( "test1.txt" ); + + r = MsiDatabaseOpenViewA( hdb, + "INSERT INTO `_Streams` ( `Name`, `Data` ) VALUES ( ?, ? )", &view ); + ok( r == ERROR_SUCCESS, "Failed to open database view: %d\n", r ); + + r = MsiViewExecute( view, rec ); + ok( r == ERROR_FUNCTION_FAILED, "got %u\n", r ); + + MsiCloseHandle( rec ); + MsiViewClose( view ); + MsiCloseHandle( view ); + r = MsiDatabaseOpenViewA( hdb, "SELECT `Name`, `Data` FROM `_Streams` WHERE `Name` = 'data'", &view ); ok( r == ERROR_SUCCESS, "Failed to open database view: %d\n", r); @@ -1759,7 +1781,7 @@ memset(buf, 0, MAX_PATH); r = MsiRecordReadStream( rec, 2, buf, &size ); ok( r == ERROR_SUCCESS, "Failed to get stream: %d\n", r); - todo_wine ok( !lstrcmpA(buf, "test2.txt\n"), "Expected 'test2.txt\\n', got %s\n", buf); + ok( !lstrcmpA(buf, "test2.txt\n"), "Expected 'test2.txt\\n', got %s\n", buf); MsiCloseHandle( rec ); MsiViewClose( view ); @@ -1791,9 +1813,40 @@ ok( r == ERROR_SUCCESS, "Failed to add stream data to the record: %d\n", r); DeleteFileA( "test.txt" ); + /* try a name that exceeds maximum OLE stream name length */ + query = "INSERT INTO `Binary` ( `Name`, `ID`, `Data` ) VALUES ( 'encryption.dll.CB4E6205_F99A_4C51_ADD4_184506EFAB87', 10000, ? )"; + r = run_query( hdb, rec, query ); + ok( r == ERROR_SUCCESS, "Insert into Binary table failed: %d\n", r ); + + r = MsiCloseHandle( rec ); + ok( r == ERROR_SUCCESS , "Failed to close record handle\n" ); + + r = MsiDatabaseCommit( hdb ); + ok( r == ERROR_FUNCTION_FAILED , "got %u\n", r ); + + r = MsiCloseHandle( hdb ); + ok( r == ERROR_SUCCESS , "Failed to close database\n" ); + + r = MsiOpenDatabaseW(msifileW, MSIDBOPEN_CREATE, &hdb ); + ok( r == ERROR_SUCCESS , "Failed to open database\n" ); + + query = "CREATE TABLE `Binary` ( `Name` CHAR(72) NOT NULL, `ID` INT NOT NULL, `Data` OBJECT PRIMARY KEY `Name`, `ID`)"; + r = run_query( hdb, 0, query ); + ok( r == ERROR_SUCCESS, "Cannot create Binary table: %d\n", r ); + + create_file( "test.txt" ); + rec = MsiCreateRecord( 1 ); + r = MsiRecordSetStreamA( rec, 1, "test.txt" ); + ok( r == ERROR_SUCCESS, "Failed to add stream data to the record: %d\n", r ); + DeleteFileA( "test.txt" ); + query = "INSERT INTO `Binary` ( `Name`, `ID`, `Data` ) VALUES ( 'filename1', 1, ? )"; r = run_query( hdb, rec, query ); ok( r == ERROR_SUCCESS, "Insert into Binary table failed: %d\n", r ); + + query = "INSERT INTO `Binary` ( `Name`, `ID`, `Data` ) VALUES ( 'filename1', 1, ? )"; + r = run_query( hdb, rec, query ); + ok( r == ERROR_FUNCTION_FAILED, "got %u\n", r ); r = MsiCloseHandle( rec ); ok( r == ERROR_SUCCESS , "Failed to close record handle\n" ); @@ -4535,7 +4588,7 @@ size = MAX_PATH; r = MsiRecordGetStringA(rec, 1, result, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(!lstrlenA(result), "Expected an empty string, got %s\n", result); + ok(!result[0], "Expected an empty string, got %s\n", result); MsiCloseHandle(rec); @@ -4581,7 +4634,7 @@ size = MAX_PATH; r = MsiRecordGetStringA(rec, 1, result, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(!lstrlenA(result), "Expected an empty string, got %s\n", result); + ok(!result[0], "Expected an empty string, got %s\n", result); MsiCloseHandle(rec); Modified: trunk/rostests/winetests/msi/install.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/install.c?r… ============================================================================== --- trunk/rostests/winetests/msi/install.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msi/install.c [iso-8859-1] Mon Mar 9 20:28:54 2015 @@ -561,34 +561,10 @@ "2\t2\t\ttest2.cab\tDISK2\t\n" "3\t12\t\ttest3.cab\tDISK3\t\n"; -static const CHAR ci_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" - "s72\tS255\tI2\n" - "InstallExecuteSequence\tAction\n" - "CostFinalize\t\t1000\n" - "CostInitialize\t\t800\n" - "FileCost\t\t900\n" - "InstallFiles\t\t4000\n" - "InstallServices\t\t5000\n" - "InstallFinalize\t\t6600\n" - "InstallInitialize\t\t1500\n" - "RunInstall\t\t1600\n" - "InstallValidate\t\t1400\n" - "LaunchConditions\t\t100"; - -static const CHAR ci_custom_action_dat[] = "Action\tType\tSource\tTarget\tISComments\n" - "s72\ti2\tS64\tS0\tS255\n" - "CustomAction\tAction\n" - "RunInstall\t87\tmsitest\\concurrent.msi\tMYPROP=[UILevel]\t\n"; - static const CHAR ci_component_dat[] = "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" "s72\tS38\ts72\ti2\tS255\tS72\n" "Component\tComponent\n" "maximus\t{DF2CBABC-3BCC-47E5-A998-448D1C0C895B}\tMSITESTDIR\t0\tUILevel=5\tmaximus\n"; - -static const CHAR ci2_component_dat[] = "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" - "s72\tS38\ts72\ti2\tS255\tS72\n" - "Component\tComponent\n" - "augustus\t\tMSITESTDIR\t0\tUILevel=3 AND MYPROP=5\taugustus\n"; static const CHAR ci2_feature_comp_dat[] = "Feature_\tComponent_\n" "s38\ts72\n" @@ -656,13 +632,6 @@ "s72\tS38\ts72\ti2\tS255\tS72\n" "Component\tComponent\n" "augustus\t\tMSITESTDIR\t0\tMYPROP=2718 and MyProp=42\taugustus\n"; - -static const CHAR rem_file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" - "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" - "File\tFile\n" - "hydrogen\thydrogen\thydrogen\t0\t\t\t8192\t1\n" - "helium\thelium\thelium\t0\t\t\t8192\t1\n" - "lithium\tlithium\tlithium\t0\t\t\t8192\t1"; static const CHAR rem_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" "s72\tS255\tI2\n" @@ -1538,31 +1507,6 @@ ADD_TABLE(cie_file), ADD_TABLE(install_exec_seq), ADD_TABLE(cie_media), - ADD_TABLE(property), -}; - -static const msi_table ci_tables[] = -{ - ADD_TABLE(ci_component), - ADD_TABLE(directory), - ADD_TABLE(rof_feature), - ADD_TABLE(rof_feature_comp), - ADD_TABLE(rof_file), - ADD_TABLE(ci_install_exec_seq), - ADD_TABLE(rof_media), - ADD_TABLE(property), - ADD_TABLE(ci_custom_action), -}; - -static const msi_table ci2_tables[] = -{ - ADD_TABLE(ci2_component), - ADD_TABLE(directory), - ADD_TABLE(rof_feature), - ADD_TABLE(ci2_feature_comp), - ADD_TABLE(ci2_file), - ADD_TABLE(install_exec_seq), - ADD_TABLE(rof_media), ADD_TABLE(property), }; @@ -5723,7 +5667,7 @@ res = RegOpenKeyExA(HKEY_CLASSES_ROOT, "CLSID\\{8dfef911-6885-41eb-b280-8f0304728e8b}\\InProcServer32", 0, KEY_ALL_ACCESS|KEY_WOW64_32KEY, &hkey); - todo_wine ok(res == ERROR_SUCCESS, "can't open 32-bit CLSID key, got %d\n", res); + ok(res == ERROR_SUCCESS, "can't open 32-bit CLSID key, got %d\n", res); if (res == ERROR_SUCCESS) { size = sizeof(value); res = RegQueryValueExA(hkey, "", NULL, NULL, (LPBYTE)value, &size); @@ -5786,7 +5730,7 @@ res = RegOpenKeyExA(HKEY_CLASSES_ROOT, "CLSID\\{8dfef911-6885-41eb-b280-8f0304728e8b}\\InProcServer32", 0, KEY_ALL_ACCESS|KEY_WOW64_32KEY, &hkey); - todo_wine ok(res == ERROR_SUCCESS, "can't open 32-bit CLSID key, got %d\n", res); + ok(res == ERROR_SUCCESS, "can't open 32-bit CLSID key, got %d\n", res); if (res == ERROR_SUCCESS) { size = sizeof(value); res = RegQueryValueExA(hkey, "", NULL, NULL, (LPBYTE)value, &size); Modified: trunk/rostests/winetests/msi/msi.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/msi.c?rev=6… ============================================================================== --- trunk/rostests/winetests/msi/msi.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msi/msi.c [iso-8859-1] Mon Mar 9 20:28:54 2015 @@ -48,6 +48,10 @@ static INSTALLSTATE (WINAPI *pMsiGetComponentPathA) (LPCSTR, LPCSTR, LPSTR, DWORD*); +static INSTALLSTATE (WINAPI *pMsiProvideComponentA) + (LPCSTR, LPCSTR, LPCSTR, DWORD, LPSTR, LPDWORD); +static INSTALLSTATE (WINAPI *pMsiProvideComponentW) + (LPCWSTR, LPCWSTR, LPCWSTR, DWORD, LPWSTR, LPDWORD); static UINT (WINAPI *pMsiGetFileHashA) (LPCSTR, DWORD, PMSIFILEHASHINFO); static UINT (WINAPI *pMsiGetProductInfoExA) @@ -86,6 +90,8 @@ trace("GetProcAddress(%s) failed\n", #func); GET_PROC(hmsi, MsiGetComponentPathA) + GET_PROC(hmsi, MsiProvideComponentA) + GET_PROC(hmsi, MsiProvideComponentW) GET_PROC(hmsi, MsiGetFileHashA) GET_PROC(hmsi, MsiGetProductInfoExA) GET_PROC(hmsi, MsiOpenPackageExA) @@ -3402,6 +3408,100 @@ LocalFree(usersid); } +static void test_MsiProvideComponent(void) +{ + static const WCHAR sourcedirW[] = + {'s','o','u','r','c','e','d','i','r',0}; + static const WCHAR productW[] = + {'{','3','8','8','4','7','3','3','8','-','1','B','B','C','-','4','1','0','4','-', + '8','1','A','C','-','2','F','A','A','C','7','E','C','D','D','C','D','}',0}; + static const WCHAR componentW[] = + {'{','D','D','4','2','2','F','9','2','-','3','E','D','8','-','4','9','B','5','-', + 'A','0','B','7','-','F','2','6','6','F','9','8','3','5','7','D','F','}',0}; + INSTALLSTATE state; + char buf[0x100]; + WCHAR bufW[0x100]; + DWORD len, len2; + UINT r; + + if (is_process_limited()) + { + skip("process is limited\n"); + return; + } + + create_test_files(); + create_file("msitest\\sourcedir.txt", "msitest\\sourcedir.txt", 1000); + create_database(msifile, sd_tables, sizeof(sd_tables) / sizeof(msi_table)); + + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + + buf[0] = 0; + len = sizeof(buf); + r = pMsiProvideComponentA("{90120000-0070-0000-0000-4000000FF1CE}", + "{17961602-C4E2-482E-800A-DF6E627549CF}", + "ProductFiles", INSTALLMODE_NODETECTION, buf, &len); + ok(r == ERROR_INVALID_PARAMETER, "got %u\n", r); + + r = MsiInstallProductA(msifile, NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + state = MsiQueryFeatureStateA("{38847338-1BBC-4104-81AC-2FAAC7ECDDCD}", "sourcedir"); + ok(state == INSTALLSTATE_LOCAL, "got %d\n", state); + + buf[0] = 0; + len = sizeof(buf); + r = pMsiProvideComponentA("{38847338-1BBC-4104-81AC-2FAAC7ECDDCD}", "sourcedir", + "{DD422F92-3ED8-49B5-A0B7-F266F98357DF}", + INSTALLMODE_NODETECTION, buf, &len); + ok(r == ERROR_SUCCESS, "got %u\n", r); + ok(buf[0], "empty path\n"); + ok(len == lstrlenA(buf), "got %u\n", len); + + len2 = 0; + r = pMsiProvideComponentA("{38847338-1BBC-4104-81AC-2FAAC7ECDDCD}", "sourcedir", + "{DD422F92-3ED8-49B5-A0B7-F266F98357DF}", + INSTALLMODE_NODETECTION, NULL, &len2); + ok(r == ERROR_SUCCESS, "got %u\n", r); + ok(len2 == len, "got %u\n", len2); + + len2 = 0; + r = pMsiProvideComponentA("{38847338-1BBC-4104-81AC-2FAAC7ECDDCD}", "sourcedir", + "{DD422F92-3ED8-49B5-A0B7-F266F98357DF}", + INSTALLMODE_NODETECTION, buf, &len2); + ok(r == ERROR_MORE_DATA, "got %u\n", r); + ok(len2 == len, "got %u\n", len2); + + /* wide version */ + + bufW[0] = 0; + len = sizeof(buf); + r = pMsiProvideComponentW(productW, sourcedirW, componentW, + INSTALLMODE_NODETECTION, bufW, &len); + ok(r == ERROR_SUCCESS, "got %u\n", r); + ok(bufW[0], "empty path\n"); + ok(len == lstrlenW(bufW), "got %u\n", len); + + len2 = 0; + r = pMsiProvideComponentW(productW, sourcedirW, componentW, + INSTALLMODE_NODETECTION, NULL, &len2); + ok(r == ERROR_SUCCESS, "got %u\n", r); + ok(len2 == len, "got %u\n", len2); + + len2 = 0; + r = pMsiProvideComponentW(productW, sourcedirW, componentW, + INSTALLMODE_NODETECTION, bufW, &len2); + ok(r == ERROR_MORE_DATA, "got %u\n", r); + ok(len2 == len, "got %u\n", len2); + + r = MsiInstallProductA(msifile, "REMOVE=ALL"); + ok(r == ERROR_SUCCESS, "got %u\n", r); + + DeleteFileA("msitest\\sourcedir.txt"); + delete_test_files(); + DeleteFileA(msifile); +} + static void test_MsiGetProductCode(void) { HKEY compkey, prodkey; @@ -14298,6 +14398,7 @@ test_MsiQueryFeatureState(); test_MsiQueryComponentState(); test_MsiGetComponentPath(); + test_MsiProvideComponent(); test_MsiGetProductCode(); test_MsiEnumClients(); test_MsiGetProductInfo(); Modified: trunk/rostests/winetests/msi/package.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/package.c?r… ============================================================================== --- trunk/rostests/winetests/msi/package.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msi/package.c [iso-8859-1] Mon Mar 9 20:28:54 2015 @@ -2194,7 +2194,7 @@ sz = 6; r = MsiGetPropertyA(hpkg, "property", buffer, &sz); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok( !strlen(buffer), "Expected empty string, got %s\n", buffer); + ok(!buffer[0], "Expected empty string, got %s\n", buffer); MsiCloseHandle( hpkg ); DeleteFileA(msifile); @@ -2347,7 +2347,7 @@ lstrcpyA(buffer, "aaa"); r = MsiGetPropertyA(hpkg, "dantes", buffer, &sz); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(lstrlenA(buffer) == 0, "Expected empty string, got %s\n", buffer); + ok(!buffer[0], "Expected empty string, got %s\n", buffer); r = MsiSetPropertyA(hpkg, "dantes", "mercedes"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); Modified: trunk/rostests/winetests/msi/source.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/source.c?re… ============================================================================== --- trunk/rostests/winetests/msi/source.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msi/source.c [iso-8859-1] Mon Mar 9 20:28:54 2015 @@ -175,7 +175,7 @@ } if (!expected) - ok_(__FILE__, line)(lstrlenA(val) == 0, "Expected empty string, got %s\n", val); + ok_(__FILE__, line)(!val[0], "Expected empty string, got %s\n", val); else { if (bcase)

1 0

[akhaldi] 66632: [MSI] Sync with Wine Staging 1.7.37. CORE-9246
by akhaldi＠svn.reactos.org 09 Mar '15

09 Mar '15

Author: akhaldi Date: Mon Mar 9 20:28:19 2015 New Revision: 66632 URL: http://svn.reactos.org/svn/reactos?rev=66632&view=rev Log: [MSI] Sync with Wine Staging 1.7.37. CORE-9246 Modified: trunk/reactos/dll/win32/msi/action.c trunk/reactos/dll/win32/msi/assembly.c trunk/reactos/dll/win32/msi/database.c trunk/reactos/dll/win32/msi/dialog.c trunk/reactos/dll/win32/msi/media.c trunk/reactos/dll/win32/msi/msi.c trunk/reactos/dll/win32/msi/msi.rc trunk/reactos/dll/win32/msi/msi.spec trunk/reactos/dll/win32/msi/msipriv.h trunk/reactos/dll/win32/msi/msiquery.c trunk/reactos/dll/win32/msi/package.c trunk/reactos/dll/win32/msi/patch.c trunk/reactos/dll/win32/msi/registry.c trunk/reactos/dll/win32/msi/script.c trunk/reactos/dll/win32/msi/storages.c trunk/reactos/dll/win32/msi/streams.c trunk/reactos/dll/win32/msi/string.c trunk/reactos/dll/win32/msi/table.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/msi/action.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/action.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msi/action.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/action.c [iso-8859-1] Mon Mar 9 20:28:19 2015 @@ -2407,7 +2407,6 @@ sprintfW( buf, fmtW, free.QuadPart / 512 ); msi_set_property( package->db, szPrimaryVolumeSpaceAvailable, buf, -1 ); } - toupperW( primary_folder[0] ); msi_set_property( package->db, szPrimaryVolumePath, primary_folder, 2 ); } msi_free( primary_folder ); @@ -2422,9 +2421,9 @@ return MSI_SetFeatureStates(package); } -static BYTE *parse_value( MSIPACKAGE *package, const WCHAR *value, DWORD *type, DWORD *size ) -{ - BYTE *data = NULL; +static BYTE *parse_value( MSIPACKAGE *package, const WCHAR *value, DWORD len, DWORD *type, DWORD *size ) +{ + BYTE *data; if (!value) { @@ -2513,19 +2512,18 @@ else { const WCHAR *ptr = value; - DWORD len; *type = REG_SZ; if (value[0] == '#') { - ptr++; + ptr++; len--; if (value[1] == '%') { - ptr++; + ptr++; len--; *type = REG_EXPAND_SZ; } } - len = deformat_string( package, ptr, (WCHAR **)&data ); + data = (BYTE *)msi_strdupW( ptr, len ); if (len > strlenW( (const WCHAR *)data )) *type = REG_MULTI_SZ; *size = (len + 1) * sizeof(WCHAR); } @@ -2574,38 +2572,22 @@ return ret; } -static WCHAR *get_keypath( MSICOMPONENT *comp, HKEY root, const WCHAR *path ) -{ - static const WCHAR prefixW[] = {'S','O','F','T','W','A','R','E','\\'}; - static const UINT len = sizeof(prefixW) / sizeof(prefixW[0]); - - if ((is_64bit || is_wow64) && - !(comp->Attributes & msidbComponentAttributes64bit) && - root == HKEY_LOCAL_MACHINE && !strncmpiW( path, prefixW, len )) - { - UINT size; - WCHAR *path_32node; - - size = (strlenW( path ) + strlenW( szWow6432Node ) + 2) * sizeof(WCHAR); - if (!(path_32node = msi_alloc( size ))) return NULL; - - memcpy( path_32node, path, len * sizeof(WCHAR) ); - strcpyW( path_32node + len, szWow6432Node ); - strcatW( path_32node, szBackSlash ); - strcatW( path_32node, path + len ); - return path_32node; - } - return strdupW( path ); -} - -static HKEY open_key( HKEY root, const WCHAR *path, BOOL create ) +static inline REGSAM get_registry_view( const MSICOMPONENT *comp ) +{ + REGSAM view = 0; + if (is_wow64 || is_64bit) + view |= (comp->Attributes & msidbComponentAttributes64bit) ? KEY_WOW64_64KEY : KEY_WOW64_32KEY; + return view; +} + +static HKEY open_key( const MSICOMPONENT *comp, HKEY root, const WCHAR *path, BOOL create ) { REGSAM access = KEY_ALL_ACCESS; WCHAR *subkey, *p, *q; HKEY hkey, ret = NULL; LONG res; - if (is_wow64) access |= KEY_WOW64_64KEY; + access |= get_registry_view( comp ); if (!(subkey = strdupW( path ))) return NULL; p = subkey; @@ -2622,7 +2604,7 @@ } if (q && q[1]) { - ret = open_key( hkey, q + 1, create ); + ret = open_key( comp, hkey, q + 1, create ); RegCloseKey( hkey ); } else ret = hkey; @@ -2803,7 +2785,7 @@ BYTE *new_value, *old_value = NULL; HKEY root_key, hkey; DWORD type, old_type, new_size, old_size = 0; - LPWSTR deformated, uikey, keypath; + LPWSTR deformated, uikey; const WCHAR *szRoot, *component, *name, *key, *str; MSICOMPONENT *comp; MSIRECORD * uirow; @@ -2847,23 +2829,19 @@ strcpyW(uikey,szRoot); strcatW(uikey,deformated); - keypath = get_keypath( comp, root_key, deformated ); + if (!(hkey = open_key( comp, root_key, deformated, TRUE ))) + { + ERR("Could not create key %s\n", debugstr_w(deformated)); + msi_free(uikey); + msi_free(deformated); + return ERROR_FUNCTION_FAILED; + } msi_free( deformated ); - if (!(hkey = open_key( root_key, keypath, TRUE ))) - { - ERR("Could not create key %s\n", debugstr_w(keypath)); - msi_free(uikey); - msi_free(keypath); - return ERROR_FUNCTION_FAILED; - } - str = msi_record_get_string( row, 5, &len ); - if (str && len > strlenW( str )) - { - type = REG_MULTI_SZ; - new_size = (len + 1) * sizeof(WCHAR); - new_value = (BYTE *)msi_strdupW( str, len ); - } - else new_value = parse_value( package, str, &type, &new_size ); + str = msi_record_get_string( row, 5, NULL ); + len = deformat_string( package, str, &deformated ); + new_value = parse_value( package, deformated, len, &type, &new_size ); + + msi_free( deformated ); deformat_string(package, name, &deformated); if (!is_special_entry( name )) @@ -2911,7 +2889,6 @@ msi_free(old_value); msi_free(deformated); msi_free(uikey); - msi_free(keypath); return ERROR_SUCCESS; } @@ -2933,20 +2910,20 @@ return rc; } -static void delete_key( HKEY root, const WCHAR *path ) +static void delete_key( const MSICOMPONENT *comp, HKEY root, const WCHAR *path ) { REGSAM access = 0; WCHAR *subkey, *p; HKEY hkey; LONG res; - if (is_wow64) access |= KEY_WOW64_64KEY; + access |= get_registry_view( comp ); if (!(subkey = strdupW( path ))) return; for (;;) { if ((p = strrchrW( subkey, '\\' ))) *p = 0; - hkey = open_key( root, subkey, FALSE ); + hkey = open_key( comp, root, subkey, FALSE ); if (!hkey) break; if (p && p[1]) res = RegDeleteKeyExW( hkey, p + 1, access, 0 ); @@ -2963,13 +2940,13 @@ msi_free( subkey ); } -static void delete_value( HKEY root, const WCHAR *path, const WCHAR *value ) +static void delete_value( const MSICOMPONENT *comp, HKEY root, const WCHAR *path, const WCHAR *value ) { LONG res; HKEY hkey; DWORD num_subkeys, num_values; - if ((hkey = open_key( root, path, FALSE ))) + if ((hkey = open_key( comp, root, path, FALSE ))) { if ((res = RegDeleteValueW( hkey, value ))) TRACE("failed to delete value %s (%d)\n", debugstr_w(value), res); @@ -2980,20 +2957,20 @@ if (!res && !num_subkeys && !num_values) { TRACE("removing empty key %s\n", debugstr_w(path)); - delete_key( root, path ); - } - } -} - -static void delete_tree( HKEY root, const WCHAR *path ) + delete_key( comp, root, path ); + } + } +} + +static void delete_tree( const MSICOMPONENT *comp, HKEY root, const WCHAR *path ) { LONG res; HKEY hkey; - if (!(hkey = open_key( root, path, FALSE ))) return; + if (!(hkey = open_key( comp, root, path, FALSE ))) return; res = SHDeleteKeyW( hkey, NULL ); if (res) TRACE("failed to delete subtree of %s (%d)\n", debugstr_w(path), res); - delete_key( root, path ); + delete_key( comp, root, path ); RegCloseKey( hkey ); } @@ -3001,7 +2978,7 @@ { MSIPACKAGE *package = param; LPCWSTR component, name, key_str, root_key_str; - LPWSTR deformated_key, deformated_name, ui_key_str, keypath; + LPWSTR deformated_key, deformated_name, ui_key_str; MSICOMPONENT *comp; MSIRECORD *uirow; BOOL delete_key = FALSE; @@ -3050,11 +3027,9 @@ deformat_string( package, name, &deformated_name ); - keypath = get_keypath( comp, hkey_root, deformated_key ); + if (delete_key) delete_tree( comp, hkey_root, deformated_key ); + else delete_value( comp, hkey_root, deformated_key, deformated_name ); msi_free( deformated_key ); - if (delete_key) delete_tree( hkey_root, keypath ); - else delete_value( hkey_root, keypath, deformated_name ); - msi_free( keypath ); uirow = MSI_CreateRecord( 2 ); MSI_RecordSetStringW( uirow, 1, ui_key_str ); @@ -3071,7 +3046,7 @@ { MSIPACKAGE *package = param; LPCWSTR component, name, key_str, root_key_str; - LPWSTR deformated_key, deformated_name, ui_key_str, keypath; + LPWSTR deformated_key, deformated_name, ui_key_str; MSICOMPONENT *comp; MSIRECORD *uirow; BOOL delete_key = FALSE; @@ -3115,11 +3090,9 @@ deformat_string( package, name, &deformated_name ); - keypath = get_keypath( comp, hkey_root, deformated_key ); + if (delete_key) delete_tree( comp, hkey_root, deformated_key ); + else delete_value( comp, hkey_root, deformated_key, deformated_name ); msi_free( deformated_key ); - if (delete_key) delete_tree( hkey_root, keypath ); - else delete_value( hkey_root, keypath, deformated_name ); - msi_free( keypath ); uirow = MSI_CreateRecord( 2 ); MSI_RecordSetStringW( uirow, 1, ui_key_str ); @@ -5300,7 +5273,7 @@ WCHAR *remove; /* first do the same as an InstallExecute */ - rc = ACTION_InstallExecute(package); + rc = execute_script(package, SCRIPT_INSTALL); if (rc != ERROR_SUCCESS) return rc; @@ -5940,23 +5913,20 @@ if (!comp) return ERROR_SUCCESS; + event = MSI_RecordGetInteger( rec, 3 ); + deformat_string( package, MSI_RecordGetString( rec, 2 ), &name ); + comp->Action = msi_get_component_action( package, comp ); - if (comp->Action != INSTALLSTATE_LOCAL) - { - TRACE("component not scheduled for installation %s\n", debugstr_w(component)); - return ERROR_SUCCESS; - } - - deformat_string(package, MSI_RecordGetString(rec, 2), &name); + if (!(comp->Action == INSTALLSTATE_LOCAL && (event & msidbServiceControlEventStart)) && + !(comp->Action == INSTALLSTATE_ABSENT && (event & msidbServiceControlEventUninstallStart))) + { + TRACE("not starting %s\n", debugstr_w(name)); + msi_free( name ); + return ERROR_SUCCESS; + } + deformat_string(package, MSI_RecordGetString(rec, 4), &args); - event = MSI_RecordGetInteger(rec, 3); wait = MSI_RecordGetInteger(rec, 5); - - if (!(event & msidbServiceControlEventStart)) - { - r = ERROR_SUCCESS; - goto done; - } scm = OpenSCManagerW(NULL, NULL, SC_MANAGER_CONNECT); if (!scm) @@ -6147,23 +6117,24 @@ MSICOMPONENT *comp; MSIRECORD *uirow; LPCWSTR component; - LPWSTR name = NULL, display_name = NULL; + WCHAR *name, *display_name = NULL; DWORD event, len; SC_HANDLE scm; - - event = MSI_RecordGetInteger( rec, 3 ); - if (!(event & msidbServiceControlEventStop)) - return ERROR_SUCCESS; component = MSI_RecordGetString( rec, 6 ); comp = msi_get_loaded_component( package, component ); if (!comp) return ERROR_SUCCESS; + event = MSI_RecordGetInteger( rec, 3 ); + deformat_string( package, MSI_RecordGetString( rec, 2 ), &name ); + comp->Action = msi_get_component_action( package, comp ); - if (comp->Action != INSTALLSTATE_ABSENT) - { - TRACE("component not scheduled for removal %s\n", debugstr_w(component)); + if (!(comp->Action == INSTALLSTATE_LOCAL && (event & msidbServiceControlEventStop)) && + !(comp->Action == INSTALLSTATE_ABSENT && (event & msidbServiceControlEventUninstallStop))) + { + TRACE("not stopping %s\n", debugstr_w(name)); + msi_free( name ); return ERROR_SUCCESS; } @@ -6183,7 +6154,6 @@ } CloseServiceHandle( scm ); - deformat_string( package, MSI_RecordGetString( rec, 2 ), &name ); stop_service( name ); done: @@ -6982,6 +6952,7 @@ data = msi_alloc(size); if (!data) { + msi_free(deformatted); RegCloseKey(env); return ERROR_OUTOFMEMORY; } @@ -7801,10 +7772,7 @@ package->full_reinstall = 1; } - /* properties may have been added by a transform */ - msi_clone_properties( package ); msi_set_original_database_property( package->db, szPackagePath ); - msi_parse_command_line( package, szCommandLine, FALSE ); msi_adjust_privilege_properties( package ); msi_set_context( package ); Modified: trunk/reactos/dll/win32/msi/assembly.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/assembly.c?r… ============================================================================== --- trunk/reactos/dll/win32/msi/assembly.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/assembly.c [iso-8859-1] Mon Mar 9 20:28:19 2015 @@ -242,7 +242,7 @@ memset( &info, 0, sizeof(info) ); info.cbAssemblyInfo = sizeof(info); hr = IAssemblyCache_QueryAssemblyInfo( cache, 0, display_name, &info ); - if (hr == S_OK /* sxs version */ || hr == HRESULT_FROM_WIN32( ERROR_INSUFFICIENT_BUFFER )) + if (hr == S_OK /* sxs version */ || hr == E_NOT_SUFFICIENT_BUFFER) { return (info.dwAssemblyFlags == ASSEMBLYINFO_FLAG_INSTALLED); } @@ -348,7 +348,7 @@ if (!pGetFileVersion) return CLR_VERSION_V10; hr = pGetFileVersion( filename, NULL, 0, &len ); - if (hr != HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER)) return CLR_VERSION_V11; + if (hr != E_NOT_SUFFICIENT_BUFFER) return CLR_VERSION_V11; if ((strW = msi_alloc( len * sizeof(WCHAR) ))) { hr = pGetFileVersion( filename, strW, len, &len ); Modified: trunk/reactos/dll/win32/msi/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/database.c?r… ============================================================================== --- trunk/reactos/dll/win32/msi/database.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/database.c [iso-8859-1] Mon Mar 9 20:28:19 2015 @@ -36,179 +36,25 @@ #define IS_INTMSIDBOPEN(x) (((ULONG_PTR)(x) >> 16) == 0) -typedef struct tagMSITRANSFORM { - struct list entry; - IStorage *stg; -} MSITRANSFORM; - -typedef struct tagMSISTREAM { - struct list entry; - IStorage *stg; - IStream *stm; -} MSISTREAM; - -static UINT find_open_stream( MSIDATABASE *db, IStorage *stg, LPCWSTR name, IStream **stm ) -{ - MSISTREAM *stream; - - LIST_FOR_EACH_ENTRY( stream, &db->streams, MSISTREAM, entry ) - { - HRESULT r; - STATSTG stat; - - if (stream->stg != stg) continue; - - r = IStream_Stat( stream->stm, &stat, 0 ); - if( FAILED( r ) ) - { - WARN("failed to stat stream r = %08x!\n", r); - continue; - } - - if( !strcmpW( name, stat.pwcsName ) ) - { - TRACE("found %s\n", debugstr_w(name)); - *stm = stream->stm; - CoTaskMemFree( stat.pwcsName ); - return ERROR_SUCCESS; - } - - CoTaskMemFree( stat.pwcsName ); - } - - return ERROR_FUNCTION_FAILED; -} - -UINT msi_clone_open_stream( MSIDATABASE *db, IStorage *stg, LPCWSTR name, IStream **stm ) -{ - IStream *stream; - - if (find_open_stream( db, stg, name, &stream ) == ERROR_SUCCESS) - { - HRESULT r; - LARGE_INTEGER pos; - - r = IStream_Clone( stream, stm ); - if( FAILED( r ) ) - { - WARN("failed to clone stream r = %08x!\n", r); - return ERROR_FUNCTION_FAILED; - } - - pos.QuadPart = 0; - r = IStream_Seek( *stm, pos, STREAM_SEEK_SET, NULL ); - if( FAILED( r ) ) - { - IStream_Release( *stm ); - return ERROR_FUNCTION_FAILED; - } - - return ERROR_SUCCESS; - } - - return ERROR_FUNCTION_FAILED; -} - -UINT msi_get_raw_stream( MSIDATABASE *db, LPCWSTR stname, IStream **stm ) -{ - HRESULT r; - IStorage *stg; - WCHAR decoded[MAX_STREAM_NAME_LEN + 1]; - - decode_streamname( stname, decoded ); - TRACE("%s -> %s\n", debugstr_w(stname), debugstr_w(decoded)); - - if (msi_clone_open_stream( db, db->storage, stname, stm ) == ERROR_SUCCESS) - return ERROR_SUCCESS; - - r = IStorage_OpenStream( db->storage, stname, NULL, - STGM_READ | STGM_SHARE_EXCLUSIVE, 0, stm ); - if( FAILED( r ) ) - { - MSITRANSFORM *transform; - - LIST_FOR_EACH_ENTRY( transform, &db->transforms, MSITRANSFORM, entry ) - { - r = IStorage_OpenStream( transform->stg, stname, NULL, - STGM_READ | STGM_SHARE_EXCLUSIVE, 0, stm ); - if (SUCCEEDED(r)) - { - stg = transform->stg; - break; - } - } - } - else stg = db->storage; - - if( SUCCEEDED(r) ) - { - MSISTREAM *stream; - - if (!(stream = msi_alloc( sizeof(MSISTREAM) ))) return ERROR_NOT_ENOUGH_MEMORY; - stream->stg = stg; - IStorage_AddRef( stg ); - stream->stm = *stm; - IStream_AddRef( *stm ); - list_add_tail( &db->streams, &stream->entry ); - } - - return SUCCEEDED(r) ? ERROR_SUCCESS : ERROR_FUNCTION_FAILED; -} - static void free_transforms( MSIDATABASE *db ) { while( !list_empty( &db->transforms ) ) { - MSITRANSFORM *t = LIST_ENTRY( list_head( &db->transforms ), - MSITRANSFORM, entry ); + MSITRANSFORM *t = LIST_ENTRY( list_head( &db->transforms ), MSITRANSFORM, entry ); list_remove( &t->entry ); IStorage_Release( t->stg ); msi_free( t ); } } -void msi_destroy_stream( MSIDATABASE *db, const WCHAR *stname ) -{ - MSISTREAM *stream, *stream2; - - LIST_FOR_EACH_ENTRY_SAFE( stream, stream2, &db->streams, MSISTREAM, entry ) - { - HRESULT r; - STATSTG stat; - - r = IStream_Stat( stream->stm, &stat, 0 ); - if (FAILED(r)) - { - WARN("failed to stat stream r = %08x\n", r); - continue; - } - - if (!strcmpW( stname, stat.pwcsName )) - { - TRACE("destroying %s\n", debugstr_w(stname)); - - list_remove( &stream->entry ); - IStream_Release( stream->stm ); - IStorage_Release( stream->stg ); - IStorage_DestroyElement( stream->stg, stname ); - msi_free( stream ); - CoTaskMemFree( stat.pwcsName ); - break; - } - CoTaskMemFree( stat.pwcsName ); - } -} - static void free_streams( MSIDATABASE *db ) { - while( !list_empty( &db->streams ) ) - { - MSISTREAM *s = LIST_ENTRY(list_head( &db->streams ), MSISTREAM, entry); - list_remove( &s->entry ); - IStream_Release( s->stm ); - IStorage_Release( s->stg ); - msi_free( s ); - } + UINT i; + for (i = 0; i < db->num_streams; i++) + { + if (db->streams[i].stream) IStream_Release( db->streams[i].stream ); + } + msi_free( db->streams ); } void append_storage_to_db( MSIDATABASE *db, IStorage *stg ) @@ -219,18 +65,15 @@ t->stg = stg; IStorage_AddRef( stg ); list_add_head( &db->transforms, &t->entry ); - - /* the transform may add or replace streams */ +} + +static VOID MSI_CloseDatabase( MSIOBJECTHDR *arg ) +{ + MSIDATABASE *db = (MSIDATABASE *) arg; + + msi_free(db->path); free_streams( db ); -} - -static VOID MSI_CloseDatabase( MSIOBJECTHDR *arg ) -{ - MSIDATABASE *db = (MSIDATABASE *) arg; - - msi_free(db->path); free_cached_tables( db ); - free_streams( db ); free_transforms( db ); if (db->strings) msi_destroy_stringtable( db->strings ); IStorage_Release( db->storage ); @@ -413,7 +256,6 @@ db->deletefile = strdupW( szDBPath ); list_init( &db->tables ); list_init( &db->transforms ); - list_init( &db->streams ); db->strings = msi_load_string_table( stg, &db->bytes_per_strref ); if( !db->strings ) Modified: trunk/reactos/dll/win32/msi/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/dialog.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msi/dialog.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/dialog.c [iso-8859-1] Mon Mar 9 20:28:19 2015 @@ -135,7 +135,6 @@ static const WCHAR szVolumeSelectCombo[] = { 'V','o','l','u','m','e','S','e','l','e','c','t','C','o','m','b','o',0 }; static const WCHAR szSelectionDescription[] = {'S','e','l','e','c','t','i','o','n','D','e','s','c','r','i','p','t','i','o','n',0}; static const WCHAR szSelectionPath[] = {'S','e','l','e','c','t','i','o','n','P','a','t','h',0}; -static const WCHAR szProperty[] = {'P','r','o','p','e','r','t','y',0}; static const WCHAR szHyperLink[] = {'H','y','p','e','r','L','i','n','k',0}; /* dialog sequencing */ @@ -2152,7 +2151,7 @@ /* FIXME: test when this should fail */ static BOOL msi_dialog_verify_path( LPWSTR path ) { - if ( !lstrlenW( path ) ) + if ( !path[0] ) return FALSE; if ( PathIsRelativeW( path ) ) Modified: trunk/reactos/dll/win32/msi/media.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/media.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/msi/media.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/media.c [iso-8859-1] Mon Mar 9 20:28:19 2015 @@ -216,15 +216,12 @@ WARN("failed to encode stream name\n"); return -1; } - if (msi_clone_open_stream( package_disk.package->db, cab->storage, encoded, &stream ) != ERROR_SUCCESS) - { - hr = IStorage_OpenStream( cab->storage, encoded, NULL, STGM_READ|STGM_SHARE_EXCLUSIVE, 0, &stream ); - if (FAILED(hr)) - { - WARN("failed to open stream 0x%08x\n", hr); - msi_free( encoded ); - return -1; - } + hr = IStorage_OpenStream( cab->storage, encoded, NULL, STGM_READ|STGM_SHARE_EXCLUSIVE, 0, &stream ); + if (FAILED(hr)) + { + WARN("failed to open stream 0x%08x\n", hr); + msi_free( encoded ); + return -1; } msi_free( encoded ); return (INT_PTR)stream; @@ -286,9 +283,6 @@ mi->disk_prompt = strdupW(MSI_RecordGetString(row, 3)); mi->cabinet = strdupW(MSI_RecordGetString(row, 4)); mi->volume_label = strdupW(MSI_RecordGetString(row, 5)); - - if (!mi->first_volume) - mi->first_volume = strdupW(mi->volume_label); msiobj_release(&row->hdr); return ERROR_SUCCESS; @@ -662,7 +656,6 @@ msi_free(mi->disk_prompt); msi_free(mi->cabinet); msi_free(mi->volume_label); - msi_free(mi->first_volume); msi_free(mi); } @@ -707,9 +700,6 @@ msi_free(mi->volume_label); mi->volume_label = strdupW(MSI_RecordGetString(row, 5)); msiobj_release(&row->hdr); - - if (!mi->first_volume) - mi->first_volume = strdupW(mi->volume_label); msi_set_sourcedir_props(package, FALSE); source_dir = msi_dup_property(package->db, szSourceDir); @@ -880,7 +870,7 @@ } } /* check volume matches, change media if not */ - if (mi->volume_label && mi->disk_id > 1 && strcmpW( mi->first_volume, mi->volume_label )) + if (mi->volume_label && mi->disk_id > 1) { WCHAR *source = msi_dup_property( package->db, szSourceDir ); BOOL match = source_matches_volume( mi, source ); Modified: trunk/reactos/dll/win32/msi/msi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi.c?rev=66… ============================================================================== --- trunk/reactos/dll/win32/msi/msi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/msi.c [iso-8859-1] Mon Mar 9 20:28:19 2015 @@ -1737,10 +1737,6 @@ { datakey = patch; szProperty = szInstalled; - } - else if (!strcmpW( szProperty, INSTALLPROPERTY_LOCALPACKAGEW )) - { - datakey = udpatch; } else if (!strcmpW( szProperty, INSTALLPROPERTY_UNINSTALLABLEW ) || !strcmpW( szProperty, INSTALLPROPERTY_PATCHSTATEW ) || @@ -4178,6 +4174,92 @@ return ERROR_SUCCESS; } +UINT WINAPI MsiProvideComponentA( LPCSTR product, LPCSTR feature, LPCSTR component, DWORD mode, LPSTR buf, LPDWORD buflen ) +{ + WCHAR *productW = NULL, *componentW = NULL, *featureW = NULL, *bufW = NULL; + UINT r = ERROR_OUTOFMEMORY; + DWORD lenW; + int len; + + TRACE("%s, %s, %s, %x, %p, %p\n", debugstr_a(product), debugstr_a(component), debugstr_a(feature), mode, buf, buflen); + + if (product && !(productW = strdupAtoW( product ))) goto done; + if (feature && !(featureW = strdupAtoW( feature ))) goto done; + if (component && !(componentW = strdupAtoW( component ))) goto done; + + r = MsiProvideComponentW( productW, featureW, componentW, mode, NULL, &lenW ); + if (r != ERROR_SUCCESS) + goto done; + + if (!(bufW = msi_alloc( ++lenW * sizeof(WCHAR) ))) + { + r = ERROR_OUTOFMEMORY; + goto done; + } + + r = MsiProvideComponentW( productW, featureW, componentW, mode, bufW, &lenW ); + if (r != ERROR_SUCCESS) + goto done; + + len = WideCharToMultiByte( CP_ACP, 0, bufW, -1, NULL, 0, NULL, NULL ); + if (buf) + { + if (len > *buflen) + r = ERROR_MORE_DATA; + else + WideCharToMultiByte( CP_ACP, 0, bufW, -1, buf, *buflen, NULL, NULL ); + } + + *buflen = len - 1; + +done: + msi_free( productW ); + msi_free( featureW ); + msi_free( componentW ); + msi_free( bufW ); + return r; +} + +UINT WINAPI MsiProvideComponentW( LPCWSTR product, LPCWSTR feature, LPCWSTR component, DWORD mode, LPWSTR buf, LPDWORD buflen ) +{ + INSTALLSTATE state; + + TRACE("%s, %s, %s, %x, %p, %p\n", debugstr_w(product), debugstr_w(component), debugstr_w(feature), mode, buf, buflen); + + state = MsiQueryFeatureStateW( product, feature ); + TRACE("feature state: %d\n", state); + switch (mode) + { + case INSTALLMODE_NODETECTION: + break; + + default: + FIXME("mode %x not implemented\n", mode); + return ERROR_INSTALL_FAILURE; + } + + state = MsiGetComponentPathW( product, component, buf, buflen ); + TRACE("component state: %d\n", state); + switch (state) + { + case INSTALLSTATE_INVALIDARG: + return ERROR_INVALID_PARAMETER; + + case INSTALLSTATE_MOREDATA: + return ERROR_MORE_DATA; + + case INSTALLSTATE_ADVERTISED: + case INSTALLSTATE_LOCAL: + case INSTALLSTATE_SOURCE: + MsiUseFeatureW( product, feature ); + return ERROR_SUCCESS; + + default: + TRACE("MsiGetComponentPathW returned %d\n", state); + return ERROR_INSTALL_FAILURE; + } +} + /*********************************************************************** * MsiBeginTransactionA [MSI.@] */ @@ -4224,3 +4306,21 @@ FIXME("%p,%p,%p,%08x\n", a, b, c, d); return ERROR_SUCCESS; } + +/*********************************************************************** + * MsiRemovePatchesA [MSI.@] + */ +UINT WINAPI MsiRemovePatchesA(LPCSTR patchlist, LPCSTR product, INSTALLTYPE type, LPCSTR propertylist) +{ + FIXME("(%s %s %d %s\n", debugstr_a(patchlist), debugstr_a(product), type, debugstr_a(propertylist)); + return ERROR_SUCCESS; +} + +/*********************************************************************** + * MsiRemovePatchesW [MSI.@] + */ +UINT WINAPI MsiRemovePatchesW(LPCWSTR patchlist, LPCWSTR product, INSTALLTYPE type, LPCWSTR propertylist) +{ + FIXME("(%s %s %d %s\n", debugstr_w(patchlist), debugstr_w(product), type, debugstr_w(propertylist)); + return ERROR_SUCCESS; +} Modified: trunk/reactos/dll/win32/msi/msi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi.rc?rev=6… ============================================================================== --- trunk/reactos/dll/win32/msi/msi.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/msi.rc [iso-8859-1] Mon Mar 9 20:28:19 2015 @@ -84,9 +84,9 @@ #define WINE_FILEDESCRIPTION_STR "Wine MSI dll" #define WINE_FILENAME_STR "msi.dll" -#define WINE_FILEVERSION 4,5,6001,22299 -#define WINE_FILEVERSION_STR "4.5.6001.22299" -#define WINE_PRODUCTVERSION 4,5,6001,22299 -#define WINE_PRODUCTVERSION_STR "4.5.6001.22299" +#define WINE_FILEVERSION 4,5,6001,22308 +#define WINE_FILEVERSION_STR "4.5.6001.22308" +#define WINE_PRODUCTVERSION 4,5,6001,22308 +#define WINE_PRODUCTVERSION_STR "4.5.6001.22308" #include <wine/wine_common_ver.rc> Modified: trunk/reactos/dll/win32/msi/msi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi.spec?rev… ============================================================================== --- trunk/reactos/dll/win32/msi/msi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/msi.spec [iso-8859-1] Mon Mar 9 20:28:19 2015 @@ -97,10 +97,10 @@ 101 stub MsiProcessAdvertiseScriptA 102 stub MsiProcessAdvertiseScriptW 103 stdcall MsiProcessMessage(long long long) -104 stub MsiProvideComponentA +104 stdcall MsiProvideComponentA(str str str long ptr ptr) 105 stdcall MsiProvideComponentFromDescriptorA(str ptr ptr ptr) 106 stdcall MsiProvideComponentFromDescriptorW(wstr ptr ptr ptr) -107 stub MsiProvideComponentW +107 stdcall MsiProvideComponentW(wstr wstr wstr long ptr ptr) 108 stdcall MsiProvideQualifiedComponentA(str str long ptr ptr) 109 stdcall MsiProvideQualifiedComponentW(wstr wstr long ptr ptr) 110 stdcall MsiQueryFeatureStateA(str str) @@ -230,8 +230,8 @@ 234 stub MsiDeleteUserDataW 235 stub Migrate10CachedPackagesA 236 stdcall Migrate10CachedPackagesW(ptr ptr ptr long) -237 stub MsiRemovePatchesA -238 stub MsiRemovePatchesW +237 stdcall MsiRemovePatchesA(str str long str) +238 stdcall MsiRemovePatchesW(wstr wstr long wstr) 239 stdcall MsiApplyMultiplePatchesA(str str str) 240 stdcall MsiApplyMultiplePatchesW(wstr wstr wstr) 241 stub MsiExtractPatchXMLDataA @@ -281,9 +281,16 @@ 285 stdcall MsiBeginTransactionW(wstr long ptr ptr) 286 stdcall MsiEndTransaction(long) 287 stub MsiJoinTransaction -288 stub QueryInstanceCount +288 stub MsiSetOfflineContextW +289 stdcall MsiEnumComponentsExA(str long long ptr ptr ptr ptr) +290 stdcall MsiEnumComponentsExW(wstr long long ptr ptr ptr ptr) +291 stdcall MsiEnumClientsExA(str str long long ptr ptr ptr ptr) +292 stdcall MsiEnumClientsExW(wstr wstr long long ptr ptr ptr ptr) +293 stub MsiGetComponentPathExA +294 stub MsiGetComponentPathExW +295 stub QueryInstanceCount + @ stdcall -private DllCanUnloadNow() @ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() - Modified: trunk/reactos/dll/win32/msi/msipriv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msipriv.h?re… ============================================================================== --- trunk/reactos/dll/win32/msi/msipriv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/msipriv.h [iso-8859-1] Mon Mar 9 20:28:19 2015 @@ -94,6 +94,18 @@ #define MSI_INITIAL_MEDIA_TRANSFORM_OFFSET 10000 #define MSI_INITIAL_MEDIA_TRANSFORM_DISKID 30000 +typedef struct tagMSISTREAM +{ + UINT str_index; + IStream *stream; +} MSISTREAM; + +typedef struct tagMSITRANSFORM +{ + struct list entry; + IStorage *stg; +} MSITRANSFORM; + typedef struct tagMSIDATABASE { MSIOBJECTHDR hdr; @@ -107,7 +119,9 @@ UINT media_transform_disk_id; struct list tables; struct list transforms; - struct list streams; + MSISTREAM *streams; + UINT num_streams; + UINT num_streams_allocated; } MSIDATABASE; typedef struct tagMSIVIEW MSIVIEW; @@ -168,7 +182,6 @@ UINT last_sequence; LPWSTR disk_prompt; LPWSTR cabinet; - LPWSTR first_volume; LPWSTR volume_label; BOOL is_continuous; BOOL is_extracted; @@ -757,6 +770,7 @@ extern void free_cached_tables( MSIDATABASE *db ) DECLSPEC_HIDDEN; extern UINT MSI_CommitTables( MSIDATABASE *db ) DECLSPEC_HIDDEN; +extern UINT msi_commit_streams( MSIDATABASE *db ) DECLSPEC_HIDDEN; /* string table functions */ @@ -766,7 +780,7 @@ StringNonPersistent = 1 }; -extern BOOL msi_addstringW( string_table *st, const WCHAR *data, int len, USHORT refcount, enum StringPersistence persistence ) DECLSPEC_HIDDEN; +extern BOOL msi_add_string( string_table *st, const WCHAR *data, int len, enum StringPersistence persistence ) DECLSPEC_HIDDEN; extern UINT msi_string2id( const string_table *st, const WCHAR *data, int len, UINT *id ) DECLSPEC_HIDDEN; extern VOID msi_destroy_stringtable( string_table *st ) DECLSPEC_HIDDEN; extern const WCHAR *msi_string_lookup( const string_table *st, UINT id, int *len ) DECLSPEC_HIDDEN; @@ -844,9 +858,7 @@ extern BOOL decode_streamname(LPCWSTR in, LPWSTR out) DECLSPEC_HIDDEN; /* database internals */ -extern UINT msi_get_raw_stream( MSIDATABASE *, LPCWSTR, IStream ** ) DECLSPEC_HIDDEN; -extern UINT msi_clone_open_stream( MSIDATABASE *, IStorage *, const WCHAR *, IStream ** ) DECLSPEC_HIDDEN; -void msi_destroy_stream( MSIDATABASE *, const WCHAR * ) DECLSPEC_HIDDEN; +extern UINT msi_get_stream( MSIDATABASE *, const WCHAR *, IStream ** ) DECLSPEC_HIDDEN; extern UINT MSI_OpenDatabaseW( LPCWSTR, LPCWSTR, MSIDATABASE ** ) DECLSPEC_HIDDEN; extern UINT MSI_DatabaseOpenViewW(MSIDATABASE *, LPCWSTR, MSIQUERY ** ) DECLSPEC_HIDDEN; extern UINT MSI_OpenQuery( MSIDATABASE *, MSIQUERY **, LPCWSTR, ... ) DECLSPEC_HIDDEN; @@ -879,7 +891,7 @@ extern UINT msi_download_file( LPCWSTR szUrl, LPWSTR filename ) DECLSPEC_HIDDEN; extern UINT msi_package_add_info(MSIPACKAGE *, DWORD, DWORD, LPCWSTR, LPWSTR) DECLSPEC_HIDDEN; extern UINT msi_package_add_media_disk(MSIPACKAGE *, DWORD, DWORD, DWORD, LPWSTR, LPWSTR) DECLSPEC_HIDDEN; -extern UINT msi_clone_properties(MSIPACKAGE *) DECLSPEC_HIDDEN; +extern UINT msi_clone_properties(MSIDATABASE *) DECLSPEC_HIDDEN; extern UINT msi_set_context(MSIPACKAGE *) DECLSPEC_HIDDEN; extern void msi_adjust_privilege_properties(MSIPACKAGE *) DECLSPEC_HIDDEN; extern UINT MSI_GetFeatureCost(MSIPACKAGE *, MSIFEATURE *, MSICOSTTREE, INSTALLSTATE, LPINT) DECLSPEC_HIDDEN; @@ -955,6 +967,7 @@ extern INT msi_suminfo_get_int32( MSISUMMARYINFO *si, UINT uiProperty ) DECLSPEC_HIDDEN; extern LPWSTR msi_get_suminfo_product( IStorage *stg ) DECLSPEC_HIDDEN; extern UINT msi_add_suminfo( MSIDATABASE *db, LPWSTR **records, int num_records, int num_columns ) DECLSPEC_HIDDEN; +extern enum platform parse_platform( const WCHAR *str ) DECLSPEC_HIDDEN; /* undocumented functions */ UINT WINAPI MsiCreateAndVerifyInstallerDirectory( DWORD ); @@ -1173,7 +1186,6 @@ static const WCHAR szAMD64[] = {'A','M','D','6','4',0}; static const WCHAR szARM[] = {'A','r','m',0}; static const WCHAR szWow6432NodeCLSID[] = {'W','o','w','6','4','3','2','N','o','d','e','\\','C','L','S','I','D',0}; -static const WCHAR szWow6432Node[] = {'W','o','w','6','4','3','2','N','o','d','e',0}; static const WCHAR szStreams[] = {'_','S','t','r','e','a','m','s',0}; static const WCHAR szStorages[] = {'_','S','t','o','r','a','g','e','s',0}; static const WCHAR szMsiPublishAssemblies[] = {'M','s','i','P','u','b','l','i','s','h','A','s','s','e','m','b','l','i','e','s',0}; @@ -1194,6 +1206,7 @@ static const WCHAR szData[] = {'D','a','t','a',0}; static const WCHAR szLangResource[] = {'\\','V','a','r','F','i','l','e','I','n','f','o','\\','T','r','a','n','s','l','a','t','i','o','n',0}; static const WCHAR szInstallLocation[] = {'I','n','s','t','a','l','l','L','o','c','a','t','i','o','n',0}; +static const WCHAR szProperty[] = {'P','r','o','p','e','r','t','y',0}; /* memory allocation macro functions */ static void *msi_alloc( size_t len ) __WINE_ALLOC_SIZE(1); Modified: trunk/reactos/dll/win32/msi/msiquery.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msiquery.c?r… ============================================================================== --- trunk/reactos/dll/win32/msi/msiquery.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/msiquery.c [iso-8859-1] Mon Mar 9 20:28:19 2015 @@ -821,8 +821,13 @@ /* FIXME: lock the database */ - r = MSI_CommitTables( db ); - if (r != ERROR_SUCCESS) ERR("Failed to commit tables!\n"); + r = msi_commit_streams( db ); + if (r != ERROR_SUCCESS) ERR("Failed to commit streams!\n"); + else + { + r = MSI_CommitTables( db ); + if (r != ERROR_SUCCESS) ERR("Failed to commit tables!\n"); + } /* FIXME: unlock the database */ Modified: trunk/reactos/dll/win32/msi/package.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/package.c?re… ============================================================================== --- trunk/reactos/dll/win32/msi/package.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/package.c [iso-8859-1] Mon Mar 9 20:28:19 2015 @@ -361,7 +361,7 @@ return rc; } -UINT msi_clone_properties(MSIPACKAGE *package) +UINT msi_clone_properties( MSIDATABASE *db ) { static const WCHAR query_select[] = { 'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', @@ -378,7 +378,7 @@ MSIQUERY *view_select; UINT rc; - rc = MSI_DatabaseOpenViewW( package->db, query_select, &view_select ); + rc = MSI_DatabaseOpenViewW( db, query_select, &view_select ); if (rc != ERROR_SUCCESS) return rc; @@ -399,7 +399,7 @@ if (rc != ERROR_SUCCESS) break; - rc = MSI_DatabaseOpenViewW( package->db, query_insert, &view_insert ); + rc = MSI_DatabaseOpenViewW( db, query_insert, &view_insert ); if (rc != ERROR_SUCCESS) { msiobj_release( &rec_select->hdr ); @@ -415,7 +415,7 @@ TRACE("insert failed, trying update\n"); - rc = MSI_DatabaseOpenViewW( package->db, query_update, &view_update ); + rc = MSI_DatabaseOpenViewW( db, query_update, &view_update ); if (rc != ERROR_SUCCESS) { WARN("open view failed %u\n", rc); @@ -1150,7 +1150,7 @@ package->BaseURL = strdupW( base_url ); create_temp_property_table( package ); - msi_clone_properties( package ); + msi_clone_properties( package->db ); msi_adjust_privilege_properties( package ); package->ProductCode = msi_dup_property( package->db, szProductCode ); @@ -1246,7 +1246,7 @@ return ERROR_SUCCESS; } -static enum platform parse_platform( WCHAR *str ) +enum platform parse_platform( const WCHAR *str ) { if (!str[0] || !strcmpW( str, szIntel )) return PLATFORM_INTEL; else if (!strcmpW( str, szIntel64 )) return PLATFORM_INTEL64; @@ -1652,11 +1652,8 @@ } index++; } - if (index) - { - msi_clone_properties( package ); - msi_adjust_privilege_properties( package ); - } + if (index) msi_adjust_privilege_properties( package ); + r = msi_set_original_database_property( package->db, szPackage ); if (r != ERROR_SUCCESS) { Modified: trunk/reactos/dll/win32/msi/patch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/patch.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/msi/patch.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/patch.c [iso-8859-1] Mon Mar 9 20:28:19 2015 @@ -35,57 +35,220 @@ return FALSE; } +struct transform_desc +{ + WCHAR *product_code_from; + WCHAR *product_code_to; + WCHAR *version_from; + WCHAR *version_to; + WCHAR *upgrade_code; +}; + +static void free_transform_desc( struct transform_desc *desc ) +{ + msi_free( desc->product_code_from ); + msi_free( desc->product_code_to ); + msi_free( desc->version_from ); + msi_free( desc->version_to ); + msi_free( desc->upgrade_code ); + msi_free( desc ); +} + +static struct transform_desc *parse_transform_desc( const WCHAR *str ) +{ + struct transform_desc *ret; + const WCHAR *p = str, *q; + UINT len; + + if (!(ret = msi_alloc_zero( sizeof(*ret) ))) return NULL; + + q = strchrW( p, '}' ); + if (*p != '{' || !q) goto error; + + len = q - p + 1; + if (!(ret->product_code_from = msi_alloc( (len + 1) * sizeof(WCHAR) ))) goto error; + memcpy( ret->product_code_from, p, len * sizeof(WCHAR) ); + ret->product_code_from[len] = 0; + + p = q + 1; + if (!(q = strchrW( p, ';' ))) goto error; + len = q - p; + if (!(ret->version_from = msi_alloc( (len + 1) * sizeof(WCHAR) ))) goto error; + memcpy( ret->version_from, p, len * sizeof(WCHAR) ); + ret->version_from[len] = 0; + + p = q + 1; + q = strchrW( p, '}' ); + if (*p != '{' || !q) goto error; + + len = q - p + 1; + if (!(ret->product_code_to = msi_alloc( (len + 1) * sizeof(WCHAR) ))) goto error; + memcpy( ret->product_code_to, p, len * sizeof(WCHAR) ); + ret->product_code_to[len] = 0; + + p = q + 1; + if (!(q = strchrW( p, ';' ))) goto error; + len = q - p; + if (!(ret->version_to = msi_alloc( (len + 1) * sizeof(WCHAR) ))) goto error; + memcpy( ret->version_to, p, len * sizeof(WCHAR) ); + ret->version_to[len] = 0; + + p = q + 1; + q = strchrW( p, '}' ); + if (*p != '{' || !q) goto error; + + len = q - p + 1; + if (!(ret->upgrade_code = msi_alloc( (len + 1) * sizeof(WCHAR) ))) goto error; + memcpy( ret->upgrade_code, p, len * sizeof(WCHAR) ); + ret->upgrade_code[len] = 0; + + return ret; + +error: + free_transform_desc( ret ); + return NULL; +} + static UINT check_transform_applicable( MSIPACKAGE *package, IStorage *transform ) { + static const UINT supported_flags = + MSITRANSFORM_VALIDATE_PRODUCT | MSITRANSFORM_VALIDATE_LANGUAGE | + MSITRANSFORM_VALIDATE_PLATFORM | MSITRANSFORM_VALIDATE_MAJORVERSION | + MSITRANSFORM_VALIDATE_MINORVERSION | MSITRANSFORM_VALIDATE_UPGRADECODE; MSISUMMARYINFO *si = MSI_GetSummaryInformationW( transform, 0 ); UINT valid_flags = 0, wanted_flags = 0; - - if (si) wanted_flags = msi_suminfo_get_int32( si, PID_CHARCOUNT ); - TRACE("validation flags %x\n", wanted_flags); - - if (wanted_flags & ~(MSITRANSFORM_VALIDATE_PRODUCT|MSITRANSFORM_VALIDATE_LANGUAGE)) - FIXME("unsupported validation flags %x\n", wanted_flags); - + WCHAR *template, *product, *p; + struct transform_desc *desc; + + if (!si) + { + WARN("no summary information!\n"); + return ERROR_FUNCTION_FAILED; + } + wanted_flags = msi_suminfo_get_int32( si, PID_CHARCOUNT ); + wanted_flags &= 0xffff; /* mask off error condition flags */ + TRACE("validation flags 0x%04x\n", wanted_flags); + + if (wanted_flags & ~supported_flags) + { + FIXME("unsupported validation flags 0x%04x\n", wanted_flags); + msiobj_release( &si->hdr ); + return ERROR_FUNCTION_FAILED; + } + if (!(template = msi_suminfo_dup_string( si, PID_TEMPLATE ))) + { + WARN("no template property!\n"); + msiobj_release( &si->hdr ); + return ERROR_FUNCTION_FAILED; + } + TRACE("template property: %s\n", debugstr_w(template)); + if (!(product = msi_get_suminfo_product( transform ))) + { + WARN("no product property!\n"); + msi_free( template ); + msiobj_release( &si->hdr ); + return ERROR_FUNCTION_FAILED; + } + TRACE("product property: %s\n", debugstr_w(product)); + if (!(desc = parse_transform_desc( product ))) + { + msi_free( template ); + msiobj_release( &si->hdr ); + return ERROR_FUNCTION_FAILED; + } + msi_free( product ); + + if (wanted_flags & MSITRANSFORM_VALIDATE_LANGUAGE) + { + if (!template[0] || ((p = strchrW( template, ';' )) && match_language( package, atoiW( p + 1 ) ))) + { + valid_flags |= MSITRANSFORM_VALIDATE_LANGUAGE; + } + } if (wanted_flags & MSITRANSFORM_VALIDATE_PRODUCT) { - WCHAR *package_product = msi_dup_property( package->db, szProductCode ); - WCHAR *transform_product = msi_get_suminfo_product( transform ); - - TRACE("package = %s transform = %s\n", debugstr_w(package_product), debugstr_w(transform_product)); - - if (!transform_product || strstrW( transform_product, package_product )) + WCHAR *product_code_installed = msi_dup_property( package->db, szProductCode ); + + if (!product_code_installed) + { + msi_free( template ); + free_transform_desc( desc ); + msiobj_release( &si->hdr ); + return ERROR_INSTALL_PACKAGE_INVALID; + } + if (!strcmpW( desc->product_code_from, product_code_installed )) { valid_flags |= MSITRANSFORM_VALIDATE_PRODUCT; } - msi_free( transform_product ); - msi_free( package_product ); - } - if (wanted_flags & MSITRANSFORM_VALIDATE_LANGUAGE) - { - WCHAR *template; - const WCHAR *p; - - if (!si) - { - ERR("no summary information!\n"); - goto end; - } - if (!(template = msi_suminfo_dup_string( si, PID_TEMPLATE ))) - { - ERR("no template property!\n"); - goto end; - } - TRACE("template: %s\n", debugstr_w(template)); - if (!template[0] || ((p = strchrW( template, ';' )) && match_language( package, atoiW( p + 1 ) ))) - { - valid_flags |= MSITRANSFORM_VALIDATE_LANGUAGE; - } - msi_free( template ); - } - -end: + msi_free( product_code_installed ); + } + if (wanted_flags & MSITRANSFORM_VALIDATE_PLATFORM) + { + if ((p = strchrW( template, ';' ))) + { + *p = 0; + if (package->platform == parse_platform( template )) + valid_flags |= MSITRANSFORM_VALIDATE_PLATFORM; + } + } + msi_free( template ); + if (wanted_flags & MSITRANSFORM_VALIDATE_MAJORVERSION) + { + WCHAR *product_version_installed = msi_dup_property( package->db, szProductVersion ); + DWORD major_installed, minor_installed, major, minor; + + if (!product_version_installed) + { + free_transform_desc( desc ); + msiobj_release( &si->hdr ); + return ERROR_INSTALL_PACKAGE_INVALID; + } + msi_parse_version_string( product_version_installed, &major_installed, &minor_installed ); + msi_parse_version_string( desc->version_from, &major, &minor ); + + if (major_installed == major) + { + valid_flags |= MSITRANSFORM_VALIDATE_MAJORVERSION; + wanted_flags &= ~MSITRANSFORM_VALIDATE_MINORVERSION; + } + msi_free( product_version_installed ); + } + else if (wanted_flags & MSITRANSFORM_VALIDATE_MINORVERSION) + { + WCHAR *product_version_installed = msi_dup_property( package->db, szProductVersion ); + DWORD major_installed, minor_installed, major, minor; + + if (!product_version_installed) + { + free_transform_desc( desc ); + msiobj_release( &si->hdr ); + return ERROR_INSTALL_PACKAGE_INVALID; + } + msi_parse_version_string( product_version_installed, &major_installed, &minor_installed ); + msi_parse_version_string( desc->version_from, &major, &minor ); + + if (major_installed == major && minor_installed == minor) + valid_flags |= MSITRANSFORM_VALIDATE_MINORVERSION; + msi_free( product_version_installed ); + } + if (wanted_flags & MSITRANSFORM_VALIDATE_UPGRADECODE) + { + WCHAR *upgrade_code_installed = msi_dup_property( package->db, szUpgradeCode ); + + if (!upgrade_code_installed) + { + free_transform_desc( desc ); + msiobj_release( &si->hdr ); + return ERROR_INSTALL_PACKAGE_INVALID; + } + if (!strcmpW( desc->upgrade_code, upgrade_code_installed )) + valid_flags |= MSITRANSFORM_VALIDATE_UPGRADECODE; + msi_free( upgrade_code_installed ); + } + + free_transform_desc( desc ); msiobj_release( &si->hdr ); - if (valid_flags & ~wanted_flags) return ERROR_FUNCTION_FAILED; + if ((valid_flags & wanted_flags) != wanted_flags) return ERROR_FUNCTION_FAILED; TRACE("applicable transform\n"); return ERROR_SUCCESS; } Modified: trunk/reactos/dll/win32/msi/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/registry.c?r… ============================================================================== --- trunk/reactos/dll/win32/msi/registry.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/registry.c [iso-8859-1] Mon Mar 9 20:28:19 2015 @@ -83,12 +83,6 @@ '%','s','\\','P','r','o','d','u','c','t','s','\\','%','s','\\', 'I','n','s','t','a','l','l','P','r','o','p','e','r','t','i','e','s',0}; -static const WCHAR szInstaller_LocalManaged_fmt[] = { - 'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', - 'W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', - 'I','n','s','t','a','l','l','e','r','\\','M','a','n','a','g','e','d','\\','%','s','\\', - 'I','n','s','t','a','l','l','e','r','\\','P','r','o','d','u','c','t','s',0}; - static const WCHAR szInstaller_LocalManagedProd_fmt[] = { 'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', 'W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', @@ -110,11 +104,6 @@ 'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', 'W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', 'I','n','s','t','a','l','l','e','r','\\','P','a','t','c','h','e','s',0}; - -static const WCHAR szInstaller_Components[] = { - 'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', - 'W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', - 'I','n','s','t','a','l','l','e','r','\\','C','o','m','p','o','n','e','n','t','s',0}; static const WCHAR szInstaller_LocalClassesProducts[] = { 'S','o','f','t','w','a','r','e','\\','C','l','a','s','s','e','s','\\', @@ -1497,6 +1486,24 @@ return r; } +UINT WINAPI MsiEnumClientsExA(LPCSTR component, LPCSTR usersid, DWORD ctx, DWORD index, + CHAR installed_product[GUID_SIZE], + MSIINSTALLCONTEXT *installed_ctx, LPSTR sid, LPDWORD sid_len) +{ + FIXME("%s, %s, %u, %u, %p, %p, %p, %p\n", debugstr_a(component), debugstr_a(usersid), + ctx, index, installed_product, installed_ctx, sid, sid_len); + return ERROR_ACCESS_DENIED; +} + +UINT WINAPI MsiEnumClientsExW(LPCWSTR component, LPCWSTR usersid, DWORD ctx, DWORD index, + WCHAR installed_product[GUID_SIZE], + MSIINSTALLCONTEXT *installed_ctx, LPWSTR sid, LPDWORD sid_len) +{ + FIXME("%s, %s, %u, %u, %p, %p, %p, %p\n", debugstr_w(component), debugstr_w(usersid), + ctx, index, installed_product, installed_ctx, sid, sid_len); + return ERROR_ACCESS_DENIED; +} + static UINT MSI_EnumComponentQualifiers( LPCWSTR szComponent, DWORD iIndex, awstring *lpQualBuf, LPDWORD pcchQual, awstring *lpAppBuf, LPDWORD pcchAppBuf ) Modified: trunk/reactos/dll/win32/msi/script.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/script.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msi/script.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/script.c [iso-8859-1] Mon Mar 9 20:28:19 2015 @@ -344,7 +344,7 @@ if (FAILED(hr)) goto done; /* Call a function if necessary through the IDispatch interface */ - if (function != NULL && strlenW(function) > 0) { + if (function && function[0]) { TRACE("Calling function %s\n", debugstr_w(function)); hr = IActiveScript_GetScriptDispatch(pActiveScript, NULL, &pDispatch); Modified: trunk/reactos/dll/win32/msi/storages.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/storages.c?r… ============================================================================== --- trunk/reactos/dll/win32/msi/storages.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/storages.c [iso-8859-1] Mon Mar 9 20:28:19 2015 @@ -62,7 +62,7 @@ if (!storage) return NULL; - storage->str_index = msi_addstringW(sv->db->strings, name, -1, 1, StringNonPersistent); + storage->str_index = msi_add_string(sv->db->strings, name, -1, StringNonPersistent); storage->storage = stg; if (storage->storage) Modified: trunk/reactos/dll/win32/msi/streams.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/streams.c?re… ============================================================================== --- trunk/reactos/dll/win32/msi/streams.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/streams.c [iso-8859-1] Mon Mar 9 20:28:19 2015 @@ -2,6 +2,7 @@ * Implementation of the Microsoft Installer (msi.dll) * * Copyright 2007 James Hawkins + * Copyright 2015 Hans Leidekker for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -24,54 +25,30 @@ #define NUM_STREAMS_COLS 2 -typedef struct tabSTREAM -{ - UINT str_index; - IStream *stream; -} STREAM; - typedef struct tagMSISTREAMSVIEW { MSIVIEW view; MSIDATABASE *db; - STREAM **streams; - UINT max_streams; - UINT num_rows; - UINT row_size; + UINT num_cols; } MSISTREAMSVIEW; -static BOOL streams_set_table_size(MSISTREAMSVIEW *sv, UINT size) -{ - if (size >= sv->max_streams) - { - sv->max_streams *= 2; - sv->streams = msi_realloc_zero(sv->streams, sv->max_streams * sizeof(STREAM *)); - if (!sv->streams) - return FALSE; - } - +static BOOL streams_resize_table( MSIDATABASE *db, UINT size ) +{ + if (!db->num_streams_allocated) + { + if (!(db->streams = msi_alloc_zero( size * sizeof(MSISTREAM) ))) return FALSE; + db->num_streams_allocated = size; + return TRUE; + } + while (size >= db->num_streams_allocated) + { + MSISTREAM *tmp; + UINT new_size = db->num_streams_allocated * 2; + if (!(tmp = msi_realloc_zero( db->streams, new_size * sizeof(MSISTREAM) ))) return FALSE; + db->streams = tmp; + db->num_streams_allocated = new_size; + } return TRUE; -} - -static STREAM *create_stream(MSISTREAMSVIEW *sv, LPCWSTR name, BOOL encoded, IStream *stm) -{ - STREAM *stream; - WCHAR decoded[MAX_STREAM_NAME_LEN + 1]; - - stream = msi_alloc(sizeof(STREAM)); - if (!stream) - return NULL; - - if (encoded) - { - decode_streamname(name, decoded); - TRACE("stream -> %s %s\n", debugstr_w(name), debugstr_w(decoded)); - name = decoded; - } - - stream->str_index = msi_addstringW(sv->db->strings, name, -1, 1, StringNonPersistent); - stream->stream = stm; - return stream; } static UINT STREAMS_fetch_int(struct tagMSIVIEW *view, UINT row, UINT col, UINT *val) @@ -83,10 +60,10 @@ if (col != 1) return ERROR_INVALID_PARAMETER; - if (row >= sv->num_rows) + if (row >= sv->db->num_streams) return ERROR_NO_MORE_ITEMS; - *val = sv->streams[row]->str_index; + *val = sv->db->streams[row].str_index; return ERROR_SUCCESS; } @@ -94,14 +71,21 @@ static UINT STREAMS_fetch_stream(struct tagMSIVIEW *view, UINT row, UINT col, IStream **stm) { MSISTREAMSVIEW *sv = (MSISTREAMSVIEW *)view; + LARGE_INTEGER pos; + HRESULT hr; TRACE("(%p, %d, %d, %p)\n", view, row, col, stm); - if (row >= sv->num_rows) + if (row >= sv->db->num_streams) return ERROR_FUNCTION_FAILED; - IStream_AddRef(sv->streams[row]->stream); - *stm = sv->streams[row]->stream; + pos.QuadPart = 0; + hr = IStream_Seek( sv->db->streams[row].stream, pos, STREAM_SEEK_SET, NULL ); + if (FAILED( hr )) + return ERROR_FUNCTION_FAILED; + + *stm = sv->db->streams[row].stream; + IStream_AddRef( *stm ); return ERROR_SUCCESS; } @@ -118,112 +102,96 @@ static UINT STREAMS_set_row(struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, UINT mask) { MSISTREAMSVIEW *sv = (MSISTREAMSVIEW *)view; - STREAM *stream; - IStream *stm; - STATSTG stat; - LPWSTR encname = NULL, name = NULL; - USHORT *data = NULL; - HRESULT hr; - ULONG count; - UINT r = ERROR_FUNCTION_FAILED; TRACE("(%p, %d, %p, %08x)\n", view, row, rec, mask); - if (row > sv->num_rows) - return ERROR_FUNCTION_FAILED; - - r = MSI_RecordGetIStream(rec, 2, &stm); + if (row > sv->db->num_streams || mask >= (1 << sv->num_cols)) + return ERROR_INVALID_PARAMETER; + + if (mask & 1) + { + const WCHAR *name = MSI_RecordGetString( rec, 1 ); + + if (!name) return ERROR_INVALID_PARAMETER; + sv->db->streams[row].str_index = msi_add_string( sv->db->strings, name, -1, StringNonPersistent ); + } + if (mask & 2) + { + IStream *old, *new; + HRESULT hr; + UINT r; + + r = MSI_RecordGetIStream( rec, 2, &new ); + if (r != ERROR_SUCCESS) + return r; + + old = sv->db->streams[row].stream; + hr = IStream_QueryInterface( new, &IID_IStream, (void **)&sv->db->streams[row].stream ); + if (FAILED( hr )) + { + IStream_Release( new ); + return ERROR_FUNCTION_FAILED; + } + if (old) IStream_Release( old ); + } + + return ERROR_SUCCESS; +} + +static UINT streams_find_row( MSISTREAMSVIEW *sv, MSIRECORD *rec, UINT *row ) +{ + const WCHAR *str; + UINT r, i, id, val; + + str = MSI_RecordGetString( rec, 1 ); + r = msi_string2id( sv->db->strings, str, -1, &id ); if (r != ERROR_SUCCESS) return r; - hr = IStream_Stat(stm, &stat, STATFLAG_NONAME); - if (FAILED(hr)) - { - WARN("failed to stat stream: %08x\n", hr); - goto done; - } - - if (stat.cbSize.QuadPart >> 32) - { - WARN("stream too large\n"); - goto done; - } - - data = msi_alloc(stat.cbSize.QuadPart); - if (!data) - goto done; - - hr = IStream_Read(stm, data, stat.cbSize.QuadPart, &count); - if (FAILED(hr) || count != stat.cbSize.QuadPart) - { - WARN("failed to read stream: %08x\n", hr); - goto done; - } - - name = strdupW(MSI_RecordGetString(rec, 1)); - if (!name) - { - WARN("failed to retrieve stream name\n"); - goto done; - } - - encname = encode_streamname(FALSE, name); - msi_destroy_stream(sv->db, encname); - - r = write_stream_data(sv->db->storage, name, data, count, FALSE); - if (r != ERROR_SUCCESS) - { - WARN("failed to write stream data: %d\n", r); - goto done; - } - - stream = create_stream(sv, name, FALSE, NULL); - if (!stream) - goto done; - - hr = IStorage_OpenStream(sv->db->storage, encname, 0, - STGM_READ | STGM_SHARE_EXCLUSIVE, 0, &stream->stream); - if (FAILED(hr)) - { - WARN("failed to open stream: %08x\n", hr); - msi_free(stream); - goto done; - } - - sv->streams[row] = stream; - -done: - msi_free(name); - msi_free(data); - msi_free(encname); - - IStream_Release(stm); + for (i = 0; i < sv->db->num_streams; i++) + { + STREAMS_fetch_int( &sv->view, i, 1, &val ); + + if (val == id) + { + if (row) *row = i; + return ERROR_SUCCESS; + } + } + + return ERROR_FUNCTION_FAILED; +} + +static UINT STREAMS_insert_row(struct tagMSIVIEW *view, MSIRECORD *rec, UINT row, BOOL temporary) +{ + MSISTREAMSVIEW *sv = (MSISTREAMSVIEW *)view; + UINT i, r, num_rows = sv->db->num_streams + 1; + + TRACE("(%p, %p, %d, %d)\n", view, rec, row, temporary); + + r = streams_find_row( sv, rec, NULL ); + if (r == ERROR_SUCCESS) + return ERROR_FUNCTION_FAILED; + + if (!streams_resize_table( sv->db, num_rows )) + return ERROR_FUNCTION_FAILED; + + if (row == -1) + row = num_rows - 1; + + /* shift the rows to make room for the new row */ + for (i = num_rows - 1; i > row; i--) + { + sv->db->streams[i] = sv->db->streams[i - 1]; + } + + r = STREAMS_set_row( view, row, rec, (1 << sv->num_cols) - 1 ); + if (r == ERROR_SUCCESS) + sv->db->num_streams = num_rows; return r; } -static UINT STREAMS_insert_row(struct tagMSIVIEW *view, MSIRECORD *rec, UINT row, BOOL temporary) -{ - MSISTREAMSVIEW *sv = (MSISTREAMSVIEW *)view; - UINT i; - - TRACE("(%p, %p, %d, %d)\n", view, rec, row, temporary); - - if (!streams_set_table_size(sv, ++sv->num_rows)) - return ERROR_FUNCTION_FAILED; - - if (row == -1) - row = sv->num_rows - 1; - - /* shift the rows to make room for the new row */ - for (i = sv->num_rows - 1; i > row; i--) - { - sv->streams[i] = sv->streams[i - 1]; - } - - return STREAMS_set_row(view, row, rec, 0); -} - static UINT STREAMS_delete_row(struct tagMSIVIEW *view, UINT row) { FIXME("(%p %d): stub!\n", view, row); @@ -248,8 +216,8 @@ TRACE("(%p, %p, %p)\n", view, rows, cols); - if (cols) *cols = NUM_STREAMS_COLS; - if (rows) *rows = sv->num_rows; + if (cols) *cols = sv->num_cols; + if (rows) *rows = sv->db->num_streams; return ERROR_SUCCESS; } @@ -257,10 +225,11 @@ static UINT STREAMS_get_column_info( struct tagMSIVIEW *view, UINT n, LPCWSTR *name, UINT *type, BOOL *temporary, LPCWSTR *table_name ) { - TRACE("(%p, %d, %p, %p, %p, %p)\n", view, n, name, type, temporary, - table_name); - - if (n == 0 || n > NUM_STREAMS_COLS) + MSISTREAMSVIEW *sv = (MSISTREAMSVIEW *)view; + + TRACE("(%p, %d, %p, %p, %p, %p)\n", view, n, name, type, temporary, table_name); + + if (!n || n > sv->num_cols) return ERROR_INVALID_PARAMETER; switch (n) @@ -280,30 +249,6 @@ return ERROR_SUCCESS; } -static UINT streams_find_row(MSISTREAMSVIEW *sv, MSIRECORD *rec, UINT *row) -{ - LPCWSTR str; - UINT r, i, id, data; - - str = MSI_RecordGetString(rec, 1); - r = msi_string2id(sv->db->strings, str, -1, &id); - if (r != ERROR_SUCCESS) - return r; - - for (i = 0; i < sv->num_rows; i++) - { - STREAMS_fetch_int(&sv->view, i, 1, &data); - - if (data == id) - { - *row = i; - return ERROR_SUCCESS; - } - } - - return ERROR_FUNCTION_FAILED; -} - static UINT streams_modify_update(struct tagMSIVIEW *view, MSIRECORD *rec) { MSISTREAMSVIEW *sv = (MSISTREAMSVIEW *)view; @@ -313,15 +258,15 @@ if (r != ERROR_SUCCESS) return ERROR_FUNCTION_FAILED; - return STREAMS_set_row(view, row, rec, 0); + return STREAMS_set_row( view, row, rec, (1 << sv->num_cols) - 1 ); } static UINT streams_modify_assign(struct tagMSIVIEW *view, MSIRECORD *rec) { MSISTREAMSVIEW *sv = (MSISTREAMSVIEW *)view; - UINT r, row; - - r = streams_find_row(sv, rec, &row); + UINT r; + + r = streams_find_row( sv, rec, NULL ); if (r == ERROR_SUCCESS) return streams_modify_update(view, rec); @@ -371,23 +316,10 @@ static UINT STREAMS_delete(struct tagMSIVIEW *view) { MSISTREAMSVIEW *sv = (MSISTREAMSVIEW *)view; - UINT i; TRACE("(%p)\n", view); - for (i = 0; i < sv->num_rows; i++) - { - if (sv->streams[i]) - { - if (sv->streams[i]->stream) - IStream_Release(sv->streams[i]->stream); - msi_free(sv->streams[i]); - } - } - - msi_free(sv->streams); msi_free(sv); - return ERROR_SUCCESS; } @@ -399,23 +331,22 @@ TRACE("(%p, %d, %d, %p, %p)\n", view, col, val, row, handle); - if (col == 0 || col > NUM_STREAMS_COLS) + if (!col || col > sv->num_cols) return ERROR_INVALID_PARAMETER; - while (index < sv->num_rows) - { - if (sv->streams[index]->str_index == val) + while (index < sv->db->num_streams) + { + if (sv->db->streams[index].str_index == val) { *row = index; break; } - index++; } *handle = UlongToPtr(++index); - if (index > sv->num_rows) + if (index > sv->db->num_streams) return ERROR_NO_MORE_ITEMS; return ERROR_SUCCESS; @@ -444,107 +375,256 @@ NULL, }; -static INT add_streams_to_table(MSISTREAMSVIEW *sv) -{ - IEnumSTATSTG *stgenum = NULL; +static HRESULT open_stream( MSIDATABASE *db, const WCHAR *name, IStream **stream ) +{ + HRESULT hr; + + hr = IStorage_OpenStream( db->storage, name, NULL, STGM_READ|STGM_SHARE_EXCLUSIVE, 0, stream ); + if (FAILED( hr )) + { + MSITRANSFORM *transform; + + LIST_FOR_EACH_ENTRY( transform, &db->transforms, MSITRANSFORM, entry ) + { + hr = IStorage_OpenStream( transform->stg, name, NULL, STGM_READ|STGM_SHARE_EXCLUSIVE, 0, stream ); + if (SUCCEEDED( hr )) + break; + } + } + return hr; +} + +static MSISTREAM *find_stream( MSIDATABASE *db, const WCHAR *name ) +{ + UINT r, id, i; + + r = msi_string2id( db->strings, name, -1, &id ); + if (r != ERROR_SUCCESS) + return NULL; + + for (i = 0; i < db->num_streams; i++) + { + if (db->streams[i].str_index == id) return &db->streams[i]; + } + return NULL; +} + +static UINT append_stream( MSIDATABASE *db, const WCHAR *name, IStream *stream ) +{ + WCHAR decoded[MAX_STREAM_NAME_LEN + 1]; + UINT i = db->num_streams; + + if (!streams_resize_table( db, db->num_streams + 1 )) + return ERROR_OUTOFMEMORY; + + decode_streamname( name, decoded ); + db->streams[i].str_index = msi_add_string( db->strings, decoded, -1, StringNonPersistent ); + db->streams[i].stream = stream; + db->num_streams++; + + TRACE("added %s\n", debugstr_w( decoded )); + return ERROR_SUCCESS; +} + +static UINT load_streams( MSIDATABASE *db ) +{ + IEnumSTATSTG *stgenum; STATSTG stat; - STREAM *stream = NULL; HRESULT hr; - UINT r, count = 0, size; - LPWSTR encname; - - hr = IStorage_EnumElements(sv->db->storage, 0, NULL, 0, &stgenum); - if (FAILED(hr)) - return -1; - - sv->max_streams = 1; - sv->streams = msi_alloc_zero(sizeof(STREAM *)); - if (!sv->streams) - return -1; - - while (TRUE) - { - size = 0; - hr = IEnumSTATSTG_Next(stgenum, 1, &stat, &size); - if (FAILED(hr) || !size) + UINT count, r = ERROR_SUCCESS; + IStream *stream; + + hr = IStorage_EnumElements( db->storage, 0, NULL, 0, &stgenum ); + if (FAILED( hr )) + return ERROR_FUNCTION_FAILED; + + for (;;) + { + count = 0; + hr = IEnumSTATSTG_Next( stgenum, 1, &stat, &count ); + if (FAILED( hr ) || !count) break; - if (stat.type != STGTY_STREAM) - { - CoTaskMemFree(stat.pwcsName); + /* table streams are not in the _Streams table */ + if (stat.type != STGTY_STREAM || *stat.pwcsName == 0x4840 || + find_stream( db, stat.pwcsName )) + { + CoTaskMemFree( stat.pwcsName ); continue; } - - /* table streams are not in the _Streams table */ - if (*stat.pwcsName == 0x4840) - { - CoTaskMemFree(stat.pwcsName); - continue; - } - - stream = create_stream(sv, stat.pwcsName, TRUE, NULL); - if (!stream) - { - count = -1; - CoTaskMemFree(stat.pwcsName); + TRACE("found new stream %s\n", debugstr_w( stat.pwcsName )); + + hr = open_stream( db, stat.pwcsName, &stream ); + if (FAILED( hr )) + { + ERR("unable to open stream %08x\n", hr); + CoTaskMemFree( stat.pwcsName ); + r = ERROR_FUNCTION_FAILED; break; } - /* these streams appear to be unencoded */ - if (*stat.pwcsName == 0x0005) - { - r = msi_get_raw_stream(sv->db, stat.pwcsName, &stream->stream); - } - else - { - encname = encode_streamname(FALSE, stat.pwcsName); - r = msi_get_raw_stream(sv->db, encname, &stream->stream); - msi_free(encname); - } - CoTaskMemFree(stat.pwcsName); - + r = append_stream( db, stat.pwcsName, stream ); + CoTaskMemFree( stat.pwcsName ); if (r != ERROR_SUCCESS) - { - WARN("unable to get stream %u\n", r); - count = -1; break; - } - - if (!streams_set_table_size(sv, ++count)) - { - count = -1; - break; - } - - sv->streams[count - 1] = stream; - } - - IEnumSTATSTG_Release(stgenum); - return count; + } + + TRACE("loaded %u streams\n", db->num_streams); + IEnumSTATSTG_Release( stgenum ); + return r; +} + +UINT msi_get_stream( MSIDATABASE *db, const WCHAR *name, IStream **ret ) +{ + MSISTREAM *stream; + WCHAR *encname; + HRESULT hr; + UINT r; + + if ((stream = find_stream( db, name ))) + { + LARGE_INTEGER pos; + + pos.QuadPart = 0; + hr = IStream_Seek( stream->stream, pos, STREAM_SEEK_SET, NULL ); + if (FAILED( hr )) + return ERROR_FUNCTION_FAILED; + + *ret = stream->stream; + IStream_AddRef( *ret ); + return ERROR_SUCCESS; + } + + if (!(encname = encode_streamname( FALSE, name ))) + return ERROR_OUTOFMEMORY; + + hr = open_stream( db, encname, ret ); + msi_free( encname ); + if (FAILED( hr )) + return ERROR_FUNCTION_FAILED; + + r = append_stream( db, name, *ret ); + if (r != ERROR_SUCCESS) + { + IStream_Release( *ret ); + return r; + } + + IStream_AddRef( *ret ); + return ERROR_SUCCESS; } UINT STREAMS_CreateView(MSIDATABASE *db, MSIVIEW **view) { MSISTREAMSVIEW *sv; - INT rows; + UINT r; TRACE("(%p, %p)\n", db, view); - sv = msi_alloc_zero( sizeof(MSISTREAMSVIEW) ); - if (!sv) - return ERROR_FUNCTION_FAILED; + r = load_streams( db ); + if (r != ERROR_SUCCESS) + return r; + + if (!(sv = msi_alloc_zero( sizeof(MSISTREAMSVIEW) ))) + return ERROR_OUTOFMEMORY; sv->view.ops = &streams_ops; + sv->num_cols = NUM_STREAMS_COLS; sv->db = db; - rows = add_streams_to_table(sv); - if (rows < 0) - { - msi_free( sv ); - return ERROR_FUNCTION_FAILED; - } - sv->num_rows = rows; *view = (MSIVIEW *)sv; return ERROR_SUCCESS; } + +static HRESULT write_stream( IStream *dst, IStream *src ) +{ + HRESULT hr; + char buf[4096]; + STATSTG stat; + LARGE_INTEGER pos; + UINT count, size; + + hr = IStream_Stat( src, &stat, STATFLAG_NONAME ); + if (FAILED( hr )) return hr; + + hr = IStream_SetSize( dst, stat.cbSize ); + if (FAILED( hr )) return hr; + + pos.QuadPart = 0; + hr = IStream_Seek( dst, pos, STREAM_SEEK_SET, NULL ); + if (FAILED( hr )) return hr; + + for (;;) + { + size = min( sizeof(buf), stat.cbSize.QuadPart ); + hr = IStream_Read( src, buf, size, &count ); + if (FAILED( hr ) || count != size) + { + WARN("failed to read stream: %08x\n", hr); + return E_INVALIDARG; + } + stat.cbSize.QuadPart -= count; + if (count) + { + size = count; + hr = IStream_Write( dst, buf, size, &count ); + if (FAILED( hr ) || count != size) + { + WARN("failed to write stream: %08x\n", hr); + return E_INVALIDARG; + } + } + if (!stat.cbSize.QuadPart) break; + } + + return S_OK; +} + +UINT msi_commit_streams( MSIDATABASE *db ) +{ + UINT i; + const WCHAR *name; + WCHAR *encname; + IStream *stream; + HRESULT hr; + + TRACE("got %u streams\n", db->num_streams); + + for (i = 0; i < db->num_streams; i++) + { + name = msi_string_lookup( db->strings, db->streams[i].str_index, NULL ); + if (!(encname = encode_streamname( FALSE, name ))) return ERROR_OUTOFMEMORY; + + hr = open_stream( db, encname, &stream ); + if (FAILED( hr )) /* new stream */ + { + hr = IStorage_CreateStream( db->storage, encname, STGM_WRITE|STGM_SHARE_EXCLUSIVE, 0, 0, &stream ); + if (FAILED( hr )) + { + ERR("failed to create stream %s (hr = %08x)\n", debugstr_w(encname), hr); + msi_free( encname ); + return ERROR_FUNCTION_FAILED; + } + hr = write_stream( stream, db->streams[i].stream ); + if (FAILED( hr )) + { + ERR("failed to write stream %s (hr = %08x)\n", debugstr_w(encname), hr); + msi_free( encname ); + IStream_Release( stream ); + return ERROR_FUNCTION_FAILED; + } + } + hr = IStream_Commit( stream, 0 ); + IStream_Release( stream ); + if (FAILED( hr )) + { + WARN("failed to commit stream %s (hr = %08x)\n", debugstr_w(encname), hr); + msi_free( encname ); + return ERROR_FUNCTION_FAILED; + } + msi_free( encname ); + } + + return ERROR_SUCCESS; +} Modified: trunk/reactos/dll/win32/msi/string.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/string.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msi/string.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/string.c [iso-8859-1] Mon Mar 9 20:28:19 2015 @@ -214,7 +214,7 @@ st->freeslot = n + 1; } -static UINT msi_string2idA( const string_table *st, LPCSTR buffer, UINT *id ) +static UINT string2id( const string_table *st, const char *buffer, UINT *id ) { DWORD sz; UINT r = ERROR_INVALID_PARAMETER; @@ -241,7 +241,7 @@ return r; } -static int msi_addstring( string_table *st, UINT n, const char *data, UINT len, USHORT refcount, enum StringPersistence persistence ) +static int add_string( string_table *st, UINT n, const char *data, UINT len, USHORT refcount, enum StringPersistence persistence ) { LPWSTR str; int sz; @@ -256,7 +256,7 @@ } else { - if( ERROR_SUCCESS == msi_string2idA( st, data, &n ) ) + if (string2id( st, data, &n ) == ERROR_SUCCESS) { if (persistence == StringPersistent) st->strings[n].persistent_refcount += refcount; @@ -287,7 +287,7 @@ return n; } -int msi_addstringW( string_table *st, const WCHAR *data, int len, USHORT refcount, enum StringPersistence persistence ) +int msi_add_string( string_table *st, const WCHAR *data, int len, enum StringPersistence persistence ) { UINT n; LPWSTR str; @@ -303,9 +303,9 @@ if (msi_string2id( st, data, len, &n) == ERROR_SUCCESS ) { if (persistence == StringPersistent) - st->strings[n].persistent_refcount += refcount; + st->strings[n].persistent_refcount++; else - st->strings[n].nonpersistent_refcount += refcount; + st->strings[n].nonpersistent_refcount++; return n; } @@ -322,7 +322,7 @@ memcpy( str, data, len*sizeof(WCHAR) ); str[len] = 0; - set_st_entry( st, n, str, len, refcount, persistence ); + set_st_entry( st, n, str, len, 1, persistence ); return n; } @@ -346,7 +346,7 @@ } /* - * msi_id2stringA + * id2string * * [in] st - pointer to the string table * [in] id - id of the string to retrieve @@ -356,7 +356,7 @@ * * Returned string is not nul terminated. */ -static UINT msi_id2stringA( const string_table *st, UINT id, LPSTR buffer, UINT *sz ) +static UINT id2string( const string_table *st, UINT id, char *buffer, UINT *sz ) { int len, lenW; const WCHAR *str; @@ -529,7 +529,7 @@ break; } - r = msi_addstring( st, n, data+offset, len, refs, StringPersistent ); + r = add_string( st, n, data+offset, len, refs, StringPersistent ); if( r != n ) ERR("Failed to add string %d\n", n ); n++; @@ -599,7 +599,7 @@ } sz = datasize - used; - r = msi_id2stringA( st, i, data+used, &sz ); + r = id2string( st, i, data+used, &sz ); if( r != ERROR_SUCCESS ) { ERR("failed to fetch string\n"); Modified: trunk/reactos/dll/win32/msi/table.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/table.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/msi/table.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/table.c [iso-8859-1] Mon Mar 9 20:28:19 2015 @@ -88,7 +88,7 @@ return 2; if( (col->type & 0xff) != 4 ) - ERR("Invalid column size!\n"); + ERR("Invalid column size %u\n", col->type & 0xff); return 4; } @@ -741,8 +741,8 @@ for( i = 0, col = col_info; col; i++, col = col->next ) { - UINT table_id = msi_addstringW( db->strings, col->table, -1, 1, string_persistence ); - UINT col_id = msi_addstringW( db->strings, col->column, -1, 1, string_persistence ); + UINT table_id = msi_add_string( db->strings, col->table, -1, string_persistence ); + UINT col_id = msi_add_string( db->strings, col->column, -1, string_persistence ); table->colinfo[ i ].tablename = msi_string_lookup( db->strings, table_id, NULL ); table->colinfo[ i ].number = i + 1; @@ -932,7 +932,7 @@ UINT size, offset, old_count; UINT n; - table = find_cached_table( db, name ); + if (!(table = find_cached_table( db, name ))) return; old_count = table->col_count; msi_free_colinfo( table->colinfo, table->col_count ); msi_free( table->colinfo ); @@ -1130,25 +1130,23 @@ { MSITABLEVIEW *tv = (MSITABLEVIEW*)view; UINT r; - LPWSTR encname, full_name = NULL; + WCHAR *name; if( !view->ops->fetch_int ) return ERROR_INVALID_PARAMETER; - r = msi_stream_name( tv, row, &full_name ); - if ( r != ERROR_SUCCESS ) - { - ERR("fetching stream, error = %d\n", r); + r = msi_stream_name( tv, row, &name ); + if (r != ERROR_SUCCESS) + { + ERR("fetching stream, error = %u\n", r); return r; } - encname = encode_streamname( FALSE, full_name ); - r = msi_get_raw_stream( tv->db, encname, stm ); - if( r ) - ERR("fetching stream %s, error = %d\n",debugstr_w(full_name), r); - - msi_free( full_name ); - msi_free( encname ); + r = msi_get_stream( tv->db, name, stm ); + if (r != ERROR_SUCCESS) + ERR("fetching stream %s, error = %u\n", debugstr_w(name), r); + + msi_free( name ); return r; } @@ -1350,8 +1348,8 @@ { int len; const WCHAR *sval = msi_record_get_string( rec, i + 1, &len ); - val = msi_addstringW( tv->db->strings, sval, len, 1, - persistent ? StringPersistent : StringNonPersistent ); + val = msi_add_string( tv->db->strings, sval, len, + persistent ? StringPersistent : StringNonPersistent ); } else { @@ -2555,6 +2553,12 @@ */ sz = 2; num_cols = mask >> 8; + if (num_cols > tv->num_cols) + { + ERR("excess columns in transform: %u > %u\n", num_cols, tv->num_cols); + break; + } + for (i = 0; i < num_cols; i++) { if( (tv->columns[i].type & MSITYPE_STRING) && @@ -2612,7 +2616,7 @@ /* * Native msi seems writes nul into the Number (2nd) column of - * the _Columns table, only when the columns are from a new table + * the _Columns table when there are new columns */ if ( number == MSI_NULL_INTEGER ) { @@ -2663,7 +2667,7 @@ WARN("failed to insert row %u\n", r); } - if (number != MSI_NULL_INTEGER && !strcmpW( name, szColumns )) + if (!strcmpW( name, szColumns )) msi_update_table_columns( db, table ); msiobj_release( &rec->hdr ); @@ -2697,6 +2701,7 @@ string_table *strings; UINT ret = ERROR_FUNCTION_FAILED; UINT bytes_per_strref; + BOOL property_update = FALSE; TRACE("%p %p\n", db, stg ); @@ -2741,6 +2746,8 @@ tables = transform; else if (!strcmpW( transform->name, szColumns ) ) columns = transform; + else if (!strcmpW( transform->name, szProperty )) + property_update = TRUE; TRACE("transform contains stream %s\n", debugstr_w(name)); @@ -2790,7 +2797,10 @@ } if ( ret == ERROR_SUCCESS ) + { append_storage_to_db( db, stg ); + if (property_update) msi_clone_properties( db ); + } end: if ( stgenum ) Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Mon Mar 9 20:28:19 2015 @@ -123,7 +123,7 @@ reactos/dll/win32/msgsm32.acm # Synced to Wine-1.7.27 reactos/dll/win32/mshtml # Synced to Wine-1.7.27 reactos/dll/win32/mshtml.tlb # Synced to Wine-1.7.27 -reactos/dll/win32/msi # Synced to Wine-1.7.27 +reactos/dll/win32/msi # Synced to WineStaging-1.7.37 reactos/dll/win32/msimg32 # Synced to Wine-1.7.27 reactos/dll/win32/msimtf # Synced to Wine-1.7.27 reactos/dll/win32/msisip # Synced to Wine-1.7.27

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