* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#include <w32k.h>
+#include <win32k.h>
#define NDEBUG
#include <debug.h>
FASTCALL
IntGetDeviceGammaRamp(HDEV hPDev, PGAMMARAMP Ramp)
{
- PGDIDEVICE pGDev = (PGDIDEVICE) hPDev;
+ PPDEVOBJ pGDev = (PPDEVOBJ) hPDev;
int i;
if (!(pGDev->flFlags & PDEV_DISPLAY )) return FALSE;
- if ((pGDev->DevInfo.iDitherFormat == BMF_8BPP) ||
- (pGDev->DevInfo.iDitherFormat == BMF_16BPP) ||
- (pGDev->DevInfo.iDitherFormat == BMF_24BPP) ||
- (pGDev->DevInfo.iDitherFormat == BMF_32BPP))
+ if ((pGDev->devinfo.iDitherFormat == BMF_8BPP) ||
+ (pGDev->devinfo.iDitherFormat == BMF_16BPP) ||
+ (pGDev->devinfo.iDitherFormat == BMF_24BPP) ||
+ (pGDev->devinfo.iDitherFormat == BMF_32BPP))
{
if (pGDev->flFlags & PDEV_GAMMARAMP_TABLE)
RtlCopyMemory( Ramp,
return FALSE;
}
- SafeRamp = ExAllocatePool(PagedPool, sizeof(GAMMARAMP));
+ SafeRamp = ExAllocatePoolWithTag(PagedPool, sizeof(GAMMARAMP), TAG_GDIICM);
if (!SafeRamp)
{
DC_UnlockDc(dc);
return FALSE;
}
- Ret = IntGetDeviceGammaRamp((HDEV)dc->pPDev, SafeRamp);
+ Ret = IntGetDeviceGammaRamp((HDEV)dc->ppdev, SafeRamp);
if (!Ret) return Ret;
_SEH2_END;
DC_UnlockDc(dc);
- ExFreePool(SafeRamp);
+ ExFreePoolWithTag(SafeRamp, TAG_GDIICM);
if (!NT_SUCCESS(Status))
{
IN HCOLORSPACE hColorSpace)
{
PDC pDC;
- PDC_ATTR pDc_Attr;
+ PDC_ATTR pdcattr;
PCOLORSPACE pCS;
pDC = DC_LockDc(hdc);
SetLastWin32Error(ERROR_INVALID_HANDLE);
return FALSE;
}
- pDc_Attr = pDC->pDc_Attr;
- if(!pDc_Attr) pDc_Attr = &pDC->Dc_Attr;
+ pdcattr = pDC->pdcattr;
- if (pDc_Attr->hColorSpace == hColorSpace)
+ if (pdcattr->hColorSpace == hColorSpace)
{
DC_UnlockDc(pDC);
return TRUE;
return FALSE;
}
- if (pDC->DcLevel.pColorSpace)
+ if (pDC->dclevel.pColorSpace)
{
- GDIOBJ_ShareUnlockObjByPtr((POBJ) pDC->DcLevel.pColorSpace);
+ GDIOBJ_ShareUnlockObjByPtr((POBJ) pDC->dclevel.pColorSpace);
}
- pDC->DcLevel.pColorSpace = pCS;
- pDc_Attr->hColorSpace = hColorSpace;
+ pDC->dclevel.pColorSpace = pCS;
+ pdcattr->hColorSpace = hColorSpace;
COLORSPACEOBJ_UnlockCS(pCS);
DC_UnlockDc(pDC);
UpdateDeviceGammaRamp( HDEV hPDev )
{
BOOL Ret = FALSE;
- PPALGDI palGDI;
+ PPALETTE palGDI;
PALOBJ *palPtr;
- PGDIDEVICE pGDev = (PGDIDEVICE) hPDev;
+ PPDEVOBJ pGDev = (PPDEVOBJ) hPDev;
- if ((pGDev->DevInfo.iDitherFormat == BMF_8BPP) ||
- (pGDev->DevInfo.iDitherFormat == BMF_16BPP) ||
- (pGDev->DevInfo.iDitherFormat == BMF_24BPP) ||
- (pGDev->DevInfo.iDitherFormat == BMF_32BPP))
+ if ((pGDev->devinfo.iDitherFormat == BMF_8BPP) ||
+ (pGDev->devinfo.iDitherFormat == BMF_16BPP) ||
+ (pGDev->devinfo.iDitherFormat == BMF_24BPP) ||
+ (pGDev->devinfo.iDitherFormat == BMF_32BPP))
{
if (pGDev->DriverFunctions.IcmSetDeviceGammaRamp)
- return pGDev->DriverFunctions.IcmSetDeviceGammaRamp( pGDev->hPDev,
+ return pGDev->DriverFunctions.IcmSetDeviceGammaRamp( pGDev->dhpdev,
IGRF_RGB_256WORDS,
pGDev->pvGammaRamp);
- if ( (pGDev->DevInfo.iDitherFormat != BMF_8BPP) ||
- !(pGDev->GDIInfo.flRaster & RC_PALETTE)) return FALSE;
+ if ( (pGDev->devinfo.iDitherFormat != BMF_8BPP) ||
+ !(pGDev->gdiinfo.flRaster & RC_PALETTE)) 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;
palPtr = (PALOBJ*) palGDI;
if (pGDev->flFlags & PDEV_GAMMARAMP_TABLE)
- palGDI->Mode |= PAL_GAMMACORRECTION;
+ palGDI->flFlags |= PAL_GAMMACORRECTION;
else
- palGDI->Mode &= ~PAL_GAMMACORRECTION;
+ palGDI->flFlags &= ~PAL_GAMMACORRECTION;
if (!(pGDev->flFlags & PDEV_DRIVER_PUNTED_CALL)) // No punting, we hook
{
// PALOBJ_cGetColors check mode flags and update Gamma Correction.
// Set the HDEV to pal and go.
palGDI->hPDev = hPDev;
- Ret = pGDev->DriverFunctions.SetPalette(pGDev->hPDev,
+ Ret = pGDev->DriverFunctions.SetPalette(pGDev->dhpdev,
palPtr,
0,
0,
{
WORD IcmGR, i, R, G, B;
BOOL Ret = FALSE, TstPeak;
- PGDIDEVICE pGDev = (PGDIDEVICE) hPDev;
+ PPDEVOBJ pGDev = (PPDEVOBJ) hPDev;
if (!hPDev) return FALSE;
if (!(pGDev->flFlags & PDEV_DISPLAY )) return FALSE;
- if ((pGDev->DevInfo.iDitherFormat == BMF_8BPP) ||
- (pGDev->DevInfo.iDitherFormat == BMF_16BPP) ||
- (pGDev->DevInfo.iDitherFormat == BMF_24BPP) ||
- (pGDev->DevInfo.iDitherFormat == BMF_32BPP))
+ if ((pGDev->devinfo.iDitherFormat == BMF_8BPP) ||
+ (pGDev->devinfo.iDitherFormat == BMF_16BPP) ||
+ (pGDev->devinfo.iDitherFormat == BMF_24BPP) ||
+ (pGDev->devinfo.iDitherFormat == BMF_32BPP))
{
if (!pGDev->DriverFunctions.IcmSetDeviceGammaRamp)
{ // 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
// have BMF_8BPP only and palette operation support.
- if ((pGDev->DevInfo.iDitherFormat != BMF_8BPP) ||
- !(pGDev->GDIInfo.flRaster & RC_PALETTE)) return FALSE;
+ if ((pGDev->devinfo.iDitherFormat != BMF_8BPP) ||
+ !(pGDev->gdiinfo.flRaster & RC_PALETTE)) return FALSE;
}
}
return FALSE;
}
- SafeRamp = ExAllocatePool(PagedPool, sizeof(GAMMARAMP));
+ SafeRamp = ExAllocatePoolWithTag(PagedPool, sizeof(GAMMARAMP), TAG_GDIICM);
if (!SafeRamp)
{
DC_UnlockDc(dc);
if (!NT_SUCCESS(Status))
{
DC_UnlockDc(dc);
- ExFreePool(SafeRamp);
+ ExFreePoolWithTag(SafeRamp, TAG_GDIICM);
SetLastNtError(Status);
return FALSE;
}
- Ret = IntSetDeviceGammaRamp((HDEV)dc->pPDev, SafeRamp, TRUE);
+ Ret = IntSetDeviceGammaRamp((HDEV)dc->ppdev, SafeRamp, TRUE);
DC_UnlockDc(dc);
- ExFreePool(SafeRamp);
+ ExFreePoolWithTag(SafeRamp, TAG_GDIICM);
return Ret;
}