Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 19:03:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

1st Sort out gdi device mess.

Browse source 
svn path=/trunk/; revision=30370
This commit is contained in:
James Tabor 2007-11-12 01:26:32 +00:00
parent d399d73f7a
commit cd2962c5b8
3 changed files with 25 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

33
reactos/include/reactos/win32k/ntgdihdl.h
View file

@ -495,28 +495,34 @@ typedef struct _DC
ULONG lucExcLock; ULONG lucExcLock;
ULONG Tid; ULONG Tid;
DHPDEV PDev; DHPDEV PDev; // Handle GDIDEVICE?
INT DC_Type; INT DC_Type;
INT DC_Flags; INT DC_Flags;
PVOID pPDev; // PGDIDEVICE?
FLONG flGraphics;
FLONG flGraphics2;
PDC_ATTR pDc_Attr; PDC_ATTR pDc_Attr;
DC_ATTR Dc_Attr; DC_ATTR Dc_Attr;
HDC hSelf; // Used only for MemoryDC & SaveDC.
HDC hNext; HDC hNext;
HSURF FillPatternSurfaces[HS_DDI_MAX]; HDC hPrev;
PGDIINFO GDIInfo; // Old tymerz! Cant code? So just Haxzorcise it!
PDEVINFO DevInfo; // How many pointers to devices do we need?
HDEV GDIDevice; HSURF FillPatternSurfaces[HS_DDI_MAX]; // In GDIDEVICE
PGDIINFO GDIInfo; // In GDIDEVICE
PDEVINFO DevInfo; // In GDIDEVICE
HDEV GDIDevice; // Should be PDev or pPDev?
DRIVER_FUNCTIONS DriverFunctions; // In GDIDEVICE
UNICODE_STRING DriverName; UNICODE_STRING DriverName;
HANDLE DeviceDriver; HANDLE DeviceDriver; // ?DHPDEV?
CLIPOBJ *CombinedClip; CLIPOBJ *CombinedClip;
XLATEOBJ *XlateBrush; XLATEOBJ *XlateBrush;
XLATEOBJ *XlatePen; XLATEOBJ *XlatePen;
INT saveLevel; INT saveLevel; // DCLEVEL lSaveDepth
BOOL IsIC; HDC hSelf; // DCLEVEL hdcSave Used only for MemoryDC & SaveDC.
BOOL IsIC; // Use DC_Type
HPALETTE PalIndexed; HPALETTE PalIndexed;
@ -524,13 +530,6 @@ typedef struct _DC
HANDLE hFile; HANDLE hFile;
LPENHMETAHEADER emh; LPENHMETAHEADER emh;
// This belongs in DHPDEV not in DC. 8^(
// So I'm putting it down here with the rest of misfits.
// DRIVER_FUNCTIONS does not belong in DC. It should go PVOID in dpdev.
DRIVER_FUNCTIONS DriverFunctions;
struct _EDD_DIRECTDRAW_GLOBAL * pEDDgpl;
//
} DC, *PDC; } DC, *PDC;
#endif #endif

5
reactos/subsystems/win32/win32k/include/dc.h
View file

@ -56,7 +56,10 @@ typedef struct
UINT SafetyRemoveLevel; /* at what level was the cursor removed? UINT SafetyRemoveLevel; /* at what level was the cursor removed?
0 for not removed */ 0 for not removed */
UINT SafetyRemoveCount; UINT SafetyRemoveCount;
} GDIDEVICE;
struct _EDD_DIRECTDRAW_GLOBAL * pEDDgpl;
} GDIDEVICE, *PGDIDEVICE;
/* Internal functions */ /* Internal functions */

7
reactos/subsystems/win32/win32k/ntddraw/dxeng.c
View file

@ -388,10 +388,13 @@ DxEngGetDCState(HDC hDC,
UNIMPLEMENTED; UNIMPLEMENTED;
return 0; return 0;
case 3: case 3:
pEDDgpl = pDC->pEDDgpl; {
/* PGDIDEVICE GDIDevice = (PGDIDEVICE)pDC->PDev; //This one is right,, we have two.*/
PGDIDEVICE GDIDevice = (PGDIDEVICE)pDC->GDIDevice; //Until now noone noticed.
pEDDgpl = GDIDevice->pEDDgpl;
DC_UnlockDc(pDC); DC_UnlockDc(pDC);
return (DWORD)pEDDgpl; return (DWORD)pEDDgpl;
}
default: default:
UNIMPLEMENTED; UNIMPLEMENTED;
break; break;