Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 58077: Fix build
by tkreuzer＠svn.reactos.org 01 Jan '13

01 Jan '13

Author: tkreuzer Date: Tue Jan 1 09:50:33 2013 New Revision: 58077 URL: http://svn.reactos.org/svn/reactos?rev=58077&view=rev Log: Fix build Modified: trunk/reactos/win32ss/gdi/eng/bitblt.c trunk/reactos/win32ss/gdi/eng/clip.c Modified: trunk/reactos/win32ss/gdi/eng/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/bitblt.c?r… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/bitblt.c [iso-8859-1] Tue Jan 1 09:50:33 2013 @@ -469,16 +469,23 @@ switch (clippingType) { case DC_TRIVIAL: - Ret = (*BltRectFunc)(OutputObj, InputObj, Mask, ColorTranslation, - &OutputRect, &InputPoint, MaskOrigin, pbo, - &AdjustedBrushOrigin, Rop4); + Ret = (*BltRectFunc)(OutputObj, + InputObj, + psoSrc, + pxlo, + &OutputRect, + &InputPoint, + pptlMask, + pbo, + &AdjustedBrushOrigin, + rop4); break; case DC_RECT: /* Clip the blt to the clip rectangle */ - ClipRect.left = ClipRegion->rclBounds.left; - ClipRect.right = ClipRegion->rclBounds.right; - ClipRect.top = ClipRegion->rclBounds.top; - ClipRect.bottom = ClipRegion->rclBounds.bottom; + ClipRect.left = pco->rclBounds.left; + ClipRect.right = pco->rclBounds.right; + ClipRect.top = pco->rclBounds.top; + ClipRect.bottom = pco->rclBounds.bottom; if (RECTL_bIntersectRect(&CombinedRect, &OutputRect, &ClipRect)) { #ifdef _USE_DIBLIB_ @@ -490,9 +497,16 @@ #endif Pt.x = InputPoint.x + CombinedRect.left - OutputRect.left; Pt.y = InputPoint.y + CombinedRect.top - OutputRect.top; - Ret = (*BltRectFunc)(OutputObj, InputObj, Mask, ColorTranslation, - &CombinedRect, &Pt, MaskOrigin, pbo, - &AdjustedBrushOrigin, Rop4); + Ret = (*BltRectFunc)(OutputObj, + InputObj, + psoSrc, + pxlo, + &CombinedRect, + &Pt, + pptlMask, + pbo, + &AdjustedBrushOrigin, + rop4); } break; case DC_COMPLEX: Modified: trunk/reactos/win32ss/gdi/eng/clip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/clip.c?rev… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/clip.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/clip.c [iso-8859-1] Tue Jan 1 09:50:33 2013 @@ -315,8 +315,8 @@ break; default: - DPRINT1("Invalid BuildOrder %lu\n", BuildOrder); - BuildOrder = ClipGDI->EnumOrder; + DPRINT1("Invalid iDirection %lu\n", iDirection); + iDirection = ClipGDI->EnumOrder; CompareFunc = NULL; break; }

1 0

[tkreuzer] 58076: {WIN32K] - Add some annotations - Fix some 64bit issues - Fix a typo - reduce ENUM_RECT_LIMIT to 32, which is more than enough and doesn't waste as much stack space - remove some ...
by tkreuzer＠svn.reactos.org 01 Jan '13

01 Jan '13

Author: tkreuzer Date: Tue Jan 1 09:40:48 2013 New Revision: 58076 URL: http://svn.reactos.org/svn/reactos?rev=58076&view=rev Log: {WIN32K] - Add some annotations - Fix some 64bit issues - Fix a typo - reduce ENUM_RECT_LIMIT to 32, which is more than enough and doesn't waste as much stack space - remove some unused macros Modified: trunk/reactos/win32ss/gdi/eng/alphablend.c trunk/reactos/win32ss/gdi/eng/bitblt.c trunk/reactos/win32ss/gdi/eng/clip.c trunk/reactos/win32ss/gdi/eng/copybits.c trunk/reactos/win32ss/gdi/eng/debug.c trunk/reactos/win32ss/gdi/eng/device.c trunk/reactos/win32ss/gdi/eng/driverobj.c trunk/reactos/win32ss/gdi/eng/engbrush.c trunk/reactos/win32ss/gdi/eng/engevent.c trunk/reactos/win32ss/gdi/eng/engmisc.c trunk/reactos/win32ss/gdi/eng/error.c trunk/reactos/win32ss/gdi/eng/float.c trunk/reactos/win32ss/gdi/eng/gradient.c trunk/reactos/win32ss/gdi/eng/inteng.h trunk/reactos/win32ss/gdi/eng/ldevobj.c trunk/reactos/win32ss/gdi/eng/lineto.c trunk/reactos/win32ss/gdi/eng/mapping.c trunk/reactos/win32ss/gdi/eng/surface.c trunk/reactos/win32ss/gdi/eng/xlateobj.c trunk/reactos/win32ss/gdi/ntgdi/gdifloat.h trunk/reactos/win32ss/user/ntuser/object.h Modified: trunk/reactos/win32ss/gdi/eng/alphablend.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/alphablend… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/alphablend.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/alphablend.c [iso-8859-1] Tue Jan 1 09:40:48 2013 @@ -17,13 +17,14 @@ */ BOOL APIENTRY -EngAlphaBlend(IN SURFOBJ *psoDest, - IN SURFOBJ *psoSource, - IN CLIPOBJ *ClipRegion, - IN XLATEOBJ *ColorTranslation, - IN PRECTL DestRect, - IN PRECTL SourceRect, - IN BLENDOBJ *BlendObj) +EngAlphaBlend( + _Inout_ SURFOBJ *psoDest, + _In_ SURFOBJ *psoSource, + _In_opt_ CLIPOBJ *ClipRegion, + _In_opt_ XLATEOBJ *ColorTranslation, + _In_ RECTL *DestRect, + _In_ RECTL *SourceRect, + _In_ BLENDOBJ *BlendObj) { RECTL InputRect; RECTL OutputRect; Modified: trunk/reactos/win32ss/gdi/eng/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/bitblt.c?r… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/bitblt.c [iso-8859-1] Tue Jan 1 09:40:48 2013 @@ -296,18 +296,20 @@ /* * @implemented */ -BOOL APIENTRY -EngBitBlt(SURFOBJ *DestObj, - SURFOBJ *SourceObj, - SURFOBJ *Mask, - CLIPOBJ *ClipRegion, - XLATEOBJ *ColorTranslation, - RECTL *DestRect, - POINTL *SourcePoint, - POINTL *MaskOrigin, - BRUSHOBJ *pbo, - POINTL *BrushOrigin, - ROP4 Rop4) +BOOL +APIENTRY +EngBitBlt( + _Inout_ SURFOBJ *psoTrg, + _In_opt_ SURFOBJ *psoSrc, + _In_opt_ SURFOBJ *psoMask, + _In_opt_ CLIPOBJ *pco, + _In_opt_ XLATEOBJ *pxlo, + _In_ RECTL *prclTrg, + _When_(psoSrc, _In_) POINTL *pptlSrc, + _When_(psoMask, _In_) POINTL *pptlMask, + _In_opt_ BRUSHOBJ *pbo, + _When_(pbo, _In_) POINTL *pptlBrush, + _In_ ROP4 rop4) { BYTE clippingType; RECTL CombinedRect; @@ -321,36 +323,36 @@ PBLTRECTFUNC BltRectFunc; BOOLEAN Ret = TRUE; RECTL ClipRect; - unsigned i; + ULONG i; POINTL Pt; ULONG Direction; BOOL UsesSource, UsesMask; POINTL AdjustedBrushOrigin; - UsesSource = ROP4_USES_SOURCE(Rop4); - UsesMask = ROP4_USES_MASK(Rop4); - - if (Rop4 == ROP4_NOOP) + UsesSource = ROP4_USES_SOURCE(rop4); + UsesMask = ROP4_USES_MASK(rop4); + + if (rop4 == ROP4_NOOP) { /* Copy destination onto itself: nop */ return TRUE; } - //DPRINT1("Rop4 : 0x%08x\n", Rop4); - - OutputRect = *DestRect; + //DPRINT1("rop4 : 0x%08x\n", rop4); + + OutputRect = *prclTrg; RECTL_vMakeWellOrdered(&OutputRect); if (UsesSource) { - if (NULL == SourcePoint) + if (!psoSrc || !pptlSrc) { return FALSE; } /* Make sure we don't try to copy anything outside the valid source region */ - InputPoint = *SourcePoint; + InputPoint = *pptlSrc; if (InputPoint.x < 0) { OutputRect.left -= InputPoint.x; @@ -361,17 +363,17 @@ OutputRect.top -= InputPoint.y; InputPoint.y = 0; } - if (SourceObj->sizlBitmap.cx < InputPoint.x + + if (psoSrc->sizlBitmap.cx < InputPoint.x + OutputRect.right - OutputRect.left) { OutputRect.right = OutputRect.left + - SourceObj->sizlBitmap.cx - InputPoint.x; - } - if (SourceObj->sizlBitmap.cy < InputPoint.y + + psoSrc->sizlBitmap.cx - InputPoint.x; + } + if (psoSrc->sizlBitmap.cy < InputPoint.y + OutputRect.bottom - OutputRect.top) { OutputRect.bottom = OutputRect.top + - SourceObj->sizlBitmap.cy - InputPoint.y; + psoSrc->sizlBitmap.cy - InputPoint.y; } InputRect.left = InputPoint.x; @@ -379,40 +381,40 @@ InputRect.top = InputPoint.y; InputRect.bottom = InputPoint.y + (OutputRect.bottom - OutputRect.top); - InputObj = SourceObj; + InputObj = psoSrc; } else { InputPoint.x = InputPoint.y = 0; InputRect.left = 0; - InputRect.right = DestRect->right - DestRect->left; + InputRect.right = prclTrg->right - prclTrg->left; InputRect.top = 0; - InputRect.bottom = DestRect->bottom - DestRect->top; - } - - if (NULL != ClipRegion) - { - if (OutputRect.left < ClipRegion->rclBounds.left) - { - InputRect.left += ClipRegion->rclBounds.left - OutputRect.left; - InputPoint.x += ClipRegion->rclBounds.left - OutputRect.left; - OutputRect.left = ClipRegion->rclBounds.left; - } - if (ClipRegion->rclBounds.right < OutputRect.right) - { - InputRect.right -= OutputRect.right - ClipRegion->rclBounds.right; - OutputRect.right = ClipRegion->rclBounds.right; - } - if (OutputRect.top < ClipRegion->rclBounds.top) - { - InputRect.top += ClipRegion->rclBounds.top - OutputRect.top; - InputPoint.y += ClipRegion->rclBounds.top - OutputRect.top; - OutputRect.top = ClipRegion->rclBounds.top; - } - if (ClipRegion->rclBounds.bottom < OutputRect.bottom) - { - InputRect.bottom -= OutputRect.bottom - ClipRegion->rclBounds.bottom; - OutputRect.bottom = ClipRegion->rclBounds.bottom; + InputRect.bottom = prclTrg->bottom - prclTrg->top; + } + + if (NULL != pco) + { + if (OutputRect.left < pco->rclBounds.left) + { + InputRect.left += pco->rclBounds.left - OutputRect.left; + InputPoint.x += pco->rclBounds.left - OutputRect.left; + OutputRect.left = pco->rclBounds.left; + } + if (pco->rclBounds.right < OutputRect.right) + { + InputRect.right -= OutputRect.right - pco->rclBounds.right; + OutputRect.right = pco->rclBounds.right; + } + if (OutputRect.top < pco->rclBounds.top) + { + InputRect.top += pco->rclBounds.top - OutputRect.top; + InputPoint.y += pco->rclBounds.top - OutputRect.top; + OutputRect.top = pco->rclBounds.top; + } + if (pco->rclBounds.bottom < OutputRect.bottom) + { + InputRect.bottom -= OutputRect.bottom - pco->rclBounds.bottom; + OutputRect.bottom = pco->rclBounds.bottom; } } @@ -424,12 +426,12 @@ return TRUE; } - OutputObj = DestObj; - - if (BrushOrigin) - { - AdjustedBrushOrigin.x = BrushOrigin->x; - AdjustedBrushOrigin.y = BrushOrigin->y; + OutputObj = psoTrg; + + if (pptlBrush) + { + AdjustedBrushOrigin.x = pptlBrush->x; + AdjustedBrushOrigin.y = pptlBrush->y; } else { @@ -438,20 +440,20 @@ } /* Determine clipping type */ - if (ClipRegion == (CLIPOBJ *) NULL) + if (pco == (CLIPOBJ *) NULL) { clippingType = DC_TRIVIAL; } else { - clippingType = ClipRegion->iDComplexity; + clippingType = pco->iDComplexity; } if (UsesMask) { BltRectFunc = BltMask; } - else if ((Rop4 & 0xFF) == R3_OPINDEX_PATCOPY) + else if ((rop4 & 0xFF) == R3_OPINDEX_PATCOPY) { if (pbo && pbo->iSolidColor == 0xFFFFFFFF) BltRectFunc = CallDibBitBlt; @@ -512,10 +514,10 @@ { Direction = CD_ANY; } - CLIPOBJ_cEnumStart(ClipRegion, FALSE, CT_RECTANGLES, Direction, 0); + CLIPOBJ_cEnumStart(pco, FALSE, CT_RECTANGLES, Direction, 0); do { - EnumMore = CLIPOBJ_bEnum(ClipRegion,(ULONG) sizeof(RectEnum), + EnumMore = CLIPOBJ_bEnum(pco, sizeof(RectEnum), (PVOID) &RectEnum); for (i = 0; i < RectEnum.c; i++) @@ -535,10 +537,16 @@ #endif Pt.x = InputPoint.x + CombinedRect.left - OutputRect.left; Pt.y = InputPoint.y + CombinedRect.top - OutputRect.top; - Ret = (*BltRectFunc)(OutputObj, InputObj, Mask, - ColorTranslation, &CombinedRect, &Pt, - MaskOrigin, pbo, &AdjustedBrushOrigin, - Rop4) && Ret; + Ret = (*BltRectFunc)(OutputObj, + InputObj, + psoMask, + pxlo, + &CombinedRect, + &Pt, + pptlMask, + pbo, + &AdjustedBrushOrigin, + rop4) && Ret; } } } @@ -965,7 +973,7 @@ { BOOLEAN ret; RECTL OutputRect; - POINTL InputPoint; + POINTL InputPoint = {0,0}; //SURFACE *psurfDest; ASSERT(psoMask); Modified: trunk/reactos/win32ss/gdi/eng/clip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/clip.c?rev… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/clip.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/clip.c [iso-8859-1] Tue Jan 1 09:40:48 2013 @@ -188,13 +188,15 @@ return Cmp; } -VOID FASTCALL +VOID +FASTCALL IntEngDeleteClipRegion(CLIPOBJ *ClipObj) { EngFreeMem(ObjToGDI(ClipObj, CLIP)); } -CLIPOBJ* FASTCALL +CLIPOBJ* +FASTCALL IntEngCreateClipRegion(ULONG count, PRECTL pRect, PRECTL rcBounds) { CLIPGDI *Clip; @@ -250,7 +252,8 @@ /* * @implemented */ -CLIPOBJ * APIENTRY +CLIPOBJ * +APIENTRY EngCreateClip(VOID) { CLIPGDI *Clip = EngAllocMem(FL_ZERO_MEMORY, sizeof(CLIPGDI), GDITAG_CLIPOBJ); @@ -265,32 +268,35 @@ /* * @implemented */ -VOID APIENTRY -EngDeleteClip(CLIPOBJ *ClipRegion) -{ - EngFreeMem(ObjToGDI(ClipRegion, CLIP)); +VOID +APIENTRY +EngDeleteClip( + _In_ _Post_ptr_invalid_ CLIPOBJ *pco) +{ + EngFreeMem(ObjToGDI(pco, CLIP)); } /* * @implemented */ -ULONG APIENTRY +ULONG +APIENTRY CLIPOBJ_cEnumStart( - IN CLIPOBJ* ClipObj, - IN BOOL ShouldDoAll, - IN ULONG ClipType, - IN ULONG BuildOrder, - IN ULONG MaxRects) -{ - CLIPGDI *ClipGDI = ObjToGDI(ClipObj, CLIP); + _Inout_ CLIPOBJ *pco, + _In_ BOOL bAll, + _In_ ULONG iType, + _In_ ULONG iDirection, + _In_ ULONG cMaxRects) +{ + CLIPGDI *ClipGDI = ObjToGDI(pco, CLIP); SORTCOMP CompareFunc; ClipGDI->EnumPos = 0; - ClipGDI->EnumMax = (MaxRects > 0) ? MaxRects : ClipGDI->EnumRects.c; - - if (CD_ANY != BuildOrder && ClipGDI->EnumOrder != BuildOrder) - { - switch (BuildOrder) + ClipGDI->EnumMax = (cMaxRects > 0) ? cMaxRects : ClipGDI->EnumRects.c; + + if (CD_ANY != iDirection && ClipGDI->EnumOrder != iDirection) + { + switch (iDirection) { case CD_RIGHTDOWN: CompareFunc = (SORTCOMP) CompareRightDown; @@ -320,11 +326,11 @@ EngSort((PBYTE) ClipGDI->EnumRects.arcl, sizeof(RECTL), ClipGDI->EnumRects.c, CompareFunc); } - ClipGDI->EnumOrder = BuildOrder; + ClipGDI->EnumOrder = iDirection; } /* Return the number of rectangles enumerated */ - if ((MaxRects > 0) && (ClipGDI->EnumRects.c > MaxRects)) + if ((cMaxRects > 0) && (ClipGDI->EnumRects.c > cMaxRects)) { return 0xFFFFFFFF; } @@ -335,21 +341,22 @@ /* * @implemented */ -BOOL APIENTRY +BOOL +APIENTRY CLIPOBJ_bEnum( - IN CLIPOBJ* ClipObj, - IN ULONG ObjSize, - OUT ULONG *EnumRects) + _In_ CLIPOBJ *pco, + _In_ ULONG cj, + _Out_bytecap_(cj) ULONG *pulEnumRects) { RECTL *dest, *src; - CLIPGDI *ClipGDI = ObjToGDI(ClipObj, CLIP); + CLIPGDI *ClipGDI = ObjToGDI(pco, CLIP); ULONG nCopy, i; - ENUMRECTS* pERects = (ENUMRECTS*)EnumRects; + ENUMRECTS* pERects = (ENUMRECTS*)pulEnumRects; // Calculate how many rectangles we should copy nCopy = min( ClipGDI->EnumMax - ClipGDI->EnumPos, min( ClipGDI->EnumRects.c - ClipGDI->EnumPos, - (ObjSize - sizeof(ULONG)) / sizeof(RECTL))); + (cj - sizeof(ULONG)) / sizeof(RECTL))); if(nCopy == 0) { Modified: trunk/reactos/win32ss/gdi/eng/copybits.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/copybits.c… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/copybits.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/copybits.c [iso-8859-1] Tue Jan 1 09:40:48 2013 @@ -15,12 +15,13 @@ * @implemented */ BOOL APIENTRY -EngCopyBits(SURFOBJ *psoDest, - SURFOBJ *psoSource, - CLIPOBJ *Clip, - XLATEOBJ *ColorTranslation, - RECTL *DestRect, - POINTL *SourcePoint) +EngCopyBits( + _In_ SURFOBJ *psoDest, + _In_ SURFOBJ *psoSource, + _In_opt_ CLIPOBJ *Clip, + _In_opt_ XLATEOBJ *ColorTranslation, + _In_ RECTL *DestRect, + _In_ POINTL *SourcePoint) { BOOL ret; BYTE clippingType; @@ -50,7 +51,7 @@ rclDest.bottom = psoDest->sizlBitmap.cy; if (RECTL_bIsEmptyRect(&rclDest)) return TRUE; DestRect = &rclDest; - + // FIXME: Don't punt to the driver's DrvCopyBits immediately. Instead, // mark the copy block function to be DrvCopyBits instead of the // GDI's copy bit function so as to remove clipping from the Modified: trunk/reactos/win32ss/gdi/eng/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/debug.c?re… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/debug.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/debug.c [iso-8859-1] Tue Jan 1 09:40:48 2013 @@ -1,4 +1,4 @@ -/* +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * PURPOSE: @@ -14,10 +14,12 @@ /* * @implemented */ -VOID APIENTRY -EngDebugPrint(PCHAR StandardPrefix, - PCHAR DebugMessage, - va_list ap) +VOID +APIENTRY +EngDebugPrint( + _In_z_ PCHAR StandardPrefix, + _In_z_ PCHAR DebugMessage, + _In_ va_list ap) { vDbgPrintExWithPrefix(StandardPrefix, -1, 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 Jan 1 09:40:48 2013 @@ -47,6 +47,7 @@ NTSTATUS Status; PWSTR pwsz; ULONG i, cj, cModes = 0; + SIZE_T cjWritten; BOOL bEnable = TRUE; PDEVMODEINFO pdminfo; PDEVMODEW pdm, pdmEnd; @@ -77,7 +78,7 @@ } /* Enable the device */ - EngFileWrite(pFileObject, &bEnable, sizeof(BOOL), &cj); + EngFileWrite(pFileObject, &bEnable, sizeof(BOOL), &cjWritten); /* Copy the device and file object pointers */ pGraphicsDevice->DeviceObject = pDeviceObject; @@ -288,11 +289,11 @@ NTSTATUS EngpFileIoRequest( PFILE_OBJECT pFileObject, - ULONG ulMajorFunction, - LPVOID lpBuffer, - DWORD nBufferSize, - ULONGLONG ullStartOffset, - OUT LPDWORD lpInformation) + ULONG ulMajorFunction, + LPVOID lpBuffer, + SIZE_T nBufferSize, + ULONGLONG ullStartOffset, + OUT PULONG_PTR lpInformation) { PDEVICE_OBJECT pDeviceObject; KEVENT Event; @@ -316,7 +317,7 @@ pIrp = IoBuildSynchronousFsdRequest(ulMajorFunction, pDeviceObject, lpBuffer, - nBufferSize, + (ULONG)nBufferSize, &liStartOffset, &Event, &Iosb); @@ -367,7 +368,7 @@ IN SIZE_T nInBufferSize, OUT PVOID lpOutBuffer, IN SIZE_T nOutBufferSize, - OUT LPDWORD lpInformation) + OUT PULONG_PTR lpInformation) { PDEVICE_OBJECT pDeviceObject; KEVENT Event; @@ -389,9 +390,9 @@ pIrp = IoBuildDeviceIoControlRequest(dwIoControlCode, pDeviceObject, lpInBuffer, - nInBufferSize, + (ULONG)nInBufferSize, lpOutBuffer, - nOutBufferSize, + (ULONG)nOutBufferSize, FALSE, &Event, &Iosb); @@ -422,13 +423,13 @@ */ DWORD APIENTRY EngDeviceIoControl( - HANDLE hDevice, - DWORD dwIoControlCode, - LPVOID lpInBuffer, - DWORD nInBufferSize, - LPVOID lpOutBuffer, - DWORD nOutBufferSize, - DWORD *lpBytesReturned) + _In_ HANDLE hDevice, + _In_ DWORD dwIoControlCode, + _In_opt_bytecount_(cjInBufferSize) LPVOID lpInBuffer, + _In_ DWORD cjInBufferSize, + _Out_opt_bytecap_(cjOutBufferSize) LPVOID lpOutBuffer, + _In_ DWORD cjOutBufferSize, + _Out_ LPDWORD lpBytesReturned) { PIRP Irp; NTSTATUS Status; @@ -445,9 +446,12 @@ Irp = IoBuildDeviceIoControlRequest(dwIoControlCode, DeviceObject, lpInBuffer, - nInBufferSize, + cjInBufferSize, lpOutBuffer, - nOutBufferSize, FALSE, &Event, &Iosb); + cjOutBufferSize, + FALSE, + &Event, + &Iosb); if (!Irp) return ERROR_NOT_ENOUGH_MEMORY; Status = IoCallDriver(DeviceObject, Irp); @@ -462,7 +466,7 @@ Iosb.Information); /* Return information to the caller about the operation. */ - *lpBytesReturned = Iosb.Information; + *lpBytesReturned = (DWORD)Iosb.Information; /* Convert NT status values to win32 error codes. */ switch (Status) Modified: trunk/reactos/win32ss/gdi/eng/driverobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/driverobj.… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/driverobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/driverobj.c [iso-8859-1] Tue Jan 1 09:40:48 2013 @@ -36,12 +36,13 @@ /** Public interface **********************************************************/ +_Must_inspect_result_ HDRVOBJ APIENTRY EngCreateDriverObj( - IN PVOID pvObj, - IN FREEOBJPROC pFreeObjProc, - IN HDEV hdev) + _In_ PVOID pvObj, + _In_opt_ FREEOBJPROC pFreeObjProc, + _In_ HDEV hdev) { PEDRIVEROBJ pedo; HDRVOBJ hdo; @@ -72,9 +73,9 @@ BOOL APIENTRY EngDeleteDriverObj( - IN HDRVOBJ hdo, - IN BOOL bCallBack, - IN BOOL bLocked) + _In_ _Post_ptr_invalid_ HDRVOBJ hdo, + _In_ BOOL bCallBack, + _In_ BOOL bLocked) { PEDRIVEROBJ pedo; @@ -111,7 +112,7 @@ PDRIVEROBJ APIENTRY EngLockDriverObj( - IN HDRVOBJ hdo) + _In_ HDRVOBJ hdo) { PEDRIVEROBJ pedo; @@ -126,7 +127,7 @@ BOOL APIENTRY EngUnlockDriverObj( - IN HDRVOBJ hdo) + _In_ _Post_ptr_invalid_ HDRVOBJ hdo) { PEDRIVEROBJ pedo; ULONG cLocks; Modified: trunk/reactos/win32ss/gdi/eng/engbrush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/engbrush.c… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/engbrush.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/engbrush.c [iso-8859-1] Tue Jan 1 09:40:48 2013 @@ -287,7 +287,7 @@ EBRUSHOBJ_bRealizeBrush(EBRUSHOBJ *pebo, BOOL bCallDriver) { BOOL bResult; - PFN_DrvRealizeBrush pfnRealzizeBrush = NULL; + PFN_DrvRealizeBrush pfnRealizeBrush = NULL; PSURFACE psurfPattern, psurfMask; PPDEVOBJ ppdev; EXLATEOBJ exlo; @@ -303,10 +303,10 @@ if (!ppdev) ppdev = gppdevPrimary; if (bCallDriver) - pfnRealzizeBrush = ppdev->DriverFunctions.RealizeBrush; - - if (!pfnRealzizeBrush) - pfnRealzizeBrush = EngRealizeBrush; + pfnRealizeBrush = ppdev->DriverFunctions.RealizeBrush; + + if (!pfnRealizeBrush) + pfnRealizeBrush = EngRealizeBrush; /* Check if this is a hatch brush */ if (pbr->flAttrs & BR_IS_HATCH) @@ -351,12 +351,12 @@ pebo->crCurrentText); /* Create the realization */ - bResult = pfnRealzizeBrush(&pebo->BrushObject, - &pebo->psurfTrg->SurfObj, - &psurfPattern->SurfObj, - psurfMask ? &psurfMask->SurfObj : NULL, - &exlo.xlo, - iHatch); + bResult = pfnRealizeBrush(&pebo->BrushObject, + &pebo->psurfTrg->SurfObj, + &psurfPattern->SurfObj, + psurfMask ? &psurfMask->SurfObj : NULL, + &exlo.xlo, + iHatch); /* Cleanup the XLATEOBJ */ EXLATEOBJ_vCleanup(&exlo); 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 Jan 1 09:40:48 2013 @@ -17,7 +17,8 @@ BOOL APIENTRY -EngCreateEvent(OUT PEVENT* Event) +EngCreateEvent( + _Deref_out_opt_ PEVENT* Event) { BOOLEAN Result = TRUE; PENG_EVENT EngEvent; @@ -54,7 +55,8 @@ BOOL APIENTRY -EngDeleteEvent(IN PEVENT Event) +EngDeleteEvent( + _In_ _Post_ptr_invalid_ PEVENT Event) { DPRINT("EngDeleteEvent(%p)\n", Event); @@ -75,7 +77,8 @@ VOID APIENTRY -EngClearEvent(IN PEVENT Event) +EngClearEvent( + _In_ PEVENT Event) { /* Clear the event */ KeClearEvent(Event->pKEvent); @@ -83,7 +86,8 @@ LONG APIENTRY -EngSetEvent(IN PEVENT Event) +EngSetEvent( + _In_ PEVENT Event) { /* Set the event */ return KeSetEvent(Event->pKEvent, @@ -93,7 +97,8 @@ LONG APIENTRY -EngReadStateEvent(IN PEVENT Event) +EngReadStateEvent( + _In_ PEVENT Event) { /* Read the event state */ return KeReadStateEvent(Event->pKEvent); @@ -101,11 +106,12 @@ PEVENT APIENTRY -EngMapEvent(IN HDEV hDev, - IN HANDLE hUserObject, - IN PVOID Reserved1, - IN PVOID Reserved2, - IN PVOID Reserved3) +EngMapEvent( + _In_ HDEV hDev, + _In_ HANDLE hUserObject, + _Reserved_ PVOID Reserved1, + _Reserved_ PVOID Reserved2, + _Reserved_ PVOID Reserved3) { PENG_EVENT EngEvent; NTSTATUS Status; @@ -147,7 +153,8 @@ BOOL APIENTRY -EngUnmapEvent(IN PEVENT Event) +EngUnmapEvent( + _In_ PEVENT Event) { /* Must be a usermapped event */ if (!(Event->fFlags & ENG_EVENT_USERMAPPED)) return FALSE; @@ -162,8 +169,9 @@ BOOL APIENTRY -EngWaitForSingleObject(IN PEVENT Event, - IN PLARGE_INTEGER TimeOut) +EngWaitForSingleObject( + _In_ PEVENT Event, + _In_opt_ PLARGE_INTEGER TimeOut) { NTSTATUS Status; DPRINT("EngWaitForSingleObject(%p %I64d)\n", Event, TimeOut->QuadPart); Modified: trunk/reactos/win32ss/gdi/eng/engmisc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/engmisc.c?… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/engmisc.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/engmisc.c [iso-8859-1] Tue Jan 1 09:40:48 2013 @@ -229,8 +229,9 @@ VOID APIENTRY -EngGetCurrentCodePage(OUT PUSHORT OemCodePage, - OUT PUSHORT AnsiCodePage) +EngGetCurrentCodePage( + _Out_ PUSHORT OemCodePage, + _Out_ PUSHORT AnsiCodePage) { /* Forward to kernel */ RtlGetDefaultCodePage(AnsiCodePage, OemCodePage); @@ -239,8 +240,8 @@ BOOL APIENTRY EngQuerySystemAttribute( - IN ENG_SYSTEM_ATTRIBUTE CapNum, - OUT PDWORD pCapability) + _In_ ENG_SYSTEM_ATTRIBUTE CapNum, + _Out_ PDWORD pCapability) { SYSTEM_BASIC_INFORMATION sbi; SYSTEM_PROCESSOR_INFORMATION spi; Modified: trunk/reactos/win32ss/gdi/eng/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/error.c?re… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/error.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/error.c [iso-8859-1] Tue Jan 1 09:40:48 2013 @@ -24,7 +24,7 @@ */ VOID APIENTRY -EngSetLastError(IN ULONG iError) +EngSetLastError(_In_ ULONG iError) { PTEB pTeb = NtCurrentTeb(); if (pTeb) Modified: trunk/reactos/win32ss/gdi/eng/float.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/float.c?re… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/float.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/float.c [iso-8859-1] Tue Jan 1 09:40:48 2013 @@ -18,7 +18,7 @@ BOOL APIENTRY EngRestoreFloatingPointState( - IN VOID *Buffer) + _In_ VOID *Buffer) { NTSTATUS Status; @@ -34,8 +34,8 @@ ULONG APIENTRY EngSaveFloatingPointState( - OUT VOID *Buffer, - IN ULONG BufferSize) + _Out_ VOID *Buffer, + _In_ ULONG BufferSize) { KFLOATING_SAVE TempBuffer; NTSTATUS Status; Modified: trunk/reactos/win32ss/gdi/eng/gradient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/gradient.c… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/gradient.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/gradient.c [iso-8859-1] Tue Jan 1 09:40:48 2013 @@ -1,4 +1,4 @@ -/* +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * PURPOSE: GDI Driver Gradient Functions @@ -443,16 +443,16 @@ BOOL APIENTRY EngGradientFill( - IN SURFOBJ *psoDest, - IN CLIPOBJ *pco, - IN XLATEOBJ *pxlo, - IN TRIVERTEX *pVertex, - IN ULONG nVertex, - IN PVOID pMesh, - IN ULONG nMesh, - IN RECTL *prclExtents, - IN POINTL *pptlDitherOrg, - IN ULONG ulMode) + _Inout_ SURFOBJ *psoDest, + _In_ CLIPOBJ *pco, + _In_opt_ XLATEOBJ *pxlo, + _In_ TRIVERTEX *pVertex, + _In_ ULONG nVertex, + _In_ PVOID pMesh, + _In_ ULONG nMesh, + _In_ RECTL *prclExtents, + _In_ POINTL *pptlDitherOrg, + _In_ ULONG ulMode) { ULONG i; BOOL ret = FALSE; Modified: trunk/reactos/win32ss/gdi/eng/inteng.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/inteng.h?r… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/inteng.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/inteng.h [iso-8859-1] Tue Jan 1 09:40:48 2013 @@ -2,7 +2,7 @@ typedef ULONG HCLIP; -#define ENUM_RECT_LIMIT 50 +#define ENUM_RECT_LIMIT 32 typedef struct _RECT_ENUM { Modified: trunk/reactos/win32ss/gdi/eng/ldevobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/ldevobj.c?… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/ldevobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/ldevobj.c [iso-8859-1] Tue Jan 1 09:40:48 2013 @@ -324,7 +324,7 @@ WCHAR acwBuffer[MAX_PATH]; PLDEVOBJ pldev; UNICODE_STRING strDriverName; - ULONG cwcLength; + SIZE_T cwcLength; LPWSTR pwsz; DPRINT("EngLoadImageEx(%ls, %lu)\n", pwszDriverName, ldevtype); @@ -442,7 +442,7 @@ HANDLE APIENTRY EngLoadImage( - LPWSTR pwszDriverName) + _In_ LPWSTR pwszDriverName) { return (HANDLE)EngLoadImageEx(pwszDriverName, LDEV_IMAGE); } @@ -451,7 +451,7 @@ VOID APIENTRY EngUnloadImage( - IN HANDLE hModule) + _In_ HANDLE hModule) { PLDEVOBJ pldev = (PLDEVOBJ)hModule; @@ -486,8 +486,8 @@ PVOID APIENTRY EngFindImageProcAddress( - IN HANDLE hModule, - IN LPSTR lpProcName) + _In_ HANDLE hModule, + _In_ LPSTR lpProcName) { PLDEVOBJ pldev = (PLDEVOBJ)hModule; Modified: trunk/reactos/win32ss/gdi/eng/lineto.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/lineto.c?r… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/lineto.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/lineto.c [iso-8859-1] Tue Jan 1 09:40:48 2013 @@ -316,15 +316,16 @@ * @implemented */ BOOL APIENTRY -EngLineTo(SURFOBJ *DestObj, - CLIPOBJ *Clip, - BRUSHOBJ *pbo, - LONG x1, - LONG y1, - LONG x2, - LONG y2, - RECTL *RectBounds, - MIX mix) +EngLineTo( + _Inout_ SURFOBJ *DestObj, + _In_ CLIPOBJ *Clip, + _In_ BRUSHOBJ *pbo, + _In_ LONG x1, + _In_ LONG y1, + _In_ LONG x2, + _In_ LONG y2, + _In_opt_ RECTL *RectBounds, + _In_ MIX mix) { LONG x, y, deltax, deltay, xchange, ychange, hx, vy; ULONG i; Modified: trunk/reactos/win32ss/gdi/eng/mapping.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/mapping.c?… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/mapping.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/mapping.c [iso-8859-1] Tue Jan 1 09:40:48 2013 @@ -419,7 +419,8 @@ HANDLE APIENTRY -EngLoadModule(LPWSTR pwsz) +EngLoadModule( + _In_ LPWSTR pwsz) { /* Forward to EngLoadModuleEx */ return (HANDLE)EngLoadModuleEx(pwsz, 0, FVF_READONLY | FVF_SYSTEMROOT); @@ -428,8 +429,8 @@ HANDLE APIENTRY EngLoadModuleForWrite( - IN LPWSTR pwsz, - IN ULONG cjSizeOfModule) + _In_ LPWSTR pwsz, + _In_ ULONG cjSizeOfModule) { /* Forward to EngLoadModuleEx */ return (HANDLE)EngLoadModuleEx(pwsz, cjSizeOfModule, FVF_SYSTEMROOT); @@ -438,15 +439,15 @@ PVOID APIENTRY EngMapModule( - IN HANDLE h, - OUT PULONG pulSize) + _In_ HANDLE h, + _Out_ PULONG pulSize) { PFILEVIEW pFileView = (PFILEVIEW)h; NTSTATUS Status; pFileView->cjView = 0; - /* FIXME: Use system space because ARM3 doesn't support executable sections yet */ + /* FIXME: Use system space because ARM3 doesn't support executable sections yet */ Status = MmMapViewInSystemSpace(pFileView->pSection, &pFileView->pvKView, &pFileView->cjView); @@ -457,18 +458,19 @@ return NULL; } - *pulSize = pFileView->cjView; + *pulSize = (ULONG)pFileView->cjView; return pFileView->pvKView; } VOID APIENTRY -EngFreeModule(IN HANDLE h) +EngFreeModule( + _In_ HANDLE h) { PFILEVIEW pFileView = (PFILEVIEW)h; NTSTATUS Status; - /* FIXME: Use system space because ARM3 doesn't support executable sections yet */ + /* FIXME: Use system space because ARM3 doesn't support executable sections yet */ Status = MmUnmapViewInSystemSpace(pFileView->pvKView); if (!NT_SUCCESS(Status)) { @@ -483,12 +485,14 @@ EngFreeMem(pFileView); } +_Success_(return != 0) +_When_(cjSize != 0, _At_(return, _Out_writes_bytes_(cjSize))) PVOID APIENTRY EngMapFile( - IN LPWSTR pwsz, - IN ULONG cjSize, - OUT ULONG_PTR *piFile) + _In_ LPWSTR pwsz, + _In_ ULONG cjSize, + _Out_ ULONG_PTR *piFile) { HANDLE hModule; PVOID pvBase; @@ -517,7 +521,7 @@ BOOL APIENTRY EngUnmapFile( - IN ULONG_PTR iFile) + _In_ ULONG_PTR iFile) { HANDLE hModule = (HANDLE)iFile; @@ -530,9 +534,9 @@ BOOL APIENTRY EngMapFontFileFD( - IN ULONG_PTR iFile, - OUT PULONG *ppjBuf, - OUT ULONG *pcjBuf) + _In_ ULONG_PTR iFile, + _Outptr_result_bytebuffer_(*pcjBuf) PULONG *ppjBuf, + _Out_ ULONG *pcjBuf) { // www.osr.com/ddk/graphics/gdifncs_0co7.htm UNIMPLEMENTED; @@ -542,7 +546,7 @@ VOID APIENTRY EngUnmapFontFileFD( - IN ULONG_PTR iFile) + _In_ ULONG_PTR iFile) { // http://www.osr.com/ddk/graphics/gdifncs_6wbr.htm UNIMPLEMENTED; @@ -551,9 +555,9 @@ BOOL APIENTRY EngMapFontFile( - ULONG_PTR iFile, - PULONG *ppjBuf, - ULONG *pcjBuf) + _In_ ULONG_PTR iFile, + _Outptr_result_bytebuffer_(*pcjBuf) PULONG *ppjBuf, + _Out_ ULONG *pcjBuf) { // www.osr.com/ddk/graphics/gdifncs_3up3.htm return EngMapFontFileFD(iFile, ppjBuf, pcjBuf); @@ -562,7 +566,7 @@ VOID APIENTRY EngUnmapFontFile( - IN ULONG_PTR iFile) + _In_ ULONG_PTR iFile) { // www.osr.com/ddk/graphics/gdifncs_09wn.htm EngUnmapFontFileFD(iFile); 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 Jan 1 09:40:48 2013 @@ -275,11 +275,11 @@ HBITMAP APIENTRY EngCreateBitmap( - IN SIZEL sizl, - IN LONG lWidth, - IN ULONG iFormat, - IN ULONG fl, - IN PVOID pvBits) + _In_ SIZEL sizl, + _In_ LONG lWidth, + _In_ ULONG iFormat, + _In_ ULONG fl, + _In_ PVOID pvBits) { PSURFACE psurf; HBITMAP hbmp; @@ -315,9 +315,9 @@ HBITMAP APIENTRY EngCreateDeviceBitmap( - IN DHSURF dhsurf, - IN SIZEL sizl, - IN ULONG iFormat) + _In_ DHSURF dhsurf, + _In_ SIZEL sizl, + _In_ ULONG iFormat) { PSURFACE psurf; HBITMAP hbmp; @@ -353,9 +353,9 @@ HSURF APIENTRY EngCreateDeviceSurface( - IN DHSURF dhsurf, - IN SIZEL sizl, - IN ULONG iFormat) + _In_ DHSURF dhsurf, + _In_ SIZEL sizl, + _In_ ULONG iFormat) { PSURFACE psurf; HSURF hsurf; @@ -391,9 +391,9 @@ BOOL APIENTRY EngAssociateSurface( - IN HSURF hsurf, - IN HDEV hdev, - IN FLONG flHooks) + _In_ HSURF hsurf, + _In_ HDEV hdev, + _In_ FLONG flHooks) { SURFOBJ *pso; PSURFACE psurf; @@ -431,14 +431,14 @@ BOOL APIENTRY EngModifySurface( - IN HSURF hsurf, - IN HDEV hdev, - IN FLONG flHooks, - IN FLONG flSurface, - IN DHSURF dhsurf, - OUT VOID *pvScan0, - IN LONG lDelta, - IN VOID *pvReserved) + _In_ HSURF hsurf, + _In_ HDEV hdev, + _In_ FLONG flHooks, + _In_ FLONG flSurface, + _In_ DHSURF dhsurf, + _In_ VOID *pvScan0, + _In_ LONG lDelta, + _Reserved_ VOID *pvReserved) { SURFOBJ *pso; PSURFACE psurf; @@ -478,7 +478,8 @@ BOOL APIENTRY -EngDeleteSurface(IN HSURF hsurf) +EngDeleteSurface( + _In_ HSURF hsurf) { PSURFACE psurf; @@ -496,9 +497,9 @@ BOOL APIENTRY EngEraseSurface( - SURFOBJ *pso, - RECTL *prcl, - ULONG iColor) + _In_ SURFOBJ *pso, + _In_ RECTL *prcl, + _In_ ULONG iColor) { ASSERT(pso); ASSERT(prcl); @@ -517,7 +518,8 @@ SURFOBJ * APIENTRY -EngLockSurface(IN HSURF hsurf) +EngLockSurface( + _In_ HSURF hsurf) { SURFACE *psurf = SURFACE_ShareLockSurface(hsurf); @@ -534,7 +536,8 @@ VOID APIENTRY -EngUnlockSurface(IN SURFOBJ *pso) +EngUnlockSurface( + _In_ SURFOBJ *pso) { if (pso != NULL) { Modified: trunk/reactos/win32ss/gdi/eng/xlateobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/xlateobj.c… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/xlateobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/xlateobj.c [iso-8859-1] Tue Jan 1 09:40:48 2013 @@ -42,7 +42,9 @@ _Function_class_(FN_XLATE) ULONG FASTCALL -EXLATEOBJ_iXlateTrivial(PEXLATEOBJ pexlo, ULONG iColor) +EXLATEOBJ_iXlateTrivial( + _In_ PEXLATEOBJ pexlo, + _In_ ULONG iColor) { return iColor; } @@ -50,7 +52,7 @@ _Function_class_(FN_XLATE) ULONG FASTCALL -EXLATEOBJ_iXlateToMono(PEXLATEOBJ pexlo, ULONG iColor) +EXLATEOBJ_iXlateToMono(_In_ PEXLATEOBJ pexlo, ULONG iColor) { return (iColor == pexlo->xlo.pulXlate[0]); } @@ -354,12 +356,12 @@ VOID NTAPI EXLATEOBJ_vInitialize( - PEXLATEOBJ pexlo, - PALETTE *ppalSrc, - PALETTE *ppalDst, - COLORREF crSrcBackColor, - COLORREF crDstBackColor, - COLORREF crDstForeColor) + _Out_ PEXLATEOBJ pexlo, + _In_opt_ PALETTE *ppalSrc, + _In_opt_ PALETTE *ppalDst, + _In_ COLORREF crSrcBackColor, + _In_ COLORREF crDstBackColor, + _In_ COLORREF crDstForeColor) { ULONG cEntries; ULONG i, ulColor; @@ -607,9 +609,9 @@ VOID NTAPI EXLATEOBJ_vInitXlateFromDCs( - EXLATEOBJ* pexlo, - PDC pdcSrc, - PDC pdcDst) + _Out_ EXLATEOBJ* pexlo, + _In_ PDC pdcSrc, + _In_ PDC pdcDst) { PSURFACE psurfDst, psurfSrc; @@ -644,7 +646,8 @@ VOID NTAPI -EXLATEOBJ_vCleanup(PEXLATEOBJ pexlo) +EXLATEOBJ_vCleanup( + _Inout_ PEXLATEOBJ pexlo) { if (pexlo->xlo.pulXlate != pexlo->aulXlate) { @@ -658,7 +661,9 @@ #undef XLATEOBJ_iXlate ULONG NTAPI -XLATEOBJ_iXlate(XLATEOBJ *pxlo, ULONG iColor) +XLATEOBJ_iXlate( + _In_ XLATEOBJ *pxlo, + _In_ ULONG iColor) { PEXLATEOBJ pexlo = (PEXLATEOBJ)pxlo; @@ -671,7 +676,11 @@ ULONG NTAPI -XLATEOBJ_cGetPalette(XLATEOBJ *pxlo, ULONG iPal, ULONG cPal, ULONG *pPalOut) +XLATEOBJ_cGetPalette( + _In_ XLATEOBJ *pxlo, + _In_ ULONG iPal, + _In_ ULONG cPal, + _Out_cap_(cPal) ULONG *pPalOut) { PEXLATEOBJ pexlo = (PEXLATEOBJ)pxlo; PPALETTE ppal; @@ -741,7 +750,8 @@ HANDLE NTAPI -XLATEOBJ_hGetColorTransform(XLATEOBJ *pxlo) +XLATEOBJ_hGetColorTransform( + _In_ XLATEOBJ *pxlo) { PEXLATEOBJ pexlo = (PEXLATEOBJ)pxlo; return pexlo->hColorTransform; @@ -749,7 +759,8 @@ PULONG NTAPI -XLATEOBJ_piVector(XLATEOBJ *pxlo) +XLATEOBJ_piVector( + _In_ XLATEOBJ *pxlo) { if (pxlo->iSrcType == PAL_INDEXED) { Modified: trunk/reactos/win32ss/gdi/ntgdi/gdifloat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/gdifloat… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/gdifloat.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/gdifloat.h [iso-8859-1] Tue Jan 1 09:40:48 2013 @@ -1,4 +1,9 @@ #pragma once + +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable:28110) // disable "Drivers must protect floating point hardware state" warning +#endif typedef struct tagFLOAT_POINT { @@ -99,3 +104,7 @@ MulDiv((tx), (pdcattr)->szlViewportExt.cx, (pdcattr)->szlWindowExt.cx) #define YLSTODS(pdcattr,ty) \ MulDiv((ty), (pdcattr)->szlViewportExt.cy, (pdcattr)->szlWindowExt.cy) + +#ifdef _MSC_VER +#pragma warning(pop) +#endif Modified: trunk/reactos/win32ss/user/ntuser/object.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/object… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/object.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/object.h [iso-8859-1] Tue Jan 1 09:40:48 2013 @@ -5,29 +5,6 @@ SINGLE_LIST_ENTRY Entry; PVOID obj; } USER_REFERENCE_ENTRY, *PUSER_REFERENCE_ENTRY; - -#define USER_ASSERT(exp,file,line) \ - if (!(exp)) {RtlAssert(#exp,(PVOID)file,line,"");} - -static __inline VOID -UserAssertLastRef(PVOID obj, const char *file, int line) -{ - PTHREADINFO W32Thread; - PSINGLE_LIST_ENTRY ReferenceEntry; - PUSER_REFERENCE_ENTRY UserReferenceEntry; - - USER_ASSERT(obj != NULL, file, line); - W32Thread = PsGetCurrentThreadWin32Thread(); - USER_ASSERT(W32Thread != NULL, file, line); - ReferenceEntry = W32Thread->ReferencesList.Next; - USER_ASSERT(ReferenceEntry != NULL, file, line); - UserReferenceEntry = CONTAINING_RECORD(ReferenceEntry, USER_REFERENCE_ENTRY, Entry); - USER_ASSERT(UserReferenceEntry != NULL, file, line); - USER_ASSERT(obj == UserReferenceEntry->obj, file, line); -} -#define ASSERT_LAST_REF(_obj_) UserAssertLastRef(_obj,__FILE__,__LINE__) - -#undef USER_ASSERT extern PUSER_HANDLE_TABLE gHandleTable; VOID FASTCALL UserReferenceObject(PVOID obj);

1 0

[hbelusca] 58075: [CONSRV] - Be sure that we reply to the dying client when he dies. - "Improve" a debug output (display the client process). - Use existing helper functions for incrementing refere...
by hbelusca＠svn.reactos.org 01 Jan '13

01 Jan '13

Author: hbelusca Date: Tue Jan 1 02:59:31 2013 New Revision: 58075 URL: http://svn.reactos.org/svn/reactos?rev=58075&view=rev Log: [CONSRV] - Be sure that we reply to the dying client when he dies. - "Improve" a debug output (display the client process). - Use existing helper functions for incrementing reference counts for threads and processes. Modified: branches/ros-csrss/subsystems/win32/csrsrv/api.c branches/ros-csrss/subsystems/win32/csrsrv/procsup.c branches/ros-csrss/subsystems/win32/csrsrv/thredsup.c Modified: branches/ros-csrss/subsystems/win32/csrsrv/api.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… ============================================================================== --- branches/ros-csrss/subsystems/win32/csrsrv/api.c [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win32/csrsrv/api.c [iso-8859-1] Tue Jan 1 02:59:31 2013 @@ -625,6 +625,9 @@ ClientDiedMsg = (PCLIENT_DIED_MSG)&ReceiveMsg; if (ClientDiedMsg->CreateTime.QuadPart == CsrThread->CreateTime.QuadPart) { + /* Now we reply to the dying client */ + ReplyPort = CsrThread->Process->ClientPort; + /* Reference the thread */ CsrLockedReferenceThread(CsrThread); @@ -773,12 +776,14 @@ if (CsrDebug & 2) { - DPRINT1("[%02x] CSRSS: [%02x,%02x] - %s Api called from %08x\n", + DPRINT1("[%02x] CSRSS: [%02x,%02x] - %s Api called from %08x, Process %08x - %08x\n", Teb->ClientId.UniqueThread, ReceiveMsg.Header.ClientId.UniqueProcess, ReceiveMsg.Header.ClientId.UniqueThread, ServerDll->NameTable[ApiId], - CsrThread); + CsrThread, + CsrThread->Process, + CsrProcess); } /* Assume success */ Modified: branches/ros-csrss/subsystems/win32/csrsrv/procsup.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… ============================================================================== --- branches/ros-csrss/subsystems/win32/csrsrv/procsup.c [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win32/csrsrv/procsup.c [iso-8859-1] Tue Jan 1 02:59:31 2013 @@ -268,8 +268,8 @@ { /* Call the generic cleanup code */ DPRINT1("Should kill process: %p\n", CsrProcess); + CsrAcquireProcessLock(); CsrProcessRefcountZero(CsrProcess); - CsrAcquireProcessLock(); } } @@ -305,7 +305,7 @@ if (CsrProcessSequenceCount < 5) CsrProcessSequenceCount = 5; /* Increase the reference count */ - CsrProcess->ReferenceCount++; + CsrLockedReferenceProcess(CsrProcess); /* Initialize the Thread List */ InitializeListHead(&CsrProcess->ThreadList); @@ -1300,7 +1300,7 @@ if (!CsrProcess) break; /* Increase reference to process */ - CsrProcess->ReferenceCount++; + CsrLockedReferenceProcess(CsrProcess); FirstTry = TRUE; while (TRUE) Modified: branches/ros-csrss/subsystems/win32/csrsrv/thredsup.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… ============================================================================== --- branches/ros-csrss/subsystems/win32/csrsrv/thredsup.c [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win32/csrsrv/thredsup.c [iso-8859-1] Tue Jan 1 02:59:31 2013 @@ -123,11 +123,11 @@ /* Allocate the structure */ CsrThread = RtlAllocateHeap(CsrHeap, HEAP_ZERO_MEMORY, sizeof(CSR_THREAD)); - if (!CsrThread) return(NULL); + if (!CsrThread) return NULL; /* Reference the Thread and Process */ - CsrThread->ReferenceCount++; - CsrProcess->ReferenceCount++; + CsrLockedReferenceThread(CsrThread); + CsrLockedReferenceProcess(CsrProcess); /* Set the Parent Process */ CsrThread->Process = CsrProcess; @@ -465,8 +465,8 @@ if (!LockCount) { /* Call the generic cleanup code */ + CsrAcquireProcessLock(); CsrThreadRefcountZero(CsrThread); - CsrAcquireProcessLock(); } } @@ -991,7 +991,7 @@ { /* Reference the found thread */ Status = STATUS_SUCCESS; - CurrentThread->ReferenceCount++; + CsrLockedReferenceThread(CurrentThread); *CsrThread = CurrentThread; } else

1 0

[hbelusca] 58074: [CSRSRV] Be sure to REALLY compare the Client ID (both Process and Thread handles).
by hbelusca＠svn.reactos.org 01 Jan '13

01 Jan '13

Author: hbelusca Date: Tue Jan 1 02:21:05 2013 New Revision: 58074 URL: http://svn.reactos.org/svn/reactos?rev=58074&view=rev Log: [CSRSRV] Be sure to REALLY compare the Client ID (both Process and Thread handles). Modified: branches/ros-csrss/subsystems/win32/csrsrv/thredsup.c Modified: branches/ros-csrss/subsystems/win32/csrsrv/thredsup.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… ============================================================================== --- branches/ros-csrss/subsystems/win32/csrsrv/thredsup.c [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win32/csrsrv/thredsup.c [iso-8859-1] Tue Jan 1 02:21:05 2013 @@ -205,8 +205,9 @@ NextEntry = NextEntry->Flink; /* Compare the CID */ - // FIXME: if (*(PULONGLONG)&FoundThread->ClientId == *(PULONGLONG)ClientId) - if (FoundThread->ClientId.UniqueThread == ClientId->UniqueThread) + // if (*(PULONGLONG)&FoundThread->ClientId == *(PULONGLONG)ClientId) + if ( FoundThread->ClientId.UniqueProcess == ClientId->UniqueProcess && + FoundThread->ClientId.UniqueThread == ClientId->UniqueThread ) { /* Match found, return the process */ *Process = FoundThread->Process;

1 0

[hbelusca] 58073: [CSRSRV] Do NOT confuse a handle and a pointer to a handle !! In this case we need a handle. Caught in the following situation : 1- Launch a process A which initializes a console ...
by hbelusca＠svn.reactos.org 01 Jan '13

01 Jan '13

Author: hbelusca Date: Tue Jan 1 02:12:19 2013 New Revision: 58073 URL: http://svn.reactos.org/svn/reactos?rev=58073&view=rev Log: [CSRSRV] Do NOT confuse a handle and a pointer to a handle !! In this case we need a handle. Caught in the following situation : 1- Launch a process A which initializes a console A (say, cmd.exe). 2- Launch a process B which also initializes a console B (for instance, in the first cmd.exe, do: start cmd.exe) 3- Click on the "Close" button (the "Cross" button in the right upper side) of the windows of the console A. 4- Notice that the console B closes but the process B remains alive, whereas the console A remains open but the process A is killed... (contrary to what you expected, closing the console A and the process A) (when clicking on the "Close" button, the Console Server launches a remote thread in the context of the target process, and it appeared in the described situation that it was the wrong process, because of bad parameter passing to the sub-function CsrLockProcessByClientId called when creating the remote thread). Modified: branches/ros-csrss/subsystems/win32/csrsrv/thredsup.c Modified: branches/ros-csrss/subsystems/win32/csrsrv/thredsup.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… ============================================================================== --- branches/ros-csrss/subsystems/win32/csrsrv/thredsup.c [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win32/csrsrv/thredsup.c [iso-8859-1] Tue Jan 1 02:12:19 2013 @@ -579,7 +579,7 @@ } /* Lock the Owner Process */ - Status = CsrLockProcessByClientId(&ClientId->UniqueProcess, &CsrProcess); + Status = CsrLockProcessByClientId(ClientId->UniqueProcess, &CsrProcess); if (!NT_SUCCESS(Status)) { DPRINT1("No known process for %lx\n", ClientId->UniqueProcess);

1 0

[ekohl] 58072: [USRMGR] - Enable the call to NetUserAdd. This enables us to create new user accounts. A lot of stuff is still missing, so don't be surprised if something unexpected happens. It will...
by ekohl＠svn.reactos.org 31 Dec '12

31 Dec '12

Author: ekohl Date: Mon Dec 31 22:04:05 2012 New Revision: 58072 URL: http://svn.reactos.org/svn/reactos?rev=58072&view=rev Log: [USRMGR] - Enable the call to NetUserAdd. This enables us to create new user accounts. A lot of stuff is still missing, so don't be surprised if something unexpected happens. It will be fixed soon. Happy new Year! Modified: trunk/reactos/dll/cpl/usrmgr/users.c Modified: trunk/reactos/dll/cpl/usrmgr/users.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/users.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/users.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/users.c [iso-8859-1] Mon Dec 31 22:04:05 2012 @@ -261,14 +261,10 @@ NewUserDlgProc, (LPARAM)&user) == IDOK) { -#if 0 status = NetUserAdd(NULL, 3, (LPBYTE)&user, NULL); -#else - status = NERR_Success; -#endif if (status != NERR_Success) { TCHAR szText[256]; @@ -434,11 +430,13 @@ lvi.iImage = (pBuffer[i].usri20_flags & UF_ACCOUNTDISABLE) ? 1 : 0; iItem = ListView_InsertItem(hwndListView, &lvi); - ListView_SetItemText(hwndListView, iItem, 1, - pBuffer[i].usri20_full_name); - - ListView_SetItemText(hwndListView, iItem, 2, - pBuffer[i].usri20_comment); + if (pBuffer[i].usri20_full_name != NULL) + ListView_SetItemText(hwndListView, iItem, 1, + pBuffer[i].usri20_full_name); + + if (pBuffer[i].usri20_comment != NULL) + ListView_SetItemText(hwndListView, iItem, 2, + pBuffer[i].usri20_comment); } NetApiBufferFree(pBuffer);

1 0

[ekohl] 58071: [NETAPI32] Implement parts of NetUserAdd.
by ekohl＠svn.reactos.org 31 Dec '12

31 Dec '12

Author: ekohl Date: Mon Dec 31 18:39:19 2012 New Revision: 58071 URL: http://svn.reactos.org/svn/reactos?rev=58071&view=rev Log: [NETAPI32] Implement parts of NetUserAdd. Modified: trunk/reactos/dll/win32/netapi32/user.c Modified: trunk/reactos/dll/win32/netapi32/user.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/user.c?… ============================================================================== --- trunk/reactos/dll/win32/netapi32/user.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/user.c [iso-8859-1] Mon Dec 31 18:39:19 2012 @@ -31,7 +31,7 @@ SAM_ENUMERATE_HANDLE EnumerationContext; PSAM_RID_ENUMERATION Buffer; - ULONG Returned; + ULONG Count; ULONG Index; BOOLEAN BuiltinDone; @@ -246,7 +246,7 @@ Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->AdminComment.Length + sizeof(WCHAR)); } - UserInfo1->usri1_flags = UserInfo->UserAccountControl; +// UserInfo1->usri1_flags = UserInfo->UserAccountControl; if (UserInfo->ScriptPath.Length > 0) { @@ -342,7 +342,7 @@ Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->AdminComment.Length + sizeof(WCHAR)); } - UserInfo20->usri20_flags = UserInfo->UserAccountControl; +// UserInfo20->usri20_flags = UserInfo->UserAccountControl; UserInfo20->usri20_user_id = RelativeId; break; @@ -396,6 +396,131 @@ SamFreeMemory(UserInfo->LogonHours.LogonHours); SamFreeMemory(UserInfo); +} + + +static +NET_API_STATUS +SetUserInfo(SAM_HANDLE UserHandle, + LPBYTE UserInfo, + DWORD Level) +{ + USER_ALL_INFORMATION UserAllInfo; + PUSER_INFO_1 UserInfo1; + PUSER_INFO_3 UserInfo3; + NET_API_STATUS ApiStatus = NERR_Success; + NTSTATUS Status = STATUS_SUCCESS; + + ZeroMemory(&UserAllInfo, sizeof(USER_ALL_INFORMATION)); + + switch (Level) + { + case 1: + UserInfo1 = (PUSER_INFO_1)UserInfo; +// RtlInitUnicodeString(&UserAllInfo.UserName, +// UserInfo1->usri1_name); + + RtlInitUnicodeString(&UserAllInfo.AdminComment, + UserInfo1->usri1_comment); + + RtlInitUnicodeString(&UserAllInfo.HomeDirectory, + UserInfo1->usri1_home_dir); + + RtlInitUnicodeString(&UserAllInfo.ScriptPath, + UserInfo1->usri1_script_path); + + RtlInitUnicodeString(&UserAllInfo.NtPassword, + UserInfo1->usri1_password); + UserAllInfo.NtPasswordPresent = TRUE; + +// UserInfo1->usri1_flags +// UserInfo1->usri1_priv + + UserAllInfo.WhichFields = + USER_ALL_ADMINCOMMENT | + USER_ALL_HOMEDIRECTORY | + USER_ALL_SCRIPTPATH | + USER_ALL_NTPASSWORDPRESENT +// USER_ALL_USERACCOUNTCONTROL + ; + break; + + + case 3: + UserInfo3 = (PUSER_INFO_3)UserInfo; + +// LPWSTR usri3_name; + + RtlInitUnicodeString(&UserAllInfo.NtPassword, + UserInfo3->usri3_password); + UserAllInfo.NtPasswordPresent = TRUE; + +// DWORD usri3_password_age; // ignored +// DWORD usri3_priv; + + RtlInitUnicodeString(&UserAllInfo.HomeDirectory, + UserInfo3->usri3_home_dir); + + RtlInitUnicodeString(&UserAllInfo.AdminComment, + UserInfo3->usri3_comment); + +// DWORD usri3_flags; + + RtlInitUnicodeString(&UserAllInfo.ScriptPath, + UserInfo3->usri3_script_path); + +// DWORD usri3_auth_flags; + + RtlInitUnicodeString(&UserAllInfo.FullName, + UserInfo3->usri3_full_name); + +// LPWSTR usri3_usr_comment; +// LPWSTR usri3_parms; +// LPWSTR usri3_workstations; +// DWORD usri3_last_logon; +// DWORD usri3_last_logoff; +// DWORD usri3_acct_expires; +// DWORD usri3_max_storage; +// DWORD usri3_units_per_week; +// PBYTE usri3_logon_hours; +// DWORD usri3_bad_pw_count; +// DWORD usri3_num_logons; +// LPWSTR usri3_logon_server; +// DWORD usri3_country_code; +// DWORD usri3_code_page; +// DWORD usri3_user_id; // ignored +// DWORD usri3_primary_group_id; +// LPWSTR usri3_profile; +// LPWSTR usri3_home_dir_drive; +// DWORD usri3_password_expired; + + UserAllInfo.WhichFields = + USER_ALL_NTPASSWORDPRESENT | + USER_ALL_HOMEDIRECTORY | + USER_ALL_ADMINCOMMENT | + USER_ALL_SCRIPTPATH | + USER_ALL_FULLNAME +// USER_ALL_USERACCOUNTCONTROL + ; + break; + + default: + ERR("Unsupported level %lu!\n", Level); + return ERROR_INVALID_PARAMETER; + } + + Status = SamSetInformationUser(UserHandle, + UserAllInformation, + &UserAllInfo); + if (!NT_SUCCESS(Status)) + { + ERR("SamSetInformationUser failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + +done: + return ApiStatus; } @@ -409,72 +534,89 @@ LPBYTE bufptr, LPDWORD parm_err) { - NET_API_STATUS status; - struct sam_user * su = NULL; - - FIXME("(%s, %d, %p, %p) stub!\n", debugstr_w(servername), level, bufptr, parm_err); - - if((status = NETAPI_ValidateServername(servername)) != NERR_Success) - return status; - - switch(level) - { - /* Level 3 and 4 are identical for the purposes of NetUserAdd */ - case 4: - case 3: - FIXME("Level 3 and 4 not implemented.\n"); - /* Fall through */ - case 2: - FIXME("Level 2 not implemented.\n"); - /* Fall through */ - case 1: - { - PUSER_INFO_1 ui = (PUSER_INFO_1) bufptr; - su = HeapAlloc(GetProcessHeap(), 0, sizeof(struct sam_user)); - if(!su) - { - status = NERR_InternalError; - break; - } - - if(lstrlenW(ui->usri1_name) > LM20_UNLEN) - { - status = NERR_BadUsername; - break; - } - - /*FIXME: do other checks for a valid username */ - lstrcpyW(su->user_name, ui->usri1_name); - - if(lstrlenW(ui->usri1_password) > PWLEN) - { - /* Always return PasswordTooShort on invalid passwords. */ - status = NERR_PasswordTooShort; - break; - } - lstrcpyW(su->user_password, ui->usri1_password); - - su->sec_since_passwd_change = ui->usri1_password_age; - su->user_priv = ui->usri1_priv; - su->user_flags = ui->usri1_flags; - - /*FIXME: set the other LPWSTRs to NULL for now */ - su->home_dir = NULL; - su->user_comment = NULL; - su->user_logon_script_path = NULL; - - list_add_head(&user_list, &su->entry); - return NERR_Success; - } - default: - TRACE("Invalid level %d specified.\n", level); - status = ERROR_INVALID_LEVEL; - break; - } - - HeapFree(GetProcessHeap(), 0, su); - - return status; + UNICODE_STRING ServerName; + UNICODE_STRING UserName; + SAM_HANDLE ServerHandle = NULL; + SAM_HANDLE DomainHandle = NULL; + SAM_HANDLE UserHandle = NULL; + ULONG GrantedAccess; + ULONG RelativeId; + NET_API_STATUS ApiStatus = NERR_Success; + NTSTATUS Status = STATUS_SUCCESS; + + FIXME("(%s, %d, %p, %p)\n", debugstr_w(servername), level, bufptr, parm_err); + + /* Check the info level */ + if (level < 1 || level > 4) + return ERROR_INVALID_LEVEL; + + if (servername != NULL) + RtlInitUnicodeString(&ServerName, servername); + + /* Connect to the SAM Server */ + Status = SamConnect((servername != NULL) ? &ServerName : NULL, + &ServerHandle, + SAM_SERVER_CONNECT | SAM_SERVER_LOOKUP_DOMAIN, + NULL); + if (!NT_SUCCESS(Status)) + { + ERR("SamConnect failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + /* Open the Account Domain */ + Status = OpenAccountDomain(ServerHandle, + (servername != NULL) ? &ServerName : NULL, + DOMAIN_CREATE_USER | DOMAIN_LOOKUP, + &DomainHandle); + if (!NT_SUCCESS(Status)) + { + ERR("OpenAccountDomain failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + /* Initialize the user name string */ + RtlInitUnicodeString(&UserName, + ((PUSER_INFO_1)bufptr)->usri1_name); + + /* Create the user account */ + Status = SamCreateUser2InDomain(DomainHandle, + &UserName, + USER_NORMAL_ACCOUNT, + USER_ALL_ACCESS | DELETE | WRITE_DAC, + &UserHandle, + &GrantedAccess, + &RelativeId); + if (!NT_SUCCESS(Status)) + { + ERR("SamCreateUser2InDomain failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + /* Set user information */ + ApiStatus = SetUserInfo(UserHandle, + bufptr, + level); + if (ApiStatus != NERR_Success) + { + ERR("SetUserInfo failed (Status %lu)\n", ApiStatus); + goto done; + } + +done: + if (UserHandle != NULL) + SamCloseHandle(UserHandle); + + if (DomainHandle != NULL) + SamCloseHandle(DomainHandle); + + if (ServerHandle != NULL) + SamCloseHandle(ServerHandle); + + return ApiStatus; } @@ -599,7 +741,7 @@ EnumContext->EnumerationContext = 0; EnumContext->Buffer = NULL; - EnumContext->Returned = 0; + EnumContext->Count = 0; EnumContext->Index = 0; EnumContext->BuiltinDone = FALSE; @@ -639,9 +781,9 @@ // while (TRUE) // { TRACE("EnumContext->Index: %lu\n", EnumContext->Index); - TRACE("EnumContext->Returned: %lu\n", EnumContext->Returned); - - if (EnumContext->Index >= EnumContext->Returned) + TRACE("EnumContext->Count: %lu\n", EnumContext->Count); + + if (EnumContext->Index >= EnumContext->Count) { // if (EnumContext->BuiltinDone == TRUE) // { @@ -655,7 +797,7 @@ 0, (PVOID *)&EnumContext->Buffer, prefmaxlen, - &EnumContext->Returned); + &EnumContext->Count); TRACE("SamEnumerateUsersInDomain returned (Status %08lx)\n", Status); if (!NT_SUCCESS(Status)) @@ -677,7 +819,7 @@ } TRACE("EnumContext: %lu\n", EnumContext); - TRACE("EnumContext->Returned: %lu\n", EnumContext->Returned); + TRACE("EnumContext->Count: %lu\n", EnumContext->Count); TRACE("EnumContext->Buffer: %p\n", EnumContext->Buffer); /* Get a pointer to the current user */ @@ -731,11 +873,11 @@ // } done: - if (ApiStatus == NERR_Success && EnumContext->Index < EnumContext->Returned) + if (ApiStatus == NERR_Success && EnumContext->Index < EnumContext->Count) ApiStatus = ERROR_MORE_DATA; if (EnumContext != NULL) - *totalentries = EnumContext->Returned; + *totalentries = EnumContext->Count; if (resume_handle == NULL || ApiStatus != ERROR_MORE_DATA) { @@ -752,7 +894,7 @@ if (EnumContext->Buffer != NULL) { - for (i = 0; i < EnumContext->Returned; i++) + for (i = 0; i < EnumContext->Count; i++) { SamFreeMemory(EnumContext->Buffer[i].Name.Buffer); }

1 0

[ekohl] 58070: [SAMSRV] Implement SamrSetInformationUser2.
by ekohl＠svn.reactos.org 31 Dec '12

31 Dec '12

Author: ekohl Date: Mon Dec 31 17:59:19 2012 New Revision: 58070 URL: http://svn.reactos.org/svn/reactos?rev=58070&view=rev Log: [SAMSRV] Implement SamrSetInformationUser2. Modified: trunk/reactos/dll/win32/samsrv/samrpc.c Modified: trunk/reactos/dll/win32/samsrv/samrpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samrpc.c?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] Mon Dec 31 17:59:19 2012 @@ -6915,6 +6915,7 @@ return STATUS_NOT_IMPLEMENTED; } + /* Function 58 */ NTSTATUS NTAPI @@ -6922,9 +6923,13 @@ IN USER_INFORMATION_CLASS UserInformationClass, IN PSAMPR_USER_INFO_BUFFER Buffer) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} + TRACE("(%p %lu %p)\n", UserHandle, UserInformationClass, Buffer); + + return SamrSetInformationUser(UserHandle, + UserInformationClass, + Buffer); +} + /* Function 59 */ NTSTATUS

1 0

[tfaber] 58069: [REGEDIT] - Fix a handle leak. Patch by Edijs Kolesnikovičs. CORE-6853 #resolve
by tfaber＠svn.reactos.org 31 Dec '12

31 Dec '12

Author: tfaber Date: Mon Dec 31 17:10:15 2012 New Revision: 58069 URL: http://svn.reactos.org/svn/reactos?rev=58069&view=rev Log: [REGEDIT] - Fix a handle leak. Patch by Edijs Kolesnikovičs. CORE-6853 #resolve Modified: trunk/reactos/base/applications/regedit/settings.c Modified: trunk/reactos/base/applications/regedit/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/settings.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/settings.c [iso-8859-1] Mon Dec 31 17:10:15 2012 @@ -116,49 +116,45 @@ if (RegCreateKeyW(HKEY_CURRENT_USER, g_szGeneralRegKey, &hKey) == ERROR_SUCCESS) { - if (RegOpenKeyW(HKEY_CURRENT_USER, g_szGeneralRegKey, &hKey) == ERROR_SUCCESS) + RegistryBinaryConfig tConfig; + DWORD iBufferSize = sizeof(tConfig); + WCHAR szBuffer[MAX_PATH]; + LPCWSTR keyPath, rootName; + HKEY hRootKey; + + /* Save key position */ + keyPath = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hRootKey); + if (keyPath) { - RegistryBinaryConfig tConfig; - DWORD iBufferSize = sizeof(tConfig); - WCHAR szBuffer[MAX_PATH]; - LPCWSTR keyPath, rootName; - HKEY hRootKey; + rootName = get_root_key_name(hRootKey); - /* Save key position */ - keyPath = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hRootKey); - if (keyPath) - { - rootName = get_root_key_name(hRootKey); + /* Load "My Computer" string and complete it */ + LoadStringW(hInst, IDS_MY_COMPUTER, szBuffer, COUNT_OF(szBuffer)); + wcscat(szBuffer, L"\\"); wcscat(szBuffer, rootName); + wcscat(szBuffer, L"\\"); wcscat(szBuffer, keyPath); - /* Load "My Computer" string and complete it */ - LoadStringW(hInst, IDS_MY_COMPUTER, szBuffer, COUNT_OF(szBuffer)); - wcscat(szBuffer, L"\\"); wcscat(szBuffer, rootName); - wcscat(szBuffer, L"\\"); wcscat(szBuffer, keyPath); + RegSetValueExW(hKey, L"LastKey", 0, REG_SZ, (LPBYTE)szBuffer, (DWORD)wcslen(szBuffer) * sizeof(WCHAR)); + } - RegSetValueExW(hKey, L"LastKey", 0, REG_SZ, (LPBYTE)szBuffer, (DWORD)wcslen(szBuffer) * sizeof(WCHAR)); - } + /* Get statusbar settings */ + tConfig.StatusBarVisible = ((GetMenuState(GetSubMenu(hMenuFrame, ID_VIEW_MENU), ID_VIEW_STATUSBAR, MF_BYCOMMAND) & MF_CHECKED) ? 1 : 0); - /* Get statusbar settings */ - tConfig.StatusBarVisible = ((GetMenuState(GetSubMenu(hMenuFrame, ID_VIEW_MENU), ID_VIEW_STATUSBAR, MF_BYCOMMAND) & MF_CHECKED) ? 1 : 0); + /* Get splitter position */ + tConfig.TreeViewSize = g_pChildWnd->nSplitPos; - /* Get splitter position */ - tConfig.TreeViewSize = g_pChildWnd->nSplitPos; + /* Get list view column width*/ + tConfig.NameColumnSize = ListView_GetColumnWidth(g_pChildWnd->hListWnd, 0); + tConfig.TypeColumnSize = ListView_GetColumnWidth(g_pChildWnd->hListWnd, 1); + tConfig.DataColumnSize = ListView_GetColumnWidth(g_pChildWnd->hListWnd, 2); - /* Get list view column width*/ - tConfig.NameColumnSize = ListView_GetColumnWidth(g_pChildWnd->hListWnd, 0); - tConfig.TypeColumnSize = ListView_GetColumnWidth(g_pChildWnd->hListWnd, 1); - tConfig.DataColumnSize = ListView_GetColumnWidth(g_pChildWnd->hListWnd, 2); + /* Get program window settings */ + tConfig.tPlacement.length = sizeof(WINDOWPLACEMENT); + GetWindowPlacement(hFrameWnd , &tConfig.tPlacement); - /* Get program window settings */ - tConfig.tPlacement.length = sizeof(WINDOWPLACEMENT); - GetWindowPlacement(hFrameWnd , &tConfig.tPlacement); + /* Save all the data */ + RegSetValueExW(hKey, L"View", 0, REG_BINARY, (LPBYTE)&tConfig, iBufferSize); - /* Save all the data */ - RegSetValueExW(hKey, L"View", 0, REG_BINARY, (LPBYTE)&tConfig, iBufferSize); - - RegCloseKey(hKey); - } + RegCloseKey(hKey); } } - /* EOF */

1 0

[ekohl] 58068: [SAMLIB] Implement SamShutdownSamServer.
by ekohl＠svn.reactos.org 31 Dec '12

31 Dec '12

Author: ekohl Date: Mon Dec 31 14:56:11 2012 New Revision: 58068 URL: http://svn.reactos.org/svn/reactos?rev=58068&view=rev Log: [SAMLIB] Implement SamShutdownSamServer. Modified: trunk/reactos/dll/win32/samlib/samlib.c Modified: trunk/reactos/dll/win32/samlib/samlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samlib/samlib.c?… ============================================================================== --- trunk/reactos/dll/win32/samlib/samlib.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samlib/samlib.c [iso-8859-1] Mon Dec 31 14:56:11 2012 @@ -1659,8 +1659,21 @@ NTAPI SamShutdownSamServer(IN SAM_HANDLE ServerHandle) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + NTSTATUS Status; + + TRACE("(%p)\n", ServerHandle); + + RpcTryExcept + { + Status = SamrShutdownSamServer((SAMPR_HANDLE)ServerHandle); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; } /* EOF */

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