mirror of
https://github.com/reactos/reactos.git
synced 2025-05-25 20:18:22 +00:00
replace NtGdiSelectObject with NtGdiSelectBitmap and NtGdiSelectBrush in desktop.c
svn path=/trunk/; revision=30924
This commit is contained in:
parent
7c34f36a33
commit
6b97efb7ed
1 changed files with 6 additions and 6 deletions
|
@ -1403,15 +1403,15 @@ NtUserPaintDesktop(HDC hDC)
|
||||||
/* FIXME - clip out the bitmap
|
/* FIXME - clip out the bitmap
|
||||||
can be replaced with "NtGdiPatBlt(hDC, x, y, WinSta->cxWallpaper, WinSta->cyWallpaper, PATCOPY | DSTINVERT);"
|
can be replaced with "NtGdiPatBlt(hDC, x, y, WinSta->cxWallpaper, WinSta->cyWallpaper, PATCOPY | DSTINVERT);"
|
||||||
once we support DSTINVERT */
|
once we support DSTINVERT */
|
||||||
PreviousBrush = NtGdiSelectObject(hDC, DesktopBrush);
|
PreviousBrush = NtGdiSelectBrush(hDC, DesktopBrush);
|
||||||
NtGdiPatBlt(hDC, Rect.left, Rect.top, Rect.right, Rect.bottom, PATCOPY);
|
NtGdiPatBlt(hDC, Rect.left, Rect.top, Rect.right, Rect.bottom, PATCOPY);
|
||||||
NtGdiSelectObject(hDC, PreviousBrush);
|
NtGdiSelectBrush(hDC, PreviousBrush);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*Do not fill the background after it is painted no matter the size of the picture */
|
/*Do not fill the background after it is painted no matter the size of the picture */
|
||||||
doPatBlt = FALSE;
|
doPatBlt = FALSE;
|
||||||
|
|
||||||
hOldBitmap = NtGdiSelectObject(hWallpaperDC, WinSta->hbmWallpaper);
|
hOldBitmap = NtGdiSelectBitmap(hWallpaperDC, WinSta->hbmWallpaper);
|
||||||
|
|
||||||
if (WinSta->WallpaperMode == wmStretch)
|
if (WinSta->WallpaperMode == wmStretch)
|
||||||
{
|
{
|
||||||
|
@ -1465,7 +1465,7 @@ NtUserPaintDesktop(HDC hDC)
|
||||||
0,
|
0,
|
||||||
0);
|
0);
|
||||||
}
|
}
|
||||||
NtGdiSelectObject(hWallpaperDC, hOldBitmap);
|
NtGdiSelectBitmap(hWallpaperDC, hOldBitmap);
|
||||||
NtGdiDeleteObjectApp(hWallpaperDC);
|
NtGdiDeleteObjectApp(hWallpaperDC);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1474,9 +1474,9 @@ NtUserPaintDesktop(HDC hDC)
|
||||||
/* Back ground is set to none, clear the screen */
|
/* Back ground is set to none, clear the screen */
|
||||||
if (doPatBlt)
|
if (doPatBlt)
|
||||||
{
|
{
|
||||||
PreviousBrush = NtGdiSelectObject(hDC, DesktopBrush);
|
PreviousBrush = NtGdiSelectBrush(hDC, DesktopBrush);
|
||||||
NtGdiPatBlt(hDC, Rect.left, Rect.top, Rect.right, Rect.bottom, PATCOPY);
|
NtGdiPatBlt(hDC, Rect.left, Rect.top, Rect.right, Rect.bottom, PATCOPY);
|
||||||
NtGdiSelectObject(hDC, PreviousBrush);
|
NtGdiSelectBrush(hDC, PreviousBrush);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
Loading…
Reference in a new issue