Module: wine Branch: refs/heads/master Commit: 241abf4e1bc8a4c5cf31998f0d61fc6509daadac URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=241abf4e1bc8a4c5cf31998f...
Author: Alexandre Julliard julliard@winehq.org Date: Wed Aug 2 13:21:58 2006 +0200
winex11.drv: Make some functions and variables static, and get rid of x11ddraw.h.
---
dlls/winex11.drv/desktop.c | 1 - dlls/winex11.drv/settings.c | 1 - dlls/winex11.drv/x11ddraw.c | 32 +++++++++++++++++-------- dlls/winex11.drv/x11ddraw.h | 55 ------------------------------------------- dlls/winex11.drv/x11drv.h | 2 ++ dlls/winex11.drv/xrandr.c | 1 - dlls/winex11.drv/xvidmode.c | 1 - 7 files changed, 24 insertions(+), 69 deletions(-) delete mode 100644 dlls/winex11.drv/x11ddraw.h
diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index 8995295..90e2ab8 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -26,7 +26,6 @@ #include "wine/winuser16.h" #include "win.h" #include "ddrawi.h" #include "x11drv.h" -#include "x11ddraw.h" #include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(x11drv); diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index 49b8a8d..5de07eb 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -22,7 +22,6 @@ #include "config.h" #include <string.h> #include <stdio.h> #include "x11drv.h" -#include "x11ddraw.h"
#include "windef.h" #include "wingdi.h" diff --git a/dlls/winex11.drv/x11ddraw.c b/dlls/winex11.drv/x11ddraw.c index b690ced..39a2e05 100644 --- a/dlls/winex11.drv/x11ddraw.c +++ b/dlls/winex11.drv/x11ddraw.c @@ -26,7 +26,6 @@ #include <X11/Xlib.h> #define NONAMELESSUNION #define NONAMELESSSTRUCT #include "x11drv.h" -#include "x11ddraw.h"
#include "windef.h" #include "gdi.h" @@ -34,18 +33,31 @@ #include "wine/debug.h"
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 dwMod 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; diff --git a/dlls/winex11.drv/x11ddraw.h b/dlls/winex11.drv/x11ddraw.h deleted file mode 100644 index bc191e5..0000000 --- a/dlls/winex11.drv/x11ddraw.h +++ /dev/null @@ -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 */ diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index b3d547a..e5027c4 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -697,4 +697,6 @@ LPDDHALMODEINFO X11DRV_Settings_SetHandl unsigned int nmodes, int reserve_depths);
+extern void X11DRV_DDHAL_SwitchMode(DWORD dwModeIndex, LPVOID fb_addr, LPVIDMEM fb_mem); + #endif /* __WINE_X11DRV_H */ diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index fcc0b7c..5cf3027 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -29,7 +29,6 @@ #include <X11/Xlib.h> #include <X11/extensions/Xrandr.h> #include "x11drv.h"
-#include "x11ddraw.h" #include "xrandr.h"
#include "windef.h" diff --git a/dlls/winex11.drv/xvidmode.c b/dlls/winex11.drv/xvidmode.c index 46c7e68..dd5993a 100644 --- a/dlls/winex11.drv/xvidmode.c +++ b/dlls/winex11.drv/xvidmode.c @@ -29,7 +29,6 @@ #ifdef HAVE_LIBXXF86VM #include <X11/extensions/xf86vmode.h> #endif /* HAVE_LIBXXF86VM */
-#include "x11ddraw.h" #include "xvidmode.h"
#include "windef.h"