Release 1.9.1.

FIXME: Should destroy_default_sampler() also be called from delete_opengl_contexts() in the non-CSMT case?

LICENSE.md

@@ -7,7 +7,7 @@ are part of **Wine Staging** and are licensed under the terms of the
 [LGPLv2.1](#gnu-lgpl-version-21), to stay compatible with Wine:
 
 ```
-Copyright (C) 2014-2015 the Wine Staging project authors.
+Copyright (C) 2014-2016 the Wine Staging project authors.
 
 Wine Staging is free software; you can redistribute it and/or
 modify it under the terms of the GNU Lesser General Public

README.md

@@ -8,306 +8,93 @@ to give developers the possibility to discuss and improve their patches before
 they are integrated into the main branch. More information about Wine Staging
 can also be found on our website [wine-staging.com](http://wine-staging.com).
 
-Although we are reviewing and testing all patches carefully before adding them,
-you may encounter additional bugs, which are not present in the development
-branch. Do not hesitate to report such issues at winehq.org, so they can be
-fixed before the feature gets integrated.
+Installation
+------------
 
+Ready-to-use packages for Wine Staging are available for a variety of Linux
+distributions and for Mac OS X. Just follow the
+[installation instructions](https://github.com/wine-compholio/wine-staging/wiki/Installation)
+for your operating system.
 
-How to install and use Wine Staging
------------------------------------
+On most distributions the `wine-staging` package is installed to
+`/opt/wine-staging`, such that multiple Wine versions can be installed in
+parallel. If this is the case for your distribution, you will have to type
+`/opt/wine-staging/bin/wine` instead of just `wine`. The same also applies for
+other wine-specific programs like `winecfg`. To learn more about how to use
+Wine Staging, please take a look at the
+[usage instructions](https://github.com/wine-compholio/wine-staging/wiki/Usage).
 
-Ready-to-use packages for Wine Staging are available for a variety
-of different Linux distributions directly for download. Just follow the
-instructions available on the
-[Wiki](https://github.com/wine-compholio/wine-staging/wiki/Installation).
+Reporting bugs
+--------------
 
-When using Wine Staging there are a few differences compared to regular
-Wine. The main difference is that it is not sufficient to type `wine` to
-run it, but instead you will have to type `/opt/wine-staging/bin/wine`.
-Besides that there are also some other differences, for example additional
-configuration options to tweak performance, which are not available in regular
-Wine. All those differences are also documented on the
-[Wiki](https://github.com/wine-compholio/wine-staging/wiki/Usage).
+Since WineConf 2015 Wine Staging is an official part of WineHQ, which means you
+can report problems directly at https://bugs.winehq.org/. Most of the time bugs
+found in Wine Staging also turn out to be present in the development branch, so
+its recommended to open your bug in the "Wine" product, unless you are sure its
+really "Wine Staging" specific. For problems with our binary packages, please
+also open a bug report there.
 
+Building
+--------
 
-Included bug fixes and improvements
------------------------------------
+Wine Staging is maintained as a set of patches which has to be applied on top of
+the development branch. In order to build Wine Staging, the first step is to
+setup a build environment for Wine, including all required dependencies. A lot
+of information about that is collected in the
+[WineHQ Wiki](http://wiki.winehq.org/BuildingWine).
 
-**Bug fixes and features in Wine Staging 1.8-rc4 [267]:**
+In order to apply all Wine Staging patches it is recommended to use the
+`patchinstall.sh` utility which takes care of applying all patches in the
+correct order. For reference, the possible commandline arguments are:
 
-*Note: The following list only contains features and bug fixes which are not
-yet available in vanilla Wine. They are removed from the list as soon as they
-are included upstream. The list also includes features and fixes from previous
-releases, take a look at the
-[changelog](https://github.com/wine-compholio/wine-staging/blob/master/staging/changelog)
-for more details.*
+```
+Usage: ./patchinstall.sh [DESTDIR=path] [--all] [-W patchset] [patchset ...]
 
-* Add IDragSourceHelper stub interface ([Wine Bug #24699](https://bugs.winehq.org/show_bug.cgi?id=24699))
-* Add IHTMLLocation::hash property's getter implementation ([Wine Bug #32967](https://bugs.winehq.org/show_bug.cgi?id=32967))
-* Add a ProfileList\<UserSID> registry subkey ([Wine Bug #15670](https://bugs.winehq.org/show_bug.cgi?id=15670))
-* Add a stub driver for tdi.sys ([Wine Bug #35693](https://bugs.winehq.org/show_bug.cgi?id=35693))
-* Add implementation for comctl32.PROPSHEET_InsertPage. ([Wine Bug #25625](https://bugs.winehq.org/show_bug.cgi?id=25625))
-* Add implementation for mfplat.MFTEnum ([Wine Bug #39309](https://bugs.winehq.org/show_bug.cgi?id=39309))
-* Add implementation for mfplat.MFTRegister ([Wine Bug #37811](https://bugs.winehq.org/show_bug.cgi?id=37811))
-* Add implementation for msidb commandline tool
-* Add implementation for shlwapi.AssocGetPerceivedType
-* Add nvapi stubs required for GPU PhysX support
-* Add performance library registry keys needed by MS SQL Server Management Studio Express 2008 R2 ([Wine Bug #33661](https://bugs.winehq.org/show_bug.cgi?id=33661))
-* Add semi-stub for 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))
-* Add stub dlls required for MSVC 2015 runtime library (Windows 10)
-* Add stub for D3DXComputeNormalMap
-* 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 ntoskrnl.ExAcquireResourceExclusiveLite
-* Add stub for ntoskrnl.ExDeleteResourceLite
-* Add stub for ntoskrnl.ExReleaseResourceForThread
-* 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))
-* Add stub for wininet.ParseX509EncodedCertificateForListBoxEntry ([Wine Bug #29842](https://bugs.winehq.org/show_bug.cgi?id=29842))
-* 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
-* Add support for hiding wine version information from applications ([Wine Bug #38656](https://bugs.winehq.org/show_bug.cgi?id=38656))
-* 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 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))
-* Allow to cancel a file operation via progress callback ([Wine Bug #22690](https://bugs.winehq.org/show_bug.cgi?id=22690))
-* Allow to edit winecfg library override by double clicking
-* Allow to open files/directories without any access rights in order to query attributes
-* Allow to override number of quality levels for D3DMULTISAMPLE_NONMASKABLE. ([Wine Bug #12652](https://bugs.winehq.org/show_bug.cgi?id=12652))
-* Allow to set debug registers separately in NtSetContextThread ([Wine Bug #39454](https://bugs.winehq.org/show_bug.cgi?id=39454))
-* Allow to set pixel format for desktop window
-* Allow to specify default display frequency in registry
-* Also send WM_CAPTURECHANGE when capture has not changed ([Wine Bug #13683](https://bugs.winehq.org/show_bug.cgi?id=13683))
-* 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))
-* Audio stuttering and performance drops in multiple applications ([Wine Bug #30639](https://bugs.winehq.org/show_bug.cgi?id=30639))
-* Avoid crashing when broken app tries to release surface although refcount is zero ([Wine Bug #18477](https://bugs.winehq.org/show_bug.cgi?id=18477))
-* Avoid race-conditions in NtReadFile() operations with write watches.
-* Avoid race-conditions of async WSARecv() operations with write watches.
-* Avoid race-conditions with write watches in WS2_async_accept.
-* Basic handling of write watches triggered while we're on the signal stack.
-* Basic support for CUDA
-* Black & White needs DXTn software decoding support ([Wine Bug #14939](https://bugs.winehq.org/show_bug.cgi?id=14939))
-* CPU-Z fails to start because GetLogicalProcessorInformationEx returns FALSE
-* Calculate msvcrt exponential math operations with higher precision ([Wine Bug #37149](https://bugs.winehq.org/show_bug.cgi?id=37149))
-* 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))
-* Check handle type for HSPFILEQ handles ([Wine Bug #12332](https://bugs.winehq.org/show_bug.cgi?id=12332))
-* 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))
-* D3DCompileShader should filter specific warning messages ([Wine Bug #33770](https://bugs.winehq.org/show_bug.cgi?id=33770))
-* 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 hold reference on parent process in wineserver ([Wine Bug #37087](https://bugs.winehq.org/show_bug.cgi?id=37087))
-* 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))
-* Ensure NtProtectVirtualMemory and NtCreateSection are on separate pages ([Wine Bug #33162](https://bugs.winehq.org/show_bug.cgi?id=33162))
-* Ensure default route IP addresses are returned first in gethostbyname ([Wine Bug #22819](https://bugs.winehq.org/show_bug.cgi?id=22819))
-* 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
-* Fake success in IViewObject::Draw stub ([Wine Bug #30611](https://bugs.winehq.org/show_bug.cgi?id=30611))
-* Fake success in kernel32.SetFileCompletionNotificationModes ([Wine Bug #38960](https://bugs.winehq.org/show_bug.cgi?id=38960))
-* Fallback to default comspec when %COMSPEC% is not set
-* Fallback to system ping command when CAP_NET_RAW is not available ([Wine Bug #8332](https://bugs.winehq.org/show_bug.cgi?id=8332))
-* Fix broken textures in XIII Century: Death or Glory ([Wine Bug #25419](https://bugs.winehq.org/show_bug.cgi?id=25419))
-* Fix calculation of listbox size when horizontal scrollbar is present ([Wine Bug #38142](https://bugs.winehq.org/show_bug.cgi?id=38142))
-* Fix caps lock state issues with multiple processes ([Wine Bug #35907](https://bugs.winehq.org/show_bug.cgi?id=35907))
-* Fix comparison of punctuation characters in lstrcmp ([Wine Bug #10767](https://bugs.winehq.org/show_bug.cgi?id=10767))
-* Fix condition mask handling in RtlVerifyVersionInfo ([Wine Bug #36143](https://bugs.winehq.org/show_bug.cgi?id=36143))
-* Fix crash in Space Rangers2 caused by missing DXTn support ([Wine Bug #24983](https://bugs.winehq.org/show_bug.cgi?id=24983))
-* Fix crash of winedevice when relocation entry crosses page boundary ([Wine Bug #28254](https://bugs.winehq.org/show_bug.cgi?id=28254))
-* 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 error handling in DeferWindowPos when passing an invalid HWND ([Wine Bug #23187](https://bugs.winehq.org/show_bug.cgi?id=23187))
-* Fix font loading in Capella ([Wine Bug #12377](https://bugs.winehq.org/show_bug.cgi?id=12377))
-* Fix for ConnectNamedPort return value in overlapped mode ([Wine Bug #16550](https://bugs.winehq.org/show_bug.cgi?id=16550))
-* Fix for programs leaking wndproc slots ([Wine Bug #32451](https://bugs.winehq.org/show_bug.cgi?id=32451))
-* Fix graphical corruption in FarCry 3 with NVIDIA drivers ([Wine Bug #35062](https://bugs.winehq.org/show_bug.cgi?id=35062))
-* Fix handling of ANSI NTLM credentials ([Wine Bug #37063](https://bugs.winehq.org/show_bug.cgi?id=37063))
-* Fix handling of empty section and key name for profile files. ([Wine Bug #8036](https://bugs.winehq.org/show_bug.cgi?id=8036))
-* Fix handling of invert_y in DrawTextExW ([Wine Bug #22109](https://bugs.winehq.org/show_bug.cgi?id=22109))
-* Fix handling of window attributes for WS_EX_LAYERED | WS_EX_COMPOSITED ([Wine Bug #37876](https://bugs.winehq.org/show_bug.cgi?id=37876))
-* Fix implementation of NtQueryInformationProcess for ProcessDebugFlags
-* Fix implementation of msvcrt.close when stdout == stderr
-* Fix issue causing applications to report magic loopback address instead of real IP ([Wine Bug #37271](https://bugs.winehq.org/show_bug.cgi?id=37271))
-* 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 multithreading issues with fullscreen clipping ([Wine Bug #38087](https://bugs.winehq.org/show_bug.cgi?id=38087))
-* Fix possible leak of explorer.exe processes and implement proper desktop refcounting
-* Fix possible segfault in pulse_rd_loop of PulseAudio backend
-* Fix race-condition when threads are killed during shutdown
-* Fix return value of ScrollWindowEx for invisible windows ([Wine Bug #37706](https://bugs.winehq.org/show_bug.cgi?id=37706))
-* Fix scaling behaviour of images and mipmap levels in IDirect3DTexture2_Load (needed for example by Prezzie Hunt)
-* Fix texture corruption in CSI: Fatal Conspiracy ([Wine Bug #33768](https://bugs.winehq.org/show_bug.cgi?id=33768))
-* Fix the initialization of combined DACLs when the new DACL is empty ([Wine Bug #38423](https://bugs.winehq.org/show_bug.cgi?id=38423))
-* Fix unintentional leaks with ntdll internals
-* Fix wrong colors in Wolfenstein (2009) ([Wine Bug #34692](https://bugs.winehq.org/show_bug.cgi?id=34692))
-* Fix wrong defition of ntoskrnl.IoReleaseCancelSpinLock function.
-* Fix wrong version of ID3DXEffect interface for d3dx9_24
-* Fix wrong version of ID3DXEffect interface for d3dx9_25 ([Wine Bug #25138](https://bugs.winehq.org/show_bug.cgi?id=25138))
-* GetMessage should remove already seen messages with higher priority ([Wine Bug #28884](https://bugs.winehq.org/show_bug.cgi?id=28884))
-* GetMonitorInfo returns the same name for all monitors ([Wine Bug #37709](https://bugs.winehq.org/show_bug.cgi?id=37709))
-* GetSecurityInfo returns NULL DACL for process object ([Wine Bug #15980](https://bugs.winehq.org/show_bug.cgi?id=15980))
-* 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))
-* Ignore socket type for protocol IPPROTO_IPV6 in getaddrinfo
-* 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))
-* Implement FileNamesInformation class support for NtQueryDirectoryFile
-* Implement FolderImpl_Items and stubbed FolderItems interface
-* Implement ID3DXEffect::FindNextValidTechnique ([Wine Bug #34101](https://bugs.winehq.org/show_bug.cgi?id=34101))
-* Implement SystemHandleInformation info class
-* Implement a Courier New replacement font ([Wine Bug #20456](https://bugs.winehq.org/show_bug.cgi?id=20456))
-* Implement a Microsoft Yahei replacement font ([Wine Bug #13829](https://bugs.winehq.org/show_bug.cgi?id=13829))
-* Implement a Times New Roman replacement font ([Wine Bug #32342](https://bugs.winehq.org/show_bug.cgi?id=32342))
-* Implement additional stub functions in authz.dll
-* Implement an Arial replacement font ([Wine Bug #32323](https://bugs.winehq.org/show_bug.cgi?id=32323))
-* Implement default homepage button in inetcpl.cpl
-* Implement dinput device property DIPROP_USERNAME ([Wine Bug #39667](https://bugs.winehq.org/show_bug.cgi?id=39667))
-* Implement enumeration of sound devices and basic properties to dxdiagn ([Wine Bug #32613](https://bugs.winehq.org/show_bug.cgi?id=32613))
-* 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 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
-* Implement proper handling of CLI .NET images in Wine library loader ([Wine Bug #38661](https://bugs.winehq.org/show_bug.cgi?id=38661))
-* 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 detection of symbol charset for old truetype fonts ([Wine Bug #33117](https://bugs.winehq.org/show_bug.cgi?id=33117))
-* Improve startup performance by delaying font initialization
-* Improve stub for AEV_GetVolumeRange ([Wine Bug #35658](https://bugs.winehq.org/show_bug.cgi?id=35658))
-* Improve stub for ID3DXEffectImpl_CloneEffect
-* Improve stub for NtQueryEaFile
-* Improve stubs for AEV_{Get,Set}MasterVolumeLevel
-* Improve stubs for AEV_{Get,Set}Mute
-* Improve stubs for dxgi MakeWindowAssociation and GetWindowAssociation
-* Improvement for heap allocation performance
-* Initialize *lpcDevices in RasEnumDevicesA ([Wine Bug #30378](https://bugs.winehq.org/show_bug.cgi?id=30378))
-* Initialize System\CurrentControlSet\Control\TimeZoneInformation registry keys
-* Jedi Knight: Dark Forces II crashes with winmm set to native ([Wine Bug #37983](https://bugs.winehq.org/show_bug.cgi?id=37983))
-* Lego Stunt Rally requires DXTn software de/encoding support ([Wine Bug #25486](https://bugs.winehq.org/show_bug.cgi?id=25486))
-* MSYS2 expects correct handling of WRITECOPY memory protection ([Wine Bug #35561](https://bugs.winehq.org/show_bug.cgi?id=35561))
-* Make ddraw1 and ddraw_surface1 vtable as writable ([Wine Bug #39534](https://bugs.winehq.org/show_bug.cgi?id=39534))
-* Make it possible to change media center / tablet pc status ([Wine Bug #18732](https://bugs.winehq.org/show_bug.cgi?id=18732))
-* Map EXDEV error code to STATUS_NOT_SAME_DEVICE
-* MediaCoder needs CUDA for video encoding ([Wine Bug #37664](https://bugs.winehq.org/show_bug.cgi?id=37664))
-* Multiple applications need EnumDisplayDevicesW implementation ([Wine Bug #34978](https://bugs.winehq.org/show_bug.cgi?id=34978))
-* Need for Speed 3 installer requires devices in HKEY_DYN_DATA ([Wine Bug #7115](https://bugs.winehq.org/show_bug.cgi?id=7115))
-* Only set SFGAO_HASSUBFOLDER when there are really subfolders ([Wine Bug #24851](https://bugs.winehq.org/show_bug.cgi?id=24851))
-* Other Pipelight-specific enhancements
-* Port Royale doesn't display ocean correctly ([Wine Bug #17913](https://bugs.winehq.org/show_bug.cgi?id=17913))
-* Prevent window managers from grouping all wine programs together ([Wine Bug #32699](https://bugs.winehq.org/show_bug.cgi?id=32699))
-* Process APC calls before starting process
-* 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 GetLargestConsoleWindowSize ([Wine Bug #10919](https://bugs.winehq.org/show_bug.cgi?id=10919))
-* 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))
-* 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
-* Return STATUS_INVALID_DEVICE_REQUEST when trying to call NtReadFile on directory
-* Return WN_NOT_CONNECTED from WNetGetUniversalName REMOTE_NAME_INFO_LEVEL stub ([Wine Bug #39452](https://bugs.winehq.org/show_bug.cgi?id=39452))
-* Return a valid mesh in D3DXCreateTeapot ([Wine Bug #36884](https://bugs.winehq.org/show_bug.cgi?id=36884))
-* Return correct IMediaSeeking stream positions in quartz
-* Return correct values for GetThreadTimes function ([Wine Bug #20230](https://bugs.winehq.org/show_bug.cgi?id=20230))
-* 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
-* 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
-* 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
-* Share source of d3dx9_36 with d3dx9_33 to avoid Wine DLL forwards ([Wine Bug #21817](https://bugs.winehq.org/show_bug.cgi?id=21817))
-* Show unmounted devices in winecfg and allow changing the unix path
-* Silence repeated FIXME message in surface_cpu_blt
-* Silence repeated LocaleNameToLCID/LCIDToLocaleName unsupported flags FIXMEs ([Wine Bug #30076](https://bugs.winehq.org/show_bug.cgi?id=30076))
-* Skip unknown item when decoding a CMS certificate ([Wine Bug #34388](https://bugs.winehq.org/show_bug.cgi?id=34388))
-* Software support for Environmental Audio Extensions (EAX)
-* Start SERVICE_FILE_SYSTEM_DRIVER services with winedevice ([Wine Bug #35824](https://bugs.winehq.org/show_bug.cgi?id=35824))
-* Super Mario 3: Mario Forever fails to load keyboard mapping from profile files. ([Wine Bug #18099](https://bugs.winehq.org/show_bug.cgi?id=18099))
-* Support for AllocateAndGetTcpExTableFromStack ([Wine Bug #34372](https://bugs.winehq.org/show_bug.cgi?id=34372))
-* Support for BindImageEx ([Wine Bug #3591](https://bugs.winehq.org/show_bug.cgi?id=3591))
-* Support for CSMT (command stream) to increase graphic performance ([Wine Bug #11674](https://bugs.winehq.org/show_bug.cgi?id=11674))
-* Support for CUDA GPU video decoding
-* Support for D3DXGetShaderInputSemantics ([Wine Bug #22682](https://bugs.winehq.org/show_bug.cgi?id=22682))
-* Support for DDS file format in D3DXSaveTextureToFileInMemory ([Wine Bug #26898](https://bugs.winehq.org/show_bug.cgi?id=26898))
-* Support for DOS hidden/system file attributes ([Wine Bug #9158](https://bugs.winehq.org/show_bug.cgi?id=9158))
-* Support for FileFsFullSizeInformation information class
-* Support for GetFinalPathNameByHandle ([Wine Bug #34851](https://bugs.winehq.org/show_bug.cgi?id=34851))
-* Support for H264 DXVA2 GPU video decoding through vaapi
-* Support for ID3DXFont::DrawTextA/W ([Wine Bug #24754](https://bugs.winehq.org/show_bug.cgi?id=24754))
-* Support for ID3DXSkinInfoImpl_UpdateSkinnedMesh ([Wine Bug #32572](https://bugs.winehq.org/show_bug.cgi?id=32572))
-* Support for Junction Points ([Wine Bug #12401](https://bugs.winehq.org/show_bug.cgi?id=12401))
-* Support for KF_FLAG_DEFAULT_PATH in SHGetKnownFolderPath ([Wine Bug #30385](https://bugs.winehq.org/show_bug.cgi?id=30385))
-* 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 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))
-* Support for inherited file ACLs
-* Support for linux priority levels for faster performance
-* Support for loader dll redirections
-* Support for named pipe message mode (Linux only) ([Wine Bug #17195](https://bugs.winehq.org/show_bug.cgi?id=17195))
-* Support for pasting HTML from Unix applications ([Wine Bug #7372](https://bugs.winehq.org/show_bug.cgi?id=7372))
-* Support for process ACLs ([Wine Bug #22006](https://bugs.winehq.org/show_bug.cgi?id=22006))
-* Support for setcap on wine-preloader ([Wine Bug #26256](https://bugs.winehq.org/show_bug.cgi?id=26256))
-* Support for shell32 file operation progress dialog
-* Support for stored file ACLs ([Wine Bug #33576](https://bugs.winehq.org/show_bug.cgi?id=33576))
-* Support for ws2_32.dll.WSAPoll ([Wine Bug #38601](https://bugs.winehq.org/show_bug.cgi?id=38601))
-* Tumblebugs 2 requires DXTn software encoding support ([Wine Bug #29586](https://bugs.winehq.org/show_bug.cgi?id=29586))
-* Update a XIM candidate position when cursor location changes ([Wine Bug #30938](https://bugs.winehq.org/show_bug.cgi?id=30938))
-* Use GLX_MESA_query_renderer extension to get more exact GPU infos
-* Use NVX_GPU_MEMORY_INFO extension for more exact video memory accounting on NVIDIA graphic cards
-* Use POSIX implementation to enumerate directory content on FreeBSD ([Wine Bug #35397](https://bugs.winehq.org/show_bug.cgi?id=35397))
-* Use actual program name if available to describe PulseAudio streams
-* Use manual relay for RunDLL_CallEntry16 in shell32 ([Wine Bug #23033](https://bugs.winehq.org/show_bug.cgi?id=23033))
-* Use video memory for rendering targets if possible ([Wine Bug #34906](https://bugs.winehq.org/show_bug.cgi?id=34906))
-* Use wrapper functions for syscalls to appease Chromium sandbox (32-bit) ([Wine Bug #39403](https://bugs.winehq.org/show_bug.cgi?id=39403))
-* Voobly expects correct handling of WRITECOPY memory protection ([Wine Bug #29384](https://bugs.winehq.org/show_bug.cgi?id=29384))
-* Wine ignores IDF_CHECKFIRST flag in SetupPromptForDisk ([Wine Bug #20465](https://bugs.winehq.org/show_bug.cgi?id=20465))
-* Workaround for shlwapi URLs with relative paths
-* XEMBED support for embedding Wine windows inside Linux applications
-* eRacer Demo doesn't correctly display text ([Wine Bug #29598](https://bugs.winehq.org/show_bug.cgi?id=29598))
-* ntdll is missing WinSqm[Start|End]Session implementation ([Wine Bug #31971](https://bugs.winehq.org/show_bug.cgi?id=31971))
+Autogenerated script to apply all Wine Staging patches on your Wine
+source tree.
 
+Configuration:
+  DESTDIR=path         Specify the path to the wine source tree
+  --all                Select all patches
+  --force-autoconf     Run autoreconf and tools/make_requests after each patch
+  --help               Display this help and exit
+  --no-autoconf        Do not run autoreconf and tools/make_requests
+  --no-patchlist       Do not apply patchlist (needed for 'wine --patches')
+  --upstream-commit    Print the upstream Wine commit SHA1 and exit
+  --version            Show version information and exit
+  -W patchset          Exclude a specific patchset
+
+Backends:
+  --backend=patch      Use regular 'patch' utility to apply patches (default)
+  --backend=epatch     Use 'epatch' to apply patches (Gentoo only)
+  --backend=git-am     Use 'git am' to apply patches
+  --backend=git-apply  Use 'git apply' to apply patches
+  --backend=stg        Import the patches using stacked git
+```
+
+If you want to apply *all* patches with the `patch` utility, the commandline
+should look similar to this:
+```
+./patches/patchinstall.sh DESTDIR="/path/to/wine" --all
+```
+
+Before you proceed with the compilation, please make sure that you installed all
+additional build dependencies required for the Wine Staging features you are
+interested in (check output of `./configure`). More information about building
+Wine Staging, optional build dependencies, and hints for packagers are collected
+in our [Wiki](https://github.com/wine-compholio/wine-staging/wiki/Packaging).
+
+Contributing
+------------
+
+Wine Staging mainly concentrates on experimental features and patches which are
+difficult to get into the development branch. If you have a very simple bug fix
+including tests, there is usually no need to send it to Wine Staging. You can
+directly contribute it to the
+[development branch](http://wiki.winehq.org/SubmittingPatches). However, if you
+already tried that without success, or are working on such a complex area that
+you do not really think its ready for inclusion, you might want to submit it to
+our Staging tree. Please open a patch submission request on
+[bugs.wine-staging.com](https://bugs.wine-staging.com/) including the patch.
+More information is also available in our
+[Wiki](https://github.com/wine-compholio/wine-staging/wiki/Contributing).

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

@@ -1,64 +0,0 @@
-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

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

patches/d3dx9_36-AnimationController/0001-d3dx9_36-Implement-D3DXCreateAnimationController-wit.patch

@@ -1,4 +1,4 @@
-From 9ec1a00c3d775cd5abd91ec88af216d669136152 Mon Sep 17 00:00:00 2001
+From 5d2fa4b454acdbcecd8967ca885ae6a8e8557e5c Mon Sep 17 00:00:00 2001
 From: Christian Costa <titan.costa@gmail.com>
 Date: Sat, 17 Jan 2015 23:54:14 +0100
 Subject: d3dx9_36: Implement D3DXCreateAnimationController with a stubbed
@@ -13,7 +13,7 @@ Subject: d3dx9_36: Implement D3DXCreateAnimationController with a stubbed
  create mode 100644 dlls/d3dx9_36/animation.c
 
 diff --git a/dlls/d3dx9_36/Makefile.in b/dlls/d3dx9_36/Makefile.in
-index aa387b5..fd710c2 100644
+index 5958c57..95e3045 100644
 --- a/dlls/d3dx9_36/Makefile.in
 +++ b/dlls/d3dx9_36/Makefile.in
 @@ -3,6 +3,7 @@ IMPORTLIB = d3dx9
@@ -486,12 +486,12 @@ index 0000000..72f685f
 +    return D3D_OK;
 +}
 diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec
-index 13f0d99..4182f59 100644
+index 5eda041..aa7c928 100644
 --- a/dlls/d3dx9_36/d3dx9_36.spec
 +++ b/dlls/d3dx9_36/d3dx9_36.spec
 @@ -30,7 +30,7 @@
  @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr)
- @ stub D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr)
+ @ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr)
  @ stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr)
 -@ stub D3DXCreateAnimationController(long long long long ptr)
 +@ stdcall D3DXCreateAnimationController(long long long long ptr)
@@ -532,5 +532,5 @@ index b5f2232..c4d4d64 100644
              UINT max_num_tracks, UINT max_num_events, ID3DXAnimationController **anim_controller) PURE;
  };
 -- 
-2.2.1
+2.6.4
 

patches/d3dx9_36-DDS/0001-d3dx9_36-Add-support-for-FOURCC-surface-to-save_dds_.patch

@@ -0,0 +1,32 @@
+From cfbee3f0f952769dbf663489c2a209493c7412d3 Mon Sep 17 00:00:00 2001
+From: Christian Costa <titan.costa@gmail.com>
+Date: Sun, 11 Jan 2015 16:18:03 +0100
+Subject: d3dx9_36: Add support for FOURCC surface to
+ save_dds_surface_to_memory.
+
+---
+ dlls/d3dx9_36/surface.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c
+index 4fa2a76..58b676d 100644
+--- a/dlls/d3dx9_36/surface.c
++++ b/dlls/d3dx9_36/surface.c
+@@ -311,6 +311,14 @@ static HRESULT d3dformat_to_dds_pixel_format(struct dds_pixel_format *pixel_form
+         }
+     }
+ 
++    /* Reuse dds_fourcc_to_d3dformat as D3DFORMAT and FOURCC are DWORD with same values */
++    if (dds_fourcc_to_d3dformat(d3dformat) != D3DFMT_UNKNOWN)
++    {
++        pixel_format->flags |= DDS_PF_FOURCC;
++        pixel_format->fourcc = d3dformat;
++        return D3D_OK;
++    }
++
+     WARN("Unknown pixel format %#x\n", d3dformat);
+     return E_NOTIMPL;
+ }
+-- 
+2.6.4
+

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

@@ -1,74 +0,0 @@
-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,52 +0,0 @@
-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.
-
-The different fixes are:
-- Fix header size of the DDS file
-- Remove DDS_MIPMAPCOUNT as mipmap levels are not supported yet
-- 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 +++----
- 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
---- a/dlls/d3dx9_36/surface.c
-+++ b/dlls/d3dx9_36/surface.c
-@@ -487,13 +487,12 @@ static HRESULT save_dds_surface_to_memory(ID3DXBuffer **dst_buffer, IDirect3DSur
- 
-     memset(header, 0, sizeof(*header));
-     header->signature = MAKEFOURCC('D','D','S',' ');
--    header->size = sizeof(*header);
--    header->flags = DDS_CAPS | DDS_HEIGHT | DDS_WIDTH | DDS_PITCH | DDS_PIXELFORMAT | DDS_MIPMAPCOUNT;
-+    /* The signature is not really part of the DDS header */
-+    header->size = sizeof(*header) - sizeof(header->signature);
-+    header->flags = DDS_CAPS | DDS_HEIGHT | DDS_WIDTH | DDS_PITCH | DDS_PIXELFORMAT;
-     header->height = src_desc.Height;
-     header->width = src_desc.Width;
-     header->pitch_or_linear_size = dst_pitch;
--    header->depth = 1;
--    header->miplevels = 1;
-     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.6.2
-

patches/d3dx9_36-DDS/0002-d3dx9_36-Improve-D3DXSaveTextureToFile-to-save-simpl.patch

@@ -1,4 +1,4 @@
-From 560676d5a7e14b73de4a1be6e47ee37754c0c331 Mon Sep 17 00:00:00 2001
+From f9702dad952fdc873a72b4a2781bf2171ff3f814 Mon Sep 17 00:00:00 2001
 From: Christian Costa <titan.costa@gmail.com>
 Date: Sun, 11 Jan 2015 16:29:30 +0100
 Subject: d3dx9_36: Improve D3DXSaveTextureToFile to save simple texture to dds
@@ -24,10 +24,10 @@ index 79f3b76..41bed31 100644
  unsigned short float_32_to_16(const float in) DECLSPEC_HIDDEN;
  float float_16_to_32(const unsigned short in) DECLSPEC_HIDDEN;
 diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c
-index 629c94c..0a9c177 100644
+index 58b676d..79e8d53 100644
 --- a/dlls/d3dx9_36/surface.c
 +++ b/dlls/d3dx9_36/surface.c
-@@ -530,6 +530,68 @@ static HRESULT save_dds_surface_to_memory(ID3DXBuffer **dst_buffer, IDirect3DSur
+@@ -527,6 +527,68 @@ static HRESULT save_dds_surface_to_memory(ID3DXBuffer **dst_buffer, IDirect3DSur
      return D3D_OK;
  }
  
@@ -97,7 +97,7 @@ index 629c94c..0a9c177 100644
      const D3DBOX *dst_box, const void *src_data, const D3DBOX *src_box, DWORD filter, D3DCOLOR color_key,
      const D3DXIMAGE_INFO *src_info)
 diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c
-index de42307..e062379 100644
+index 38349e2..5c06700 100644
 --- a/dlls/d3dx9_36/texture.c
 +++ b/dlls/d3dx9_36/texture.c
 @@ -1873,10 +1873,7 @@ HRESULT WINAPI D3DXSaveTextureToFileInMemory(ID3DXBuffer **dst_buffer, D3DXIMAGE
@@ -113,5 +113,5 @@ index de42307..e062379 100644
      type = IDirect3DBaseTexture9_GetType(src_texture);
      switch (type)
 -- 
-2.2.1
+2.6.4
 

patches/d3dx9_36-DDS/0003-d3dx9_36-Add-support-for-FOURCC-surface-to-save_dds_.patch

@@ -1,43 +0,0 @@
-From 26c87c400c478b878b72b9cb7d216f89a9a58d1f Mon Sep 17 00:00:00 2001
-From: Christian Costa <titan.costa@gmail.com>
-Date: Sun, 11 Jan 2015 16:18:03 +0100
-Subject: d3dx9_36: Add support for FOURCC surface to
- save_dds_surface_to_memory.
-
----
- dlls/d3dx9_36/surface.c | 12 +++++++++++-
- 1 file changed, 11 insertions(+), 1 deletion(-)
-
-diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c
-index ae10adc..629c94c 100644
---- a/dlls/d3dx9_36/surface.c
-+++ b/dlls/d3dx9_36/surface.c
-@@ -311,6 +311,14 @@ static HRESULT d3dformat_to_dds_pixel_format(struct dds_pixel_format *pixel_form
-         }
-     }
- 
-+    /* Reuse dds_fourcc_to_d3dformat as D3DFORMAT and FOURCC are DWORD with same values */
-+    if (dds_fourcc_to_d3dformat(d3dformat) != D3DFMT_UNKNOWN)
-+    {
-+        pixel_format->flags |= DDS_PF_FOURCC;
-+        pixel_format->fourcc = d3dformat;
-+        return D3D_OK;
-+    }
-+
-     WARN("Unknown pixel format %#x\n", d3dformat);
-     return E_NOTIMPL;
- }
-@@ -489,7 +497,9 @@ static HRESULT save_dds_surface_to_memory(ID3DXBuffer **dst_buffer, IDirect3DSur
-     header->signature = MAKEFOURCC('D','D','S',' ');
-     /* The signature is not really part of the DDS header */
-     header->size = sizeof(*header) - sizeof(header->signature);
--    header->flags = DDS_CAPS | DDS_HEIGHT | DDS_WIDTH | DDS_PITCH | DDS_PIXELFORMAT;
-+    header->flags = DDS_CAPS | DDS_HEIGHT | DDS_WIDTH | DDS_PIXELFORMAT;
-+    /* Note that native does not set DDS_LINEARSIZE flag nor pitch_or_linear_size field for DXTn */
-+    header->flags |= (pixel_format->block_width != 1) || (pixel_format->block_height != 1) ? DDS_LINEARSIZE : DDS_PITCH;
-     header->height = src_desc.Height;
-     header->width = src_desc.Width;
-     header->pitch_or_linear_size = dst_pitch;
--- 
-2.2.1
-

patches/dmime-Dsound_Flags/0001-dmime-Do-not-pass-both-DSBCAPS_CTRLPAN-and-DSBCAPS_C.patch

@@ -0,0 +1,42 @@
+From 51d8680f294c62391912f9e7b47bdb794683e764 Mon Sep 17 00:00:00 2001
+From: Michael Stefaniuc <mstefani@redhat.de>
+Date: Sat, 9 Jan 2016 22:44:10 +0100
+Subject: dmime: Do not pass both DSBCAPS_CTRLPAN and DSBCAPS_CTRL3D to dsound.
+
+---
+ dlls/dmime/performance.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c
+index 38f68db..8b5d3e2 100644
+--- a/dlls/dmime/performance.c
++++ b/dlls/dmime/performance.c
+@@ -1035,7 +1035,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_CreateStandardAudioPath(IDire
+ 	
+ 	memset(&desc, 0, sizeof(desc));
+ 	desc.dwSize = sizeof(desc);
+-	desc.dwFlags = DSBCAPS_CTRLFX | DSBCAPS_CTRLPAN | DSBCAPS_CTRLVOLUME | DSBCAPS_GLOBALFOCUS;
++        desc.dwFlags = DSBCAPS_CTRLFX | DSBCAPS_CTRLVOLUME | DSBCAPS_GLOBALFOCUS;
+ 	desc.dwBufferBytes = DSBSIZE_MIN;
+ 	desc.dwReserved = 0;
+ 	desc.lpwfxFormat = &format;
+@@ -1046,14 +1046,14 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_CreateStandardAudioPath(IDire
+                 desc.dwFlags |= DSBCAPS_CTRL3D | DSBCAPS_CTRLFREQUENCY | DSBCAPS_MUTE3DATMAXDISTANCE;
+ 		break;
+ 	case DMUS_APATH_DYNAMIC_MONO:
+-	        desc.dwFlags |= DSBCAPS_CTRLFREQUENCY;
++                desc.dwFlags |= DSBCAPS_CTRLPAN | DSBCAPS_CTRLFREQUENCY;
+ 		break;
+ 	case DMUS_APATH_SHARED_STEREOPLUSREVERB:
+ 	        /* normally we have to create 2 buffers (one for music other for reverb)
+ 		 * in this case. See msdn
+                  */
+ 	case DMUS_APATH_DYNAMIC_STEREO:
+-		desc.dwFlags |= DSBCAPS_CTRLFREQUENCY;
++                desc.dwFlags |= DSBCAPS_CTRLPAN | DSBCAPS_CTRLFREQUENCY;
+ 		format.nChannels = 2;
+ 		format.nBlockAlign *= 2;
+ 		format.nAvgBytesPerSec *=2;
+-- 
+2.6.4
+

patches/dmime-Dsound_Flags/definition

@@ -0,0 +1 @@
+Fixes: [39958] Fix regression caused by passing invalid flag combination to dsound8

patches/dsound-EAX/definition

@@ -1,2 +1,3 @@
 Fixes: Software support for Environmental Audio Extensions (EAX)
 Depends: dsound-Fast_Mixer
+Depends: dsound-Revert_Cleanup

patches/dsound-Revert_Cleanup/0001-Revert-dsound-Use-a-better-name-for-IDirectSoundBuff.patch

@@ -0,0 +1,106 @@
+From 462599cf79d964c6add1a7250f654d2e3110c4d2 Mon Sep 17 00:00:00 2001
+From: Sebastian Lackner <sebastian@fds-team.de>
+Date: Wed, 23 Dec 2015 00:58:57 +0100
+Subject: Revert "dsound: Use a better name for
+ IDirectSoundBufferImpl_Create()."
+
+This reverts commit bb72548f3870b1df03ad9fe7ad2e543a69d5d574.
+---
+ dlls/dsound/buffer.c         | 24 +++++++++++++++---------
+ dlls/dsound/dsound.c         |  7 +++++--
+ dlls/dsound/dsound_private.h |  6 ++++--
+ 3 files changed, 24 insertions(+), 13 deletions(-)
+
+diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c
+index 2a80c3f..d7717fd 100644
+--- a/dlls/dsound/buffer.c
++++ b/dlls/dsound/buffer.c
+@@ -983,15 +983,19 @@ static const IDirectSoundBuffer8Vtbl dsbvt =
+ 	IDirectSoundBufferImpl_GetObjectInPath
+ };
+ 
+-HRESULT secondarybuffer_create(DirectSoundDevice *device, const DSBUFFERDESC *dsbd,
+-        IDirectSoundBuffer **buffer)
++HRESULT IDirectSoundBufferImpl_Create(
++	DirectSoundDevice * device,
++	IDirectSoundBufferImpl **pdsb,
++	LPCDSBUFFERDESC dsbd)
+ {
+ 	IDirectSoundBufferImpl *dsb;
+ 	LPWAVEFORMATEX wfex = dsbd->lpwfxFormat;
+ 	HRESULT err = DS_OK;
+ 	DWORD capf = 0;
+ 
+-        TRACE("(%p,%p,%p)\n", device, dsbd, buffer);
++	TRACE("(%p,%p,%p)\n",device,pdsb,dsbd);
++
++        *pdsb = NULL;
+ 
+ 	if (dsbd->dwBufferBytes < DSBSIZE_MIN || dsbd->dwBufferBytes > DSBSIZE_MAX) {
+ 		WARN("invalid parameter: dsbd->dwBufferBytes = %d\n", dsbd->dwBufferBytes);
+@@ -1103,12 +1107,14 @@ HRESULT secondarybuffer_create(DirectSoundDevice *device, const DSBUFFERDESC *ds
+ 
+ 	RtlInitializeResource(&dsb->lock);
+ 
+-        /* register buffer */
+-        err = DirectSoundDevice_AddBuffer(device, dsb);
+-        if (err == DS_OK)
+-                *buffer = (IDirectSoundBuffer*)&dsb->IDirectSoundBuffer8_iface;
+-        else
+-                IDirectSoundBuffer8_Release(&dsb->IDirectSoundBuffer8_iface);
++	/* register buffer if not primary */
++	if (!(dsbd->dwFlags & DSBCAPS_PRIMARYBUFFER)) {
++		err = DirectSoundDevice_AddBuffer(device, dsb);
++                if (err == DS_OK)
++                        *pdsb = dsb;
++                else
++                        IDirectSoundBuffer8_Release(&dsb->IDirectSoundBuffer8_iface);
++	}
+ 
+ 	return err;
+ }
+diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c
+index ccefd1f..e50ef58 100644
+--- a/dlls/dsound/dsound.c
++++ b/dlls/dsound/dsound.c
+@@ -469,6 +469,8 @@ static HRESULT DirectSoundDevice_CreateSoundBuffer(
+                 WARN("primarybuffer_create() failed\n");
+         }
+     } else {
++        IDirectSoundBufferImpl * dsb;
++
+         if (dsbd->lpwfxFormat == NULL) {
+             WARN("invalid parameter: dsbd->lpwfxFormat can't be NULL for "
+                  "secondary buffer\n");
+@@ -545,8 +547,9 @@ static HRESULT DirectSoundDevice_CreateSoundBuffer(
+             return DSERR_INVALIDPARAM;
+         }
+ 
+-        hres = secondarybuffer_create(device, dsbd, ppdsb);
+-        if (SUCCEEDED(hres)) {
++        hres = IDirectSoundBufferImpl_Create(device, &dsb, dsbd);
++        if (dsb) {
++            *ppdsb = (IDirectSoundBuffer*)&dsb->IDirectSoundBuffer8_iface;
+             if (dsbd->dwFlags & DSBCAPS_LOCHARDWARE)
+                 device->drvcaps.dwFreeHwMixingAllBuffers--;
+         } else
+diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h
+index 07bda48..9c001ed 100644
+--- a/dlls/dsound/dsound_private.h
++++ b/dlls/dsound/dsound_private.h
+@@ -182,8 +182,10 @@ void put_stereo2quad(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel
+ void put_mono2surround51(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) DECLSPEC_HIDDEN;
+ void put_stereo2surround51(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) DECLSPEC_HIDDEN;
+ 
+-HRESULT secondarybuffer_create(DirectSoundDevice *device, const DSBUFFERDESC *dsbd,
+-        IDirectSoundBuffer **buffer) DECLSPEC_HIDDEN;
++HRESULT IDirectSoundBufferImpl_Create(
++    DirectSoundDevice *device,
++    IDirectSoundBufferImpl **ppdsb,
++    LPCDSBUFFERDESC dsbd) DECLSPEC_HIDDEN;
+ HRESULT IDirectSoundBufferImpl_Duplicate(
+     DirectSoundDevice *device,
+     IDirectSoundBufferImpl **ppdsb,
+-- 
+2.6.4
+

patches/dsound-Revert_Cleanup/0002-Revert-dsound-Simplify-error-handling-when-creating-.patch

@@ -0,0 +1,116 @@
+From 974a901f92d5197d3db6356df454bdd47dea39da Mon Sep 17 00:00:00 2001
+From: Sebastian Lackner <sebastian@fds-team.de>
+Date: Wed, 23 Dec 2015 00:59:07 +0100
+Subject: Revert "dsound: Simplify error handling when creating a sound
+ buffer."
+
+This reverts commit d51d55bab8995f94dcc78ce8418a4149836c27b0.
+---
+ dlls/dsound/buffer.c | 46 ++++++++++++++++++++++++++++++----------------
+ 1 file changed, 30 insertions(+), 16 deletions(-)
+
+diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c
+index d7717fd..5aa2834 100644
+--- a/dlls/dsound/buffer.c
++++ b/dlls/dsound/buffer.c
+@@ -992,28 +992,29 @@ HRESULT IDirectSoundBufferImpl_Create(
+ 	LPWAVEFORMATEX wfex = dsbd->lpwfxFormat;
+ 	HRESULT err = DS_OK;
+ 	DWORD capf = 0;
+-
+ 	TRACE("(%p,%p,%p)\n",device,pdsb,dsbd);
+ 
+-        *pdsb = NULL;
+-
+ 	if (dsbd->dwBufferBytes < DSBSIZE_MIN || dsbd->dwBufferBytes > DSBSIZE_MAX) {
+ 		WARN("invalid parameter: dsbd->dwBufferBytes = %d\n", dsbd->dwBufferBytes);
++		*pdsb = NULL;
+ 		return DSERR_INVALIDPARAM; /* FIXME: which error? */
+ 	}
+ 
+ 	dsb = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(*dsb));
+ 
+-        if (!dsb)
++	if (dsb == 0) {
++		WARN("out of memory\n");
++		*pdsb = NULL;
+ 		return DSERR_OUTOFMEMORY;
++	}
+ 
+ 	TRACE("Created buffer at %p\n", dsb);
+ 
+-        dsb->ref = 1;
++	dsb->ref = 0;
+         dsb->refn = 0;
+         dsb->ref3D = 0;
+         dsb->refiks = 0;
+-        dsb->numIfaces = 1;
++	dsb->numIfaces = 0;
+ 	dsb->device = device;
+ 	dsb->IDirectSoundBuffer8_iface.lpVtbl = &dsbvt;
+         dsb->IDirectSoundNotify_iface.lpVtbl = &dsnvt;
+@@ -1024,8 +1025,9 @@ HRESULT IDirectSoundBufferImpl_Create(
+ 	CopyMemory(&dsb->dsbd, dsbd, dsbd->dwSize);
+ 
+ 	dsb->pwfx = DSOUND_CopyFormat(wfex);
+-        if (!dsb->pwfx) {
+-                IDirectSoundBuffer8_Release(&dsb->IDirectSoundBuffer8_iface);
++	if (dsb->pwfx == NULL) {
++		HeapFree(GetProcessHeap(),0,dsb);
++		*pdsb = NULL;
+ 		return DSERR_OUTOFMEMORY;
+ 	}
+ 
+@@ -1050,16 +1052,22 @@ HRESULT IDirectSoundBufferImpl_Create(
+ 
+ 	/* Allocate an empty buffer */
+ 	dsb->buffer = HeapAlloc(GetProcessHeap(),0,sizeof(*(dsb->buffer)));
+-        if (!dsb->buffer) {
+-                IDirectSoundBuffer8_Release(&dsb->IDirectSoundBuffer8_iface);
++	if (dsb->buffer == NULL) {
++		WARN("out of memory\n");
++		HeapFree(GetProcessHeap(),0,dsb->pwfx);
++		HeapFree(GetProcessHeap(),0,dsb);
++		*pdsb = NULL;
+ 		return DSERR_OUTOFMEMORY;
+ 	}
+ 
+ 	/* Allocate system memory for buffer */
+ 	dsb->buffer->memory = HeapAlloc(GetProcessHeap(),0,dsb->buflen);
+-        if (!dsb->buffer->memory) {
++	if (dsb->buffer->memory == NULL) {
+ 		WARN("out of memory\n");
+-                IDirectSoundBuffer8_Release(&dsb->IDirectSoundBuffer8_iface);
++		HeapFree(GetProcessHeap(),0,dsb->pwfx);
++		HeapFree(GetProcessHeap(),0,dsb->buffer);
++		HeapFree(GetProcessHeap(),0,dsb);
++		*pdsb = NULL;
+ 		return DSERR_OUTOFMEMORY;
+ 	}
+ 
+@@ -1110,12 +1118,18 @@ HRESULT IDirectSoundBufferImpl_Create(
+ 	/* register buffer if not primary */
+ 	if (!(dsbd->dwFlags & DSBCAPS_PRIMARYBUFFER)) {
+ 		err = DirectSoundDevice_AddBuffer(device, dsb);
+-                if (err == DS_OK)
+-                        *pdsb = dsb;
+-                else
+-                        IDirectSoundBuffer8_Release(&dsb->IDirectSoundBuffer8_iface);
++		if (err != DS_OK) {
++			HeapFree(GetProcessHeap(),0,dsb->buffer->memory);
++			HeapFree(GetProcessHeap(),0,dsb->buffer);
++			RtlDeleteResource(&dsb->lock);
++			HeapFree(GetProcessHeap(),0,dsb->pwfx);
++			HeapFree(GetProcessHeap(),0,dsb);
++			dsb = NULL;
++		}
+ 	}
+ 
++        IDirectSoundBuffer8_AddRef(&dsb->IDirectSoundBuffer8_iface);
++	*pdsb = dsb;
+ 	return err;
+ }
+ 
+-- 
+2.6.4
+

patches/explorer-Video_Registry_Key/0001-explorer-Create-CurrentControlSet-Control-Video-regi.patch

@@ -0,0 +1,63 @@
+From cccf1b75e810985c817d34329878f497d853d3ac Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
+Date: Sat, 9 Jan 2016 16:57:49 +0100
+Subject: explorer: Create CurrentControlSet\Control\Video registry key as
+ non-volatile.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Michael Müller <michael@fds-team.de>
+---
+ dlls/advapi32/tests/registry.c | 7 +++++++
+ programs/explorer/desktop.c    | 9 +++++++++
+ 2 files changed, 16 insertions(+)
+
+diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c
+index ef5d989..6387697 100644
+--- a/dlls/advapi32/tests/registry.c
++++ b/dlls/advapi32/tests/registry.c
+@@ -1340,6 +1340,13 @@ static void test_reg_create_key(void)
+     RegDeleteKeyA(hkey1, "");
+     RegCloseKey(hkey1);
+ 
++    /* System\CurrentControlSet\Control\Video should be non-volatile */
++    ret = RegCreateKeyExA(HKEY_LOCAL_MACHINE, "System\\CurrentControlSet\\Control\\Video\\Wine",
++                          0, NULL, 0, KEY_NOTIFY, NULL, &hkey1, NULL);
++    ok(ret == ERROR_SUCCESS, "RegCreateKeyExA failed with error %d\n", ret);
++    RegDeleteKeyA(hkey1, "");
++    RegCloseKey(hkey1);
++
+     /* WOW64 flags - open an existing key */
+     hkey1 = NULL;
+     ret = RegCreateKeyExA(HKEY_LOCAL_MACHINE, "Software", 0, NULL, 0, KEY_READ|KEY_WOW64_32KEY, NULL, &hkey1, NULL);
+diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c
+index 2b8502b..85cb4bc 100644
+--- a/programs/explorer/desktop.c
++++ b/programs/explorer/desktop.c
+@@ -775,6 +775,11 @@ static BOOL get_default_enable_shell( const WCHAR *name )
+ 
+ static HMODULE load_graphics_driver( const WCHAR *driver, const GUID *guid )
+ {
++    static const WCHAR video_keyW[] = {
++        'S','y','s','t','e','m','\\',
++        'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\',
++        'C','o','n','t','r','o','l','\\',
++        'V','i','d','e','o',0};
+     static const WCHAR device_keyW[] = {
+         'S','y','s','t','e','m','\\',
+         'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\',
+@@ -838,6 +843,10 @@ static HMODULE load_graphics_driver( const WCHAR *driver, const GUID *guid )
+         TRACE( "display %s driver %s\n", debugstr_guid(guid), debugstr_w(buffer) );
+     }
+ 
++    /* create video key first without REG_OPTION_VOLATILE attribute */
++    if (!RegCreateKeyExW( HKEY_LOCAL_MACHINE, video_keyW, 0, NULL, 0, KEY_SET_VALUE, NULL, &hkey, NULL ))
++        RegCloseKey( hkey );
++
+     sprintfW( key, device_keyW, guid->Data1, guid->Data2, guid->Data3,
+               guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3],
+               guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7] );
+-- 
+2.6.4
+

patches/explorer-Video_Registry_Key/definition

@@ -0,0 +1 @@
+Fixes: Registry key System\CurrentControlSet\Control\Video should be non-volatile

patches/fonts-Missing_Fonts/0005-Add-licenses-for-fonts-as-separate-files.patch

@@ -918,7 +918,7 @@ index 6dbf8c0..9a9fe47 100644
 +
 +-----------------------------------------------------------------------
 +
- Copyright (c) 1993-2015 the Wine project authors (see the file AUTHORS
+ Copyright (c) 1993-2016 the Wine project authors (see the file AUTHORS
  for a complete list)
  
  Wine is free software; you can redistribute it and/or modify it under

patches/hal-KeQueryPerformanceCounter/0001-hal-Implement-KeQueryPerformanceCounter.patch

@@ -1,4 +1,4 @@
-From 6ae55e62a81e4f4ded0ea14926f014b6d6a4b633 Mon Sep 17 00:00:00 2001
+From 29ed0b32254cac13e07daea09b4288ce774688cc Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Wed, 28 Oct 2015 22:36:01 +0100
 Subject: hal: Implement KeQueryPerformanceCounter.
@@ -9,11 +9,11 @@ Subject: hal: Implement KeQueryPerformanceCounter.
  2 files changed, 11 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/hal/hal.c b/dlls/hal/hal.c
-index 96bc895..145869d 100644
+index bca688e..84942ca 100644
 --- a/dlls/hal/hal.c
 +++ b/dlls/hal/hal.c
-@@ -155,3 +155,13 @@ KIRQL WINAPI KeGetCurrentIrql(VOID)
-     FIXME( " stub!\n");
+@@ -161,3 +161,13 @@ ULONG WINAPI READ_PORT_ULONG(ULONG *port)
+     FIXME("(%p) stub!\n", port);
      return 0;
  }
 +
@@ -27,7 +27,7 @@ index 96bc895..145869d 100644
 +    return counter.QuadPart;
 +}
 diff --git a/dlls/hal/hal.spec b/dlls/hal/hal.spec
-index 3046c65..dc908dd 100644
+index 02f778c..821084d 100644
 --- a/dlls/hal/hal.spec
 +++ b/dlls/hal/hal.spec
 @@ -72,7 +72,7 @@
@@ -40,5 +40,5 @@ index 3046c65..dc908dd 100644
  @ stub KeRaiseIrqlToDpcLevel
  @ stub KeRaiseIrqlToSynchLevel
 -- 
-2.6.2
+2.6.4
 

patches/iexplore-Revert_ProductVersion/0001-Revert-iexplore-Sync-registry-and-program-resource-v.patch

@@ -0,0 +1,32 @@
+From 0c1c8f2879629c0e698c23373e699742f34b2bd1 Mon Sep 17 00:00:00 2001
+From: Sebastian Lackner <sebastian@fds-team.de>
+Date: Sun, 27 Dec 2015 22:25:31 +0100
+Subject: Revert "iexplore: Sync registry and program resource values."
+
+This reverts commit bda46cc6fd5fa0f3c9db947108b685533662037a.
+---
+ programs/iexplore/iexplore.rc | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/programs/iexplore/iexplore.rc b/programs/iexplore/iexplore.rc
+index 3d6d50f..cd75781 100644
+--- a/programs/iexplore/iexplore.rc
++++ b/programs/iexplore/iexplore.rc
+@@ -18,10 +18,10 @@
+ 
+ #define WINE_FILEDESCRIPTION_STR "Wine Internet Explorer"
+ #define WINE_FILENAME_STR "iexplore.exe"
+-#define WINE_FILEVERSION 9,0,8112,16421
+-#define WINE_FILEVERSION_STR "9.0.8112.16421"
+-#define WINE_PRODUCTVERSION 9,0,8112,16421
+-#define WINE_PRODUCTVERSION_STR "9.0.8112.16421"
++#define WINE_FILEVERSION 6,0,2900,2180
++#define WINE_FILEVERSION_STR "6.0.2900.2180"
++#define WINE_PRODUCTVERSION 6,0,2900,2180
++#define WINE_PRODUCTVERSION_STR "6.0.2900.2180"
+ #define WINE_EXTRAVALUES VALUE "OLESelfRegister",""
+ 
+ #include "wine/wine_common_ver.rc"
+-- 
+2.6.4
+