Ros-diffs March 2009

ros-diffs@reactos.org

28 participants
483 discussions

[fireball] 40074: Evgeniy Boltik <bstsoft@narod.ru> - Rework 16bit DIB alphablend to do alpha operations in source's palette (32bpp) to obtain much better output quality without data loss. See issue #3708 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Tue Mar 17 21:00:28 2009 New Revision: 40074 URL: http://svn.reactos.org/svn/reactos?rev=40074&view=rev Log: Evgeniy Boltik <bstsoft(a)narod.ru> - Rework 16bit DIB alphablend to do alpha operations in source's palette (32bpp) to obtain much better output quality without data loss. See issue #3708 for more details. Modified: trunk/reactos/subsystems/win32/win32k/dib/dib16bpp.c Modified: trunk/reactos/subsystems/win32/win32k/dib/dib16bpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/dib16bpp.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/dib/dib16bpp.c [iso-8859-1] Tue Mar 17 21:00:28 2009 @@ -541,6 +541,12 @@ } static __inline UCHAR +Clamp8(ULONG val) +{ + return (val > 255) ? 255 : val; +} + +static __inline UCHAR Clamp6(ULONG val) { return (val > 63) ? 63 : val; @@ -555,9 +561,13 @@ register PUSHORT Dst; ULONG DstDelta; BLENDFUNCTION BlendFunc; - register NICEPIXEL16 DstPixel; - register NICEPIXEL32 SrcPixel; + register NICEPIXEL16 SrcPixel16; + register NICEPIXEL16 DstPixel16; + register NICEPIXEL32 SrcPixel32; + register NICEPIXEL32 DstPixel32; UCHAR Alpha, SrcBpp; + XLATEGDI* XlateGDI; + XLATEOBJ* SrcXlateObj; DPRINT("DIB_16BPP_AlphaBlend: srcRect: (%d,%d)-(%d,%d), dstRect: (%d,%d)-(%d,%d)\n", SourceRect->left, SourceRect->top, SourceRect->right, SourceRect->bottom, @@ -586,6 +596,21 @@ BitsPerFormat(Source->iBitmapFormat) != 32) { DPRINT1("Source bitmap must be 32bpp when AC_SRC_ALPHA is set\n"); + return FALSE; + } + + if (!ColorTranslation) + { + DPRINT1("ColorTranslation must not be NULL!\n"); + return FALSE; + } + + XlateGDI = ObjToGDI(ColorTranslation, XLATE); + SrcXlateObj = IntEngCreateXlate(0, 0, XlateGDI->SourcePal, XlateGDI->DestPal); + + if (!SrcXlateObj) + { + DPRINT1("IntEngCreateXlate failed\n"); return FALSE; } @@ -604,52 +629,61 @@ { if (SrcBpp <= 16) { - DstPixel.us = DIB_GetSource(Source, SrcX++, SrcY, ColorTranslation); - SrcPixel.col.red = (DstPixel.col.red << 3) | (DstPixel.col.red >> 2); - - SrcPixel.col.green = (DstPixel.col.green << 2) | - (DstPixel.col.green >> 4); - - SrcPixel.col.blue = (DstPixel.col.blue << 3) | (DstPixel.col.blue >> 2); + SrcPixel16.us = DIB_GetSource(Source, SrcX++, SrcY, ColorTranslation); + SrcPixel32.col.red = (SrcPixel16.col.red << 3); + SrcPixel32.col.green = (SrcPixel16.col.green << 2); + SrcPixel32.col.blue = (SrcPixel16.col.blue << 3); + + SrcPixel32.col.red = SrcPixel32.col.red * BlendFunc.SourceConstantAlpha / 255; + SrcPixel32.col.green = SrcPixel32.col.green * BlendFunc.SourceConstantAlpha / 255; + SrcPixel32.col.blue = SrcPixel32.col.blue * BlendFunc.SourceConstantAlpha / 255; + SrcPixel32.col.alpha = (SrcBpp == 32) ? + (SrcPixel32.col.alpha * BlendFunc.SourceConstantAlpha / 255) : + BlendFunc.SourceConstantAlpha; + + Alpha = ((BlendFunc.AlphaFormat & AC_SRC_ALPHA) != 0) ? + SrcPixel32.col.alpha : BlendFunc.SourceConstantAlpha; + + DstPixel16.us = *Dst; + DstPixel16.col.red = Clamp5(DstPixel16.col.red * (255 - Alpha) / 255 + + (SrcPixel32.col.red >> 3)); + + DstPixel16.col.green = Clamp6(DstPixel16.col.green * (255 - Alpha) / 255 + + (SrcPixel32.col.green >> 2)); + + DstPixel16.col.blue = Clamp5(DstPixel16.col.blue * (255 - Alpha) / 255 + + (SrcPixel32.col.blue >> 3)); + + *Dst++ = DstPixel16.us; } else { - SrcPixel.ul = DIB_GetSourceIndex(Source, SrcX++, SrcY); - } - SrcPixel.col.red = SrcPixel.col.red * - BlendFunc.SourceConstantAlpha / 255; - - SrcPixel.col.green = SrcPixel.col.green * - BlendFunc.SourceConstantAlpha / 255; - - SrcPixel.col.blue = SrcPixel.col.blue * - BlendFunc.SourceConstantAlpha / 255; - - SrcPixel.col.alpha = (SrcBpp == 32) ? - (SrcPixel.col.alpha * - BlendFunc.SourceConstantAlpha / 255) : - BlendFunc.SourceConstantAlpha; - - Alpha = ((BlendFunc.AlphaFormat & AC_SRC_ALPHA) != 0) ? - SrcPixel.col.alpha : BlendFunc.SourceConstantAlpha; - - DstPixel.us = *Dst; - DstPixel.col.red = Clamp5(DstPixel.col.red * (255 - Alpha) / 255 + - (SrcPixel.col.red >> 3)); - - DstPixel.col.green = Clamp6(DstPixel.col.green * (255 - Alpha) / 255 + - (SrcPixel.col.green >> 2)); - - DstPixel.col.blue = Clamp5(DstPixel.col.blue * (255 - Alpha) / 255 + - (SrcPixel.col.blue >> 3)); - - *Dst++ = DstPixel.us; + SrcPixel32.ul = DIB_GetSourceIndex(Source, SrcX++, SrcY); + + SrcPixel32.col.red = SrcPixel32.col.red * BlendFunc.SourceConstantAlpha / 255; + SrcPixel32.col.green = SrcPixel32.col.green * BlendFunc.SourceConstantAlpha / 255; + SrcPixel32.col.blue = SrcPixel32.col.blue * BlendFunc.SourceConstantAlpha / 255; + SrcPixel32.col.alpha = (SrcBpp == 32) ? + (SrcPixel32.col.alpha * BlendFunc.SourceConstantAlpha / 255) : + BlendFunc.SourceConstantAlpha; + + Alpha = ((BlendFunc.AlphaFormat & AC_SRC_ALPHA) != 0) ? + SrcPixel32.col.alpha : BlendFunc.SourceConstantAlpha; + + DstPixel32.ul = XLATEOBJ_iXlate(SrcXlateObj, *Dst); + SrcPixel32.col.red = Clamp8(DstPixel32.col.red * (255 - Alpha) / 255 + SrcPixel32.col.red); + SrcPixel32.col.green = Clamp8(DstPixel32.col.green * (255 - Alpha) / 255 + SrcPixel32.col.green); + SrcPixel32.col.blue = Clamp8(DstPixel32.col.blue * (255 - Alpha) / 255 + SrcPixel32.col.blue); + *Dst++ = XLATEOBJ_iXlate(ColorTranslation, SrcPixel32.ul); + } } Dst = (PUSHORT)((ULONG_PTR)Dst + DstDelta); SrcY++; } + if (SrcXlateObj) EngDeleteXlate(SrcXlateObj); + return TRUE; }

16 years, 2 months

[tkreuzer] 40073: [FORMATTING] - apply ansi style formatting with an indentation of 4 spaces - Add 2 FIXME comments, regarding MmSecureVirtualmemory - no code change

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Mar 17 09:34:09 2009 New Revision: 40073 URL: http://svn.reactos.org/svn/reactos?rev=40073&view=rev Log: [FORMATTING] - apply ansi style formatting with an indentation of 4 spaces - Add 2 FIXME comments, regarding MmSecureVirtualmemory - no code change Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] Tue Mar 17 09:34:09 2009 @@ -33,370 +33,378 @@ HBITMAP APIENTRY IntGdiCreateBitmap( - INT Width, - INT Height, - UINT Planes, - UINT BitsPixel, + INT Width, + INT Height, + UINT Planes, + UINT BitsPixel, IN OPTIONAL LPBYTE pBits) { - HBITMAP hBitmap; - SIZEL Size; - LONG WidthBytes; - - /* NOTE: Windows also doesn't store nr. of planes separately! */ - BitsPixel = BITMAP_GetRealBitsPixel(BitsPixel * Planes); - - /* Check parameters */ - if (BitsPixel == 0 || Width <= 0 || Width >= 0x8000000 || Height == 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); - - /* Make sure that cjBits will not overflow */ - if ((ULONGLONG)WidthBytes * Size.cy >= 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; - } - - PSURFACE psurfBmp = SURFACE_LockSurface(hBitmap); - if (psurfBmp == NULL) - { - NtGdiDeleteObject(hBitmap); - return NULL; - } - - psurfBmp->flFlags = BITMAPOBJ_IS_APIBITMAP; - psurfBmp->hDC = NULL; // Fixme - - if (NULL != pBits) - { - IntSetBitmapBits(psurfBmp, psurfBmp->SurfObj.cjBits, pBits); - } - - 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 hBitmap; + SIZEL Size; + LONG WidthBytes; + PSURFACE psurfBmp; + + /* NOTE: Windows also doesn't store nr. of planes separately! */ + BitsPixel = BITMAP_GetRealBitsPixel(BitsPixel * Planes); + + /* Check parameters */ + if (BitsPixel == 0 || Width <= 0 || Width >= 0x8000000 || Height == 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); + + /* Make sure that cjBits will not overflow */ + if ((ULONGLONG)WidthBytes * Size.cy >= 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) + { + NtGdiDeleteObject(hBitmap); + return NULL; + } + + psurfBmp->flFlags = BITMAPOBJ_IS_APIBITMAP; + psurfBmp->hDC = NULL; // Fixme + + if (NULL != pBits) + { + IntSetBitmapBits(psurfBmp, psurfBmp->SurfObj.cjBits, pBits); + } + + 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, + INT Width, + INT Height, + UINT Planes, + UINT BitsPixel, IN OPTIONAL LPBYTE pUnsafeBits) { - if (pUnsafeBits) - { - BOOL Hit = FALSE; - UINT cjBits = BITMAP_GetWidthBytes(Width, BitsPixel) * abs(Height); - - _SEH2_TRY - { - ProbeForRead(pUnsafeBits, cjBits, 1); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Hit = TRUE; - } - _SEH2_END - - if (Hit) return 0; - } - - return IntGdiCreateBitmap(Width, Height, Planes, BitsPixel, pUnsafeBits); + if (pUnsafeBits) + { + BOOL Hit = FALSE; + UINT cjBits = BITMAP_GetWidthBytes(Width, BitsPixel) * abs(Height); + + // FIXME: Use MmSecureVirtualMemory + _SEH2_TRY + { + ProbeForRead(pUnsafeBits, cjBits, 1); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Hit = TRUE; + } + _SEH2_END + + if (Hit) return 0; + } + + return IntGdiCreateBitmap(Width, Height, Planes, BitsPixel, pUnsafeBits); } HBITMAP FASTCALL IntCreateCompatibleBitmap( - PDC Dc, - INT Width, - INT Height) -{ - HBITMAP Bmp = NULL; - - /* MS doc says if width or height is 0, return 1-by-1 pixel, monochrome bitmap */ - if (0 == Width || 0 == Height) - { - Bmp = NtGdiGetStockObject(DEFAULT_BITMAP); - } - else - { - if (Dc->DC_Type != DC_TYPE_MEMORY) - { - Bmp = IntGdiCreateBitmap( abs(Width), - abs(Height), - IntGdiGetDeviceCaps(Dc,PLANES), - IntGdiGetDeviceCaps(Dc,BITSPIXEL), - NULL); - } - else - { - DIBSECTION dibs; - INT Count; - PSURFACE psurf = SURFACE_LockSurface( Dc->w.hBitmap ); - Count = BITMAP_GetObject(psurf, sizeof(dibs), &dibs); - - if (Count) - { - if (Count == sizeof(BITMAP)) - { - - /* We have a bitmap bug!!! W/O the HACK, we have white icons. - - MSDN Note: When a memory device context is created, it initially - has a 1-by-1 monochrome bitmap selected into it. If this memory - device context is used in CreateCompatibleBitmap, the bitmap that - is created is a monochrome bitmap. To create a color bitmap, use - the hDC that was used to create the memory device context, as - shown in the following code: - - HDC memDC = CreateCompatibleDC ( hDC ); - HBITMAP memBM = CreateCompatibleBitmap ( hDC, nWidth, nHeight ); - SelectObject ( memDC, memBM ); - */ - Bmp = IntGdiCreateBitmap( abs(Width), - abs(Height), - dibs.dsBm.bmPlanes, - IntGdiGetDeviceCaps(Dc,BITSPIXEL),//<-- HACK! dibs.dsBm.bmBitsPixel, // <-- Correct! + PDC Dc, + INT Width, + INT Height) +{ + HBITMAP Bmp = NULL; + + /* MS doc says if width or height is 0, return 1-by-1 pixel, monochrome bitmap */ + if (0 == Width || 0 == Height) + { + Bmp = NtGdiGetStockObject(DEFAULT_BITMAP); + } + else + { + if (Dc->DC_Type != DC_TYPE_MEMORY) + { + Bmp = IntGdiCreateBitmap(abs(Width), + abs(Height), + IntGdiGetDeviceCaps(Dc,PLANES), + IntGdiGetDeviceCaps(Dc,BITSPIXEL), + NULL); + } + else + { + DIBSECTION dibs; + INT Count; + PSURFACE psurf = SURFACE_LockSurface(Dc->w.hBitmap); + Count = BITMAP_GetObject(psurf, sizeof(dibs), &dibs); + + if (Count) + { + if (Count == sizeof(BITMAP)) + { + /* We have a bitmap bug!!! W/O the HACK, we have white icons. + + MSDN Note: When a memory device context is created, it initially + has a 1-by-1 monochrome bitmap selected into it. If this memory + device context is used in CreateCompatibleBitmap, the bitmap that + is created is a monochrome bitmap. To create a color bitmap, use + the hDC that was used to create the memory device context, as + shown in the following code: + + HDC memDC = CreateCompatibleDC(hDC); + HBITMAP memBM = CreateCompatibleBitmap(hDC, nWidth, nHeight); + SelectObject(memDC, memBM); + */ + Bmp = IntGdiCreateBitmap(abs(Width), + abs(Height), + dibs.dsBm.bmPlanes, + IntGdiGetDeviceCaps(Dc,BITSPIXEL),//<-- HACK! dibs.dsBm.bmBitsPixel, // <-- Correct! NULL); - } - else - - { - /* A DIB section is selected in the DC */ - BITMAPINFO *bi; - PVOID Bits; - - /* Allocate memory for a BITMAPINFOHEADER structure and a - color table. The maximum number of colors in a color table - is 256 which corresponds to a bitmap with depth 8. - Bitmaps with higher depths don't have color tables. */ - bi = ExAllocatePoolWithTag(PagedPool, sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD), TAG_TEMP); - - if (bi) - { - bi->bmiHeader.biSize = sizeof(bi->bmiHeader); - bi->bmiHeader.biWidth = Width; - bi->bmiHeader.biHeight = Height; - bi->bmiHeader.biPlanes = dibs.dsBmih.biPlanes; - bi->bmiHeader.biBitCount = dibs.dsBmih.biBitCount; - bi->bmiHeader.biCompression = dibs.dsBmih.biCompression; - bi->bmiHeader.biSizeImage = 0; - bi->bmiHeader.biXPelsPerMeter = dibs.dsBmih.biXPelsPerMeter; - bi->bmiHeader.biYPelsPerMeter = dibs.dsBmih.biYPelsPerMeter; - bi->bmiHeader.biClrUsed = dibs.dsBmih.biClrUsed; - bi->bmiHeader.biClrImportant = dibs.dsBmih.biClrImportant; - - if (bi->bmiHeader.biCompression == BI_BITFIELDS) - { - /* Copy the color masks */ - RtlCopyMemory(bi->bmiColors, dibs.dsBitfields, 3 * sizeof(DWORD)); - } - else if (bi->bmiHeader.biBitCount <= 8) - { - /* Copy the color table */ - UINT Index; - PPALGDI PalGDI = PALETTE_LockPalette(psurf->hDIBPalette); - - if (!PalGDI) + } + else + { + /* A DIB section is selected in the DC */ + BITMAPINFO *bi; + PVOID Bits; + + /* Allocate memory for a BITMAPINFOHEADER structure and a + color table. The maximum number of colors in a color table + is 256 which corresponds to a bitmap with depth 8. + Bitmaps with higher depths don't have color tables. */ + bi = ExAllocatePoolWithTag(PagedPool, + sizeof(BITMAPINFOHEADER) + + 256 * sizeof(RGBQUAD), + TAG_TEMP); + + if (bi) { - ExFreePoolWithTag(bi, TAG_TEMP); - SURFACE_UnlockSurface( psurf ); - SetLastWin32Error(ERROR_INVALID_HANDLE); - return 0; + bi->bmiHeader.biSize = sizeof(bi->bmiHeader); + bi->bmiHeader.biWidth = Width; + bi->bmiHeader.biHeight = Height; + bi->bmiHeader.biPlanes = dibs.dsBmih.biPlanes; + bi->bmiHeader.biBitCount = dibs.dsBmih.biBitCount; + bi->bmiHeader.biCompression = dibs.dsBmih.biCompression; + bi->bmiHeader.biSizeImage = 0; + bi->bmiHeader.biXPelsPerMeter = dibs.dsBmih.biXPelsPerMeter; + bi->bmiHeader.biYPelsPerMeter = dibs.dsBmih.biYPelsPerMeter; + bi->bmiHeader.biClrUsed = dibs.dsBmih.biClrUsed; + bi->bmiHeader.biClrImportant = dibs.dsBmih.biClrImportant; + + if (bi->bmiHeader.biCompression == BI_BITFIELDS) + { + /* Copy the color masks */ + RtlCopyMemory(bi->bmiColors, dibs.dsBitfields, 3 * sizeof(DWORD)); + } + else if (bi->bmiHeader.biBitCount <= 8) + { + /* Copy the color table */ + UINT Index; + PPALGDI PalGDI = PALETTE_LockPalette(psurf->hDIBPalette); + + if (!PalGDI) + { + ExFreePoolWithTag(bi, TAG_TEMP); + SURFACE_UnlockSurface(psurf); + SetLastWin32Error(ERROR_INVALID_HANDLE); + return 0; + } + + for (Index = 0; + Index < 256 && Index < PalGDI->NumColors; + Index++) + { + bi->bmiColors[Index].rgbRed = PalGDI->IndexedColors[Index].peRed; + bi->bmiColors[Index].rgbGreen = PalGDI->IndexedColors[Index].peGreen; + bi->bmiColors[Index].rgbBlue = PalGDI->IndexedColors[Index].peBlue; + bi->bmiColors[Index].rgbReserved = 0; + } + PALETTE_UnlockPalette(PalGDI); + } + SURFACE_UnlockSurface(psurf); + + Bmp = DIB_CreateDIBSection(Dc, + bi, + DIB_RGB_COLORS, + &Bits, + NULL, + 0, + 0); + + ExFreePoolWithTag(bi, TAG_TEMP); + return Bmp; } - - for (Index = 0; - Index < 256 && Index < PalGDI->NumColors; - Index++) - { - bi->bmiColors[Index].rgbRed = PalGDI->IndexedColors[Index].peRed; - bi->bmiColors[Index].rgbGreen = PalGDI->IndexedColors[Index].peGreen; - bi->bmiColors[Index].rgbBlue = PalGDI->IndexedColors[Index].peBlue; - bi->bmiColors[Index].rgbReserved = 0; - } - PALETTE_UnlockPalette(PalGDI); - } - SURFACE_UnlockSurface(psurf); - - Bmp = DIB_CreateDIBSection ( Dc, - bi, - DIB_RGB_COLORS, - &Bits, - NULL, - 0, - 0); - - ExFreePoolWithTag(bi, TAG_TEMP); - return Bmp; - } - } - } - SURFACE_UnlockSurface(psurf); - } - } - return Bmp; + } + } + SURFACE_UnlockSurface(psurf); + } + } + return Bmp; } HBITMAP APIENTRY NtGdiCreateCompatibleBitmap( - HDC hDC, - INT Width, - INT Height) -{ - HBITMAP Bmp; - PDC Dc; - - if ( Width <= 0 || Height <= 0 || (Width * Height) > 0x3FFFFFFF ) - { - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return NULL; - } - - if (!hDC) - return IntGdiCreateBitmap(Width, Height, 1, 1, 0); - - Dc = DC_LockDc(hDC); - - DPRINT("NtGdiCreateCompatibleBitmap(%04x,%d,%d, bpp:%d) = \n", hDC, Width, Height, ((PGDIDEVICE)Dc->pPDev)->GDIInfo.cBitsPixel); - - if (NULL == Dc) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return NULL; - } - - Bmp = IntCreateCompatibleBitmap(Dc, Width, Height); - - DPRINT ("\t\t%04x\n", Bmp); - DC_UnlockDc(Dc); - return Bmp; + HDC hDC, + INT Width, + INT Height) +{ + HBITMAP Bmp; + PDC Dc; + + if (Width <= 0 || Height <= 0 || (Width * Height) > 0x3FFFFFFF) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return NULL; + } + + if (!hDC) + return IntGdiCreateBitmap(Width, Height, 1, 1, 0); + + Dc = DC_LockDc(hDC); + + DPRINT("NtGdiCreateCompatibleBitmap(%04x,%d,%d, bpp:%d) = \n", + hDC, Width, Height, ((PGDIDEVICE)Dc->pPDev)->GDIInfo.cBitsPixel); + + if (NULL == Dc) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return NULL; + } + + Bmp = IntCreateCompatibleBitmap(Dc, Width, Height); + + DPRINT("\t\t%04x\n", Bmp); + DC_UnlockDc(Dc); + return Bmp; } BOOL APIENTRY NtGdiGetBitmapDimension( - HBITMAP hBitmap, - LPSIZE Dimension) -{ - PSURFACE psurfBmp; - BOOL Ret = TRUE; - - if (hBitmap == NULL) - return FALSE; - - psurfBmp = SURFACE_LockSurface(hBitmap); - if (psurfBmp == NULL) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; - } - - _SEH2_TRY - { - ProbeForWrite(Dimension, sizeof(SIZE), 1); - *Dimension = psurfBmp->dimension; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Ret = FALSE; - } - _SEH2_END - - SURFACE_UnlockSurface(psurfBmp); - - return Ret; + HBITMAP hBitmap, + LPSIZE Dimension) +{ + PSURFACE psurfBmp; + BOOL Ret = TRUE; + + if (hBitmap == NULL) + return FALSE; + + psurfBmp = SURFACE_LockSurface(hBitmap); + if (psurfBmp == NULL) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return FALSE; + } + + _SEH2_TRY + { + ProbeForWrite(Dimension, sizeof(SIZE), 1); + *Dimension = psurfBmp->dimension; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Ret = FALSE; + } + _SEH2_END + + SURFACE_UnlockSurface(psurfBmp); + + return Ret; } COLORREF APIENTRY NtGdiGetPixel(HDC hDC, INT XPos, INT YPos) { - PDC dc = NULL; - COLORREF Result = (COLORREF)CLR_INVALID; // default to failure - BOOL bInRect = FALSE; - SURFACE *psurf; - SURFOBJ *pso; - HPALETTE Pal = 0; - XLATEOBJ *XlateObj; - HBITMAP hBmpTmp; - - dc = DC_LockDc (hDC); - - if ( !dc ) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return Result; - } - if (dc->DC_Type == DC_TYPE_INFO) - { - DC_UnlockDc(dc); - return Result; - } - XPos += dc->ptlDCOrig.x; - YPos += dc->ptlDCOrig.y; - if ( IN_RECT(dc->CombinedClip->rclBounds,XPos,YPos) ) - { - bInRect = TRUE; - psurf = SURFACE_LockSurface(dc->w.hBitmap); - pso = &psurf->SurfObj; - if ( psurf ) - { - Pal = psurf->hDIBPalette; - if (!Pal) Pal = pPrimarySurface->DevInfo.hpalDefault; - - /* FIXME: Verify if it shouldn't be PAL_BGR! */ - XlateObj = (XLATEOBJ*)IntEngCreateXlate ( PAL_RGB, 0, NULL, Pal ); - if ( XlateObj ) - { - // check if this DC has a DIB behind it... - if ( pso->pvScan0 ) // STYPE_BITMAP == pso->iType - { - ASSERT ( pso->lDelta ); - Result = XLATEOBJ_iXlate(XlateObj, - DibFunctionsForBitmapFormat[pso->iBitmapFormat].DIB_GetPixel ( pso, XPos, YPos ) ); - } - EngDeleteXlate(XlateObj); - } - SURFACE_UnlockSurface(psurf); - } - } - DC_UnlockDc(dc); - - // if Result is still CLR_INVALID, then the "quick" method above didn't work - if ( bInRect && Result == CLR_INVALID ) - { - // FIXME: create a 1x1 32BPP DIB, and blit to it - HDC hDCTmp = NtGdiCreateCompatibleDC(hDC); - if ( hDCTmp ) - { - static const BITMAPINFOHEADER bih = { sizeof(BITMAPINFOHEADER), 1, 1, 1, 32, BI_RGB, 0, 0, 0, 0, 0 }; - BITMAPINFO bi; - RtlMoveMemory ( &(bi.bmiHeader), &bih, sizeof(bih) ); - hBmpTmp = NtGdiCreateDIBitmapInternal(hDC, + PDC dc = NULL; + COLORREF Result = (COLORREF)CLR_INVALID; // default to failure + BOOL bInRect = FALSE; + SURFACE *psurf; + SURFOBJ *pso; + HPALETTE Pal = 0; + XLATEOBJ *XlateObj; + HBITMAP hBmpTmp; + + dc = DC_LockDc(hDC); + + if (!dc) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return Result; + } + + if (dc->DC_Type == DC_TYPE_INFO) + { + DC_UnlockDc(dc); + return Result; + } + + XPos += dc->ptlDCOrig.x; + YPos += dc->ptlDCOrig.y; + if (IN_RECT(dc->CombinedClip->rclBounds,XPos,YPos)) + { + bInRect = TRUE; + psurf = SURFACE_LockSurface(dc->w.hBitmap); + pso = &psurf->SurfObj; + if (psurf) + { + Pal = psurf->hDIBPalette; + if (!Pal) Pal = pPrimarySurface->DevInfo.hpalDefault; + + /* FIXME: Verify if it shouldn't be PAL_BGR! */ + XlateObj = (XLATEOBJ*)IntEngCreateXlate(PAL_RGB, 0, NULL, Pal); + if (XlateObj) + { + // check if this DC has a DIB behind it... + if (pso->pvScan0) // STYPE_BITMAP == pso->iType + { + ASSERT(pso->lDelta); + Result = XLATEOBJ_iXlate(XlateObj, + DibFunctionsForBitmapFormat[pso->iBitmapFormat].DIB_GetPixel(pso, XPos, YPos)); + } + EngDeleteXlate(XlateObj); + } + SURFACE_UnlockSurface(psurf); + } + } + DC_UnlockDc(dc); + + // if Result is still CLR_INVALID, then the "quick" method above didn't work + if (bInRect && Result == CLR_INVALID) + { + // FIXME: create a 1x1 32BPP DIB, and blit to it + HDC hDCTmp = NtGdiCreateCompatibleDC(hDC); + if (hDCTmp) + { + static const BITMAPINFOHEADER bih = { sizeof(BITMAPINFOHEADER), 1, 1, 1, 32, BI_RGB, 0, 0, 0, 0, 0 }; + BITMAPINFO bi; + RtlMoveMemory(&(bi.bmiHeader), &bih, sizeof(bih)); + hBmpTmp = NtGdiCreateDIBitmapInternal(hDC, bi.bmiHeader.biWidth, bi.bmiHeader.biHeight, 0, @@ -408,281 +416,292 @@ 0, 0); - //HBITMAP hBmpTmp = IntGdiCreateBitmap ( 1, 1, 1, 32, NULL); - if ( hBmpTmp ) - { - HBITMAP hBmpOld = (HBITMAP)NtGdiSelectBitmap ( hDCTmp, hBmpTmp ); - if ( hBmpOld ) - { - PSURFACE psurf; - - NtGdiBitBlt ( hDCTmp, 0, 0, 1, 1, hDC, XPos, YPos, SRCCOPY, 0, 0 ); - NtGdiSelectBitmap ( hDCTmp, hBmpOld ); - - // our bitmap is no longer selected, so we can access it's stuff... - psurf = SURFACE_LockSurface(hBmpTmp); - if ( psurf ) - { - // Dont you need to convert something here? - Result = *(COLORREF*)psurf->SurfObj.pvScan0; - SURFACE_UnlockSurface(psurf); - } - } - NtGdiDeleteObject ( hBmpTmp ); - } - NtGdiDeleteObjectApp ( hDCTmp ); - } - } - - return Result; + //HBITMAP hBmpTmp = IntGdiCreateBitmap(1, 1, 1, 32, NULL); + if (hBmpTmp) + { + HBITMAP hBmpOld = (HBITMAP)NtGdiSelectBitmap(hDCTmp, hBmpTmp); + if (hBmpOld) + { + PSURFACE psurf; + + NtGdiBitBlt(hDCTmp, 0, 0, 1, 1, hDC, XPos, YPos, SRCCOPY, 0, 0); + NtGdiSelectBitmap(hDCTmp, hBmpOld); + + // our bitmap is no longer selected, so we can access it's stuff... + psurf = SURFACE_LockSurface(hBmpTmp); + if (psurf) + { + // Dont you need to convert something here? + Result = *(COLORREF*)psurf->SurfObj.pvScan0; + SURFACE_UnlockSurface(psurf); + } + } + NtGdiDeleteObject(hBmpTmp); + } + NtGdiDeleteObjectApp(hDCTmp); + } + } + + return Result; } LONG APIENTRY IntGetBitmapBits( - PSURFACE psurf, - DWORD Bytes, - OUT PBYTE Bits) -{ - LONG ret; - - ASSERT(Bits); - - /* Don't copy more bytes than the buffer has */ - Bytes = min(Bytes, psurf->SurfObj.cjBits); + PSURFACE psurf, + DWORD Bytes, + OUT PBYTE Bits) +{ + LONG ret; + + ASSERT(Bits); + + /* Don't copy more bytes than the buffer has */ + Bytes = min(Bytes, psurf->SurfObj.cjBits); #if 0 - /* FIXME: Call DDI CopyBits here if available */ - if(psurf->DDBitmap) - { - DPRINT("Calling device specific BitmapBits\n"); - if(psurf->DDBitmap->funcs->pBitmapBits) - { - ret = psurf->DDBitmap->funcs->pBitmapBits(hbitmap, bits, count, DDB_GET); - } - else - { - ERR_(bitmap)("BitmapBits == NULL??\n"); - ret = 0; - } - } - else + /* FIXME: Call DDI CopyBits here if available */ + if (psurf->DDBitmap) + { + DPRINT("Calling device specific BitmapBits\n"); + if (psurf->DDBitmap->funcs->pBitmapBits) + { + ret = psurf->DDBitmap->funcs->pBitmapBits(hbitmap, + bits, + count, + DDB_GET); + } + else + { + ERR_(bitmap)("BitmapBits == NULL??\n"); + ret = 0; + } + } + else #endif - { - RtlCopyMemory(Bits, psurf->SurfObj.pvBits, Bytes); - ret = Bytes; - } - return ret; + { + RtlCopyMemory(Bits, psurf->SurfObj.pvBits, Bytes); + ret = Bytes; + } + return ret; } LONG APIENTRY -NtGdiGetBitmapBits(HBITMAP hBitmap, - ULONG Bytes, - OUT OPTIONAL PBYTE pUnsafeBits) -{ - PSURFACE psurf; - LONG ret; - - if (pUnsafeBits != NULL && Bytes == 0) - { - return 0; - } - - psurf = SURFACE_LockSurface(hBitmap); - if (!psurf) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return 0; - } - - /* If the bits vector is null, the function should return the read size */ - if (pUnsafeBits == NULL) - { - ret = psurf->SurfObj.cjBits; - SURFACE_UnlockSurface(psurf); - return ret; - } - - /* Don't copy more bytes than the buffer has */ - Bytes = min(Bytes, psurf->SurfObj.cjBits); - - _SEH2_TRY - { - ProbeForWrite(pUnsafeBits, Bytes, 1); - ret = IntGetBitmapBits(psurf, Bytes, pUnsafeBits); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - ret = 0; - } - _SEH2_END - - SURFACE_UnlockSurface(psurf); - - return ret; +NtGdiGetBitmapBits( + HBITMAP hBitmap, + ULONG Bytes, + OUT OPTIONAL PBYTE pUnsafeBits) +{ + PSURFACE psurf; + LONG ret; + + if (pUnsafeBits != NULL && Bytes == 0) + { + return 0; + } + + psurf = SURFACE_LockSurface(hBitmap); + if (!psurf) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return 0; + } + + /* If the bits vector is null, the function should return the read size */ + if (pUnsafeBits == NULL) + { + ret = psurf->SurfObj.cjBits; + SURFACE_UnlockSurface(psurf); + return ret; + } + + /* Don't copy more bytes than the buffer has */ + Bytes = min(Bytes, psurf->SurfObj.cjBits); + + // FIXME: use MmSecureVirtualMemory + _SEH2_TRY + { + ProbeForWrite(pUnsafeBits, Bytes, 1); + ret = IntGetBitmapBits(psurf, Bytes, pUnsafeBits); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ret = 0; + } + _SEH2_END + + SURFACE_UnlockSurface(psurf); + + return ret; } 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); + 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 + /* 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; + { + RtlCopyMemory(psurf->SurfObj.pvBits, Bits, Bytes); + ret = Bytes; + } + + return ret; } LONG APIENTRY NtGdiSetBitmapBits( - HBITMAP hBitmap, - DWORD Bytes, - IN PBYTE pUnsafeBits) -{ - LONG ret; - PSURFACE psurf; - - if (pUnsafeBits == NULL || Bytes == 0) - { - return 0; - } - - psurf = SURFACE_LockSurface(hBitmap); - if (psurf == NULL) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return 0; - } - - _SEH2_TRY - { - ProbeForRead(pUnsafeBits, Bytes, 1); - ret = IntSetBitmapBits(psurf, Bytes, pUnsafeBits); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - ret = 0; - } - _SEH2_END - - SURFACE_UnlockSurface(psurf); - - return ret; + HBITMAP hBitmap, + DWORD Bytes, + IN PBYTE pUnsafeBits) +{ + LONG ret; + PSURFACE psurf; + + if (pUnsafeBits == NULL || Bytes == 0) + { + return 0; + } + + psurf = SURFACE_LockSurface(hBitmap); + if (psurf == NULL) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return 0; + } + + _SEH2_TRY + { + ProbeForRead(pUnsafeBits, Bytes, 1); + ret = IntSetBitmapBits(psurf, Bytes, pUnsafeBits); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ret = 0; + } + _SEH2_END + + SURFACE_UnlockSurface(psurf); + + return ret; } BOOL APIENTRY NtGdiSetBitmapDimension( - HBITMAP hBitmap, - INT Width, - INT Height, - LPSIZE Size) -{ - PSURFACE psurf; - BOOL Ret = TRUE; - - if (hBitmap == NULL) - return FALSE; - - psurf = SURFACE_LockSurface(hBitmap); - if (psurf == NULL) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; - } - - if (Size) - { - _SEH2_TRY - { - ProbeForWrite(Size, sizeof(SIZE), 1); - *Size = psurf->dimension; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Ret = FALSE; - } - _SEH2_END - } - - /* The dimension is changed even if writing the old value failed */ - psurf->dimension.cx = Width; - psurf->dimension.cy = Height; - - SURFACE_UnlockSurface(psurf); - - return Ret; + HBITMAP hBitmap, + INT Width, + INT Height, + LPSIZE Size) +{ + PSURFACE psurf; + BOOL Ret = TRUE; + + if (hBitmap == NULL) + return FALSE; + + psurf = SURFACE_LockSurface(hBitmap); + if (psurf == NULL) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return FALSE; + } + + if (Size) + { + _SEH2_TRY + { + ProbeForWrite(Size, sizeof(SIZE), 1); + *Size = psurf->dimension; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Ret = FALSE; + } + _SEH2_END + } + + /* The dimension is changed even if writing the old value failed */ + psurf->dimension.cx = Width; + psurf->dimension.cy = Height; + + SURFACE_UnlockSurface(psurf); + + return Ret; } BOOL APIENTRY GdiSetPixelV( - HDC hDC, - INT X, - INT Y, - COLORREF Color) -{ - HBRUSH NewBrush = NtGdiCreateSolidBrush(Color, NULL); - HGDIOBJ OldBrush; - - if (NewBrush == NULL) - return(FALSE); - OldBrush = NtGdiSelectBrush(hDC, NewBrush); - if (OldBrush == NULL) - { - NtGdiDeleteObject(NewBrush); - return(FALSE); - } - NtGdiPatBlt(hDC, X, Y, 1, 1, PATCOPY); - NtGdiSelectBrush(hDC, OldBrush); - NtGdiDeleteObject(NewBrush); - return TRUE; + HDC hDC, + INT X, + INT Y, + COLORREF Color) +{ + HBRUSH NewBrush = NtGdiCreateSolidBrush(Color, NULL); + HGDIOBJ OldBrush; + + if (NewBrush == NULL) + return(FALSE); + + OldBrush = NtGdiSelectBrush(hDC, NewBrush); + if (OldBrush == NULL) + { + NtGdiDeleteObject(NewBrush); + return(FALSE); + } + + NtGdiPatBlt(hDC, X, Y, 1, 1, PATCOPY); + NtGdiSelectBrush(hDC, OldBrush); + NtGdiDeleteObject(NewBrush); + + return TRUE; } COLORREF APIENTRY NtGdiSetPixel( - HDC hDC, - INT X, - INT Y, - COLORREF Color) -{ - DPRINT("0 NtGdiSetPixel X %ld Y %ld C %ld\n",X,Y,Color); - - if (GdiSetPixelV(hDC,X,Y,Color)) - { - Color = NtGdiGetPixel(hDC,X,Y); - DPRINT("1 NtGdiSetPixel X %ld Y %ld C %ld\n",X,Y,Color); - return Color; - } - - Color = ((COLORREF) CLR_INVALID); - DPRINT("2 NtGdiSetPixel X %ld Y %ld C %ld\n",X,Y,Color); - return Color; + HDC hDC, + INT X, + INT Y, + COLORREF Color) +{ + DPRINT("0 NtGdiSetPixel X %ld Y %ld C %ld\n", X, Y, Color); + + if (GdiSetPixelV(hDC,X,Y,Color)) + { + Color = NtGdiGetPixel(hDC,X,Y); + DPRINT("1 NtGdiSetPixel X %ld Y %ld C %ld\n", X, Y, Color); + return Color; + } + + Color = (COLORREF)CLR_INVALID; + DPRINT("2 NtGdiSetPixel X %ld Y %ld C %ld\n", X, Y, Color); + return Color; } @@ -691,119 +710,121 @@ UINT FASTCALL BITMAP_GetRealBitsPixel(UINT nBitsPixel) { - if (nBitsPixel <= 1) - return 1; - if (nBitsPixel <= 4) - return 4; - if (nBitsPixel <= 8) - return 8; - if (nBitsPixel <= 16) - return 16; - if (nBitsPixel <= 24) - return 24; - if (nBitsPixel <= 32) - return 32; - - return 0; + if (nBitsPixel <= 1) + return 1; + if (nBitsPixel <= 4) + return 4; + if (nBitsPixel <= 8) + return 8; + if (nBitsPixel <= 16) + return 16; + if (nBitsPixel <= 24) + return 24; + if (nBitsPixel <= 32) + return 32; + + return 0; } INT FASTCALL -BITMAP_GetWidthBytes (INT bmWidth, INT bpp) +BITMAP_GetWidthBytes(INT bmWidth, INT bpp) { #if 0 - switch(bpp) - { - case 1: - return 2 * ((bmWidth+15) >> 4); - - case 24: - bmWidth *= 3; /* fall through */ - case 8: - return bmWidth + (bmWidth & 1); - - case 32: - return bmWidth * 4; - - case 16: - case 15: - return bmWidth * 2; - - case 4: - return 2 * ((bmWidth+3) >> 2); - - default: - DPRINT ("stub"); - } - - return -1; + switch (bpp) + { + case 1: + return 2 * ((bmWidth+15) >> 4); + + case 24: + bmWidth *= 3; /* fall through */ + case 8: + return bmWidth + (bmWidth & 1); + + case 32: + return bmWidth * 4; + + case 16: + case 15: + return bmWidth * 2; + + case 4: + return 2 * ((bmWidth+3) >> 2); + + default: + DPRINT ("stub"); + } + + return -1; #endif - return ((bmWidth * bpp + 15) & ~15) >> 3; + return ((bmWidth * bpp + 15) & ~15) >> 3; } HBITMAP FASTCALL -BITMAP_CopyBitmap(HBITMAP hBitmap) -{ - HBITMAP res; - BITMAP bm; - SURFACE *Bitmap, *resBitmap; - SIZEL Size; - - if (hBitmap == NULL) - { - return 0; - } - - Bitmap = GDIOBJ_LockObj(hBitmap, GDI_OBJECT_TYPE_BITMAP); - if (Bitmap == NULL) - { - return 0; - } - - BITMAP_GetObject(Bitmap, sizeof(BITMAP), (PVOID)&bm); - bm.bmBits = NULL; - if (Bitmap->SurfObj.lDelta >= 0) - bm.bmHeight = -bm.bmHeight; - - 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); - - if(res) - { - PBYTE buf; - - resBitmap = GDIOBJ_LockObj(res, GDI_OBJECT_TYPE_BITMAP); - if (resBitmap) - { - buf = ExAllocatePoolWithTag (PagedPool, bm.bmWidthBytes * abs(bm.bmHeight), TAG_BITMAP); - if (buf == NULL) - { - GDIOBJ_UnlockObjByPtr((POBJ)resBitmap); - GDIOBJ_UnlockObjByPtr((POBJ)Bitmap); - NtGdiDeleteObject(res); - return 0; - } - IntGetBitmapBits (Bitmap, bm.bmWidthBytes * abs(bm.bmHeight), buf); - IntSetBitmapBits (resBitmap, bm.bmWidthBytes * abs(bm.bmHeight), buf); - ExFreePoolWithTag (buf,TAG_BITMAP); - resBitmap->flFlags = Bitmap->flFlags; - GDIOBJ_UnlockObjByPtr((POBJ)resBitmap); - } - else - { - NtGdiDeleteObject(res); - res = NULL; - } - } - - GDIOBJ_UnlockObjByPtr((POBJ)Bitmap); - - return res; +BITMAP_CopyBitmap(HBITMAP hBitmap) +{ + HBITMAP res; + BITMAP bm; + SURFACE *Bitmap, *resBitmap; + SIZEL Size; + + if (hBitmap == NULL) + { + return 0; + } + + Bitmap = GDIOBJ_LockObj(hBitmap, GDI_OBJECT_TYPE_BITMAP); + if (Bitmap == NULL) + { + return 0; + } + + BITMAP_GetObject(Bitmap, sizeof(BITMAP), (PVOID)&bm); + bm.bmBits = NULL; + if (Bitmap->SurfObj.lDelta >= 0) + bm.bmHeight = -bm.bmHeight; + + 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); + + if (res) + { + PBYTE buf; + + resBitmap = GDIOBJ_LockObj(res, GDI_OBJECT_TYPE_BITMAP); + if (resBitmap) + { + buf = ExAllocatePoolWithTag(PagedPool, + bm.bmWidthBytes * abs(bm.bmHeight), + TAG_BITMAP); + if (buf == NULL) + { + GDIOBJ_UnlockObjByPtr((POBJ)resBitmap); + GDIOBJ_UnlockObjByPtr((POBJ)Bitmap); + NtGdiDeleteObject(res); + return 0; + } + IntGetBitmapBits(Bitmap, bm.bmWidthBytes * abs(bm.bmHeight), buf); + IntSetBitmapBits(resBitmap, bm.bmWidthBytes * abs(bm.bmHeight), buf); + ExFreePoolWithTag(buf,TAG_BITMAP); + resBitmap->flFlags = Bitmap->flFlags; + GDIOBJ_UnlockObjByPtr((POBJ)resBitmap); + } + else + { + NtGdiDeleteObject(res); + res = NULL; + } + } + + GDIOBJ_UnlockObjByPtr((POBJ)Bitmap); + + return res; } INT APIENTRY @@ -812,7 +833,7 @@ PBITMAP pBitmap; if (!buffer) return sizeof(BITMAP); - if ((UINT)Count < sizeof(BITMAP)) return 0; + if ((UINT)Count < sizeof(BITMAP)) return 0; /* always fill a basic BITMAP structure */ pBitmap = buffer; @@ -824,13 +845,13 @@ pBitmap->bmBitsPixel = BitsPerFormat(psurf->SurfObj.iBitmapFormat); /* Check for DIB section */ - if(psurf->hSecure) - { - /* Set bmBits in this case */ + if (psurf->hSecure) + { + /* Set bmBits in this case */ pBitmap->bmBits = psurf->SurfObj.pvBits; - if (Count >= sizeof(DIBSECTION)) - { + if (Count >= sizeof(DIBSECTION)) + { /* Fill rest of DIBSECTION */ PDIBSECTION pds = buffer; @@ -851,15 +872,16 @@ pds->dshSection = psurf->hDIBSection; pds->dsOffset = psurf->dwOffset; - return sizeof(DIBSECTION); - } - } - else - { - pBitmap->bmBits = NULL; /* not set according to wine test, confirmed in win2k */ - } - - return sizeof(BITMAP); + return sizeof(DIBSECTION); + } + } + else + { + /* not set according to wine test, confirmed in win2k */ + pBitmap->bmBits = NULL; + } + + return sizeof(BITMAP); } /* @@ -870,14 +892,14 @@ NtGdiGetDCforBitmap( IN HBITMAP hsurf) { - HDC hDC = NULL; - PSURFACE psurf = SURFACE_LockSurface(hsurf); - if (psurf) - { - hDC = psurf->hDC; - SURFACE_UnlockSurface(psurf); - } - return hDC; + HDC hDC = NULL; + PSURFACE psurf = SURFACE_LockSurface(hsurf); + if (psurf) + { + hDC = psurf->hDC; + SURFACE_UnlockSurface(psurf); + } + return hDC; } /* @@ -906,7 +928,7 @@ } pDc_Attr = pDC->pDc_Attr; - if(!pDc_Attr) pDc_Attr = &pDC->Dc_Attr; + if (!pDc_Attr) pDc_Attr = &pDC->Dc_Attr; /* must be memory dc to select bitmap */ if (pDC->DC_Type != DC_TYPE_MEMORY) @@ -930,8 +952,9 @@ pDC->DcLevel.pSurface = psurfBmp; psurfBmp->hDC = hDC; - // if we're working with a DIB, get the palette [fixme: only create if the selected palette is null] - if(psurfBmp->hSecure) + // if we're working with a DIB, get the palette + // [fixme: only create if the selected palette is null] + if (psurfBmp->hSecure) { // pDC->w.bitsPerPixel = psurfBmp->dib->dsBmih.biBitCount; ??? pDC->w.bitsPerPixel = BitsPerFormat(psurfBmp->SurfObj.iBitmapFormat); @@ -941,7 +964,10 @@ pDC->w.bitsPerPixel = BitsPerFormat(psurfBmp->SurfObj.iBitmapFormat); } - hVisRgn = NtGdiCreateRectRgn(0, 0, psurfBmp->SurfObj.sizlBitmap.cx, psurfBmp->SurfObj.sizlBitmap.cy); + hVisRgn = NtGdiCreateRectRgn(0, + 0, + psurfBmp->SurfObj.sizlBitmap.cx, + psurfBmp->SurfObj.sizlBitmap.cy); SURFACE_UnlockSurface(psurfBmp); /* Regenerate the XLATEOBJs. */ @@ -971,8 +997,8 @@ if (hVisRgn) { - GdiSelectVisRgn(hDC, hVisRgn); - NtGdiDeleteObject(hVisRgn); + GdiSelectVisRgn(hDC, hVisRgn); + NtGdiDeleteObject(hVisRgn); } return hOrgBmp;

16 years, 2 months

[tkreuzer] 40072: Remove unused DriverFunction and GDIBdyToHdr

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Mar 17 07:28:03 2009 New Revision: 40072 URL: http://svn.reactos.org/svn/reactos?rev=40072&view=rev Log: Remove unused DriverFunction and GDIBdyToHdr Modified: trunk/reactos/subsystems/win32/win32k/eng/surface.c Modified: trunk/reactos/subsystems/win32/win32k/eng/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/surface.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/surface.c [iso-8859-1] Tue Mar 17 07:28:03 2009 @@ -503,20 +503,6 @@ return hsurf; } -PFN FASTCALL DriverFunction(DRVENABLEDATA *DED, ULONG DriverFunc) -{ - ULONG i; - - for (i=0; i<DED->c; i++) - { - if (DED->pdrvfn[i].iFunc == DriverFunc) - { - return DED->pdrvfn[i].pfn; - } - } - return NULL; -} - /* * @implemented */ @@ -609,10 +595,6 @@ return FillSolid(pso, Rect, iColor); } -#define GDIBdyToHdr(body) \ - ((PGDIOBJHDR)(body) - 1) - - /* * @implemented */

16 years, 2 months

[tkreuzer] 40071: - Move contents of eng/misc.h into include/misc.h, get rid of eng/misc.h - Move eng/objects.h -> include/engobjects.h

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Mar 17 04:41:33 2009 New Revision: 40071 URL: http://svn.reactos.org/svn/reactos?rev=40071&view=rev Log: - Move contents of eng/misc.h into include/misc.h, get rid of eng/misc.h - Move eng/objects.h -> include/engobjects.h Added: trunk/reactos/subsystems/win32/win32k/include/engobjects.h (props changed) - copied unchanged from r40068, trunk/reactos/subsystems/win32/win32k/eng/objects.h Removed: trunk/reactos/subsystems/win32/win32k/eng/misc.h trunk/reactos/subsystems/win32/win32k/eng/objects.h Modified: trunk/reactos/subsystems/win32/win32k/include/misc.h trunk/reactos/subsystems/win32/win32k/include/mouse.h trunk/reactos/subsystems/win32/win32k/include/text.h trunk/reactos/subsystems/win32/win32k/include/win32k.h Removed: trunk/reactos/subsystems/win32/win32k/eng/misc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/misc.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/misc.h (removed) @@ -1,46 +1,0 @@ -/* - * ReactOS kernel - * Copyright (C) 1998, 1999, 2000, 2001 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -/* $Id$ */ -#ifndef __ENG_MISC_H -#define __ENG_MISC_H - -#ifndef __ENG_OBJECTS_H -#include "objects.h" -#endif - -typedef struct INTENG_ENTER_LEAVE_TAG - { - /* Contents is private to EngEnter/EngLeave */ - SURFOBJ *DestObj; - SURFOBJ *OutputObj; - HBITMAP OutputBitmap; - CLIPOBJ *TrivialClipObj; - RECTL DestRect; - BOOL ReadOnly; - } INTENG_ENTER_LEAVE, *PINTENG_ENTER_LEAVE; - -extern BOOL APIENTRY IntEngEnter(PINTENG_ENTER_LEAVE EnterLeave, - SURFOBJ *DestObj, - RECTL *DestRect, - BOOL ReadOnly, - POINTL *Translate, - SURFOBJ **OutputObj); -extern BOOL APIENTRY IntEngLeave(PINTENG_ENTER_LEAVE EnterLeave); - -#endif Removed: trunk/reactos/subsystems/win32/win32k/eng/objects.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/objects.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/objects.h (removed) @@ -1,178 +1,0 @@ -/* - * ReactOS kernel - * Copyright (C) 1998, 1999, 2000, 2001 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * PURPOSE: GDI Internal Objects - * FILE: subsystem/win32/win32k/eng/objects.h - * PROGRAMER: Jason Filby - * REVISION HISTORY: - * 21/8/1999: Created - */ -#ifndef __ENG_OBJECTS_H -#define __ENG_OBJECTS_H - -#include <ft2build.h> -#include <freetype/freetype.h> - -/* Structure of internal gdi objects that win32k manages for ddi engine: - |---------------------------------| - | Public part | - | accessed from engine | - |---------------------------------| - | Private part | - | managed by gdi | - |_________________________________| - ----------------------------------------------------------------------------*/ - -typedef struct _CLIPGDI { - CLIPOBJ ClipObj; - ULONG EnumPos; - ULONG EnumOrder; - ULONG EnumMax; - ENUMRECTS EnumRects; -} CLIPGDI, *PCLIPGDI; - -/*ei What is this for? */ -typedef struct _DRVFUNCTIONSGDI { - HDEV hdev; - DRVFN Functions[INDEX_LAST]; -} DRVFUNCTIONSGDI; - -typedef struct _FLOATGDI { - ULONG Dummy; -} FLOATGDI; - - -#define FDM_TYPE_TEXT_METRIC 0x80000000 - -typedef struct _FONTGDI { - FONTOBJ FontObj; - ULONG iUnique; - FLONG flType; - union{ - DHPDEV dhpdev; - FT_Face face; - }; - FLONG flRealizedType; - - LONG lMaxNegA; - LONG lMaxNegC; - LONG lMinWidthD; - - TEXTMETRICW TextMetric; - LPWSTR Filename; - BYTE Underline; - BYTE StrikeOut; -} FONTGDI, *PFONTGDI; - -typedef struct _PATHGDI { - PATHOBJ PathObj; -} PATHGDI; - -typedef BOOL (APIENTRY *PFN_BitBlt)(SURFOBJ *, SURFOBJ *, SURFOBJ *, CLIPOBJ *, - XLATEOBJ *, RECTL *, POINTL *, POINTL *, - BRUSHOBJ *, POINTL *, ROP4); - -typedef BOOL (APIENTRY *PFN_TransparentBlt)(SURFOBJ *, SURFOBJ *, CLIPOBJ *, XLATEOBJ *, RECTL *, RECTL *, ULONG, ULONG); - -typedef BOOL (APIENTRY *PFN_StretchBlt)(SURFOBJ *, SURFOBJ *, SURFOBJ *, CLIPOBJ *, - XLATEOBJ *, COLORADJUSTMENT *, POINTL *, - RECTL *, RECTL *, PPOINT, ULONG); - -typedef BOOL (APIENTRY *PFN_TextOut)(SURFOBJ *, STROBJ *, FONTOBJ *, CLIPOBJ *, - RECTL *, RECTL *, BRUSHOBJ *, BRUSHOBJ *, - POINTL *, MIX); - -typedef BOOL (APIENTRY *PFN_Paint)(SURFOBJ *, CLIPOBJ *, BRUSHOBJ *, POINTL *, MIX); - -typedef BOOL (APIENTRY *PFN_StrokePath)(SURFOBJ *, PATHOBJ *, CLIPOBJ *, XFORMOBJ *, - BRUSHOBJ *, POINTL *, LINEATTRS *, MIX); - -typedef BOOL (APIENTRY *PFN_FillPath)(SURFOBJ *, PATHOBJ *, CLIPOBJ *, BRUSHOBJ *, - POINTL *, MIX, ULONG); - -typedef BOOL (APIENTRY *PFN_StrokeAndFillPath)(SURFOBJ *, PATHOBJ *, CLIPOBJ *, - XFORMOBJ *, BRUSHOBJ *, LINEATTRS *, BRUSHOBJ *, - POINTL *, MIX, ULONG); - -typedef BOOL (APIENTRY *PFN_LineTo)(SURFOBJ *, CLIPOBJ *, BRUSHOBJ *, - LONG, LONG, LONG, LONG, RECTL *, MIX); - -typedef BOOL (APIENTRY *PFN_CopyBits)(SURFOBJ *, SURFOBJ *, CLIPOBJ *, - XLATEOBJ *, RECTL *, POINTL *); - -typedef VOID (APIENTRY *PFN_Synchronize)(DHPDEV, RECTL *); - -typedef VOID (APIENTRY *PFN_MovePointer)(SURFOBJ *, LONG, LONG, RECTL *); - -typedef ULONG (APIENTRY *PFN_SetPointerShape)(SURFOBJ *, SURFOBJ *, SURFOBJ *, XLATEOBJ *, - LONG, LONG, LONG, LONG, RECTL *, FLONG); - -typedef HBITMAP (APIENTRY *PFN_CreateDeviceBitmap)(DHPDEV, SIZEL, ULONG); - -typedef BOOL (APIENTRY *PFN_SetPalette)(DHPDEV, PALOBJ*, ULONG, ULONG, ULONG); - -typedef BOOL (APIENTRY *PFN_GradientFill)(SURFOBJ*, CLIPOBJ*, XLATEOBJ*, TRIVERTEX*, ULONG, PVOID, ULONG, RECTL*, POINTL*, ULONG); - -typedef struct _WNDGDI { - WNDOBJ WndObj; - LIST_ENTRY ListEntry; - HWND Hwnd; - CLIPOBJ *ClientClipObj; - WNDOBJCHANGEPROC ChangeProc; - FLONG Flags; - int PixelFormat; -} WNDGDI, *PWNDGDI; - -typedef struct _XFORMGDI { - ULONG Dummy; - /* XFORMOBJ has no public members */ -} XFORMGDI; - -typedef struct _XLATEGDI { - XLATEOBJ XlateObj; - HPALETTE DestPal; - HPALETTE SourcePal; - BOOL UseShiftAndMask; - -// union { -// struct { /* For Shift Translations */ - ULONG RedMask; - ULONG GreenMask; - ULONG BlueMask; - INT RedShift; - INT GreenShift; - INT BlueShift; -// }; -// struct { /* For Color -> Mono Translations */ - ULONG BackgroundColor; -// }; -// }; -} XLATEGDI; - -/* as the *OBJ structures are located at the beginning of the *GDI structures - we can simply typecast the pointer */ -#define ObjToGDI(ClipObj, Type) (Type##GDI *)(ClipObj) -#define GDIToObj(ClipGDI, Type) (Type##OBJ *)(ClipGDI) - - -#endif //__ENG_OBJECTS_H Propchange: trunk/reactos/subsystems/win32/win32k/include/engobjects.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/subsystems/win32/win32k/include/engobjects.h ------------------------------------------------------------------------------ svn:keywords = author date id revision Propchange: trunk/reactos/subsystems/win32/win32k/include/engobjects.h ------------------------------------------------------------------------------ svn:mergeinfo = Modified: trunk/reactos/subsystems/win32/win32k/include/misc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/misc.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/misc.h [iso-8859-1] Tue Mar 17 04:41:33 2009 @@ -30,6 +30,26 @@ #define W32PF_MANUALGUICHECK (0x02000000) #define W32PF_CREATEDWINORDC (0x04000000) +typedef struct INTENG_ENTER_LEAVE_TAG + { + /* Contents is private to EngEnter/EngLeave */ + SURFOBJ *DestObj; + SURFOBJ *OutputObj; + HBITMAP OutputBitmap; + CLIPOBJ *TrivialClipObj; + RECTL DestRect; + BOOL ReadOnly; + } INTENG_ENTER_LEAVE, *PINTENG_ENTER_LEAVE; + +extern BOOL APIENTRY IntEngEnter(PINTENG_ENTER_LEAVE EnterLeave, + SURFOBJ *DestObj, + RECTL *DestRect, + BOOL ReadOnly, + POINTL *Translate, + SURFOBJ **OutputObj); + +extern BOOL APIENTRY IntEngLeave(PINTENG_ENTER_LEAVE EnterLeave); + extern HGDIOBJ StockObjects[]; extern SHORT gusLanguageID; Modified: trunk/reactos/subsystems/win32/win32k/include/mouse.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/mouse.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/mouse.h [iso-8859-1] Tue Mar 17 04:41:33 2009 @@ -1,7 +1,6 @@ #ifndef _WIN32K_MOUSE_H #define _WIN32K_MOUSE_H -#include "../eng/misc.h" #include <include/winsta.h> INT INTERNAL_CALL MouseSafetyOnDrawStart(SURFOBJ *SurfObj, LONG HazardX1, LONG HazardY1, LONG HazardX2, LONG HazardY2); Modified: trunk/reactos/subsystems/win32/win32k/include/text.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/text.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/text.h [iso-8859-1] Tue Mar 17 04:41:33 2009 @@ -1,5 +1,7 @@ #ifndef _WIN32K_TEXT_H #define _WIN32K_TEXT_H + +#include <include/engobjects.h> #define TAG_FINF TAG('F', 'I', 'N', 'F') // Modified: trunk/reactos/subsystems/win32/win32k/include/win32k.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/win32k.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/win32k.h [iso-8859-1] Tue Mar 17 04:41:33 2009 @@ -73,8 +73,7 @@ #include <include/mmcopy.h> #include <include/misc.h> #include <include/gdifloat.h> -#include <eng/objects.h> -#include <eng/misc.h> +#include <include/engobjects.h> #include <dib/dib.h> #endif /* __WIN32K_H */

16 years, 2 months

[tkreuzer] 40070: [FORMATTING] - Change indentation to 4 spaces - remove dditional header and $Id field - no code change

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Mar 17 04:15:26 2009 New Revision: 40070 URL: http://svn.reactos.org/svn/reactos?rev=40070&view=rev Log: [FORMATTING] - Change indentation to 4 spaces - remove dditional header and $Id field - no code change Modified: trunk/reactos/subsystems/win32/win32k/eng/device.c Modified: trunk/reactos/subsystems/win32/win32k/eng/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/device.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/device.c [iso-8859-1] Tue Mar 17 04:15:26 2009 @@ -1,23 +1,4 @@ /* - * ReactOS W32 Subsystem - * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -/* $Id$ - * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * PURPOSE: GDI Driver Device Functions @@ -36,60 +17,75 @@ * @implemented */ DWORD APIENTRY -EngDeviceIoControl(HANDLE hDevice, - DWORD dwIoControlCode, - LPVOID lpInBuffer, - DWORD nInBufferSize, - LPVOID lpOutBuffer, - DWORD nOutBufferSize, - DWORD *lpBytesReturned) +EngDeviceIoControl( + HANDLE hDevice, + DWORD dwIoControlCode, + LPVOID lpInBuffer, + DWORD nInBufferSize, + LPVOID lpOutBuffer, + DWORD nOutBufferSize, + DWORD *lpBytesReturned) { - PIRP Irp; - NTSTATUS Status; - KEVENT Event; - IO_STATUS_BLOCK Iosb; - PDEVICE_OBJECT DeviceObject; + PIRP Irp; + NTSTATUS Status; + KEVENT Event; + IO_STATUS_BLOCK Iosb; + PDEVICE_OBJECT DeviceObject; - DPRINT("EngDeviceIoControl() called\n"); + DPRINT("EngDeviceIoControl() called\n"); - KeInitializeEvent(&Event, SynchronizationEvent, FALSE); + KeInitializeEvent(&Event, SynchronizationEvent, FALSE); - DeviceObject = (PDEVICE_OBJECT) hDevice; + DeviceObject = (PDEVICE_OBJECT) hDevice; - Irp = IoBuildDeviceIoControlRequest(dwIoControlCode, - DeviceObject, - lpInBuffer, - nInBufferSize, - lpOutBuffer, - nOutBufferSize, FALSE, &Event, &Iosb); - if (!Irp) return ERROR_NOT_ENOUGH_MEMORY; + Irp = IoBuildDeviceIoControlRequest(dwIoControlCode, + DeviceObject, + lpInBuffer, + nInBufferSize, + lpOutBuffer, + nOutBufferSize, FALSE, &Event, &Iosb); + if (!Irp) return ERROR_NOT_ENOUGH_MEMORY; - Status = IoCallDriver(DeviceObject, Irp); + Status = IoCallDriver(DeviceObject, Irp); - if (Status == STATUS_PENDING) + if (Status == STATUS_PENDING) { - (VOID)KeWaitForSingleObject(&Event, Executive, KernelMode, TRUE, 0); - Status = Iosb.Status; + (VOID)KeWaitForSingleObject(&Event, Executive, KernelMode, TRUE, 0); + Status = Iosb.Status; } - DPRINT("EngDeviceIoControl(): Returning %X/%X\n", Iosb.Status, - Iosb.Information); + DPRINT("EngDeviceIoControl(): Returning %X/%X\n", Iosb.Status, + Iosb.Information); - /* Return information to the caller about the operation. */ - *lpBytesReturned = Iosb.Information; + /* Return information to the caller about the operation. */ + *lpBytesReturned = Iosb.Information; - /* Convert NT status values to win32 error codes. */ - switch (Status) + /* Convert NT status values to win32 error codes. */ + switch (Status) { - case STATUS_INSUFFICIENT_RESOURCES: return ERROR_NOT_ENOUGH_MEMORY; - case STATUS_BUFFER_OVERFLOW: return ERROR_MORE_DATA; - case STATUS_NOT_IMPLEMENTED: return ERROR_INVALID_FUNCTION; - case STATUS_INVALID_PARAMETER: return ERROR_INVALID_PARAMETER; - case STATUS_BUFFER_TOO_SMALL: return ERROR_INSUFFICIENT_BUFFER; - case STATUS_DEVICE_DOES_NOT_EXIST: return ERROR_DEV_NOT_EXIST; - case STATUS_PENDING: return ERROR_IO_PENDING; + case STATUS_INSUFFICIENT_RESOURCES: + return ERROR_NOT_ENOUGH_MEMORY; + + case STATUS_BUFFER_OVERFLOW: + return ERROR_MORE_DATA; + + case STATUS_NOT_IMPLEMENTED: + return ERROR_INVALID_FUNCTION; + + case STATUS_INVALID_PARAMETER: + return ERROR_INVALID_PARAMETER; + + case STATUS_BUFFER_TOO_SMALL: + return ERROR_INSUFFICIENT_BUFFER; + + case STATUS_DEVICE_DOES_NOT_EXIST: + return ERROR_DEV_NOT_EXIST; + + case STATUS_PENDING: + return ERROR_IO_PENDING; } - return Status; + + return Status; } /* EOF */

16 years, 2 months

[tkreuzer] 40069: - Inline GDIOBJ_UnlockObjByPtr, ASSERT that we don't unlock an already unlocked object, return how many locks are left. - Don't access the objects cExclsiveLock field after unlocking it, instead use new return value of GDIOBJ_UnlockObjByPtr

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Mar 17 04:06:34 2009 New Revision: 40069 URL: http://svn.reactos.org/svn/reactos?rev=40069&view=rev Log: - Inline GDIOBJ_UnlockObjByPtr, ASSERT that we don't unlock an already unlocked object, return how many locks are left. - Don't access the objects cExclsiveLock field after unlocking it, instead use new return value of GDIOBJ_UnlockObjByPtr Modified: trunk/reactos/subsystems/win32/win32k/eng/driverobj.c trunk/reactos/subsystems/win32/win32k/include/gdiobj.h trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Modified: trunk/reactos/subsystems/win32/win32k/eng/driverobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/driverobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/driverobj.c [iso-8859-1] Tue Mar 17 04:06:34 2009 @@ -128,6 +128,7 @@ IN HDRVOBJ hdo) { PEDRIVEROBJ pedo; + ULONG cLocks; /* First lock to get a pointer to the object */ pedo = DRIVEROBJ_LockObject(hdo); @@ -138,10 +139,10 @@ } /* Unlock object */ - DRIVEROBJ_UnlockObject(pedo); + cLocks = DRIVEROBJ_UnlockObject(pedo); /* Check if we still hold a lock */ - if (pedo->baseobj.cExclusiveLock < 1) + if (cLocks < 1) { /* Object wasn't locked before, fail. */ return FALSE; Modified: trunk/reactos/subsystems/win32/win32k/include/gdiobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/gdiobj.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/gdiobj.h [iso-8859-1] Tue Mar 17 04:06:34 2009 @@ -61,7 +61,6 @@ BOOL INTERNAL_CALL GDIOBJ_SetOwnership(HGDIOBJ ObjectHandle, PEPROCESS Owner); BOOL INTERNAL_CALL GDIOBJ_CopyOwnership(HGDIOBJ CopyFrom, HGDIOBJ CopyTo); BOOL INTERNAL_CALL GDIOBJ_ConvertToStockObj(HGDIOBJ *hObj); -VOID INTERNAL_CALL GDIOBJ_UnlockObjByPtr(POBJ Object); VOID INTERNAL_CALL GDIOBJ_ShareUnlockObjByPtr(POBJ Object); BOOL INTERNAL_CALL GDIOBJ_ValidateHandle(HGDIOBJ hObj, ULONG ObjectType); POBJ INTERNAL_CALL GDIOBJ_AllocObj(UCHAR ObjectType); @@ -84,4 +83,20 @@ BOOL FASTCALL IsObjectDead(HGDIOBJ); BOOL FASTCALL IntGdiSetDCOwnerEx( HDC, DWORD, BOOL); +/*! + * Release GDI object. Every object locked by GDIOBJ_LockObj() must be unlocked. + * You should unlock the object + * as soon as you don't need to have access to it's data. + + * \param Object Object pointer (as returned by GDIOBJ_LockObj). + */ +ULONG +FORCEINLINE +GDIOBJ_UnlockObjByPtr(POBJ Object) +{ + INT cLocks = InterlockedDecrement((PLONG)&Object->cExclusiveLock); + ASSERT(cLocks >= 0); + return cLocks; +} + #endif Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] Tue Mar 17 04:06:34 2009 @@ -1014,21 +1014,6 @@ } -/*! - * Release GDI object. Every object locked by GDIOBJ_LockObj() must be unlocked. You should unlock the object - * as soon as you don't need to have access to it's data. - - * \param Object Object pointer (as returned by GDIOBJ_LockObj). - */ -VOID INTERNAL_CALL -GDIOBJ_UnlockObjByPtr(POBJ Object) -{ - if (InterlockedDecrement((PLONG)&Object->cExclusiveLock) < 0) - { - DPRINT1("Trying to unlock non-existant object\n"); - } -} - VOID INTERNAL_CALL GDIOBJ_ShareUnlockObjByPtr(POBJ Object) {

16 years, 2 months

[tkreuzer] 40068: Rewrite DRIVEROBJ api, giving the object a handle, belonging to the current process. Let the gdi obj cleanup take care for calling the callback function. Allow deleting of objects that are exclusively locked by the current thread.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Mar 17 03:30:15 2009 New Revision: 40068 URL: http://svn.reactos.org/svn/reactos?rev=40068&view=rev Log: Rewrite DRIVEROBJ api, giving the object a handle, belonging to the current process. Let the gdi obj cleanup take care for calling the callback function. Allow deleting of objects that are exclusively locked by the current thread. Added: trunk/reactos/subsystems/win32/win32k/include/driverobj.h (with props) Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h trunk/reactos/subsystems/win32/win32k/eng/driverobj.c trunk/reactos/subsystems/win32/win32k/eng/objects.h trunk/reactos/subsystems/win32/win32k/include/inteng.h trunk/reactos/subsystems/win32/win32k/include/win32k.h trunk/reactos/subsystems/win32/win32k/main/dllmain.c trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdihdl.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntgdihdl.h [iso-8859-1] Tue Mar 17 03:30:15 2009 @@ -66,6 +66,7 @@ #define GDI_OBJECT_TYPE_DD_VIDEOPORT 0x00120000 /* Should be moved away from gdi objects */ #define GDI_OBJECT_TYPE_DD_MOTIONCOMP 0x00140000 /* Should be moved away from gdi objects */ #define GDI_OBJECT_TYPE_ENUMFONT 0x00160000 +#define GDI_OBJECT_TYPE_DRIVEROBJ 0x001C0000 /* Confrim on XP value is taken from NtGdiCreateDirectDrawObject */ #define GDI_OBJECT_TYPE_DIRECTDRAW 0x00200000 Modified: trunk/reactos/subsystems/win32/win32k/eng/driverobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/driverobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/driverobj.c [iso-8859-1] Tue Mar 17 03:30:15 2009 @@ -1,180 +1,156 @@ /* - * ReactOS W32 Subsystem - * Copyright (C) 2005 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * COPYRIGHT: GPL, see COPYING in the top level directory + * PROJECT: ReactOS win32 kernel mode sunsystem + * PURPOSE: GDI DRIVEROBJ Functions + * FILE: subsystems/win32k/eng/driverobj.c + * PROGRAMER: Timo Kreuzer */ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * PURPOSE: GDI DRIVEROBJ Functions - * FILE: subsys/win32k/eng/driverobj.c - * PROGRAMER: Gregor Anich - * REVISION HISTORY: - * 04/01/2005: Created - */ + +/** Includes ******************************************************************/ #include <w32k.h> #define NDEBUG #include <debug.h> -/*!\brief Called when the process is terminated. - * - * Calls the free-proc for each existing DRIVEROBJ. - * - * \param Process Pointer to the EPROCESS struct for the process beeing terminated. - * \param Win32Process Pointer to the W32PROCESS + +/** Internal interface ********************************************************/ + +/*! + * \brief DRIVEROBJ cleanup function */ -VOID FASTCALL -IntEngCleanupDriverObjs(struct _EPROCESS *Process, - PW32PROCESS Win32Process) +BOOL INTERNAL_CALL +DRIVEROBJ_Cleanup(PVOID pObject) { - PDRIVERGDI DrvObjInt; - PW32PROCESS CurrentWin32Process; + PEDRIVEROBJ pedo = pObject; + FREEOBJPROC pFreeProc; - CurrentWin32Process = PsGetCurrentProcessWin32Process(); - IntEngLockProcessDriverObjs(CurrentWin32Process); - while (!IsListEmpty(&Win32Process->DriverObjListHead)) + pFreeProc = pedo->drvobj.pFreeProc; + if (pFreeProc) { - DrvObjInt = CONTAINING_RECORD(Win32Process->DriverObjListHead.Flink, - DRIVERGDI, ListEntry); - IntEngUnLockProcessDriverObjs(CurrentWin32Process); - EngDeleteDriverObj((HDRVOBJ)(&DrvObjInt->DriverObj), TRUE, FALSE); - IntEngLockProcessDriverObjs(CurrentWin32Process); + return pFreeProc(pedo->drvobj.pvObj); } - IntEngUnLockProcessDriverObjs(CurrentWin32Process); + + return TRUE; +} + +/** Public interface **********************************************************/ + +HDRVOBJ +APIENTRY +EngCreateDriverObj( + IN PVOID pvObj, + IN FREEOBJPROC pFreeObjProc, + IN HDEV hdev) +{ + PEDRIVEROBJ pedo; + HDRVOBJ hdo; + GDIDEVICE *ppdev = (GDIDEVICE*)hdev; + + /* Allocate a new DRIVEROBJ */ + pedo = DRIVEROBJ_AllocObjectWithHandle(); + if (!pedo) + { + return NULL; + } + hdo = pedo->baseobj.hHmgr; + + /* Fill in fields */ + pedo->drvobj.pvObj = pvObj; + pedo->drvobj.pFreeProc = pFreeObjProc; + pedo->drvobj.hdev = hdev; + pedo->drvobj.dhpdev = ppdev->hPDev; + + /* Unlock the object */ + DRIVEROBJ_UnlockObject(pedo); + + /* Return the handle */ + return hdo; } -/* - * @implemented - */ -HDRVOBJ +BOOL APIENTRY -EngCreateDriverObj( - IN PVOID pvObj, - IN FREEOBJPROC pFreeObjProc, - IN HDEV hdev - ) +EngDeleteDriverObj( + IN HDRVOBJ hdo, + IN BOOL bCallBack, + IN BOOL bLocked) { - PDRIVERGDI DrvObjInt; - PDRIVEROBJ DrvObjUser; - PW32PROCESS CurrentWin32Process; + PEDRIVEROBJ pedo; - /* Create DRIVEROBJ */ - DrvObjInt = EngAllocMem(0, sizeof (DRIVERGDI), TAG_DRIVEROBJ); - if (DrvObjInt == NULL) + /* Lock the object */ + pedo = DRIVEROBJ_LockObject(hdo); + if (!pedo) { - DPRINT1("Failed to allocate memory for a DRIVERGDI structure!\n"); - return NULL; + return FALSE; } - /* fill user object */ - DrvObjUser = GDIToObj(DrvObjInt, DRIVER); - DrvObjUser->pvObj = pvObj; - DrvObjUser->pFreeProc = pFreeObjProc; - DrvObjUser->hdev = hdev; - DrvObjUser->dhpdev = ((GDIDEVICE*)hdev)->hPDev; + /* Manually call cleanup callback */ + if (bCallBack) + { + if (!pedo->drvobj.pFreeProc(pedo->drvobj.pvObj)) + { + /* Callback failed */ + DRIVEROBJ_UnlockObject(pedo); + return FALSE; + } + } - /* fill internal object */ - ExInitializeFastMutex(&DrvObjInt->Lock); - CurrentWin32Process = PsGetCurrentProcessWin32Process(); - IntEngLockProcessDriverObjs(CurrentWin32Process); - InsertTailList(&CurrentWin32Process->DriverObjListHead, &DrvObjInt->ListEntry); - IntEngUnLockProcessDriverObjs(CurrentWin32Process); + /* Prevent cleanup callback from being called again */ + pedo->drvobj.pFreeProc = NULL; - return (HDRVOBJ)DrvObjUser; + /* NOTE: We don't care about the bLocked param, as our handle manager + allows freeing the object, while we hold any number of locks. */ + + /* Free the object */ + return DRIVEROBJ_FreeObjectByHandle(hdo); } -/* - * @implemented - */ -BOOL +PDRIVEROBJ APIENTRY -EngDeleteDriverObj( - IN HDRVOBJ hdo, - IN BOOL bCallBack, - IN BOOL bLocked - ) +EngLockDriverObj( + IN HDRVOBJ hdo) { - PDRIVEROBJ DrvObjUser = (PDRIVEROBJ)hdo; - PDRIVERGDI DrvObjInt = ObjToGDI(DrvObjUser, DRIVER); - PW32PROCESS CurrentWin32Process; + PEDRIVEROBJ pedo; - /* Make sure the obj is locked */ - if (!bLocked) - { - if (!ExTryToAcquireFastMutex(&DrvObjInt->Lock)) - { - return FALSE; - } - } + /* Lock the object */ + pedo = DRIVEROBJ_LockObject(hdo); - /* Call the free-proc */ - if (bCallBack) - { - if (!DrvObjUser->pFreeProc(DrvObjUser)) - { - return FALSE; - } - } - - /* Free the DRIVEROBJ */ - CurrentWin32Process = PsGetCurrentProcessWin32Process(); - IntEngLockProcessDriverObjs(CurrentWin32Process); - RemoveEntryList(&DrvObjInt->ListEntry); - IntEngUnLockProcessDriverObjs(CurrentWin32Process); - EngFreeMem(DrvObjInt); - - return TRUE; + /* Return pointer to the DRIVEROBJ structure */ + return &pedo->drvobj; } -/* - * @implemented - */ -PDRIVEROBJ +BOOL APIENTRY -EngLockDriverObj( IN HDRVOBJ hdo ) +EngUnlockDriverObj( + IN HDRVOBJ hdo) { - PDRIVEROBJ DrvObjUser = (PDRIVEROBJ)hdo; - PDRIVERGDI DrvObjInt = ObjToGDI(DrvObjUser, DRIVER); + PEDRIVEROBJ pedo; - if (!ExTryToAcquireFastMutex(&DrvObjInt->Lock)) + /* First lock to get a pointer to the object */ + pedo = DRIVEROBJ_LockObject(hdo); + if(!pedo) { - return NULL; + /* Object could not be locked, fail. */ + return FALSE; } - return DrvObjUser; + /* Unlock object */ + DRIVEROBJ_UnlockObject(pedo); + + /* Check if we still hold a lock */ + if (pedo->baseobj.cExclusiveLock < 1) + { + /* Object wasn't locked before, fail. */ + return FALSE; + } + + /* Unlock again */ + DRIVEROBJ_UnlockObject(pedo); + + /* Success */ + return TRUE; } - -/* - * @implemented - */ -BOOL -APIENTRY -EngUnlockDriverObj ( IN HDRVOBJ hdo ) -{ - PDRIVERGDI DrvObjInt = ObjToGDI((PDRIVEROBJ)hdo, DRIVER); - - ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&DrvObjInt->Lock); - return TRUE; -} - -/* EOF */ - Modified: trunk/reactos/subsystems/win32/win32k/eng/objects.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/objects.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/objects.h [iso-8859-1] Tue Mar 17 03:30:15 2009 @@ -50,12 +50,6 @@ ULONG EnumMax; ENUMRECTS EnumRects; } CLIPGDI, *PCLIPGDI; - -typedef struct _DRIVERGDI { - DRIVEROBJ DriverObj; - LIST_ENTRY ListEntry; - FAST_MUTEX Lock; -} DRIVERGDI, *PDRIVERGDI; /*ei What is this for? */ typedef struct _DRVFUNCTIONSGDI { Added: trunk/reactos/subsystems/win32/win32k/include/driverobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/driverobj.h (added) +++ trunk/reactos/subsystems/win32/win32k/include/driverobj.h [iso-8859-1] Tue Mar 17 03:30:15 2009 @@ -1,0 +1,23 @@ +#ifndef _WIN32K_DRIVEROBJ_H +#define _WIN32K_DRIVEROBJ_H + +#include "gdiobj.h" + +/* Object structure */ +typedef struct _EDRIVEROBJ +{ + BASEOBJECT baseobj; + DRIVEROBJ drvobj; + PVOID reserved; +} EDRIVEROBJ, *PEDRIVEROBJ; + +/* Cleanup function */ +BOOL INTERNAL_CALL DRIVEROBJ_Cleanup(PVOID pObject); + + +#define DRIVEROBJ_AllocObjectWithHandle() ((PEDRIVEROBJ)GDIOBJ_AllocObjWithHandle(GDI_OBJECT_TYPE_DRIVEROBJ)) +#define DRIVEROBJ_FreeObjectByHandle(hdo) GDIOBJ_FreeObjByHandle((HGDIOBJ)hdo, GDI_OBJECT_TYPE_DRIVEROBJ) +#define DRIVEROBJ_LockObject(hdo) ((PEDRIVEROBJ)GDIOBJ_LockObj((HGDIOBJ)hdo, GDI_OBJECT_TYPE_DRIVEROBJ)) +#define DRIVEROBJ_UnlockObject(pdo) GDIOBJ_UnlockObjByPtr((POBJ)pdo) + +#endif /* !_WIN32K_DRIVEROBJ_H */ Propchange: trunk/reactos/subsystems/win32/win32k/include/driverobj.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/subsystems/win32/win32k/include/inteng.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/inteng.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/inteng.h [iso-8859-1] Tue Mar 17 03:30:15 2009 @@ -33,16 +33,6 @@ #define ROP3_TO_ROP4(Rop3) ((((Rop3) >> 8) & 0xff00) | (((Rop3) >> 16) & 0x00ff)) /* Definitions of IntEngXxx functions */ - -#define IntEngLockProcessDriverObjs(W32Process) \ - ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&(W32Process)->DriverObjListLock) - -#define IntEngUnLockProcessDriverObjs(W32Process) \ - ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&(W32Process)->DriverObjListLock) - -VOID FASTCALL -IntEngCleanupDriverObjs(struct _EPROCESS *Process, - PW32PROCESS Win32Process); BOOL APIENTRY IntEngLineTo(SURFOBJ *Surface, Modified: trunk/reactos/subsystems/win32/win32k/include/win32k.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/win32k.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/win32k.h [iso-8859-1] Tue Mar 17 03:30:15 2009 @@ -28,6 +28,7 @@ #include <include/dce.h> #include <include/dib.h> #include <include/driver.h> +#include <include/driverobj.h> #include <include/error.h> #include <include/floatobj.h> #include <include/gdiobj.h> Modified: trunk/reactos/subsystems/win32/win32k/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ma… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] Tue Mar 17 03:30:15 2009 @@ -136,7 +136,6 @@ DPRINT("Destroying W32 process PID:%d at IRQ level: %lu\n", Process->UniqueProcessId, KeGetCurrentIrql()); IntCleanupMenus(Process, Win32Process); IntCleanupCurIcons(Process, Win32Process); - IntEngCleanupDriverObjs(Process, Win32Process); CleanupMonitorImpl(); /* no process windows should exist at this point, or the function will assert! */ Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] Tue Mar 17 03:30:15 2009 @@ -70,7 +70,7 @@ {0, 0, TAG_TTFD, NULL}, /* 19 TTFD, unused */ {0, 0, TAG_RC, NULL}, /* 1a RC, unused */ {0, 0, TAG_TEMP, NULL}, /* 1b TEMP, unused */ - {0, 0, TAG_DRVOBJ, NULL}, /* 1c DRVOBJ, unused */ + {0, sizeof(EDRIVEROBJ), TAG_DRVOBJ, DRIVEROBJ_Cleanup},/* 1c DRVOBJ */ {0, 0, TAG_DCIOBJ, NULL}, /* 1d DCIOBJ, unused */ {0, 0, TAG_SPOOL, NULL}, /* 1e SPOOL, unused */ {0, 0, 0, NULL}, /* 1f reserved entry */ @@ -537,7 +537,8 @@ Object = Entry->KernelData; - if (Object->cExclusiveLock == 0) + if (Object->cExclusiveLock == 0 || + Object->Tid == (PW32THREAD)PsGetCurrentThreadWin32Thread()) { BOOL Ret; PW32PROCESS W32Process = PsGetCurrentProcessWin32Process(); @@ -571,14 +572,16 @@ else { /* - * The object is currently locked, so freeing is forbidden! + * The object is currently locked by another thread, so freeing is forbidden! */ DPRINT1("Object->cExclusiveLock = %d\n", Object->cExclusiveLock); GDIDBG_TRACECALLER(); GDIDBG_TRACELOCKER(GDI_HANDLE_GET_INDEX(hObj)); (void)InterlockedExchangePointer((PVOID*)&Entry->ProcessId, PrevProcId); /* do not assert here for it will call again from dxg.sys it being call twice */ - //ASSERT(FALSE); + + DelayExecution(); + goto LockHandle; } } else

16 years, 2 months

[arty] 40067: Fix some issues with peer names being reported. There may be other problems too. My read of MSDN is that queries that return addresses in queries other than TDI_QUERY_ADDRESS_INFO return a TRANSPORT_ADDRESS, so we plumb that through for GetPeerName. Note that this isn't user-facing functionality, so it's unlikely, though not impossible, that we've got it wrong and it'll affect something. Likely, this is an improvement.

by arty＠svn.reactos.org

Author: arty Date: Mon Mar 16 23:59:05 2009 New Revision: 40067 URL: http://svn.reactos.org/svn/reactos?rev=40067&view=rev Log: Fix some issues with peer names being reported. There may be other problems too. My read of MSDN is that queries that return addresses in queries other than TDI_QUERY_ADDRESS_INFO return a TRANSPORT_ADDRESS, so we plumb that through for GetPeerName. Note that this isn't user-facing functionality, so it's unlikely, though not impossible, that we've got it wrong and it'll affect something. Likely, this is an improvement. Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllma… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Mon Mar 16 23:59:05 2009 @@ -1488,7 +1488,7 @@ { IO_STATUS_BLOCK IOSB; ULONG TdiAddressSize; - PTDI_ADDRESS_INFO TdiAddress; + PTDI_ADDRESS_INFO TdiAddress; PTRANSPORT_ADDRESS SocketAddress; PSOCKET_INFORMATION Socket = NULL; NTSTATUS Status; @@ -1507,9 +1507,8 @@ Socket = GetSocketStructure(Handle); /* Allocate a buffer for the address */ - TdiAddressSize = FIELD_OFFSET(TDI_ADDRESS_INFO, Address.Address[0].Address) + - Socket->SharedData.SizeOfLocalAddress; - + TdiAddressSize = + sizeof(TRANSPORT_ADDRESS) + Socket->SharedData.SizeOfLocalAddress; TdiAddress = HeapAlloc(GlobalHeap, 0, TdiAddressSize); if ( TdiAddress == NULL ) @@ -1578,7 +1577,6 @@ { IO_STATUS_BLOCK IOSB; ULONG TdiAddressSize; - PTDI_ADDRESS_INFO TdiAddress; PTRANSPORT_ADDRESS SocketAddress; PSOCKET_INFORMATION Socket = NULL; NTSTATUS Status; @@ -1597,19 +1595,16 @@ Socket = GetSocketStructure(s); /* Allocate a buffer for the address */ - TdiAddressSize = FIELD_OFFSET(TDI_ADDRESS_INFO, Address.Address[0].Address) + - Socket->SharedData.SizeOfLocalAddress; - TdiAddress = HeapAlloc(GlobalHeap, 0, TdiAddressSize); - - if ( TdiAddress == NULL ) + TdiAddressSize = sizeof(TRANSPORT_ADDRESS) + *NameLength; + SocketAddress = HeapAlloc(GlobalHeap, 0, TdiAddressSize); + + if ( SocketAddress == NULL ) { NtClose( SockEvent ); *lpErrno = WSAENOBUFS; return SOCKET_ERROR; } - SocketAddress = &TdiAddress->Address; - /* Send IOCTL */ Status = NtDeviceIoControlFile((HANDLE)Socket->Handle, SockEvent, @@ -1619,7 +1614,7 @@ IOCTL_AFD_GET_PEER_NAME, NULL, 0, - TdiAddress, + SocketAddress, TdiAddressSize); /* Wait for return */ @@ -1643,12 +1638,12 @@ AFD_DbgPrint (MID_TRACE, ("NameLength %d Address: %s Port %x\n", *NameLength, ((struct sockaddr_in *)Name)->sin_addr.s_addr, ((struct sockaddr_in *)Name)->sin_port)); - HeapFree(GlobalHeap, 0, TdiAddress); + HeapFree(GlobalHeap, 0, SocketAddress); return 0; } else { - HeapFree(GlobalHeap, 0, TdiAddress); + HeapFree(GlobalHeap, 0, SocketAddress); *lpErrno = WSAEFAULT; return SOCKET_ERROR; }

16 years, 2 months

[fireball] 40066: - Implement boot drivers loading.

by fireball＠svn.reactos.org

Author: fireball Date: Mon Mar 16 23:56:07 2009 New Revision: 40066 URL: http://svn.reactos.org/svn/reactos?rev=40066&view=rev Log: - Implement boot drivers loading. Modified: trunk/reactos/boot/freeldr/freeldr/windows/setupldr2.c Modified: trunk/reactos/boot/freeldr/freeldr/windows/setupldr2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/setupldr2.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/setupldr2.c [iso-8859-1] Mon Mar 16 23:56:07 2009 @@ -42,7 +42,11 @@ IN LPCSTR AnsiFileName, IN LPCSTR OemFileName, IN LPCSTR LanguageFileName); - +BOOLEAN +WinLdrAddDriverToList(LIST_ENTRY *BootDriverListHead, + LPWSTR RegistryPath, + LPWSTR ImagePath, + LPWSTR ServiceName); //FIXME: Do a better way to retrieve Arc disk information @@ -98,6 +102,52 @@ Status = WinLdrLoadNLSData(LoaderBlock, SearchPath, AnsiName, OemName, LangName); DPRINTM(DPRINT_WINDOWS, "NLS data loaded with status %d\n", Status); +} + +VOID +SetupLdrScanBootDrivers(PLOADER_PARAMETER_BLOCK LoaderBlock, HINF InfHandle, LPCSTR SearchPath) +{ + INFCONTEXT InfContext; + BOOLEAN Status; + LPCSTR Media, DriverName; + WCHAR ServiceName[256]; + WCHAR ImagePath[256]; + + /* Open inf section */ + if (!InfFindFirstLine(InfHandle, "SourceDisksFiles", NULL, &InfContext)) + return; + + /* Load all listed boot drivers */ + do + { + if (InfGetDataField(&InfContext, 7, &Media) && + InfGetDataField(&InfContext, 0, &DriverName)) + { + if (strcmp(Media, "x") == 0) + { + /* Convert name to widechar */ + swprintf(ServiceName, L"%S", DriverName); + + /* Remove .sys extension */ + ServiceName[wcslen(ServiceName) - 4] = 0; + + /* Prepare image path */ + swprintf(ImagePath, L"%S", DriverName); + + /* Add it to the list */ + Status = WinLdrAddDriverToList(&LoaderBlock->BootDriverListHead, + L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\", + ImagePath, + ServiceName); + + if (!Status) + { + DPRINTM(DPRINT_WINDOWS, "could not add boot driver %s, %s\n", SearchPath, DriverName); + return; + } + } + } + } while (InfFindNextLine(&InfContext, &InfContext)); } VOID LoadReactOSSetup2(VOID) @@ -239,8 +289,11 @@ /* Load NLS data */ SetupLdrLoadNlsData(LoaderBlock, InfHandle, BootPath); + /* Get a list of boot drivers */ + SetupLdrScanBootDrivers(LoaderBlock, InfHandle, BootPath); + /* Load boot drivers */ - //Status = WinLdrLoadBootDrivers(LoaderBlock, BootPath); + Status = WinLdrLoadBootDrivers(LoaderBlock, BootPath); DPRINTM(DPRINT_WINDOWS, "Boot drivers loaded with status %d\n", Status); /* Alloc PCR, TSS, do magic things with the GDT/IDT */

16 years, 2 months

[cgutman] 40065: - Don't access an index outside the array bounds - Fixes memory corruption when calling AfdGetSockName and AfdGetPeerName - This caused a high-side redzone overwrite when accessing some web sites

by cgutman＠svn.reactos.org

Author: cgutman Date: Mon Mar 16 22:26:38 2009 New Revision: 40065 URL: http://svn.reactos.org/svn/reactos?rev=40065&view=rev Log: - Don't access an index outside the array bounds - Fixes memory corruption when calling AfdGetSockName and AfdGetPeerName - This caused a high-side redzone overwrite when accessing some web sites Modified: trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c Modified: trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] Mon Mar 16 22:26:38 2009 @@ -850,7 +850,6 @@ AddressIP->Address[0].AddressType = TDI_ADDRESS_TYPE_IP; AddressIP->Address[0].Address[0].sin_port = GetRemote ? RemotePort : LocalPort; AddressIP->Address[0].Address[0].in_addr = GetRemote ? RemoteAddress : LocalAddress; - AddressIP->Address[1].AddressLength = TDI_ADDRESS_LENGTH_IP; TcpipRecursiveMutexLeave( &TCPLock );

16 years, 2 months

← Newer
1
...
21
22
23
24
25
26
27
...
49
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2009