Update to X server 1.14.1. Tested by many during t2k13. Thanks.

1 files changed, 38 insertions, 35 deletions

diff --git a/xserver/hw/xwin/Makefile.in b/xserver/hw/xwin/Makefile.in
index 419103c7a..84135408b 100644
--- a/xserver/hw/xwin/Makefile.in
+++ b/xserver/hw/xwin/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.3 from Makefile.am.
+# Makefile.in generated by automake 1.12.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2012 Free Software Foundation, Inc.
@@ -53,7 +53,7 @@ build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = XWin$(EXEEXT)
 subdir = hw/xwin
-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(top_srcdir)/depcomp $(top_srcdir)/ylwrap winprefslex.c \
 	winprefsyacc.c winprefsyacc.h
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -83,34 +83,36 @@ am__XWin_SOURCES_DIST = InitInput.c InitOutput.c winallpriv.c \
 	winkeybd.c winkeyhook.c winmisc.c winmonitors.c winmouse.c \
 	winmsg.c winmultiwindowclass.c winmultiwindowicons.c \
 	winprefs.c winprefsyacc.y winprefslex.l winprocarg.c \
-	winregistry.c winscrinit.c winshaddd.c winshadddnl.c \
-	winshadgdi.c wintrayicon.c winvalargs.c winwakeup.c \
+	winscrinit.c winshaddd.c winshadddnl.c winshadgdi.c \
+	wintaskbar.c wintrayicon.c winvalargs.c winwakeup.c \
 	winwindow.c winwndproc.c ddraw.h winclipboard.h winconfig.h \
-	win.h winkeybd.h winkeynames.h winlayouts.h winmessages.h \
-	winmsg.h winms.h winmultiwindowclass.h winprefs.h \
+	win.h winglobals.h winkeybd.h winkeynames.h winlayouts.h \
+	winmessages.h winmonitors.h winmsg.h winms.h \
+	winmultiwindowclass.h winmultiwindowicons.h winprefs.h \
 	winresource.h winwindow.h XWin.rc \
 	$(top_srcdir)/Xext/dpmsstubs.c $(top_srcdir)/Xi/stubs.c \
 	$(top_srcdir)/mi/miinitext.c $(top_srcdir)/fb/fbcmap_mi.c \
 	winclipboardinit.c winclipboardtextconv.c winclipboardthread.c \
-	winclipboardunicode.c winclipboardwndproc.c \
-	winclipboardwrappers.c winclipboardxevents.c \
-	winmultiwindowshape.c winmultiwindowwindow.c \
-	winmultiwindowwm.c winmultiwindowwndproc.c winwin32rootless.c \
-	winwin32rootlesswindow.c winwin32rootlesswndproc.c \
-	winwindowswm.c winclip.c winfillsp.c winfont.c wingc.c \
-	wingetsp.c winnativegdi.c winpixmap.c winpolyline.c winrop.c \
-	winsetsp.c winpfbdd.c winrandr.c winvideo.c
+	winclipboardwndproc.c winclipboardwrappers.c \
+	winclipboardxevents.c winmultiwindowshape.c \
+	winmultiwindowwindow.c winmultiwindowwm.c \
+	winmultiwindowwndproc.c propertystore.h winSetAppUserModelID.c \
+	winwin32rootless.c winwin32rootlesswindow.c \
+	winwin32rootlesswndproc.c winwindowswm.c winclip.c winfillsp.c \
+	winfont.c wingc.c wingetsp.c winnativegdi.c winpixmap.c \
+	winpolyline.c winrop.c winsetsp.c winpfbdd.c winrandr.c \
+	winvideo.c
 @XWIN_CLIPBOARD_TRUE@am__objects_1 = winclipboardinit.$(OBJEXT) \
 @XWIN_CLIPBOARD_TRUE@	winclipboardtextconv.$(OBJEXT) \
 @XWIN_CLIPBOARD_TRUE@	winclipboardthread.$(OBJEXT) \
-@XWIN_CLIPBOARD_TRUE@	winclipboardunicode.$(OBJEXT) \
 @XWIN_CLIPBOARD_TRUE@	winclipboardwndproc.$(OBJEXT) \
 @XWIN_CLIPBOARD_TRUE@	winclipboardwrappers.$(OBJEXT) \
 @XWIN_CLIPBOARD_TRUE@	winclipboardxevents.$(OBJEXT)
 @XWIN_MULTIWINDOW_TRUE@am__objects_2 = winmultiwindowshape.$(OBJEXT) \
 @XWIN_MULTIWINDOW_TRUE@	winmultiwindowwindow.$(OBJEXT) \
 @XWIN_MULTIWINDOW_TRUE@	winmultiwindowwm.$(OBJEXT) \
-@XWIN_MULTIWINDOW_TRUE@	winmultiwindowwndproc.$(OBJEXT)
+@XWIN_MULTIWINDOW_TRUE@	winmultiwindowwndproc.$(OBJEXT) \
+@XWIN_MULTIWINDOW_TRUE@	winSetAppUserModelID.$(OBJEXT)
 @XWIN_MULTIWINDOWEXTWM_TRUE@am__objects_3 =  \
 @XWIN_MULTIWINDOWEXTWM_TRUE@	winwin32rootless.$(OBJEXT) \
 @XWIN_MULTIWINDOWEXTWM_TRUE@	winwin32rootlesswindow.$(OBJEXT) \
@@ -135,8 +137,8 @@ am__objects_8 = InitInput.$(OBJEXT) InitOutput.$(OBJEXT) \
 	winmultiwindowclass.$(OBJEXT) winmultiwindowicons.$(OBJEXT) \
 	winprefs.$(OBJEXT) winprefsyacc.$(OBJEXT) \
 	winprefslex.$(OBJEXT) winprocarg.$(OBJEXT) \
-	winregistry.$(OBJEXT) winscrinit.$(OBJEXT) winshaddd.$(OBJEXT) \
-	winshadddnl.$(OBJEXT) winshadgdi.$(OBJEXT) \
+	winscrinit.$(OBJEXT) winshaddd.$(OBJEXT) winshadddnl.$(OBJEXT) \
+	winshadgdi.$(OBJEXT) wintaskbar.$(OBJEXT) \
 	wintrayicon.$(OBJEXT) winvalargs.$(OBJEXT) winwakeup.$(OBJEXT) \
 	winwindow.$(OBJEXT) winwndproc.$(OBJEXT) XWin.$(OBJEXT) \
 	dpmsstubs.$(OBJEXT) stubs.$(OBJEXT) miinitext.$(OBJEXT) \
@@ -187,7 +189,6 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
 am__v_CCLD_0 = @echo "  CCLD    " $@;
 am__v_CCLD_1 = 
-@MAINTAINER_MODE_FALSE@am__skiplex = test -f $@ ||
 LEXCOMPILE = $(LEX) $(AM_LFLAGS) $(LFLAGS)
 LTLEXCOMPILE = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=compile $(LEX) $(AM_LFLAGS) $(LFLAGS)
@@ -196,7 +197,6 @@ am__v_LEX_ = $(am__v_LEX_@AM_DEFAULT_V@)
 am__v_LEX_0 = @echo "  LEX     " $@;
 am__v_LEX_1 = 
 YLWRAP = $(top_srcdir)/ylwrap
-@MAINTAINER_MODE_FALSE@am__skipyacc = test -f $@ ||
 am__yacc_c2h = sed -e s/cc$$/hh/ -e s/cpp$$/hpp/ -e s/cxx$$/hxx/ \
 		   -e s/c++$$/h++/ -e s/c$$/h/
 YACCCOMPILE = $(YACC) $(AM_YFLAGS) $(YFLAGS)
@@ -346,13 +346,9 @@ DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
 DOXYGEN = @DOXYGEN@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
-DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
-DRIPROTO_LIBS = @DRIPROTO_LIBS@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
-DRI_CFLAGS = @DRI_CFLAGS@
 DRI_DRIVER_PATH = @DRI_DRIVER_PATH@
-DRI_LIBS = @DRI_LIBS@
 DSYMUTIL = @DSYMUTIL@
 DTRACE = @DTRACE@
 DUMPBIN = @DUMPBIN@
@@ -374,6 +370,7 @@ FONTTYPE1DIR = @FONTTYPE1DIR@
 FOP = @FOP@
 GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@
 GLX_DEFINES = @GLX_DEFINES@
+GLX_SYS_LIBS = @GLX_SYS_LIBS@
 GLX_TLS = @GLX_TLS@
 GL_CFLAGS = @GL_CFLAGS@
 GL_LIBS = @GL_LIBS@
@@ -398,6 +395,7 @@ KHRONOS_SPEC_DIR = @KHRONOS_SPEC_DIR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LD_EXPORT_SYMBOLS_FLAG = @LD_EXPORT_SYMBOLS_FLAG@
+LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -413,7 +411,6 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
 MAIN_LIB = @MAIN_LIB@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -512,6 +509,7 @@ XNESTMODULES_LIBS = @XNESTMODULES_LIBS@
 XNEST_LIBS = @XNEST_LIBS@
 XNEST_SYS_LIBS = @XNEST_SYS_LIBS@
 XORG_CFLAGS = @XORG_CFLAGS@
+XORG_DRIVER_LIBS = @XORG_DRIVER_LIBS@
 XORG_INCS = @XORG_INCS@
 XORG_LIBS = @XORG_LIBS@
 XORG_MALLOC_DEBUG_ENV = @XORG_MALLOC_DEBUG_ENV@
@@ -543,7 +541,7 @@ XWINMODULES_CFLAGS = @XWINMODULES_CFLAGS@
 XWINMODULES_LIBS = @XWINMODULES_LIBS@
 XWIN_LIBS = @XWIN_LIBS@
 XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
-XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
+XWIN_SYS_LIBS = @XWIN_SYS_LIBS@ -ldxguid
 YACC = @YACC@
 YFLAGS = @YFLAGS@
 __XCONFIGDIR__ = @__XCONFIGDIR__@
@@ -615,7 +613,6 @@ top_srcdir = @top_srcdir@
 @XWIN_CLIPBOARD_TRUE@	winclipboardinit.c \
 @XWIN_CLIPBOARD_TRUE@	winclipboardtextconv.c \
 @XWIN_CLIPBOARD_TRUE@	winclipboardthread.c \
-@XWIN_CLIPBOARD_TRUE@	winclipboardunicode.c \
 @XWIN_CLIPBOARD_TRUE@	winclipboardwndproc.c \
 @XWIN_CLIPBOARD_TRUE@	winclipboardwrappers.c \
 @XWIN_CLIPBOARD_TRUE@	winclipboardxevents.c
@@ -629,9 +626,12 @@ top_srcdir = @top_srcdir@
 @XWIN_MULTIWINDOW_TRUE@	winmultiwindowshape.c \
 @XWIN_MULTIWINDOW_TRUE@	winmultiwindowwindow.c \
 @XWIN_MULTIWINDOW_TRUE@	winmultiwindowwm.c \
-@XWIN_MULTIWINDOW_TRUE@	winmultiwindowwndproc.c
+@XWIN_MULTIWINDOW_TRUE@	winmultiwindowwndproc.c \
+@XWIN_MULTIWINDOW_TRUE@	propertystore.h \
+@XWIN_MULTIWINDOW_TRUE@	winSetAppUserModelID.c
 
 @XWIN_MULTIWINDOW_TRUE@DEFS_MULTIWINDOW = -DXWIN_MULTIWINDOW
+@XWIN_MULTIWINDOW_TRUE@MULTIWINDOW_LIBS = -lshlwapi -lole32
 @XWIN_MULTIWINDOWEXTWM_TRUE@SRCS_MULTIWINDOWEXTWM = \
 @XWIN_MULTIWINDOWEXTWM_TRUE@	winwin32rootless.c \
 @XWIN_MULTIWINDOWEXTWM_TRUE@	winwin32rootlesswindow.c \
@@ -690,11 +690,11 @@ SRCS = InitInput.c \
 	winprefsyacc.y \
 	winprefslex.l \
 	winprocarg.c \
-	winregistry.c \
 	winscrinit.c \
 	winshaddd.c \
 	winshadddnl.c \
 	winshadgdi.c \
+	wintaskbar.c \
 	wintrayicon.c \
 	winvalargs.c \
 	winwakeup.c \
@@ -704,13 +704,16 @@ SRCS = InitInput.c \
 	winclipboard.h \
 	winconfig.h \
 	win.h \
+	winglobals.h \
 	winkeybd.h \
 	winkeynames.h \
 	winlayouts.h \
 	winmessages.h \
+	winmonitors.h \
 	winmsg.h \
 	winms.h \
 	winmultiwindowclass.h \
+	winmultiwindowicons.h \
 	winprefs.h \
 	winresource.h \
 	winwindow.h \
@@ -730,7 +733,7 @@ SRCS = InitInput.c \
 XWin_SOURCES = $(SRCS)
 INCLUDES = -I$(top_srcdir)/miext/rootless
 XWin_DEPENDENCIES = $(MULTIWINDOWEXTWM_LIBS) $(XWIN_GLX_LIBS) $(XWIN_LIBS) $(MAIN_LIB) $(XSERVER_LIBS)
-XWin_LDADD = $(MULTIWINDOWEXTWM_LIBS) $(XWIN_GLX_LIBS) $(XWIN_GLX_LINK_FLAGS) $(XWIN_LIBS) $(MAIN_LIB) $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) $(XWIN_SYS_LIBS)
+XWin_LDADD = $(MULTIWINDOW_LIBS) $(MULTIWINDOWEXTWM_LIBS) $(XWIN_GLX_LIBS) $(XWIN_GLX_LINK_FLAGS) $(XWIN_LIBS) $(MAIN_LIB) $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) $(XWIN_SYS_LIBS)
 XWin_LDFLAGS = -mwindows -static
 BUILT_SOURCES = winprefsyacc.h winprefsyacc.c winprefslex.c
 CLEANFILES = $(BUILT_SOURCES)
@@ -756,7 +759,7 @@ all: $(BUILT_SOURCES)
 
 .SUFFIXES:
 .SUFFIXES: .c .l .lo .o .obj .rc .y
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -781,9 +784,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+$(top_srcdir)/configure:  $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
 install-binPROGRAMS: $(bin_PROGRAMS)
@@ -848,6 +851,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fbcmap_mi.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/miinitext.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stubs.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/winSetAppUserModelID.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/winallpriv.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/winauth.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/winblock.Po@am__quote@
@@ -855,7 +859,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/winclipboardinit.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/winclipboardtextconv.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/winclipboardthread.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/winclipboardunicode.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/winclipboardwndproc.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/winclipboardwrappers.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/winclipboardxevents.Po@am__quote@
@@ -892,13 +895,13 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/winprefsyacc.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/winprocarg.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/winrandr.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/winregistry.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/winrop.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/winscrinit.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/winsetsp.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/winshaddd.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/winshadddnl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/winshadgdi.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wintaskbar.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wintrayicon.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/winvalargs.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/winvideo.Po@am__quote@