system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-31 12:19:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

winex11: Avoid depending on ddraw.h.

Browse source
This commit is contained in:
Henri Verbeet 2012-10-25 21:21:41 +02:00 committed by Alexandre Julliard
parent fd06135d51
commit f08854ac3d
3 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
dlls/winex11.drv/init.c
View file

@ -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);

7
dlls/winex11.drv/x11drv.h
View file

@ -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;

5
dlls/winex11.drv/xvidmode.c
View file

@ -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;