mirror of
https://github.com/reactos/reactos.git
synced 2024-12-29 02:25:17 +00:00
Handle NULL window as special case when computing visible region for GetDC.
Fixes bug #59 svn path=/trunk/; revision=8006
This commit is contained in:
parent
51612d040b
commit
70a9c9cdf0
1 changed files with 16 additions and 2 deletions
|
@ -16,7 +16,7 @@
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||||
*/
|
*/
|
||||||
/* $Id: windc.c,v 1.52 2004/02/02 22:09:05 gvg Exp $
|
/* $Id: windc.c,v 1.53 2004/02/02 23:28:17 gvg Exp $
|
||||||
*
|
*
|
||||||
* COPYRIGHT: See COPYING in the top level directory
|
* COPYRIGHT: See COPYING in the top level directory
|
||||||
* PROJECT: ReactOS kernel
|
* PROJECT: ReactOS kernel
|
||||||
|
@ -232,6 +232,7 @@ DceUpdateVisRgn(DCE *Dce, PWINDOW_OBJECT Window, ULONG Flags)
|
||||||
{
|
{
|
||||||
HANDLE hRgnVisible = NULL;
|
HANDLE hRgnVisible = NULL;
|
||||||
ULONG DcxFlags;
|
ULONG DcxFlags;
|
||||||
|
PWINDOW_OBJECT DesktopWindow;
|
||||||
|
|
||||||
if (Flags & DCX_PARENTCLIP)
|
if (Flags & DCX_PARENTCLIP)
|
||||||
{
|
{
|
||||||
|
@ -260,9 +261,22 @@ DceUpdateVisRgn(DCE *Dce, PWINDOW_OBJECT Window, ULONG Flags)
|
||||||
hRgnVisible = NtGdiCreateRectRgn(0, 0, 0, 0);
|
hRgnVisible = NtGdiCreateRectRgn(0, 0, 0, 0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
else if (NULL == Window)
|
||||||
|
{
|
||||||
|
DesktopWindow = IntGetWindowObject(IntGetDesktopWindow());
|
||||||
|
if (NULL != DesktopWindow)
|
||||||
|
{
|
||||||
|
hRgnVisible = UnsafeIntCreateRectRgnIndirect(&DesktopWindow->WindowRect);
|
||||||
|
IntReleaseWindowObject(DesktopWindow);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
hRgnVisible = NULL;
|
||||||
|
}
|
||||||
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
hRgnVisible = DceGetVisRgn(NULL != Window ? Window->Self : NULL, Flags, 0, 0);
|
hRgnVisible = DceGetVisRgn(Window->Self, Flags, 0, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (0 != (Flags & DCX_INTERSECTRGN))
|
if (0 != (Flags & DCX_INTERSECTRGN))
|
||||||
|
|
Loading…
Reference in a new issue