diff options
Diffstat (limited to 'xorg-server/hw')
-rw-r--r-- | xorg-server/hw/xfree86/os-support/bus/nobus.c | 2 | ||||
-rw-r--r-- | xorg-server/hw/xfree86/os-support/shared/agp_noop.c | 2 | ||||
-rw-r--r-- | xorg-server/hw/xfree86/os-support/shared/ioperm_noop.c | 4 | ||||
-rw-r--r-- | xorg-server/hw/xfree86/os-support/stub/stub_init.c | 6 | ||||
-rw-r--r-- | xorg-server/hw/xfree86/sdksyms.sh | 1 | ||||
-rw-r--r-- | xorg-server/hw/xwin/Makefile.am | 2 | ||||
-rw-r--r-- | xorg-server/hw/xwin/glx/glwrap.c | 1 | ||||
-rw-r--r-- | xorg-server/hw/xwin/glx/indirect.c | 1 | ||||
-rw-r--r-- | xorg-server/hw/xwin/swrastwgl_dri/glwrap.c | 1 | ||||
-rw-r--r-- | xorg-server/hw/xwin/swrastwgl_dri/swrastwgl_dri.c | 5 | ||||
-rw-r--r-- | xorg-server/hw/xwin/winms.h | 4 | ||||
-rw-r--r-- | xorg-server/hw/xwin/winmultiwindowwm.c | 2 | ||||
-rw-r--r-- | xorg-server/hw/xwin/winshaddd.c | 2 | ||||
-rw-r--r-- | xorg-server/hw/xwin/winshadddnl.c | 66 | ||||
-rw-r--r-- | xorg-server/hw/xwin/winwindow.h | 9 |
15 files changed, 23 insertions, 85 deletions
diff --git a/xorg-server/hw/xfree86/os-support/bus/nobus.c b/xorg-server/hw/xfree86/os-support/bus/nobus.c index dca58fee2..dc36ecd0a 100644 --- a/xorg-server/hw/xfree86/os-support/bus/nobus.c +++ b/xorg-server/hw/xfree86/os-support/bus/nobus.c @@ -1,5 +1,5 @@ static void -__noop_to_appease_ar__() +__noop_to_appease_ar__(void) { return; } diff --git a/xorg-server/hw/xfree86/os-support/shared/agp_noop.c b/xorg-server/hw/xfree86/os-support/shared/agp_noop.c index 9c6ed4b8d..da486c051 100644 --- a/xorg-server/hw/xfree86/os-support/shared/agp_noop.c +++ b/xorg-server/hw/xfree86/os-support/shared/agp_noop.c @@ -47,7 +47,7 @@ xf86GARTCloseScreen(int screenNum) } Bool -xf86AgpGARTSupported() +xf86AgpGARTSupported(void) { return FALSE; } diff --git a/xorg-server/hw/xfree86/os-support/shared/ioperm_noop.c b/xorg-server/hw/xfree86/os-support/shared/ioperm_noop.c index 30688c0b5..eeacee9cc 100644 --- a/xorg-server/hw/xfree86/os-support/shared/ioperm_noop.c +++ b/xorg-server/hw/xfree86/os-support/shared/ioperm_noop.c @@ -36,13 +36,13 @@ #include "xf86_OSlib.h" Bool -xf86EnableIO() +xf86EnableIO(void) { return TRUE; } void -xf86DisableIO() +xf86DisableIO(void) { return; } diff --git a/xorg-server/hw/xfree86/os-support/stub/stub_init.c b/xorg-server/hw/xfree86/os-support/stub/stub_init.c index 629675d68..d3e0c3f29 100644 --- a/xorg-server/hw/xfree86/os-support/stub/stub_init.c +++ b/xorg-server/hw/xfree86/os-support/stub/stub_init.c @@ -5,12 +5,12 @@ #include "xf86_OSlib.h" void -xf86OpenConsole() +xf86OpenConsole(void) { } void -xf86CloseConsole() +xf86CloseConsole(void) { } @@ -21,6 +21,6 @@ xf86ProcessArgument(int argc, char *argv[], int i) } void -xf86UseMsg() +xf86UseMsg(void) { } diff --git a/xorg-server/hw/xfree86/sdksyms.sh b/xorg-server/hw/xfree86/sdksyms.sh index fa1989379..48b48b5db 100644 --- a/xorg-server/hw/xfree86/sdksyms.sh +++ b/xorg-server/hw/xfree86/sdksyms.sh @@ -259,6 +259,7 @@ cat > sdksyms.c << EOF #include "dixevents.h" #include "dixfont.h" #include "dixfontstr.h" +#include "dixfontstubs.h" #include "dixgrabs.h" #include "dixstruct.h" #include "exevents.h" diff --git a/xorg-server/hw/xwin/Makefile.am b/xorg-server/hw/xwin/Makefile.am index eaf475fff..af5bb9961 100644 --- a/xorg-server/hw/xwin/Makefile.am +++ b/xorg-server/hw/xwin/Makefile.am @@ -148,6 +148,8 @@ XWin_SOURCES = $(SRCS) INCLUDES = -I$(top_srcdir)/miext/rootless +XWIN_SYS_LIBS += -ldxguid + XWin_DEPENDENCIES = $(MULTIWINDOWEXTWM_LIBS) $(XWIN_GLX_LIBS) $(XWIN_LIBS) $(MAIN_LIB) $(XSERVER_LIBS) XWin_LDADD = $(MULTIWINDOWEXTWM_LIBS) $(XWIN_GLX_LIBS) $(XWIN_GLX_LINK_FLAGS) $(XWIN_LIBS) $(MAIN_LIB) $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) $(XWIN_SYS_LIBS) XWin_LDFLAGS = -mwindows -static diff --git a/xorg-server/hw/xwin/glx/glwrap.c b/xorg-server/hw/xwin/glx/glwrap.c index 18d3521e0..9733e7526 100644 --- a/xorg-server/hw/xwin/glx/glwrap.c +++ b/xorg-server/hw/xwin/glx/glwrap.c @@ -39,6 +39,7 @@ #include <X11/Xwindows.h> #include <GL/gl.h> #include <GL/glext.h> +#include <glx/glheader.h> #include <glx/glxserver.h> #include <glx/glxext.h> #include <glx/glapi.h> diff --git a/xorg-server/hw/xwin/glx/indirect.c b/xorg-server/hw/xwin/glx/indirect.c index c1eb254f2..f4eb595bb 100644 --- a/xorg-server/hw/xwin/glx/indirect.c +++ b/xorg-server/hw/xwin/glx/indirect.c @@ -79,6 +79,7 @@ #endif #include "glwindows.h" +#include <glx/glheader.h> #include <glx/glxserver.h> #include <glx/glxutil.h> #include <glx/extension_string.h> diff --git a/xorg-server/hw/xwin/swrastwgl_dri/glwrap.c b/xorg-server/hw/xwin/swrastwgl_dri/glwrap.c index d74addb69..6d794b671 100644 --- a/xorg-server/hw/xwin/swrastwgl_dri/glwrap.c +++ b/xorg-server/hw/xwin/swrastwgl_dri/glwrap.c @@ -39,6 +39,7 @@ #include <X11/Xwindows.h> #include <GL/gl.h> #include <GL/glext.h> +#include <glx/glheader.h> #include <glx/glxserver.h> #include <glx/glxext.h> #include <glx/glapi.h> diff --git a/xorg-server/hw/xwin/swrastwgl_dri/swrastwgl_dri.c b/xorg-server/hw/xwin/swrastwgl_dri/swrastwgl_dri.c index c5b799079..8597e5b4a 100644 --- a/xorg-server/hw/xwin/swrastwgl_dri/swrastwgl_dri.c +++ b/xorg-server/hw/xwin/swrastwgl_dri/swrastwgl_dri.c @@ -1,3 +1,6 @@ +#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
#include <X11/Xwindows.h>
#include <GL/gl.h>
#include <GL/glext.h>
@@ -5,6 +8,7 @@ #include <GL/internal/dri_interface.h>
#include <stdint.h>
+#include <glx/glheader.h>
#include <glx/glapi.h>
#include <glx/glapitable.h>
@@ -17,6 +21,7 @@ typedef int BOOL; #define PRINTF(...)
#endif
+#undef PUBLIC
#define PUBLIC __declspec(dllexport)
BOOL colorIndexMode = FALSE;
diff --git a/xorg-server/hw/xwin/winms.h b/xorg-server/hw/xwin/winms.h index 4355baeb8..5282fc982 100644 --- a/xorg-server/hw/xwin/winms.h +++ b/xorg-server/hw/xwin/winms.h @@ -42,7 +42,11 @@ #include <X11/Xwindows.h> #include <windowsx.h> +#pragma push_macro("Status") +#undef Status +#define Status wStatus #include "ddraw.h" +#pragma pop_macro("Status") #undef CreateWindow diff --git a/xorg-server/hw/xwin/winmultiwindowwm.c b/xorg-server/hw/xwin/winmultiwindowwm.c index 5d547dbdd..961f2fd8d 100644 --- a/xorg-server/hw/xwin/winmultiwindowwm.c +++ b/xorg-server/hw/xwin/winmultiwindowwm.c @@ -57,8 +57,6 @@ typedef int pid_t; #include <X11/Xwindows.h> /* Local headers */ -#include "objbase.h" -#include "ddraw.h" #include "winwindow.h" #include "winprefs.h" #include "window.h" diff --git a/xorg-server/hw/xwin/winshaddd.c b/xorg-server/hw/xwin/winshaddd.c index f6ba49a8a..709d07527 100644 --- a/xorg-server/hw/xwin/winshaddd.c +++ b/xorg-server/hw/xwin/winshaddd.c @@ -36,8 +36,6 @@ #endif #include "win.h" - - /* * Local prototypes */ diff --git a/xorg-server/hw/xwin/winshadddnl.c b/xorg-server/hw/xwin/winshadddnl.c index 2a28d8717..2c80a6bf0 100644 --- a/xorg-server/hw/xwin/winshadddnl.c +++ b/xorg-server/hw/xwin/winshadddnl.c @@ -36,26 +36,6 @@ #endif #include "win.h" -/* - * FIXME: Headers are broken, DEFINE_GUID doesn't work correctly, - * so we have to redefine it here. - */ -#ifndef _MSC_VER -#ifdef DEFINE_GUID -#undef DEFINE_GUID -#define DEFINE_GUID(n,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) const GUID n GUID_SECT = {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}} -#endif /* DEFINE_GUID */ -#endif - -/* - * FIXME: Headers are broken, IID_IDirectDraw4 has to be defined - * here manually. Should be handled by ddraw.h - */ -#ifndef IID_IDirectDraw4 -DEFINE_GUID(IID_IDirectDraw4, 0x9c59509a, 0x39bd, 0x11d1, 0x8c, 0x4a, 0x00, - 0xc0, 0x4f, 0xd9, 0x30, 0xc5); -#endif /* IID_IDirectDraw4 */ - #define FAIL_MSG_MAX_BLT 10 /* @@ -596,50 +576,6 @@ winFreeFBShadowDDNL(ScreenPtr pScreen) pScreenInfo->pfb = NULL; } -#if defined(XWIN_MULTIWINDOW) || defined(XWIN_MULTIWINDOWEXTWM) -/* - * Create a DirectDraw surface for the new multi-window window - */ - -static - Bool -winFinishCreateWindowsWindowDDNL(WindowPtr pWin) -{ - winWindowPriv(pWin); - winPrivScreenPtr pScreenPriv = pWinPriv->pScreenPriv; - HRESULT ddrval = DD_OK; - DDSURFACEDESC2 ddsd; - int iWidth, iHeight; - int iX, iY; - - winDebug("winFinishCreateWindowsWindowDDNL!\n\n"); - - iX = pWin->drawable.x + GetSystemMetrics(SM_XVIRTUALSCREEN); - iY = pWin->drawable.y + GetSystemMetrics(SM_YVIRTUALSCREEN); - - iWidth = pWin->drawable.width; - iHeight = pWin->drawable.height; - - /* Describe the primary surface */ - ZeroMemory(&ddsd, sizeof(ddsd)); - ddsd.dwSize = sizeof(ddsd); - ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; - ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; - ddsd.dwHeight = iHeight; - ddsd.dwWidth = iWidth; - - /* Create the primary surface */ - ddrval = IDirectDraw4_CreateSurface(pScreenPriv->pdd4, - &ddsd, &pWinPriv->pddsPrimary4, NULL); - if (FAILED(ddrval)) { - ErrorF("winFinishCreateWindowsWindowDDNL - Could not create primary " - "surface: %08x\n", (unsigned int) ddrval); - return FALSE; - } - return TRUE; -} -#endif - /* * Transfer the damaged regions of the shadow framebuffer to the display. */ @@ -1266,7 +1202,7 @@ winSetEngineFunctionsShadowDDNL(ScreenPtr pScreen) pScreenPriv->pwinReleasePrimarySurface = winReleasePrimarySurfaceShadowDDNL; #ifdef XWIN_MULTIWINDOW pScreenPriv->pwinFinishCreateWindowsWindow - = winFinishCreateWindowsWindowDDNL; + = (winFinishCreateWindowsWindowProcPtr) (void (*)(void)) NoopDDA; #endif return TRUE; diff --git a/xorg-server/hw/xwin/winwindow.h b/xorg-server/hw/xwin/winwindow.h index 8757f15e2..7d5a88a55 100644 --- a/xorg-server/hw/xwin/winwindow.h +++ b/xorg-server/hw/xwin/winwindow.h @@ -76,15 +76,6 @@ typedef struct { #ifdef XWIN_GLX_WINDOWS Bool fWglUsed; #endif - - /* Privates used by primary fb DirectDraw server */ - LPDDSURFACEDESC pddsdPrimary; - - /* Privates used by shadow fb DirectDraw Nonlocking server */ - LPDIRECTDRAWSURFACE4 pddsPrimary4; - - /* Privates used by both shadow fb DirectDraw servers */ - LPDIRECTDRAWCLIPPER pddcPrimary; } winPrivWinRec, *winPrivWinPtr; #ifdef XWIN_MULTIWINDOW |