Move standard WGL function declarations to wingdi.h.

dlls/opengl32/wgl.h is now empty and no longer needed.

dlls/opengl32/wgl.c

@@ -30,8 +30,8 @@
 #include "winuser.h"
 #include "winerror.h"
 #include "winreg.h"
+#include "wingdi.h"
 
-#include "wgl.h"
 #include "wgl_ext.h"
 #include "opengl_ext.h"
 #include "wine/library.h"
@@ -360,7 +360,7 @@ static int wgl_compar(const void *elt_a, const void *elt_b) {
 		((const WGL_extension *) elt_b)->func_name);
 }
 
-void* WINAPI wglGetProcAddress(LPCSTR  lpszProc) {
+PROC WINAPI wglGetProcAddress(LPCSTR  lpszProc) {
   void *local_func;
   OpenGL_extension  ext;
   OpenGL_extension *ext_ret;

dlls/opengl32/wgl.h

@@ -1,77 +0,0 @@
-/* Window-specific OpenGL functions implementation.
- *
- * Copyright (c) 2000 Lionel Ulmer
- * Copyright (c) 2005 Raphael Junqueira
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef __DLLS_OPENGL32_WGL_H
-#define __DLLS_OPENGL32_WGL_H
-
-#include "wingdi.h"
-
-HGLRC WINAPI wglCreateContext(HDC hdc) ;
-HGLRC WINAPI wglCreateLayerContext(HDC hdc,
-				   int iLayerPlane) ;
-BOOL WINAPI wglCopyContext(HGLRC hglrcSrc,
-			   HGLRC hglrcDst,
-			   UINT mask) ;
-BOOL WINAPI wglDeleteContext(HGLRC hglrc) ;
-BOOL WINAPI wglDescribeLayerPlane(HDC hdc,
-				  int iPixelFormat,
-				  int iLayerPlane,
-				  UINT nBytes,
-				  LPLAYERPLANEDESCRIPTOR plpd) ;
-HGLRC WINAPI wglGetCurrentContext(void) ;
-HDC WINAPI wglGetCurrentDC(void) ;
-int WINAPI wglGetLayerPaletteEntries(HDC hdc,
-				     int iLayerPlane,
-				     int iStart,
-				     int cEntries,
-				     const COLORREF *pcr) ;
-void * WINAPI wglGetProcAddress(LPCSTR  lpszProc) ;
-BOOL WINAPI wglMakeCurrent(HDC hdc,
-			   HGLRC hglrc) ;
-BOOL WINAPI wglRealizeLayerPalette(HDC hdc,
-				   int iLayerPlane,
-				   BOOL bRealize) ;
-int WINAPI wglSetLayerPaletteEntries(HDC hdc,
-				     int iLayerPlane,
-				     int iStart,
-				     int cEntries,
-				     const COLORREF *pcr) ;
-BOOL WINAPI wglShareLists(HGLRC hglrc1,
-			  HGLRC hglrc2) ;
-BOOL WINAPI wglSwapLayerBuffers(HDC hdc,
-				UINT fuPlanes);
-BOOL WINAPI wglUseFontBitmaps(HDC hdc,
-			      DWORD first,
-			      DWORD count,
-			      DWORD listBase) ;
-BOOL WINAPI wglUseFontOutlines(HDC hdc,
-			       DWORD first,
-			       DWORD count,
-			       DWORD listBase,
-			       FLOAT deviation,
-			       FLOAT extrusion,
-			       int format,
-			       LPGLYPHMETRICSFLOAT lpgmf) ;
-const char * WINAPI wglGetExtensionsStringARB(HDC hdc) ;
-
-BOOL WINAPI wglMakeContextCurrentARB(HDC hDrawDC, HDC hReadDC, HGLRC hglrc);
-HDC WINAPI wglGetCurrentReadDCARB(void) ;
-
-#endif /* __DLLS_OPENGL32_WGL_H */

dlls/opengl32/wgl_ext.c

@@ -32,7 +32,6 @@
 #include "winerror.h"
 
 #include "gdi.h"
-#include "wgl.h"
 #include "wgl_ext.h"
 #include "opengl_ext.h"
 #include "wine/library.h"
@@ -1120,6 +1119,12 @@ void wgl_ext_finalize_extensions(void)
     }
 }
 
+
+/* these are located in wgl.c for convenience of implementation */
+BOOL    WINAPI wglMakeContextCurrentARB(HDC,HDC,HGLRC);
+HDC     WINAPI wglGetCurrentReadDCARB(void);
+
+
 /*
  * Putting this at the end to prevent having to write the prototypes :-) 
  *

include/wingdi.h

@@ -3678,6 +3678,24 @@ BOOL      WINAPI PolyTextOutW(HDC,PPOLYTEXTW,INT);
 #define WGL_SWAP_UNDERLAY14 (1 << 29)
 #define WGL_SWAP_UNDERLAY15 (1 << 30)
 
+/* WGL prototypes */
+HGLRC   WINAPI wglCreateContext(HDC);
+HGLRC   WINAPI wglCreateLayerContext(HDC,INT);
+BOOL    WINAPI wglCopyContext(HGLRC,HGLRC,UINT);
+BOOL    WINAPI wglDeleteContext(HGLRC);
+BOOL    WINAPI wglDescribeLayerPlane(HDC,INT,INT,UINT,LPLAYERPLANEDESCRIPTOR);
+HGLRC   WINAPI wglGetCurrentContext(void);
+HDC     WINAPI wglGetCurrentDC(void);
+INT     WINAPI wglGetLayerPaletteEntries(HDC,INT,INT,INT,const COLORREF *);
+PROC    WINAPI wglGetProcAddress(LPCSTR);
+BOOL    WINAPI wglMakeCurrent(HDC,HGLRC);
+BOOL    WINAPI wglRealizeLayerPalette(HDC,INT,BOOL);
+INT     WINAPI wglSetLayerPaletteEntries(HDC,INT,INT,INT,const COLORREF *);
+BOOL    WINAPI wglShareLists(HGLRC,HGLRC);
+BOOL    WINAPI wglSwapLayerBuffers(HDC,UINT);
+BOOL    WINAPI wglUseFontBitmaps(HDC,DWORD,DWORD,DWORD);
+BOOL    WINAPI wglUseFontOutlines(HDC,DWORD,DWORD,DWORD,FLOAT,FLOAT,INT,LPGLYPHMETRICSFLOAT);
+
 #ifdef __cplusplus
 }
 #endif