17 files changed, 151 insertions, 21 deletions
diff --git a/xorg-server/include/callback.h b/xorg-server/include/callback.h
index 94360dc72..2c4510a6e 100644
--- a/xorg-server/include/callback.h
+++ b/xorg-server/include/callback.h
@@ -53,6 +53,10 @@ SOFTWARE.
 #include <X11/Xproto.h>
 #include <X11/Xfuncproto.h>
 
+#ifdef _MSC_VER
+#define inline __inline
+#endif
+
 /*
  *  callback manager stuff
  */
diff --git a/xorg-server/include/closestr.h b/xorg-server/include/closestr.h
index d29ee4d91..5cd52198f 100644
--- a/xorg-server/include/closestr.h
+++ b/xorg-server/include/closestr.h
@@ -53,6 +53,7 @@ typedef struct _OFclosure {
     XID         fontid;
     char       *fontname;
     int         fnamelen;
+    Bool	from_dispatch;
     FontPtr	non_cachable_font;
 }           OFclosureRec;
 
@@ -78,6 +79,7 @@ typedef struct _LFWIclosure {
     LFWIstateRec	saved;
     int			savedNumFonts;
     Bool		haveSaved;
+    Bool	        from_dispatch;
     char		*savedName;
 } LFWIclosureRec;
 
@@ -91,6 +93,7 @@ typedef struct _LFclosure {
     LFWIstateRec current;
     LFWIstateRec saved;
     Bool        haveSaved;
+    Bool	from_dispatch;    
     char	*savedName;
     int		savedNameLen;
 }	LFclosureRec;
@@ -109,6 +112,7 @@ typedef struct _PTclosure {
     CARD8		reqType;
     XID			did;
     int			err;
+    Bool	        from_dispatch;
 } PTclosureRec;
 
 /* ImageText */
@@ -123,5 +127,6 @@ typedef struct _ITclosure {
     int			yorg;
     CARD8		reqType;
     XID			did;
+    Bool	        from_dispatch;
 } ITclosureRec;
 #endif				/* CLOSESTR_H */
diff --git a/xorg-server/include/dixstruct.h b/xorg-server/include/dixstruct.h
index 6cc961478..10adc2c0e 100644
--- a/xorg-server/include/dixstruct.h
+++ b/xorg-server/include/dixstruct.h
@@ -93,7 +93,7 @@ typedef struct _Client {
     Bool        swapped;
     ReplySwapPtr pSwapReplyFunc;
     XID         errorValue;
-    int         sequence;
+    unsigned short sequence;    //MH
     int         closeDownMode;
     int         clientGone;
     int         noClientException;	/* this client died or needs to be
diff --git a/xorg-server/include/globals.h b/xorg-server/include/globals.h
index 17bca8208..a637260cd 100644
--- a/xorg-server/include/globals.h
+++ b/xorg-server/include/globals.h
@@ -38,9 +38,7 @@ extern _X_EXPORT Bool DPMSCapableFlag;
 extern _X_EXPORT Bool PanoramiXExtensionDisabledHack;
 #endif
 
-#ifdef COMPOSITE
 extern _X_EXPORT Bool noCompositeExtension;
-#endif
 
 #ifdef DAMAGE
 extern _X_EXPORT Bool noDamageExtension;
diff --git a/xorg-server/include/misc.h b/xorg-server/include/misc.h
index dc039113d..04e084b65 100644
--- a/xorg-server/include/misc.h
+++ b/xorg-server/include/misc.h
@@ -80,6 +80,16 @@ OF THIS SOFTWARE.
 
 #include <stddef.h>
 #include <stdint.h>
+#include <unistd.h>
+
+#ifdef _MSC_VER
+#define inline __inline
+#include <math.h>
+static double __inline trunc(double d)
+{
+  return (d>0) ? floor(d) : ceil(d) ;
+}
+#endif
 
 #ifndef MAXSCREENS
 #define MAXSCREENS	16
@@ -168,9 +178,9 @@ static inline uint16_t lswaps(uint16_t x)
 
 #include <math.h>
 #undef MAXSHORT
-#define MAXSHORT SHRT_MAX
+#define MAXSHORT 32767
 #undef MINSHORT
-#define MINSHORT SHRT_MIN
+#define MINSHORT -32768
 #undef MAXINT
 #define MAXINT INT_MAX
 #undef MININT
@@ -198,7 +208,7 @@ static inline uint16_t lswaps(uint16_t x)
  * @param bits The minimum number of bits needed.
  * @return The number of bytes needed to hold bits.
  */
-static inline int
+static __inline int
 bits_to_bytes(const int bits) {
     return ((bits + 7) >> 3);
 }
@@ -208,7 +218,7 @@ bits_to_bytes(const int bits) {
  * @param bytes The minimum number of bytes needed.
  * @return The number of 4-byte units needed to hold bytes.
  */
-static inline int
+static __inline int
 bytes_to_int32(const int bytes) {
     return (((bytes) + 3) >> 2);
 }
@@ -218,7 +228,7 @@ bytes_to_int32(const int bytes) {
  * @param bytes The minimum number of bytes needed.
  * @return The closest multiple of 4 that is equal or higher than bytes.
  */
-static inline int
+static __inline int
 pad_to_int32(const int bytes) {
     return (((bytes) + 3) & ~3);
 }
diff --git a/xorg-server/include/os.h b/xorg-server/include/os.h
index b489211ab..642caeb99 100644
--- a/xorg-server/include/os.h
+++ b/xorg-server/include/os.h
@@ -115,6 +115,8 @@ extern _X_EXPORT int WriteToClient(ClientPtr /*who*/, int /*count*/, const void*
 
 extern _X_EXPORT void ResetOsBuffers(void);
 
+extern _X_EXPORT int TransIsListening(char *protocol);
+
 extern _X_EXPORT void InitConnectionLimits(void);
 
 extern _X_EXPORT void NotifyParentProcess(void);
@@ -327,7 +329,7 @@ extern _X_EXPORT int AddHost(
     ClientPtr	/*client*/,
     int         /*family*/,
     unsigned    /*length*/,
-    const void */*pAddr*/);
+    const void * /*pAddr*/);
 
 extern _X_EXPORT Bool ForEachHostInFamily (
     int	    /*family*/,
@@ -390,7 +392,7 @@ extern _X_EXPORT void DisableLocalHost(void);
 
 extern _X_EXPORT void AccessUsingXdmcp(void);
 
-extern _X_EXPORT void DefineSelf(int /*fd*/);
+extern _X_EXPORT void DefineSelf(int /*fd*/, const int /*protocol*/);
 
 #if XDMCP
 extern _X_EXPORT void AugmentSelf(pointer /*from*/, int /*len*/);
@@ -549,10 +551,24 @@ extern _X_EXPORT void FatalError(const char *f, ...) _X_ATTRIBUTE_PRINTF(1,2) _X
 #define DebugF(...) /* */
 #endif
 
+#ifdef _MSC_VER
+#ifdef INSERVER
+#define SERVEXTERN _declspec(dllimport)
+#else
+#define SERVEXTERN _declspec(dllexport)
+#endif
+#else
+#define SERVEXTERN _X_EXPORT
+#endif
+
 extern _X_EXPORT void VErrorF(const char *f, va_list args) _X_ATTRIBUTE_PRINTF(1,0);
-extern _X_EXPORT void ErrorF(const char *f, ...) _X_ATTRIBUTE_PRINTF(1,2);
+extern SERVEXTERN void ErrorF(const char *f, ...) _X_ATTRIBUTE_PRINTF(1,2);
 extern _X_EXPORT void LogPrintMarkers(void);
 
 extern _X_EXPORT void xorg_backtrace(void);
 
+#ifdef _MSC_VER
+#define snprintf _snprintf
+#endif
+
 #endif /* OS_H */
diff --git a/xorg-server/include/pixmapstr.h b/xorg-server/include/pixmapstr.h
index 0a5d379dc..19190e697 100644
--- a/xorg-server/include/pixmapstr.h
+++ b/xorg-server/include/pixmapstr.h
@@ -76,10 +76,8 @@ typedef struct _Pixmap {
     int			refcnt;
     int			devKind; /* This is the pitch of the pixmap, typically width*bpp/8. */
     DevUnion		devPrivate; /* When !NULL, devPrivate.ptr points to the raw pixel data. */
-#ifdef COMPOSITE
     short		screen_x;
     short		screen_y;
-#endif
     unsigned		usage_hint; /* see CREATE_PIXMAP_USAGE_* */
 } PixmapRec;
 
diff --git a/xorg-server/include/resource.h b/xorg-server/include/resource.h
index 17bebe7d4..2bed80577 100644
--- a/xorg-server/include/resource.h
+++ b/xorg-server/include/resource.h
@@ -70,7 +70,7 @@ typedef uint32_t RESTYPE;
 #define RC_LASTPREDEF	RC_NEVERRETAIN
 #define RC_ANY		(~(RESTYPE)0)
 
-/* types for Resource routines */
+/* types for Resource routines. When you change one of them, please also update the predefTypes array in resource.c*/
 
 #define RT_WINDOW	((RESTYPE)1|RC_DRAWABLE)
 #define RT_PIXMAP	((RESTYPE)2|RC_DRAWABLE)
diff --git a/xorg-server/include/scrnintstr.h b/xorg-server/include/scrnintstr.h
index 490c6460e..a373acd27 100644
--- a/xorg-server/include/scrnintstr.h
+++ b/xorg-server/include/scrnintstr.h
@@ -67,7 +67,7 @@ typedef struct _Visual {
     VisualID		vid;
     short		class;
     short		bitsPerRGBValue;
-    short		ColormapEntries;
+    long		ColormapEntries;
     short		nplanes;/* = log2 (ColormapEntries). This does not
 				 * imply that the screen has this many planes.
 				 * it may have more or fewer */
@@ -395,6 +395,10 @@ typedef    void (* MarkUnrealizedWindowProcPtr)(
 	WindowPtr /*pWin*/,
 	Bool /*fromConfigure*/);
 
+#ifdef CreateWindow
+#undef CreateWindow
+#endif
+
 typedef    Bool (* DeviceCursorInitializeProcPtr)(
         DeviceIntPtr /* pDev */,
         ScreenPtr    /* pScreen */);
diff --git a/xorg-server/include/servermd.h b/xorg-server/include/servermd.h
index b5ae6ac71..99e89a5c4 100644
--- a/xorg-server/include/servermd.h
+++ b/xorg-server/include/servermd.h
@@ -290,6 +290,12 @@ SOFTWARE.
 #define GLYPHPADBYTES		4
 #endif /* linux/s390 */ 
 
+#ifdef WIN32
+#define IMAGE_BYTE_ORDER	LSBFirst
+#define BITMAP_BIT_ORDER	LSBFirst
+#define GLYPHPADBYTES		4
+#endif
+
 /* size of buffer to use with GetImage, measured in bytes. There's obviously
  * a trade-off between the amount of heap used and the number of times the
  * ddx routine has to be called.
diff --git a/xorg-server/include/site.h b/xorg-server/include/site.h
index 07d7db543..dc8f7e20c 100644
--- a/xorg-server/include/site.h
+++ b/xorg-server/include/site.h
@@ -52,7 +52,7 @@ SOFTWARE.
  * server executable.
  */
 #ifndef VENDOR_STRING
-#define VENDOR_STRING "The X.Org Foundation"
+#define VENDOR_STRING "HC-Consult"
 #endif
 
 /*
@@ -61,7 +61,7 @@ SOFTWARE.
  * by the vendor.
  */
 #ifndef VENDOR_RELEASE
-#define VENDOR_RELEASE	6600
+#define VENDOR_RELEASE	XORG_VERSION_CURRENT
 #endif
 
 /*
diff --git a/xorg-server/include/version-config.h b/xorg-server/include/version-config.h
new file mode 100644
index 000000000..b8d482ce8
--- /dev/null
+++ b/xorg-server/include/version-config.h
@@ -0,0 +1,16 @@
+/* version-config.h.in: not generated */
+
+#ifndef VERSION_CONFIG_H
+#define VERSION_CONFIG_H
+
+/* Vendor man version */
+#undef VENDOR_MAN_VERSION
+
+/* Vendor name */
+#define VENDOR_NAME  "HC-Consult"
+
+/* Vendor release */
+#define VENDOR_RELEASE  XORG_VERSION_CURRENT
+
+#endif /* VERSION_CONFIG_H */
+
diff --git a/xorg-server/include/windowstr.h b/xorg-server/include/windowstr.h
index 222de31dc..04553f831 100644
--- a/xorg-server/include/windowstr.h
+++ b/xorg-server/include/windowstr.h
@@ -141,7 +141,7 @@ typedef struct _Window {
     RegionRec		borderSize;
     DDXPointRec		origin;		/* position relative to parent */
     unsigned short	borderWidth;
-    unsigned short	deliverableEvents; /* all masks from all clients */
+    unsigned long	deliverableEvents; /* all masks from all clients */
     Mask		eventMask;      /* mask from the creating client */
     PixUnion		background;
     PixUnion		border;
diff --git a/xorg-server/include/xkb-config.h b/xorg-server/include/xkb-config.h
new file mode 100644
index 000000000..9f7dac59e
--- /dev/null
+++ b/xorg-server/include/xkb-config.h
@@ -0,0 +1,36 @@
+/* include/xkb-config.h.  Generated from xkb-config.h.in by configure.  */
+/* xkb-config.h.in: not at all generated.                      -*- c -*-
+ * 
+ */
+
+#ifndef _XKB_CONFIG_H_
+#define _XKB_CONFIG_H_
+
+/* Default set of XKB rules. */
+#define XKB_DFLT_RULES "xorg"
+
+/* Default XKB model. */
+#define XKB_DFLT_MODEL "pc104"
+
+/* Default XKB layout. */
+#define XKB_DFLT_LAYOUT "us"
+
+/* Default XKB variant. */
+#define XKB_DFLT_VARIANT ""
+
+/* Default XKB options. */
+#define XKB_DFLT_OPTIONS ""
+
+/* Path to XKB definitions. */
+#define XKB_BASE_DIRECTORY "xkbdata"
+
+/* Path to xkbcomp. */
+#define XKB_BIN_DIRECTORY "."
+
+/* XKB output dir for compiled keymaps. */
+#define XKM_OUTPUT_DIR "xkbdata/compiled/"
+
+/* Do not have `strcasecmp'. */
+/* #undef NEED_STRCASECMP */
+
+#endif /* _XKB_CONFIG_H_ */
diff --git a/xorg-server/include/xkbsrv.h b/xorg-server/include/xkbsrv.h
index c6f86f544..7b0053486 100644
--- a/xorg-server/include/xkbsrv.h
+++ b/xorg-server/include/xkbsrv.h
@@ -296,8 +296,8 @@ extern void xkbUnwrapProc(DeviceIntPtr, DeviceHandleProc, pointer);
 extern _X_EXPORT int	XkbReqCode;
 extern _X_EXPORT int	XkbEventBase;
 extern _X_EXPORT int	XkbKeyboardErrorCode;
-extern _X_EXPORT char *	XkbBaseDirectory;
-extern _X_EXPORT char *	XkbBinDirectory;
+extern _X_EXPORT const char *	XkbBaseDirectory;
+extern _X_EXPORT const char *	XkbBinDirectory;
 
 extern _X_EXPORT CARD32	xkbDebugFlags;
 
diff --git a/xorg-server/include/xkbstr.h b/xorg-server/include/xkbstr.h
index 4afe010d2..499512d7a 100644
--- a/xorg-server/include/xkbstr.h
+++ b/xorg-server/include/xkbstr.h
@@ -46,10 +46,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 typedef struct _XkbStateRec {
 	unsigned char   group; /* base + latched + locked */
+	unsigned char   locked_group;
 	/* FIXME: Why are base + latched short and not char?? */
 	unsigned short  base_group; /* physically ... down? */
 	unsigned short  latched_group;
-	unsigned char   locked_group;
 
 	unsigned char   mods; /* base + latched + locked */
 	unsigned char   base_mods; /* physically down */
diff --git a/xorg-server/include/xwin-config.h b/xorg-server/include/xwin-config.h
new file mode 100644
index 000000000..645a6cead
--- /dev/null
+++ b/xorg-server/include/xwin-config.h
@@ -0,0 +1,37 @@
+/*
+ * xwin-config.h.in
+ *
+ * This file has all defines used in the xwin ddx
+ *
+ */
+#include <dix-config.h>
+
+/* Winsock networking */
+#define HAS_WINSOCK
+
+/* Cygwin has /dev/windows for signaling new win32 messages */
+// let's should this for now #define HAS_DEVWINDOWS 1
+
+/* Switch on debug messages */ 
+/* #undef CYGDEBUG */
+/* #undef CYGWINDOWING_DEBUG */
+/* #undef CYGMULTIWINDOW_DEBUG */
+
+/* Define to 1 if unsigned long is 64 bits. */
+/* #undef _XSERVER64 */
+
+/* Do we require our own snprintf? */
+/* #undef NEED_SNPRINTF */
+
+/* Short vendor name */
+#define XVENDORNAMESHORT "VcXsrv"
+
+/* Vendor web address for support */
+#define __VENDORDWEBSUPPORT__ "http://www.hc-consult.be/"
+
+/* Default log location */
+#define DEFAULT_LOGDIR "."
+
+/* Location of system.XWinrc */
+#define SYSCONFDIR "."
+