Author: fireball Date: Wed Jan 5 23:19:10 2011 New Revision: 50295
URL: http://svn.reactos.org/svn/reactos?rev=50295&view=rev Log: - Modify RosGdiCreateDC accordingly.
Modified: branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c
Modified: branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win32... ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c [iso-8859-1] Wed Jan 5 23:19:10 2011 @@ -49,8 +49,8 @@ return TRUE; }
-BOOL APIENTRY RosGdiCreateDC( PROS_DCINFO dc, HDC *pdev, LPCWSTR driver, LPCWSTR device, - LPCWSTR output, const DEVMODEW* initData ) +BOOL APIENTRY RosGdiCreateDC( HDC *pdev, LPCWSTR driver, LPCWSTR device, + LPCWSTR output, const DEVMODEW* initData, ULONG dcType ) { HGDIOBJ hNewDC; PDC pNewDC; @@ -90,7 +90,7 @@ pNewDC->dclevel.hpal = hStockPalette; pNewDC->dclevel.ppal = PALETTE_ShareLockPalette(pNewDC->dclevel.hpal);
- if (dc->dwType == OBJ_MEMDC) + if (dcType == OBJ_MEMDC) { DPRINT("Creating a memory DC %x\n", hNewDC); pNewDC->dclevel.pSurface = SURFACE_ShareLockSurface(hStockBmp);
Modified: branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win32... ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c [iso-8859-1] Wed Jan 5 23:19:10 2011 @@ -56,15 +56,12 @@ NTAPI SwmCreateScreenDc() { - ROS_DCINFO RosDc; PDC pDC; RECTL rcBounds;
/* Create the display DC */ - RtlZeroMemory(&RosDc, sizeof(ROS_DCINFO)); - RosDc.dwType = OBJ_DC; SwmDc = (HDC)0; - RosGdiCreateDC(&RosDc, &SwmDc, NULL, NULL, NULL, NULL); + RosGdiCreateDC(&SwmDc, NULL, NULL, NULL, NULL, OBJ_DC);
/* Set clipping to full screen */ pDC = DC_LockDc(SwmDc);