Merge remote-tracking branch 'origin/released'

Conflicts:
	mesalib/src/glsl/ast_function.cpp
	mesalib/src/glsl/glsl_types.cpp
	mesalib/src/mesa/main/teximage.c
	mesalib/src/mesa/main/texparam.c
	xorg-server/config/udev.c
	xorg-server/configure.ac
	xorg-server/dix/main.c
	xorg-server/hw/dmx/dmxinit.c
	xorg-server/hw/kdrive/src/kdrive.c
	xorg-server/hw/xfree86/common/xf86Config.c
	xorg-server/hw/xfree86/common/xf86Configure.c
	xorg-server/hw/xfree86/common/xf86Helper.c
	xorg-server/hw/xfree86/common/xf86Init.c
	xorg-server/hw/xfree86/common/xf86Option.c
	xorg-server/hw/xfree86/common/xf86Priv.h
	xorg-server/hw/xfree86/common/xf86Xinput.c
	xorg-server/hw/xnest/Init.c
	xorg-server/hw/xquartz/darwin.c
	xorg-server/hw/xwin/InitOutput.c
	xorg-server/hw/xwin/winerror.c
	xorg-server/hw/xwin/xlaunch/config.cc
	xorg-server/hw/xwin/xlaunch/config.h
	xorg-server/hw/xwin/xlaunch/main.cc
	xorg-server/hw/xwin/xlaunch/resources/dialog.rc
	xorg-server/hw/xwin/xlaunch/resources/resources.h
	xorg-server/hw/xwin/xlaunch/resources/resources.rc
	xorg-server/hw/xwin/xlaunch/resources/strings.rc
	xorg-server/hw/xwin/xlaunch/window/util.cc
	xorg-server/hw/xwin/xlaunch/window/util.h
	xorg-server/hw/xwin/xlaunch/window/wizard.h
	xorg-server/include/os.h
	xorg-server/os/log.c
	xorg-server/xkeyboard-config/symbols/lv

3 files changed, 173 insertions, 193 deletions

diff --git a/xorg-server/hw/xwin/InitOutput.c b/xorg-server/hw/xwin/InitOutput.c
index ae56c51fa..f79132c42 100644
--- a/xorg-server/hw/xwin/InitOutput.c
+++ b/xorg-server/hw/xwin/InitOutput.c
@@ -177,7 +177,7 @@ ddxBeforeReset (void)
 

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

 void

-ddxGiveUp (void)

+ddxGiveUp (enum ExitCode error)

 {

   int		i;

 

@@ -212,7 +212,7 @@ ddxGiveUp (void)
     g_pszLogFile = LogInit (g_pszLogFile, NULL);

     g_fLogInited = TRUE;

   }  

-  LogClose ();

+  LogClose (error);

 

   /*

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

@@ -242,10 +242,10 @@ ddxGiveUp (void)
 

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

 void

-AbortDDX (void)

+AbortDDX (enum ExitCode error)

 {

   winDebug ("AbortDDX\n");

-  ddxGiveUp ();

+  ddxGiveUp (error);

 }

 

 #ifdef __CYGWIN__

@@ -906,7 +906,7 @@ ddxUseMsg(void)
     g_pszLogFile = LogInit (g_pszLogFile, NULL);

     g_fLogInited = TRUE;

   }  

-  LogClose ();

+  LogClose (EXIT_NO_ERROR);

 

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

   if (!g_fNoHelpMessageBox)

diff --git a/xorg-server/hw/xwin/Makefile.am b/xorg-server/hw/xwin/Makefile.am
index 0afd81883..70f6cf7a6 100644
--- a/xorg-server/hw/xwin/Makefile.am
+++ b/xorg-server/hw/xwin/Makefile.am
@@ -176,27 +176,7 @@ install-exec-hook:
 EXTRA_DIST = \
 	$(xwinconfig_DATA) \
 	X.ico \
-	XWin.rc \
-	xlaunch/config.cc \
-	xlaunch/COPYING \
-	xlaunch/main.cc \
-	xlaunch/resources/dialog.rc \
-	xlaunch/resources/fullscreen.bmp \
-	xlaunch/resources/images.rc \
-	xlaunch/resources/multiwindow.bmp \
-	xlaunch/resources/nodecoration.bmp \
-	xlaunch/resources/resources.h \
-	xlaunch/resources/resources.rc \
-	xlaunch/resources/strings.rc \
-	xlaunch/resources/windowed.bmp \
-	xlaunch/window/dialog.cc \
-	xlaunch/window/dialog.h \
-	xlaunch/window/util.cc \
-	xlaunch/window/util.h \
-	xlaunch/window/window.cc \
-	xlaunch/window/window.h \
-	xlaunch/window/wizard.cc \
-	xlaunch/window/wizard.h
+	XWin.rc
 
 relink:
 	$(AM_V_at)rm -f XWin$(EXEEXT) && $(MAKE) XWin$(EXEEXT)
diff --git a/xorg-server/hw/xwin/winerror.c b/xorg-server/hw/xwin/winerror.c
index 47e1bd86f..e95be3f4c 100644
--- a/xorg-server/hw/xwin/winerror.c
+++ b/xorg-server/hw/xwin/winerror.c
@@ -1,167 +1,167 @@
-/*

- *Copyright (C) 2001-2004 Harold L Hunt II All Rights Reserved.

- *

- *Permission is hereby granted, free of charge, to any person obtaining

- * a copy of this software and associated documentation files (the

- *"Software"), to deal in the Software without restriction, including

- *without limitation the rights to use, copy, modify, merge, publish,

- *distribute, sublicense, and/or sell copies of the Software, and to

- *permit persons to whom the Software is furnished to do so, subject to

- *the following conditions:

- *

- *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 HAROLD L HUNT II 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 Harold L Hunt II

- *shall not be used in advertising or otherwise to promote the sale, use

- *or other dealings in this Software without prior written authorization

- *from Harold L Hunt II.

- *

- * Authors:	Harold L Hunt II

- */

-

-#ifdef HAVE_XWIN_CONFIG_H

-#include <xwin-config.h>

-#endif

-

-#include <../xfree86/common/xorgVersion.h>

-#include "win.h"

-

-extern Bool		g_fSilentDupError;

-#ifdef DDXOSVERRORF

-/* Prototype */

-void

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

-

-void

-OsVendorVErrorF (const char *pszFormat, va_list va_args)

-{

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

-  /* make sure the clipboard and multiwindow threads do not interfere the

-   * main thread */

-  static pthread_mutex_t	s_pmPrinting = PTHREAD_MUTEX_INITIALIZER;

-

-  /* Lock the printing mutex */

-  pthread_mutex_lock (&s_pmPrinting);

-#endif

-

-  /*

-     If we want to silence it,

-     detect if we are going to abort due to duplication error

-  */

-  if (g_fSilentDupError)

-    {

-      if ((strcmp(pszFormat,

-		  "InitOutput - Duplicate invocation on display "

-		  "number: %s.  Exiting.\n") == 0)

-	  || (strcmp(pszFormat,

-		     "Server is already active for display %s\n%s %s\n%s\n") == 0)

-	  || (strcmp(pszFormat,

-		     "MakeAllCOTSServerListeners: server already running\n") == 0))

-	{

-	  g_fSilentFatalError = TRUE;

-	}

-    }

-

-  /* Print the error message to a log file, could be stderr */

-  LogVWrite (0, pszFormat, va_args);

-

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

-  /* Unlock the printing mutex */

-  pthread_mutex_unlock (&s_pmPrinting);

-#endif

-}

-#endif

-

-

-/*

- * os/util.c/FatalError () calls our vendor ErrorF, so the message

- * from a FatalError will be logged.  Thus, the message for the

- * fatal error is not passed to this function.

- *

- * Attempt to do last-ditch, safe, important cleanup here.

- */

-char g_FatalErrorMessage[1024];

-void

-OsVendorFatalError (void)

-{

-  /* Don't give duplicate warning if UseMsg was called */

-  if (g_fSilentFatalError)

-    return;

-

-  if (!g_fLogInited) {

-    g_fLogInited = TRUE;

-    g_pszLogFile = LogInit (g_pszLogFile, NULL);

-  }

-  LogClose ();

-

-  winMessageBoxF (

-          "A fatal error has occurred and " PROJECT_NAME " will now exit.\n" \

-	  "%s\n"	  

-          "Please open %s for more information.\n",

-		  MB_ICONERROR, g_FatalErrorMessage, (g_pszLogFile?g_pszLogFile:"the logfile"));

-}

-

-

-/*

- * winMessageBoxF - Print a formatted error message in a useful

- * message box.

- */

-

-void

-winMessageBoxF (const char *pszError, UINT uType, ...)

-{

-  char *	pszErrorF = NULL;

-  char *	pszMsgBox = NULL;

-  va_list	args;

-  int		size;

-

-  va_start(args, uType);

-  size = vasprintf (&pszErrorF, pszError, args);

-  va_end(args);

-  if (size == -1) {

-    pszErrorF = NULL;

-    goto winMessageBoxF_Cleanup;

-  }

-

-#define MESSAGEBOXF \

-	"%s\n" \

-	"Vendor: %s\n" \

-	"Release: %d.%d.%d.%d\n" \

-	"Contact: %s\n" \

-	"%s\n\n" \

-	"XWin was started with the following command-line:\n\n" \

-	"%s\n"

-

-  size = asprintf (&pszMsgBox, MESSAGEBOXF,

-		   pszErrorF, XVENDORNAME,

-		   XORG_VERSION_MAJOR, XORG_VERSION_MINOR, XORG_VERSION_PATCH,

-		    XORG_VERSION_SNAP,

-		   BUILDERADDR,

-		   BUILDERSTRING,

-		   g_pszCommandLine);

-

-  if (size == -1) {

-    pszMsgBox = NULL;

-    goto winMessageBoxF_Cleanup;

-  }

-

-  /* Display the message box string */

-  MessageBox (NULL,

-	      pszMsgBox,

-	      PROJECT_NAME,

-	      MB_OK | uType);

-

- winMessageBoxF_Cleanup:

-  free(pszErrorF);

-  free(pszMsgBox);

-#undef MESSAGEBOXF

-}

+/*
+ *Copyright (C) 2001-2004 Harold L Hunt II All Rights Reserved.
+ *
+ *Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ *"Software"), to deal in the Software without restriction, including
+ *without limitation the rights to use, copy, modify, merge, publish,
+ *distribute, sublicense, and/or sell copies of the Software, and to
+ *permit persons to whom the Software is furnished to do so, subject to
+ *the following conditions:
+ *
+ *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 HAROLD L HUNT II 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 Harold L Hunt II
+ *shall not be used in advertising or otherwise to promote the sale, use
+ *or other dealings in this Software without prior written authorization
+ *from Harold L Hunt II.
+ *
+ * Authors:	Harold L Hunt II
+ */
+
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
+
+#include <../xfree86/common/xorgVersion.h>
+#include "win.h"
+
+extern Bool		g_fSilentDupError;
+#ifdef DDXOSVERRORF
+/* Prototype */
+void
+OsVendorVErrorF (const char *pszFormat, va_list va_args);
+
+void
+OsVendorVErrorF (const char *pszFormat, va_list va_args)
+{
+#if defined(XWIN_CLIPBOARD) || defined (XWIN_MULTIWINDOW)
+  /* make sure the clipboard and multiwindow threads do not interfere the
+   * main thread */
+  static pthread_mutex_t	s_pmPrinting = PTHREAD_MUTEX_INITIALIZER;
+
+  /* Lock the printing mutex */
+  pthread_mutex_lock (&s_pmPrinting);
+#endif
+
+  /*
+     If we want to silence it,
+     detect if we are going to abort due to duplication error
+  */
+  if (g_fSilentDupError)
+    {
+      if ((strcmp(pszFormat,
+		  "InitOutput - Duplicate invocation on display "
+		  "number: %s.  Exiting.\n") == 0)
+	  || (strcmp(pszFormat,
+		     "Server is already active for display %s\n%s %s\n%s\n") == 0)
+	  || (strcmp(pszFormat,
+		     "MakeAllCOTSServerListeners: server already running\n") == 0))
+	{
+	  g_fSilentFatalError = TRUE;
+	}
+    }
+
+  /* Print the error message to a log file, could be stderr */
+  LogVWrite (0, pszFormat, va_args);
+
+#if defined(XWIN_CLIPBOARD) || defined (XWIN_MULTIWINDOW)
+  /* Unlock the printing mutex */
+  pthread_mutex_unlock (&s_pmPrinting);
+#endif
+}
+#endif
+
+
+/*
+ * os/util.c/FatalError () calls our vendor ErrorF, so the message
+ * from a FatalError will be logged.  Thus, the message for the
+ * fatal error is not passed to this function.
+ *
+ * Attempt to do last-ditch, safe, important cleanup here.
+ */
+char g_FatalErrorMessage[1024];
+void
+OsVendorFatalError (void)
+{
+  /* Don't give duplicate warning if UseMsg was called */
+  if (g_fSilentFatalError)
+    return;
+
+  if (!g_fLogInited) {
+    g_fLogInited = TRUE;
+    g_pszLogFile = LogInit (g_pszLogFile, NULL);
+  }
+  LogClose (EXIT_ERR_ABORT);
+
+  winMessageBoxF (
+          "A fatal error has occurred and " PROJECT_NAME " will now exit.\n" \
+	  "%s\n"	  
+          "Please open %s for more information.\n",
+		  MB_ICONERROR, g_FatalErrorMessage, (g_pszLogFile?g_pszLogFile:"the logfile"));
+}
+
+
+/*
+ * winMessageBoxF - Print a formatted error message in a useful
+ * message box.
+ */
+
+void
+winMessageBoxF (const char *pszError, UINT uType, ...)
+{
+  char *	pszErrorF = NULL;
+  char *	pszMsgBox = NULL;
+  va_list	args;
+  int		size;
+
+  va_start(args, uType);
+  size = vasprintf (&pszErrorF, pszError, args);
+  va_end(args);
+  if (size == -1) {
+    pszErrorF = NULL;
+    goto winMessageBoxF_Cleanup;
+  }
+
+#define MESSAGEBOXF \
+	"%s\n" \
+	"Vendor: %s\n" \
+	"Release: %d.%d.%d.%d\n" \
+	"Contact: %s\n" \
+	"%s\n\n" \
+	"XWin was started with the following command-line:\n\n" \
+	"%s\n"
+
+  size = asprintf (&pszMsgBox, MESSAGEBOXF,
+		   pszErrorF, XVENDORNAME,
+		   XORG_VERSION_MAJOR, XORG_VERSION_MINOR, XORG_VERSION_PATCH,
+		    XORG_VERSION_SNAP,
+		   BUILDERADDR,
+		   BUILDERSTRING,
+		   g_pszCommandLine);
+
+  if (size == -1) {
+    pszMsgBox = NULL;
+    goto winMessageBoxF_Cleanup;
+  }
+
+  /* Display the message box string */
+  MessageBox (NULL,
+	      pszMsgBox,
+	      PROJECT_NAME,
+	      MB_OK | uType);
+
+ winMessageBoxF_Cleanup:
+  free(pszErrorF);
+  free(pszMsgBox);
+#undef MESSAGEBOXF
+}