Henri Verbeet : winex11: Avoid depending on ddraw.h.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: f08854ac3d47dedcaaa3216248095df644d1b5ae
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=f08854ac3d47dedcaaa3216248...

Author: Henri Verbeet 
Date:   Thu Oct 25 21:21:41 2012 +0200

winex11: Avoid depending on ddraw.h.

---

dlls/winex11.drv/init.c     |    1 -
 dlls/winex11.drv/x11drv.h   |    7 +++++++
 dlls/winex11.drv/xvidmode.c |    5 ++---
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c
index f03dd4d..d729fd0 100644
--- a/dlls/winex11.drv/init.c
+++ b/dlls/winex11.drv/init.c
@@ -27,7 +27,6 @@
 #include "winbase.h"
 #include "winreg.h"
 #include "x11drv.h"
-#include "ddrawi.h"
 #include "wine/debug.h"

WINE_DEFAULT_DEBUG_CHANNEL(x11drv);
diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h
index f4ccdd2..99f045f 100644
--- a/dlls/winex11.drv/x11drv.h
+++ b/dlls/winex11.drv/x11drv.h
@@ -114,6 +114,13 @@ typedef struct
     int           exposures;   /* count of graphics exposures operations */
 } X11DRV_PDEVICE;

+struct x11drv_gamma_ramp
+{
+    WORD red[256];
+    WORD green[256];
+    WORD blue[256];
+};
+
 static inline X11DRV_PDEVICE *get_x11drv_dev( PHYSDEV dev )
 {
     return (X11DRV_PDEVICE *)dev;
diff --git a/dlls/winex11.drv/xvidmode.c b/dlls/winex11.drv/xvidmode.c
index 844560d..a4e20f3 100644
--- a/dlls/winex11.drv/xvidmode.c
+++ b/dlls/winex11.drv/xvidmode.c
@@ -36,7 +36,6 @@

#include "windef.h"
 #include "wingdi.h"
-#include "ddrawi.h"
 #include "wine/debug.h"
 #include "wine/library.h"

@@ -335,7 +334,7 @@ static BOOL ComputeGammaFromRamp(WORD ramp[256], float *gamma)
 /* Hmm... should gamma control be available in desktop mode or not?
  * I'll assume that it should */

-static BOOL X11DRV_XF86VM_GetGammaRamp(LPDDGAMMARAMP ramp)
+static BOOL X11DRV_XF86VM_GetGammaRamp(struct x11drv_gamma_ramp *ramp)
 {
 #ifdef X_XF86VidModeSetGamma
   XF86VidModeGamma gamma;
@@ -357,7 +356,7 @@ static BOOL X11DRV_XF86VM_GetGammaRamp(LPDDGAMMARAMP ramp)
   return FALSE;
 }

-static BOOL X11DRV_XF86VM_SetGammaRamp(LPDDGAMMARAMP ramp)
+static BOOL X11DRV_XF86VM_SetGammaRamp(struct x11drv_gamma_ramp *ramp)
 {
 #ifdef X_XF86VidModeSetGamma
   XF86VidModeGamma gamma;