From: Rémi Bernon rbernon@codeweavers.com
--- dlls/winemac.drv/macdrv.h | 1 - dlls/winemac.drv/surface.c | 6 ------ dlls/winemac.drv/window.c | 18 ------------------ 3 files changed, 25 deletions(-)
diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index 7fffa8e722f..1c4d23298fa 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -193,7 +193,6 @@ extern BOOL macdrv_SystemParametersInfo(UINT action, UINT int_param, void *ptr_p unsigned int minimized : 1; /* is window minimized? */ unsigned int swap_interval : 1; /* GL swap interval for window */ struct window_surface *surface; - struct window_surface *unminimized_surface; };
extern struct macdrv_win_data *get_win_data(HWND hwnd); diff --git a/dlls/winemac.drv/surface.c b/dlls/winemac.drv/surface.c index 9bca2a651e5..5e7f94f47ed 100644 --- a/dlls/winemac.drv/surface.c +++ b/dlls/winemac.drv/surface.c @@ -229,12 +229,6 @@ BOOL macdrv_CreateWindowSurface(HWND hwnd, BOOL layered, const RECT *surface_rec { data->layered = TRUE; data->ulw_layered = TRUE; - - if (data->unminimized_surface) - { - window_surface_release(data->unminimized_surface); - data->unminimized_surface = NULL; - } }
*surface = create_surface(hwnd, data->cocoa_window, surface_rect); diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 97f781738af..3737e2f916c 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -702,8 +702,6 @@ static void destroy_cocoa_window(struct macdrv_win_data *data) data->on_screen = FALSE; if (data->surface) window_surface_release(data->surface); data->surface = NULL; - if (data->unminimized_surface) window_surface_release(data->unminimized_surface); - data->unminimized_surface = NULL; }
@@ -1939,22 +1937,6 @@ void macdrv_WindowPosChanged(HWND hwnd, HWND insert_after, UINT swp_flags, const if (data->cocoa_window && !data->ulw_layered) { if (surface) window_surface_add_ref(surface); - if (new_style & WS_MINIMIZE) - { - if (!data->unminimized_surface && data->surface) - { - data->unminimized_surface = data->surface; - window_surface_add_ref(data->unminimized_surface); - } - } - else - { - if (data->unminimized_surface) - { - window_surface_release(data->unminimized_surface); - data->unminimized_surface = NULL; - } - } if (data->surface) window_surface_release(data->surface); data->surface = surface; }