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

replace NtGdiSelectObject with NtGdiSelectBitmap and NtGdiSelectBrush in bitmaps.c

Browse source 
svn path=/trunk/; revision=30910
This commit is contained in:
Timo Kreuzer 2007-11-30 02:38:19 +00:00
parent 9748f79adc
commit 180c07024b
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
reactos/subsystems/win32/win32k/objects/bitmaps.c
View file

@ -305,13 +305,13 @@ NtGdiGetPixel(HDC hDC, INT XPos, INT YPos)
//HBITMAP hBmpTmp = IntGdiCreateBitmap ( 1, 1, 1, 32, NULL); //HBITMAP hBmpTmp = IntGdiCreateBitmap ( 1, 1, 1, 32, NULL);
if ( hBmpTmp ) if ( hBmpTmp )
{ {
HBITMAP hBmpOld = (HBITMAP)NtGdiSelectObject ( hDCTmp, hBmpTmp ); HBITMAP hBmpOld = (HBITMAP)NtGdiSelectBitmap ( hDCTmp, hBmpTmp );
if ( hBmpOld ) if ( hBmpOld )
{ {
PBITMAPOBJ bmpobj; PBITMAPOBJ bmpobj;
NtGdiBitBlt ( hDCTmp, 0, 0, 1, 1, hDC, XPos, YPos, SRCCOPY, 0, 0 ); NtGdiBitBlt ( hDCTmp, 0, 0, 1, 1, hDC, XPos, YPos, SRCCOPY, 0, 0 );
NtGdiSelectObject ( hDCTmp, hBmpOld ); NtGdiSelectBitmap ( hDCTmp, hBmpOld );
// our bitmap is no longer selected, so we can access it's stuff... // our bitmap is no longer selected, so we can access it's stuff...
bmpobj = BITMAPOBJ_LockBitmap ( hBmpTmp ); bmpobj = BITMAPOBJ_LockBitmap ( hBmpTmp );
@ -529,14 +529,14 @@ GdiSetPixelV(
if (NewBrush == NULL) if (NewBrush == NULL)
return(FALSE); return(FALSE);
OldBrush = NtGdiSelectObject(hDC, NewBrush); OldBrush = NtGdiSelectBrush(hDC, NewBrush);
if (OldBrush == NULL) if (OldBrush == NULL)
{ {
NtGdiDeleteObject(NewBrush); NtGdiDeleteObject(NewBrush);
return(FALSE); return(FALSE);
} }
NtGdiPatBlt(hDC, X, Y, 1, 1, PATCOPY); NtGdiPatBlt(hDC, X, Y, 1, 1, PATCOPY);
NtGdiSelectObject(hDC, OldBrush); NtGdiSelectBrush(hDC, OldBrush);
NtGdiDeleteObject(NewBrush); NtGdiDeleteObject(NewBrush);
return TRUE; return TRUE;
} }