ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gdi32: Don't implement the gamma ramp functions in the DIB driver.

This commit is contained in:
Alexandre Julliard 2012-05-31 13:44:32 +02:00
parent 13b2a3b9bc
commit 61f4767ade
2 changed files with 14 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/gdi32/dc.c
View File

@ -1244,9 +1244,13 @@ BOOL WINAPI GetDeviceGammaRamp(HDC hDC, LPVOID ptr)
TRACE("%p, %p\n", hDC, ptr); TRACE("%p, %p\n", hDC, ptr);
if( dc ) if( dc )
{
if (GetObjectType( hDC ) != OBJ_MEMDC)
{ {
PHYSDEV physdev = GET_DC_PHYSDEV( dc, pGetDeviceGammaRamp ); PHYSDEV physdev = GET_DC_PHYSDEV( dc, pGetDeviceGammaRamp );
ret = physdev->funcs->pGetDeviceGammaRamp( physdev, ptr ); ret = physdev->funcs->pGetDeviceGammaRamp( physdev, ptr );
}
else SetLastError( ERROR_INVALID_PARAMETER );
release_dc_ptr( dc ); release_dc_ptr( dc );
} }
return ret; return ret;
@ -1262,9 +1266,13 @@ BOOL WINAPI SetDeviceGammaRamp(HDC hDC, LPVOID ptr)
TRACE("%p, %p\n", hDC, ptr); TRACE("%p, %p\n", hDC, ptr);
if( dc ) if( dc )
{
if (GetObjectType( hDC ) != OBJ_MEMDC)
{ {
PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSetDeviceGammaRamp ); PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSetDeviceGammaRamp );
ret = physdev->funcs->pSetDeviceGammaRamp( physdev, ptr ); ret = physdev->funcs->pSetDeviceGammaRamp( physdev, ptr );
}
else SetLastError( ERROR_INVALID_PARAMETER );
release_dc_ptr( dc ); release_dc_ptr( dc );
} }
return ret; return ret;

22
dlls/gdi32/dibdrv/dc.c
View File

@ -392,24 +392,6 @@ static UINT dibdrv_SetBoundsRect( PHYSDEV dev, RECT *rect, UINT flags )
return DCB_RESET; /* we don't have device-specific bounds */ return DCB_RESET; /* we don't have device-specific bounds */
} }
/***********************************************************************
* dibdrv_GetDeviceGammaRamp
*/
static BOOL dibdrv_GetDeviceGammaRamp( PHYSDEV dev, void *ramp )
{
SetLastError( ERROR_INVALID_PARAMETER );
return FALSE;
}
/***********************************************************************
* dibdrv_SetDeviceGammaRamp
*/
static BOOL dibdrv_SetDeviceGammaRamp( PHYSDEV dev, void *ramp )
{
SetLastError( ERROR_INVALID_PARAMETER );
return FALSE;
}
const struct gdi_dc_funcs dib_driver = const struct gdi_dc_funcs dib_driver =
{ {
NULL, /* pAbortDoc */ NULL, /* pAbortDoc */
@ -453,7 +435,7 @@ const struct gdi_dc_funcs dib_driver =
NULL, /* pGetCharABCWidthsI */ NULL, /* pGetCharABCWidthsI */
NULL, /* pGetCharWidth */ NULL, /* pGetCharWidth */
NULL, /* pGetDeviceCaps */ NULL, /* pGetDeviceCaps */
dibdrv_GetDeviceGammaRamp, /* pGetDeviceGammaRamp */ NULL, /* pGetDeviceGammaRamp */
NULL, /* pGetFontData */ NULL, /* pGetFontData */
NULL, /* pGetFontUnicodeRanges */ NULL, /* pGetFontUnicodeRanges */
NULL, /* pGetGlyphIndices */ NULL, /* pGetGlyphIndices */
@ -515,7 +497,7 @@ const struct gdi_dc_funcs dib_driver =
dibdrv_SetDCPenColor, /* pSetDCPenColor */ dibdrv_SetDCPenColor, /* pSetDCPenColor */
NULL, /* pSetDIBitsToDevice */ NULL, /* pSetDIBitsToDevice */
dibdrv_SetDeviceClipping, /* pSetDeviceClipping */ dibdrv_SetDeviceClipping, /* pSetDeviceClipping */
dibdrv_SetDeviceGammaRamp, /* pSetDeviceGammaRamp */ NULL, /* pSetDeviceGammaRamp */
NULL, /* pSetLayout */ NULL, /* pSetLayout */
NULL, /* pSetMapMode */ NULL, /* pSetMapMode */
NULL, /* pSetMapperFlags */ NULL, /* pSetMapperFlags */