[PATCH 1/5] ddraw: Avoid LPDDCOLORCONTROL.

[Henri Verbeet]

---
 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 0b8128f..28d53ae 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 5422ed7..e7f4099 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;
-- 
1.7.8.6