Ros-diffs June 2010

ros-diffs@reactos.org

24 participants
407 discussions

[cgutman] 47642: [NDIS] - Hold the miniport lock when we work with the timer queue - Use the return value of KeSetTimer(Ex) to determine whether we need to queue the timer in our queue, otherwise we just use the entry that is already there - Add more assertions

by cgutman＠svn.reactos.org

Author: cgutman Date: Mon Jun 7 00:08:40 2010 New Revision: 47642 URL: http://svn.reactos.org/svn/reactos?rev=47642&view=rev Log: [NDIS] - Hold the miniport lock when we work with the timer queue - Use the return value of KeSetTimer(Ex) to determine whether we need to queue the timer in our queue, otherwise we just use the entry that is already there - Add more assertions Modified: trunk/reactos/drivers/network/ndis/ndis/time.c Modified: trunk/reactos/drivers/network/ndis/ndis/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/time.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/time.c [iso-8859-1] Mon Jun 7 00:08:40 2010 @@ -98,6 +98,8 @@ BOOLEAN DequeueMiniportTimer(PNDIS_MINIPORT_TIMER Timer) { PNDIS_MINIPORT_TIMER CurrentTimer; + + ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); if (!Timer->Miniport->TimerQueue) return FALSE; @@ -143,13 +145,21 @@ * - call at IRQL <= DISPATCH_LEVEL */ { + KIRQL OldIrql; + ASSERT_IRQL(DISPATCH_LEVEL); ASSERT(TimerCancelled); ASSERT(Timer); *TimerCancelled = KeCancelTimer (&Timer->Timer); - DequeueMiniportTimer(Timer); + if (*TimerCancelled) + { + KeAcquireSpinLock(&Timer->Miniport->Lock, &OldIrql); + /* If it's somebody already dequeued it, something is wrong (maybe a double-cancel?) */ + if (!DequeueMiniportTimer(Timer)) ASSERT(FALSE); + KeReleaseSpinLock(&Timer->Miniport->Lock, OldIrql); + } } VOID NTAPI @@ -166,7 +176,13 @@ SystemArgument2); /* Only dequeue if the timer has a period of 0 */ - if (!Timer->Timer.Period) DequeueMiniportTimer(Timer); + if (!Timer->Timer.Period) + { + KeAcquireSpinLockAtDpcLevel(&Timer->Miniport->Lock); + /* If someone already dequeued it, something is wrong (borked timer implementation?) */ + if (!DequeueMiniportTimer(Timer)) ASSERT(FALSE); + KeReleaseSpinLockFromDpcLevel(&Timer->Miniport->Lock); + } } @@ -224,6 +240,7 @@ */ { LARGE_INTEGER Timeout; + KIRQL OldIrql; ASSERT_IRQL(DISPATCH_LEVEL); ASSERT(Timer); @@ -231,14 +248,15 @@ /* relative delays are negative, absolute are positive; resolution is 100ns */ Timeout.QuadPart = Int32x32To64(MillisecondsPeriod, -10000); - /* Dequeue the timer if it is queued already */ - DequeueMiniportTimer(Timer); - - /* Add the timer at the head of the timer queue */ - Timer->NextDeferredTimer = Timer->Miniport->TimerQueue; - Timer->Miniport->TimerQueue = Timer; - - KeSetTimerEx (&Timer->Timer, Timeout, MillisecondsPeriod, &Timer->Dpc); + KeAcquireSpinLock(&Timer->Miniport->Lock, &OldIrql); + /* If KeSetTimer(Ex) returns FALSE then the timer is not in the system's queue (and not in ours either) */ + if (!KeSetTimerEx(&Timer->Timer, Timeout, MillisecondsPeriod, &Timer->Dpc)) + { + /* Add the timer at the head of the timer queue */ + Timer->NextDeferredTimer = Timer->Miniport->TimerQueue; + Timer->Miniport->TimerQueue = Timer; + } + KeReleaseSpinLock(&Timer->Miniport->Lock, OldIrql); } @@ -262,6 +280,7 @@ */ { LARGE_INTEGER Timeout; + KIRQL OldIrql; ASSERT_IRQL(DISPATCH_LEVEL); ASSERT(Timer); @@ -269,14 +288,15 @@ /* relative delays are negative, absolute are positive; resolution is 100ns */ Timeout.QuadPart = Int32x32To64(MillisecondsToDelay, -10000); - /* Dequeue the timer if it is queued already */ - DequeueMiniportTimer(Timer); - - /* Add the timer at the head of the timer queue */ - Timer->NextDeferredTimer = Timer->Miniport->TimerQueue; - Timer->Miniport->TimerQueue = Timer; - - KeSetTimer (&Timer->Timer, Timeout, &Timer->Dpc); + KeAcquireSpinLock(&Timer->Miniport->Lock, &OldIrql); + /* If KeSetTimer(Ex) returns FALSE then the timer is not in the system's queue (and not in ours either) */ + if (!KeSetTimer(&Timer->Timer, Timeout, &Timer->Dpc)) + { + /* Add the timer at the head of the timer queue */ + Timer->NextDeferredTimer = Timer->Miniport->TimerQueue; + Timer->Miniport->TimerQueue = Timer; + } + KeReleaseSpinLock(&Timer->Miniport->Lock, OldIrql); }

14 years, 6 months

[tkreuzer] 47641: [WIN32K] Rewrite the bitmap API. There were a lot of bugs. NtGdiCreateBitmap allowed a negative height, leading to either topdown or bottomup bitmaps, a behaviour that Windows doesn't have. The function copied the bitmap bits directly from the caller to the bitmap using RtlCopyMemory, ignoring different scanline length and direction (resulting in bitmaps being upside down), not SEH protected. This function (IntSetBitmapBits) is replaced by a better solution UnsafeSetBitmapBits,

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Jun 7 00:01:41 2010 New Revision: 47641 URL: http://svn.reactos.org/svn/reactos?rev=47641&view=rev Log: [WIN32K] Rewrite the bitmap API. There were a lot of bugs. NtGdiCreateBitmap allowed a negative height, leading to either topdown or bottomup bitmaps, a behaviour that Windows doesn't have. The function copied the bitmap bits directly from the caller to the bitmap using RtlCopyMemory, ignoring different scanline length and direction (resulting in bitmaps being upside down), not SEH protected. This function (IntSetBitmapBits) is replaced by a better solution UnsafeSetBitmapBits, that takes these things into account. The name is chosen to give a hint that the function can/should be SEH protected. IntSetBitmapBits is still there, as its retarded behaviour is actually required in some places. There were also IntCreateBitmap and IntGdiCreateBitmap, now both being replaced by GreCreateBitmap. The code that set the palette is removed, as it's already done in SURFACE_AllocSurface, here gpalRGB is replaced with gpalBGR, fixing some inverted color issues. The alignment correction in SURFACE_bSetBitmapBits is reapplied, now that the callers are behaving as they are supposed to do. Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/surface.c branches/reactos-yarotows/subsystems/win32/win32k/include/bitmaps.h branches/reactos-yarotows/subsystems/win32/win32k/include/surface.h branches/reactos-yarotows/subsystems/win32/win32k/objects/bitmaps.c branches/reactos-yarotows/subsystems/win32/win32k/objects/brush.c branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c branches/reactos-yarotows/subsystems/win32/win32k/objects/pen.c branches/reactos-yarotows/subsystems/win32/win32k/objects/stockobj.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/surface.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/eng/surface.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/eng/surface.c [iso-8859-1] Mon Jun 7 00:01:41 2010 @@ -171,8 +171,8 @@ break; case 24: case 32: - psurfBmp->ppal = &gpalRGB; - GDIOBJ_IncrementShareCount((POBJ)&gpalRGB); + psurfBmp->ppal = &gpalBGR; + GDIOBJ_IncrementShareCount(&gpalBGR.BaseObject); break; default: DPRINT1("Could not determine palette for bit depth %u.\n", cBitsPixel); @@ -233,7 +233,7 @@ if (ulWidth) { /* Align the width (Windows compatibility) */ - //ulWidth = ((((ulWidth << 3) / cBitsPixel) * cBitsPixel + 31) & ~31) >> 3; + ulWidth = ((((ulWidth << 3) / cBitsPixel) * cBitsPixel + 31) & ~31) >> 3; } else { @@ -544,68 +544,4 @@ } } -HBITMAP -FASTCALL -IntCreateBitmap( - IN SIZEL Size, - IN LONG Width, - IN ULONG Format, - IN ULONG Flags, - IN PVOID Bits) -{ - HBITMAP hbmp; - SURFOBJ *pso; - PSURFACE psurf; - PVOID UncompressedBits; - ULONG UncompressedFormat; - - if (Format == 0) - return 0; - - /* Allocate a surface */ - psurf = SURFACE_AllocSurface(STYPE_BITMAP, Size.cx, Size.cy, Format); - if (!psurf) - { - DPRINT1("SURFACE_AllocSurface failed.\n"); - return NULL; - } - - /* Get the handle for the bitmap and the surfobj */ - hbmp = (HBITMAP)psurf->SurfObj.hsurf; - pso = &psurf->SurfObj; - - if (Format == BMF_4RLE) - { - UncompressedFormat = BMF_4BPP; - UncompressedBits = EngAllocMem(FL_ZERO_MEMORY, pso->cjBits, TAG_DIB); - Decompress4bpp(Size, (BYTE *)Bits, (BYTE *)UncompressedBits, pso->lDelta); - Flags |= BMF_RLE_HACK; - } - else if (Format == BMF_8RLE) - { - UncompressedFormat = BMF_8BPP; - UncompressedBits = EngAllocMem(FL_ZERO_MEMORY, pso->cjBits, TAG_DIB); - Decompress8bpp(Size, (BYTE *)Bits, (BYTE *)UncompressedBits, pso->lDelta); - Flags |= BMF_RLE_HACK; - } - else - { - UncompressedBits = Bits; - UncompressedFormat = Format; - } - - /* Set the bitmap bits */ - if (!SURFACE_bSetBitmapBits(psurf, Flags, Width, UncompressedBits)) - { - /* Bail out if that failed */ - DPRINT1("SURFACE_bSetBitmapBits failed.\n"); - SURFACE_FreeSurfaceByHandle(hbmp); - return NULL; - } - - /* Unlock the surface and return */ - SURFACE_UnlockSurface(psurf); - return hbmp; -} - /* EOF */ Modified: branches/reactos-yarotows/subsystems/win32/win32k/include/bitmaps.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/include/bitmaps.h [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/include/bitmaps.h [iso-8859-1] Mon Jun 7 00:01:41 2010 @@ -10,3 +10,13 @@ HBITMAP FASTCALL BITMAP_CopyBitmap (HBITMAP hBitmap); UINT FASTCALL BITMAP_GetRealBitsPixel(UINT nBitsPixel); INT FASTCALL BITMAP_GetWidthBytes (INT bmWidth, INT bpp); + + +HBITMAP +APIENTRY +GreCreateBitmap( + IN INT nWidth, + IN INT nHeight, + IN UINT cPlanes, + IN UINT cBitsPixel, + IN OPTIONAL PVOID pvBits); Modified: branches/reactos-yarotows/subsystems/win32/win32k/include/surface.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/include/surface.h [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/include/surface.h [iso-8859-1] Mon Jun 7 00:01:41 2010 @@ -116,6 +116,14 @@ IN ULONG cy, IN ULONG iFormat); +BOOL +NTAPI +SURFACE_bSetBitmapBits( + IN PSURFACE psurf, + IN USHORT fjBitmap, + IN ULONG ulWidth, + IN PVOID pvBits OPTIONAL); + #define GDIDEV(SurfObj) ((PDEVOBJ *)((SurfObj)->hdev)) #define GDIDEVFUNCS(SurfObj) ((PDEVOBJ *)((SurfObj)->hdev))->DriverFunctions Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] Mon Jun 7 00:01:41 2010 @@ -22,141 +22,206 @@ #define NDEBUG #include <debug.h> -HBITMAP APIENTRY -IntGdiCreateBitmap( - INT Width, - INT Height, - UINT Planes, - UINT BitsPixel, - IN OPTIONAL LPBYTE pBits) -{ - HBITMAP hBitmap; - SIZEL Size; - LONG WidthBytes; - PSURFACE psurfBmp; +LONG APIENTRY +IntSetBitmapBits( + PSURFACE psurf, + DWORD Bytes, + IN PBYTE Bits) +{ + /* Don't copy more bytes than the buffer has */ + Bytes = min(Bytes, psurf->SurfObj.cjBits); + + RtlCopyMemory(psurf->SurfObj.pvBits, Bits, Bytes); + + return Bytes; +} + +void +NTAPI +UnsafeSetBitmapBits( + PSURFACE psurf, + IN ULONG cjBits, + IN PVOID pvBits) +{ + PUCHAR pjDst, pjSrc; + LONG lDeltaDst, lDeltaSrc; + ULONG nWidth, nHeight, cBitsPixel; + + nWidth = psurf->SurfObj.sizlBitmap.cx; + nHeight = psurf->SurfObj.sizlBitmap.cy; + cBitsPixel = BitsPerFormat(psurf->SurfObj.iBitmapFormat); + + /* Get pointers */ + pjDst = psurf->SurfObj.pvScan0; + pjSrc = pvBits; + lDeltaDst = psurf->SurfObj.lDelta; + lDeltaSrc = BITMAP_GetWidthBytes(nWidth, cBitsPixel); + + while (nHeight--) + { + /* Copy one line */ + memcpy(pjDst, pjSrc, lDeltaSrc); + pjSrc += lDeltaSrc; + pjDst += lDeltaDst; + } + +} + +HBITMAP +APIENTRY +GreCreateBitmap( + IN INT nWidth, + IN INT nHeight, + IN UINT cPlanes, + IN UINT cBitsPixel, + IN OPTIONAL PVOID pvBits) +{ + PSURFACE psurf; + SURFOBJ *pso; + HBITMAP hbmp; + PVOID pvCompressedBits; + SIZEL sizl; + FLONG fl = 0; + ULONG iFormat; + + /* Calculate bitmap format */ + iFormat = BitmapFormat(cBitsPixel * cPlanes, BI_RGB); + + /* Verify format */ + if (iFormat < BMF_1BPP || iFormat > BMF_PNG) return NULL; + + /* Allocate a surface */ + psurf = SURFACE_AllocSurface(STYPE_BITMAP, nWidth, nHeight, iFormat); + if (!psurf) + { + DPRINT1("SURFACE_AllocSurface failed.\n"); + return NULL; + } + + /* Get the handle for the bitmap and the surfobj */ + hbmp = (HBITMAP)psurf->SurfObj.hsurf; + pso = &psurf->SurfObj; + + /* The infamous RLE hack */ + if (iFormat == BMF_4RLE) + { + sizl.cx = nWidth; sizl.cy = nHeight; + pvCompressedBits = pvBits; + pvBits = EngAllocMem(FL_ZERO_MEMORY, pso->cjBits, TAG_DIB); + Decompress4bpp(sizl, pvCompressedBits, pvBits, pso->lDelta); + fl |= BMF_RLE_HACK; + } + else if (iFormat == BMF_8RLE) + { + sizl.cx = nWidth; sizl.cy = nHeight; + pvCompressedBits = pvBits; + pvBits = EngAllocMem(FL_ZERO_MEMORY, pso->cjBits, TAG_DIB); + Decompress8bpp(sizl, pvCompressedBits, pvBits, pso->lDelta); + fl |= BMF_RLE_HACK; + } + + /* Set the bitmap bits */ + if (!SURFACE_bSetBitmapBits(psurf, fl, 0, pvBits)) + { + /* Bail out if that failed */ + DPRINT1("SURFACE_bSetBitmapBits failed.\n"); + SURFACE_FreeSurfaceByHandle(hbmp); + return NULL; + } + + /* Mark as API bitmap */ + psurf->flags |= API_BITMAP; + + /* Unlock the surface and return */ + SURFACE_UnlockSurface(psurf); + return hbmp; +} + +HBITMAP +APIENTRY +NtGdiCreateBitmap( + IN INT nWidth, + IN INT nHeight, + IN UINT cPlanes, + IN UINT cBitsPixel, + IN OPTIONAL LPBYTE pUnsafeBits) +{ + PSURFACE psurf; + SURFOBJ *pso; + HBITMAP hbmp; + FLONG fl = 0; + ULONG cjWidthBytes, iFormat; /* NOTE: Windows also doesn't store nr. of planes separately! */ - BitsPixel = BITMAP_GetRealBitsPixel(BitsPixel * Planes); + cBitsPixel = BITMAP_GetRealBitsPixel(cBitsPixel * cPlanes); + + /* Calculate bitmap format */ + iFormat = BitmapFormat(cBitsPixel, BI_RGB); /* Check parameters */ - if (BitsPixel == 0 || Width <= 0 || Width >= 0x8000000 || Height == 0) + if (iFormat == 0 || nWidth <= 0 || nWidth >= 0x8000000 || nHeight <= 0) { DPRINT1("Width = %d, Height = %d BitsPixel = %d\n", - Width, Height, BitsPixel); - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return 0; - } - - WidthBytes = BITMAP_GetWidthBytes(Width, BitsPixel); - - Size.cx = Width; - Size.cy = abs(Height); + nWidth, nHeight, cBitsPixel); + EngSetLastError(ERROR_INVALID_PARAMETER); + return NULL; + } /* Make sure that cjBits will not overflow */ - if ((ULONGLONG)WidthBytes * Size.cy >= 0x100000000ULL) + cjWidthBytes = DIB_GetDIBWidthBytes(nWidth, cBitsPixel); + if ((ULONGLONG)cjWidthBytes * nHeight >= 0x100000000ULL) { DPRINT1("Width = %d, Height = %d BitsPixel = %d\n", - Width, Height, BitsPixel); - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return 0; - } - - /* Create the bitmap object. */ - hBitmap = IntCreateBitmap(Size, WidthBytes, - BitmapFormat(BitsPixel, BI_RGB), - (Height < 0 ? BMF_TOPDOWN : 0) | - (NULL == pBits ? 0 : BMF_NOZEROINIT), NULL); - if (!hBitmap) - { - DPRINT("IntGdiCreateBitmap: returned 0\n"); - return 0; - } - - psurfBmp = SURFACE_LockSurface(hBitmap); - if (psurfBmp == NULL) - { - GreDeleteObject(hBitmap); + nWidth, nHeight, cBitsPixel); + EngSetLastError(ERROR_INVALID_PARAMETER); return NULL; } - psurfBmp->flags = API_BITMAP; - psurfBmp->hdc = NULL; // Fixme - - if (NULL != pBits) - { - IntSetBitmapBits(psurfBmp, psurfBmp->SurfObj.cjBits, pBits); - } - - /* Find a suitable palette for this bitmap - * Increment internal objects share count - * so we can call PALETTE_ShareUnlockPalette - * or GDIOBJ_IncrementShareCount safely */ - switch(BitsPixel) - { - case 1: - psurfBmp->ppal = &gpalMono; - GDIOBJ_IncrementShareCount((POBJ)&gpalMono); - break; - case 4: - case 8: - psurfBmp->ppal = PALETTE_ShareLockPalette(StockObjects[DEFAULT_PALETTE]); - break; - case 15: - psurfBmp->ppal = &gpalRGB555; - GDIOBJ_IncrementShareCount((POBJ)&gpalRGB555); - break; - case 16: - psurfBmp->ppal = &gpalRGB565; - GDIOBJ_IncrementShareCount((POBJ)&gpalRGB565); - break; - case 24: - case 32: - psurfBmp->ppal = &gpalRGB; - GDIOBJ_IncrementShareCount((POBJ)&gpalRGB); - break; - default: - DPRINT1("Could not determine palette for bit depth %u.\n", BitsPixel); - break; - } - - SURFACE_UnlockSurface(psurfBmp); - - DPRINT("IntGdiCreateBitmap : %dx%d, %d BPP colors, topdown %d, returning %08x\n", - Size.cx, Size.cy, BitsPixel, (Height < 0 ? 1 : 0), hBitmap); - - return hBitmap; -} - - -HBITMAP APIENTRY -NtGdiCreateBitmap( - INT Width, - INT Height, - UINT Planes, - UINT BitsPixel, - IN OPTIONAL LPBYTE pUnsafeBits) -{ + /* Allocate a surface */ + psurf = SURFACE_AllocSurface(STYPE_BITMAP, nWidth, nHeight, iFormat); + if (!psurf) + { + DPRINT1("SURFACE_AllocSurface failed.\n"); + EngSetLastError(ERROR_OUTOFMEMORY); + return NULL; + } + + /* Get the handle for the bitmap and the surfobj */ + hbmp = (HBITMAP)psurf->SurfObj.hsurf; + pso = &psurf->SurfObj; + + /* Allocate the bitmap bits */ + if (!SURFACE_bSetBitmapBits(psurf, fl, 0, NULL)) + { + /* Bail out if that failed */ + DPRINT1("SURFACE_bSetBitmapBits failed.\n"); + SURFACE_FreeSurfaceByHandle(hbmp); + return NULL; + } + if (pUnsafeBits) { - BOOL Hit = FALSE; - UINT cjBits = BITMAP_GetWidthBytes(Width, BitsPixel) * abs(Height); - - // FIXME: Use MmSecureVirtualMemory _SEH2_TRY { - ProbeForRead(pUnsafeBits, cjBits, 1); + ProbeForRead(pUnsafeBits, cjWidthBytes * nHeight, 1); + UnsafeSetBitmapBits(psurf, 0, pUnsafeBits); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - Hit = TRUE; + SURFACE_FreeSurfaceByHandle(hbmp); + _SEH2_YIELD(return NULL;) } _SEH2_END - - if (Hit) return 0; - } - - return IntGdiCreateBitmap(Width, Height, Planes, BitsPixel, pUnsafeBits); -} + } + + /* Mark as API bitmap */ + psurf->flags |= API_BITMAP; + + /* Unlock the surface and return */ + SURFACE_UnlockSurface(psurf); + return hbmp; +} + HBITMAP FASTCALL IntCreateCompatibleBitmap( @@ -180,13 +245,11 @@ size.cx = abs(Width); size.cy = abs(Height); - - Bmp = IntCreateBitmap(size, - BITMAP_GetWidthBytes(Width, Dc->ppdev->gdiinfo.cBitsPixel), - Dc->ppdev->pSurface->SurfObj.iBitmapFormat, - 0, + Bmp = GreCreateBitmap(abs(Width), + abs(Height), + 1, + Dc->ppdev->gdiinfo.cBitsPixel, NULL); - psurf = SURFACE_LockSurface(Bmp); ASSERT(psurf); /* Set palette */ @@ -211,11 +274,11 @@ PSURFACE psurfBmp; size.cx = abs(Width); size.cy = abs(Height); - Bmp = IntCreateBitmap(size, - BITMAP_GetWidthBytes(Width, dibs.dsBm.bmBitsPixel), - psurf->SurfObj.iBitmapFormat, - 0, - NULL); + Bmp = GreCreateBitmap(abs(Width), + abs(Height), + 1, + dibs.dsBm.bmBitsPixel, + NULL); psurfBmp = SURFACE_LockSurface(Bmp); ASSERT(psurfBmp); /* Assign palette */ @@ -321,7 +384,7 @@ } if (!hDC) - return IntGdiCreateBitmap(Width, Height, 1, 1, 0); + return GreCreateBitmap(Width, Height, 1, 1, 0); Dc = DC_LockDc(hDC); @@ -464,7 +527,7 @@ 0, 0); - //HBITMAP hBmpTmp = IntGdiCreateBitmap(1, 1, 1, 32, NULL); + //HBITMAP hBmpTmp = GreCreateBitmap(1, 1, 1, 32, NULL); if (hBmpTmp) { HBITMAP hBmpOld = (HBITMAP)NtGdiSelectBitmap(hDCTmp, hBmpTmp); @@ -588,46 +651,6 @@ LONG APIENTRY -IntSetBitmapBits( - PSURFACE psurf, - DWORD Bytes, - IN PBYTE Bits) -{ - LONG ret; - - /* Don't copy more bytes than the buffer has */ - Bytes = min(Bytes, psurf->SurfObj.cjBits); - -#if 0 - /* FIXME: call DDI specific function here if available */ - if (psurf->DDBitmap) - { - DPRINT("Calling device specific BitmapBits\n"); - if (psurf->DDBitmap->funcs->pBitmapBits) - { - ret = psurf->DDBitmap->funcs->pBitmapBits(hBitmap, - (void *)Bits, - Bytes, - DDB_SET); - } - else - { - DPRINT("BitmapBits == NULL??\n"); - ret = 0; - } - } - else -#endif - { - RtlCopyMemory(psurf->SurfObj.pvBits, Bits, Bytes); - ret = Bytes; - } - - return ret; -} - - -LONG APIENTRY NtGdiSetBitmapBits( HBITMAP hBitmap, DWORD Bytes, @@ -651,7 +674,8 @@ _SEH2_TRY { ProbeForRead(pUnsafeBits, Bytes, 1); - ret = IntSetBitmapBits(psurf, Bytes, pUnsafeBits); + UnsafeSetBitmapBits(psurf, Bytes, pUnsafeBits); + ret = 1; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -898,11 +922,11 @@ Size.cx = abs(bm.bmWidth); Size.cy = abs(bm.bmHeight); - res = IntCreateBitmap(Size, - bm.bmWidthBytes, - BitmapFormat(bm.bmBitsPixel * bm.bmPlanes, BI_RGB), - (bm.bmHeight < 0 ? BMF_TOPDOWN : 0) | BMF_NOZEROINIT, - NULL); + res = GreCreateBitmap(abs(bm.bmWidth), + abs(bm.bmHeight), + 1, + bm.bmBitsPixel, + NULL); if (res) { Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/brush.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/brush.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/brush.c [iso-8859-1] Mon Jun 7 00:01:41 2010 @@ -405,7 +405,7 @@ else DataPtr += PaletteEntryCount * sizeof(USHORT); - hPattern = IntGdiCreateBitmap(BitmapInfo->bmiHeader.biWidth, + hPattern = GreCreateBitmap(BitmapInfo->bmiHeader.biWidth, BitmapInfo->bmiHeader.biHeight, BitmapInfo->bmiHeader.biPlanes, BitmapInfo->bmiHeader.biBitCount, @@ -459,7 +459,7 @@ return 0; } - hPattern = IntGdiCreateBitmap(8, 8, 1, 1, (LPBYTE)HatchBrushes[Style]); + hPattern = GreCreateBitmap(8, 8, 1, 1, (LPBYTE)HatchBrushes[Style]); if (hPattern == NULL) { SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Mon Jun 7 00:01:41 2010 @@ -1178,11 +1178,11 @@ } else { - handle = IntGdiCreateBitmap(width, - height, - 1, - 1, - NULL); + handle = GreCreateBitmap(width, + height, + 1, + 1, + NULL); } if (height < 0) Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/pen.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/pen.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/pen.c [iso-8859-1] Mon Jun 7 00:01:41 2010 @@ -125,27 +125,27 @@ case PS_ALTERNATE: pbrushPen->flAttrs |= GDIBRUSH_IS_BITMAP; - pbrushPen->hbmPattern = IntGdiCreateBitmap(24, 1, 1, 1, (LPBYTE)PatternAlternate); + pbrushPen->hbmPattern = GreCreateBitmap(24, 1, 1, 1, (LPBYTE)PatternAlternate); break; case PS_DOT: pbrushPen->flAttrs |= GDIBRUSH_IS_BITMAP; - pbrushPen->hbmPattern = IntGdiCreateBitmap(24, 1, 1, 1, (LPBYTE)PatternDot); + pbrushPen->hbmPattern = GreCreateBitmap(24, 1, 1, 1, (LPBYTE)PatternDot); break; case PS_DASH: pbrushPen->flAttrs |= GDIBRUSH_IS_BITMAP; - pbrushPen->hbmPattern = IntGdiCreateBitmap(24, 1, 1, 1, (LPBYTE)PatternDash); + pbrushPen->hbmPattern = GreCreateBitmap(24, 1, 1, 1, (LPBYTE)PatternDash); break; case PS_DASHDOT: pbrushPen->flAttrs |= GDIBRUSH_IS_BITMAP; - pbrushPen->hbmPattern = IntGdiCreateBitmap(24, 1, 1, 1, (LPBYTE)PatternDashDot); + pbrushPen->hbmPattern = GreCreateBitmap(24, 1, 1, 1, (LPBYTE)PatternDashDot); break; case PS_DASHDOTDOT: pbrushPen->flAttrs |= GDIBRUSH_IS_BITMAP; - pbrushPen->hbmPattern = IntGdiCreateBitmap(24, 1, 1, 1, (LPBYTE)PatternDashDotDot); + pbrushPen->hbmPattern = GreCreateBitmap(24, 1, 1, 1, (LPBYTE)PatternDashDotDot); break; case PS_INSIDEFRAME: Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/stockobj.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/stockobj.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/stockobj.c [iso-8859-1] Mon Jun 7 00:01:41 2010 @@ -180,7 +180,7 @@ StockObjects[NULL_PEN] = IntCreateStockPen(NullPen.lopnStyle, NullPen.lopnWidth.x, BS_SOLID, NullPen.lopnColor); StockObjects[20] = NULL; /* TODO: Unknown internal stock object */ - StockObjects[DEFAULT_BITMAP] = IntGdiCreateBitmap(1, 1, 1, 1, NULL); + StockObjects[DEFAULT_BITMAP] = GreCreateBitmap(1, 1, 1, 1, NULL); (void) TextIntCreateFontIndirect(&OEMFixedFont, (HFONT*)&StockObjects[OEM_FIXED_FONT]); (void) TextIntCreateFontIndirect(&AnsiFixedFont, (HFONT*)&StockObjects[ANSI_FIXED_FONT]);

14 years, 6 months

[fireball] 47640: - Remove my implementation of SWM cursor icons which turned out to be similar to creating an elephant from a fly. Instead use a much simpler, updated and fail-proof implementation by Giannis Adamopoulos. Arwinss is back on track.

by fireball＠svn.reactos.org

Author: fireball Date: Sun Jun 6 23:40:11 2010 New Revision: 47640 URL: http://svn.reactos.org/svn/reactos?rev=47640&view=rev Log: - Remove my implementation of SWM cursor icons which turned out to be similar to creating an elephant from a fly. Instead use a much simpler, updated and fail-proof implementation by Giannis Adamopoulos. Arwinss is back on track. Modified: branches/arwinss/reactos/dll/win32/winent.drv/mouse.c branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c branches/arwinss/reactos/dll/win32/winent.drv/winent.h branches/arwinss/reactos/include/reactos/win32k/rosuser.h branches/arwinss/reactos/subsystems/win32/win32k/gre/cursoricon.c branches/arwinss/reactos/subsystems/win32/win32k/include/cursor.h branches/arwinss/reactos/subsystems/win32/win32k/include/gre.h branches/arwinss/reactos/subsystems/win32/win32k/include/swm.h branches/arwinss/reactos/subsystems/win32/win32k/main/cursor.c branches/arwinss/reactos/subsystems/win32/win32k/main/init.c branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db Modified: branches/arwinss/reactos/dll/win32/winent.drv/mouse.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/mouse.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/mouse.c [iso-8859-1] Sun Jun 6 23:40:11 2010 @@ -1,5 +1,5 @@ /* - * X11 mouse driver + * NTDRV mouse driver * * Copyright 1998 Ulrich Weigand * Copyright 2007 Henri Verbeet @@ -69,41 +69,8 @@ MOUSEEVENTF_XUP }; -static HWND cursor_window; static BYTE TrackSysKey = 0; /* determine whether ALT key up will cause a WM_SYSKEYUP or a WM_KEYUP message */ - -VOID create_cursor( HANDLE handle ); - -/*********************************************************************** - * set_window_cursor - */ -void set_window_cursor( HWND hwnd, HCURSOR handle ) -{ - struct ntdrv_win_data *data; - - if (!(data = NTDRV_get_win_data( hwnd ))) return; - - if (!handle) - { - // FIXME: Special case for removing the cursor - FIXME("TODO: Cursor should be removed!\n"); - data->cursor = handle; - return; - } - - /* Try to set the cursor */ - if (!SwmDefineCursor(hwnd, handle)) - { - /* This cursor doesn't exist yet, create it */ - create_cursor(handle); - - /* Set it for this window */ - SwmDefineCursor(hwnd, handle); - } - - data->cursor = handle; -} /*********************************************************************** * get_key_state @@ -165,12 +132,6 @@ cursor = (reply->count >= 0) ? wine_server_ptr_handle(reply->cursor) : 0; } SERVER_END_REQ; - - if (hwnd) - { - struct ntdrv_win_data *data = NTDRV_get_win_data( hwnd ); - if (data && cursor != data->cursor) set_window_cursor( hwnd, cursor ); - } } /*********************************************************************** @@ -233,7 +194,6 @@ /* get the window handle from cursor position */ hwnd = SwmGetWindowFromPoint(pt.x, pt.y); - cursor_window = hwnd; if (flags & MOUSEEVENTF_MOVE) { @@ -424,208 +384,24 @@ } /*********************************************************************** - * get_bitmap_width_bytes - * - * Return number of bytes taken by a scanline of 16-bit aligned Windows DDB - * data. - * from user32/cursoricon.c:168 - */ -static int get_bitmap_width_bytes( int width, int bpp ) -{ - switch(bpp) - { - case 1: - return 2 * ((width+15) / 16); - case 4: - return 2 * ((width+3) / 4); - case 24: - width *= 3; - /* fall through */ - case 8: - return width + (width & 1); - case 16: - case 15: - return width * 2; - case 32: - return width * 4; - default: - WARN("Unknown depth %d, please report.\n", bpp ); - } - return -1; -} - -VOID CDECL RosDrv_GetIconInfo(CURSORICONINFO *ciconinfo, PICONINFO iconinfo) -{ - INT height; - BITMAP bitmap; - PVOID pbits; - static const WORD ICON_HOTSPOT = 0x4242; /* From user32/cursoricon.c:128 */ - - //TRACE("%p => %dx%d, %d bpp\n", ciconinfo, - // ciconinfo->nWidth, ciconinfo->nHeight, ciconinfo->bBitsPerPixel); - - if ( (ciconinfo->ptHotSpot.x == ICON_HOTSPOT) && - (ciconinfo->ptHotSpot.y == ICON_HOTSPOT) ) - { - iconinfo->fIcon = TRUE; - iconinfo->xHotspot = ciconinfo->nWidth / 2; - iconinfo->yHotspot = ciconinfo->nHeight / 2; + * DestroyCursorIcon (NTDRV.@) + */ +void CDECL RosDrv_DestroyCursorIcon( HCURSOR handle ) +{ +} + +void CDECL RosDrv_SetCursor( HCURSOR handle ) +{ + ICONINFO iconinfo; + + if(handle == NULL) + { + RosUserSetCursor(NULL); } else { - iconinfo->fIcon = FALSE; - iconinfo->xHotspot = ciconinfo->ptHotSpot.x; - iconinfo->yHotspot = ciconinfo->ptHotSpot.y; - } - - height = ciconinfo->nHeight; - - if (ciconinfo->bBitsPerPixel > 1) - { - pbits = (char *)(ciconinfo + 1) + ciconinfo->nHeight * get_bitmap_width_bytes (ciconinfo->nWidth,1); - - iconinfo->hbmColor = CreateBitmap( ciconinfo->nWidth, ciconinfo->nHeight, - ciconinfo->bPlanes, ciconinfo->bBitsPerPixel, - pbits); - if(GetObjectW(iconinfo->hbmColor, sizeof(bitmap), &bitmap)) - RosGdiCreateBitmap(NULL, iconinfo->hbmColor, &bitmap, pbits); - } - else - { - iconinfo->hbmColor = 0; - height *= 2; - } - - pbits = (char *)(ciconinfo + 1); - - /* Create the mask bitmap */ - iconinfo->hbmMask = CreateBitmap ( ciconinfo->nWidth, height, - 1, 1, pbits); - if( GetObjectW(iconinfo->hbmMask, sizeof(bitmap), &bitmap)) - { - RosGdiCreateBitmap(NULL, iconinfo->hbmMask, &bitmap, pbits); - } -} - -/*********************************************************************** - * create_cursor - * - * Create a client cursor from a Windows one. - */ -VOID create_cursor( HANDLE handle ) -{ - HDC hdc; - ICONINFO icon; - BITMAP bm; - - //if (!handle) return get_empty_cursor(); - - if (!(hdc = CreateCompatibleDC( 0 ))) return; - if (!GetIconInfo( handle, &icon )) - { - DeleteDC( hdc ); - return; - } - - GetObjectW( icon.hbmMask, sizeof(bm), &bm ); - if (!icon.hbmColor) bm.bmHeight /= 2; - - /* make sure hotspot is valid */ - if (icon.xHotspot >= bm.bmWidth || icon.yHotspot >= bm.bmHeight) - { - icon.xHotspot = bm.bmWidth / 2; - icon.yHotspot = bm.bmHeight / 2; - } - - // help for debugging -#if 0 - { - BITMAPINFO *info; - unsigned int *color_bits = NULL; - unsigned char *mask_bits = NULL; - int width = bm.bmWidth; - int height = bm.bmHeight; - unsigned int width_bytes = (width + 31) / 32 * 4; - BITMAP bitmap; - - - if (!(info = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )))) - return; - - info->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); - info->bmiHeader.biWidth = width; - info->bmiHeader.biHeight = -height; - info->bmiHeader.biPlanes = 1; - info->bmiHeader.biBitCount = 1; - info->bmiHeader.biCompression = BI_RGB; - info->bmiHeader.biSizeImage = width_bytes * height; - info->bmiHeader.biXPelsPerMeter = 0; - info->bmiHeader.biYPelsPerMeter = 0; - info->bmiHeader.biClrUsed = 0; - info->bmiHeader.biClrImportant = 0; - - if (!(mask_bits = HeapAlloc( GetProcessHeap(), 0, info->bmiHeader.biSizeImage ))) goto done; - if (!GetDIBits( hdc, icon.hbmMask, 0, height, mask_bits, info, DIB_RGB_COLORS )) goto done; - - /* HACK: Create the mask bitmap */ - DeleteObject( icon.hbmMask ); - icon.hbmMask = CreateBitmap ( width, height, - 1, 1, NULL); - if( GetObjectW(icon.hbmMask, sizeof(bitmap), &bitmap)) - { - RosGdiCreateBitmap(NULL, icon.hbmMask, &bitmap, NULL); - mask_bits[0] = 0xFF; mask_bits[1] = 0xFF; mask_bits[2] = 0xFF; - SetDIBits( hdc, icon.hbmMask, 0, height, mask_bits, info, DIB_RGB_COLORS ); - } - - info->bmiHeader.biBitCount = 32; - info->bmiHeader.biSizeImage = width * height * 4; - if (!(color_bits = HeapAlloc( GetProcessHeap(), 0, info->bmiHeader.biSizeImage ))) goto done; - GetDIBits( hdc, icon.hbmColor, 0, height, color_bits, info, DIB_RGB_COLORS ); - -done: - HeapFree( GetProcessHeap(), 0, info ); - HeapFree( GetProcessHeap(), 0, color_bits ); - HeapFree( GetProcessHeap(), 0, mask_bits ); - } -#endif - - /* Create the cursor icon */ - RosUserCreateCursorIcon( &icon, handle ); - - //DeleteObject( icon.hbmMask ); - DeleteDC( hdc ); -} - -/*********************************************************************** - * DestroyCursorIcon (NTDRV.@) - */ -void CDECL RosDrv_DestroyCursorIcon( HCURSOR handle ) -{ - ICONINFO IconInfo = {0}; - - FIXME( "Destroying cursor %p\n", handle ); - - /* Destroy kernel mode part of the cursor icon */ - RosUserDestroyCursorIcon( &IconInfo, handle ); - - /* Destroy usermode-created bitmaps */ - // FIXME: Will it delete kernelmode bitmaps?! - // HACK - //if (IconInfo.hbmColor) DeleteObject( IconInfo.hbmColor ); - //if (IconInfo.hbmMask) DeleteObject( IconInfo.hbmMask ); -} - -void CDECL RosDrv_SetCursor( HCURSOR handle ) -{ - - // HACK - if (!cursor_window) - { - cursor_window = SwmGetWindowFromPoint(200, 200); - } - - if (cursor_window) SendNotifyMessageW( cursor_window, WM_NTDRV_SET_CURSOR, 0, (LPARAM)handle ); - FIXME("handle %x, cursor_window %x\n", handle, cursor_window); -} - + GetIconInfo(handle, &iconinfo); + RosUserSetCursor(&iconinfo); + } +} + Modified: branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c [iso-8859-1] Sun Jun 6 23:40:11 2010 @@ -763,9 +763,6 @@ { switch(msg) { - case WM_NTDRV_SET_CURSOR: - set_window_cursor( hwnd, (HCURSOR)lparam ); - return 0; default: FIXME( "got window msg %x hwnd %p wp %lx lp %lx\n", msg, hwnd, wparam, lparam ); return 0; Modified: branches/arwinss/reactos/dll/win32/winent.drv/winent.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/winent.h [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/winent.h [iso-8859-1] Sun Jun 6 23:40:11 2010 @@ -14,12 +14,6 @@ NTDRV_GET_GLX_DRAWABLE, /* get current glx drawable for a DC */ NTDRV_SYNC_PIXMAP, /* sync the dibsection to its pixmap */ NTDRV_FLUSH_GL_DRAWABLE /* flush changes made to the gl drawable */ -}; - -/* NT driver private messages, must be in the range 0x80001000..0x80001fff */ -enum ntdrv_window_messages -{ - WM_NTDRV_SET_CURSOR = 0x80001000 }; struct ntdrv_escape_set_drawable Modified: branches/arwinss/reactos/include/reactos/win32k/rosuser.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos… ============================================================================== --- branches/arwinss/reactos/include/reactos/win32k/rosuser.h [iso-8859-1] (original) +++ branches/arwinss/reactos/include/reactos/win32k/rosuser.h [iso-8859-1] Sun Jun 6 23:40:11 2010 @@ -46,6 +46,7 @@ BOOL NTAPI RosUserClipCursor( LPCRECT clip ); +#if 0 void NTAPI RosUserSetCursor( ICONINFO* IconInfo ); @@ -56,6 +57,11 @@ VOID APIENTRY RosUserDestroyCursorIcon(ICONINFO* IconInfoUnsafe, HCURSOR Handle); +#endif + +VOID +APIENTRY +RosUserSetCursor( ICONINFO* IconInfoUnsafe ); LONG APIENTRY @@ -167,9 +173,6 @@ VOID NTAPI SwmAddDesktopWindow(HWND hWnd, UINT Width, UINT Height); -BOOL NTAPI -SwmDefineCursor(HWND hWnd, HCURSOR hCursor); - VOID NTAPI SwmRemoveWindow(HWND hWnd); Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/cursoricon.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/cursoricon.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/cursoricon.c [iso-8859-1] Sun Jun 6 23:40:11 2010 @@ -13,7 +13,7 @@ extern PDEVOBJ PrimarySurface; VOID NTAPI -GreMovePointer( +IntEngMovePointer( IN SURFOBJ *pso, IN LONG x, IN LONG y, @@ -27,8 +27,30 @@ SURFACE_UnlockBitmapBits(pSurf); } +VOID +NTAPI +GreMovePointer( + HDC hdc, + LONG x, + LONG y) +{ + PRECTL prcl; + SURFOBJ *pso; + + pso = EngLockSurface(PrimarySurface.pSurface); + + /* Store the cursor exclude position in the PDEV */ + prcl = &(GDIDEV(pso)->Pointer.Exclude); + + /* Call Eng/Drv function */ + IntEngMovePointer(pso, x, y, prcl); + + EngUnlockSurface(pso); +} + + ULONG NTAPI -GreSetPointerShape( +IntSetPointerShape( IN SURFOBJ *pso, IN SURFOBJ *psoMask, IN SURFOBJ *psoColor, @@ -90,37 +112,23 @@ return ulResult; } - - -BOOL +ULONG NTAPI -GreSetCursor(ICONINFO* NewCursor, PSYSTEM_CURSORINFO CursorInfo) +GreSetPointerShape( + HDC hdc, + HBITMAP hbmMask, + HBITMAP hbmColor, + LONG xHot, + LONG yHot, + LONG x, + LONG y) { SURFOBJ *pso; - HBITMAP hbmMask, hbmColor; PSURFACE psurfMask, psurfColor; XLATEOBJ *XlateObj = NULL; ULONG Status; pso = EngLockSurface(PrimarySurface.pSurface); - - if (!NewCursor) - { - if (CursorInfo->ShowingCursor) - { - DPRINT("Removing pointer!\n"); - /* Remove the cursor if it was displayed */ - GreMovePointer(pso, -1, -1, NULL); - } - CursorInfo->ShowingCursor = 0; - EngUnlockSurface(pso); - return TRUE; - } - - CursorInfo->ShowingCursor = TRUE; - - hbmMask = NewCursor->hbmMask; - hbmColor = NewCursor->hbmColor; /* Lock the mask bitmap */ if (hbmMask) @@ -133,7 +141,7 @@ { /* We have one, lock it */ psurfColor = SURFACE_ShareLock(hbmColor); - + if (psurfColor) { /* Create an XLATEOBJ, no mono support */ @@ -144,14 +152,14 @@ else psurfColor = NULL; - Status = GreSetPointerShape(pso, + Status = IntSetPointerShape(pso, psurfMask ? &psurfMask->SurfObj : NULL, psurfColor ? &psurfColor->SurfObj : NULL, XlateObj, - NewCursor->xHotspot, - NewCursor->yHotspot, - CursorInfo->CursorPos.x, - CursorInfo->CursorPos.y, + xHot, + yHot, + x, + y, &(GDIDEV(pso)->Pointer.Exclude), SPS_CHANGE); Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/cursor.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/cursor.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/cursor.h [iso-8859-1] Sun Jun 6 23:40:11 2010 @@ -31,8 +31,5 @@ extern SYSTEM_CURSORINFO CursorInfo; -VOID NTAPI USER_InitCursorIcons(); -VOID USER_LockCursorIcons(); -VOID USER_UnlockCursorIcons(); PCURSORICONENTRY NTAPI USER_GetCursorIcon(HCURSOR Handle); Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/gre.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/gre.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/gre.h [iso-8859-1] Sun Jun 6 23:40:11 2010 @@ -366,15 +366,23 @@ /* Mouse pointer */ -BOOL NTAPI -GreSetCursor(ICONINFO* NewCursor, PSYSTEM_CURSORINFO CursorInfo); - -VOID NTAPI +ULONG +NTAPI +GreSetPointerShape( + HDC hdc, + HBITMAP hbmMask, + HBITMAP hbmColor, + LONG xHot, + LONG yHot, + LONG x, + LONG y); + +VOID +NTAPI GreMovePointer( - SURFOBJ *pso, + HDC hdc, LONG x, - LONG y, - RECTL *prcl); + LONG y); INT FASTCALL MouseSafetyOnDrawStart(SURFOBJ *pso, Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/swm.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/swm.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/swm.h [iso-8859-1] Sun Jun 6 23:40:11 2010 @@ -17,6 +17,6 @@ PSWM_WINDOW NTAPI SwmFindByHwnd(HWND hWnd); VOID NTAPI SwmAcquire(VOID); VOID NTAPI SwmRelease(VOID); - +HDC SwmGetScreenDC(); #endif Modified: branches/arwinss/reactos/subsystems/win32/win32k/main/cursor.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/main/cursor.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/main/cursor.c [iso-8859-1] Sun Jun 6 23:40:11 2010 @@ -10,10 +10,6 @@ #define NDEBUG #include <debug.h> -/* Cursor icons list */ -LIST_ENTRY CursorIcons; -ERESOURCE CursorIconsLock; - SYSTEM_CURSORINFO CursorInfo; extern PDEVOBJ PrimarySurface; @@ -22,8 +18,6 @@ APIENTRY RosUserGetCursorPos(LPPOINT pt) { - NTSTATUS Status = STATUS_SUCCESS; - _SEH2_TRY { ProbeForWrite(pt, sizeof(POINT), 1); @@ -31,11 +25,11 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - Status = _SEH2_GetExceptionCode(); + _SEH2_YIELD(return FALSE); } _SEH2_END; - return NT_SUCCESS(Status); + return TRUE; } static void NTAPI clip_point_to_rect(LPCRECT rect, LPPOINT pt) @@ -51,7 +45,6 @@ RosUserSetCursorPos(INT x, INT y) { POINT pos; - SURFOBJ *pso; pos.x = x; pos.y = y; @@ -63,9 +56,10 @@ if (CursorInfo.ShowingCursor) { - pso = EngLockSurface(PrimarySurface.pSurface); - GreMovePointer(pso, pos.x, pos.y, &(GDIDEV(pso)->Pointer.Exclude)); - EngUnlockSurface(pso); + HDC hDCscreen = SwmGetScreenDC(); + if (!hDCscreen) return FALSE; + + GreMovePointer(hDCscreen, pos.x, pos.y); } CursorInfo.CursorPos = pos; @@ -77,7 +71,6 @@ APIENTRY RosUserClipCursor( LPCRECT UnsafeRect ) { - NTSTATUS Status = STATUS_SUCCESS; RECT Rect; if (!UnsafeRect) @@ -93,15 +86,10 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - Status = _SEH2_GetExceptionCode(); + SetLastWin32Error(ERROR_INVALID_PARAMETER); + _SEH2_YIELD(return FALSE); } _SEH2_END; - - if (!NT_SUCCESS(Status)) - { - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return FALSE; - } CursorInfo.IsClipped = TRUE; CursorInfo.ClipRect = Rect; @@ -111,166 +99,66 @@ return TRUE; } +VOID UserSetCursor( ICONINFO* IconInfo ) +{ + HDC hDCscreen; + + hDCscreen = SwmGetScreenDC(); + if (!hDCscreen) return; + + if (!IconInfo) + { + if (CursorInfo.ShowingCursor == FALSE) + return; + + DPRINT("Removing pointer!\n"); + /* Remove the cursor if it was displayed */ + GreMovePointer(hDCscreen, -1, -1); + + CursorInfo.ShowingCursor = FALSE; + return; + } + + IconInfo->hbmMask = GDI_MapUserHandle(IconInfo->hbmMask); + IconInfo->hbmColor = GDI_MapUserHandle(IconInfo->hbmColor); + + DPRINT("hbmMask = 0x%x, hbmColor = 0x%x\n", IconInfo->hbmMask, IconInfo->hbmColor); + + GreSetPointerShape( hDCscreen, + IconInfo->hbmMask, + IconInfo->hbmColor, + IconInfo->xHotspot, + IconInfo->yHotspot, + CursorInfo.CursorPos.x, + CursorInfo.CursorPos.y); + + CursorInfo.ShowingCursor = TRUE; +} + VOID APIENTRY RosUserSetCursor( ICONINFO* IconInfoUnsafe ) { ICONINFO IconInfo; - NTSTATUS Status = STATUS_SUCCESS; - /* Special case for removing a pointer */ - if (!IconInfoUnsafe) + if(IconInfoUnsafe == NULL) { - GreSetCursor(NULL, &CursorInfo); - return; + UserSetCursor(NULL); } + else + { + _SEH2_TRY + { + ProbeForRead(IconInfoUnsafe, sizeof(ICONINFO), 1); + RtlCopyMemory(&IconInfo, IconInfoUnsafe , sizeof(ICONINFO)); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + _SEH2_YIELD(return;) + } + _SEH2_END; - _SEH2_TRY - { - ProbeForRead(IconInfoUnsafe, sizeof(ICONINFO), 1); - RtlCopyMemory(&IconInfo, IconInfoUnsafe , sizeof(ICONINFO)); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - - if (NT_SUCCESS(Status)) - { - IconInfo.hbmMask = GDI_MapUserHandle(IconInfo.hbmMask); - IconInfo.hbmColor = GDI_MapUserHandle(IconInfo.hbmColor); - GreSetCursor(&IconInfo, &CursorInfo); + UserSetCursor(&IconInfo); } } -VOID -APIENTRY -RosUserCreateCursorIcon(ICONINFO* IconInfoUnsafe, - HCURSOR Handle) -{ - PCURSORICONENTRY pCursorIcon; - - // FIXME: SEH! - - /* Allocate an entry in the cursor icons list */ - pCursorIcon = ExAllocatePool(PagedPool, sizeof(CURSORICONENTRY)); - RtlZeroMemory(pCursorIcon, sizeof(CURSORICONENTRY)); - - /* Save the usermode handle and other fields */ - pCursorIcon->Self = Handle; - pCursorIcon->IconInfo = *IconInfoUnsafe; - pCursorIcon->hbmMaskUser = IconInfoUnsafe->hbmMask; - pCursorIcon->hbmColorUser = IconInfoUnsafe->hbmColor; - - /* Map handles */ - pCursorIcon->IconInfo.hbmMask = GDI_MapUserHandle(pCursorIcon->IconInfo.hbmMask); - if (pCursorIcon->IconInfo.hbmColor) - pCursorIcon->IconInfo.hbmColor = GDI_MapUserHandle(pCursorIcon->IconInfo.hbmColor); - - /* Make those bitmaps "system" objects */ - GDIOBJ_SetOwnership(pCursorIcon->IconInfo.hbmMask, NULL); - if (pCursorIcon->IconInfo.hbmColor) - GDIOBJ_SetOwnership(pCursorIcon->IconInfo.hbmColor, NULL); - - /* Acquire lock */ - USER_LockCursorIcons(); - - /* Add it to the list */ - InsertTailList(&CursorIcons, &pCursorIcon->Entry); - - /* Release lock */ - USER_UnlockCursorIcons(); -} - -VOID -APIENTRY -RosUserDestroyCursorIcon(ICONINFO* IconInfoUnsafe, - HCURSOR Handle) -{ - PLIST_ENTRY Current; - PCURSORICONENTRY pCursorIcon; - - /* Acquire lock */ - USER_LockCursorIcons(); - - /* Traverse the list to find our mapping */ - Current = CursorIcons.Flink; - while(Current != &CursorIcons) - { - pCursorIcon = CONTAINING_RECORD(Current, CURSORICONENTRY, Entry); - - /* Check if it's our entry */ - if (pCursorIcon->Self == Handle) - { - /* Remove it from the list */ - RemoveEntryList(Current); - - /* Get handles back to the user for proper disposal */ - IconInfoUnsafe->hbmColor = pCursorIcon->hbmColorUser; - IconInfoUnsafe->hbmMask = pCursorIcon->hbmMaskUser; - - // TODO: Go through all windows and remove this cursor from them! - DPRINT1("Hitting a TODO!\n"); - - /* Free memory */ - ExFreePool(pCursorIcon); - break; - } - - /* Advance to the next pair */ - Current = Current->Flink; - } - - /* Release lock */ - USER_UnlockCursorIcons(); -} - -PCURSORICONENTRY -NTAPI -USER_GetCursorIcon(HCURSOR Handle) -{ - PLIST_ENTRY Current; - PCURSORICONENTRY pCursorIcon; - - /* Traverse the list to find our mapping */ - Current = CursorIcons.Flink; - while(Current != &CursorIcons) - { - pCursorIcon = CONTAINING_RECORD(Current, CURSORICONENTRY, Entry); - - /* Check if it's our entry */ - if (pCursorIcon->Self == Handle) return pCursorIcon; - - /* Advance to the next pair */ - Current = Current->Flink; - } - - return NULL; -} - -VOID NTAPI -USER_InitCursorIcons() -{ - NTSTATUS Status; - - /* Initialize cursor icons list and a spinlock */ - InitializeListHead(&CursorIcons); - Status = ExInitializeResourceLite(&CursorIconsLock); - if (!NT_SUCCESS(Status)) - DPRINT1("Initializing cursor icons lock failed with Status 0x%08X\n", Status); -} - -VOID USER_LockCursorIcons() -{ - /* Acquire lock */ - KeEnterCriticalRegion(); - ExAcquireResourceExclusiveLite(&CursorIconsLock, TRUE); -} - -VOID USER_UnlockCursorIcons() -{ - /* Release lock */ - ExReleaseResourceLite(&CursorIconsLock); - KeLeaveCriticalRegion(); -} Modified: branches/arwinss/reactos/subsystems/win32/win32k/main/init.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/main/init.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/main/init.c [iso-8859-1] Sun Jun 6 23:40:11 2010 @@ -357,9 +357,6 @@ /* Initialize handle-mapping */ GDI_InitHandleMapping(); - /* Initialize cursor icons */ - USER_InitCursorIcons(); - /* Create stock objects */ CreateStockBitmap(); PALETTE_Init(); Modified: branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c [iso-8859-1] Sun Jun 6 23:40:11 2010 @@ -35,7 +35,6 @@ LIST_ENTRY SwmWindows; ERESOURCE SwmLock; HDC SwmDc; /* Screen DC for copying operations */ -PCURSORICONENTRY SwmLastCursor; /* FUNCTIONS *****************************************************************/ @@ -87,6 +86,14 @@ GDIOBJ_SetOwnership(SwmDc, NULL); } +HDC SwmGetScreenDC() +{ + /* Lazily create a global screen DC */ + if (!SwmDc) SwmCreateScreenDc(); + + return SwmDc; +} + VOID NTAPI SwmInvalidateRegion(PSWM_WINDOW Window, struct region *Region, rectangle_t *Rect) @@ -785,37 +792,11 @@ if (point_in_region(Window->Visible, x, y)) { - /* Acquire CI lock */ - USER_LockCursorIcons(); - - /* Check if cursor needs to be changed */ - if (Window->Cursor != SwmLastCursor) - { - if (Window->Cursor) - { - /* Set the new cursor */ - DPRINT1("Setting cursor bitmap %p for hwnd %p\n", Window->Cursor->IconInfo.hbmMask, Window->hwnd); - GreSetCursor(&Window->Cursor->IconInfo, &CursorInfo); - } - else - { - /* This window should have no cursor */ - GreSetCursor(NULL, &CursorInfo); - } - - /* Update the last cursor */ - SwmLastCursor = Window->Cursor; - } - - /* Release CI lock */ - USER_UnlockCursorIcons(); - /* Release the lock */ SwmRelease(); return Window->hwnd; } - /* Advance to the next window */ Current = Current->Flink; } @@ -826,63 +807,6 @@ return 0; } -BOOL -NTAPI -SwmDefineCursor(HWND hWnd, HCURSOR hCursor) -{ - PCURSORICONENTRY pCursorIcon; - PSWM_WINDOW pSwmWindow; - - /* Acquire CI lock */ - USER_LockCursorIcons(); - - /* Try to find this cursor */ - pCursorIcon = USER_GetCursorIcon(hCursor); - - /* Release CI lock */ - USER_UnlockCursorIcons(); - - if (!pCursorIcon) return FALSE; - - /* Acquire the SWM lock */ - SwmAcquire(); - - if (!hWnd) - { - /* Special case for setting default cursor */ - DPRINT1("Setting cursor bitmap uh%p\n", pCursorIcon->hbmMaskUser); - GreSetCursor(&pCursorIcon->IconInfo, &CursorInfo); - - /* Update current cursor */ - SwmLastCursor = hCursor; - - /* Release the SWM lock */ - SwmRelease(); - - return TRUE; - } - - /* Now find the window */ - pSwmWindow = SwmFindByHwnd(hWnd); - - /* Success is returned in this case */ - if (!pSwmWindow) - { - /* Release the SWM lock */ - SwmRelease(); - - return TRUE; - } - - /* Set a cursor for this window */ - pSwmWindow->Cursor = pCursorIcon; - - /* Release the SWM lock */ - SwmRelease(); - - return TRUE; -} - VOID NTAPI SwmInitialize() @@ -900,10 +824,7 @@ DPRINT1("Failure initializing SWM resource!\n"); } - /* Cursor is hidden by default */ - SwmLastCursor = NULL; - - SwmTest(); + //SwmTest(); } VOID Modified: branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] Sun Jun 6 23:40:11 2010 @@ -64,12 +64,10 @@ RosGdiSwapBuffers 1 RosGdiUnrealizePalette 1 RosUserConnectCsrss 0 -RosUserCreateCursorIcon 2 -RosUserDestroyCursorIcon 2 +RosUserSetCursor 1 RosUserGetCursorPos 1 RosUserSetCursorPos 2 RosUserClipCursor 1 -RosUserSetCursor 1 RosUserChangeDisplaySettings 5 RosUserEnumDisplayMonitors 3 RosUserEnumDisplaySettings 4 @@ -88,7 +86,6 @@ RosUserGetAsyncKeyState 1 SwmAddWindow 2 SwmAddDesktopWindow 3 -SwmDefineCursor 2 SwmRemoveWindow 1 SwmSetForeground 1 SwmPosChanging 2

14 years, 6 months

[cgutman] 47639: Forgot to remove this ASSERT for r47636

by cgutman＠svn.reactos.org

Author: cgutman Date: Sun Jun 6 23:31:58 2010 New Revision: 47639 URL: http://svn.reactos.org/svn/reactos?rev=47639&view=rev Log: Forgot to remove this ASSERT for r47636 Modified: trunk/reactos/drivers/network/ndis/ndis/time.c Modified: trunk/reactos/drivers/network/ndis/ndis/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/time.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/time.c [iso-8859-1] Sun Jun 6 23:31:58 2010 @@ -99,7 +99,8 @@ { PNDIS_MINIPORT_TIMER CurrentTimer; - ASSERT(Timer->Miniport->TimerQueue); + if (!Timer->Miniport->TimerQueue) + return FALSE; if (Timer->Miniport->TimerQueue == Timer) {

14 years, 6 months

[tkreuzer] 47638: [WIN32K] Make the bitmap data for the extpens (making extpens bitmaps is a bad idea anyway) 4 bytes long instead of 3, to fulfill alignment requirements.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Jun 6 22:56:58 2010 New Revision: 47638 URL: http://svn.reactos.org/svn/reactos?rev=47638&view=rev Log: [WIN32K] Make the bitmap data for the extpens (making extpens bitmaps is a bad idea anyway) 4 bytes long instead of 3, to fulfill alignment requirements. Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/pen.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/pen.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/pen.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/pen.c [iso-8859-1] Sun Jun 6 22:56:58 2010 @@ -63,11 +63,11 @@ { HPEN hPen; PBRUSH pbrushPen; - static const BYTE PatternAlternate[] = {0x55, 0x55, 0x55}; - static const BYTE PatternDash[] = {0xFF, 0xFF, 0xC0}; - static const BYTE PatternDot[] = {0xE3, 0x8E, 0x38}; - static const BYTE PatternDashDot[] = {0xFF, 0x81, 0xC0}; - static const BYTE PatternDashDotDot[] = {0xFF, 0x8E, 0x38}; + static const BYTE PatternAlternate[] = {0x55, 0x55, 0x55, 0}; + static const BYTE PatternDash[] = {0xFF, 0xFF, 0xC0, 0}; + static const BYTE PatternDot[] = {0xE3, 0x8E, 0x38, 0}; + static const BYTE PatternDashDot[] = {0xFF, 0x81, 0xC0, 0}; + static const BYTE PatternDashDotDot[] = {0xFF, 0x8E, 0x38, 0}; dwWidth = abs(dwWidth);

14 years, 6 months

[gschneider] 47637: [WIN32K] - Use TAG_KEYBOARD for keyboard layouts - Free TAG_ACCEL and TAG_DRIVER allocations with their tags

by gschneider＠svn.reactos.org

Author: gschneider Date: Sun Jun 6 21:29:20 2010 New Revision: 47637 URL: http://svn.reactos.org/svn/reactos?rev=47637&view=rev Log: [WIN32K] - Use TAG_KEYBOARD for keyboard layouts - Free TAG_ACCEL and TAG_DRIVER allocations with their tags Modified: trunk/reactos/subsystems/win32/win32k/misc/driver.c trunk/reactos/subsystems/win32/win32k/ntuser/accelerator.c trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c Modified: trunk/reactos/subsystems/win32/win32k/misc/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/mi… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/misc/driver.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/misc/driver.c [iso-8859-1] Sun Jun 6 21:29:20 2010 @@ -167,7 +167,7 @@ if (!NT_SUCCESS(Status)) { - ExFreePool(FullName); + ExFreePoolWithTag(FullName, TAG_DRIVER); return NULL; } @@ -572,8 +572,8 @@ if (Driver != NULL) { - ExFreePool(Driver->Name); - ExFreePool(Driver); + ExFreePoolWithTag(Driver->Name, TAG_DRIVER); + ExFreePoolWithTag(Driver, TAG_DRIVER); return TRUE; } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/accelerator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/accelerator.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/accelerator.c [iso-8859-1] Sun Jun 6 21:29:20 2010 @@ -436,7 +436,7 @@ if (Accel->Table != NULL) { - ExFreePool(Accel->Table); + ExFreePoolWithTag(Accel->Table, TAG_ACCEL); Accel->Table = NULL; } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c [iso-8859-1] Sun Jun 6 21:29:20 2010 @@ -199,7 +199,7 @@ ULONG hKl; LANGID langid; - NewKbl = ExAllocatePool(PagedPool, sizeof(KBL)); + NewKbl = ExAllocatePoolWithTag(PagedPool, sizeof(KBL), TAG_KEYBOARD); if(!NewKbl) { @@ -212,7 +212,7 @@ if(!UserLoadKbdDll(NewKbl->Name, &NewKbl->hModule, &NewKbl->KBTables)) { DPRINT("%s: failed to load %x dll!\n", __FUNCTION__, LocaleId); - ExFreePool(NewKbl); + ExFreePoolWithTag(NewKbl, TAG_KEYBOARD); return NULL; } @@ -401,7 +401,7 @@ //Unload the layout EngUnloadImage(pKbl->hModule); RemoveEntryList(&pKbl->List); - ExFreePool(pKbl); + ExFreePoolWithTag(pKbl, TAG_KEYBOARD); } return TRUE;

14 years, 6 months

[cgutman] 47636: [NDIS] - Only dequeue the timer in the DPC if the Period is 0 (which means that it's NOT a periodic timer so we only get called once) - Attempt to dequeue the timer before inserting it so we don't end up with multiple copies of the same timer on the timer queue if somebody calls NdisMSet(Periodic)Timer twice

by cgutman＠svn.reactos.org

Author: cgutman Date: Sun Jun 6 21:18:19 2010 New Revision: 47636 URL: http://svn.reactos.org/svn/reactos?rev=47636&view=rev Log: [NDIS] - Only dequeue the timer in the DPC if the Period is 0 (which means that it's NOT a periodic timer so we only get called once) - Attempt to dequeue the timer before inserting it so we don't end up with multiple copies of the same timer on the timer queue if somebody calls NdisMSet(Periodic)Timer twice Modified: trunk/reactos/drivers/network/ndis/ndis/time.c Modified: trunk/reactos/drivers/network/ndis/ndis/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/time.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/time.c [iso-8859-1] Sun Jun 6 21:18:19 2010 @@ -95,7 +95,7 @@ KeInitializeDpc (&Timer->Dpc, (PKDEFERRED_ROUTINE)TimerFunction, FunctionContext); } -VOID DequeueMiniportTimer(PNDIS_MINIPORT_TIMER Timer) +BOOLEAN DequeueMiniportTimer(PNDIS_MINIPORT_TIMER Timer) { PNDIS_MINIPORT_TIMER CurrentTimer; @@ -104,6 +104,8 @@ if (Timer->Miniport->TimerQueue == Timer) { Timer->Miniport->TimerQueue = Timer->NextDeferredTimer; + Timer->NextDeferredTimer = NULL; + return TRUE; } else { @@ -113,11 +115,12 @@ if (CurrentTimer->NextDeferredTimer == Timer) { CurrentTimer->NextDeferredTimer = Timer->NextDeferredTimer; - return; + Timer->NextDeferredTimer = NULL; + return TRUE; } CurrentTimer = CurrentTimer->NextDeferredTimer; } - ASSERT(FALSE); + return FALSE; } } @@ -161,8 +164,8 @@ SystemArgument1, SystemArgument2); - /* FIXME: We can't call this if we have a periodic timer */ - //DequeueMiniportTimer(Timer); + /* Only dequeue if the timer has a period of 0 */ + if (!Timer->Timer.Period) DequeueMiniportTimer(Timer); } @@ -227,6 +230,9 @@ /* relative delays are negative, absolute are positive; resolution is 100ns */ Timeout.QuadPart = Int32x32To64(MillisecondsPeriod, -10000); + /* Dequeue the timer if it is queued already */ + DequeueMiniportTimer(Timer); + /* Add the timer at the head of the timer queue */ Timer->NextDeferredTimer = Timer->Miniport->TimerQueue; Timer->Miniport->TimerQueue = Timer; @@ -261,6 +267,9 @@ /* relative delays are negative, absolute are positive; resolution is 100ns */ Timeout.QuadPart = Int32x32To64(MillisecondsToDelay, -10000); + + /* Dequeue the timer if it is queued already */ + DequeueMiniportTimer(Timer); /* Add the timer at the head of the timer queue */ Timer->NextDeferredTimer = Timer->Miniport->TimerQueue;

14 years, 6 months

[gschneider] 47635: [WIN32K] - Use TAG_PALETTE for palette entries - Remove mapping codes, the functions from pre r9000 don't even exist anymore

by gschneider＠svn.reactos.org

Author: gschneider Date: Sun Jun 6 21:11:52 2010 New Revision: 47635 URL: http://svn.reactos.org/svn/reactos?rev=47635&view=rev Log: [WIN32K] - Use TAG_PALETTE for palette entries - Remove mapping codes, the functions from pre r9000 don't even exist anymore Modified: trunk/reactos/subsystems/win32/win32k/include/palette.h trunk/reactos/subsystems/win32/win32k/objects/palette.c Modified: trunk/reactos/subsystems/win32/win32k/include/palette.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/palette.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/palette.h [iso-8859-1] Sun Jun 6 21:11:52 2010 @@ -1,8 +1,6 @@ #pragma once #include <include/dc.h> - -#define NO_MAPPING #define PALETTE_FIXED 0x0001 /* read-only colormap - have to use XAllocColor (if not virtual) */ #define PALETTE_VIRTUAL 0x0002 /* no mapping needed - pixel == pixel color */ @@ -79,9 +77,6 @@ HPALETTE FASTCALL PALETTE_Init (VOID); VOID FASTCALL PALETTE_ValidateFlags (PALETTEENTRY* lpPalE, INT size); -#ifndef NO_MAPPING -INT APIENTRY PALETTE_SetMapping(PALOBJ* palPtr, UINT uStart, UINT uNum, BOOL mapOnly); -#endif INT FASTCALL PALETTE_ToPhysical (PDC dc, COLORREF color); INT FASTCALL PALETTE_GetObject(PPALETTE pGdiObject, INT cbCount, LPLOGBRUSH lpBuffer); Modified: trunk/reactos/subsystems/win32/win32k/objects/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/palette.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/palette.c [iso-8859-1] Sun Jun 6 21:11:52 2010 @@ -61,9 +61,6 @@ int i; HPALETTE hpalette; PLOGPALETTE palPtr; -#ifndef NO_MAPPING - PALOBJ *palObj; -#endif // create default palette (20 system colors) palPtr = ExAllocatePoolWithTag(PagedPool, @@ -84,19 +81,6 @@ hpalette = NtGdiCreatePaletteInternal(palPtr,NB_RESERVED_COLORS); ExFreePoolWithTag(palPtr, TAG_PALETTE); - -#ifndef NO_MAPPING - palObj = (PALOBJ*)PALETTE_LockPalette(hpalette); - if (palObj) - { - if (!(palObj->mapping = ExAllocatePool(PagedPool, sizeof(int) * 20))) - { - DbgPrint("Win32k: Can not create palette mapping -- out of memory!"); - return FALSE; - } - PALETTE_UnlockPalette(palObj); - } -#endif /* palette_size = visual->map_entries; */ @@ -232,7 +216,7 @@ PPALETTE pPal = (PPALETTE)ObjectBody; if (NULL != pPal->IndexedColors) { - ExFreePool(pPal->IndexedColors); + ExFreePoolWithTag(pPal->IndexedColors, TAG_PALETTE); } return TRUE; @@ -453,7 +437,7 @@ else { /* FIXME - Handle PalGDI == NULL!!!! */ - DPRINT1("waring PalGDI is NULL \n"); + DPRINT1("PalGDI is NULL\n"); } return NewPalette; } @@ -981,7 +965,7 @@ if (pUnsafeEntries) { - pEntries = ExAllocatePool(PagedPool, cEntries * sizeof(PALETTEENTRY)); + pEntries = ExAllocatePoolWithTag(PagedPool, cEntries * sizeof(PALETTEENTRY), TAG_PALETTE); if (!pEntries) return 0; if (bInbound) @@ -993,7 +977,7 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - ExFreePool(pEntries); + ExFreePoolWithTag(pEntries, TAG_PALETTE); _SEH2_YIELD(return 0); } _SEH2_END @@ -1047,7 +1031,7 @@ } _SEH2_END } - ExFreePool(pEntries); + ExFreePoolWithTag(pEntries, TAG_PALETTE); } return ret;

14 years, 6 months

[gschneider] 47634: [WIN32K] Use TAG_GDIICM tag for ICM allocations

by gschneider＠svn.reactos.org

Author: gschneider Date: Sun Jun 6 20:51:43 2010 New Revision: 47634 URL: http://svn.reactos.org/svn/reactos?rev=47634&view=rev Log: [WIN32K] Use TAG_GDIICM tag for ICM allocations Modified: trunk/reactos/subsystems/win32/win32k/objects/icm.c Modified: trunk/reactos/subsystems/win32/win32k/objects/icm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/icm.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/icm.c [iso-8859-1] Sun Jun 6 20:51:43 2010 @@ -146,7 +146,7 @@ return FALSE; } - SafeRamp = ExAllocatePool(PagedPool, sizeof(GAMMARAMP)); + SafeRamp = ExAllocatePoolWithTag(PagedPool, sizeof(GAMMARAMP), TAG_GDIICM); if (!SafeRamp) { DC_UnlockDc(dc); @@ -174,7 +174,7 @@ _SEH2_END; DC_UnlockDc(dc); - ExFreePool(SafeRamp); + ExFreePoolWithTag(SafeRamp, TAG_GDIICM); if (!NT_SUCCESS(Status)) { @@ -377,7 +377,7 @@ return FALSE; } - SafeRamp = ExAllocatePool(PagedPool, sizeof(GAMMARAMP)); + SafeRamp = ExAllocatePoolWithTag(PagedPool, sizeof(GAMMARAMP), TAG_GDIICM); if (!SafeRamp) { DC_UnlockDc(dc); @@ -402,14 +402,14 @@ if (!NT_SUCCESS(Status)) { DC_UnlockDc(dc); - ExFreePool(SafeRamp); + ExFreePoolWithTag(SafeRamp, TAG_GDIICM); SetLastNtError(Status); return FALSE; } Ret = IntSetDeviceGammaRamp((HDEV)dc->ppdev, SafeRamp, TRUE); DC_UnlockDc(dc); - ExFreePool(SafeRamp); + ExFreePoolWithTag(SafeRamp, TAG_GDIICM); return Ret; }

14 years, 6 months

[sginsberg] 47633: [NTOS] Inline writing to PTEs through MI_WRITE_VALID/INVALID_PTE.

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Sun Jun 6 20:45:46 2010 New Revision: 47633 URL: http://svn.reactos.org/svn/reactos?rev=47633&view=rev Log: [NTOS] Inline writing to PTEs through MI_WRITE_VALID/INVALID_PTE. Modified: trunk/reactos/ntoskrnl/mm/ARM3/hypermap.c trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c trunk/reactos/ntoskrnl/mm/ARM3/iosup.c trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/mm/ARM3/mminit.c trunk/reactos/ntoskrnl/mm/ARM3/ncache.c trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c trunk/reactos/ntoskrnl/mm/ARM3/pool.c trunk/reactos/ntoskrnl/mm/ARM3/procsup.c trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/hypermap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/hypermap.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/hypermap.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/hypermap.c [iso-8859-1] Sun Jun 6 20:45:46 2010 @@ -82,9 +82,7 @@ // Write the current PTE // PointerPte += Offset; - ASSERT(PointerPte->u.Hard.Valid == 0); - ASSERT(TempPte.u.Hard.Valid == 1); - *PointerPte = TempPte; + MI_WRITE_VALID_PTE(PointerPte, TempPte); // // Return the address @@ -176,9 +174,7 @@ // Set the correct PTE to write to, and set its new value // PointerPte--; - ASSERT(PointerPte->u.Hard.Valid == 0); - ASSERT(TempPte.u.Hard.Valid == 1); - *PointerPte = TempPte; + MI_WRITE_VALID_PTE(PointerPte, TempPte); } while (--NumberOfPages); // Modified: trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/i386/init… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] Sun Jun 6 20:45:46 2010 @@ -411,16 +411,10 @@ while (StartPde <= EndPde) { // - // Sanity check - // - ASSERT(StartPde->u.Hard.Valid == 0); - - // // Get a page // TempPde.u.Hard.PageFrameNumber = MxGetNextPage(1); - ASSERT(TempPde.u.Hard.Valid == 1); - *StartPde = TempPde; + MI_WRITE_VALID_PTE(StartPde, TempPde); // // Zero out the page table @@ -443,17 +437,11 @@ while (StartPde <= EndPde) { // - // Sanity check - // - ASSERT(StartPde->u.Hard.Valid == 0); - - // // Get a page // TempPde.u.Hard.PageFrameNumber = MxGetNextPage(1); - ASSERT(TempPde.u.Hard.Valid == 1); - *StartPde = TempPde; - + MI_WRITE_VALID_PTE(StartPde, TempPde); + // // Zero out the page table // @@ -483,9 +471,7 @@ // Use one of our contigous pages // TempPte.u.Hard.PageFrameNumber = PageFrameIndex++; - ASSERT(PointerPte->u.Hard.Valid == 0); - ASSERT(TempPte.u.Hard.Valid == 1); - *PointerPte++ = TempPte; + MI_WRITE_VALID_PTE(PointerPte++, TempPte); } // @@ -548,9 +534,7 @@ PageFrameIndex = MiRemoveAnyPage(0); TempPde.u.Hard.PageFrameNumber = PageFrameIndex; TempPde.u.Hard.Global = FALSE; // Hyperspace is local! - ASSERT(StartPde->u.Hard.Valid == 0); - ASSERT(TempPde.u.Hard.Valid == 1); - *StartPde = TempPde; + MI_WRITE_VALID_PTE(StartPde, TempPde); /* Flush the TLB */ KeFlushCurrentTb(); Modified: trunk/reactos/ntoskrnl/mm/ARM3/iosup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/iosup.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/iosup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/iosup.c [iso-8859-1] Sun Jun 6 20:45:46 2010 @@ -172,15 +172,10 @@ do { // - // Start out with nothing - // - ASSERT(PointerPte->u.Hard.Valid == 0); - - // // Write the PFN // TempPte.u.Hard.PageFrameNumber = Pfn++; - *PointerPte++ = TempPte; + MI_WRITE_VALID_PTE(PointerPte++, TempPte); } while (--PageCount); // Modified: trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c [iso-8859-1] Sun Jun 6 20:45:46 2010 @@ -416,9 +416,8 @@ // // Write the PTE // - ASSERT(PointerPte->u.Hard.Valid == 0); TempPte.u.Hard.PageFrameNumber = *MdlPages; - *PointerPte++ = TempPte; + MI_WRITE_VALID_PTE(PointerPte++, TempPte); } while (++MdlPages < LastPage); // Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Sun Jun 6 20:45:46 2010 @@ -499,6 +499,33 @@ return ((PointerPde->u.Hard.LargePage) && (PointerPde->u.Hard.Valid)); } +// +// Writes a valid PTE +// +VOID +FORCEINLINE +MI_WRITE_VALID_PTE(IN PMMPTE PointerPte, + IN MMPTE TempPte) +{ + /* Write the valid PTE */ + ASSERT(PointerPte->u.Hard.Valid == 0); + ASSERT(TempPte.u.Hard.Valid == 1); + *PointerPte = TempPte; +} + +// +// Writes an invalid PTE +// +VOID +FORCEINLINE +MI_WRITE_INVALID_PTE(IN PMMPTE PointerPte, + IN MMPTE InvalidPte) +{ + /* Write the invalid PTE */ + ASSERT(InvalidPte.u.Hard.Valid == 0); + *PointerPte = InvalidPte; +} + NTSTATUS NTAPI MmArmInitSystem( Modified: trunk/reactos/ntoskrnl/mm/ARM3/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/mminit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] Sun Jun 6 20:45:46 2010 @@ -453,9 +453,8 @@ { /* Get a page and map it */ TempPte.u.Hard.PageFrameNumber = MxGetNextPage(1); - ASSERT(TempPte.u.Hard.Valid == 1); - *PointerPte = TempPte; - + MI_WRITE_VALID_PTE(PointerPte, TempPte); + /* Zero out the page */ RtlZeroMemory(MiPteToAddress(PointerPte), PAGE_SIZE); } @@ -614,9 +613,7 @@ /* Write out this PTE */ PagesLeft++; - ASSERT(PointerPte->u.Hard.Valid == 0); - ASSERT(TempPte.u.Hard.Valid == 1); - *PointerPte = TempPte; + MI_WRITE_VALID_PTE(PointerPte, TempPte); /* Zero this page */ RtlZeroMemory(MiPteToAddress(PointerPte), PAGE_SIZE); @@ -1482,9 +1479,7 @@ TempPte = ValidKernelPte; ASSERT(PD_COUNT == 1); TempPte.u.Hard.PageFrameNumber = MmSystemPageDirectory[0]; - ASSERT(PointerPte->u.Hard.Valid == 0); - ASSERT(TempPte.u.Hard.Valid == 1); - *PointerPte = TempPte; + MI_WRITE_VALID_PTE(PointerPte, TempPte); // // Let's get back to paged pool work: size it up. @@ -1555,9 +1550,7 @@ /* Allocate a page and map the first paged pool PDE */ PageFrameIndex = MiRemoveZeroPage(0); TempPte.u.Hard.PageFrameNumber = PageFrameIndex; - ASSERT(PointerPde->u.Hard.Valid == 0); - ASSERT(TempPte.u.Hard.Valid == 1); - *PointerPde = TempPte; + MI_WRITE_VALID_PTE(PointerPde, TempPte); /* Initialize the PFN entry for it */ MiInitializePfnForOtherProcess(PageFrameIndex, Modified: trunk/reactos/ntoskrnl/mm/ARM3/ncache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/ncache.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/ncache.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/ncache.c [iso-8859-1] Sun Jun 6 20:45:46 2010 @@ -154,9 +154,7 @@ // Set the PFN in the page and write it // TempPte.u.Hard.PageFrameNumber = PageFrameIndex; - ASSERT(PointerPte->u.Hard.Valid == 0); - ASSERT(TempPte.u.Hard.Valid == 1); - *PointerPte++ = TempPte; + MI_WRITE_VALID_PTE(PointerPte++, TempPte); } while (--PageCount); // Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pagfault.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] Sun Jun 6 20:45:46 2010 @@ -127,11 +127,8 @@ /* Build the PTE */ MI_MAKE_HARDWARE_PTE(&TempPte, PointerPte, PointerPte->u.Soft.Protection, PageFrameNumber); - ASSERT(TempPte.u.Hard.Valid == 1); - ASSERT(PointerPte->u.Hard.Valid == 0); - *PointerPte = TempPte; - ASSERT(PointerPte->u.Hard.Valid == 1); - + MI_WRITE_VALID_PTE(PointerPte, TempPte); + // // It's all good now // Modified: trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c [iso-8859-1] Sun Jun 6 20:45:46 2010 @@ -747,6 +747,9 @@ KIRQL OldIrql; PFN_NUMBER PageFrameIndex; MMPTE TempPte; + + /* Sanity check that we aren't passed a valid PTE */ + ASSERT(PointerPte->u.Hard.Valid == 0); /* Make an empty software PTE */ MI_MAKE_SOFTWARE_PTE(&TempPte, MM_READWRITE); @@ -767,8 +770,7 @@ PageFrameIndex = MiRemoveAnyPage(0); /* Write the software PTE */ - ASSERT(PointerPte->u.Hard.Valid == 0); - *PointerPte = TempPte; + MI_WRITE_INVALID_PTE(PointerPte, TempPte); PointerPte->u.Soft.Protection |= Protection; /* Initialize its PFN entry */ Modified: trunk/reactos/ntoskrnl/mm/ARM3/pool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pool.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pool.c [iso-8859-1] Sun Jun 6 20:45:46 2010 @@ -344,8 +344,7 @@ MmSystemPageDirectory[(PointerPte - (PMMPTE)PDE_BASE) / PDE_COUNT]); /* Write the actual PTE now */ - ASSERT(TempPte.u.Hard.Valid == 1); - *PointerPte++ = TempPte; + MI_WRITE_VALID_PTE(PointerPte++, TempPte); // // Move on to the next expansion address @@ -604,9 +603,7 @@ /* Write the PTE for it */ TempPte.u.Hard.PageFrameNumber = PageFrameNumber; - ASSERT(PointerPte->u.Hard.Valid == 0); - ASSERT(TempPte.u.Hard.Valid == 1); - *PointerPte++ = TempPte; + MI_WRITE_VALID_PTE(PointerPte++, TempPte); } while (--SizeInPages > 0); // Modified: trunk/reactos/ntoskrnl/mm/ARM3/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/procsup.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] Sun Jun 6 20:45:46 2010 @@ -175,17 +175,14 @@ /* Get a page and write the current invalid PTE */ PageFrameIndex = MiRemoveAnyPage(0); - ASSERT(InvalidPte.u.Hard.Valid == 0); - *PointerPte = InvalidPte; - + MI_WRITE_INVALID_PTE(PointerPte, InvalidPte); + /* Initialize the PFN entry for this page */ MiInitializePfn(PageFrameIndex, PointerPte, 1); /* Write the valid PTE */ TempPte.u.Hard.PageFrameNumber = PageFrameIndex; - ASSERT(PointerPte->u.Hard.Valid == 0); - ASSERT(TempPte.u.Hard.Valid == 1); - *PointerPte = TempPte; + MI_WRITE_VALID_PTE(PointerPte, TempPte); } // Bug #4835 @@ -267,9 +264,8 @@ { /* Get a page and write the current invalid PTE */ PageFrameIndex = MiRemoveAnyPage(0); - ASSERT(InvalidPte.u.Hard.Valid == 0); - *LimitPte = InvalidPte; - + MI_WRITE_INVALID_PTE(LimitPte, InvalidPte); + /* Initialize the PFN entry for this page */ MiInitializePfn(PageFrameIndex, LimitPte, 1); @@ -277,9 +273,7 @@ MI_MAKE_HARDWARE_PTE(&TempPte, LimitPte, MM_READWRITE, PageFrameIndex); /* Write the valid PTE */ - ASSERT(LimitPte->u.Hard.Valid == 0); - ASSERT(TempPte.u.Hard.Valid == 1); - *LimitPte-- = TempPte; + MI_WRITE_VALID_PTE(LimitPte--, TempPte); } // Modified: trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c [iso-8859-1] Sun Jun 6 20:45:46 2010 @@ -173,12 +173,10 @@ { /* Allocate a page */ TempPte.u.Hard.PageFrameNumber = MiAllocatePfn(PointerPte, MM_EXECUTE); - + /* Write it */ - ASSERT(PointerPte->u.Hard.Valid == 0); - ASSERT(TempPte.u.Hard.Valid == 1); - *PointerPte = TempPte; - + MI_WRITE_VALID_PTE(PointerPte, TempPte); + /* Move on */ PointerPte++; } @@ -1451,15 +1449,13 @@ /* Copy the old data */ OldPte = *StartPte; ASSERT(OldPte.u.Hard.Valid == 1); - + /* Set page number from the loader's memory */ TempPte.u.Hard.PageFrameNumber = OldPte.u.Hard.PageFrameNumber; - + /* Write it */ - ASSERT(PointerPte->u.Hard.Valid == 0); - ASSERT(TempPte.u.Hard.Valid == 1); - *PointerPte = TempPte; - + MI_WRITE_VALID_PTE(PointerPte, TempPte); + /* Move on */ PointerPte++; StartPte++;

14 years, 6 months

← Newer
1
...
25
26
27
28
29
30
31
...
41
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2010