From: Rémi Bernon rbernon@codeweavers.com
--- dlls/opengl32/make_opengl | 2 +- dlls/opengl32/unix_thunks.c | 25 ------------------------- dlls/opengl32/unixlib.h | 6 ------ dlls/wineandroid.drv/opengl.c | 1 - dlls/winemac.drv/opengl.c | 1 - dlls/winex11.drv/opengl.c | 1 - include/wine/wgl_driver.h | 3 +-- 7 files changed, 2 insertions(+), 37 deletions(-)
diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index bc1a2422185..0b7f4de8eac 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -150,6 +150,7 @@ my %manual_win_functions = "wglDescribeLayerPlane" => 1, "wglGetCurrentContext" => 1, "wglGetCurrentDC" => 1, + "wglGetCurrentReadDCARB" => 1, "wglGetDefaultProcAddress" => 1, "wglGetLayerPaletteEntries" => 1, "wglRealizeLayerPalette" => 1, @@ -175,7 +176,6 @@ my %manual_win_thunks = "glUnmapBufferARB" => 1, "glUnmapNamedBuffer" => 1, "glUnmapNamedBufferEXT" => 1, - "wglGetCurrentReadDCARB" => 1, "wglGetExtensionsStringARB" => 1, "wglGetExtensionsStringEXT" => 1, "wglGetPixelFormat" => 1, diff --git a/dlls/opengl32/unix_thunks.c b/dlls/opengl32/unix_thunks.c index 820b6e3415d..310248d8e46 100644 --- a/dlls/opengl32/unix_thunks.c +++ b/dlls/opengl32/unix_thunks.c @@ -24051,14 +24051,6 @@ static NTSTATUS ext_wglFreeMemoryNV( void *args ) return STATUS_SUCCESS; }
-static NTSTATUS ext_wglGetCurrentReadDCARB( void *args ) -{ - struct wglGetCurrentReadDCARB_params *params = args; - const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; - params->ret = funcs->ext.p_wglGetCurrentReadDCARB(); - return STATUS_SUCCESS; -} - NTSTATUS ext_wglGetExtensionsStringARB( void *args ) { struct wglGetExtensionsStringARB_params *params = args; @@ -27179,7 +27171,6 @@ const unixlib_entry_t __wine_unix_call_funcs[] = &ext_wglCreatePbufferARB, &ext_wglDestroyPbufferARB, &ext_wglFreeMemoryNV, - &ext_wglGetCurrentReadDCARB, &ext_wglGetExtensionsStringARB, &ext_wglGetExtensionsStringEXT, &ext_wglGetPbufferDCARB, @@ -60398,19 +60389,6 @@ static NTSTATUS wow64_ext_wglFreeMemoryNV( void *args ) return status; }
-static NTSTATUS wow64_ext_wglGetCurrentReadDCARB( void *args ) -{ - struct - { - PTR32 ret; - } *params32 = args; - struct wglGetCurrentReadDCARB_params params = - { - }; - FIXME( "params32 %p, params %p stub!\n", params32, ¶ms ); - return STATUS_NOT_IMPLEMENTED; -} - static NTSTATUS wow64_ext_wglGetPixelFormatAttribfvARB( void *args ) { struct @@ -63667,7 +63645,6 @@ const unixlib_entry_t __wine_unix_call_wow64_funcs[] = &wow64_ext_wglCreatePbufferARB, &wow64_ext_wglDestroyPbufferARB, &wow64_ext_wglFreeMemoryNV, - &wow64_ext_wglGetCurrentReadDCARB, &wow64_ext_wglGetExtensionsStringARB, &wow64_ext_wglGetExtensionsStringEXT, &wow64_ext_wglGetPbufferDCARB, @@ -66711,7 +66688,6 @@ static struct wgl_context * null_wglCreateContextAttribsARB( HDC hDC, struct wgl static struct wgl_pbuffer * null_wglCreatePbufferARB( HDC hDC, int iPixelFormat, int iWidth, int iHeight, const int *piAttribList ) { return 0; } static BOOL null_wglDestroyPbufferARB( struct wgl_pbuffer * hPbuffer ) { return 0; } static void null_wglFreeMemoryNV( void *pointer ) { } -static HDC null_wglGetCurrentReadDCARB(void) { return 0; } static const char * null_wglGetExtensionsStringARB( HDC hdc ) { return 0; } static const char * null_wglGetExtensionsStringEXT(void) { return 0; } static HDC null_wglGetPbufferDCARB( struct wgl_pbuffer * hPbuffer ) { return 0; } @@ -69759,7 +69735,6 @@ struct opengl_funcs null_opengl_funcs = null_wglCreatePbufferARB, null_wglDestroyPbufferARB, null_wglFreeMemoryNV, - null_wglGetCurrentReadDCARB, null_wglGetExtensionsStringARB, null_wglGetExtensionsStringEXT, null_wglGetPbufferDCARB, diff --git a/dlls/opengl32/unixlib.h b/dlls/opengl32/unixlib.h index e7f21383f86..bbafb6c61fa 100644 --- a/dlls/opengl32/unixlib.h +++ b/dlls/opengl32/unixlib.h @@ -22162,11 +22162,6 @@ struct wglFreeMemoryNV_params void *pointer; };
-struct wglGetCurrentReadDCARB_params -{ - HDC ret; -}; - struct wglGetExtensionsStringARB_params { HDC hdc; @@ -25317,7 +25312,6 @@ enum unix_funcs unix_wglCreatePbufferARB, unix_wglDestroyPbufferARB, unix_wglFreeMemoryNV, - unix_wglGetCurrentReadDCARB, unix_wglGetExtensionsStringARB, unix_wglGetExtensionsStringEXT, unix_wglGetPbufferDCARB, diff --git a/dlls/wineandroid.drv/opengl.c b/dlls/wineandroid.drv/opengl.c index 337486ba6be..8b32a2b2fc4 100644 --- a/dlls/wineandroid.drv/opengl.c +++ b/dlls/wineandroid.drv/opengl.c @@ -632,7 +632,6 @@ static void init_extensions(void) egl_funcs.ext.p_wglGetExtensionsStringARB = android_wglGetExtensionsStringARB;
register_extension("WGL_ARB_make_current_read"); - egl_funcs.ext.p_wglGetCurrentReadDCARB = (void *)1; /* never called */ egl_funcs.ext.p_wglMakeContextCurrentARB = android_wglMakeContextCurrentARB;
register_extension("WGL_EXT_extensions_string"); diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index 70b366def56..57292171972 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -4128,7 +4128,6 @@ static void load_extensions(void) opengl_funcs.ext.p_wglGetExtensionsStringARB = macdrv_wglGetExtensionsStringARB;
register_extension("WGL_ARB_make_current_read"); - opengl_funcs.ext.p_wglGetCurrentReadDCARB = (void *)1; /* never called */ opengl_funcs.ext.p_wglMakeContextCurrentARB = macdrv_wglMakeContextCurrentARB;
register_extension("WGL_ARB_pixel_format"); diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 06f84ca55fa..224789b3096 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -3208,7 +3208,6 @@ static void X11DRV_WineGL_LoadExtensions(void) if (glxRequireVersion(3)) { register_extension( "WGL_ARB_make_current_read" ); - opengl_funcs.ext.p_wglGetCurrentReadDCARB = (void *)1; /* never called */ opengl_funcs.ext.p_wglMakeContextCurrentARB = X11DRV_wglMakeContextCurrentARB; }
diff --git a/include/wine/wgl_driver.h b/include/wine/wgl_driver.h index 36b1f384ddf..fcf3dcb374e 100644 --- a/include/wine/wgl_driver.h +++ b/include/wine/wgl_driver.h @@ -7,7 +7,7 @@ #define WINE_GLAPI #endif
-#define WINE_WGL_DRIVER_VERSION 21 +#define WINE_WGL_DRIVER_VERSION 22
struct wgl_context; struct wgl_pbuffer; @@ -3046,7 +3046,6 @@ struct opengl_funcs struct wgl_pbuffer * (WINE_GLAPI *p_wglCreatePbufferARB)( HDC hDC, int iPixelFormat, int iWidth, int iHeight, const int *piAttribList ); BOOL (WINE_GLAPI *p_wglDestroyPbufferARB)( struct wgl_pbuffer * hPbuffer ); void (WINE_GLAPI *p_wglFreeMemoryNV)( void *pointer ); - HDC (WINE_GLAPI *p_wglGetCurrentReadDCARB)(void); const char * (WINE_GLAPI *p_wglGetExtensionsStringARB)( HDC hdc ); const char * (WINE_GLAPI *p_wglGetExtensionsStringEXT)(void); HDC (WINE_GLAPI *p_wglGetPbufferDCARB)( struct wgl_pbuffer * hPbuffer );