Release 1.7.55.

But still not simple enough... :/
https://www.winehq.org/pipermail/wine-devel/2015-November/110204.html

README.md

@@ -34,7 +34,7 @@ Wine. All those differences are also documented on the
 Included bug fixes and improvements
 -----------------------------------
 
-**Bug fixes and features in Wine Staging 1.7.54 [268]:**
+**Bug fixes and features in Wine Staging 1.7.55 [269]:**
 
 *Note: The following list only contains features and bug fixes which are not
 yet available in vanilla Wine. They are removed from the list as soon as they
@@ -53,6 +53,7 @@ for more details.*
 * Add implementation for msidb commandline tool
 * Add implementation for shlwapi.AssocGetPerceivedType
 * Add nvapi stubs required for GPU PhysX support
+* Add partial implementation of ITfThreadMgrEx_ActivateEx ([Wine Bug #39564](https://bugs.winehq.org/show_bug.cgi?id=39564))
 * Add performance library registry keys needed by MS SQL Server Management Studio Express 2008 R2 ([Wine Bug #33661](https://bugs.winehq.org/show_bug.cgi?id=33661))
 * Add semi-stub for FileFsVolumeInformation information class ([Wine Bug #21466](https://bugs.winehq.org/show_bug.cgi?id=21466))
 * Add shell32 placeholder icons to match offsets with Windows ([Wine Bug #30185](https://bugs.winehq.org/show_bug.cgi?id=30185))
@@ -61,12 +62,10 @@ for more details.*
 * Add stub for D3DXFrameFind ([Wine Bug #38334](https://bugs.winehq.org/show_bug.cgi?id=38334))
 * Add stub for NtSetLdtEntries/ZwSetLdtEntries ([Wine Bug #26268](https://bugs.winehq.org/show_bug.cgi?id=26268))
 * Add stub for SetCoalescableTimer ([Wine Bug #39509](https://bugs.winehq.org/show_bug.cgi?id=39509))
-* Add stub for SetConsoleKeyShortcuts ([Wine Bug #35702](https://bugs.winehq.org/show_bug.cgi?id=35702))
-* Add stub for SfcGetNextProtectedFile ([Wine Bug #38097](https://bugs.winehq.org/show_bug.cgi?id=38097))
 * Add stub for ntoskrnl.ExAcquireResourceExclusiveLite
 * Add stub for ntoskrnl.ExDeleteResourceLite
 * Add stub for ntoskrnl.ExReleaseResourceForThread
-* Add stub for ntoskrnl.KeWaitForMultipleObjects
+* Add stub for ntoskrnl.KeWaitForMultipleObjects ([Wine Bug #32186](https://bugs.winehq.org/show_bug.cgi?id=32186))
 * Add stub for ntoskrnl.Mm{Map,Unmap}LockedPages
 * Add stub for ntoskrnl.PsRemoveLoadImageNotifyRoutine
 * Add stub for setupapi.SetupDiSelectBestCompatDrv ([Wine Bug #32088](https://bugs.winehq.org/show_bug.cgi?id=32088))
@@ -74,9 +73,11 @@ for more details.*
 * Add stub for winscard.SCardListReadersA/W ([Wine Bug #26978](https://bugs.winehq.org/show_bug.cgi?id=26978))
 * Add stub for winspool.SetPrinterW level 8 ([Wine Bug #24645](https://bugs.winehq.org/show_bug.cgi?id=24645))
 * Add stub for winsta.WinStationEnumerateW ([Wine Bug #38102](https://bugs.winehq.org/show_bug.cgi?id=38102))
+* Add stub kernel32.FreeUserPhysicalPages ([Wine Bug #39543](https://bugs.winehq.org/show_bug.cgi?id=39543))
 * Add stubbed ISWbemSecurity interfaces in wbemdisp
 * Add stubs for D3DXCreateAnimationController interface
 * Add stubs for additional wininet options in InternetSetOption
+* Add stubs for advapi32.RegCreateKeyTransacted[A/W]
 * Add support for CopyFileEx progress callback ([Wine Bug #22692](https://bugs.winehq.org/show_bug.cgi?id=22692))
 * Add support for GTK3 theming
 * Add support for GetPropValue to PulseAudio backend
@@ -84,6 +85,7 @@ for more details.*
 * Add support for process specific debug channels
 * Add wined3d detection for GeForce GT 425M ([Wine Bug #35054](https://bugs.winehq.org/show_bug.cgi?id=35054))
 * Adobe Reader needs ITextSelection_fnGetDuplicate implementation
+* Allow dinput EnumDevices callback with broken calling convention ([Wine Bug #27664](https://bugs.winehq.org/show_bug.cgi?id=27664))
 * Allow non-nullterminated string as working directory in kernel32.create_startup_info
 * 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))
@@ -92,6 +94,7 @@ for more details.*
 * Allow to open files/directories without any access rights in order to query attributes
 * Allow to override number of quality levels for D3DMULTISAMPLE_NONMASKABLE. ([Wine Bug #12652](https://bugs.winehq.org/show_bug.cgi?id=12652))
 * Allow to set pixel format for desktop window
+* Allow to specify default display frequency in registry
 * Always use 64-bit registry view on WOW64 setups
 * Anno 1602 installer depends on Windows 98 behavior of SHFileOperationW ([Wine Bug #37916](https://bugs.winehq.org/show_bug.cgi?id=37916))
 * Assign a drive serial number during prefix creation/update ([Wine Bug #17823](https://bugs.winehq.org/show_bug.cgi?id=17823))
@@ -109,6 +112,7 @@ for more details.*
 * Catch invalid memory accesses in imagehlp.CheckSumMappedFile
 * Check architecture before trying to load libraries ([Wine Bug #38021](https://bugs.winehq.org/show_bug.cgi?id=38021))
 * Codepage conversion should fail when destination length is < 0
+* CompareString should abort on first non-matching character ([Wine Bug #37556](https://bugs.winehq.org/show_bug.cgi?id=37556))
 * Create Microsoft\Windows\Themes directory during Wineprefix creation ([Wine Bug #34910](https://bugs.winehq.org/show_bug.cgi?id=34910))
 * Create stub files for system32/drivers/etc/{services,hosts,networks,protocol} ([Wine Bug #12076](https://bugs.winehq.org/show_bug.cgi?id=12076))
 * CreateProcess does not prioritize the working directory over the system search path ([Wine Bug #23934](https://bugs.winehq.org/show_bug.cgi?id=23934))
@@ -116,12 +120,12 @@ for more details.*
 * Do not allow interruption of system APC in server_select ([Wine Bug #14697](https://bugs.winehq.org/show_bug.cgi?id=14697))
 * Do not allow to deallocate thread stack for current thread
 * Do not fail when a used context is passed to wglShareLists ([Wine Bug #11436](https://bugs.winehq.org/show_bug.cgi?id=11436))
+* Do not require SeBackupPrivilege in load_registry and unload_registry ([Wine Bug #28729](https://bugs.winehq.org/show_bug.cgi?id=28729))
 * Do not signal threads until they are really gone
 * Do not use unixfs for devices without mountpoint
 * Do not wait for hook thread startup in IDirectInput8::Initialize ([Wine Bug #21403](https://bugs.winehq.org/show_bug.cgi?id=21403))
 * Enforce that surfaces are flushed after ReleaseDC ([Wine Bug #39465](https://bugs.winehq.org/show_bug.cgi?id=39465))
 * Ensure NtProtectVirtualMemory and NtCreateSection are on separate pages ([Wine Bug #33162](https://bugs.winehq.org/show_bug.cgi?id=33162))
-* Ensure X11 input events are handled even without explicit message loop ([Wine Bug #8854](https://bugs.winehq.org/show_bug.cgi?id=8854))
 * Exception during start of fr-043 caused by missing DXTn support ([Wine Bug #37391](https://bugs.winehq.org/show_bug.cgi?id=37391))
 * Export additional OpenAL32 functions ([Wine Bug #38972](https://bugs.winehq.org/show_bug.cgi?id=38972))
 * Expose PKEY_AudioEndpoint_PhysicalSpeakers device property in PulseAudio driver
@@ -137,7 +141,6 @@ for more details.*
 * Fix condition mask handling in RtlVerifyVersionInfo ([Wine Bug #36143](https://bugs.winehq.org/show_bug.cgi?id=36143))
 * Fix crash in Space Rangers2 caused by missing DXTn support ([Wine Bug #24983](https://bugs.winehq.org/show_bug.cgi?id=24983))
 * Fix crash of winedevice when relocation entry crosses page boundary ([Wine Bug #28254](https://bugs.winehq.org/show_bug.cgi?id=28254))
-* Fix cursor clip regression / broken raw input in multiple games ([Wine Bug #33479](https://bugs.winehq.org/show_bug.cgi?id=33479))
 * Fix detection of case-insensitive systems in MSYS2
 * Fix device paths in HKLM\SYSTEM\MountedDevices ([Wine Bug #38235](https://bugs.winehq.org/show_bug.cgi?id=38235))
 * Fix endless loop in regedit when importing files with very long lines
@@ -150,12 +153,10 @@ for more details.*
 * Fix handling of ANSI NTLM credentials ([Wine Bug #37063](https://bugs.winehq.org/show_bug.cgi?id=37063))
 * Fix handling of empty section and key name for profile files. ([Wine Bug #8036](https://bugs.winehq.org/show_bug.cgi?id=8036))
 * Fix handling of invert_y in DrawTextExW ([Wine Bug #22109](https://bugs.winehq.org/show_bug.cgi?id=22109))
-* Fix handling of opening read-only files for FILE_DELETE_ON_CLOSE ([Wine Bug #38417](https://bugs.winehq.org/show_bug.cgi?id=38417))
 * Fix handling of window attributes for WS_EX_LAYERED | WS_EX_COMPOSITED ([Wine Bug #37876](https://bugs.winehq.org/show_bug.cgi?id=37876))
 * Fix implementation of msvcrt.close when stdout == stderr
 * 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 multiple issues in widl typelib generation
 * Fix multithreading issues with fullscreen clipping ([Wine Bug #38087](https://bugs.winehq.org/show_bug.cgi?id=38087))
 * Fix possible segfault in pulse_rd_loop of PulseAudio backend
 * Fix race-condition when threads are killed during shutdown
@@ -175,7 +176,6 @@ for more details.*
 * GetSecurityInfo returns NULL DACL for process object ([Wine Bug #15980](https://bugs.winehq.org/show_bug.cgi?id=15980))
 * Globally invalidate key state on changes in other threads ([Wine Bug #29871](https://bugs.winehq.org/show_bug.cgi?id=29871))
 * Graphical issues in Inquisitor ([Wine Bug #32490](https://bugs.winehq.org/show_bug.cgi?id=32490))
-* IEnumSTATSTG::Next should zero out returned stats when enumeration ends
 * Implement AMStream GetMultiMediaStream functions ([Wine Bug #37090](https://bugs.winehq.org/show_bug.cgi?id=37090))
 * Implement D3DXGetShaderOutputSemantics
 * Implement DDENUMSURFACES_CANBECREATED in IDirectDraw7::EnumSurfaces ([Wine Bug #17233](https://bugs.winehq.org/show_bug.cgi?id=17233))
@@ -194,8 +194,8 @@ for more details.*
 * Implement exclusive mode in PulseAudio backend ([Wine Bug #37042](https://bugs.winehq.org/show_bug.cgi?id=37042))
 * Implement general tab for file property dialog
 * Implement hal.KeQueryPerformanceCounter ([Wine Bug #39500](https://bugs.winehq.org/show_bug.cgi?id=39500))
-* Implement kernel32.GetConsoleFontSize
 * Implement locking and synchronization of key states ([Wine Bug #31899](https://bugs.winehq.org/show_bug.cgi?id=31899))
+* Implement marshalling for TKIND_COCLASS ([Wine Bug #19016](https://bugs.winehq.org/show_bug.cgi?id=19016))
 * Implement mscoree._CorValidateImage for mono runtime ([Wine Bug #38662](https://bugs.winehq.org/show_bug.cgi?id=38662))
 * Implement ntoskrnl driver testing framework.
 * Implement ntoskrnl.KeInitializeMutex
@@ -203,10 +203,13 @@ for more details.*
 * Implement shell32 NewMenu class with new folder item ([Wine Bug #24812](https://bugs.winehq.org/show_bug.cgi?id=24812))
 * Implement special handling for calling GetChildContainer with an empty string ([Wine Bug #38014](https://bugs.winehq.org/show_bug.cgi?id=38014))
 * Implement stub for ProcessQuotaLimits info class
+* Implement stub for hid.HidP_TranslateUsagesToI8042ScanCodes ([Wine Bug #39447](https://bugs.winehq.org/show_bug.cgi?id=39447))
 * Implement stub for ntoskrnl.IoGetAttachedDeviceReference
 * Implement stub for ntoskrnl.KeDelayExecutionThread.
+* Implement stubless proxies on x86_64 ([Wine Bug #26768](https://bugs.winehq.org/show_bug.cgi?id=26768))
 * Implement stubs for ntoskrnl.Ex{Acquire,Release}FastMutexUnsafe
 * Implement stubs for ntoskrnl.ObReferenceObjectByPointer and ntoskrnl.ObDereferenceObject
+* Implement support for "Purist Mode" (override for all dlls)
 * Improve INetFwAuthorizedApplication::get_ProcessImageFileName stub
 * Improve ReadDataAvailable handling in FilePipeLocalInformation class
 * Improve startup performance by delaying font initialization
@@ -233,12 +236,11 @@ for more details.*
 * Port Royale doesn't display ocean correctly ([Wine Bug #17913](https://bugs.winehq.org/show_bug.cgi?id=17913))
 * Prevent window managers from grouping all wine programs together ([Wine Bug #32699](https://bugs.winehq.org/show_bug.cgi?id=32699))
 * Process APC calls before starting process
-* Process Hacker 2.x needs ntoskrnl.ProbeForRead ([Wine Bug #38103](https://bugs.winehq.org/show_bug.cgi?id=38103))
 * Properly close sockets when WSACleanup is called ([Wine Bug #18670](https://bugs.winehq.org/show_bug.cgi?id=18670))
+* Properly handle multiple registry notifications per key
 * Properly implement imagehlp.ImageLoad and ImageUnload ([Wine Bug #23455](https://bugs.winehq.org/show_bug.cgi?id=23455))
 * Properly initialize caps->dwZBufferBitDepths in ddraw7_GetCaps ([Wine Bug #27002](https://bugs.winehq.org/show_bug.cgi?id=27002))
 * Properly render themed buttons when they are pressed ([Wine Bug #37584](https://bugs.winehq.org/show_bug.cgi?id=37584))
-* Protect TVM_GETITEM from invalid item pointers ([Wine Bug #33001](https://bugs.winehq.org/show_bug.cgi?id=33001))
 * Reduced SetTimer minimum value from 10 ms to 5 ms (improves Silverlight framerates)
 * Refresh MDI menus when DefMDIChildProc(WM_SETTEXT) is called ([Wine Bug #21855](https://bugs.winehq.org/show_bug.cgi?id=21855))
 * Report correct ObjectName for NamedPipe wineserver objects
@@ -251,9 +253,9 @@ for more details.*
 * Return dummy ID3DXSkinInfo interface when skinning info not present ([Wine Bug #33904](https://bugs.winehq.org/show_bug.cgi?id=33904))
 * Return fake device type when systemroot is located on virtual disk ([Wine Bug #36546](https://bugs.winehq.org/show_bug.cgi?id=36546))
 * Return proper status codes when NtReadFile/NtWriteFile is called on closed (but not disconnected) pipe
+* Revert patch to prepare GL resources before calling context_apply_fbo_state ([Wine Bug #39536](https://bugs.winehq.org/show_bug.cgi?id=39536))
 * SHFileOperation with FO_MOVE should create new directory on Vista+ ([Wine Bug #25207](https://bugs.winehq.org/show_bug.cgi?id=25207))
 * SO_CONNECT_TIME returns the appropriate time
-* Scrolling causes mouse and screen to lock in Call to Power II ([Wine Bug #34559](https://bugs.winehq.org/show_bug.cgi?id=34559))
 * Send WM_PAINT event during dialog creation ([Wine Bug #35652](https://bugs.winehq.org/show_bug.cgi?id=35652))
 * Set EOF on file which has a memory mapping should fail
 * Set NamedPipeState to FILE_PIPE_CLOSING_STATE on broken pipe in NtQueryInformationFile
@@ -281,7 +283,6 @@ for more details.*
 * Support for MPEG2 DXVA2 GPU video decoding through vaapi
 * Support for NVIDIA video encoder library (nvencodeapi)
 * Support for NtQuerySection ([Wine Bug #37338](https://bugs.winehq.org/show_bug.cgi?id=37338))
-* Support for PulseAudio backend for audio ([Wine Bug #10495](https://bugs.winehq.org/show_bug.cgi?id=10495))
 * Support for SHCreateSessionKey ([Wine Bug #35630](https://bugs.winehq.org/show_bug.cgi?id=35630))
 * Support for WTSEnumerateProcessesW ([Wine Bug #29903](https://bugs.winehq.org/show_bug.cgi?id=29903))
 * Support for extra large and jumbo icon lists in shell32 ([Wine Bug #24721](https://bugs.winehq.org/show_bug.cgi?id=24721))

debian/changelog

@@ -1,3 +1,47 @@
+wine-staging (1.7.55) unstable; urgency=low
+  * Added patch to revert "Prepare GL resources before calling
+    context_apply_fbo_state".
+  * Added patch to implement support for "Purist Mode" (override for all dlls).
+  * Added patch for partial implementation of ITfThreadMgrEx_ActivateEx.
+  * Added patch for stub of hid.HidP_TranslateUsagesToI8042ScanCodes.
+  * Added patch to properly handle multiple registry notifications per key.
+  * Added patch for stub of kernel32.FreeUserPhysicalPages.
+  * Added patch for stubs of advapi32.RegCreateKeyTransacted[A/W].
+  * Added patch to fix required privileges for load_registry and unload_registry
+    wineserver call.
+  * Added patch to make sure CompareString immediately aborts on first non-
+    matching character.
+  * Added patch to implement marshalling for TKIND_COCLASS.
+  * Added patch to implement stubless proxies on x86_64.
+  * Added patch to allow dinput EnumDevices callback with broken calling
+    convention.
+  * Added patch to allow to set default display frequency in registry (fixes
+    Wine Staging Bug #609).
+  * Remove disabled shell32-Quoted_ShellExecute patchset (bug already fixed and
+    all tests pass).
+  * Remove disabled reg-Cleanup patchset (only cleanup and not actively
+    maintained).
+  * Remove disabled ntdll-FD_Cache patchset (only for PowerPC, no longer
+    necessary because Wine uses inline cmpxchg64 now when compiling with gcc).
+  * Removed patch to implement kernel32.GetConsoleFontSize (accepted upstream).
+  * Removed patch to zero out returned stats when IEnumSTATSTG::Next reaches end
+    of enumeration (accepted upstream).
+  * Removed patch for SfcGetNextProtectedFile stub function (accepted upstream).
+  * Removed patch for SetConsoleKeyShortcuts stub function (accepted upstream).
+  * Removed various PulseAudio driver patches (accepted upstream).
+  * Removed patch to protect TVM_GETITEM from invalid item pointers (accepted
+    upstream).
+  * Removed patch to ensure that X11 input events handled even without explicit
+    message loop (accepted upstream).
+  * Removed patches to fix multiple issues in widl typelib generator (accepted
+    upstream).
+  * Removed patch to fix handling of opening read-only files for
+    FILE_DELETE_ON_CLOSE (accepted upstream).
+  * Removed patch to fix cursor clip regression / broken raw input in multiple
+    games (accepted upstream).
+  * Removed patch for ntoskrnl.ProbeForRead stub (accepted upstream).
+ -- Sebastian Lackner <sebastian@fds-team.de>  Sun, 15 Nov 2015 18:40:25 +0100
+
 wine-staging (1.7.54) unstable; urgency=low
   * Updated server-FileEndOfFileInformation patchset, growing a memory mapped
     file should still work.

debian/tools/patchupdate.py

@@ -295,17 +295,13 @@ def read_patchset(revision = None):
                 patch.categories.append(val)
 
             elif key == "fixes":
-                r = re.match("^[0-9]+$", val)
+                r = re.match("^\\[ *(!)? *([0-9]+) *\\](.*)$", val)
                 if r:
-                    bugid = int(val)
-                    patch.fixes.append((bugid, None))
+                    sync  = (r.group(1) != "!")
+                    bugid = int(r.group(2))
+                    patch.fixes.append((sync, bugid, r.group(3).strip()))
                     continue
-                r = re.match("^\\[ *([0-9]+) *\\](.*)$", val)
-                if r:
-                    bugid = int(r.group(1))
-                    patch.fixes.append((bugid, r.group(2).strip()))
-                    continue
-                patch.fixes.append((None, val))
+                patch.fixes.append((False, None, val))
 
             elif key == "disabled":
                 patch.disabled = _parse_int(val)
@@ -476,8 +472,8 @@ def check_bug_status(all_patches, sync_bugs=False):
 
     for _, patch in all_patches.iteritems():
         url = "%s/tree/master/%s" % (config.github_url, patch.directory)
-        for bugid, bugname in patch.fixes:
-            if bugid is not None:
+        for sync, bugid, bugname in patch.fixes:
+            if sync and bugid is not None:
                 url_map[bugid] = url
                 all_bugids.add(bugid)
 
@@ -767,9 +763,9 @@ def generate_script(all_patches, skip_checks=False):
             lines.append("# |\n")
 
         # List all bugs fixed by this patchset
-        if any([bugid is not None for bugid, bugname in patch.fixes]):
+        if any([bugid is not None for sync, bugid, bugname in patch.fixes]):
             lines.append("# | This patchset fixes the following Wine bugs:\n")
-            for bugid, bugname in patch.fixes:
+            for sync, bugid, bugname in patch.fixes:
                 if bugid is not None:
                     lines.append("# |   *\t%s\n" % "\n# | \t".join(textwrap.wrap("[#%d] %s" % (bugid, bugname), 120)))
             lines.append("# |\n")
@@ -815,13 +811,13 @@ def generate_markdown(all_patches, release_patches):
 
     # Get fixes for current version
     for _, patch in all_patches.iteritems():
-        for bugid, bugname in patch.fixes:
+        for sync, bugid, bugname in patch.fixes:
             key = bugid if bugid is not None else bugname
             all_fixes[key] = [1, bugid, bugname]
 
     # Compare with fixes for last release
     for _, patch in release_patches.iteritems():
-        for bugid, bugname in patch.fixes:
+        for sync, bugid, bugname in patch.fixes:
             if bugid is not None and all_fixes.has_key(bugid):
                 all_fixes[bugid][0] = 0
             elif all_fixes.has_key(bugname):

debian/tools/patchutils.py

@@ -328,6 +328,8 @@ def read_patch(filename):
                     assert fp.read() == line
                 subject, revision = _parse_subject(subject)
                 if not subject.endswith("."): subject += "."
+                subject = re.sub('^([^:]*: *)([a-z])', lambda x: "%s%s" %
+                                 (x.group(1), x.group(2).upper()), subject, 1)
                 header['subject'], header['revision'] = subject, revision
 
             elif line.startswith("Signed-off-by: "):

debian/wine-staging-i386.install

@@ -2,3 +2,7 @@
 /opt/wine-staging/lib/wine
 /opt/wine-staging/bin/wine
 /opt/wine-staging/bin/wine-preloader
+/opt/wine-staging/share/man/man?/wine.?*
+/opt/wine-staging/share/man/de.UTF-8/man?/wine.?*
+/opt/wine-staging/share/man/fr.UTF-8/man?/wine.?*
+/opt/wine-staging/share/man/pl.UTF-8/man?/wine.?*

debian/wine-staging.install

@@ -1,2 +1,28 @@
 /opt/wine-staging/bin
-/opt/wine-staging/share
+/opt/wine-staging/share/applications
+/opt/wine-staging/share/wine
+/opt/wine-staging/share/man/de.UTF-8/man?/winemaker.?*
+/opt/wine-staging/share/man/de.UTF-8/man?/wineserver.?*
+/opt/wine-staging/share/man/fr.UTF-8/man?/winemaker.?*
+/opt/wine-staging/share/man/fr.UTF-8/man?/wineserver.?*
+/opt/wine-staging/share/man/man?/msiexec.?*
+/opt/wine-staging/share/man/man?/notepad.?*
+/opt/wine-staging/share/man/man?/regedit.?*
+/opt/wine-staging/share/man/man?/regsvr32.?*
+/opt/wine-staging/share/man/man?/widl.?*
+/opt/wine-staging/share/man/man?/wineboot.?*
+/opt/wine-staging/share/man/man?/winebuild.?*
+/opt/wine-staging/share/man/man?/winecfg.?*
+/opt/wine-staging/share/man/man?/wineconsole.?*
+/opt/wine-staging/share/man/man?/winecpp.?*
+/opt/wine-staging/share/man/man?/winedbg.?*
+/opt/wine-staging/share/man/man?/winedump.?*
+/opt/wine-staging/share/man/man?/winefile.?*
+/opt/wine-staging/share/man/man?/wineg++.?*
+/opt/wine-staging/share/man/man?/winegcc.?*
+/opt/wine-staging/share/man/man?/winemaker.?*
+/opt/wine-staging/share/man/man?/winemine.?*
+/opt/wine-staging/share/man/man?/winepath.?*
+/opt/wine-staging/share/man/man?/wineserver.?*
+/opt/wine-staging/share/man/man?/wmc.?*
+/opt/wine-staging/share/man/man?/wrc.?*

patches/Compiler_Warnings/0001-Appease-the-blessed-version-of-gcc-4.5-when-Werror-i.patch

@@ -1,4 +1,4 @@
-From 267583000e05b5ed8da1122df0830556fe7e69f6 Mon Sep 17 00:00:00 2001
+From 35e7be609df3c37eded9a3fd117ba0cef02f24c7 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.
@@ -12,10 +12,10 @@ Subject: Appease the blessed version of gcc (4.5) when -Werror is enabled.
  5 files changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c
-index f9cb71c..81f6131 100644
+index 55140c6..2facbfb 100644
 --- a/dlls/d3d9/tests/visual.c
 +++ b/dlls/d3d9/tests/visual.c
-@@ -11967,7 +11967,7 @@ static void yuv_layout_test(void)
+@@ -12034,7 +12034,7 @@ static void yuv_layout_test(void)
      IDirect3D9 *d3d;
      D3DCOLOR color;
      DWORD ref_color;
@@ -25,10 +25,10 @@ index f9cb71c..81f6131 100644
      IDirect3DDevice9 *device;
      ULONG refcount;
 diff --git a/dlls/netapi32/netapi32.c b/dlls/netapi32/netapi32.c
-index 7a1d408..649c866 100644
+index bb61e7f..cf4c466 100644
 --- a/dlls/netapi32/netapi32.c
 +++ b/dlls/netapi32/netapi32.c
-@@ -779,7 +779,7 @@ static NET_API_STATUS share_info_to_samba( DWORD level, const BYTE *buf, unsigne
+@@ -780,7 +780,7 @@ static NET_API_STATUS share_info_to_samba( DWORD level, const BYTE *buf, unsigne
  static NET_API_STATUS share_add( LMSTR servername, DWORD level, LPBYTE buf, LPDWORD parm_err )
  {
      char *server = NULL;
@@ -51,10 +51,10 @@ index 14eac39..ebff9f1 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 f69a2ce..00232a5 100644
+index 44e7090..429ae90 100644
 --- a/dlls/wined3d/glsl_shader.c
 +++ b/dlls/wined3d/glsl_shader.c
-@@ -6706,7 +6706,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const
+@@ -6893,7 +6893,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const
      GLuint vs_id = 0;
      GLuint gs_id = 0;
      GLuint ps_id = 0;
@@ -64,18 +64,18 @@ index f69a2ce..00232a5 100644
      struct wined3d_string_buffer *tmp_name;
  
 diff --git a/tools/makedep.c b/tools/makedep.c
-index 54aab45..103422e 100644
+index d8cf2f5..280f62f 100644
 --- a/tools/makedep.c
 +++ b/tools/makedep.c
-@@ -1480,7 +1480,7 @@ static char *get_make_variable( struct makefile *make, const char *name )
-  */
- static char *get_expanded_make_variable( struct makefile *make, const char *name )
+@@ -1559,7 +1559,7 @@ static const char *get_make_variable( const struct makefile *make, const char *n
+ static char *get_expanded_make_variable( const struct makefile *make, const char *name )
  {
--    char *p, *end, *var, *expand, *tmp;
-+    char *p, *end, *var, *expand, *tmp = NULL;
+     const char *var;
+-    char *p, *end, *expand, *tmp;
++    char *p, *end, *expand, *tmp = NULL;
  
-     expand = get_make_variable( make, name );
-     if (!expand) return NULL;
+     var = get_make_variable( make, name );
+     if (!var) return NULL;
 -- 
-2.4.2
+2.6.2
 

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

@@ -1,4 +1,4 @@
-From 65feac97e132fb25278e7c4c904d2ae831bf8a50 Mon Sep 17 00:00:00 2001
+From 2e1a505fedd43f0f03ba36e1a8413bf04f8afa83 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 '(Staging)' at the end of the version string.
@@ -8,18 +8,18 @@ Subject: winelib: Append '(Staging)' at the end of the version string.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in
-index bc5f6fe..799b032 100644
+index 1b7fea8..780be10 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`\"
+@@ -112,7 +112,7 @@ libwine_LDFLAGS = $(LIBWINE_LDFLAGS)
+ libwine_DEPS = $(LIBWINE_DEPENDS)
  
  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 (Staging)";/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";/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  (Staging)";/p'` && (echo $$version | cmp -s - $@) || echo $$version >$@ || ($(RM) $@ && exit 1)
  
  dummy:
- 
+ .PHONY: dummy
 -- 
-2.6.1
+2.6.2
 

patches/advapi32-RegCreateKeyTransacted/0001-advapi32-Add-stubs-for-RegCreateKeyTransacted-A-W-fu.patch

@@ -0,0 +1,64 @@
+From a5cf87f611909a601fe00cbdd5235add43652c54 Mon Sep 17 00:00:00 2001
+From: Sebastian Lackner <sebastian@fds-team.de>
+Date: Sat, 14 Nov 2015 17:29:43 +0100
+Subject: advapi32: Add stubs for RegCreateKeyTransacted[A/W] functions.
+
+---
+ dlls/advapi32/advapi32.spec |  4 ++--
+ dlls/advapi32/registry.c    | 25 +++++++++++++++++++++++++
+ 2 files changed, 27 insertions(+), 2 deletions(-)
+
+diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec
+index ff2b0de..36f176b 100644
+--- a/dlls/advapi32/advapi32.spec
++++ b/dlls/advapi32/advapi32.spec
+@@ -581,8 +581,8 @@
+ @ stdcall RegCreateKeyExA(long str long ptr long long ptr ptr ptr)
+ @ stdcall RegCreateKeyExW(long wstr long ptr long long ptr ptr ptr)
+ @ stdcall RegCreateKeyW(long wstr ptr)
+-# @ stub RegCreateKeyTransactedA
+-# @ stub RegCreateKeyTransactedW
++@ stdcall RegCreateKeyTransactedA(long str long ptr long long ptr ptr ptr long ptr)
++@ stdcall RegCreateKeyTransactedW(long wstr long ptr long long ptr ptr ptr long ptr)
+ @ stdcall RegDeleteKeyA(long str)
+ @ stdcall RegDeleteKeyExA(long str long long)
+ @ stdcall RegDeleteKeyExW(long wstr long long)
+diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c
+index 798f93d..6b4c873 100644
+--- a/dlls/advapi32/registry.c
++++ b/dlls/advapi32/registry.c
+@@ -473,6 +473,31 @@ LSTATUS WINAPI RegCreateKeyA( HKEY hkey, LPCSTR lpSubKey, PHKEY phkResult )
+ }
+ 
+ 
++/******************************************************************************
++ * RegCreateKeyTransactedW   [ADVAPI32.@]
++ */
++LSTATUS WINAPI RegCreateKeyTransactedW( HKEY hkey, LPCWSTR name, DWORD reserved, LPWSTR class,
++                                        DWORD options, REGSAM access, SECURITY_ATTRIBUTES *sa,
++                                        PHKEY retkey, LPDWORD dispos, HANDLE transaction, PVOID reserved2 )
++{
++    FIXME( "(%p,%s,%u,%s,%u,%u,%p,%p,%p,%p,%p): stub\n", hkey, debugstr_w(name), reserved,
++           debugstr_w(class), options, access, sa, retkey, dispos, transaction, reserved2 );
++    return ERROR_CALL_NOT_IMPLEMENTED;
++}
++
++
++/******************************************************************************
++ * RegCreateKeyTransactedA   [ADVAPI32.@]
++ */
++LSTATUS WINAPI RegCreateKeyTransactedA( HKEY hkey, LPCSTR name, DWORD reserved, LPSTR class,
++                                        DWORD options, REGSAM access, SECURITY_ATTRIBUTES *sa,
++                                        PHKEY retkey, LPDWORD dispos, HANDLE transaction, PVOID reserved2 )
++{
++    FIXME( "(%p,%s,%u,%s,%u,%u,%p,%p,%p,%p,%p): stub\n", hkey, debugstr_a(name), reserved,
++           debugstr_a(class), options, access, sa, retkey, dispos, transaction, reserved2 );
++    return ERROR_CALL_NOT_IMPLEMENTED;
++}
++
+ 
+ /******************************************************************************
+  * RegOpenKeyExW   [ADVAPI32.@]
+-- 
+2.6.2
+

patches/advapi32-RegCreateKeyTransacted/definition

@@ -0,0 +1 @@
+Fixes: Add stubs for advapi32.RegCreateKeyTransacted[A/W]

patches/comctl32-TVM_GETITEM/0001-comctl32-Protect-TVM_GETITEM-from-invalid-item-point.patch

@@ -1,71 +0,0 @@
-From 1b058c627bdd31c151110e8f554ab6210248e105 Mon Sep 17 00:00:00 2001
-From: Nikolay Sivov <nsivov@codeweavers.com>
-Date: Fri, 22 Feb 2013 11:38:12 +0400
-Subject: comctl32: Protect TVM_GETITEM from invalid item pointers
-
-Changes by Sebastian Lackner <sebastian@fds-team.de>:
-* Avoid return in __TRY block.
----
- dlls/comctl32/tests/treeview.c |  9 +++++++++
- dlls/comctl32/treeview.c       | 16 +++++++++++++---
- 2 files changed, 22 insertions(+), 3 deletions(-)
-
-diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c
-index 5003dfa..933a8b0 100644
---- a/dlls/comctl32/tests/treeview.c
-+++ b/dlls/comctl32/tests/treeview.c
-@@ -905,6 +905,15 @@ static void test_get_set_item(void)
-     expect(TRUE, ret);
-     ok(tviRoot.state == TVIS_FOCUSED, "got state 0x%0x\n", tviRoot.state);
- 
-+if (0)
-+{
-+    /* invalid item pointer, nt4 crashes here but later versions just return 0 */
-+    tviRoot.hItem = (HTREEITEM)0xdeadbeef;
-+    tviRoot.mask = TVIF_STATE;
-+    tviRoot.state = 0;
-+    ret = SendMessageA(hTree2, TVM_GETITEMA, 0, (LPARAM)&tviRoot);
-+    expect(FALSE, ret);
-+}
-     DestroyWindow(hTree);
-     DestroyWindow(hTree2);
- }
-diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c
-index 812bd35..6adafc4 100644
---- a/dlls/comctl32/treeview.c
-+++ b/dlls/comctl32/treeview.c
-@@ -63,6 +63,7 @@
- #include "vssym32.h"
- #include "wine/unicode.h"
- #include "wine/debug.h"
-+#include "wine/exception.h"
- 
- WINE_DEFAULT_DEBUG_CHANNEL(treeview);
- 
-@@ -2068,11 +2069,20 @@ TREEVIEW_GetItemT(const TREEVIEW_INFO *infoPtr, LPTVITEMEXW tvItem, BOOL isW)
- 
-     if (!TREEVIEW_ValidItem(infoPtr, item))
-     {
-+        BOOL valid_item = FALSE;
-         if (!item) return FALSE;
- 
--        TRACE("got item from different tree %p, called from %p\n", item->infoPtr, infoPtr);
--        infoPtr = item->infoPtr;
--        if (!TREEVIEW_ValidItem(infoPtr, item)) return FALSE;
-+        __TRY
-+        {
-+            infoPtr = item->infoPtr;
-+            TRACE("got item from different tree %p, called from %p\n", item->infoPtr, infoPtr);
-+            valid_item = TREEVIEW_ValidItem(infoPtr, item);
-+        }
-+        __EXCEPT_PAGE_FAULT
-+        {
-+        }
-+        __ENDTRY
-+        if (!valid_item) return FALSE;
-     }
- 
-     TREEVIEW_UpdateDispInfo(infoPtr, item, tvItem->mask);
--- 
-2.5.1
-

patches/comctl32-TVM_GETITEM/definition

@@ -1 +0,0 @@
-Fixes: [33001] Protect TVM_GETITEM from invalid item pointers

patches/d3dx9_36-DDS/0001-d3dx9_36-tests-Add-D3DXSaveSurfaceToFileInMemory-D3D.patch

@@ -0,0 +1,74 @@
+From 68efe5449591b9b1366d66d87fff1a8c9f8002e5 Mon Sep 17 00:00:00 2001
+From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
+Date: Fri, 16 Oct 2015 14:06:30 +1100
+Subject: d3dx9_36/tests: Add D3DXSaveSurfaceToFileInMemory D3DXIFF_DDS tests
+
+Also updates the structure dds_header to be the same as d3dx9_36/surface.c.
+
+Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
+---
+ dlls/d3dx9_36/tests/surface.c | 34 +++++++++++++++++++++++++++++++++-
+ 1 file changed, 33 insertions(+), 1 deletion(-)
+
+diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c
+index 1697a03..77bd142 100644
+--- a/dlls/d3dx9_36/tests/surface.c
++++ b/dlls/d3dx9_36/tests/surface.c
+@@ -211,7 +211,9 @@ struct dds_header
+     struct dds_pixel_format pixel_format;
+     DWORD caps;
+     DWORD caps2;
+-    DWORD reserved2[3];
++    DWORD caps3;
++    DWORD caps4;
++    DWORD reserved2;
+ };
+ 
+ /* fills dds_header with reasonable default values */
+@@ -1231,6 +1233,7 @@ static void test_D3DXSaveSurfaceToFileInMemory(IDirect3DDevice9 *device)
+     RECT rect;
+     ID3DXBuffer *buffer;
+     IDirect3DSurface9 *surface;
++    struct dds_header *header;
+ 
+     hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 4, 4, D3DFMT_A8R8G8B8, D3DPOOL_SCRATCH, &surface, NULL);
+     if (FAILED(hr)) {
+@@ -1248,6 +1251,35 @@ static void test_D3DXSaveSurfaceToFileInMemory(IDirect3DDevice9 *device)
+         ID3DXBuffer_Release(buffer);
+     }
+ 
++    SetRect(&rect, 0, 0, 0, 0);
++    hr = D3DXSaveSurfaceToFileInMemory(&buffer, D3DXIFF_DDS, surface, NULL, &rect);
++    todo_wine ok(hr == D3D_OK || broken(hr == D3DERR_INVALIDCALL), "D3DXSaveSurfaceToFileInMemory returned %#x, expected %#x\n", hr, D3D_OK);
++    if (SUCCEEDED(hr)) {
++        header = ID3DXBuffer_GetBufferPointer(buffer);
++
++        ok(header->magic == MAKEFOURCC('D','D','S',' '), "Invalid DDS signature\n");
++        todo_wine ok(header->size == 124, "Invalid DDS size %d\n", header->size);
++        ok(header->height == 0, "Wrong height %d\n", header->height);
++        ok(header->width == 0, "Wrong width %d\n", header->width);
++        ok(header->flags == (DDS_CAPS | DDS_HEIGHT | DDS_WIDTH | DDS_PIXELFORMAT),
++           "Wrong flags %x\n", header->flags);
++        ID3DXBuffer_Release(buffer);
++    }
++
++    hr = D3DXSaveSurfaceToFileInMemory(&buffer, D3DXIFF_DDS, surface, NULL, NULL);
++    ok(hr == D3D_OK || broken(hr == D3DERR_INVALIDCALL), "D3DXSaveSurfaceToFileInMemory returned %#x, expected %#x\n", hr, D3D_OK);
++    if (SUCCEEDED(hr)) {
++        header = ID3DXBuffer_GetBufferPointer(buffer);
++
++        ok(header->magic == MAKEFOURCC('D','D','S',' '), "Invalid DDS signature\n");
++        todo_wine ok(header->size == 124, "Invalid DDS size %d\n", header->size);
++        ok(header->height == 4, "Wrong height %d\n", header->height);
++        ok(header->width == 4, "Wrong width %d\n", header->width);
++        todo_wine ok(header->flags == (DDS_CAPS | DDS_HEIGHT | DDS_WIDTH | DDS_PIXELFORMAT),
++                     "Wrong flags %x\n", header->flags);
++        ID3DXBuffer_Release(buffer);
++    }
++
+     IDirect3DSurface9_Release(surface);
+ }
+ 
+-- 
+2.6.2
+

patches/d3dx9_36-DDS/0002-d3dx9_36-Fix-several-issues-in-save_dds_surface_to_m.patch

@@ -1,4 +1,4 @@
-From 226f9f6bd5622c18ec4ab78f3b71ef205a550d16 Mon Sep 17 00:00:00 2001
+From 88f02c608de86c125cbddd543c34ea2bfce30993 Mon Sep 17 00:00:00 2001
 From: Christian Costa <titan.costa@gmail.com>
 Date: Sun, 11 Jan 2015 16:09:43 +0100
 Subject: d3dx9_36: Fix several issues in save_dds_surface_to_memory.
@@ -9,8 +9,9 @@ The different fixes are:
 - Fix DDS_WIDTH define to correct value 4
 - Do not set depth and miplevels fields as their flags are not set (to match native)
 ---
- dlls/d3dx9_36/surface.c | 7 +++----
- 1 file changed, 3 insertions(+), 4 deletions(-)
+ dlls/d3dx9_36/surface.c       | 7 +++----
+ dlls/d3dx9_36/tests/surface.c | 2 +-
+ 2 files changed, 4 insertions(+), 5 deletions(-)
 
 diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c
 index b8bb710..6f6132c 100644
@@ -33,6 +34,19 @@ index b8bb710..6f6132c 100644
      header->caps = DDS_CAPS_TEXTURE;
      hr = d3dformat_to_dds_pixel_format(&header->pixel_format, src_desc.Format);
      if (FAILED(hr))
+diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c
+index 77bd142..f04fa67 100644
+--- a/dlls/d3dx9_36/tests/surface.c
++++ b/dlls/d3dx9_36/tests/surface.c
+@@ -1272,7 +1272,7 @@ static void test_D3DXSaveSurfaceToFileInMemory(IDirect3DDevice9 *device)
+         header = ID3DXBuffer_GetBufferPointer(buffer);
+ 
+         ok(header->magic == MAKEFOURCC('D','D','S',' '), "Invalid DDS signature\n");
+-        todo_wine ok(header->size == 124, "Invalid DDS size %d\n", header->size);
++        ok(header->size == 124, "Invalid DDS size %d\n", header->size);
+         ok(header->height == 4, "Wrong height %d\n", header->height);
+         ok(header->width == 4, "Wrong width %d\n", header->width);
+         todo_wine ok(header->flags == (DDS_CAPS | DDS_HEIGHT | DDS_WIDTH | DDS_PIXELFORMAT),
 -- 
-2.5.0
+2.6.2
 

patches/dbghelp-Debug_Symbols/0001-dbghelp-Always-check-for-debug-symbols-in-BINDIR.patch

@@ -1,4 +1,4 @@
-From 4ecefb9629cb3121da17e7d9573c5134dcdc74c6 Mon Sep 17 00:00:00 2001
+From eee7c92a62872ca06bb864674ea73ddab09f362e Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Mon, 6 Oct 2014 05:06:06 +0200
 Subject: dbghelp: Always check for debug symbols in BINDIR.
@@ -9,14 +9,14 @@ Subject: dbghelp: Always check for debug symbols in BINDIR.
  2 files changed, 6 insertions(+), 4 deletions(-)
 
 diff --git a/dlls/dbghelp/Makefile.in b/dlls/dbghelp/Makefile.in
-index e483693..03248a6 100644
+index 86846cb..6b72980 100644
 --- a/dlls/dbghelp/Makefile.in
 +++ b/dlls/dbghelp/Makefile.in
 @@ -1,6 +1,6 @@
  MODULE    = dbghelp.dll
  IMPORTLIB = dbghelp
--EXTRADEFS = -D_IMAGEHLP_SOURCE_ -DDLLPREFIX='"$(DLLPREFIX)"'
-+EXTRADEFS = -D_IMAGEHLP_SOURCE_ -DDLLPREFIX='"$(DLLPREFIX)"' -DBINDIR="\"${bindir}\""
+-EXTRADEFS = -D_IMAGEHLP_SOURCE_
++EXTRADEFS = -D_IMAGEHLP_SOURCE_ -DBINDIR="\"${bindir}\""
  IMPORTS   = psapi
  DELAYIMPORTS = version
  EXTRALIBS = $(Z_LIBS) $(CORESERVICES_LIBS) $(COREFOUNDATION_LIBS)
@@ -40,5 +40,5 @@ index b176143..8e22265 100644
                                                      load_offset, dyn_addr, elf_info);
      }
 -- 
-2.4.4
+2.6.2
 

patches/ddraw-IDirect3DTexture2_Load/0001-ddraw-Allow-size-and-format-conversions-in-IDirect3D.patch

@@ -1,4 +1,4 @@
-From 3e9c3ba84739fdd41205e1dd4ea8ad686871defb Mon Sep 17 00:00:00 2001
+From f1ad7b7975ed611a4989986f35ea3695eca0f26c Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sat, 30 May 2015 02:55:03 +0200
 Subject: ddraw: Allow size and format conversions in IDirect3DTexture2::Load.
@@ -8,10 +8,10 @@ Subject: ddraw: Allow size and format conversions in IDirect3DTexture2::Load.
  1 file changed, 76 insertions(+), 71 deletions(-)
 
 diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c
-index f716cfc..f3bea20 100644
+index 8a10eff..cb71a65 100644
 --- a/dlls/ddraw/surface.c
 +++ b/dlls/ddraw/surface.c
-@@ -5048,6 +5048,46 @@ static struct ddraw_surface *get_sub_mimaplevel(struct ddraw_surface *surface)
+@@ -5062,6 +5062,46 @@ static struct ddraw_surface *get_sub_mimaplevel(struct ddraw_surface *surface)
      return impl_from_IDirectDrawSurface7(next_level);
  }
  
@@ -58,7 +58,7 @@ index f716cfc..f3bea20 100644
  /*****************************************************************************
   * IDirect3DTexture2::Load
   *
-@@ -5081,91 +5121,57 @@ static HRESULT WINAPI d3d_texture2_Load(IDirect3DTexture2 *iface, IDirect3DTextu
+@@ -5095,90 +5135,56 @@ static HRESULT WINAPI d3d_texture2_Load(IDirect3DTexture2 *iface, IDirect3DTextu
  
      wined3d_mutex_lock();
  
@@ -75,8 +75,7 @@ index f716cfc..f3bea20 100644
 -        DDSURFACEDESC *src_desc, *dst_desc;
 +        DDSURFACEDESC *src_desc = (DDSURFACEDESC *)&src_surface->surface_desc;
  
-         TRACE("Copying surface %p to surface %p (mipmap level %d).\n",
-                 src_surface, dst_surface, src_surface->mipmap_level);
+         TRACE("Copying surface %p to surface %p.\n", src_surface, dst_surface);
  
 -        /* Suppress the ALLOCONLOAD flag */
 -        dst_surface->surface_desc.ddsCaps.dwCaps &= ~DDSCAPS_ALLOCONLOAD;
@@ -183,7 +182,7 @@ index f716cfc..f3bea20 100644
          }
  
          if (src_surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_MIPMAP)
-@@ -5178,12 +5184,11 @@ static HRESULT WINAPI d3d_texture2_Load(IDirect3DTexture2 *iface, IDirect3DTextu
+@@ -5191,12 +5197,11 @@ static HRESULT WINAPI d3d_texture2_Load(IDirect3DTexture2 *iface, IDirect3DTextu
          else
              dst_surface = NULL;
  
@@ -200,5 +199,5 @@ index f716cfc..f3bea20 100644
  
      wined3d_mutex_unlock();
 -- 
-2.4.2
+2.6.2
 

patches/dinput-EnumDevice_Callback/0001-dinput-Allow-EnumDevices-callback-functions-with-bro.patch

@@ -0,0 +1,62 @@
+From 0904e4dd80d07f725dc31c78ffbfaa32b351ad94 Mon Sep 17 00:00:00 2001
+From: Andrew Nguyen <arethusa26@gmail.com>
+Date: Sun, 15 Nov 2015 07:18:13 +0100
+Subject: dinput: Allow EnumDevices callback functions with broken calling
+ conventions.
+
+---
+ dlls/dinput/dinput_main.c | 24 ++++++++++++++++++++++--
+ 1 file changed, 22 insertions(+), 2 deletions(-)
+
+diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c
+index aef9d10..1ed1034 100644
+--- a/dlls/dinput/dinput_main.c
++++ b/dlls/dinput/dinput_main.c
+@@ -339,6 +339,26 @@ static DWORD diactionformat_priorityW(LPDIACTIONFORMATW lpdiaf, DWORD genre)
+     return priorityFlags;
+ }
+ 
++#ifdef __i386__
++extern BOOL CDECL enum_callback_wrapper(void *callback, const void *instance, void *ref);
++__ASM_GLOBAL_FUNC( enum_callback_wrapper,
++    "pushl %ebp\n\t"
++    __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t")
++    __ASM_CFI(".cfi_rel_offset %ebp,0\n\t")
++    "movl %esp,%ebp\n\t"
++    __ASM_CFI(".cfi_def_cfa_register %ebp\n\t")
++    "pushl 16(%ebp)\n\t"
++    "pushl 12(%ebp)\n\t"
++    "movl 8(%ebp),%eax\n\t"
++    "call *%eax\n\t"
++    "leave\n\t"
++    __ASM_CFI(".cfi_def_cfa %esp,4\n\t")
++    __ASM_CFI(".cfi_same_value %ebp\n\t")
++    "ret" )
++#else
++#define enum_callback_wrapper(callback, instance, ref) (callback)((instance), (ref))
++#endif
++
+ /******************************************************************************
+  *	IDirectInputA_EnumDevices
+  */
+@@ -371,7 +391,7 @@ static HRESULT WINAPI IDirectInputAImpl_EnumDevices(
+             TRACE("  - checking device %u ('%s')\n", i, dinput_devices[i]->name);
+             r = dinput_devices[i]->enum_deviceA(dwDevType, dwFlags, &devInstance, This->dwVersion, j);
+             if (r == S_OK)
+-                if (lpCallback(&devInstance,pvRef) == DIENUM_STOP)
++                if (enum_callback_wrapper(lpCallback, &devInstance, pvRef) == DIENUM_STOP)
+                     return S_OK;
+         }
+     }
+@@ -411,7 +431,7 @@ static HRESULT WINAPI IDirectInputWImpl_EnumDevices(
+             TRACE("  - checking device %u ('%s')\n", i, dinput_devices[i]->name);
+             r = dinput_devices[i]->enum_deviceW(dwDevType, dwFlags, &devInstance, This->dwVersion, j);
+             if (r == S_OK)
+-                if (lpCallback(&devInstance,pvRef) == DIENUM_STOP)
++                if (enum_callback_wrapper(lpCallback, &devInstance, pvRef) == DIENUM_STOP)
+                     return S_OK;
+         }
+     }
+-- 
+2.6.2
+

patches/dinput-EnumDevice_Callback/definition

@@ -0,0 +1 @@
+Fixes: [27664] Allow dinput EnumDevices callback with broken calling convention