From: Rémi Bernon rbernon@codeweavers.com
--- dlls/wineandroid.drv/android.h | 1 - dlls/wineandroid.drv/init.c | 1 - dlls/wineandroid.drv/window.c | 36 ---------------------------------- 3 files changed, 38 deletions(-)
diff --git a/dlls/wineandroid.drv/android.h b/dlls/wineandroid.drv/android.h index e5bae80f3fc..616bd5beffe 100644 --- a/dlls/wineandroid.drv/android.h +++ b/dlls/wineandroid.drv/android.h @@ -94,7 +94,6 @@ extern BOOL ANDROID_ProcessEvents( DWORD mask ); extern LRESULT ANDROID_DesktopWindowProc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ); extern void ANDROID_SetParent( HWND hwnd, HWND parent, HWND old_parent ); extern void ANDROID_SetCapture( HWND hwnd, UINT flags ); -extern void ANDROID_SetWindowStyle( HWND hwnd, INT offset, STYLESTRUCT *style ); extern UINT ANDROID_ShowWindow( HWND hwnd, INT cmd, RECT *rect, UINT swp ); extern LRESULT ANDROID_WindowMessage( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ); extern BOOL ANDROID_WindowPosChanging( HWND hwnd, UINT swp_flags, BOOL shaped, struct window_rects *rects ); diff --git a/dlls/wineandroid.drv/init.c b/dlls/wineandroid.drv/init.c index d84a56716d8..d747ce5d091 100644 --- a/dlls/wineandroid.drv/init.c +++ b/dlls/wineandroid.drv/init.c @@ -345,7 +345,6 @@ static const struct user_driver_funcs android_drv_funcs = .pProcessEvents = ANDROID_ProcessEvents, .pSetCapture = ANDROID_SetCapture, .pSetParent = ANDROID_SetParent, - .pSetWindowStyle = ANDROID_SetWindowStyle, .pShowWindow = ANDROID_ShowWindow, .pWindowMessage = ANDROID_WindowMessage, .pWindowPosChanging = ANDROID_WindowPosChanging, diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index f0b94938f68..bb7a8985f3c 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -56,7 +56,6 @@ struct android_win_data RECT whole_rect; /* X window rectangle for the whole window relative to parent */ RECT client_rect; /* client area relative to parent */ ANativeWindow *window; /* native window wrapper that forwards calls to the desktop process */ - struct window_surface *surface; };
#define SWP_AGG_NOPOSCHANGE (SWP_NOSIZE | SWP_NOMOVE | SWP_NOCLIENTSIZE | SWP_NOCLIENTMOVE | SWP_NOZORDER) @@ -690,10 +689,6 @@ static const struct window_surface_funcs android_surface_funcs = android_surface_destroy };
-static BOOL is_argb_surface( struct window_surface *surface ) -{ - return surface && surface->funcs == &android_surface_funcs && !!surface->alpha_mask; -}
/*********************************************************************** * create_surface @@ -1007,8 +1002,6 @@ void ANDROID_DestroyWindow( HWND hwnd )
if (!(data = get_win_data( hwnd ))) return;
- if (data->surface) window_surface_release( data->surface ); - data->surface = NULL; destroy_gl_drawable( hwnd ); free_win_data( data ); } @@ -1089,12 +1082,6 @@ void ANDROID_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags, con data->whole_rect = new_rects->visible; data->client_rect = new_rects->client;
- if (!is_argb_surface( data->surface )) - { - if (surface) window_surface_add_ref( surface ); - if (data->surface) window_surface_release( data->surface ); - data->surface = surface; - } if (!data->parent) owner = NtUserGetWindowRelative( hwnd, GW_OWNER ); release_win_data( data );
@@ -1209,29 +1196,6 @@ void ANDROID_SetCursor( HWND hwnd, HCURSOR handle ) }
-/*********************************************************************** - * ANDROID_SetWindowStyle - */ -void ANDROID_SetWindowStyle( HWND hwnd, INT offset, STYLESTRUCT *style ) -{ - struct android_win_data *data; - DWORD changed = style->styleNew ^ style->styleOld; - - if (hwnd == NtUserGetDesktopWindow()) return; - if (!(data = get_win_data( hwnd ))) return; - - if (offset == GWL_EXSTYLE && (changed & WS_EX_LAYERED)) /* changing WS_EX_LAYERED resets attributes */ - { - if (is_argb_surface( data->surface )) - { - if (data->surface) window_surface_release( data->surface ); - data->surface = NULL; - } - } - release_win_data( data ); -} - - /********************************************************************** * ANDROID_WindowMessage */