From 4f23821f080ead6232377141fb10338d4f2a04cc Mon Sep 17 00:00:00 2001
From: Ken Thomases <ken@codeweavers.com>
Date: Mon, 8 Jul 2013 17:36:49 -0500
Subject: [PATCH] winemac: Add registry setting to control setting display
 gamma ramp.

---
 dlls/winemac.drv/display.c     | 6 ++++++
 dlls/winemac.drv/macdrv.h      | 1 +
 dlls/winemac.drv/macdrv_main.c | 4 ++++
 3 files changed, 11 insertions(+)

diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c
index 9ed02f86448..e44415d98f4 100644
--- a/dlls/winemac.drv/display.c
+++ b/dlls/winemac.drv/display.c
@@ -797,6 +797,12 @@ BOOL macdrv_SetDeviceGammaRamp(PHYSDEV dev, LPVOID ramp)
 
     TRACE("dev %p ramp %p\n", dev, ramp);
 
+    if (!allow_set_gamma)
+    {
+        TRACE("disallowed by registry setting\n");
+        return FALSE;
+    }
+
     if (macdrv_get_displays(&displays, &num_displays))
     {
         WARN("failed to get Mac displays\n");
diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h
index 3c7bea5403b..4c74ddc8531 100644
--- a/dlls/winemac.drv/macdrv.h
+++ b/dlls/winemac.drv/macdrv.h
@@ -37,6 +37,7 @@
 
 extern BOOL skip_single_buffer_flushes DECLSPEC_HIDDEN;
 extern BOOL allow_vsync DECLSPEC_HIDDEN;
+extern BOOL allow_set_gamma DECLSPEC_HIDDEN;
 
 
 extern const char* debugstr_cf(CFTypeRef t) DECLSPEC_HIDDEN;
diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c
index 6bae707656a..dd032f3dfb0 100644
--- a/dlls/winemac.drv/macdrv_main.c
+++ b/dlls/winemac.drv/macdrv_main.c
@@ -49,6 +49,7 @@ int topmost_float_inactive = TOPMOST_FLOAT_INACTIVE_NONFULLSCREEN;
 int capture_displays_for_fullscreen = 0;
 BOOL skip_single_buffer_flushes = FALSE;
 BOOL allow_vsync = TRUE;
+BOOL allow_set_gamma = TRUE;
 
 
 /**************************************************************************
@@ -164,6 +165,9 @@ static void setup_options(void)
     if (!get_config_key(hkey, appkey, "AllowVerticalSync", buffer, sizeof(buffer)))
         allow_vsync = IS_OPTION_TRUE(buffer[0]);
 
+    if (!get_config_key(hkey, appkey, "AllowSetGamma", buffer, sizeof(buffer)))
+        allow_set_gamma = IS_OPTION_TRUE(buffer[0]);
+
     if (appkey) RegCloseKey(appkey);
     if (hkey) RegCloseKey(hkey);
 }
-- 
2.11.4.GIT