Roderick Colenbrander : winex11.Drv: Remove unneeded wgl exports.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 272196f5140deacefb8eb072542ed88ba72f1612
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=272196f5140deacefb8eb072...

Author: Roderick Colenbrander <thunderbird2k(a)gmx.net>
Date:   Mon Sep 25 23:03:27 2006 +0200

winex11.Drv: Remove unneeded wgl exports.

---

 dlls/opengl32/wgl.c               |   22 ----------------------
 dlls/winex11.drv/opengl.c         |   18 ++----------------
 dlls/winex11.drv/winex11.drv.spec |    2 --
 3 files changed, 2 insertions(+), 40 deletions(-)

diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c
index 7e584a9..bb66430 100644
--- a/dlls/opengl32/wgl.c
+++ b/dlls/opengl32/wgl.c
@@ -51,10 +51,8 @@ typedef struct wine_wgl_s {
     BOOL WINAPI  (*p_wglDeleteContext)(HGLRC hglrc);
     HGLRC WINAPI (*p_wglGetCurrentContext)(void);
     HDC WINAPI   (*p_wglGetCurrentDC)(void);
-    HDC WINAPI   (*p_wglGetCurrentReadDCARB)(void);
     PROC WINAPI  (*p_wglGetProcAddress)(LPCSTR  lpszProc);
     BOOL WINAPI  (*p_wglMakeCurrent)(HDC hdc, HGLRC hglrc);
-    BOOL WINAPI  (*p_wglMakeContextCurrentARB)(HDC hDrawDC, HDC hReadDC, HGLRC hglrc); 
     BOOL WINAPI  (*p_wglShareLists)(HGLRC hglrc1, HGLRC hglrc2);
     BOOL WINAPI  (*p_wglUseFontBitmapsA)(HDC hdc, DWORD first, DWORD count, DWORD listBase);
     BOOL WINAPI  (*p_wglUseFontBitmapsW)(HDC hdc, DWORD first, DWORD count, DWORD listBase);
@@ -298,24 +296,6 @@ BOOL WINAPI wglMakeCurrent(HDC hdc, HGLR
 }
 
 /***********************************************************************
- *		wglMakeContextCurrentARB (OPENGL32.@)
- */
-BOOL WINAPI wglMakeContextCurrentARB(HDC hDrawDC, HDC hReadDC, HGLRC hglrc) 
-{
-    TRACE("hDrawDC: (%p), hReadDC: (%p), hglrc: (%p)\n", hDrawDC, hReadDC, hglrc);
-    return wine_wgl.p_wglMakeContextCurrentARB(hDrawDC, hReadDC, hglrc);
-}
-
-/***********************************************************************
- *		wglGetCurrentReadDCARB (OPENGL32.@)
- */
-HDC WINAPI wglGetCurrentReadDCARB(void) 
-{
-    TRACE("\n");
-    return wine_wgl.p_wglGetCurrentReadDCARB();
-}
-
-/***********************************************************************
  *		wglRealizeLayerPalette (OPENGL32.@)
  */
 BOOL WINAPI wglRealizeLayerPalette(HDC hdc,
@@ -718,10 +698,8 @@ static BOOL process_attach(void)
   wine_wgl.p_wglDeleteContext = (void *)GetProcAddress(mod, "wglDeleteContext");
   wine_wgl.p_wglGetCurrentContext = (void *)GetProcAddress(mod, "wglGetCurrentContext");
   wine_wgl.p_wglGetCurrentDC = (void *)GetProcAddress(mod, "wglGetCurrentDC");
-  wine_wgl.p_wglGetCurrentReadDCARB = (void *)GetProcAddress(mod, "wglGetCurrentReadDCARB");
   wine_wgl.p_wglGetProcAddress = (void *)GetProcAddress(mod, "wglGetProcAddress");
   wine_wgl.p_wglMakeCurrent = (void *)GetProcAddress(mod, "wglMakeCurrent");
-  wine_wgl.p_wglMakeContextCurrentARB = (void *)GetProcAddress(mod, "wglMakeContextCurrentARB");
   wine_wgl.p_wglShareLists = (void *)GetProcAddress(mod, "wglShareLists");
   wine_wgl.p_wglUseFontBitmapsA = (void*)GetProcAddress(mod, "wglUseFontBitmapsA");
   wine_wgl.p_wglUseFontBitmapsW = (void*)GetProcAddress(mod, "wglUseFontBitmapsW");
diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c
index 1d5b50d..b90f760 100644
--- a/dlls/winex11.drv/opengl.c
+++ b/dlls/winex11.drv/opengl.c
@@ -1320,7 +1320,7 @@ HDC WINAPI X11DRV_wglGetCurrentDC(void) 
 }
 
 /* OpenGL32 wglGetCurrentReadDCARB */
-HDC WINAPI X11DRV_wglGetCurrentReadDCARB(void) 
+static HDC WINAPI X11DRV_wglGetCurrentReadDCARB(void) 
 {
     GLXDrawable gl_d;
     HDC ret;
@@ -1417,7 +1417,7 @@ BOOL WINAPI X11DRV_wglMakeCurrent(HDC hd
 }
 
 /* OpenGL32 wglMakeContextCurrentARB */
-BOOL WINAPI X11DRV_wglMakeContextCurrentARB(HDC hDrawDC, HDC hReadDC, HGLRC hglrc) 
+static BOOL WINAPI X11DRV_wglMakeContextCurrentARB(HDC hDrawDC, HDC hReadDC, HGLRC hglrc) 
 {
     BOOL ret;
     TRACE("(%p,%p,%p)\n", hDrawDC, hReadDC, hglrc);
@@ -2816,13 +2816,6 @@ HDC WINAPI X11DRV_wglGetCurrentDC(void) 
     return 0;
 }
 
-/* OpenGL32 wglGetCurrentReadDCARB */
-HDC WINAPI X11DRV_wglGetCurrentReadDCARB(void)
-{
-    ERR_(opengl)("No OpenGL support compiled in.\n");
-    return 0;
-}
-
 /* OpenGL32: wglGetProcAddress */
 PROC X11DRV_wglGetProcAddress(LPCSTR lpszProc) {
     ERR_(opengl)("No OpenGL support compiled in.\n");
@@ -2835,13 +2828,6 @@ BOOL WINAPI X11DRV_wglMakeCurrent(HDC hd
     return FALSE;
 }
 
-/* OpenGL32 wglMakeContextCurrentARB */
-BOOL WINAPI X11DRV_wglMakeContextCurrentARB(HDC hDrawDC, HDC hReadDC, HGLRC hglrc) 
-{
-    ERR_(opengl)("No OpenGL support compiled in.\n");
-    return FALSE;
-}
-
 /* OpenGL32 wglShaderLists */
 BOOL WINAPI X11DRV_wglShareLists(HGLRC hglrc1, HGLRC hglrc2) {
     ERR_(opengl)("No OpenGL support compiled in.\n");
diff --git a/dlls/winex11.drv/winex11.drv.spec b/dlls/winex11.drv/winex11.drv.spec
index d01316b..4e4dcbf 100644
--- a/dlls/winex11.drv/winex11.drv.spec
+++ b/dlls/winex11.drv/winex11.drv.spec
@@ -133,10 +133,8 @@ # OpenGL
 @ cdecl wglDeleteContext(long) X11DRV_wglDeleteContext
 @ cdecl wglGetCurrentContext() X11DRV_wglGetCurrentContext
 @ cdecl wglGetCurrentDC() X11DRV_wglGetCurrentDC
-@ cdecl wglGetCurrentReadDCARB() X11DRV_wglGetCurrentReadDCARB
 @ cdecl wglGetIntegerv(long ptr) X11DRV_wglGetIntegerv
 @ cdecl wglGetProcAddress(ptr) X11DRV_wglGetProcAddress
-@ cdecl wglMakeContextCurrentARB(long long long) X11DRV_wglMakeContextCurrentARB
 @ cdecl wglMakeCurrent(long long) X11DRV_wglMakeCurrent
 @ cdecl wglShareLists(long long) X11DRV_wglShareLists
 @ cdecl wglUseFontBitmapsA(long long long long) X11DRV_wglUseFontBitmapsA