Release 1.7.28.

ntdll-WRITECOPY: Merge patches 4 and 7.
ntdll-WRITECOPY: Fix some additional issues, disable this patch by default since it might trigger additional Wine bugs.
2025-04-13 14:42:51 -07:00 · 2014-10-04 04:40:22 +02:00 · 2014-10-04 04:02:07 +02:00 · 2014-10-04 03:28:03 +02:00 · 2014-10-03 22:18:32 +02:00 · 2014-10-03 21:04:01 +02:00
228 changed files with 58501 additions and 4053 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 debian/tools/wine
 .depcache
+.srccache
 *.ok
 *.pyc
--- a/DEVELOPER.md
+++ b/DEVELOPER.md
@@ -0,0 +1,152 @@
+Developers and maintainers guide
+================================
+
+This document will provide some information targeted at developers, who
+either want to build/package Wine-Compholio for their distribution, but also
+for developers who would like to contribute their patches to Wine-Compholio,
+to get them included in future releases.
+
+
+
+Compiling Wine-Compholio
+========================
+
+**Warning:** Please note that starting with Wine-Compholio 1.7.23 it is
+deprecated to manually apply patches without using the Makefile. To avoid
+typical pitfalls for package maintainers (like trying to use the patch
+commandline utility for binary patches or not updating the patchlist) it is
+highly recommended to use the Makefile in order to apply all patches. This
+ensures that the the correct patch utility is used, that the list of patches
+is updated appropriately, and so on. Please note that it is still possible
+to exclude patches if desired, take a look at the end of this document for
+more details.
+
+Instructions
+------------
+
+The following instructions (based on the [Gentoo
+Wiki](https://wiki.gentoo.org/wiki/Netflix/Pipelight#Compiling_manually))
+will give a short overview how to compile Wine-Compholio, but of course not
+explain all details. Make sure to install all required Wine dependencies
+before proceeding.
+
+As the first step please grab the latest Wine source:
+```bash
+wget http://prdownloads.sourceforge.net/wine/wine-1.7.28.tar.bz2
+wget https://github.com/compholio/wine-compholio-daily/archive/v1.7.28.tar.gz
+```
+
+Extract the archives:
+```bash
+tar xvjf wine-1*.tar.bz2
+cd wine-1*
+tar xvzf ../v1.7.28.tar.gz --strip-components 1
+```
+
+And apply the patches:
+```bash
+make -C ./patches DESTDIR=$(pwd) install
+```
+
+Afterwards run configure (you can also specify a prefix if you don't want to install
+Wine-Compholio system-wide):
+```bash
+./configure --with-xattr
+```
+
+Before you continue you should make sure that `./configure` doesn't show any
+warnings (look at the end of the output). If there are any warnings, this
+most likely means that you're missing some important header files. Install
+them and repeat the `./configure` step until all problems are fixed.
+
+Afterwards compile it (and grab a cup of coffee):
+```bash
+make
+```
+
+And install it (you only need sudo for a system-wide installation):
+```bash
+sudo make install
+```
+
+Excluding patches
+-----------------
+
+It is also possible to apply only a subset of the patches, for example if
+you're compiling for a distribution where PulseAudio is not installed, or
+if you just don't like a specific patchset. Please note that some patchsets
+depend on each other, and requesting an impossible situation might result
+in a failure to apply all patches.
+
+Lets assume you want to exclude the patchset in directory `DIRNAME`, then
+just invoke the Makefile like this:
+```bash
+make -C ./patches DESTDIR=$(pwd) install -W DIRNAME.ok
+```
+
+Using the same method its also possible to exclude multiple patchsets. If you
+want to exclude a very large number of patches, it is easier to do specify
+a list of patches which should be included instead. To apply for example
+only the patchsets in directory `DIRNAME1` and `DIRNAME2`, you can use:
+```bash
+make -C ./patches DESTDIR=$(pwd) PATCHLIST="DIRNAME1.ok DIRNAME2.ok" install
+```
+
+
+Contributing to Wine-Compholio
+==============================
+
+Please note that Wine-Compholio is not just an arbitrary collection of Wine
+patches. We see Wine-Compholio as a **testing version** in preparation for
+patches to be submitted to upstream Wine. This implies that all patches should
+at least have a minimum standard quality. Unlike some other PPAs/AURs which
+provide heavily patched Wine versions, we will not accept hacks for very
+specific games. Such hacks often break compatibility with other applications,
+which means we probably don't want to include them, sorry.
+
+If you think your patches are indeed a proper implementation, then feel free
+to contribute them.  Please note that to allow possible later inclusion
+into upstream Wine, we will require you to pay attention to the same
+[rules](http://wiki.winehq.org/SubmittingPatches). Please be patient and
+give us up to about a week to review them - we're a very small team, so
+it might take some time, and we want to make sure that the implementation
+doesn't contain any critical errors, which could cause regressions. If you
+want to contribute huge sets of patches, we would really like you to *stay
+contributing* in the future. Even if we accepted your patches, this doesn't
+necessary mean we understand all of it, and if you cannot or don't want
+to maintain them (especially in case of errors, or difficult rebasing),
+we will probably end up removing them again.
+
+You can also suggest adding patches written by other people - in this case
+your request should include who wrote the patch. Anonymous patches which
+don't include the author information aren't welcome, similar to the rules
+for upstream Wine.
+
+
+Attribution guidelines
+----------------------
+
+The Wine "Compholio" Edition repository expects all patches to conform to
+Wine's (undocumented) attribution guidelines. There are a variety of ways
+to attribute patches, but they all involve an additional line to the patch
+subject:
+
+```
+commit 0000000000000000000000000000000000000000
+Author: Example Author <example.email@email-provider.com>
+Date:   Sat Jul 26 12:31:50 2014 -0600
+
+    Name of patch.
+    
+    TYPE-OF-ATTRIBUTION.
+```
+
+TYPE-OF-ATTRIBUTION can be any of the following:
+
+`Found/Spotted by FINDER.`: The resolved issue was found by FINDER, they
+should receive appropriate credit for finding the problem - even though
+their patch was not used in the final implementation.
+
+`Based on patch by AUTHOR.`: The patch created by AUTHOR was a starting point
+for the patch, some modifications were made to their patch - but they should
+receive credit since the original implementation was theirs.
--- a/LICENSE.GPLv3
+++ b/LICENSE.GPLv3
--- a/LICENSE.LGPLv2.1
+++ b/LICENSE.LGPLv2.1
--- a/LICENSE.Liberation
+++ b/LICENSE.Liberation
@@ -1,59 +0,0 @@
-The following files are under this license:
-* ./patches/fonts-Missing_Fonts/0001-fonts-Add-Liberation-Sans-as-an-Arial-replacement.patch
-
-LICENSE AGREEMENT AND LIMITED PRODUCT WARRANTY
-LIBERATION FONT SOFTWARE
-
-This agreement governs the use of the Software and any updates to the Software,
-regardless of the delivery mechanism. Subject to the following terms, Red Hat,
-Inc. ("Red Hat") grants to the user ("Client") a license to this work pursuant
-to the GNU General Public License v.2 with the exceptions set forth below and
-such other terms as our set forth in this End User License Agreement.
-
-1.The Software and License Exception. LIBERATION font software  (the "Software")
-consists of TrueType-OpenType formatted font software for rendering LIBERATION
-typefaces in sans serif, serif, and monospaced character styles. You are licensed
-to use, modify, copy, and distribute the Software pursuant to the GNU General
-Public License v.2 with the following exceptions:
-(a)As a special exception, if you create a document which uses this font, and
-embed this font or unaltered portions of this font into the document, this font
-does not by itself cause the resulting document to be covered by the GNU General
-Public License. This exception does not however invalidate any other reasons why
-the document might be covered by the GNU General Public License. If you modify
-this font, you may extend this exception to your version of the font, but you
-are not obligated to do so. If you do not wish to do so, delete this exception
-statement from your version.
-(b)As a further exception, any distribution of the object code of the Software
-in a physical product must provide you the right to access and modify the source
-code for the Software and to reinstall that modified version of the Software in
-object code form on the same physical product on which you received it.
-2.Intellectual Property Rights. The Software and each of its components,
-including the source code, documentation, appearance, structure and organization
-are owned by Red Hat and others and are protected under copyright and other laws.
-Title to the Software and any component, or to any copy, modification, or merged
-portion shall remain with the aforementioned, subject to the applicable license.
-The "LIBERATION" trademark is a trademark of Red Hat, Inc. in the U.S. and other
-countries. This agreement does not permit Client to distribute modified versions
-of the Software using Red Hat's trademarks. If Client makes a redistribution of
-a modified version of the Software, then Client must modify the files names to
-remove any reference to the Red Hat trademarks and must not use the Red Hat
-trademarks in any way to reference or promote the modified Software.
-3.Limited Warranty. To the maximum extent permitted under applicable law, the
-Software is provided and licensed "as is" without warranty of any kind,
-expressed or implied, including the implied warranties of merchantability,
-non-infringement or fitness for a particular purpose. Red Hat does not warrant
-that the functions contained in the Software will meet Client's requirements or
-that the operation of the Software will be entirely error free or appear
-precisely as described in the accompanying documentation.
-4.Limitation of Remedies and Liability. To the maximum extent permitted by
-applicable law, Red Hat or any Red Hat authorized dealer will not be liable to
-Client for any incidental or consequential damages, including lost profits or
-lost savings arising out of the use or inability to use the Software, even if
-Red Hat or such dealer has been advised of the possibility of such damages.
-5.General. If any provision of this agreement is held to be unenforceable, that
-shall not affect the enforceability of the remaining provisions. This agreement
-shall be governed by the laws of the State of North Carolina and of the United
-States, without regard to any conflict of laws provisions, except that the
-United Nations Convention on the International Sale of Goods shall not apply.
-Copyright © 2007 Red Hat, Inc. All rights reserved. LIBERATION is a trademark
-of Red Hat, Inc.
--- a/LICENSE.md
+++ b/LICENSE.md
--- a/LICENSE.wine-compholio
+++ b/LICENSE.wine-compholio
@@ -1,24 +0,0 @@
-wine-compholio is free software; you can redistribute it and/or modify it
-under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 2.1 of the License, or (at
-your option) any later version with the exception of the following files:
-
-Liberation/GPLv2†:
-* ./patches/fonts-Missing_Fonts/0001-fonts-Add-Liberation-Sans-as-an-Arial-replacement.patch
-
-Apache2/GPLv3†:
-* ./patches/fonts-Missing_Fonts/0002-fonts-Add-WenQuanYi-Micro-Hei-as-a-Microsoft-Yahei-r.patch
-
-This program is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Lesser General Public License for more details.
-
-A copy of the GNU Lesser General Public License is included in the
-Wine distribution in the file COPYING.LIB. If you did not receive this
-copy, write to the Free Software Foundation, Inc., 51 Franklin St,
-Fifth Floor, Boston, MA 02110-1301, USA.
-
-† These files are not linked to by the rest of this project in any way,
-they are fonts that can be used by any application and are installed
-simply for end-user convenience.
--- a/README.md
+++ b/README.md
@@ -1,106 +1,113 @@
-wine-compholio
-==============
+What is Wine-Compholio?
+=======================

-The Wine "Compholio" Edition repository includes a variety of patches for
-Wine to run common Windows applications under Linux.
+**Warning: Do not report bugs at bugs.winehq.org when using this version!
+Please take a look at our
+[Wiki](https://github.com/compholio/wine-compholio/wiki/Reporting-bugs)
+for more information about how to report bugs.**

-These patches fix the following Wine bugs:
+The **Wine "Compholio" Edition** is a special build of the popular Wine
+software that includes both patches written by our team and selected patches
+by third party developers that we consider good enough for inclusion. This can
+be seen as a testing version in preparation for patches to be submitted to
+upstream Wine - don't be surprised if you encounter additional bugs, which are
+not present in regular wine, and always report such issues to us (via github!),
+so we can improve our fixes even further. Thanks!

-* Support for TransmitFile ([Wine Bug #5048](http://bugs.winehq.org/show_bug.cgi?id=5048 "Multiple applications and games need support for ws2_32 SIO_GET_EXTENSION_FUNCTION_POINTER TransmitFile (WSAID_TRANSMITFILE)"))
-* Need for Speed 3 installer requires devices in HKEY_DYN_DATA ([Wine Bug #7115](http://bugs.winehq.org/show_bug.cgi?id=7115 "Need for Speed III installer fails in Win9X mode, reporting \"Could not get 'HardWareKey' value\" (active PnP device keys in 'HKEY_DYN_DATA\\\\Config Manager\\\\Enum' missing)"))
-* Support for Junction Points ([Wine Bug #12401](http://bugs.winehq.org/show_bug.cgi?id=12401 "Support junction points, i.e. DeviceIoCtl(FSCTL_SET_REPARSE_POINT/FSCTL_GET_REPARSE_POINT)"))
-* Implement a Microsoft Yahei replacement font ([Wine Bug #13829](http://bugs.winehq.org/show_bug.cgi?id=13829 "Wine does not have CJK fonts"))
-* GetSecurityInfo returns NULL DACL for process object ([Wine Bug #15980](http://bugs.winehq.org/show_bug.cgi?id=15980 "Rhapsody 2 crashes on startup (GetSecurityInfo returns NULL DACL for process object)"))
-* Workaround for TransactNamedPipe not being supported ([Wine Bug #17273](http://bugs.winehq.org/show_bug.cgi?id=17273 "Many apps and games need SetNamedPipeHandleState implementation (support for named pipe message mode)(FireFox+Flash, Win8/NET 4.x SDK/vcrun2012, WiX installers)"))
-* Support for process ACLs ([Wine Bug #22006](http://bugs.winehq.org/show_bug.cgi?id=22006 "OpenProcess does not enforce ACL"))
-* Return correct IMediaSeeking stream positions in quartz ([Wine Bug #23174](http://bugs.winehq.org/show_bug.cgi?id=23174 "Fallout 3: Diologue and Video/sound issues"))
-* Add implementation of WTSEnumerateProcessesW ([Wine Bug #29903](http://bugs.winehq.org/show_bug.cgi?id=29903 "Some Microsoft debuggers fail to enumerate processes due to wtsapi32.WTSEnumerateProcessesW() being a stub (Microsoft Visual Studio 2005, DbgCLR from .NET 2.0 SDK)"))
-* Fix race conditions and deadlocks in strmbase/quartz ([Wine Bug #31566](http://bugs.winehq.org/show_bug.cgi?id=31566 "Fallout 3: regression causes block at critical section when radio is enabled"))
-* Support for stored file ACLs ([Wine Bug #31858](http://bugs.winehq.org/show_bug.cgi?id=31858 "Netflix on Firefox fails with Internet Connection Problem when loading bar is at 99%"))
-* Implement an Arial replacement font ([Wine Bug #32323](http://bugs.winehq.org/show_bug.cgi?id=32323 "Netflix (Silverlight 4.x) and several .NET Framework 3.x/4.0 WPF apps require either Arial or Verdana to be installed"))
-* Support for interface change notifications ([Wine Bug #32328](http://bugs.winehq.org/show_bug.cgi?id=32328 "Many .NET and Silverlight applications require SIO_ADDRESS_LIST_CHANGE for interface change notifications"))
-* Support for inherited file ACLs ([Wine Bug #34406](http://bugs.winehq.org/show_bug.cgi?id=34406 "Finale Notepad 2012 doesn't copy/create user files on program start"))
-* Add Dynamic DST exceptions for Israel Standard Time ([Wine Bug #36374](http://bugs.winehq.org/show_bug.cgi?id=36374 "Israel timezone handled incorrectly"))

-Besides that the following additional changes are included:
+How to install and use Wine-Compholio
+=====================================

+Ready-to-use packages for Wine-Compholio are available for a variety
+of different Linux distributions directly for download. Just follow the
+instructions available on the
+[Wiki](https://github.com/compholio/wine-compholio/wiki/Installation).
+
+When using Wine-Compholio there are a few differences compared to regular
+Wine. The main difference is that it is not sufficient to type `wine` to
+run it, but instead you will have to type `/opt/wine-compholio/bin/wine`.
+Besides that there are also some other differences, for example additional
+configuration options to tweak performance, which are not available in regular
+Wine. All those differences are also documented on the
+[Wiki](https://github.com/compholio/wine-compholio/wiki/Usage).
+
+
+Included bugfixes and improvements
+==================================
+
+**Bugs fixed in Wine-Compholio 1.7.28 [73]:**
+
+* ATL IOCS data should not be stored in GWLP_USERDATA ([Wine Bug #21767](http://bugs.winehq.org/show_bug.cgi?id=21767))
+* Add Dynamic DST exceptions for Israel Standard Time ([Wine Bug #36374](http://bugs.winehq.org/show_bug.cgi?id=36374))
 * Add default ACLs for user shell folders
-* Add support for Dynamic DST (daylight saving time) information in registry
+* Allow special characters in pipe names ([Wine Bug #28995](http://bugs.winehq.org/show_bug.cgi?id=28995))
+* Audio stuttering and performance drops in multiple applications ([Wine Bug #30639](http://bugs.winehq.org/show_bug.cgi?id=30639))
+* Correctly treat '.' when checking for empty directories ([Wine Bug #26272](http://bugs.winehq.org/show_bug.cgi?id=26272))
+* Do not fail when a used context is passed to wglShareLists ([Wine Bug #11436](http://bugs.winehq.org/show_bug.cgi?id=11436))
+* Don't fill KdHelp structure for usermode applications ([Wine Bug #37272](http://bugs.winehq.org/show_bug.cgi?id=37272))
+* Ensure NtProtectVirtualMemory and NtCreateSection are on separate pages ([Wine Bug #33162](http://bugs.winehq.org/show_bug.cgi?id=33162))
+* Fix black screen on startup introduced by pixelformat changes. ([Wine Bug #35950](http://bugs.winehq.org/show_bug.cgi?id=35950))
+* Fix comparison of punctuation characters in lstrcmp ([Wine Bug #10767](http://bugs.winehq.org/show_bug.cgi?id=10767))
+* Fix flickering introduced by pixelformat changes. ([Wine Bug #35718](http://bugs.winehq.org/show_bug.cgi?id=35718))
+* Fix for ConnectNamedPort return value in overlapped mode ([Wine Bug #16550](http://bugs.winehq.org/show_bug.cgi?id=16550))
+* Fix for programs leaking wndproc slots ([Wine Bug #32451](http://bugs.winehq.org/show_bug.cgi?id=32451))
+* Fix gray screen on startup introduced by pixelformat changes. ([Wine Bug #35975](http://bugs.winehq.org/show_bug.cgi?id=35975))
+* Fix issue with invisible dragimages in ImageList ([Wine Bug #36761](http://bugs.winehq.org/show_bug.cgi?id=36761))
+* Fix issues when driver dispatch routine returns different status codes ([Wine Bug #30155](http://bugs.winehq.org/show_bug.cgi?id=30155))
+* Fix missing video introduced by pixelformat changes. ([Wine Bug #36900](http://bugs.winehq.org/show_bug.cgi?id=36900))
+* Fix unintentional leaks with ntdll internals
+* Fix wined3d performance drop introduced by pixelformat changes. ([Wine Bug #35655](http://bugs.winehq.org/show_bug.cgi?id=35655))
+* Games For Windows Live 1.x expects a valid linker version in the PE header ([Wine Bug #28768](http://bugs.winehq.org/show_bug.cgi?id=28768))
+* GetSecurityInfo returns NULL DACL for process object ([Wine Bug #15980](http://bugs.winehq.org/show_bug.cgi?id=15980))
+* Implement a Microsoft Yahei replacement font ([Wine Bug #13829](http://bugs.winehq.org/show_bug.cgi?id=13829))
+* Implement an Arial replacement font ([Wine Bug #32323](http://bugs.winehq.org/show_bug.cgi?id=32323))
+* Improvement for heap allocation performance
+* Lego Stunt Rally requires DXTn software de/encoding support ([Wine Bug #25486](http://bugs.winehq.org/show_bug.cgi?id=25486))
+* Limit cross thread access to ImmSet* functions ([Wine Bug #35361](http://bugs.winehq.org/show_bug.cgi?id=35361))
 * Lockfree algorithm for filedescriptor cache (improves file access speed)
-* Other Pipelight specific enhancements
+* Make it possible to change media center / tablet pc status ([Wine Bug #18732](http://bugs.winehq.org/show_bug.cgi?id=18732))
+* Need for Speed 3 installer requires devices in HKEY_DYN_DATA ([Wine Bug #7115](http://bugs.winehq.org/show_bug.cgi?id=7115))
+* Other Pipelight-specific enhancements
+* Prevent window managers from grouping all wine programs together ([Wine Bug #32699](http://bugs.winehq.org/show_bug.cgi?id=32699))
 * Reduced SetTimer minimum value from 10 ms to 5 ms (improves Silverlight framerates)
+* Return an error when trying to open a terminated process ([Wine Bug #37087](http://bugs.winehq.org/show_bug.cgi?id=37087))
+* Return correct IMediaSeeking stream positions in quartz ([Wine Bug #23174](http://bugs.winehq.org/show_bug.cgi?id=23174))
+* SO_CONNECT_TIME returns the appropriate time
+* Send WM_PAINT event during dialog creation ([Wine Bug #35652](http://bugs.winehq.org/show_bug.cgi?id=35652))
+* Set ldr.EntryPoint for main executable ([Wine Bug #33034](http://bugs.winehq.org/show_bug.cgi?id=33034))
+* Support for AllocateAndGetTcpExTableFromStack ([Wine Bug #34372](http://bugs.winehq.org/show_bug.cgi?id=34372))
+* Support for DOS hidden/system file attributes ([Wine Bug #9158](http://bugs.winehq.org/show_bug.cgi?id=9158))
+* Support for Dynamic DST (daylight saving time) information in registry
+* Support for FindFirstFileExW level FindExInfoBasic ([Wine Bug #37354](http://bugs.winehq.org/show_bug.cgi?id=37354))
+* Support for GetFinalPathNameByHandle ([Wine Bug #36073](http://bugs.winehq.org/show_bug.cgi?id=36073))
+* Support for GetSystemTimes ([Wine Bug #19813](http://bugs.winehq.org/show_bug.cgi?id=19813))
 * Support for GetVolumePathName
-* Support for PulseAudio backend for audio
+* Support for IRichEditOle and ITextDocument support for ITextServices. ([Wine Bug #17042](http://bugs.winehq.org/show_bug.cgi?id=17042))
+* Support for ITextDocument_fnRange function ([Wine Bug #12458](http://bugs.winehq.org/show_bug.cgi?id=12458))
+* Support for ITextRange, ITextFont and ITextPara ([Wine Bug #18303](http://bugs.winehq.org/show_bug.cgi?id=18303))
+* Support for Junction Points ([Wine Bug #12401](http://bugs.winehq.org/show_bug.cgi?id=12401))
+* Support for KF_FLAG_DEFAULT_PATH in SHGetKnownFolderPath ([Wine Bug #30385](http://bugs.winehq.org/show_bug.cgi?id=30385))
+* Support for LoadIconMetric ([Wine Bug #35375](http://bugs.winehq.org/show_bug.cgi?id=35375))
+* Support for NtQuerySection ([Wine Bug #37338](http://bugs.winehq.org/show_bug.cgi?id=37338))
+* Support for NtSetInformationFile class FileDispositionInformation ([Wine Bug #30397](http://bugs.winehq.org/show_bug.cgi?id=30397))
+* Support for PulseAudio backend for audio ([Wine Bug #10495](http://bugs.winehq.org/show_bug.cgi?id=10495))
+* Support for SHCreateSessionKey ([Wine Bug #35630](http://bugs.winehq.org/show_bug.cgi?id=35630))
+* Support for TOOLTIPS_GetTipText edge cases ([Wine Bug #30648](http://bugs.winehq.org/show_bug.cgi?id=30648))
+* Support for TransmitFile ([Wine Bug #5048](http://bugs.winehq.org/show_bug.cgi?id=5048))
+* Support for WTSEnumerateProcessesW ([Wine Bug #29903](http://bugs.winehq.org/show_bug.cgi?id=29903))
+* Support for [Get|Set]SystemFileCacheSize ([Wine Bug #35886](http://bugs.winehq.org/show_bug.cgi?id=35886))
+* Support for extra large and jumbo icon lists in shell32 ([Wine Bug #24721](http://bugs.winehq.org/show_bug.cgi?id=24721))
+* Support for inherited file ACLs ([Wine Bug #34406](http://bugs.winehq.org/show_bug.cgi?id=34406))
+* Support for interface change notifications ([Wine Bug #32328](http://bugs.winehq.org/show_bug.cgi?id=32328))
+* Support for process ACLs ([Wine Bug #22006](http://bugs.winehq.org/show_bug.cgi?id=22006))
+* Support for setcap on wine-preloader ([Wine Bug #26256](http://bugs.winehq.org/show_bug.cgi?id=26256))
+* Support for stored file ACLs ([Wine Bug #31858](http://bugs.winehq.org/show_bug.cgi?id=31858))
+* Support for ws2_32.inet_pton ([Wine Bug #36713](http://bugs.winehq.org/show_bug.cgi?id=36713))
+* Unity3D Editor requires ProductId registry value ([Wine Bug #36964](http://bugs.winehq.org/show_bug.cgi?id=36964))
+* Update a XIM candidate position when cursor location changes ([Wine Bug #30938](http://bugs.winehq.org/show_bug.cgi?id=30938))
+* Use manual relay for RunDLL_CallEntry16 in shell32 ([Wine Bug #23033](http://bugs.winehq.org/show_bug.cgi?id=23033))
+* Voobly expects correct handling of WRITECOPY memory protection ([Wine Bug #29384](http://bugs.winehq.org/show_bug.cgi?id=29384))
 * Workaround for shlwapi URLs with relative paths
 * XEMBED support for embedding Wine windows inside Linux applications
+* nVidia driver for high-end laptop cards does not list all supported resolutions

-### Compiling wine-compholio
-
-Please note that starting with wine-compholio 1.7.23 it is deprecated to manually
-apply patches without using the Makefile. To avoid typical pitfalls for package
-maintainers (like trying to use the patch commandline utility for binary patches or
-not updating the patchlist) it is highly recommended to use the Makefile in order
-to apply all patches. This ensures that the the correct patch utility is used, that
-the list of patches is updated appropriately, and so on. Please note that it is still
-possible to exclude patches if desired, take a look at the end of this document for
-more details.
-
-The following instructions (based on the
-[Gentoo Wiki](https://wiki.gentoo.org/wiki/Netflix/Pipelight#Compiling_manually))
-will give a short overview how to compile wine-compholio, but of course not explain
-all details. Make sure to install all required Wine dependencies before proceeding.
-
-As the first step please grab the latest Wine source:
-```bash
-wget http://prdownloads.sourceforge.net/wine/wine-1.7.23.tar.bz2
-wget https://github.com/compholio/wine-compholio-daily/archive/v1.7.23.tar.gz
-```
-Extract the archives:
-```bash
-tar xvjf wine-1*.tar.bz2
-cd wine-1*
-tar xvzf ../v1.7.23.tar.gz --strip-components 1
-```
-And apply the patches:
-```bash
-make -C ./patches DESTDIR=$(pwd) install
-```
-Afterwards run configure (you can also specify a prefix if you don't want to install
-wine-compholio system-wide):
-```bash
-./configure --with-xattr
-```
-Before you continue you should make sure that ./configure doesn't show any warnings
-(look at the end of the output). If there are any warnings, this most likely means
-that you're missing some important header files. Install them and repeat the ./configure
-step until all problems are fixed.
-
-Afterwards compile it (and grab a cup of coffee):
-```bash
-make
-```
-And install it (you only need sudo for a system-wide installation):
-```bash
-sudo make install
-```
-
-### Excluding patches
-
-It is also possible to apply only a subset of the patches, for example if you're
-compiling for a distribution where PulseAudio is not installed, or if you just don't
-like a specific patchset. Please note that some patchsets depend on each other, and
-requesting an impossible situation might result in a failure to apply all patches.
-
-Lets assume you want to exclude the patchset in directory DIRNAME, then just invoke the
-Makefile like this:
-```bash
-make -C ./patches DESTDIR=$(pwd) install -W DIRNAME.ok
-```
-
-Using the same method its also possible to exclude multiple patchsets. If you want to
-exclude a very large number of patches, it is easier to do specify a list of patches
-which should be included instead. To apply for example only the patchsets in directory
-DIRNAME1 and DIRNAME2, you can use:
-```bash
-make -C ./patches DESTDIR=$(pwd) PATCHLIST="DIRNAME1.ok DIRNAME2.ok" install
-```
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,115 @@
+wine-compholio (1.7.28) unstable; urgency=low
+  * Added missing recommendation for libtxc-dxtn-s2tc0 on Ubuntu.
+  * Added patch to fix issues with over-the-spot input method.
+  * Added patch to fix winemenubuilder desktop icon wine path (when using multiple wine versions).
+  * Added patch to support FIND_FIRST_EX_CASE_SENSITIVE flag in FindFirstFileExW.
+  * Added patch to send WM_PAINT event during dialog creation.
+  * Added patch to fix issues when driver dispatch routine returns different status codes.
+  * Added several patches for Unity3D Editor.
+  * Added patch to fix differences between exception handling behaviour in Wine and Windows.
+  * Added patch to export ?_BADOFF@std@@3_JB on both i386 and win64.
+  * Added patch to limit cross thread access to ImmSet* functions.
+  * Added patch for IRichEditOle and ITextDocument support for ITextServices.
+  * Added patch to fix implementation of SH*Shared commands.
+  * Added patch to handle WRITECOPY memory protection properly on i386 (disabled by default).
+  * Added patch to fix some issues with write watches / guard page access.
+  * Added patch to implement NtQuerySection.
+  * Added patches to make clearly visible, that this is a patched wine version.
+  * Added patch for FindFirstFileExW level FindExInfoBasic. 
+  * Removed patch to support FIND_FIRST_EX_CASE_SENSITIVE flag in FindFirstFileExW (accepted upstream).
+  * Removed patch to fix implementation of SH*Shared commands (accepted upstream).
+  * Removed patch to export ?_BADOFF@std@@3_JB on both i386 and win64 (accepted upstream).
+  * Partially removed patches for CreateProcess ACLs (accepted upstream).
+ -- Sebastian Lackner <sebastian@fds-team.de>  Sat, 04 Oct 2014 04:36:22 +0200
+
+wine-compholio (1.7.27) unstable; urgency=low
+  * Fixed some issues in the patches for GetSystemTimes.
+  * Added patch to support FIND_FIRST_EX_LARGE_FETCH flag in FindFirstFileExW.
+  * Added patch to fix deadlock caused by incorrect wrapper of glu polygon/contour function.
+  * Added patch to avoid filling out KdHelp for usermode applications.
+  * Added patch to silence repeated GSUB_apply_ChainContext[Subst|Pos] FIXMEs.
+  * Added patch to revert wined3d pixelformat changes (causes regression in many games).
+  * Added patch to implement software decoding/encoding of DXT1 textures.
+  * Removed patch to use assembly wrapper for TLS callbacks (accepted upstream).
+  * Removed patch to fix uninitialized cch struct member in GetMenuItemInfo (accepted upstream).
+  * Removed some patches for riched20/IText*-interface (accepted upstream).
+  * Removed patch to fix deadlock caused by incorrect wrapper of glu functions (accepted upstream).
+  * Removed patch for stub of BCryptGetFipsAlgorithmMode (accepted upstream).
+ -- Sebastian Lackner <sebastian@fds-team.de>  Sat, 20 Sep 2014 05:52:23 +0200
+
+wine-compholio (1.7.26) unstable; urgency=low
+  * Added new make targets 'series' and 'install-git'.
+  * Some improvements in the patch system scripts.
+  * Fixed issues in the winepulse configure script.
+  * Fixed some issues in patches for Inherited ACLs.
+  * Fixed some issues in patches for backwards compatibility with old ACL format.
+  * Added patch to fix unintentional leaks with ntdll internals.
+  * Added patch to add support for DOS hidden/system file attributes.
+  * Added patch to use dynamic linking for libpcap.
+  * Added patch to fix issues when using setcap on wine executable.
+  * Added patch to improve heap allocation performance by using more freelists.
+  * Added patch to fix detection of ncurses on Archlinux (avoids ugly workarounds at build time).
+  * Added patch to fix detection of gnutls on Ubuntu 14.10.
+  * Added patch to use assembly wrapper for TLS callbacks.
+  * Added patch to fix uninitialized cch struct member in GetMenuItemInfo.
+  * Removed patch to fix issue with msi/ITERATE_MoveFiles (accepted upstream).
+  * Removed patch to fix detection of ncurses on Archlinux (accepted upstream).
+ -- Sebastian Lackner <sebastian@fds-team.de>  Sun, 07 Sep 2014 23:50:25 +0200
+
+wine-compholio (1.7.25) unstable; urgency=low
+  * Improve generation of README.md on patch update.
+  * Updated patches for riched20 IText* Interface.
+  * Fixed some issues in the patches for TransmitFile.
+  * Fixed some issues in the patches for CreateProcess ACLs.
+  * Fixed issue with gitapply.sh script on Gentoo systems.
+  * Added patch with stub for DwmInvalidateIconicBitmaps.
+  * Added Courier Prime (OFLv1.1) as a Courier New replacement.
+  * Added patch to implement DOS hidden/system file attributes.
+  * Added patch to better detect broken nVidia RandR 1.2 support.
+  * Added patch to set linker version in PE header.
+  * Added patch to move NtProtectVirtualMemory and NtCreateSection to separate pages.
+  * Added patch to fix issues with drag image in ImageLists.
+  * Added patch with stub for BCryptGetFipsAlgorithmMode.
+  * Added patch to fix issues with OpenProcess on terminated processes.
+  * Added patch to fix issues with msi/ITERATE_MoveFiles.
+  * Added patch to avoid grouping all Wine windows together.
+  * Added patch to implement KF_FLAG_DEFAULT_PATH for SHGetKnownFolderPath.
+  * Added patch to implement GetFinalPathNameByHandle.
+  * Removed patch to update gl_drawable for embedded windows (deprecated).
+  * Removed patch to return empty D3D hardware flags for RGB device enumeration (accepted upstream).
+  * Removed patch with stub for DwmInvalidateIconicBitmaps (accepted upstream).
+  * Removed patch for SetNamedPipeHandleState implementation (accepted upstream).
+ -- Erich E. Hoover <erich.e.hoover@gmail.com>  Sun, 24 Aug 2014 11:09:58 -0600
+
+wine-compholio (1.7.24) unstable; urgency=low
+  * Various further improvements to the patch system.
+  * Added patch to implement inet_pton.
+  * Added patch to implement GetSystemTimes.
+  * Added patch to implement SHCreateSessionKey.
+  * Added patch to create directory available on Vista and later.
+  * Added patch to fix edge cases in TOOLTIPS_GetTipText.
+  * Added patch to allow special characters in pipe names.
+  * Added patch with stubs for [Get|Set]SystemFileCacheSize.
+  * Added patch to implement AllocateAndGetTcpExTableFromStack.
+  * Added patch to support setting file disposition information.
+  * Added patch to fix ConnectNamedPort return value in overlapped mode.
+  * Added patch to store IOCS data in a property instead of GWLP_USERDATA.
+  * Added patch to return empty D3D hardware flags for HEL device enumeration.
+  * Added patch to return the appropriate connection time with SO_CONNECT_TIME.
+  * Added patch to support extra large and jumbo icons.
+  * Added patch to allow setting tablet / media center status via registry.
+  * Added patch to use manual redirection for RunDLL_CallEntry16.
+  * Added patch to set ldr.EntryPoint for main executable.
+  * Added patch to fix invalid memory access in windowscodecs/PropertyBag.
+  * Added patch to use a linear resampler when there a large number of dsound mixing buffers.
+  * Added patch to fix comparison of punctuation characters in lstrcmp.
+  * Added patch to workaround programs leaking wndproc splots.
+  * Added patch to implement ITextRange, ITextFont and ITextPara.
+  * Removed patch to create Vista directories (accepted upstream).
+  * Removed strmbase/quartz locking fix patches (accepted upstream).
+  * Removed windowscodecs/PropertyBag patch (accepted upstream).
+ -- Erich E. Hoover <erich.e.hoover@gmail.com>  Fri, 08 Aug 2014 22:06:07 -0600
+
 wine-compholio (1.7.23) unstable; urgency=low
  * Rewrite of patch system to simplify maintaining large patchsets.
  * Fix failing Junction Point test.
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: wine-compholio
 Section: otherosfs
 Priority: optional
-Maintainer: Erich E. Hoover <ehoover@mines.edu>
+Maintainer: Erich E. Hoover <erich.e.hoover@gmail.com>
 XSBC-Original-Maintainer: Scott Ritchie <scottritchie@ubuntu.com>
 Build-Depends: autotools-dev,
               autoconf,
@@ -39,12 +39,14 @@ Build-Depends: autotools-dev,
               libmpg123-dev,
               libncurses5-dev | libncurses-dev,
               libopenal-dev (>= 1:1.12) | ubuntu-desktop (<< 1.207),
+               libpcap-dev,
               libpng12-dev,
               libpulse-dev,
               libsane-dev,
               libssl-dev,
               libstdc++6-4.5-dev | libstdc++-dev,
               libtiff5-dev | libtiff4-dev | libtiff-dev,
+               libtxc-dxtn-s2tc-dev,
               libv4l-dev,
               libx11-dev,
               libxcomposite-dev,
@@ -85,11 +87,13 @@ Recommends: libcapi20-3,
            libjpeg8,
            libopenal1 (>= 1:1.12),
            libosmesa6,
+            libpcap0.8,
            libpng12-0,
            libpulse0,
            libsane,
            libssl1.0.0,
            libtiff5 | libtiff4,
+            libtxc-dxtn-s2tc0,
            libv4l-0,
            libxcomposite1,
            libxcursor1,
@@ -108,10 +112,6 @@ Replaces: wine-compholio (<< 1.7.15-1~)
 Breaks: wine-compholio (<< 1.7.15-1~)
 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.
@@ -143,11 +143,13 @@ Recommends: libcapi20-3,
            libjpeg8,
            libopenal1 (>= 1:1.12),
            libosmesa6,
+            libpcap0.8,
            libpng12-0,
            libpulse0,
            libsane,
            libssl1.0.0,
            libtiff5 | libtiff4,
+            libtxc-dxtn-s2tc0,
            libv4l-0,
            libxcomposite1,
            libxcursor1,
@@ -166,10 +168,6 @@ Replaces: wine-compholio (<< 1.7.15-1~)
 Breaks: wine-compholio (<< 1.7.15-1~)
 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.
@@ -194,10 +192,6 @@ 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.
@@ -226,10 +220,6 @@ Replaces: wine-compholio (<< 1.7.15-1~)
 Breaks: wine-compholio (<< 1.7.15-1~)
 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.
@@ -253,10 +243,6 @@ Replaces: wine-compholio (<< 1.7.15-1~)
 Breaks: wine-compholio (<< 1.7.15-1~)
 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.
--- a/debian/rules
+++ b/debian/rules
@@ -10,34 +10,60 @@ endif
 %:
 	dh $@ --parallel

+
 override_dh_auto_configure:

 	# Apply our patches, reconfigure, and update the wineserver protocol request data
 	make -C "$(CURDIR)/patches/" DESTDIR="$(CURDIR)" install

+	# Run configure
 ifeq ($(DEB_BUILD_ARCH), amd64)
-	./configure --prefix=/opt/wine-compholio --libdir=\$${prefix}/lib64 --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --enable-win64 --without-gstreamer --with-xattr $(CONFFLAGS)
+	./configure --prefix=/opt/wine-compholio \
+				--libdir=\$${prefix}/lib64 \
+				--mandir=\$${prefix}/share/man \
+				--infodir=\$${prefix}/share/info \
+				--enable-win64 \
+				--without-gstreamer \
+				--with-xattr \
+				$(CONFFLAGS)
 else
-	./configure --prefix=/opt/wine-compholio --libdir=\$${prefix}/lib --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --without-gstreamer --with-xattr $(CONFFLAGS)
+	./configure --prefix=/opt/wine-compholio \
+				--libdir=\$${prefix}/lib \
+				--mandir=\$${prefix}/share/man \
+				--infodir=\$${prefix}/share/info \
+				--without-gstreamer \
+				--with-xattr \
+				$(CONFFLAGS)
 endif

+
 override_dh_auto_test:
 	# Wine's test suite does not pass on build daemons, skip it for now

+
 override_dh_installdocs:
+
+	# Create copies of license files
+	cp "$(CURDIR)/LICENSE" "$(CURDIR)/LICENSE.wine"
+	cp "$(CURDIR)/LICENSE.md" "$(CURDIR)/LICENSE.wine-compholio"
+
 	dh_installdocs --link-doc=wine-compholio

+
 override_dh_install:
 	dh_install --fail-missing
+
 	# These files will end up in multiple packages otherwise
 	rm -f debian/wine-compholio/opt/wine-compholio/bin/wine
 	rm -f debian/wine-compholio/opt/wine-compholio/bin/wine-preloader
 	rm -f debian/wine-compholio/opt/wine-compholio/bin/wine64
 	rm -f debian/wine-compholio/opt/wine-compholio/bin/wine64-preloader

+
 override_dh_strip:
 	dh_strip -Xwine-pthread -Xwine-kthread --dbg-package=wine-compholio-dbg

+
 override_dh_shlibdeps:
 ifeq ($(DEB_HOST_ARCH),amd64)
 	dh_shlibdeps -l $(CURDIR)/debian/tmp/opt/wine-compholio/lib64/
--- a/debian/tools/DEVELOPER.md.in
+++ b/debian/tools/DEVELOPER.md.in
@@ -0,0 +1,152 @@
+Developers and maintainers guide
+================================
+
+This document will provide some information targeted at developers, who
+either want to build/package Wine-Compholio for their distribution, but also
+for developers who would like to contribute their patches to Wine-Compholio,
+to get them included in future releases.
+
+
+
+Compiling Wine-Compholio
+========================
+
+**Warning:** Please note that starting with Wine-Compholio 1.7.23 it is
+deprecated to manually apply patches without using the Makefile. To avoid
+typical pitfalls for package maintainers (like trying to use the patch
+commandline utility for binary patches or not updating the patchlist) it is
+highly recommended to use the Makefile in order to apply all patches. This
+ensures that the the correct patch utility is used, that the list of patches
+is updated appropriately, and so on. Please note that it is still possible
+to exclude patches if desired, take a look at the end of this document for
+more details.
+
+Instructions
+------------
+
+The following instructions (based on the [Gentoo
+Wiki](https://wiki.gentoo.org/wiki/Netflix/Pipelight#Compiling_manually))
+will give a short overview how to compile Wine-Compholio, but of course not
+explain all details. Make sure to install all required Wine dependencies
+before proceeding.
+
+As the first step please grab the latest Wine source:
+```bash
+wget http://prdownloads.sourceforge.net/wine/wine-{version}.tar.bz2
+wget https://github.com/compholio/wine-compholio-daily/archive/v{version}.tar.gz
+```
+
+Extract the archives:
+```bash
+tar xvjf wine-1*.tar.bz2
+cd wine-1*
+tar xvzf ../v{version}.tar.gz --strip-components 1
+```
+
+And apply the patches:
+```bash
+make -C ./patches DESTDIR=$(pwd) install
+```
+
+Afterwards run configure (you can also specify a prefix if you don't want to install
+Wine-Compholio system-wide):
+```bash
+./configure --with-xattr
+```
+
+Before you continue you should make sure that `./configure` doesn't show any
+warnings (look at the end of the output). If there are any warnings, this
+most likely means that you're missing some important header files. Install
+them and repeat the `./configure` step until all problems are fixed.
+
+Afterwards compile it (and grab a cup of coffee):
+```bash
+make
+```
+
+And install it (you only need sudo for a system-wide installation):
+```bash
+sudo make install
+```
+
+Excluding patches
+-----------------
+
+It is also possible to apply only a subset of the patches, for example if
+you're compiling for a distribution where PulseAudio is not installed, or
+if you just don't like a specific patchset. Please note that some patchsets
+depend on each other, and requesting an impossible situation might result
+in a failure to apply all patches.
+
+Lets assume you want to exclude the patchset in directory `DIRNAME`, then
+just invoke the Makefile like this:
+```bash
+make -C ./patches DESTDIR=$(pwd) install -W DIRNAME.ok
+```
+
+Using the same method its also possible to exclude multiple patchsets. If you
+want to exclude a very large number of patches, it is easier to do specify
+a list of patches which should be included instead. To apply for example
+only the patchsets in directory `DIRNAME1` and `DIRNAME2`, you can use:
+```bash
+make -C ./patches DESTDIR=$(pwd) PATCHLIST="DIRNAME1.ok DIRNAME2.ok" install
+```
+
+
+Contributing to Wine-Compholio
+==============================
+
+Please note that Wine-Compholio is not just an arbitrary collection of Wine
+patches. We see Wine-Compholio as a **testing version** in preparation for
+patches to be submitted to upstream Wine. This implies that all patches should
+at least have a minimum standard quality. Unlike some other PPAs/AURs which
+provide heavily patched Wine versions, we will not accept hacks for very
+specific games. Such hacks often break compatibility with other applications,
+which means we probably don't want to include them, sorry.
+
+If you think your patches are indeed a proper implementation, then feel free
+to contribute them.  Please note that to allow possible later inclusion
+into upstream Wine, we will require you to pay attention to the same
+[rules](http://wiki.winehq.org/SubmittingPatches). Please be patient and
+give us up to about a week to review them - we're a very small team, so
+it might take some time, and we want to make sure that the implementation
+doesn't contain any critical errors, which could cause regressions. If you
+want to contribute huge sets of patches, we would really like you to *stay
+contributing* in the future. Even if we accepted your patches, this doesn't
+necessary mean we understand all of it, and if you cannot or don't want
+to maintain them (especially in case of errors, or difficult rebasing),
+we will probably end up removing them again.
+
+You can also suggest adding patches written by other people - in this case
+your request should include who wrote the patch. Anonymous patches which
+don't include the author information aren't welcome, similar to the rules
+for upstream Wine.
+
+
+Attribution guidelines
+----------------------
+
+The Wine "Compholio" Edition repository expects all patches to conform to
+Wine's (undocumented) attribution guidelines. There are a variety of ways
+to attribute patches, but they all involve an additional line to the patch
+subject:
+
+```
+commit 0000000000000000000000000000000000000000
+Author: Example Author <example.email@email-provider.com>
+Date:   Sat Jul 26 12:31:50 2014 -0600
+
+    Name of patch.
+    
+    TYPE-OF-ATTRIBUTION.
+```
+
+TYPE-OF-ATTRIBUTION can be any of the following:
+
+`Found/Spotted by FINDER.`: The resolved issue was found by FINDER, they
+should receive appropriate credit for finding the problem - even though
+their patch was not used in the final implementation.
+
+`Based on patch by AUTHOR.`: The patch created by AUTHOR was a starting point
+for the patch, some modifications were made to their patch - but they should
+receive credit since the original implementation was theirs.
--- a/debian/tools/Makefile.in
+++ b/debian/tools/Makefile.in
@@ -0,0 +1,70 @@
+#
+# This file is automatically generated, DO NOT EDIT!
+#
+
+.NOTPARALLEL:
+
+CURDIR    ?= ${{.CURDIR}}
+PATCH     := $(CURDIR)/../debian/tools/gitapply.sh
+APPLY      = (cd "$(DESTDIR)" && $(PATCH))
+APPLY_FILE = @echo "Applying $(1)"; $(APPLY) < "$(CURDIR)/$(1)"
+
+#
+# This Makefile understands the following targets:
+#
+# install (default):  apply patches to directory provided by DESTDIR
+# install-git:        as above, but use 'git am' to apply the patches
+# series:             create a 'series' file containing the patch order
+# clean:              delete autogenerated and temporary files
+#
+
+PATCHLIST := \
+{patchlist}
+
+.PHONY: install
+install: $(PATCHLIST)
+	cat *.ok | sort | $(CURDIR)/../debian/tools/patchlist.sh | $(APPLY)
+	cd $(DESTDIR) && autoreconf -f
+	cd $(DESTDIR) && ./tools/make_requests
+
+.PHONY: install-git
+install-git: PATCH := git am
+install-git: install
+
+series: APPLY_FILE = @echo "$(1)" >> series
+series: $(PATCHLIST)
+	@cat *.ok | sort | $(CURDIR)/../debian/tools/patchlist.sh > patchlist.diff
+	@echo "patchlist.diff" >> series
+	@( \
+		echo ""; \
+		echo "The 'series' file was created in current directory. Please note that"; \
+		echo "'patchlist.diff' is autogenerated based on your selection of patches and not"; \
+		echo "included in this repository - keep in mind to update it on every release."; \
+		echo ""; \
+		echo "Moreover, depending on which patches you have selected, you will have to run"; \
+		echo "'autoreconf -f' and/or './tools/make_requests' after applying them."; \
+		echo ""; \
+		binary=0; \
+		while IFS= read -r line; do \
+			if grep -q "^GIT binary patch" "$$line"; then \
+				binary=1; break; \
+			fi \
+		done < series; \
+		if [ "$$binary" -ne 0 ]; then \
+			echo "The following files contain binary patches and cannot be applied with the"; \
+			echo "regular 'patch' commandline tool:"; \
+			echo ""; \
+			while IFS= read -r line; do \
+				grep -q "^GIT binary patch" "$$line" && echo "$$line"; \
+			done < series; \
+			echo ""; \
+			echo "Please use 'git apply' or '../debian/tools/gitapply.sh' from this repository."; \
+			echo ""; \
+		fi \
+	)
+
+.PHONY: clean
+clean:
+	rm -f series patchlist.diff
+	rm -f *.ok
+
--- a/debian/tools/README.md.in
+++ b/debian/tools/README.md.in
@@ -1,84 +1,39 @@
-wine-compholio
-==============
+What is Wine-Compholio?
+=======================

-The Wine "Compholio" Edition repository includes a variety of patches for
-Wine to run common Windows applications under Linux.
+**Warning: Do not report bugs at bugs.winehq.org when using this version!
+Please take a look at our
+[Wiki](https://github.com/compholio/wine-compholio/wiki/Reporting-bugs)
+for more information about how to report bugs.**

-These patches fix the following Wine bugs:
+The **Wine "Compholio" Edition** is a special build of the popular Wine
+software that includes both patches written by our team and selected patches
+by third party developers that we consider good enough for inclusion. This can
+be seen as a testing version in preparation for patches to be submitted to
+upstream Wine - don't be surprised if you encounter additional bugs, which are
+not present in regular wine, and always report such issues to us (via github!),
+so we can improve our fixes even further. Thanks!

-{bugs}

-Besides that the following additional changes are included:
+How to install and use Wine-Compholio
+=====================================
+
+Ready-to-use packages for Wine-Compholio are available for a variety
+of different Linux distributions directly for download. Just follow the
+instructions available on the
+[Wiki](https://github.com/compholio/wine-compholio/wiki/Installation).
+
+When using Wine-Compholio there are a few differences compared to regular
+Wine. The main difference is that it is not sufficient to type `wine` to
+run it, but instead you will have to type `/opt/wine-compholio/bin/wine`.
+Besides that there are also some other differences, for example additional
+configuration options to tweak performance, which are not available in regular
+Wine. All those differences are also documented on the
+[Wiki](https://github.com/compholio/wine-compholio/wiki/Usage).
+
+
+Included bugfixes and improvements
+==================================

 {fixes}

-### Compiling wine-compholio
-
-Please note that starting with wine-compholio 1.7.23 it is deprecated to manually
-apply patches without using the Makefile. To avoid typical pitfalls for package
-maintainers (like trying to use the patch commandline utility for binary patches or
-not updating the patchlist) it is highly recommended to use the Makefile in order
-to apply all patches. This ensures that the the correct patch utility is used, that
-the list of patches is updated appropriately, and so on. Please note that it is still
-possible to exclude patches if desired, take a look at the end of this document for
-more details.
-
-The following instructions (based on the
-[Gentoo Wiki](https://wiki.gentoo.org/wiki/Netflix/Pipelight#Compiling_manually))
-will give a short overview how to compile wine-compholio, but of course not explain
-all details. Make sure to install all required Wine dependencies before proceeding.
-
-As the first step please grab the latest Wine source:
-```bash
-wget http://prdownloads.sourceforge.net/wine/wine-{version}.tar.bz2
-wget https://github.com/compholio/wine-compholio-daily/archive/v{version}.tar.gz
-```
-Extract the archives:
-```bash
-tar xvjf wine-1*.tar.bz2
-cd wine-1*
-tar xvzf ../v{version}.tar.gz --strip-components 1
-```
-And apply the patches:
-```bash
-make -C ./patches DESTDIR=$(pwd) install
-```
-Afterwards run configure (you can also specify a prefix if you don't want to install
-wine-compholio system-wide):
-```bash
-./configure --with-xattr
-```
-Before you continue you should make sure that ./configure doesn't show any warnings
-(look at the end of the output). If there are any warnings, this most likely means
-that you're missing some important header files. Install them and repeat the ./configure
-step until all problems are fixed.
-
-Afterwards compile it (and grab a cup of coffee):
-```bash
-make
-```
-And install it (you only need sudo for a system-wide installation):
-```bash
-sudo make install
-```
-
-### Excluding patches
-
-It is also possible to apply only a subset of the patches, for example if you're
-compiling for a distribution where PulseAudio is not installed, or if you just don't
-like a specific patchset. Please note that some patchsets depend on each other, and
-requesting an impossible situation might result in a failure to apply all patches.
-
-Lets assume you want to exclude the patchset in directory DIRNAME, then just invoke the
-Makefile like this:
-```bash
-make -C ./patches DESTDIR=$(pwd) install -W DIRNAME.ok
-```
-
-Using the same method its also possible to exclude multiple patchsets. If you want to
-exclude a very large number of patches, it is easier to do specify a list of patches
-which should be included instead. To apply for example only the patchsets in directory
-DIRNAME1 and DIRNAME2, you can use:
-```bash
-make -C ./patches DESTDIR=$(pwd) PATCHLIST="DIRNAME1.ok DIRNAME2.ok" install
-```
--- a/debian/tools/gitapply.sh
+++ b/debian/tools/gitapply.sh
--- a/debian/tools/patchlist.sh
+++ b/debian/tools/patchlist.sh
@@ -17,7 +17,7 @@ index a273502..5fa0cd5 100644
 }
 
 +struct wine_patch {
-+    const char *hash;
+    const char *name;
 +    const char *author;
 +    const char *title;
 +} wine_patch_data[] = {
--- a/debian/tools/patchupdate.py
+++ b/debian/tools/patchupdate.py
--- a/debian/tools/patchutils.py
+++ b/debian/tools/patchutils.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 #
 # Python functions to read, split and apply patches.
 #
@@ -300,7 +300,7 @@ def apply_patch(content, patches, reverse=False, fuzz=2):
        for patch in patches:

            patchfile = patch.extract()
-            cmdline = ["patch", "--batch", "--silent", "-r", "-"]
+            cmdline = ["patch", "--force", "--silent", "-r", "-"]
            if reverse:   cmdline.append("--reverse")
            if fuzz != 2: cmdline.append("--fuzz=%d" % fuzz)
            cmdline += [contentfile.name, patchfile.name]
--- a/debian/wine-compholio.docs
+++ b/debian/wine-compholio.docs
@@ -1,9 +1,6 @@
 documentation/README.*
 ANNOUNCE
 AUTHORS
-LICENSE
-LICENSE.GPLv3
-LICENSE.LGPLv2.1
-LICENSE.Liberation
+LICENSE.wine
 LICENSE.wine-compholio
 README
--- a/patches/Compholio/0001-kernel32-Add-winediag-message-to-show-warning-that-t.patch
+++ b/patches/Compholio/0001-kernel32-Add-winediag-message-to-show-warning-that-t.patch
@@ -0,0 +1,42 @@
+From 3e4695fd4eab3f7666cd5361f98f2ace34c43739 Mon Sep 17 00:00:00 2001
+From: Sebastian Lackner <sebastian@fds-team.de>
+Date: Thu, 2 Oct 2014 19:44:31 +0200
+Subject: kernel32: Add winediag message to show warning, that this isn't
+ vanilla wine.
+
+---
+ dlls/kernel32/process.c | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c
+index 301c64a..5c5be22 100644
+--- a/dlls/kernel32/process.c
+++ b/dlls/kernel32/process.c
+@@ -65,6 +65,7 @@
+ WINE_DEFAULT_DEBUG_CHANNEL(process);
+ WINE_DECLARE_DEBUG_CHANNEL(file);
+ WINE_DECLARE_DEBUG_CHANNEL(relay);
+WINE_DECLARE_DEBUG_CHANNEL(winediag);
+ 
+ #ifdef __APPLE__
+ extern char **__wine_get_main_environment(void);
+@@ -1092,6 +1093,16 @@ static DWORD WINAPI start_process( PEB *peb )
+         DPRINTF( "%04x:Starting process %s (entryproc=%p)\n", GetCurrentThreadId(),
+                  debugstr_w(peb->ProcessParameters->ImagePathName.Buffer), entry );
+ 
+    /* Wine developers don't like it, when bug are reported with Wine versions containing our patches. */
+    if (CreateEventA(0, 0, 0, "__winecompholio_warn_event") && GetLastError() != ERROR_ALREADY_EXISTS)
+    {
+        FIXME_(winediag)("Wine-Compholio is a Wine testing version containing experimental patches.\n");
+        FIXME_(winediag)("Please don't report bugs at winehq.org and use our issue tracker instead:\n");
+        FIXME_(winediag)("https://github.com/compholio/wine-compholio/issues\n");
+    }
+    else
+        WARN_(winediag)("Wine-Compholio is a Wine testing version containing experimental patches.\n");
+
+     SetLastError( 0 );  /* clear error code */
+     if (peb->BeingDebugged) DbgBreakPoint();
+     return call_process_entry( peb, entry );
+-- 
+2.1.1
+
--- a/Show More
+++ b/Show More