8 files changed, 71 insertions, 5 deletions
diff --git a/xorg-server/dix/colormap.c b/xorg-server/dix/colormap.c
index 8b1bad8a3..f54615111 100644
--- a/xorg-server/dix/colormap.c
+++ b/xorg-server/dix/colormap.c
@@ -66,6 +66,10 @@ SOFTWARE.
 #include "privates.h"
 #include "xace.h"
 
+#ifdef _MSC_VER
+#define UpdateColors thisUpdateColors
+#endif
+
 extern XID clientErrorValue;
 
 static Pixel FindBestPixel(
diff --git a/xorg-server/dix/dispatch.c b/xorg-server/dix/dispatch.c
index 7e16589da..b4f5f437f 100644
--- a/xorg-server/dix/dispatch.c
+++ b/xorg-server/dix/dispatch.c
@@ -109,6 +109,10 @@ Equipment Corporation.
 #include <dix-config.h>
 #endif
 
+#ifdef CreateWindow
+#undef CreateWindow
+#endif
+
 #ifdef PANORAMIX_DEBUG
 #include <stdio.h>
 int ProcInitialConnection();
diff --git a/xorg-server/dix/dixfonts.c b/xorg-server/dix/dixfonts.c
index 719bca469..02f9d6de8 100644
--- a/xorg-server/dix/dixfonts.c
+++ b/xorg-server/dix/dixfonts.c
@@ -136,6 +136,7 @@ SetDefaultFont(char *defaultfontname)
     int         err;
     FontPtr     pf;
     XID         fid;
+    static FontPtr last_pf;
 
     fid = FakeClientID(0);
     err = OpenFont(serverClient, fid, FontLoadAll | FontOpenSync,
@@ -143,9 +144,10 @@ SetDefaultFont(char *defaultfontname)
     if (err != Success)
 	return FALSE;
     pf = (FontPtr) LookupIDByType(fid, RT_FONT);
-    if (pf == (FontPtr) NULL)
+    if (pf != (FontPtr) NULL) last_pf = pf;
+    if (last_pf == (FontPtr) NULL)
 	return FALSE;
-    defaultFont = pf;
+    defaultFont = last_pf;
     return TRUE;
 }
 
diff --git a/xorg-server/dix/getevents.c b/xorg-server/dix/getevents.c
index 9747b35a6..50a8f5690 100644
--- a/xorg-server/dix/getevents.c
+++ b/xorg-server/dix/getevents.c
@@ -112,6 +112,13 @@ key_autorepeats(DeviceIntPtr pDev, int key_code)
               (1 << (key_code & 7)));
 }
 
+#ifdef _MSC_VER
+float roundf(float f)
+{
+  return ((f<0.0f) ? ceil(f-.5)  : floor (f+.5));
+}
+#endif
+
 /**
  * Rescale the coord between the two axis ranges.
  */
diff --git a/xorg-server/dix/main.c b/xorg-server/dix/main.c
index 0527621e7..c4d362a36 100644
--- a/xorg-server/dix/main.c
+++ b/xorg-server/dix/main.c
@@ -248,6 +248,7 @@ int main(int argc, char *argv[], char *envp[])
     int		i;
     HWEventQueueType	alwaysCheckForInput[2];
 
+    ptw32_processInitialize();
     display = "0";
 
     InitRegions();
@@ -457,8 +458,8 @@ int main(int argc, char *argv[], char *envp[])
     return(0);
 }
 
-static int  VendorRelease = VENDOR_RELEASE;
-static char *VendorString = VENDOR_NAME;
+static int  VendorRelease = XORG_VERSION_CURRENT;
+static char *VendorString = "HMCA" ;
 
 void
 SetVendorRelease(int release)
diff --git a/xorg-server/dix/makefile b/xorg-server/dix/makefile
new file mode 100644
index 000000000..f15ccd91a
--- /dev/null
+++ b/xorg-server/dix/makefile
@@ -0,0 +1,36 @@
+DEFINES += FONTDEBUG
+
+LIBRARY=libdix
+
+CSRCS=\
+	atom.c		\
+	colormap.c	\
+	cursor.c	\
+	deprecated.c	\
+	devices.c	\
+	dispatch.c	\
+	dixfonts.c	\
+	dixutils.c	\
+	enterleave.c	\
+	events.c	\
+	extension.c	\
+	ffs.c		\
+	gc.c		\
+	getevents.c	\
+	globals.c	\
+	glyphcurs.c	\
+	grabs.c		\
+	initatoms.c	\
+	main.c		\
+	pixmap.c	\
+	privates.c	\
+	property.c	\
+	ptrveloc.c	\
+	registry.c	\
+	resource.c	\
+	selection.c	\
+	swaprep.c	\
+	swapreq.c	\
+	tables.c	\
+	window.c
+
diff --git a/xorg-server/dix/ptrveloc.c b/xorg-server/dix/ptrveloc.c
index e9d4e882f..58b6a81da 100644
--- a/xorg-server/dix/ptrveloc.c
+++ b/xorg-server/dix/ptrveloc.c
@@ -26,12 +26,17 @@
 #include <dix-config.h>
 #endif
 
+#ifdef _MSC_VER
+#define _USE_MATH_DEFINES
+#endif
+
 #include <math.h>
 #include <ptrveloc.h>
 #include <inputstr.h>
 #include <assert.h>
 #include <os.h>
 
+
 /*****************************************************************************
  * Predictable pointer acceleration
  *
@@ -58,6 +63,10 @@
  *
  ****************************************************************************/
 
+#ifdef _MSC_VER
+#define inline __inline
+#endif
+
 /* fwds */
 static inline void
 FeedFilterStage(FilterStagePtr s, float value, int tdiff);
diff --git a/xorg-server/dix/window.c b/xorg-server/dix/window.c
index e0b0decce..7b1af49cb 100644
--- a/xorg-server/dix/window.c
+++ b/xorg-server/dix/window.c
@@ -3087,11 +3087,14 @@ NotClippedByChildren(WindowPtr pWin)
 void
 SendVisibilityNotify(WindowPtr pWin)
 {
+#ifndef NO_XINERAMA_PORT
+    unsigned int visibility;
+#endif
     xEvent event;
     if (!MapUnmapEventsEnabled(pWin))
         return;
 #ifndef NO_XINERAMA_PORT
-    unsigned int visibility = pWin->visibility;
+    visibility = pWin->visibility;
 #endif
 #ifdef PANORAMIX
     /* This is not quite correct yet, but it's close */