- Cleanup leftovers and bugs from GreatLord's fix. I think this is my last "postfix" of GreatLord's commits to trunk.

svn path=/trunk/; revision=33886
This commit is contained in:
Aleksey Bragin 2008-06-07 12:58:48 +00:00
parent f984375fa8
commit 3f4244aafc

View file

@ -806,10 +806,13 @@ NtGdiStretchDIBitsInternal(
DPRINT1("NtGdiCreateCompatibleBitmap fail create bitmap\n");
DPRINT1("hDC : 0x%08x \n", hDC);
DPRINT1("BitsInfo->bmiHeader.biWidth : 0x%08x \n", BitsInfo->bmiHeader.biWidth);
DPRINT1("BitsInfo->bmiHeader.biWidth : 0x%08x \n", BitsInfo->bmiHeader.biHeight);
DPRINT1("BitsInfo->bmiHeader.biHeight : 0x%08x \n", BitsInfo->bmiHeader.biHeight);
return 0;
}
/* Select the bitmap into hdcMem, and save a handle to the old bitmap */
hOldBitmap = NtGdiSelectBitmap(hdcMem, hBitmap);
if(Usage == DIB_PAL_COLORS)
{
hPal = NtGdiGetDCObject(hDC, GDI_OBJECT_TYPE_PALETTE);
@ -859,10 +862,8 @@ NtGdiStretchDIBitsInternal(
if(hPal)
GdiSelectPalette(hdcMem, hPal, FALSE);
if (hOldBitmap != NULL)
{
NtGdiSelectBitmap(hdcMem, hOldBitmap);
}
if (hOldBitmap)
NtGdiSelectBitmap(hdcMem, hOldBitmap);
NtGdiDeleteObjectApp(hdcMem);