Alexandre Julliard : gdi32: Sort the OpenGL driver functions alphabetically .

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 715d8100730e5edd6ab11b7d00195360ef43d733
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=715d8100730e5edd6ab11b7d00195360ef43d733

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Wed Jul 13 14:22:59 2011 +0200

gdi32: Sort the OpenGL driver functions alphabetically.

---

 dlls/gdi32/dibdrv/dc.c    |    4 ++--
 dlls/gdi32/driver.c       |    4 ++--
 dlls/winex11.drv/init.c   |    4 ++--
 include/wine/gdi_driver.h |    6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c
index 2923aeb..a6823c9 100644
--- a/dlls/gdi32/dibdrv/dc.c
+++ b/dlls/gdi32/dibdrv/dc.c
@@ -551,10 +551,10 @@ const DC_FUNCTIONS dib_driver =
     NULL,                               /* pwglCreateContext */
     NULL,                               /* pwglCreateContextAttribsARB */
     NULL,                               /* pwglDeleteContext */
-    NULL,                               /* pwglGetProcAddress */
     NULL,                               /* pwglGetPbufferDCARB */
-    NULL,                               /* pwglMakeCurrent */
+    NULL,                               /* pwglGetProcAddress */
     NULL,                               /* pwglMakeContextCurrentARB */
+    NULL,                               /* pwglMakeCurrent */
     NULL,                               /* pwglSetPixelFormatWINE */
     NULL,                               /* pwglShareLists */
     NULL,                               /* pwglUseFontBitmapsA */
diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c
index 4c5d308..e870b17 100644
--- a/dlls/gdi32/driver.c
+++ b/dlls/gdi32/driver.c
@@ -788,10 +788,10 @@ const DC_FUNCTIONS null_driver =
     nulldrv_wglCreateContext,           /* pwglCreateContext */
     nulldrv_wglCreateContextAttribsARB, /* pwglCreateContextAttribsARB */
     nulldrv_wglDeleteContext,           /* pwglDeleteContext */
-    nulldrv_wglGetProcAddress,          /* pwglGetProcAddress */
     nulldrv_wglGetPbufferDCARB,         /* pwglGetPbufferDCARB */
-    nulldrv_wglMakeCurrent,             /* pwglMakeCurrent */
+    nulldrv_wglGetProcAddress,          /* pwglGetProcAddress */
     nulldrv_wglMakeContextCurrentARB,   /* pwglMakeContextCurrentARB */
+    nulldrv_wglMakeCurrent,             /* pwglMakeCurrent */
     nulldrv_wglSetPixelFormatWINE,      /* pwglSetPixelFormatWINE */
     nulldrv_wglShareLists,              /* pwglShareLists */
     nulldrv_wglUseFontBitmapsA,         /* pwglUseFontBitmapsA */
diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c
index 6f734b5..15680c4 100644
--- a/dlls/winex11.drv/init.c
+++ b/dlls/winex11.drv/init.c
@@ -568,10 +568,10 @@ static const struct gdi_dc_funcs x11drv_funcs =
     X11DRV_wglCreateContext,            /* pwglCreateContext */
     X11DRV_wglCreateContextAttribsARB,  /* pwglCreateContextAttribsARB */
     X11DRV_wglDeleteContext,            /* pwglDeleteContext */
-    X11DRV_wglGetProcAddress,           /* pwglGetProcAddress */
     X11DRV_wglGetPbufferDCARB,          /* pwglGetPbufferDCARB */
-    X11DRV_wglMakeCurrent,              /* pwglMakeCurrent */
+    X11DRV_wglGetProcAddress,           /* pwglGetProcAddress */
     X11DRV_wglMakeContextCurrentARB,    /* pwglMakeContextCurrentARB */
+    X11DRV_wglMakeCurrent,              /* pwglMakeCurrent */
     X11DRV_wglSetPixelFormatWINE,       /* pwglSetPixelFormatWINE */
     X11DRV_wglShareLists,               /* pwglShareLists */
     X11DRV_wglUseFontBitmapsA,          /* pwglUseFontBitmapsA */
diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h
index ffcf634..c28e4d3 100644
--- a/include/wine/gdi_driver.h
+++ b/include/wine/gdi_driver.h
@@ -171,10 +171,10 @@ struct gdi_dc_funcs
     HGLRC    (CDECL *pwglCreateContext)(PHYSDEV);
     HGLRC    (CDECL *pwglCreateContextAttribsARB)(PHYSDEV,HGLRC,const int*);
     BOOL     (CDECL *pwglDeleteContext)(HGLRC);
-    PROC     (CDECL *pwglGetProcAddress)(LPCSTR);
     HDC      (CDECL *pwglGetPbufferDCARB)(PHYSDEV,void*);
-    BOOL     (CDECL *pwglMakeCurrent)(PHYSDEV,HGLRC);
+    PROC     (CDECL *pwglGetProcAddress)(LPCSTR);
     BOOL     (CDECL *pwglMakeContextCurrentARB)(PHYSDEV,PHYSDEV,HGLRC);
+    BOOL     (CDECL *pwglMakeCurrent)(PHYSDEV,HGLRC);
     BOOL     (CDECL *pwglSetPixelFormatWINE)(PHYSDEV,INT,const PIXELFORMATDESCRIPTOR*);
     BOOL     (CDECL *pwglShareLists)(HGLRC,HGLRC);
     BOOL     (CDECL *pwglUseFontBitmapsA)(PHYSDEV,DWORD,DWORD,DWORD);
@@ -182,7 +182,7 @@ struct gdi_dc_funcs
 };
 
 /* increment this when you change the DC function table */
-#define WINE_GDI_DRIVER_VERSION 1
+#define WINE_GDI_DRIVER_VERSION 2
 
 static inline PHYSDEV get_physdev_entry_point( PHYSDEV dev, size_t offset )
 {