8 files changed, 74 insertions, 1 deletions
diff --git a/xorg-server/Xext/Makefile b/xorg-server/Xext/Makefile
new file mode 100644
index 000000000..f78eff1eb
--- /dev/null
+++ b/xorg-server/Xext/Makefile
@@ -0,0 +1,42 @@
+CSRCS=\
+bigreq.c \
+cup.c \
+dpms.c \
+dpmsstubs.c \
+EVI.c \
+mbuf.c \
+mitmisc.c \
+sampleEVI.c \
+saver.c \
+security.c \
+shape.c \
+sleepuntil.c \
+sync.c \
+xace.c \
+xcmisc.c \
+xevie.c \
+xres.c \
+xtest.c
+
+#shm.c \
+#appgroup.c \
+#fontcache.c \
+#mbufbf.c \
+#mbufpx.c \
+#panoramiX.c \
+#panoramiXprocs.c \
+#panoramiXSwap.c \
+#xcalibrate.c \
+#xf86bigfont.c \
+#xprint.c \
+#xselinux.c \
+#xvdisp.c \
+#xvmain.c \
+#xvmc.c
+
+LIBRARY=libxext
+
+INCLUDES += ..\hw\xfree86\dixmods\extmod
+
+
+
diff --git a/xorg-server/Xext/dpms.c b/xorg-server/Xext/dpms.c
index e3204febb..be11fd76a 100644
--- a/xorg-server/Xext/dpms.c
+++ b/xorg-server/Xext/dpms.c
@@ -35,6 +35,8 @@ Equipment Corporation.
 
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
+#else
+#define DPMSExtension
 #endif
 
 #include <X11/X.h>
diff --git a/xorg-server/Xext/saver.c b/xorg-server/Xext/saver.c
index feab972e2..3a70afe6d 100644
--- a/xorg-server/Xext/saver.c
+++ b/xorg-server/Xext/saver.c
@@ -31,6 +31,8 @@ in this Software without prior written authorization from the X Consortium.
 #define NEED_EVENTS
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
+#else
+#define SCREENSAVER
 #endif
 
 #include <X11/X.h>
diff --git a/xorg-server/Xext/security.c b/xorg-server/Xext/security.c
index ad30e06b8..ff6c1edfa 100644
--- a/xorg-server/Xext/security.c
+++ b/xorg-server/Xext/security.c
@@ -26,6 +26,8 @@ in this Software without prior written authorization from The Open Group.
 
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
+#else
+#define XACE
 #endif
 
 #include "scrnintstr.h"
diff --git a/xorg-server/Xext/shape.c b/xorg-server/Xext/shape.c
index 2f1baf917..53c7de8b8 100644
--- a/xorg-server/Xext/shape.c
+++ b/xorg-server/Xext/shape.c
@@ -28,6 +28,8 @@ in this Software without prior written authorization from The Open Group.
 #define NEED_EVENTS
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
+#else
+#define SHAPE
 #endif
 
 #include <stdlib.h>
diff --git a/xorg-server/Xext/shm.c b/xorg-server/Xext/shm.c
index 34c875274..bbcbd05af 100644
--- a/xorg-server/Xext/shm.c
+++ b/xorg-server/Xext/shm.c
@@ -34,7 +34,8 @@ in this Software without prior written authorization from The Open Group.
 #endif
 
 #include <sys/types.h>
-#ifndef Lynx
+#if !defined(_MSC_VER)
+#if !defined(Lynx)
 #include <sys/ipc.h>
 #include <sys/shm.h>
 #else
@@ -42,6 +43,7 @@ in this Software without prior written authorization from The Open Group.
 #include <shm.h>
 #endif
 #include <unistd.h>
+#endif
 #include <sys/stat.h>
 #define NEED_REPLIES
 #define NEED_EVENTS
@@ -348,8 +350,10 @@ ProcShmQueryVersion(client)
     rep.pixmapFormat = pixmapFormat;
     rep.majorVersion = SHM_MAJOR_VERSION;
     rep.minorVersion = SHM_MINOR_VERSION;
+#ifndef _MSC_VER
     rep.uid = geteuid();
     rep.gid = getegid();
+#endif
     if (client->swapped) {
     	swaps(&rep.sequenceNumber, n);
     	swapl(&rep.length, n);
@@ -399,6 +403,9 @@ shm_access(ClientPtr client, SHMPERM_TYPE *perm, int readonly)
 	    if (uid == 0) {
 		return 0;
 	    }
+            #ifdef _MSC_VER
+            __asm int 3;
+            #else
 	    /* Check the owner */
 	    if (SHMPERM_UID(perm) == uid || SHMPERM_CUID(perm) == uid) {
 		mask = S_IRUSR;
@@ -407,10 +414,14 @@ shm_access(ClientPtr client, SHMPERM_TYPE *perm, int readonly)
 		}
 		return (SHMPERM_MODE(perm) & mask) == mask ? 0 : -1;
 	    }
+            #endif
 	}
 
 	if (gidset) {
 	    /* Check the group */
+            #ifdef _MSC_VER
+            __asm int 3;
+            #else
 	    if (SHMPERM_GID(perm) == gid || SHMPERM_CGID(perm) == gid) {
 		mask = S_IRGRP;
 		if (!readonly) {
@@ -418,14 +429,20 @@ shm_access(ClientPtr client, SHMPERM_TYPE *perm, int readonly)
 		}
 		return (SHMPERM_MODE(perm) & mask) == mask ? 0 : -1;
 	    }
+            #endif
 	}
     }
+            #ifdef _MSC_VER
+            __asm int 3;
+            return -1;
+            #else
     /* Otherwise, check everyone else */
     mask = S_IROTH;
     if (!readonly) {
 	mask |= S_IWOTH;
     }
     return (SHMPERM_MODE(perm) & mask) == mask ? 0 : -1;
+    #endif
 }
 
 static int
@@ -500,7 +517,9 @@ ShmDetachSegment(value, shmseg)
 
     if (--shmdesc->refcnt)
 	return TRUE;
+#ifndef _MSC_VER
     shmdt(shmdesc->addr);
+#endif
     for (prev = &Shmsegs; *prev != shmdesc; prev = &(*prev)->next)
 	;
     *prev = shmdesc->next;
diff --git a/xorg-server/Xext/xace.c b/xorg-server/Xext/xace.c
index 8a8f8c61d..9d2d2fa51 100644
--- a/xorg-server/Xext/xace.c
+++ b/xorg-server/Xext/xace.c
@@ -19,6 +19,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
+#else
+#define XACE
 #endif
 
 #include <stdarg.h>
diff --git a/xorg-server/Xext/xevie.c b/xorg-server/Xext/xevie.c
index 1d51fd825..ad1ea52b8 100644
--- a/xorg-server/Xext/xevie.c
+++ b/xorg-server/Xext/xevie.c
@@ -35,6 +35,8 @@ of the copyright holder.
 #define NEED_EVENTS
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
+#else
+#define XEVIE
 #endif
 
 #include <X11/X.h>