Ros-diffs June 2010

ros-diffs@reactos.org

24 participants
407 discussions

[tkreuzer] 47612: [WIN32K] - Move RLE specific code to it's own file (rlecomp.c) - Relace BitsPerFormat function with an array of UCHARs - Rewrite surface creation. Surfaces are now allocated from one central function SURFACE_AllocSurface, which sets the size, iType, iUniq, the handle and the default palette. - Implement SURFACE_vSetDefaultPalette, which sets the default RGB palette, based on bit depth. - Implement SURFACE_bSetBitmapBits, wich sets cjBits, pvBits, pvScan0 and lDelta and allocate

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Jun 6 09:02:15 2010 New Revision: 47612 URL: http://svn.reactos.org/svn/reactos?rev=47612&view=rev Log: [WIN32K] - Move RLE specific code to it's own file (rlecomp.c) - Relace BitsPerFormat function with an array of UCHARs - Rewrite surface creation. Surfaces are now allocated from one central function SURFACE_AllocSurface, which sets the size, iType, iUniq, the handle and the default palette. - Implement SURFACE_vSetDefaultPalette, which sets the default RGB palette, based on bit depth. - Implement SURFACE_bSetBitmapBits, wich sets cjBits, pvBits, pvScan0 and lDelta and allocates memory if neccessary. - Use these functions for EngCreateBitmap, EngCreateDeviceBitmap, EngCreateDeviceSurface and IntCreateBitmap Added: branches/reactos-yarotows/subsystems/win32/win32k/eng/rlecomp.c (with props) Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/surface.c branches/reactos-yarotows/subsystems/win32/win32k/include/eng.h branches/reactos-yarotows/subsystems/win32/win32k/include/surface.h branches/reactos-yarotows/subsystems/win32/win32k/win32k.rbuild Added: branches/reactos-yarotows/subsystems/win32/win32k/eng/rlecomp.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/eng/rlecomp.c (added) +++ branches/reactos-yarotows/subsystems/win32/win32k/eng/rlecomp.c [iso-8859-1] Sun Jun 6 09:02:15 2010 @@ -1,0 +1,140 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * PURPOSE: RLE compression + * FILE: subsystems/win32k/eng/rlecomp.c + * PROGRAMER: Jason Filby + */ + +#include <win32k.h> + +#define NDEBUG +#include <debug.h> + +enum Rle_EscapeCodes +{ + RLE_EOL = 0, /* End of line */ + RLE_END = 1, /* End of bitmap */ + RLE_DELTA = 2 /* Delta */ +}; + +VOID Decompress4bpp(SIZEL Size, BYTE *CompressedBits, BYTE *UncompressedBits, LONG Delta) +{ + int x = 0; + int y = Size.cy - 1; + int c; + int length; + int width = ((Size.cx+1)/2); + int height = Size.cy - 1; + BYTE *begin = CompressedBits; + BYTE *bits = CompressedBits; + BYTE *temp; + while (y >= 0) + { + length = *bits++ / 2; + if (length) + { + c = *bits++; + while (length--) + { + if (x >= width) break; + temp = UncompressedBits + (((height - y) * Delta) + x); + x++; + *temp = c; + } + } + else + { + length = *bits++; + switch (length) + { + case RLE_EOL: + x = 0; + y--; + break; + case RLE_END: + return; + case RLE_DELTA: + x += (*bits++)/2; + y -= (*bits++)/2; + break; + default: + length /= 2; + while (length--) + { + c = *bits++; + if (x < width) + { + temp = UncompressedBits + (((height - y) * Delta) + x); + x++; + *temp = c; + } + } + if ((bits - begin) & 1) + { + bits++; + } + } + } + } +} + +VOID Decompress8bpp(SIZEL Size, BYTE *CompressedBits, BYTE *UncompressedBits, LONG Delta) +{ + int x = 0; + int y = Size.cy - 1; + int c; + int length; + int width = Size.cx; + int height = Size.cy - 1; + BYTE *begin = CompressedBits; + BYTE *bits = CompressedBits; + BYTE *temp; + while (y >= 0) + { + length = *bits++; + if (length) + { + c = *bits++; + while (length--) + { + if (x >= width) break; + temp = UncompressedBits + (((height - y) * Delta) + x); + x++; + *temp = c; + } + } + else + { + length = *bits++; + switch (length) + { + case RLE_EOL: + x = 0; + y--; + break; + case RLE_END: + return; + case RLE_DELTA: + x += *bits++; + y -= *bits++; + break; + default: + while (length--) + { + c = *bits++; + if (x < width) + { + temp = UncompressedBits + (((height - y) * Delta) + x); + x++; + *temp = c; + } + } + if ((bits - begin) & 1) + { + bits++; + } + } + } + } +} Propchange: branches/reactos-yarotows/subsystems/win32/win32k/eng/rlecomp.c ------------------------------------------------------------------------------ svn:eol-style = native 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] Sun Jun 6 09:02:15 2010 @@ -3,7 +3,8 @@ * PROJECT: ReactOS kernel * PURPOSE: GDI Driver Surace Functions * FILE: subsys/win32k/eng/surface.c - * PROGRAMER: Jason Filby + * PROGRAMERS: Jason Filby + * Timo Kreuzer * REVISION HISTORY: * 3/7/1999: Created * 9/11/2000: Updated to handle real pixel packed bitmaps (UPDATE TO DATE COMPLETED) @@ -17,43 +18,24 @@ #define NDEBUG #include <debug.h> -enum Rle_EscapeCodes -{ - RLE_EOL = 0, /* End of line */ - RLE_END = 1, /* End of bitmap */ - RLE_DELTA = 2 /* Delta */ +ULONG giUniqueSurface = 0; + +UCHAR +gajBitsPerFormat[11] = +{ + 0, /* 0: unused */ + 1, /* 1: BMF_1BPP */ + 4, /* 2: BMF_4BPP */ + 8, /* 3: BMF_8BPP */ + 16, /* 4: BMF_16BPP */ + 24, /* 5: BMF_24BPP */ + 32, /* 6: BMF_32BPP */ + 4, /* 7: BMF_4RLE */ + 8, /* 8: BMF_8RLE */ + 0, /* 9: BMF_JPEG */ + 0, /* 10: BMF_PNG */ }; -INT FASTCALL BitsPerFormat(ULONG Format) -{ - switch (Format) - { - case BMF_1BPP: - return 1; - - case BMF_4BPP: - /* Fall through */ - case BMF_4RLE: - return 4; - - case BMF_8BPP: - /* Fall through */ - case BMF_8RLE: - return 8; - - case BMF_16BPP: - return 16; - - case BMF_24BPP: - return 24; - - case BMF_32BPP: - return 32; - - default: - return 0; - } -} ULONG FASTCALL BitmapFormat(WORD Bits, DWORD Compression) { @@ -158,484 +140,189 @@ return TRUE; } -/* - * @implemented - */ -HBITMAP APIENTRY -EngCreateDeviceBitmap(IN DHSURF dhsurf, - IN SIZEL Size, - IN ULONG Format) -{ - HBITMAP NewBitmap; +static +void +SURFACE_vSetDefaultPalette( + PSURFACE psurfBmp) +{ + ULONG cBitsPixel = BitsPerFormat(psurfBmp->SurfObj.iBitmapFormat); + + /* Find a suitable palette for this bitmap + * Increment internal objects share count + * so we can call PALETTE_ShareUnlockPalette + * or GDIOBJ_IncrementShareCount safely */ + switch(cBitsPixel) + { + case 1: + psurfBmp->ppal = &gpalMono; + GDIOBJ_IncrementShareCount(&gpalMono.BaseObject); + break; + case 4: + case 8: + psurfBmp->ppal = PALETTE_ShareLockPalette(StockObjects[DEFAULT_PALETTE]); + break; + case 15: + psurfBmp->ppal = &gpalRGB555; + GDIOBJ_IncrementShareCount(&gpalRGB555.BaseObject); + break; + case 16: + psurfBmp->ppal = &gpalRGB565; + GDIOBJ_IncrementShareCount(&gpalRGB565.BaseObject); + break; + case 24: + case 32: + psurfBmp->ppal = &gpalRGB; + GDIOBJ_IncrementShareCount((POBJ)&gpalRGB); + break; + default: + DPRINT1("Could not determine palette for bit depth %u.\n", cBitsPixel); + break; + } +} + +PSURFACE +NTAPI +SURFACE_AllocSurface( + IN ULONG iType, + IN ULONG cx, + IN ULONG cy, + IN ULONG iFormat) +{ + PSURFACE psurf; SURFOBJ *pso; - - NewBitmap = EngCreateBitmap(Size, DIB_GetDIBWidthBytes(Size.cx, BitsPerFormat(Format)), Format, 0, NULL); - if (!NewBitmap) - { - DPRINT1("EngCreateBitmap failed\n"); - return 0; - } - - pso = EngLockSurface((HSURF)NewBitmap); - if (!pso) - { - DPRINT1("EngLockSurface failed on newly created bitmap!\n"); - GreDeleteObject(NewBitmap); - return NULL; - } - - pso->dhsurf = dhsurf; - pso->iType = STYPE_DEVBITMAP; - - EngUnlockSurface(pso); - - return NewBitmap; -} - -VOID Decompress4bpp(SIZEL Size, BYTE *CompressedBits, BYTE *UncompressedBits, LONG Delta) -{ - int x = 0; - int y = Size.cy - 1; - int c; - int length; - int width = ((Size.cx+1)/2); - int height = Size.cy - 1; - BYTE *begin = CompressedBits; - BYTE *bits = CompressedBits; - BYTE *temp; - while (y >= 0) - { - length = *bits++ / 2; - if (length) + + /* Allocate a SURFACE object */ + psurf = (PSURFACE)GDIOBJ_AllocObjWithHandle(GDI_OBJECT_TYPE_BITMAP); + + if (psurf) + { + /* Initialize the basic fields */ + pso = &psurf->SurfObj; + pso->hsurf = psurf->BaseObject.hHmgr; + pso->sizlBitmap.cx = cx; + pso->sizlBitmap.cy = cy; + pso->iBitmapFormat = iFormat; + pso->iType = iType; + pso->iUniq = InterlockedIncrement((PLONG)&giUniqueSurface); + + SURFACE_vSetDefaultPalette(psurf); + } + + return psurf; +} + +BOOL +NTAPI +SURFACE_bSetBitmapBits( + IN PSURFACE psurf, + IN USHORT fjBitmap, + IN ULONG ulWidth, + IN PVOID pvBits OPTIONAL) +{ + SURFOBJ *pso = &psurf->SurfObj; + PVOID pvSection; + + /* Only bitmaps can have bits */ + ASSERT(psurf->SurfObj.iType == STYPE_BITMAP); + + /* If no width is given, calculate it */ + if (!ulWidth) + ulWidth = DIB_GetDIBWidthBytes(pso->sizlBitmap.cx, + BitsPerFormat(pso->iBitmapFormat)); + + /* Calculate the bitmap size in bytes */ + pso->cjBits = ulWidth * pso->sizlBitmap.cy; + + /* Did the caller provide bits? */ + if (pvBits) + { + /* Yes, so let him free it */ + fjBitmap |= BMF_DONT_FREE; + } + else if (pso->cjBits) + { + /* We must allocate memory, check what kind */ + if (fjBitmap & BMF_USERMEM) { - c = *bits++; - while (length--) - { - if (x >= width) break; - temp = UncompressedBits + (((height - y) * Delta) + x); - x++; - *temp = c; - } + /* User mode memory was requested */ + pvBits = EngAllocUserMem(pso->cjBits, 0); } else { - length = *bits++; - switch (length) - { - case RLE_EOL: - x = 0; - y--; - break; - case RLE_END: - return; - case RLE_DELTA: - x += (*bits++)/2; - y -= (*bits++)/2; - break; - default: - length /= 2; - while (length--) - { - c = *bits++; - if (x < width) - { - temp = UncompressedBits + (((height - y) * Delta) + x); - x++; - *temp = c; - } - } - if ((bits - begin) & 1) - { - bits++; - } - } + /* Use a kernel mode section */ + fjBitmap |= BMF_KMSECTION; + pvBits = EngAllocSectionMem(&pvSection, + (fjBitmap & BMF_NOZEROINIT) ? + 0 : FL_ZERO_MEMORY, + pso->cjBits, TAG_DIB); + + /* Free the section already, but keep the mapping */ + if (pvBits) EngFreeSectionMem(pvSection, NULL); } - } -} - -VOID Decompress8bpp(SIZEL Size, BYTE *CompressedBits, BYTE *UncompressedBits, LONG Delta) -{ - int x = 0; - int y = Size.cy - 1; - int c; - int length; - int width = Size.cx; - int height = Size.cy - 1; - BYTE *begin = CompressedBits; - BYTE *bits = CompressedBits; - BYTE *temp; - while (y >= 0) - { - length = *bits++; - if (length) - { - c = *bits++; - while (length--) - { - if (x >= width) break; - temp = UncompressedBits + (((height - y) * Delta) + x); - x++; - *temp = c; - } - } - else - { - length = *bits++; - switch (length) - { - case RLE_EOL: - x = 0; - y--; - break; - case RLE_END: - return; - case RLE_DELTA: - x += *bits++; - y -= *bits++; - break; - default: - while (length--) - { - c = *bits++; - if (x < width) - { - temp = UncompressedBits + (((height - y) * Delta) + x); - x++; - *temp = c; - } - } - if ((bits - begin) & 1) - { - bits++; - } - } - } - } -} - -HBITMAP FASTCALL -IntCreateBitmap(IN SIZEL Size, - IN LONG Width, - IN ULONG Format, - IN ULONG Flags, - IN PVOID Bits) -{ + + /* Check for failure */ + if (!pvBits) return FALSE; + } + + /* Set pvBits, pvScan0 and lDelta */ + pso->pvBits = pvBits; + if (fjBitmap & BMF_TOPDOWN) + { + /* Topdown is the normal way */ + pso->pvScan0 = pso->pvBits; + pso->lDelta = ulWidth; + } + else + { + /* Inversed bitmap (bottom up) */ + pso->pvScan0 = (PVOID)((ULONG_PTR)pso->pvBits + pso->cjBits - ulWidth); + pso->lDelta = -ulWidth; + } + + pso->fjBitmap = fjBitmap; + + /* Success */ + return TRUE; +} + +HBITMAP +APIENTRY +EngCreateBitmap( + IN SIZEL sizl, + IN LONG lWidth, + IN ULONG iFormat, + IN ULONG fl, + IN PVOID pvBits) +{ + PSURFACE psurf; HBITMAP hbmp; - SURFOBJ *pso; - PSURFACE psurf; - PVOID UncompressedBits; - ULONG UncompressedFormat; - - if (Format == 0) - return 0; - - psurf = SURFACE_AllocSurfaceWithHandle(); - if (psurf == NULL) - { - return 0; - } - hbmp = psurf->BaseObject.hHmgr; - - pso = &psurf->SurfObj; - - if (Format == BMF_4RLE) - { - pso->lDelta = DIB_GetDIBWidthBytes(Size.cx, BitsPerFormat(BMF_4BPP)); - pso->cjBits = pso->lDelta * Size.cy; - 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) - { - pso->lDelta = DIB_GetDIBWidthBytes(Size.cx, BitsPerFormat(BMF_8BPP)); - pso->cjBits = pso->lDelta * Size.cy; - 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 - { - pso->lDelta = abs(Width); - pso->cjBits = pso->lDelta * Size.cy; - UncompressedBits = Bits; - UncompressedFormat = Format; - } - - if (UncompressedBits != NULL) - { - pso->pvBits = UncompressedBits; - Flags |= BMF_DONT_FREE; - } - else - { - if (pso->cjBits == 0) - { - pso->pvBits = NULL; - } - else - { - if (0 != (Flags & BMF_USERMEM)) - { - pso->pvBits = EngAllocUserMem(pso->cjBits, 0); - } - else - { - PVOID pvSection; - Flags |= BMF_KMSECTION; - pso->pvBits = EngAllocSectionMem(&pvSection, - (Flags & BMF_NOZEROINIT) ? - 0 : FL_ZERO_MEMORY, - pso->cjBits, TAG_DIB); - - /* Free the section already, keep the mapping */ - EngFreeSectionMem(pvSection, NULL); - } - if (pso->pvBits == NULL) - { - SURFACE_UnlockSurface(psurf); - SURFACE_FreeSurfaceByHandle(hbmp); - SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); - return 0; - } - } - } - - if (0 == (Flags & BMF_TOPDOWN)) - { - pso->pvScan0 = (PVOID)((ULONG_PTR)pso->pvBits + pso->cjBits - pso->lDelta); - pso->lDelta = - pso->lDelta; - } - else - { - pso->pvScan0 = pso->pvBits; - } - - pso->dhsurf = 0; /* device managed surface */ - pso->hsurf = (HSURF)hbmp; - pso->dhpdev = NULL; - pso->hdev = NULL; - pso->sizlBitmap = Size; - pso->iBitmapFormat = UncompressedFormat; - pso->iType = STYPE_BITMAP; - pso->fjBitmap = Flags & (BMF_TOPDOWN|BMF_NOZEROINIT|BMF_KMSECTION|BMF_USERMEM|BMF_DONT_FREE); - pso->iUniq = 0; - - psurf->flags = 0; - psurf->sizlDim.cx = 0; - psurf->sizlDim.cy = 0; - - psurf->hSecure = NULL; - psurf->hDIBSection = NULL; - + + /* Allocate a surface */ + psurf = SURFACE_AllocSurface(STYPE_BITMAP, sizl.cx, sizl.cy, iFormat); + if (!psurf) + { + DPRINT1("SURFACE_AllocSurface failed.\n"); + return NULL; + } + + /* Get the handle for the bitmap */ + hbmp = (HBITMAP)psurf->SurfObj.hsurf; + + /* Set the bitmap bits */ + if (!SURFACE_bSetBitmapBits(psurf, fl, lWidth, pvBits)) + { + /* Bail out if that failed */ + DPRINT1("SURFACE_bSetBitmapBits failed.\n"); + SURFACE_FreeSurfaceByHandle(hbmp); + return NULL; + } + + /* Set public ownership */ + GDIOBJ_SetOwnership(hbmp, NULL); + + /* Unlock the surface and return */ SURFACE_UnlockSurface(psurf); - return hbmp; -} - -/* Name gleaned from C++ symbol information for SURFMEM::bInitDIB */ -typedef struct _DEVBITMAPINFO -{ - ULONG Format; - ULONG Width; - ULONG Height; - ULONG Flags; - ULONG Size; -} DEVBITMAPINFO, *PDEVBITMAPINFO; - -SURFOBJ* -FASTCALL -SURFMEM_bCreateDib(IN PDEVBITMAPINFO BitmapInfo, - IN PVOID Bits) -{ - BOOLEAN Compressed = FALSE; - ULONG ScanLine = 0; // Compiler is dumb - ULONG Size; - SURFOBJ *pso; - PSURFACE psurf; - SIZEL LocalSize; - BOOLEAN AllocatedLocally = FALSE; - -/* - * First, check the format so we can get the aligned scanline width. - * RLE and the newer fancy-smanshy JPG/PNG support do NOT have scanlines - * since they are compressed surfaces! - */ - switch (BitmapInfo->Format) - { - case BMF_1BPP: - ScanLine = ((BitmapInfo->Width + 31) & ~31) >> 3; - break; - - case BMF_4BPP: - ScanLine = ((BitmapInfo->Width + 7) & ~7) >> 1; - break; - - case BMF_8BPP: - ScanLine = (BitmapInfo->Width + 3) & ~3; - break; - - case BMF_16BPP: - ScanLine = ((BitmapInfo->Width + 1) & ~1) << 1; - break; - - case BMF_24BPP: - ScanLine = ((BitmapInfo->Width * 3) + 3) & ~3; - break; - - case BMF_32BPP: - ScanLine = BitmapInfo->Width << 2; - break; - - case BMF_8RLE: - case BMF_4RLE: - case BMF_JPEG: - case BMF_PNG: - Compressed = TRUE; - break; - - default: - DPRINT1("Invalid bitmap format\n"); - return NULL; - } - - /* Does the device manage its own surface? */ - if (!Bits) - { - /* We need to allocate bits for the caller, figure out the size */ - if (Compressed) - { - /* Note: we should not be seeing this scenario from ENGDDI */ - ASSERT(FALSE); - Size = BitmapInfo->Size; - } - else - { - /* The height times the bytes for each scanline */ - Size = BitmapInfo->Height * ScanLine; - } - - if (Size) - { - /* Check for allocation flag */ - if (BitmapInfo->Flags & BMF_USERMEM) - { - /* Get the bits from user-mode memory */ - Bits = EngAllocUserMem(Size, 'mbuG'); - } - else - { - PVOID pvSection; - BitmapInfo->Flags |= BMF_KMSECTION; - Bits = EngAllocSectionMem(&pvSection, - (BitmapInfo->Flags & BMF_NOZEROINIT) ? - 0 : FL_ZERO_MEMORY, - Size, TAG_DIB); - - /* Free the section already, keep the mapping */ - EngFreeSectionMem(pvSection, NULL); - } - AllocatedLocally = TRUE; - /* Bail out if that failed */ - if (!Bits) return NULL; - } - } - else - { - /* Should not have asked for user memory */ - ASSERT((BitmapInfo->Flags & BMF_USERMEM) == 0); - - /* Must not free anything */ - BitmapInfo->Flags |= BMF_DONT_FREE; - } - - /* Allocate the actual surface object structure */ - psurf = SURFACE_AllocSurfaceWithHandle(); - if (!psurf) - { - if(Bits && AllocatedLocally) - { - if(BitmapInfo->Flags & BMF_USERMEM) - EngFreeUserMem(Bits); - else - EngFreeMem(Bits); - } - return NULL; - } - - /* We should now have our surface object */ - pso = &psurf->SurfObj; - - /* Save format and flags */ - pso->iBitmapFormat = BitmapInfo->Format; - pso->fjBitmap = BitmapInfo->Flags & (BMF_TOPDOWN | BMF_UMPDMEM | BMF_USERMEM | BMF_KMSECTION | BMF_DONT_FREE); - - /* Save size and type */ - LocalSize.cy = BitmapInfo->Height; - LocalSize.cx = BitmapInfo->Width; - pso->sizlBitmap = LocalSize; - pso->iType = STYPE_BITMAP; - - /* Device-managed surface, no flags or dimension */ - pso->dhsurf = 0; - pso->dhpdev = NULL; - pso->hdev = NULL; - psurf->flags = 0; - psurf->sizlDim.cx = 0; - psurf->sizlDim.cy = 0; - psurf->hSecure = NULL; - psurf->hDIBSection = NULL; - - /* Set bits */ - pso->pvBits = Bits; - - /* Check for bitmap type */ - if (!Compressed) - { - /* Number of bits is based on the height times the scanline */ - pso->cjBits = BitmapInfo->Height * ScanLine; - if (BitmapInfo->Flags & BMF_TOPDOWN) - { - /* For topdown, the base address starts with the bits */ - pso->pvScan0 = pso->pvBits; - pso->lDelta = ScanLine; - } - else - { - /* Otherwise we start with the end and go up */ - pso->pvScan0 = (PVOID)((ULONG_PTR)pso->pvBits + pso->cjBits - ScanLine); - pso->lDelta = -ScanLine; - } - } - else - { - /* Compressed surfaces don't have scanlines! */ - pso->lDelta = 0; - pso->cjBits = BitmapInfo->Size; - - /* Check for JPG or PNG */ - if ((BitmapInfo->Format != BMF_JPEG) && (BitmapInfo->Format != BMF_PNG)) - { - /* Wherever the bit data is */ - pso->pvScan0 = pso->pvBits; - } - else - { - /* Fancy formats don't use a base address */ - pso->pvScan0 = NULL; - ASSERT(FALSE); // ENGDDI shouldn't be creating PNGs for drivers ;-) - } - } - - /* Finally set the handle and uniq */ - pso->hsurf = (HSURF)psurf->BaseObject.hHmgr; - pso->iUniq = 0; - - /* Unlock and return the surface */ - SURFACE_UnlockSurface(psurf); - return pso; } /* @@ -643,103 +330,66 @@ */ HBITMAP APIENTRY -EngCreateBitmap(IN SIZEL Size, - IN LONG Width, - IN ULONG Format, - IN ULONG Flags, - IN PVOID Bits) -{ - SURFOBJ* Surface; - DEVBITMAPINFO BitmapInfo; - - /* Capture the parameters */ - BitmapInfo.Format = Format; - BitmapInfo.Width = Size.cx; - BitmapInfo.Height = Size.cy; - BitmapInfo.Flags = Flags; - - /* - * If the display driver supports framebuffer access, use the scanline width - * to determine the actual width of the bitmap, and convert it to pels instead - * of bytes. - */ - if ((Bits) && (Width)) - { - switch (BitmapInfo.Format) - { - /* Do the conversion for each bit depth we support */ - case BMF_1BPP: - BitmapInfo.Width = Width * 8; - break; - case BMF_4BPP: - BitmapInfo.Width = Width * 2; - break; - case BMF_8BPP: - BitmapInfo.Width = Width; - break; - case BMF_16BPP: - BitmapInfo.Width = Width / 2; - break; - case BMF_24BPP: - BitmapInfo.Width = Width / 3; - break; - case BMF_32BPP: - BitmapInfo.Width = Width / 4; - break; - } - } - - /* Now create the surface */ - Surface = SURFMEM_bCreateDib(&BitmapInfo, Bits); - if (!Surface) return 0; - - /* Set public ownership and reutrn the handle */ - GDIOBJ_SetOwnership(Surface->hsurf, NULL); - return Surface->hsurf; -} - -/* - * @unimplemented - */ -HSURF APIENTRY -EngCreateDeviceSurface(IN DHSURF dhsurf, - IN SIZEL Size, - IN ULONG Format) -{ +EngCreateDeviceBitmap( + IN DHSURF dhsurf, + IN SIZEL sizl, + IN ULONG iFormat) +{ + PSURFACE psurf; + HBITMAP hbmp; + + /* Allocate a surface */ + psurf = SURFACE_AllocSurface(STYPE_DEVBITMAP, sizl.cx, sizl.cy, iFormat); + if (!psurf) + { + return 0; + } + + /* Set the device handle */ + psurf->SurfObj.dhsurf = dhsurf; + + /* Get the handle for the bitmap */ + hbmp = (HBITMAP)psurf->SurfObj.hsurf; + + /* Set public ownership */ + GDIOBJ_SetOwnership(hbmp, NULL); + + /* Unlock the surface and return */ + SURFACE_UnlockSurface(psurf); + return hbmp; +} + +HSURF +APIENTRY +EngCreateDeviceSurface( + IN DHSURF dhsurf, + IN SIZEL sizl, + IN ULONG iFormat) +{ + PSURFACE psurf; HSURF hsurf; - SURFOBJ *pso; - PSURFACE psurf; - - psurf = SURFACE_AllocSurfaceWithHandle(); + + /* Allocate a surface */ + psurf = SURFACE_AllocSurface(STYPE_DEVICE, sizl.cx, sizl.cy, iFormat); if (!psurf) { return 0; } - hsurf = psurf->BaseObject.hHmgr; + /* Set the device handle */ + psurf->SurfObj.dhsurf = dhsurf; + + /* Get the handle for the surface */ + hsurf = psurf->SurfObj.hsurf; + + /* Set public ownership */ GDIOBJ_SetOwnership(hsurf, NULL); - pso = &psurf->SurfObj; - - pso->dhsurf = dhsurf; - pso->hsurf = hsurf; - pso->sizlBitmap = Size; - pso->iBitmapFormat = Format; - pso->lDelta = DIB_GetDIBWidthBytes(Size.cx, BitsPerFormat(Format)); - pso->iType = STYPE_DEVICE; - pso->iUniq = 0; - pso->pvBits = NULL; - - psurf->flags = 0; - + /* Unlock the surface and return */ SURFACE_UnlockSurface(psurf); - return hsurf; } -/* - * @implemented - */ BOOL APIENTRY EngAssociateSurface( @@ -777,10 +427,8 @@ return TRUE; } -/* - * @implemented - */ -BOOL APIENTRY +BOOL +APIENTRY EngModifySurface( IN HSURF hsurf, IN HDEV hdev, @@ -823,10 +471,9 @@ return TRUE; } -/* - * @implemented - */ -BOOL APIENTRY + +BOOL +APIENTRY EngDeleteSurface(IN HSURF hsurf) { GDIOBJ_SetOwnership(hsurf, PsGetCurrentProcess()); @@ -834,17 +481,16 @@ return TRUE; } -/* - * @implemented - */ -BOOL APIENTRY -EngEraseSurface(SURFOBJ *pso, - RECTL *Rect, - ULONG iColor) +BOOL +APIENTRY +EngEraseSurface( + SURFOBJ *pso, + RECTL *prcl, + ULONG iColor) { ASSERT(pso); - ASSERT(Rect); - return FillSolid(pso, Rect, iColor); + ASSERT(prcl); + return FillSolid(pso, prcl, iColor); } /* @@ -857,10 +503,8 @@ } -/* - * @implemented - */ -SURFOBJ * APIENTRY +SURFOBJ * +APIENTRY EngLockSurface(IN HSURF hsurf) { SURFACE *psurf = GDIOBJ_ShareLockObj(hsurf, GDI_OBJECT_TYPE_BITMAP); @@ -871,20 +515,15 @@ return NULL; } - -/* - * @implemented - */ -VOID APIENTRY +VOID +APIENTRY NtGdiEngUnlockSurface(IN SURFOBJ *pso) { EngUnlockSurface(pso); } -/* - * @implemented - */ -VOID APIENTRY +VOID +APIENTRY EngUnlockSurface(IN SURFOBJ *pso) { if (pso != NULL) @@ -894,5 +533,74 @@ } } +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) + { + pso->lDelta = DIB_GetDIBWidthBytes(Size.cx, BitsPerFormat(BMF_4BPP)); + pso->cjBits = pso->lDelta * Size.cy; + 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) + { + pso->lDelta = DIB_GetDIBWidthBytes(Size.cx, BitsPerFormat(BMF_8BPP)); + pso->cjBits = pso->lDelta * Size.cy; + 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 + { + pso->lDelta = abs(Width); + pso->cjBits = pso->lDelta * Size.cy; + 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/eng.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/include/eng.h [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/include/eng.h [iso-8859-1] Sun Jun 6 09:02:15 2010 @@ -36,3 +36,6 @@ IN SIZE_T cjSize, IN ULONG ulTag); +VOID Decompress4bpp(SIZEL Size, BYTE *CompressedBits, BYTE *UncompressedBits, LONG Delta); +VOID Decompress8bpp(SIZEL Size, BYTE *CompressedBits, BYTE *UncompressedBits, LONG Delta); + 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] Sun Jun 6 09:02:15 2010 @@ -92,7 +92,6 @@ /* Internal interface */ -#define SURFACE_AllocSurface() ((PSURFACE) GDIOBJ_AllocObj(GDIObjType_SURF_TYPE)) #define SURFACE_AllocSurfaceWithHandle() ((PSURFACE) GDIOBJ_AllocObjWithHandle(GDI_OBJECT_TYPE_BITMAP)) #define SURFACE_FreeSurface(pBMObj) GDIOBJ_FreeObj((POBJ) pBMObj, GDIObjType_SURF_TYPE) #define SURFACE_FreeSurfaceByHandle(hBMObj) GDIOBJ_FreeObjByHandle((HGDIOBJ) hBMObj, GDI_OBJECT_TYPE_BITMAP) @@ -109,8 +108,17 @@ BOOL INTERNAL_CALL SURFACE_Cleanup(PVOID ObjectBody); +PSURFACE +NTAPI +SURFACE_AllocSurface( + IN ULONG iType, + IN ULONG cx, + IN ULONG cy, + IN ULONG iFormat); + #define GDIDEV(SurfObj) ((PDEVOBJ *)((SurfObj)->hdev)) #define GDIDEVFUNCS(SurfObj) ((PDEVOBJ *)((SurfObj)->hdev))->DriverFunctions -INT FASTCALL BitsPerFormat (ULONG Format); ULONG FASTCALL BitmapFormat (WORD Bits, DWORD Compression); +extern UCHAR gajBitsPerFormat[]; +#define BitsPerFormat(Format) gajBitsPerFormat[Format] Modified: branches/reactos-yarotows/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] Sun Jun 6 09:02:15 2010 @@ -78,6 +78,7 @@ <file>paint.c</file> <file>pdevobj.c</file> <file>perfcnt.c</file> + <file>rlecomp.c</file> <file>semaphor.c</file> <file>sort.c</file> <file>string.c</file>

14 years, 6 months

[tkreuzer] 47611: [WIN32K] Once again: Do not free the memory for the bitmap bits, when you have not allocated them.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Jun 6 08:32:01 2010 New Revision: 47611 URL: http://svn.reactos.org/svn/reactos?rev=47611&view=rev Log: [WIN32K] Once again: Do not free the memory for the bitmap bits, when you have not allocated them. Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/alphablend.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/alphablend.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/eng/alphablend.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/eng/alphablend.c [iso-8859-1] Sun Jun 6 08:32:01 2010 @@ -144,7 +144,6 @@ NULL, NULL, NULL, ROP3_TO_ROP4(SRCCOPY))) { DPRINT1("EngStretchBlt failed!\n"); - EngFreeMem(SourceStretchedObj->pvBits); EngUnlockSurface(SourceStretchedObj); EngDeleteSurface((HSURF)SourceStretchedBitmap); return FALSE; @@ -161,7 +160,6 @@ { if (SourceStretchedObj != NULL) { - EngFreeMem(SourceStretchedObj->pvBits); EngUnlockSurface(SourceStretchedObj); } if (SourceStretchedBitmap != 0) @@ -180,7 +178,6 @@ IntEngLeave(&EnterLeaveSource); if (SourceStretchedObj != NULL) { - EngFreeMem(SourceStretchedObj->pvBits); EngUnlockSurface(SourceStretchedObj); } if (SourceStretchedBitmap != 0) @@ -258,7 +255,6 @@ if (SourceStretchedObj != NULL) { - EngFreeMem(SourceStretchedObj->pvBits); EngUnlockSurface(SourceStretchedObj); } if (SourceStretchedBitmap != 0)

14 years, 6 months

[tkreuzer] 47610: [WIN32K] Add another failure check to EngAllocSectionMem

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Jun 6 07:47:31 2010 New Revision: 47610 URL: http://svn.reactos.org/svn/reactos?rev=47610&view=rev Log: [WIN32K] Add another failure check to EngAllocSectionMem Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/mapping.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/mapping.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/eng/mapping.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/eng/mapping.c [iso-8859-1] Sun Jun 6 07:47:31 2010 @@ -219,6 +219,11 @@ /* Allocate a section object */ pSection = EngCreateSection(fl, cjSize, ulTag); + if (!pSection) + { + *ppvSection = NULL; + return NULL; + } /* Map the section in session space */ Status = MmMapViewInSessionSpace(pSection->pvSectionObject,

14 years, 6 months

[tkreuzer] 47609: [WIN32K] Do not free the memory for the bitmap bits, when you have not allocated them. Fixes bugcheck with VBox driver.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Jun 6 07:45:36 2010 New Revision: 47609 URL: http://svn.reactos.org/svn/reactos?rev=47609&view=rev Log: [WIN32K] Do not free the memory for the bitmap bits, when you have not allocated them. Fixes bugcheck with VBox driver. Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/engmisc.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/engmisc.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/eng/engmisc.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/eng/engmisc.c [iso-8859-1] Sun Jun 6 07:45:36 2010 @@ -127,7 +127,6 @@ &ClippedDestRect, &SrcPoint)) { EngDeleteClip(EnterLeave->TrivialClipObj); - EngFreeMem((*ppsoOutput)->pvBits); EngUnlockSurface(*ppsoOutput); EngDeleteSurface((HSURF)EnterLeave->OutputBitmap); return FALSE; @@ -219,7 +218,6 @@ Result = TRUE; } } - EngFreeMem(EnterLeave->OutputObj->pvBits); EngUnlockSurface(EnterLeave->OutputObj); EngDeleteSurface((HSURF)EnterLeave->OutputBitmap); EngDeleteClip(EnterLeave->TrivialClipObj);

14 years, 6 months

[sir_richard] 47608: [NTOS]: Clean up /mm a bit, move sysldr.c into ARM3.

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Sun Jun 6 06:38:51 2010 New Revision: 47608 URL: http://svn.reactos.org/svn/reactos?rev=47608&view=rev Log: [NTOS]: Clean up /mm a bit, move sysldr.c into ARM3. Added: trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c - copied, changed from r47576, trunk/reactos/ntoskrnl/mm/sysldr.c Removed: trunk/reactos/ntoskrnl/mm/elf.inc.h trunk/reactos/ntoskrnl/mm/elf32.c trunk/reactos/ntoskrnl/mm/elf64.c trunk/reactos/ntoskrnl/mm/sysldr.c Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Copied: trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c (from r47576, trunk/reactos/ntoskrnl/mm/sysldr.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c?… Removed: trunk/reactos/ntoskrnl/mm/elf.inc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/elf.inc.h?rev=… Removed: trunk/reactos/ntoskrnl/mm/elf32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/elf32.c?rev=47… Removed: trunk/reactos/ntoskrnl/mm/elf64.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/elf64.c?rev=47… Removed: trunk/reactos/ntoskrnl/mm/sysldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/sysldr.c?rev=4… Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl-generic.…

14 years, 6 months

[sir_richard] 47607: [NTOS]: Silence more debug spew.

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Sun Jun 6 06:37:53 2010 New Revision: 47607 URL: http://svn.reactos.org/svn/reactos?rev=47607&view=rev Log: [NTOS]: Silence more debug spew. Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c 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 06:37:53 2010 @@ -91,7 +91,7 @@ { PFN_NUMBER PageFrameNumber; MMPTE TempPte; - DPRINT1("ARM3 Demand Zero Page Fault Handler for address: %p in process: %p\n", + DPRINT("ARM3 Demand Zero Page Fault Handler for address: %p in process: %p\n", Address, Process);

14 years, 6 months

[tkreuzer] 47606: [WIN32K] - Allocate bitmaps as kernel sections, instead of from paged pool, like it's done in windows. - Fix SURFACE_Cleanup. It was only freeing the memory for API_BITMAPs. If memory was allocated by a driver it never got freed. - Add BMF_RLE_HACK flag to free decompressed RLE bits - Support FL_ZERO_MEMORY in EngAllocSectionMem - Set SURFOBJ::iType when creating a surface

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Jun 6 05:12:56 2010 New Revision: 47606 URL: http://svn.reactos.org/svn/reactos?rev=47606&view=rev Log: [WIN32K] - Allocate bitmaps as kernel sections, instead of from paged pool, like it's done in windows. - Fix SURFACE_Cleanup. It was only freeing the memory for API_BITMAPs. If memory was allocated by a driver it never got freed. - Add BMF_RLE_HACK flag to free decompressed RLE bits - Support FL_ZERO_MEMORY in EngAllocSectionMem - Set SURFOBJ::iType when creating a surface Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/mapping.c branches/reactos-yarotows/subsystems/win32/win32k/eng/mem.c branches/reactos-yarotows/subsystems/win32/win32k/eng/surface.c branches/reactos-yarotows/subsystems/win32/win32k/include/eng.h branches/reactos-yarotows/subsystems/win32/win32k/include/surface.h Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/mapping.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/eng/mapping.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/eng/mapping.c [iso-8859-1] Sun Jun 6 05:12:56 2010 @@ -232,6 +232,11 @@ return NULL; } + if (fl & FL_ZERO_MEMORY) + { + RtlZeroMemory(pSection->pvMappedBase, cjSize); + } + /* Set section pointer and return base address */ *ppvSection = pSection; return pSection->pvMappedBase; Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/mem.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/eng/mem.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/eng/mem.c [iso-8859-1] Sun Jun 6 05:12:56 2010 @@ -79,6 +79,7 @@ } /* TODO: Add allocation info to AVL tree (stored inside W32PROCESS structure) */ + //hSecure = EngSecureMem(NewMem, cj); return NewMem; } @@ -166,6 +167,7 @@ HANDLE APIENTRY EngSecureMem(PVOID Address, ULONG Length) { + return (HANDLE)-1; // HACK!!! return MmSecureVirtualMemory(Address, Length, PAGE_READWRITE); } @@ -175,6 +177,7 @@ VOID APIENTRY EngUnsecureMem(HANDLE Mem) { + if (Mem == (HANDLE)-1) return; // HACK!!! MmUnsecureVirtualMemory((PVOID) Mem); } 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] Sun Jun 6 05:12:56 2010 @@ -90,46 +90,63 @@ } } -BOOL INTERNAL_CALL +BOOL +INTERNAL_CALL SURFACE_Cleanup(PVOID ObjectBody) { PSURFACE psurf = (PSURFACE)ObjectBody; PVOID pvBits = psurf->SurfObj.pvBits; - - /* If this is an API bitmap, free the bits */ - if (pvBits != NULL && - (psurf->flags & API_BITMAP)) - { - /* Check if we have a DIB section */ - if (psurf->hSecure) - { - // FIXME: IMPLEMENT ME! - // MmUnsecureVirtualMemory(psurf->hSecure); - if (psurf->hDIBSection) - { - /* DIB was created from a section */ - NTSTATUS Status; - - pvBits = (PVOID)((ULONG_PTR)pvBits - psurf->dwOffset); - Status = ZwUnmapViewOfSection(NtCurrentProcess(), pvBits); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Could not unmap section view!\n"); - // Should we BugCheck here? - } - } - else - { - /* DIB was allocated */ - EngFreeUserMem(pvBits); - } + NTSTATUS Status; + + /* Check if the surface has bits */ + if (pvBits) + { + /* Only bitmaps can have bits */ + ASSERT(psurf->SurfObj.iType == STYPE_BITMAP); + + /* Check if it is a DIB section */ + if (psurf->hDIBSection) + { + /* Unsecure the memory */ + EngUnsecureMem(psurf->hSecure); + + /* Calculate the real start of the section */ + pvBits = (PVOID)((ULONG_PTR)pvBits - psurf->dwOffset); + + /* Unmap the section */ + Status = MmUnmapViewOfSection(PsGetCurrentProcess(), pvBits); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Could not unmap section view!\n"); + // Should we BugCheck here? + ASSERT(FALSE); + } + } + else if (psurf->SurfObj.fjBitmap & BMF_USERMEM) + { + /* Bitmap was allocated from usermode memory */ + EngFreeUserMem(pvBits); + } + else if (psurf->SurfObj.fjBitmap & BMF_KMSECTION) + { + /* Bitmap was allocated from a kernel section */ + if (!EngFreeSectionMem(NULL, pvBits)) + { + DPRINT1("EngFreeSectionMem failed for %p!\n", pvBits); + // Should we BugCheck here? + ASSERT(FALSE); + } + } + else if (psurf->SurfObj.fjBitmap & BMF_RLE_HACK) + { + /* HACK: Free RLE decompressed bits */ + EngFreeMem(pvBits); } else { - // FIXME: use TAG - ExFreePool(psurf->SurfObj.pvBits); - } - + /* There should be nothing to free */ + ASSERT(psurf->SurfObj.fjBitmap & BMF_DONT_FREE); + } } /* Free palette */ @@ -168,6 +185,8 @@ } pso->dhsurf = dhsurf; + pso->iType = STYPE_DEVBITMAP; + EngUnlockSurface(pso); return NewBitmap; @@ -206,13 +225,13 @@ case RLE_EOL: x = 0; y--; - break; + break; case RLE_END: return; case RLE_DELTA: x += (*bits++)/2; y -= (*bits++)/2; - break; + break; default: length /= 2; while (length--) @@ -306,7 +325,7 @@ PSURFACE psurf; PVOID UncompressedBits; ULONG UncompressedFormat; - + if (Format == 0) return 0; @@ -326,6 +345,7 @@ 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) { @@ -334,6 +354,7 @@ 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 { @@ -346,6 +367,7 @@ if (UncompressedBits != NULL) { pso->pvBits = UncompressedBits; + Flags |= BMF_DONT_FREE; } else { @@ -361,9 +383,15 @@ } else { - pso->pvBits = EngAllocMem(0 != (Flags & BMF_NOZEROINIT) ? - 0 : FL_ZERO_MEMORY, - pso->cjBits, TAG_DIB); + PVOID pvSection; + Flags |= BMF_KMSECTION; + pso->pvBits = EngAllocSectionMem(&pvSection, + (Flags & BMF_NOZEROINIT) ? + 0 : FL_ZERO_MEMORY, + pso->cjBits, TAG_DIB); + + /* Free the section already, keep the mapping */ + EngFreeSectionMem(pvSection, NULL); } if (pso->pvBits == NULL) { @@ -392,7 +420,7 @@ pso->sizlBitmap = Size; pso->iBitmapFormat = UncompressedFormat; pso->iType = STYPE_BITMAP; - pso->fjBitmap = Flags & (BMF_TOPDOWN | BMF_NOZEROINIT); + pso->fjBitmap = Flags & (BMF_TOPDOWN|BMF_NOZEROINIT|BMF_KMSECTION|BMF_USERMEM|BMF_DONT_FREE); pso->iUniq = 0; psurf->flags = 0; @@ -430,11 +458,11 @@ SIZEL LocalSize; BOOLEAN AllocatedLocally = FALSE; - /* +/* * First, check the format so we can get the aligned scanline width. * RLE and the newer fancy-smanshy JPG/PNG support do NOT have scanlines * since they are compressed surfaces! - */ + */ switch (BitmapInfo->Format) { case BMF_1BPP: @@ -499,10 +527,15 @@ } else { - /* Get kernel bits (zeroed out if requested) */ - Bits = EngAllocMem((BitmapInfo->Flags & BMF_NOZEROINIT) ? 0 : FL_ZERO_MEMORY, - Size, - TAG_DIB); + PVOID pvSection; + BitmapInfo->Flags |= BMF_KMSECTION; + Bits = EngAllocSectionMem(&pvSection, + (BitmapInfo->Flags & BMF_NOZEROINIT) ? + 0 : FL_ZERO_MEMORY, + Size, TAG_DIB); + + /* Free the section already, keep the mapping */ + EngFreeSectionMem(pvSection, NULL); } AllocatedLocally = TRUE; /* Bail out if that failed */ @@ -513,6 +546,9 @@ { /* Should not have asked for user memory */ ASSERT((BitmapInfo->Flags & BMF_USERMEM) == 0); + + /* Must not free anything */ + BitmapInfo->Flags |= BMF_DONT_FREE; } /* Allocate the actual surface object structure */ @@ -534,7 +570,7 @@ /* Save format and flags */ pso->iBitmapFormat = BitmapInfo->Format; - pso->fjBitmap = BitmapInfo->Flags & (BMF_TOPDOWN | BMF_UMPDMEM | BMF_USERMEM); + pso->fjBitmap = BitmapInfo->Flags & (BMF_TOPDOWN | BMF_UMPDMEM | BMF_USERMEM | BMF_KMSECTION | BMF_DONT_FREE); /* Save size and type */ LocalSize.cy = BitmapInfo->Height; @@ -692,6 +728,7 @@ pso->lDelta = DIB_GetDIBWidthBytes(Size.cx, BitsPerFormat(Format)); pso->iType = STYPE_DEVICE; pso->iUniq = 0; + pso->pvBits = NULL; psurf->flags = 0; Modified: branches/reactos-yarotows/subsystems/win32/win32k/include/eng.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/include/eng.h [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/include/eng.h [iso-8859-1] Sun Jun 6 05:12:56 2010 @@ -21,3 +21,18 @@ VOID FASTCALL IntGdiAcquireSemaphore ( HSEMAPHORE hsem ); VOID FASTCALL IntGdiReleaseSemaphore ( HSEMAPHORE hsem ); ULONGLONG APIENTRY EngGetTickCount(VOID); + +BOOL +APIENTRY +EngFreeSectionMem( + IN PVOID pvSection OPTIONAL, + IN PVOID pvMappedBase OPTIONAL); + +PVOID +APIENTRY +EngAllocSectionMem( + OUT PVOID *ppvSection, + IN ULONG fl, + IN SIZE_T cjSize, + IN ULONG ulTag); + 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] Sun Jun 6 05:12:56 2010 @@ -86,6 +86,10 @@ #define PDEV_SURFACE 0x80000000 +#define BMF_DONT_FREE 0x100 +#define BMF_RLE_HACK 0x200 + + /* Internal interface */ #define SURFACE_AllocSurface() ((PSURFACE) GDIOBJ_AllocObj(GDIObjType_SURF_TYPE))

14 years, 6 months

[sir_richard] 47605: [NTOS]: Fix for the the bug that broke ARM3 paged pool (and has been corrupting ReactOS paged pool behind the scenes for years): When a KCB (key stuff) is allocated, the key name associated with it receives an NCB (name stuff). In case this name is already used, a cache exists, and an existing NCB is grabbed, and its reference count is increased. When the KCB goes away, its NCB loses a reference. When all references are gone, the NCB is destroyed. Simple enough. It turns out

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Sun Jun 6 03:04:03 2010 New Revision: 47605 URL: http://svn.reactos.org/svn/reactos?rev=47605&view=rev Log: [NTOS]: Fix for the the bug that broke ARM3 paged pool (and has been corrupting ReactOS paged pool behind the scenes for years): When a KCB (key stuff) is allocated, the key name associated with it receives an NCB (name stuff). In case this name is already used, a cache exists, and an existing NCB is grabbed, and its reference count is increased. When the KCB goes away, its NCB loses a reference. When all references are gone, the NCB is destroyed. Simple enough. It turns out that what was currently happening is that an NCB would get dereferenced to 0, deleted, but still remained attached to a valid KCB (shouldn't happen). When that KCB went away, the NCB's reference count was dropped to... -1, and then -2, -3, -4, etc. Remember this is a FREED NCB. In other words, freed pool, that might now belong to someone else, was getting "-1" operations on it. So any value stored in that freed pool would get decremented by one. In ARM3 paged pool, because the allocator keeps a linked list, what would happen is that the FLINK pointer would be 0xE0F01234 instead of 0xE1A01234. What happened is that "0xE1A0" was treated as the reference count of the freed NCB, and it kept getting dereferenced down to 0xE0F0. Proving this was easy, by adding an ASSERT(Ncb->RefCount >= 1) to the routine that dereferences NCBs. Obviously, we should not try to dereference an NCB that has a reference count of 0, because that NCB is now gone. Adding this ASSERT immediately caught the error, regardless of which pool implementation was being used, so this was a problem in ReactOS today, right now. My first thought was that we were taking references to NCBs without incrementing the reference count. The NCB gets referenced in two places: when it gets created, and everytime a cached NCB is re-used for a new KCB (all this in CmpGetNameControlBlock). After adding some tracing code, I discovered that CmpGetNameControlBlock would sometimes return an NCB that was cached, but without referencing it. I did not understand why, since the code says "if (Found) Ncb->RefCount++". Further analysis showed that what would happen, on this particular instance, is that NCB "Foo" was being Found, but NCB "Bar" was returned instead. Therefore, causing some serious issues: First, NCB Foo was receiving too many references. Secondly, NCB Bar was not being referenced. Worse though, it turns out this would happen when "Foo" was the CORRECT NCB, and "Bar" was an INCORRECT NCB. What do we mean by correct and incorrect? Well, because NCBs are hashed, it's possible for two NCB hashes to be VERY SIMILAR, but only ONE OF THOSE NCBs will be the right one -- for example, HKLM\Software\Hello vs HKLM\Software\Hell. In our case, when a KCB for "Hello" was searching for the "Hello" NCB, the "Hello NCB would get a reference, but the "Hell" NCB would be returned. In other words, whenever a HASH COLLISION happened, the incorrect NCB was returned, probably messing up registry code in the process. Subsequently, when the KCB was dereferneced, it was attached to this incorrect, under-referenced NCB. Since in ANY hash collision with "Hell", in our example, the "Hell" NCB would come first, subsequent searches for "Hellmaster", "Hellboy", "Hello World" would all still return "Hell". Eventually when all these KCBs would go away, the "Hell" NCB would reach even -18 references. The simple solution? When the CORRECT NCB is found, STOP SEARCHING! By adding a simple "break" statement. Otherwise, even after the correct NCB is found, further, incorrect, collided NCBs are found, and eventually the last one ("Hell", in our example) got returned, and under-referenced, while "Hellmaster" and "Hellboy" were not returned, but LEAKED REFERENCES. There you have it folks, MEMORY CORRUPTION (USE-AFTER-FREE), INCORRECT REGISTRY NAME PARSHING, REFERENCE LEAKS and REFERENCE UNDERRUNS, all due to ONE missing "break;". -r Modified: trunk/reactos/ntoskrnl/config/cmkcbncb.c Modified: trunk/reactos/ntoskrnl/config/cmkcbncb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmkcbncb.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmkcbncb.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmkcbncb.c [iso-8859-1] Sun Jun 6 03:04:03 2010 @@ -234,7 +234,9 @@ if (Found) { /* Reference it */ + ASSERT(Ncb->RefCount != 0xFFFF); Ncb->RefCount++; + break; } } @@ -320,6 +322,7 @@ CmpAcquireNcbLockExclusiveByKey(ConvKey); /* Decrease the reference count */ + ASSERT(Ncb->RefCount >= 1); if (!(--Ncb->RefCount)) { /* Find the NCB in the table */ @@ -579,7 +582,7 @@ NewRefCount = OldRefCount - 1; /* Check if we still have references */ - if( (NewRefCount & 0xFFFF) > 0) + if ((NewRefCount & 0xFFFF) > 0) { /* Do the dereference */ if (InterlockedCompareExchange((PLONG)&Kcb->RefCount,

14 years, 6 months

[sir_richard] 47604: [NTOS]: Kill some debug spew.

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Sun Jun 6 02:49:26 2010 New Revision: 47604 URL: http://svn.reactos.org/svn/reactos?rev=47604&view=rev Log: [NTOS]: Kill some debug spew. Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c trunk/reactos/ntoskrnl/mm/ARM3/pool.c trunk/reactos/ntoskrnl/mm/mmfault.c 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 02:49:26 2010 @@ -107,7 +107,7 @@ /* Get a page */ PageFrameNumber = MiRemoveAnyPage(0); - DPRINT1("New pool page: %lx\n", PageFrameNumber); + DPRINT("New pool page: %lx\n", PageFrameNumber); /* Initialize it */ MiInitializePfn(PageFrameNumber, PointerPte, TRUE); @@ -135,7 +135,7 @@ // // It's all good now // - DPRINT1("Paged pool page has now been paged in\n"); + DPRINT("Paged pool page has now been paged in\n"); return STATUS_PAGE_FAULT_DEMAND_ZERO; } 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 02:49:26 2010 @@ -422,7 +422,6 @@ KeFlushEntireTb(TRUE, TRUE); /* Setup a demand-zero writable PTE */ - DPRINT1("Setting up demand zero\n"); MI_MAKE_SOFTWARE_PTE(&TempPte, MM_READWRITE); // Modified: trunk/reactos/ntoskrnl/mm/mmfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mmfault.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mmfault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/mmfault.c [iso-8859-1] Sun Jun 6 02:49:26 2010 @@ -290,7 +290,7 @@ // // Hand it off to more competent hands... // - DPRINT1("ARM3 fault %p\n", MemoryArea); + DPRINT("ARM3 fault %p\n", MemoryArea); return MmArmAccessFault(StoreInstruction, Address, Mode, TrapInformation); }

14 years, 6 months

[tkreuzer] 47603: [WIN32K] Make the SURFACE structure a bit more like the half documented windows version.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Jun 5 23:19:41 2010 New Revision: 47603 URL: http://svn.reactos.org/svn/reactos?rev=47603&view=rev Log: [WIN32K] Make the SURFACE structure a bit more like the half documented windows version. Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/alphablend.c branches/reactos-yarotows/subsystems/win32/win32k/eng/bitblt.c branches/reactos-yarotows/subsystems/win32/win32k/eng/copybits.c branches/reactos-yarotows/subsystems/win32/win32k/eng/engmisc.c branches/reactos-yarotows/subsystems/win32/win32k/eng/gradient.c branches/reactos-yarotows/subsystems/win32/win32k/eng/lineto.c branches/reactos-yarotows/subsystems/win32/win32k/eng/paint.c branches/reactos-yarotows/subsystems/win32/win32k/eng/stretchblt.c branches/reactos-yarotows/subsystems/win32/win32k/eng/surface.c branches/reactos-yarotows/subsystems/win32/win32k/eng/transblt.c 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/dcobjs.c branches/reactos-yarotows/subsystems/win32/win32k/objects/dcutil.c branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/alphablend.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/eng/alphablend.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/eng/alphablend.c [iso-8859-1] Sat Jun 5 23:19:41 2010 @@ -301,7 +301,7 @@ } /* Call the driver's DrvAlphaBlend if available */ - if (psurfDest->flHooks & HOOK_ALPHABLEND) + if (psurfDest->flags & HOOK_ALPHABLEND) { ret = GDIDEVFUNCS(psoDest).AlphaBlend( psoDest, psoSource, ClipRegion, ColorTranslation, Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/bitblt.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/eng/bitblt.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/eng/bitblt.c [iso-8859-1] Sat Jun 5 23:19:41 2010 @@ -585,10 +585,10 @@ } /* Is the target surface device managed? */ - if (psurfTrg->flHooks & HOOK_BITBLT) + if (psurfTrg->flags & HOOK_BITBLT) { /* Is the source a different device managed surface? */ - if (psoSrc && psoSrc->hdev != psoTrg->hdev && psurfSrc->flHooks & HOOK_BITBLT) + if (psoSrc && psoSrc->hdev != psoTrg->hdev && psurfSrc->flags & HOOK_BITBLT) { DPRINT1("Need to copy to standard bitmap format!\n"); ASSERT(FALSE); @@ -598,7 +598,7 @@ } /* Is the source surface device managed? */ - else if (psoSrc && psurfSrc->flHooks & HOOK_BITBLT) + else if (psoSrc && psurfSrc->flags & HOOK_BITBLT) { pfnBitBlt = GDIDEVFUNCS(psoSrc).BitBlt; } Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/copybits.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/eng/copybits.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/eng/copybits.c [iso-8859-1] Sat Jun 5 23:19:41 2010 @@ -67,7 +67,7 @@ if (psoDest->iType!=STYPE_BITMAP) { /* FIXME: Eng* functions shouldn't call Drv* functions. ? */ - if (psurfDest->flHooks & HOOK_COPYBITS) + if (psurfDest->flags & HOOK_COPYBITS) { ret = GDIDEVFUNCS(psoDest).CopyBits( psoDest, psoSource, Clip, ColorTranslation, DestRect, SourcePoint); @@ -80,7 +80,7 @@ if (psoSource->iType!=STYPE_BITMAP) { /* FIXME: Eng* functions shouldn't call Drv* functions. ? */ - if (psurfSource->flHooks & HOOK_COPYBITS) + if (psurfSource->flags & HOOK_COPYBITS) { ret = GDIDEVFUNCS(psoSource).CopyBits( psoDest, psoSource, Clip, ColorTranslation, DestRect, SourcePoint); Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/engmisc.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/eng/engmisc.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/eng/engmisc.c [iso-8859-1] Sat Jun 5 23:19:41 2010 @@ -56,7 +56,7 @@ { /* Driver needs to support DrvCopyBits, else we can't do anything */ SURFACE *psurfDest = CONTAINING_RECORD(psoDest, SURFACE, SurfObj); - if (!(psurfDest->flHooks & HOOK_COPYBITS)) + if (!(psurfDest->flags & HOOK_COPYBITS)) { return FALSE; } @@ -149,7 +149,7 @@ if (NULL != *ppsoOutput) { SURFACE* psurfOutput = CONTAINING_RECORD(*ppsoOutput, SURFACE, SurfObj); - if (0 != (psurfOutput->flHooks & HOOK_SYNCHRONIZE)) + if (0 != (psurfOutput->flags & HOOK_SYNCHRONIZE)) { if (NULL != GDIDEVFUNCS(*ppsoOutput).SynchronizeSurface) { Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/gradient.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/eng/gradient.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/eng/gradient.c [iso-8859-1] Sat Jun 5 23:19:41 2010 @@ -548,7 +548,7 @@ psurf = CONTAINING_RECORD(psoDest, SURFACE, SurfObj); ASSERT(psurf); - if(psurf->flHooks & HOOK_GRADIENTFILL) + if(psurf->flags & HOOK_GRADIENTFILL) { Ret = GDIDEVFUNCS(psoDest).GradientFill( psoDest, pco, pxlo, pVertex, nVertex, pMesh, nMesh, Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/lineto.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/eng/lineto.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/eng/lineto.c [iso-8859-1] Sat Jun 5 23:19:41 2010 @@ -565,7 +565,7 @@ if (b.left == b.right) b.right++; if (b.top == b.bottom) b.bottom++; - if (psurfDest->flHooks & HOOK_LINETO) + if (psurfDest->flags & HOOK_LINETO) { /* Call the driver's DrvLineTo */ ret = GDIDEVFUNCS(psoDest).LineTo( @@ -573,7 +573,7 @@ } #if 0 - if (! ret && (psurfDest->flHooks & HOOK_STROKEPATH)) + if (! ret && (psurfDest->flags & HOOK_STROKEPATH)) { /* FIXME: Emulate LineTo using drivers DrvStrokePath and set ret on success */ } Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/paint.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/eng/paint.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/eng/paint.c [iso-8859-1] Sat Jun 5 23:19:41 2010 @@ -124,7 +124,7 @@ DPRINT("pso->iType == %d\n", pso->iType); /* Is the surface's Paint function hooked? */ - if((pso->iType!=STYPE_BITMAP) && (psurf->flHooks & HOOK_PAINT)) + if((pso->iType!=STYPE_BITMAP) && (psurf->flags & HOOK_PAINT)) { // Call the driver's DrvPaint ret = GDIDEVFUNCS(pso).Paint( Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/stretchblt.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/eng/stretchblt.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/eng/stretchblt.c [iso-8859-1] Sat Jun 5 23:19:41 2010 @@ -471,7 +471,7 @@ /* Prepare color adjustment */ /* Call the driver's DrvStretchBlt if available */ - if (psurfDest->flHooks & HOOK_STRETCHBLTROP) + if (psurfDest->flags & HOOK_STRETCHBLTROP) { /* Drv->StretchBltROP (look at http://www.osronline.com/ddkx/graphics/ddifncs_0z3b.htm ) */ ret = GDIDEVFUNCS(psoDest).StretchBltROP(psoDest, 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] Sat Jun 5 23:19:41 2010 @@ -98,7 +98,7 @@ /* If this is an API bitmap, free the bits */ if (pvBits != NULL && - (psurf->flFlags & BITMAPOBJ_IS_APIBITMAP)) + (psurf->flags & API_BITMAP)) { /* Check if we have a DIB section */ if (psurf->hSecure) @@ -395,10 +395,9 @@ pso->fjBitmap = Flags & (BMF_TOPDOWN | BMF_NOZEROINIT); pso->iUniq = 0; - psurf->flHooks = 0; - psurf->flFlags = 0; - psurf->dimension.cx = 0; - psurf->dimension.cy = 0; + psurf->flags = 0; + psurf->sizlDim.cx = 0; + psurf->sizlDim.cy = 0; psurf->hSecure = NULL; psurf->hDIBSection = NULL; @@ -547,12 +546,11 @@ pso->dhsurf = 0; pso->dhpdev = NULL; pso->hdev = NULL; - psurf->flFlags = 0; - psurf->dimension.cx = 0; - psurf->dimension.cy = 0; + psurf->flags = 0; + psurf->sizlDim.cx = 0; + psurf->sizlDim.cy = 0; psurf->hSecure = NULL; psurf->hDIBSection = NULL; - psurf->flHooks = 0; /* Set bits */ pso->pvBits = Bits; @@ -695,7 +693,7 @@ pso->iType = STYPE_DEVICE; pso->iUniq = 0; - psurf->flHooks = 0; + psurf->flags = 0; SURFACE_UnlockSurface(psurf); @@ -731,7 +729,8 @@ pso->dhpdev = ppdev->dhpdev; /* Hook up specified functions */ - psurf->flHooks = flHooks; + psurf->flags &= ~HOOK_FLAGS; + psurf->flags |= (flHooks & HOOK_FLAGS); /* Get palette */ psurf->ppal = PALETTE_ShareLockPalette(ppdev->devinfo.hpalDefault); @@ -776,7 +775,8 @@ pso->dhpdev = ppdev->dhpdev; /* Hook up specified functions */ - psurf->flHooks = flHooks; + psurf->flags &= ~HOOK_FLAGS; + psurf->flags |= (flHooks & HOOK_FLAGS); /* Get palette */ psurf->ppal = PALETTE_ShareLockPalette(ppdev->devinfo.hpalDefault); Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/transblt.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/eng/transblt.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/eng/transblt.c [iso-8859-1] Sat Jun 5 23:19:41 2010 @@ -284,7 +284,7 @@ OutputRect = InputClippedRect; } - if(psurfDest->flHooks & HOOK_TRANSPARENTBLT) + if(psurfDest->flags & HOOK_TRANSPARENTBLT) { Ret = GDIDEVFUNCS(psoDest).TransparentBlt( psoDest, psoSource, Clip, ColorTranslation, &OutputRect, 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] Sat Jun 5 23:19:41 2010 @@ -8,41 +8,83 @@ /* GDI surface object */ typedef struct _SURFACE { - BASEOBJECT BaseObject; + BASEOBJECT BaseObject; - SURFOBJ SurfObj; - FLONG flHooks; - FLONG flFlags; - struct _PALETTE *ppal; + SURFOBJ SurfObj; + //XDCOBJ * pdcoAA; + FLONG flags; + struct _PALETTE *ppal; + //UINT unk_050; - union - { - HANDLE hSecureUMPD; // if UMPD_SURFACE set - HANDLE hMirrorParent;// if MIRROR_SURFACE set - HANDLE hDDSurface; // if DIRECTDRAW_SURFACE set - }; + union + { + HANDLE hSecureUMPD; // if UMPD_SURFACE set + HANDLE hMirrorParent;// if MIRROR_SURFACE set + HANDLE hDDSurface; // if DIRECTDRAW_SURFACE set + }; - SIZEL dimension; /* For SetBitmapDimension(), do NOT use + SIZEL sizlDim; /* For SetBitmapDimension(), do NOT use to get width/height of bitmap, use bitmap.bmWidth/bitmap.bmHeight for that */ - HDC hDC; // Doc in "Undocumented Windows", page 546, seems to be supported with XP. - ULONG cRef; // 0x064 - HPALETTE hpalHint; + HDC hdc; // Doc in "Undocumented Windows", page 546, seems to be supported with XP. + ULONG cRef; + HPALETTE hpalHint; - /* For device-independent bitmaps: */ - HANDLE hDIBSection; - HANDLE hSecure; - DWORD dwOffset; + /* For device-independent bitmaps: */ + HANDLE hDIBSection; + HANDLE hSecure; + DWORD dwOffset; + //UINT unk_078; /* reactos specific */ - DWORD dsBitfields[3]; // hack, should probably use palette instead - DWORD biClrUsed; - DWORD biClrImportant; + DWORD dsBitfields[3]; // hack, should probably use palette instead + DWORD biClrUsed; + DWORD biClrImportant; } SURFACE, *PSURFACE; -#define BITMAPOBJ_IS_APIBITMAP 0x1 +// flags field: +//#define HOOK_BITBLT 0x00000001 +//#define HOOK_STRETCHBLT 0x00000002 +//#define HOOK_PLGBLT 0x00000004 +//#define HOOK_TEXTOUT 0x00000008 +//#define HOOK_PAINT 0x00000010 +//#define HOOK_STROKEPATH 0x00000020 +//#define HOOK_FILLPATH 0x00000040 +//#define HOOK_STROKEANDFILLPATH 0x00000080 +//#define HOOK_LINETO 0x00000100 +//#define SHAREACCESS_SURFACE 0x00000200 +//#define HOOK_COPYBITS 0x00000400 +//#define REDIRECTION_SURFACE 0x00000800 // ? +//#define HOOK_MOVEPANNING 0x00000800 +//#define HOOK_SYNCHRONIZE 0x00001000 +//#define HOOK_STRETCHBLTROP 0x00002000 +//#define HOOK_SYNCHRONIZEACCESS 0x00004000 +//#define USE_DEVLOCK_SURFACE 0x00004000 +//#define HOOK_TRANSPARENTBLT 0x00008000 +//#define HOOK_ALPHABLEND 0x00010000 +//#define HOOK_GRADIENTFILL 0x00020000 +//#if (NTDDI_VERSION < 0x06000000) +// #define HOOK_FLAGS 0x0003B5FF +//#else +// #define HOOK_FLAGS 0x0003B5EF +//#endif +#define UMPD_SURFACE 0x00040000 +#define MIRROR_SURFACE 0x00080000 +#define DIRECTDRAW_SURFACE 0x00100000 +#define DRIVER_CREATED_SURFACE 0x00200000 +#define ENG_CREATE_DEVICE_SURFACE 0x00400000 +#define DDB_SURFACE 0x00800000 +#define LAZY_DELETE_SURFACE 0x01000000 +#define BANDING_SURFACE 0x02000000 +#define API_BITMAP 0x04000000 +#define PALETTE_SELECT_SET 0x08000000 +#define UNREADABLE_SURFACE 0x10000000 +#define DYNAMIC_MODE_PALETTE 0x20000000 +#define ABORT_SURFACE 0x40000000 +#define PDEV_SURFACE 0x80000000 + /* Internal interface */ 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] Sat Jun 5 23:19:41 2010 @@ -79,8 +79,8 @@ return NULL; } - psurfBmp->flFlags = BITMAPOBJ_IS_APIBITMAP; - psurfBmp->hDC = NULL; // Fixme + psurfBmp->flags = API_BITMAP; + psurfBmp->hdc = NULL; // Fixme if (NULL != pBits) { @@ -192,8 +192,8 @@ /* Set palette */ psurf->ppal = PALETTE_ShareLockPalette(Dc->ppdev->devinfo.hpalDefault); /* Set flags */ - psurf->flFlags = BITMAPOBJ_IS_APIBITMAP; - psurf->hDC = NULL; // Fixme + psurf->flags = API_BITMAP; + psurf->hdc = NULL; // Fixme SURFACE_UnlockSurface(psurf); } else @@ -222,8 +222,8 @@ psurfBmp->ppal = psurf->ppal; GDIOBJ_IncrementShareCount((POBJ)psurf->ppal); /* Set flags */ - psurfBmp->flFlags = BITMAPOBJ_IS_APIBITMAP; - psurfBmp->hDC = NULL; // Fixme + psurfBmp->flags = API_BITMAP; + psurfBmp->hdc = NULL; // Fixme SURFACE_UnlockSurface(psurfBmp); } else @@ -362,7 +362,7 @@ _SEH2_TRY { ProbeForWrite(Dimension, sizeof(SIZE), 1); - *Dimension = psurfBmp->dimension; + *Dimension = psurfBmp->sizlDim; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -689,7 +689,7 @@ _SEH2_TRY { ProbeForWrite(Size, sizeof(SIZE), 1); - *Size = psurf->dimension; + *Size = psurf->sizlDim; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -699,8 +699,8 @@ } /* The dimension is changed even if writing the old value failed */ - psurf->dimension.cx = Width; - psurf->dimension.cy = Height; + psurf->sizlDim.cx = Width; + psurf->sizlDim.cy = Height; SURFACE_UnlockSurface(psurf); @@ -924,7 +924,7 @@ IntGetBitmapBits(Bitmap, bm.bmWidthBytes * abs(bm.bmHeight), buf); IntSetBitmapBits(resBitmap, bm.bmWidthBytes * abs(bm.bmHeight), buf); ExFreePoolWithTag(buf,TAG_BITMAP); - resBitmap->flFlags = Bitmap->flFlags; + resBitmap->flags = Bitmap->flags; /* Copy palette */ if (Bitmap->ppal) { @@ -1033,14 +1033,14 @@ NtGdiGetDCforBitmap( IN HBITMAP hsurf) { - HDC hDC = NULL; + HDC hdc = NULL; PSURFACE psurf = SURFACE_LockSurface(hsurf); if (psurf) { - hDC = psurf->hDC; + hdc = psurf->hdc; SURFACE_UnlockSurface(psurf); } - return hDC; + return hdc; } /* EOF */ Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/dcobjs.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/dcobjs.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/dcobjs.c [iso-8859-1] Sat Jun 5 23:19:41 2010 @@ -291,7 +291,7 @@ DC_vSelectSurface(pDC, psurfBmp); // If Info DC this is zero and pSurface is moved to DC->pSurfInfo. - psurfBmp->hDC = hDC; + psurfBmp->hdc = hDC; /* FIXME; improve by using a region without a handle and selecting it */ hVisRgn = IntSysCreateRectRgn( 0, Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/dcutil.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/dcutil.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/dcutil.c [iso-8859-1] Sat Jun 5 23:19:41 2010 @@ -145,7 +145,7 @@ if (pdc->ppdev->flFlags & PDEV_META_DEVICE) { pSurface = pdc->dclevel.pSurface; - if (pSurface && pSurface->flFlags & PDEV_SURFACE) + if (pSurface && pSurface->flags & PDEV_SURFACE) { rclClip.left += pdc->ppdev->ptlOrigion.x; rclClip.top += pdc->ppdev->ptlOrigion.y; 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] Sat Jun 5 23:19:41 2010 @@ -1535,7 +1535,7 @@ bmp->hDIBSection = section; bmp->hSecure = hSecure; bmp->dwOffset = offset; - bmp->flFlags = BITMAPOBJ_IS_APIBITMAP; + bmp->flags = API_BITMAP; bmp->dsBitfields[0] = dsBitfields[0]; bmp->dsBitfields[1] = dsBitfields[1]; bmp->dsBitfields[2] = dsBitfields[2];

14 years, 6 months

← Newer
1
...
28
29
30
31
32
33
34
...
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