Release 1.7.33.

The fix in 78156b2 was incomplete, the build now fails with "config.h must be included before anything else".

.gitignore

@@ -1,5 +1,4 @@
 debian/tools/wine
-.depcache
-.srccache
+.patchupdate.cache
 *.ok
 *.pyc

DEVELOPER.md

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

LICENSE.md

@@ -1,15 +1,15 @@
-Wine-Compholio license
-======================
+Wine Staging license
+====================
 
 **Note:** Some files in this repository are provided under a different license.
 Please check the list of exceptions below. Unless stated otherwise all files
-are part of **Wine-Compholio** and are licensed under the terms of the
+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-Compholio project authors.
+Copyright (C) 2014 the Wine Staging project authors.
 
-Wine-Compholio is free software; you can redistribute it and/or
+Wine Staging 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.
@@ -26,7 +26,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA.
 
 ### Exceptions
 
-The following files are not part of Wine-Compholio and provided under a
+The following files are not part of Wine Staging and provided under a
 different license. These files are not linked to the rest of the project in
 any way and are simply installed for end-user convenience.
 

README.md

@@ -1,93 +1,120 @@
-What is Wine-Compholio?
-=======================
+What is Wine Staging?
+=====================
 
 **Warning: Do not report bugs at bugs.winehq.org when using this version!
-Please take a look at our
-[Wiki](https://github.com/compholio/wine-compholio/wiki/Reporting-bugs)
-for more information about how to report bugs.**
+Please take a look [here](http://bugs.wine-staging.com) for more information
+about how to report bugs.**
 
-The **Wine "Compholio" Edition** is a special build of the popular Wine
-software that includes both patches written by our team and selected patches
-by third party developers that we consider good enough for inclusion. This can
-be seen as a testing version in preparation for patches to be submitted to
-upstream Wine - don't be surprised if you encounter additional bugs, which are
-not present in regular wine, and always report such issues to us (via github!),
-so we can improve our fixes even further. Thanks!
+**Wine Staging** (formerly wine-compholio) is a special wine version containing
+bug fixes and features that are not yet available in regular wine versions. The
+idea behind Wine Staging is to provide new features faster to end users and to
+give developers the possibility to discuss and improve their patches before
+they are sent upstream. We also intend to create a community of wine developers
+to share experience and to make it easier for beginners to start hacking on
+wine.
 
+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!
 
-How to install and use Wine-Compholio
-=====================================
+How to install and use Wine Staging
+===================================
 
-Ready-to-use packages for Wine-Compholio are available for a variety
+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
-[Wiki](https://github.com/compholio/wine-compholio/wiki/Installation).
+instructions available on the [website](http://www.wine-staging.com/install.html).
 
-When using Wine-Compholio there are a few differences compared to regular
+When using Wine Staging there are a few differences compared to regular
 Wine. The main difference is that it is not sufficient to type `wine` to
 run it, but instead you will have to type `/opt/wine-compholio/bin/wine`.
 Besides that there are also some other differences, for example additional
 configuration options to tweak performance, which are not available in regular
 Wine. All those differences are also documented on the
-[Wiki](https://github.com/compholio/wine-compholio/wiki/Usage).
+[Wiki](https://github.com/wine-compholio/wine-staging/wiki/Usage).
 
 
-Included bugfixes and improvements
-==================================
+Included bug fixes and improvements
+===================================
 
-**Bugs fixed in Wine-Compholio 1.7.30 [90]:**
+**Bugs fixed in Wine Staging 1.7.33 [119]:**
 
 * ATL IOCS data should not be stored in GWLP_USERDATA ([Wine Bug #21767](https://bugs.winehq.org/show_bug.cgi?id=21767))
 * Add Dynamic DST exceptions for Israel Standard Time ([Wine Bug #36374](https://bugs.winehq.org/show_bug.cgi?id=36374))
 * Add default ACLs for user shell folders
-* Add partially support for sessionStorage
+* Add stub for NtSetLdtEntries/ZwSetLdtEntries ([Wine Bug #26268](https://bugs.winehq.org/show_bug.cgi?id=26268))
+* Add support for GetPropValue to PulseAudio backend
 * Adobe Reader needs ITextSelection_fnGetDuplicate implementation
+* Allow selection of audio device for PulseAudio backend
 * Allow special characters in pipe names ([Wine Bug #28995](https://bugs.winehq.org/show_bug.cgi?id=28995))
 * Anno 1602 installer depends on Windows 98 behavior of SHFileOperationW
 * Audio stuttering and performance drops in multiple applications ([Wine Bug #30639](https://bugs.winehq.org/show_bug.cgi?id=30639))
-* Cinema 4D needs NotifyIpInterfaceChange ([Wine Bug #34573](https://bugs.winehq.org/show_bug.cgi?id=34573))
+* Avoid crashing when broken app tries to release surface although refcount is zero ([Wine Bug #18477](https://bugs.winehq.org/show_bug.cgi?id=18477))
+* Avoid race-conditions of async WSARecv() operations with write watches.
+* Black & White needs DXTn software decoding support ([Wine Bug #14939](https://bugs.winehq.org/show_bug.cgi?id=14939))
 * Correctly treat '.' when checking for empty directories ([Wine Bug #26272](https://bugs.winehq.org/show_bug.cgi?id=26272))
 * D3DCompileShader should filter specific warning messages ([Wine Bug #33770](https://bugs.winehq.org/show_bug.cgi?id=33770))
 * Do not fail when a used context is passed to wglShareLists ([Wine Bug #11436](https://bugs.winehq.org/show_bug.cgi?id=11436))
 * Don't fill KdHelp structure for usermode applications ([Wine Bug #37272](https://bugs.winehq.org/show_bug.cgi?id=37272))
+* Emulate access to KI_USER_SHARED_DATA kernel page on x86_64 ([Wine Bug #33849](https://bugs.winehq.org/show_bug.cgi?id=33849))
 * Emulate write to CR4 register ([Wine Bug #30220](https://bugs.winehq.org/show_bug.cgi?id=30220))
 * Ensure NtProtectVirtualMemory and NtCreateSection are on separate pages ([Wine Bug #33162](https://bugs.winehq.org/show_bug.cgi?id=33162))
+* Exception during start of fr-043 caused by missing DXTn support ([Wine Bug #37391](https://bugs.winehq.org/show_bug.cgi?id=37391))
 * FEAR 1 installer expects basic_string_wchar_dtor to return NULL ([Wine Bug #37358](https://bugs.winehq.org/show_bug.cgi?id=37358))
+* FairplayKD.sys needs KeSetSystemAffinityThread ([Wine Bug #36822](https://bugs.winehq.org/show_bug.cgi?id=36822))
 * Fix black screen on startup introduced by pixelformat changes. ([Wine Bug #35950](https://bugs.winehq.org/show_bug.cgi?id=35950))
 * Fix comparison of punctuation characters in lstrcmp ([Wine Bug #10767](https://bugs.winehq.org/show_bug.cgi?id=10767))
+* Fix condition mask handling in RtlVerifyVersionInfo ([Wine Bug #36143](https://bugs.winehq.org/show_bug.cgi?id=36143))
+* Fix crash of Trine Demo on start ([Wine Bug #19231](https://bugs.winehq.org/show_bug.cgi?id=19231))
+* Fix crash of winedevice when relocation entry crosses page boundary ([Wine Bug #28254](https://bugs.winehq.org/show_bug.cgi?id=28254))
 * Fix flickering introduced by pixelformat changes. ([Wine Bug #35718](https://bugs.winehq.org/show_bug.cgi?id=35718))
 * Fix for ConnectNamedPort return value in overlapped mode ([Wine Bug #16550](https://bugs.winehq.org/show_bug.cgi?id=16550))
 * Fix for programs leaking wndproc slots ([Wine Bug #32451](https://bugs.winehq.org/show_bug.cgi?id=32451))
 * Fix gray screen on startup introduced by pixelformat changes. ([Wine Bug #35975](https://bugs.winehq.org/show_bug.cgi?id=35975))
+* Fix handling of empty section and key name for profile files. ([Wine Bug #8036](https://bugs.winehq.org/show_bug.cgi?id=8036))
+* Fix handling of invert_y in DrawTextExW ([Wine Bug #22109](https://bugs.winehq.org/show_bug.cgi?id=22109))
 * Fix issues when driver dispatch routine returns different status codes ([Wine Bug #30155](https://bugs.winehq.org/show_bug.cgi?id=30155))
+* Fix issues with dragging layers between images in Adobe Photoshop 7.0 ([Wine Bug #12007](https://bugs.winehq.org/show_bug.cgi?id=12007))
 * Fix missing video introduced by pixelformat changes. ([Wine Bug #36900](https://bugs.winehq.org/show_bug.cgi?id=36900))
+* Fix possible segfault in pulse_rd_loop of PulseAudio backend
+* Fix return value of ScrollWindowEx for invisible windows ([Wine Bug #37706](https://bugs.winehq.org/show_bug.cgi?id=37706))
+* Fix texture corruption in CSI: Fatal Conspiracy ([Wine Bug #33768](https://bugs.winehq.org/show_bug.cgi?id=33768))
 * Fix unintentional leaks with ntdll internals
 * Fix wined3d performance drop introduced by pixelformat changes. ([Wine Bug #35655](https://bugs.winehq.org/show_bug.cgi?id=35655))
 * Games For Windows Live 1.x expects a valid linker version in the PE header ([Wine Bug #28768](https://bugs.winehq.org/show_bug.cgi?id=28768))
 * GetSecurityInfo returns NULL DACL for process object ([Wine Bug #15980](https://bugs.winehq.org/show_bug.cgi?id=15980))
+* Ignore unsupported flags for CoInternetSetFeatureEnabled ([Wine Bug #35197](https://bugs.winehq.org/show_bug.cgi?id=35197))
 * Implement a Microsoft Yahei replacement font ([Wine Bug #13829](https://bugs.winehq.org/show_bug.cgi?id=13829))
 * Implement an Arial replacement font ([Wine Bug #32323](https://bugs.winehq.org/show_bug.cgi?id=32323))
+* Implement exclusive mode in PulseAudio backend ([Wine Bug #37042](https://bugs.winehq.org/show_bug.cgi?id=37042))
+* Implement stubs for mfplat.MFStartup and MFShutdown ([Wine Bug #37701](https://bugs.winehq.org/show_bug.cgi?id=37701))
 * Improvement for heap allocation performance
+* Initialize irp.Tail.Overlay.OriginalFileObject with stub file object ([Wine Bug #37537](https://bugs.winehq.org/show_bug.cgi?id=37537))
 * Lego Stunt Rally requires DXTn software de/encoding support ([Wine Bug #25486](https://bugs.winehq.org/show_bug.cgi?id=25486))
 * Limit cross thread access to ImmSet* functions ([Wine Bug #35361](https://bugs.winehq.org/show_bug.cgi?id=35361))
 * Lockfree algorithm for filedescriptor cache (improves file access speed)
+* MSVCRT crashes when NULL is passed as string to atof or strtod ([Wine Bug #32550](https://bugs.winehq.org/show_bug.cgi?id=32550))
 * Make it possible to change media center / tablet pc status ([Wine Bug #18732](https://bugs.winehq.org/show_bug.cgi?id=18732))
 * Multiple applications need EnumDisplayDevicesW implementation ([Wine Bug #34978](https://bugs.winehq.org/show_bug.cgi?id=34978))
 * Need for Speed 3 installer requires devices in HKEY_DYN_DATA ([Wine Bug #7115](https://bugs.winehq.org/show_bug.cgi?id=7115))
 * Other Pipelight-specific enhancements
 * Prevent window managers from grouping all wine programs together ([Wine Bug #32699](https://bugs.winehq.org/show_bug.cgi?id=32699))
+* Provide named entry point shell32.SHILCreateFromPath for vista apps ([Wine Bug #37265](https://bugs.winehq.org/show_bug.cgi?id=37265))
+* Reallocate buffer when adding records to AVI files ([Wine Bug #5137](https://bugs.winehq.org/show_bug.cgi?id=5137))
 * Reduced SetTimer minimum value from 10 ms to 5 ms (improves Silverlight framerates)
 * Return an error when trying to open a terminated process ([Wine Bug #37087](https://bugs.winehq.org/show_bug.cgi?id=37087))
 * Return correct IMediaSeeking stream positions in quartz ([Wine Bug #23174](https://bugs.winehq.org/show_bug.cgi?id=23174))
+* Return correct values for GetThreadTimes function ([Wine Bug #20230](https://bugs.winehq.org/show_bug.cgi?id=20230))
+* Return more context attributes in schan_InitializeSecurityContextW ([Wine Bug #37527](https://bugs.winehq.org/show_bug.cgi?id=37527))
 * SO_CONNECT_TIME returns the appropriate time
 * Send WM_PAINT event during dialog creation ([Wine Bug #35652](https://bugs.winehq.org/show_bug.cgi?id=35652))
+* Set last error when GetRawInputDeviceList fails ([Wine Bug #37667](https://bugs.winehq.org/show_bug.cgi?id=37667))
 * Support for AllocateAndGetTcpExTableFromStack ([Wine Bug #34372](https://bugs.winehq.org/show_bug.cgi?id=34372))
 * Support for BindImageEx ([Wine Bug #3591](https://bugs.winehq.org/show_bug.cgi?id=3591))
-* Support for D3DXCreatePolygon ([Wine Bug #13632](https://bugs.winehq.org/show_bug.cgi?id=13632))
+* Support for CSMT (command stream) to increase graphic performance ([Wine Bug #11674](https://bugs.winehq.org/show_bug.cgi?id=11674))
 * Support for D3DXGetShaderInputSemantics ([Wine Bug #22682](https://bugs.winehq.org/show_bug.cgi?id=22682))
 * Support for DOS hidden/system file attributes ([Wine Bug #9158](https://bugs.winehq.org/show_bug.cgi?id=9158))
 * Support for Dynamic DST (daylight saving time) information in registry
-* Support for FindFirstFileExW level FindExInfoBasic ([Wine Bug #37354](https://bugs.winehq.org/show_bug.cgi?id=37354))
 * Support for GdipCreateRegionRgnData ([Wine Bug #34843](https://bugs.winehq.org/show_bug.cgi?id=34843))
 * Support for GetFinalPathNameByHandle ([Wine Bug #36073](https://bugs.winehq.org/show_bug.cgi?id=36073))
 * Support for GetSystemTimes ([Wine Bug #19813](https://bugs.winehq.org/show_bug.cgi?id=19813))
@@ -96,6 +123,7 @@ Included bugfixes and improvements
 * Support for ITextDocument_fnRange function ([Wine Bug #12458](https://bugs.winehq.org/show_bug.cgi?id=12458))
 * Support for ITextRange, ITextFont and ITextPara ([Wine Bug #18303](https://bugs.winehq.org/show_bug.cgi?id=18303))
 * Support for Junction Points ([Wine Bug #12401](https://bugs.winehq.org/show_bug.cgi?id=12401))
+* Support for K32EnumProcessModulesEx ([Wine Bug #34864](https://bugs.winehq.org/show_bug.cgi?id=34864))
 * Support for KF_FLAG_DEFAULT_PATH in SHGetKnownFolderPath ([Wine Bug #30385](https://bugs.winehq.org/show_bug.cgi?id=30385))
 * Support for LoadIconMetric ([Wine Bug #35375](https://bugs.winehq.org/show_bug.cgi?id=35375))
 * Support for NtQuerySection ([Wine Bug #37338](https://bugs.winehq.org/show_bug.cgi?id=37338))
@@ -103,23 +131,23 @@ Included bugfixes 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 TLB dependencies lookup in resources ([Wine Bug #34184](https://bugs.winehq.org/show_bug.cgi?id=34184))
+* Support for StrCatChainW
 * Support for TOOLTIPS_GetTipText edge cases ([Wine Bug #30648](https://bugs.winehq.org/show_bug.cgi?id=30648))
 * Support for TransmitFile ([Wine Bug #5048](https://bugs.winehq.org/show_bug.cgi?id=5048))
 * Support for UTF7 encoding/decoding ([Wine Bug #27388](https://bugs.winehq.org/show_bug.cgi?id=27388))
 * Support for WTSEnumerateProcessesW ([Wine Bug #29903](https://bugs.winehq.org/show_bug.cgi?id=29903))
+* Support for combase HSTRING objects
 * Support for extra large and jumbo icon lists in shell32 ([Wine Bug #24721](https://bugs.winehq.org/show_bug.cgi?id=24721))
 * Support for inherited file ACLs ([Wine Bug #34406](https://bugs.winehq.org/show_bug.cgi?id=34406))
 * Support for interface change notifications ([Wine Bug #32328](https://bugs.winehq.org/show_bug.cgi?id=32328))
+* Support for loader dll redirections
 * Support for pasting HTML from Unix applications ([Wine Bug #7372](https://bugs.winehq.org/show_bug.cgi?id=7372))
 * Support for process ACLs ([Wine Bug #22006](https://bugs.winehq.org/show_bug.cgi?id=22006))
 * Support for setcap on wine-preloader ([Wine Bug #26256](https://bugs.winehq.org/show_bug.cgi?id=26256))
 * Support for stored file ACLs ([Wine Bug #31858](https://bugs.winehq.org/show_bug.cgi?id=31858))
 * Support for wine64 on FreeBSD/PC-BSD ([Wine Bug #34330](https://bugs.winehq.org/show_bug.cgi?id=34330))
-* Support for ws2_32.inet_pton ([Wine Bug #36713](https://bugs.winehq.org/show_bug.cgi?id=36713))
 * 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 ProductVersion property when applying MSI transforms ([Wine Bug #37493](https://bugs.winehq.org/show_bug.cgi?id=37493))
 * Update a XIM candidate position when cursor location changes ([Wine Bug #30938](https://bugs.winehq.org/show_bug.cgi?id=30938))
 * Use manual relay for RunDLL_CallEntry16 in shell32 ([Wine Bug #23033](https://bugs.winehq.org/show_bug.cgi?id=23033))
 * Voobly expects correct handling of WRITECOPY memory protection ([Wine Bug #29384](https://bugs.winehq.org/show_bug.cgi?id=29384))
@@ -127,4 +155,7 @@ Included bugfixes and improvements
 * Workaround for shlwapi URLs with relative paths
 * XEMBED support for embedding Wine windows inside Linux applications
 * nVidia driver for high-end laptop cards does not list all supported resolutions
+* vSphere needs IoCsqInitialize ([Wine Bug #36777](https://bugs.winehq.org/show_bug.cgi?id=36777))
+* wglDescribePixelFormat should return max index for NULL descriptor ([Wine Bug #6176](https://bugs.winehq.org/show_bug.cgi?id=6176))
+* wininet should allow Accept-Encoding header for HTTP/1.0 ([Wine Bug #37046](https://bugs.winehq.org/show_bug.cgi?id=37046))
 

debian/changelog

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

debian/postinst

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

debian/postrm

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

debian/prerm

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

debian/tools/DEVELOPER.md.in

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

debian/tools/README.md.in

@@ -1,39 +1,41 @@
-What is Wine-Compholio?
-=======================
+What is Wine Staging?
+=====================
 
 **Warning: Do not report bugs at bugs.winehq.org when using this version!
-Please take a look at our
-[Wiki](https://github.com/compholio/wine-compholio/wiki/Reporting-bugs)
-for more information about how to report bugs.**
+Please take a look [here](http://bugs.wine-staging.com) for more information
+about how to report bugs.**
 
-The **Wine "Compholio" Edition** is a special build of the popular Wine
-software that includes both patches written by our team and selected patches
-by third party developers that we consider good enough for inclusion. This can
-be seen as a testing version in preparation for patches to be submitted to
-upstream Wine - don't be surprised if you encounter additional bugs, which are
-not present in regular wine, and always report such issues to us (via github!),
-so we can improve our fixes even further. Thanks!
+**Wine Staging** (formerly wine-compholio) is a special wine version containing
+bug fixes and features that are not yet available in regular wine versions. The
+idea behind Wine Staging is to provide new features faster to end users and to
+give developers the possibility to discuss and improve their patches before
+they are sent upstream. We also intend to create a community of wine developers
+to share experience and to make it easier for beginners to start hacking on
+wine.
 
+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!
 
-How to install and use Wine-Compholio
-=====================================
+How to install and use Wine Staging
+===================================
 
-Ready-to-use packages for Wine-Compholio are available for a variety
+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
-[Wiki](https://github.com/compholio/wine-compholio/wiki/Installation).
+instructions available on the [website](http://www.wine-staging.com/install.html).
 
-When using Wine-Compholio there are a few differences compared to regular
+When using Wine Staging there are a few differences compared to regular
 Wine. The main difference is that it is not sufficient to type `wine` to
 run it, but instead you will have to type `/opt/wine-compholio/bin/wine`.
 Besides that there are also some other differences, for example additional
 configuration options to tweak performance, which are not available in regular
 Wine. All those differences are also documented on the
-[Wiki](https://github.com/compholio/wine-compholio/wiki/Usage).
+[Wiki](https://github.com/wine-compholio/wine-staging/wiki/Usage).
 
 
-Included bugfixes and improvements
-==================================
+Included bug fixes and improvements
+===================================
 
 {fixes}
 

debian/tools/patchlist.sh

@@ -1,32 +1,45 @@
 #!/bin/sh
 PATCH_DATA=$(cat);
 PATCH_LINES=$(echo "${PATCH_DATA}" | wc -l);
-PATCH_LINES=$((${PATCH_LINES}+20));
+PATCH_LINES=$((${PATCH_LINES}+23));
 
 cat <<EOF
-From: "FDS-Team" <webmaster@fds-team.de>
+From: Wine Staging Team <webmaster@fds-team.de>
 Subject: Autogenerated patch list.
 
----
+diff --git a/include/wine/library.h b/include/wine/library.h
+--- a/include/wine/library.h
++++ b/include/wine/library.h
+@@ -43,6 +43,7 @@ extern const char *wine_get_data_dir(void);
+ extern const char *wine_get_server_dir(void);
+ extern const char *wine_get_user_name(void);
+ extern const char *wine_get_version(void);
++extern const void *wine_get_patches(void);
+ extern const char *wine_get_build_id(void);
+ extern void wine_init_argv0_path( const char *argv0 );
+ extern void wine_exec_wine_binary( const char *name, char **argv, const char *env_var );
 diff --git a/libs/wine/config.c b/libs/wine/config.c
-index a273502..5fa0cd5 100644
+index a273502..0a3182f 100644
 --- a/libs/wine/config.c
 +++ b/libs/wine/config.c
 @@ -478,6 +478,${PATCH_LINES} @@ const char *wine_get_version(void)
      return PACKAGE_VERSION;
  }
  
-+struct wine_patch {
-+    const char *name;
++static const struct
++{
 +    const char *author;
-+    const char *title;
-+} wine_patch_data[] = {
++    const char *subject;
++    int revision;
++}
++wine_patch_data[] =
++{
 ${PATCH_DATA}
-+    { NULL, NULL, NULL }
++    { NULL, NULL, 0 }
 +};
 +
 +/* return the applied non-standard patches */
-+const void * wine_get_patches(void)
++const void *wine_get_patches(void)
 +{
 +    return &wine_patch_data[0];
 +}
@@ -58,16 +71,4 @@ index 2159fac..7cb2918 100644
      wine_init;
      wine_init_argv0_path;
      wine_is_dbcs_leadbyte;
-diff --git a/include/wine/library.h b/include/wine/library.h
-index 242bb69..aa9e585 100644
---- a/include/wine/library.h
-+++ b/include/wine/library.h
-@@ -43,6 +43,7 @@ extern const char *wine_get_data_dir(void);
- extern const char *wine_get_server_dir(void);
- extern const char *wine_get_user_name(void);
- extern const char *wine_get_version(void);
-+extern const void *wine_get_patches(void);
- extern const char *wine_get_build_id(void);
- extern void wine_init_argv0_path( const char *argv0 );
- extern void wine_exec_wine_binary( const char *name, char **argv, const char *env_var );
 EOF

debian/tools/progressbar.py

@@ -0,0 +1,106 @@
+#!/usr/bin/python2
+#
+# Python progressbar functions.
+#
+# Copyright (C) 2014 Sebastian Lackner
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+#
+
+import fcntl
+import os
+import signal
+import struct
+import sys
+import termios
+
+def _sig_winch(signum=None, frame=None):
+    """Signal handler for SIGWINCH."""
+    global _term_width
+    h, w, hp, wp = struct.unpack('HHHH', fcntl.ioctl(sys.stdout.fileno(),
+                   termios.TIOCGWINSZ, struct.pack('HHHH', 0, 0, 0, 0)))
+    _term_width  = w
+
+try:
+    _sig_winch()
+    signal.signal(signal.SIGWINCH, _sig_winch)
+except IOError:
+    _term_width = int(os.environ.get('COLUMNS', 80)) - 1
+
+class ProgressBar(object):
+    def __init__(self, desc="", msg=None, current=0, total=100):
+        """Initialize a new progress bar with given properties."""
+        self.desc    = desc
+        self.msg     = msg
+        self.current = current
+        self.total   = total
+
+    def __enter__(self):
+        self.update()
+        return self
+
+    def __exit__(self, type, value, traceback):
+        if type is not None:
+            sys.stdout.write("\r")
+            msg = "<interrupted>"
+        else:
+            msg = None
+        self.finish(msg)
+        if self.msg is not None:
+            sys.stdout.write("\n")
+
+    def update(self, value = None):
+        """Redraw the progressbar and optionally update the value."""
+        if value is not None:
+            self.current = value
+
+        if self.current == 0 or (self.current >= self.total and self.msg is None):
+            sys.stdout.write("%s\r" % (' ' * _term_width))
+            sys.stdout.flush()
+            return
+
+        width = _term_width / 2
+        s1 = self.desc.ljust(width - 1, ' ')[:width - 1]
+
+        width = _term_width - width
+        if self.current >= self.total:
+            s2 = self.msg.ljust(width, ' ')[:width]
+        elif width > 2:
+            numbars = min(self.current * (width - 2) / self.total, width - 2)
+            s2 = "[%s%s]" % ('#' * numbars, '-' * (width - 2 - numbars))
+            percent = " %d%% " % min(self.current * 100 / self.total, 100)
+            i = (len(s2)-len(percent))/2
+            s2 = "%s%s%s" % (s2[:i], percent, s2[i+len(percent):])
+
+        sys.stdout.write("%s %s\r" % (s1, s2))
+        sys.stdout.flush()
+
+    def finish(self, msg = None):
+        """Finalize the progressbar."""
+        if msg is not None:
+            self.msg = msg
+
+        self.current = self.total
+        self.update()
+        sys.stdout.flush()
+
+if __name__ == '__main__':
+    import time
+
+    print ""
+    with ProgressBar(desc="description") as x:
+        for i in xrange(100):
+            x.update(i)
+            time.sleep(1)

patches/Compholio/definition

@@ -1,15 +0,0 @@
-Author: Sebastian Lackner
-Subject: Add winediag message to show warning, that this isn't vanilla wine.
-Revision: 1
-
-Author: Sebastian Lackner
-Subject: Append '(Compholio)' at the end of the version string.
-Revision: 1
-
-Author: Sebastian Lackner
-Subject: Add commandline option --patches to show the patch list.
-Revision: 1
-
-Author: Michael Müller
-Subject: Add commandline option --check-libs to test if shared libraries are installed.
-Revision: 1

patches/Exagear/0001-ntdll-Implement-emulation-of-SIDT-instruction-when-u.patch

@@ -0,0 +1,288 @@
+From 7cb209e122fc503190dcad411483147ebc6d6cb4 Mon Sep 17 00:00:00 2001
+From: Sebastian Lackner <sebastian@fds-team.de>
+Date: Tue, 11 Nov 2014 03:11:33 +0100
+Subject: ntdll: Implement emulation of SIDT instruction when using Exagear.
+
+---
+ configure.ac             |   8 ++
+ dlls/ntdll/signal_i386.c | 224 +++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 232 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 92d78a2..c88a139 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -32,6 +32,7 @@ AC_ARG_ENABLE(win16, AS_HELP_STRING([--disable-win16],[do not include Win16 supp
+ AC_ARG_ENABLE(win64, AS_HELP_STRING([--enable-win64],[build a Win64 emulator on AMD64 (won't run Win32 binaries)]))
+ AC_ARG_ENABLE(tests, AS_HELP_STRING([--disable-tests],[do not build the regression tests]))
+ AC_ARG_ENABLE(maintainer-mode, AS_HELP_STRING([--enable-maintainer-mode],[enable maintainer-specific build rules]))
++AC_ARG_ENABLE(exagear-compat, AS_HELP_STRING([--enable-exagear-compat],[use workarounds for known problems in the Exagear emulator]))
+ 
+ AC_ARG_WITH(alsa,      AS_HELP_STRING([--without-alsa],[do not use the Alsa sound support]),
+             [if test "x$withval" = "xno"; then ac_cv_header_sys_asoundlib_h=no; ac_cv_header_alsa_asoundlib_h=no; fi])
+@@ -367,6 +368,13 @@ fi
+ WINE_WARNING_WITH(gettext,[test "$MSGFMT" = false],
+                   [gettext tools not found (or too old), translations won't be built.])
+ 
++dnl **** Enable Exagear workarounds ****
++
++if test "x$enable_exagear_compat" = "xyes"
++then
++  AC_DEFINE(EXAGEAR_COMPAT, 1, [Define if you want to enable Exagear emulator workarounds])
++fi
++
+ dnl **** Check for some libraries ****
+ 
+ dnl Check for -li386 for NetBSD and OpenBSD
+diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c
+index 13df4bb..edf5ea8 100644
+--- a/dlls/ntdll/signal_i386.c
++++ b/dlls/ntdll/signal_i386.c
+@@ -96,6 +96,14 @@ typedef struct
+     BYTE Reserved4[96];
+ } XMM_SAVE_AREA32;
+ 
++#include "pshpack1.h"
++struct idtr
++{
++    WORD  limit;
++    BYTE *base;
++};
++#include "poppack.h"
++
+ /***********************************************************************
+  * signal context platform-specific definitions
+  */
+@@ -1573,6 +1581,214 @@ static inline DWORD is_privileged_instr( CONTEXT *context )
+     }
+ }
+ 
++
++#ifdef EXAGEAR_COMPAT
++
++/***********************************************************************
++ *           INSTR_GetOperandAddr
++ *
++ * Return the address of an instruction operand (from the mod/rm byte).
++ */
++static BYTE *INSTR_GetOperandAddr( CONTEXT *context, const BYTE *instr,
++                                   int long_addr, int segprefix, int *len )
++{
++    int mod, rm, base = 0, index = 0, ss = 0, off;
++
++#define GET_VAL(val,type) \
++    { *val = *(type *)instr; instr += sizeof(type); *len += sizeof(type); }
++
++    *len = 0;
++    GET_VAL( &mod, BYTE );
++    rm = mod & 7;
++    mod >>= 6;
++
++    if (mod == 3)
++    {
++        switch(rm)
++        {
++        case 0: return (BYTE *)&context->Eax;
++        case 1: return (BYTE *)&context->Ecx;
++        case 2: return (BYTE *)&context->Edx;
++        case 3: return (BYTE *)&context->Ebx;
++        case 4: return (BYTE *)&context->Esp;
++        case 5: return (BYTE *)&context->Ebp;
++        case 6: return (BYTE *)&context->Esi;
++        case 7: return (BYTE *)&context->Edi;
++        }
++    }
++
++    if (long_addr)
++    {
++        if (rm == 4)
++        {
++            BYTE sib;
++            GET_VAL( &sib, BYTE );
++            rm = sib & 7;
++            ss = sib >> 6;
++            switch((sib >> 3) & 7)
++            {
++            case 0: index = context->Eax; break;
++            case 1: index = context->Ecx; break;
++            case 2: index = context->Edx; break;
++            case 3: index = context->Ebx; break;
++            case 4: index = 0; break;
++            case 5: index = context->Ebp; break;
++            case 6: index = context->Esi; break;
++            case 7: index = context->Edi; break;
++            }
++        }
++
++        switch(rm)
++        {
++        case 0: base = context->Eax; break;
++        case 1: base = context->Ecx; break;
++        case 2: base = context->Edx; break;
++        case 3: base = context->Ebx; break;
++        case 4: base = context->Esp; break;
++        case 5: base = context->Ebp; break;
++        case 6: base = context->Esi; break;
++        case 7: base = context->Edi; break;
++        }
++        switch (mod)
++        {
++        case 0:
++            if (rm == 5)  /* special case: ds:(disp32) */
++            {
++                GET_VAL( &base, DWORD );
++            }
++            break;
++
++        case 1:  /* 8-bit disp */
++            GET_VAL( &off, BYTE );
++            base += (signed char)off;
++            break;
++
++        case 2:  /* 32-bit disp */
++            GET_VAL( &off, DWORD );
++            base += (signed long)off;
++            break;
++        }
++    }
++    else  /* short address */
++    {
++        switch(rm)
++        {
++        case 0:  /* ds:(bx,si) */
++            base = LOWORD(context->Ebx) + LOWORD(context->Esi);
++            break;
++        case 1:  /* ds:(bx,di) */
++            base = LOWORD(context->Ebx) + LOWORD(context->Edi);
++            break;
++        case 2:  /* ss:(bp,si) */
++            base = LOWORD(context->Ebp) + LOWORD(context->Esi);
++            break;
++        case 3:  /* ss:(bp,di) */
++            base = LOWORD(context->Ebp) + LOWORD(context->Edi);
++            break;
++        case 4:  /* ds:(si) */
++            base = LOWORD(context->Esi);
++            break;
++        case 5:  /* ds:(di) */
++            base = LOWORD(context->Edi);
++            break;
++        case 6:  /* ss:(bp) */
++            base = LOWORD(context->Ebp);
++            break;
++        case 7:  /* ds:(bx) */
++            base = LOWORD(context->Ebx);
++            break;
++        }
++
++        switch(mod)
++        {
++        case 0:
++            if (rm == 6)  /* special case: ds:(disp16) */
++            {
++                GET_VAL( &base, WORD );
++            }
++            break;
++
++        case 1:  /* 8-bit disp */
++            GET_VAL( &off, BYTE );
++            base += (signed char)off;
++            break;
++
++        case 2:  /* 16-bit disp */
++            GET_VAL( &off, WORD );
++            base += (signed short)off;
++            break;
++        }
++        base &= 0xffff;
++    }
++    /* FIXME: we assume that all segments have a base of 0 */
++    return (BYTE *)(base + (index << ss));
++#undef GET_VAL
++}
++
++
++/***********************************************************************
++ *           check_invalid_instr
++ *
++ * Support for instructions not implemented by Exagear.
++ */
++static inline BOOL check_invalid_instr( CONTEXT *context )
++{
++    const BYTE *instr;
++    unsigned int prefix_count = 0;
++    int len, long_addr = 1;
++
++    if (!wine_ldt_is_system( context->SegCs )) return FALSE;
++    instr = (BYTE *)context->Eip;
++
++    for (;;) switch (*instr)
++    {
++    /* instruction prefixes */
++    case 0x2e:  /* %cs: */
++    case 0x36:  /* %ss: */
++    case 0x3e:  /* %ds: */
++    case 0x26:  /* %es: */
++    case 0x64:  /* %fs: */
++    case 0x65:  /* %gs: */
++    case 0x66:  /* opcode size */
++    case 0x67:  /* addr size */
++    case 0xf0:  /* lock */
++    case 0xf2:  /* repne */
++    case 0xf3:  /* repe */
++        if (++prefix_count >= 15) return FALSE;
++        if (*instr == 0x67) long_addr = !long_addr; /* addr size */
++        instr++;
++        continue;
++    case 0x0f: /* extended instruction */
++        switch (instr[1])
++        {
++        case 0x01:
++            if (((instr[2] >> 3) & 7) == 1) /* sidt m */
++            {
++                struct idtr ret;
++                BYTE *addr;
++
++                if ((instr[2] >> 6) == 3) return FALSE; /* loading to register not allowed */
++                addr = INSTR_GetOperandAddr( context, instr + 2, long_addr, 0, &len );
++
++                /* fake IDT structure */
++                ret.limit = 0xfff;
++                ret.base  = (void *)0xff000000;
++                memcpy(addr, &ret, sizeof(ret));
++
++                context->Eip += prefix_count + len + 2;
++                return TRUE;
++            }
++            break;
++        }
++        return FALSE;
++    default:
++        return FALSE;
++    }
++}
++
++#endif /* EXAGEAR_COMPAT */
++
++
+ /***********************************************************************
+  *           check_invalid_gs
+  *
+@@ -1902,6 +2118,14 @@ static void WINAPI raise_segv_exception( EXCEPTION_RECORD *rec, CONTEXT *context
+ 
+     switch(rec->ExceptionCode)
+     {
++#ifdef EXAGEAR_COMPAT
++    case EXCEPTION_ILLEGAL_INSTRUCTION:
++        {
++            if (check_invalid_instr( context ))
++                goto done;
++        }
++        break;
++#endif
+     case EXCEPTION_ACCESS_VIOLATION:
+         if (rec->NumberParameters == 2)
+         {
+-- 
+2.1.3
+

patches/Exagear/0002-ntdll-Fix-issues-with-write-watches-when-using-Exage.patch

@@ -0,0 +1,51 @@
+From 8c7754a1da9f43cf15057a8467c0b76c9da2ce40 Mon Sep 17 00:00:00 2001
+From: Sebastian Lackner <sebastian@fds-team.de>
+Date: Sat, 22 Nov 2014 05:49:30 +0100
+Subject: ntdll: Fix issues with write watches when using Exagear.
+
+---
+ dlls/ntdll/virtual.c | 21 +++++++++++++++++++++
+ 1 file changed, 21 insertions(+)
+
+diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c
+index 1a8e4a4..4140323 100644
+--- a/dlls/ntdll/virtual.c
++++ b/dlls/ntdll/virtual.c
+@@ -1558,6 +1558,26 @@ NTSTATUS virtual_handle_fault( LPCVOID addr, DWORD err )
+     {
+         void *page = ROUND_ADDR( addr, page_mask );
+         BYTE *vprot = &view->prot[((const char *)page - (const char *)view->base) >> page_shift];
++#ifdef EXAGEAR_COMPAT
++        /* Exagear doesn't correctly set err, so always check for write watches, and
++         * retry after removing the VPROT_WRITEWATCH or VPROT_WRITECOPY flag. In
++         * contrary to the general implementation below this is not completely race-
++         * condition safe. When multiple threads trigger the write watch at the same
++         * time only the first thread will properly continue the execution, the rest
++         * will crash. */
++        if ((view->protect & VPROT_WRITEWATCH) && (*vprot & VPROT_WRITEWATCH))
++        {
++            *vprot &= ~VPROT_WRITEWATCH;
++            VIRTUAL_SetProt( view, page, page_size, *vprot );
++            if (VIRTUAL_GetUnixProt( *vprot ) & PROT_WRITE) ret = STATUS_SUCCESS;
++        }
++        if (*vprot & VPROT_WRITECOPY)
++        {
++            *vprot = (*vprot & ~VPROT_WRITECOPY) | VPROT_WRITE;
++            VIRTUAL_SetProt( view, page, page_size, *vprot );
++            if (VIRTUAL_GetUnixProt( *vprot ) & PROT_WRITE) ret = STATUS_SUCCESS;
++        }
++#else
+         if (err & EXCEPTION_WRITE_FAULT)
+         {
+             if ((view->protect & VPROT_WRITEWATCH) && (*vprot & VPROT_WRITEWATCH))
+@@ -1573,6 +1593,7 @@ NTSTATUS virtual_handle_fault( LPCVOID addr, DWORD err )
+             /* ignore fault if page is writable now */
+             if (VIRTUAL_GetUnixProt( *vprot ) & PROT_WRITE) ret = STATUS_SUCCESS;
+         }
++#endif
+         if (*vprot & VPROT_GUARD)
+         {
+             VIRTUAL_SetProt( view, page, page_size, *vprot & ~VPROT_GUARD );
+-- 
+2.1.3
+

patches/Exagear/0003-server-Don-t-attempt-to-use-ptrace-when-running-with.patch

@@ -0,0 +1,25 @@
+From 67cc0e23b26d5d9abda7eb771dc2bec309cb8650 Mon Sep 17 00:00:00 2001
+From: Sebastian Lackner <sebastian@fds-team.de>
+Date: Sun, 23 Nov 2014 22:33:51 +0100
+Subject: server: Don't attempt to use ptrace when running with Exagear.
+
+---
+ server/ptrace.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/server/ptrace.c b/server/ptrace.c
+index cb436b6..fb29b5a 100644
+--- a/server/ptrace.c
++++ b/server/ptrace.c
+@@ -531,7 +531,7 @@ void get_selector_entry( struct thread *thread, int entry, unsigned int *base,
+ 
+ 
+ #if defined(linux) && (defined(HAVE_SYS_USER_H) || defined(HAVE_ASM_USER_H)) \
+-    && (defined(__i386__) || defined(__x86_64__))
++    && (defined(__i386__) || defined(__x86_64__)) && !defined(EXAGEAR_COMPAT)
+ 
+ #ifdef HAVE_SYS_USER_H
+ #include <sys/user.h>
+-- 
+2.1.3
+

patches/Exagear/definition

@@ -0,0 +1 @@
+Depends: ntdll-WRITECOPY