Rémi Bernon : winemac: Remove now unnecessary cocoa window surface pointer.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 22c517319aca0ac4e5d5897d0a1411c3445d37f3
URL:    https://gitlab.winehq.org/wine/wine/-/commit/22c517319aca0ac4e5d5897d0a1411c...

Author: Rémi Bernon 
Date:   Fri Jun 21 10:15:12 2024 +0200

winemac: Remove now unnecessary cocoa window surface pointer.

---

dlls/winemac.drv/cocoa_window.h |  3 ---
 dlls/winemac.drv/cocoa_window.m | 19 +------------------
 dlls/winemac.drv/macdrv_cocoa.h |  1 -
 dlls/winemac.drv/surface.c      |  1 -
 dlls/winemac.drv/window.c       |  1 -
 5 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/dlls/winemac.drv/cocoa_window.h b/dlls/winemac.drv/cocoa_window.h
index 9539e4ebdd7..b5168d0c128 100644
--- a/dlls/winemac.drv/cocoa_window.h
+++ b/dlls/winemac.drv/cocoa_window.h
@@ -44,9 +44,6 @@
     void* hwnd;
     WineEventQueue* queue;

-    void* surface;
-    pthread_mutex_t* surface_mutex;
-
     CGDirectDisplayID _lastDisplayID;
     NSTimeInterval _lastDisplayTime;

diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m
index 8889e83bc8c..caf06ff338f 100644
--- a/dlls/winemac.drv/cocoa_window.m
+++ b/dlls/winemac.drv/cocoa_window.m
@@ -410,8 +410,6 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi
 @property (nonatomic) void* hwnd;
 @property (retain, readwrite, nonatomic) WineEventQueue* queue;

-@property (nonatomic) void* surface;
-
 @property (nonatomic) BOOL shapeChangedSinceLastDraw;
 @property (readonly, nonatomic) BOOL needsTransparency;

@@ -527,7 +525,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi
         if ([window contentView] != self)
             return;

-        if (window.closing || !window.surface)
+        if (window.closing)
             return;

imageRect = layer.bounds;
@@ -1021,7 +1019,6 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi

@synthesize disabled, noForeground, preventsAppActivation, floating, fullscreen, fakingClose, closing, latentParentWindow, hwnd, queue;
     @synthesize drawnSinceShown;
-    @synthesize surface;
     @synthesize shapeChangedSinceLastDraw;
     @synthesize colorKeyed, colorKeyRed, colorKeyGreen, colorKeyBlue;
     @synthesize usePerPixelAlpha;
@@ -3500,20 +3497,6 @@ void macdrv_set_cocoa_parent_window(macdrv_window w, macdrv_window parent)
     });
 }

-/***********************************************************************
- *              macdrv_set_window_surface
- */
-void macdrv_set_window_surface(macdrv_window w, struct window_surface *window_surface)
-{
-@autoreleasepool
-{
-    WineWindow* window = (WineWindow*)w;
-
-    OnMainThread(^{
-        window.surface = window_surface;
-    });
-}
-}

/***********************************************************************
  *              macdrv_window_set_color_image
diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h
index 31159ab060d..30ab06c3662 100644
--- a/dlls/winemac.drv/macdrv_cocoa.h
+++ b/dlls/winemac.drv/macdrv_cocoa.h
@@ -552,7 +552,6 @@ extern void macdrv_hide_cocoa_window(macdrv_window w);
 extern void macdrv_set_cocoa_window_frame(macdrv_window w, const CGRect* new_frame);
 extern void macdrv_get_cocoa_window_frame(macdrv_window w, CGRect* out_frame);
 extern void macdrv_set_cocoa_parent_window(macdrv_window w, macdrv_window parent);
-extern void macdrv_set_window_surface(macdrv_window w, struct window_surface *window_surface);
 extern void macdrv_window_set_color_image(macdrv_window w, CGImageRef image, CGRect rect, CGRect dirty);
 extern void macdrv_set_window_shape(macdrv_window w, const CGRect *rects, int count);
 extern void macdrv_set_window_alpha(macdrv_window w, CGFloat alpha);
diff --git a/dlls/winemac.drv/surface.c b/dlls/winemac.drv/surface.c
index f3d48ab194f..4dc15770853 100644
--- a/dlls/winemac.drv/surface.c
+++ b/dlls/winemac.drv/surface.c
@@ -317,7 +317,6 @@ BOOL macdrv_CreateLayeredWindow(HWND hwnd, const RECT *window_rect, COLORREF col
     if (!surface || !EqualRect(&surface->rect, &rect))
     {
         data->surface = create_surface(data->hwnd, data->cocoa_window, &rect, NULL, TRUE);
-        macdrv_set_window_surface(data->cocoa_window, data->surface);
         if (surface) window_surface_release(surface);
         surface = data->surface;
         if (data->unminimized_surface)
diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c
index 35198f45607..36f3e3053d6 100644
--- a/dlls/winemac.drv/window.c
+++ b/dlls/winemac.drv/window.c
@@ -2011,7 +2011,6 @@ void macdrv_WindowPosChanged(HWND hwnd, HWND insert_after, UINT swp_flags,
         }
         else
         {
-            macdrv_set_window_surface(data->cocoa_window, surface);
             if (data->unminimized_surface)
             {
                 window_surface_release(data->unminimized_surface);