From bde45e68ad254e7fe92e1afc15f4512ee217d31a Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Mon, 28 Sep 2009 09:32:08 +0000
Subject: Also install xerrordb file. Added extra information in error message
 of winMultiWindowXMsgProcErrorHandler

---
 xorg-server/hw/xwin/winmultiwindowwm.c | 11 ++++++++++-
 xorg-server/installer/vcxsrv.nsi       |  6 ++++--
 xorg-server/makefile                   |  7 +++++--
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/xorg-server/hw/xwin/winmultiwindowwm.c b/xorg-server/hw/xwin/winmultiwindowwm.c
index 8d7cea99b..ed0f4b0a2 100644
--- a/xorg-server/hw/xwin/winmultiwindowwm.c
+++ b/xorg-server/hw/xwin/winmultiwindowwm.c
@@ -1317,7 +1317,16 @@ winMultiWindowXMsgProcErrorHandler (Display *pDisplay, XErrorEvent *pErr)
 		 pErr->error_code,
 		 pszErrorMsg,
 		 sizeof (pszErrorMsg));
-  ErrorF ("winMultiWindowXMsgProcErrorHandler - ERROR: %s\n", pszErrorMsg);
+  ErrorF ("winMultiWindowXMsgProcErrorHandler - ERROR: %s\n"
+          "  errorCode %d\n"
+          "  resourceID %d\n"
+          "  majorCode %d\n"
+          "  minorCode %d\n"
+          , pszErrorMsg
+          , pErr->error_code
+          , pErr->resourceid
+          , pErr->request_code
+          , pErr->minor_code);
   
   return 0;
 }
diff --git a/xorg-server/installer/vcxsrv.nsi b/xorg-server/installer/vcxsrv.nsi
index 6b66a4cd6..be8258f92 100644
--- a/xorg-server/installer/vcxsrv.nsi
+++ b/xorg-server/installer/vcxsrv.nsi
@@ -62,7 +62,8 @@ Section "VcXsrv (required)"
   File "..\protocol.txt"
   File "..\system.XWinrc"
   File "..\..\xkbcomp\obj\release\xkbcomp.exe"
-  File "..\xkeysymdb"
+  File "..\XKeysymDB"
+  File "..\XErrorDB"
   File "..\hw\xwin\xlaunch\obj\release\xlaunch.exe"
   File "..\..\tools\plink\obj\release\plink.exe"
   SetOutPath $INSTDIR\fonts
@@ -157,7 +158,8 @@ Section "Uninstall"
   Delete "$INSTDIR\protocol.txt"
   Delete "$INSTDIR\system.XWinrc"
   Delete "$INSTDIR\xkbcomp.exe"
-  Delete "$INSTDIR\xkeysymdb"
+  Delete "$INSTDIR\XKeysymDB"
+  Delete "$INSTDIR\XErrorDB"
   Delete "$INSTDIR\xlaunch.exe"
 
   RMDir /r "$INSTDIR\fonts"
diff --git a/xorg-server/makefile b/xorg-server/makefile
index 519a5be53..bdbae3802 100644
--- a/xorg-server/makefile
+++ b/xorg-server/makefile
@@ -82,6 +82,9 @@ $(OBJDIR)\$(TTYAPP).exe: $(LINKLIBS)
 XKeysymDB: ..\libX11\src\XKeysymDB
 	copy $< $@
 
+XErrorDB: ..\libX11\src\XErrorDB
+	copy $< $@
+
 $(TTYAPP).exe: $(OBJDIR)\$(TTYAPP).exe
 	copy $< $@
 
@@ -104,8 +107,8 @@ load_makefile ..\libX11\nls\makefile MAKESERVER=0 DEBUG=0
 load_makefile fonts.src\makefile MAKESERVER=0 DEBUG=0
 load_makefile xkbdata.src\makefile MAKESERVER=0 DEBUG=0
 
-all: $(TTYAPP).exe xlaunch.exe xkbcomp.exe protocol.txt XKeysymDB ..\libX11\nls\all fonts.src\all xkbdata.src\all \
-     plink.exe
+all: $(TTYAPP).exe xlaunch.exe xkbcomp.exe protocol.txt XKeysymDB XErrorDB \
+     ..\libX11\nls\all fonts.src\all xkbdata.src\all plink.exe
 
 protocol.txt: dix\protocol.txt
 	copy $< $@
-- 
cgit v1.2.3