[PATCH 1/3] winemac: Remove pre-macOS 10.12 workarounds.

[Brendan Shanks]

From: Brendan Shanks

---
 dlls/winemac.drv/cocoa_app.m            |  4 +---
 dlls/winemac.drv/cocoa_cursorclipping.m | 11 +++--------
 dlls/winemac.drv/cocoa_window.m         | 25 ++-----------------------
 dlls/winemac.drv/opengl.c               |  4 ----
 4 files changed, 6 insertions(+), 38 deletions(-)

diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m
index 82334d477cd..85ce592c363 100644
--- a/dlls/winemac.drv/cocoa_app.m
+++ b/dlls/winemac.drv/cocoa_app.m
@@ -256,13 +256,11 @@ - (void) transformProcessToForeground:(BOOL)activateIfTransformed
             if (activateIfTransformed)
                 [self tryToActivateIgnoringOtherApps:YES];

-#if defined(MAC_OS_X_VERSION_10_9) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_9
-            if (!enable_app_nap && [NSProcessInfo instancesRespondToSelector:@selector(beginActivityWithOptions:reason:)])
+            if (!enable_app_nap)
             {
                 [[[NSProcessInfo processInfo] beginActivityWithOptions:NSActivityUserInitiatedAllowingIdleSystemSleep
                                                                 reason:@"Running Windows program"] retain]; // intentional leak
             }
-#endif

mainMenu = [[[NSMenu alloc] init] autorelease];

diff --git a/dlls/winemac.drv/cocoa_cursorclipping.m b/dlls/winemac.drv/cocoa_cursorclipping.m
index cfb7ff529e7..b7dc0b322b1 100644
--- a/dlls/winemac.drv/cocoa_cursorclipping.m
+++ b/dlls/winemac.drv/cocoa_cursorclipping.m
@@ -428,14 +428,9 @@ @implementation WineConfinementClipCursorHandler

+ (BOOL) isAvailable
     {
-        if ([NSProcessInfo instancesRespondToSelector:@selector(isOperatingSystemAtLeastVersion:)])
-        {
-            NSOperatingSystemVersion requiredVersion = { 10, 13, 0 };
-            return [[NSProcessInfo processInfo] isOperatingSystemAtLeastVersion:requiredVersion] &&
-                   [NSWindow instancesRespondToSelector:@selector(setMouseConfinementRect:)];
-        }
-
-        return FALSE;
+        NSOperatingSystemVersion requiredVersion = { 10, 13, 0 };
+        return [[NSProcessInfo processInfo] isOperatingSystemAtLeastVersion:requiredVersion] &&
+               [NSWindow instancesRespondToSelector:@selector(setMouseConfinementRect:)];
     }

/* Returns the region of the given rect that intersects with the given
diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m
index 7aa3dbf81c7..0d2862218ec 100644
--- a/dlls/winemac.drv/cocoa_window.m
+++ b/dlls/winemac.drv/cocoa_window.m
@@ -36,13 +36,6 @@

#pragma GCC diagnostic ignored "-Wdeclaration-after-statement"

-#if !defined(MAC_OS_X_VERSION_10_12) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_12
-/* Additional Mac virtual keycode, to complement those in Carbon's <HIToolbox/Events.h>. */
-enum {
-    kVK_RightCommand              = 0x36, /* Invented for Wine; was unused */
-};
-#endif
-

@interface NSWindow (PrivatePreventsActivation)

@@ -2279,10 +2272,8 @@ - (void) checkWineDisplayLink
         NSScreen* screen = self.screen;
         if (![self isVisible] || ![self isOnActiveSpace] || [self isMiniaturized] || [self isEmptyShaped])
             screen = nil;
-#if defined(MAC_OS_X_VERSION_10_9) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_9
-        if ([self respondsToSelector:@selector(occlusionState)] && !(self.occlusionState & NSWindowOcclusionStateVisible))
+        if (!(self.occlusionState & NSWindowOcclusionStateVisible))
             screen = nil;
-#endif

NSNumber* displayIDNumber = screen.deviceDescription[@"NSScreenNumber"];
         CGDirectDisplayID displayID = [displayIDNumber unsignedIntValue];
@@ -3808,10 +3799,6 @@ void macdrv_set_view_superview(macdrv_view v, macdrv_view s, macdrv_window w, ma
         WineWindow* oldWindow = (WineWindow*)[view window];
         WineWindow* newWindow = (WineWindow*)[superview window];

-#if !defined(MAC_OS_X_VERSION_10_10) || MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_10
-        if (floor(NSAppKitVersionNumber) <= 1265 /*NSAppKitVersionNumber10_9*/)
-            [view removeFromSuperview];
-#endif
         if (prev)
             [superview addSubview:view positioned:NSWindowBelow relativeTo:prev];
         else
@@ -3882,15 +3869,7 @@ macdrv_metal_device macdrv_create_metal_device(void)
 {
 @autoreleasepool
 {
-    macdrv_metal_device ret;
-
-#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_11
-    if (MTLCreateSystemDefaultDevice == NULL)
-        return NULL;
-#endif
-
-    ret = (macdrv_metal_device)MTLCreateSystemDefaultDevice();
-    return ret;
+    return (macdrv_metal_device)MTLCreateSystemDefaultDevice();
 }
 }

diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c
index ac87cfc1313..94f1915d62b 100644
--- a/dlls/winemac.drv/opengl.c
+++ b/dlls/winemac.drv/opengl.c
@@ -1457,14 +1457,10 @@ static BOOL create_context(struct wgl_context *context, CGLContextObj share, uns
     if (core)
     {
         attribs[n++] = kCGLPFAOpenGLProfile;
-#if defined(MAC_OS_X_VERSION_10_9) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_9
         if (major == 3)
             attribs[n++] = (int)kCGLOGLPVersion_GL3_Core;
         else
             attribs[n++] = (int)kCGLOGLPVersion_GL4_Core;
-#else
-        attribs[n++] = (int)kCGLOGLPVersion_3_2_Core;
-#endif
     }

attribs[n] = 0;