From 533dbc4353f201f415e41d9829a56a481e3b1045 Mon Sep 17 00:00:00 2001
From: Henri Verbeet <hverbeet@codeweavers.com>
Date: Sun, 9 Dec 2012 21:22:03 +0100
Subject: [PATCH] ddraw: Avoid LPDDCOLORCONTROL.

---
 include/ddraw.h  | 4 ++--
 include/ddrawi.h | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/ddraw.h b/include/ddraw.h
index 0b8128f8466..28d53aefac1 100644
--- a/include/ddraw.h
+++ b/include/ddraw.h
@@ -2660,8 +2660,8 @@ DECLARE_INTERFACE_(IDirectDrawColorControl,IUnknown)
     STDMETHOD_(ULONG,AddRef)(THIS) PURE;
     STDMETHOD_(ULONG,Release)(THIS) PURE;
     /*** IDirectDrawColorControl methods ***/
-    STDMETHOD(GetColorControls)(THIS_ LPDDCOLORCONTROL lpColorControl) PURE;
-    STDMETHOD(SetColorControls)(THIS_ LPDDCOLORCONTROL lpColorControl) PURE;
+    STDMETHOD(GetColorControls)(THIS_ DDCOLORCONTROL *color_control) PURE;
+    STDMETHOD(SetColorControls)(THIS_ DDCOLORCONTROL *color_control) PURE;
 };
 #undef INTERFACE
 
diff --git a/include/ddrawi.h b/include/ddrawi.h
index 5422ed7b062..e7f40991bdc 100644
--- a/include/ddrawi.h
+++ b/include/ddrawi.h
@@ -906,7 +906,7 @@ typedef struct _DDRAWI_DDRAWSURFACE_GBL_MORE {
     DWORD			cPageUnlocks;
     ULONG_PTR			hKernelSurface;
     DWORD			dwKernelRefCnt;
-    LPDDCOLORCONTROL		lpColorInfo;
+    DDCOLORCONTROL             *lpColorInfo;
     FLATPTR			fpNTAlias;
     DWORD			dwContentsStamp;
     LPVOID			lpvUnswappedDriverReserved;