Author: jimtabor
Date: Sat Apr 3 01:52:38 2010
New Revision: 46692
URL:
http://svn.reactos.org/svn/reactos?rev=46692&view=rev
Log:
- Simplifying MakeInfoDC.
Modified:
trunk/reactos/subsystems/win32/win32k/objects/dclife.c
Modified: trunk/reactos/subsystems/win32/win32k/objects/dclife.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] Sat Apr 3
01:52:38 2010
@@ -606,13 +606,14 @@
pdc->dctype = DC_TYPE_INFO;
pdc->dclevel.pSurface = NULL;
- if (PDEV_sizl(pdc->ppdev, &sizl)->cx == pdc->dclevel.sizl.cx
&&
- PDEV_sizl(pdc->ppdev, &sizl)->cy == pdc->dclevel.sizl.cy)
+ PDEV_sizl(pdc->ppdev, &sizl);
+
+ if ( sizl.cx == pdc->dclevel.sizl.cx &&
+ sizl.cy == pdc->dclevel.sizl.cy )
return TRUE;
- pdc->dclevel.sizl.cx = PDEV_sizl(pdc->ppdev, &sizl)->cx;
+ pdc->dclevel.sizl.cx = sizl.cx;
pdc->dclevel.sizl.cy = sizl.cy;
- IntSetDefaultRegion(pdc);
}
else
{
@@ -632,9 +633,8 @@
pdc->dclevel.sizl.cx = pSurface->SurfObj.sizlBitmap.cx;
pdc->dclevel.sizl.cy = pSurface->SurfObj.sizlBitmap.cy;
- IntSetDefaultRegion(pdc);
- }
- return TRUE;
+ }
+ return IntSetDefaultRegion(pdc);
}
/*