Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 23:12:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WIN32K]

Browse source 
Improve NtGdiStretchDIBitsInternal, use _SEH2_YIELT instead of saving an NTSTATUS and handle the fast path in place instead of setting a BOOL variable. Fixes warnings about uninitialized variables.

svn path=/trunk/; revision=50342
This commit is contained in:
Timo Kreuzer 2011-01-09 18:11:44 +00:00
parent e6182247f6
commit 3ecc17156e
1 changed files with 54 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

61
reactos/subsystems/win32/win32k/objects/dibobj.c
View file

@ -1028,9 +1028,10 @@ NtGdiStretchDIBitsInternal(
WORD planes, bpp;
DWORD compr, size;
HBITMAP hBitmap;
BOOL fastpath = FALSE;
NTSTATUS Status = STATUS_SUCCESS;
PBYTE safeBits ;
HBITMAP hOldBitmap;
HDC hdcMem;
PVOID pvBits;
PBYTE safeBits;
if (!Bits || !BitsInfo)
return 0;
@ -1053,25 +1054,20 @@ NtGdiStretchDIBitsInternal(
{
ProbeForRead(BitsInfo, cjMaxInfo, 1);
ProbeForRead(Bits, cjMaxBits, 1);
if (DIB_GetBitmapInfo( &BitsInfo->bmiHeader, &width, &height, &planes, &bpp, &compr, &size ) == -1)
if (DIB_GetBitmapInfo(&BitsInfo->bmiHeader, &width, &height, &planes, &bpp, &compr, &size) == -1)
{
DPRINT1("Invalid bitmap\n");
Status = STATUS_INVALID_PARAMETER;
_SEH2_YIELD(goto cleanup;)
}
RtlCopyMemory(safeBits, Bits, cjMaxBits);
}
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{
Status = _SEH2_GetExceptionCode();
DPRINT1("Error, failed to read the DIB bits\n");
_SEH2_YIELD(goto cleanup;)
}
_SEH2_END
if(!NT_SUCCESS(Status))
{
DPRINT1("Error, failed to read the DIB bits\n");
goto cleanup;
}
if (width < 0)
{
DPRINT1("Bitmap has a negative width\n");
@ -1086,30 +1082,22 @@ NtGdiStretchDIBitsInternal(
ROP == SRCCOPY)
{
BITMAP bmp;
if (IntGdiGetObject(hBitmap, sizeof(bmp), &bmp) == sizeof(bmp))
{
if (bmp.bmBitsPixel == bpp &&
ret = IntGdiGetObject(hBitmap, sizeof(bmp), &bmp) == sizeof(bmp);
if (ret &&
bmp.bmBitsPixel == bpp &&
bmp.bmWidth == SrcWidth &&
bmp.bmHeight == SrcHeight &&
bmp.bmPlanes == planes)
fastpath = TRUE;
}
}
if (fastpath)
{
/* fast path */
DPRINT1("using fast path\n");
ret = IntSetDIBits( pdc, hBitmap, 0, height, safeBits, BitsInfo, Usage);
ret = IntSetDIBits(pdc, hBitmap, 0, height, safeBits, BitsInfo, Usage);
goto cleanup;
}
}
else
{
/* slow path - need to use StretchBlt */
HBITMAP hOldBitmap;
HDC hdcMem;
PVOID pvBits;
hdcMem = NtGdiCreateCompatibleDC( hDC );
/* slow path - need to use StretchBlt */
hdcMem = NtGdiCreateCompatibleDC(hDC);
hBitmap = DIB_CreateDIBSection(pdc, BitsInfo, Usage, &pvBits, NULL, 0, 0);
if(!hBitmap)
{
@ -1117,21 +1105,22 @@ NtGdiStretchDIBitsInternal(
NtGdiDeleteObjectApp(hdcMem);
goto cleanup;
}
RtlCopyMemory(pvBits, safeBits, cjMaxBits);
hOldBitmap = NtGdiSelectBitmap( hdcMem, hBitmap );
hOldBitmap = NtGdiSelectBitmap(hdcMem, hBitmap);
/* Origin for DIBitmap may be bottom left (positive biHeight) or top
left (negative biHeight) */
ret = NtGdiStretchBlt( hDC, XDest, YDest, DestWidth, DestHeight,
ret = NtGdiStretchBlt(hDC, XDest, YDest, DestWidth, DestHeight,
hdcMem, XSrc, abs(height) - SrcHeight - YSrc,
SrcWidth, SrcHeight, ROP, 0 );
SrcWidth, SrcHeight, ROP, 0);
if(ret)
ret = SrcHeight;
NtGdiSelectBitmap( hdcMem, hOldBitmap );
NtGdiDeleteObjectApp( hdcMem );
GreDeleteObject( hBitmap );
}
NtGdiSelectBitmap(hdcMem, hOldBitmap);
NtGdiDeleteObjectApp(hdcMem);
GreDeleteObject(hBitmap);
cleanup:
ExFreePoolWithTag(safeBits, TAG_DIB);
DC_UnlockDc(pdc);