[ros-diffs] [jimtabor] 30371: Removed unused DeviceDriver. Fix behavior for dcattr.

[jimtabor at svn.reactos.org]

Author: jimtabor
Date: Mon Nov 12 06:22:12 2007
New Revision: 30371

URL: http://svn.reactos.org/svn/reactos?rev=30371&view=rev
Log:
Removed unused DeviceDriver. Fix behavior for dcattr.

Modified:
    trunk/reactos/include/reactos/win32k/ntgdihdl.h
    trunk/reactos/subsystems/win32/win32k/objects/dc.c

Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntgdihdl.h?rev=30371&r1=30370&r2=30371&view=diff
==============================================================================
--- trunk/reactos/include/reactos/win32k/ntgdihdl.h (original)
+++ trunk/reactos/include/reactos/win32k/ntgdihdl.h Mon Nov 12 06:22:12 2007
@@ -513,7 +513,6 @@
   HDEV        GDIDevice; // Should be PDev or pPDev?
   DRIVER_FUNCTIONS  DriverFunctions; // In GDIDEVICE
   UNICODE_STRING    DriverName;
-  HANDLE      DeviceDriver; // ?DHPDEV?
 
   CLIPOBJ     *CombinedClip;
 

Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/objects/dc.c?rev=30371&r1=30370&r2=30371&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Mon Nov 12 06:22:12 2007
@@ -218,7 +218,6 @@
   NewDC->w.bitsPerPixel = OrigDC->w.bitsPerPixel;
 
   /* DriverName is copied in the AllocDC routine  */
-  NewDC->DeviceDriver = OrigDC->DeviceDriver;
   NewDC->Dc_Attr.ptlWindowOrg.x = OrigDC->Dc_Attr.ptlWindowOrg.x;
   NewDC->Dc_Attr.ptlWindowOrg.y = OrigDC->Dc_Attr.ptlWindowOrg.y;
   NewDC->Dc_Attr.szlWindowExt.cx = OrigDC->Dc_Attr.szlWindowExt.cx;
@@ -2534,6 +2533,7 @@
   PDC pDC = DC_LockDc(DCToFree);
   if (pDC->pDc_Attr == &pDC->Dc_Attr) return; // Internal DC object!
   pDC->pDc_Attr = NULL;
+//  pDC->pDc_Attr = &pDC->Dc_Attr; // Correct behavior.
   DC_UnlockDc(pDC);
 
   KeEnterCriticalRegion();