Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-24 01:15:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update PDEVOBJ and GRAPHICS_DEVICE fields

Browse source 
svn path=/trunk/; revision=42735
This commit is contained in:
Timo Kreuzer 2009-08-16 12:57:41 +00:00
parent c13c6c8daa
commit 074f29786e
20 changed files with 187 additions and 173 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/subsystems/win32/win32k/eng/driverobj.c
View file

@ -59,7 +59,7 @@ EngCreateDriverObj(
pedo->drvobj.pvObj = pvObj; pedo->drvobj.pvObj = pvObj;
pedo->drvobj.pFreeProc = pFreeObjProc; pedo->drvobj.pFreeProc = pFreeObjProc;
pedo->drvobj.hdev = hdev; pedo->drvobj.hdev = hdev;
pedo->drvobj.dhpdev = ppdev->hPDev; pedo->drvobj.dhpdev = ppdev->dhpdev;
/* Unlock the object */ /* Unlock the object */
DRIVEROBJ_UnlockObject(pedo); DRIVEROBJ_UnlockObject(pedo);

2
reactos/subsystems/win32/win32k/eng/engbrush.c
View file

@ -39,7 +39,7 @@ EBRUSHOBJ_vInit(EBRUSHOBJ *pebo, PBRUSH pbrush, PDC pdc)
if (pebo->psurfTrg) if (pebo->psurfTrg)
hpal = pebo->psurfTrg->hDIBPalette; hpal = pebo->psurfTrg->hDIBPalette;
if (!hpal) hpal = pPrimarySurface->DevInfo.hpalDefault; if (!hpal) hpal = pPrimarySurface->devinfo.hpalDefault;
pebo->ppalSurf = PALETTE_ShareLockPalette(hpal); pebo->ppalSurf = PALETTE_ShareLockPalette(hpal);
if (!pebo->ppalSurf) if (!pebo->ppalSurf)
pebo->ppalSurf = &gpalRGB; pebo->ppalSurf = &gpalRGB;

2
reactos/subsystems/win32/win32k/eng/mouse.c
View file

@ -428,7 +428,7 @@ EngSetPointerShape(
if(pgp->psurfMask) if(pgp->psurfMask)
{ {
ppal = PALETTE_LockPalette(ppdev->DevInfo.hpalDefault); ppal = PALETTE_LockPalette(ppdev->devinfo.hpalDefault);
EXLATEOBJ_vInitialize(&exlo, EXLATEOBJ_vInitialize(&exlo,
&gpalMono, &gpalMono,
ppal, ppal,

4
reactos/subsystems/win32/win32k/eng/surface.c
View file

@ -536,7 +536,7 @@ EngAssociateSurface(
/* Associate the hdev */ /* Associate the hdev */
pso->hdev = hdev; pso->hdev = hdev;
pso->dhpdev = ppdev->hPDev; pso->dhpdev = ppdev->dhpdev;
/* Hook up specified functions */ /* Hook up specified functions */
psurf->flHooks = flHooks; psurf->flHooks = flHooks;
@ -578,7 +578,7 @@ EngModifySurface(
/* Associate the hdev */ /* Associate the hdev */
pso->hdev = hdev; pso->hdev = hdev;
pso->dhpdev = ppdev->hPDev; pso->dhpdev = ppdev->dhpdev;
/* Hook up specified functions */ /* Hook up specified functions */
psurf->flHooks = flHooks; psurf->flHooks = flHooks;

6
reactos/subsystems/win32/win32k/eng/xlate.c
View file

@ -621,14 +621,14 @@ EXLATEOBJ_vInitXlateFromDCs(
hpalSrc = psurfSrc->hDIBPalette; hpalSrc = psurfSrc->hDIBPalette;
if (!hpalSrc) if (!hpalSrc)
hpalSrc = pPrimarySurface->DevInfo.hpalDefault; hpalSrc = pPrimarySurface->devinfo.hpalDefault;
ppalSrc = PALETTE_ShareLockPalette(hpalSrc); ppalSrc = PALETTE_ShareLockPalette(hpalSrc);
if (!ppalSrc) if (!ppalSrc)
return; return;
hpalDst = psurfDst->hDIBPalette; hpalDst = psurfDst->hDIBPalette;
if (!hpalDst) hpalDst = pPrimarySurface->DevInfo.hpalDefault; if (!hpalDst) hpalDst = pPrimarySurface->devinfo.hpalDefault;
ppalDst = PALETTE_ShareLockPalette(hpalDst); ppalDst = PALETTE_ShareLockPalette(hpalDst);
if (!ppalDst) if (!ppalDst)
@ -695,7 +695,7 @@ EXLATEOBJ_vInitBrushXlate(
EXLATEOBJ_vInitTrivial(pexlo); EXLATEOBJ_vInitTrivial(pexlo);
hpalDst = psurfDst->hDIBPalette; hpalDst = psurfDst->hDIBPalette;
if (!hpalDst) hpalDst = pPrimarySurface->DevInfo.hpalDefault; if (!hpalDst) hpalDst = pPrimarySurface->devinfo.hpalDefault;
ppalDst = PALETTE_ShareLockPalette(hpalDst); ppalDst = PALETTE_ShareLockPalette(hpalDst);
if (!ppalDst) if (!ppalDst)
{ {

34
reactos/subsystems/win32/win32k/include/pdevobj.h
View file

@ -39,10 +39,24 @@ typedef struct _GDIPOINTER /* should stay private to ENG? No, part of PDEVOBJ ak
typedef struct _GRAPHICS_DEVICE typedef struct _GRAPHICS_DEVICE
{ {
CHAR szNtDeviceName[CCHDEVICENAME]; /* Yes char AscII */ WCHAR szNtDeviceName[CCHDEVICENAME/2];
CHAR szWinDeviceName[CCHDEVICENAME]; /* <- chk GetMonitorInfoW MxIxEX.szDevice */ WCHAR szWinDeviceName[CCHDEVICENAME/2];
struct _GRAPHICS_DEVICE * pNextGraphicsDevice; struct _GRAPHICS_DEVICE * pNextGraphicsDevice;
DWORD StateFlags; /* See DISPLAY_DEVICE_* */ struct _GRAPHICS_DEVICE * pVgaDevice;
PDEVICE_OBJECT DeviceObject;
PVOID pDeviceHandle;
DWORD hkClassDriverConfig;
DWORD StateFlags; /* See DISPLAY_DEVICE_* */
ULONG cbdevmodeInfo;
PVOID devmodeInfo;
DWORD cbdevmodeInfo1;
PVOID devmodeInfo1;
LPWSTR pwszDeviceNames;
LPWSTR pwszDescription;
DWORD dwUnknown;
PVOID pUnknown;
PFILE_OBJECT FileObject;
DWORD ProtocolType;
} GRAPHICS_DEVICE, *PGRAPHICS_DEVICE; } GRAPHICS_DEVICE, *PGRAPHICS_DEVICE;
typedef struct _PDEVOBJ typedef struct _PDEVOBJ
@ -55,7 +69,7 @@ typedef struct _PDEVOBJ
struct _PDEVOBJ * ppdevParent; struct _PDEVOBJ * ppdevParent;
FLONG flFlags; // flags FLONG flFlags; // flags
// FLONG flAccelerated; // FLONG flAccelerated;
PERESOURCE hsemDevLock; /* Device lock. */ HSEMAPHORE hsemDevLock; /* Device lock. */
// HSEMAPHORE hsemPointer; // HSEMAPHORE hsemPointer;
POINTL ptlPointer; POINTL ptlPointer;
// SIZEL szlPointer; // SIZEL szlPointer;
@ -63,7 +77,7 @@ typedef struct _PDEVOBJ
// HFONT hlfntDefault; // HFONT hlfntDefault;
// HFONT hlfntAnsiVariable; // HFONT hlfntAnsiVariable;
// HFONT hlfntAnsiFixed; // HFONT hlfntAnsiFixed;
HSURF FillPatterns[HS_DDI_MAX]; // ahsurf[HS_DDI_MAX]; HSURF ahsurf[HS_DDI_MAX];
// PUNICODE_STRING pusPrtDataFileName; // PUNICODE_STRING pusPrtDataFileName;
// PVOID pDevHTInfo; // PVOID pDevHTInfo;
// RFONT * prfntActive; // RFONT * prfntActive;
@ -85,14 +99,14 @@ typedef struct _PDEVOBJ
// PFN_DrvNotify pfnDrvNotify; // PFN_DrvNotify pfnDrvNotify;
// ULONG TagSig; // ULONG TagSig;
// PLDEVOBJ pldev; // PLDEVOBJ pldev;
DHPDEV hPDev; /* dhpdev, DHPDEV for device. */ DHPDEV dhpdev; /* DHPDEV for device. */
PVOID ppalSurf; /* PEPALOBJ/PPALETTE for this device. */ PVOID ppalSurf; /* PEPALOBJ/PPALETTE for this device. */
DEVINFO DevInfo; // devinfo DEVINFO devinfo;
GDIINFO GDIInfo; // gdiinfo GDIINFO gdiinfo;
HSURF pSurface; /* SURFACE for this device., FIXME: PSURFACE */ HSURF pSurface; /* SURFACE for this device., FIXME: PSURFACE */
// HANDLE hSpooler; /* Handle to spooler, if spooler dev driver. */ // HANDLE hSpooler; /* Handle to spooler, if spooler dev driver. */
// PVOID pDesktopId; // PVOID pDesktopId;
PGRAPHICS_DEVICE pGraphicsDev; /* pGraphicsDevice */ PGRAPHICS_DEVICE pGraphicsDevice;
// POINTL ptlOrigion; // POINTL ptlOrigion;
PVOID pdmwDev; /* Ptr->DEVMODEW.dmSize + dmDriverExtra == alloc size. */ PVOID pdmwDev; /* Ptr->DEVMODEW.dmSize + dmDriverExtra == alloc size. */
// DWORD Unknown3; // DWORD Unknown3;

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

@ -265,7 +265,7 @@ DxEngSetDeviceGammaRamp(HDEV hPDev, PGAMMARAMP Ramp, BOOL Test)
* DxEGShDevData_OpenRefs Retrieve the pdevOpenRefs counter * DxEGShDevData_OpenRefs Retrieve the pdevOpenRefs counter
* DxEGShDevData_palette See if the device RC_PALETTE is set * DxEGShDevData_palette See if the device RC_PALETTE is set
* DxEGShDevData_ldev ATM we do not support the Loader Device driver structure * DxEGShDevData_ldev ATM we do not support the Loader Device driver structure
* DxEGShDevData_GDev Retrieve the device pGraphicsDev * DxEGShDevData_GDev Retrieve the device pGraphicsDevice
* DxEGShDevData_clonedev Retrieve the device PDEV_CLONE_DEVICE flag is set or not * DxEGShDevData_clonedev Retrieve the device PDEV_CLONE_DEVICE flag is set or not
* *
* @return * @return
@ -302,15 +302,15 @@ DxEngGetHdevData(HDEV hDev,
break; break;
case DxEGShDevData_DitherFmt: case DxEGShDevData_DitherFmt:
DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_DitherFmt\n"); DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_DitherFmt\n");
retVal = (DWORD_PTR) PDev->DevInfo.iDitherFormat; retVal = (DWORD_PTR) PDev->devinfo.iDitherFormat;
break; break;
case DxEGShDevData_FxCaps: case DxEGShDevData_FxCaps:
DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_FxCaps\n"); DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_FxCaps\n");
retVal = (DWORD_PTR) PDev->DevInfo.flGraphicsCaps; retVal = (DWORD_PTR) PDev->devinfo.flGraphicsCaps;
break; break;
case DxEGShDevData_FxCaps2: case DxEGShDevData_FxCaps2:
DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_FxCaps2\n"); DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_FxCaps2\n");
retVal = (DWORD_PTR) PDev->DevInfo.flGraphicsCaps2; retVal = (DWORD_PTR) PDev->devinfo.flGraphicsCaps2;
break; break;
case DxEGShDevData_DrvFuncs: case DxEGShDevData_DrvFuncs:
DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_DrvFuncs\n"); DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_DrvFuncs\n");
@ -318,7 +318,7 @@ DxEngGetHdevData(HDEV hDev,
break; break;
case DxEGShDevData_dhpdev: case DxEGShDevData_dhpdev:
DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_dhpdev\n"); DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_dhpdev\n");
retVal = (DWORD_PTR) PDev->hPDev; // DHPDEV retVal = (DWORD_PTR) PDev->dhpdev; // DHPDEV
break; break;
case DxEGShDevData_eddg: case DxEGShDevData_eddg:
DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_eddg\n"); DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_eddg\n");
@ -354,7 +354,7 @@ DxEngGetHdevData(HDEV hDev,
break; break;
case DxEGShDevData_palette: case DxEGShDevData_palette:
DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_palette\n"); DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_palette\n");
retVal = (DWORD_PTR) PDev->GDIInfo.flRaster & RC_PALETTE; retVal = (DWORD_PTR) PDev->gdiinfo.flRaster & RC_PALETTE;
break; break;
case DxEGShDevData_ldev: case DxEGShDevData_ldev:
DPRINT1("DxEGShDevData_ldev not supported yet\n"); DPRINT1("DxEGShDevData_ldev not supported yet\n");
@ -363,7 +363,7 @@ DxEngGetHdevData(HDEV hDev,
break; break;
case DxEGShDevData_GDev: case DxEGShDevData_GDev:
DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_GDev\n"); DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_GDev\n");
retVal = (DWORD_PTR) PDev->pGraphicsDev; // P"GRAPHICS_DEVICE" retVal = (DWORD_PTR) PDev->pGraphicsDevice; // P"GRAPHICS_DEVICE"
break; break;
case DxEGShDevData_clonedev: case DxEGShDevData_clonedev:
DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_clonedev\n"); DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_clonedev\n");

4
reactos/subsystems/win32/win32k/ntuser/metric.c
View file

@ -29,8 +29,8 @@ InitMetrics(VOID)
PSYSTEM_CURSORINFO CurInfo; PSYSTEM_CURSORINFO CurInfo;
INT *piSysMet; INT *piSysMet;
Width = pPrimarySurface->GDIInfo.ulHorzRes; Width = pPrimarySurface->gdiinfo.ulHorzRes;
Height = pPrimarySurface->GDIInfo.ulVertRes; Height = pPrimarySurface->gdiinfo.ulVertRes;
Status = IntValidateWindowStationHandle(PsGetCurrentProcess()->Win32WindowStation, Status = IntValidateWindowStationHandle(PsGetCurrentProcess()->Win32WindowStation,
KernelMode, KernelMode,

8
reactos/subsystems/win32/win32k/ntuser/monitor.c
View file

@ -334,8 +334,8 @@ IntGetMonitorsFromRect(OPTIONAL IN LPCRECTL pRect,
ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&Monitor->Lock); ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&Monitor->Lock);
MonitorRect.left = 0; /* FIXME: get origin */ MonitorRect.left = 0; /* FIXME: get origin */
MonitorRect.top = 0; /* FIXME: get origin */ MonitorRect.top = 0; /* FIXME: get origin */
MonitorRect.right = MonitorRect.left + Monitor->GdiDevice->GDIInfo.ulHorzRes; MonitorRect.right = MonitorRect.left + Monitor->GdiDevice->gdiinfo.ulHorzRes;
MonitorRect.bottom = MonitorRect.top + Monitor->GdiDevice->GDIInfo.ulVertRes; MonitorRect.bottom = MonitorRect.top + Monitor->GdiDevice->gdiinfo.ulVertRes;
ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&Monitor->Lock); ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&Monitor->Lock);
DPRINT("MonitorRect: left = %d, top = %d, right = %d, bottom = %d\n", DPRINT("MonitorRect: left = %d, top = %d, right = %d, bottom = %d\n",
@ -667,8 +667,8 @@ NtUserGetMonitorInfo(
/* fill monitor info */ /* fill monitor info */
MonitorInfo.rcMonitor.left = 0; /* FIXME: get origin */ MonitorInfo.rcMonitor.left = 0; /* FIXME: get origin */
MonitorInfo.rcMonitor.top = 0; /* FIXME: get origin */ MonitorInfo.rcMonitor.top = 0; /* FIXME: get origin */
MonitorInfo.rcMonitor.right = MonitorInfo.rcMonitor.left + Monitor->GdiDevice->GDIInfo.ulHorzRes; MonitorInfo.rcMonitor.right = MonitorInfo.rcMonitor.left + Monitor->GdiDevice->gdiinfo.ulHorzRes;
MonitorInfo.rcMonitor.bottom = MonitorInfo.rcMonitor.top + Monitor->GdiDevice->GDIInfo.ulVertRes; MonitorInfo.rcMonitor.bottom = MonitorInfo.rcMonitor.top + Monitor->GdiDevice->gdiinfo.ulVertRes;
MonitorInfo.rcWork = MonitorInfo.rcMonitor; /* FIXME: use DEVMODE panning to calculate work area? */ MonitorInfo.rcWork = MonitorInfo.rcMonitor; /* FIXME: use DEVMODE panning to calculate work area? */
MonitorInfo.dwFlags = 0; MonitorInfo.dwFlags = 0;

4
reactos/subsystems/win32/win32k/objects/bitblt.c
View file

@ -377,10 +377,10 @@ NtGdiTransparentBlt(
} }
DestPalette = BitmapDest->hDIBPalette; DestPalette = BitmapDest->hDIBPalette;
if (!DestPalette) DestPalette = pPrimarySurface->DevInfo.hpalDefault; if (!DestPalette) DestPalette = pPrimarySurface->devinfo.hpalDefault;
SourcePalette = BitmapSrc->hDIBPalette; SourcePalette = BitmapSrc->hDIBPalette;
if (!SourcePalette) SourcePalette = pPrimarySurface->DevInfo.hpalDefault; if (!SourcePalette) SourcePalette = pPrimarySurface->devinfo.hpalDefault;
if(!(PalSourceGDI = PALETTE_LockPalette(SourcePalette))) if(!(PalSourceGDI = PALETTE_LockPalette(SourcePalette)))
{ {

4
reactos/subsystems/win32/win32k/objects/bitmaps.c
View file

@ -278,7 +278,7 @@ NtGdiCreateCompatibleBitmap(
Dc = DC_LockDc(hDC); Dc = DC_LockDc(hDC);
DPRINT("NtGdiCreateCompatibleBitmap(%04x,%d,%d, bpp:%d) = \n", DPRINT("NtGdiCreateCompatibleBitmap(%04x,%d,%d, bpp:%d) = \n",
hDC, Width, Height, Dc->ppdev->GDIInfo.cBitsPixel); hDC, Width, Height, Dc->ppdev->gdiinfo.cBitsPixel);
if (NULL == Dc) if (NULL == Dc)
{ {
@ -364,7 +364,7 @@ NtGdiGetPixel(HDC hDC, INT XPos, INT YPos)
{ {
pso = &psurf->SurfObj; pso = &psurf->SurfObj;
hpal = psurf->hDIBPalette; hpal = psurf->hDIBPalette;
if (!hpal) hpal = pPrimarySurface->DevInfo.hpalDefault; if (!hpal) hpal = pPrimarySurface->devinfo.hpalDefault;
ppal = PALETTE_ShareLockPalette(hpal); ppal = PALETTE_ShareLockPalette(hpal);
if (psurf->SurfObj.iBitmapFormat == BMF_1BPP && !psurf->hSecure) if (psurf->SurfObj.iBitmapFormat == BMF_1BPP && !psurf->hSecure)

44
reactos/subsystems/win32/win32k/objects/coord.c
View file

@ -674,38 +674,38 @@ IntGdiSetMapMode(
/* Fall through */ /* Fall through */
case MM_LOMETRIC: case MM_LOMETRIC:
pdcattr->szlWindowExt.cx = dc->ppdev->GDIInfo.ulHorzSize * 10; pdcattr->szlWindowExt.cx = dc->ppdev->gdiinfo.ulHorzSize * 10;
pdcattr->szlWindowExt.cy = dc->ppdev->GDIInfo.ulVertSize * 10; pdcattr->szlWindowExt.cy = dc->ppdev->gdiinfo.ulVertSize * 10;
pdcattr->szlViewportExt.cx = dc->ppdev->GDIInfo.ulHorzRes; pdcattr->szlViewportExt.cx = dc->ppdev->gdiinfo.ulHorzRes;
pdcattr->szlViewportExt.cy = -dc->ppdev->GDIInfo.ulVertRes; pdcattr->szlViewportExt.cy = -dc->ppdev->gdiinfo.ulVertRes;
break; break;
case MM_HIMETRIC: case MM_HIMETRIC:
pdcattr->szlWindowExt.cx = dc->ppdev->GDIInfo.ulHorzSize * 100; pdcattr->szlWindowExt.cx = dc->ppdev->gdiinfo.ulHorzSize * 100;
pdcattr->szlWindowExt.cy = dc->ppdev->GDIInfo.ulVertSize * 100; pdcattr->szlWindowExt.cy = dc->ppdev->gdiinfo.ulVertSize * 100;
pdcattr->szlViewportExt.cx = dc->ppdev->GDIInfo.ulHorzRes; pdcattr->szlViewportExt.cx = dc->ppdev->gdiinfo.ulHorzRes;
pdcattr->szlViewportExt.cy = -dc->ppdev->GDIInfo.ulVertRes; pdcattr->szlViewportExt.cy = -dc->ppdev->gdiinfo.ulVertRes;
break; break;
case MM_LOENGLISH: case MM_LOENGLISH:
pdcattr->szlWindowExt.cx = MulDiv(1000, dc->ppdev->GDIInfo.ulHorzSize, 254); pdcattr->szlWindowExt.cx = MulDiv(1000, dc->ppdev->gdiinfo.ulHorzSize, 254);
pdcattr->szlWindowExt.cy = MulDiv(1000, dc->ppdev->GDIInfo.ulVertSize, 254); pdcattr->szlWindowExt.cy = MulDiv(1000, dc->ppdev->gdiinfo.ulVertSize, 254);
pdcattr->szlViewportExt.cx = dc->ppdev->GDIInfo.ulHorzRes; pdcattr->szlViewportExt.cx = dc->ppdev->gdiinfo.ulHorzRes;
pdcattr->szlViewportExt.cy = -dc->ppdev->GDIInfo.ulVertRes; pdcattr->szlViewportExt.cy = -dc->ppdev->gdiinfo.ulVertRes;
break; break;
case MM_HIENGLISH: case MM_HIENGLISH:
pdcattr->szlWindowExt.cx = MulDiv(10000, dc->ppdev->GDIInfo.ulHorzSize, 254); pdcattr->szlWindowExt.cx = MulDiv(10000, dc->ppdev->gdiinfo.ulHorzSize, 254);
pdcattr->szlWindowExt.cy = MulDiv(10000, dc->ppdev->GDIInfo.ulVertSize, 254); pdcattr->szlWindowExt.cy = MulDiv(10000, dc->ppdev->gdiinfo.ulVertSize, 254);
pdcattr->szlViewportExt.cx = dc->ppdev->GDIInfo.ulHorzRes; pdcattr->szlViewportExt.cx = dc->ppdev->gdiinfo.ulHorzRes;
pdcattr->szlViewportExt.cy = -dc->ppdev->GDIInfo.ulVertRes; pdcattr->szlViewportExt.cy = -dc->ppdev->gdiinfo.ulVertRes;
break; break;
case MM_TWIPS: case MM_TWIPS:
pdcattr->szlWindowExt.cx = MulDiv(14400, dc->ppdev->GDIInfo.ulHorzSize, 254); pdcattr->szlWindowExt.cx = MulDiv(14400, dc->ppdev->gdiinfo.ulHorzSize, 254);
pdcattr->szlWindowExt.cy = MulDiv(14400, dc->ppdev->GDIInfo.ulVertSize, 254); pdcattr->szlWindowExt.cy = MulDiv(14400, dc->ppdev->gdiinfo.ulVertSize, 254);
pdcattr->szlViewportExt.cx = dc->ppdev->GDIInfo.ulHorzRes; pdcattr->szlViewportExt.cx = dc->ppdev->gdiinfo.ulHorzRes;
pdcattr->szlViewportExt.cy = -dc->ppdev->GDIInfo.ulVertRes; pdcattr->szlViewportExt.cy = -dc->ppdev->gdiinfo.ulVertRes;
break; break;
case MM_ANISOTROPIC: case MM_ANISOTROPIC:
@ -1151,8 +1151,8 @@ DC_vGetAspectRatioFilter(PDC pDC, LPSIZE AspectRatio)
{ {
// "This specifies that Windows should only match fonts that have the // "This specifies that Windows should only match fonts that have the
// same aspect ratio as the display.", Programming Windows, Fifth Ed. // same aspect ratio as the display.", Programming Windows, Fifth Ed.
AspectRatio->cx = pDC->ppdev->GDIInfo.ulLogPixelsX; AspectRatio->cx = pDC->ppdev->gdiinfo.ulLogPixelsX;
AspectRatio->cy = pDC->ppdev->GDIInfo.ulLogPixelsY; AspectRatio->cy = pDC->ppdev->gdiinfo.ulLogPixelsY;
} }
else else
{ {

18
reactos/subsystems/win32/win32k/objects/dclife.c
View file

@ -296,33 +296,33 @@ IntGdiCreateDC(
pdc->dctype = DC_TYPE_DIRECT; pdc->dctype = DC_TYPE_DIRECT;
pdc->dhpdev = PrimarySurface.hPDev; pdc->dhpdev = PrimarySurface.dhpdev;
if (pUMdhpdev) pUMdhpdev = pdc->dhpdev; // set DHPDEV for device. if (pUMdhpdev) pUMdhpdev = pdc->dhpdev; // set DHPDEV for device.
pdc->ppdev = (PVOID)&PrimarySurface; pdc->ppdev = (PVOID)&PrimarySurface;
// ATM we only have one display. // ATM we only have one display.
pdcattr->ulDirty_ |= DC_PRIMARY_DISPLAY; pdcattr->ulDirty_ |= DC_PRIMARY_DISPLAY;
pdc->rosdc.bitsPerPixel = pdc->ppdev->GDIInfo.cBitsPixel * pdc->rosdc.bitsPerPixel = pdc->ppdev->gdiinfo.cBitsPixel *
pdc->ppdev->GDIInfo.cPlanes; pdc->ppdev->gdiinfo.cPlanes;
DPRINT("Bits per pel: %u\n", pdc->rosdc.bitsPerPixel); DPRINT("Bits per pel: %u\n", pdc->rosdc.bitsPerPixel);
pdc->flGraphicsCaps = PrimarySurface.DevInfo.flGraphicsCaps; pdc->flGraphicsCaps = PrimarySurface.devinfo.flGraphicsCaps;
pdc->flGraphicsCaps2 = PrimarySurface.DevInfo.flGraphicsCaps2; pdc->flGraphicsCaps2 = PrimarySurface.devinfo.flGraphicsCaps2;
pdc->dclevel.hpal = NtGdiGetStockObject(DEFAULT_PALETTE); pdc->dclevel.hpal = NtGdiGetStockObject(DEFAULT_PALETTE);
pdcattr->jROP2 = R2_COPYPEN; pdcattr->jROP2 = R2_COPYPEN;
pdc->erclWindow.top = pdc->erclWindow.left = 0; pdc->erclWindow.top = pdc->erclWindow.left = 0;
pdc->erclWindow.right = pdc->ppdev->GDIInfo.ulHorzRes; pdc->erclWindow.right = pdc->ppdev->gdiinfo.ulHorzRes;
pdc->erclWindow.bottom = pdc->ppdev->GDIInfo.ulVertRes; pdc->erclWindow.bottom = pdc->ppdev->gdiinfo.ulVertRes;
pdc->dclevel.flPath &= ~DCPATH_CLOCKWISE; // Default is CCW. pdc->dclevel.flPath &= ~DCPATH_CLOCKWISE; // Default is CCW.
pdcattr->iCS_CP = ftGdiGetTextCharsetInfo(pdc,NULL,0); pdcattr->iCS_CP = ftGdiGetTextCharsetInfo(pdc,NULL,0);
hVisRgn = NtGdiCreateRectRgn(0, 0, pdc->ppdev->GDIInfo.ulHorzRes, hVisRgn = NtGdiCreateRectRgn(0, 0, pdc->ppdev->gdiinfo.ulHorzRes,
pdc->ppdev->GDIInfo.ulVertRes); pdc->ppdev->gdiinfo.ulVertRes);
if (!CreateAsIC) if (!CreateAsIC)
{ {

156
reactos/subsystems/win32/win32k/objects/device.c
View file

@ -320,19 +320,19 @@ IntPrepareDriver()
PrimarySurface.DMW.dmSize = sizeof (PrimarySurface.DMW); PrimarySurface.DMW.dmSize = sizeof (PrimarySurface.DMW);
if (SetupDevMode(&PrimarySurface.DMW, DisplayNumber)) if (SetupDevMode(&PrimarySurface.DMW, DisplayNumber))
{ {
PrimarySurface.hPDev = PrimarySurface.DriverFunctions.EnablePDEV( PrimarySurface.dhpdev = PrimarySurface.DriverFunctions.EnablePDEV(
&PrimarySurface.DMW, &PrimarySurface.DMW,
L"", L"",
HS_DDI_MAX, HS_DDI_MAX,
PrimarySurface.FillPatterns, PrimarySurface.ahsurf,
sizeof(PrimarySurface.GDIInfo), sizeof(PrimarySurface.gdiinfo),
&PrimarySurface.GDIInfo, &PrimarySurface.gdiinfo,
sizeof(PrimarySurface.DevInfo), sizeof(PrimarySurface.devinfo),
&PrimarySurface.DevInfo, &PrimarySurface.devinfo,
NULL, NULL,
L"", L"",
(HANDLE) (PrimarySurface.VideoFileObject->DeviceObject)); (HANDLE) (PrimarySurface.VideoFileObject->DeviceObject));
DoDefault = (NULL == PrimarySurface.hPDev); DoDefault = (NULL == PrimarySurface.dhpdev);
if (DoDefault) if (DoDefault)
{ {
DPRINT1("DrvEnablePDev with registry parameters failed\n"); DPRINT1("DrvEnablePDev with registry parameters failed\n");
@ -347,20 +347,20 @@ IntPrepareDriver()
{ {
RtlZeroMemory(&(PrimarySurface.DMW), sizeof(DEVMODEW)); RtlZeroMemory(&(PrimarySurface.DMW), sizeof(DEVMODEW));
PrimarySurface.DMW.dmSize = sizeof (PrimarySurface.DMW); PrimarySurface.DMW.dmSize = sizeof (PrimarySurface.DMW);
PrimarySurface.hPDev = PrimarySurface.DriverFunctions.EnablePDEV( PrimarySurface.dhpdev = PrimarySurface.DriverFunctions.EnablePDEV(
&PrimarySurface.DMW, &PrimarySurface.DMW,
L"", L"",
HS_DDI_MAX, HS_DDI_MAX,
PrimarySurface.FillPatterns, PrimarySurface.ahsurf,
sizeof(PrimarySurface.GDIInfo), sizeof(PrimarySurface.gdiinfo),
&PrimarySurface.GDIInfo, &PrimarySurface.gdiinfo,
sizeof(PrimarySurface.DevInfo), sizeof(PrimarySurface.devinfo),
&PrimarySurface.DevInfo, &PrimarySurface.devinfo,
NULL, NULL,
L"", L"",
(HANDLE) (PrimarySurface.VideoFileObject->DeviceObject)); (HANDLE) (PrimarySurface.VideoFileObject->DeviceObject));
if (NULL == PrimarySurface.hPDev) if (NULL == PrimarySurface.dhpdev)
{ {
ObDereferenceObject(PrimarySurface.VideoFileObject); ObDereferenceObject(PrimarySurface.VideoFileObject);
DPRINT1("DrvEnablePDEV with default parameters failed\n"); DPRINT1("DrvEnablePDEV with default parameters failed\n");
@ -369,10 +369,10 @@ IntPrepareDriver()
} }
// Update the primary surface with what we really got // Update the primary surface with what we really got
PrimarySurface.DMW.dmPelsWidth = PrimarySurface.GDIInfo.ulHorzRes; PrimarySurface.DMW.dmPelsWidth = PrimarySurface.gdiinfo.ulHorzRes;
PrimarySurface.DMW.dmPelsHeight = PrimarySurface.GDIInfo.ulVertRes; PrimarySurface.DMW.dmPelsHeight = PrimarySurface.gdiinfo.ulVertRes;
PrimarySurface.DMW.dmBitsPerPel = PrimarySurface.GDIInfo.cBitsPixel; PrimarySurface.DMW.dmBitsPerPel = PrimarySurface.gdiinfo.cBitsPixel;
PrimarySurface.DMW.dmDisplayFrequency = PrimarySurface.GDIInfo.ulVRefresh; PrimarySurface.DMW.dmDisplayFrequency = PrimarySurface.gdiinfo.ulVRefresh;
} }
if (!PrimarySurface.DMW.dmDriverExtra) if (!PrimarySurface.DMW.dmDriverExtra)
@ -389,15 +389,15 @@ IntPrepareDriver()
DPRINT1("**** DMW extra = %u bytes. Please report to ros-dev@reactos.org ****\n", PrimarySurface.DMW.dmDriverExtra); DPRINT1("**** DMW extra = %u bytes. Please report to ros-dev@reactos.org ****\n", PrimarySurface.DMW.dmDriverExtra);
} }
if (0 == PrimarySurface.GDIInfo.ulLogPixelsX) if (0 == PrimarySurface.gdiinfo.ulLogPixelsX)
{ {
DPRINT("Adjusting GDIInfo.ulLogPixelsX\n"); DPRINT("Adjusting gdiinfo.ulLogPixelsX\n");
PrimarySurface.GDIInfo.ulLogPixelsX = 96; PrimarySurface.gdiinfo.ulLogPixelsX = 96;
} }
if (0 == PrimarySurface.GDIInfo.ulLogPixelsY) if (0 == PrimarySurface.gdiinfo.ulLogPixelsY)
{ {
DPRINT("Adjusting GDIInfo.ulLogPixelsY\n"); DPRINT("Adjusting gdiinfo.ulLogPixelsY\n");
PrimarySurface.GDIInfo.ulLogPixelsY = 96; PrimarySurface.gdiinfo.ulLogPixelsY = 96;
} }
PrimarySurface.Pointer.Exclude.right = -1; PrimarySurface.Pointer.Exclude.right = -1;
@ -406,7 +406,7 @@ IntPrepareDriver()
/* Complete initialization of the physical device */ /* Complete initialization of the physical device */
PrimarySurface.DriverFunctions.CompletePDEV( PrimarySurface.DriverFunctions.CompletePDEV(
PrimarySurface.hPDev, PrimarySurface.dhpdev,
(HDEV)&PrimarySurface); (HDEV)&PrimarySurface);
DPRINT("calling DRIVER_ReferenceDriver\n"); DPRINT("calling DRIVER_ReferenceDriver\n");
@ -421,7 +421,7 @@ IntPrepareDriver()
PrimarySurface.pvGammaRamp = NULL; PrimarySurface.pvGammaRamp = NULL;
PrimarySurface.ppdevNext = NULL; // Fixme! We need to support more than display drvs. PrimarySurface.ppdevNext = NULL; // Fixme! We need to support more than display drvs.
PrimarySurface.ppdevParent = NULL; // Always NULL if primary. PrimarySurface.ppdevParent = NULL; // Always NULL if primary.
PrimarySurface.pGraphicsDev = NULL; // Fixme! PrimarySurface.pGraphicsDevice = NULL; // Fixme!
PrimarySurface.pEDDgpl = ExAllocatePoolWithTag(PagedPool, sizeof(EDD_DIRECTDRAW_GLOBAL), TAG_EDDGBL); PrimarySurface.pEDDgpl = ExAllocatePoolWithTag(PagedPool, sizeof(EDD_DIRECTDRAW_GLOBAL), TAG_EDDGBL);
if (PrimarySurface.pEDDgpl) if (PrimarySurface.pEDDgpl)
{ {
@ -519,17 +519,17 @@ IntCreatePrimarySurface()
DPRINT("calling EnableSurface\n"); DPRINT("calling EnableSurface\n");
/* Enable the drawing surface */ /* Enable the drawing surface */
PrimarySurface.pSurface = PrimarySurface.pSurface =
PrimarySurface.DriverFunctions.EnableSurface(PrimarySurface.hPDev); PrimarySurface.DriverFunctions.EnableSurface(PrimarySurface.dhpdev);
if (NULL == PrimarySurface.pSurface) if (NULL == PrimarySurface.pSurface)
{ {
/* PrimarySurface.DriverFunctions.AssertMode(PrimarySurface.hPDev, FALSE);*/ /* PrimarySurface.DriverFunctions.AssertMode(PrimarySurface.dhpdev, FALSE);*/
PrimarySurface.DriverFunctions.DisablePDEV(PrimarySurface.hPDev); PrimarySurface.DriverFunctions.DisablePDEV(PrimarySurface.dhpdev);
ObDereferenceObject(PrimarySurface.VideoFileObject); ObDereferenceObject(PrimarySurface.VideoFileObject);
DPRINT1("DrvEnableSurface failed\n"); DPRINT1("DrvEnableSurface failed\n");
return FALSE; return FALSE;
} }
PrimarySurface.DriverFunctions.AssertMode(PrimarySurface.hPDev, TRUE); PrimarySurface.DriverFunctions.AssertMode(PrimarySurface.dhpdev, TRUE);
calledFromUser = UserIsEntered(); //fixme: possibly upgrade a shared lock calledFromUser = UserIsEntered(); //fixme: possibly upgrade a shared lock
if (!calledFromUser) if (!calledFromUser)
@ -541,7 +541,7 @@ IntCreatePrimarySurface()
IntAttachMonitor(&PrimarySurface, PrimarySurface.DisplayNumber); IntAttachMonitor(&PrimarySurface, PrimarySurface.DisplayNumber);
SurfObj = EngLockSurface(PrimarySurface.pSurface); SurfObj = EngLockSurface(PrimarySurface.pSurface);
SurfObj->dhpdev = PrimarySurface.hPDev; SurfObj->dhpdev = PrimarySurface.dhpdev;
SurfSize = SurfObj->sizlBitmap; SurfSize = SurfObj->sizlBitmap;
SurfaceRect.left = SurfaceRect.top = 0; SurfaceRect.left = SurfaceRect.top = 0;
SurfaceRect.right = SurfObj->sizlBitmap.cx; SurfaceRect.right = SurfObj->sizlBitmap.cx;
@ -599,9 +599,9 @@ IntDestroyPrimarySurface()
*/ */
DPRINT("Reseting display\n" ); DPRINT("Reseting display\n" );
PrimarySurface.DriverFunctions.AssertMode(PrimarySurface.hPDev, FALSE); PrimarySurface.DriverFunctions.AssertMode(PrimarySurface.dhpdev, FALSE);
PrimarySurface.DriverFunctions.DisableSurface(PrimarySurface.hPDev); PrimarySurface.DriverFunctions.DisableSurface(PrimarySurface.dhpdev);
PrimarySurface.DriverFunctions.DisablePDEV(PrimarySurface.hPDev); PrimarySurface.DriverFunctions.DisablePDEV(PrimarySurface.dhpdev);
PrimarySurface.PreparedDriver = FALSE; PrimarySurface.PreparedDriver = FALSE;
KeSetEvent(&VideoDriverNeedsPreparation, 1, FALSE); KeSetEvent(&VideoDriverNeedsPreparation, 1, FALSE);
KeResetEvent(&VideoDriverPrepared); KeResetEvent(&VideoDriverPrepared);
@ -619,15 +619,15 @@ IntcFonts(PPDEVOBJ pDevObj)
// Msdn DrvQueryFont: // Msdn DrvQueryFont:
// If the number of fonts in DEVINFO is -1 and iFace is zero, the driver // If the number of fonts in DEVINFO is -1 and iFace is zero, the driver
// should return the number of fonts it supports. // should return the number of fonts it supports.
if ( pDevObj->DevInfo.cFonts == -1) if ( pDevObj->devinfo.cFonts == -1)
{ {
if (pDevObj->DriverFunctions.QueryFont) if (pDevObj->DriverFunctions.QueryFont)
pDevObj->DevInfo.cFonts = pDevObj->devinfo.cFonts =
(ULONG)pDevObj->DriverFunctions.QueryFont(pDevObj->hPDev, 0, 0, &Junk); (ULONG)pDevObj->DriverFunctions.QueryFont(pDevObj->dhpdev, 0, 0, &Junk);
else else
pDevObj->DevInfo.cFonts = 0; pDevObj->devinfo.cFonts = 0;
} }
return pDevObj->DevInfo.cFonts; return pDevObj->devinfo.cFonts;
} }
// //
@ -704,13 +704,13 @@ IntGetColorManagementCaps(PPDEVOBJ pDevObj)
if ( pDevObj->flFlags & PDEV_DISPLAY) if ( pDevObj->flFlags & PDEV_DISPLAY)
{ {
if (pDevObj->DevInfo.iDitherFormat == BMF_8BPP || if (pDevObj->devinfo.iDitherFormat == BMF_8BPP ||
pDevObj->DevInfo.flGraphicsCaps2 & GCAPS2_CHANGEGAMMARAMP) pDevObj->devinfo.flGraphicsCaps2 & GCAPS2_CHANGEGAMMARAMP)
ret = CM_GAMMA_RAMP; ret = CM_GAMMA_RAMP;
} }
if (pDevObj->DevInfo.flGraphicsCaps & GCAPS_CMYKCOLOR) if (pDevObj->devinfo.flGraphicsCaps & GCAPS_CMYKCOLOR)
ret |= CM_CMYK_COLOR; ret |= CM_CMYK_COLOR;
if (pDevObj->DevInfo.flGraphicsCaps & GCAPS_ICM) if (pDevObj->devinfo.flGraphicsCaps & GCAPS_ICM)
ret |= CM_DEVICE_ICM; ret |= CM_DEVICE_ICM;
return ret; return ret;
} }
@ -724,50 +724,50 @@ IntGdiGetDeviceCaps(PDC dc, INT Index)
switch (Index) switch (Index)
{ {
case DRIVERVERSION: case DRIVERVERSION:
ret = ppdev->GDIInfo.ulVersion; ret = ppdev->gdiinfo.ulVersion;
break; break;
case TECHNOLOGY: case TECHNOLOGY:
ret = ppdev->GDIInfo.ulTechnology; ret = ppdev->gdiinfo.ulTechnology;
break; break;
case HORZSIZE: case HORZSIZE:
ret = ppdev->GDIInfo.ulHorzSize; ret = ppdev->gdiinfo.ulHorzSize;
break; break;
case VERTSIZE: case VERTSIZE:
ret = ppdev->GDIInfo.ulVertSize; ret = ppdev->gdiinfo.ulVertSize;
break; break;
case HORZRES: case HORZRES:
ret = ppdev->GDIInfo.ulHorzRes; ret = ppdev->gdiinfo.ulHorzRes;
break; break;
case VERTRES: case VERTRES:
ret = ppdev->GDIInfo.ulVertRes; ret = ppdev->gdiinfo.ulVertRes;
break; break;
case LOGPIXELSX: case LOGPIXELSX:
ret = ppdev->GDIInfo.ulLogPixelsX; ret = ppdev->gdiinfo.ulLogPixelsX;
break; break;
case LOGPIXELSY: case LOGPIXELSY:
ret = ppdev->GDIInfo.ulLogPixelsY; ret = ppdev->gdiinfo.ulLogPixelsY;
break; break;
case CAPS1: case CAPS1:
if ( ppdev->pGraphicsDev && if ( ppdev->pGraphicsDevice &&
(((PGRAPHICS_DEVICE)ppdev->pGraphicsDev)->StateFlags & (((PGRAPHICS_DEVICE)ppdev->pGraphicsDevice)->StateFlags &
DISPLAY_DEVICE_MIRRORING_DRIVER)) DISPLAY_DEVICE_MIRRORING_DRIVER))
ret = C1_MIRRORING; ret = C1_MIRRORING;
break; break;
case BITSPIXEL: case BITSPIXEL:
ret = ppdev->GDIInfo.cBitsPixel; ret = ppdev->gdiinfo.cBitsPixel;
break; break;
case PLANES: case PLANES:
ret = ppdev->GDIInfo.cPlanes; ret = ppdev->gdiinfo.cPlanes;
break; break;
case NUMBRUSHES: case NUMBRUSHES:
@ -775,7 +775,7 @@ IntGdiGetDeviceCaps(PDC dc, INT Index)
break; break;
case NUMPENS: case NUMPENS:
ret = ppdev->GDIInfo.ulNumColors; ret = ppdev->gdiinfo.ulNumColors;
if ( ret != -1 ) ret *= 5; if ( ret != -1 ) ret *= 5;
break; break;
@ -784,19 +784,19 @@ IntGdiGetDeviceCaps(PDC dc, INT Index)
break; break;
case NUMCOLORS: case NUMCOLORS:
ret = ppdev->GDIInfo.ulNumColors; ret = ppdev->gdiinfo.ulNumColors;
break; break;
case ASPECTX: case ASPECTX:
ret = ppdev->GDIInfo.ulAspectX; ret = ppdev->gdiinfo.ulAspectX;
break; break;
case ASPECTY: case ASPECTY:
ret = ppdev->GDIInfo.ulAspectY; ret = ppdev->gdiinfo.ulAspectY;
break; break;
case ASPECTXY: case ASPECTXY:
ret = ppdev->GDIInfo.ulAspectXY; ret = ppdev->gdiinfo.ulAspectXY;
break; break;
case CLIPCAPS: case CLIPCAPS:
@ -804,7 +804,7 @@ IntGdiGetDeviceCaps(PDC dc, INT Index)
break; break;
case SIZEPALETTE: case SIZEPALETTE:
ret = ppdev->GDIInfo.ulNumPalReg; ret = ppdev->gdiinfo.ulNumPalReg;
break; break;
case NUMRESERVED: case NUMRESERVED:
@ -812,25 +812,25 @@ IntGdiGetDeviceCaps(PDC dc, INT Index)
break; break;
case COLORRES: case COLORRES:
ret = ppdev->GDIInfo.ulDACRed + ret = ppdev->gdiinfo.ulDACRed +
ppdev->GDIInfo.ulDACGreen + ppdev->gdiinfo.ulDACGreen +
ppdev->GDIInfo.ulDACBlue; ppdev->gdiinfo.ulDACBlue;
break; break;
case DESKTOPVERTRES: case DESKTOPVERTRES:
ret = ppdev->GDIInfo.ulVertRes; ret = ppdev->gdiinfo.ulVertRes;
break; break;
case DESKTOPHORZRES: case DESKTOPHORZRES:
ret = ppdev->GDIInfo.ulHorzRes; ret = ppdev->gdiinfo.ulHorzRes;
break; break;
case BLTALIGNMENT: case BLTALIGNMENT:
ret = ppdev->GDIInfo.ulBltAlignment; ret = ppdev->gdiinfo.ulBltAlignment;
break; break;
case SHADEBLENDCAPS: case SHADEBLENDCAPS:
ret = ppdev->GDIInfo.flShadeBlend; ret = ppdev->gdiinfo.flShadeBlend;
break; break;
case COLORMGMTCAPS: case COLORMGMTCAPS:
@ -838,27 +838,27 @@ IntGdiGetDeviceCaps(PDC dc, INT Index)
break; break;
case PHYSICALWIDTH: case PHYSICALWIDTH:
ret = ppdev->GDIInfo.szlPhysSize.cx; ret = ppdev->gdiinfo.szlPhysSize.cx;
break; break;
case PHYSICALHEIGHT: case PHYSICALHEIGHT:
ret = ppdev->GDIInfo.szlPhysSize.cy; ret = ppdev->gdiinfo.szlPhysSize.cy;
break; break;
case PHYSICALOFFSETX: case PHYSICALOFFSETX:
ret = ppdev->GDIInfo.ptlPhysOffset.x; ret = ppdev->gdiinfo.ptlPhysOffset.x;
break; break;
case PHYSICALOFFSETY: case PHYSICALOFFSETY:
ret = ppdev->GDIInfo.ptlPhysOffset.y; ret = ppdev->gdiinfo.ptlPhysOffset.y;
break; break;
case VREFRESH: case VREFRESH:
ret = ppdev->GDIInfo.ulVRefresh; ret = ppdev->gdiinfo.ulVRefresh;
break; break;
case RASTERCAPS: case RASTERCAPS:
ret = ppdev->GDIInfo.flRaster; ret = ppdev->gdiinfo.flRaster;
break; break;
case CURVECAPS: case CURVECAPS:
@ -877,8 +877,8 @@ IntGdiGetDeviceCaps(PDC dc, INT Index)
break; break;
case TEXTCAPS: case TEXTCAPS:
ret = ppdev->GDIInfo.flTextCaps; ret = ppdev->gdiinfo.flTextCaps;
if (ppdev->GDIInfo.ulTechnology) ret |= TC_VA_ABLE; if (ppdev->gdiinfo.ulTechnology) ret |= TC_VA_ABLE;
ret |= (TC_SO_ABLE|TC_UA_ABLE); ret |= (TC_SO_ABLE|TC_UA_ABLE);
break; break;
@ -922,7 +922,7 @@ IntvGetDeviceCaps(
PDEVCAPS pDevCaps) PDEVCAPS pDevCaps)
{ {
ULONG Tmp = 0; ULONG Tmp = 0;
PGDIINFO pGdiInfo = &pDevObj->GDIInfo; PGDIINFO pGdiInfo = &pDevObj->gdiinfo;
pDevCaps->ulVersion = pGdiInfo->ulVersion; pDevCaps->ulVersion = pGdiInfo->ulVersion;
pDevCaps->ulTechnology = pGdiInfo->ulTechnology; pDevCaps->ulTechnology = pGdiInfo->ulTechnology;
@ -1056,7 +1056,7 @@ NtGdiGetDhpdev(
while (ppdev != NULL); while (ppdev != NULL);
IntGdiReleaseSemaphore(hsemDriverMgmt); IntGdiReleaseSemaphore(hsemDriverMgmt);
if (!ppdev) return NULL; if (!ppdev) return NULL;
return pGdiDevice->hPDev; return pGdiDevice->dhpdev;
} }
static NTSTATUS FASTCALL static NTSTATUS FASTCALL

6
reactos/subsystems/win32/win32k/objects/dibobj.c
View file

@ -287,7 +287,7 @@ IntSetDIBits(
else else
{ {
// Destination palette obtained from the hDC // Destination palette obtained from the hDC
DDB_Palette = DC->ppdev->DevInfo.hpalDefault; DDB_Palette = DC->ppdev->devinfo.hpalDefault;
} }
ppalDDB = PALETTE_LockPalette(DDB_Palette); ppalDDB = PALETTE_LockPalette(DDB_Palette);
@ -478,7 +478,7 @@ NtGdiSetDIBitsToDeviceInternal(
} }
/* Use destination palette obtained from the DC by default */ /* Use destination palette obtained from the DC by default */
DDBPalette = pDC->ppdev->DevInfo.hpalDefault; DDBPalette = pDC->ppdev->devinfo.hpalDefault;
/* Try to use hDIBPalette if it exists */ /* Try to use hDIBPalette if it exists */
pSurf = pDC->dclevel.pSurface; pSurf = pDC->dclevel.pSurface;
@ -654,7 +654,7 @@ NtGdiGetDIBitsInternal(
hSourcePalette = psurf->hDIBPalette; hSourcePalette = psurf->hDIBPalette;
if (!hSourcePalette) if (!hSourcePalette)
{ {
hSourcePalette = pPrimarySurface->DevInfo.hpalDefault; hSourcePalette = pPrimarySurface->devinfo.hpalDefault;
} }
ColorPtr = ((PBYTE)Info + Info->bmiHeader.biSize); ColorPtr = ((PBYTE)Info + Info->bmiHeader.biSize);

4
reactos/subsystems/win32/win32k/objects/fillshap.c
View file

@ -918,7 +918,7 @@ IntGdiGradientFill(
ASSERT(psurf); ASSERT(psurf);
hDestPalette = psurf->hDIBPalette; hDestPalette = psurf->hDIBPalette;
if (!hDestPalette) hDestPalette = pPrimarySurface->DevInfo.hpalDefault; if (!hDestPalette) hDestPalette = pPrimarySurface->devinfo.hpalDefault;
PalDestGDI = PALETTE_LockPalette(hDestPalette); PalDestGDI = PALETTE_LockPalette(hDestPalette);
EXLATEOBJ_vInitialize(&exlo, &gpalRGB, PalDestGDI, 0, 0, 0); EXLATEOBJ_vInitialize(&exlo, &gpalRGB, PalDestGDI, 0, 0, 0);
@ -1113,7 +1113,7 @@ NtGdiExtFloodFill(
} }
hpal = dc->dclevel.pSurface->hDIBPalette; hpal = dc->dclevel.pSurface->hDIBPalette;
if (!hpal) hpal = pPrimarySurface->DevInfo.hpalDefault; if (!hpal) hpal = pPrimarySurface->devinfo.hpalDefault;
ppal = PALETTE_ShareLockPalette(hpal); ppal = PALETTE_ShareLockPalette(hpal);
EXLATEOBJ_vInitialize(&exlo, &gpalRGB, ppal, 0, 0xffffff, 0); EXLATEOBJ_vInitialize(&exlo, &gpalRGB, ppal, 0, 0xffffff, 0);

2
reactos/subsystems/win32/win32k/objects/freetype.c
View file

@ -3386,7 +3386,7 @@ GreExtTextOutW(
/* Create the xlateobj */ /* Create the xlateobj */
hDestPalette = psurf->hDIBPalette; hDestPalette = psurf->hDIBPalette;
if (!hDestPalette) hDestPalette = pPrimarySurface->DevInfo.hpalDefault; if (!hDestPalette) hDestPalette = pPrimarySurface->devinfo.hpalDefault;
ppalDst = PALETTE_LockPalette(hDestPalette); ppalDst = PALETTE_LockPalette(hDestPalette);
EXLATEOBJ_vInitialize(&exloRGB2Dst, &gpalRGB, ppalDst, 0, 0, 0); EXLATEOBJ_vInitialize(&exloRGB2Dst, &gpalRGB, ppalDst, 0, 0, 0);
EXLATEOBJ_vInitialize(&exloDst2RGB, ppalDst, &gpalRGB, 0, 0, 0); EXLATEOBJ_vInitialize(&exloDst2RGB, ppalDst, &gpalRGB, 0, 0, 0);

40
reactos/subsystems/win32/win32k/objects/icm.c
View file

@ -104,10 +104,10 @@ IntGetDeviceGammaRamp(HDEV hPDev, PGAMMARAMP Ramp)
if (!(pGDev->flFlags & PDEV_DISPLAY )) return FALSE; if (!(pGDev->flFlags & PDEV_DISPLAY )) return FALSE;
if ((pGDev->DevInfo.iDitherFormat == BMF_8BPP) || if ((pGDev->devinfo.iDitherFormat == BMF_8BPP) ||
(pGDev->DevInfo.iDitherFormat == BMF_16BPP) || (pGDev->devinfo.iDitherFormat == BMF_16BPP) ||
(pGDev->DevInfo.iDitherFormat == BMF_24BPP) || (pGDev->devinfo.iDitherFormat == BMF_24BPP) ||
(pGDev->DevInfo.iDitherFormat == BMF_32BPP)) (pGDev->devinfo.iDitherFormat == BMF_32BPP))
{ {
if (pGDev->flFlags & PDEV_GAMMARAMP_TABLE) if (pGDev->flFlags & PDEV_GAMMARAMP_TABLE)
RtlCopyMemory( Ramp, RtlCopyMemory( Ramp,
@ -236,22 +236,22 @@ UpdateDeviceGammaRamp( HDEV hPDev )
PALOBJ *palPtr; PALOBJ *palPtr;
PPDEVOBJ pGDev = (PPDEVOBJ) hPDev; PPDEVOBJ pGDev = (PPDEVOBJ) hPDev;
if ((pGDev->DevInfo.iDitherFormat == BMF_8BPP) || if ((pGDev->devinfo.iDitherFormat == BMF_8BPP) ||
(pGDev->DevInfo.iDitherFormat == BMF_16BPP) || (pGDev->devinfo.iDitherFormat == BMF_16BPP) ||
(pGDev->DevInfo.iDitherFormat == BMF_24BPP) || (pGDev->devinfo.iDitherFormat == BMF_24BPP) ||
(pGDev->DevInfo.iDitherFormat == BMF_32BPP)) (pGDev->devinfo.iDitherFormat == BMF_32BPP))
{ {
if (pGDev->DriverFunctions.IcmSetDeviceGammaRamp) if (pGDev->DriverFunctions.IcmSetDeviceGammaRamp)
return pGDev->DriverFunctions.IcmSetDeviceGammaRamp( pGDev->hPDev, return pGDev->DriverFunctions.IcmSetDeviceGammaRamp( pGDev->dhpdev,
IGRF_RGB_256WORDS, IGRF_RGB_256WORDS,
pGDev->pvGammaRamp); pGDev->pvGammaRamp);
if ( (pGDev->DevInfo.iDitherFormat != BMF_8BPP) || if ( (pGDev->devinfo.iDitherFormat != BMF_8BPP) ||
!(pGDev->GDIInfo.flRaster & RC_PALETTE)) return FALSE; !(pGDev->gdiinfo.flRaster & RC_PALETTE)) return FALSE;
if (!(pGDev->flFlags & PDEV_GAMMARAMP_TABLE)) return FALSE; if (!(pGDev->flFlags & PDEV_GAMMARAMP_TABLE)) return FALSE;
palGDI = PALETTE_LockPalette(pGDev->DevInfo.hpalDefault); palGDI = PALETTE_LockPalette(pGDev->devinfo.hpalDefault);
if(!palGDI) return FALSE; if(!palGDI) return FALSE;
palPtr = (PALOBJ*) palGDI; palPtr = (PALOBJ*) palGDI;
@ -266,7 +266,7 @@ UpdateDeviceGammaRamp( HDEV hPDev )
// PALOBJ_cGetColors check mode flags and update Gamma Correction. // PALOBJ_cGetColors check mode flags and update Gamma Correction.
// Set the HDEV to pal and go. // Set the HDEV to pal and go.
palGDI->hPDev = hPDev; palGDI->hPDev = hPDev;
Ret = pGDev->DriverFunctions.SetPalette(pGDev->hPDev, Ret = pGDev->DriverFunctions.SetPalette(pGDev->dhpdev,
palPtr, palPtr,
0, 0,
0, 0,
@ -296,18 +296,18 @@ IntSetDeviceGammaRamp(HDEV hPDev, PGAMMARAMP Ramp, BOOL Test)
if (!(pGDev->flFlags & PDEV_DISPLAY )) return FALSE; if (!(pGDev->flFlags & PDEV_DISPLAY )) return FALSE;
if ((pGDev->DevInfo.iDitherFormat == BMF_8BPP) || if ((pGDev->devinfo.iDitherFormat == BMF_8BPP) ||
(pGDev->DevInfo.iDitherFormat == BMF_16BPP) || (pGDev->devinfo.iDitherFormat == BMF_16BPP) ||
(pGDev->DevInfo.iDitherFormat == BMF_24BPP) || (pGDev->devinfo.iDitherFormat == BMF_24BPP) ||
(pGDev->DevInfo.iDitherFormat == BMF_32BPP)) (pGDev->devinfo.iDitherFormat == BMF_32BPP))
{ {
if (!pGDev->DriverFunctions.IcmSetDeviceGammaRamp) if (!pGDev->DriverFunctions.IcmSetDeviceGammaRamp)
{ // No driver support { // No driver support
if (!(pGDev->DevInfo.flGraphicsCaps2 & GCAPS2_CHANGEGAMMARAMP)) if (!(pGDev->devinfo.flGraphicsCaps2 & GCAPS2_CHANGEGAMMARAMP))
{ // Driver does not support Gamma Ramp, so test to see we { // Driver does not support Gamma Ramp, so test to see we
// have BMF_8BPP only and palette operation support. // have BMF_8BPP only and palette operation support.
if ((pGDev->DevInfo.iDitherFormat != BMF_8BPP) || if ((pGDev->devinfo.iDitherFormat != BMF_8BPP) ||
!(pGDev->GDIInfo.flRaster & RC_PALETTE)) return FALSE; !(pGDev->gdiinfo.flRaster & RC_PALETTE)) return FALSE;
} }
} }

2
reactos/subsystems/win32/win32k/objects/palette.c
View file

@ -916,7 +916,7 @@ IntGetSystemPaletteEntries(HDC hDC,
} }
else else
{ {
Ret = dc->ppdev->GDIInfo.ulNumPalReg; Ret = dc->ppdev->gdiinfo.ulNumPalReg;
} }
} }

4
reactos/subsystems/win32/win32k/objects/wingl.c
View file

@ -39,7 +39,7 @@ IntGetipfdDevMax(PDC pdc)
if (ppdev->DriverFunctions.DescribePixelFormat) if (ppdev->DriverFunctions.DescribePixelFormat)
{ {
Ret = ppdev->DriverFunctions.DescribePixelFormat( Ret = ppdev->DriverFunctions.DescribePixelFormat(
ppdev->hPDev, ppdev->dhpdev,
1, 1,
0, 0,
NULL); NULL);
@ -94,7 +94,7 @@ NtGdiDescribePixelFormat(HDC hDC,
if (ppdev->DriverFunctions.DescribePixelFormat) if (ppdev->DriverFunctions.DescribePixelFormat)
{ {
Ret = ppdev->DriverFunctions.DescribePixelFormat( Ret = ppdev->DriverFunctions.DescribePixelFormat(
ppdev->hPDev, ppdev->dhpdev,
PixelFormat, PixelFormat,
sizeof(PIXELFORMATDESCRIPTOR), sizeof(PIXELFORMATDESCRIPTOR),
&pfdSafe); &pfdSafe);