Jacek Caban : gdi32: Move __wine_get_wgl_driver to driver.c.

Alexandre Julliard julliard at winehq.org
Mon Sep 27 15:21:45 CDT 2021


Module: wine
Branch: master
Commit: 1e8fa197b5b8732967e6aac1691428358c944f50
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=1e8fa197b5b8732967e6aac1691428358c944f50

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Mon Sep 27 13:05:51 2021 +0200

gdi32: Move __wine_get_wgl_driver to driver.c.

Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Huw Davies <huw at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/gdi32/driver.c | 17 +++++++++++++++++
 dlls/gdi32/opengl.c | 18 ------------------
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c
index f9cf592b28e..aad5f08b78e 100644
--- a/dlls/gdi32/driver.c
+++ b/dlls/gdi32/driver.c
@@ -1157,3 +1157,20 @@ NTSTATUS WINAPI NtGdiDdDDICheckVidPnExclusiveOwnership( const D3DKMT_CHECKVIDPNE
 
     return get_display_driver()->pD3DKMTCheckVidPnExclusiveOwnership( desc );
 }
+
+/***********************************************************************
+ *      __wine_get_wgl_driver  (win32u.@)
+ */
+struct opengl_funcs * CDECL __wine_get_wgl_driver( HDC hdc, UINT version )
+{
+    struct opengl_funcs *ret = NULL;
+    DC * dc = get_dc_ptr( hdc );
+
+    if (dc)
+    {
+        PHYSDEV physdev = GET_DC_PHYSDEV( dc, wine_get_wgl_driver );
+        ret = physdev->funcs->wine_get_wgl_driver( physdev, version );
+        release_dc_ptr( dc );
+    }
+    return ret;
+}
diff --git a/dlls/gdi32/opengl.c b/dlls/gdi32/opengl.c
index c50d7bc2b43..0fbd851f67e 100644
--- a/dlls/gdi32/opengl.c
+++ b/dlls/gdi32/opengl.c
@@ -30,7 +30,6 @@
 #include "winerror.h"
 #include "winternl.h"
 #include "winnt.h"
-#include "ntgdi_private.h"
 
 
 static HMODULE opengl32;
@@ -40,23 +39,6 @@ static INT (WINAPI *wglGetPixelFormat)(HDC);
 static BOOL (WINAPI *wglSetPixelFormat)(HDC,INT,const PIXELFORMATDESCRIPTOR*);
 static BOOL (WINAPI *wglSwapBuffers)(HDC);
 
-/***********************************************************************
- *      __wine_get_wgl_driver  (GDI32.@)
- */
-struct opengl_funcs * CDECL __wine_get_wgl_driver( HDC hdc, UINT version )
-{
-    struct opengl_funcs *ret = NULL;
-    DC * dc = get_dc_ptr( hdc );
-
-    if (dc)
-    {
-        PHYSDEV physdev = GET_DC_PHYSDEV( dc, wine_get_wgl_driver );
-        ret = physdev->funcs->wine_get_wgl_driver( physdev, version );
-        release_dc_ptr( dc );
-    }
-    return ret;
-}
-
 /******************************************************************************
  *		ChoosePixelFormat (GDI32.@)
  */




More information about the wine-cvs mailing list