From 8481625fa4db17dc29f69dc8f4ec2e82550b13d3 Mon Sep 17 00:00:00 2001
From: Henri Verbeet <hverbeet@codeweavers.com>
Date: Sun, 1 Apr 2012 13:12:01 +0200
Subject: [PATCH] ddraw: Explicitly check for the IDirectDrawColorControl
 interface in ddraw_surface7_QueryInterface().

---
 dlls/ddraw/surface.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c
index 202eb4d5c0d..01094494514 100644
--- a/dlls/ddraw/surface.c
+++ b/dlls/ddraw/surface.c
@@ -191,6 +191,13 @@ static HRESULT WINAPI ddraw_surface7_QueryInterface(IDirectDrawSurface7 *iface,
         return S_OK;
     }
 
+    if (IsEqualGUID(riid, &IID_IDirectDrawColorControl))
+    {
+        WARN("Color control not implemented.\n");
+        *obj = NULL;
+        return E_NOINTERFACE;
+    }
+
     if (IsEqualGUID(riid, &IID_D3DDEVICE_WineD3D)
             || IsEqualGUID(riid, &IID_IDirect3DHALDevice)
             || IsEqualGUID(riid, &IID_IDirect3DRGBDevice))
-- 
2.11.4.GIT