Implemented Get/SetDeviceGammaRamp.

This commit is contained in:
Ove Kaaven 2001-03-20 01:55:18 +00:00 committed by Alexandre Julliard
parent ca6c9a6a20
commit 27398d4966
9 changed files with 45 additions and 3 deletions

View File

@ -54,6 +54,7 @@ static const DC_FUNCTIONS TTYDRV_DC_Driver =
NULL, /* pFrameRgn */ NULL, /* pFrameRgn */
TTYDRV_DC_GetCharWidth, /* pGetCharWidth */ TTYDRV_DC_GetCharWidth, /* pGetCharWidth */
NULL, /* pGetDCOrgEx */ NULL, /* pGetDCOrgEx */
NULL, /* pGetDeviceGammaRamp */
TTYDRV_DC_GetPixel, /* pGetPixel */ TTYDRV_DC_GetPixel, /* pGetPixel */
NULL, /* pGetPixelFormat */ NULL, /* pGetPixelFormat */
TTYDRV_DC_GetTextExtentPoint, /* pGetTextExtentPoint */ TTYDRV_DC_GetTextExtentPoint, /* pGetTextExtentPoint */
@ -90,6 +91,7 @@ static const DC_FUNCTIONS TTYDRV_DC_Driver =
TTYDRV_DC_SetBkColor, /* pSetBkColor */ TTYDRV_DC_SetBkColor, /* pSetBkColor */
NULL, /* pSetBkMode */ NULL, /* pSetBkMode */
TTYDRV_DC_SetDeviceClipping, /* pSetDeviceClipping */ TTYDRV_DC_SetDeviceClipping, /* pSetDeviceClipping */
NULL, /* pSetDeviceGammaRamp */
TTYDRV_DC_SetDIBitsToDevice, /* pSetDIBitsToDevice */ TTYDRV_DC_SetDIBitsToDevice, /* pSetDIBitsToDevice */
NULL, /* pSetMapMode (optional) */ NULL, /* pSetMapMode (optional) */
NULL, /* pSetMapperFlags */ NULL, /* pSetMapperFlags */

View File

@ -58,6 +58,7 @@ static const DC_FUNCTIONS PSDRV_Funcs =
NULL, /* pFrameRgn */ NULL, /* pFrameRgn */
PSDRV_GetCharWidth, /* pGetCharWidth */ PSDRV_GetCharWidth, /* pGetCharWidth */
NULL, /* pGetDCOrgEx */ NULL, /* pGetDCOrgEx */
NULL, /* pGetDeviceGammaRamp */
NULL, /* pGetPixel */ NULL, /* pGetPixel */
NULL, /* pGetPixelFormat */ NULL, /* pGetPixelFormat */
PSDRV_GetTextExtentPoint, /* pGetTextExtentPoint */ PSDRV_GetTextExtentPoint, /* pGetTextExtentPoint */
@ -94,6 +95,7 @@ static const DC_FUNCTIONS PSDRV_Funcs =
PSDRV_SetBkColor, /* pSetBkColor */ PSDRV_SetBkColor, /* pSetBkColor */
NULL, /* pSetBkMode */ NULL, /* pSetBkMode */
PSDRV_SetDeviceClipping, /* pSetDeviceClipping */ PSDRV_SetDeviceClipping, /* pSetDeviceClipping */
NULL, /* pSetDeviceGammaRamp */
NULL, /* pSetDIBitsToDevice */ NULL, /* pSetDIBitsToDevice */
NULL, /* pSetMapMode (optional) */ NULL, /* pSetMapMode (optional) */
NULL, /* pSetMapperFlags */ NULL, /* pSetMapperFlags */

View File

@ -53,6 +53,7 @@ static const DC_FUNCTIONS EMFDRV_Funcs =
EMFDRV_FrameRgn, /* pFrameRgn */ EMFDRV_FrameRgn, /* pFrameRgn */
NULL, /* pGetCharWidth */ NULL, /* pGetCharWidth */
NULL, /* pGetDCOrgEx */ NULL, /* pGetDCOrgEx */
NULL, /* pGetDeviceGammaRamp */
NULL, /* no implementation */ /* pGetPixel */ NULL, /* no implementation */ /* pGetPixel */
NULL, /* pGetPixelFormat */ NULL, /* pGetPixelFormat */
NULL, /* pGetTextExtentPoint */ NULL, /* pGetTextExtentPoint */
@ -89,6 +90,7 @@ static const DC_FUNCTIONS EMFDRV_Funcs =
EMFDRV_SetBkColor, /* pSetBkColor */ EMFDRV_SetBkColor, /* pSetBkColor */
EMFDRV_SetBkMode, /* pSetBkMode */ EMFDRV_SetBkMode, /* pSetBkMode */
NULL, /* pSetDeviceClipping */ NULL, /* pSetDeviceClipping */
NULL, /* pSetDeviceGammaRamp */
NULL, /* pSetDIBitsToDevice */ NULL, /* pSetDIBitsToDevice */
EMFDRV_SetMapMode, /* pSetMapMode */ EMFDRV_SetMapMode, /* pSetMapMode */
EMFDRV_SetMapperFlags, /* pSetMapperFlags */ EMFDRV_SetMapperFlags, /* pSetMapperFlags */

View File

@ -53,6 +53,7 @@ static const DC_FUNCTIONS MFDRV_Funcs =
MFDRV_FrameRgn, /* pFrameRgn */ MFDRV_FrameRgn, /* pFrameRgn */
NULL, /* pGetCharWidth */ NULL, /* pGetCharWidth */
NULL, /* pGetDCOrgEx */ NULL, /* pGetDCOrgEx */
NULL, /* pGetDeviceGammaRamp */
NULL, /* no implementation */ /* pGetPixel */ NULL, /* no implementation */ /* pGetPixel */
NULL, /* pGetPixelFormat */ NULL, /* pGetPixelFormat */
NULL, /* pGetTextExtentPoint */ NULL, /* pGetTextExtentPoint */
@ -89,6 +90,7 @@ static const DC_FUNCTIONS MFDRV_Funcs =
MFDRV_SetBkColor, /* pSetBkColor */ MFDRV_SetBkColor, /* pSetBkColor */
MFDRV_SetBkMode, /* pSetBkMode */ MFDRV_SetBkMode, /* pSetBkMode */
NULL, /* pSetDeviceClipping */ NULL, /* pSetDeviceClipping */
NULL, /* pSetDeviceGammaRamp */
MFDRV_SetDIBitsToDevice, /* pSetDIBitsToDevice */ MFDRV_SetDIBitsToDevice, /* pSetDIBitsToDevice */
MFDRV_SetMapMode, /* pSetMapMode */ MFDRV_SetMapMode, /* pSetMapMode */
MFDRV_SetMapperFlags, /* pSetMapperFlags */ MFDRV_SetMapperFlags, /* pSetMapperFlags */

View File

@ -79,6 +79,7 @@ static const DC_FUNCTIONS WIN16DRV_Funcs =
NULL, /* pFrameRgn */ NULL, /* pFrameRgn */
WIN16DRV_GetCharWidth, /* pGetCharWidth */ WIN16DRV_GetCharWidth, /* pGetCharWidth */
NULL, /* pGetDCOrgEx */ NULL, /* pGetDCOrgEx */
NULL, /* pGetDeviceGammaRamp */
NULL, /* pGetPixel */ NULL, /* pGetPixel */
NULL, /* pGetPixelFormat */ NULL, /* pGetPixelFormat */
WIN16DRV_GetTextExtentPoint, /* pGetTextExtentPoint */ WIN16DRV_GetTextExtentPoint, /* pGetTextExtentPoint */
@ -115,6 +116,7 @@ static const DC_FUNCTIONS WIN16DRV_Funcs =
NULL, /* pSetBkColor */ NULL, /* pSetBkColor */
NULL, /* pSetBkMode */ NULL, /* pSetBkMode */
NULL, /* pSetDeviceClipping */ NULL, /* pSetDeviceClipping */
NULL, /* pSetDeviceGammaRamp */
NULL, /* pSetDIBitsToDevice */ NULL, /* pSetDIBitsToDevice */
NULL, /* pSetMapMode */ NULL, /* pSetMapMode */
NULL, /* pSetMapperFlags */ NULL, /* pSetMapperFlags */

View File

@ -62,6 +62,7 @@ const DC_FUNCTIONS X11DRV_DC_Funcs =
NULL, /* pFrameRgn */ NULL, /* pFrameRgn */
X11DRV_GetCharWidth, /* pGetCharWidth */ X11DRV_GetCharWidth, /* pGetCharWidth */
X11DRV_GetDCOrgEx, /* pGetDCOrgEx */ X11DRV_GetDCOrgEx, /* pGetDCOrgEx */
X11DRV_GetDeviceGammaRamp, /* pGetDeviceGammaRamp */
X11DRV_GetPixel, /* pGetPixel */ X11DRV_GetPixel, /* pGetPixel */
X11DRV_GetPixelFormat, /* pGetPixelFormat */ X11DRV_GetPixelFormat, /* pGetPixelFormat */
X11DRV_GetTextExtentPoint, /* pGetTextExtentPoint */ X11DRV_GetTextExtentPoint, /* pGetTextExtentPoint */
@ -98,6 +99,7 @@ const DC_FUNCTIONS X11DRV_DC_Funcs =
X11DRV_SetBkColor, /* pSetBkColor */ X11DRV_SetBkColor, /* pSetBkColor */
NULL, /* pSetBkMode */ NULL, /* pSetBkMode */
X11DRV_SetDeviceClipping, /* pSetDeviceClipping */ X11DRV_SetDeviceClipping, /* pSetDeviceClipping */
X11DRV_SetDeviceGammaRamp, /* pSetDeviceGammaRamp */
X11DRV_SetDIBitsToDevice, /* pSetDIBitsToDevice */ X11DRV_SetDIBitsToDevice, /* pSetDIBitsToDevice */
NULL, /* pSetMapMode (optional) */ NULL, /* pSetMapMode (optional) */
NULL, /* pSetMapperFlags */ NULL, /* pSetMapperFlags */

View File

@ -199,6 +199,7 @@ typedef struct tagDC_FUNCS
BOOL (*pFrameRgn)(DC*,HRGN,HBRUSH,INT,INT); BOOL (*pFrameRgn)(DC*,HRGN,HBRUSH,INT,INT);
BOOL (*pGetCharWidth)(DC*,UINT,UINT,LPINT); BOOL (*pGetCharWidth)(DC*,UINT,UINT,LPINT);
BOOL (*pGetDCOrgEx)(DC*,LPPOINT); BOOL (*pGetDCOrgEx)(DC*,LPPOINT);
BOOL (*pGetDeviceGammaRamp)(DC*,LPVOID);
COLORREF (*pGetPixel)(DC*,INT,INT); COLORREF (*pGetPixel)(DC*,INT,INT);
INT (*pGetPixelFormat)(DC*); INT (*pGetPixelFormat)(DC*);
BOOL (*pGetTextExtentPoint)(DC*,LPCWSTR,INT,LPSIZE); BOOL (*pGetTextExtentPoint)(DC*,LPCWSTR,INT,LPSIZE);
@ -235,6 +236,7 @@ typedef struct tagDC_FUNCS
COLORREF (*pSetBkColor)(DC*,COLORREF); COLORREF (*pSetBkColor)(DC*,COLORREF);
INT (*pSetBkMode)(DC*,INT); INT (*pSetBkMode)(DC*,INT);
VOID (*pSetDeviceClipping)(DC*); VOID (*pSetDeviceClipping)(DC*);
BOOL (*pSetDeviceGammaRamp)(DC*,LPVOID);
INT (*pSetDIBitsToDevice)(DC*,INT,INT,DWORD,DWORD,INT,INT,UINT,UINT, INT (*pSetDIBitsToDevice)(DC*,INT,INT,DWORD,DWORD,INT,INT,UINT,UINT,
LPCVOID,const BITMAPINFO*,UINT); LPCVOID,const BITMAPINFO*,UINT);
INT (*pSetMapMode)(DC*,INT); INT (*pSetMapMode)(DC*,INT);

View File

@ -3139,6 +3139,7 @@ BOOL WINAPI GetColorAdjustment(HDC, LPCOLORADJUSTMENT);
HANDLE WINAPI GetCurrentObject(HDC,UINT); HANDLE WINAPI GetCurrentObject(HDC,UINT);
BOOL WINAPI GetCurrentPositionEx(HDC,LPPOINT); BOOL WINAPI GetCurrentPositionEx(HDC,LPPOINT);
INT WINAPI GetDeviceCaps(HDC,INT); INT WINAPI GetDeviceCaps(HDC,INT);
BOOL WINAPI GetDeviceGammaRamp(HDC,LPVOID);
COLORREF WINAPI GetDCBrushColor(HDC); COLORREF WINAPI GetDCBrushColor(HDC);
BOOL WINAPI GetDCOrgEx(HDC,LPPOINT); BOOL WINAPI GetDCOrgEx(HDC,LPPOINT);
COLORREF WINAPI GetDCPenColor(HDC); COLORREF WINAPI GetDCPenColor(HDC);
@ -3286,6 +3287,7 @@ UINT WINAPI SetBoundsRect(HDC,const RECT*,UINT);
BOOL WINAPI SetBrushOrgEx(HDC,INT,INT,LPPOINT); BOOL WINAPI SetBrushOrgEx(HDC,INT,INT,LPPOINT);
BOOL WINAPI SetColorAdjustment(HDC,const COLORADJUSTMENT*); BOOL WINAPI SetColorAdjustment(HDC,const COLORADJUSTMENT*);
HCOLORSPACE WINAPI SetColorSpace(HDC,HCOLORSPACE); HCOLORSPACE WINAPI SetColorSpace(HDC,HCOLORSPACE);
BOOL WINAPI SetDeviceGammaRamp(HDC,LPVOID);
UINT WINAPI SetDIBColorTable(HDC,UINT,UINT,RGBQUAD*); UINT WINAPI SetDIBColorTable(HDC,UINT,UINT,RGBQUAD*);
INT WINAPI SetDIBits(HDC,HBITMAP,UINT,UINT,LPCVOID,const BITMAPINFO*,UINT); INT WINAPI SetDIBits(HDC,HBITMAP,UINT,UINT,LPCVOID,const BITMAPINFO*,UINT);
INT WINAPI SetDIBitsToDevice(HDC,INT,INT,DWORD,DWORD,INT, INT WINAPI SetDIBitsToDevice(HDC,INT,INT,DWORD,DWORD,INT,

View File

@ -1285,9 +1285,35 @@ INT WINAPI SetICMMode(HDC hdc, INT iEnableICM)
/*********************************************************************** /***********************************************************************
* GetDeviceGammaRamp (GDI32.@) * GetDeviceGammaRamp (GDI32.@)
*/ */
BOOL WINAPI GetDeviceGammaRamp(HDC hdc,LPVOID ptr) { BOOL WINAPI GetDeviceGammaRamp(HDC hDC, LPVOID ptr)
FIXME("(%x,%p), empty stub!\n",hdc,ptr); {
return FALSE; BOOL ret = FALSE;
DC *dc = DC_GetDCPtr( hDC );
if( dc )
{
if (dc->funcs->pGetDeviceGammaRamp)
ret = dc->funcs->pGetDeviceGammaRamp(dc, ptr);
GDI_ReleaseObj( hDC );
}
return ret;
}
/***********************************************************************
* SetDeviceGammaRamp (GDI32.@)
*/
BOOL WINAPI SetDeviceGammaRamp(HDC hDC, LPVOID ptr)
{
BOOL ret = FALSE;
DC *dc = DC_GetDCPtr( hDC );
if( dc )
{
if (dc->funcs->pSetDeviceGammaRamp)
ret = dc->funcs->pSetDeviceGammaRamp(dc, ptr);
GDI_ReleaseObj( hDC );
}
return ret;
} }
/*********************************************************************** /***********************************************************************