Release 1.7.33.

wined3d-CSMT_Helper: Remove autogenerated changes from 'configure'.
wined3d-CSMT_Helper: Fix error in spec file.
2025-04-13 14:42:51 -07:00 · 2014-12-15 00:53:35 +01:00 · 2014-12-15 00:12:40 +01:00 · 2014-12-14 22:14:05 +01:00 · 2014-12-14 21:55:51 +01:00 · 2014-12-14 21:45:45 +01:00
540 changed files with 107853 additions and 4652 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
 debian/tools/wine
-.depcache
+.patchupdate.cache
 *.ok
 *.pyc
--- 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,161 @@
-wine-compholio
-==============
+What is Wine Staging?
+=====================

-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 [here](http://bugs.wine-staging.com) for more information
+about how to report bugs.**

-These patches fix the following Wine bugs:
+**Wine Staging** (formerly wine-compholio) is a special wine version containing
+bug fixes and features that are not yet available in regular wine versions. The
+idea behind Wine Staging is to provide new features faster to end users and to
+give developers the possibility to discuss and improve their patches before
+they are sent upstream. We also intend to create a community of wine developers
+to share experience and to make it easier for beginners to start hacking on
+wine.

-* 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"))
+Although we are reviewing all patches before adding them, you may encounter
+additional bugs, which are not present in regular wine. Make sure to report
+such issues in our bug tracker instead of winehq.org so that we can try to
+solve them in future versions. Thanks!

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

+Ready-to-use packages for Wine Staging are available for a variety
+of different Linux distributions directly for download. Just follow the
+instructions available on the [website](http://www.wine-staging.com/install.html).
+
+When using Wine Staging 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/wine-compholio/wine-staging/wiki/Usage).
+
+
+Included bug fixes and improvements
+===================================
+
+**Bugs fixed in Wine Staging 1.7.33 [119]:**
+
+* ATL IOCS data should not be stored in GWLP_USERDATA ([Wine Bug #21767](https://bugs.winehq.org/show_bug.cgi?id=21767))
+* Add Dynamic DST exceptions for Israel Standard Time ([Wine Bug #36374](https://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
+* Add stub for NtSetLdtEntries/ZwSetLdtEntries ([Wine Bug #26268](https://bugs.winehq.org/show_bug.cgi?id=26268))
+* Add support for GetPropValue to PulseAudio backend
+* Adobe Reader needs ITextSelection_fnGetDuplicate implementation
+* Allow selection of audio device for PulseAudio backend
+* Allow special characters in pipe names ([Wine Bug #28995](https://bugs.winehq.org/show_bug.cgi?id=28995))
+* Anno 1602 installer depends on Windows 98 behavior of SHFileOperationW
+* Audio stuttering and performance drops in multiple applications ([Wine Bug #30639](https://bugs.winehq.org/show_bug.cgi?id=30639))
+* Avoid crashing when broken app tries to release surface although refcount is zero ([Wine Bug #18477](https://bugs.winehq.org/show_bug.cgi?id=18477))
+* Avoid race-conditions of async WSARecv() operations with write watches.
+* Black & White needs DXTn software decoding support ([Wine Bug #14939](https://bugs.winehq.org/show_bug.cgi?id=14939))
+* Correctly treat '.' when checking for empty directories ([Wine Bug #26272](https://bugs.winehq.org/show_bug.cgi?id=26272))
+* D3DCompileShader should filter specific warning messages ([Wine Bug #33770](https://bugs.winehq.org/show_bug.cgi?id=33770))
+* Do not fail when a used context is passed to wglShareLists ([Wine Bug #11436](https://bugs.winehq.org/show_bug.cgi?id=11436))
+* Don't fill KdHelp structure for usermode applications ([Wine Bug #37272](https://bugs.winehq.org/show_bug.cgi?id=37272))
+* Emulate access to KI_USER_SHARED_DATA kernel page on x86_64 ([Wine Bug #33849](https://bugs.winehq.org/show_bug.cgi?id=33849))
+* Emulate write to CR4 register ([Wine Bug #30220](https://bugs.winehq.org/show_bug.cgi?id=30220))
+* Ensure NtProtectVirtualMemory and NtCreateSection are on separate pages ([Wine Bug #33162](https://bugs.winehq.org/show_bug.cgi?id=33162))
+* Exception during start of fr-043 caused by missing DXTn support ([Wine Bug #37391](https://bugs.winehq.org/show_bug.cgi?id=37391))
+* FEAR 1 installer expects basic_string_wchar_dtor to return NULL ([Wine Bug #37358](https://bugs.winehq.org/show_bug.cgi?id=37358))
+* FairplayKD.sys needs KeSetSystemAffinityThread ([Wine Bug #36822](https://bugs.winehq.org/show_bug.cgi?id=36822))
+* Fix black screen on startup introduced by pixelformat changes. ([Wine Bug #35950](https://bugs.winehq.org/show_bug.cgi?id=35950))
+* Fix comparison of punctuation characters in lstrcmp ([Wine Bug #10767](https://bugs.winehq.org/show_bug.cgi?id=10767))
+* Fix condition mask handling in RtlVerifyVersionInfo ([Wine Bug #36143](https://bugs.winehq.org/show_bug.cgi?id=36143))
+* Fix crash of Trine Demo on start ([Wine Bug #19231](https://bugs.winehq.org/show_bug.cgi?id=19231))
+* Fix crash of winedevice when relocation entry crosses page boundary ([Wine Bug #28254](https://bugs.winehq.org/show_bug.cgi?id=28254))
+* Fix flickering introduced by pixelformat changes. ([Wine Bug #35718](https://bugs.winehq.org/show_bug.cgi?id=35718))
+* Fix for ConnectNamedPort return value in overlapped mode ([Wine Bug #16550](https://bugs.winehq.org/show_bug.cgi?id=16550))
+* Fix for programs leaking wndproc slots ([Wine Bug #32451](https://bugs.winehq.org/show_bug.cgi?id=32451))
+* Fix gray screen on startup introduced by pixelformat changes. ([Wine Bug #35975](https://bugs.winehq.org/show_bug.cgi?id=35975))
+* Fix handling of empty section and key name for profile files. ([Wine Bug #8036](https://bugs.winehq.org/show_bug.cgi?id=8036))
+* Fix handling of invert_y in DrawTextExW ([Wine Bug #22109](https://bugs.winehq.org/show_bug.cgi?id=22109))
+* Fix issues when driver dispatch routine returns different status codes ([Wine Bug #30155](https://bugs.winehq.org/show_bug.cgi?id=30155))
+* Fix issues with dragging layers between images in Adobe Photoshop 7.0 ([Wine Bug #12007](https://bugs.winehq.org/show_bug.cgi?id=12007))
+* Fix missing video introduced by pixelformat changes. ([Wine Bug #36900](https://bugs.winehq.org/show_bug.cgi?id=36900))
+* Fix possible segfault in pulse_rd_loop of PulseAudio backend
+* Fix return value of ScrollWindowEx for invisible windows ([Wine Bug #37706](https://bugs.winehq.org/show_bug.cgi?id=37706))
+* Fix texture corruption in CSI: Fatal Conspiracy ([Wine Bug #33768](https://bugs.winehq.org/show_bug.cgi?id=33768))
+* Fix unintentional leaks with ntdll internals
+* Fix wined3d performance drop introduced by pixelformat changes. ([Wine Bug #35655](https://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](https://bugs.winehq.org/show_bug.cgi?id=28768))
+* GetSecurityInfo returns NULL DACL for process object ([Wine Bug #15980](https://bugs.winehq.org/show_bug.cgi?id=15980))
+* Ignore unsupported flags for CoInternetSetFeatureEnabled ([Wine Bug #35197](https://bugs.winehq.org/show_bug.cgi?id=35197))
+* Implement a Microsoft Yahei replacement font ([Wine Bug #13829](https://bugs.winehq.org/show_bug.cgi?id=13829))
+* Implement an Arial replacement font ([Wine Bug #32323](https://bugs.winehq.org/show_bug.cgi?id=32323))
+* Implement exclusive mode in PulseAudio backend ([Wine Bug #37042](https://bugs.winehq.org/show_bug.cgi?id=37042))
+* Implement stubs for mfplat.MFStartup and MFShutdown ([Wine Bug #37701](https://bugs.winehq.org/show_bug.cgi?id=37701))
+* Improvement for heap allocation performance
+* Initialize irp.Tail.Overlay.OriginalFileObject with stub file object ([Wine Bug #37537](https://bugs.winehq.org/show_bug.cgi?id=37537))
+* Lego Stunt Rally requires DXTn software de/encoding support ([Wine Bug #25486](https://bugs.winehq.org/show_bug.cgi?id=25486))
+* Limit cross thread access to ImmSet* functions ([Wine Bug #35361](https://bugs.winehq.org/show_bug.cgi?id=35361))
 * Lockfree algorithm for filedescriptor cache (improves file access speed)
-* Other Pipelight specific enhancements
+* MSVCRT crashes when NULL is passed as string to atof or strtod ([Wine Bug #32550](https://bugs.winehq.org/show_bug.cgi?id=32550))
+* Make it possible to change media center / tablet pc status ([Wine Bug #18732](https://bugs.winehq.org/show_bug.cgi?id=18732))
+* Multiple applications need EnumDisplayDevicesW implementation ([Wine Bug #34978](https://bugs.winehq.org/show_bug.cgi?id=34978))
+* Need for Speed 3 installer requires devices in HKEY_DYN_DATA ([Wine Bug #7115](https://bugs.winehq.org/show_bug.cgi?id=7115))
+* Other Pipelight-specific enhancements
+* Prevent window managers from grouping all wine programs together ([Wine Bug #32699](https://bugs.winehq.org/show_bug.cgi?id=32699))
+* Provide named entry point shell32.SHILCreateFromPath for vista apps ([Wine Bug #37265](https://bugs.winehq.org/show_bug.cgi?id=37265))
+* Reallocate buffer when adding records to AVI files ([Wine Bug #5137](https://bugs.winehq.org/show_bug.cgi?id=5137))
 * 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](https://bugs.winehq.org/show_bug.cgi?id=37087))
+* Return correct IMediaSeeking stream positions in quartz ([Wine Bug #23174](https://bugs.winehq.org/show_bug.cgi?id=23174))
+* Return correct values for GetThreadTimes function ([Wine Bug #20230](https://bugs.winehq.org/show_bug.cgi?id=20230))
+* Return more context attributes in schan_InitializeSecurityContextW ([Wine Bug #37527](https://bugs.winehq.org/show_bug.cgi?id=37527))
+* SO_CONNECT_TIME returns the appropriate time
+* Send WM_PAINT event during dialog creation ([Wine Bug #35652](https://bugs.winehq.org/show_bug.cgi?id=35652))
+* Set last error when GetRawInputDeviceList fails ([Wine Bug #37667](https://bugs.winehq.org/show_bug.cgi?id=37667))
+* Support for AllocateAndGetTcpExTableFromStack ([Wine Bug #34372](https://bugs.winehq.org/show_bug.cgi?id=34372))
+* Support for BindImageEx ([Wine Bug #3591](https://bugs.winehq.org/show_bug.cgi?id=3591))
+* Support for CSMT (command stream) to increase graphic performance ([Wine Bug #11674](https://bugs.winehq.org/show_bug.cgi?id=11674))
+* Support for D3DXGetShaderInputSemantics ([Wine Bug #22682](https://bugs.winehq.org/show_bug.cgi?id=22682))
+* Support for DOS hidden/system file attributes ([Wine Bug #9158](https://bugs.winehq.org/show_bug.cgi?id=9158))
+* Support for Dynamic DST (daylight saving time) information in registry
+* Support for GdipCreateRegionRgnData ([Wine Bug #34843](https://bugs.winehq.org/show_bug.cgi?id=34843))
+* Support for GetFinalPathNameByHandle ([Wine Bug #36073](https://bugs.winehq.org/show_bug.cgi?id=36073))
+* Support for GetSystemTimes ([Wine Bug #19813](https://bugs.winehq.org/show_bug.cgi?id=19813))
 * Support for GetVolumePathName
-* Support for PulseAudio backend for audio
+* Support for ID3DXSkinInfoImpl_UpdateSkinnedMesh ([Wine Bug #32572](https://bugs.winehq.org/show_bug.cgi?id=32572))
+* Support for ITextDocument_fnRange function ([Wine Bug #12458](https://bugs.winehq.org/show_bug.cgi?id=12458))
+* Support for ITextRange, ITextFont and ITextPara ([Wine Bug #18303](https://bugs.winehq.org/show_bug.cgi?id=18303))
+* Support for Junction Points ([Wine Bug #12401](https://bugs.winehq.org/show_bug.cgi?id=12401))
+* Support for K32EnumProcessModulesEx ([Wine Bug #34864](https://bugs.winehq.org/show_bug.cgi?id=34864))
+* Support for KF_FLAG_DEFAULT_PATH in SHGetKnownFolderPath ([Wine Bug #30385](https://bugs.winehq.org/show_bug.cgi?id=30385))
+* Support for LoadIconMetric ([Wine Bug #35375](https://bugs.winehq.org/show_bug.cgi?id=35375))
+* Support for NtQuerySection ([Wine Bug #37338](https://bugs.winehq.org/show_bug.cgi?id=37338))
+* Support for NtSetInformationFile class FileDispositionInformation ([Wine Bug #30397](https://bugs.winehq.org/show_bug.cgi?id=30397))
+* Support for PulseAudio backend for audio ([Wine Bug #10495](https://bugs.winehq.org/show_bug.cgi?id=10495))
+* Support for RtlDecompressBuffer ([Wine Bug #37449](https://bugs.winehq.org/show_bug.cgi?id=37449))
+* Support for SHCreateSessionKey ([Wine Bug #35630](https://bugs.winehq.org/show_bug.cgi?id=35630))
+* Support for StrCatChainW
+* Support for TOOLTIPS_GetTipText edge cases ([Wine Bug #30648](https://bugs.winehq.org/show_bug.cgi?id=30648))
+* Support for TransmitFile ([Wine Bug #5048](https://bugs.winehq.org/show_bug.cgi?id=5048))
+* Support for UTF7 encoding/decoding ([Wine Bug #27388](https://bugs.winehq.org/show_bug.cgi?id=27388))
+* Support for WTSEnumerateProcessesW ([Wine Bug #29903](https://bugs.winehq.org/show_bug.cgi?id=29903))
+* Support for combase HSTRING objects
+* Support for extra large and jumbo icon lists in shell32 ([Wine Bug #24721](https://bugs.winehq.org/show_bug.cgi?id=24721))
+* Support for inherited file ACLs ([Wine Bug #34406](https://bugs.winehq.org/show_bug.cgi?id=34406))
+* Support for interface change notifications ([Wine Bug #32328](https://bugs.winehq.org/show_bug.cgi?id=32328))
+* Support for loader dll redirections
+* Support for pasting HTML from Unix applications ([Wine Bug #7372](https://bugs.winehq.org/show_bug.cgi?id=7372))
+* Support for process ACLs ([Wine Bug #22006](https://bugs.winehq.org/show_bug.cgi?id=22006))
+* Support for setcap on wine-preloader ([Wine Bug #26256](https://bugs.winehq.org/show_bug.cgi?id=26256))
+* Support for stored file ACLs ([Wine Bug #31858](https://bugs.winehq.org/show_bug.cgi?id=31858))
+* Support for wine64 on FreeBSD/PC-BSD ([Wine Bug #34330](https://bugs.winehq.org/show_bug.cgi?id=34330))
+* Tumblebugs 2 requires DXTn software encoding support ([Wine Bug #29586](https://bugs.winehq.org/show_bug.cgi?id=29586))
+* Unity3D Editor requires ProductId registry value ([Wine Bug #36964](https://bugs.winehq.org/show_bug.cgi?id=36964))
+* Update a XIM candidate position when cursor location changes ([Wine Bug #30938](https://bugs.winehq.org/show_bug.cgi?id=30938))
+* Use manual relay for RunDLL_CallEntry16 in shell32 ([Wine Bug #23033](https://bugs.winehq.org/show_bug.cgi?id=23033))
+* Voobly expects correct handling of WRITECOPY memory protection ([Wine Bug #29384](https://bugs.winehq.org/show_bug.cgi?id=29384))
+* Wine ignores IDF_CHECKFIRST flag in SetupPromptForDisk ([Wine Bug #20465](https://bugs.winehq.org/show_bug.cgi?id=20465))
 * 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
+* vSphere needs IoCsqInitialize ([Wine Bug #36777](https://bugs.winehq.org/show_bug.cgi?id=36777))
+* wglDescribePixelFormat should return max index for NULL descriptor ([Wine Bug #6176](https://bugs.winehq.org/show_bug.cgi?id=6176))
+* wininet should allow Accept-Encoding header for HTTP/1.0 ([Wine Bug #37046](https://bugs.winehq.org/show_bug.cgi?id=37046))

-### 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,262 @@
+wine-compholio (1.7.33) unstable; urgency=low
+  * Various improvements of patchupdate.py.
+  * Added patches for wined3d CSMT (command stream) support.
+  * Added additional tests for VerifyVersionInfoA.
+  * Added patch to fix condition handling in RtlVerifyVersionInfo.
+  * Added patch to set last error when GetRawInputDeviceList fails.
+  * Added patch to fix possible segfault in pulse_rd_loop of PulseAudio backend.
+  * Added patch to implement support for GetPropValue to PulseAudio backend.
+  * Added patch to implement shlwapi.StrCatChainW.
+  * Added patch to allow Accept-Encoding for HTTP/1.0 in wininet.
+  * Added patch for combase HSTRING objects.
+  * Added patch to implement stubs for MFStartup and MFShutdown.
+  * Added patch for additional tests of CoWaitForMultipleHandles with WM_QUIT.
+  * Added patch to fix return value of ScrollWindowEx for invisible windows.
+  * Added patch to ignore unsupported flags for CoInternetSetFeatureEnabled.
+  * Added patch to provide named entry point shell32.SHILCreateFromPath for vista apps.
+  * Added patch to reallocate buffer when adding records to AVI files.
+  * Added patch to implement support for loader dll redirections.
+  * Added patch to add winecfg Staging tab.
+  * Removed patch to fix copy and paste errors in ws2_32 tests (accepted upstream).
+  * Removed patch to fix ordering of IP addresses by metric if two addresses have the same metric (accepted upstream).
+  * Removed patch to reset data->pWintrustData->u.pFile->hFile after closing handle (accepted upstream).
+  * Removed patch to simplify implementation of ws32 get_poll_results (accepted upstream).
+  * Removed patch to fix passing of unicode environment from msvcrt to CreateProcessW (accepted upstream).
+  * Removed patches for api-ms-win-core-* stub dlls (accepted upstream).
+ -- Sebastian Lackner <sebastian@fds-team.de>  Mon, 15 Dec 2014 00:53:01 +0100
+
+wine-compholio (1.7.32) unstable; urgency=low
+  * Various optimizations of patchupdate.py.
+  * Update patch for SO_CONNECT_TIME and adding better tests.
+  * Update patch for FD Cache and use faster method on x86_64.
+  * Added patch to ensure dbghelp always checks for debug symbols in BINDIR.
+  * Added patch for pulseaudio exclusive mode support.
+  * Added patch to take abs() of vertex z coordinate as FFP fog coordinate.
+  * Added patch to ensure ShowWindow avoids interthread no-op messages.
+  * Added patch to avoid race-conditions of async WSARecv() operations with write watches.
+  * Added patch to fix issues with write watches when using Exagear.
+  * Added patch to avoid failure because of missing ptrace support for Exagear.
+  * Added patch to automatically detect if tests are running under Wine.
+  * Added patch to avoid sending unexpected wakeup with uninitialized cookie value.
+  * Added patch to fix issues with dragging layers between images in Adobe Photoshop 7.0.
+  * Added patch to ensure wintrust resets data->pWintrustData->u.pFile->hFile after closing handle.
+  * Added patch to add additional format conversions for DXT1 and DXT3.
+  * Added patch to implement stubs for additional api-ms-win-core-* dlls.
+  * Added patch to fix copy and paste error recently introduced in ws2_32 tests.
+  * Added patch to change bug reporting URL in winedbg.
+  * Added patch to implement semi-stub for psapi/kernel32 K32EnumProcessModulesEx.
+  * Added patch to fix ordering of IP addresses by metric if two addresses have the same metric.
+  * Added patch to fix handling of empty section and key name for profile files.
+  * Added patch to fix passing of unicode environment from msvcrt to CreateProcessW.
+  * Removed patch to close server fd is there is no space in thread inflight fd list (accepted upstream).
+  * Removed patch to fix bugs in StrStr functions (accepted upstream).
+  * Removed patches to avoid sending messages in FindWindowExW (accepted upstream).
+  * Removed patch to fix implementation ofCoWaitForMultipleHandles (accepted upstream).
+  * Removed patch to avoid interthread no-op messages in ShowWindow (accepted upstream).
+  * Removed patches to take abs() of vertex z coordinate as FFP fog coordinate (fixed upstream).
+  * Removed patch to fix detection of gnutls on Ubuntu 14.10.
+ -- Sebastian Lackner <sebastian@fds-team.de>  Sun, 30 Nov 2014 15:22:49 +0100
+
+wine-compholio (1.7.31) unstable; urgency=low
+  * Improve output of 'wine --patches' and simplify syntax of definition files.
+  * Update kernel32-GetSystemTimes patches.
+  * Improve style for ntdll-Fix_Alignment patches.
+  * Added possibility to temporarily disable patches to patch system.
+  * Added patch to allow selecting specific audio device for PulseAudio backend.
+  * Added patch with stub for NtSetLdtEntries/ZwSetLdtEntries.
+  * Added patch to prevent processing message events for CoWaitForMultipleHandles when APC calls are queued.
+  * Added patch with stub for KeSetSystemAffinityThread.
+  * Added patch to implement DXTn support for d3dx9_36.
+  * Added patch to return correct values for GetThreadTimes.
+  * Added patch to align texture dimensions to block size for compressed textures.
+  * Added patch with stub for IoCsqInitialize.
+  * Added patch with stubs for vectored continue handler functions.
+  * Added patch to fix wglDescribePixelFormat when NULL is passed as pixel format descriptor.
+  * Added patch to allow NULL pointer for optional arguments of D3DXIntersectTri.
+  * Added patch to fix crash of winedevice when relocation entry crosses page boundary.
+  * Added patch to emulate 'mov Eb, Gb' instruction on x86 processor architecture.
+  * Added patch to emulate access to KI_USER_SHARED_DATA kernel page on x86_64.
+  * Added patch to initialize irp.Tail.Overlay.OriginalFileObject with stub file object.
+  * Added patch to implement emulation of SIDT instruction when using Exagear.
+  * Added patch to return more context attributes in schan_InitializeSecurityContextW.
+  * Added patch to avoid crashing when broken app tries to release surface although refcount is zero.
+  * Added patch to avoid sending window messages in FindWindowExW.
+  * Added patch to fix handling of invert_y in DrawTextExW.
+  * Added patch to fix implementation of K32GetPerformanceInfo.
+  * Added patch to close server fd if there is no space in thread inflight fd list.
+  * Added patch to avoid failing in d3dx9_mesh_OptimizeInplace because of unimplemented vertex reordering.
+  * Added patch to workaround bugs in CompareStringW (triggered by Adobe Flash).
+  * Removed patch for iphlpapi stub functions (accepted upstream).
+  * Removed patches for FindFirstFileExW (accepted upstream).
+  * Removed patches for TLB dependencies lookup in resources (accepted upstream).
+  * Removed patches for ws2_32.inet_pton implementation (fixed upstream).
+  * Removed patch to update properties when applying MSI transforms (fixed upstream).
+  * Removed patch to silence repeated GSUB_apply_ChainContext[Subst|Pos] FIXMEs (accepted upstream).
+  * Removed patch with additional tests for MsgWaitForMultipleObjectsEx (accepted upstream).
+  * Removed patches for D3DXCreatePolygon (accepted upstream).
+  * Removed patches vor vectored continue handler stubs (accepted upstream).
+  * Removed patches for K32GetPerformanceInfo (accepted upstream).
+  * Removed patch for D3DXIntersectTri (accepted upstream).
+  * Partially removed patches for UTF-7 tests (accepted upstream).
+  * Partially removed patches for WS_SO_CONNECT_TIME (accepted upstream).
+ -- Sebastian Lackner <sebastian@fds-team.de>  Sat, 15 Nov 2014 15:36:38 +0100
+
+wine-compholio (1.7.30) unstable; urgency=low
+  * Fix wrong escaping of quote/slash characters in patchupdater script.
+  * Added additional conversion functions to DXTn patch.
+  * Added patch to filter specific warning messages for D3DCompileShader.
+  * Added patch to implement iphlpapi stub functions.
+  * Added patch to implement support for pasting HTML from native Unix applications.
+  * Added patch to implement RtlDecompressBuffer.
+  * Added patch to emulate write to CR4 register.
+  * Added patch for implementation of GdipCreateRegionRgnData.
+  * Added patch for implementation of D3DXCreatePolygon.
+  * Added patch for TLB dependencies lookup in resources.
+  * Added patch to update ProductVersion when applying MSI transforms.
+  * Added patch for ITextSelection_fnGetDuplicate implementation.
+  * Removed patch to avoid Clang compiler warning because of unused Vtable (accepted upstream).
+  * Removed patch for additional ATL thunks (accepted upstream).
+  * Removed patch to ímplement IRichEditOle and ITextDocument support for ITextServices (accepted upstream).
+  * Removed patch to fix compile errors on Archlinux (fixed upstream).
+ -- Sebastian Lackner <sebastian@fds-team.de>  Sun, 02 Nov 2014 00:45:28 +0100
+
+wine-compholio (1.7.29) unstable; urgency=low
+  * Updated DOS Attributes patch to better detect XATTR functions.
+  * Updated patch for shell32 default folder ACLs.
+  * Updated NtQuerySection patch.
+  * Updated patch for WRITECOPY memory protection.
+  * Added patch to support IDF_CHECKFIRST in SetupPromptForDisk.
+  * Added patch to fix issues when executing pages with guard page / write watch permissions.
+  * Added patch to set return value of basic_string_wchar_dtor to return NULL.
+  * Added patch for UTF7 encoding/decoding support.
+  * Added patch to implement ID3DXSkinInfoImpl_UpdateSkinnedMesh.
+  * Added patch for implementation of D3DXGetShaderInputSemantics.
+  * Added patch to ensure tests check exact return value of ParseURLFromOutsideSourceX.
+  * Added patch for additional ATL thunks.
+  * Added patch to add partially support for sessionStorage.
+  * Added patch for implementation of GetNumaProcessorNode.
+  * Added patch for wine64 support on FreeBSD/PC-BSD.
+  * Added patch for improved multi monitor support.
+  * Added patch for implementation of BindImageEx.
+  * Removed patch to fix issues with drag image in ImageLists (accepted upstream).
+  * Removed patch to set ldr.EntryPoint for main executable (accepted upstream).
+  * Removed patch to implement stubs for [Get|Set]SystemFileCacheSize (accepted upstream).
+  * Removed patches for ATL thunk implementation (accepted upstream).
+  * Partially removed patches for WRITECOPY memory protection (accepted upstream).
+ -- Sebastian Lackner <sebastian@fds-team.de>  Sun, 19 Oct 2014 19:37:21 +0200
+
+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/postinst
+++ b/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
-
-
-
--- a/debian/postrm
+++ b/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
--- a/debian/prerm
+++ b/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
-
-
--- 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/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,41 @@
-wine-compholio
-==============
+What is Wine Staging?
+=====================

-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 [here](http://bugs.wine-staging.com) for more information
+about how to report bugs.**

-These patches fix the following Wine bugs:
+**Wine Staging** (formerly wine-compholio) is a special wine version containing
+bug fixes and features that are not yet available in regular wine versions. The
+idea behind Wine Staging is to provide new features faster to end users and to
+give developers the possibility to discuss and improve their patches before
+they are sent upstream. We also intend to create a community of wine developers
+to share experience and to make it easier for beginners to start hacking on
+wine.

-{bugs}
+Although we are reviewing all patches before adding them, you may encounter
+additional bugs, which are not present in regular wine. Make sure to report
+such issues in our bug tracker instead of winehq.org so that we can try to
+solve them in future versions. Thanks!

-Besides that the following additional changes are included:
+How to install and use Wine Staging
+===================================
+
+Ready-to-use packages for Wine Staging are available for a variety
+of different Linux distributions directly for download. Just follow the
+instructions available on the [website](http://www.wine-staging.com/install.html).
+
+When using Wine Staging 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/wine-compholio/wine-staging/wiki/Usage).
+
+
+Included bug fixes 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
@@ -1,32 +1,45 @@
 #!/bin/sh
 PATCH_DATA=$(cat);
 PATCH_LINES=$(echo "${PATCH_DATA}" | wc -l);
-PATCH_LINES=$((${PATCH_LINES}+20));
+PATCH_LINES=$((${PATCH_LINES}+23));

 cat <<EOF
-From: "FDS-Team" <webmaster@fds-team.de>
+From: Wine Staging Team <webmaster@fds-team.de>
 Subject: Autogenerated patch list.

---
+diff --git a/include/wine/library.h b/include/wine/library.h
+--- a/include/wine/library.h
+++ b/include/wine/library.h
+@@ -43,6 +43,7 @@ extern const char *wine_get_data_dir(void);
+ extern const char *wine_get_server_dir(void);
+ extern const char *wine_get_user_name(void);
+ extern const char *wine_get_version(void);
+extern const void *wine_get_patches(void);
+ extern const char *wine_get_build_id(void);
+ extern void wine_init_argv0_path( const char *argv0 );
+ extern void wine_exec_wine_binary( const char *name, char **argv, const char *env_var );
 diff --git a/libs/wine/config.c b/libs/wine/config.c
-index a273502..5fa0cd5 100644
+index a273502..0a3182f 100644
 --- a/libs/wine/config.c
 +++ b/libs/wine/config.c
@@ -478,6 +478,${PATCH_LINES} @@ const char *wine_get_version(void)
     return PACKAGE_VERSION;
 }
 
-+struct wine_patch {
-+    const char *hash;
+static const struct
+{
 +    const char *author;
-+    const char *title;
-+} wine_patch_data[] = {
+    const char *subject;
+    int revision;
+}
+wine_patch_data[] =
+{
 ${PATCH_DATA}
-+    { NULL, NULL, NULL }
+    { NULL, NULL, 0 }
 +};
 +
 +/* return the applied non-standard patches */
-+const void * wine_get_patches(void)
+const void *wine_get_patches(void)
 +{
 +    return &wine_patch_data[0];
 +}
@@ -58,16 +71,4 @@ index 2159fac..7cb2918 100644
     wine_init;
     wine_init_argv0_path;
     wine_is_dbcs_leadbyte;
-diff --git a/include/wine/library.h b/include/wine/library.h
-index 242bb69..aa9e585 100644
--- a/include/wine/library.h
-+++ b/include/wine/library.h
-@@ -43,6 +43,7 @@ extern const char *wine_get_data_dir(void);
- extern const char *wine_get_server_dir(void);
- extern const char *wine_get_user_name(void);
- extern const char *wine_get_version(void);
-+extern const void *wine_get_patches(void);
- extern const char *wine_get_build_id(void);
- extern void wine_init_argv0_path( const char *argv0 );
- extern void wine_exec_wine_binary( const char *name, char **argv, const char *env_var );
 EOF
--- a/debian/tools/patchupdate.py
+++ b/debian/tools/patchupdate.py
--- a/debian/tools/patchutils.py
+++ b/debian/tools/patchutils.py
--- a/debian/tools/progressbar.py
+++ b/debian/tools/progressbar.py
@@ -0,0 +1,106 @@
+#!/usr/bin/python2
+#
+# Python progressbar functions.
+#
+# Copyright (C) 2014 Sebastian Lackner
+#
+# This library 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.
+#
+# This library 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.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+#
+
+import fcntl
+import os
+import signal
+import struct
+import sys
+import termios
+
+def _sig_winch(signum=None, frame=None):
+    """Signal handler for SIGWINCH."""
+    global _term_width
+    h, w, hp, wp = struct.unpack('HHHH', fcntl.ioctl(sys.stdout.fileno(),
+                   termios.TIOCGWINSZ, struct.pack('HHHH', 0, 0, 0, 0)))
+    _term_width  = w
+
+try:
+    _sig_winch()
+    signal.signal(signal.SIGWINCH, _sig_winch)
+except IOError:
+    _term_width = int(os.environ.get('COLUMNS', 80)) - 1
+
+class ProgressBar(object):
+    def __init__(self, desc="", msg=None, current=0, total=100):
+        """Initialize a new progress bar with given properties."""
+        self.desc    = desc
+        self.msg     = msg
+        self.current = current
+        self.total   = total
+
+    def __enter__(self):
+        self.update()
+        return self
+
+    def __exit__(self, type, value, traceback):
+        if type is not None:
+            sys.stdout.write("\r")
+            msg = "<interrupted>"
+        else:
+            msg = None
+        self.finish(msg)
+        if self.msg is not None:
+            sys.stdout.write("\n")
+
+    def update(self, value = None):
+        """Redraw the progressbar and optionally update the value."""
+        if value is not None:
+            self.current = value
+
+        if self.current == 0 or (self.current >= self.total and self.msg is None):
+            sys.stdout.write("%s\r" % (' ' * _term_width))
+            sys.stdout.flush()
+            return
+
+        width = _term_width / 2
+        s1 = self.desc.ljust(width - 1, ' ')[:width - 1]
+
+        width = _term_width - width
+        if self.current >= self.total:
+            s2 = self.msg.ljust(width, ' ')[:width]
+        elif width > 2:
+            numbars = min(self.current * (width - 2) / self.total, width - 2)
+            s2 = "[%s%s]" % ('#' * numbars, '-' * (width - 2 - numbars))
+            percent = " %d%% " % min(self.current * 100 / self.total, 100)
+            i = (len(s2)-len(percent))/2
+            s2 = "%s%s%s" % (s2[:i], percent, s2[i+len(percent):])
+
+        sys.stdout.write("%s %s\r" % (s1, s2))
+        sys.stdout.flush()
+
+    def finish(self, msg = None):
+        """Finalize the progressbar."""
+        if msg is not None:
+            self.msg = msg
+
+        self.current = self.total
+        self.update()
+        sys.stdout.flush()
+
+if __name__ == '__main__':
+    import time
+
+    print ""
+    with ProgressBar(desc="description") as x:
+        for i in xrange(100):
+            x.update(i)
+            time.sleep(1)
--- a/Show More
+++ b/Show More