- Simplify GdiExtSelectClipRgn slightly
- Add missing line break

svn path=/trunk/; revision=44654
This commit is contained in:
Gregor Schneider 2009-12-19 13:08:53 +00:00
parent 077c75ad65
commit 3fc3ac5c8c
2 changed files with 4 additions and 7 deletions

View file

@ -729,7 +729,7 @@ NtUserSetScrollBarInfo(
if(!SBID_IS_VALID(Obj)) if(!SBID_IS_VALID(Obj))
{ {
SetLastWin32Error(ERROR_INVALID_PARAMETER); SetLastWin32Error(ERROR_INVALID_PARAMETER);
DPRINT1("Trying to set scrollinfo for unknown scrollbar type %d", Obj); DPRINT1("Trying to set scrollinfo for unknown scrollbar type %d\n", Obj);
RETURN( FALSE); RETURN( FALSE);
} }

View file

@ -99,7 +99,6 @@ int FASTCALL GdiExtSelectClipRgn(PDC dc,
HRGN hrgn, HRGN hrgn,
int fnMode) int fnMode)
{ {
int retval;
// dc->fs &= ~DC_FLAG_DIRTY_RAO; // dc->fs &= ~DC_FLAG_DIRTY_RAO;
if (!hrgn) if (!hrgn)
@ -110,7 +109,6 @@ int FASTCALL GdiExtSelectClipRgn(PDC dc,
{ {
GreDeleteObject(dc->rosdc.hClipRgn); GreDeleteObject(dc->rosdc.hClipRgn);
dc->rosdc.hClipRgn = NULL; dc->rosdc.hClipRgn = NULL;
retval = NULLREGION;
} }
} }
else else
@ -144,8 +142,7 @@ int FASTCALL GdiExtSelectClipRgn(PDC dc,
NtGdiCombineRgn(dc->rosdc.hClipRgn, dc->rosdc.hClipRgn, hrgn, fnMode); NtGdiCombineRgn(dc->rosdc.hClipRgn, dc->rosdc.hClipRgn, hrgn, fnMode);
} }
retval = CLIPPING_UpdateGCRegion(dc); return CLIPPING_UpdateGCRegion(dc);
return retval;
} }