Gijs Vermeulen : winemac: Avoid some compiler warnings.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 8cd44ecf4c89ed5fbc5e280ae06a0be0e092dea0
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=8cd44ecf4c89ed5fbc5e280ae...

Author: Gijs Vermeulen 
Date:   Fri Dec  6 11:42:34 2019 +0100

winemac: Avoid some compiler warnings.

Signed-off-by: Gijs Vermeulen 
Signed-off-by: Alexandre Julliard

---

dlls/winemac.drv/cocoa_app.m | 9 ++++-----
 dlls/winemac.drv/display.c   | 7 +++----
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m
index b5658eab08..87a73b6da9 100644
--- a/dlls/winemac.drv/cocoa_app.m
+++ b/dlls/winemac.drv/cocoa_app.m
@@ -769,9 +769,9 @@ static NSString* WineLocalizedString(unsigned int stringID)
         if (CGDisplayModeGetHeight(mode1) != CGDisplayModeGetHeight(mode2)) return FALSE;

#if defined(MAC_OS_X_VERSION_10_8) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_8
-        if (CGDisplayModeGetPixelWidth != NULL &&
+        if (&CGDisplayModeGetPixelWidth != NULL &&
             CGDisplayModeGetPixelWidth(mode1) != CGDisplayModeGetPixelWidth(mode2)) return FALSE;
-        if (CGDisplayModeGetPixelHeight != NULL &&
+        if (&CGDisplayModeGetPixelHeight != NULL &&
             CGDisplayModeGetPixelHeight(mode1) != CGDisplayModeGetPixelHeight(mode2)) return FALSE;
 #endif

@@ -801,9 +801,8 @@ static NSString* WineLocalizedString(unsigned int stringID)
         NSDictionary* options = nil;

#if defined(MAC_OS_X_VERSION_10_8) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_8
-        if (&kCGDisplayShowDuplicateLowResolutionModes != NULL)
-            options = [NSDictionary dictionaryWithObject:[NSNumber numberWithBool:TRUE]
-                                                  forKey:(NSString*)kCGDisplayShowDuplicateLowResolutionModes];
+        options = [NSDictionary dictionaryWithObject:[NSNumber numberWithBool:TRUE]
+                                              forKey:(NSString*)kCGDisplayShowDuplicateLowResolutionModes];
 #endif

NSArray *modes = [(NSArray*)CGDisplayCopyAllDisplayModes(displayID, (CFDictionaryRef)options) autorelease];
diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c
index cc5e9beaff..bafdb42589 100644
--- a/dlls/winemac.drv/display.c
+++ b/dlls/winemac.drv/display.c
@@ -268,7 +268,7 @@ static BOOL write_display_settings(HKEY parent_hkey, CGDirectDisplayID displayID
         goto fail;

#if defined(MAC_OS_X_VERSION_10_8) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_8
-    if (CGDisplayModeGetPixelWidth != NULL && CGDisplayModeGetPixelHeight != NULL)
+    if (&CGDisplayModeGetPixelWidth != NULL && &CGDisplayModeGetPixelHeight != NULL)
     {
         val = CGDisplayModeGetPixelWidth(display_mode);
         if (RegSetValueExA(display_hkey, "PixelWidth", 0, REG_DWORD, (const BYTE*)&val, sizeof(val)))
@@ -456,7 +456,7 @@ static BOOL display_mode_matches_descriptor(CGDisplayModeRef mode, const struct
         return FALSE;

#if defined(MAC_OS_X_VERSION_10_8) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_8
-    if (CGDisplayModeGetPixelWidth != NULL && CGDisplayModeGetPixelHeight != NULL)
+    if (&CGDisplayModeGetPixelWidth != NULL && &CGDisplayModeGetPixelHeight != NULL)
     {
         if (CGDisplayModeGetPixelWidth(mode) != desc->pixel_width ||
             CGDisplayModeGetPixelHeight(mode) != desc->pixel_height)
@@ -616,8 +616,7 @@ static CFArrayRef copy_display_modes(CGDirectDisplayID display)
     CFArrayRef modes = NULL;

#if defined(MAC_OS_X_VERSION_10_8) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_8
-    if (&kCGDisplayShowDuplicateLowResolutionModes != NULL &&
-        CGDisplayModeGetPixelWidth != NULL && CGDisplayModeGetPixelHeight != NULL)
+    if (&CGDisplayModeGetPixelWidth != NULL && &CGDisplayModeGetPixelHeight != NULL)
     {
         CFDictionaryRef options;
         struct display_mode_descriptor* desc;