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

gdi32: Remove the remaining OpenGL entry points from the DC driver.

This commit is contained in:
Alexandre Julliard 2012-06-28 16:38:33 +02:00
parent 855f225498
commit 6a9dcd51a2
11 changed files with 1 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -403,7 +403,6 @@ const struct gdi_dc_funcs dib_driver =
dibdrv_ArcTo, /* pArcTo */ dibdrv_ArcTo, /* pArcTo */
NULL, /* pBeginPath */ NULL, /* pBeginPath */
dibdrv_BlendImage, /* pBlendImage */ dibdrv_BlendImage, /* pBlendImage */
NULL, /* pChoosePixelFormat */
dibdrv_Chord, /* pChord */ dibdrv_Chord, /* pChord */
NULL, /* pCloseFigure */ NULL, /* pCloseFigure */
NULL, /* pCreateCompatibleDC */ NULL, /* pCreateCompatibleDC */
@ -447,7 +446,6 @@ const struct gdi_dc_funcs dib_driver =
dibdrv_GetNearestColor, /* pGetNearestColor */ dibdrv_GetNearestColor, /* pGetNearestColor */
NULL, /* pGetOutlineTextMetrics */ NULL, /* pGetOutlineTextMetrics */
dibdrv_GetPixel, /* pGetPixel */ dibdrv_GetPixel, /* pGetPixel */
NULL, /* pGetPixelFormat */
NULL, /* pGetSystemPaletteEntries */ NULL, /* pGetSystemPaletteEntries */
NULL, /* pGetTextCharsetInfo */ NULL, /* pGetTextCharsetInfo */
NULL, /* pGetTextExtentExPoint */ NULL, /* pGetTextExtentExPoint */
@ -526,9 +524,6 @@ const struct gdi_dc_funcs dib_driver =
NULL, /* pSwapBuffers */ NULL, /* pSwapBuffers */
NULL, /* pUnrealizePalette */ NULL, /* pUnrealizePalette */
NULL, /* pWidenPath */ NULL, /* pWidenPath */
NULL, /* pwglCreateContext */
NULL, /* pwglCreateContextAttribsARB */
NULL, /* pwglGetProcAddress */
NULL, /* wine_get_wgl_driver */ NULL, /* wine_get_wgl_driver */
GDI_PRIORITY_DIB_DRV /* priority */ GDI_PRIORITY_DIB_DRV /* priority */
}; };

30
dlls/gdi32/driver.c
View File

@ -198,11 +198,6 @@ static BOOL nulldrv_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom,
return TRUE; return TRUE;
} }
static INT nulldrv_ChoosePixelFormat( PHYSDEV dev, const PIXELFORMATDESCRIPTOR *descr )
{
return 0;
}
static BOOL nulldrv_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom, static BOOL nulldrv_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom,
INT xstart, INT ystart, INT xend, INT yend ) INT xstart, INT ystart, INT xend, INT yend )
{ {
@ -391,11 +386,6 @@ static UINT nulldrv_GetOutlineTextMetrics( PHYSDEV dev, UINT size, LPOUTLINETEXT
return 0; return 0;
} }
static INT nulldrv_GetPixelFormat( PHYSDEV dev )
{
return 0;
}
static UINT nulldrv_GetSystemPaletteEntries( PHYSDEV dev, UINT start, UINT count, PALETTEENTRY *entries ) static UINT nulldrv_GetSystemPaletteEntries( PHYSDEV dev, UINT start, UINT count, PALETTEENTRY *entries )
{ {
return 0; return 0;
@ -670,21 +660,6 @@ static BOOL nulldrv_UnrealizePalette( HPALETTE palette )
return FALSE; return FALSE;
} }
static HGLRC nulldrv_wglCreateContext( PHYSDEV dev )
{
return 0;
}
static HGLRC nulldrv_wglCreateContextAttribsARB( PHYSDEV dev, HGLRC share_ctx, const int *attribs )
{
return 0;
}
static PROC nulldrv_wglGetProcAddress( LPCSTR name )
{
return NULL;
}
static const struct wgl_funcs *nulldrv_wine_get_wgl_driver( PHYSDEV dev, UINT version ) static const struct wgl_funcs *nulldrv_wine_get_wgl_driver( PHYSDEV dev, UINT version )
{ {
return NULL; return NULL;
@ -700,7 +675,6 @@ const struct gdi_dc_funcs null_driver =
nulldrv_ArcTo, /* pArcTo */ nulldrv_ArcTo, /* pArcTo */
nulldrv_BeginPath, /* pBeginPath */ nulldrv_BeginPath, /* pBeginPath */
nulldrv_BlendImage, /* pBlendImage */ nulldrv_BlendImage, /* pBlendImage */
nulldrv_ChoosePixelFormat, /* pChoosePixelFormat */
nulldrv_Chord, /* pChord */ nulldrv_Chord, /* pChord */
nulldrv_CloseFigure, /* pCloseFigure */ nulldrv_CloseFigure, /* pCloseFigure */
nulldrv_CreateCompatibleDC, /* pCreateCompatibleDC */ nulldrv_CreateCompatibleDC, /* pCreateCompatibleDC */
@ -744,7 +718,6 @@ const struct gdi_dc_funcs null_driver =
nulldrv_GetNearestColor, /* pGetNearestColor */ nulldrv_GetNearestColor, /* pGetNearestColor */
nulldrv_GetOutlineTextMetrics, /* pGetOutlineTextMetrics */ nulldrv_GetOutlineTextMetrics, /* pGetOutlineTextMetrics */
nulldrv_GetPixel, /* pGetPixel */ nulldrv_GetPixel, /* pGetPixel */
nulldrv_GetPixelFormat, /* pGetPixelFormat */
nulldrv_GetSystemPaletteEntries, /* pGetSystemPaletteEntries */ nulldrv_GetSystemPaletteEntries, /* pGetSystemPaletteEntries */
nulldrv_GetTextCharsetInfo, /* pGetTextCharsetInfo */ nulldrv_GetTextCharsetInfo, /* pGetTextCharsetInfo */
nulldrv_GetTextExtentExPoint, /* pGetTextExtentExPoint */ nulldrv_GetTextExtentExPoint, /* pGetTextExtentExPoint */
@ -823,9 +796,6 @@ const struct gdi_dc_funcs null_driver =
nulldrv_SwapBuffers, /* pSwapBuffers */ nulldrv_SwapBuffers, /* pSwapBuffers */
nulldrv_UnrealizePalette, /* pUnrealizePalette */ nulldrv_UnrealizePalette, /* pUnrealizePalette */
nulldrv_WidenPath, /* pWidenPath */ nulldrv_WidenPath, /* pWidenPath */
nulldrv_wglCreateContext, /* pwglCreateContext */
nulldrv_wglCreateContextAttribsARB, /* pwglCreateContextAttribsARB */
nulldrv_wglGetProcAddress, /* pwglGetProcAddress */
nulldrv_wine_get_wgl_driver, /* wine_get_wgl_driver */ nulldrv_wine_get_wgl_driver, /* wine_get_wgl_driver */
GDI_PRIORITY_NULL_DRV /* priority */ GDI_PRIORITY_NULL_DRV /* priority */

5
dlls/gdi32/enhmfdrv/init.c
View File

@ -44,7 +44,6 @@ static const struct gdi_dc_funcs EMFDRV_Funcs =
NULL, /* pArcTo */ NULL, /* pArcTo */
EMFDRV_BeginPath, /* pBeginPath */ EMFDRV_BeginPath, /* pBeginPath */
NULL, /* pBlendImage */ NULL, /* pBlendImage */
NULL, /* pChoosePixelFormat */
EMFDRV_Chord, /* pChord */ EMFDRV_Chord, /* pChord */
EMFDRV_CloseFigure, /* pCloseFigure */ EMFDRV_CloseFigure, /* pCloseFigure */
NULL, /* pCreateCompatibleDC */ NULL, /* pCreateCompatibleDC */
@ -88,7 +87,6 @@ static const struct gdi_dc_funcs EMFDRV_Funcs =
NULL, /* pGetNearestColor */ NULL, /* pGetNearestColor */
NULL, /* pGetOutlineTextMetrics */ NULL, /* pGetOutlineTextMetrics */
NULL, /* pGetPixel */ NULL, /* pGetPixel */
NULL, /* pGetPixelFormat */
NULL, /* pGetSystemPaletteEntries */ NULL, /* pGetSystemPaletteEntries */
NULL, /* pGetTextCharsetInfo */ NULL, /* pGetTextCharsetInfo */
NULL, /* pGetTextExtentExPoint */ NULL, /* pGetTextExtentExPoint */
@ -167,9 +165,6 @@ static const struct gdi_dc_funcs EMFDRV_Funcs =
NULL, /* pSwapBuffers */ NULL, /* pSwapBuffers */
NULL, /* pUnrealizePalette */ NULL, /* pUnrealizePalette */
EMFDRV_WidenPath, /* pWidenPath */ EMFDRV_WidenPath, /* pWidenPath */
NULL, /* pwglCreateContext */
NULL, /* pwglCreateContextAttribsARB */
NULL, /* pwglGetProcAddress */
NULL, /* wine_get_wgl_driver */ NULL, /* wine_get_wgl_driver */
GDI_PRIORITY_GRAPHICS_DRV /* priority */ GDI_PRIORITY_GRAPHICS_DRV /* priority */
}; };

5
dlls/gdi32/freetype.c
View File

@ -7748,7 +7748,6 @@ static const struct gdi_dc_funcs freetype_funcs =
NULL, /* pArcTo */ NULL, /* pArcTo */
NULL, /* pBeginPath */ NULL, /* pBeginPath */
NULL, /* pBlendImage */ NULL, /* pBlendImage */
NULL, /* pChoosePixelFormat */
NULL, /* pChord */ NULL, /* pChord */
NULL, /* pCloseFigure */ NULL, /* pCloseFigure */
NULL, /* pCreateCompatibleDC */ NULL, /* pCreateCompatibleDC */
@ -7792,7 +7791,6 @@ static const struct gdi_dc_funcs freetype_funcs =
NULL, /* pGetNearestColor */ NULL, /* pGetNearestColor */
freetype_GetOutlineTextMetrics, /* pGetOutlineTextMetrics */ freetype_GetOutlineTextMetrics, /* pGetOutlineTextMetrics */
NULL, /* pGetPixel */ NULL, /* pGetPixel */
NULL, /* pGetPixelFormat */
NULL, /* pGetSystemPaletteEntries */ NULL, /* pGetSystemPaletteEntries */
freetype_GetTextCharsetInfo, /* pGetTextCharsetInfo */ freetype_GetTextCharsetInfo, /* pGetTextCharsetInfo */
freetype_GetTextExtentExPoint, /* pGetTextExtentExPoint */ freetype_GetTextExtentExPoint, /* pGetTextExtentExPoint */
@ -7871,9 +7869,6 @@ static const struct gdi_dc_funcs freetype_funcs =
NULL, /* pSwapBuffers */ NULL, /* pSwapBuffers */
NULL, /* pUnrealizePalette */ NULL, /* pUnrealizePalette */
NULL, /* pWidenPath */ NULL, /* pWidenPath */
NULL, /* pwglCreateContext */
NULL, /* pwglCreateContextAttribsARB */
NULL, /* pwglGetProcAddress */
NULL, /* wine_get_wgl_driver */ NULL, /* wine_get_wgl_driver */
GDI_PRIORITY_FONT_DRV /* priority */ GDI_PRIORITY_FONT_DRV /* priority */
}; };

5
dlls/gdi32/mfdrv/init.c
View File

@ -107,7 +107,6 @@ static const struct gdi_dc_funcs MFDRV_Funcs =
NULL, /* pArcTo */ NULL, /* pArcTo */
MFDRV_BeginPath, /* pBeginPath */ MFDRV_BeginPath, /* pBeginPath */
NULL, /* pBlendImage */ NULL, /* pBlendImage */
NULL, /* pChoosePixelFormat */
MFDRV_Chord, /* pChord */ MFDRV_Chord, /* pChord */
MFDRV_CloseFigure, /* pCloseFigure */ MFDRV_CloseFigure, /* pCloseFigure */
MFDRV_CreateCompatibleDC, /* pCreateCompatibleDC */ MFDRV_CreateCompatibleDC, /* pCreateCompatibleDC */
@ -151,7 +150,6 @@ static const struct gdi_dc_funcs MFDRV_Funcs =
NULL, /* pGetNearestColor */ NULL, /* pGetNearestColor */
NULL, /* pGetOutlineTextMetrics */ NULL, /* pGetOutlineTextMetrics */
NULL, /* pGetPixel */ NULL, /* pGetPixel */
NULL, /* pGetPixelFormat */
NULL, /* pGetSystemPaletteEntries */ NULL, /* pGetSystemPaletteEntries */
NULL, /* pGetTextCharsetInfo */ NULL, /* pGetTextCharsetInfo */
NULL, /* pGetTextExtentExPoint */ NULL, /* pGetTextExtentExPoint */
@ -230,9 +228,6 @@ static const struct gdi_dc_funcs MFDRV_Funcs =
NULL, /* pSwapBuffers */ NULL, /* pSwapBuffers */
NULL, /* pUnrealizePalette */ NULL, /* pUnrealizePalette */
MFDRV_WidenPath, /* pWidenPath */ MFDRV_WidenPath, /* pWidenPath */
NULL, /* pwglCreateContext */
NULL, /* pwglCreateContextAttribsARB */
NULL, /* pwglGetProcAddress */
NULL, /* wine_get_wgl_driver */ NULL, /* wine_get_wgl_driver */
GDI_PRIORITY_GRAPHICS_DRV /* priority */ GDI_PRIORITY_GRAPHICS_DRV /* priority */
}; };

5
dlls/gdi32/path.c
View File

@ -2241,7 +2241,6 @@ const struct gdi_dc_funcs path_driver =
pathdrv_ArcTo, /* pArcTo */ pathdrv_ArcTo, /* pArcTo */
pathdrv_BeginPath, /* pBeginPath */ pathdrv_BeginPath, /* pBeginPath */
NULL, /* pBlendImage */ NULL, /* pBlendImage */
NULL, /* pChoosePixelFormat */
pathdrv_Chord, /* pChord */ pathdrv_Chord, /* pChord */
pathdrv_CloseFigure, /* pCloseFigure */ pathdrv_CloseFigure, /* pCloseFigure */
NULL, /* pCreateCompatibleDC */ NULL, /* pCreateCompatibleDC */
@ -2285,7 +2284,6 @@ const struct gdi_dc_funcs path_driver =
NULL, /* pGetNearestColor */ NULL, /* pGetNearestColor */
NULL, /* pGetOutlineTextMetrics */ NULL, /* pGetOutlineTextMetrics */
NULL, /* pGetPixel */ NULL, /* pGetPixel */
NULL, /* pGetPixelFormat */
NULL, /* pGetSystemPaletteEntries */ NULL, /* pGetSystemPaletteEntries */
NULL, /* pGetTextCharsetInfo */ NULL, /* pGetTextCharsetInfo */
NULL, /* pGetTextExtentExPoint */ NULL, /* pGetTextExtentExPoint */
@ -2364,9 +2362,6 @@ const struct gdi_dc_funcs path_driver =
NULL, /* pSwapBuffers */ NULL, /* pSwapBuffers */
NULL, /* pUnrealizePalette */ NULL, /* pUnrealizePalette */
NULL, /* pWidenPath */ NULL, /* pWidenPath */
NULL, /* pwglCreateContext */
NULL, /* pwglCreateContextAttribsARB */
NULL, /* pwglGetProcAddress */
NULL, /* wine_get_wgl_driver */ NULL, /* wine_get_wgl_driver */
GDI_PRIORITY_PATH_DRV /* priority */ GDI_PRIORITY_PATH_DRV /* priority */
}; };

5
dlls/wineps.drv/init.c
View File

@ -718,7 +718,6 @@ static const struct gdi_dc_funcs psdrv_funcs =
NULL, /* pArcTo */ NULL, /* pArcTo */
NULL, /* pBeginPath */ NULL, /* pBeginPath */
NULL, /* pBlendImage */ NULL, /* pBlendImage */
NULL, /* pChoosePixelFormat */
PSDRV_Chord, /* pChord */ PSDRV_Chord, /* pChord */
NULL, /* pCloseFigure */ NULL, /* pCloseFigure */
PSDRV_CreateCompatibleDC, /* pCreateCompatibleDC */ PSDRV_CreateCompatibleDC, /* pCreateCompatibleDC */
@ -762,7 +761,6 @@ static const struct gdi_dc_funcs psdrv_funcs =
NULL, /* pGetNearestColor */ NULL, /* pGetNearestColor */
NULL, /* pGetOutlineTextMetrics */ NULL, /* pGetOutlineTextMetrics */
NULL, /* pGetPixel */ NULL, /* pGetPixel */
NULL, /* pGetPixelFormat */
NULL, /* pGetSystemPaletteEntries */ NULL, /* pGetSystemPaletteEntries */
NULL, /* pGetTextCharsetInfo */ NULL, /* pGetTextCharsetInfo */
PSDRV_GetTextExtentExPoint, /* pGetTextExtentExPoint */ PSDRV_GetTextExtentExPoint, /* pGetTextExtentExPoint */
@ -841,9 +839,6 @@ static const struct gdi_dc_funcs psdrv_funcs =
NULL, /* pSwapBuffers */ NULL, /* pSwapBuffers */
NULL, /* pUnrealizePalette */ NULL, /* pUnrealizePalette */
NULL, /* pWidenPath */ NULL, /* pWidenPath */
NULL, /* pwglCreateContext */
NULL, /* pwglCreateContextAttribsARB */
NULL, /* pwglGetProcAddress */
NULL, /* wine_get_wgl_driver */ NULL, /* wine_get_wgl_driver */
GDI_PRIORITY_GRAPHICS_DRV /* priority */ GDI_PRIORITY_GRAPHICS_DRV /* priority */
}; };

41
dlls/winex11.drv/init.c
View File

@ -446,15 +446,6 @@ static inline void opengl_error(void)
if (!warned++) ERR("No OpenGL support compiled in.\n"); if (!warned++) ERR("No OpenGL support compiled in.\n");
} }
/***********************************************************************
* X11DRV_ChoosePixelFormat
*/
static int X11DRV_ChoosePixelFormat( PHYSDEV dev, const PIXELFORMATDESCRIPTOR *ppfd )
{
opengl_error();
return 0;
}
/*********************************************************************** /***********************************************************************
* X11DRV_DescribePixelFormat * X11DRV_DescribePixelFormat
*/ */
@ -473,33 +464,6 @@ static BOOL X11DRV_SetPixelFormat( PHYSDEV dev, int fmt, const PIXELFORMATDESCRI
return FALSE; return FALSE;
} }
/***********************************************************************
* X11DRV_wglCreateContext
*/
static HGLRC X11DRV_wglCreateContext( PHYSDEV dev )
{
opengl_error();
return NULL;
}
/***********************************************************************
* X11DRV_wglCreateContextAttribsARB
*/
static HGLRC X11DRV_wglCreateContextAttribsARB( PHYSDEV dev, HGLRC hShareContext, const int* attribList )
{
opengl_error();
return NULL;
}
/***********************************************************************
* X11DRV_wglGetProcAddress
*/
static PROC X11DRV_wglGetProcAddress( LPCSTR proc )
{
opengl_error();
return NULL;
}
static const struct gdi_dc_funcs x11drv_funcs = static const struct gdi_dc_funcs x11drv_funcs =
{ {
@ -511,7 +475,6 @@ static const struct gdi_dc_funcs x11drv_funcs =
NULL, /* pArcTo */ NULL, /* pArcTo */
NULL, /* pBeginPath */ NULL, /* pBeginPath */
NULL, /* pBlendImage */ NULL, /* pBlendImage */
X11DRV_ChoosePixelFormat, /* pChoosePixelFormat */
X11DRV_Chord, /* pChord */ X11DRV_Chord, /* pChord */
NULL, /* pCloseFigure */ NULL, /* pCloseFigure */
X11DRV_CreateCompatibleDC, /* pCreateCompatibleDC */ X11DRV_CreateCompatibleDC, /* pCreateCompatibleDC */
@ -555,7 +518,6 @@ static const struct gdi_dc_funcs x11drv_funcs =
X11DRV_GetNearestColor, /* pGetNearestColor */ X11DRV_GetNearestColor, /* pGetNearestColor */
NULL, /* pGetOutlineTextMetrics */ NULL, /* pGetOutlineTextMetrics */
NULL, /* pGetPixel */ NULL, /* pGetPixel */
NULL, /* pGetPixelFormat */
X11DRV_GetSystemPaletteEntries, /* pGetSystemPaletteEntries */ X11DRV_GetSystemPaletteEntries, /* pGetSystemPaletteEntries */
NULL, /* pGetTextCharsetInfo */ NULL, /* pGetTextCharsetInfo */
NULL, /* pGetTextExtentExPoint */ NULL, /* pGetTextExtentExPoint */
@ -634,9 +596,6 @@ static const struct gdi_dc_funcs x11drv_funcs =
NULL, /* pSwapBuffers */ NULL, /* pSwapBuffers */
X11DRV_UnrealizePalette, /* pUnrealizePalette */ X11DRV_UnrealizePalette, /* pUnrealizePalette */
NULL, /* pWidenPath */ NULL, /* pWidenPath */
X11DRV_wglCreateContext, /* pwglCreateContext */
X11DRV_wglCreateContextAttribsARB, /* pwglCreateContextAttribsARB */
X11DRV_wglGetProcAddress, /* pwglGetProcAddress */
NULL, /* wine_get_wgl_driver */ NULL, /* wine_get_wgl_driver */
GDI_PRIORITY_GRAPHICS_DRV /* priority */ GDI_PRIORITY_GRAPHICS_DRV /* priority */
}; };

5
dlls/winex11.drv/opengl.c
View File

@ -3458,7 +3458,6 @@ static const struct gdi_dc_funcs glxdrv_funcs =
NULL, /* pArcTo */ NULL, /* pArcTo */
NULL, /* pBeginPath */ NULL, /* pBeginPath */
NULL, /* pBlendImage */ NULL, /* pBlendImage */
NULL, /* pChoosePixelFormat */
NULL, /* pChord */ NULL, /* pChord */
NULL, /* pCloseFigure */ NULL, /* pCloseFigure */
glxdrv_CreateCompatibleDC, /* pCreateCompatibleDC */ glxdrv_CreateCompatibleDC, /* pCreateCompatibleDC */
@ -3502,7 +3501,6 @@ static const struct gdi_dc_funcs glxdrv_funcs =
NULL, /* pGetNearestColor */ NULL, /* pGetNearestColor */
NULL, /* pGetOutlineTextMetrics */ NULL, /* pGetOutlineTextMetrics */
NULL, /* pGetPixel */ NULL, /* pGetPixel */
NULL, /* pGetPixelFormat */
NULL, /* pGetSystemPaletteEntries */ NULL, /* pGetSystemPaletteEntries */
NULL, /* pGetTextCharsetInfo */ NULL, /* pGetTextCharsetInfo */
NULL, /* pGetTextExtentExPoint */ NULL, /* pGetTextExtentExPoint */
@ -3581,9 +3579,6 @@ static const struct gdi_dc_funcs glxdrv_funcs =
glxdrv_SwapBuffers, /* pSwapBuffers */ glxdrv_SwapBuffers, /* pSwapBuffers */
NULL, /* pUnrealizePalette */ NULL, /* pUnrealizePalette */
NULL, /* pWidenPath */ NULL, /* pWidenPath */
NULL, /* pwglCreateContext */
NULL, /* pwglCreateContextAttribsARB */
NULL, /* pwglGetProcAddress */
glxdrv_wine_get_wgl_driver, /* wine_get_wgl_driver */ glxdrv_wine_get_wgl_driver, /* wine_get_wgl_driver */
GDI_PRIORITY_GRAPHICS_DRV + 20 /* priority */ GDI_PRIORITY_GRAPHICS_DRV + 20 /* priority */
}; };

5
dlls/winex11.drv/xrender.c
View File

@ -2474,7 +2474,6 @@ static const struct gdi_dc_funcs xrender_funcs =
NULL, /* pArcTo */ NULL, /* pArcTo */
NULL, /* pBeginPath */ NULL, /* pBeginPath */
xrenderdrv_BlendImage, /* pBlendImage */ xrenderdrv_BlendImage, /* pBlendImage */
NULL, /* pChoosePixelFormat */
NULL, /* pChord */ NULL, /* pChord */
NULL, /* pCloseFigure */ NULL, /* pCloseFigure */
xrenderdrv_CreateCompatibleDC, /* pCreateCompatibleDC */ xrenderdrv_CreateCompatibleDC, /* pCreateCompatibleDC */
@ -2518,7 +2517,6 @@ static const struct gdi_dc_funcs xrender_funcs =
NULL, /* pGetNearestColor */ NULL, /* pGetNearestColor */
NULL, /* pGetOutlineTextMetrics */ NULL, /* pGetOutlineTextMetrics */
NULL, /* pGetPixel */ NULL, /* pGetPixel */
NULL, /* pGetPixelFormat */
NULL, /* pGetSystemPaletteEntries */ NULL, /* pGetSystemPaletteEntries */
NULL, /* pGetTextCharsetInfo */ NULL, /* pGetTextCharsetInfo */
NULL, /* pGetTextExtentExPoint */ NULL, /* pGetTextExtentExPoint */
@ -2597,9 +2595,6 @@ static const struct gdi_dc_funcs xrender_funcs =
NULL, /* pSwapBuffers */ NULL, /* pSwapBuffers */
NULL, /* pUnrealizePalette */ NULL, /* pUnrealizePalette */
NULL, /* pWidenPath */ NULL, /* pWidenPath */
NULL, /* pwglCreateContext */
NULL, /* pwglCreateContextAttribsARB */
NULL, /* pwglGetProcAddress */
NULL, /* wine_get_wgl_driver */ NULL, /* wine_get_wgl_driver */
GDI_PRIORITY_GRAPHICS_DRV + 10 /* priority */ GDI_PRIORITY_GRAPHICS_DRV + 10 /* priority */
}; };

7
include/wine/gdi_driver.h
View File

@ -70,7 +70,6 @@ struct gdi_dc_funcs
BOOL (*pArcTo)(PHYSDEV,INT,INT,INT,INT,INT,INT,INT,INT); BOOL (*pArcTo)(PHYSDEV,INT,INT,INT,INT,INT,INT,INT,INT);
BOOL (*pBeginPath)(PHYSDEV); BOOL (*pBeginPath)(PHYSDEV);
DWORD (*pBlendImage)(PHYSDEV,BITMAPINFO*,const struct gdi_image_bits*,struct bitblt_coords*,struct bitblt_coords*,BLENDFUNCTION); DWORD (*pBlendImage)(PHYSDEV,BITMAPINFO*,const struct gdi_image_bits*,struct bitblt_coords*,struct bitblt_coords*,BLENDFUNCTION);
INT (*pChoosePixelFormat)(PHYSDEV,const PIXELFORMATDESCRIPTOR *);
BOOL (*pChord)(PHYSDEV,INT,INT,INT,INT,INT,INT,INT,INT); BOOL (*pChord)(PHYSDEV,INT,INT,INT,INT,INT,INT,INT,INT);
BOOL (*pCloseFigure)(PHYSDEV); BOOL (*pCloseFigure)(PHYSDEV);
BOOL (*pCreateCompatibleDC)(PHYSDEV,PHYSDEV*); BOOL (*pCreateCompatibleDC)(PHYSDEV,PHYSDEV*);
@ -114,7 +113,6 @@ struct gdi_dc_funcs
COLORREF (*pGetNearestColor)(PHYSDEV,COLORREF); COLORREF (*pGetNearestColor)(PHYSDEV,COLORREF);
UINT (*pGetOutlineTextMetrics)(PHYSDEV,UINT,LPOUTLINETEXTMETRICW); UINT (*pGetOutlineTextMetrics)(PHYSDEV,UINT,LPOUTLINETEXTMETRICW);
COLORREF (*pGetPixel)(PHYSDEV,INT,INT); COLORREF (*pGetPixel)(PHYSDEV,INT,INT);
INT (*pGetPixelFormat)(PHYSDEV);
UINT (*pGetSystemPaletteEntries)(PHYSDEV,UINT,UINT,LPPALETTEENTRY); UINT (*pGetSystemPaletteEntries)(PHYSDEV,UINT,UINT,LPPALETTEENTRY);
UINT (*pGetTextCharsetInfo)(PHYSDEV,LPFONTSIGNATURE,DWORD); UINT (*pGetTextCharsetInfo)(PHYSDEV,LPFONTSIGNATURE,DWORD);
BOOL (*pGetTextExtentExPoint)(PHYSDEV,LPCWSTR,INT,INT,LPINT,LPINT,LPSIZE); BOOL (*pGetTextExtentExPoint)(PHYSDEV,LPCWSTR,INT,INT,LPINT,LPINT,LPSIZE);
@ -193,9 +191,6 @@ struct gdi_dc_funcs
BOOL (*pSwapBuffers)(PHYSDEV); BOOL (*pSwapBuffers)(PHYSDEV);
BOOL (*pUnrealizePalette)(HPALETTE); BOOL (*pUnrealizePalette)(HPALETTE);
BOOL (*pWidenPath)(PHYSDEV); BOOL (*pWidenPath)(PHYSDEV);
HGLRC (*pwglCreateContext)(PHYSDEV);
HGLRC (*pwglCreateContextAttribsARB)(PHYSDEV,HGLRC,const int*);
PROC (*pwglGetProcAddress)(LPCSTR);
const struct wgl_funcs * (*wine_get_wgl_driver)(PHYSDEV,UINT); const struct wgl_funcs * (*wine_get_wgl_driver)(PHYSDEV,UINT);
/* priority order for the driver on the stack */ /* priority order for the driver on the stack */
@ -203,7 +198,7 @@ struct gdi_dc_funcs
}; };
/* increment this when you change the DC function table */ /* increment this when you change the DC function table */
#define WINE_GDI_DRIVER_VERSION 38 #define WINE_GDI_DRIVER_VERSION 39
#define GDI_PRIORITY_NULL_DRV 0 /* null driver */ #define GDI_PRIORITY_NULL_DRV 0 /* null driver */
#define GDI_PRIORITY_FONT_DRV 100 /* any font driver */ #define GDI_PRIORITY_FONT_DRV 100 /* any font driver */