server-Stored_ACLs: Fix some issues causing out-of-sync of local security descriptors and extended attributes.

Split out a couple of ACL tests into separate patchset advapi32-ACL_Tests.
advapi32-Revert_DACL: Add missing definition file.
2025-04-13 14:42:51 -07:00 · 2015-03-30 21:48:59 +02:00 · 2015-03-30 08:17:13 +02:00 · 2015-03-30 04:39:57 +02:00 · 2015-03-30 03:51:23 +02:00 · 2015-03-28 23:54:21 +01:00
757 changed files with 97056 additions and 10236 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,2 @@
 debian/tools/wine
-.patchupdate.cache
-*.ok
 *.pyc
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -7,7 +7,7 @@ are part of **Wine Staging** and are licensed under the terms of the
 [LGPLv2.1](#gnu-lgpl-version-21), to stay compatible with Wine:

 ```
-Copyright (C) 2014 the Wine Staging project authors.
+Copyright (C) 2014-2015 the Wine Staging project authors.

 Wine Staging is free software; you can redistribute it and/or
 modify it under the terms of the GNU Lesser General Public
--- a/README.md
+++ b/README.md
@@ -23,11 +23,12 @@ 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).
+instructions available on the
+[Wiki](https://github.com/wine-compholio/wine-staging/wiki/Installation).

 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`.
+run it, but instead you will have to type `/opt/wine-staging/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
@@ -37,114 +38,224 @@ Wine. All those differences are also documented on the
 Included bug fixes and improvements
 ===================================

-**Bugs fixed in Wine Staging 1.7.32 [108]:**
+**Bugfixes and features included in the next upcoming release [9]:**
+
+* Add stub fltmgr.sys (filter manager driver) ([Wine Bug #23583](https://bugs.winehq.org/show_bug.cgi?id=23583))
+* Add stubs for Power[Set|Clear]Request
+* Avoid spam of FIXME messages for PsLookupProcessByProcessId stub ([Wine Bug #36821](https://bugs.winehq.org/show_bug.cgi?id=36821))
+* Don't return an error in WS_select when EINTR happens during timeout
+* Fix calculation of 3D sound source ([Wine Bug #38041](https://bugs.winehq.org/show_bug.cgi?id=38041))
+* Fix compatibility of Uplay with gnutls28 ([Wine Bug #38134](https://bugs.winehq.org/show_bug.cgi?id=38134))
+* Fix handling of ANSI NTLM credentials ([Wine Bug #37063](https://bugs.winehq.org/show_bug.cgi?id=37063))
+* Implement empty enumerator for IWiaDevMgr::EnumDeviceInfo ([Wine Bug #27775](https://bugs.winehq.org/show_bug.cgi?id=27775))
+* Software support for Environmental Audio Extensions (EAX)
+
+
+**Bugs fixed in Wine Staging 1.7.39 [205]:**

-* 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 implementation for CreateThreadpool ([Wine Bug #35192](https://bugs.winehq.org/show_bug.cgi?id=35192))
+* Add nvapi stubs required for GPU PhysX support
+* Add performance library registry keys needed by MS SQL Server Management Studio Express 2008 R2 ([Wine Bug #33661](https://bugs.winehq.org/show_bug.cgi?id=33661))
+* Add semi-stub for GetFileVersionInfoExA/W ([Wine Bug #38098](https://bugs.winehq.org/show_bug.cgi?id=38098))
+* Add semi-stub for GetFileVersionInfoSizeExA/W ([Wine Bug #38090](https://bugs.winehq.org/show_bug.cgi?id=38090))
+* Add stub for D3DXComputeNormalMap
+* Add stub for D3DXComputeTangentFrameEx ([Wine Bug #31984](https://bugs.winehq.org/show_bug.cgi?id=31984))
+* Add stub for D3DXIntersect
 * Add stub for NtSetLdtEntries/ZwSetLdtEntries ([Wine Bug #26268](https://bugs.winehq.org/show_bug.cgi?id=26268))
+* Add stub for PowerCreateRequest
+* Add stub for gdiplus.GdipCreateEffect ([Wine Bug #32163](https://bugs.winehq.org/show_bug.cgi?id=32163))
+* Add stub for ntoskrnl.ExAcquireResourceExclusiveLite
+* Add stub for ntoskrnl.ExDeleteResourceLite
+* Add stub for ntoskrnl.ExReleaseResourceForThread
+* Add stub for ntoskrnl.KeWaitForMultipleObjects
+* Add stub for ntoskrnl.Mm{Map,Unmap}LockedPages
+* Add stub for wininet.ParseX509EncodedCertificateForListBoxEntry ([Wine Bug #29842](https://bugs.winehq.org/show_bug.cgi?id=29842))
+* Add stubs for D3DXCreateAnimationController interface
+* Add support for CopyFileEx progress callback ([Wine Bug #22692](https://bugs.winehq.org/show_bug.cgi?id=22692))
+* 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
+* Allow to cancel a file operation via progress callback ([Wine Bug #22690](https://bugs.winehq.org/show_bug.cgi?id=22690))
+* Allow to edit winecfg library override by double clicking
+* Allow to override number of quality levels for D3DMULTISAMPLE_NONMASKABLE. ([Wine Bug #12652](https://bugs.winehq.org/show_bug.cgi?id=12652))
+* Anno 1602 installer depends on Windows 98 behavior of SHFileOperationW ([Wine Bug #37916](https://bugs.winehq.org/show_bug.cgi?id=37916))
 * 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 in NtReadFile() operations with write watches.
 * Avoid race-conditions of async WSARecv() operations with write watches.
+* Avoid race-conditions with write watches in WS2_async_accept.
+* Avoid unloading msctf library while textservices are activated ([Wine Bug #31579](https://bugs.winehq.org/show_bug.cgi?id=31579))
+* Avseq crashes when multisampling is enabled ([Wine Bug #31998](https://bugs.winehq.org/show_bug.cgi?id=31998))
+* Basic handling of write watches triggered while we're on the signal stack.
+* Basic support for CUDA
 * 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))
+* CPU-Z fails to start because GetLogicalProcessorInformationEx returns FALSE
+* ~~Child of Light expects FindConnectionPoint to succeed and increase the refcount~~ ([Wine Bug #36408](https://bugs.winehq.org/show_bug.cgi?id=36408))
+* CreateProcess does not prioritize the working directory over the system search path ([Wine Bug #23934](https://bugs.winehq.org/show_bug.cgi?id=23934))
 * D3DCompileShader should filter specific warning messages ([Wine Bug #33770](https://bugs.winehq.org/show_bug.cgi?id=33770))
+* Do not append duplicate NULL characters when importing keys with regedit ([Wine Bug #37575](https://bugs.winehq.org/show_bug.cgi?id=37575))
 * 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))
+* EA Origin needs support for job objects ([Wine Bug #33723](https://bugs.winehq.org/show_bug.cgi?id=33723))
 * 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))
+* Enforce that surfaces are flushed after ReleaseDC
 * Ensure NtProtectVirtualMemory and NtCreateSection are on separate pages ([Wine Bug #33162](https://bugs.winehq.org/show_bug.cgi?id=33162))
+* Ensure X11 input events are handled even without explicit message loop ([Wine Bug #8854](https://bugs.winehq.org/show_bug.cgi?id=8854))
 * Exception during start of fr-043 caused by missing DXTn support ([Wine Bug #37391](https://bugs.winehq.org/show_bug.cgi?id=37391))
+* Expose PKEY_AudioEndpoint_PhysicalSpeakers device property in PulseAudio driver
 * 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))
+* Fallback to global key state for threads without a queue ([Wine Bug #27238](https://bugs.winehq.org/show_bug.cgi?id=27238))
+* Fix NULL dereference in ICSeqCompressFrameStart ([Wine Bug #27595](https://bugs.winehq.org/show_bug.cgi?id=27595))
+* Fix access violation when calling GetStringTypeW with NULL src. ([Wine Bug #37759](https://bugs.winehq.org/show_bug.cgi?id=37759))
 * Fix black screen on startup introduced by pixelformat changes. ([Wine Bug #35950](https://bugs.winehq.org/show_bug.cgi?id=35950))
+* Fix caps lock state issues with multiple processes ([Wine Bug #35907](https://bugs.winehq.org/show_bug.cgi?id=35907))
+* Fix check for end_frame in RtlUnwindEx on x86_64. ([Wine Bug #34254](https://bugs.winehq.org/show_bug.cgi?id=34254))
 * 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 in Space Rangers2 caused by missing DXTn support ([Wine Bug #24983](https://bugs.winehq.org/show_bug.cgi?id=24983))
+* Fix crash in clip_cursor_notify caused by uninitialized TLS ([Wine Bug #36915](https://bugs.winehq.org/show_bug.cgi?id=36915))
 * 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 cursor clip regression / broken raw input in multiple games ([Wine Bug #33479](https://bugs.winehq.org/show_bug.cgi?id=33479))
 * 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 graphical corruption in FarCry 3 with NVIDIA drivers ([Wine Bug #35062](https://bugs.winehq.org/show_bug.cgi?id=35062))
 * 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 handling of window attributes for WS_EX_LAYERED | WS_EX_COMPOSITED ([Wine Bug #37876](https://bugs.winehq.org/show_bug.cgi?id=37876))
 * 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 ordering of IP addresses by metric if two addresses have the same metric.
-* Fix passing of unicode environment from msvcrt to CreateProcessW. ([Wine Bug #37635](https://bugs.winehq.org/show_bug.cgi?id=37635))
+* Fix multithreading issues with fullscreen clipping ([Wine Bug #38087](https://bugs.winehq.org/show_bug.cgi?id=38087))
+* Fix possible segfault in pulse_rd_loop of PulseAudio backend
+* Fix race-condition when threads are killed during shutdown
+* ~~Fix regression causing black screen on startup~~ ([Wine Bug #38248](https://bugs.winehq.org/show_bug.cgi?id=38248))
+* ~~Fix regression causing too dark/missing textures in several games~~ ([Wine Bug #38256](https://bugs.winehq.org/show_bug.cgi?id=38256))
+* 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))
+* Fix wrong colors in Wolfenstein (2009) ([Wine Bug #34692](https://bugs.winehq.org/show_bug.cgi?id=34692))
+* Fix wrong defition of ntoskrnl.IoReleaseCancelSpinLock function.
+* Fix wrong version of ID3DXEffect interface for d3dx9_24
+* Fix wrong version of ID3DXEffect interface for d3dx9_25 ([Wine Bug #25138](https://bugs.winehq.org/show_bug.cgi?id=25138))
 * 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))
+* GetMessage should remove already seen messages with higher priority ([Wine Bug #28884](https://bugs.winehq.org/show_bug.cgi?id=28884))
+* GetMonitorInfo returns the same name for all monitors ([Wine Bug #37709](https://bugs.winehq.org/show_bug.cgi?id=37709))
 * GetSecurityInfo returns NULL DACL for process object ([Wine Bug #15980](https://bugs.winehq.org/show_bug.cgi?id=15980))
+* Graphical issues in Inquisitor ([Wine Bug #32490](https://bugs.winehq.org/show_bug.cgi?id=32490))
+* Hearthstone fails to start ([Wine Bug #36216](https://bugs.winehq.org/show_bug.cgi?id=36216))
+* IOCTL_DVD_READ_STRUCTURE expects the wrong size of output buffer for some requests ([Wine Bug #37767](https://bugs.winehq.org/show_bug.cgi?id=37767))
+* Ignore unsupported alpha channels in TIFF decoder ([Wine Bug #38027](https://bugs.winehq.org/show_bug.cgi?id=38027))
+* Ignore unsupported flags for CoInternetSetFeatureEnabled ([Wine Bug #35197](https://bugs.winehq.org/show_bug.cgi?id=35197))
+* Implement D3DXGetShaderOutputSemantics
+* Implement ID3DXEffect::FindNextValidTechnique ([Wine Bug #34101](https://bugs.winehq.org/show_bug.cgi?id=34101))
+* Implement IDXGIOutput::GetDesc
+* Implement SetFileInformationByHandle
+* ~~Implement SetupLogError[A|W] and Setup[Open|Close]Log~~
 * Implement a Microsoft Yahei replacement font ([Wine Bug #13829](https://bugs.winehq.org/show_bug.cgi?id=13829))
+* Implement additional stubs for vcomp dlls ([Wine Bug #31640](https://bugs.winehq.org/show_bug.cgi?id=31640))
 * Implement an Arial replacement font ([Wine Bug #32323](https://bugs.winehq.org/show_bug.cgi?id=32323))
+* Implement combase.WindowsSubstring function
 * Implement exclusive mode in PulseAudio backend ([Wine Bug #37042](https://bugs.winehq.org/show_bug.cgi?id=37042))
+* Implement locking and synchronization of key states ([Wine Bug #31899](https://bugs.winehq.org/show_bug.cgi?id=31899))
+* Implement ntoskrnl driver testing framework.
+* Implement ntoskrnl.KeInitializeMutex
+* Implement stub for ntoskrnl.IoGetAttachedDeviceReference
+* Implement stub for ntoskrnl.KeDelayExecutionThread.
+* Implement stubs for ntoskrnl.Ex{Acquire,Release}FastMutexUnsafe
+* Implement stubs for ntoskrnl.ObReferenceObjectByPointer and ntoskrnl.ObDereferenceObject
+* Implement threadpool timers ([Wine Bug #37306](https://bugs.winehq.org/show_bug.cgi?id=37306))
+* Implement threadpool wait objects
+* Implement threadpool work items ([Wine Bug #32531](https://bugs.winehq.org/show_bug.cgi?id=32531))
+* Improve stub for AEV_GetVolumeRange ([Wine Bug #35658](https://bugs.winehq.org/show_bug.cgi?id=35658))
+* Improve stub for ID3DXEffectImpl_CloneEffect
+* Improve stubs for AEV_{Get,Set}MasterVolumeLevel
+* Improve stubs for AEV_{Get,Set}Mute
 * 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))
+* Increase wineconsole commandline buffer size ([Wine Bug #34814](https://bugs.winehq.org/show_bug.cgi?id=34814))
+* Invalidate key state cache globally after calling LL hooks ([Wine Bug #29871](https://bugs.winehq.org/show_bug.cgi?id=29871))
+* Jedi Knight: Dark Forces II crashes with winmm set to native ([Wine Bug #37983](https://bugs.winehq.org/show_bug.cgi?id=37983))
 * 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)
 * MSVCRT crashes when NULL is passed as string to atof or strtod ([Wine Bug #32550](https://bugs.winehq.org/show_bug.cgi?id=32550))
+* MSYS2 expects correct handling of WRITECOPY memory protection ([Wine Bug #35561](https://bugs.winehq.org/show_bug.cgi?id=35561))
 * Make it possible to change media center / tablet pc status ([Wine Bug #18732](https://bugs.winehq.org/show_bug.cgi?id=18732))
+* MediaCoder needs CUDA for video encoding ([Wine Bug #37664](https://bugs.winehq.org/show_bug.cgi?id=37664))
 * Multiple applications need EnumDisplayDevicesW implementation ([Wine Bug #34978](https://bugs.winehq.org/show_bug.cgi?id=34978))
+* Multiple applications start wrong executable if whitespace present in name ([Wine Bug #19666](https://bugs.winehq.org/show_bug.cgi?id=19666))
 * 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
+* Port Royale doesn't display ocean correctly ([Wine Bug #17913](https://bugs.winehq.org/show_bug.cgi?id=17913))
 * Prevent window managers from grouping all wine programs together ([Wine Bug #32699](https://bugs.winehq.org/show_bug.cgi?id=32699))
+* Process APC calls before starting process
+* Process Hacker 2.x needs ntoskrnl.ProbeForRead ([Wine Bug #38103](https://bugs.winehq.org/show_bug.cgi?id=38103))
+* Properly track handle count of wineserver objects
+* Python PIP needs better NtQueryInformationJobObject stub
 * 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
+* Scrolling causes mouse and screen to lock in Call to Power II ([Wine Bug #34559](https://bugs.winehq.org/show_bug.cgi?id=34559))
 * 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))
+* Super Mario 3: Mario Forever fails to load keyboard mapping from profile files. ([Wine Bug #18099](https://bugs.winehq.org/show_bug.cgi?id=18099))
 * 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 CUDA GPU video decoding
+* Support for D3DXComputeNormals ([Wine Bug #26379](https://bugs.winehq.org/show_bug.cgi?id=26379))
 * Support for D3DXGetShaderInputSemantics ([Wine Bug #22682](https://bugs.winehq.org/show_bug.cgi?id=22682))
+* Support for DDS file format in D3DXSaveTextureToFileInMemory ([Wine Bug #26898](https://bugs.winehq.org/show_bug.cgi?id=26898))
 * 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 GetFinalPathNameByHandle ([Wine Bug #34851](https://bugs.winehq.org/show_bug.cgi?id=34851))
 * Support for GetSystemTimes ([Wine Bug #19813](https://bugs.winehq.org/show_bug.cgi?id=19813))
 * Support for GetVolumePathName
+* Support for H264 DXVA2 GPU video decoding through vaapi
+* Support for ID3DXFont::DrawTextA/W ([Wine Bug #24754](https://bugs.winehq.org/show_bug.cgi?id=24754))
 * 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 MPEG2 DXVA2 GPU video decoding through vaapi
+* Support for NVIDIA video encoder library (nvencodeapi)
 * 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 TOOLTIPS_GetTipText edge cases ([Wine Bug #30648](https://bugs.winehq.org/show_bug.cgi?id=30648))
+* ~~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 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 named pipe message mode (Linux only) ([Wine Bug #17195](https://bugs.winehq.org/show_bug.cgi?id=17195))
+* Support for non-blocking SIO_ADDRESS_LIST_CHANGE requests ([Wine Bug #38062](https://bugs.winehq.org/show_bug.cgi?id=38062))
 * 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))
+* Support for shell32 file operation progress dialog
+* Support for stored file ACLs ([Wine Bug #33576](https://bugs.winehq.org/show_bug.cgi?id=33576))
+* Try harder to get the host name address in getaddrinfo() ([Wine Bug #29609](https://bugs.winehq.org/show_bug.cgi?id=29609))
 * 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 actual program name if available to describe PulseAudio streams
 * 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))
-* Wintrust doesn't reset data->pWintrustData->u.pFile->hFile after closing handle ([Wine Bug #36257](https://bugs.winehq.org/show_bug.cgi?id=36257))
 * 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))
+* eRacer Demo doesn't correctly display text ([Wine Bug #29598](https://bugs.winehq.org/show_bug.cgi?id=29598))
+* ntdll is missing WinSqm[Start|End]Session implementation ([Wine Bug #31971](https://bugs.winehq.org/show_bug.cgi?id=31971))
 * wglDescribePixelFormat should return max index for NULL descriptor ([Wine Bug #6176](https://bugs.winehq.org/show_bug.cgi?id=6176))

--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,296 @@
+wine-staging (1.7.40) UNRELEASED; urgency=low
+  * Update dsound fast mixer patchset to use integer math.
+  * Various improvements to Debian packaging files, pull request #310.
+  * Added patch with stubs for Power[Set|Clear]Request.
+  * Added patch to avoid spam of FIXME messages for PsLookupProcessByProcessId stub.
+  * Added patch to implement empty enumerator for IWiaDevMgr::EnumDeviceInfo.
+  * Added patch to fix handling of ANSI NTLM credentials.
+  * Added patch to fix compatibility of Uplay with gnutls28.
+  * Added patches for Environmental Audio Extensions (EAX), pull request #311 from Mark Harmstone.
+  * Added patch to fix return value of WS_select in case of EINTR during timeout.
+  * Added patch to fix calculation of 3D sound source.
+  * Added patch for stub of fltmgr.sys (filter manager driver).
+  * Removed patch to fix regression causing black screen on startup (accepted upstream).
+  * Removed patch to fix edge cases in TOOLTIPS_GetTipText (fixed upstream).
+  * Removed patch for IConnectionPoint/INetworkListManagerEvents stub interface (accepted upstream).
+  * Removed patch to fix race-condition when closing browseui IProcessDialog (accepted upstream).
+  * Removed patch with tests for GetFinalPathNameByHandleA/W (accepted upstream).
+  * Removed patch to emulate 'mov Eb, Gb' instruction on x86 processor architecture (accepted upstream).
+  * Removed patches for Setup*Log() functions (accepted upstream).
+ -- Sebastian Lackner <sebastian@fds-team.de>  Mon, 23 Mar 2015 16:12:20 +0100
+
+wine-staging (1.7.39) unstable; urgency=low
+  * Fix a build failure on MacOS caused by using of strndup in the server-Inherited_ACLs patchset.
+  * Update patchset for ntdll-RtlUnwindEx to fix an issue with dwarf handling (fixes Wine Staging Bug #170).
+  * Updated patchset for dinput-Events to be compatible with more games (fixes Wine Staging Bug #149).
+  * Added patch for tests of RtlIpv6StringToAddress, RtlIpv{4,6}StringToAddressEx (by Mark Jansen).
+  * Added patch to fix multithreading issues with fullscreen clipping.
+  * Added patch with tests for VerQueryValueA (by Mark Jansen).
+  * Added patch to implement proper locking of keystate and synchronization with desktop thread.
+  * Added patch to implement better stub function for NtQueryInformationJobObject.
+  * Added patch to avoid crash in d3d9 tests by skipping when texture/surface creation fails.
+  * Added patch to fix wrong version of ID3DXEffect interface for d3dx9_24.
+  * Added patch to fix wrong version of ID3DXEffect interface for d3dx9_25.
+  * Added patch to allow to query for d3dx9_26 specific ID3DXEffect interface.
+  * Added patch to modify GetMessage to return already seen messages with higher priority.
+  * Added patch to silence repeated 'Unhandled blend factor 0' FIXME messages.
+  * Added patch for stub of PowerCreateRequest.
+  * Added patch to invalidate key state cache globally after calling LL hooks.
+  * Added patch to fix Wine Staging Bug #162 - Caesar III demo installer crashes.
+  * Added patch to fix wrong return values of RtlFindActivationContextSectionString for NULL data (by Mark Jansen).
+  * Added patch to implement _ismbckata and _mbctohira, moreover fix wrong return value of _ismbckata.
+  * Added patch to improve stub for ID3DXEffectImpl_CloneEffect.
+  * Added patch with additional tests for server-PeekMessage.
+  * Added patch to only zero the buffer up 32767 bytes in GetTempPathW.
+  * Added patches to implement shared memory wineserver communication for various user32 functions.
+  * Added patch to implement combase.WindowsSubstring function.
+  * Added patch with stub for wininet.ParseX509EncodedCertificateForListBoxEntry.
+  * Added patch to allow to edit winecfg library override by double clicking.
+  * Added patch to fix regression causing too dark/missing textures in several games.
+  * Added patch to fix regression causing black screen on startup.
+  * Added patch to implement SetupLogError[A|W] and Setup[Open|Close]Log.
+  * Added patches to get rid of wineserver call for GetActiveWindow, GetFocus, GetCapture.
+  * Removed patch to avoid hardcoded values for sizeof(GUID) (accepted upstream).
+  * Removed patches for SLGetWindowsInformationDWORD (accepted upstream).
+  * Removed patches for _ismbckata and _mbctohira (fixed upstream).
+  * Removed patches to fix wrong return values of RtlFindActivationContextSectionString for NULL data (accepted upstream).
+  * Removed patch for server-PeekMessage tests (accepted upstream).
+  * Removed patch to only zero the buffer up 32767 bytes in GetTempPathW (accepted upstream).
+  * Removed first patch of series ws2_32_WriteWatches (accepted upstream).
+ -- Sebastian Lackner <sebastian@fds-team.de>  Sun, 22 Mar 2015 04:05:46 +0100
+
+wine-staging (1.7.38) unstable; urgency=low
+  * Various improvements to patchupdate.py.
+  * Various improvements to dxva2 vaapi support.
+  * Long overdue update to the TransmitFile patches.
+  * Disabled patchset for reg.exe cleanup (partially accepted upstream).
+  * Added patch to report the correct refresh rates for some NVIDIA cards.
+  * Added patch to mark DllCanUnloadNow and DllGetClassObject as private (by Amine Khaldi, wine-patched/pull/3).
+  * Added patch to skip Wine specific __wine_check_for_events calls in ReactOS (by Amine Khaldi, wine-patched/pull/4).
+  * Added patch to declare pDirectInputCreateEx in a MSVC compatible way (by Amine Khaldi, wine-patched/pull/5).
+  * Added patch to complete and properly pack DNS_HEADER structure (by Amine Khaldi, wine-patched/pull/6).
+  * Added patch to fix race-condition when threads are killed during shutdown.
+  * Added patch to avoid deadlock by using _exit() in NtTerminateProcess.
+  * Added patch to fallback to global key state for threads without a queue.
+  * Added patch to implement SetFileInformationByHandle.
+  * Added patch for CopyFileEx progress callback and cancellation support.
+  * Added first set of patches for job objects (by Andrew Cook).
+  * Added patch for stub of gdiplus.GdipCreateEffect.
+  * Added patches for ntoskrnl.ProbeFor{Read,Write}.
+  * Added patch for support of shell32 file operation progress dialog.
+  * Added patch for basic implementation of job objects.
+  * Added patch to display animations for SHFileOperation progress dialog.
+  * Added patch to enforce that surfaces are flushed after ReleaseDC.
+  * Added patch to implement IProgressDialog::SetAnimation.
+  * Added patch in order to allow to override number of quality levels for D3DMULTISAMPLE_NONMASKABLE.
+  * Added patch for job object completion support.
+  * Added patch to properly track handle count of wineserver objects.
+  * Added patch to implement JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE.
+  * Added patch to implement PROGDLG_AUTOTIME for IProgressDialog.
+  * Added patch to implement support for NULL job handles in IsProcessInJob.
+  * Added patch to implement support for waiting on job object.
+  * Added patch to fix crash in clip_cursor_notify caused by uninitialized TLS.
+  * Added patches to make various functions in d3d8 / ddraw hotpatchable (required for fraps).
+  * Added patch to make GetLogicalProcessorInformationEx a stub which returns TRUE.
+  * Added patches to fix race-condition when closing browseui IProcessDialog.
+  * Added patch to avoid unloading msctf library while textservices are activated.
+  * Added patch to correct DDSCAPS2 and DDSURFACEDESC2 structure (by Amine Khaldi, wine-patched/pull/7).
+  * Added patch to fix crash when trying to switch back to a 16-bit stack.
+  * Added patches to improve performance by reusing old async IO structure if possible.
+  * Added patch to increase wineconsole commandline buffer size.
+  * Added patch to replace hardcoded values with sizeof(GUID) for d3dxof.
+  * Added patch to implement cuModuleLoad wrapper function.
+  * Added patch to process APC calls before starting process.
+  * Removed patch to properly call DriverUnload when unloading device drivers (accepted upstream).
+  * Removed patch to allow Accept-Encoding for HTTP/1.0 in wininet (accepted upstream).
+  * Removed patch to declare pDirectInputCreateEx in a MSVC compatible way (accepted upstream).
+  * Removed patch to limit cross thread access to ImmSet* functions (accepted upstream).
+  * Removed patch to fix arguments for OSMesaMakeCurrent when using 16 bit formats (accepted upstream).
+  * Removed patch to fix memory leak in ApplicationAssociationRegistration_QueryCurrentDefault (accepted upstream).
+  * Removed patch to complete and properly pack DNS_HEADER structure (accepted upstream).
+  * Removed patch to avoid accessing stack below ESP when restoring thread context (accepted upstream).
+  * Removed patch to fix mouse jittering in Planetside 2 (accepted upstream).
+  * Removed patch to handle write watches while we're on the signal stack (accepted upstream).
+  * Removed patch with tests for NtQueryLicenseKey (accepted upstream).
+  * Removed patch to fix crash when trying to switch back to a 16-bit stack (accepted upstream).
+  * Removed patch to fix definition of SECTION_BASIC_INFORMATION and SECTION_IMAGE_INFORMATION (accepted upstream).
+  * Removed patch to add library override instead of closing winecfg when pressing ENTER (accepted upstream).
+  * Removed patch to fix init of LONGLONG variable with a negative value in TGA decoder (accepted upstream).
+  * Removed patch to fix parameters for ConvertToIndexedBlendedMesh stub (accepted upstream).
+ -- Sebastian Lackner <sebastian@fds-team.de>  Sat, 07 Mar 2015 23:09:11 +0100
+
+wine-staging (1.7.37) unstable; urgency=low
+  * Fix a TRACE line in the iphlpapi-TCP_Table patchset.
+  * Fix an issue in the d3dx9_36-GetShaderSemantics patchset.
+  * Update patchset for RtlUnwindEx on x86_64 and fix a second bug.
+  * Updated patch for DXTn support to avoid libtxc_dxtn as compile time dependency.
+  * Added patch to avoid race-conditions in NtReadFile() operations with write watches.
+  * Added patch to avoid race-conditions with write watches in WS2_async_accept.
+  * Added patch to implement D3DXGetShaderOutputSemantics.
+  * Added patch to implement basic handling of write watches while we're on the signal stack.
+  * Added patch to add stub for ntoskrnl.ExAcquireResourceExclusiveLite.
+  * Added patch to add stub for ntoskrnl.ExReleaseResourceForThread.
+  * Added patch to add stub for ntoskrnl.ExDeleteResourceLite.
+  * Added patch to avoid accessing stack below ESP when restoring thread context.
+  * Added patch to implement IApplicationAssociationRegistration::QueryCurrentDefault.
+  * Added patch to improve stubs for AEV_{Get,Set}MasterVolumeLevel.
+  * Added patch to improve stubs for AEV_{Get,Set}Mute.
+  * Added patch to implement semi-stub for GetFileVersionInfoSizeExA/W.
+  * Added patch to implement semi-stub for GetFileVersionInfoExA/W.
+  * Added patch to ignore unsupported alpha channels in TIFF decoder.
+  * Added patch to add stub for ntoskrnl.Mm{Map,Unmap}LockedPages.
+  * Added patch to implement ntoskrnl.KeInitializeMutex.
+  * Added patch for support of non-blocking SIO_ADDRESS_LIST_CHANGE requests.
+  * Added patch for MPEG2/H264 DXVA2 video decoding through vaapi.
+  * Removed patches for UTF7 support (accepted upstream).
+  * Removed patches for SIO_ADDRESS_LIST_CHANGE ioctl (accepted upstream).
+  * Removed patch for IApplicationAssociationRegistration::QueryCurrentDefault (accepted upstream).
+  * Removed patch for IDirectPlayVoiceClient::GetCompressionTypes (accepted upstream).
+ -- Sebastian Lackner <sebastian@fds-team.de>  Sun, 22 Feb 2015 06:58:09 +0100
+
+wine-staging (1.7.36) unstable; urgency=low
+  * Fix an incompatibility of patchinstall.sh with non-bash shells under specific situations.
+  * Improve dinput-Events patch to be compatible with applications which do not explicitly poll for input.
+  * Added patch to properly call DriverUnload when unloading device drivers.
+  * Added patch to fix check for end_frame in RtlUnwindEx on x86_64.
+  * Added patch to fix mouse jittering in Planetside 2.
+  * Added patch to implement additional stubs for vcomp dlls.
+  * Added patchset to implement Vista+ threadpool functions for work / timers.
+  * Added patchset for Vista+ threadpool wait objects.
+  * Added patch to fix crash in Jedi Knight: Dark Forces II when winmm is set to native.
+  * Added patch to fix arguments for OSMesaMakeCurrent when using 16 bit formats.
+  * Added patch to add library override instead of closing winecfg when pressing ENTER over the combobox.
+  * Added patchset for various improvements and cleanup of reg.exe.
+  * Added patch to add performance library registry keys needed by MS SQL Server Management Studio Express 2008 R2.
+  * Added patch to implement NVIDIA video encoder library (nvencodeapi).
+  * Added patch to make nvcuda.dll compatible with CUDA 7.0.
+  * Added patch to implement stub for ntoskrnl.IoGetAttachedDeviceReference.
+  * Added patch to implement stubs for ntoskrnl.Ex{Acquire,Release}FastMutexUnsafe.
+  * Added patch to implement stubs for ntoskrnl.ObReferenceObjectByPointer and ntoskrnl.ObDereferenceObject.
+  * Added patch to implement stub for ntoskrnl.KeDelayExecutionThread.
+  * Added patch to improve various ntoskrnl stub functions.
+  * Added patch to fix wrong defition of ntoskrnl.IoReleaseCancelSpinLock function.
+  * Added patch to improve stub for AEV_GetVolumeRange.
+  * Removed patch to add additional tests for SLGetWindowsInformationDWORD (accepted upstream).
+  * Removed patch to avoid filling KdHelp structure for usermode applications (accepted upstream).
+ -- Sebastian Lackner <sebastian@fds-team.de>  Sun, 08 Feb 2015 19:14:24 +0100
+
+wine-staging (1.7.35) unstable; urgency=low
+  * Add stub for KeWaitForMultipleObjects.
+  * Add support for patchinstall.sh parameters '--no-patchlist' and '--no-autoconf'.
+  * Add support for Gentoo epatch backend to patchinstall.sh.
+  * Fix compile warnings on x86_64 in several patchsets.
+  * Automatically enable fallback method to apply patches when running from inside of a git subdirectory.
+  * Synchronize CSMT patchset with https://github.com/stefand/wine.
+  * Several improvements to make nvcuvid (CUDA video decoding) better compatible with x86_64.
+  * Properly wrap CUDA stream callbacks by forwarding them to a separate worker thread.
+  * Added patch to quote program name in ShellExecute[Ex] when it contains spaces.
+  * Added patch to implement support for DDS file format in D3DXSaveTextureToFileInMemory.
+  * Added patch to avoid appending duplicate NULL character when importing keys with regedit.
+  * Added patch for IConnectionPoint/INetworkListManagerEvents stub interface.
+  * Added patch to fix init of LONGLONG variable with a negative value in TGA decoder.
+  * Added patch to implement stubs for D3DXCreateAnimationController interface.
+  * Added patch to implement semi-stub for IDirectPlayVoiceClient::GetCompressionTypes.
+  * Added patch to fix cursor clip regression / broken raw input in multiple games.
+  * Added patches to implement ntoskrnl driver testing framework.
+  * Added patch to fix handling of window attributes for WS_EX_LAYERED | WS_EX_COMPOSITED.
+  * Removed patch to fix RandR on some broken nVidia systems (accepted upstream).
+  * Removed patch to set last error on success in WSARecv (accepted upstream).
+  * Removed patch to fix handling of subdirectory in FtpFindFirstFile (accepted upstream).
+  * Removed patch to initialize irp.Tail.Overlay.OriginalFileObject with stub file object (accepted upstream).
+  * Removed patch to fix incorrect behaviour of PathIsDirectoryEmptyW (accepted upstream).
+  * Removed patch to store IOCS data in a property instead of GWLP_USERDATA (accepted upstream).
+  * Removed patch to fix color key regression (fixed upstream).
+ -- Sebastian Lackner <sebastian@fds-team.de>  Sat, 24 Jan 2015 16:03:35 +0100
+
+wine-staging (1.7.34-1) unstable; urgency=low
+  * Debian/Ubuntu specific package dependency fix (no changes for other distros).
+ -- Sebastian Lackner <sebastian@fds-team.de>  Sun, 11 Jan 2015 19:14:09 +0100
+
+wine-staging (1.7.34) unstable; urgency=low
+  * Huge rewrite of patchupdate.py, deprecation of Makefile based way to apply patches.
+  * Rename debian package from 'wine-compholio' to 'wine-staging' and provide compatibility package.
+  * Avoid duplicate wined3d specfile by adding PARENTSPEC Makefile argument.
+  * Fix issue in DOS Attributes patch which broke ./configure on systems with alternative shells.
+  * Fix issue in user32-WndProc patch which caused crashes for some 16-bit apps.
+  * Fix issue in ws2_32-WriteWatches patch which can cause exceptions on the signal stack.
+  * Fix issue with invalid handles being incorrect when a new process is created.
+  * Update DXTn patches to better handle when libtxc_dxtn is missing or support is not compiled in.
+  * Added patch for WSARecv to call SetLastError on success.
+  * Added patch for CreateProcess to prioritize the working directory over the system search path.
+  * Added patch with stubs for WinSqm[Start|End]Session.
+  * Added patch to fix handling of subdirectory in FtpFindFirstFile.
+  * Added patch to return proper charcount for GetLocaleInfo with LOCALE_IFIRSTDAYOFWEEK.
+  * Added patch to ensure X11 input events are handled even without explicit message loop.
+  * Added test for server-Unexpected_Wakeup patch.
+  * Added patch for stub of ntdll.RtlSetHeapInformation.
+  * Added patch for IDXGIOutput::GetDesc.
+  * Added patch for ID3DXEffect::FindNextValidTechnique.
+  * Added patch with stub for D3DXComputeTangentFrameEx.
+  * Added patch with stub for D3DXIntersect.
+  * Added test for RtlIpv4StringToAddressExA.
+  * Added patch for support of SLGetWindowsInformationDWORD.
+  * Added patch to expect the correct buffer size for different IOCTL_DVD_READ_STRUCTURE requests.
+  * Added patch to use actual program name if available to describe PulseAudio streams.
+  * Added patch to try harder to get the host name address in getaddrinfo().
+  * Added patch to fix invalid usage of RegOpenKeyExW in msdmo.
+  * Added patch to add support for named pipe message mode.
+  * Added patch to avoid calling IDirect3DDevice7_DrawIndexedPrimitive if there is no primitive.
+  * Added patch to fix access violation when calling GetStringTypeW with NULL src.
+  * Added patch for ID3DXFont::DrawTextA/W support.
+  * Added patch to fix parameters for ConvertToIndexedBlendedMesh stub.
+  * Added patch for basic CUDA support.
+  * Added patches for D3DXComputeNormals and D3DXComputeNormalMap.
+  * Added patch for nvapi stubs (required for GPU PhysX support).
+  * Added patch to fix NULL dereference in ICSeqCompressFrameStart.
+  * Added patch to implement support for CUDA GPU video decoding.
+  * Added patch to fix color key regression causing pink rectangles around text.
+  * Rebased winepulse-Pulseaudio_Support patches to latest version from http://repo.or.cz/w/wine/multimedia.git.
+  * Removed patch to emulate write to CR4 register (accepted upstream).
+  * Removed patch with stub for KeSetSystemAffinityThread (accepted upstream).
+  * Removed patch to implement combase HSTRING objects (accepted upstream).
+  * Removed patch to add fake ProductId to registry (accepted upstream).
+  * Removed patch to implement stubs for MFStartup and MFShutdown (accepted upstream).
+  * Removed patch to implement shlwapi.StrCatChainW (accepted upstream).
+  * Removed patch to implement semi-stub for psapi/kernel32 K32EnumProcessModulesEx (accepted upstream).
+  * Removed patch to return proper charcount for GetLocaleInfo with LOCALE_IFIRSTDAYOFWEEK (accepted upstream).
+  * Removed patch to export SHILCreateFromPath by name (accepted upstream).
+  * Removed patch for stub of ntdll.RtlSetHeapInformation (accepted upstream).
+  * Removed patch for wine64 support on FreeBSD (accepted upstream).
+  * Removed patch for IoCsqInitialize (accepted upstream).
+  * Removed patch to fix invalid usage of RegOpenKeyExW in msdmo (fixed upstream).
+  * Removed patch to reallocate buffer when adding records to AVI files (fixed upstream).
+  * Partially removed patches for ntdll DOS attributes (accepted upstream).
+  * Partially removed patches for UTF7 support (accepted upstream).
+ -- Sebastian Lackner <sebastian@fds-team.de>  Sat, 10 Jan 2015 22:22:01 +0100
+
+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.
@@ -27,7 +320,7 @@ wine-compholio (1.7.32) unstable; urgency=low
  * 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.
+  * Removed patch to fix detection of gnutls on Ubuntu 14.10 (accepted upstream).
 -- Sebastian Lackner <sebastian@fds-team.de>  Sun, 30 Nov 2014 15:22:49 +0100

 wine-compholio (1.7.31) unstable; urgency=low
--- a/debian/conffiles
+++ b/debian/conffiles
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-Source: wine-compholio
+Source: wine-staging
 Section: otherosfs
 Priority: optional
 Maintainer: Erich E. Hoover <erich.e.hoover@gmail.com>
@@ -48,6 +48,7 @@ Build-Depends: autotools-dev,
               libtiff5-dev | libtiff4-dev | libtiff-dev,
               libtxc-dxtn-s2tc-dev,
               libv4l-dev,
+               libva-dev,
               libx11-dev,
               libxcomposite-dev,
               libxcursor-dev,
@@ -69,7 +70,7 @@ Build-Depends: autotools-dev,
               x11proto-xinerama-dev
 Standards-Version: 3.9.2

-Package: wine-compholio-i386
+Package: wine-staging-i386
 Architecture: i386
 Multi-Arch: foreign
 Pre-Depends: dpkg (>= 1.14.12ubuntu3), ${misc:Pre-Depends}
@@ -95,6 +96,8 @@ Recommends: libcapi20-3,
            libtiff5 | libtiff4,
            libtxc-dxtn-s2tc0,
            libv4l-0,
+            libva-drm1,
+            libva-x11-1,
            libxcomposite1,
            libxcursor1,
            libxi6,
@@ -108,9 +111,8 @@ Recommends: libcapi20-3,
            libgsm1
 Section: otherosfs
 Priority: optional
-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
+Description: special build of the popular Wine software
+ The Staging Edition is a special build of the popular Wine software
 with patches representing my current staging tree for Wine.
 .
 Microsoft Windows Compatibility Layer (Binary Emulator and Library)
@@ -121,11 +123,11 @@ Description: The Compholio Edition is a special build of the popular Wine softwa
 .
 This package provides support for loading 32-bit x86 Windows applications
 .
- This package is based on a recent Wine beta.  While many more applications will
- work, there may be some loss of functionality compared with the stable release
- provided by the regular wine package.
+ This package is based on a recent Wine beta.  While many more applications
+ will work, there may be some loss of functionality compared with the stable
+ release provided by the regular wine package.

-Package: wine-compholio-amd64
+Package: wine-staging-amd64
 Architecture: amd64
 Multi-Arch: foreign
 Pre-Depends: dpkg (>= 1.14.12ubuntu3), ${misc:Pre-Depends}
@@ -151,6 +153,8 @@ Recommends: libcapi20-3,
            libtiff5 | libtiff4,
            libtxc-dxtn-s2tc0,
            libv4l-0,
+            libva-drm1,
+            libva-x11-1,
            libxcomposite1,
            libxcursor1,
            libxi6,
@@ -164,9 +168,8 @@ Recommends: libcapi20-3,
            libgsm1
 Section: otherosfs
 Priority: optional
-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
+Description: special build of the popular Wine software
+ The Staging Edition is a special build of the popular Wine software
 with patches representing my current staging tree for Wine.
 .
 Microsoft Windows Compatibility Layer (Binary Emulator and Library)
@@ -177,20 +180,21 @@ Description: The Compholio Edition is a special build of the popular Wine softwa
 .
 This package provides support for loading 64-bit x86 Windows applications
 .
- This package is based on a recent Wine beta.  While many more applications will
- work, there may be some loss of functionality compared with the stable release
- provided by the regular wine package.
+ This package is based on a recent Wine beta.  While many more applications
+ will work, there may be some loss of functionality compared with the stable
+ release provided by the regular wine package.

-Package: wine-compholio
+Package: wine-staging
 Architecture: i386 amd64
 Multi-Arch: foreign
 Pre-Depends: dpkg (>= 1.14.12ubuntu3), ${misc:Pre-Depends}
 Depends:    ${misc:Depends}, ${shlibs:Depends},
-            wine-compholio-i386  (= ${binary:Version}) [i386 amd64],
-            wine-compholio-amd64 (= ${binary:Version}) [amd64],
+            wine-staging-i386  (= ${binary:Version}) [i386 amd64],
+            wine-staging-amd64 (= ${binary:Version}) [amd64],
 Section: otherosfs
 Priority: optional
-Description: The Compholio Edition is a special build of the popular Wine software
+Description: special build of the popular Wine software
+ The Staging Edition is a special build of the popular Wine software
 with patches representing my current staging tree for Wine.
 .
 Microsoft Windows Compatibility Layer (Binary Emulator and Library)
@@ -199,26 +203,25 @@ Description: The Compholio Edition is a special build of the popular Wine softwa
 does not require Microsoft Windows, however it can use native system dll
 files in place of its own if they are available.
 .
- This package includes a program loader for running unmodified Windows executables
- as well as the Wine project's free version of the Windows API for running programs
- ported from Windows.
+ This package includes a program loader for running unmodified Windows
+ executables as well as the Wine project's free version of the Windows API
+ for running programs ported from Windows.
 .
- This package is based on a recent Wine beta.  While many more applications will
- work, there may be some loss of functionality compared with the stable release
- provided by the regular wine package.
+ This package is based on a recent Wine beta.  While many more applications
+ will work, there may be some loss of functionality compared with the stable
+ release provided by the regular wine package.

-Package: wine-compholio-dev
+Package: wine-staging-dev
 Architecture: i386 amd64
 Pre-Depends: dpkg (>= 1.14.12ubuntu3), ${misc:Pre-Depends}
 Depends:    libc6-dev,
            ${shlibs:Depends},
-            wine-compholio-i386  (= ${binary:Version}) [i386 amd64],
-            wine-compholio-amd64 (= ${binary:Version}) [amd64],
+            wine-staging-i386  (= ${binary:Version}) [i386 amd64],
+            wine-staging-amd64 (= ${binary:Version}) [amd64],
 Section: libdevel
 Priority: optional
-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
+Description: special build of the popular Wine software
+ The Staging Edition is a special build of the popular Wine software
 with patches representing my current staging tree for Wine.
 .
 Microsoft Windows Compatibility Layer (Binary Emulator and Library)
@@ -230,18 +233,17 @@ Description: The Compholio Edition is a special build of the popular Wine softwa
 This package consists of the development files needed to compile programs
 using wine's free version of the Microsoft Windows API.

-Package: wine-compholio-dbg
+Package: wine-staging-dbg
 Architecture: i386 amd64
 Multi-Arch: same
 Pre-Depends: dpkg (>= 1.14.12ubuntu3), ${misc:Pre-Depends}
 Depends:    ${shlibs:Depends},
-            wine-compholio-i386  (= ${binary:Version}) [i386 amd64],
-            wine-compholio-amd64 (= ${binary:Version}) [amd64],
+            wine-staging-i386  (= ${binary:Version}) [i386 amd64],
+            wine-staging-amd64 (= ${binary:Version}) [amd64],
 Section: debug
 Priority: optional
-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
+Description: special build of the popular Wine software
+ The Staging Edition is a special build of the popular Wine software
 with patches representing my current staging tree for Wine.
 .
 Microsoft Windows Compatibility Layer (Binary Emulator and Library)
@@ -252,3 +254,43 @@ Description: The Compholio Edition is a special build of the popular Wine softwa
 .
 This package includes debugging symbols useful for reporting crashes and other
 failures.
+
+Package: wine-compholio
+Architecture: i386 amd64
+Depends: wine-staging, ${misc:Depends}
+Priority: extra
+Section: oldlibs
+Description: Transitional dummy package
+ This is a transitional dummy package. It can safely be removed.
+
+Package: wine-compholio-i386
+Architecture: i386
+Depends: wine-staging-i386, ${misc:Depends}
+Priority: extra
+Section: oldlibs
+Description: Transitional dummy package
+ This is a transitional dummy package. It can safely be removed.
+
+Package: wine-compholio-amd64
+Architecture: amd64
+Depends: wine-staging-amd64, ${misc:Depends}
+Priority: extra
+Section: oldlibs
+Description: Transitional dummy package
+ This is a transitional dummy package. It can safely be removed.
+
+Package: wine-compholio-dev
+Architecture: i386 amd64
+Depends: wine-staging-dev, ${misc:Depends}
+Priority: extra
+Section: oldlibs
+Description: Transitional dummy package
+ This is a transitional dummy package. It can safely be removed.
+
+Package: wine-compholio-dbg
+Architecture: i386 amd64
+Depends: wine-staging-dbg, ${misc:Depends}
+Priority: extra
+Section: oldlibs
+Description: Transitional dummy package
+ This is a transitional dummy package. It can safely be removed.
--- a/debian/copyright
+++ b/debian/copyright
@@ -0,0 +1,226 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Wine Staging
+Source: http://www.winehq.com/ and http://www.wine-staging.com/
+
+Files: *
+Copyright: 1993-2015, the Wine project authors
+           2014-2015, the Wine Staging project authors
+License: LGPL-2.1
+
+Files: patches/fonts-Missing_Fonts/0001-fonts-Add-Liberation-Sans-as-an-Arial-replacement.patch
+Copyright: 2007, Red Hat
+License: LiberationFontLicense
+
+Files: patches/fonts-Missing_Fonts/0002-fonts-Add-WenQuanYi-Micro-Hei-as-a-Microsoft-Yahei-r.patch
+Copyright: 2008-2009, WenQuanYi Board of Trustees
+           2007, Google Corporation
+           2003-2004, Electronic Font Open Laboratory
+           1990-2003, Wada Laboratory, the University of Tokyo
+License: Apache-2 or GPL-3+ with font embedding exceptions
+
+Files: patches/fonts-Missing_Fonts/0003-fonts-Add-Courier-Prime-as-a-Courier-New-replacement
+Copyright: 2013, Quote-Unquote Apps
+License: OFL1.1
+
+License: LGPL-2.1
+ This software 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 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.
+ .
+ On Debian systems, the complete text of the GNU Library General Public
+ License can be found in /usr/share/common-licenses/LGPL-2.1 file.
+
+License: LiberationFontLicense
+ 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.
+
+License: GPL-3+ with font embedding exceptions
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ 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 General Public License for more details.
+ .
+ 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.
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ version 3 can be found in /usr/share/common-licenses/GPL-3 file.
+
+License: OFL1.1
+ Copyright (c) 2013, Quote-Unquote Apps (http://quoteunquoteapps.com),
+ with Reserved Font Name Courier Prime.
+ .
+ This Font Software is licensed under the SIL Open Font License, Version 1.1.
+ This license is copied below, and is also available with a FAQ at:
+ http://scripts.sil.org/OFL
+ .
+ PREAMBLE
+ The goals of the Open Font License (OFL) are to stimulate worldwide
+ development of collaborative font projects, to support the font creation
+ efforts of academic and linguistic communities, and to provide a free and
+ open framework in which fonts may be shared and improved in partnership
+ with others.
+ .
+ The OFL allows the licensed fonts to be used, studied, modified and
+ redistributed freely as long as they are not sold by themselves. The
+ fonts, including any derivative works, can be bundled, embedded, 
+ redistributed and/or sold with any software provided that any reserved
+ names are not used by derivative works. The fonts and derivatives,
+ however, cannot be released under any other type of license. The
+ requirement for fonts to remain under this license does not apply
+ to any document created using the fonts or their derivatives.
+ .
+ DEFINITIONS
+ "Font Software" refers to the set of files released by the Copyright
+ Holder(s) under this license and clearly marked as such. This may
+ include source files, build scripts and documentation.
+ .
+ "Reserved Font Name" refers to any names specified as such after the
+ copyright statement(s).
+ .
+ "Original Version" refers to the collection of Font Software components as
+ distributed by the Copyright Holder(s).
+ .
+ "Modified Version" refers to any derivative made by adding to, deleting,
+ or substituting -- in part or in whole -- any of the components of the
+ Original Version, by changing formats or by porting the Font Software to a
+ new environment.
+ .
+ "Author" refers to any designer, engineer, programmer, technical
+ writer or other person who contributed to the Font Software.
+ .
+ PERMISSION & CONDITIONS
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of the Font Software, to use, study, copy, merge, embed, modify,
+ redistribute, and sell modified and unmodified copies of the Font
+ Software, subject to the following conditions:
+ .
+ 1) Neither the Font Software nor any of its individual components,
+ in Original or Modified Versions, may be sold by itself.
+ .
+ 2) Original or Modified Versions of the Font Software may be bundled,
+ redistributed and/or sold with any software, provided that each copy
+ contains the above copyright notice and this license. These can be
+ included either as stand-alone text files, human-readable headers or
+ in the appropriate machine-readable metadata fields within text or
+ binary files as long as those fields can be easily viewed by the user.
+ .
+ 3) No Modified Version of the Font Software may use the Reserved Font
+ Name(s) unless explicit written permission is granted by the corresponding
+ Copyright Holder. This restriction only applies to the primary font name as
+ presented to the users.
+ .
+ 4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+ Software shall not be used to promote, endorse or advertise any
+ Modified Version, except to acknowledge the contribution(s) of the
+ Copyright Holder(s) and the Author(s) or with their explicit written
+ permission.
+ .
+ 5) The Font Software, modified or unmodified, in part or in whole,
+ must be distributed entirely under this license, and must not be
+ distributed under any other license. The requirement for fonts to
+ remain under this license does not apply to any document created
+ using the Font Software.
+ .
+ TERMINATION
+ This license becomes null and void if any of the above conditions are
+ not met.
+ .
+ DISCLAIMER
+ THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+ OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+ COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+ DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+ OTHER DEALINGS IN THE FONT SOFTWARE.
+
+License: Apache-2
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ .
+ http://www.apache.org/licenses/LICENSE-2.0
+ .
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ .
+ On Debian systems, the complete text of the Apache License 2.0 can be
+ found in /usr/share/common-licenses/Apache-2.0 file.
--- a/debian/rules
+++ b/debian/rules
@@ -14,11 +14,11 @@ endif
 override_dh_auto_configure:

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

 	# Run configure
 ifeq ($(DEB_BUILD_ARCH), amd64)
-	./configure --prefix=/opt/wine-compholio \
+	./configure --prefix=/opt/wine-staging \
 				--libdir=\$${prefix}/lib64 \
 				--mandir=\$${prefix}/share/man \
 				--infodir=\$${prefix}/share/info \
@@ -27,7 +27,7 @@ ifeq ($(DEB_BUILD_ARCH), amd64)
 				--with-xattr \
 				$(CONFFLAGS)
 else
-	./configure --prefix=/opt/wine-compholio \
+	./configure --prefix=/opt/wine-staging \
 				--libdir=\$${prefix}/lib \
 				--mandir=\$${prefix}/share/man \
 				--infodir=\$${prefix}/share/info \
@@ -42,31 +42,42 @@ override_dh_auto_test:


 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
+	dh_installdocs --link-doc=wine-staging


 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
+	rm -f debian/wine-staging/opt/wine-staging/bin/wine
+	rm -f debian/wine-staging/opt/wine-staging/bin/wine-preloader
+	rm -f debian/wine-staging/opt/wine-staging/bin/wine64
+	rm -f debian/wine-staging/opt/wine-staging/bin/wine64-preloader

+	# Create compatibility symlinks
+	mkdir -p debian/wine-compholio/opt/wine-compholio/bin
+	for _file in $$(ls "debian/wine-staging/opt/wine-staging/bin"); do \
+		ln -s "/opt/wine-staging/bin/$$_file" "debian/wine-compholio/opt/wine-compholio/bin/$$_file"; \
+	done
+
+	# Architecture specific compatibility symlinks
+ifeq ($(DEB_HOST_ARCH),amd64)
+	for _file in wine wine-preloader wine64 wine64-preloader; do \
+		ln -s "/opt/wine-staging/bin/$$_file" "debian/wine-compholio/opt/wine-compholio/bin/$$_file"; \
+	done
+else
+	for _file in wine wine-preloader; do \
+		ln -s "/opt/wine-staging/bin/$$_file" "debian/wine-compholio/opt/wine-compholio/bin/$$_file"; \
+	done
+endif

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


 override_dh_shlibdeps:
 ifeq ($(DEB_HOST_ARCH),amd64)
-	dh_shlibdeps -l $(CURDIR)/debian/tmp/opt/wine-compholio/lib64/
+	dh_shlibdeps -l $(CURDIR)/debian/tmp/opt/wine-staging/lib64/
 else
-	dh_shlibdeps -l $(CURDIR)/debian/tmp/opt/wine-compholio/lib/
+	dh_shlibdeps -l $(CURDIR)/debian/tmp/opt/wine-staging/lib/
 endif
--- a/debian/source/format
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (native)
--- a/debian/tools/README.md.in
+++ b/debian/tools/README.md.in
@@ -23,11 +23,12 @@ 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).
+instructions available on the
+[Wiki](https://github.com/wine-compholio/wine-staging/wiki/Installation).

 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`.
+run it, but instead you will have to type `/opt/wine-staging/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
--- a/debian/tools/gitapply.sh
+++ b/debian/tools/gitapply.sh
@@ -2,7 +2,7 @@
 #
 # Wrapper to apply binary patches without git.
 #
-# Copyright (C) 2014 Sebastian Lackner
+# Copyright (C) 2014-2015 Sebastian Lackner
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -75,7 +75,7 @@ filesize()


 # Parse environment variables
-while [[ $# > 0 ]]; do
+while [ "$#" -gt 0 ]; do
 	cmd="$1"; shift
 	case "$cmd" in

--- a/debian/tools/patchinstall.sh.in
+++ b/debian/tools/patchinstall.sh.in
@@ -0,0 +1,349 @@
+#!/bin/sh
+#
+# Script to automatically install all Wine Staging patches
+#
+# Copyright (C) 2015 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
+#
+
+# Show usage information
+usage()
+{{
+	echo ""
+	echo "Usage: ./patchinstall.sh [DESTDIR=path] [--all] [-W patchset] [patchset ...]"
+	echo ""
+	echo "Autogenerated script to apply all Wine Staging patches on your Wine"
+	echo "source tree. This script replaces and enhances the old method of"
+	echo "using a Makefile."
+	echo ""
+	echo "Configuration:"
+	echo "  DESTDIR=path         Specify the path to the wine source tree"
+	echo "  --all                Select all patches"
+	echo "  --help               Display this help and exit"
+	echo "  --no-patchlist       Do not apply patchlist (needed for 'wine --patches')"
+	echo "  --no-autoconf        Do not run autoreconf and tools/make_requests"
+	echo "  -W patchset          Exclude a specific patchset"
+	echo ""
+	echo "Backends:"
+	echo "  --backend=patch      Use regular 'patch' utility to apply patches (default)"
+	echo "  --backend=epatch     Use 'epatch' to apply patches (Gentoo only)"
+	echo "  --backend=git-am     Use 'git am' to apply patches"
+	echo "  --backend=git-apply  Use 'git apply' to apply patches"
+	echo "  --backend=stg        Import the patches using stacked git"
+	echo ""
+}}
+
+# Critical error, abort
+abort()
+{{
+	echo "ERROR: $1" >&2
+	exit 1
+}}
+
+# Show a warning
+warning()
+{{
+	echo "WARNING: $1" >&2
+}}
+
+{patch_helpers}
+
+# Default settings
+patch_enable_all 0
+enable_patchlist=1
+enable_autoconf=1
+patchlist="/dev/null"
+backend="patch"
+enable=1
+
+# Find location of patches
+patchdir="$(dirname "$(readlink -f "$0")")"
+if test ! -f "$patchdir/patchinstall.sh"; then
+	if test -f ./patchinstall.sh; then
+		patchdir="$(pwd)"
+	else
+		abort "Failed to find patch directory."
+	fi
+fi
+
+# Parse commandline arguments
+if test "$#" -eq 0; then
+	abort "No commandline arguments given, don't know what to do."
+fi
+
+while test "$#" -gt 0; do
+	if patch_enable "$1" "$enable"; then
+		shift
+		enable=1
+		continue
+	fi
+
+	if test "$enable" -ne 1; then
+		abort "Wrong use of -W commandline argument, expected patchname."
+	fi
+
+	case "$1" in
+		DESTDIR=*)
+			DESTDIR="${{1#*=}}"
+			shift
+			;;
+
+		--all)
+			patch_enable_all 1
+			shift
+			;;
+
+		--backend=*)
+			backend="${{1#*=}}"
+			shift
+			;;
+
+		--help)
+			usage
+			exit 0
+			;;
+
+		--no-patchlist)
+			enable_patchlist=0
+			shift
+			;;
+
+		--no-autoconf)
+			enable_autoconf=0
+			shift
+			;;
+
+		-W)
+			enable=2
+			shift
+			;;
+
+		*)
+			abort "Unknown commandline argument $1"
+			exit 1
+	esac
+done
+
+if test "$enable" -ne 1; then
+	abort "Missing argument for -W, expected patchname."
+fi
+
+# Determine DESTDIR if not explicitly specified
+if test -z "$DESTDIR" -a -f ./tools/make_requests; then
+	DESTDIR="$(pwd)"
+
+elif test ! -f "$DESTDIR/tools/make_requests"; then
+	abort "DESTDIR does not point to the Wine source tree."
+fi
+
+# Change directory to DESTDIR, epatch depends on that
+if ! cd "$DESTDIR"; then
+	abort "Unable to change directory to $DESTDIR."
+fi
+
+# Most backends will try to use git, either directly or indirectly.
+# Unfortunately this does not work when "$DESTDIR" points to a
+# subdirectory of a git tree, which has the effect that no patches
+# are applied, but the exitcode is zero. To avoid broken builds we
+# will workaround this issue or abort. For more information see
+# https://github.com/wine-compholio/wine-staging/issues/7
+test ! -d ".git" && git rev-parse --git-dir >/dev/null 2>&1
+workaround_git_bug="$?"
+
+# Apply the patches using gitapply.sh, a small wrapper around 'patch'
+if test "$backend" = "patch"; then
+
+	if test "$workaround_git_bug" -eq 0; then
+		gitapply_args="--nogit"
+	else
+		gitapply_args=""
+	fi
+
+	patch_apply_file ()
+	{{
+		echo "Applying $1"
+		if ! "$patchdir/../debian/tools/gitapply.sh" $gitapply_args < "$1"; then
+			abort "Failed to apply patch, aborting!"
+		fi
+	}}
+
+# 'epatch' backend - used on Gentoo
+elif test "$backend" = "epatch"; then
+
+	if test "$workaround_git_bug" -eq 0; then
+		gitapply_args="--nogit"
+	else
+		gitapply_args=""
+	fi
+
+	if ! command -v epatch >/dev/null 2>&1 || \
+	   ! command -v ebegin >/dev/null 2>&1 || \
+	   ! command -v eend   >/dev/null 2>&1 || \
+	   ! command -v die    >/dev/null 2>&1; then
+		abort "Shell functions epatch/ebegin/eend not found. You have to source this script from your ebuild."
+	fi
+
+	patch_apply_file ()
+	{{
+		shortname="$(basename "$1")"
+		if grep -q "^GIT binary patch" "$1"; then
+			ebegin "Applying $shortname"
+			"$patchdir/../debian/tools/gitapply.sh" $gitapply_args < "$1" || \
+				die "Failed Patch: $1!"
+			eend
+
+		else
+			epatch "$1" # epatch calls die upon failure
+		fi
+	}}
+
+# GIT backend - apply patches using 'git am'
+elif test "$backend" = "git" -o "$backend" = "git-am"; then
+
+	if test "$workaround_git_bug" -eq 0; then
+		abort "Backend 'git-am' not possible when DESTDIR points to a git subdirectory."
+	fi
+
+	patch_apply_file ()
+	{{
+		echo "Applying $1"
+		if ! git am "$1"; then
+			abort "Failed to apply patch, aborting!"
+		fi
+	}}
+
+# Git apply backend
+elif test "$backend" = "git-apply"; then
+
+	if test "$workaround_git_bug" -eq 0; then
+		abort "Backend 'git-apply' not possible when DESTDIR points to a git subdirectory."
+	fi
+
+	patch_apply_file ()
+	{{
+		echo "Applying $1"
+		if ! git apply "$1"; then
+			abort "Failed to apply patch, aborting!"
+		fi
+	}}
+
+# Stacked GIT backend - import the patches (mainly for developers)
+elif test "$backend" = "stg"; then
+
+	if test "$workaround_git_bug" -eq 0; then
+		abort "Backend 'stg' not possible when DESTDIR points to a git subdirectory."
+	fi
+
+	# Only import the regular patches, no autogenerated ones -
+	# moreover, don't run autoreconf or ./tools/make_requests.
+	enable_patchlist=0
+	enable_autoconf=0
+
+	patch_apply_file ()
+	{{
+		echo "Applying $1"
+		shortname="$(basename "$1")"
+		if ! echo "staging/$shortname" | cat - "$1" | stg import; then
+			abort "Failed to apply patch, aborting!"
+		fi
+	}}
+
+else
+	abort "Selected backend $backend not supported."
+fi
+
+patch_apply ()
+{{
+	patch_apply_file "$patchdir/$1"
+}}
+
+
+{patch_resolver}
+
+
+# If autoupdate is enabled then create a tempfile to keep track of all patches
+if test "$enable_patchlist" -eq 1; then
+	if test "$enable_Staging" -eq 1; then
+		patchlist=$(mktemp)
+		if test ! -f "$patchlist"; then
+			abort "Unable to create temporary file for patchlist."
+		fi
+	else
+		warning "Skipping generation of patchlist because 'Staging' patchset is disabled."
+		enable_patchlist=0
+	fi
+fi
+
+
+{patch_apply}
+
+
+if test "$enable_patchlist" -eq 1; then
+
+	# Generate a temporary patch containing the patchlist and apply it
+	patch_data=$(cat "$patchlist" | sort)
+	if test ! -z "$patch_data"; then
+		patch_lines=$(echo "$patch_data" | wc -l)
+		patch_lines=$((${{patch_lines}}+21))
+		cat > "$patchlist" <<EOF
+From: Wine Staging Team <webmaster@fds-team.de>
+Subject: Autogenerated patch list.
+
+diff --git a/libs/wine/config.c b/libs/wine/config.c
+index 5262c76..0a3182f 100644
+--- a/libs/wine/config.c
+++ b/libs/wine/config.c
+@@ -478,10 +478,${{patch_lines}} @@ const char *wine_get_version(void)
+     return PACKAGE_VERSION;
+ }}
+ 
+static const struct
+{{
+    const char *author;
+    const char *subject;
+    int revision;
+}}
+wine_patch_data[] =
+{{
+${{patch_data}}
+    {{ NULL, NULL, 0 }}
+}};
+
+ /* return the applied non-standard patches */
+ const void *wine_get_patches(void)
+ {{
+-    return NULL;
+    return &wine_patch_data[0];
+ }}
+ 
+ /* return the build id string */
+EOF
+		patch_apply_file "$patchlist"
+	fi
+	rm "$patchlist"
+fi
+
+if test "$enable_autoconf" -eq 1; then
+	if ! autoreconf -f; then
+		abort "'autoreconf -f' failed."
+	fi
+	if ! ./tools/make_requests; then
+		abort "'./tools/make_requests' failed."
+	fi
+fi
+
+# Success
+exit 0
--- a/debian/tools/patchlist.sh
+++ b/debian/tools/patchlist.sh
@@ -1,76 +0,0 @@
-#!/bin/sh
-PATCH_DATA=$(cat);
-PATCH_LINES=$(echo "${PATCH_DATA}" | wc -l);
-PATCH_LINES=$((${PATCH_LINES}+23));
-
-cat <<EOF
-From: FDS-Team <webmaster@fds-team.de>
-Subject: Autogenerated patch list.
-
---
-diff --git a/include/wine/library.h b/include/wine/library.h
-index 242bb69..fae73fe 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 );
-diff --git a/libs/wine/config.c b/libs/wine/config.c
-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;
- }
- 
-+static const struct
-+{
-+    const char *author;
-+    const char *subject;
-+    int revision;
-+}
-+wine_patch_data[] =
-+{
-${PATCH_DATA}
-+    { NULL, NULL, 0 }
-+};
-+
-+/* return the applied non-standard patches */
-+const void *wine_get_patches(void)
-+{
-+    return &wine_patch_data[0];
-+}
-+
- /* return the build id string */
- const char *wine_get_build_id(void)
- {
-diff --git a/libs/wine/wine.def b/libs/wine/wine.def
-index ed315bd..5b42029 100644
--- a/libs/wine/wine.def
-+++ b/libs/wine/wine.def
-@@ -83,6 +83,7 @@ EXPORTS
-     wine_get_sortkey
-     wine_get_user_name
-     wine_get_version
-+    wine_get_patches
-     wine_init
-     wine_init_argv0_path
-     wine_is_dbcs_leadbyte
-diff --git a/libs/wine/wine.map b/libs/wine/wine.map
-index 2159fac..7cb2918 100644
--- a/libs/wine/wine.map
-+++ b/libs/wine/wine.map
-@@ -90,6 +90,7 @@ WINE_1.0
-     wine_get_ss;
-     wine_get_user_name;
-     wine_get_version;
-+    wine_get_patches;
-     wine_init;
-     wine_init_argv0_path;
-     wine_is_dbcs_leadbyte;
-EOF
--- a/debian/tools/patchupdate.py
+++ b/debian/tools/patchupdate.py
--- a/debian/tools/patchutils.py
+++ b/debian/tools/patchutils.py
@@ -40,6 +40,14 @@ class PatchApplyError(RuntimeError):
    """Failed to apply/merge patch."""
    pass

+class PatchDiffError(RuntimeError):
+    """Failed to compute diff."""
+    pass
+
+class CParserError(RuntimeError):
+    """Unable to parse C source."""
+    pass
+
 class PatchObject(object):
    def __init__(self, filename, header):
        self.patch_author       = header['author']
@@ -362,3 +370,299 @@ def apply_patch(original, patchfile, reverse=False, fuzz=2):
    except:
        os.unlink(result.name)
        raise
+
+def generate_ifdef_patch(original, patched, ifdef):
+    """Generate a patch which adds #ifdef where necessary to keep both the original and patched version."""
+
+    def _preprocess_source(fp):
+        """Simple C preprocessor to determine where we can safely add #ifdef instructions."""
+
+        _re_state0 = re.compile("(\"|/[/*])")
+        _re_state1 = re.compile("(\\\"|\")")
+        _re_state2 = re.compile("\\*/")
+
+        # We need to read the original file, and figure out where lines can be splitted
+        lines = []
+        original.seek(0)
+        for line in original:
+            lines.append(line.rstrip("\n"))
+
+        split = set([0])
+        state = 0
+
+        i = 0
+        while i < len(lines):
+
+            # Read a full line (and handle line continuation)
+            line = lines[i]
+            i += 1
+            while line.endswith("\\"):
+                if i >= len(lines):
+                    raise CParserError("Unexpected end of file.")
+                line = line[:-1] + lines[i]
+                i += 1
+
+            # To find out where we can add our #ifdef tags we use a simple
+            # statemachine. This allows finding the beginning of a multiline
+            # instruction or comment.
+            j = 0
+            while True:
+
+                # State 0: No context
+                if state == 0:
+                    match = _re_state0.search(line, j)
+                    if match is None: break
+
+                    if match.group(0) == "\"":
+                        state = 1 # Begin of string
+                    elif match.group(0) == "/*":
+                        state = 2 # Begin of comment
+                    elif match.group(0) == "//":
+                        break # Rest of the line is a comment, which can be safely ignored
+                    else:
+                        assert 0
+
+                # State 1: Inside of string
+                elif state == 1:
+                    match = _re_state1.search(line, j)
+                    if match is None:
+                        raise CParserError("Line ended in the middle of a string.")
+
+                    if match.group(0) == "\"":
+                        state = 0 # End of string
+                    elif match.group(0) != "\\\"":
+                        assert 0
+
+                # State 2: Multiline comment
+                elif state == 2:
+                    match = _re_state2.search(line, j)
+                    if match is None: break
+
+                    if match.group(0) == "*/":
+                        state = 0 # End of comment
+                    else:
+                        assert 0
+
+                else:
+                    raise CParserError("Internal state error.")
+                j = match.end()
+
+            # Only in state 0 (no context) we can split here
+            if state == 0:
+                split.add(i)
+
+        # Ensure that the last comment is properly terminated
+        if state != 0:
+            raise CParserError("Unexpected end of file.")
+        return lines, split
+
+    #
+    # The basic of idea of this algorithm is as following:
+    #
+    # (1) determine diff between original file and patched file
+    # (2) run the preprocessor, to determine where #ifdefs can be safely added
+    # (3) use diff and preprocessor information to create a merged version containing #ifdefs
+    # (4) create another diff to apply the changes on the patched version
+    #
+
+    with tempfile.NamedTemporaryFile() as diff:
+        exitcode = subprocess.call(["diff", "-u", original.name, patched.name],
+                                   stdout=diff, stderr=_devnull)
+        if exitcode == 0:
+            return None
+        elif exitcode != 1:
+            raise PatchDiffError("Failed to compute diff (exitcode %d)." % exitcode)
+
+        # Preprocess the original C source
+        lines, split = _preprocess_source(original)
+
+        # Parse the created diff file
+        diff.flush()
+        diff.seek(0)
+
+        # We expect this output format from 'diff', if this is not the case things might go wrong.
+        line = diff.readline()
+        assert line.startswith("--- ")
+        line = diff.readline()
+        assert line.startswith("+++ ")
+
+        hunks = []
+        while True:
+            line = diff.readline()
+            if line == "":
+                break
+
+            # Parse each hunk, and extract the srclines and dstlines. This algorithm is very
+            # similar to _read_single_patch.
+            if not line.startswith("@@ -"):
+                raise PatchParserError("Unable to parse line '%s'." % line)
+
+            r = re.match("^@@ -(([0-9]+),)?([0-9]+) \+(([0-9]+),)?([0-9]+) @@", line)
+            if not r: raise PatchParserError("Unable to parse hunk header '%s'." % line)
+            srcpos = max(int(r.group(2)) - 1, 0) if r.group(2) else 0
+            dstpos = max(int(r.group(5)) - 1, 0) if r.group(5) else 0
+            srclines, dstlines = int(r.group(3)), int(r.group(6))
+            if srclines <= 0 and dstlines <= 0:
+                raise PatchParserError("Empty hunk doesn't make sense.")
+
+            srcdata = []
+            dstdata = []
+
+            try:
+                while srclines > 0 or dstlines > 0:
+                    line = diff.readline().rstrip("\n")
+                    if line[0] == " ":
+                        if srclines == 0 or dstlines == 0:
+                            raise PatchParserError("Corrupted patch.")
+                        srcdata.append(line[1:])
+                        dstdata.append(line[1:])
+                        srclines -= 1
+                        dstlines -= 1
+                    elif line[0] == "-":
+                        if srclines == 0:
+                            raise PatchParserError("Corrupted patch.")
+                        srcdata.append(line[1:])
+                        srclines -= 1
+                    elif line[0] == "+":
+                        if dstlines == 0:
+                            raise PatchParserError("Corrupted patch.")
+                        dstdata.append(line[1:])
+                        dstlines -= 1
+                    elif line[0] == "\\":
+                        pass # ignore
+                    else:
+                        raise PatchParserError("Unexpected line in hunk.")
+            except IndexError: # triggered by ""[0]
+                raise PatchParserError("Truncated patch.")
+
+            # Ensure that the patch would really apply in practice
+            if lines[srcpos:srcpos + len(srcdata)] != srcdata:
+                raise PatchParserError("Patch failed to apply.")
+
+            # Strip common lines from the beginning and end
+            while len(srcdata) > 0 and len(dstdata) > 0 and \
+                    srcdata[0] == dstdata[0]:
+                srcdata.pop(0)
+                dstdata.pop(0)
+                srcpos += 1
+                dstpos += 1
+
+            while len(srcdata) > 0 and len(dstdata) > 0 and \
+                    srcdata[-1] == dstdata[-1]:
+                srcdata.pop()
+                dstdata.pop()
+
+            # Ensure that diff generated valid output
+            assert len(srcdata) > 0 or len(dstdata) > 0
+
+            # If this is the first hunk, then check if we have to extend it at the beginning
+            if len(hunks) == 0:
+                while srcpos > 0 and srcpos not in split:
+                    srcpos -= 1
+                    srcdata.insert(0, lines[srcpos])
+                    dstdata.insert(0, lines[srcpos])
+                hunks.append((srcpos, dstpos, srcdata, dstdata))
+
+            # Check if we can merge with the previous hunk
+            else:
+                prev_srcpos, prev_dstpos, prev_srcdata, prev_dstdata = hunks[-1]
+                prev_endpos = prev_srcpos + len(prev_srcdata)
+
+                found = 0
+                for i in xrange(prev_endpos, srcpos):
+                    if i in split:
+                        found += 1
+
+                # At least two possible splitting positions inbetween
+                if found >= 2:
+                    while prev_endpos not in split:
+                        prev_srcdata.append(lines[prev_endpos])
+                        prev_dstdata.append(lines[prev_endpos])
+                        prev_endpos += 1
+
+                    while srcpos not in split:
+                        srcpos -= 1
+                        srcdata.insert(0, lines[srcpos])
+                        dstdata.insert(0, lines[srcpos])
+                    hunks.append((srcpos, dstpos, srcdata, dstdata))
+
+                # Merge hunks
+                else:
+                    while prev_endpos < srcpos:
+                        prev_srcdata.append(lines[prev_endpos])
+                        prev_dstdata.append(lines[prev_endpos])
+                        prev_endpos += 1
+                    assert prev_dstpos + len(prev_dstdata) == dstpos
+                    hunks[-1][2] += srcdata
+                    hunks[-1][3] += dstdata
+
+            # Ready with this hunk
+            pass
+
+        # We might have to extend the last hunk
+        if len(hunks):
+            prev_srcpos, prev_dstpos, prev_srcdata, prev_dstdata = hunks[-1]
+            prev_endpos = prev_srcpos + len(prev_srcdata)
+
+            while prev_endpos < len(lines) and prev_endpos not in split:
+                prev_srcdata.append(lines[prev_endpos])
+                prev_dstdata.append(lines[prev_endpos])
+                prev_endpos += 1
+
+        # We don't need the diff anymore, all hunks are in memory
+        diff.close()
+
+    # Generate resulting file with #ifdefs
+    with tempfile.NamedTemporaryFile() as intermediate:
+
+        pos = 0
+        while len(hunks):
+            srcpos, dstpos, srcdata, dstdata = hunks.pop(0)
+            if pos < srcpos:
+                intermediate.write("\n".join(lines[pos:srcpos]))
+                intermediate.write("\n")
+
+            if len(srcdata) and len(dstdata):
+                intermediate.write("#if defined(%s)\n" % ifdef)
+                intermediate.write("\n".join(dstdata))
+                intermediate.write("\n#else  /* %s */\n" % ifdef)
+                intermediate.write("\n".join(srcdata))
+                intermediate.write("\n#endif /* %s */\n" % ifdef)
+
+            elif len(srcdata):
+                intermediate.write("#if !defined(%s)\n" % ifdef)
+                intermediate.write("\n".join(srcdata))
+                intermediate.write("\n#endif /* %s */\n" % ifdef)
+
+            elif len(dstdata):
+                intermediate.write("#if defined(%s)\n" % ifdef)
+                intermediate.write("\n".join(dstdata))
+                intermediate.write("\n#endif /* %s */\n" % ifdef)
+
+            else:
+                assert 0
+            pos = srcpos + len(srcdata)
+
+        if pos < len(lines):
+            intermediate.write("\n".join(lines[pos:]))
+            intermediate.write("\n")
+        intermediate.flush()
+
+        # Now we can finally compute the diff between the patched file and our intermediate file
+        diff = tempfile.NamedTemporaryFile()
+        exitcode = subprocess.call(["diff", "-u", patched.name, intermediate.name],
+                                   stdout=diff, stderr=_devnull)
+        if exitcode != 1: # exitcode 0 cannot (=shouldn't) happen in this situation
+            raise PatchDiffError("Failed to compute diff (exitcode %d)." % exitcode)
+
+        diff.flush()
+        diff.seek(0)
+
+        # We expect this output format from 'diff', if this is not the case things might go wrong.
+        line = diff.readline()
+        assert line.startswith("--- ")
+        line = diff.readline()
+        assert line.startswith("+++ ")
+
+    # Return the final diff
+    return diff
--- a/debian/wine-compholio-amd64.install
+++ b/debian/wine-compholio-amd64.install
@@ -1,4 +0,0 @@
-/opt/wine-compholio/lib64/libwine.so*
-/opt/wine-compholio/lib64/wine
-/opt/wine-compholio/bin/wine64
-/opt/wine-compholio/bin/wine64-preloader
--- a/debian/wine-compholio-dev.install
+++ b/debian/wine-compholio-dev.install
@@ -1 +0,0 @@
-/opt/wine-compholio/include
--- a/debian/wine-compholio-i386.install
+++ b/debian/wine-compholio-i386.install
@@ -1,4 +0,0 @@
-/opt/wine-compholio/lib/libwine.so*
-/opt/wine-compholio/lib/wine
-/opt/wine-compholio/bin/wine
-/opt/wine-compholio/bin/wine-preloader
--- a/debian/wine-compholio.install
+++ b/debian/wine-compholio.install
@@ -1,2 +0,0 @@
-/opt/wine-compholio/bin
-/opt/wine-compholio/share
--- a/debian/wine-staging-amd64.install
+++ b/debian/wine-staging-amd64.install
@@ -0,0 +1,4 @@
+/opt/wine-staging/lib64/libwine.so*
+/opt/wine-staging/lib64/wine
+/opt/wine-staging/bin/wine64
+/opt/wine-staging/bin/wine64-preloader
--- a/Show More
+++ b/Show More