winemac: Move CVDisplayLink operations out of @synchronized blocks to avoid potential deadlock.

The -fire method called by the display link callback also synchronizes on self (while accessing the windows array). Display link operations use a lock to synchronize, too, and it's held while the callback is running. Signed-off-by: Ken Thomases <ken@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

winemac: Move CVDisplayLink operations out of @synchronized blocks to avoid potential deadlock.
24d37952 · Ken Thomases · Alexandre Julliard · e90aaaab · 24d37952
Commit 24d37952 authored May 08, 2017 by Ken Thomases Committed by Alexandre Julliard May 08, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 4 deletions

cocoa_window.m dlls/winemac.drv/cocoa_window.m +8 -4

No files found.
--- a/dlls/winemac.drv/cocoa_window.m
+++ b/dlls/winemac.drv/cocoa_window.m
@@ -218,22 +218,26 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi

    - (void) addWindow:(WineWindow*)window
    {
+        BOOL needsStart;
        @synchronized(self) {
-            BOOL needsStart = !_windows.count;
+            needsStart = !_windows.count;
            [_windows addObject:window];
-            if (needsStart)
-                CVDisplayLinkStart(_link);
        }
+        if (needsStart)
+            CVDisplayLinkStart(_link);
    }

    - (void) removeWindow:(WineWindow*)window
    {
+        BOOL shouldStop = FALSE;
        @synchronized(self) {
            BOOL wasRunning = _windows.count > 0;
            [_windows removeObject:window];
            if (wasRunning && !_windows.count)
-                CVDisplayLinkStop(_link);
+                shouldStop = TRUE;
        }
+        if (shouldStop)
+            CVDisplayLinkStop(_link);
    }

    - (void) fire