Release 1.7.29.

The old patch contained several issues, including invalid memory access, a memory leak,
and wrong DACL size calculation. This updated version simplifies the logic a bit and should
fix those issues.

DEVELOPER.md

@@ -32,15 +32,15 @@ before proceeding.
 
 As the first step please grab the latest Wine source:
 ```bash
-wget http://prdownloads.sourceforge.net/wine/wine-1.7.27.tar.bz2
-wget https://github.com/compholio/wine-compholio-daily/archive/v1.7.27.tar.gz
+wget http://prdownloads.sourceforge.net/wine/wine-1.7.29.tar.bz2
+wget https://github.com/compholio/wine-compholio-daily/archive/v1.7.29.tar.gz
 ```
 
 Extract the archives:
 ```bash
 tar xvjf wine-1*.tar.bz2
 cd wine-1*
-tar xvzf ../v1.7.27.tar.gz --strip-components 1
+tar xvzf ../v1.7.29.tar.gz --strip-components 1
 ```
 
 And apply the patches:

README.md

@@ -35,68 +35,85 @@ Wine. All those differences are also documented on the
 Included bugfixes and improvements
 ==================================
 
-**Bugs fixed in Wine-Compholio 1.7.27 [63]:**
+**Bugs fixed in Wine-Compholio 1.7.29 [80]:**
 
-* ATL IOCS data should not be stored in GWLP_USERDATA ([Wine Bug #21767](http://bugs.winehq.org/show_bug.cgi?id=21767 "Multiple applications storing AxHostWindow instance pointer in GWLP_USERDATA crash on startup (Wine uses GWLP_USERDATA to store IOCS)(JLC's Internet TV, Anime Studio Pro 10.x)"))
-* Add Dynamic DST exceptions for Israel Standard Time ([Wine Bug #36374](http://bugs.winehq.org/show_bug.cgi?id=36374 "Israel timezone handled incorrectly"))
+* ATL IOCS data should not be stored in GWLP_USERDATA ([Wine Bug #21767](http://bugs.winehq.org/show_bug.cgi?id=21767))
+* Add Dynamic DST exceptions for Israel Standard Time ([Wine Bug #36374](http://bugs.winehq.org/show_bug.cgi?id=36374))
 * Add default ACLs for user shell folders
-* Allow special characters in pipe names ([Wine Bug #28995](http://bugs.winehq.org/show_bug.cgi?id=28995 "Unable to use named pipes with \">\" character in the name"))
-* Audio stuttering and performance drops in multiple applications ([Wine Bug #30639](http://bugs.winehq.org/show_bug.cgi?id=30639 "Audio stuttering and performance drops in Star Wolves 3"))
-* Don't fill KdHelp structure for usermode applications ([Wine Bug #37272](http://bugs.winehq.org/show_bug.cgi?id=37272 "CheatEngine 6.4 fails after remote process 'breakin', reporting 'Debugger Crash:Access violation (Last location:41)'"))
-* Ensure NtProtectVirtualMemory and NtCreateSection are on separate pages ([Wine Bug #33162](http://bugs.winehq.org/show_bug.cgi?id=33162 "Acrobat Reader 11 crashes on start (native API application virtualization, NtProtectVirtualMemory removes execute page protection on its own code)"))
-* Fix black screen on startup introduced by pixelformat changes. ([Wine Bug #35950](http://bugs.winehq.org/show_bug.cgi?id=35950 "StarCraft: Black screen, hangs on startup"))
-* Fix comparison of punctuation characters in lstrcmp ([Wine Bug #10767](http://bugs.winehq.org/show_bug.cgi?id=10767 "lstrcmp and others do not compare punctuation characters correctly"))
-* Fix flickering introduced by pixelformat changes. ([Wine Bug #35718](http://bugs.winehq.org/show_bug.cgi?id=35718 "Multiple games have extreme flicker, stutter, slowdown (Path of Exile, Roller Coaster Tycoon, Counter Strike: Global Offensive, Warframe, Crysis, Anno 1602,  Splinter Cell: Blacklist)"))
-* Fix for ConnectNamedPort return value in overlapped mode ([Wine Bug #16550](http://bugs.winehq.org/show_bug.cgi?id=16550 "ConnectNamedPort should never return OK in overlapped mode (affects chromium ui_tests.exe)"))
-* Fix for programs leaking wndproc slots ([Wine Bug #32451](http://bugs.winehq.org/show_bug.cgi?id=32451 "Multiple GOG.com installer bundles show a broken/unresponsive dialog window during installation (installer process running out of wndproc slots)"))
-* Fix gray screen on startup introduced by pixelformat changes. ([Wine Bug #35975](http://bugs.winehq.org/show_bug.cgi?id=35975 "Comanche 3 shows only gray screen"))
-* Fix issue with invisible dragimages in ImageList ([Wine Bug #36761](http://bugs.winehq.org/show_bug.cgi?id=36761 "Imagelist invisible dragimage"))
-* Fix missing video introduced by pixelformat changes. ([Wine Bug #36900](http://bugs.winehq.org/show_bug.cgi?id=36900 "Star Wars Galactic Battlegrounds Clone Campaigns: no video (regression)"))
+* Add partially support for sessionStorage
+* Allow special characters in pipe names ([Wine Bug #28995](http://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](http://bugs.winehq.org/show_bug.cgi?id=30639))
+* Correctly treat '.' when checking for empty directories ([Wine Bug #26272](http://bugs.winehq.org/show_bug.cgi?id=26272))
+* Do not fail when a used context is passed to wglShareLists ([Wine Bug #11436](http://bugs.winehq.org/show_bug.cgi?id=11436))
+* Don't fill KdHelp structure for usermode applications ([Wine Bug #37272](http://bugs.winehq.org/show_bug.cgi?id=37272))
+* Ensure NtProtectVirtualMemory and NtCreateSection are on separate pages ([Wine Bug #33162](http://bugs.winehq.org/show_bug.cgi?id=33162))
+* FEAR 1 installer expects basic_string_wchar_dtor to return NULL ([Wine Bug #37358](http://bugs.winehq.org/show_bug.cgi?id=37358))
+* Fix black screen on startup introduced by pixelformat changes. ([Wine Bug #35950](http://bugs.winehq.org/show_bug.cgi?id=35950))
+* Fix comparison of punctuation characters in lstrcmp ([Wine Bug #10767](http://bugs.winehq.org/show_bug.cgi?id=10767))
+* Fix flickering introduced by pixelformat changes. ([Wine Bug #35718](http://bugs.winehq.org/show_bug.cgi?id=35718))
+* Fix for ConnectNamedPort return value in overlapped mode ([Wine Bug #16550](http://bugs.winehq.org/show_bug.cgi?id=16550))
+* Fix for programs leaking wndproc slots ([Wine Bug #32451](http://bugs.winehq.org/show_bug.cgi?id=32451))
+* Fix gray screen on startup introduced by pixelformat changes. ([Wine Bug #35975](http://bugs.winehq.org/show_bug.cgi?id=35975))
+* Fix issues when driver dispatch routine returns different status codes ([Wine Bug #30155](http://bugs.winehq.org/show_bug.cgi?id=30155))
+* Fix missing video introduced by pixelformat changes. ([Wine Bug #36900](http://bugs.winehq.org/show_bug.cgi?id=36900))
 * Fix unintentional leaks with ntdll internals
-* Fix wined3d performance drop introduced by pixelformat changes. ([Wine Bug #35655](http://bugs.winehq.org/show_bug.cgi?id=35655 "Wined3d performance drop"))
-* Games For Windows Live 1.x expects a valid linker version in the PE header ([Wine Bug #28768](http://bugs.winehq.org/show_bug.cgi?id=28768 "Multiple GFWL (Games For Windows Live) 1.x games crash on startup (Kane & Lynch: Dead Men)"))
-* GetSecurityInfo returns NULL DACL for process object ([Wine Bug #15980](http://bugs.winehq.org/show_bug.cgi?id=15980 "Rhapsody 2 crashes on startup (GetSecurityInfo returns NULL DACL for process object)"))
-* Implement a Microsoft Yahei replacement font ([Wine Bug #13829](http://bugs.winehq.org/show_bug.cgi?id=13829 "Wine does not have CJK fonts"))
-* Implement an Arial replacement font ([Wine Bug #32323](http://bugs.winehq.org/show_bug.cgi?id=32323 "Netflix (Silverlight 4.x) and several .NET Framework 3.x/4.0 WPF apps require either Arial or Verdana to be installed"))
+* Fix wined3d performance drop introduced by pixelformat changes. ([Wine Bug #35655](http://bugs.winehq.org/show_bug.cgi?id=35655))
+* Games For Windows Live 1.x expects a valid linker version in the PE header ([Wine Bug #28768](http://bugs.winehq.org/show_bug.cgi?id=28768))
+* GetSecurityInfo returns NULL DACL for process object ([Wine Bug #15980](http://bugs.winehq.org/show_bug.cgi?id=15980))
+* Implement a Microsoft Yahei replacement font ([Wine Bug #13829](http://bugs.winehq.org/show_bug.cgi?id=13829))
+* Implement an Arial replacement font ([Wine Bug #32323](http://bugs.winehq.org/show_bug.cgi?id=32323))
 * Improvement for heap allocation performance
-* Lego Stunt Rally requires DXTn software de/encoding support ([Wine Bug #25486](http://bugs.winehq.org/show_bug.cgi?id=25486 "Lego Stunt Rally: 3d scene is black"))
+* Lego Stunt Rally requires DXTn software de/encoding support ([Wine Bug #25486](http://bugs.winehq.org/show_bug.cgi?id=25486))
+* Limit cross thread access to ImmSet* functions ([Wine Bug #35361](http://bugs.winehq.org/show_bug.cgi?id=35361))
 * Lockfree algorithm for filedescriptor cache (improves file access speed)
-* Make it possible to change media center / tablet pc status ([Wine Bug #18732](http://bugs.winehq.org/show_bug.cgi?id=18732 "Microsoft Experience Pack for Tablet PC 1 refuses to install"))
-* Need for Speed 3 installer requires devices in HKEY_DYN_DATA ([Wine Bug #7115](http://bugs.winehq.org/show_bug.cgi?id=7115 "Need for Speed III installer fails in Win9X mode, reporting \"Could not get 'HardWareKey' value\" (active PnP device keys in 'HKEY_DYN_DATA\\\\Config Manager\\\\Enum' missing)"))
+* Make it possible to change media center / tablet pc status ([Wine Bug #18732](http://bugs.winehq.org/show_bug.cgi?id=18732))
+* Multiple applications need EnumDisplayDevicesW implementation ([Wine Bug #34978](http://bugs.winehq.org/show_bug.cgi?id=34978))
+* Need for Speed 3 installer requires devices in HKEY_DYN_DATA ([Wine Bug #7115](http://bugs.winehq.org/show_bug.cgi?id=7115))
 * Other Pipelight-specific enhancements
-* Prevent window managers from grouping all wine programs together ([Wine Bug #32699](http://bugs.winehq.org/show_bug.cgi?id=32699 "Add StartupWMClass to .desktop files."))
+* Prevent window managers from grouping all wine programs together ([Wine Bug #32699](http://bugs.winehq.org/show_bug.cgi?id=32699))
 * Reduced SetTimer minimum value from 10 ms to 5 ms (improves Silverlight framerates)
-* Return an error when trying to open a terminated process ([Wine Bug #37087](http://bugs.winehq.org/show_bug.cgi?id=37087 "Gothic 2 english demo fails with 'Conflict: a hook process was found. Please deactivate all Antivirus and Anti-Trojan programs and debuggers.'"))
-* Return correct IMediaSeeking stream positions in quartz ([Wine Bug #23174](http://bugs.winehq.org/show_bug.cgi?id=23174 "Fallout 3: Diologue and Video/sound issues"))
+* Return an error when trying to open a terminated process ([Wine Bug #37087](http://bugs.winehq.org/show_bug.cgi?id=37087))
+* Return correct IMediaSeeking stream positions in quartz ([Wine Bug #23174](http://bugs.winehq.org/show_bug.cgi?id=23174))
 * SO_CONNECT_TIME returns the appropriate time
-* Set ldr.EntryPoint for main executable ([Wine Bug #33034](http://bugs.winehq.org/show_bug.cgi?id=33034 "Many GFWL (Games For Windows Live) 1.x/2.x/3.x games crash or exit silently on startup (DiRT 2/3, GTA IV Steam)"))
-* Support for AllocateAndGetTcpExTableFromStack ([Wine Bug #34372](http://bugs.winehq.org/show_bug.cgi?id=34372 "Add missing function AllocateAndGetTcpExTableFromStack() to iphlpapi.dll"))
-* Support for DOS hidden/system file attributes ([Wine Bug #9158](http://bugs.winehq.org/show_bug.cgi?id=9158 "Multiple Microsoft development tools online/web installers fail to skip \"$shtdwn$.req\" with FILE_ATTRIBUTE_HIDDEN (Visual Studio Express Editions, .NET Framework 3.0)"))
+* Send WM_PAINT event during dialog creation ([Wine Bug #35652](http://bugs.winehq.org/show_bug.cgi?id=35652))
+* Support for AllocateAndGetTcpExTableFromStack ([Wine Bug #34372](http://bugs.winehq.org/show_bug.cgi?id=34372))
+* Support for BindImageEx ([Wine Bug #3591](http://bugs.winehq.org/show_bug.cgi?id=3591))
+* Support for D3DXGetShaderInputSemantics ([Wine Bug #22682](http://bugs.winehq.org/show_bug.cgi?id=22682))
+* Support for DOS hidden/system file attributes ([Wine Bug #9158](http://bugs.winehq.org/show_bug.cgi?id=9158))
 * Support for Dynamic DST (daylight saving time) information in registry
-* Support for FIND_FIRST_EX_LARGE_FETCH flag in FindFirstFileExW ([Wine Bug #35121](http://bugs.winehq.org/show_bug.cgi?id=35121 "Multiple applications/games fail to start with WinVer set to 'Windows 7' (FindFirstFileExW needs FIND_FIRST_EX_LARGE_FETCH support)(FotoQuelle Fotosoftware v4.13, QT5)"))
-* Support for GetFinalPathNameByHandle ([Wine Bug #36073](http://bugs.winehq.org/show_bug.cgi?id=36073 "OneDrive crashes on unimplemented function KERNEL32.dll.GetFinalPathNameByHandleW"))
-* Support for GetSystemTimes ([Wine Bug #19813](http://bugs.winehq.org/show_bug.cgi?id=19813 "Voddler needs GetSystemTimes to run"))
+* Support for FindFirstFileExW level FindExInfoBasic ([Wine Bug #37354](http://bugs.winehq.org/show_bug.cgi?id=37354))
+* Support for GetFinalPathNameByHandle ([Wine Bug #36073](http://bugs.winehq.org/show_bug.cgi?id=36073))
+* Support for GetSystemTimes ([Wine Bug #19813](http://bugs.winehq.org/show_bug.cgi?id=19813))
 * Support for GetVolumePathName
-* Support for ITextDocument_fnRange function ([Wine Bug #12458](http://bugs.winehq.org/show_bug.cgi?id=12458 "Multiple apps fail due to RichEdit ITextDocument_fnRange stub (MySQL Workbench, BlitzMaxDemo137)"))
-* Support for ITextRange, ITextFont and ITextPara ([Wine Bug #18303](http://bugs.winehq.org/show_bug.cgi?id=18303 "Adobe Acrobat Pro 7: Crashes when selecting the \"edit\" menu while having a file open."))
-* Support for Junction Points ([Wine Bug #12401](http://bugs.winehq.org/show_bug.cgi?id=12401 "Support junction points, i.e. DeviceIoCtl(FSCTL_SET_REPARSE_POINT/FSCTL_GET_REPARSE_POINT)"))
-* Support for KF_FLAG_DEFAULT_PATH in SHGetKnownFolderPath ([Wine Bug #30385](http://bugs.winehq.org/show_bug.cgi?id=30385 "Windows Live Essentials 2011 web installer fails to download packages in background (shell32.SHGetKnownFolderPath missing support for KF_FLAG_DEFAULT_PATH)"))
-* Support for LoadIconMetric ([Wine Bug #35375](http://bugs.winehq.org/show_bug.cgi?id=35375 "Multiple applications need Vista+ API COMCTL32.dll.380 a.k.a. 'LoadIconMetric' (Solidworks 2013 systray monitor, Microsoft One/SkyDrive)"))
-* Support for NtSetInformationFile class FileDispositionInformation ([Wine Bug #30397](http://bugs.winehq.org/show_bug.cgi?id=30397 "Multiple applications need support for NtSetInformationFile class FileDispositionInformation (Cygwin installer, Stylizer 5.x Visual CSS editor, Spoon Studio 2011 (ex Xenocode) application sandboxing scheme)"))
-* Support for PulseAudio backend for audio ([Wine Bug #10495](http://bugs.winehq.org/show_bug.cgi?id=10495 "Wine should support PulseAudio"))
-* Support for SHCreateSessionKey ([Wine Bug #35630](http://bugs.winehq.org/show_bug.cgi?id=35630 "SHCreateSessionKey is unimplemented"))
-* Support for TOOLTIPS_GetTipText edge cases ([Wine Bug #30648](http://bugs.winehq.org/show_bug.cgi?id=30648 "SEGA Genesis / Mega Drive Classic Collection (Steam) crashes on startup"))
-* Support for TransmitFile ([Wine Bug #5048](http://bugs.winehq.org/show_bug.cgi?id=5048 "Multiple applications and games need support for ws2_32 SIO_GET_EXTENSION_FUNCTION_POINTER TransmitFile (WSAID_TRANSMITFILE)"))
-* Support for WTSEnumerateProcessesW ([Wine Bug #29903](http://bugs.winehq.org/show_bug.cgi?id=29903 "Some Microsoft debuggers fail to enumerate processes due to wtsapi32.WTSEnumerateProcessesW() being a stub (Microsoft Visual Studio 2005, DbgCLR from .NET 2.0 SDK)"))
-* Support for [Get|Set]SystemFileCacheSize ([Wine Bug #35886](http://bugs.winehq.org/show_bug.cgi?id=35886 "Lotus Notes 9 'cacheset.exe' utility needs KERNEL32.dll.SetSystemFileCacheSize"))
-* Support for extra large and jumbo icon lists in shell32 ([Wine Bug #24721](http://bugs.winehq.org/show_bug.cgi?id=24721 "Explorer++ crashes when choosing to view large icons or extra large icons"))
-* Support for inherited file ACLs ([Wine Bug #34406](http://bugs.winehq.org/show_bug.cgi?id=34406 "Finale Notepad 2012 doesn't copy/create user files on program start"))
-* Support for interface change notifications ([Wine Bug #32328](http://bugs.winehq.org/show_bug.cgi?id=32328 "Many .NET and Silverlight applications require SIO_ADDRESS_LIST_CHANGE for interface change notifications"))
-* Support for process ACLs ([Wine Bug #22006](http://bugs.winehq.org/show_bug.cgi?id=22006 "OpenProcess does not enforce ACL"))
-* Support for setcap on wine-preloader ([Wine Bug #26256](http://bugs.winehq.org/show_bug.cgi?id=26256 "wine64-preloader can't handle setcap cap_net_raw+epi"))
-* Support for stored file ACLs ([Wine Bug #31858](http://bugs.winehq.org/show_bug.cgi?id=31858 "Netflix on Firefox fails with Internet Connection Problem when loading bar is at 99%"))
-* Support for ws2_32.inet_pton ([Wine Bug #36713](http://bugs.winehq.org/show_bug.cgi?id=36713 "Watch_Dogs requires ws2_32.inet_pton"))
-* Use manual relay for RunDLL_CallEntry16 in shell32 ([Wine Bug #23033](http://bugs.winehq.org/show_bug.cgi?id=23033 "Tages Protection v5.x: games report \"DLL not found shell.dll16.dll\" (Runaway 2: The Dream Of The Turtle, ...)"))
+* Support for ID3DXSkinInfoImpl_UpdateSkinnedMesh ([Wine Bug #32572](http://bugs.winehq.org/show_bug.cgi?id=32572))
+* Support for IRichEditOle and ITextDocument support for ITextServices. ([Wine Bug #17042](http://bugs.winehq.org/show_bug.cgi?id=17042))
+* Support for ITextDocument_fnRange function ([Wine Bug #12458](http://bugs.winehq.org/show_bug.cgi?id=12458))
+* Support for ITextRange, ITextFont and ITextPara ([Wine Bug #18303](http://bugs.winehq.org/show_bug.cgi?id=18303))
+* Support for Junction Points ([Wine Bug #12401](http://bugs.winehq.org/show_bug.cgi?id=12401))
+* Support for KF_FLAG_DEFAULT_PATH in SHGetKnownFolderPath ([Wine Bug #30385](http://bugs.winehq.org/show_bug.cgi?id=30385))
+* Support for LoadIconMetric ([Wine Bug #35375](http://bugs.winehq.org/show_bug.cgi?id=35375))
+* Support for NtQuerySection ([Wine Bug #37338](http://bugs.winehq.org/show_bug.cgi?id=37338))
+* Support for NtSetInformationFile class FileDispositionInformation ([Wine Bug #30397](http://bugs.winehq.org/show_bug.cgi?id=30397))
+* Support for PulseAudio backend for audio ([Wine Bug #10495](http://bugs.winehq.org/show_bug.cgi?id=10495))
+* Support for SHCreateSessionKey ([Wine Bug #35630](http://bugs.winehq.org/show_bug.cgi?id=35630))
+* Support for TOOLTIPS_GetTipText edge cases ([Wine Bug #30648](http://bugs.winehq.org/show_bug.cgi?id=30648))
+* Support for TransmitFile ([Wine Bug #5048](http://bugs.winehq.org/show_bug.cgi?id=5048))
+* Support for UTF7 encoding/decoding ([Wine Bug #27388](http://bugs.winehq.org/show_bug.cgi?id=27388))
+* Support for WTSEnumerateProcessesW ([Wine Bug #29903](http://bugs.winehq.org/show_bug.cgi?id=29903))
+* Support for extra large and jumbo icon lists in shell32 ([Wine Bug #24721](http://bugs.winehq.org/show_bug.cgi?id=24721))
+* Support for inherited file ACLs ([Wine Bug #34406](http://bugs.winehq.org/show_bug.cgi?id=34406))
+* Support for interface change notifications ([Wine Bug #32328](http://bugs.winehq.org/show_bug.cgi?id=32328))
+* Support for process ACLs ([Wine Bug #22006](http://bugs.winehq.org/show_bug.cgi?id=22006))
+* Support for setcap on wine-preloader ([Wine Bug #26256](http://bugs.winehq.org/show_bug.cgi?id=26256))
+* Support for stored file ACLs ([Wine Bug #31858](http://bugs.winehq.org/show_bug.cgi?id=31858))
+* Support for wine64 on FreeBSD/PC-BSD ([Wine Bug #34330](http://bugs.winehq.org/show_bug.cgi?id=34330))
+* Support for ws2_32.inet_pton ([Wine Bug #36713](http://bugs.winehq.org/show_bug.cgi?id=36713))
+* Unity3D Editor requires ProductId registry value ([Wine Bug #36964](http://bugs.winehq.org/show_bug.cgi?id=36964))
+* Update a XIM candidate position when cursor location changes ([Wine Bug #30938](http://bugs.winehq.org/show_bug.cgi?id=30938))
+* Use manual relay for RunDLL_CallEntry16 in shell32 ([Wine Bug #23033](http://bugs.winehq.org/show_bug.cgi?id=23033))
+* Voobly expects correct handling of WRITECOPY memory protection ([Wine Bug #29384](http://bugs.winehq.org/show_bug.cgi?id=29384))
+* Wine ignores IDF_CHECKFIRST flag in SetupPromptForDisk ([Wine Bug #20465](http://bugs.winehq.org/show_bug.cgi?id=20465))
 * Workaround for shlwapi URLs with relative paths
 * XEMBED support for embedding Wine windows inside Linux applications
 * nVidia driver for high-end laptop cards does not list all supported resolutions

debian/changelog

@@ -1,3 +1,52 @@
+wine-compholio (1.7.29) unstable; urgency=low
+  * Updated DOS Attributes patch to better detect XATTR functions.
+  * Updated patch for shell32 default folder ACLs.
+  * Updated NtQuerySection patch.
+  * Updated patch for WRITECOPY memory protection.
+  * Added patch to support IDF_CHECKFIRST in SetupPromptForDisk.
+  * Added patch to fix issues when executing pages with guard page / write watch permissions.
+  * Added patch to set return value of basic_string_wchar_dtor to return NULL.
+  * Added patch for UTF7 encoding/decoding support.
+  * Added patch to implement ID3DXSkinInfoImpl_UpdateSkinnedMesh.
+  * Added patch for implementation of D3DXGetShaderInputSemantics.
+  * Added patch to ensure tests check exact return value of ParseURLFromOutsideSourceX.
+  * Added patch for additional ATL thunks.
+  * Added patch to add partially support for sessionStorage.
+  * Added patch for implementation of GetNumaProcessorNode.
+  * Added patch for wine64 support on FreeBSD/PC-BSD.
+  * Added patch for improved multi monitor support.
+  * Added patch for implementation of BindImageEx.
+  * Removed patch to fix issues with drag image in ImageLists (accepted upstream).
+  * Removed patch to set ldr.EntryPoint for main executable (accepted upstream).
+  * Removed patch to implement stubs for [Get|Set]SystemFileCacheSize (accepted upstream).
+  * Removed patches for ATL thunk implementation (accepted upstream).
+  * Partially removed patches for WRITECOPY memory protection (accepted upstream).
+ -- Sebastian Lackner <sebastian@fds-team.de>  Sun, 19 Oct 2014 19:37:21 +0200
+
+wine-compholio (1.7.28) unstable; urgency=low
+  * Added missing recommendation for libtxc-dxtn-s2tc0 on Ubuntu.
+  * Added patch to fix issues with over-the-spot input method.
+  * Added patch to fix winemenubuilder desktop icon wine path (when using multiple wine versions).
+  * Added patch to support FIND_FIRST_EX_CASE_SENSITIVE flag in FindFirstFileExW.
+  * Added patch to send WM_PAINT event during dialog creation.
+  * Added patch to fix issues when driver dispatch routine returns different status codes.
+  * Added several patches for Unity3D Editor.
+  * Added patch to fix differences between exception handling behaviour in Wine and Windows.
+  * Added patch to export ?_BADOFF@std@@3_JB on both i386 and win64.
+  * Added patch to limit cross thread access to ImmSet* functions.
+  * Added patch for IRichEditOle and ITextDocument support for ITextServices.
+  * Added patch to fix implementation of SH*Shared commands.
+  * Added patch to handle WRITECOPY memory protection properly on i386 (disabled by default).
+  * Added patch to fix some issues with write watches / guard page access.
+  * Added patch to implement NtQuerySection.
+  * Added patches to make clearly visible, that this is a patched wine version.
+  * Added patch for FindFirstFileExW level FindExInfoBasic. 
+  * Removed patch to support FIND_FIRST_EX_CASE_SENSITIVE flag in FindFirstFileExW (accepted upstream).
+  * Removed patch to fix implementation of SH*Shared commands (accepted upstream).
+  * Removed patch to export ?_BADOFF@std@@3_JB on both i386 and win64 (accepted upstream).
+  * Partially removed patches for CreateProcess ACLs (accepted upstream).
+ -- Sebastian Lackner <sebastian@fds-team.de>  Sat, 04 Oct 2014 04:36:22 +0200
+
 wine-compholio (1.7.27) unstable; urgency=low
   * Fixed some issues in the patches for GetSystemTimes.
   * Added patch to support FIND_FIRST_EX_LARGE_FETCH flag in FindFirstFileExW.

debian/control

@@ -93,6 +93,7 @@ Recommends: libcapi20-3,
             libsane,
             libssl1.0.0,
             libtiff5 | libtiff4,
+            libtxc-dxtn-s2tc0,
             libv4l-0,
             libxcomposite1,
             libxcursor1,
@@ -148,6 +149,7 @@ Recommends: libcapi20-3,
             libsane,
             libssl1.0.0,
             libtiff5 | libtiff4,
+            libtxc-dxtn-s2tc0,
             libv4l-0,
             libxcomposite1,
             libxcursor1,

debian/tools/patchlist.sh

@@ -17,7 +17,7 @@ index a273502..5fa0cd5 100644
  }
  
 +struct wine_patch {
-+    const char *hash;
++    const char *name;
 +    const char *author;
 +    const char *title;
 +} wine_patch_data[] = {

debian/tools/patchupdate.py

@@ -540,13 +540,13 @@ def generate_markdown(all_patches, stable_patches, stable_compholio_version):
     """Generate README.md and DEVELOPER.md including information about specific patches and bugfixes."""
 
     def _format_bug(mode, bugid, bugname):
-        if bugid is not None:
-            short_desc = bug_short_desc[bugid]
-            if bugname is None: bugname = short_desc
+        # if bugid is not None:
+        #     short_desc = bug_short_desc[bugid]
+        #     if bugname is None: bugname = short_desc
         if mode < 0: bugname = "~~%s~~" % bugname
         if bugid is None: return "* %s" % bugname
-        return "* %s ([Wine Bug #%d](http://bugs.winehq.org/show_bug.cgi?id=%d \"%s\"))" % \
-               (bugname, bugid, bugid, short_desc.replace("\\", "\\\\").replace("\"", "\\\""))
+        return "* %s ([Wine Bug #%d](http://bugs.winehq.org/show_bug.cgi?id=%d))" % \
+               (bugname, bugid, bugid) #, short_desc.replace("\\", "\\\\").replace("\"", "\\\""))
 
     all_bugids = set()
     all_fixes  = {}
@@ -580,7 +580,7 @@ def generate_markdown(all_patches, stable_patches, stable_compholio_version):
         new_fixes = []
 
     # Query information from bugzilla
-    bug_short_desc = _winebugs_query_short_desc(all_bugids)
+    # bug_short_desc = _winebugs_query_short_desc(all_bugids)
 
     # Generate information for current version
     lines = []

patches/Compholio/0001-kernel32-Add-winediag-message-to-show-warning-that-t.patch

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

patches/Compholio/0002-winelib-Append-Compholio-at-the-end-of-the-version-s.patch

@@ -0,0 +1,25 @@
+From 0e76401ae2de47285c66ee0b59bdf7449136d060 Mon Sep 17 00:00:00 2001
+From: Sebastian Lackner <sebastian@fds-team.de>
+Date: Thu, 2 Oct 2014 19:53:46 +0200
+Subject: winelib: Append '(Compholio)' at the end of the version string.
+
+---
+ libs/wine/Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in
+index c961ba5..776168c 100644
+--- a/libs/wine/Makefile.in
++++ b/libs/wine/Makefile.in
+@@ -105,7 +105,7 @@ config_EXTRADEFS = \
+ 	-DBIN_TO_DATADIR=\"`$(MAKEDEP) -R ${bindir} ${datadir}/wine`\"
+ 
+ version.c: dummy
+-	version=`(GIT_DIR=$(top_srcdir)/.git git describe HEAD 2>/dev/null || echo "wine-@PACKAGE_VERSION@") | sed -n -e '$$s/\(.*\)/const char wine_build[] = "\1";/p'` && (echo $$version | cmp -s - $@) || echo $$version >$@ || ($(RM) $@ && exit 1)
++	version=`(GIT_DIR=$(top_srcdir)/.git git describe HEAD 2>/dev/null || echo "wine-@PACKAGE_VERSION@") | sed -n -e '$$s/\(.*\)/const char wine_build[] = "\1 (Compholio)";/p'` && (echo $$version | cmp -s - $@) || echo $$version >$@ || ($(RM) $@ && exit 1)
+ 
+ # Make sure that make_makefiles sees the generated rules
+ .PHONY: install install-lib install-dev uninstall
+-- 
+2.1.1
+

patches/Compholio/0003-loader-Add-commandline-option-patches-to-show-the-pa.patch

@@ -49,7 +49,7 @@ index ac67290..71e5055 100644
  #endif  /* __APPLE__ */
  
 +struct wine_patch {
-+    const char *hash;
++    const char *name;
 +    const char *author;
 +    const char *title;
 +};
@@ -74,9 +74,9 @@ index ac67290..71e5055 100644
 +    if (!strcmp( argv[1], "--patches" ))
 +    {
 +        const struct wine_patch *wine_patch_data = wine_get_patches();
-+        for(; wine_patch_data->hash != NULL; wine_patch_data++)
++        for(; wine_patch_data->name != NULL; wine_patch_data++)
 +        {
-+            printf( "%s :: %s :: %s\n", wine_patch_data->hash, wine_patch_data->author,
++            printf( "%s :: %s :: %s\n", wine_patch_data->name, wine_patch_data->author,
 +                    wine_patch_data->title );
 +        }
 +        exit(0);

patches/Compholio/0004-loader-Add-commandline-option-check-libs.patch

@@ -1,19 +1,19 @@
-From eb9657a39d222aa59140f6b0aff657ae86d1824d Mon Sep 17 00:00:00 2001
+From 5f0f1d8dc69cd473f35c874b46e98a34930d0b46 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Wed, 28 May 2014 19:50:51 +0200
 Subject: loader: Add commandline option --check-libs.
 
 ---
- include/wine/library.h |    2 ++
- libs/wine/config.c     |   91 ++++++++++++++++++++++++++++++++++++++++++++++++
- libs/wine/loader.c     |   36 +++++++++++++++++++
- libs/wine/wine.def     |    2 ++
- libs/wine/wine.map     |    2 ++
- loader/main.c          |   50 +++++++++++++++++++++++++-
- 6 files changed, 182 insertions(+), 1 deletion(-)
+ include/wine/library.h |   2 +
+ libs/wine/config.c     | 103 +++++++++++++++++++++++++++++++++++++++++++++++++
+ libs/wine/loader.c     |  36 +++++++++++++++++
+ libs/wine/wine.def     |   2 +
+ libs/wine/wine.map     |   2 +
+ loader/main.c          |  50 +++++++++++++++++++++++-
+ 6 files changed, 194 insertions(+), 1 deletion(-)
 
 diff --git a/include/wine/library.h b/include/wine/library.h
-index fae73fe..7395a11 100644
+index 242bb69..fa1e339 100644
 --- a/include/wine/library.h
 +++ b/include/wine/library.h
 @@ -40,6 +40,7 @@ extern "C" {
@@ -24,7 +24,7 @@ index fae73fe..7395a11 100644
  extern const char *wine_get_server_dir(void);
  extern const char *wine_get_user_name(void);
  extern const char *wine_get_version(void);
-@@ -52,6 +53,7 @@ extern void wine_exec_wine_binary( const char *name, char **argv, const char *en
+@@ -51,6 +52,7 @@ extern void wine_exec_wine_binary( const char *name, char **argv, const char *en
  
  typedef void (*load_dll_callback_t)( void *, const char * );
  
@@ -33,10 +33,10 @@ index fae73fe..7395a11 100644
  extern void *wine_dlsym( void *handle, const char *symbol, char *error, size_t errorsize );
  extern int wine_dlclose( void *handle, char *error, size_t errorsize );
 diff --git a/libs/wine/config.c b/libs/wine/config.c
-index 954035d..3fb7327 100644
+index a273502..58e4977 100644
 --- a/libs/wine/config.c
 +++ b/libs/wine/config.c
-@@ -444,6 +444,97 @@ const char *wine_get_build_dir(void)
+@@ -444,6 +444,109 @@ const char *wine_get_build_dir(void)
      return build_dir;
  }
  
@@ -56,6 +56,9 @@ index 954035d..3fb7327 100644
 +#ifdef SONAME_LIBFONTCONFIG
 +    SONAME_LIBFONTCONFIG,
 +#endif
++#ifdef SONAME_LIBFREETYPE
++    SONAME_LIBFREETYPE,
++#endif
 +#ifdef SONAME_LIBGL
 +    SONAME_LIBGL,
 +#endif
@@ -83,6 +86,9 @@ index 954035d..3fb7327 100644
 +#ifdef SONAME_LIBOSMESA
 +    SONAME_LIBOSMESA,
 +#endif
++#ifdef SONAME_LIBPCAP
++    SONAME_LIBPCAP,
++#endif
 +#ifdef SONAME_LIBPNG
 +    SONAME_LIBPNG,
 +#endif
@@ -92,9 +98,15 @@ index 954035d..3fb7327 100644
 +#ifdef SONAME_LIBTIFF
 +    SONAME_LIBTIFF,
 +#endif
++#ifdef SONAME_LIBTXC_DXTN
++    SONAME_LIBTXC_DXTN,
++#endif
 +#ifdef SONAME_LIBV4L1
 +    SONAME_LIBV4L1,
 +#endif
++#ifdef SONAME_LIBX11
++    SONAME_LIBX11,
++#endif
 +#ifdef SONAME_LIBXCOMPOSITE
 +    SONAME_LIBXCOMPOSITE,
 +#endif
@@ -135,10 +147,10 @@ index 954035d..3fb7327 100644
  const char *wine_get_server_dir(void)
  {
 diff --git a/libs/wine/loader.c b/libs/wine/loader.c
-index 5c0192d..91a4428 100644
+index 3591ede..2718857 100644
 --- a/libs/wine/loader.c
 +++ b/libs/wine/loader.c
-@@ -1054,6 +1054,42 @@ void *wine_dlopen( const char *filename, int flag, char *error, size_t errorsize
+@@ -1043,6 +1043,42 @@ void *wine_dlopen( const char *filename, int flag, char *error, size_t errorsize
  }
  
  /***********************************************************************
@@ -182,7 +194,7 @@ index 5c0192d..91a4428 100644
   */
  void *wine_dlsym( void *handle, const char *symbol, char *error, size_t errorsize )
 diff --git a/libs/wine/wine.def b/libs/wine/wine.def
-index 5b42029..6acf329 100644
+index ed315bd..b6acbce 100644
 --- a/libs/wine/wine.def
 +++ b/libs/wine/wine.def
 @@ -64,6 +64,7 @@ EXPORTS
@@ -202,7 +214,7 @@ index 5b42029..6acf329 100644
      wine_get_sortkey
      wine_get_user_name
 diff --git a/libs/wine/wine.map b/libs/wine/wine.map
-index 7cb2918..72ffed8 100644
+index 2159fac..91ace06 100644
 --- a/libs/wine/wine.map
 +++ b/libs/wine/wine.map
 @@ -65,6 +65,7 @@ WINE_1.0
@@ -222,7 +234,7 @@ index 7cb2918..72ffed8 100644
      wine_get_sortkey;
      wine_get_ss;
 diff --git a/loader/main.c b/loader/main.c
-index 71e5055..131ac2f 100644
+index 76bf324..36738f2 100644
 --- a/loader/main.c
 +++ b/loader/main.c
 @@ -36,6 +36,12 @@
@@ -297,5 +309,5 @@ index 71e5055..131ac2f 100644
  
  
 -- 
-1.7.9.5
+2.1.2
 

patches/Compholio/definition

@@ -1,3 +1,11 @@
+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

patches/Miscellaneous/0005-Appease-the-blessed-version-of-gcc-4.5-when-Werror-i.patch

@@ -1,16 +1,15 @@
-From fec987aaff3478e5325df368cce471109fe3c064 Mon Sep 17 00:00:00 2001
+From f56694f318ce0134317b812ff32f6c35875c31b3 Mon Sep 17 00:00:00 2001
 From: "Erich E. Hoover" <erich.e.hoover@gmail.com>
 Date: Fri, 8 Aug 2014 19:33:14 -0600
 Subject: Appease the blessed version of gcc (4.5) when -Werror is enabled.
 
 ---
- dlls/d3d9/tests/visual.c     |    2 +-
- dlls/netapi32/netapi32.c     |    2 +-
- dlls/winealsa.drv/mmdevdrv.c |    2 +-
- dlls/wined3d/glsl_shader.c   |    2 +-
- server/object.c              |    2 +-
- tools/makedep.c              |    2 +-
- 6 files changed, 6 insertions(+), 6 deletions(-)
+ dlls/d3d9/tests/visual.c     | 2 +-
+ dlls/netapi32/netapi32.c     | 2 +-
+ dlls/winealsa.drv/mmdevdrv.c | 2 +-
+ dlls/wined3d/glsl_shader.c   | 2 +-
+ tools/makedep.c              | 2 +-
+ 5 files changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c
 index 117c8eb..3988628 100644
@@ -52,10 +51,10 @@ index a4c02bf..909db53 100644
      static const WCHAR dashW[] = {' ','-',' ',0};
      static const size_t dashW_len = (sizeof(dashW) / sizeof(*dashW)) - 1;
 diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
-index 1097d87..38d6cbd 100644
+index 34cc567..4f2a6c6 100644
 --- a/dlls/wined3d/glsl_shader.c
 +++ b/dlls/wined3d/glsl_shader.c
-@@ -5798,7 +5798,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const
+@@ -5784,7 +5784,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const
      GLhandleARB vs_id = 0;
      GLhandleARB gs_id = 0;
      GLhandleARB ps_id = 0;
@@ -64,21 +63,8 @@ index 1097d87..38d6cbd 100644
  
      if (!(context->shader_update_mask & (1 << WINED3D_SHADER_TYPE_VERTEX)))
      {
-diff --git a/server/object.c b/server/object.c
-index 11ef0ce..133c6b5 100644
---- a/server/object.c
-+++ b/server/object.c
-@@ -428,7 +428,7 @@ int default_set_sd( struct object *obj, const struct security_descriptor *sd,
- {
-     struct security_descriptor new_sd, *new_sd_ptr;
-     int present;
--    const SID *owner, *group;
-+    const SID *owner = NULL, *group = NULL;
-     const ACL *sacl, *dacl;
-     char *ptr;
- 
 diff --git a/tools/makedep.c b/tools/makedep.c
-index 396a1e3..1261785 100644
+index 54aab45..103422e 100644
 --- a/tools/makedep.c
 +++ b/tools/makedep.c
 @@ -1480,7 +1480,7 @@ static char *get_make_variable( struct makefile *make, const char *name )
@@ -91,5 +77,5 @@ index 396a1e3..1261785 100644
      expand = get_make_variable( make, name );
      if (!expand) return NULL;
 -- 
-1.7.9.5
+2.1.1
 

patches/Miscellaneous/0007-strmbase-Remove-unused-TransformFilter_Vtbl-Clang.patch

@@ -0,0 +1,49 @@
+From 53611893c65e0470cf8d81b7900a02f9640c6dcc Mon Sep 17 00:00:00 2001
+From: Amine Khaldi <amine.khaldi@reactos.org>
+Date: Sat, 18 Oct 2014 19:53:56 +0100
+Subject: [PATCH] strmbase: Remove unused TransformFilter_Vtbl (Clang).
+---
+ dlls/strmbase/transform.c | 20 --------------------
+ 1 file changed, 20 deletions(-)
+
+diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c
+index 0fc7515..4d872be 100644
+--- a/dlls/strmbase/transform.c
++++ b/dlls/strmbase/transform.c
+@@ -42,7 +42,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(strmbase);
+ static const WCHAR wcsInputPinName[] = {'i','n','p','u','t',' ','p','i','n',0};
+ static const WCHAR wcsOutputPinName[] = {'o','u','t','p','u','t',' ','p','i','n',0};
+ 
+-static const IBaseFilterVtbl TransformFilter_Vtbl;
+ static const IPinVtbl TransformFilter_InputPin_Vtbl;
+ static const IPinVtbl TransformFilter_OutputPin_Vtbl;
+ static const IQualityControlVtbl TransformFilter_QualityControl_Vtbl;
+@@ -439,25 +438,6 @@ HRESULT WINAPI TransformFilterImpl_FindPin(IBaseFilter * iface, LPCWSTR Id, IPin
+     return E_NOTIMPL;
+ }
+ 
+-static const IBaseFilterVtbl TransformFilter_Vtbl =
+-{
+-    TransformFilterImpl_QueryInterface,
+-    BaseFilterImpl_AddRef,
+-    TransformFilterImpl_Release,
+-    BaseFilterImpl_GetClassID,
+-    TransformFilterImpl_Stop,
+-    TransformFilterImpl_Pause,
+-    TransformFilterImpl_Run,
+-    BaseFilterImpl_GetState,
+-    BaseFilterImpl_SetSyncSource,
+-    BaseFilterImpl_GetSyncSource,
+-    BaseFilterImpl_EnumPins,
+-    TransformFilterImpl_FindPin,
+-    BaseFilterImpl_QueryFilterInfo,
+-    BaseFilterImpl_JoinFilterGraph,
+-    BaseFilterImpl_QueryVendorInfo
+-};
+-
+ static HRESULT WINAPI TransformFilter_InputPin_EndOfStream(IPin * iface)
+ {
+     BaseInputPin* This = impl_BaseInputPin_from_IPin(iface);
+-- 
+2.1.2
+

patches/Miscellaneous/definition

@@ -21,3 +21,7 @@ Title: Appease the blessed version of gcc (4.5) when -Werror is enabled.
 Revision: 1
 Author: Sebastian Lackner
 Title: Appease the Archlinux version of gcc (4.9.1) when -Werror is enabled.
+
+Revision: 1
+Author: Amine Khaldi
+Title: Silence Clang warning by removing unused TransformFilter_Vtbl.

patches/atl-IOCS_Property/0001-atl-Don-t-use-GWLP_USERDATA-to-store-IOCS-to-avoid-c.patch

@@ -35,7 +35,7 @@ index 5bafbf1..45936e8 100644
  static LRESULT CALLBACK AtlHost_wndproc( HWND hWnd, UINT wMsg, WPARAM wParam, LPARAM lParam )
  {
 -    IOCS *This = (IOCS*) GetWindowLongPtrW( hWnd, GWLP_USERDATA );
-+    IOCS *This = (IOCS*) GetPropA( hWnd, WINE_IOCS_PROPERTY );
++    IOCS *This = (IOCS *)GetPropA( hWnd, WINE_IOCS_PROPERTY );
      return IOCS_OnWndProc( This, hWnd, wMsg, wParam, lParam );
  }
  
@@ -53,7 +53,7 @@ index 5bafbf1..45936e8 100644
      *host = NULL;
  
 -    This = (IOCS*) GetWindowLongPtrW( hWnd, GWLP_USERDATA );
-+    This = (IOCS*) GetPropA( hWnd, WINE_IOCS_PROPERTY );
++    This = (IOCS *)GetPropA( hWnd, WINE_IOCS_PROPERTY );
      if ( !This )
      {
          WARN("No container attached to %p\n", hWnd );
@@ -62,7 +62,7 @@ index 5bafbf1..45936e8 100644
      *pUnk = NULL;
  
 -    This = (IOCS*) GetWindowLongPtrW( hWnd, GWLP_USERDATA );
-+    This = (IOCS*) GetPropA ( hWnd, WINE_IOCS_PROPERTY );
++    This = (IOCS *)GetPropA ( hWnd, WINE_IOCS_PROPERTY );
      if ( !This || !This->control )
      {
          WARN("No control attached to %p\n", hWnd );

patches/comctl32-ImageList/0001-comctl32-Fix-issue-that-dragimage-in-ImageList-only-.patch

@@ -1,42 +0,0 @@
-From a79d771501ec85da65e27234972807364e1b29db Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Mon, 18 Aug 2014 00:50:41 +0200
-Subject: comctl32: Fix issue that dragimage in ImageList only works for first
- four elements.
-
-Patch by ocean04 [at] suomi24 [dot] fi, provided at Wine bug #36761.
----
- dlls/comctl32/imagelist.c |    6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c
-index 645068d..f15a0a9 100644
---- a/dlls/comctl32/imagelist.c
-+++ b/dlls/comctl32/imagelist.c
-@@ -599,6 +599,7 @@ ImageList_BeginDrag (HIMAGELIST himlTrack, INT iTrack,
- 	             INT dxHotspot, INT dyHotspot)
- {
-     INT cx, cy;
-+    POINT ptSrc;
- 
-     TRACE("(himlTrack=%p iTrack=%d dx=%d dy=%d)\n", himlTrack, iTrack,
- 	  dxHotspot, dyHotspot);
-@@ -620,12 +621,13 @@ ImageList_BeginDrag (HIMAGELIST himlTrack, INT iTrack,
- 
-     InternalDrag.dxHotspot = dxHotspot;
-     InternalDrag.dyHotspot = dyHotspot;
-+    imagelist_point_from_index( himlTrack, iTrack, &ptSrc );
- 
-     /* copy image */
--    BitBlt (InternalDrag.himl->hdcImage, 0, 0, cx, cy, himlTrack->hdcImage, iTrack * cx, 0, SRCCOPY);
-+    BitBlt (InternalDrag.himl->hdcImage, 0, 0, cx, cy, himlTrack->hdcImage, ptSrc.x, ptSrc.y, SRCCOPY);
- 
-     /* copy mask */
--    BitBlt (InternalDrag.himl->hdcMask, 0, 0, cx, cy, himlTrack->hdcMask, iTrack * cx, 0, SRCCOPY);
-+    BitBlt (InternalDrag.himl->hdcMask, 0, 0, cx, cy, himlTrack->hdcMask, ptSrc.x, ptSrc.y, SRCCOPY);
- 
-     InternalDrag.himl->cCurImage = 1;
- 
--- 
-1.7.9.5
-

patches/comctl32-ImageList/definition

@@ -1,4 +0,0 @@
-Author: Sebastian Lackner
-Subject: Fix issue that dragimage in ImageList only works for first four elements.
-Revision: 1
-Fixes: [36761] Fix issue with invisible dragimages in ImageList

patches/d3dx9_36-GetShaderSemantics/0001-d3dx9_36-Implement-D3DXGetShaderInputSemantics-tests.patch

@@ -0,0 +1,265 @@
+From 8bead9c1fd37eff6e1f0612faf0fc7fb93e899f3 Mon Sep 17 00:00:00 2001
+From: Christian Costa <titan.costa@gmail.com>
+Date: Sat, 5 Apr 2014 14:02:07 +0200
+Subject: d3dx9_36: Implement D3DXGetShaderInputSemantics + tests.
+
+Fixes bug 22682.
+---
+ dlls/d3dx9_36/d3dx9_36.spec  |  2 +-
+ dlls/d3dx9_36/shader.c       | 94 ++++++++++++++++++++++++++++++++++++++++++++
+ dlls/d3dx9_36/tests/shader.c | 86 ++++++++++++++++++++++++++++++++++++++++
+ include/d3dx9shader.h        |  1 +
+ 4 files changed, 182 insertions(+), 1 deletion(-)
+
+diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec
+index 4c72dc2..e4890ee 100644
+--- a/dlls/d3dx9_36/d3dx9_36.spec
++++ b/dlls/d3dx9_36/d3dx9_36.spec
+@@ -159,7 +159,7 @@
+ @ stdcall D3DXGetPixelShaderProfile(ptr)
+ @ stdcall D3DXGetShaderConstantTable(ptr ptr)
+ @ stdcall D3DXGetShaderConstantTableEx(ptr long ptr)
+-@ stub D3DXGetShaderInputSemantics(ptr ptr ptr)
++@ stdcall D3DXGetShaderInputSemantics(ptr ptr ptr)
+ @ stub D3DXGetShaderOutputSemantics(ptr ptr ptr)
+ @ stdcall D3DXGetShaderSamplers(ptr ptr ptr)
+ @ stdcall D3DXGetShaderSize(ptr)
+diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c
+index 5ea3d13..63852d0 100644
+--- a/dlls/d3dx9_36/shader.c
++++ b/dlls/d3dx9_36/shader.c
+@@ -1,6 +1,7 @@
+ /*
+  * Copyright 2008 Luis Busquets
+  * Copyright 2009 Matteo Bruni
++ * Copyright 2010, 2013 Christian Costa
+  * Copyright 2011 Travis Athougies
+  *
+  * This library is free software; you can redistribute it and/or
+@@ -2126,3 +2127,96 @@ HRESULT WINAPI D3DXGetShaderSamplers(const DWORD *byte_code, const char **sample
+ 
+     return D3D_OK;
+ }
++
++const DWORD* skip_instruction(const DWORD *byte_code, UINT shader_model)
++{
++    TRACE("Shader model %u\n", shader_model);
++
++    /* Handle all special instructions whose arguments may contain D3DSIO_DCL */
++    if ((*byte_code & D3DSI_OPCODE_MASK) == D3DSIO_COMMENT)
++    {
++        byte_code += 1 + ((*byte_code & D3DSI_COMMENTSIZE_MASK) >> D3DSI_COMMENTSIZE_SHIFT);
++    }
++    else if (shader_model >= 2)
++    {
++        byte_code += 1 + ((*byte_code & D3DSI_INSTLENGTH_MASK) >> D3DSI_INSTLENGTH_SHIFT);
++    }
++    else if ((*byte_code & D3DSI_OPCODE_MASK) == D3DSIO_DEF)
++    {
++        byte_code += 1 + 5;
++    }
++    else
++    {
++        /* Handle remaining safe instructions */
++        while (*++byte_code & (1 << 31));
++    }
++
++    return byte_code;
++}
++
++static UINT get_shader_semantics(const DWORD *byte_code, D3DXSEMANTIC *semantics, BOOL input)
++{
++    const DWORD *ptr = byte_code;
++    UINT shader_model = (*ptr >> 8) & 0xff;
++    UINT i = 0;
++
++    TRACE("Shader version: %#x\n", *ptr++);
++
++    while (*ptr != D3DSIO_END)
++    {
++        if (*ptr & (1 << 31))
++        {
++            FIXME("Opcode expected\n");
++            return 0;
++        }
++        else if ((*ptr & D3DSI_OPCODE_MASK) == D3DSIO_DCL)
++        {
++            DWORD param1 = *++ptr;
++            DWORD param2 = *++ptr;
++            DWORD usage = param1 & 0x1f;
++            DWORD usage_index = (param1 >> 16) & 0xf;
++            DWORD reg_type = (((param2 >> 11) & 0x3) << 3) | ((param2 >> 28) & 0x7);
++
++            TRACE("D3DSIO_DCL param1: %#x, param2: %#x, usage: %u, usage_index: %u, reg_type: %u\n",
++                   param1, param2, usage, usage_index, reg_type);
++
++            if (input && (reg_type == D3DSPR_INPUT))
++            {
++                if (semantics)
++                {
++                    semantics[i].Usage = usage;
++                    semantics[i].UsageIndex = usage_index;
++                }
++                i++;
++            }
++            else
++            {
++                /* FIXME: Support for output semantics */
++            }
++            ptr++;
++        }
++        else
++        {
++            ptr = skip_instruction(ptr, shader_model);
++        }
++    }
++
++    return i;
++}
++
++HRESULT WINAPI D3DXGetShaderInputSemantics(const DWORD *byte_code, D3DXSEMANTIC *semantics, UINT *count)
++{
++    UINT nb_semantics;
++
++    TRACE("byte_code %p, semantics %p, count %p\n", byte_code, semantics, count);
++
++    if (!byte_code)
++        return D3DERR_INVALIDCALL;
++
++    nb_semantics = get_shader_semantics(byte_code, semantics, TRUE);
++
++    if (count)
++        *count = nb_semantics;
++
++    return D3D_OK;
++}
+diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c
+index 694540c..728cd86 100644
+--- a/dlls/d3dx9_36/tests/shader.c
++++ b/dlls/d3dx9_36/tests/shader.c
+@@ -1,5 +1,6 @@
+ /*
+  * Copyright 2008 Luis Busquets
++ * Copyright 2010, 2013 Christian Costa
+  * Copyright 2011 Travis Athougies
+  *
+  * This library is free software; you can redistribute it and/or
+@@ -299,6 +300,26 @@ static const DWORD fx_shader_with_ctab[] =
+     0x0000ffff                                                              /* END                      */
+ };
+ 
++static const DWORD semantics_vs11[] = {
++    0xfffe0101,                                                             /* vs_1_1                       */
++    0x0001fffe, D3DSIO_DCL,                                                 /* Comment                      */
++    0x00000051, 0xa00f0001, D3DSIO_DCL, D3DSIO_DCL, D3DSIO_DCL, D3DSIO_DCL, /* def c1 = dcl, dcl, dcl, dcl  */
++    0x0000001f, 0x80000000, 0x900f0000,                                     /* dcl_position0 v0 (input)     */
++    0x0000001f, 0x80000005, 0x900f0001,                                     /* dcl_texcoord0 v1 (input)     */
++    0x0000001f, 0x80010005, 0x900f0002,                                     /* dcl_texcoord1 v2 (input)     */
++    0x0000001f, 0x8000000a, 0xe00f0000,                                     /* dcl_color0    oD0 (output)   */
++    0x0000ffff};                                                            /* END                          */
++
++static const DWORD semantics_vs30[] = {
++    0xfffe0300,                                                             /* vs_3_0                       */
++    0x0001fffe, D3DSIO_DCL,                                                 /* Comment                      */
++    0x05000051, 0xa00f0001, D3DSIO_DCL, D3DSIO_DCL, D3DSIO_DCL, D3DSIO_DCL, /* def c1 = dcl, dcl, dcl, dcl  */
++    0x0200001f, 0x80000000, 0x900f0000,                                     /* dcl_position0 v0 (input)     */
++    0x0200001f, 0x80000005, 0x900f0001,                                     /* dcl_texcoord0 v1 (input)     */
++    0x0200001f, 0x80010005, 0x900f0002,                                     /* dcl_texcoord1 v2 (input)     */
++    0x0200001f, 0x8000000a, 0xe00f0000,                                     /* dcl_color0    o0 (output)    */
++    0x0000ffff};                                                            /* END                          */
++
+ static void test_get_shader_size(void)
+ {
+     UINT shader_size, expected;
+@@ -6489,6 +6510,70 @@ static void test_registerset_defaults(void)
+     if (wnd) DestroyWindow(wnd);
+ }
+ 
++static void test_get_shader_semantics(void)
++{
++    HRESULT ret;
++    D3DXSEMANTIC semantics[MAXD3DDECLLENGTH];
++    UINT count;
++
++    /* Test D3DXGetShaderInputSemantics */
++
++    /* Check wrong parameters */
++    ret = D3DXGetShaderInputSemantics(NULL, NULL, NULL);
++    ok(ret == D3DERR_INVALIDCALL, "Returned %#x, expected %#x\n", ret, D3DERR_INVALIDCALL);
++    ret = D3DXGetShaderInputSemantics(NULL, NULL, &count);
++    ok(ret == D3DERR_INVALIDCALL, "Returned %#x, expected %#x\n", ret, D3DERR_INVALIDCALL);
++    ret = D3DXGetShaderInputSemantics(NULL, semantics, NULL);
++    ok(ret == D3DERR_INVALIDCALL, "Returned %#x, expected %#x\n", ret, D3DERR_INVALIDCALL);
++    ret = D3DXGetShaderInputSemantics(NULL, semantics, &count);
++    ok(ret == D3DERR_INVALIDCALL, "Returned %#x, expected %#x\n", ret, D3DERR_INVALIDCALL);
++    ret = D3DXGetShaderInputSemantics(semantics_vs11, NULL, NULL);
++    ok(ret == D3D_OK, "Failed with %#x\n", ret);
++
++    /* Check null semantics pointer */
++    count = 0xdeadbeef;
++    ret = D3DXGetShaderInputSemantics(semantics_vs11, NULL, &count);
++    ok(ret == D3D_OK, "Failed with %#x\n", ret);
++    ok(count == 3, "Got %u, expected 3\n", count);
++
++    /* Check null count pointer */
++    memset(semantics, 0xcc, sizeof(semantics));
++    ret = D3DXGetShaderInputSemantics(semantics_vs11, semantics, NULL);
++    ok(ret == D3D_OK, "Failed with %#x\n", ret);
++    ok(semantics[0].Usage == D3DDECLUSAGE_POSITION, "Got %u, expected %u\n", semantics[0].Usage, D3DDECLUSAGE_POSITION);
++    ok(semantics[0].UsageIndex == 0, "Got %u, expected 0\n", semantics[0].UsageIndex);
++    ok(semantics[1].Usage == D3DDECLUSAGE_TEXCOORD, "Got %u, expected %u\n", semantics[1].Usage, D3DDECLUSAGE_TEXCOORD);
++    ok(semantics[1].UsageIndex == 0, "Got %u, expected 0\n", semantics[0].UsageIndex);
++    ok(semantics[2].Usage == D3DDECLUSAGE_TEXCOORD, "Got %u, expected %u\n", semantics[2].Usage, D3DDECLUSAGE_TEXCOORD);
++    ok(semantics[2].UsageIndex == 1, "Got %u, expected 1\n", semantics[0].UsageIndex);
++
++    /* Check with vs11 shader */
++    count = 0xdeadbeef;
++    memset(semantics, 0xcc, sizeof(semantics));
++    ret = D3DXGetShaderInputSemantics(semantics_vs11, semantics, &count);
++    ok(ret == D3D_OK, "Failed with %#x\n", ret);
++    ok(count == 3, "Got %u, expected 3\n", count);
++    ok(semantics[0].Usage == D3DDECLUSAGE_POSITION, "Got %u, expected %u\n", semantics[0].Usage, D3DDECLUSAGE_POSITION);
++    ok(semantics[0].UsageIndex == 0, "Got %u, expected 0\n", semantics[0].UsageIndex);
++    ok(semantics[1].Usage == D3DDECLUSAGE_TEXCOORD, "Got %u, expected %u\n", semantics[1].Usage, D3DDECLUSAGE_TEXCOORD);
++    ok(semantics[1].UsageIndex == 0, "Got %u, expected 0\n", semantics[0].UsageIndex);
++    ok(semantics[2].Usage == D3DDECLUSAGE_TEXCOORD, "Got %u, expected %u\n", semantics[2].Usage, D3DDECLUSAGE_TEXCOORD);
++    ok(semantics[2].UsageIndex == 1, "Got %u, expected 1\n", semantics[0].UsageIndex);
++
++    /* Check with vs30 shader */
++    count = 0xdeadbeef;
++    memset(semantics, 0xcc, sizeof(semantics));
++    ret = D3DXGetShaderInputSemantics(semantics_vs30, semantics, &count);
++    ok(ret == D3D_OK, "Failed with %#x\n", ret);
++    ok(count == 3, "Got %u, expected 3\n", count);
++    ok(semantics[0].Usage == D3DDECLUSAGE_POSITION, "Got %u, expected %u\n", semantics[0].Usage, D3DDECLUSAGE_POSITION);
++    ok(semantics[0].UsageIndex == 0, "Got %u, expected 0\n", semantics[0].UsageIndex);
++    ok(semantics[1].Usage == D3DDECLUSAGE_TEXCOORD, "Got %u, expected %u\n", semantics[1].Usage, D3DDECLUSAGE_TEXCOORD);
++    ok(semantics[1].UsageIndex == 0, "Got %u, expected 0\n", semantics[0].UsageIndex);
++    ok(semantics[2].Usage == D3DDECLUSAGE_TEXCOORD, "Got %u, expected %u\n", semantics[2].Usage, D3DDECLUSAGE_TEXCOORD);
++    ok(semantics[2].UsageIndex == 1, "Got %u, expected 1\n", semantics[0].UsageIndex);
++}
++
+ START_TEST(shader)
+ {
+     test_get_shader_size();
+@@ -6502,4 +6587,5 @@ START_TEST(shader)
+     test_get_shader_constant_variables();
+     test_registerset();
+     test_registerset_defaults();
++    test_get_shader_semantics();
+ }
+diff --git a/include/d3dx9shader.h b/include/d3dx9shader.h
+index d665f72..f565432 100644
+--- a/include/d3dx9shader.h
++++ b/include/d3dx9shader.h
+@@ -315,6 +315,7 @@ DWORD WINAPI D3DXGetShaderVersion(const DWORD *byte_code);
+ const char * WINAPI D3DXGetVertexShaderProfile(struct IDirect3DDevice9 *device);
+ HRESULT WINAPI D3DXFindShaderComment(const DWORD *byte_code, DWORD fourcc, const void **data, UINT *size);
+ HRESULT WINAPI D3DXGetShaderSamplers(const DWORD *byte_code, const char **samplers, UINT *count);
++HRESULT WINAPI D3DXGetShaderInputSemantics(const DWORD *byte_code, D3DXSEMANTIC *semantics, UINT *count);
+ 
+ HRESULT WINAPI D3DXAssembleShaderFromFileA(const char *filename, const D3DXMACRO *defines,
+         ID3DXInclude *include, DWORD flags, ID3DXBuffer **shader, ID3DXBuffer **error_messages);
+-- 
+2.1.2
+

patches/d3dx9_36-GetShaderSemantics/definition

@@ -0,0 +1,4 @@
+Author: Christian Costa
+Subject: Implement D3DXGetShaderInputSemantics
+Revision: 1
+Fixes: [22682] Support for D3DXGetShaderInputSemantics