ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winex11: Get rid of xvidmode.h.

This commit is contained in:
Henri Verbeet 2012-07-08 16:06:38 +02:00 committed by Alexandre Julliard
parent 73eceafb17
commit eafc8d0b34
4 changed files with 14 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dlls/winex11.drv/x11drv.h
View File

@ -662,6 +662,9 @@ struct x11drv_mode_info *X11DRV_Settings_SetHandlers(const char *name,
unsigned int nmodes,
int reserve_depths) DECLSPEC_HIDDEN;
void X11DRV_XF86VM_Init(void) DECLSPEC_HIDDEN;
void X11DRV_XF86VM_Cleanup(void) DECLSPEC_HIDDEN;
/* XIM support */
extern BOOL X11DRV_InitXIM( const char *input_style ) DECLSPEC_HIDDEN;
extern XIC X11DRV_CreateIC(XIM xim, struct x11drv_win_data *data) DECLSPEC_HIDDEN;

5
dlls/winex11.drv/x11drv_main.c
View File

@ -47,7 +47,6 @@
#include "winreg.h"
#include "x11drv.h"
#include "xvidmode.h"
#include "xrandr.h"
#include "xcomposite.h"
#include "wine/server.h"
@ -575,10 +574,8 @@ static BOOL process_attach(void)
xinerama_init( WidthOfScreen(screen), HeightOfScreen(screen) );
X11DRV_Settings_Init();
#ifdef SONAME_LIBXXF86VM
/* initialize XVidMode */
X11DRV_XF86VM_Init();
#endif
#ifdef SONAME_LIBXRANDR
/* initialize XRandR */
X11DRV_XRandR_Init();
@ -625,10 +622,8 @@ static void thread_detach(void)
static void process_detach(void)
{
X11DRV_Clipboard_Cleanup();
#ifdef SONAME_LIBXXF86VM
/* cleanup XVidMode */
X11DRV_XF86VM_Cleanup();
#endif
X11DRV_XRender_Finalize();
/* cleanup GDI */

13
dlls/winex11.drv/xvidmode.c
View File

@ -34,8 +34,6 @@
#include <X11/extensions/xf86vmproto.h>
#endif
#include "xvidmode.h"
#include "windef.h"
#include "wingdi.h"
#include "ddrawi.h"
@ -408,6 +406,17 @@ static BOOL X11DRV_XF86VM_SetGammaRamp(LPDDGAMMARAMP ramp)
return ret;
}
#else /* SONAME_LIBXXF86VM */
void X11DRV_XF86VM_Init(void)
{
TRACE("XVidMode support not compiled in.\n");
}
void X11DRV_XF86VM_Cleanup(void)
{
}
#endif /* SONAME_LIBXXF86VM */
/***********************************************************************

37
dlls/winex11.drv/xvidmode.h
View File

@ -1,37 +0,0 @@
/*
* DirectDraw HAL XVidMode interface
*
* Copyright 2001 TransGaming Technologies, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifndef __WINE_XVIDMODE_H
#define __WINE_XVIDMODE_H
#ifndef __WINE_CONFIG_H
# error You must include config.h to use this header
#endif
#ifdef SONAME_LIBXXF86VM
#include <stdarg.h>
#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
void X11DRV_XF86VM_Init(void) DECLSPEC_HIDDEN;
void X11DRV_XF86VM_Cleanup(void) DECLSPEC_HIDDEN;
#endif /* SONAME_LIBXXF86VM */
#endif /* __WINE_XVIDMODE_H */