Attachment 1274 Details for Bug 1802 – Patches to xserver DIX

[patch] Patches to xserver DIX

mingw-xserver.diff (text/plain), 8.45 KB, created by Alexander Gottwald on 2004-11-10 09:40:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alexander Gottwald

Created: 2004-11-10 09:40:39 UTC

Size: 8.45 KB

patch

obsolete

>Index: Imakefile
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/Imakefile,v
>retrieving revision 1.21
>diff -u -r1.21 Imakefile
>--- Imakefile	10 Nov 2004 01:46:23 -0000	1.21
>+++ Imakefile	10 Nov 2004 17:32:17 -0000
>@@ -1016,7 +1016,15 @@
> XWINOBJS = $(XWINDDXDIR)/stubs.o $(XWINDDXDIR)/XWin.res
> XWINLIBS = PreFbLibs $(XWINLIB) FbPostFbLibs $(XWINLIB) $(XWINLAYERLIB) \
>            $(SHADOW) $(XWINPARSERLIB) $(ROOTLESSLIB)
>-XWINSYSLIBS = $(FONTLIBS) $(LDPRELIBS) $(XONLYLIB) $(SYSLIBS) -lgdi32
>+#if BuildXWinMultiWindow || BuildXWinClipboard
>+XWINX11  = $(XONLYLIB)	   
>+#endif
>+#if defined(Win32Architecture)
>+XWINW32  = -lgdi32 -lwsock32 -lmsvcr70
>+#else
>+XWINW32  = -lgdi32
>+#endif
>+XWINSYSLIBS = $(FONTLIBS) $(LDPRELIBS) $(XWINX11) $(SYSLIBS) $(XWINW32)
> 
> EXTRA_LDOPTIONS = -e _mainCRTStartup
> 
>@@ -1029,10 +1037,17 @@
> 	@if [ -f $@ ]; then touch $@ >/dev/null 2>&1 || exit 0; fi
> #endif
> 
>-ServerTarget(XWin,$(XWINDIRS),$(XWINOBJS), \
>+#ifdef mingwArchitecture
>+XWINSERVERNAME=Xming    
>+XWINGLSERVERNAME=XmingGL    
>+#else
>+XWINSERVERNAME=XWin    
>+XWINGLSERVERNAME=XWin_GL 
>+#endif
>+ServerTarget($(XWINSERVERNAME),$(XWINDIRS),$(XWINOBJS), \
> 	     $(LIBCWRAPPER) $(XWINLIBS) $(LOADABLEEXTS),$(XWINSYSLIBS))
> #if defined(GlxUseWindows) && GlxUseWindows 
>-ServerTarget(XWin_GL,$(XWINDIRS),$(XWINOBJS), \
>+ServerTarget($(XWINGLSERVERNAME),$(XWINDIRS),$(XWINOBJS), \
> 	     $(LIBCWRAPPER) $(XWINLIBS) $(LOADABLEEXTS),$(XWINSYSLIBS) \
> 	     $(XWINOPENGLLIB)) 
> #endif
>Index: os/WaitFor.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/os/WaitFor.c,v
>retrieving revision 1.3
>diff -u -r1.3 WaitFor.c
>--- os/WaitFor.c	18 Oct 2004 14:21:46 -0000	1.3
>+++ os/WaitFor.c	10 Nov 2004 17:32:17 -0000
>@@ -222,7 +222,11 @@
> 	{
> 	    i = Select (MaxClients, &LastSelectMask, NULL, NULL, wt);
> 	}
>+#ifndef WIN32
> 	selecterr = errno;
>+#else
>+	selecterr = WSAGetLastError();
>+#endif
> 	WakeupHandler(i, (pointer)&LastSelectMask);
> #ifdef XTESTEXT1
> 	if (playback_on) {
>@@ -244,18 +248,30 @@
> 		return 0;
> 	    if (i < 0) 
> 	    {
>+#ifndef WIN32
> 		if (selecterr == EBADF)    /* Some client disconnected */
>+#else
>+		if (selecterr == WSAENOTSOCK)    /* Some client disconnected */
>+#endif
> 		{
> 		    CheckConnections ();
> 		    if (! XFD_ANYSET (&AllClients))
> 			return 0;
> 		}
>+#ifndef WIN32
> 		else if (selecterr == EINVAL)
>+#else
>+		else if (selecterr == WSAEINVAL)
>+#endif
> 		{
> 		    FatalError("WaitForSomething(): select: errno=%d\n",
> 			selecterr);
>-		}
>+            }
>+#ifndef WIN32
> 		else if (selecterr != EINTR)
>+#else
>+		else if (selecterr != WSAEINTR)
>+#endif
> 		{
> 		    ErrorF("WaitForSomething(): select: errno=%d\n",
> 			selecterr);
>Index: os/access.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/os/access.c,v
>retrieving revision 1.6
>diff -u -r1.6 access.c
>--- os/access.c	17 Oct 2004 10:46:14 -0000	1.6
>+++ os/access.c	10 Nov 2004 17:32:17 -0000
>@@ -531,7 +531,14 @@
>     int		family;
>     register HOST	*host;
> 
>+#ifndef WIN32
>     struct utsname name;
>+#else
>+    struct {
>+        char  nodename[512];	    
>+    } name;
>+#endif
>+
>     register struct hostent  *hp;
> 
>     union {
>@@ -555,8 +562,12 @@
>      * see), whereas gethostname() kindly truncates it for me.
>      */
> #ifndef QNX4
>+#ifndef WIN32
>     uname(&name);
> #else
>+    gethostname(name.nodename, sizeof(name.nodename));
>+#endif
>+#else
>     /* QNX4's uname returns node number in name.nodename, not the hostname
>        have to overwrite it */
>     char hname[1024];
>Index: os/connection.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/os/connection.c,v
>retrieving revision 1.3
>diff -u -r1.3 connection.c
>--- os/connection.c	17 Oct 2004 10:46:14 -0000	1.3
>+++ os/connection.c	10 Nov 2004 17:32:18 -0000
>@@ -202,6 +202,10 @@
>  * This is clearly boggus and another form of storage which doesn't use the fd
>  * as a direct index should really be implemented for NT.
>  */
>+#undef MAXSOCKS
>+#define MAXSOCKS 500
>+#undef MAXSELECT
>+#define MAXSELECT 500
> #define MAXFD 500
> #endif
> 
>Index: os/io.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/os/io.c,v
>retrieving revision 1.2
>diff -u -r1.2 io.c
>--- os/io.c	23 Apr 2004 19:54:28 -0000	1.2
>+++ os/io.c	10 Nov 2004 17:32:18 -0000
>@@ -94,6 +94,7 @@
>  * systems are broken and return EWOULDBLOCK when they should return EAGAIN
>  */
> #ifndef __UNIXOS2__
>+#ifndef WIN32
> #if defined(EAGAIN) && defined(EWOULDBLOCK)
> #define ETEST(err) (err == EAGAIN || err == EWOULDBLOCK)
> #else
>@@ -103,6 +104,9 @@
> #define ETEST(err) (err == EWOULDBLOCK)
> #endif
> #endif
>+#else /* WIN32 The socket errorcodes differ from the normal errors*/
>+#define ETEST(err) (err == EAGAIN || err == WSAEWOULDBLOCK)
>+#endif
> #else /* __UNIXOS2__  Writing to full pipes may return ENOSPC */
> #define ETEST(err) (err == EAGAIN || err == EWOULDBLOCK || err == ENOSPC)
> #endif
>Index: os/log.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/os/log.c,v
>retrieving revision 1.3
>diff -u -r1.3 log.c
>--- os/log.c	13 Aug 2004 19:51:34 -0000	1.3
>+++ os/log.c	10 Nov 2004 17:32:18 -0000
>@@ -89,6 +89,11 @@
> #include "site.h"
> #include "opaque.h"
> 
>+#ifdef WIN32
>+#include <process.h>
>+#define getpid(x) _getpid(x)
>+#endif
>+
> 
> #ifdef DDXOSVERRORF
> void (*OsVendorVErrorFProc)(const char *, va_list args) = NULL;
>@@ -191,7 +196,9 @@
> 	if (saveBuffer && bufferSize > 0) {
> 	    fwrite(saveBuffer, bufferPos, 1, logFile);
> 	    fflush(logFile);
>+#ifndef WIN32
> 	    fsync(fileno(logFile));
>+#endif
> 	}
>     }
> 
>@@ -263,8 +270,10 @@
> 	    fwrite(tmpBuffer, len, 1, logFile);
> 	    if (logFlush) {
> 		fflush(logFile);
>+#ifndef WIN32
> 		if (logSync)
> 		    fsync(fileno(logFile));
>+#endif
> 	    }
> 	} else if (needBuffer) {
> 	    /*
>Index: os/osdep.h
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/os/osdep.h,v
>retrieving revision 1.2
>diff -u -r1.2 osdep.h
>--- os/osdep.h	23 Apr 2004 19:54:28 -0000	1.2
>+++ os/osdep.h	10 Nov 2004 17:32:18 -0000
>@@ -260,6 +260,9 @@
> extern WorkQueuePtr workQueue;
> 
> /* added by raphael */
>+#ifdef WIN32
>+typedef long int fd_mask;
>+#endif
> #define ffs mffs
> extern int mffs(fd_mask);
> 
>Index: os/utils.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/os/utils.c,v
>retrieving revision 1.9
>diff -u -r1.9 utils.c
>--- os/utils.c	29 Sep 2004 04:17:44 -0000	1.9
>+++ os/utils.c	10 Nov 2004 17:32:18 -0000
>@@ -81,7 +81,9 @@
> #undef _POSIX_SOURCE
> #endif
> #endif
>+#ifndef WIN32
> #include <sys/wait.h>
>+#endif
> #if !defined(SYSV) && !defined(WIN32) && !defined(Lynx) && !defined(QNX4)
> #include <sys/resource.h>
> #endif
>@@ -1974,7 +1976,11 @@
> 
> /* Check args and env only if running setuid (euid == 0 && euid != uid) ? */
> #ifndef CHECK_EUID
>+#ifndef WIN32
> #define CHECK_EUID 1
>+#else
>+#define CHECK_EUID 0
>+#endif
> #endif
> 
> /*
>Index: os/xdmcp.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/os/xdmcp.c,v
>retrieving revision 1.3
>diff -u -r1.3 xdmcp.c
>--- os/xdmcp.c	20 Jul 2004 15:15:13 -0000	1.3
>+++ os/xdmcp.c	10 Nov 2004 17:32:18 -0000
>@@ -17,17 +17,7 @@
> /* $XFree86: xc/programs/Xserver/os/xdmcp.c,v 3.31 2003/12/30 21:24:32 herrb Exp $ */
> 
> #ifdef WIN32
>-/* avoid conflicting definitions */
>-#define BOOL wBOOL
>-#define ATOM wATOM
>-#define FreeResource wFreeResource
>-#include <winsock.h>
>-#undef BOOL
>-#undef ATOM
>-#undef FreeResource
>-#undef CreateWindowA
>-#undef RT_FONT
>-#undef RT_CURSOR
>+#include <Xwinsock.h>
> #endif
> 
> #include "Xos.h"
>@@ -1548,7 +1538,9 @@
> #ifdef XTHREADS_NEEDS_BYNAMEPARAMS
>     _Xgethostbynameparams hparams;
> #endif
>-
>+#if defined(WIN32) && (defined(TCPCONN) || defined(DNETCONN))
>+    _XSERVTransWSAStartup(); 
>+#endif
>     if (!(hep = _XGethostbyname(namestr, hparams)))
>     {
> 	FatalError("Xserver: %s unknown host: %s\n", argtype, namestr);
>Index: render/picture.h
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/render/picture.h,v
>retrieving revision 1.4
>diff -u -r1.4 picture.h
>--- render/picture.h	6 Aug 2004 23:42:10 -0000	1.4
>+++ render/picture.h	10 Nov 2004 17:32:18 -0000
>@@ -165,7 +165,7 @@
> 
> /* Fixed point updates from Carl Worth, USC, Information Sciences Institute */
> 
>-#ifdef WIN32
>+#if defined(WIN32) && !defined(__GNUC__)
> typedef __int64		xFixed_32_32;
> #else
> #  if defined (_LP64) || \

Actions: View | Splinter Review

Attachments on bug 1802: 1251 | 1252 | 1253 | 1254 | 1271 | 1272 | 1273 | 1274 | 1275

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.