Release v5.8

Get the guard with STAGING_WRITECOPY env var back as the
patchset is currently causing some regressions.

.gitignore

@@ -0,0 +1,3 @@
+staging/wine
+*.pyc
+.patchupdate.cache

README.md

@@ -1,18 +1,82 @@
-wine-compholio-daily
-====================
+What is Wine Staging?
+---------------------
 
-Daily updates for the Wine "Compholio" Edition.
+**Wine Staging** is the testing area of winehq.org. It contains bug fixes and
+features, which have not been integrated into the development branch yet. The
+idea of Wine Staging is to provide experimental features faster to end users and
+to give developers the possibility to discuss and improve their patches before
+they are integrated into the main branch. More information about Wine Staging
+can also be found [on the WineHQ wiki](https://wiki.winehq.org/Wine-Staging).
 
-Current patches include:
-* Support for interface change notifications (http://bugs.winehq.org/show_bug.cgi?id=32328)
-* Support for stored file ACLs (http://bugs.winehq.org/show_bug.cgi?id=31858)
-* Support for inherited file ACLs (http://bugs.winehq.org/show_bug.cgi?id=34406)
-* Support for Junction Points (http://bugs.winehq.org/show_bug.cgi?id=12401)
-* Support for TransmitFile (http://bugs.winehq.org/show_bug.cgi?id=5048)
-* Support for GetVolumePathName
-* Allow CompareStringEx flag NORM_LINGUISTIC_CASING (http://bugs.winehq.org/show_bug.cgi?id=34269)
-* Workaround for TransactNamedPipe not being supported (http://bugs.winehq.org/show_bug.cgi?id=17273)
-* XEMBED support for embedding Wine windows inside Linux applications
-* Reduced SetTimer minimum value from 15 ms to 5 ms (improves Silverlight framerates)
-* Workaround for shlwapi URLs with relative paths
-* Support for PulseAudio backend for audio
+Installation
+------------
+
+Ready-to-use packages for Wine Staging are available for a variety of Linux
+distributions and for Mac OS X. Just follow the [installation
+instructions](https://wiki.winehq.org/Download) for your operating system.
+
+On most distributions the `wine-staging` package is installed to
+`/opt/wine-staging`, such that multiple Wine versions can be installed in
+parallel. If this is the case for your distribution, you will have to type
+`/opt/wine-staging/bin/wine` instead of just `wine`. The same also applies for
+other wine-specific programs like `winecfg`. To learn more about how to use
+Wine Staging, please take a look at the
+[usage instructions](https://wiki.winehq.org/Wine-Staging_Usage).
+
+Building
+--------
+
+Wine Staging is maintained as a set of patches which has to be applied on top of
+the development branch. In order to build Wine Staging, the first step is to
+setup a build environment for Wine, including all required dependencies. A lot
+of information about that is collected in the
+[WineHQ Wiki](http://wiki.winehq.org/BuildingWine).
+
+In order to apply all Wine Staging patches it is recommended to use the
+`patchinstall.sh` utility which takes care of applying all patches in the
+correct order. For reference, the possible commandline arguments are:
+
+```
+Usage: ./patchinstall.sh [DESTDIR=path] [--all] [-W patchset] [patchset ...]
+
+Autogenerated script to apply all Wine Staging patches on your Wine
+source tree.
+
+Configuration:
+  DESTDIR=path         Specify the path to the wine source tree
+  --all                Select all patches
+  --force-autoconf     Run autoreconf and tools/make_requests after each patch
+  --help               Display this help and exit
+  --no-autoconf        Do not run autoreconf and tools/make_requests
+  --no-patchlist       Do not apply patchlist (needed for 'wine --patches')
+  --upstream-commit    Print the upstream Wine commit SHA1 and exit
+  --version            Show version information and exit
+  -W patchset          Exclude a specific patchset
+
+Backends:
+  --backend=patch      Use regular 'patch' utility to apply patches (default)
+  --backend=eapply     Use 'eapply' to apply patches (Gentoo only)
+  --backend=epatch     Use 'epatch' to apply patches (Gentoo only, deprecated)
+  --backend=git-am     Use 'git am' to apply patches
+  --backend=git-apply  Use 'git apply' to apply patches
+  --backend=stg        Import the patches using stacked git
+```
+
+If you want to apply *all* patches with the `patch` utility, the commandline
+should look similar to this:
+```
+./patches/patchinstall.sh DESTDIR="/path/to/wine" --all
+```
+
+Before you proceed with the compilation, please make sure that you installed all
+additional build dependencies required for the Wine Staging features you are
+interested in (check output of `./configure`). More information about building
+Wine Staging, optional build dependencies, and hints for packagers are collected
+in our [Wiki](https://wiki.winehq.org/Wine-Staging).
+
+Contributing
+------------
+
+For information on contributing to Wine-Staging, please see
+<https://wiki.winehq.org/Wine-Staging_Contributing>. Note that GitHub pull
+requests are strongly dispreferred, especially for patches.

debian/changelog

@@ -1,129 +0,0 @@
-wine-compholio (1.7.13-1) unstable; urgency=low
-  * Fixed a typo in the configure check for extended attributes.
- -- Erich E. Hoover <erich.e.hoover@gmail.com>  Fri, 21 Feb 2014 09:00:00 -0700
-
-wine-compholio (1.7.13) unstable; urgency=low
-  * Added support for inherited file ACLs.
-  * Further separated the file ACL patches.
-  * Updated linguistic casing patches to include tests.
-  * Updated the patch list template to be compatible with 'git am'.
-  * Moved the patching code out of the debian rules into a Makefile.
-  * Removed the named pipe security access patch (accepted upstream).
-  * Explicitly run configure with '--with-xattr' when building debian packages.
-  * Will now fail on configure when '--with-xattr' is passed and xattr.h cannot be found.
- -- Erich E. Hoover <erich.e.hoover@gmail.com>  Thu, 20 Feb 2014 18:48:03 -0700
-
-wine-compholio (1.7.12-1) unstable; urgency=low
-  * Fixed PulseAudio patches to apply with 'git am'.
-  * Fixed PulseAudio driver configure file for upstream Wine 1.7.12.
-  * Fixed PulseAudio driver pthread dependency for upstream Wine 1.7.12.
- -- Erich E. Hoover <erich.e.hoover@gmail.com>  Fri, 07 Feb 2014 17:52:32 -0700
-
-wine-compholio (1.7.12) unstable; urgency=low
-  * Added new patches to support GetVolumePathName.
- -- Erich E. Hoover <erich.e.hoover@gmail.com>  Fri, 07 Feb 2014 14:57:33 -0700
-
-wine-compholio (1.7.11) unstable; urgency=low
-  * Added SRWLock patch.
-  * Added new patches to support TransmitFile.
-  * Added new patches to support Junction Points.
-  * Moved pipelight-specific patches to a separate folder.
-  * Removed SRWLock patch included in upstream Wine 1.7.11.
-  * Reduced SetTimer minimum limitation from 15 ms to 5 ms.
-  * Added support for security access parameters for named pipes.
-  * Added WINE_STRICT_DRAW_ORDERING command line environment variable.
-  * Fixed a path length bug in the ACL inheritance patch (assumed DOS limitation).
-  * Added some workarounds for shlwapi url functions not handling relative paths well.
- -- Erich E. Hoover <erich.e.hoover@gmail.com>  Fri, 17 Jan 2014 12:27:32 -0700
-
-wine-compholio (1.7.10) unstable; urgency=low
-  * Removed monitor enumeration patch included in upstream Wine 1.7.10.
-  * Updated SIO_ADDRESS_LIST_CHANGE patch with latest proposed version.
-  * Added new patch to support linux windowlessmode (required for Qt5 browsers).
- -- Erich E. Hoover <erich.e.hoover@gmail.com>  Fri, 03 Jan 2014 12:19:14 -0700
-
-wine-compholio (1.7.9) unstable; urgency=low
-  * Added a new patch for windowless mode for Qt5 browsers.
- -- Erich E. Hoover <erich.e.hoover@gmail.com>  Fri, 27 Dec 2013 12:03:22 -0700
-
-wine-compholio (1.7.8-1) unstable; urgency=low
-  * Fixed several build problems.
- -- Erich E. Hoover <erich.e.hoover@gmail.com>  Sat, 07 Dec 2013 10:49:03 -0700
-
-wine-compholio (1.7.8) unstable; urgency=low
-  * Added PulseAudio support patches.
-  * Updated SIO_ADDRESS_LIST_CHANGE patches.
-  * Separated out patches into logical subfolders.
-  * Updated XEMBED patch to work with latest upstream Wine.
- -- Erich E. Hoover <erich.e.hoover@gmail.com>  Fri, 06 Dec 2013 13:26:24 -0700
-
-wine-compholio (1.7.7) unstable; urgency=low
-  * Remove patches included in upstream Wine 1.7.7.
-  * Rebase ACL extended attribute patches against upstream Wine 1.7.7.
-  * Rebase SIO_ADDRESS_LIST_CHANGE patches against upstream Wine 1.7.7.
-  * Added the ability to return the list of patches with "wine --patches".
-  * Added a patch to workaround a Silverlight issue with multiple monitors.
- -- Erich E. Hoover <erich.e.hoover@gmail.com>  Fri, 22 Nov 2013 14:24:53 -0700
-
-wine-compholio (1.7.6-1) unstable; urgency=low
-  * Work around a build problem with Wine 1.7.6.
- -- Erich E. Hoover <erich.e.hoover@gmail.com>  Tue, 12 Nov 2013 14:16:16 -0700
-
-wine-compholio (1.7.6) unstable; urgency=low
-  * Rebased VMR7 patches against upstream Wine 1.7.6.
-  * Rebased SIO_ADDRESS_LIST_CHANGE patches against upstream Wine 1.7.6.
- -- Erich E. Hoover <erich.e.hoover@gmail.com>  Sun, 10 Nov 2013 17:26:30 -0700
-
-wine-compholio (1.7.5-1) unstable; urgency=low
-  * Included new patch to fix running TestOut under Silverlight.
- -- Erich E. Hoover <erich.e.hoover@gmail.com>  Thu, 07 Nov 2013 11:18:23 -0700
-
-wine-compholio (1.7.5) unstable; urgency=low
-  * Rebased changes against upstream Wine 1.7.5.
- -- Erich E. Hoover <erich.e.hoover@gmail.com>  Wed, 30 Oct 2013 08:05:51 -0600
-
-wine-compholio (1.7.4-2) unstable; urgency=low
-  * Updated XEmbed patches from Sebastian Lackner.
- -- Erich E. Hoover <erich.e.hoover@gmail.com>  Mon, 28 Oct 2013 10:00:43 -0600
-
-wine-compholio (1.7.4-1) unstable; urgency=low
-  * Fix an issue with Ubuntu 13.10 post-install behavior.
- -- Erich E. Hoover <erich.e.hoover@gmail.com>  Sun, 13 Oct 2013 15:13:48 -0600
-
-wine-compholio (1.7.4) unstable; urgency=low
-  * Rebased changes against upstream Wine 1.7.4.
- -- Erich E. Hoover <erich.e.hoover@gmail.com>  Sat, 12 Oct 2013 13:30:33 -0600
-
-wine-compholio (1.7.3) unstable; urgency=low
-  * Removed patches already included in upstream Wine 1.7.3.
-  * Rebased ACL extended attributes patch against upstream Wine 1.7.3.
-  * Update SIO_ADDRESS_LIST_CHANGE patches to new server-based method.
- -- Erich E. Hoover <erich.e.hoover@gmail.com>  Thu, 03 Oct 2013 15:16:26 -0600
-
-wine-compholio (1.7.2) unstable; urgency=low
-  * Rebased changes against upstream Wine 1.7.2.
- -- Erich E. Hoover <erich.e.hoover@gmail.com>  Mon, 30 Sep 2013 12:21:43 -0600
-
-wine-compholio (1.7.1) unstable; urgency=low
-  * Rebased changes against upstream Wine 1.7.1.
- -- Erich E. Hoover <erich.e.hoover@gmail.com>  Mon, 30 Sep 2013 11:42:34 -0600
-
-wine-compholio (1.7.0-7) unstable; urgency=low
-  * Updated all changed patches and backported upstream commits.
- -- Erich E. Hoover <erich.e.hoover@gmail.com>  Mon, 30 Sep 2013 11:41:43 -0600
-
-wine-compholio (1.7.0-6) unstable; urgency=low
-  * Included fix for Watchever from Andreas Loibl.
- -- Erich E. Hoover <ehoover@mines.edu>  Fri, 06 Sep 2013 16:33:33 -0600
-
-wine-compholio (1.7.0-5) unstable; urgency=low
-  * Updated patches for LOVEFiLM from Sebastian Lackner and Michael Müller.
- -- Erich E. Hoover <ehoover@mines.edu>  Fri, 06 Sep 2013 16:33:33 -0600
-
-wine-compholio (1.7.0-4) unstable; urgency=low
-  * Hopefully fixed build script problem.
- -- Erich E. Hoover <ehoover@mines.edu>  Tue, 27 Aug 2013 09:51:15 -0600
-
-wine-compholio (1.7.0-3) unstable; urgency=low
-  * Added D3D acceleration fix from Michael Müller.
- -- Erich E. Hoover <ehoover@mines.edu>  Fri, 16 Apr 2010 12:20:00 -0600

debian/compat

@@ -1 +0,0 @@
-7

debian/control

@@ -1,137 +0,0 @@
-Source: wine-compholio
-Section: otherosfs
-Priority: optional
-Maintainer: Erich E. Hoover <ehoover@mines.edu>
-XSBC-Original-Maintainer: Scott Ritchie <scottritchie@ubuntu.com>
-Build-Depends: autotools-dev,
-               autoconf,
-               bind9-host,
-               bison,
-               debhelper (>= 7),
-               docbook-to-man,
-               docbook-utils,
-               docbook-xsl,
-               flex,
-               fontforge,
-               gcc-4.5 | gcc-4.7 | ubuntu-desktop (<< 1.207),
-               gcc-4.5-multilib [amd64] | ubuntu-desktop (<< 1.207) [amd64],
-               gcc-multilib [amd64],
-               gettext,
-               ia32-libs [amd64],
-               ia32-libs-dev [amd64] | ubuntu-desktop (<< 1.267) [amd64],
-               ia32-libs-multiarch [amd64] | ubuntu-desktop (<< 1.267) [amd64],
-               lib32asound2-dev [amd64],
-               lib32ncurses5-dev [amd64],
-               lib32z1-dev [amd64],
-               libacl1-dev,
-               libasound2-dev [i386 lpia],
-               libc6-dev-i386 [amd64],
-               libcapi20-dev,
-               libcups2-dev,
-               libdbus-1-dev,
-               libesd0 | libesd-alsa0,
-               libesd0-dev,
-               libfontconfig1-dev | libfontconfig-dev,
-               libfreetype6-dev,
-               libgif-dev | libungif4-dev,
-               libgl1-mesa-dev | nvidia-glx-dev | fglrx-driver-dev | libgl-dev,
-               libglu1-mesa-dev | libglu-dev,
-               libgnutls-dev,
-               libgphoto2-dev | libgphoto2-6-dev | libgphoto2-2-dev (>= 2.4.6),
-               libgphoto2port-dev | ubuntu-desktop (>= 1.245) | debian-edu-config,
-               libgsm1-dev,
-               libgstreamer-plugins-base0.10-dev,
-               libgstreamer0.10-dev,
-               libice-dev,
-               libjpeg-dev,
-               liblcms1-dev, liblcms-dev,
-               libldap2-dev, libldap-dev,
-               libmpg123-dev,
-               libncurses5-dev [i386] | libncurses-dev [i386],
-               libopenal-dev (>= 1:1.12) | ubuntu-desktop (<< 1.207),
-               libpng12-dev,
-               libpulse-dev,
-               libssl-dev,
-               libstdc++6-4.5-dev | libstdc++-dev,
-               libtiff4-dev,
-               libv4l-dev [i386],
-               libx11-dev,
-               libxcomposite-dev,
-               libxcursor-dev,
-               libxext-dev,
-               libxi-dev,
-               libxinerama-dev,
-               libxml2-dev,
-               libxrandr-dev,
-               libxrender-dev,
-               libxslt1-dev,
-               libxt-dev,
-               libxxf86vm-dev,
-               linux-kernel-headers,
-               linux-libc-dev,
-               prelink [i386 amd64],
-               quilt (>= 0.46-7~),
-               sharutils,
-               unixodbc-dev,
-               x11proto-xinerama-dev
-Standards-Version: 3.9.2
-
-Package: wine-compholio
-Architecture: i386
-Multi-Arch: foreign
-Pre-Depends: dpkg (>= 1.14.12ubuntu3), ${misc:Pre-Depends}
-Depends:    ${shlibs:Depends},
-            libasound2-plugins,
-            libncurses5
-Recommends: gettext,
-            libcapi20-3,
-            libcups2,
-            libdbus-1-3,
-            libfontconfig1 | libfontconfig,
-            libfreetype6,
-            libgif4,
-            libgnutls26,
-            libgphoto2-6 | libgphoto2-2 (>= 2.4.6),
-            libgphoto2-port0 (>= 2.4.6),
-            libjpeg8,
-            libopenal1 (>= 1:1.12),
-            libosmesa6,
-            libpng12-0,
-            libpulse0,
-            libsane,
-            libssl1.0.0,
-            libtiff4,
-            libv4l-0,
-            libxcomposite1,
-            libxcursor1,
-            libxi6,
-            libxinerama1,
-            libxrandr2,
-            libxrender1,
-            libxslt1.1,
-            libxt6,
-            libxxf86vm1,
-            unixodbc
-Provides: wine-compholio
-Section: otherosfs
-Priority: optional
-Description: The Compholio Edition is a special build of the popular Wine software
- with patches representing my current staging tree for Wine.
- Currently these patches fix:
-  * Netflix on Firefox hangs with loading bar at 100% (Bug 31993).
-  * Netflix on Firefox fails with Internet Connection Problem when loading bar is
- at 99% (Bug 31858).
- .
- Microsoft Windows Compatibility Layer (Binary Emulator and Library)
- Wine is a compatibility layer for running Windows applications on Linux.
- Applications are run at full speed without the need of cpu emulation. Wine
- does not require Microsoft Windows, however it can use native system dll
- files in place of its own if they are available.
- .
- This package includes a program loader for running unmodified Windows executables
- as well as the Wine project's free version of the Windows API for running programs
- ported from Windows.
- .
- This package is based on a recent Wine beta.  While many more applications will
- work, there may be some loss of functionality compared with the stable release
- provided by the regular wine package.

debian/postinst

@@ -1,23 +0,0 @@
-#!/bin/sh -e
-
-if [ "$1" = "upgrade" ] ; then
-	if ps -C wineserver > /dev/null && test -d /var/lib/update-notifier/user.d/ ; then
-		cp -f /usr/share/wine/wineserver-restart-required.update-notifier /var/lib/update-notifier/user.d/wineserver-restart-required
-	fi
-fi
-
-service procps start || /etc/init.d/procps restart
-
-# Automatically added by dh_installmime
-if [ "$1" = "configure" ] && [ -x "`which update-mime 2>/dev/null`" ]; then
-	update-mime
-fi
-# End automatically added section
-# Automatically added by dh_makeshlibs
-if [ "$1" = "configure" ]; then
-	ldconfig
-fi
-# End automatically added section
-
-
-

debian/postrm

@@ -1,10 +0,0 @@
-#!/bin/sh
-set -e
-# Automatically added by dh_installmime
-if which update-mime >/dev/null 2>&1; then update-mime; fi
-# End automatically added section
-# Automatically added by dh_makeshlibs
-if [ "$1" = "remove" ]; then
-	ldconfig
-fi
-# End automatically added section

debian/prerm

@@ -1,9 +0,0 @@
-#!/bin/sh -e
-
-if [ "$1" = "remove" ] ; then
-  if [ -x /usr/sbin/update-binfmts ]; then
-    /usr/sbin/update-binfmts --package wine --remove wine /usr/bin/wine || true
-  fi
-fi
-
-

debian/rules

@@ -1,144 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
-	CROSS= --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
-else
-	CROSS= --build $(DEB_BUILD_GNU_TYPE)
-endif
-
-
-# Apparently it's important to have an empty LDFLAGS, see:
-# http://www.winehq.org/pipermail/wine-bugs/2007-July/062505.html
-# For Wine 1.1.44 it's also important not to compile at -O0
-LDFLAGS = 
-CFLAGS = -Wall -g -O2
-
-# On amd64 the 32-bit libraries are in lib32 instead of lib
-ifeq ($(DEB_BUILD_ARCH), amd64)
-	CONFFLAGS += --libdir=\$${prefix}/lib32
-endif
-
-# Use gcc-4.5 if it's available
-ifeq ($(shell which gcc-4.5),)
-	CC = gcc
-else
-	CC = gcc-4.5
-endif
-
-# Support passing of parallel=<n> in build options
-ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-	NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-	MAKEFLAGS += -j$(NUMJOBS)
-endif
-
-configure:
-	# Unpack the original Wine version
-	tar -xjvf wine-*.tar.bz2
-	mv wine-*/* .
-	rm wine-*/.* || true
-	rm wine-*.tar.bz2
-	rmdir wine-*
-
-config.status: configure
-	dh_testdir
-	# Add here commands to configure the package.
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-	cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-	cp -f /usr/share/misc/config.guess config.guess
-endif
-
-	# Apply our patches, reconfigure, and update the wineserver protocol request data
-	make -C "$(CURDIR)/patches/" DESTDIR="$(CURDIR)" install
-
-	# Configure
-	CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/opt/wine-compholio --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --with-xattr $(CONFFLAGS)
-
-build: build-stamp
-
-build-stamp:  config.status 
-	dh_testdir
-
-	# Add here commands to compile the package.
-	$(MAKE) depend
-	$(MAKE) $(MAKEFLAGS)
-	#docbook-to-man debian/wine-compholio.sgml > wine-compholio.1
-
-	touch $@
-
-clean: 
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp 
-
-	# Add here commands to clean up after the build process.
-	[ ! -f Makefile ] || $(MAKE) distclean
-	rm -f config.sub config.guess
-
-	dh_clean 
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep  
-	dh_installdirs
-
-	# Add here commands to install the package into debian/wine-compholio.
-	$(MAKE) DESTDIR=$(CURDIR)/debian/wine-compholio install
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-#	dh_installchangelogs ChangeLog
-#	dh_installdocs
-	dh_installexamples
-#	dh_install
-#	dh_installmenu
-#	dh_installdebconf
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_python
-#	dh_installinit
-#	dh_installcron
-#	dh_installinfo
-	dh_installman
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-#	dh_perl
-	dh_makeshlibs
-	dh_installdeb
-ifeq ($(DEB_BUILD_ARCH), amd64)
-	dh_gencontrol -- -V"shlibs:Depends= ia32-libs (>= 1.6), lib32asound2 (>> 1.0.14), libc6-i386 (>= 2.6-1), lib32nss-mdns (>= 0.10-3)"
-else
-	LD_LIBRARY_PATH="$(CURDIR)/debian/wine-compholio/opt/wine-compholio/lib:${LD_LIBRARY_PATH}" dh_shlibdeps -L wine-compholio -l debian/wine-compholio/opt/wine-compholio/lib
-	dh_gencontrol
-endif
-	dh_md5sums
-	dh_builddeb -- -Z lzma
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 

generate-patchlist.sh

@@ -1,24 +0,0 @@
-#!/bin/sh
-
-PATCH_DATA="";
-for FILE in patches/*/*.def; do
-	UUID=$(echo "${FILE}" | sed -e 's|^.*/||g' -e 's|\.def$||g');
-	REVISION=$(cat "${FILE}" | sed -n 's|Revision: \(.*\)|\1|p');
-	AUTHOR=$(cat "${FILE}" | sed -n 's|Author: \(.*\)|\1|p');
-	TITLE=$(cat "${FILE}" | sed -n 's|Title: \(.*\)|\1|p');
-	if [ "${AUTHOR}" = "" ] && [ "${TITLE}" = "" ]; then
-		continue;
-	fi
-	if [ "${PATCH_DATA}" != "" ]; then
-		PATCH_DATA="${PATCH_DATA}
-";
-	fi
-	PATCH_DATA="${PATCH_DATA}+    { \"${UUID}:${REVISION}\", \"${AUTHOR}\", \"${TITLE}\" },";
-done
-PATCH_LINES=$(echo "${PATCH_DATA}" | grep -c '\n');
-PATCH_LINES=$((${PATCH_LINES}+20));
-PATCH_DATA=$(echo "${PATCH_DATA}" | sed ':a;N;$!ba;s/\n/\\n/g');
-cat patch-list-template.diff | sed \
-	-e "s|##PATCH_LINES##|${PATCH_LINES}|" \
-	-e "s|##PATCH_DATA##|${PATCH_DATA}|"
-#

patches/01-Address_Change_Notification/0001-ws2_32-Ask-the-server-to-process-unsupported-WSAIoct.patch

@@ -1,101 +0,0 @@
-From a1ad64b059de5325b15ed09a39083f5eb973a2f6 Mon Sep 17 00:00:00 2001
-From: "Erich E. Hoover" <erich.e.hoover@gmail.com>
-Date: Wed, 12 Feb 2014 13:46:28 -0700
-Subject: ws2_32: Ask the server to process unsupported WSAIoctl operations.
-
----
- dlls/ws2_32/socket.c |   60 ++++++++++++++++++++++++++++++++++++++++++++------
- 1 file changed, 53 insertions(+), 7 deletions(-)
-
-diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c
-index 1c558bf..fe5577c 100644
---- a/dlls/ws2_32/socket.c
-+++ b/dlls/ws2_32/socket.c
-@@ -3668,6 +3668,40 @@ static const char *debugstr_wsaioctl(DWORD ioctl)
-                             (USHORT)(ioctl & 0xffff));
- }
- 
-+/* do an ioctl call through the server */
-+static DWORD server_ioctl_sock( SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size,
-+                                LPVOID out_buff, DWORD out_size, LPDWORD ret_size,
-+                                LPWSAOVERLAPPED overlapped,
-+                                LPWSAOVERLAPPED_COMPLETION_ROUTINE completion )
-+{
-+    HANDLE event = overlapped ? overlapped->hEvent : 0;
-+    HANDLE handle = SOCKET2HANDLE( s );
-+    struct ws2_async *wsa;
-+    NTSTATUS status;
-+    PIO_STATUS_BLOCK io;
-+
-+    if (!(wsa = RtlAllocateHeap( GetProcessHeap(), 0, sizeof(*wsa) )))
-+        return WSA_NOT_ENOUGH_MEMORY;
-+    wsa->hSocket           = handle;
-+    wsa->user_overlapped   = overlapped;
-+    wsa->completion_func   = completion;
-+    io = (overlapped ? (PIO_STATUS_BLOCK)overlapped : &wsa->local_iosb);
-+
-+    status = NtDeviceIoControlFile( handle, event, (PIO_APC_ROUTINE)ws2_async_apc, wsa, io, code,
-+                                    in_buff, in_size, out_buff, out_size );
-+    if (status == STATUS_NOT_SUPPORTED)
-+    {
-+        FIXME("Unsupported ioctl %x (device=%x access=%x func=%x method=%x)\n",
-+              code, code >> 16, (code >> 14) & 3, (code >> 2) & 0xfff, code & 3);
-+    }
-+    else if (status == STATUS_SUCCESS)
-+        *ret_size = io->Information; /* "Information" is the size written to the output buffer */
-+
-+    if (status != STATUS_PENDING) RtlFreeHeap( GetProcessHeap(), 0, wsa );
-+
-+    return NtStatusToWSAError( status );
-+}
-+
- /**********************************************************************
-  *              WSAIoctl                (WS2_32.50)
-  *
-@@ -3859,12 +3893,6 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID
-            break;
-        }
- 
--   case WS_SIO_ADDRESS_LIST_CHANGE:
--       FIXME("-> SIO_ADDRESS_LIST_CHANGE request: stub\n");
--       /* FIXME: error and return code depend on whether socket was created
--        * with WSA_FLAG_OVERLAPPED, but there is no easy way to get this */
--       break;
--
-    case WS_SIO_ADDRESS_LIST_QUERY:
-    {
-         DWORD size;
-@@ -4100,11 +4128,29 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID
-         WSASetLastError(WSAEOPNOTSUPP);
-         return SOCKET_ERROR;
-     default:
--        FIXME("unsupported WS_IOCTL cmd (%s)\n", debugstr_wsaioctl(code));
-         status = WSAEOPNOTSUPP;
-         break;
-     }
- 
-+    if (status == WSAEOPNOTSUPP)
-+    {
-+        status = server_ioctl_sock(s, code, in_buff, in_size, out_buff, out_size, &total,
-+                                   overlapped, completion);
-+        if (status != WSAEOPNOTSUPP)
-+        {
-+            if (status == 0 || status == WSA_IO_PENDING)
-+                TRACE("-> %s request\n", debugstr_wsaioctl(code));
-+            else
-+                ERR("-> %s request failed with status 0x%x\n", debugstr_wsaioctl(code), status);
-+
-+            /* overlapped and completion operations will be handled by the server */
-+            completion = NULL;
-+            overlapped = NULL;
-+        }
-+        else
-+            FIXME("unsupported WS_IOCTL cmd (%s)\n", debugstr_wsaioctl(code));
-+    }
-+
-     if (completion)
-     {
-         FIXME( "completion routine %p not supported\n", completion );
--- 
-1.7.9.5
-

patches/01-Address_Change_Notification/0002-server-Implement-an-interface-change-notification-ob.patch

@@ -1,481 +0,0 @@
-From 60f7d242951be1980501f45922dbee5480ac2810 Mon Sep 17 00:00:00 2001
-From: "Erich E. Hoover" <erich.e.hoover@gmail.com>
-Date: Tue, 31 Dec 2013 18:36:58 -0700
-Subject: server: Implement an interface change notification object.
-
----
- server/event.c      |   13 +++
- server/named_pipe.c |   13 ---
- server/object.h     |    1 +
- server/sock.c       |  324 ++++++++++++++++++++++++++++++++++++++++++++++++++-
- 4 files changed, 334 insertions(+), 17 deletions(-)
-
-diff --git a/server/event.c b/server/event.c
-index b8515af..e8a3888 100644
---- a/server/event.c
-+++ b/server/event.c
-@@ -124,6 +124,19 @@ struct event *create_event( struct directory *root, const struct unicode_str *na
-     return event;
- }
- 
-+obj_handle_t alloc_wait_event( struct process *process )
-+{
-+    obj_handle_t handle = 0;
-+    struct event *event = create_event( NULL, NULL, 0, 1, 0, NULL );
-+
-+    if (event)
-+    {
-+        handle = alloc_handle( process, event, EVENT_ALL_ACCESS, 0 );
-+        release_object( event );
-+    }
-+    return handle;
-+}
-+
- struct event *get_event_obj( struct process *process, obj_handle_t handle, unsigned int access )
- {
-     return (struct event *)get_handle_obj( process, handle, access, &event_ops );
-diff --git a/server/named_pipe.c b/server/named_pipe.c
-index 4c85104..6ba2145 100644
---- a/server/named_pipe.c
-+++ b/server/named_pipe.c
-@@ -587,19 +587,6 @@ static enum server_fd_type pipe_client_get_fd_type( struct fd *fd )
-     return FD_TYPE_PIPE;
- }
- 
--static obj_handle_t alloc_wait_event( struct process *process )
--{
--    obj_handle_t handle = 0;
--    struct event *event = create_event( NULL, NULL, 0, 1, 0, NULL );
--
--    if (event)
--    {
--        handle = alloc_handle( process, event, EVENT_ALL_ACCESS, 0 );
--        release_object( event );
--    }
--    return handle;
--}
--
- static obj_handle_t pipe_server_ioctl( struct fd *fd, ioctl_code_t code, const async_data_t *async_data,
-                                        int blocking, const void *data, data_size_t size )
- {
-diff --git a/server/object.h b/server/object.h
-index bb3ff21..bad162f 100644
---- a/server/object.h
-+++ b/server/object.h
-@@ -159,6 +159,7 @@ extern struct event *create_event( struct directory *root, const struct unicode_
-                                    const struct security_descriptor *sd );
- extern struct keyed_event *create_keyed_event( struct directory *root, const struct unicode_str *name,
-                                                unsigned int attr, const struct security_descriptor *sd );
-+extern obj_handle_t alloc_wait_event( struct process *process );
- extern struct event *get_event_obj( struct process *process, obj_handle_t handle, unsigned int access );
- extern struct keyed_event *get_keyed_event_obj( struct process *process, obj_handle_t handle, unsigned int access );
- extern void pulse_event( struct event *event );
-diff --git a/server/sock.c b/server/sock.c
-index 1a3a8f7..9c8284d 100644
---- a/server/sock.c
-+++ b/server/sock.c
-@@ -23,6 +23,7 @@
- 
- #include "config.h"
- 
-+#include <limits.h>
- #include <assert.h>
- #include <fcntl.h>
- #include <stdarg.h>
-@@ -44,11 +45,17 @@
- #include <time.h>
- #include <unistd.h>
- 
-+#ifdef HAVE_LINUX_RTNETLINK_H
-+# include <linux/rtnetlink.h>
-+#endif
-+
- #include "ntstatus.h"
- #define WIN32_NO_STATUS
- #include "windef.h"
- #include "winternl.h"
- #include "winerror.h"
-+#define USE_WS_PREFIX
-+#include "winsock2.h"
- 
- #include "process.h"
- #include "file.h"
-@@ -83,9 +90,6 @@
- #define FD_WINE_RAW                0x80000000
- #define FD_WINE_INTERNAL           0xFFFF0000
- 
--/* Constants for WSAIoctl() */
--#define WSA_FLAG_OVERLAPPED        0x01
--
- struct sock
- {
-     struct object       obj;         /* object header */
-@@ -107,16 +111,28 @@ struct sock
-     struct sock        *deferred;    /* socket that waits for a deferred accept */
-     struct async_queue *read_q;      /* queue for asynchronous reads */
-     struct async_queue *write_q;     /* queue for asynchronous writes */
-+    struct async_queue *ifchange_q;  /* queue for interface change notifications */
-+    struct list         ifchange_entry; /* entry in ifchange notification list */
- };
- 
-+#ifdef HAVE_LINUX_RTNETLINK_H
-+/* only keep one ifchange object around, all sockets waiting for wakeups will look to it */
-+static struct object *ifchange_object = NULL;
-+
-+static int sock_add_ifchange( struct sock *sock, const async_data_t *async_data );
-+#endif
-+
- static void sock_dump( struct object *obj, int verbose );
- static int sock_signaled( struct object *obj, struct wait_queue_entry *entry );
- static struct fd *sock_get_fd( struct object *obj );
- static void sock_destroy( struct object *obj );
-+static void sock_destroy_ifchange_q( struct sock *sock );
- 
- static int sock_get_poll_events( struct fd *fd );
- static void sock_poll_event( struct fd *fd, int event );
- static enum server_fd_type sock_get_fd_type( struct fd *fd );
-+static obj_handle_t sock_ioctl( struct fd *fd, ioctl_code_t code, const async_data_t *async,
-+                                int blocking, const void *data, data_size_t size );
- static void sock_queue_async( struct fd *fd, const async_data_t *data, int type, int count );
- static void sock_reselect_async( struct fd *fd, struct async_queue *queue );
- static void sock_cancel_async( struct fd *fd, struct process *process, struct thread *thread, client_ptr_t iosb );
-@@ -151,7 +167,7 @@ static const struct fd_ops sock_fd_ops =
-     sock_poll_event,              /* poll_event */
-     no_flush,                     /* flush */
-     sock_get_fd_type,             /* get_fd_type */
--    default_fd_ioctl,             /* ioctl */
-+    sock_ioctl,                   /* ioctl */
-     sock_queue_async,             /* queue_async */
-     sock_reselect_async,          /* reselect_async */
-     sock_cancel_async             /* cancel_async */
-@@ -518,6 +534,41 @@ static enum server_fd_type sock_get_fd_type( struct fd *fd )
-     return FD_TYPE_SOCKET;
- }
- 
-+obj_handle_t sock_ioctl( struct fd *fd, ioctl_code_t code, const async_data_t *async_data,
-+                         int blocking, const void *data, data_size_t size )
-+{
-+#ifdef HAVE_LINUX_RTNETLINK_H
-+    struct sock *sock = get_fd_user( fd );
-+    obj_handle_t wait_handle = 0;
-+    async_data_t new_data;
-+
-+    assert( sock->obj.ops == &sock_ops );
-+
-+    if (blocking)
-+    {
-+        if (!(wait_handle = alloc_wait_event( current->process ))) return 0;
-+        new_data = *async_data;
-+        new_data.event = wait_handle;
-+        async_data = &new_data;
-+    }
-+    switch(code)
-+    {
-+    case WS_SIO_ADDRESS_LIST_CHANGE:
-+        if (sock_add_ifchange( sock, async_data ))
-+        {
-+            set_error( STATUS_PENDING );
-+            return wait_handle;
-+        }
-+        break;
-+    default:
-+        /* handled by default_fd_ioctl */
-+        break;
-+    }
-+    close_handle( current->process, wait_handle );
-+#endif
-+    return default_fd_ioctl(fd, code, async_data, blocking, data, size);
-+}
-+
- static void sock_queue_async( struct fd *fd, const async_data_t *data, int type, int count )
- {
-     struct sock *sock = get_fd_user( fd );
-@@ -592,6 +643,7 @@ static void sock_destroy( struct object *obj )
- 
-     free_async_queue( sock->read_q );
-     free_async_queue( sock->write_q );
-+    sock_destroy_ifchange_q( sock );
-     if (sock->event) release_object( sock->event );
-     if (sock->fd)
-     {
-@@ -618,6 +670,7 @@ static void init_sock(struct sock *sock)
-     sock->deferred = NULL;
-     sock->read_q  = NULL;
-     sock->write_q = NULL;
-+    sock->ifchange_q = NULL;
-     memset( sock->errors, 0, sizeof(sock->errors) );
- }
- 
-@@ -906,6 +959,269 @@ static void sock_set_error(void)
-     set_error( sock_get_ntstatus( errno ) );
- }
- 
-+#ifdef HAVE_LINUX_RTNETLINK_H
-+
-+static void ifchange_dump( struct object *obj, int verbose );
-+static struct fd *ifchange_get_fd( struct object *obj );
-+static void ifchange_destroy( struct object *obj );
-+
-+static int ifchange_get_poll_events( struct fd *fd );
-+static void ifchange_poll_event( struct fd *fd, int event );
-+static void ifchange_reselect_async( struct fd *fd, struct async_queue *queue );
-+
-+struct ifchange
-+{
-+    struct object       obj;     /* object header */
-+    struct fd          *fd;      /* interface change file descriptor */
-+    struct list         sockets; /* list of sockets to send interface change notifications */
-+};
-+
-+static const struct object_ops ifchange_ops =
-+{
-+    sizeof(struct ifchange), /* size */
-+    ifchange_dump,           /* dump */
-+    no_get_type,             /* get_type */
-+    add_queue,               /* add_queue */
-+    NULL,                    /* remove_queue */
-+    NULL,                    /* signaled */
-+    no_satisfied,            /* satisfied */
-+    no_signal,               /* signal */
-+    ifchange_get_fd,         /* get_fd */
-+    default_fd_map_access,   /* map_access */
-+    default_get_sd,          /* get_sd */
-+    default_set_sd,          /* set_sd */
-+    no_lookup_name,          /* lookup_name */
-+    no_open_file,            /* open_file */
-+    no_close_handle,         /* close_handle */
-+    ifchange_destroy         /* destroy */
-+};
-+
-+static const struct fd_ops ifchange_fd_ops =
-+{
-+    ifchange_get_poll_events, /* get_poll_events */
-+    ifchange_poll_event,      /* poll_event */
-+    NULL,                     /* flush */
-+    NULL,                     /* get_fd_type */
-+    NULL,                     /* ioctl */
-+    NULL,                     /* queue_async */
-+    ifchange_reselect_async,  /* reselect_async */
-+    NULL                      /* cancel_async */
-+};
-+
-+static void ifchange_dump( struct object *obj, int verbose )
-+{
-+    assert( obj->ops == &ifchange_ops );
-+    printf( "ifchange\n" );
-+}
-+
-+static struct fd *ifchange_get_fd( struct object *obj )
-+{
-+    struct ifchange *ifchange = (struct ifchange *)obj;
-+    return (struct fd *)grab_object( ifchange->fd );
-+}
-+
-+static void ifchange_destroy( struct object *obj )
-+{
-+    struct ifchange *ifchange = (struct ifchange *)obj;
-+    assert( obj->ops == &ifchange_ops );
-+
-+    if (ifchange->fd)
-+    {
-+        /* reset the global ifchange object so that it will be recreated if it is needed again */
-+        assert( obj == ifchange_object );
-+        ifchange_object = NULL;
-+
-+        /* shut the socket down to force pending poll() calls in the client to return */
-+        shutdown( get_unix_fd(ifchange->fd), SHUT_RDWR );
-+        release_object( ifchange->fd );
-+    }
-+}
-+
-+static int ifchange_get_poll_events( struct fd *fd )
-+{
-+    return POLLIN;
-+}
-+
-+static void ifchange_add_sock( struct object *obj, struct sock *sock )
-+{
-+    struct ifchange *ifchange = (struct ifchange *)obj;
-+
-+    list_add_tail( &ifchange->sockets, &sock->ifchange_entry );
-+}
-+
-+/* we only need one of these interface notification objects, all of the sockets dependent upon
-+ * it will wake up when a notification event occurs */
-+static struct object *grab_ifchange( void )
-+{
-+    struct ifchange *ifchange;
-+    struct sockaddr_nl addr;
-+    int unix_fd;
-+
-+    if (ifchange_object)
-+    {
-+        /* increment the refcount for each socket that uses the ifchange object */
-+        return grab_object( ifchange_object );
-+    }
-+
-+    /* create the socket we need for processing interface change notifications */
-+    unix_fd = socket( PF_NETLINK, SOCK_RAW, NETLINK_ROUTE );
-+    if (unix_fd == -1)
-+    {
-+        sock_set_error();
-+        return NULL;
-+    }
-+    fcntl( unix_fd, F_SETFL, O_NONBLOCK ); /* make socket nonblocking */
-+    memset( &addr, 0, sizeof(addr) );
-+    addr.nl_family = AF_NETLINK;
-+    addr.nl_groups = RTMGRP_IPV4_IFADDR;
-+    /* bind the socket to the special netlink kernel interface */
-+    if (bind( unix_fd, (struct sockaddr *)&addr, sizeof(addr) ) == -1)
-+    {
-+        sock_set_error();
-+        close( unix_fd );
-+        return NULL;
-+    }
-+    if (!(ifchange = alloc_object( &ifchange_ops )))
-+    {
-+        set_error( STATUS_NO_MEMORY );
-+        close( unix_fd );
-+        return NULL;
-+    }
-+    list_init( &ifchange->sockets );
-+    if (!(ifchange->fd = create_anonymous_fd( &ifchange_fd_ops, unix_fd, &ifchange->obj, 0 )))
-+    {
-+        set_error( STATUS_NO_MEMORY );
-+        release_object( ifchange );
-+        return NULL;
-+    }
-+    set_fd_events( ifchange->fd, POLLIN ); /* enable read wakeup on the file descriptor */
-+
-+    /* the ifchange object is now successfully configured */
-+    ifchange_object = &ifchange->obj;
-+    return ifchange_object;
-+}
-+
-+/* create a new ifchange queue for a specific socket or, if one already exists, reuse the existing one */
-+static struct async_queue *sock_get_ifchange_q( struct sock *sock )
-+{
-+    struct object *ifchange;
-+    struct fd *fd;
-+
-+    if (sock->ifchange_q) /* reuse existing ifchange_q for this socket */
-+        return sock->ifchange_q;
-+
-+    if (!(ifchange = grab_ifchange()))
-+        return NULL;
-+
-+    /* create the ifchange notification queue */
-+    fd = ifchange_get_fd( ifchange );
-+    sock->ifchange_q = create_async_queue( fd );
-+    release_object( fd );
-+    if (!sock->ifchange_q)
-+    {
-+        set_error( STATUS_NO_MEMORY );
-+        release_object( ifchange );
-+        return NULL;
-+    }
-+
-+    /* add the socket to the ifchange notification list */
-+    ifchange_add_sock( ifchange, sock );
-+    return sock->ifchange_q;
-+}
-+
-+/* wake up all the sockets waiting for a change notification event */
-+static void ifchange_wake_up( struct object *obj, unsigned int status )
-+{
-+    struct ifchange *ifchange = (struct ifchange *)obj;
-+    struct list *ptr, *next;
-+    assert( obj->ops == &ifchange_ops );
-+    assert( obj == ifchange_object );
-+
-+    LIST_FOR_EACH_SAFE( ptr, next, &ifchange->sockets )
-+    {
-+        struct sock *sock = LIST_ENTRY( ptr, struct sock, ifchange_entry );
-+
-+        assert( sock->ifchange_q );
-+        async_wake_up( sock->ifchange_q, status ); /* issue ifchange notification for the socket */
-+        sock_destroy_ifchange_q( sock ); /* remove socket from list and decrement ifchange refcount */
-+    }
-+}
-+
-+static void ifchange_poll_event( struct fd *fd, int event )
-+{
-+    struct object *ifchange = get_fd_user( fd );
-+    unsigned int status = STATUS_PENDING;
-+    char buffer[PIPE_BUF];
-+    int r;
-+
-+    r = recv( get_unix_fd(fd), buffer, sizeof(buffer), MSG_DONTWAIT );
-+    if (r < 0)
-+    {
-+        if (errno == EWOULDBLOCK || errno == EAGAIN)
-+            return; /* retry when poll() says the socket is ready */
-+        status = sock_get_ntstatus( errno );
-+    }
-+    else if (r > 0)
-+    {
-+        struct nlmsghdr *nlh;
-+
-+        for (nlh = (struct nlmsghdr *)buffer; NLMSG_OK(nlh, r); nlh = NLMSG_NEXT(nlh, r))
-+        {
-+            if (nlh->nlmsg_type == NLMSG_DONE)
-+                break;
-+            if (nlh->nlmsg_type == RTM_NEWADDR || nlh->nlmsg_type == RTM_DELADDR)
-+                status = STATUS_SUCCESS;
-+        }
-+    }
-+    if (status != STATUS_PENDING)
-+        ifchange_wake_up( ifchange, status );
-+}
-+
-+static void ifchange_reselect_async( struct fd *fd, struct async_queue *queue )
-+{
-+    /* do nothing, this object is about to disappear */
-+}
-+
-+/* add interface change notification to a socket */
-+static int sock_add_ifchange( struct sock *sock, const async_data_t *async_data )
-+{
-+    struct async_queue *ifchange_q;
-+    struct async *async;
-+
-+    if (!(ifchange_q = sock_get_ifchange_q( sock )))
-+        return FALSE;
-+
-+    if (!(async = create_async( current, ifchange_q, async_data )))
-+    {
-+        if (!async_queued( ifchange_q ))
-+            sock_destroy_ifchange_q( sock );
-+
-+        set_error( STATUS_NO_MEMORY );
-+        return FALSE;
-+    }
-+
-+    release_object( async );
-+    return TRUE;
-+}
-+
-+#endif
-+
-+/* destroy an existing ifchange queue for a specific socket */
-+static void sock_destroy_ifchange_q( struct sock *sock )
-+{
-+#ifdef HAVE_LINUX_RTNETLINK_H
-+    if (sock->ifchange_q)
-+    {
-+        assert( ifchange_object );
-+
-+        list_remove( &sock->ifchange_entry );
-+        free_async_queue( sock->ifchange_q );
-+        sock->ifchange_q = NULL;
-+        release_object( ifchange_object );  
-+    }
-+#endif
-+}
-+
- /* create a socket */
- DECL_HANDLER(create_socket)
- {
--- 
-1.7.9.5
-

patches/01-Address_Change_Notification/0003-ws2_32-Add-an-interactive-test-for-interface-change-.patch

@@ -1,98 +0,0 @@
-From b3156dc253a94f9414a04569181728ec43608f2a Mon Sep 17 00:00:00 2001
-From: "Erich E. Hoover" <erich.e.hoover@gmail.com>
-Date: Mon, 18 Nov 2013 17:22:14 -0700
-Subject: ws2_32: Add an interactive test for interface change notifications.
-
----
- dlls/ws2_32/tests/sock.c |   68 ++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 68 insertions(+)
-
-diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c
-index 0abf732..4703e59 100644
---- a/dlls/ws2_32/tests/sock.c
-+++ b/dlls/ws2_32/tests/sock.c
-@@ -6487,6 +6487,73 @@ static void test_sioRoutingInterfaceQuery(void)
-     closesocket(sock);
- }
- 
-+static void test_sioAddressListChange(void)
-+{
-+    struct sockaddr_in bindAddress;
-+    struct in_addr net_address;
-+    WSAOVERLAPPED overlapped;
-+    struct hostent *h;
-+    DWORD num_bytes;
-+    SOCKET sock;
-+    int acount;
-+    int ret;
-+
-+    if (!winetest_interactive)
-+    {
-+        skip("Cannot test SIO_ADDRESS_LIST_CHANGE, interactive tests must be enabled\n");
-+        return;
-+    }
-+
-+    /* Use gethostbyname to find the list of local network interfaces */
-+    h = gethostbyname("");
-+    if (!h)
-+    {
-+        skip("Cannot test SIO_ADDRESS_LIST_CHANGE, gethostbyname failed with %u\n",
-+             WSAGetLastError());
-+        return;
-+    }
-+    for (acount = 0; h->h_addr_list[acount]; acount++);
-+    if (acount == 0)
-+    {
-+        skip("Cannot test SIO_ADDRESS_LIST_CHANGE, test requires a network card.\n");
-+        return;
-+    }
-+    net_address.s_addr = *(ULONG *) h->h_addr_list[0];
-+
-+    /* Bind an overlapped socket to the first found network interface */
-+    sock = WSASocketW(AF_INET, SOCK_STREAM, IPPROTO_TCP, NULL, 0, WSA_FLAG_OVERLAPPED);
-+    ok(sock != INVALID_SOCKET, "Expected socket to return a valid socket\n");
-+    if (sock == INVALID_SOCKET)
-+    {
-+        skip("Cannot test SIO_ADDRESS_LIST_CHANGE, socket creation failed with %u\n",
-+             WSAGetLastError());
-+        return;
-+    }
-+    memset(&bindAddress, 0, sizeof(bindAddress));
-+    bindAddress.sin_family = AF_INET;
-+    bindAddress.sin_addr.s_addr = net_address.s_addr;
-+    ret = bind(sock, (struct sockaddr*)&bindAddress, sizeof(bindAddress));
-+    if (ret != 0)
-+    {
-+        skip("Cannot test SIO_ADDRESS_LIST_CHANGE, failed to bind, error %u\n", WSAGetLastError());
-+        goto end;
-+    }
-+
-+    /* Wait for address changes, request that the user connect/disconnect an interface */
-+    memset(&overlapped, 0, sizeof(overlapped));
-+    overlapped.hEvent = CreateEventA(NULL, FALSE, FALSE, NULL);
-+    ret = WSAIoctl(sock, SIO_ADDRESS_LIST_CHANGE, NULL, 0, NULL, 0, &num_bytes, &overlapped, NULL);
-+    ok(ret == SOCKET_ERROR, "WSAIoctl succeeded unexpectedly\n");
-+    ok(WSAGetLastError() == WSA_IO_PENDING, "Expected pending last error %d\n", WSAGetLastError());
-+    trace("Testing socket-based ipv4 address list change notification. Please connect/disconnect or"
-+          " change the ipv4 address of any of the local network interfaces (10 second timeout).\n");
-+    ret = WaitForSingleObject(overlapped.hEvent, 10000);
-+    ok(ret == WAIT_OBJECT_0, "failed to get overlapped event %u\n", ret);
-+
-+end:
-+    closesocket(sock);
-+}
-+
- static void test_synchronous_WSAIoctl(void)
- {
-     HANDLE previous_port, io_port;
-@@ -7570,6 +7637,7 @@ START_TEST( sock )
-     test_ConnectEx();
- 
-     test_sioRoutingInterfaceQuery();
-+    test_sioAddressListChange();
- 
-     test_WSALookupService();
- 
--- 
-1.7.9.5
-

patches/01-Address_Change_Notification/8a366b6d-8ad6-4581-8aa9-66a03590a57b.def

@@ -1,3 +0,0 @@
-Revision: 1
-Author: Erich E. Hoover
-Title: Implement SIO_ADDRESS_LIST_CHANGE.

patches/02-ACL_Extended_Attributes/0003-server-Store-file-security-attributes-with-extended-.patch

@@ -1,150 +0,0 @@
-From 96470b6ee4c0e91700ac197e77784feb42d9a961 Mon Sep 17 00:00:00 2001
-From: "Erich E. Hoover" <erich.e.hoover@gmail.com>
-Date: Sat, 15 Feb 2014 18:20:49 -0700
-Subject: server: Store file security attributes with extended file
- attributes.
-
----
- configure.ac  |   12 +++++++++++
- server/file.c |   67 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 79 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index 32730f3..96d796a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -73,6 +73,7 @@ AC_ARG_WITH(pthread,   AS_HELP_STRING([--without-pthread],[do not use the pthrea
- AC_ARG_WITH(sane,      AS_HELP_STRING([--without-sane],[do not use SANE (scanner support)]))
- AC_ARG_WITH(tiff,      AS_HELP_STRING([--without-tiff],[do not use TIFF]))
- AC_ARG_WITH(v4l,       AS_HELP_STRING([--without-v4l],[do not use v4l1 (v4l support)]))
-+AC_ARG_WITH(xattr,     AS_HELP_STRING([--without-xattr],[do not use xattr (security attributes support)]))
- AC_ARG_WITH(xcomposite,AS_HELP_STRING([--without-xcomposite],[do not use the Xcomposite extension]),
-             [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xcomposite_h=no; fi])
- AC_ARG_WITH(xcursor,   AS_HELP_STRING([--without-xcursor],[do not use the Xcursor extension]),
-@@ -661,6 +662,17 @@ AC_CHECK_HEADERS([libprocstat.h],,,
- #include <sys/socket.h>
- #endif])
- 
-+if test "x$with_xattr" != "xno"
-+then
-+  AC_CHECK_HEADERS(attr/xattr.h,HAVE_XATTR=1)
-+fi
-+if test "x$with_xattr" == "xyes"
-+then
-+  WINE_ERROR_WITH(xattr,[test "x$HAVE_XATTR" = "x"],[xattr ${notice_platform}development files not \
-+found. Wine will be built without extended attribute support, which probably isn't what you want. \
-+You will need to install ${notice_platform}development packages of libacl at the very least.])
-+fi
-+
- dnl **** Check for working dll ****
- 
- AC_SUBST(dlldir,"\${libdir}/wine")
-diff --git a/server/file.c b/server/file.c
-index 8baa712..c375c72 100644
---- a/server/file.c
-+++ b/server/file.c
-@@ -32,6 +32,7 @@
- #include <sys/time.h>
- #include <sys/types.h>
- #include <time.h>
-+#include <limits.h>
- #include <unistd.h>
- #ifdef HAVE_UTIME_H
- #include <utime.h>
-@@ -39,6 +40,9 @@
- #ifdef HAVE_POLL_H
- #include <poll.h>
- #endif
-+#ifdef HAVE_ATTR_XATTR_H
-+#include <attr/xattr.h>
-+#endif
- 
- #include "ntstatus.h"
- #define WIN32_NO_STATUS
-@@ -178,6 +182,66 @@ static struct object *create_file_obj( struct fd *fd, unsigned int access, mode_
-     return &file->obj;
- }
- 
-+void set_xattr_acls( int fd, const struct security_descriptor *sd )
-+{
-+#ifdef HAVE_ATTR_XATTR_H
-+    char buffer[XATTR_SIZE_MAX], *p = buffer;
-+    const ACE_HEADER *ace;
-+    int present, i, j, n;
-+    const ACL *dacl;
-+
-+    if (!sd) return;
-+    dacl = sd_get_dacl( sd, &present );
-+    if (!present || !dacl) return;
-+    ace = (const ACE_HEADER *)(dacl + 1);
-+
-+    for (i = 0; i < dacl->AceCount; i++, ace = ace_next( ace ))
-+    {
-+        BYTE type = ace->AceType, flags;
-+        const ACCESS_ALLOWED_ACE *aaa;
-+        const ACCESS_DENIED_ACE *ada;
-+        char sidtxt[100], *s;
-+        const SID *sid;
-+        DWORD mask;
-+
-+        if (type & INHERIT_ONLY_ACE) continue;
-+
-+        switch (type)
-+        {
-+            case ACCESS_DENIED_ACE_TYPE:
-+                ada   = (const ACCESS_DENIED_ACE *)ace;
-+                flags = ada->Header.AceFlags;
-+                mask  = ada->Mask;
-+                sid   = (const SID *)&ada->SidStart;
-+                break;
-+            case ACCESS_ALLOWED_ACE_TYPE:
-+                aaa   = (const ACCESS_ALLOWED_ACE *)ace;
-+                flags = aaa->Header.AceFlags;
-+                mask  = aaa->Mask;
-+                sid   = (const SID *)&aaa->SidStart;
-+                break;
-+            default:
-+                continue;
-+        }
-+        n = sprintf( sidtxt,  "S-%u-%d", sid->Revision,
-+            MAKELONG(
-+                MAKEWORD( sid->IdentifierAuthority.Value[5],
-+                          sid->IdentifierAuthority.Value[4] ),
-+                MAKEWORD( sid->IdentifierAuthority.Value[3],
-+                          sid->IdentifierAuthority.Value[2] )
-+            ) );
-+        s = sidtxt + n;
-+        for( j=0; j<sid->SubAuthorityCount; j++ )
-+            s += sprintf( s, "-%u", sid->SubAuthority[j] );
-+
-+        p += snprintf( p, XATTR_SIZE_MAX-(p-buffer), "%s%x,%x,%x,%s",
-+                      (p != buffer ? ";" : ""), type, flags, mask, sidtxt );
-+    }
-+
-+    fsetxattr( fd, "user.wine.acl", buffer, p-buffer, 0 );
-+#endif
-+}
-+
- static struct object *create_file( struct fd *root, const char *nameptr, data_size_t len,
-                                    unsigned int access, unsigned int sharing, int create,
-                                    unsigned int options, unsigned int attrs,
-@@ -239,6 +303,7 @@ static struct object *create_file( struct fd *root, const char *nameptr, data_si
-     /* FIXME: should set error to STATUS_OBJECT_NAME_COLLISION if file existed before */
-     fd = open_fd( root, name, flags | O_NONBLOCK | O_LARGEFILE, &mode, access, sharing, options );
-     if (!fd) goto done;
-+    set_xattr_acls( get_unix_fd( fd ), sd );
- 
-     if (S_ISDIR(mode))
-         obj = create_dir_obj( fd, access, mode );
-@@ -580,6 +645,8 @@ int file_set_acls( struct object *obj, struct fd *fd, const struct security_desc
-         mode = st.st_mode & (S_ISUID|S_ISGID|S_ISVTX);
-         mode |= sd_to_mode( sd, owner );
- 
-+        set_xattr_acls( unix_fd, sd );
-+
-         if (((st.st_mode ^ mode) & (S_IRWXU|S_IRWXG|S_IRWXO)) && fchmod( unix_fd, mode ) == -1)
-         {
-             file_set_error();
--- 
-1.7.9.5
-

patches/02-ACL_Extended_Attributes/0004-server-Retrieve-file-security-attributes-with-extend.patch

@@ -1,293 +0,0 @@
-From 66583f9f848becaa12d84270a2ebe7a79ac34724 Mon Sep 17 00:00:00 2001
-From: "Erich E. Hoover" <erich.e.hoover@gmail.com>
-Date: Thu, 13 Feb 2014 16:04:57 -0700
-Subject: server: Retrieve file security attributes with extended file
- attributes.
-
----
- dlls/advapi32/tests/security.c |   49 +++++++------
- server/file.c                  |  156 +++++++++++++++++++++++++++++++++++++++-
- 2 files changed, 177 insertions(+), 28 deletions(-)
-
-diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
-index e2e9cd5..f107abc 100644
---- a/dlls/advapi32/tests/security.c
-+++ b/dlls/advapi32/tests/security.c
-@@ -3105,24 +3105,24 @@ static void test_CreateDirectoryA(void)
-         bret = pGetAce(pDacl, 0, (VOID **)&ace);
-         ok(bret, "Failed to get Current User ACE.\n");
-         bret = EqualSid(&ace->SidStart, user_sid);
--        todo_wine ok(bret, "Current User ACE != Current User SID.\n");
--        todo_wine ok(((ACE_HEADER *)ace)->AceFlags == (OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE),
--                     "Current User ACE has unexpected flags (0x%x != 0x03)\n",
--                     ((ACE_HEADER *)ace)->AceFlags);
--        ok(ace->Mask == 0x1f01ff, "Current User ACE has unexpected mask (0x%x != 0x1f01ff)\n",
--                                  ace->Mask);
-+        ok(bret, "Current User ACE != Current User SID.\n");
-+        ok(((ACE_HEADER *)ace)->AceFlags == (OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE),
-+           "Current User ACE has unexpected flags (0x%x != 0x03)\n",
-+           ((ACE_HEADER *)ace)->AceFlags);
-+        todo_wine ok(ace->Mask == 0x1f01ff,
-+                     "Current User ACE has unexpected mask (0x%x != 0x1f01ff)\n", ace->Mask);
-     }
-     if (acl_size.AceCount > 1)
-     {
-         bret = pGetAce(pDacl, 1, (VOID **)&ace);
-         ok(bret, "Failed to get Administators Group ACE.\n");
-         bret = EqualSid(&ace->SidStart, admin_sid);
--        todo_wine ok(bret, "Administators Group ACE != Administators Group SID.\n");
--        todo_wine ok(((ACE_HEADER *)ace)->AceFlags == (OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE),
--                     "Administators Group ACE has unexpected flags (0x%x != 0x03)\n",
--                     ((ACE_HEADER *)ace)->AceFlags);
--        ok(ace->Mask == 0x1f01ff, "Administators Group ACE has unexpected mask (0x%x != 0x1f01ff)\n",
--                                  ace->Mask);
-+        ok(bret, "Administators Group ACE != Administators Group SID.\n");
-+        ok(((ACE_HEADER *)ace)->AceFlags == (OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE),
-+           "Administators Group ACE has unexpected flags (0x%x != 0x03)\n",
-+           ((ACE_HEADER *)ace)->AceFlags);
-+        todo_wine ok(ace->Mask == 0x1f01ff,
-+                     "Administators Group ACE has unexpected mask (0x%x != 0x1f01ff)\n", ace->Mask);
-     }
- 
- done:
-@@ -3294,23 +3294,22 @@ static void test_GetNamedSecurityInfoA(void)
-         bret = pGetAce(pDacl, 0, (VOID **)&ace);
-         ok(bret, "Failed to get Current User ACE.\n");
-         bret = EqualSid(&ace->SidStart, user_sid);
--        todo_wine ok(bret, "Current User ACE != Current User SID.\n");
-+        ok(bret, "Current User ACE != Current User SID.\n");
-         ok(((ACE_HEADER *)ace)->AceFlags == 0,
-            "Current User ACE has unexpected flags (0x%x != 0x0)\n", ((ACE_HEADER *)ace)->AceFlags);
--        ok(ace->Mask == 0x1f01ff, "Current User ACE has unexpected mask (0x%x != 0x1f01ff)\n",
--                                  ace->Mask);
-+        todo_wine ok(ace->Mask == 0x1f01ff,
-+                     "Current User ACE has unexpected mask (0x%x != 0x1f01ff)\n", ace->Mask);
-     }
-     if (acl_size.AceCount > 1)
-     {
-         bret = pGetAce(pDacl, 1, (VOID **)&ace);
-         ok(bret, "Failed to get Administators Group ACE.\n");
-         bret = EqualSid(&ace->SidStart, admin_sid);
--        todo_wine ok(bret || broken(!bret) /* win2k */,
--                     "Administators Group ACE != Administators Group SID.\n");
-+        ok(bret || broken(!bret) /* win2k */, "Administators Group ACE != Administators Group SID.\n");
-         ok(((ACE_HEADER *)ace)->AceFlags == 0,
-            "Administators Group ACE has unexpected flags (0x%x != 0x0)\n", ((ACE_HEADER *)ace)->AceFlags);
--        ok(ace->Mask == 0x1f01ff || broken(ace->Mask == GENERIC_ALL) /* win2k */,
--           "Administators Group ACE has unexpected mask (0x%x != 0x1f01ff)\n", ace->Mask);
-+        todo_wine ok(ace->Mask == 0x1f01ff || broken(ace->Mask == GENERIC_ALL) /* win2k */,
-+                     "Administators Group ACE has unexpected mask (0x%x != 0x1f01ff)\n", ace->Mask);
-     }
-     LocalFree(pSD);
-     HeapFree(GetProcessHeap(), 0, user);
-@@ -3960,22 +3959,22 @@ static void test_GetSecurityInfo(void)
-         bret = pGetAce(pDacl, 0, (VOID **)&ace);
-         ok(bret, "Failed to get Current User ACE.\n");
-         bret = EqualSid(&ace->SidStart, user_sid);
--        todo_wine ok(bret, "Current User ACE != Current User SID.\n");
-+        ok(bret, "Current User ACE != Current User SID.\n");
-         ok(((ACE_HEADER *)ace)->AceFlags == 0,
-            "Current User ACE has unexpected flags (0x%x != 0x0)\n", ((ACE_HEADER *)ace)->AceFlags);
--        ok(ace->Mask == 0x1f01ff, "Current User ACE has unexpected mask (0x%x != 0x1f01ff)\n",
--                                    ace->Mask);
-+        todo_wine ok(ace->Mask == 0x1f01ff,
-+                     "Current User ACE has unexpected mask (0x%x != 0x1f01ff)\n", ace->Mask);
-     }
-     if (acl_size.AceCount > 1)
-     {
-         bret = pGetAce(pDacl, 1, (VOID **)&ace);
-         ok(bret, "Failed to get Administators Group ACE.\n");
-         bret = EqualSid(&ace->SidStart, admin_sid);
--        todo_wine ok(bret, "Administators Group ACE != Administators Group SID.\n");
-+        ok(bret, "Administators Group ACE != Administators Group SID.\n");
-         ok(((ACE_HEADER *)ace)->AceFlags == 0,
-            "Administators Group ACE has unexpected flags (0x%x != 0x0)\n", ((ACE_HEADER *)ace)->AceFlags);
--        ok(ace->Mask == 0x1f01ff, "Administators Group ACE has unexpected mask (0x%x != 0x1f01ff)\n",
--                                  ace->Mask);
-+        todo_wine ok(ace->Mask == 0x1f01ff,
-+                     "Administators Group ACE has unexpected mask (0x%x != 0x1f01ff)\n", ace->Mask);
-     }
-     CloseHandle(obj);
- }
-diff --git a/server/file.c b/server/file.c
-index c375c72..b9135b9 100644
---- a/server/file.c
-+++ b/server/file.c
-@@ -489,11 +489,160 @@ struct security_descriptor *mode_to_sd( mode_t mode, const SID *user, const SID
-     return sd;
- }
- 
-+struct security_descriptor *get_xattr_acls( int fd, const SID *user, const SID *group )
-+{
-+#ifdef HAVE_ATTR_XATTR_H
-+    int ace_count = 0, dacl_size = sizeof(ACL), i, n;
-+    char buffer[XATTR_SIZE_MAX], *p = buffer, *pn;
-+    struct security_descriptor *sd;
-+    ACE_HEADER *current_ace;
-+    ACCESS_ALLOWED_ACE *aaa;
-+    ACCESS_DENIED_ACE *ada;
-+    int type, flags, mask;
-+    ACL *dacl;
-+    char *ptr;
-+
-+    n = fgetxattr( fd, "user.wine.acl", buffer, sizeof(buffer) );
-+    if (n == -1) return NULL;
-+    buffer[n] = 0;
-+
-+    do
-+    {
-+        int sub_authority_count = 0;
-+
-+        pn = strchr(p, ';');
-+        if (pn) pn++;
-+        sscanf(p, "%x", &type);
-+        do
-+        {
-+            p = strchr(p, '-');
-+            if (p) p++;
-+            sub_authority_count++;
-+        }
-+        while(p && (!pn || p < pn));
-+        sub_authority_count -= 3; /* Revision and IdentifierAuthority don't count */
-+
-+        switch (type)
-+        {
-+            case ACCESS_DENIED_ACE_TYPE:
-+                dacl_size += FIELD_OFFSET(ACCESS_DENIED_ACE, SidStart) +
-+                             FIELD_OFFSET(SID, SubAuthority[sub_authority_count]);
-+                break;
-+            case ACCESS_ALLOWED_ACE_TYPE:
-+                dacl_size += FIELD_OFFSET(ACCESS_ALLOWED_ACE, SidStart) +
-+                             FIELD_OFFSET(SID, SubAuthority[sub_authority_count]);
-+                break;
-+            default:
-+                continue;
-+        }
-+        ace_count++;
-+        p = pn;
-+    }
-+    while(p);
-+
-+    sd = mem_alloc( sizeof(struct security_descriptor) +
-+                    FIELD_OFFSET(SID, SubAuthority[user->SubAuthorityCount]) +
-+                    FIELD_OFFSET(SID, SubAuthority[group->SubAuthorityCount]) +
-+                    dacl_size );
-+
-+    sd->control = SE_DACL_PRESENT;
-+    sd->owner_len = FIELD_OFFSET(SID, SubAuthority[user->SubAuthorityCount]);
-+    sd->group_len = FIELD_OFFSET(SID, SubAuthority[group->SubAuthorityCount]);
-+    sd->sacl_len = 0;
-+    sd->dacl_len = dacl_size;
-+
-+    ptr = (char *)(sd + 1);
-+    memcpy( ptr, user, sd->owner_len );
-+    ptr += sd->owner_len;
-+    memcpy( ptr, group, sd->group_len );
-+    ptr += sd->group_len;
-+
-+    dacl = (ACL *)ptr;
-+    dacl->AclRevision = ACL_REVISION;
-+    dacl->Sbz1 = 0;
-+    dacl->AclSize = dacl_size;
-+    dacl->AceCount = ace_count;
-+    dacl->Sbz2 = 0;
-+    aaa = (ACCESS_ALLOWED_ACE *)(dacl + 1);
-+    current_ace = &aaa->Header;
-+
-+    p = buffer;
-+    for(i=0; i<ace_count; i++)
-+    {
-+        char b[sizeof(SID) + sizeof(ULONG) * SID_MAX_SUB_AUTHORITIES];
-+        int sub_authority_count = 0;
-+        SID *sid = (SID *)&b[0];
-+        char sidtxt[100];
-+        int rev, ia, sa;
-+
-+        if (i != 0)
-+        {
-+            aaa = (ACCESS_ALLOWED_ACE *)ace_next( current_ace );
-+            current_ace = &aaa->Header;
-+        }
-+        pn = strchr(p, ';');
-+        if (pn) pn++;
-+        sscanf(p, "%x,%x,%x,%[^;]", &type, &flags, &mask, sidtxt);
-+        sscanf(sidtxt, "S-%u-%d", &rev, &ia);
-+        sid->Revision = rev;
-+        sid->IdentifierAuthority.Value[0] = 0;
-+        sid->IdentifierAuthority.Value[1] = 0;
-+        sid->IdentifierAuthority.Value[2] = HIBYTE(HIWORD(ia));
-+        sid->IdentifierAuthority.Value[3] = LOBYTE(HIWORD(ia));
-+        sid->IdentifierAuthority.Value[4] = HIBYTE(LOWORD(ia));
-+        sid->IdentifierAuthority.Value[5] = LOBYTE(LOWORD(ia));
-+        p = strchr(sidtxt, '-')+1; 
-+        p = strchr(p, '-')+1; /* Revision doesn't count */
-+        p = strchr(p, '-')+1; /* IdentifierAuthority doesn't count */
-+        do
-+        {
-+            sscanf(p, "%u", &sa);
-+            sid->SubAuthority[sub_authority_count] = sa;
-+            p = strchr(p, '-');
-+            if (p) p++;
-+            sub_authority_count++;
-+        }
-+        while(p);
-+        sid->SubAuthorityCount = sub_authority_count;
-+
-+        /* Handle the specific ACE */
-+        switch (type)
-+        {
-+            case ACCESS_DENIED_ACE_TYPE:
-+                ada = (ACCESS_DENIED_ACE *)aaa;
-+                ada->Header.AceType  = type;
-+                ada->Header.AceFlags = flags;
-+                ada->Header.AceSize  = FIELD_OFFSET(ACCESS_DENIED_ACE, SidStart) +
-+                                       FIELD_OFFSET(SID, SubAuthority[sid->SubAuthorityCount]);
-+                ada->Mask            = mask;
-+                memcpy( &ada->SidStart, sid, FIELD_OFFSET(SID, SubAuthority[sid->SubAuthorityCount]) );
-+                break;
-+            case ACCESS_ALLOWED_ACE_TYPE:
-+                aaa->Header.AceType  = type;
-+                aaa->Header.AceFlags = flags;
-+                aaa->Header.AceSize  = FIELD_OFFSET(ACCESS_ALLOWED_ACE, SidStart) +
-+                                       FIELD_OFFSET(SID, SubAuthority[sid->SubAuthorityCount]);
-+                aaa->Mask            = mask;
-+                memcpy( &aaa->SidStart, sid, FIELD_OFFSET(SID, SubAuthority[sid->SubAuthorityCount]) );
-+                break;
-+            default:
-+                continue;
-+        }
-+        p = pn;
-+    }
-+
-+    return sd;
-+#else
-+    return NULL;
-+#endif
-+}
-+
- struct security_descriptor *file_get_acls( struct object *obj, struct fd *fd, mode_t *mode,
-                                            uid_t *uid )
- {
-     int unix_fd = get_unix_fd( fd );
-     struct security_descriptor *sd;
-+    const SID *user, *group;
-     struct stat st;
- 
-     if (unix_fd == -1 || fstat( unix_fd, &st ) == -1)
-@@ -504,9 +653,10 @@ struct security_descriptor *file_get_acls( struct object *obj, struct fd *fd, mo
-         (st.st_uid == *uid))
-         return obj->sd;
- 
--    sd = mode_to_sd( st.st_mode,
--                     security_unix_uid_to_sid( st.st_uid ),
--                     token_get_primary_group( current->process->token ));
-+    user = security_unix_uid_to_sid( st.st_uid );
-+    group = token_get_primary_group( current->process->token );
-+    sd = get_xattr_acls( unix_fd, user, group );
-+    if (!sd) sd = mode_to_sd( st.st_mode, user, group);
-     if (!sd) return obj->sd;
- 
-     *mode = st.st_mode;
--- 
-1.7.9.5
-

patches/02-ACL_Extended_Attributes/0005-server-Convert-return-of-file-security-masks-with-ge.patch

@@ -1,124 +0,0 @@
-From e1b3d93adab31966d145ea41a9246d8f498c09d6 Mon Sep 17 00:00:00 2001
-From: "Erich E. Hoover" <erich.e.hoover@gmail.com>
-Date: Thu, 13 Feb 2014 16:06:54 -0700
-Subject: server: Convert return of file security masks with generic access
- mappings.
-
----
- dlls/advapi32/tests/security.c |   24 ++++++++++++------------
- server/file.c                  |   22 ++++++++++++++++++++++
- 2 files changed, 34 insertions(+), 12 deletions(-)
-
-diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
-index f107abc..b71bad3 100644
---- a/dlls/advapi32/tests/security.c
-+++ b/dlls/advapi32/tests/security.c
-@@ -3109,8 +3109,8 @@ static void test_CreateDirectoryA(void)
-         ok(((ACE_HEADER *)ace)->AceFlags == (OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE),
-            "Current User ACE has unexpected flags (0x%x != 0x03)\n",
-            ((ACE_HEADER *)ace)->AceFlags);
--        todo_wine ok(ace->Mask == 0x1f01ff,
--                     "Current User ACE has unexpected mask (0x%x != 0x1f01ff)\n", ace->Mask);
-+        ok(ace->Mask == 0x1f01ff, "Current User ACE has unexpected mask (0x%x != 0x1f01ff)\n",
-+                                  ace->Mask);
-     }
-     if (acl_size.AceCount > 1)
-     {
-@@ -3121,8 +3121,8 @@ static void test_CreateDirectoryA(void)
-         ok(((ACE_HEADER *)ace)->AceFlags == (OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE),
-            "Administators Group ACE has unexpected flags (0x%x != 0x03)\n",
-            ((ACE_HEADER *)ace)->AceFlags);
--        todo_wine ok(ace->Mask == 0x1f01ff,
--                     "Administators Group ACE has unexpected mask (0x%x != 0x1f01ff)\n", ace->Mask);
-+        ok(ace->Mask == 0x1f01ff, "Administators Group ACE has unexpected mask (0x%x != 0x1f01ff)\n",
-+                                  ace->Mask);
-     }
- 
- done:
-@@ -3297,8 +3297,8 @@ static void test_GetNamedSecurityInfoA(void)
-         ok(bret, "Current User ACE != Current User SID.\n");
-         ok(((ACE_HEADER *)ace)->AceFlags == 0,
-            "Current User ACE has unexpected flags (0x%x != 0x0)\n", ((ACE_HEADER *)ace)->AceFlags);
--        todo_wine ok(ace->Mask == 0x1f01ff,
--                     "Current User ACE has unexpected mask (0x%x != 0x1f01ff)\n", ace->Mask);
-+        ok(ace->Mask == 0x1f01ff, "Current User ACE has unexpected mask (0x%x != 0x1f01ff)\n",
-+                                  ace->Mask);
-     }
-     if (acl_size.AceCount > 1)
-     {
-@@ -3308,8 +3308,8 @@ static void test_GetNamedSecurityInfoA(void)
-         ok(bret || broken(!bret) /* win2k */, "Administators Group ACE != Administators Group SID.\n");
-         ok(((ACE_HEADER *)ace)->AceFlags == 0,
-            "Administators Group ACE has unexpected flags (0x%x != 0x0)\n", ((ACE_HEADER *)ace)->AceFlags);
--        todo_wine ok(ace->Mask == 0x1f01ff || broken(ace->Mask == GENERIC_ALL) /* win2k */,
--                     "Administators Group ACE has unexpected mask (0x%x != 0x1f01ff)\n", ace->Mask);
-+        ok(ace->Mask == 0x1f01ff || broken(ace->Mask == GENERIC_ALL) /* win2k */,
-+           "Administators Group ACE has unexpected mask (0x%x != 0x1f01ff)\n", ace->Mask);
-     }
-     LocalFree(pSD);
-     HeapFree(GetProcessHeap(), 0, user);
-@@ -3962,8 +3962,8 @@ static void test_GetSecurityInfo(void)
-         ok(bret, "Current User ACE != Current User SID.\n");
-         ok(((ACE_HEADER *)ace)->AceFlags == 0,
-            "Current User ACE has unexpected flags (0x%x != 0x0)\n", ((ACE_HEADER *)ace)->AceFlags);
--        todo_wine ok(ace->Mask == 0x1f01ff,
--                     "Current User ACE has unexpected mask (0x%x != 0x1f01ff)\n", ace->Mask);
-+        ok(ace->Mask == 0x1f01ff, "Current User ACE has unexpected mask (0x%x != 0x1f01ff)\n",
-+                                    ace->Mask);
-     }
-     if (acl_size.AceCount > 1)
-     {
-@@ -3973,8 +3973,8 @@ static void test_GetSecurityInfo(void)
-         ok(bret, "Administators Group ACE != Administators Group SID.\n");
-         ok(((ACE_HEADER *)ace)->AceFlags == 0,
-            "Administators Group ACE has unexpected flags (0x%x != 0x0)\n", ((ACE_HEADER *)ace)->AceFlags);
--        todo_wine ok(ace->Mask == 0x1f01ff,
--                     "Administators Group ACE has unexpected mask (0x%x != 0x1f01ff)\n", ace->Mask);
-+        ok(ace->Mask == 0x1f01ff, "Administators Group ACE has unexpected mask (0x%x != 0x1f01ff)\n",
-+                                  ace->Mask);
-     }
-     CloseHandle(obj);
- }
-diff --git a/server/file.c b/server/file.c
-index b9135b9..0df2245 100644
---- a/server/file.c
-+++ b/server/file.c
-@@ -637,6 +637,27 @@ struct security_descriptor *get_xattr_acls( int fd, const SID *user, const SID *
- #endif
- }
- 
-+/* Convert generic rights into standard access rights */
-+void convert_generic_sd( struct security_descriptor *sd )
-+{
-+    const ACL *dacl;
-+    int present;
-+
-+    dacl = sd_get_dacl( sd, &present );
-+    if (present && dacl)
-+    {
-+        const ACE_HEADER *ace = (const ACE_HEADER *)(dacl + 1);
-+        ULONG i;
-+
-+        for (i = 0; i < dacl->AceCount; i++, ace = ace_next( ace ))
-+        {
-+            DWORD *mask = (DWORD *)(ace + 1);
-+
-+            *mask = generic_file_map_access( *mask );
-+        }
-+    }
-+}
-+
- struct security_descriptor *file_get_acls( struct object *obj, struct fd *fd, mode_t *mode,
-                                            uid_t *uid )
- {
-@@ -656,6 +677,7 @@ struct security_descriptor *file_get_acls( struct object *obj, struct fd *fd, mo
-     user = security_unix_uid_to_sid( st.st_uid );
-     group = token_get_primary_group( current->process->token );
-     sd = get_xattr_acls( unix_fd, user, group );
-+    if (sd) convert_generic_sd( sd );
-     if (!sd) sd = mode_to_sd( st.st_mode, user, group);
-     if (!sd) return obj->sd;
- 
--- 
-1.7.9.5
-

patches/02-ACL_Extended_Attributes/0006-server-Inherit-security-attributes-from-parent-direc.patch

@@ -1,300 +0,0 @@
-From 81bfee65674a81a826b32629e218e457b5ef6b4b Mon Sep 17 00:00:00 2001
-From: "Erich E. Hoover" <erich.e.hoover@gmail.com>
-Date: Thu, 13 Feb 2014 16:07:15 -0700
-Subject: server: Inherit security attributes from parent directories on
- creation.
-
----
- dlls/advapi32/tests/security.c |   40 ++++++++++-
- server/change.c                |    2 +-
- server/file.c                  |  146 +++++++++++++++++++++++++++++++++++++++-
- server/file.h                  |    2 +-
- 4 files changed, 184 insertions(+), 6 deletions(-)
-
-diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
-index b71bad3..cad8ca9 100644
---- a/dlls/advapi32/tests/security.c
-+++ b/dlls/advapi32/tests/security.c
-@@ -3030,10 +3030,11 @@ static void test_CreateDirectoryA(void)
-     ACL_SIZE_INFORMATION acl_size;
-     ACCESS_ALLOWED_ACE *ace;
-     SECURITY_ATTRIBUTES sa;
-+    char tmpfile[MAX_PATH];
-     char tmpdir[MAX_PATH];
-+    HANDLE token, hTemp;
-     struct _SID *owner;
-     BOOL bret = TRUE;
--    HANDLE token;
-     DWORD error;
-     PACL pDacl;
- 
-@@ -3125,6 +3126,43 @@ static void test_CreateDirectoryA(void)
-                                   ace->Mask);
-     }
- 
-+    /* Test inheritance of ACLs */
-+    strcpy(tmpfile, tmpdir);
-+    lstrcatA(tmpfile, "/tmpfile");
-+    hTemp = CreateFileA(tmpfile, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_NEW,
-+                        FILE_FLAG_DELETE_ON_CLOSE, NULL);
-+    error = pGetNamedSecurityInfoA(tmpfile, SE_FILE_OBJECT,
-+                                   OWNER_SECURITY_INFORMATION|DACL_SECURITY_INFORMATION, (PSID*)&owner,
-+                                   NULL, &pDacl, NULL, &pSD);
-+    ok(error == ERROR_SUCCESS, "Failed to get permissions on file.\n");
-+    bret = pGetAclInformation(pDacl, &acl_size, sizeof(acl_size), AclSizeInformation);
-+    ok(bret, "GetAclInformation failed\n");
-+    ok(acl_size.AceCount == 2, "GetAclInformation returned unexpected entry count (%d != 2).\n",
-+                               acl_size.AceCount);
-+    if (acl_size.AceCount > 0)
-+    {
-+        bret = pGetAce(pDacl, 0, (VOID **)&ace);
-+        ok(bret, "Inherited Failed to get Current User ACE.\n");
-+        bret = EqualSid(&ace->SidStart, user_sid);
-+        ok(bret, "Inherited Current User ACE != Current User SID.\n");
-+        ok(((ACE_HEADER *)ace)->AceFlags == INHERITED_ACE,
-+           "Inherited Current User ACE has unexpected flags (0x%x != 0x10)\n", ((ACE_HEADER *)ace)->AceFlags);
-+        ok(ace->Mask == 0x1f01ff, "Current User ACE has unexpected mask (0x%x != 0x1f01ff)\n",
-+                                  ace->Mask);
-+    }
-+    if (acl_size.AceCount > 1)
-+    {
-+        bret = pGetAce(pDacl, 1, (VOID **)&ace);
-+        ok(bret, "Inherited Failed to get Administators Group ACE.\n");
-+        bret = EqualSid(&ace->SidStart, admin_sid);
-+        ok(bret, "Inherited Administators Group ACE != Administators Group SID.\n");
-+        ok(((ACE_HEADER *)ace)->AceFlags == INHERITED_ACE,
-+           "Inherited Administators Group ACE has unexpected flags (0x%x != 0x10)\n", ((ACE_HEADER *)ace)->AceFlags);
-+        ok(ace->Mask == 0x1f01ff, "Administators Group ACE has unexpected mask (0x%x != 0x1f01ff)\n",
-+                                  ace->Mask);
-+    }
-+    CloseHandle(hTemp);
-+
- done:
-     HeapFree(GetProcessHeap(), 0, user);
-     bret = RemoveDirectoryA(tmpdir);
-diff --git a/server/change.c b/server/change.c
-index 0b7b979..14f37c3 100644
---- a/server/change.c
-+++ b/server/change.c
-@@ -292,7 +292,7 @@ static struct security_descriptor *dir_get_sd( struct object *obj )
-     assert( obj->ops == &dir_ops );
- 
-     fd = dir_get_fd( obj );
--    sd = file_get_acls( obj, fd, &dir->mode, &dir->uid );
-+    sd = file_get_acls( obj, fd, &dir->mode, &dir->uid, TRUE );
-     release_object( fd );
-     return sd;
- }
-diff --git a/server/file.c b/server/file.c
-index 0df2245..c115ff7 100644
---- a/server/file.c
-+++ b/server/file.c
-@@ -242,11 +242,141 @@ void set_xattr_acls( int fd, const struct security_descriptor *sd )
- #endif
- }
- 
-+struct security_descriptor *inherit_sd( const struct security_descriptor *parent_sd, int is_dir )
-+{
-+    DWORD inheritance_mask = INHERIT_ONLY_ACE|OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE;
-+    struct security_descriptor *sd = NULL;
-+    const ACL *parent_dacl;
-+    int present;
-+    ACL *dacl;
-+
-+    parent_dacl = sd_get_dacl( parent_sd, &present );
-+    if (present && parent_dacl)
-+    {
-+        size_t dacl_size = sizeof(ACL), ace_count = 0;
-+        const ACE_HEADER *parent_ace;
-+        const SID *user, *group;
-+        ACE_HEADER *ace;
-+        char *ptr;
-+        ULONG i;
-+
-+        /* Calculate the size of the DACL */
-+        parent_ace = (const ACE_HEADER *)(parent_dacl + 1);
-+        for (i = 0; i < parent_dacl->AceCount; i++, parent_ace = ace_next( parent_ace ))
-+        {
-+            int multiplier = 1;
-+
-+            if (!(parent_ace->AceFlags & inheritance_mask)) continue;
-+
-+            ace_count += multiplier;
-+            dacl_size += multiplier * parent_ace->AceSize;
-+        }
-+        if(!ace_count) return sd; /* No inheritance */
-+
-+        /* Fill in the security descriptor so that it is compatible with our DACL */
-+        user = (const SID *)(parent_sd + 1);
-+        group = (const SID *)((char *)(parent_sd + 1) + parent_sd->owner_len);
-+        sd = mem_alloc( sizeof(struct security_descriptor) + security_sid_len( user )
-+                        + security_sid_len( group ) + dacl_size );
-+        if (!sd) return sd;
-+        sd->control = SE_DACL_PRESENT;
-+        sd->owner_len = parent_sd->owner_len;
-+        sd->group_len = parent_sd->group_len;
-+        sd->sacl_len = 0;
-+        sd->dacl_len = dacl_size;
-+        ptr = (char *)(sd + 1);
-+        memcpy( ptr, user, sd->owner_len );
-+        ptr += sd->owner_len;
-+        memcpy( ptr, group, sd->group_len );
-+        ptr += sd->group_len;
-+        dacl = (ACL *)ptr;
-+        dacl->AclRevision = ACL_REVISION;
-+        dacl->Sbz1 = 0;
-+        dacl->AclSize = dacl_size;
-+        dacl->AceCount = ace_count;
-+        dacl->Sbz2 = 0;
-+        ace = (ACE_HEADER *)(dacl + 1);
-+
-+        /* Build the new DACL, inheriting from the parent's information */
-+        parent_ace = (const ACE_HEADER *)(parent_dacl + 1);
-+        for (i = 0; i < parent_dacl->AceCount; i++, parent_ace = ace_next( parent_ace ))
-+        {
-+            DWORD flags = parent_ace->AceFlags;
-+
-+            if (!(flags & inheritance_mask)) continue;
-+
-+            ace->AceType = parent_ace->AceType;
-+            if(is_dir && (flags & CONTAINER_INHERIT_ACE))
-+                flags &= ~INHERIT_ONLY_ACE;
-+            else if(!is_dir && (flags & OBJECT_INHERIT_ACE))
-+                flags &= ~INHERIT_ONLY_ACE;
-+            else if(is_dir && (flags & OBJECT_INHERIT_ACE))
-+                flags |= INHERIT_ONLY_ACE;
-+            if(is_dir)
-+                ace->AceFlags = flags | INHERITED_ACE;
-+            else
-+                ace->AceFlags = (parent_ace->AceFlags & ~inheritance_mask) | INHERITED_ACE;
-+            ace->AceSize = parent_ace->AceSize;
-+            memcpy( ace + 1, parent_ace + 1, parent_ace->AceSize - sizeof(ACE_HEADER));
-+            ace = (ACE_HEADER *)ace_next( ace );
-+        }
-+    }
-+    return sd;
-+}
-+
-+static struct security_descriptor *file_get_parent_sd( struct fd *root, char *parent_name,
-+                                                       int is_dir )
-+{
-+    struct security_descriptor *sd = NULL;
-+    int len = strlen( parent_name );
-+    mode_t parent_mode = 0555;
-+    struct fd *parent_fd;
-+    char *slash;
-+
-+    /* Even if the file is a directory we need its parent, so skip any terminating slash */
-+    if (parent_name[len-1] == '/')
-+        parent_name[len-1] = 0;
-+    /* Find the last slash in the filename and terminate the name there */
-+    slash = strrchr(parent_name, '/');
-+    if (slash)
-+        slash[0] = 0;
-+    else
-+        parent_name[0] = 0;
-+
-+    parent_fd = open_fd( root, parent_name, O_NONBLOCK | O_LARGEFILE, &parent_mode,
-+                         READ_CONTROL|ACCESS_SYSTEM_SECURITY,
-+                         FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE,
-+                         FILE_OPEN_FOR_BACKUP_INTENT );
-+    if(parent_fd)
-+    {
-+        struct object *obj;
-+
-+        if ((obj = create_file_obj( parent_fd, READ_CONTROL|ACCESS_SYSTEM_SECURITY, parent_mode )))
-+        {
-+            struct file *file = (struct file *)obj;
-+            struct fd *fd;
-+
-+            fd = file_get_fd( obj );
-+            if (fd)
-+            {
-+                sd = file_get_acls( obj, fd, &file->mode, &file->uid, FALSE );
-+                release_object( fd );
-+            }
-+            if (sd)
-+                sd = inherit_sd( sd, is_dir );
-+            release_object( obj );
-+        }
-+        release_object( parent_fd );
-+    }
-+    return sd;
-+}
-+
- static struct object *create_file( struct fd *root, const char *nameptr, data_size_t len,
-                                    unsigned int access, unsigned int sharing, int create,
-                                    unsigned int options, unsigned int attrs,
-                                    const struct security_descriptor *sd )
- {
-+    struct security_descriptor *temp_sd = NULL;
-     struct object *obj = NULL;
-     struct fd *fd;
-     int flags;
-@@ -275,6 +405,15 @@ static struct object *create_file( struct fd *root, const char *nameptr, data_si
-     default:                set_error( STATUS_INVALID_PARAMETER ); goto done;
-     }
- 
-+    if (!sd && (create == FILE_CREATE || create == FILE_OVERWRITE_IF))
-+    {
-+        /* Note: inheritance of security descriptors only occurs on creation when sd is NULL */
-+        char *child_name = strndup( nameptr, len );
-+
-+        sd = temp_sd = file_get_parent_sd( root, child_name, options & FILE_DIRECTORY_FILE );
-+        free(child_name);
-+    }
-+
-     if (sd)
-     {
-         const SID *owner = sd_get_owner( sd );
-@@ -315,6 +454,7 @@ static struct object *create_file( struct fd *root, const char *nameptr, data_si
-     release_object( fd );
- 
- done:
-+    free( temp_sd );
-     free( name );
-     return obj;
- }
-@@ -659,7 +799,7 @@ void convert_generic_sd( struct security_descriptor *sd )
- }
- 
- struct security_descriptor *file_get_acls( struct object *obj, struct fd *fd, mode_t *mode,
--                                           uid_t *uid )
-+                                           uid_t *uid, int convert_generic )
- {
-     int unix_fd = get_unix_fd( fd );
-     struct security_descriptor *sd;
-@@ -677,7 +817,7 @@ struct security_descriptor *file_get_acls( struct object *obj, struct fd *fd, mo
-     user = security_unix_uid_to_sid( st.st_uid );
-     group = token_get_primary_group( current->process->token );
-     sd = get_xattr_acls( unix_fd, user, group );
--    if (sd) convert_generic_sd( sd );
-+    if (sd && convert_generic) convert_generic_sd( sd );
-     if (!sd) sd = mode_to_sd( st.st_mode, user, group);
-     if (!sd) return obj->sd;
- 
-@@ -697,7 +837,7 @@ static struct security_descriptor *file_get_sd( struct object *obj )
-     assert( obj->ops == &file_ops );
- 
-     fd = file_get_fd( obj );
--    sd = file_get_acls( obj, fd, &file->mode, &file->uid );
-+    sd = file_get_acls( obj, fd, &file->mode, &file->uid, TRUE );
-     release_object( fd );
-     return sd;
- }
-diff --git a/server/file.h b/server/file.h
-index 89b5888..0905fbb 100644
---- a/server/file.h
-+++ b/server/file.h
-@@ -125,7 +125,7 @@ extern mode_t sd_to_mode( const struct security_descriptor *sd, const SID *owner
- extern int file_set_acls( struct object *obj, struct fd *fd, const struct security_descriptor *sd,
-                           unsigned int set_info );
- extern struct security_descriptor *file_get_acls( struct object *obj, struct fd *fd, mode_t *mode,
--                                                  uid_t *uid );
-+                                                  uid_t *uid, int convert_generic );
- 
- /* file mapping functions */
- 
--- 
-1.7.9.5
-