From 6b97efb7ed40f396880d638bf07afe485293eeb4 Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Sat, 1 Dec 2007 01:11:25 +0000 Subject: [PATCH] replace NtGdiSelectObject with NtGdiSelectBitmap and NtGdiSelectBrush in desktop.c svn path=/trunk/; revision=30924 --- reactos/subsystems/win32/win32k/ntuser/desktop.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/reactos/subsystems/win32/win32k/ntuser/desktop.c b/reactos/subsystems/win32/win32k/ntuser/desktop.c index 36997cfe399..5d127dc080b 100644 --- a/reactos/subsystems/win32/win32k/ntuser/desktop.c +++ b/reactos/subsystems/win32/win32k/ntuser/desktop.c @@ -1403,15 +1403,15 @@ NtUserPaintDesktop(HDC hDC) /* FIXME - clip out the bitmap can be replaced with "NtGdiPatBlt(hDC, x, y, WinSta->cxWallpaper, WinSta->cyWallpaper, PATCOPY | DSTINVERT);" once we support DSTINVERT */ - PreviousBrush = NtGdiSelectObject(hDC, DesktopBrush); + PreviousBrush = NtGdiSelectBrush(hDC, DesktopBrush); 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 */ doPatBlt = FALSE; - hOldBitmap = NtGdiSelectObject(hWallpaperDC, WinSta->hbmWallpaper); + hOldBitmap = NtGdiSelectBitmap(hWallpaperDC, WinSta->hbmWallpaper); if (WinSta->WallpaperMode == wmStretch) { @@ -1465,7 +1465,7 @@ NtUserPaintDesktop(HDC hDC) 0, 0); } - NtGdiSelectObject(hWallpaperDC, hOldBitmap); + NtGdiSelectBitmap(hWallpaperDC, hOldBitmap); NtGdiDeleteObjectApp(hWallpaperDC); } } @@ -1474,9 +1474,9 @@ NtUserPaintDesktop(HDC hDC) /* Back ground is set to none, clear the screen */ if (doPatBlt) { - PreviousBrush = NtGdiSelectObject(hDC, DesktopBrush); + PreviousBrush = NtGdiSelectBrush(hDC, DesktopBrush); NtGdiPatBlt(hDC, Rect.left, Rect.top, Rect.right, Rect.bottom, PATCOPY); - NtGdiSelectObject(hDC, PreviousBrush); + NtGdiSelectBrush(hDC, PreviousBrush); } /*