Release 1.7.40.

More improvements to the Debian packaging files.

README.md

@@ -1,25 +1,26 @@
 What is Wine Staging?
-=====================
+---------------------
 
 **Warning: Do not report bugs at bugs.winehq.org when using this version!
 Please take a look [here](http://bugs.wine-staging.com) for more information
 about how to report bugs.**
 
 **Wine Staging** (formerly wine-compholio) is a special wine version containing
-bug fixes and features that are not yet available in regular wine versions. The
-idea behind Wine Staging is to provide new features faster to end users and to
+bug fixes and features, which are not yet available in regular wine versions.
+The idea of Wine Staging is to provide new features faster to end users and to
 give developers the possibility to discuss and improve their patches before
 they are sent upstream. We also intend to create a community of wine developers
 to share experience and to make it easier for beginners to start hacking on
-wine.
+wine. More information about Wine Staging can also be found on our website
+[wine-staging.com](http://wine-staging.com).
 
-Although we are reviewing all patches before adding them, you may encounter
-additional bugs, which are not present in regular wine. Make sure to report
-such issues in our bug tracker instead of winehq.org so that we can try to
-solve them in future versions. Thanks!
+Although we are reviewing and testing all patches before adding them, you may
+encounter additional bugs, which are not present in vanilla wine. Make sure to
+report such issues in our bug tracker instead of winehq.org so that we can try
+to solve them in future versions. Thanks!
 
 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
@@ -36,9 +37,16 @@ Wine. All those differences are also documented on the
 
 
 Included bug fixes and improvements
-===================================
+-----------------------------------
 
-**Bugs fixed in Wine Staging 1.7.39 [205]:**
+**Bug fixes and features in Wine Staging 1.7.40 [220]:**
+
+*Note: The following list only contains features and bug fixes which are not
+yet available in vanilla Wine. They are removed from the list as soon as they
+are included upstream. The list also includes features and fixes from previous
+releases, take a look at the
+[changelog](https://github.com/wine-compholio/wine-staging/blob/master/debian/changelog)
+for more details.*
 
 * 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
@@ -47,6 +55,7 @@ Included bug fixes and improvements
 * 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 fltmgr.sys (filter manager driver) ([Wine Bug #23583](https://bugs.winehq.org/show_bug.cgi?id=23583))
 * Add stub for D3DXComputeNormalMap
 * Add stub for D3DXComputeTangentFrameEx ([Wine Bug #31984](https://bugs.winehq.org/show_bug.cgi?id=31984))
 * Add stub for D3DXIntersect
@@ -58,15 +67,20 @@ Included bug fixes and improvements
 * Add stub for ntoskrnl.ExReleaseResourceForThread
 * Add stub for ntoskrnl.KeWaitForMultipleObjects
 * Add stub for ntoskrnl.Mm{Map,Unmap}LockedPages
+* Add stub for ntoskrnl.PsRemoveLoadImageNotifyRoutine
+* Add stub for setupapi.SetupDiSelectBestCompatDrv ([Wine Bug #32088](https://bugs.winehq.org/show_bug.cgi?id=32088))
 * Add stub for wininet.ParseX509EncodedCertificateForListBoxEntry ([Wine Bug #29842](https://bugs.winehq.org/show_bug.cgi?id=29842))
 * Add stubs for D3DXCreateAnimationController interface
+* Add stubs for Power[Set|Clear]Request
 * 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 NULL pointer as keystate argument in ToUnicodeEx ([Wine Bug #38353](https://bugs.winehq.org/show_bug.cgi?id=38353))
 * 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))
 * 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 open files/directories without any access rights in order to query attributes
 * 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))
@@ -74,17 +88,17 @@ Included bug fixes and improvements
 * 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))
+* Avoid spam of FIXME messages for PsLookupProcessByProcessId stub ([Wine Bug #36821](https://bugs.winehq.org/show_bug.cgi?id=36821))
 * 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))
 * 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 return an error in WS_select when EINTR happens during timeout
 * 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))
 * Enforce that surfaces are flushed after ReleaseDC
@@ -97,30 +111,32 @@ Included bug fixes and improvements
 * 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 calculation of 3D sound source ([Wine Bug #38041](https://bugs.winehq.org/show_bug.cgi?id=38041))
 * 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 compatibility of Uplay with gnutls28 ([Wine Bug #38134](https://bugs.winehq.org/show_bug.cgi?id=38134))
 * 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 device paths in HKLM\SYSTEM\MountedDevices ([Wine Bug #38235](https://bugs.winehq.org/show_bug.cgi?id=38235))
 * 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 ANSI NTLM credentials ([Wine Bug #37063](https://bugs.winehq.org/show_bug.cgi?id=37063))
 * 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 handling of window attributes for WS_EX_LAYERED | WS_EX_COMPOSITED ([Wine Bug #37876](https://bugs.winehq.org/show_bug.cgi?id=37876))
+* Fix invalid memory access in get_registry_locale_info ([Wine Bug #38344](https://bugs.winehq.org/show_bug.cgi?id=38344))
 * 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 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
@@ -136,21 +152,24 @@ Included bug fixes and improvements
 * 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))
+* Ignore unsupported job object restrictions ([Wine Bug #38351](https://bugs.winehq.org/show_bug.cgi?id=38351))
 * Implement D3DXGetShaderOutputSemantics
+* Implement DDENUMSURFACES_CANBECREATED in IDirectDraw7::EnumSurfaces ([Wine Bug #17233](https://bugs.winehq.org/show_bug.cgi?id=17233))
 * 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 empty enumerator for IWiaDevMgr::EnumDeviceInfo ([Wine Bug #27775](https://bugs.winehq.org/show_bug.cgi?id=27775))
 * 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 mscoree._CorValidateImage for mono runtime
 * Implement ntoskrnl driver testing framework.
 * Implement ntoskrnl.KeInitializeMutex
+* Implement proper handling of CLI .NET images in Wine library loader
 * Implement stub for ntoskrnl.IoGetAttachedDeviceReference
 * Implement stub for ntoskrnl.KeDelayExecutionThread.
 * Implement stubs for ntoskrnl.Ex{Acquire,Release}FastMutexUnsafe
@@ -185,13 +204,17 @@ Included bug fixes and improvements
 * 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 device type for cd devices without medium
 * 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))
+* Show unmounted devices in winecfg and allow changing the unix path
+* Software support for Environmental Audio Extensions (EAX)
 * 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 8bpp grayscale TIFF images with 8bpp alpha channel ([Wine Bug #38027](https://bugs.winehq.org/show_bug.cgi?id=38027))
 * 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))
@@ -220,11 +243,11 @@ Included bug fixes and improvements
 * 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 TransmitFile ([Wine Bug #5048](https://bugs.winehq.org/show_bug.cgi?id=5048))
 * 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 linux priority levels for faster performance
 * 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))

debian/changelog

@@ -1,3 +1,41 @@
+wine-staging (1.7.40) unstable; 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).
+  * Added patch to return correct device type for cd devices without medium.
+  * Added patch to fix device paths in HKLM\SYSTEM\MountedDevices.
+  * Added patch to show unmounted devices in winecfg and allow changing the unix path.
+  * Added patch for support of 8bpp grayscale TIFF images with 8bpp alpha channel (replaces previous stub).
+  * Added patch to implement support for linux priority levels (by Joakim Hernberg, various modifications by Sebastian Lackner).
+  * Added patch to implement mscoree._CorValidateImage for mono runtime.
+  * Added patch to implement proper handling of CLI .NET images in Wine library loader.
+  * Added patch to stub ntoskrnl.PsRemoveLoadImageNotifyRoutine
+  * Added patch to fix invalid memory access in get_registry_locale_info.
+  * Added patch to allow to open files/directories without any access rights in order to query attributes.
+  * Added patch to implement DDENUMSURFACES_CANBECREATED in IDirectDraw7::EnumSurfaces and fix some bugs.
+  * Added patch to ignore unsupported job object restrictions.
+  * Added patch to allow NULL pointer as keystate argument in ToUnicodeEx.
+  * Added patch with stub for setupapi.SetupDiSelectBestCompatDrv.
+  * 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).
+  * Removed tests for job objects (accepted upstream).
+  * Removed patch to fix various bugs in RtlUnwindEx on x86_64 (accepted upstream).
+  * Partially removed patches for job objects (accepted upstream).
+ -- Sebastian Lackner <sebastian@fds-team.de>  Sun, 05 Apr 2015 01:28:45 +0200
+
 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).

debian/control

@@ -7,7 +7,6 @@ Build-Depends: autotools-dev,
                autoconf,
                bison,
                bsdmainutils,
-               coreutils,
                debhelper (>= 7),
                docbook-to-man,
                docbook-utils,
@@ -17,7 +16,6 @@ Build-Depends: autotools-dev,
                gawk,
                gcc-4.5 | gcc-4.7 | ubuntu-desktop (<< 1.207),
                gettext,
-               gzip,
                libacl1-dev,
                libasound2-dev,
                libcapi20-dev,
@@ -63,12 +61,13 @@ Build-Depends: autotools-dev,
                libxxf86vm-dev,
                linux-kernel-headers,
                linux-libc-dev,
+               patch,
+               perl,
                prelink,
-               quilt (>= 0.46-7~),
                sharutils,
                unixodbc-dev,
                x11proto-xinerama-dev
-Standards-Version: 3.9.2
+Standards-Version: 3.9.5
 
 Package: wine-staging-i386
 Architecture: i386
@@ -111,7 +110,8 @@ Recommends: libcapi20-3,
             libgsm1
 Section: otherosfs
 Priority: optional
-Description: The Staging 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)
@@ -122,9 +122,9 @@ Description: The Staging Edition is a special build of the popular Wine software
  .
  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-staging-amd64
 Architecture: amd64
@@ -167,7 +167,8 @@ Recommends: libcapi20-3,
             libgsm1
 Section: otherosfs
 Priority: optional
-Description: The Staging 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)
@@ -178,9 +179,9 @@ Description: The Staging Edition is a special build of the popular Wine software
  .
  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-staging
 Architecture: i386 amd64
@@ -191,7 +192,8 @@ Depends:    ${misc:Depends}, ${shlibs:Depends},
             wine-staging-amd64 (= ${binary:Version}) [amd64],
 Section: otherosfs
 Priority: optional
-Description: The Staging 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)
@@ -200,13 +202,13 @@ Description: The Staging Edition is a special build of the popular Wine software
  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-staging-dev
 Architecture: i386 amd64
@@ -217,7 +219,8 @@ Depends:    libc6-dev,
             wine-staging-amd64 (= ${binary:Version}) [amd64],
 Section: libdevel
 Priority: optional
-Description: The Staging 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)
@@ -238,7 +241,8 @@ Depends:    ${shlibs:Depends},
             wine-staging-amd64 (= ${binary:Version}) [amd64],
 Section: debug
 Priority: optional
-Description: The Staging 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)
@@ -250,6 +254,40 @@ Description: The Staging Edition is a special build of the popular Wine software
  This package includes debugging symbols useful for reporting crashes and other
  failures.
 
+Package: wine-staging-compat
+Architecture: i386 amd64
+Depends: wine-staging, ${misc:Depends}
+Section: otherosfs
+Priority: optional
+Replaces:   wine, wine1.4, wine1.5, wine1.6, wine1.7, wine-i386, wine1.4-i386,
+            wine1.5-i386, wine1.6-i386, wine1.7-i386, ine-amd64, wine1.4-amd64,
+            wine1.5-amd64, wine1.6-amd64, wine1.7-amd64
+Conflicts:  wine, wine-i386, wine-amd64
+Provides:   wine, wine1.4, wine1.5, wine1.6, wine1.7, wine-i386, wine1.4-i386,
+            wine1.5-i386, wine1.6-i386, wine1.7-i386, wine-amd64 [amd64],
+            wine1.4-amd64 [amd64], wine1.5-amd64 [amd64], wine1.6-amd64 [amd64],
+            wine1.7-amd64 [amd64]
+Description: special build of the popular Wine software
+ The Staging Edition is a special build of the popular Wine software
+ with patches representing our current staging tree for Wine.
+ .
+ Microsoft Windows Compatibility Layer (Binary Emulator and Library)
+ Wine is a compatibility layer for running Windows applications on Linux.
+ Applications are run at full speed without the need of cpu emulation. Wine
+ does not require Microsoft Windows, however it can use native system dll
+ files in place of its own if they are available.
+ .
+ This package includes a program loader for running unmodified Windows
+ executables as well as the Wine project's free version of the Windows API
+ for running programs ported from Windows.
+ .
+ This package is based on a recent Wine beta.  While many more applications
+ will work, there may be some loss of functionality compared with the stable
+ release provided by the regular wine package.
+ .
+ This compatibility package allows to use Wine Staging system-wide as
+ the default Wine version.
+
 Package: wine-compholio
 Architecture: i386 amd64
 Depends: wine-staging, ${misc:Depends}

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.

debian/rules

@@ -56,18 +56,23 @@ override_dh_install:
 
 	# Create compatibility symlinks
 	mkdir -p debian/wine-compholio/opt/wine-compholio/bin
+	mkdir -p debian/wine-staging-compat/usr/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"; \
+		ln -s "/opt/wine-staging/bin/$$_file" "debian/wine-staging-compat/usr/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"; \
+		ln -s "/opt/wine-staging/bin/$$_file" "debian/wine-staging-compat/usr/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"; \
+		ln -s "/opt/wine-staging/bin/$$_file" "debian/wine-staging-compat/usr/bin/$$_file"; \
 	done
 endif
 

debian/source/format

@@ -0,0 +1 @@
+3.0 (native)

debian/tools/Makefile.in

@@ -1,70 +0,0 @@
-#
-# This file is automatically generated, DO NOT EDIT!
-#
-
-.NOTPARALLEL:
-
-CURDIR    ?= ${{.CURDIR}}
-PATCH     := $(CURDIR)/../debian/tools/gitapply.sh
-APPLY      = (cd "$(DESTDIR)" && $(PATCH))
-APPLY_FILE = @echo "Applying $(1)"; $(APPLY) < "$(CURDIR)/$(1)"
-
-#
-# This Makefile understands the following targets:
-#
-# install (default):  apply patches to directory provided by DESTDIR
-# install-git:        as above, but use 'git am' to apply the patches
-# series:             create a 'series' file containing the patch order
-# clean:              delete autogenerated and temporary files
-#
-
-PATCHLIST := \
-{patchlist}
-
-.PHONY: install
-install: $(PATCHLIST)
-	cat *.ok | sort | $(CURDIR)/../debian/tools/patchlist.sh | $(APPLY)
-	cd $(DESTDIR) && autoreconf -f
-	cd $(DESTDIR) && ./tools/make_requests
-
-.PHONY: install-git
-install-git: PATCH := git am
-install-git: install
-
-series: APPLY_FILE = @echo "$(1)" >> series
-series: $(PATCHLIST)
-	@cat *.ok | sort | $(CURDIR)/../debian/tools/patchlist.sh > patchlist.diff
-	@echo "patchlist.diff" >> series
-	@( \
-		echo ""; \
-		echo "The 'series' file was created in current directory. Please note that"; \
-		echo "'patchlist.diff' is autogenerated based on your selection of patches and not"; \
-		echo "included in this repository - keep in mind to update it on every release."; \
-		echo ""; \
-		echo "Moreover, depending on which patches you have selected, you will have to run"; \
-		echo "'autoreconf -f' and/or './tools/make_requests' after applying them."; \
-		echo ""; \
-		binary=0; \
-		while IFS= read -r line; do \
-			if grep -q "^GIT binary patch" "$$line"; then \
-				binary=1; break; \
-			fi \
-		done < series; \
-		if [ "$$binary" -ne 0 ]; then \
-			echo "The following files contain binary patches and cannot be applied with the"; \
-			echo "regular 'patch' commandline tool:"; \
-			echo ""; \
-			while IFS= read -r line; do \
-				grep -q "^GIT binary patch" "$$line" && echo "$$line"; \
-			done < series; \
-			echo ""; \
-			echo "Please use 'git apply' or '../debian/tools/gitapply.sh' from this repository."; \
-			echo ""; \
-		fi \
-	)
-
-.PHONY: clean
-clean:
-	rm -f series patchlist.diff
-	rm -f *.ok
-

debian/tools/README.md.in

@@ -1,25 +1,26 @@
 What is Wine Staging?
-=====================
+---------------------
 
 **Warning: Do not report bugs at bugs.winehq.org when using this version!
 Please take a look [here](http://bugs.wine-staging.com) for more information
 about how to report bugs.**
 
 **Wine Staging** (formerly wine-compholio) is a special wine version containing
-bug fixes and features that are not yet available in regular wine versions. The
-idea behind Wine Staging is to provide new features faster to end users and to
+bug fixes and features, which are not yet available in regular wine versions.
+The idea of Wine Staging is to provide new features faster to end users and to
 give developers the possibility to discuss and improve their patches before
 they are sent upstream. We also intend to create a community of wine developers
 to share experience and to make it easier for beginners to start hacking on
-wine.
+wine. More information about Wine Staging can also be found on our website
+[wine-staging.com](http://wine-staging.com).
 
-Although we are reviewing all patches before adding them, you may encounter
-additional bugs, which are not present in regular wine. Make sure to report
-such issues in our bug tracker instead of winehq.org so that we can try to
-solve them in future versions. Thanks!
+Although we are reviewing and testing all patches before adding them, you may
+encounter additional bugs, which are not present in vanilla wine. Make sure to
+report such issues in our bug tracker instead of winehq.org so that we can try
+to solve them in future versions. Thanks!
 
 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
@@ -36,7 +37,7 @@ Wine. All those differences are also documented on the
 
 
 Included bug fixes and improvements
-===================================
+-----------------------------------
 
 {fixes}
 

debian/tools/patchinstall.sh.in

@@ -175,7 +175,7 @@ if test "$backend" = "patch"; then
 	patch_apply_file ()
 	{{
 		echo "Applying $1"
-		if ! "$patchdir/../debian/tools/gitapply.sh" $gitapply_args < "$1"; then
+		if ! "$patchdir/gitapply.sh" $gitapply_args < "$1"; then
 			abort "Failed to apply patch, aborting!"
 		fi
 	}}
@@ -201,7 +201,7 @@ elif test "$backend" = "epatch"; then
 		shortname="$(basename "$1")"
 		if grep -q "^GIT binary patch" "$1"; then
 			ebegin "Applying $shortname"
-			"$patchdir/../debian/tools/gitapply.sh" $gitapply_args < "$1" || \
+			"$patchdir/gitapply.sh" $gitapply_args < "$1" || \
 				die "Failed Patch: $1!"
 			eend
 

debian/tools/patchupdate.py

@@ -503,13 +503,36 @@ def generate_script(all_patches):
     # Check dependencies
     pool = multiprocessing.pool.ThreadPool(processes=4)
     try:
+
+        # Checking all dependencies takes a very long time, so to improve development speed,
+        # run a first quick check with all patches enabled.
+        with progressbar.ProgressBar(desc="pre-check ...", total=len(modified_files)) as progress:
+            for k, (filename, indices) in enumerate(modified_files.iteritems()):
+
+                # If one of patches is a binary patch, then we cannot / won't verify it - require dependencies in this case
+                if contains_binary_patch(all_patches, indices, filename):
+                    if not causal_time_relation_any(all_patches, indices):
+                        raise PatchUpdaterError("Because of binary patch modifying file %s the following patches need explicit dependencies: %s" %
+                                                (filename, ", ".join([all_patches[i].name for i in indices])))
+                    continue
+
+                original         = get_wine_file(filename)
+                selected_patches = select_patches(all_patches, indices, filename)
+                set_apply        = [(i, all_patches[i]) for i in indices]
+
+                try:
+                    for i, patch in set_apply:
+                        original = patchutils.apply_patch(original, selected_patches[i][1], fuzz=0)
+                except patchutils.PatchApplyError:
+                    progress.finish("<failed to apply>")
+                    raise PatchUpdaterError("Changes to file %s don't apply: %s" %
+                                            (filename, ", ".join([all_patches[i].name for i in indices])))
+                progress.update(k)
+
+        # More detailed checks, required to make sure that dependencies are set correctly
         for filename, indices in modified_files.iteritems():
 
-            # If one of patches is a binary patch, then we cannot / won't verify it - require dependencies in this case
             if contains_binary_patch(all_patches, indices, filename):
-                if not causal_time_relation_any(all_patches, indices):
-                    raise PatchUpdaterError("Because of binary patch modifying file %s the following patches need explicit dependencies: %s" %
-                                            (filename, ", ".join([all_patches[i].name for i in indices])))
                 continue
 
             original_content = get_wine_file(filename)
@@ -676,13 +699,20 @@ def generate_markdown(all_patches, stable_patches, stable_compholio_version):
     # Generate information for current version
     lines = []
     if len(new_fixes):
-        lines.append("**Bugfixes and features included in the next upcoming release [%d]:**" % len(new_fixes))
+        lines.append("**Bug fixes and features included in the next upcoming release [%d]:**" % len(new_fixes))
         lines.append("")
         for mode, bugid, bugname in sorted(new_fixes, key=lambda x: x[2]):
             lines.append(_format_bug(mode, bugid, bugname))
         lines.append("")
         lines.append("")
-    lines.append("**Bugs fixed in Wine Staging %s [%d]:**" % (stable_compholio_version, len(old_fixes)))
+    lines.append("**Bug fixes and features in Wine Staging %s [%d]:**" % (stable_compholio_version, len(old_fixes)))
+    lines.append("")
+    lines.append("*Note: The following list only contains features and bug fixes which are not")
+    lines.append("yet available in vanilla Wine. They are removed from the list as soon as they")
+    lines.append("are included upstream. The list also includes features and fixes from previous")
+    lines.append("releases, take a look at the")
+    lines.append("[changelog](https://github.com/wine-compholio/wine-staging/blob/master/debian/changelog)")
+    lines.append("for more details.*")
     lines.append("")
     for mode, bugid, bugname in sorted(old_fixes, key=lambda x: x[2]):
         lines.append(_format_bug(mode, bugid, bugname))

debian/tools/progressbar.py

@@ -29,9 +29,14 @@ import termios
 def _sig_winch(signum=None, frame=None):
     """Signal handler for SIGWINCH."""
     global _term_width
-    h, w, hp, wp = struct.unpack('HHHH', fcntl.ioctl(sys.stdout.fileno(),
-                   termios.TIOCGWINSZ, struct.pack('HHHH', 0, 0, 0, 0)))
-    _term_width  = w
+    try:
+        h, w, hp, wp = struct.unpack('HHHH', fcntl.ioctl(sys.stdout.fileno(),
+                       termios.TIOCGWINSZ, struct.pack('HHHH', 0, 0, 0, 0)))
+        _term_width  = w
+    except IOError:
+        # ignore 'IOError: [Errno 25] Inappropriate ioctl for device',
+        # which can occur when resizing the window while the output is redirected
+        pass
 
 try:
     _sig_winch()

debian/wine-staging-amd64.lintian-overrides

@@ -0,0 +1,3 @@
+# Wine preloader needs static linking to reserve memory and work properly, see
+# the comments at loader/preloader.c for a fuller explanation
+wine-staging-amd64 binary: statically-linked-binary opt/wine-staging/bin/wine64-preloader

debian/wine-staging-i386.lintian-overrides

@@ -0,0 +1,3 @@
+# Wine preloader needs static linking to reserve memory and work properly, see
+# the comments at loader/preloader.c for a fuller explanation
+wine-staging-i386 binary: statically-linked-binary opt/wine-staging/bin/wine-preloader

debian/wine-staging.docs

@@ -1,9 +1,4 @@
 documentation/README.*
 ANNOUNCE
 AUTHORS
-LICENSE
-COPYING.LIB
-COPYING.arial
-COPYING.cour
-COPYING.msyh
 README

patches/advapi32-Revert_DACL/0001-Revert-advapi32-Add-DACL-inheritance-support-in-SetS.patch

@@ -0,0 +1,216 @@
+From e498b901443fffeb344b2dcc4627da4b520f0af9 Mon Sep 17 00:00:00 2001
+From: Sebastian Lackner <sebastian@fds-team.de>
+Date: Fri, 27 Mar 2015 15:32:04 +0100
+Subject: Revert "advapi32: Add DACL inheritance support in SetSecurityInfo."
+
+This reverts commit f974d726720eff4fcd7371bca95e6cdcc4b4a848.
+---
+ dlls/advapi32/security.c       | 130 +----------------------------------------
+ dlls/advapi32/tests/security.c |  23 ++++----
+ 2 files changed, 14 insertions(+), 139 deletions(-)
+
+diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c
+index 2cd3f74..e8cdcc5 100644
+--- a/dlls/advapi32/security.c
++++ b/dlls/advapi32/security.c
+@@ -4052,8 +4052,6 @@ DWORD WINAPI SetNamedSecurityInfoW(LPWSTR pObjectName,
+         }
+         break;
+     case SE_FILE_OBJECT:
+-        if (SecurityInfo & DACL_SECURITY_INFORMATION)
+-            access |= READ_CONTROL;
+         if (!(err = get_security_file( pObjectName, access, &handle )))
+         {
+             err = SetSecurityInfo( handle, ObjectType, SecurityInfo, psidOwner, psidGroup, pDacl, pSacl );
+@@ -5731,7 +5729,6 @@ DWORD WINAPI SetSecurityInfo(HANDLE handle, SE_OBJECT_TYPE ObjectType,
+                       PSID psidGroup, PACL pDacl, PACL pSacl)
+ {
+     SECURITY_DESCRIPTOR sd;
+-    PACL dacl = pDacl;
+     NTSTATUS status;
+ 
+     if (!InitializeSecurityDescriptor(&sd, SECURITY_DESCRIPTOR_REVISION))
+@@ -5742,130 +5739,7 @@ DWORD WINAPI SetSecurityInfo(HANDLE handle, SE_OBJECT_TYPE ObjectType,
+     if (SecurityInfo & GROUP_SECURITY_INFORMATION)
+         SetSecurityDescriptorGroup(&sd, psidGroup, FALSE);
+     if (SecurityInfo & DACL_SECURITY_INFORMATION)
+-    {
+-        if (ObjectType == SE_FILE_OBJECT && pDacl)
+-        {
+-            SECURITY_DESCRIPTOR_CONTROL control;
+-            PSECURITY_DESCRIPTOR psd;
+-            OBJECT_NAME_INFORMATION *name_info;
+-            DWORD size, rev;
+-
+-            status = NtQuerySecurityObject(handle, SecurityInfo, NULL, 0, &size);
+-            if (status != STATUS_BUFFER_TOO_SMALL)
+-                return RtlNtStatusToDosError(status);
+-
+-            psd = heap_alloc(size);
+-            if (!psd)
+-                return ERROR_NOT_ENOUGH_MEMORY;
+-
+-            status = NtQuerySecurityObject(handle, SecurityInfo, psd, size, &size);
+-            if (status)
+-            {
+-                heap_free(psd);
+-                return RtlNtStatusToDosError(status);
+-            }
+-
+-            status = RtlGetControlSecurityDescriptor(psd, &control, &rev);
+-            heap_free(psd);
+-            if (status)
+-                return RtlNtStatusToDosError(status);
+-            /* TODO: copy some control flags to new sd */
+-
+-            /* inherit parent directory DACL */
+-            if (!(control & SE_DACL_PROTECTED))
+-            {
+-                status = NtQueryObject(handle, ObjectNameInformation, NULL, 0, &size);
+-                if (status != STATUS_INFO_LENGTH_MISMATCH)
+-                    return RtlNtStatusToDosError(status);
+-
+-                name_info = heap_alloc(size);
+-                if (!name_info)
+-                    return ERROR_NOT_ENOUGH_MEMORY;
+-
+-                status = NtQueryObject(handle, ObjectNameInformation, name_info, size, NULL);
+-                if (status)
+-                {
+-                    heap_free(name_info);
+-                    return RtlNtStatusToDosError(status);
+-                }
+-
+-                for (name_info->Name.Length-=2; name_info->Name.Length>0; name_info->Name.Length-=2)
+-                    if (name_info->Name.Buffer[name_info->Name.Length/2-1]=='\\' ||
+-                            name_info->Name.Buffer[name_info->Name.Length/2-1]=='/')
+-                        break;
+-                if (name_info->Name.Length)
+-                {
+-                    OBJECT_ATTRIBUTES attr;
+-                    IO_STATUS_BLOCK io;
+-                    HANDLE parent;
+-                    PSECURITY_DESCRIPTOR parent_sd;
+-                    ACL *parent_dacl;
+-                    DWORD err = ERROR_ACCESS_DENIED;
+-
+-                    name_info->Name.Buffer[name_info->Name.Length/2] = 0;
+-
+-                    attr.Length = sizeof(attr);
+-                    attr.RootDirectory = 0;
+-                    attr.Attributes = 0;
+-                    attr.ObjectName = &name_info->Name;
+-                    attr.SecurityDescriptor = NULL;
+-                    status = NtOpenFile(&parent, READ_CONTROL, &attr, &io,
+-                            FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE,
+-                            FILE_OPEN_FOR_BACKUP_INTENT);
+-                    heap_free(name_info);
+-                    if (!status)
+-                    {
+-                        err = GetSecurityInfo(parent, SE_FILE_OBJECT, DACL_SECURITY_INFORMATION,
+-                                NULL, NULL, &parent_dacl, NULL, &parent_sd);
+-                        CloseHandle(parent);
+-                    }
+-
+-                    if (!err)
+-                    {
+-                        int i;
+-
+-                        dacl = heap_alloc_zero(pDacl->AclSize+parent_dacl->AclSize);
+-                        if (!dacl)
+-                        {
+-                            LocalFree(parent_sd);
+-                            return ERROR_NOT_ENOUGH_MEMORY;
+-                        }
+-                        memcpy(dacl, pDacl, pDacl->AclSize);
+-                        dacl->AclSize = pDacl->AclSize+parent_dacl->AclSize;
+-
+-                        for (i=0; i<parent_dacl->AceCount; i++)
+-                        {
+-                            ACE_HEADER *ace;
+-
+-                            if (!GetAce(parent_dacl, i, (void*)&ace))
+-                                continue;
+-                            if (!(ace->AceFlags & (OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE)))
+-                                continue;
+-                            if ((ace->AceFlags & (OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE)) !=
+-                                    (OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE))
+-                            {
+-                                FIXME("unsupported flags: %x\n", ace->AceFlags);
+-                                continue;
+-                            }
+-
+-                            if (ace->AceFlags & NO_PROPAGATE_INHERIT_ACE)
+-                                ace->AceFlags &= ~(OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE|NO_PROPAGATE_INHERIT_ACE);
+-                            ace->AceFlags &= ~INHERIT_ONLY_ACE;
+-                            ace->AceFlags |= INHERITED_ACE;
+-
+-                            if(!AddAce(dacl, ACL_REVISION, MAXDWORD, ace, ace->AceSize))
+-                                WARN("error adding inherited ACE\n");
+-                        }
+-                        LocalFree(parent_sd);
+-                    }
+-                }
+-                else
+-                    heap_free(name_info);
+-            }
+-        }
+-
+-        SetSecurityDescriptorDacl(&sd, TRUE, dacl, FALSE);
+-    }
++        SetSecurityDescriptorDacl(&sd, TRUE, pDacl, FALSE);
+     if (SecurityInfo & SACL_SECURITY_INFORMATION)
+         SetSecurityDescriptorSacl(&sd, TRUE, pSacl, FALSE);
+ 
+@@ -5879,8 +5753,6 @@ DWORD WINAPI SetSecurityInfo(HANDLE handle, SE_OBJECT_TYPE ObjectType,
+         status = NtSetSecurityObject(handle, SecurityInfo, &sd);
+         break;
+     }
+-    if (dacl != pDacl)
+-        heap_free(dacl);
+     return RtlNtStatusToDosError(status);
+ }
+ 
+diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
+index 466100d..53fd643 100644
+--- a/dlls/advapi32/tests/security.c
++++ b/dlls/advapi32/tests/security.c
+@@ -3615,22 +3615,25 @@ static void test_GetNamedSecurityInfoA(void)
+ 
+     error = pGetNamedSecurityInfoA(tmpfile, SE_FILE_OBJECT, DACL_SECURITY_INFORMATION,
+             NULL, NULL, &pDacl, NULL, &pSD);
+-    ok(!error, "GetNamedSecurityInfo failed with error %d\n", error);
++    todo_wine ok(!error, "GetNamedSecurityInfo failed with error %d\n", error);
+ 
+-    bret = pGetAclInformation(pDacl, &acl_size, sizeof(acl_size), AclSizeInformation);
+-    ok(bret, "GetAclInformation failed\n");
+-    if (acl_size.AceCount > 0)
++    if (!error)
+     {
+-        bret = pGetAce(pDacl, 0, (VOID **)&ace);
+-        ok(bret, "Failed to get ACE.\n");
+-        todo_wine ok(((ACE_HEADER *)ace)->AceFlags & INHERITED_ACE,
+-                "ACE has unexpected flags: 0x%x\n", ((ACE_HEADER *)ace)->AceFlags);
++        bret = pGetAclInformation(pDacl, &acl_size, sizeof(acl_size), AclSizeInformation);
++        ok(bret, "GetAclInformation failed\n");
++        if (acl_size.AceCount > 0)
++        {
++            bret = pGetAce(pDacl, 0, (VOID **)&ace);
++            ok(bret, "Failed to get ACE.\n");
++            ok(((ACE_HEADER *)ace)->AceFlags & INHERITED_ACE,
++                    "ACE has unexpected flags: 0x%x\n", ((ACE_HEADER *)ace)->AceFlags);
++        }
++        LocalFree(pSD);
+     }
+-    LocalFree(pSD);
+ 
+     h = CreateFileA(tmpfile, GENERIC_READ, FILE_SHARE_DELETE|FILE_SHARE_WRITE|FILE_SHARE_READ,
+             NULL, OPEN_EXISTING, 0, NULL);
+-    ok(h != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError());
++    todo_wine ok(h != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError());
+     CloseHandle(h);
+ 
+     /* test setting NULL DACL */
+-- 
+2.3.3
+

patches/advapi32-Revert_DACL/0002-Revert-advapi32-tests-Add-test-for-mapping-DACL-to-p.patch

@@ -0,0 +1,75 @@
+From eb05c44d59763b99851106cac937107f4c101639 Mon Sep 17 00:00:00 2001
+From: Sebastian Lackner <sebastian@fds-team.de>
+Date: Fri, 27 Mar 2015 15:32:17 +0100
+Subject: Revert "advapi32/tests: Add test for mapping DACL to permission."
+
+This reverts commit a4b12eb9f937202848b229ed15f2c7d1823b41da.
+---
+ dlls/advapi32/tests/security.c | 36 ++----------------------------------
+ 1 file changed, 2 insertions(+), 34 deletions(-)
+
+diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
+index a12fb7b..91d8600 100644
+--- a/dlls/advapi32/tests/security.c
++++ b/dlls/advapi32/tests/security.c
+@@ -3405,6 +3405,7 @@ static void test_GetNamedSecurityInfoA(void)
+            "Administators Group ACE has unexpected mask (0x%x != 0x1f01ff)\n", ace->Mask);
+     }
+     LocalFree(pSD);
++    HeapFree(GetProcessHeap(), 0, user);
+ 
+     /* show that setting empty DACL is not removing all file permissions */
+     pDacl = HeapAlloc(GetProcessHeap(), 0, sizeof(ACL));
+@@ -3441,7 +3442,7 @@ static void test_GetNamedSecurityInfoA(void)
+     /* NtSetSecurityObject doesn't inherit DACL entries */
+     pSD = sd+sizeof(void*)-((ULONG_PTR)sd)%sizeof(void*);
+     InitializeSecurityDescriptor(pSD, SECURITY_DESCRIPTOR_REVISION);
+-    pDacl = HeapAlloc(GetProcessHeap(), 0, 100);
++    pDacl = HeapAlloc(GetProcessHeap(), 0, sizeof(ACL));
+     bret = InitializeAcl(pDacl, sizeof(ACL), ACL_REVISION);
+     ok(bret, "Failed to initialize ACL.\n");
+     bret = SetSecurityDescriptorDacl(pSD, TRUE, pDacl, FALSE);
+@@ -3472,40 +3473,7 @@ static void test_GetNamedSecurityInfoA(void)
+             NULL, OPEN_EXISTING, 0, NULL);
+     ok(h == INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError());
+     CloseHandle(h);
+-
+-    /* test if DACL is properly mapped to permission */
+-    bret = InitializeAcl(pDacl, 100, ACL_REVISION);
+-    ok(bret, "Failed to initialize ACL.\n");
+-    bret = pAddAccessAllowedAceEx(pDacl, ACL_REVISION, 0, GENERIC_ALL, user_sid);
+-    ok(bret, "Failed to add Current User to ACL.\n");
+-    bret = pAddAccessDeniedAceEx(pDacl, ACL_REVISION, 0, GENERIC_ALL, user_sid);
+-    ok(bret, "Failed to add Current User to ACL.\n");
+-    bret = SetSecurityDescriptorDacl(pSD, TRUE, pDacl, FALSE);
+-    ok(bret, "Failed to add ACL to security desciptor.\n");
+-    status = pNtSetSecurityObject(hTemp, DACL_SECURITY_INFORMATION, pSD);
+-    ok(status == ERROR_SUCCESS, "NtSetSecurityObject returned %x\n", status);
+-
+-    h = CreateFileA(tmpfile, GENERIC_READ, FILE_SHARE_DELETE|FILE_SHARE_WRITE|FILE_SHARE_READ,
+-            NULL, OPEN_EXISTING, 0, NULL);
+-    ok(h != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError());
+-    CloseHandle(h);
+-
+-    bret = InitializeAcl(pDacl, 100, ACL_REVISION);
+-    ok(bret, "Failed to initialize ACL.\n");
+-    bret = pAddAccessDeniedAceEx(pDacl, ACL_REVISION, 0, GENERIC_ALL, user_sid);
+-    ok(bret, "Failed to add Current User to ACL.\n");
+-    bret = pAddAccessAllowedAceEx(pDacl, ACL_REVISION, 0, GENERIC_ALL, user_sid);
+-    ok(bret, "Failed to add Current User to ACL.\n");
+-    bret = SetSecurityDescriptorDacl(pSD, TRUE, pDacl, FALSE);
+-    ok(bret, "Failed to add ACL to security desciptor.\n");
+-    status = pNtSetSecurityObject(hTemp, DACL_SECURITY_INFORMATION, pSD);
+-    ok(status == ERROR_SUCCESS, "NtSetSecurityObject returned %x\n", status);
+-
+-    h = CreateFileA(tmpfile, GENERIC_READ, FILE_SHARE_DELETE|FILE_SHARE_WRITE|FILE_SHARE_READ,
+-            NULL, OPEN_EXISTING, 0, NULL);
+-    ok(h == INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError());
+     HeapFree(GetProcessHeap(), 0, pDacl);
+-    HeapFree(GetProcessHeap(), 0, user);
+     CloseHandle(hTemp);
+ 
+     /* Test querying the ownership of a built-in registry key */
+-- 
+2.3.3
+

patches/advapi32-Revert_DACL/0003-Revert-advapi32-Add-SetNamedSecurityInfo-test-with-e.patch

@@ -0,0 +1,158 @@
+From 0e64055fbe7f17de05328353457b93f720ef3bb7 Mon Sep 17 00:00:00 2001
+From: Sebastian Lackner <sebastian@fds-team.de>
+Date: Fri, 27 Mar 2015 15:32:32 +0100
+Subject: Revert "advapi32: Add SetNamedSecurityInfo test with empty DACL."
+
+This reverts commit 02c4f5bd275d70d1dcb48bf95775efa376b50c22.
+---
+ dlls/advapi32/tests/security.c | 95 ++----------------------------------------
+ 1 file changed, 4 insertions(+), 91 deletions(-)
+
+diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
+index 00dd9e8..b19dbe8 100644
+--- a/dlls/advapi32/tests/security.c
++++ b/dlls/advapi32/tests/security.c
+@@ -125,7 +125,6 @@ static BOOL (WINAPI *pCreateRestrictedToken)(HANDLE, DWORD, DWORD, PSID_AND_ATTR
+                                              PLUID_AND_ATTRIBUTES, DWORD, PSID_AND_ATTRIBUTES, PHANDLE);
+ static BOOL (WINAPI *pGetAclInformation)(PACL,LPVOID,DWORD,ACL_INFORMATION_CLASS);
+ static BOOL (WINAPI *pGetAce)(PACL,DWORD,LPVOID*);
+-static NTSTATUS (WINAPI *pNtSetSecurityObject)(HANDLE,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR);
+ static NTSTATUS (WINAPI *pNtCreateFile)(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES,PIO_STATUS_BLOCK,PLARGE_INTEGER,ULONG,ULONG,ULONG,ULONG,PVOID,ULONG);
+ static BOOL     (WINAPI *pRtlDosPathNameToNtPathName_U)(LPCWSTR,PUNICODE_STRING,PWSTR*,CURDIR*);
+ static NTSTATUS (WINAPI *pRtlAnsiStringToUnicodeString)(PUNICODE_STRING,PCANSI_STRING,BOOLEAN);
+@@ -155,7 +154,6 @@ static void init(void)
+     hntdll = GetModuleHandleA("ntdll.dll");
+     pNtQueryObject = (void *)GetProcAddress( hntdll, "NtQueryObject" );
+     pNtAccessCheck = (void *)GetProcAddress( hntdll, "NtAccessCheck" );
+-    pNtSetSecurityObject = (void *)GetProcAddress(hntdll, "NtSetSecurityObject");
+     pNtCreateFile = (void *)GetProcAddress(hntdll, "NtCreateFile");
+     pRtlDosPathNameToNtPathName_U = (void *)GetProcAddress(hntdll, "RtlDosPathNameToNtPathName_U");
+     pRtlAnsiStringToUnicodeString = (void *)GetProcAddress(hntdll, "RtlAnsiStringToUnicodeString");
+@@ -3429,7 +3427,7 @@ static void test_GetNamedSecurityInfoA(void)
+     char invalid_path[] = "/an invalid file path";
+     int users_ace_id = -1, admins_ace_id = -1, i;
+     char software_key[] = "MACHINE\\Software";
+-    char sd[SECURITY_DESCRIPTOR_MIN_LENGTH+sizeof(void*)];
++    char sd[SECURITY_DESCRIPTOR_MIN_LENGTH];
+     SECURITY_DESCRIPTOR_CONTROL control;
+     ACL_SIZE_INFORMATION acl_size;
+     CHAR windows_dir[MAX_PATH];
+@@ -3441,12 +3439,11 @@ static void test_GetNamedSecurityInfoA(void)
+     BOOL owner_defaulted;
+     BOOL group_defaulted;
+     BOOL dacl_defaulted;
+-    HANDLE token, hTemp, h;
++    HANDLE token, hTemp;
+     PSID owner, group;
+     BOOL dacl_present;
+     PACL pDacl;
+     BYTE flags;
+-    NTSTATUS status;
+ 
+     if (!pSetNamedSecurityInfoA || !pGetNamedSecurityInfoA || !pCreateWellKnownSid)
+     {
+@@ -3551,8 +3548,8 @@ static void test_GetNamedSecurityInfoA(void)
+     bret = SetSecurityDescriptorDacl(pSD, TRUE, pDacl, FALSE);
+     ok(bret, "Failed to add ACL to security desciptor.\n");
+     GetTempFileNameA(".", "foo", 0, tmpfile);
+-    hTemp = CreateFileA(tmpfile, WRITE_DAC|GENERIC_WRITE, FILE_SHARE_DELETE|FILE_SHARE_READ,
+-                        NULL, OPEN_EXISTING, FILE_FLAG_DELETE_ON_CLOSE, NULL);
++    hTemp = CreateFileA(tmpfile, GENERIC_WRITE, FILE_SHARE_READ, NULL, OPEN_EXISTING,
++                        FILE_FLAG_DELETE_ON_CLOSE, NULL);
+     SetLastError(0xdeadbeef);
+     error = pSetNamedSecurityInfoA(tmpfile, SE_FILE_OBJECT, DACL_SECURITY_INFORMATION, NULL,
+                                    NULL, pDacl, NULL);
+@@ -3604,90 +3601,6 @@ static void test_GetNamedSecurityInfoA(void)
+     }
+     LocalFree(pSD);
+     HeapFree(GetProcessHeap(), 0, user);
+-
+-    /* show that setting empty DACL is not removing all file permissions */
+-    pDacl = HeapAlloc(GetProcessHeap(), 0, sizeof(ACL));
+-    bret = InitializeAcl(pDacl, sizeof(ACL), ACL_REVISION);
+-    ok(bret, "Failed to initialize ACL.\n");
+-    error =  pSetNamedSecurityInfoA(tmpfile, SE_FILE_OBJECT, DACL_SECURITY_INFORMATION,
+-            NULL, NULL, pDacl, NULL);
+-    ok(!error, "SetNamedSecurityInfoA failed with error %d\n", error);
+-    HeapFree(GetProcessHeap(), 0, pDacl);
+-
+-    error = pGetNamedSecurityInfoA(tmpfile, SE_FILE_OBJECT, DACL_SECURITY_INFORMATION,
+-            NULL, NULL, &pDacl, NULL, &pSD);
+-    todo_wine ok(!error, "GetNamedSecurityInfo failed with error %d\n", error);
+-
+-    if (!error)
+-    {
+-        bret = pGetAclInformation(pDacl, &acl_size, sizeof(acl_size), AclSizeInformation);
+-        ok(bret, "GetAclInformation failed\n");
+-        if (acl_size.AceCount > 0)
+-        {
+-            bret = pGetAce(pDacl, 0, (VOID **)&ace);
+-            ok(bret, "Failed to get ACE.\n");
+-            ok(((ACE_HEADER *)ace)->AceFlags & INHERITED_ACE,
+-                    "ACE has unexpected flags: 0x%x\n", ((ACE_HEADER *)ace)->AceFlags);
+-        }
+-        LocalFree(pSD);
+-    }
+-
+-    h = CreateFileA(tmpfile, GENERIC_READ, FILE_SHARE_DELETE|FILE_SHARE_WRITE|FILE_SHARE_READ,
+-            NULL, OPEN_EXISTING, 0, NULL);
+-    todo_wine ok(h != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError());
+-    CloseHandle(h);
+-
+-    /* test setting NULL DACL */
+-    error = pSetNamedSecurityInfoA(tmpfile, SE_FILE_OBJECT,
+-            DACL_SECURITY_INFORMATION, NULL, NULL, NULL, NULL);
+-    ok(!error, "SetNamedSecurityInfoA failed with error %d\n", error);
+-
+-    error = pGetNamedSecurityInfoA(tmpfile, SE_FILE_OBJECT, DACL_SECURITY_INFORMATION,
+-                NULL, NULL, &pDacl, NULL, &pSD);
+-    ok(!error, "GetNamedSecurityInfo failed with error %d\n", error);
+-    todo_wine ok(!pDacl, "pDacl != NULL\n");
+-    LocalFree(pSD);
+-
+-    h = CreateFileA(tmpfile, GENERIC_READ, FILE_SHARE_DELETE|FILE_SHARE_WRITE|FILE_SHARE_READ,
+-            NULL, OPEN_EXISTING, 0, NULL);
+-    ok(h != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError());
+-    CloseHandle(h);
+-
+-    /* NtSetSecurityObject doesn't inherit DACL entries */
+-    pSD = sd+sizeof(void*)-((ULONG_PTR)sd)%sizeof(void*);
+-    InitializeSecurityDescriptor(pSD, SECURITY_DESCRIPTOR_REVISION);
+-    pDacl = HeapAlloc(GetProcessHeap(), 0, sizeof(ACL));
+-    bret = InitializeAcl(pDacl, sizeof(ACL), ACL_REVISION);
+-    ok(bret, "Failed to initialize ACL.\n");
+-    bret = SetSecurityDescriptorDacl(pSD, TRUE, pDacl, FALSE);
+-    ok(bret, "Failed to add ACL to security desciptor.\n");
+-    status = pNtSetSecurityObject(hTemp, DACL_SECURITY_INFORMATION, pSD);
+-    ok(status == ERROR_SUCCESS, "NtSetSecurityObject returned %x\n", status);
+-
+-    h = CreateFileA(tmpfile, GENERIC_READ, FILE_SHARE_DELETE|FILE_SHARE_WRITE|FILE_SHARE_READ,
+-            NULL, OPEN_EXISTING, 0, NULL);
+-    ok(h == INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError());
+-    CloseHandle(h);
+-
+-    pSetSecurityDescriptorControl(pSD, SE_DACL_AUTO_INHERIT_REQ, SE_DACL_AUTO_INHERIT_REQ);
+-    status = pNtSetSecurityObject(hTemp, DACL_SECURITY_INFORMATION, pSD);
+-    ok(status == ERROR_SUCCESS, "NtSetSecurityObject returned %x\n", status);
+-
+-    h = CreateFileA(tmpfile, GENERIC_READ, FILE_SHARE_DELETE|FILE_SHARE_WRITE|FILE_SHARE_READ,
+-            NULL, OPEN_EXISTING, 0, NULL);
+-    ok(h == INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError());
+-    CloseHandle(h);
+-
+-    pSetSecurityDescriptorControl(pSD, SE_DACL_AUTO_INHERIT_REQ|SE_DACL_AUTO_INHERITED,
+-            SE_DACL_AUTO_INHERIT_REQ|SE_DACL_AUTO_INHERITED);
+-    status = pNtSetSecurityObject(hTemp, DACL_SECURITY_INFORMATION, pSD);
+-    ok(status == ERROR_SUCCESS, "NtSetSecurityObject returned %x\n", status);
+-
+-    h = CreateFileA(tmpfile, GENERIC_READ, FILE_SHARE_DELETE|FILE_SHARE_WRITE|FILE_SHARE_READ,
+-            NULL, OPEN_EXISTING, 0, NULL);
+-    ok(h == INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError());
+-    CloseHandle(h);
+-    HeapFree(GetProcessHeap(), 0, pDacl);
+     CloseHandle(hTemp);
+ 
+     /* Test querying the ownership of a built-in registry key */
+-- 
+2.3.3
+

patches/advapi32-Revert_DACL/0004-Revert-server-Make-directory-DACL-entries-inheritabl.patch

@@ -0,0 +1,67 @@
+From 41ffec5994a45a7f18cd77e98d8cf7bedecfd9a4 Mon Sep 17 00:00:00 2001
+From: Sebastian Lackner <sebastian@fds-team.de>
+Date: Fri, 27 Mar 2015 15:32:44 +0100
+Subject: Revert "server: Make directory DACL entries inheritable."
+
+This reverts commit 3eb448cf33b6b6635bac4e06ea7fddd190e26450.
+---
+ dlls/advapi32/tests/security.c | 2 +-
+ server/file.c                  | 8 ++++----
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
+index b19dbe8..a757c22 100644
+--- a/dlls/advapi32/tests/security.c
++++ b/dlls/advapi32/tests/security.c
+@@ -3262,7 +3262,7 @@ static void test_CreateDirectoryA(void)
+     }
+     ok(!error, "GetNamedSecurityInfo failed with error %d\n", error);
+     test_inherited_dacl(pDacl, admin_sid, user_sid, OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE,
+-                        0x1f01ff, FALSE, TRUE, FALSE, __LINE__);
++                        0x1f01ff, FALSE, TRUE, TRUE, __LINE__);
+     LocalFree(pSD);
+ 
+     /* Test inheritance of ACLs in CreateFile without security descriptor */
+diff --git a/server/file.c b/server/file.c
+index aa5ff01..c8c880b 100644
+--- a/server/file.c
++++ b/server/file.c
+@@ -367,7 +367,7 @@ struct security_descriptor *mode_to_sd( mode_t mode, const SID *user, const SID
+     aaa = (ACCESS_ALLOWED_ACE *)(dacl + 1);
+     current_ace = &aaa->Header;
+     aaa->Header.AceType = ACCESS_ALLOWED_ACE_TYPE;
+-    aaa->Header.AceFlags = (mode & S_IFDIR) ? OBJECT_INHERIT_ACE | CONTAINER_INHERIT_ACE : 0;
++    aaa->Header.AceFlags = 0;
+     aaa->Header.AceSize = FIELD_OFFSET(ACCESS_ALLOWED_ACE, SidStart) + security_sid_len( local_system_sid );
+     aaa->Mask = FILE_ALL_ACCESS;
+     sid = (SID *)&aaa->SidStart;
+@@ -379,7 +379,7 @@ struct security_descriptor *mode_to_sd( mode_t mode, const SID *user, const SID
+         aaa = (ACCESS_ALLOWED_ACE *)ace_next( current_ace );
+         current_ace = &aaa->Header;
+         aaa->Header.AceType = ACCESS_ALLOWED_ACE_TYPE;
+-        aaa->Header.AceFlags = (mode & S_IFDIR) ? OBJECT_INHERIT_ACE | CONTAINER_INHERIT_ACE : 0;
++        aaa->Header.AceFlags = 0;
+         aaa->Header.AceSize = FIELD_OFFSET(ACCESS_ALLOWED_ACE, SidStart) + security_sid_len( user );
+         aaa->Mask = WRITE_DAC | WRITE_OWNER;
+         if (mode & S_IRUSR)
+@@ -397,7 +397,7 @@ struct security_descriptor *mode_to_sd( mode_t mode, const SID *user, const SID
+         ACCESS_DENIED_ACE *ada = (ACCESS_DENIED_ACE *)ace_next( current_ace );
+         current_ace = &ada->Header;
+         ada->Header.AceType = ACCESS_DENIED_ACE_TYPE;
+-        ada->Header.AceFlags = (mode & S_IFDIR) ? OBJECT_INHERIT_ACE | CONTAINER_INHERIT_ACE : 0;
++        ada->Header.AceFlags = 0;
+         ada->Header.AceSize = FIELD_OFFSET(ACCESS_DENIED_ACE, SidStart) + security_sid_len( user );
+         ada->Mask = 0;
+         if (!(mode & S_IRUSR) && (mode & (S_IRGRP|S_IROTH)))
+@@ -414,7 +414,7 @@ struct security_descriptor *mode_to_sd( mode_t mode, const SID *user, const SID
+         aaa = (ACCESS_ALLOWED_ACE *)ace_next( current_ace );
+         current_ace = &aaa->Header;
+         aaa->Header.AceType = ACCESS_ALLOWED_ACE_TYPE;
+-        aaa->Header.AceFlags = (mode & S_IFDIR) ? OBJECT_INHERIT_ACE | CONTAINER_INHERIT_ACE : 0;
++        aaa->Header.AceFlags = 0;
+         aaa->Header.AceSize = FIELD_OFFSET(ACCESS_ALLOWED_ACE, SidStart) + security_sid_len( world_sid );
+         aaa->Mask = 0;
+         if (mode & S_IROTH)
+-- 
+2.3.3
+

patches/advapi32-Revert_DACL/0005-Revert-advapi-Don-t-use-CreateFile-when-opening-file.patch

@@ -0,0 +1,77 @@
+From 59067deb0ad4afb77deca29300133bff9d49f9f7 Mon Sep 17 00:00:00 2001
+From: Sebastian Lackner <sebastian@fds-team.de>
+Date: Fri, 27 Mar 2015 15:32:56 +0100
+Subject: Revert "advapi: Don't use CreateFile when opening file with possibly
+ empty DACL."
+
+This reverts commit f956bb4caa442ccde1ddaf483c5cb619bbf4049a.
+---
+ dlls/advapi32/security.c | 22 +++++++++-------------
+ 1 file changed, 9 insertions(+), 13 deletions(-)
+
+diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c
+index e8cdcc5..097b0da 100644
+--- a/dlls/advapi32/security.c
++++ b/dlls/advapi32/security.c
+@@ -397,7 +397,7 @@ static inline BOOL set_ntstatus( NTSTATUS status )
+ }
+ 
+ /* helper function for SE_FILE_OBJECT objects in [Get|Set]NamedSecurityInfo */
+-static inline DWORD get_security_file( LPCWSTR full_file_name, DWORD access, HANDLE *file )
++static inline DWORD get_security_file( LPWSTR full_file_name, DWORD access, HANDLE *file )
+ {
+     UNICODE_STRING file_nameW;
+     OBJECT_ATTRIBUTES attr;
+@@ -2029,7 +2029,7 @@ GetFileSecurityW( LPCWSTR lpFileName,
+ {
+     HANDLE hfile;
+     NTSTATUS status;
+-    DWORD access = 0, err;
++    DWORD access = 0;
+ 
+     TRACE("(%s,%d,%p,%d,%p)\n", debugstr_w(lpFileName),
+           RequestedInformation, pSecurityDescriptor,
+@@ -2041,12 +2041,10 @@ GetFileSecurityW( LPCWSTR lpFileName,
+     if (RequestedInformation & SACL_SECURITY_INFORMATION)
+         access |= ACCESS_SYSTEM_SECURITY;
+ 
+-    err = get_security_file( lpFileName, access, &hfile);
+-    if (err)
+-    {
+-        SetLastError(err);
++    hfile = CreateFileW( lpFileName, access, FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE,
++                         NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0 );
++    if ( hfile == INVALID_HANDLE_VALUE )
+         return FALSE;
+-    }
+ 
+     status = NtQuerySecurityObject( hfile, RequestedInformation, pSecurityDescriptor,
+                                     nLength, lpnLengthNeeded );
+@@ -2327,7 +2325,7 @@ SetFileSecurityW( LPCWSTR lpFileName,
+                     PSECURITY_DESCRIPTOR pSecurityDescriptor )
+ {
+     HANDLE file;
+-    DWORD access = 0, err;
++    DWORD access = 0;
+     NTSTATUS status;
+ 
+     TRACE("(%s, 0x%x, %p)\n", debugstr_w(lpFileName), RequestedInformation,
+@@ -2341,12 +2339,10 @@ SetFileSecurityW( LPCWSTR lpFileName,
+     if (RequestedInformation & DACL_SECURITY_INFORMATION)
+         access |= WRITE_DAC;
+ 
+-    err = get_security_file( lpFileName, access, &file);
+-    if (err)
+-    {
+-        SetLastError(err);
++    file = CreateFileW( lpFileName, access, FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE,
++                        NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL );
++    if (file == INVALID_HANDLE_VALUE)
+         return FALSE;
+-    }
+ 
+     status = NtSetSecurityObject( file, RequestedInformation, pSecurityDescriptor );
+     CloseHandle( file );
+-- 
+2.3.3
+