svn merge ^/branches/released .

31 files changed, 1284 insertions, 1309 deletions

diff --git a/xorg-server/config/config.c b/xorg-server/config/config.c
index 1ffbdcdad..5a7b0ea17 100644
--- a/xorg-server/config/config.c
+++ b/xorg-server/config/config.c
@@ -133,7 +133,7 @@ add_option(InputOption **options, const char *key, const char *value)
     *options = calloc(sizeof(**options), 1);

     if (!*options) /* Yeesh. */

         return;

-    (*options)->key = xstrdup(key);

-    (*options)->value = xstrdup(value);

+    (*options)->key = strdup(key);

+    (*options)->value = strdup(value);

     (*options)->next = NULL;

 }

diff --git a/xorg-server/config/dbus.c b/xorg-server/config/dbus.c
index 5d11feaa1..ec1008a4d 100644
--- a/xorg-server/config/dbus.c
+++ b/xorg-server/config/dbus.c
@@ -86,8 +86,8 @@ add_device(DBusMessage *message, DBusMessage *reply, DBusError *error)
         return BadAlloc;

     }

 

-    options->key = xstrdup("_source");

-    options->value = xstrdup("client/dbus");

+    options->key = strdup("_source");

+    options->value = strdup("client/dbus");

     if (!options->key || !options->value) {

         ErrorF("[config/dbus] couldn't allocate first key/value pair\n");

         ret = BadAlloc;

@@ -120,7 +120,7 @@ add_device(DBusMessage *message, DBusMessage *reply, DBusError *error)
                    tmp);

             MALFORMED_MESSAGE();

         }

-        options->key = xstrdup(tmp);

+        options->key = strdup(tmp);

         if (!options->key) {

             ErrorF("[config/dbus] couldn't duplicate key!\n");

             ret = BadAlloc;

@@ -136,7 +136,7 @@ add_device(DBusMessage *message, DBusMessage *reply, DBusError *error)
         dbus_message_iter_get_basic(&subiter, &tmp);

         if (!tmp)

             MALFORMED_MESSAGE();

-        options->value = xstrdup(tmp);

+        options->value = strdup(tmp);

         if (!options->value) {

             ErrorF("[config/dbus] couldn't duplicate option!\n");

             ret = BadAlloc;

diff --git a/xorg-server/config/hal.c b/xorg-server/config/hal.c
index 1245bb192..5ce7d7d48 100644
--- a/xorg-server/config/hal.c
+++ b/xorg-server/config/hal.c
@@ -81,7 +81,7 @@ get_prop_string(LibHalContext *hal_ctx, const char *udi, const char *name)
     prop = libhal_device_get_property_string(hal_ctx, udi, name, NULL);

     LogMessageVerb(X_INFO, 10, "config/hal: getting %s on %s returned %s\n", name, udi, prop ? prop : "(null)");

     if (prop) {

-        ret = xstrdup(prop);

+        ret = strdup(prop);

         libhal_free_string(prop);

     }

     else {

@@ -156,13 +156,13 @@ device_added(LibHalContext *hal_ctx, const char *udi)
         LogMessage(X_WARNING,"config/hal: no driver or path specified for %s\n", udi);

         goto unwind;

     }

-    attrs.device = xstrdup(path);

+    attrs.device = strdup(path);

 

     name = get_prop_string(hal_ctx, udi, "info.product");

     if (!name)

-        name = xstrdup("(unnamed)");

+        name = strdup("(unnamed)");

     else

-        attrs.product = xstrdup(name);

+        attrs.product = strdup(name);

 

     attrs.vendor = get_prop_string(hal_ctx, udi, "info.vendor");

     hal_tags = get_prop_string(hal_ctx, udi, "input.tags");

@@ -211,8 +211,8 @@ device_added(LibHalContext *hal_ctx, const char *udi)
         goto unwind;

     }

 

-    options->key = xstrdup("_source");

-    options->value = xstrdup("server/hal");

+    options->key = strdup("_source");

+    options->value = strdup("server/hal");

     if (!options->key || !options->value) {

         LogMessage(X_ERROR, "config/hal: couldn't allocate first key/value pair\n");

         goto unwind;

@@ -387,7 +387,7 @@ device_added(LibHalContext *hal_ctx, const char *udi)
 

     for (; dev; dev = dev->next){

         free(dev->config_info);

-        dev->config_info = xstrdup(config_info);

+        dev->config_info = strdup(config_info);

     }

 

 unwind:

diff --git a/xorg-server/config/udev.c b/xorg-server/config/udev.c
index bf463168e..da4fe15cb 100644
--- a/xorg-server/config/udev.c
+++ b/xorg-server/config/udev.c
@@ -86,8 +86,8 @@ device_added(struct udev_device *udev_device)
     if (!options)

         return;

 

-    options->key = xstrdup("_source");

-    options->value = xstrdup("server/udev");

+    options->key = strdup("_source");

+    options->value = strdup("server/udev");

     if (!options->key || !options->value)

         goto unwind;

 

@@ -197,7 +197,7 @@ device_added(struct udev_device *udev_device)
 

     for (; dev; dev = dev->next) {

         free(dev->config_info);

-        dev->config_info = xstrdup(config_info);

+        dev->config_info = strdup(config_info);

     }

 

  unwind:

diff --git a/xorg-server/dix/dixfonts.c b/xorg-server/dix/dixfonts.c
index f46902419..1cc5a9161 100644
--- a/xorg-server/dix/dixfonts.c
+++ b/xorg-server/dix/dixfonts.c
@@ -1838,7 +1838,7 @@ SetDefaultFontPath(char *path)
     if (!start) {

 	temp_path = Xprintf("%s%sbuilt-ins", path, *path ? "," : "");

     } else {

-	temp_path = xstrdup(path);

+	temp_path = strdup(path);

     }

     if (!temp_path)

         return BadAlloc;

diff --git a/xorg-server/exa/exa_classic.c b/xorg-server/exa/exa_classic.c
index 8b92d6880..8f24daeeb 100644
--- a/xorg-server/exa/exa_classic.c
+++ b/xorg-server/exa/exa_classic.c
@@ -257,9 +257,10 @@ exaPixmapHasGpuCopy_classic(PixmapPtr pPixmap)
     Bool ret;

 

     if (pExaScr->info->PixmapIsOffscreen) {

+	void* old_ptr = pPixmap->devPrivate.ptr;

 	pPixmap->devPrivate.ptr = ExaGetPixmapAddress(pPixmap);

 	ret = pExaScr->info->PixmapIsOffscreen(pPixmap);

-	pPixmap->devPrivate.ptr = NULL;

+	pPixmap->devPrivate.ptr = old_ptr;

     } else

 	ret = (pExaPixmap->use_gpu_copy && pExaPixmap->fb_ptr);

 

diff --git a/xorg-server/exa/exa_glyphs.c b/xorg-server/exa/exa_glyphs.c
index 36217dc59..15ef61b1e 100644
--- a/xorg-server/exa/exa_glyphs.c
+++ b/xorg-server/exa/exa_glyphs.c
@@ -127,15 +127,11 @@ exaUnrealizeGlyphCaches(ScreenPtr    pScreen,
 	    cache->picture = NULL;

 	}

 

-	if (cache->hashEntries) {

-	    free(cache->hashEntries);

-	    cache->hashEntries = NULL;

-	}

+	free(cache->hashEntries);

+	cache->hashEntries = NULL;

 	

-	if (cache->glyphs) {

-	    free(cache->glyphs);

-	    cache->glyphs = NULL;

-	}

+	free(cache->glyphs);

+	cache->glyphs = NULL;

 	cache->glyphCount = 0;

     }

 }

diff --git a/xorg-server/glx/glxcmds.c b/xorg-server/glx/glxcmds.c
index a4ac2b86b..35b2c4ee2 100644
--- a/xorg-server/glx/glxcmds.c
+++ b/xorg-server/glx/glxcmds.c
@@ -2437,7 +2437,7 @@ int __glXDisp_ClientInfo(__GLXclientState *cl, GLbyte *pc)
     cl->GLClientminorVersion = req->minor;

     free(cl->GLClientextensions);

     buf = (const char *)(req+1);

-    cl->GLClientextensions = xstrdup(buf);

+    cl->GLClientextensions = strdup(buf);

 

     return Success;

 }

diff --git a/xorg-server/glx/glxscreens.c b/xorg-server/glx/glxscreens.c
index 3d91e20d2..3ba8a64fc 100644
--- a/xorg-server/glx/glxscreens.c
+++ b/xorg-server/glx/glxscreens.c
@@ -360,9 +360,9 @@ void __glXScreenInit(__GLXscreen *pGlxScreen, ScreenPtr pScreen)
 	return;

 

     pGlxScreen->pScreen       = pScreen;

-    pGlxScreen->GLextensions  = xstrdup(GLServerExtensions);

-    pGlxScreen->GLXvendor     = xstrdup(GLXServerVendorName);

-    pGlxScreen->GLXextensions = xstrdup(GLXServerExtensions);

+    pGlxScreen->GLextensions  = strdup(GLServerExtensions);

+    pGlxScreen->GLXvendor     = strdup(GLXServerVendorName);

+    pGlxScreen->GLXextensions = strdup(GLXServerExtensions);

 

     /* All GLX providers must support all of the functionality required for at

      * least GLX 1.2.  If the provider supports a higher version, the GLXminor

diff --git a/xorg-server/hw/dmx/input/dmxinputinit.c b/xorg-server/hw/dmx/input/dmxinputinit.c
index 2e062ef79..0ea3e0953 100644
--- a/xorg-server/hw/dmx/input/dmxinputinit.c
+++ b/xorg-server/hw/dmx/input/dmxinputinit.c
@@ -885,7 +885,7 @@ static void dmxInputScanForExtensions(DMXInputInfo *dmxInput, int doXI)
                         && dmxL->deviceId < 0) {

                         dmxL->deviceId   = devices[i].id;

                         dmxL->deviceName = (devices[i].name

-                                            ? xstrdup(devices[i].name)

+                                            ? strdup(devices[i].name)

                                             : NULL);

                     }

                 }

@@ -918,7 +918,7 @@ static void dmxInputScanForExtensions(DMXInputInfo *dmxInput, int doXI)
                         dmxLocal->sendsCore  = FALSE;

                         dmxLocal->deviceId   = devices[i].id;

                         dmxLocal->deviceName = (devices[i].name

-                                                ? xstrdup(devices[i].name)

+                                                ? strdup(devices[i].name)

                                                 : NULL);

                     }

                 }

diff --git a/xorg-server/hw/dmx/input/usb-keyboard.c b/xorg-server/hw/dmx/input/usb-keyboard.c
index fcbea47f9..c2b49039f 100644
--- a/xorg-server/hw/dmx/input/usb-keyboard.c
+++ b/xorg-server/hw/dmx/input/usb-keyboard.c
@@ -439,6 +439,6 @@ void kbdUSBGetInfo(DevicePtr pDev, DMXLocalInitInfoPtr info)
     kbdUSBGetMap(pDev, &info->keySyms, info->modMap);

     info->focusClass       = 1;

     info->kbdFeedbackClass = 1;

-    info->names.keycodes   = xstrdup("powerpcps2");

+    info->names.keycodes   = strdup("powerpcps2");

     info->force            = 1;

 }

diff --git a/xorg-server/hw/kdrive/ephyr/ephyrhostvideo.c b/xorg-server/hw/kdrive/ephyr/ephyrhostvideo.c
index da573dacb..2b81c276c 100644
--- a/xorg-server/hw/kdrive/ephyr/ephyrhostvideo.c
+++ b/xorg-server/hw/kdrive/ephyr/ephyrhostvideo.c
@@ -831,10 +831,8 @@ out:
         XFreeGC (dpy, gc) ;

         gc = NULL ;

     }

-    if (rects) {

-        free (rects) ;

-        rects = NULL ;

-    }

+    free(rects);

+    rects = NULL;

     EPHYR_LOG ("leave\n") ;

     return is_ok ;

 }

diff --git a/xorg-server/hw/kdrive/ephyr/hostx.c b/xorg-server/hw/kdrive/ephyr/hostx.c
index 4eb9cc1c0..320541f82 100644
--- a/xorg-server/hw/kdrive/ephyr/hostx.c
+++ b/xorg-server/hw/kdrive/ephyr/hostx.c
@@ -683,11 +683,8 @@ hostx_screen_init (EphyrScreenInfo screen,
 	}

       else

 	{

-	  if (host_screen->ximg->data) 

-	    {

-	      free(host_screen->ximg->data);

-	      host_screen->ximg->data = NULL;

-	    } 

+	  free(host_screen->ximg->data);

+	  host_screen->ximg->data = NULL;

 

 	  XDestroyImage(host_screen->ximg);

 	}

@@ -1186,10 +1183,8 @@ out:
         XFree (visuals) ;

         visuals = NULL;

     }

-    if (host_visuals) {

-        free (host_visuals) ;

-        host_visuals = NULL;

-    }

+    free(host_visuals);

+    host_visuals = NULL;

     EPHYR_LOG ("leave\n") ;

     return is_ok ;

 

@@ -1322,10 +1317,8 @@ hostx_set_window_bounding_rectangles (int a_window,
 #endif

     is_ok = TRUE ;

 

-    if (rects) {

-        free (rects) ;

-        rects = NULL ;

-    }

+    free(rects);

+    rects = NULL;

     EPHYR_LOG ("leave\n") ;

     return is_ok;

 }

@@ -1363,10 +1356,8 @@ hostx_set_window_clipping_rectangles (int a_window,
 #endif

     is_ok = TRUE ;

 

-    if (rects) {

-        free (rects) ;

-        rects = NULL ;

-    }

+    free(rects);

+    rects = NULL;

     EPHYR_LOG ("leave\n") ;

     return is_ok;

 }

diff --git a/xorg-server/hw/kdrive/src/kinput.c b/xorg-server/hw/kdrive/src/kinput.c
index d1b12b890..5b17163da 100644
--- a/xorg-server/hw/kdrive/src/kinput.c
+++ b/xorg-server/hw/kdrive/src/kinput.c
@@ -942,7 +942,7 @@ KdAddConfigKeyboard (char *keyboard)
     if (!new)

         return BadAlloc;

 

-    new->line = xstrdup(keyboard);

+    new->line = strdup(keyboard);

     new->next = NULL;

 

     for (prev = &kdConfigKeyboards; *prev; prev = &(*prev)->next);

@@ -1010,7 +1010,7 @@ KdAddConfigPointer (char *pointer)
     if (!new)

         return BadAlloc;

 

-    new->line = xstrdup(pointer);

+    new->line = strdup(pointer);

     new->next = NULL;

 

     for (prev = &kdConfigPointers; *prev; prev = &(*prev)->next);

@@ -1090,11 +1090,11 @@ KdGetOptions (InputOption **options, char *string)
         newopt->key = (char *)malloc(tam_key);

         strncpy(newopt->key, string, tam_key);

         newopt->key[tam_key] = '\0';

-        newopt->value = xstrdup(strchr(string, '=') + 1);

+        newopt->value = strdup(strchr(string, '=') + 1);

     }

     else

     {

-        newopt->key = xstrdup(string);

+        newopt->key = strdup(string);

         newopt->value = NULL;

     }

     newopt->next = NULL;

@@ -1170,7 +1170,7 @@ KdParseKeyboard (char *arg)
     if (strcmp (save, "auto") == 0)

         ki->driverPrivate = NULL;

     else

-        ki->driverPrivate = xstrdup(save);

+        ki->driverPrivate = strdup(save);

 

     if (delim != ',')

     {

@@ -1266,7 +1266,7 @@ KdParsePointer (char *arg)
     if (strcmp(save, "auto") == 0)

         pi->driverPrivate = NULL;

     else

-        pi->driverPrivate = xstrdup(save);

+        pi->driverPrivate = strdup(save);

 

     if (delim != ',')

     {

diff --git a/xorg-server/hw/xfree86/common/xf86Configure.c b/xorg-server/hw/xfree86/common/xf86Configure.c
index c2b7464cd..94398dff5 100644
--- a/xorg-server/hw/xfree86/common/xf86Configure.c
+++ b/xorg-server/hw/xfree86/common/xf86Configure.c
@@ -277,16 +277,16 @@ configureInputSection (void)
     mouse->inp_identifier = "Mouse0";

     mouse->inp_driver = "mouse";

     mouse->inp_option_lst = 

-		xf86addNewOption(mouse->inp_option_lst, xstrdup("Protocol"),

-				xstrdup(DFLT_MOUSE_PROTO));

+		xf86addNewOption(mouse->inp_option_lst, strdup("Protocol"),

+				strdup(DFLT_MOUSE_PROTO));

 #ifndef __SCO__

     mouse->inp_option_lst = 

-		xf86addNewOption(mouse->inp_option_lst, xstrdup("Device"),

-				xstrdup(DFLT_MOUSE_DEV));

+		xf86addNewOption(mouse->inp_option_lst, strdup("Device"),

+				strdup(DFLT_MOUSE_DEV));

 #endif

     mouse->inp_option_lst = 

-		xf86addNewOption(mouse->inp_option_lst, xstrdup("ZAxisMapping"),

-				xstrdup("4 5 6 7"));

+		xf86addNewOption(mouse->inp_option_lst, strdup("ZAxisMapping"),

+				strdup("4 5 6 7"));

     ptr = (XF86ConfInputPtr)xf86addListItem((glp)ptr, (glp)mouse);

     return ptr;

 }

@@ -389,7 +389,7 @@ configureDeviceSection (int screennum)
 	    "        ### <string>: \"String\", <freq>: \"<f> Hz/kHz/MHz\",\n"

 	    "        ### <percent>: \"<f>%\"\n"

 	    "        ### [arg]: arg optional\n";

-	ptr->dev_comment = xstrdup(descrip);

+	ptr->dev_comment = strdup(descrip);

 	if (ptr->dev_comment) {

     	    for (p = DevToConfig[screennum].GDev.options;

 		 p->name != NULL; p++) {

@@ -440,7 +440,7 @@ configureLayoutSection (void)
 	iptr->iref_option_lst = NULL;

 	iptr->iref_inputdev_str = "Mouse0";

 	iptr->iref_option_lst =

-		xf86addNewOption (iptr->iref_option_lst, xstrdup("CorePointer"), NULL);

+		xf86addNewOption (iptr->iref_option_lst, strdup("CorePointer"), NULL);

 	ptr->lay_input_lst = (XF86ConfInputrefPtr)

 		xf86addListItem ((glp) ptr->lay_input_lst, (glp) iptr);

     }

@@ -453,7 +453,7 @@ configureLayoutSection (void)
 	iptr->iref_option_lst = NULL;

 	iptr->iref_inputdev_str = "Keyboard0";

 	iptr->iref_option_lst =

-		xf86addNewOption (iptr->iref_option_lst, xstrdup("CoreKeyboard"), NULL);

+		xf86addNewOption (iptr->iref_option_lst, strdup("CoreKeyboard"), NULL);

 	ptr->lay_input_lst = (XF86ConfInputrefPtr)

 		xf86addListItem ((glp) ptr->lay_input_lst, (glp) iptr);

     }

@@ -626,7 +626,7 @@ configureDDCMonitorSection (int screennum)
                              ptr);

 

     if (ConfiguredMonitor->features.dpms) {

-      ptr->mon_option_lst = xf86addNewOption(ptr->mon_option_lst, xstrdup("DPMS"), NULL);

+      ptr->mon_option_lst = xf86addNewOption(ptr->mon_option_lst, strdup("DPMS"), NULL);

     }

 

     return ptr;

diff --git a/xorg-server/hw/xfree86/common/xf86Option.c b/xorg-server/hw/xfree86/common/xf86Option.c
index 5b20229a9..8dce3ad0f 100644
--- a/xorg-server/hw/xfree86/common/xf86Option.c
+++ b/xorg-server/hw/xfree86/common/xf86Option.c
@@ -209,7 +209,7 @@ LookupStrOption(pointer optlist, const char *name, char *deflt, Bool markUsed)
     if (ParseOptionValue(-1, optlist, &o, markUsed))

         deflt = o.value.str;

     if (deflt)

-	return xstrdup(deflt);

+	return strdup(deflt);

     else

 	return NULL;

 }

diff --git a/xorg-server/hw/xfree86/loader/loadmod.c b/xorg-server/hw/xfree86/loader/loadmod.c
index 171f0521e..82739e46e 100644
--- a/xorg-server/hw/xfree86/loader/loadmod.c
+++ b/xorg-server/hw/xfree86/loader/loadmod.c
@@ -135,7 +135,7 @@ InitPathList(const char *path)
     if (!path)

 	return defaultPathList;

 

-    fullpath = xstrdup(path);

+    fullpath = strdup(path);

     if (!fullpath)

 	return NULL;

     elem = strtok(fullpath, ",");

@@ -353,7 +353,7 @@ InitSubdirs(const char **subdirlist)
 	    sprintf(subdirs[i], "%s%s%s/", *s, slash, osname);

 	    i++;

 	    /* path as given */

-	    subdirs[i] = xstrdup(*s);

+	    subdirs[i] = strdup(*s);

 	    i++;

 	    s++;

 	    if (indefault && !s) {

@@ -1246,7 +1246,7 @@ LoaderGetCanonicalName(const char *modname, PatternPtr patterns)
 	}

 

     /* If there is no match, return the whole name minus the leading path */

-    return xstrdup(s);

+    return strdup(s);

 }

 

 /*

diff --git a/xorg-server/hw/xfree86/modes/xf86Cursors.c b/xorg-server/hw/xfree86/modes/xf86Cursors.c
index e9770f8b9..4cf6147bb 100644
--- a/xorg-server/hw/xfree86/modes/xf86Cursors.c
+++ b/xorg-server/hw/xfree86/modes/xf86Cursors.c
@@ -659,11 +659,8 @@ xf86_cursors_fini (ScreenPtr screen)
 	xf86DestroyCursorInfoRec (xf86_config->cursor_info);

 	xf86_config->cursor_info = NULL;

     }

-    if (xf86_config->cursor_image)

-    {

-	free(xf86_config->cursor_image);

-	xf86_config->cursor_image = NULL;

-    }

+    free(xf86_config->cursor_image);

+    xf86_config->cursor_image = NULL;

     if (xf86_config->cursor)

     {

 	FreeCursor (xf86_config->cursor, None);

diff --git a/xorg-server/hw/xfree86/os-support/bus/Sbus.c b/xorg-server/hw/xfree86/os-support/bus/Sbus.c
index 4560ef016..7c4888126 100644
--- a/xorg-server/hw/xfree86/os-support/bus/Sbus.c
+++ b/xorg-server/hw/xfree86/os-support/bus/Sbus.c
@@ -191,10 +191,8 @@ sparcPromClose(void)
 	close(promFd);

 	promFd = -1;

     }

-    if (promOpio) {

-	free(promOpio);

-	promOpio = NULL;

-    }

+    free(promOpio);

+    promOpio = NULL;

     promOpenCount = 0;

 }

 

diff --git a/xorg-server/hw/xquartz/GL/indirect.c b/xorg-server/hw/xquartz/GL/indirect.c
index b40f38d31..b432ec750 100644
--- a/xorg-server/hw/xquartz/GL/indirect.c
+++ b/xorg-server/hw/xquartz/GL/indirect.c
@@ -595,12 +595,12 @@ static __GLXscreen * __glXAquaScreenProbe(ScreenPtr pScreen) {
 

     __glXScreenInit(&screen->base, pScreen);

 

-    screen->base.GLXversion = xstrdup("1.4");

-    screen->base.GLXextensions = xstrdup("GLX_SGIX_fbconfig "

-					 "GLX_SGIS_multisample "

-					 "GLX_ARB_multisample "

-					 "GLX_EXT_visual_info "

-					 "GLX_EXT_import_context ");

+    screen->base.GLXversion = strdup("1.4");

+    screen->base.GLXextensions = strdup("GLX_SGIX_fbconfig "

+                                        "GLX_SGIS_multisample "

+                                        "GLX_ARB_multisample "

+                                        "GLX_EXT_visual_info "

+                                        "GLX_EXT_import_context ");

     

     /*We may be able to add more GLXextensions at a later time. */

     

diff --git a/xorg-server/hw/xwin/InitOutput.c b/xorg-server/hw/xwin/InitOutput.c
index 2cd7bab08..14d88894b 100644
--- a/xorg-server/hw/xwin/InitOutput.c
+++ b/xorg-server/hw/xwin/InitOutput.c
@@ -1,1165 +1,1162 @@
-
-/*
-
-Copyright 1993, 1998  The Open Group
-Copyright (C) Colin Harrison 2005-2008
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-*/
-
-#ifdef HAVE_XWIN_CONFIG_H
-#include <xwin-config.h>
-#endif
-#include "win.h"
-#include "winmsg.h"
-#include "winconfig.h"
-#include "winprefs.h"
-#ifdef XWIN_CLIPBOARD
-#include "X11/Xlocale.h"
-#endif
-#ifdef DPMSExtension
-#include "dpmsproc.h"
-#endif
-#ifdef __CYGWIN__
-#include <mntent.h>
-#endif
-#if defined(WIN32)
-#include "xkbsrv.h"
-#endif
-#ifdef RELOCATE_PROJECTROOT
-#undef Status
-#include <shlobj.h>
-typedef HRESULT  (__stdcall *  SHGETFOLDERPATHPROC)(
-    HWND hwndOwner,
-    int nFolder,
-    HANDLE hToken,
-    DWORD dwFlags,
-    LPSTR pszPath
-);
-#endif
-
-
-/*
- * References to external symbols
- */
-
-extern int			g_iNumScreens;
-extern winScreenInfo *		g_ScreenInfo;
-extern char *			g_pszCommandLine;
-extern Bool			g_fSilentFatalError;
-
-extern const char *		g_pszLogFile;
-extern Bool			g_fLogFileChanged;
-extern int			g_iLogVerbose;
-Bool				g_fLogInited;
-
-extern Bool			g_fXdmcpEnabled;
-extern Bool			g_fAuthEnabled;
-#ifdef HAS_DEVWINDOWS
-extern int			g_fdMessageQueue;
-#endif
-extern const char *		g_pszQueryHost;
-extern HINSTANCE		g_hInstance;
-
-#ifdef XWIN_CLIPBOARD
-extern Bool			g_fUnicodeClipboard;
-extern Bool			g_fClipboardLaunched;
-extern Bool			g_fClipboardStarted;
-extern pthread_t		g_ptClipboardProc;
-extern HWND			g_hwndClipboard;
-extern Bool			g_fClipboard;
-#endif
-
-extern HMODULE			g_hmodDirectDraw;
-extern FARPROC			g_fpDirectDrawCreate;
-extern FARPROC			g_fpDirectDrawCreateClipper;
-  
-extern HMODULE			g_hmodCommonControls;
-extern FARPROC			g_fpTrackMouseEvent;
-extern Bool			g_fNoHelpMessageBox;                     
-extern Bool			g_fSilentDupError;                     
-extern Bool                     g_fNativeGl;
-
-/*
- * Function prototypes
- */
-
-#ifdef XWIN_CLIPBOARD
-static void
-winClipboardShutdown (void);
-#endif
-
-#if defined(DDXOSVERRORF)
-void
-OsVendorVErrorF (const char *pszFormat, va_list va_args);
-#endif
-
-static Bool
-winCheckDisplayNumber (void);
-
-void
-winLogCommandLine (int argc, char *argv[]);
-
-void
-winLogVersionInfo (void);
-
-Bool
-winValidateArgs (void);
-
-#ifdef RELOCATE_PROJECTROOT
-const char *
-winGetBaseDir(void);
-#endif
-
-static
-void glx_debugging(void);
-
-/*
- * For the depth 24 pixmap we default to 32 bits per pixel, but
- * we change this pixmap format later if we detect that the display
- * is going to be running at 24 bits per pixel.
- *
- * FIXME: On second thought, don't DIBs only support 32 bits per pixel?
- * DIBs are the underlying bitmap used for DirectDraw surfaces, so it
- * seems that all pixmap formats with depth 24 would be 32 bits per pixel.
- * Confirm whether depth 24 DIBs can have 24 bits per pixel, then remove/keep
- * the bits per pixel adjustment and update this comment to reflect the
- * situation.  Harold Hunt - 2002/07/02
- */
-
-static PixmapFormatRec g_PixmapFormats[] = {
-  { 1,    1,      BITMAP_SCANLINE_PAD },
-  { 4,    8,      BITMAP_SCANLINE_PAD },
-  { 8,    8,      BITMAP_SCANLINE_PAD },
-  { 15,   16,     BITMAP_SCANLINE_PAD },
-  { 16,   16,     BITMAP_SCANLINE_PAD },
-  { 24,   32,     BITMAP_SCANLINE_PAD },
-  { 32,   32,     BITMAP_SCANLINE_PAD }
-};
-
-const int NUMFORMATS = sizeof (g_PixmapFormats) / sizeof (g_PixmapFormats[0]);
-
-#ifdef XWIN_CLIPBOARD
-static void
-winClipboardShutdown (void)
-{
-  /* Close down clipboard resources */
-  if (g_fClipboard && g_fClipboardLaunched && g_fClipboardStarted)
-    {
-      /* Synchronously destroy the clipboard window */
-      if (g_hwndClipboard != NULL)
-	{
-	  SendMessage (g_hwndClipboard, WM_DESTROY, 0, 0);
-	  /* NOTE: g_hwndClipboard is set to NULL in winclipboardthread.c */
-	}
-      else
-	return;
-      
-      /* Wait for the clipboard thread to exit */
-      pthread_join (g_ptClipboardProc, NULL);
-
-      winDebug ("winClipboardShutdown - Clipboard thread has exited.\n");
-    }
-}
-#endif
-
-
-#if defined(DDXBEFORERESET)
-/*
- * Called right before KillAllClients when the server is going to reset,
- * allows us to shutdown our seperate threads cleanly.
- */
-
-void
-ddxBeforeReset (void)
-{
-  winDebug ("ddxBeforeReset - Hello\n");
-
-#ifdef XWIN_CLIPBOARD
-  winClipboardShutdown ();
-#endif
-}
-#endif
-
-
-/* See Porting Layer Definition - p. 57 */
-void
-ddxGiveUp (void)
-{
-  int		i;
-
-  winDebug ("ddxGiveUp\n");
-
-  /* Perform per-screen deinitialization */
-  for (i = 0; i < g_iNumScreens; ++i)
-    {
-      /* Delete the tray icon */
-      if (!g_ScreenInfo[i].fNoTrayIcon && g_ScreenInfo[i].pScreen)
- 	winDeleteNotifyIcon (winGetScreenPriv (g_ScreenInfo[i].pScreen));
-    }
-
-#ifdef XWIN_MULTIWINDOW
-  /* Notify the worker threads we're exiting */
-  winDeinitMultiWindowWM ();
-#endif
-
-#ifdef HAS_DEVWINDOWS
-  /* Close our handle to our message queue */
-  if (g_fdMessageQueue != WIN_FD_INVALID)
-    {
-      /* Close /dev/windows */
-      close (g_fdMessageQueue);
-
-      /* Set the file handle to invalid */
-      g_fdMessageQueue = WIN_FD_INVALID;
-    }
-#endif
-
-  if (!g_fLogInited) {
-    g_pszLogFile = LogInit (g_pszLogFile, NULL);
-    g_fLogInited = TRUE;
-  }  
-  LogClose ();
-
-  /*
-   * At this point we aren't creating any new screens, so
-   * we are guaranteed to not need the DirectDraw functions.
-   */
-  if (g_hmodDirectDraw != NULL)
-    {
-      FreeLibrary (g_hmodDirectDraw);
-      g_hmodDirectDraw = NULL;
-      g_fpDirectDrawCreate = NULL;
-      g_fpDirectDrawCreateClipper = NULL;
-    }
-
-  /* Unload our TrackMouseEvent funtion pointer */
-  if (g_hmodCommonControls != NULL)
-    {
-      FreeLibrary (g_hmodCommonControls);
-      g_hmodCommonControls = NULL;
-      g_fpTrackMouseEvent = (FARPROC) (void (*)(void))NoopDDA;
-    }
-  
-  /* Free concatenated command line */
-  if (g_pszCommandLine)
-    {
-      free (g_pszCommandLine);
-      g_pszCommandLine = NULL;
-    }
-
-  /* Remove our keyboard hook if it is installed */
-  winRemoveKeyboardHookLL ();
-
-  /* Tell Windows that we want to end the app */
-  PostQuitMessage (0);
-}
-
-
-/* See Porting Layer Definition - p. 57 */
-void
-AbortDDX (void)
-{
-  winDebug ("AbortDDX\n");
-  ddxGiveUp ();
-}
-
-#ifdef __CYGWIN__
-/* hasmntopt is currently not implemented for cygwin */
-static const char *winCheckMntOpt(const struct mntent *mnt, const char *opt)
-{
-    const char *s;
-    size_t len;
-    if (mnt == NULL)
-        return NULL;
-    if (opt == NULL)
-        return NULL;
-    if (mnt->mnt_opts == NULL)
-        return NULL;
-
-    len = strlen(opt);
-    s = strstr(mnt->mnt_opts, opt);
-    if (s == NULL)
-        return NULL;
-    if ((s == mnt->mnt_opts || *(s-1) == ',') &&  (s[len] == 0 || s[len] == ','))
-        return (char *)opt;
-    return NULL;
-}
-
-static void
-winCheckMount(void)
-{
-  FILE *mnt;
-  struct mntent *ent;
-
-  enum { none = 0, sys_root, user_root, sys_tmp, user_tmp } 
-    level = none, curlevel;
-  BOOL binary = TRUE;
-
-  mnt = setmntent("/etc/mtab", "r");
-  if (mnt == NULL)
-  {
-    ErrorF("setmntent failed");
-    return;
-  }
-
-  while ((ent = getmntent(mnt)) != NULL)
-  {
-    BOOL system = (winCheckMntOpt(ent, "user") != NULL);
-    BOOL root = (strcmp(ent->mnt_dir, "/") == 0);
-    BOOL tmp = (strcmp(ent->mnt_dir, "/tmp") == 0);
-    
-    if (system)
-    {
-      if (root)
-        curlevel = sys_root;
-      else if (tmp)
-        curlevel = sys_tmp;
-      else
-        continue;
-    }
-    else
-    {
-      if (root)
-        curlevel = user_root;
-      else if (tmp) 
-        curlevel = user_tmp;
-      else
-        continue;
-    }
-
-    if (curlevel <= level)
-      continue;
-    level = curlevel;
-
-    if ((winCheckMntOpt(ent, "binary") == NULL) &&
-        (winCheckMntOpt(ent, "binmode") == NULL))
-      binary = FALSE;
-    else
-      binary = TRUE;
-  }
-    
-  if (endmntent(mnt) != 1)
-  {
-    ErrorF("endmntent failed");
-    return;
-  }
-  
-#ifdef WINDBG
-  if (!binary) 
-    winDebug("/tmp mounted in textmode\n");
-#endif
-}
-#else
-static void
-winCheckMount(void) 
-{
-}
-#endif
-
-#ifdef RELOCATE_PROJECTROOT
-const char * 
-winGetBaseDir(void)
-{
-    static BOOL inited = FALSE;
-    static char buffer[MAX_PATH];
-    if (!inited)
-    {
-        char *fendptr;
-        HMODULE module = GetModuleHandle(NULL);
-        DWORD size = GetModuleFileName(module, buffer, sizeof(buffer));
-        if (sizeof(buffer) > 0)
-            buffer[sizeof(buffer)-1] = 0;
-    
-        fendptr = buffer + size;
-        while (fendptr > buffer)
-        {
-            if (*fendptr == '\\' || *fendptr == '/')
-            {
-                *fendptr = 0;
-                break;
-            }
-            fendptr--;
-        }
-        inited = TRUE;
-    }
-    return buffer;
-}
-#endif
-
-static void
-winFixupPaths (void)
-{
-    BOOL changed_fontpath = FALSE;
-    MessageType font_from = X_DEFAULT;
-#ifdef RELOCATE_PROJECTROOT
-    const char *basedir = winGetBaseDir();
-    size_t basedirlen = strlen(basedir);
-#endif
-
-#ifdef READ_FONTDIRS
-    {
-        /* Open fontpath configuration file */
-#if defined WIN32 && defined __MINGW32__
-        static Bool once = False;
-        char buffer[MAX_PATH];
-        snprintf(buffer, sizeof(buffer), "%s\\font-dirs", basedir);
-        buffer[sizeof(buffer)-1] = 0;
-        FILE *fontdirs = fopen(buffer, "rt");
-        if (once) fontdirs = NULL;
-        else once = True;
-#else
-        FILE *fontdirs = fopen(ETCX11DIR "/font-dirs", "rt");
-#endif
-        if (fontdirs != NULL)
-        {
-            char buffer[256];
-            int needs_sep = TRUE; 
-            int comment_block = FALSE;
-
-            /* get defautl fontpath */
-            char *fontpath = xstrdup(defaultFontPath);
-            size_t size = strlen(fontpath);
-
-            /* read all lines */
-            while (!feof(fontdirs))
-            {
-                size_t blen;
-                char *hashchar;
-                char *str;
-                int has_eol = FALSE;
-
-                /* read one line */
-                str = fgets(buffer, sizeof(buffer), fontdirs);
-                if (str == NULL) /* stop on error or eof */
-                    break;
-
-                if (strchr(str, '\n') != NULL)
-                    has_eol = TRUE;
-
-                /* check if block is continued comment */
-                if (comment_block)
-                {
-                    /* ignore all input */
-                    *str = 0; 
-                    blen = 0; 
-                    if (has_eol) /* check if line ended in this block */
-                        comment_block = FALSE;
-                }
-                else 
-                {
-                    /* find comment character. ignore all trailing input */
-                    hashchar = strchr(str, '#');
-                    if (hashchar != NULL)
-                    {
-                        *hashchar = 0;
-                        if (!has_eol) /* mark next block as continued comment */
-                            comment_block = TRUE;
-                    }
-                }
-
-                /* strip whitespaces from beginning */
-                while (*str == ' ' || *str == '\t')
-                    str++;
-
-                /* get size, strip whitespaces from end */ 
-                blen = strlen(str);
-                while (blen > 0 && (str[blen-1] == ' ' || 
-                            str[blen-1] == '\t' || str[blen-1] == '\n'))
-                {
-                    str[--blen] = 0;
-                }
-
-                /* still something left to add? */ 
-                if (blen > 0)
-                {
-                    size_t newsize = size + blen;
-                    /* reserve one character more for ',' */
-                    if (needs_sep)
-                        newsize++;
-
-                    /* allocate memory */
-                    if (fontpath == NULL)
-                        fontpath = malloc(newsize+1);
-                    else
-                        fontpath = realloc(fontpath, newsize+1);
-
-                    /* add separator */
-                    if (needs_sep)
-                    {
-                        fontpath[size] = ',';
-                        size++;
-                        needs_sep = FALSE;
-                    }
-
-                    /* mark next line as new entry */
-                    if (has_eol)
-                        needs_sep = TRUE;
-
-                    /* add block */
-                    strncpy(fontpath + size, str, blen);
-                    fontpath[newsize] = 0;
-                    size = newsize;
-                }
-            }
-
-            /* cleanup */
-            fclose(fontdirs);  
-            defaultFontPath = xstrdup(fontpath);
-            free(fontpath);
-            changed_fontpath = TRUE;
-            font_from = X_CONFIG;
-        }
-    }
-#endif /* READ_FONTDIRS */
-#ifdef RELOCATE_PROJECTROOT
-    {
-        const char *libx11dir = PROJECTROOT "/lib/X11";
-        size_t libx11dir_len = strlen(libx11dir);
-        char *newfp = NULL;
-        size_t newfp_len = 0;
-        const char *endptr, *ptr, *oldptr = defaultFontPath;
-
-        endptr = oldptr + strlen(oldptr);
-        ptr = strchr(oldptr, ',');
-        if (ptr == NULL)
-            ptr = endptr;
-        while (ptr != NULL)
-        {
-            size_t oldfp_len = (ptr - oldptr);
-            size_t newsize = oldfp_len;
-            char *newpath = malloc(newsize + 1);
-            strncpy(newpath, oldptr, newsize);
-            newpath[newsize] = 0;
-
-
-            if (strncmp(libx11dir, newpath, libx11dir_len) == 0)
-            {
-                char *compose;
-                newsize = newsize - libx11dir_len + basedirlen;
-                compose = malloc(newsize + 1);  
-                strcpy(compose, basedir);
-                strncat(compose, newpath + libx11dir_len, newsize - basedirlen);
-                compose[newsize] = 0;
-                free(newpath);
-                newpath = compose;
-            }
-
-            oldfp_len = newfp_len;
-            if (oldfp_len > 0)
-                newfp_len ++; /* space for separator */
-            newfp_len += newsize;
-
-            if (newfp == NULL)
-                newfp = malloc(newfp_len + 1);
-            else
-                newfp = realloc(newfp, newfp_len + 1);
-
-            if (oldfp_len > 0)
-            {
-                strcpy(newfp + oldfp_len, ",");
-                oldfp_len++;
-            }
-            strcpy(newfp + oldfp_len, newpath);
-
-            free(newpath);
-
-            if (*ptr == 0)
-            {
-                oldptr = ptr;
-                ptr = NULL;
-            } else
-            {
-                oldptr = ptr + 1;
-                ptr = strchr(oldptr, ',');
-                if (ptr == NULL)
-                    ptr = endptr;
-            }
-        } 
-
-        defaultFontPath = xstrdup(newfp);
-        free(newfp);
-        changed_fontpath = TRUE;
-    }
-#endif /* RELOCATE_PROJECTROOT */
-    if (changed_fontpath)
-        winDebug ("FontPath set to \"%s\"\n", defaultFontPath);
-
-#ifdef RELOCATE_PROJECTROOT
-    if (getenv("XKEYSYMDB") == NULL)
-    {
-        char buffer[MAX_PATH];
-        snprintf(buffer, sizeof(buffer), "XKEYSYMDB=%s\\XKeysymDB",
-                basedir);
-        buffer[sizeof(buffer)-1] = 0;
-        putenv(buffer);
-    }
-    if (getenv("XERRORDB") == NULL)
-    {
-        char buffer[MAX_PATH];
-        snprintf(buffer, sizeof(buffer), "XERRORDB=%s\\XErrorDB",
-                basedir);
-        buffer[sizeof(buffer)-1] = 0;
-        putenv(buffer);
-    }
-    if (getenv("XLOCALEDIR") == NULL)
-    {
-        char buffer[MAX_PATH];
-        snprintf(buffer, sizeof(buffer), "XLOCALEDIR=%s\\locale",
-                basedir);
-        buffer[sizeof(buffer)-1] = 0;
-        putenv(buffer);
-    }
-    if (getenv("XHOSTPREFIX") == NULL)
-    {
-        char buffer[MAX_PATH];
-        snprintf(buffer, sizeof(buffer), "XHOSTPREFIX=%s\\X",
-                basedir);
-        buffer[sizeof(buffer)-1] = 0;
-        putenv(buffer);
-    }
-    if (getenv("HOME") == NULL)
-    {
-        HMODULE shfolder;
-        SHGETFOLDERPATHPROC shgetfolderpath = NULL;
-        char buffer[MAX_PATH + 5];
-        strncpy(buffer, "HOME=", 5);
-
-        /* Try to load SHGetFolderPath from shfolder.dll and shell32.dll */
-        
-        shfolder = LoadLibrary("shfolder.dll");
-        /* fallback to shell32.dll */
-        if (shfolder == NULL)
-            shfolder = LoadLibrary("shell32.dll");
-
-        /* resolve SHGetFolderPath */
-        if (shfolder != NULL)
-            shgetfolderpath = (SHGETFOLDERPATHPROC)GetProcAddress(shfolder, "SHGetFolderPathA");
-
-        /* query appdata directory */
-        if (shgetfolderpath &&
-                shgetfolderpath(NULL, CSIDL_APPDATA|CSIDL_FLAG_CREATE, NULL, 0, 
-                    buffer + 5) == 0)
-        { 
-            putenv(buffer);
-        } else
-        {
-            ErrorF ("Can not determine HOME directory\n");
-        } 
-        if (shfolder != NULL)
-            FreeLibrary(shfolder);
-    }
-    if (!g_fLogFileChanged) {
-        static char buffer[MAX_PATH];
-        DWORD size = GetTempPath(sizeof(buffer), buffer);
-        if (size && size < sizeof(buffer))
-        {
-            snprintf(buffer + size, sizeof(buffer) - size, 
-                    "VCXSrv.%s.log", display); 
-            buffer[sizeof(buffer)-1] = 0;
-            g_pszLogFile = buffer;
-            GetLongPathName(buffer, buffer, MAX_PATH);
-            winDebug ("Logfile set to \"%s\"\n", g_pszLogFile);
-        }
-    }
-    {
-        static char xkbbasedir[MAX_PATH];
-
-        snprintf(xkbbasedir, sizeof(xkbbasedir), "%s\\xkbdata", basedir);
-        if (sizeof(xkbbasedir) > 0)
-            xkbbasedir[sizeof(xkbbasedir)-1] = 0;
-        XkbBaseDirectory = xkbbasedir;
-	XkbBinDirectory = basedir;
-    }
-#endif /* RELOCATE_PROJECTROOT */
-}
-
-void
-OsVendorInit (void)
-{
-  /* Re-initialize global variables on server reset */
-  winInitializeGlobals ();
-
-  winFixupPaths();
-
-#ifdef DDXOSVERRORF
-  if (!OsVendorVErrorFProc)
-    OsVendorVErrorFProc = OsVendorVErrorF;
-#endif
-
-  if (!g_fLogInited) {
-    /* keep this order. If LogInit fails it calls Abort which then calls
-     * ddxGiveUp where LogInit is called again and creates an infinite 
-     * recursion. If we set g_fLogInited to TRUE before the init we 
-     * avoid the second call 
-     */  
-    g_fLogInited = TRUE;
-    g_pszLogFile = LogInit (g_pszLogFile, NULL);
-  } 
-  LogSetParameter (XLOG_FLUSH, 1);
-  LogSetParameter (XLOG_VERBOSITY, g_iLogVerbose);
-  LogSetParameter (XLOG_FILE_VERBOSITY, g_iLogVerbose);
-
-  /* Log the version information */
-  if (serverGeneration == 1)
-    winLogVersionInfo ();
-
-  winCheckMount();  
-
-  /* Add a default screen if no screens were specified */
-  if (g_iNumScreens == 0)
-    {
-      winDebug ("OsVendorInit - Creating default screen 0\n");
-
-      /*
-       * We need to initialize the default screen 0 if no -screen
-       * arguments were processed.
-       *
-       * Add a screen 0 using the defaults set by winInitializeDefaultScreens()
-       * and any additional default screen parameters given
-       */
-      winInitializeScreens(1);
-
-      /* We have to flag this as an explicit screen, even though it isn't */
-      g_ScreenInfo[0].fExplicitScreen = TRUE;
-    }
-}
-
-
-static void
-winUseMsg (void)
-{
-  ErrorF("\n");
-  ErrorF("\n");
-  ErrorF(EXECUTABLE_NAME " Device Dependent Usage:\n");
-  ErrorF("\n");
-
-#ifdef XWIN_CLIPBOARD
-  ErrorF ("-[no]clipboard\n"
-	  "\tEnable [disable] the clipboard integration. Default is enabled.\n");
-#endif
-
-  ErrorF ("-clipupdates num_boxes\n"
-	  "\tUse a clipping region to constrain shadow update blits to\n"
-	  "\tthe updated region when num_boxes, or more, are in the\n"
-	  "\tupdated region.\n");
-
-#ifdef XWIN_XF86CONFIG
-  ErrorF ("-config\n"
-          "\tSpecify a configuration file.\n");
-
-  ErrorF ("-configdir\n"
-          "\tSpecify a configuration directory.\n");
-#endif
-
-  ErrorF ("-depth bits_per_pixel\n"
-	  "\tSpecify an optional bitdepth to use in fullscreen mode\n"
-	  "\twith a DirectDraw engine.\n");
-
-  ErrorF ("-emulate3buttons [timeout]\n"
-	  "\tEmulate 3 button mouse with an optional timeout in\n"
-	  "\tmilliseconds.\n");
-
-#ifdef XWIN_EMULATEPSEUDO
-  ErrorF ("-emulatepseudo\n"
-	  "\tCreate a depth 8 PseudoColor visual when running in\n"
-	  "\tdepths 15, 16, 24, or 32, collectively known as TrueColor\n"
-	  "\tdepths.  The PseudoColor visual does not have correct colors,\n"
-	  "\tand it may crash, but it at least allows you to run your\n"
-	  "\tapplication in TrueColor modes.\n");
-#endif
-
-  ErrorF ("-engine engine_type_id\n"
-	  "\tOverride the server's automatically selected engine type:\n"
-	  "\t\t1 - Shadow GDI\n"
-	  "\t\t2 - Shadow DirectDraw\n"
-	  "\t\t4 - Shadow DirectDraw4 Non-Locking\n"
-#ifdef XWIN_PRIMARYFB
-	  "\t\t8 - Primary DirectDraw\n"
-#endif
-#ifdef XWIN_NATIVEGDI
-	  "\t\t16 - Native GDI - experimental\n"
-#endif
-	  );
-
-  ErrorF ("-fullscreen\n"
-	  "\tRun the server in fullscreen mode.\n");
-
-  ErrorF ("-ignoreinput\n"
-	  "\tIgnore keyboard and mouse input.\n");
-
-#ifdef XWIN_MULTIWINDOWEXTWM
-  ErrorF ("-internalwm\n"
-	  "\tRun the internal window manager.\n");
-#endif
-
-#ifdef XWIN_XF86CONFIG
-  ErrorF ("-keyboard\n"
-	  "\tSpecify a keyboard device from the configuration file.\n");
-#endif
-
-  ErrorF ("-[no]keyhook\n"
-	  "\tGrab special Windows keypresses like Alt-Tab or the Menu "
-          "key.\n");
-
-  ErrorF ("-lesspointer\n"
-	  "\tHide the windows mouse pointer when it is over any\n"
-          "\t" EXECUTABLE_NAME " window.  This prevents ghost cursors appearing when\n"
-	  "\tthe Windows cursor is drawn on top of the X cursor\n");
-
-  ErrorF ("-logfile filename\n"
-	  "\tWrite log messages to <filename>.\n");
-
-  ErrorF ("-logverbose verbosity\n"
-	  "\tSet the verbosity of log messages. [NOTE: Only a few messages\n"
-	  "\trespect the settings yet]\n"
-	  "\t\t0 - only print fatal error.\n"
-	  "\t\t1 - print additional configuration information.\n"
-	  "\t\t2 - print additional runtime information [default].\n"
-	  "\t\t3 - print debugging and tracing information.\n");
-
-  ErrorF ("-[no]multimonitors or -[no]multiplemonitors\n"
-	  "\tUse the entire virtual screen if multiple\n"
-	  "\tmonitors are present.\n");
-
-#ifdef XWIN_MULTIWINDOW
-  ErrorF ("-multiwindow\n"
-	  "\tRun the server in multi-window mode.\n");
-#endif
-
-#ifdef XWIN_MULTIWINDOWEXTWM
-  ErrorF ("-mwextwm\n"
-	  "\tRun the server in multi-window external window manager mode.\n");
-#endif
-
-  ErrorF ("-nodecoration\n"
-          "\tDo not draw a window border, title bar, etc.  Windowed\n"
-	  "\tmode only.\n");
-
-#ifdef XWIN_CLIPBOARD
-  ErrorF ("-nounicodeclipboard\n"
-	  "\tDo not use Unicode clipboard even if on a NT-based platform.\n");
-#endif
-
-  ErrorF ("-refresh rate_in_Hz\n"
-	  "\tSpecify an optional refresh rate to use in fullscreen mode\n"
-	  "\twith a DirectDraw engine.\n");
-
-  ErrorF ("-rootless\n"
-	  "\tRun the server in rootless mode.\n");
-
-  ErrorF ("-screen scr_num [width height [x y] | [[WxH[+X+Y]][@m]] ]\n"
-	  "\tEnable screen scr_num and optionally specify a width and\n"
-	  "\theight and initial position for that screen. Additionally\n"
-	  "\ta monitor number can be specified to start the server on,\n"
-	  "\tat which point, all coordinates become relative to that\n"
-      "\tmonitor (Not for Windows NT4 and 95). Examples:\n"
-      "\t -screen 0 800x600+100+100@2 ; 2nd monitor offset 100,100 size 800x600\n"
-      "\t -screen 0 1024x768@3        ; 3rd monitor size 1024x768\n"
-      "\t -screen 0 @1 ; on 1st monitor using its full resolution (the default)\n");
-
-  ErrorF ("-scrollbars\n"
-	  "\tIn windowed mode, allow screens bigger than the Windows desktop.\n"
-	  "\tMoreover, if the window has decorations, one can now resize\n"
-	  "\tit.\n");
-
-  ErrorF ("-silent-dup-error\n"
-	  "\tIf another instance of " EXECUTABLE_NAME " with the same display number is running\n"
-     "\texit silently and don’t display any error message.\n");
-
-  ErrorF ("-swcursor\n"
-	  "\tDisable the usage of the Windows cursor and use the X11 software\n"
-	  "\tcursor instead.\n");
-
-  ErrorF ("-[no]trayicon\n"
-          "\tDo not create a tray icon.  Default is to create one\n"
-	  "\ticon per screen.  You can globally disable tray icons with\n"
-	  "\t-notrayicon, then enable it for specific screens with\n"
-	  "\t-trayicon for those screens.\n");
-
-  ErrorF ("-[no]unixkill\n"
-          "\tCtrl+Alt+Backspace exits the X Server.\n");
-
-#ifdef XWIN_GLX_WINDOWS
-  ErrorF ("-[no]wgl\n"
-	  "\tEnable the GLX extension to use the native Windows WGL interface for accelerated OpenGL\n");
-#endif
-
-  ErrorF ("-[no]winkill\n"
-          "\tAlt+F4 exits the X Server.\n");
-
-  ErrorF ("-xkblayout XKBLayout\n"
-	  "\tEquivalent to XKBLayout in XF86Config files.\n"
-	  "\tFor example: -xkblayout de\n");
-
-  ErrorF ("-xkbmodel XKBModel\n"
-	  "\tEquivalent to XKBModel in XF86Config files.\n");
-
-  ErrorF ("-xkboptions XKBOptions\n"
-	  "\tEquivalent to XKBOptions in XF86Config files.\n");
-
-  ErrorF ("-xkbrules XKBRules\n"
-	  "\tEquivalent to XKBRules in XF86Config files.\n");
-
-  ErrorF ("-xkbvariant XKBVariant\n"
-	  "\tEquivalent to XKBVariant in XF86Config files.\n"
-	  "\tFor example: -xkbvariant nodeadkeys\n");
-}
-
-/* See Porting Layer Definition - p. 57 */
-void
-ddxUseMsg(void)
-{
-  /* Set a flag so that FatalError won't give duplicate warning message */
-  g_fSilentFatalError = TRUE;
-  
-  winUseMsg();  
-
-  /* Log file will not be opened for UseMsg unless we open it now */
-  if (!g_fLogInited) {
-    g_pszLogFile = LogInit (g_pszLogFile, NULL);
-    g_fLogInited = TRUE;
-  }  
-  LogClose ();
-
-  /* Notify user where UseMsg text can be found.*/
-  if (!g_fNoHelpMessageBox)
-    winMessageBoxF ("The " PROJECT_NAME " help text has been printed to "
-		  "%s.\n"
-		  "Please open %s to read the help text.\n",
-		  MB_ICONINFORMATION, g_pszLogFile, g_pszLogFile);
-}
-
-/* See Porting Layer Definition - p. 20 */
-/*
- * Do any global initialization, then initialize each screen.
- * 
- * NOTE: We use ddxProcessArgument, so we don't need to touch argc and argv
- */
-
-void
-InitOutput (ScreenInfo *screenInfo, int argc, char *argv[])
-{
-  int		i;
-
-  /* Log the command line */
-  winLogCommandLine (argc, argv);
-
-  winDebug ("InitOutput\n");
-
-  /* Validate command-line arguments */
-  if (serverGeneration == 1 && !winValidateArgs ())
-    {
-      FatalError ("InitOutput - Invalid command-line arguments found.  "
-		  "Exiting.\n");
-    }
-
-  /* Check for duplicate invocation on same display number.*/
-  if (serverGeneration == 1 && !winCheckDisplayNumber ())
-    {
-      if (g_fSilentDupError)
-        g_fSilentFatalError = TRUE;  
-      FatalError ("InitOutput - Duplicate invocation on display "
-		  "number: %s.  Exiting.\n", display);
-    }
-
-#ifdef XWIN_XF86CONFIG
-  /* Try to read the xorg.conf-style configuration file */
-  if (!winReadConfigfile ())
-    ErrorF ("InitOutput - Error reading config file\n");
-#else
-  winConfigFiles ();
-#endif
-
-  /* Load preferences from XWinrc file */
-  LoadPreferences();
-
-  /* Setup global screen info parameters */
-  screenInfo->imageByteOrder = IMAGE_BYTE_ORDER;
-  screenInfo->bitmapScanlinePad = BITMAP_SCANLINE_PAD;
-  screenInfo->bitmapScanlineUnit = BITMAP_SCANLINE_UNIT;
-  screenInfo->bitmapBitOrder = BITMAP_BIT_ORDER;
-  screenInfo->numPixmapFormats = NUMFORMATS;
-  
-  /* Describe how we want common pixmap formats padded */
-  for (i = 0; i < NUMFORMATS; i++)
-    {
-      screenInfo->formats[i] = g_PixmapFormats[i];
-    }
-
-  /* Load pointers to DirectDraw functions */
-  winGetDDProcAddresses ();
-  
-  /* Detect supported engines */
-  winDetectSupportedEngines ();
-
-  /* Load common controls library */
-  g_hmodCommonControls = LoadLibraryEx ("comctl32.dll", NULL, 0);
-
-  /* Load TrackMouseEvent function pointer */  
-  g_fpTrackMouseEvent = GetProcAddress (g_hmodCommonControls,
-					 "_TrackMouseEvent");
-  if (g_fpTrackMouseEvent == NULL)
-    {
-      ErrorF ("InitOutput - Could not get pointer to function\n"
-	      "\t_TrackMouseEvent in comctl32.dll.  Try installing\n"
-	      "\tInternet Explorer 3.0 or greater if you have not\n"
-	      "\talready.\n");
-
-      /* Free the library since we won't need it */
-      FreeLibrary (g_hmodCommonControls);
-      g_hmodCommonControls = NULL;
-
-      /* Set function pointer to point to no operation function */
-      g_fpTrackMouseEvent = (FARPROC) (void (*)(void))NoopDDA;
-    }
-
-  /* Store the instance handle */
-  g_hInstance = GetModuleHandle (NULL);
-
-  /* Initialize each screen */
-  for (i = 0; i < g_iNumScreens; ++i)
-    {
-      /* Initialize the screen */
-      if (-1 == AddScreen (winScreenInit, argc, argv))
-	{
-	  FatalError ("InitOutput - Couldn't add screen %d", i);
-	}
-    }
-
-#if defined(XWIN_CLIPBOARD) || defined(XWIN_MULTIWINDOW)
-
-  /* Generate a cookie used by internal clients for authorization */
-  if (g_fXdmcpEnabled || g_fAuthEnabled)
-    winGenerateAuthorization ();
-
-  /* Perform some one time initialization */
-  if (1 == serverGeneration)
-    {
-      /*
-       * setlocale applies to all threads in the current process.
-       * Apply locale specified in LANG environment variable.
-       */
-      setlocale (LC_ALL, "");
-
-      glx_debugging();
-    }
-#endif
-
-  winDebug ("InitOutput - Returning.\n");
-}
-
-
-/*
- * winCheckDisplayNumber - Check if another instance of Cygwin/X is
- * already running on the same display number.  If no one exists,
- * make a mutex to prevent new instances from running on the same display.
- *
- * return FALSE if the display number is already used.
- */
-
-static Bool
-winCheckDisplayNumber (void)
-{
-  int			nDisp;
-  HANDLE		mutex;
-  char			name[MAX_PATH];
-  char *		pszPrefix = '\0';
-  OSVERSIONINFO		osvi = {0};
-
-  /* Check display range */
-  nDisp = atoi (display);
-  if (nDisp < 0 || nDisp > 59535)
-    {
-      ErrorF ("winCheckDisplayNumber - Bad display number: %d\n", nDisp);
-      return FALSE;
-    }
-
-  /* Set first character of mutex name to null */
-  name[0] = '\0';
-
-  /* Get operating system version information */
-  osvi.dwOSVersionInfoSize = sizeof (osvi);
-  GetVersionEx (&osvi);
-
-  /* Want a mutex shared among all terminals on NT > 4.0 */
-  if (osvi.dwPlatformId == VER_PLATFORM_WIN32_NT
-      && osvi.dwMajorVersion >= 5)
-    {
-      pszPrefix = "Global\\";
-    }
-
-  /* Setup Cygwin/X specific part of name */
-  snprintf (name, sizeof(name), "%sCYGWINX_DISPLAY:%d", pszPrefix, nDisp);
-
-  /* Windows automatically releases the mutex when this process exits */
-  mutex = CreateMutex (NULL, FALSE, name);
-  if (!mutex)
-    {
-      LPVOID lpMsgBuf;
-
-      /* Display a fancy error message */
-      FormatMessage (FORMAT_MESSAGE_ALLOCATE_BUFFER | 
-		     FORMAT_MESSAGE_FROM_SYSTEM | 
-		     FORMAT_MESSAGE_IGNORE_INSERTS,
-		     NULL,
-		     GetLastError (),
-		     MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
-		     (LPTSTR) &lpMsgBuf,
-		     0, NULL);
-      ErrorF ("winCheckDisplayNumber - CreateMutex failed: %s\n",
-	      (LPSTR)lpMsgBuf);
-      LocalFree (lpMsgBuf);
-
-      return FALSE;
-    }
-  if (GetLastError () == ERROR_ALREADY_EXISTS)
-    {
-      ErrorF ("winCheckDisplayNumber - "
-	      "VCXsrv, Xming or Cygwin/X is already running on display %d\n",
-	      nDisp);
-      return FALSE;
-    }
-
-  return TRUE;
-}
-
-/* GLX debugging helpers */
-#include <../glx/glapi.h>
-
-static
-void warn_func(void * p1, const char *format, ...) {
-  va_list v;
-  va_start(v, format);
-  vfprintf(stderr, format, v);
-  va_end(v);
-  fprintf(stderr,"\n");
-}
-
-static
-void glx_debugging(void)
-{
-  _glapi_set_warning_func(warn_func);
-  _glapi_noop_enable_warnings(TRUE);
-}
+

+/*

+

+Copyright 1993, 1998  The Open Group

+Copyright (C) Colin Harrison 2005-2008

+

+Permission to use, copy, modify, distribute, and sell this software and its

+documentation for any purpose is hereby granted without fee, provided that

+the above copyright notice appear in all copies and that both that

+copyright notice and this permission notice appear in supporting

+documentation.

+

+The above copyright notice and this permission notice shall be included

+in all copies or substantial portions of the Software.

+

+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

+IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR

+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

+OTHER DEALINGS IN THE SOFTWARE.

+

+Except as contained in this notice, the name of The Open Group shall

+not be used in advertising or otherwise to promote the sale, use or

+other dealings in this Software without prior written authorization

+from The Open Group.

+

+*/

+

+#ifdef HAVE_XWIN_CONFIG_H

+#include <xwin-config.h>

+#endif

+#include "win.h"

+#include "winmsg.h"

+#include "winconfig.h"

+#include "winprefs.h"

+#ifdef XWIN_CLIPBOARD

+#include "X11/Xlocale.h"

+#endif

+#ifdef DPMSExtension

+#include "dpmsproc.h"

+#endif

+#ifdef __CYGWIN__

+#include <mntent.h>

+#endif

+#if defined(WIN32)

+#include "xkbsrv.h"

+#endif

+#ifdef RELOCATE_PROJECTROOT

+#undef Status

+#include <shlobj.h>

+typedef HRESULT  (__stdcall *  SHGETFOLDERPATHPROC)(

+    HWND hwndOwner,

+    int nFolder,

+    HANDLE hToken,

+    DWORD dwFlags,

+    LPSTR pszPath

+);

+#endif

+

+

+/*

+ * References to external symbols

+ */

+

+extern int			g_iNumScreens;

+extern winScreenInfo *		g_ScreenInfo;

+extern char *			g_pszCommandLine;

+extern Bool			g_fSilentFatalError;

+

+extern const char *		g_pszLogFile;

+extern Bool			g_fLogFileChanged;

+extern int			g_iLogVerbose;

+Bool				g_fLogInited;

+

+extern Bool			g_fXdmcpEnabled;

+extern Bool			g_fAuthEnabled;

+#ifdef HAS_DEVWINDOWS

+extern int			g_fdMessageQueue;

+#endif

+extern const char *		g_pszQueryHost;

+extern HINSTANCE		g_hInstance;

+

+#ifdef XWIN_CLIPBOARD

+extern Bool			g_fUnicodeClipboard;

+extern Bool			g_fClipboardLaunched;

+extern Bool			g_fClipboardStarted;

+extern pthread_t		g_ptClipboardProc;

+extern HWND			g_hwndClipboard;

+extern Bool			g_fClipboard;

+#endif

+

+extern HMODULE			g_hmodDirectDraw;

+extern FARPROC			g_fpDirectDrawCreate;

+extern FARPROC			g_fpDirectDrawCreateClipper;

+  

+extern HMODULE			g_hmodCommonControls;

+extern FARPROC			g_fpTrackMouseEvent;

+extern Bool			g_fNoHelpMessageBox;                     

+extern Bool			g_fSilentDupError;                     

+extern Bool                     g_fNativeGl;

+

+/*

+ * Function prototypes

+ */

+

+#ifdef XWIN_CLIPBOARD

+static void

+winClipboardShutdown (void);

+#endif

+

+#if defined(DDXOSVERRORF)

+void

+OsVendorVErrorF (const char *pszFormat, va_list va_args);

+#endif

+

+static Bool

+winCheckDisplayNumber (void);

+

+void

+winLogCommandLine (int argc, char *argv[]);

+

+void

+winLogVersionInfo (void);

+

+Bool

+winValidateArgs (void);

+

+#ifdef RELOCATE_PROJECTROOT

+const char *

+winGetBaseDir(void);

+#endif

+

+static

+void glx_debugging(void);

+

+/*

+ * For the depth 24 pixmap we default to 32 bits per pixel, but

+ * we change this pixmap format later if we detect that the display

+ * is going to be running at 24 bits per pixel.

+ *

+ * FIXME: On second thought, don't DIBs only support 32 bits per pixel?

+ * DIBs are the underlying bitmap used for DirectDraw surfaces, so it

+ * seems that all pixmap formats with depth 24 would be 32 bits per pixel.

+ * Confirm whether depth 24 DIBs can have 24 bits per pixel, then remove/keep

+ * the bits per pixel adjustment and update this comment to reflect the

+ * situation.  Harold Hunt - 2002/07/02

+ */

+

+static PixmapFormatRec g_PixmapFormats[] = {

+  { 1,    1,      BITMAP_SCANLINE_PAD },

+  { 4,    8,      BITMAP_SCANLINE_PAD },

+  { 8,    8,      BITMAP_SCANLINE_PAD },

+  { 15,   16,     BITMAP_SCANLINE_PAD },

+  { 16,   16,     BITMAP_SCANLINE_PAD },

+  { 24,   32,     BITMAP_SCANLINE_PAD },

+  { 32,   32,     BITMAP_SCANLINE_PAD }

+};

+

+const int NUMFORMATS = sizeof (g_PixmapFormats) / sizeof (g_PixmapFormats[0]);

+

+#ifdef XWIN_CLIPBOARD

+static void

+winClipboardShutdown (void)

+{

+  /* Close down clipboard resources */

+  if (g_fClipboard && g_fClipboardLaunched && g_fClipboardStarted)

+    {

+      /* Synchronously destroy the clipboard window */

+      if (g_hwndClipboard != NULL)

+	{

+	  SendMessage (g_hwndClipboard, WM_DESTROY, 0, 0);

+	  /* NOTE: g_hwndClipboard is set to NULL in winclipboardthread.c */

+	}

+      else

+	return;

+      

+      /* Wait for the clipboard thread to exit */

+      pthread_join (g_ptClipboardProc, NULL);

+

+      winDebug ("winClipboardShutdown - Clipboard thread has exited.\n");

+    }

+}

+#endif

+

+

+#if defined(DDXBEFORERESET)

+/*

+ * Called right before KillAllClients when the server is going to reset,

+ * allows us to shutdown our seperate threads cleanly.

+ */

+

+void

+ddxBeforeReset (void)

+{

+  winDebug ("ddxBeforeReset - Hello\n");

+

+#ifdef XWIN_CLIPBOARD

+  winClipboardShutdown ();

+#endif

+}

+#endif

+

+

+/* See Porting Layer Definition - p. 57 */

+void

+ddxGiveUp (void)

+{

+  int		i;

+

+  winDebug ("ddxGiveUp\n");

+

+  /* Perform per-screen deinitialization */

+  for (i = 0; i < g_iNumScreens; ++i)

+    {

+      /* Delete the tray icon */

+      if (!g_ScreenInfo[i].fNoTrayIcon && g_ScreenInfo[i].pScreen)

+ 	winDeleteNotifyIcon (winGetScreenPriv (g_ScreenInfo[i].pScreen));

+    }

+

+#ifdef XWIN_MULTIWINDOW

+  /* Notify the worker threads we're exiting */

+  winDeinitMultiWindowWM ();

+#endif

+

+#ifdef HAS_DEVWINDOWS

+  /* Close our handle to our message queue */

+  if (g_fdMessageQueue != WIN_FD_INVALID)

+    {

+      /* Close /dev/windows */

+      close (g_fdMessageQueue);

+

+      /* Set the file handle to invalid */

+      g_fdMessageQueue = WIN_FD_INVALID;

+    }

+#endif

+

+  if (!g_fLogInited) {

+    g_pszLogFile = LogInit (g_pszLogFile, NULL);

+    g_fLogInited = TRUE;

+  }  

+  LogClose ();

+

+  /*

+   * At this point we aren't creating any new screens, so

+   * we are guaranteed to not need the DirectDraw functions.

+   */

+  if (g_hmodDirectDraw != NULL)

+    {

+      FreeLibrary (g_hmodDirectDraw);

+      g_hmodDirectDraw = NULL;

+      g_fpDirectDrawCreate = NULL;

+      g_fpDirectDrawCreateClipper = NULL;

+    }

+

+  /* Unload our TrackMouseEvent funtion pointer */

+  if (g_hmodCommonControls != NULL)

+    {

+      FreeLibrary (g_hmodCommonControls);

+      g_hmodCommonControls = NULL;

+      g_fpTrackMouseEvent = (FARPROC) (void (*)(void))NoopDDA;

+    }

+  

+  /* Free concatenated command line */

+  free(g_pszCommandLine);

+  g_pszCommandLine = NULL;

+

+  /* Remove our keyboard hook if it is installed */

+  winRemoveKeyboardHookLL ();

+

+  /* Tell Windows that we want to end the app */

+  PostQuitMessage (0);

+}

+

+

+/* See Porting Layer Definition - p. 57 */

+void

+AbortDDX (void)

+{

+  winDebug ("AbortDDX\n");

+  ddxGiveUp ();

+}

+

+#ifdef __CYGWIN__

+/* hasmntopt is currently not implemented for cygwin */

+static const char *winCheckMntOpt(const struct mntent *mnt, const char *opt)

+{

+    const char *s;

+    size_t len;

+    if (mnt == NULL)

+        return NULL;

+    if (opt == NULL)

+        return NULL;

+    if (mnt->mnt_opts == NULL)

+        return NULL;

+

+    len = strlen(opt);

+    s = strstr(mnt->mnt_opts, opt);

+    if (s == NULL)

+        return NULL;

+    if ((s == mnt->mnt_opts || *(s-1) == ',') &&  (s[len] == 0 || s[len] == ','))

+        return (char *)opt;

+    return NULL;

+}

+

+static void

+winCheckMount(void)

+{

+  FILE *mnt;

+  struct mntent *ent;

+

+  enum { none = 0, sys_root, user_root, sys_tmp, user_tmp } 

+    level = none, curlevel;

+  BOOL binary = TRUE;

+

+  mnt = setmntent("/etc/mtab", "r");

+  if (mnt == NULL)

+  {

+    ErrorF("setmntent failed");

+    return;

+  }

+

+  while ((ent = getmntent(mnt)) != NULL)

+  {

+    BOOL system = (winCheckMntOpt(ent, "user") != NULL);

+    BOOL root = (strcmp(ent->mnt_dir, "/") == 0);

+    BOOL tmp = (strcmp(ent->mnt_dir, "/tmp") == 0);

+    

+    if (system)

+    {

+      if (root)

+        curlevel = sys_root;

+      else if (tmp)

+        curlevel = sys_tmp;

+      else

+        continue;

+    }

+    else

+    {

+      if (root)

+        curlevel = user_root;

+      else if (tmp) 

+        curlevel = user_tmp;

+      else

+        continue;

+    }

+

+    if (curlevel <= level)

+      continue;

+    level = curlevel;

+

+    if ((winCheckMntOpt(ent, "binary") == NULL) &&

+        (winCheckMntOpt(ent, "binmode") == NULL))

+      binary = FALSE;

+    else

+      binary = TRUE;

+  }

+    

+  if (endmntent(mnt) != 1)

+  {

+    ErrorF("endmntent failed");

+    return;

+  }

+  

+#ifdef WINDBG

+  if (!binary) 

+    winDebug("/tmp mounted in textmode\n");

+#endif

+}

+#else

+static void

+winCheckMount(void) 

+{

+}

+#endif

+

+#ifdef RELOCATE_PROJECTROOT

+const char * 

+winGetBaseDir(void)

+{

+    static BOOL inited = FALSE;

+    static char buffer[MAX_PATH];

+    if (!inited)

+    {

+        char *fendptr;

+        HMODULE module = GetModuleHandle(NULL);

+        DWORD size = GetModuleFileName(module, buffer, sizeof(buffer));

+        if (sizeof(buffer) > 0)

+            buffer[sizeof(buffer)-1] = 0;

+    

+        fendptr = buffer + size;

+        while (fendptr > buffer)

+        {

+            if (*fendptr == '\\' || *fendptr == '/')

+            {

+                *fendptr = 0;

+                break;

+            }

+            fendptr--;

+        }

+        inited = TRUE;

+    }

+    return buffer;

+}

+#endif

+

+static void

+winFixupPaths (void)

+{

+    BOOL changed_fontpath = FALSE;

+    MessageType font_from = X_DEFAULT;

+#ifdef RELOCATE_PROJECTROOT

+    const char *basedir = winGetBaseDir();

+    size_t basedirlen = strlen(basedir);

+#endif

+

+#ifdef READ_FONTDIRS

+    {

+        /* Open fontpath configuration file */

+#if defined WIN32 && defined __MINGW32__

+        static Bool once = False;

+        char buffer[MAX_PATH];

+        snprintf(buffer, sizeof(buffer), "%s\\font-dirs", basedir);

+        buffer[sizeof(buffer)-1] = 0;

+        FILE *fontdirs = fopen(buffer, "rt");

+        if (once) fontdirs = NULL;

+        else once = True;

+#else

+        FILE *fontdirs = fopen(ETCX11DIR "/font-dirs", "rt");

+#endif

+        if (fontdirs != NULL)

+        {

+            char buffer[256];

+            int needs_sep = TRUE; 

+            int comment_block = FALSE;

+

+            /* get defautl fontpath */

+            char *fontpath = strdup(defaultFontPath);

+            size_t size = strlen(fontpath);

+

+            /* read all lines */

+            while (!feof(fontdirs))

+            {

+                size_t blen;

+                char *hashchar;

+                char *str;

+                int has_eol = FALSE;

+

+                /* read one line */

+                str = fgets(buffer, sizeof(buffer), fontdirs);

+                if (str == NULL) /* stop on error or eof */

+                    break;

+

+                if (strchr(str, '\n') != NULL)

+                    has_eol = TRUE;

+

+                /* check if block is continued comment */

+                if (comment_block)

+                {

+                    /* ignore all input */

+                    *str = 0; 

+                    blen = 0; 

+                    if (has_eol) /* check if line ended in this block */

+                        comment_block = FALSE;

+                }

+                else 

+                {

+                    /* find comment character. ignore all trailing input */

+                    hashchar = strchr(str, '#');

+                    if (hashchar != NULL)

+                    {

+                        *hashchar = 0;

+                        if (!has_eol) /* mark next block as continued comment */

+                            comment_block = TRUE;

+                    }

+                }

+

+                /* strip whitespaces from beginning */

+                while (*str == ' ' || *str == '\t')

+                    str++;

+

+                /* get size, strip whitespaces from end */ 

+                blen = strlen(str);

+                while (blen > 0 && (str[blen-1] == ' ' || 

+                            str[blen-1] == '\t' || str[blen-1] == '\n'))

+                {

+                    str[--blen] = 0;

+                }

+

+                /* still something left to add? */ 

+                if (blen > 0)

+                {

+                    size_t newsize = size + blen;

+                    /* reserve one character more for ',' */

+                    if (needs_sep)

+                        newsize++;

+

+                    /* allocate memory */

+                    if (fontpath == NULL)

+                        fontpath = malloc(newsize+1);

+                    else

+                        fontpath = realloc(fontpath, newsize+1);

+

+                    /* add separator */

+                    if (needs_sep)

+                    {

+                        fontpath[size] = ',';

+                        size++;

+                        needs_sep = FALSE;

+                    }

+

+                    /* mark next line as new entry */

+                    if (has_eol)

+                        needs_sep = TRUE;

+

+                    /* add block */

+                    strncpy(fontpath + size, str, blen);

+                    fontpath[newsize] = 0;

+                    size = newsize;

+                }

+            }

+

+            /* cleanup */

+            fclose(fontdirs);  

+            defaultFontPath = strdup(fontpath);

+            free(fontpath);

+            changed_fontpath = TRUE;

+            font_from = X_CONFIG;

+        }

+    }

+#endif /* READ_FONTDIRS */

+#ifdef RELOCATE_PROJECTROOT

+    {

+        const char *libx11dir = PROJECTROOT "/lib/X11";

+        size_t libx11dir_len = strlen(libx11dir);

+        char *newfp = NULL;

+        size_t newfp_len = 0;

+        const char *endptr, *ptr, *oldptr = defaultFontPath;

+

+        endptr = oldptr + strlen(oldptr);

+        ptr = strchr(oldptr, ',');

+        if (ptr == NULL)

+            ptr = endptr;

+        while (ptr != NULL)

+        {

+            size_t oldfp_len = (ptr - oldptr);

+            size_t newsize = oldfp_len;

+            char *newpath = malloc(newsize + 1);

+            strncpy(newpath, oldptr, newsize);

+            newpath[newsize] = 0;

+

+

+            if (strncmp(libx11dir, newpath, libx11dir_len) == 0)

+            {

+                char *compose;

+                newsize = newsize - libx11dir_len + basedirlen;

+                compose = malloc(newsize + 1);  

+                strcpy(compose, basedir);

+                strncat(compose, newpath + libx11dir_len, newsize - basedirlen);

+                compose[newsize] = 0;

+                free(newpath);

+                newpath = compose;

+            }

+

+            oldfp_len = newfp_len;

+            if (oldfp_len > 0)

+                newfp_len ++; /* space for separator */

+            newfp_len += newsize;

+

+            if (newfp == NULL)

+                newfp = malloc(newfp_len + 1);

+            else

+                newfp = realloc(newfp, newfp_len + 1);

+

+            if (oldfp_len > 0)

+            {

+                strcpy(newfp + oldfp_len, ",");

+                oldfp_len++;

+            }

+            strcpy(newfp + oldfp_len, newpath);

+

+            free(newpath);

+

+            if (*ptr == 0)

+            {

+                oldptr = ptr;

+                ptr = NULL;

+            } else

+            {

+                oldptr = ptr + 1;

+                ptr = strchr(oldptr, ',');

+                if (ptr == NULL)

+                    ptr = endptr;

+            }

+        } 

+

+        defaultFontPath = strdup(newfp);

+        free(newfp);

+        changed_fontpath = TRUE;

+    }

+#endif /* RELOCATE_PROJECTROOT */

+    if (changed_fontpath)

+        winDebug ("FontPath set to \"%s\"\n", defaultFontPath);

+

+#ifdef RELOCATE_PROJECTROOT

+    if (getenv("XKEYSYMDB") == NULL)

+    {

+        char buffer[MAX_PATH];

+        snprintf(buffer, sizeof(buffer), "XKEYSYMDB=%s\\XKeysymDB",

+                basedir);

+        buffer[sizeof(buffer)-1] = 0;

+        putenv(buffer);

+    }

+    if (getenv("XERRORDB") == NULL)

+    {

+        char buffer[MAX_PATH];

+        snprintf(buffer, sizeof(buffer), "XERRORDB=%s\\XErrorDB",

+                basedir);

+        buffer[sizeof(buffer)-1] = 0;

+        putenv(buffer);

+    }

+    if (getenv("XLOCALEDIR") == NULL)

+    {

+        char buffer[MAX_PATH];

+        snprintf(buffer, sizeof(buffer), "XLOCALEDIR=%s\\locale",

+                basedir);

+        buffer[sizeof(buffer)-1] = 0;

+        putenv(buffer);

+    }

+    if (getenv("XHOSTPREFIX") == NULL)

+    {

+        char buffer[MAX_PATH];

+        snprintf(buffer, sizeof(buffer), "XHOSTPREFIX=%s\\X",

+                basedir);

+        buffer[sizeof(buffer)-1] = 0;

+        putenv(buffer);

+    }

+    if (getenv("HOME") == NULL)

+    {

+        HMODULE shfolder;

+        SHGETFOLDERPATHPROC shgetfolderpath = NULL;

+        char buffer[MAX_PATH + 5];

+        strncpy(buffer, "HOME=", 5);

+

+        /* Try to load SHGetFolderPath from shfolder.dll and shell32.dll */

+        

+        shfolder = LoadLibrary("shfolder.dll");

+        /* fallback to shell32.dll */

+        if (shfolder == NULL)

+            shfolder = LoadLibrary("shell32.dll");

+

+        /* resolve SHGetFolderPath */

+        if (shfolder != NULL)

+            shgetfolderpath = (SHGETFOLDERPATHPROC)GetProcAddress(shfolder, "SHGetFolderPathA");

+

+        /* query appdata directory */

+        if (shgetfolderpath &&

+                shgetfolderpath(NULL, CSIDL_APPDATA|CSIDL_FLAG_CREATE, NULL, 0, 

+                    buffer + 5) == 0)

+        { 

+            putenv(buffer);

+        } else

+        {

+            ErrorF ("Can not determine HOME directory\n");

+        } 

+        if (shfolder != NULL)

+            FreeLibrary(shfolder);

+    }

+    if (!g_fLogFileChanged) {

+        static char buffer[MAX_PATH];

+        DWORD size = GetTempPath(sizeof(buffer), buffer);

+        if (size && size < sizeof(buffer))

+        {

+            snprintf(buffer + size, sizeof(buffer) - size, 

+                    "VCXSrv.%s.log", display); 

+            buffer[sizeof(buffer)-1] = 0;

+            g_pszLogFile = buffer;

+            GetLongPathName(buffer, buffer, MAX_PATH);

+            winDebug ("Logfile set to \"%s\"\n", g_pszLogFile);

+        }

+    }

+    {

+        static char xkbbasedir[MAX_PATH];

+

+        snprintf(xkbbasedir, sizeof(xkbbasedir), "%s\\xkbdata", basedir);

+        if (sizeof(xkbbasedir) > 0)

+            xkbbasedir[sizeof(xkbbasedir)-1] = 0;

+        XkbBaseDirectory = xkbbasedir;

+	XkbBinDirectory = basedir;

+    }

+#endif /* RELOCATE_PROJECTROOT */

+}

+

+void

+OsVendorInit (void)

+{

+  /* Re-initialize global variables on server reset */

+  winInitializeGlobals ();

+

+  winFixupPaths();

+

+#ifdef DDXOSVERRORF

+  if (!OsVendorVErrorFProc)

+    OsVendorVErrorFProc = OsVendorVErrorF;

+#endif

+

+  if (!g_fLogInited) {

+    /* keep this order. If LogInit fails it calls Abort which then calls

+     * ddxGiveUp where LogInit is called again and creates an infinite 

+     * recursion. If we set g_fLogInited to TRUE before the init we 

+     * avoid the second call 

+     */  

+    g_fLogInited = TRUE;

+    g_pszLogFile = LogInit (g_pszLogFile, NULL);

+  } 

+  LogSetParameter (XLOG_FLUSH, 1);

+  LogSetParameter (XLOG_VERBOSITY, g_iLogVerbose);

+  LogSetParameter (XLOG_FILE_VERBOSITY, g_iLogVerbose);

+

+  /* Log the version information */

+  if (serverGeneration == 1)

+    winLogVersionInfo ();

+

+  winCheckMount();  

+

+  /* Add a default screen if no screens were specified */

+  if (g_iNumScreens == 0)

+    {

+      winDebug ("OsVendorInit - Creating default screen 0\n");

+

+      /*

+       * We need to initialize the default screen 0 if no -screen

+       * arguments were processed.

+       *

+       * Add a screen 0 using the defaults set by winInitializeDefaultScreens()

+       * and any additional default screen parameters given

+       */

+      winInitializeScreens(1);

+

+      /* We have to flag this as an explicit screen, even though it isn't */

+      g_ScreenInfo[0].fExplicitScreen = TRUE;

+    }

+}

+

+

+static void

+winUseMsg (void)

+{

+  ErrorF("\n");

+  ErrorF("\n");

+  ErrorF(EXECUTABLE_NAME " Device Dependent Usage:\n");

+  ErrorF("\n");

+

+#ifdef XWIN_CLIPBOARD

+  ErrorF ("-[no]clipboard\n"

+	  "\tEnable [disable] the clipboard integration. Default is enabled.\n");

+#endif

+

+  ErrorF ("-clipupdates num_boxes\n"

+	  "\tUse a clipping region to constrain shadow update blits to\n"

+	  "\tthe updated region when num_boxes, or more, are in the\n"

+	  "\tupdated region.\n");

+

+#ifdef XWIN_XF86CONFIG

+  ErrorF ("-config\n"

+          "\tSpecify a configuration file.\n");

+

+  ErrorF ("-configdir\n"

+          "\tSpecify a configuration directory.\n");

+#endif

+

+  ErrorF ("-depth bits_per_pixel\n"

+	  "\tSpecify an optional bitdepth to use in fullscreen mode\n"

+	  "\twith a DirectDraw engine.\n");

+

+  ErrorF ("-emulate3buttons [timeout]\n"

+	  "\tEmulate 3 button mouse with an optional timeout in\n"

+	  "\tmilliseconds.\n");

+

+#ifdef XWIN_EMULATEPSEUDO

+  ErrorF ("-emulatepseudo\n"

+	  "\tCreate a depth 8 PseudoColor visual when running in\n"

+	  "\tdepths 15, 16, 24, or 32, collectively known as TrueColor\n"

+	  "\tdepths.  The PseudoColor visual does not have correct colors,\n"

+	  "\tand it may crash, but it at least allows you to run your\n"

+	  "\tapplication in TrueColor modes.\n");

+#endif

+

+  ErrorF ("-engine engine_type_id\n"

+	  "\tOverride the server's automatically selected engine type:\n"

+	  "\t\t1 - Shadow GDI\n"

+	  "\t\t2 - Shadow DirectDraw\n"

+	  "\t\t4 - Shadow DirectDraw4 Non-Locking\n"

+#ifdef XWIN_PRIMARYFB

+	  "\t\t8 - Primary DirectDraw\n"

+#endif

+#ifdef XWIN_NATIVEGDI

+	  "\t\t16 - Native GDI - experimental\n"

+#endif

+	  );

+

+  ErrorF ("-fullscreen\n"

+	  "\tRun the server in fullscreen mode.\n");

+

+  ErrorF ("-ignoreinput\n"

+	  "\tIgnore keyboard and mouse input.\n");

+

+#ifdef XWIN_MULTIWINDOWEXTWM

+  ErrorF ("-internalwm\n"

+	  "\tRun the internal window manager.\n");

+#endif

+

+#ifdef XWIN_XF86CONFIG

+  ErrorF ("-keyboard\n"

+	  "\tSpecify a keyboard device from the configuration file.\n");

+#endif

+

+  ErrorF ("-[no]keyhook\n"

+	  "\tGrab special Windows keypresses like Alt-Tab or the Menu "

+          "key.\n");

+

+  ErrorF ("-lesspointer\n"

+	  "\tHide the windows mouse pointer when it is over any\n"

+          "\t" EXECUTABLE_NAME " window.  This prevents ghost cursors appearing when\n"

+	  "\tthe Windows cursor is drawn on top of the X cursor\n");

+

+  ErrorF ("-logfile filename\n"

+	  "\tWrite log messages to <filename>.\n");

+

+  ErrorF ("-logverbose verbosity\n"

+	  "\tSet the verbosity of log messages. [NOTE: Only a few messages\n"

+	  "\trespect the settings yet]\n"

+	  "\t\t0 - only print fatal error.\n"

+	  "\t\t1 - print additional configuration information.\n"

+	  "\t\t2 - print additional runtime information [default].\n"

+	  "\t\t3 - print debugging and tracing information.\n");

+

+  ErrorF ("-[no]multimonitors or -[no]multiplemonitors\n"

+	  "\tUse the entire virtual screen if multiple\n"

+	  "\tmonitors are present.\n");

+

+#ifdef XWIN_MULTIWINDOW

+  ErrorF ("-multiwindow\n"

+	  "\tRun the server in multi-window mode.\n");

+#endif

+

+#ifdef XWIN_MULTIWINDOWEXTWM

+  ErrorF ("-mwextwm\n"

+	  "\tRun the server in multi-window external window manager mode.\n");

+#endif

+

+  ErrorF ("-nodecoration\n"

+          "\tDo not draw a window border, title bar, etc.  Windowed\n"

+	  "\tmode only.\n");

+

+#ifdef XWIN_CLIPBOARD

+  ErrorF ("-nounicodeclipboard\n"

+	  "\tDo not use Unicode clipboard even if on a NT-based platform.\n");

+#endif

+

+  ErrorF ("-refresh rate_in_Hz\n"

+	  "\tSpecify an optional refresh rate to use in fullscreen mode\n"

+	  "\twith a DirectDraw engine.\n");

+

+  ErrorF ("-rootless\n"

+	  "\tRun the server in rootless mode.\n");

+

+  ErrorF ("-screen scr_num [width height [x y] | [[WxH[+X+Y]][@m]] ]\n"

+	  "\tEnable screen scr_num and optionally specify a width and\n"

+	  "\theight and initial position for that screen. Additionally\n"

+	  "\ta monitor number can be specified to start the server on,\n"

+	  "\tat which point, all coordinates become relative to that\n"

+      "\tmonitor (Not for Windows NT4 and 95). Examples:\n"

+      "\t -screen 0 800x600+100+100@2 ; 2nd monitor offset 100,100 size 800x600\n"

+      "\t -screen 0 1024x768@3        ; 3rd monitor size 1024x768\n"

+      "\t -screen 0 @1 ; on 1st monitor using its full resolution (the default)\n");

+

+  ErrorF ("-scrollbars\n"

+	  "\tIn windowed mode, allow screens bigger than the Windows desktop.\n"

+	  "\tMoreover, if the window has decorations, one can now resize\n"

+	  "\tit.\n");

+

+  ErrorF ("-silent-dup-error\n"

+	  "\tIf another instance of " EXECUTABLE_NAME " with the same display number is running\n"

+     "\texit silently and don’t display any error message.\n");

+

+  ErrorF ("-swcursor\n"

+	  "\tDisable the usage of the Windows cursor and use the X11 software\n"

+	  "\tcursor instead.\n");

+

+  ErrorF ("-[no]trayicon\n"

+          "\tDo not create a tray icon.  Default is to create one\n"

+	  "\ticon per screen.  You can globally disable tray icons with\n"

+	  "\t-notrayicon, then enable it for specific screens with\n"

+	  "\t-trayicon for those screens.\n");

+

+  ErrorF ("-[no]unixkill\n"

+          "\tCtrl+Alt+Backspace exits the X Server.\n");

+

+#ifdef XWIN_GLX_WINDOWS

+  ErrorF ("-[no]wgl\n"

+	  "\tEnable the GLX extension to use the native Windows WGL interface for accelerated OpenGL\n");

+#endif

+

+  ErrorF ("-[no]winkill\n"

+          "\tAlt+F4 exits the X Server.\n");

+

+  ErrorF ("-xkblayout XKBLayout\n"

+	  "\tEquivalent to XKBLayout in XF86Config files.\n"

+	  "\tFor example: -xkblayout de\n");

+

+  ErrorF ("-xkbmodel XKBModel\n"

+	  "\tEquivalent to XKBModel in XF86Config files.\n");

+

+  ErrorF ("-xkboptions XKBOptions\n"

+	  "\tEquivalent to XKBOptions in XF86Config files.\n");

+

+  ErrorF ("-xkbrules XKBRules\n"

+	  "\tEquivalent to XKBRules in XF86Config files.\n");

+

+  ErrorF ("-xkbvariant XKBVariant\n"

+	  "\tEquivalent to XKBVariant in XF86Config files.\n"

+	  "\tFor example: -xkbvariant nodeadkeys\n");

+}

+

+/* See Porting Layer Definition - p. 57 */

+void

+ddxUseMsg(void)

+{

+  /* Set a flag so that FatalError won't give duplicate warning message */

+  g_fSilentFatalError = TRUE;

+  

+  winUseMsg();  

+

+  /* Log file will not be opened for UseMsg unless we open it now */

+  if (!g_fLogInited) {

+    g_pszLogFile = LogInit (g_pszLogFile, NULL);

+    g_fLogInited = TRUE;

+  }  

+  LogClose ();

+

+  /* Notify user where UseMsg text can be found.*/

+  if (!g_fNoHelpMessageBox)

+    winMessageBoxF ("The " PROJECT_NAME " help text has been printed to "

+		  "%s.\n"

+		  "Please open %s to read the help text.\n",

+		  MB_ICONINFORMATION, g_pszLogFile, g_pszLogFile);

+}

+

+/* See Porting Layer Definition - p. 20 */

+/*

+ * Do any global initialization, then initialize each screen.

+ * 

+ * NOTE: We use ddxProcessArgument, so we don't need to touch argc and argv

+ */

+

+void

+InitOutput (ScreenInfo *screenInfo, int argc, char *argv[])

+{

+  int		i;

+

+  /* Log the command line */

+  winLogCommandLine (argc, argv);

+

+  winDebug ("InitOutput\n");

+

+  /* Validate command-line arguments */

+  if (serverGeneration == 1 && !winValidateArgs ())

+    {

+      FatalError ("InitOutput - Invalid command-line arguments found.  "

+		  "Exiting.\n");

+    }

+

+  /* Check for duplicate invocation on same display number.*/

+  if (serverGeneration == 1 && !winCheckDisplayNumber ())

+    {

+      if (g_fSilentDupError)

+        g_fSilentFatalError = TRUE;  

+      FatalError ("InitOutput - Duplicate invocation on display "

+		  "number: %s.  Exiting.\n", display);

+    }

+

+#ifdef XWIN_XF86CONFIG

+  /* Try to read the xorg.conf-style configuration file */

+  if (!winReadConfigfile ())

+    ErrorF ("InitOutput - Error reading config file\n");

+#else

+  winConfigFiles ();

+#endif

+

+  /* Load preferences from XWinrc file */

+  LoadPreferences();

+

+  /* Setup global screen info parameters */

+  screenInfo->imageByteOrder = IMAGE_BYTE_ORDER;

+  screenInfo->bitmapScanlinePad = BITMAP_SCANLINE_PAD;

+  screenInfo->bitmapScanlineUnit = BITMAP_SCANLINE_UNIT;

+  screenInfo->bitmapBitOrder = BITMAP_BIT_ORDER;

+  screenInfo->numPixmapFormats = NUMFORMATS;

+  

+  /* Describe how we want common pixmap formats padded */

+  for (i = 0; i < NUMFORMATS; i++)

+    {

+      screenInfo->formats[i] = g_PixmapFormats[i];

+    }

+

+  /* Load pointers to DirectDraw functions */

+  winGetDDProcAddresses ();

+  

+  /* Detect supported engines */

+  winDetectSupportedEngines ();

+

+  /* Load common controls library */

+  g_hmodCommonControls = LoadLibraryEx ("comctl32.dll", NULL, 0);

+

+  /* Load TrackMouseEvent function pointer */  

+  g_fpTrackMouseEvent = GetProcAddress (g_hmodCommonControls,

+					 "_TrackMouseEvent");

+  if (g_fpTrackMouseEvent == NULL)

+    {

+      ErrorF ("InitOutput - Could not get pointer to function\n"

+	      "\t_TrackMouseEvent in comctl32.dll.  Try installing\n"

+	      "\tInternet Explorer 3.0 or greater if you have not\n"

+	      "\talready.\n");

+

+      /* Free the library since we won't need it */

+      FreeLibrary (g_hmodCommonControls);

+      g_hmodCommonControls = NULL;

+

+      /* Set function pointer to point to no operation function */

+      g_fpTrackMouseEvent = (FARPROC) (void (*)(void))NoopDDA;

+    }

+

+  /* Store the instance handle */

+  g_hInstance = GetModuleHandle (NULL);

+

+  /* Initialize each screen */

+  for (i = 0; i < g_iNumScreens; ++i)

+    {

+      /* Initialize the screen */

+      if (-1 == AddScreen (winScreenInit, argc, argv))

+	{

+	  FatalError ("InitOutput - Couldn't add screen %d", i);

+	}

+    }

+

+#if defined(XWIN_CLIPBOARD) || defined(XWIN_MULTIWINDOW)

+

+  /* Generate a cookie used by internal clients for authorization */

+  if (g_fXdmcpEnabled || g_fAuthEnabled)

+    winGenerateAuthorization ();

+

+  /* Perform some one time initialization */

+  if (1 == serverGeneration)

+    {

+      /*

+       * setlocale applies to all threads in the current process.

+       * Apply locale specified in LANG environment variable.

+       */

+      setlocale (LC_ALL, "");

+

+      glx_debugging();

+    }

+#endif

+

+  winDebug ("InitOutput - Returning.\n");

+}

+

+

+/*

+ * winCheckDisplayNumber - Check if another instance of Cygwin/X is

+ * already running on the same display number.  If no one exists,

+ * make a mutex to prevent new instances from running on the same display.

+ *

+ * return FALSE if the display number is already used.

+ */

+

+static Bool

+winCheckDisplayNumber (void)

+{

+  int			nDisp;

+  HANDLE		mutex;

+  char			name[MAX_PATH];

+  char *		pszPrefix = '\0';

+  OSVERSIONINFO		osvi = {0};

+

+  /* Check display range */

+  nDisp = atoi (display);

+  if (nDisp < 0 || nDisp > 59535)

+    {

+      ErrorF ("winCheckDisplayNumber - Bad display number: %d\n", nDisp);

+      return FALSE;

+    }

+

+  /* Set first character of mutex name to null */

+  name[0] = '\0';

+

+  /* Get operating system version information */

+  osvi.dwOSVersionInfoSize = sizeof (osvi);

+  GetVersionEx (&osvi);

+

+  /* Want a mutex shared among all terminals on NT > 4.0 */

+  if (osvi.dwPlatformId == VER_PLATFORM_WIN32_NT

+      && osvi.dwMajorVersion >= 5)

+    {

+      pszPrefix = "Global\\";

+    }

+

+  /* Setup Cygwin/X specific part of name */

+  snprintf (name, sizeof(name), "%sCYGWINX_DISPLAY:%d", pszPrefix, nDisp);

+

+  /* Windows automatically releases the mutex when this process exits */

+  mutex = CreateMutex (NULL, FALSE, name);

+  if (!mutex)

+    {

+      LPVOID lpMsgBuf;

+

+      /* Display a fancy error message */

+      FormatMessage (FORMAT_MESSAGE_ALLOCATE_BUFFER | 

+		     FORMAT_MESSAGE_FROM_SYSTEM | 

+		     FORMAT_MESSAGE_IGNORE_INSERTS,

+		     NULL,

+		     GetLastError (),

+		     MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),

+		     (LPTSTR) &lpMsgBuf,

+		     0, NULL);

+      ErrorF ("winCheckDisplayNumber - CreateMutex failed: %s\n",

+	      (LPSTR)lpMsgBuf);

+      LocalFree (lpMsgBuf);

+

+      return FALSE;

+    }

+  if (GetLastError () == ERROR_ALREADY_EXISTS)

+    {

+      ErrorF ("winCheckDisplayNumber - "

+	      "VCXsrv, Xming or Cygwin/X is already running on display %d\n",

+	      nDisp);

+      return FALSE;

+    }

+

+  return TRUE;

+}

+

+/* GLX debugging helpers */

+#include <../glx/glapi.h>

+

+static

+void warn_func(void * p1, const char *format, ...) {

+  va_list v;

+  va_start(v, format);

+  vfprintf(stderr, format, v);

+  va_end(v);

+  fprintf(stderr,"\n");

+}

+

+static

+void glx_debugging(void)

+{

+  _glapi_set_warning_func(warn_func);

+  _glapi_noop_enable_warnings(TRUE);

+}

diff --git a/xorg-server/hw/xwin/glx/indirect.c b/xorg-server/hw/xwin/glx/indirect.c
index 08c16f85d..bc0d24841 100644
--- a/xorg-server/hw/xwin/glx/indirect.c
+++ b/xorg-server/hw/xwin/glx/indirect.c
@@ -739,7 +739,7 @@ glxWinScreenProbe(ScreenPtr pScreen)
 #endif

 

       // Override the GL extensions string set by __glXScreenInit()

-      screen->base.GLextensions = xstrdup(gl_extensions);

+      screen->base.GLextensions = strdup(gl_extensions);

 

       // Generate the GLX extensions string (overrides that set by __glXScreenInit())

       {

@@ -769,13 +769,13 @@ glxWinScreenProbe(ScreenPtr pScreen)
 

           if (screen->has_WGL_ARB_multisample)

             {

-              screen->base.GLXversion = xstrdup("1.4");

+              screen->base.GLXversion = strdup("1.4");

               screen->base.GLXmajor = 1;

               screen->base.GLXminor = 4;

             }

           else

             {

-              screen->base.GLXversion = xstrdup("1.3");

+              screen->base.GLXversion = strdup("1.3");

               screen->base.GLXmajor = 1;

               screen->base.GLXminor = 3;

             }

diff --git a/xorg-server/hw/xwin/winconfig.c b/xorg-server/hw/xwin/winconfig.c
index 89a57eada..8357ff576 100644
--- a/xorg-server/hw/xwin/winconfig.c
+++ b/xorg-server/hw/xwin/winconfig.c
@@ -580,7 +580,7 @@ winConfigFiles ()
   else if (filesptr != NULL && filesptr->file_fontpath)

     {

       from = X_CONFIG;

-      defaultFontPath = xstrdup (filesptr->file_fontpath);

+      defaultFontPath = strdup (filesptr->file_fontpath);

     }

   winDebug ("FontPath set to \"%s\"\n", defaultFontPath);

 

@@ -627,7 +627,7 @@ winSetStrOption (pointer optlist, const char *name, char *deflt)
   if (ParseOptionValue (-1, optlist, &o))

     deflt = o.value.str;

   if (deflt)

-    return xstrdup (deflt);

+    return strdup (deflt);

   else

     return NULL;

 }

diff --git a/xorg-server/record/record.c b/xorg-server/record/record.c
index 17159fca4..75b74eaca 100644
--- a/xorg-server/record/record.c
+++ b/xorg-server/record/record.c
@@ -2520,8 +2520,6 @@ RecordDeleteContext(pointer value, XID id)
 	}

     }

 

-    free(pContext);

-

     /* remove context from AllContexts list */

 

     if (-1 != (i = RecordFindContextOnAllContexts(pContext)))

@@ -2533,6 +2531,8 @@ RecordDeleteContext(pointer value, XID id)
 	    ppAllContexts = NULL;

 	}

     }

+    free(pContext);

+

     return Success;

 } /* RecordDeleteContext */

 

diff --git a/xorg-server/xkb/XKBGAlloc.c b/xorg-server/xkb/XKBGAlloc.c
index b5c9b8446..a6d10c4b0 100644
--- a/xorg-server/xkb/XKBGAlloc.c
+++ b/xorg-server/xkb/XKBGAlloc.c
@@ -114,10 +114,8 @@ register char *ptr;
     }

     if (freeAll) {

 	(*num_inout)= (*sz_inout)= 0;

-	if (*elems) {

-	    free(*elems);

-	    *elems= NULL;

-	}

+	free(*elems);

+	*elems = NULL;

     }

     else if (first+count>=(*num_inout))

 	*num_inout= first;

@@ -137,14 +135,10 @@ _XkbClearProperty(char *prop_in)
 {

 XkbPropertyPtr	prop= (XkbPropertyPtr)prop_in;

 

-    if (prop->name) {

-	free(prop->name);

-	prop->name= NULL;

-    }

-    if (prop->value) {

-	free(prop->value);

-	prop->value= NULL;

-    }

+    free(prop->name);

+    prop->name = NULL;

+    free(prop->value);

+    prop->value = NULL;

     return;

 }

 

diff --git a/xorg-server/xkb/XKBMAlloc.c b/xorg-server/xkb/XKBMAlloc.c
index 0bd7b5e01..28995de81 100644
--- a/xorg-server/xkb/XKBMAlloc.c
+++ b/xorg-server/xkb/XKBMAlloc.c
@@ -221,18 +221,12 @@ XkbCopyKeyType(XkbKeyTypePtr from,XkbKeyTypePtr into)
 {

     if ((!from)||(!into))

 	return BadMatch;

-    if (into->map) {

-	free(into->map);

-	into->map= NULL;

-    }

-    if (into->preserve) {

-	free(into->preserve);

-	into->preserve= NULL;

-    }

-    if (into->level_names) {

-	free(into->level_names);

-	into->level_names= NULL;

-    }

+    free(into->map);

+    into->map = NULL;

+    free(into->preserve);

+    into->preserve = NULL;

+    free(into->level_names);

+    into->level_names = NULL;

     *into= *from;

     if ((from->map)&&(into->map_count>0)) {

 	into->map= calloc(into->map_count, sizeof(XkbKTMapEntryRec));

diff --git a/xorg-server/xkb/ddxList.c b/xorg-server/xkb/ddxList.c
index b148c714f..e4e32075b 100644
--- a/xorg-server/xkb/ddxList.c
+++ b/xorg-server/xkb/ddxList.c
@@ -208,10 +208,7 @@ char	tmpname[PATH_MAX];
 	return BadImplementation;

     }

     list->nFound[what]= 0;

-    if (buf) {

-        free(buf);

-        buf = NULL;

-    }

+    free(buf);

     buf = malloc(PATH_MAX * sizeof(char));

     if (!buf)

     {

diff --git a/xorg-server/xkb/ddxLoad.c b/xorg-server/xkb/ddxLoad.c
index 6cf8e7ee9..b8fd71776 100644
--- a/xorg-server/xkb/ddxLoad.c
+++ b/xorg-server/xkb/ddxLoad.c
@@ -74,6 +74,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 

 #ifdef WIN32

 

+#define strdup _strdup

+

 #include <X11/Xwindows.h>

 const char* 

 Win32TempDir()

@@ -103,7 +105,7 @@ Win32System(const char *cmdline)
     STARTUPINFO si;

     PROCESS_INFORMATION pi;

     DWORD dwExitCode;

-    char *cmd = xstrdup(cmdline);

+    char *cmd = strdup(cmdline);

 

     ZeroMemory( &si, sizeof(si) );

     si.cb = sizeof(si);

@@ -235,6 +237,11 @@ XkbDDXCompileKeymapByNames(	XkbDescPtr		xkb,
 		  xkm_output_dir, keymap);

 

     free(xkbbasedirflag);

+

+    if (!buf) {

+        LogMessage(X_ERROR, "XKB: Could not invoke xkbcomp: not enough memory\n");

+        return FALSE;

+    }

     

 #ifndef WIN32

     out= Popen(buf,"w");

diff --git a/xorg-server/xkb/xkb.c b/xorg-server/xkb/xkb.c
index cd48515d7..b491f8240 100644
--- a/xorg-server/xkb/xkb.c
+++ b/xorg-server/xkb/xkb.c
@@ -5510,10 +5510,8 @@ ProcXkbListComponents(ClientPtr client)
     if ((XkbPaddedSize(len)/4)!=stuff->length)

 	return BadLength;

     if ((status=XkbDDXList(dev,&list,client))!=Success) {

-	if (list.pool) {

-	    free(list.pool);

-	    list.pool= NULL;

-	}

+	free(list.pool);

+	list.pool = NULL;

 	return status;

     }

     memset(&rep, 0, sizeof(xkbListComponentsReply));

@@ -5888,11 +5886,16 @@ ProcXkbGetKbdByName(ClientPtr client)
 	XkbFreeKeyboard(new,XkbAllComponentsMask,TRUE);

 	new= NULL;

     }

-    if (names.keycodes)	{ free(names.keycodes); names.keycodes= NULL; }

-    if (names.types)	{ free(names.types); names.types= NULL; }

-    if (names.compat)	{ free(names.compat); names.compat= NULL; }

-    if (names.symbols)	{ free(names.symbols); names.symbols= NULL; }

-    if (names.geometry)	{ free(names.geometry); names.geometry= NULL; }

+    free(names.keycodes);

+    names.keycodes = NULL;

+    free(names.types);

+    names.types = NULL;

+    free(names.compat);

+    names.compat = NULL;

+    free(names.symbols);

+    names.symbols = NULL;

+    free(names.geometry);

+    names.geometry = NULL;

     return Success;

 }

 

diff --git a/xorg-server/xkb/xkbInit.c b/xorg-server/xkb/xkbInit.c
index eb3e04d64..98483857c 100644
--- a/xorg-server/xkb/xkbInit.c
+++ b/xorg-server/xkb/xkbInit.c
@@ -635,10 +635,8 @@ unwind_key:
 void

 XkbFreeInfo(XkbSrvInfoPtr xkbi)

 {

-    if (xkbi->radioGroups) {

-	free(xkbi->radioGroups);

-	xkbi->radioGroups= NULL;

-    }

+    free(xkbi->radioGroups);

+    xkbi->radioGroups = NULL;

     if (xkbi->mouseKeyTimer) {

 	TimerFree(xkbi->mouseKeyTimer);

 	xkbi->mouseKeyTimer= NULL;

diff --git a/xorg-server/xkb/xkbUtils.c b/xorg-server/xkb/xkbUtils.c
index 6b6e6d379..63c99e51b 100644
--- a/xorg-server/xkb/xkbUtils.c
+++ b/xorg-server/xkb/xkbUtils.c
@@ -69,6 +69,10 @@ DEALINGS IN THE SOFTWARE.
 #include "xkbgeom.h"

 #include "xkb.h"

 

+#ifdef _MSC_VER

+#define strdup _strdup

+#endif

+

 /***====================================================================***/

 

 int

@@ -1761,15 +1765,15 @@ _XkbCopyGeom(XkbDescPtr src, XkbDescPtr dst)
                     if (sdoodad->any.type == XkbTextDoodad) {

                         if (sdoodad->text.text)

                             ddoodad->text.text =

-                             xstrdup(sdoodad->text.text);

+                             strdup(sdoodad->text.text);

                         if (sdoodad->text.font)

                             ddoodad->text.font =

-                             xstrdup(sdoodad->text.font);

+                             strdup(sdoodad->text.font);

                     }

                     else if (sdoodad->any.type == XkbLogoDoodad) {

                         if (sdoodad->logo.logo_name)

                             ddoodad->logo.logo_name =

-                             xstrdup(sdoodad->logo.logo_name);

+                             strdup(sdoodad->logo.logo_name);

                     }

                 }

                 dsection->overlays = NULL;

@@ -1832,14 +1836,14 @@ _XkbCopyGeom(XkbDescPtr src, XkbDescPtr dst)
                 memcpy(ddoodad , sdoodad, sizeof(XkbDoodadRec));

                 if (sdoodad->any.type == XkbTextDoodad) {

                     if (sdoodad->text.text)

-                        ddoodad->text.text = xstrdup(sdoodad->text.text);

+                        ddoodad->text.text = strdup(sdoodad->text.text);

                     if (sdoodad->text.font)

-                        ddoodad->text.font = xstrdup(sdoodad->text.font);

+                        ddoodad->text.font = strdup(sdoodad->text.font);

                 }

                 else if (sdoodad->any.type == XkbLogoDoodad) {

                     if (sdoodad->logo.logo_name)

                         ddoodad->logo.logo_name =

-                          xstrdup(sdoodad->logo.logo_name);

+                          strdup(sdoodad->logo.logo_name);

                 }

             }