mirror of
git://source.winehq.org/git/wine.git
synced 2024-09-14 17:16:18 +00:00
winex11.drv: Make some functions and variables static, and get rid of x11ddraw.h.
This commit is contained in:
Alexandre Julliard
parent
91ec65d7f1
commit
241abf4e1b
|
|
@ -26,7 +26,6 @@
|
|||
#include "win.h"
|
||||
#include "ddrawi.h"
|
||||
#include "x11drv.h"
|
||||
#include "x11ddraw.h"
|
||||
#include "wine/debug.h"
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(x11drv);
|
||||
|
|
|
|||
|
|
@ -22,7 +22,6 @@
|
|||
#include <string.h>
|
||||
#include <stdio.h>
|
||||
#include "x11drv.h"
|
||||
#include "x11ddraw.h"
|
||||
|
||||
#include "windef.h"
|
||||
#include "wingdi.h"
|
||||
|
|
|
|||
|
|
@ -26,7 +26,6 @@
|
|||
#define NONAMELESSUNION
|
||||
#define NONAMELESSSTRUCT
|
||||
#include "x11drv.h"
|
||||
#include "x11ddraw.h"
|
||||
|
||||
#include "windef.h"
|
||||
#include "gdi.h"
|
||||
|
|
@ -34,18 +33,31 @@
|
|||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(x11drv);
|
||||
|
||||
typedef struct _X11DRIVERINFO {
|
||||
const GUID * lpGuid;
|
||||
DWORD dwSize;
|
||||
LPVOID lpvData;
|
||||
struct _X11DRIVERINFO*lpNext;
|
||||
} X11DRIVERINFO,*LPX11DRIVERINFO;
|
||||
|
||||
typedef struct _X11DEVICE {
|
||||
LPX11DRIVERINFO lpInfo;
|
||||
} X11DEVICE,*LPX11DEVICE;
|
||||
|
||||
extern int dxgrab;
|
||||
|
||||
LPDDRAWI_DDRAWSURFACE_LCL X11DRV_DD_Primary;
|
||||
LPDDRAWI_DDRAWSURFACE_GBL X11DRV_DD_PrimaryGbl;
|
||||
HWND X11DRV_DD_PrimaryWnd;
|
||||
HBITMAP X11DRV_DD_PrimaryDIB;
|
||||
Drawable X11DRV_DD_PrimaryDrawable;
|
||||
ATOM X11DRV_DD_UserClass;
|
||||
BOOL X11DRV_DD_IsDirect;
|
||||
static LPDDRAWI_DDRAWSURFACE_LCL X11DRV_DD_Primary;
|
||||
static LPDDRAWI_DDRAWSURFACE_GBL X11DRV_DD_PrimaryGbl;
|
||||
static HWND X11DRV_DD_PrimaryWnd;
|
||||
static HBITMAP X11DRV_DD_PrimaryDIB;
|
||||
static Drawable X11DRV_DD_PrimaryDrawable;
|
||||
static ATOM X11DRV_DD_UserClass;
|
||||
static UINT X11DRV_DD_GrabMessage;
|
||||
static WNDPROC X11DRV_DD_GrabOldProcedure;
|
||||
|
||||
static void X11DRV_DDHAL_SetPalEntries(Colormap pal, DWORD dwBase, DWORD dwNumEntries,
|
||||
LPPALETTEENTRY lpEntries);
|
||||
|
||||
static void SetPrimaryDIB(HBITMAP hBmp)
|
||||
{
|
||||
X11DRV_DD_PrimaryDIB = hBmp;
|
||||
|
|
@ -419,8 +431,8 @@ void X11DRV_DDHAL_SwitchMode(DWORD dwModeIndex, LPVOID fb_addr, LPVIDMEM fb_mem)
|
|||
X11DRV_DDHAL_SetInfo();
|
||||
}
|
||||
|
||||
void X11DRV_DDHAL_SetPalEntries(Colormap pal, DWORD dwBase, DWORD dwNumEntries,
|
||||
LPPALETTEENTRY lpEntries)
|
||||
static void X11DRV_DDHAL_SetPalEntries(Colormap pal, DWORD dwBase, DWORD dwNumEntries,
|
||||
LPPALETTEENTRY lpEntries)
|
||||
{
|
||||
XColor c;
|
||||
unsigned int n;
|
||||
|
|
|
|||
|
|
@ -1,55 +0,0 @@
|
|||
/*
|
||||
* DirectDraw HAL base 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_X11DDRAW_H
|
||||
#define __WINE_X11DDRAW_H
|
||||
|
||||
#ifndef __WINE_CONFIG_H
|
||||
# error You must include config.h to use this header
|
||||
#endif
|
||||
|
||||
#include <stdarg.h>
|
||||
|
||||
#include "windef.h"
|
||||
#include "winbase.h"
|
||||
#include "wingdi.h"
|
||||
#include "ddrawi.h"
|
||||
|
||||
extern LPDDRAWI_DDRAWSURFACE_LCL X11DRV_DD_Primary;
|
||||
extern LPDDRAWI_DDRAWSURFACE_GBL X11DRV_DD_PrimaryGbl;
|
||||
extern HWND X11DRV_DD_PrimaryWnd;
|
||||
extern HBITMAP X11DRV_DD_PrimaryDIB;
|
||||
extern BOOL X11DRV_DD_IsDirect;
|
||||
|
||||
void X11DRV_DDHAL_SwitchMode(DWORD dwModeIndex, LPVOID fb_addr, LPVIDMEM fb_mem);
|
||||
void X11DRV_DDHAL_SetPalEntries(Colormap pal, DWORD dwBase, DWORD dwNumEntries,
|
||||
LPPALETTEENTRY lpEntries);
|
||||
|
||||
typedef struct _X11DRIVERINFO {
|
||||
const GUID * lpGuid;
|
||||
DWORD dwSize;
|
||||
LPVOID lpvData;
|
||||
struct _X11DRIVERINFO*lpNext;
|
||||
} X11DRIVERINFO,*LPX11DRIVERINFO;
|
||||
|
||||
typedef struct _X11DEVICE {
|
||||
LPX11DRIVERINFO lpInfo;
|
||||
} X11DEVICE,*LPX11DEVICE;
|
||||
|
||||
#endif /* __WINE_X11DDRAW_H */
|
||||
|
|
@ -697,4 +697,6 @@ LPDDHALMODEINFO X11DRV_Settings_SetHandlers(const char *name,
|
|||
unsigned int nmodes,
|
||||
int reserve_depths);
|
||||
|
||||
extern void X11DRV_DDHAL_SwitchMode(DWORD dwModeIndex, LPVOID fb_addr, LPVIDMEM fb_mem);
|
||||
|
||||
#endif /* __WINE_X11DRV_H */
|
||||
|
|
|
|||
|
|
@ -29,7 +29,6 @@
|
|||
#include <X11/extensions/Xrandr.h>
|
||||
#include "x11drv.h"
|
||||
|
||||
#include "x11ddraw.h"
|
||||
#include "xrandr.h"
|
||||
|
||||
#include "windef.h"
|
||||
|
|
|
|||
|
|
@ -29,7 +29,6 @@
|
|||
#include <X11/extensions/xf86vmode.h>
|
||||
#endif /* HAVE_LIBXXF86VM */
|
||||
|
||||
#include "x11ddraw.h"
|
||||
#include "xvidmode.h"
|
||||
|
||||
#include "windef.h"
|
||||
|
|
|
|||
Loading…
Reference in a new issue