[PATCH 3/3] wineandroid: Use detach_client_surfaces to invalidate drawables.

[Rémi Bernon]

From: Rémi Bernon

---
 dlls/win32u/opengl.c           | 4 +---
 dlls/win32u/window.c           | 2 +-
 dlls/wineandroid.drv/android.h | 1 -
 dlls/wineandroid.drv/window.c  | 2 +-
 include/wine/gdi_driver.h      | 1 +
 include/wine/opengl_driver.h   | 2 --
 6 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/dlls/win32u/opengl.c b/dlls/win32u/opengl.c
index e0c584f0dbf..efd6ea63b1a 100644
--- a/dlls/win32u/opengl.c
+++ b/dlls/win32u/opengl.c
@@ -1101,13 +1101,11 @@ static int win32u_wglGetPixelFormat( HDC hdc )
     return format > 0 ? format : 0;
 }

-void set_window_opengl_drawable( HWND hwnd, struct opengl_drawable *new_drawable, BOOL current )
+static void set_window_opengl_drawable( HWND hwnd, struct opengl_drawable *new_drawable, BOOL current )
 {
     struct opengl_drawable *old_drawable = NULL;
     WND *win;

-    TRACE( "hwnd %p, new_drawable %s\n", hwnd, debugstr_opengl_drawable( new_drawable ) );
-
     if ((win = get_win_ptr( hwnd )) && win != WND_DESKTOP && win != WND_OTHER_PROCESS)
     {
         struct opengl_drawable **ptr = current ? &win->current_drawable : &win->unused_drawable;
diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c
index ad9526c6ebd..23ebf8a92f6 100644
--- a/dlls/win32u/window.c
+++ b/dlls/win32u/window.c
@@ -237,7 +237,7 @@ void *free_user_handle( HANDLE handle, unsigned short type )
 static pthread_mutex_t surfaces_lock = PTHREAD_MUTEX_INITIALIZER;
 static struct list client_surfaces = LIST_INIT( client_surfaces );

-static void detach_client_surfaces( HWND hwnd )
+void detach_client_surfaces( HWND hwnd )
 {
     struct list detached = LIST_INIT( detached );
     struct client_surface *surface, *next;
diff --git a/dlls/wineandroid.drv/android.h b/dlls/wineandroid.drv/android.h
index b96d744e425..07c0f9ea7b7 100644
--- a/dlls/wineandroid.drv/android.h
+++ b/dlls/wineandroid.drv/android.h
@@ -54,7 +54,6 @@ DECL_FUNCPTR( ANativeWindow_release );
  */

extern pthread_mutex_t drawable_mutex;
-extern void update_gl_drawable( HWND hwnd );
 extern UINT ANDROID_OpenGLInit( UINT version, const struct opengl_funcs *opengl_funcs, const struct opengl_driver_funcs **driver_funcs );

diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c
index 71bc04e9d73..9c0dc8d6115 100644
--- a/dlls/wineandroid.drv/window.c
+++ b/dlls/wineandroid.drv/window.c
@@ -1192,7 +1192,7 @@ LRESULT ANDROID_WindowMessage( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp )
                 release_win_data( data );
             }

-            update_gl_drawable( hwnd );
+            detach_client_surfaces( hwnd );
         }
         else
         {
diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h
index abf1b699cab..b3b392dc474 100644
--- a/include/wine/gdi_driver.h
+++ b/include/wine/gdi_driver.h
@@ -272,6 +272,7 @@ W32KAPI void *client_surface_create( UINT size, const struct client_surface_func
 W32KAPI void client_surface_add_ref( struct client_surface *surface );
 W32KAPI void client_surface_release( struct client_surface *surface );
 W32KAPI void client_surface_present( struct client_surface *surface );
+W32KAPI void detach_client_surfaces( HWND hwnd );

static inline const char *debugstr_client_surface( struct client_surface *surface )
 {
diff --git a/include/wine/opengl_driver.h b/include/wine/opengl_driver.h
index 38b14f57e3b..60fe402621c 100644
--- a/include/wine/opengl_driver.h
+++ b/include/wine/opengl_driver.h
@@ -183,8 +183,6 @@ W32KAPI void *opengl_drawable_create( UINT size, const struct opengl_drawable_fu
 W32KAPI void opengl_drawable_add_ref( struct opengl_drawable *drawable );
 W32KAPI void opengl_drawable_release( struct opengl_drawable *drawable );

-W32KAPI void set_window_opengl_drawable( HWND hwnd, struct opengl_drawable *drawable, BOOL current );
-
 /* interface between win32u and the user drivers */
 struct opengl_driver_funcs
 {