Release 1.8.4.

(cherry picked from commit e875860886)

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,307 +8,94 @@ 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-rc1 [268]:**
+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 IDXGIOutput::GetDesc ([Wine Bug #32006](https://bugs.winehq.org/show_bug.cgi?id=32006))
-* 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 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))
-* 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 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))
-* 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.
-* Avseq crashes when multisampling is enabled ([Wine Bug #31998](https://bugs.winehq.org/show_bug.cgi?id=31998))
-* Basic handling of write watches triggered while we're on the signal stack.
-* Basic support for CUDA
-* Black & White needs DXTn software decoding support ([Wine Bug #14939](https://bugs.winehq.org/show_bug.cgi?id=14939))
-* CPU-Z fails to start because GetLogicalProcessorInformationEx returns FALSE
-* 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))
-* 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 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))
-* 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
-* FEAR 1 installer expects basic_string_wchar_dtor to return NULL ([Wine Bug #37358](https://bugs.winehq.org/show_bug.cgi?id=37358))
-* 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 access violation in MSYS2 git when cloning repository
-* 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 endless loop in regedit when importing files with very long lines
-* Fix error handling in DeferWindowPos when passing an invalid HWND ([Wine Bug #23187](https://bugs.winehq.org/show_bug.cgi?id=23187))
-* Fix for ConnectNamedPort return value in overlapped mode ([Wine Bug #16550](https://bugs.winehq.org/show_bug.cgi?id=16550))
-* Fix for programs leaking wndproc slots ([Wine Bug #32451](https://bugs.winehq.org/show_bug.cgi?id=32451))
-* Fix graphical corruption in FarCry 3 with NVIDIA drivers ([Wine Bug #35062](https://bugs.winehq.org/show_bug.cgi?id=35062))
-* Fix gray screen on startup introduced by pixelformat changes. ([Wine Bug #35975](https://bugs.winehq.org/show_bug.cgi?id=35975))
-* Fix handling of ANSI NTLM credentials ([Wine Bug #37063](https://bugs.winehq.org/show_bug.cgi?id=37063))
-* Fix handling of empty section and key name for profile files. ([Wine Bug #8036](https://bugs.winehq.org/show_bug.cgi?id=8036))
-* Fix handling of invert_y in DrawTextExW ([Wine Bug #22109](https://bugs.winehq.org/show_bug.cgi?id=22109))
-* Fix handling of window attributes for WS_EX_LAYERED | WS_EX_COMPOSITED ([Wine Bug #37876](https://bugs.winehq.org/show_bug.cgi?id=37876))
-* Fix 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 multithreading issues with fullscreen clipping ([Wine Bug #38087](https://bugs.winehq.org/show_bug.cgi?id=38087))
-* Fix possible segfault in pulse_rd_loop of PulseAudio backend
-* Fix race-condition when threads are killed during shutdown
-* Fix regression caused by blacklisting supported OpenGL extensions ([Wine Bug #38480](https://bugs.winehq.org/show_bug.cgi?id=38480))
-* 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))
-* 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 IDXGIOutput::GetDesc
-* 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 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 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 an error when trying to open a terminated process ([Wine Bug #37087](https://bugs.winehq.org/show_bug.cgi?id=37087))
-* Return correct IMediaSeeking stream positions in quartz
-* 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
-* 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
-* 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
-* Show windows version when collecting system info in winedbg
-* 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)
-* 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))
-* wglDescribePixelFormat should return max index for NULL descriptor ([Wine Bug #6176](https://bugs.winehq.org/show_bug.cgi?id=6176))
+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=eapply     Use 'eapply' to apply patches (Gentoo only)
+  --backend=epatch     Use 'epatch' to apply patches (Gentoo only, deprecated)
+  --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/Exagear/0001-ntdll-Implement-emulation-of-SIDT-instruction-when-u.patch

@@ -1,12 +1,12 @@
-From 7cb209e122fc503190dcad411483147ebc6d6cb4 Mon Sep 17 00:00:00 2001
+From 940f22fae1e118faab3aa2926d050ad3c84a3e79 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Tue, 11 Nov 2014 03:11:33 +0100
 Subject: ntdll: Implement emulation of SIDT instruction when using Exagear.
 
 ---
  configure.ac             |   8 ++
- dlls/ntdll/signal_i386.c | 224 +++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 232 insertions(+)
+ dlls/ntdll/signal_i386.c | 223 +++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 231 insertions(+)
 
 diff --git a/configure.ac b/configure.ac
 index 92d78a2..c88a139 100644
@@ -20,7 +20,7 @@ index 92d78a2..c88a139 100644
  
  AC_ARG_WITH(alsa,      AS_HELP_STRING([--without-alsa],[do not use the Alsa sound support]),
              [if test "x$withval" = "xno"; then ac_cv_header_sys_asoundlib_h=no; ac_cv_header_alsa_asoundlib_h=no; fi])
-@@ -367,6 +368,13 @@ fi
+@@ -363,6 +364,13 @@ fi
  WINE_WARNING_WITH(gettext,[test "$MSGFMT" = false],
                    [gettext tools not found (or too old), translations won't be built.])
  
@@ -35,7 +35,7 @@ index 92d78a2..c88a139 100644
  
  dnl Check for -li386 for NetBSD and OpenBSD
 diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c
-index 13df4bb..edf5ea8 100644
+index 5708aae..f27ce56 100644
 --- a/dlls/ntdll/signal_i386.c
 +++ b/dlls/ntdll/signal_i386.c
 @@ -96,6 +96,14 @@ typedef struct
@@ -53,11 +53,10 @@ index 13df4bb..edf5ea8 100644
  /***********************************************************************
   * signal context platform-specific definitions
   */
-@@ -1573,6 +1581,214 @@ static inline DWORD is_privileged_instr( CONTEXT *context )
-     }
+@@ -1898,6 +1906,213 @@ static inline DWORD get_fpu_code( const CONTEXT *context )
  }
  
-+
+ 
 +#ifdef EXAGEAR_COMPAT
 +
 +/***********************************************************************
@@ -265,10 +264,10 @@ index 13df4bb..edf5ea8 100644
 +#endif /* EXAGEAR_COMPAT */
 +
 +
- /***********************************************************************
-  *           check_invalid_gs
-  *
-@@ -1902,6 +2118,14 @@ static void WINAPI raise_segv_exception( EXCEPTION_RECORD *rec, CONTEXT *context
+ /**********************************************************************
+  *		raise_segv_exception
+  */
+@@ -1907,6 +2122,14 @@ static void WINAPI raise_segv_exception( EXCEPTION_RECORD *rec, CONTEXT *context
  
      switch(rec->ExceptionCode)
      {
@@ -284,5 +283,5 @@ index 13df4bb..edf5ea8 100644
          if (rec->NumberParameters == 2)
          {
 -- 
-2.1.3
+2.7.1
 

patches/Pipelight/0003-wined3d-allow-changing-strict-drawing-through-an-exp.patch

@@ -29,7 +29,7 @@ index 758ba43..7ccd3a1 100644
      wined3d_wndproc_mutex_unlock();
  }
  
-+void wined3d_strictdrawing_set(int value)
++void CDECL wined3d_strictdrawing_set(int value)
 +{
 +    wined3d_settings.strict_draw_ordering = value;
 +}

patches/amstream-GetMultiMediaStream/0001-amstream-Implement-IAMMediaStream-GetMultiMediaStrea.patch

@@ -1,14 +1,14 @@
-From 4d0e6bbc00bd49b8dcfce494bd7380c49f58f92b Mon Sep 17 00:00:00 2001
+From 4bec6ad3640799a4b8bdb1d1987d8e65e15c0355 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Tue, 28 Jul 2015 18:21:20 +0200
 Subject: amstream: Implement IAMMediaStream::GetMultiMediaStream.
 
 ---
- dlls/amstream/mediastream.c | 40 ++++++++++++++++++++++++++++++++--------
- 1 file changed, 32 insertions(+), 8 deletions(-)
+ dlls/amstream/mediastream.c | 30 ++++++++++++++++++++++++------
+ 1 file changed, 24 insertions(+), 6 deletions(-)
 
 diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c
-index 947be1e..e4e15d7 100644
+index 51349ab..98fca62 100644
 --- a/dlls/amstream/mediastream.c
 +++ b/dlls/amstream/mediastream.c
 @@ -110,9 +110,15 @@ static HRESULT WINAPI DirectDrawMediaStreamImpl_IAMMediaStream_GetMultiMediaStre
@@ -29,25 +29,7 @@ index 947be1e..e4e15d7 100644
  }
  
  static HRESULT WINAPI DirectDrawMediaStreamImpl_IAMMediaStream_GetInformation(IAMMediaStream *iface,
-@@ -271,9 +277,15 @@ static HRESULT WINAPI DirectDrawMediaStreamImpl_IDirectDrawMediaStream_GetMultiM
- {
-     DirectDrawMediaStreamImpl *This = impl_from_IDirectDrawMediaStream(iface);
- 
--    FIXME("(%p/%p)->(%p) stub!\n", This, iface, ppMultiMediaStream);
-+    TRACE("(%p/%p)->(%p) stub!\n", This, iface, ppMultiMediaStream);
- 
--    return S_FALSE;
-+    if (!ppMultiMediaStream)
-+        return E_POINTER;
-+
-+    IMultiMediaStream_AddRef(This->parent);
-+    *ppMultiMediaStream = This->parent;
-+
-+    return S_OK;
- }
- 
- static HRESULT WINAPI DirectDrawMediaStreamImpl_IDirectDrawMediaStream_GetInformation(IDirectDrawMediaStream *iface,
-@@ -511,9 +523,15 @@ static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_GetMultiMediaStream(IA
+@@ -517,9 +523,15 @@ static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_GetMultiMediaStream(IA
  {
      AudioMediaStreamImpl *This = impl_from_AudioMediaStream_IAMMediaStream(iface);
  
@@ -65,7 +47,7 @@ index 947be1e..e4e15d7 100644
  }
  
  static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_GetInformation(IAMMediaStream *iface,
-@@ -672,9 +690,15 @@ static HRESULT WINAPI AudioMediaStreamImpl_IAudioMediaStream_GetMultiMediaStream
+@@ -678,9 +690,15 @@ static HRESULT WINAPI AudioMediaStreamImpl_IAudioMediaStream_GetMultiMediaStream
  {
      AudioMediaStreamImpl *This = impl_from_IAudioMediaStream(iface);
  
@@ -84,5 +66,5 @@ index 947be1e..e4e15d7 100644
  
  static HRESULT WINAPI AudioMediaStreamImpl_IAudioMediaStream_GetInformation(IAudioMediaStream *iface,
 -- 
-2.4.5
+2.9.0
 

patches/api-ms-win-crt-Stub_DLLs/0001-ucrtbase-Hook-up-some-functions-with-new-names-to-ex.patch

@@ -1,46 +0,0 @@
-From fe4c1e1f10f8edc76c5dad994ed2e5202f9c2821 Mon Sep 17 00:00:00 2001
-From: Martin Storsjo <martin@martin.st>
-Date: Mon, 3 Aug 2015 22:26:01 +0300
-Subject: ucrtbase: Hook up some functions with new names to existing
- implementations
-
-These are some functions that on a first glance seem to have a
-matching signature even though the name has changed.
----
- dlls/ucrtbase/ucrtbase.spec | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec
-index bb56408..cee094d 100644
---- a/dlls/ucrtbase/ucrtbase.spec
-+++ b/dlls/ucrtbase/ucrtbase.spec
-@@ -211,7 +211,7 @@
- @ cdecl _c_exit() MSVCRT__c_exit
- @ cdecl _cabs(long) MSVCRT__cabs
- @ cdecl _callnewh(long)
--@ stub _calloc_base
-+@ cdecl _calloc_base(long long) MSVCRT_calloc
- @ cdecl _cexit() MSVCRT__cexit
- @ cdecl _cgets(ptr)
- @ stub _cgets_s
-@@ -333,7 +333,7 @@
- @ cdecl _fputwchar(long) MSVCRT__fputwchar
- @ cdecl _fread_nolock(ptr long long ptr) MSVCRT__fread_nolock
- @ cdecl _fread_nolock_s(ptr long long long ptr) MSVCRT__fread_nolock_s
--@ stub _free_base
-+@ cdecl _free_base(ptr) MSVCRT_free
- @ cdecl _free_locale(ptr) MSVCRT__free_locale
- @ cdecl _fseek_nolock(ptr long long) MSVCRT__fseek_nolock
- @ cdecl _fseeki64(ptr int64 long) MSVCRT__fseeki64
-@@ -580,7 +580,7 @@
- @ cdecl _ltow_s(long ptr long long) MSVCRT__ltow_s
- @ cdecl _makepath(ptr str str str str) MSVCRT__makepath
- @ cdecl _makepath_s(ptr long str str str str) MSVCRT__makepath_s
--@ stub _malloc_base
-+@ cdecl _malloc_base(long) MSVCRT_malloc
- @ cdecl _mbbtombc(long)
- @ stub _mbbtombc_l
- @ cdecl _mbbtype(long long)
--- 
-2.5.0
-

patches/api-ms-win-crt-Stub_DLLs/definition

@@ -1 +0,0 @@
-Fixes: Add stub dlls required for MSVC 2015 runtime library (Windows 10)

patches/comctl32-PROPSHEET_InsertPage/0001-comctl32-tests-Add-tests-for-PROPSHEET_InsertPage.patch

@@ -1,4 +1,4 @@
-From 5bd9830f145a29823b4a44b079c70171e55fb5db Mon Sep 17 00:00:00 2001
+From 1b05fa6764dc8eb220ef9dd349801fa2e76914bd Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Sat, 17 Oct 2015 15:38:13 +0200
 Subject: comctl32/tests: Add tests for PROPSHEET_InsertPage.
@@ -8,7 +8,7 @@ Subject: comctl32/tests: Add tests for PROPSHEET_InsertPage.
  1 file changed, 96 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c
-index 6594298..cdbbca8 100644
+index 6594298..8fdbae8 100644
 --- a/dlls/comctl32/tests/propsheet.c
 +++ b/dlls/comctl32/tests/propsheet.c
 @@ -806,7 +806,7 @@ static void test_PSM_ADDPAGE(void)
@@ -78,7 +78,7 @@ index 6594298..cdbbca8 100644
 +    ret = SendMessageA(hdlg, PSM_INSERTPAGE, 0, (LPARAM)INVALID_HANDLE_VALUE);
 +}
 +
-+    ret = SendMessageA(hdlg, PSM_INSERTPAGE, (LPARAM)INVALID_HANDLE_VALUE, (LPARAM)hpsp[2]);
++    ret = SendMessageA(hdlg, PSM_INSERTPAGE, (WPARAM)INVALID_HANDLE_VALUE, (LPARAM)hpsp[2]);
 +    ok(ret == FALSE, "got %d\n", ret);
 +
 +    /* check item count */
@@ -128,5 +128,5 @@ index 6594298..cdbbca8 100644
 +    test_PSM_INSERTPAGE();
  }
 -- 
-2.6.1
+2.6.2
 

patches/d3dx9_36-DrawText/0003-d3dx9_36-Support-NULL-terminated-strings-in-ID3DXFon.patch

@@ -0,0 +1,117 @@
+From f28e6a98185ce7dd1137f2f04861c097e75e72a9 Mon Sep 17 00:00:00 2001
+From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
+Date: Fri, 4 Dec 2015 09:22:35 +1100
+Subject: d3dx9_36: Support NULL terminated strings in ID3DXFont_DrawText
+
+Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
+---
+ dlls/d3dx9_36/font.c       | 10 ++++++++--
+ dlls/d3dx9_36/tests/core.c | 46 +++++++++++++++++++++++++++++++++++++++++++++-
+ 2 files changed, 53 insertions(+), 3 deletions(-)
+
+diff --git a/dlls/d3dx9_36/font.c b/dlls/d3dx9_36/font.c
+index d6dcd6c..63aa828 100644
+--- a/dlls/d3dx9_36/font.c
++++ b/dlls/d3dx9_36/font.c
+@@ -214,9 +214,12 @@ static INT WINAPI ID3DXFontImpl_DrawTextA(ID3DXFont *iface, ID3DXSprite *sprite,
+     TRACE("iface %p, sprite %p, string %s, count %d, rect %s, format %#x, color 0x%08x\n",
+             iface,  sprite, debugstr_a(string), count, wine_dbgstr_rect(rect), format, color);
+ 
+-    if (!string || count <= 0)
++    if (!string || count == 0)
+         return 0;
+ 
++    if (count < 0)
++       count = -1;
++
+     countW = MultiByteToWideChar(CP_ACP, 0, string, count, NULL, 0);
+     stringW = HeapAlloc(GetProcessHeap(), 0, countW * sizeof(WCHAR));
+     if (stringW)
+@@ -239,9 +242,12 @@ static INT WINAPI ID3DXFontImpl_DrawTextW(ID3DXFont *iface, ID3DXSprite *sprite,
+     TRACE("iface %p, sprite %p, string %s, count %d, rect %s, format %#x, color 0x%08x\n",
+             iface,  sprite, debugstr_w(string), count, wine_dbgstr_rect(rect), format, color);
+ 
+-    if (!string || count <= 0)
++    if (!string || count == 0)
+         return 0;
+ 
++    if (count < 0)
++       count = lstrlenW(string);
++
+     /* Strip terminating NULL characters */
+     while (count > 0 && !string[count-1])
+         count--;
+diff --git a/dlls/d3dx9_36/tests/core.c b/dlls/d3dx9_36/tests/core.c
+index 1c379fb..c931260 100644
+--- a/dlls/d3dx9_36/tests/core.c
++++ b/dlls/d3dx9_36/tests/core.c
+@@ -321,6 +321,8 @@ static void test_ID3DXFont(IDirect3DDevice9 *device)
+         { 12, 256, 5 },
+         { 72, 256, 8 }
+     };
++    static const WCHAR testW[] = {'t','e','s','t',0};
++    static const char testA[] = "test";
+ 
+ 
+     /* D3DXCreateFont */
+@@ -463,7 +465,6 @@ static void test_ID3DXFont(IDirect3DDevice9 *device)
+     /* ID3DXFont_PreloadText */
+     hr = D3DXCreateFontA(device, 12, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Arial", &font);
+     if(SUCCEEDED(hr)) {
+-        const WCHAR testW[] = {'t','e','s','t',0};
+ 
+         todo_wine {
+         hr = ID3DXFont_PreloadTextA(font, NULL, -1);
+@@ -591,6 +592,49 @@ static void test_ID3DXFont(IDirect3DDevice9 *device)
+         }
+         ID3DXFont_Release(font);
+     }
++
++    /* ID3DXFont_DrawTextA, ID3DXFont_DrawTextW */
++    hr = D3DXCreateFontA(device, 12, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Arial", &font);
++    if (SUCCEEDED(hr)) {
++        RECT rect;
++        int height;
++
++        SetRect(&rect, 10, 10, 200, 200);
++
++        height = ID3DXFont_DrawTextA(font, NULL, testA, -2, &rect, 0, 0xFF00FF);
++        ok(height == 12, "DrawTextA returned %d, expected 12.\n", height);
++
++        height = ID3DXFont_DrawTextA(font, NULL, testA, -1, &rect, 0, 0xFF00FF);
++        ok(height == 12, "DrawTextA returned %d, expected 12.\n", height);
++
++        height = ID3DXFont_DrawTextA(font, NULL, testA, 0, &rect, 0, 0xFF00FF);
++        ok(height == 0, "DrawTextA returned %d, expected 0.\n", height);
++
++        height = ID3DXFont_DrawTextA(font, NULL, testA, 1, &rect, 0, 0xFF00FF);
++        ok(height == 12, "DrawTextA returned %d, expected 12.\n", height);
++
++        height = ID3DXFont_DrawTextA(font, NULL, testA, 2, &rect, 0, 0xFF00FF);
++        ok(height == 12, "DrawTextA returned %d, expected 12.\n", height);
++
++if (0) { /* Causes a lockup on windows 7. */
++        height = ID3DXFont_DrawTextW(font, NULL, testW, -2, &rect, 0, 0xFF00FF);
++        ok(height == 12, "DrawTextW returned %d, expected 12.\n", height);
++}
++
++        height = ID3DXFont_DrawTextW(font, NULL, testW, -1, &rect, 0, 0xFF00FF);
++        ok(height == 12, "DrawTextW returned %d, expected 12.\n", height);
++
++        height = ID3DXFont_DrawTextW(font, NULL, testW, 0, &rect, 0, 0xFF00FF);
++        ok(height == 0, "DrawTextW returned %d, expected 0.\n", height);
++
++        height = ID3DXFont_DrawTextW(font, NULL, testW, 1, &rect, 0, 0xFF00FF);
++        ok(height == 12, "DrawTextW returned %d, expected 12.\n", height);
++
++        height = ID3DXFont_DrawTextW(font, NULL, testW, 2, &rect, 0, 0xFF00FF);
++        ok(height == 12, "DrawTextW returned %d, expected 12.\n", height);
++
++        ID3DXFont_Release(font);
++    }
+ }
+ 
+ static void test_D3DXCreateRenderToSurface(IDirect3DDevice9 *device)
+-- 
+2.6.2
+

patches/d3dx9_36-DrawText/0004-d3dx9_36-ID3DXFont_DrawText-calc_rect-can-be-null.patch

@@ -0,0 +1,80 @@
+From 5b46372b7cc36f07d61bce63d5e3ae8aa766aa5a Mon Sep 17 00:00:00 2001
+From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
+Date: Sat, 5 Dec 2015 15:31:06 +1100
+Subject: d3dx9_36: ID3DXFont_DrawText calc_rect can be null
+
+Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
+---
+ dlls/d3dx9_36/font.c       |  8 ++++++--
+ dlls/d3dx9_36/tests/core.c | 18 ++++++++++++++++++
+ 2 files changed, 24 insertions(+), 2 deletions(-)
+
+diff --git a/dlls/d3dx9_36/font.c b/dlls/d3dx9_36/font.c
+index 63aa828..2262db9 100644
+--- a/dlls/d3dx9_36/font.c
++++ b/dlls/d3dx9_36/font.c
+@@ -236,7 +236,7 @@ static INT WINAPI ID3DXFontImpl_DrawTextW(ID3DXFont *iface, ID3DXSprite *sprite,
+         const WCHAR *string, INT count, RECT *rect, DWORD format, D3DCOLOR color)
+ {
+     struct d3dx_font *This = impl_from_ID3DXFont(iface);
+-    RECT calc_rect = *rect;
++    RECT calc_rect;
+     INT height;
+ 
+     TRACE("iface %p, sprite %p, string %s, count %d, rect %s, format %#x, color 0x%08x\n",
+@@ -252,11 +252,15 @@ static INT WINAPI ID3DXFontImpl_DrawTextW(ID3DXFont *iface, ID3DXSprite *sprite,
+     while (count > 0 && !string[count-1])
+         count--;
+ 
++    if (rect)
++        calc_rect = *rect;
++
+     height = DrawTextW(This->hdc, string, count, &calc_rect, format | DT_CALCRECT);
+ 
+     if (format & DT_CALCRECT)
+     {
+-        *rect = calc_rect;
++        if (rect)
++            *rect = calc_rect;
+         return height;
+     }
+ 
+diff --git a/dlls/d3dx9_36/tests/core.c b/dlls/d3dx9_36/tests/core.c
+index c931260..1cf0db6 100644
+--- a/dlls/d3dx9_36/tests/core.c
++++ b/dlls/d3dx9_36/tests/core.c
+@@ -616,6 +616,15 @@ static void test_ID3DXFont(IDirect3DDevice9 *device)
+         height = ID3DXFont_DrawTextA(font, NULL, testA, 2, &rect, 0, 0xFF00FF);
+         ok(height == 12, "DrawTextA returned %d, expected 12.\n", height);
+ 
++        height = ID3DXFont_DrawTextA(font, NULL, testA, -1, NULL, 0, 0xFF00FF);
++        ok(height == 12, "DrawTextA returned %d, expected 12.\n", height);
++
++        height = ID3DXFont_DrawTextA(font, NULL, testA, -1, NULL, DT_CALCRECT, 0xFF00FF);
++        ok(height == 12, "DrawTextA returned %d, expected 12.\n", height);
++
++        height = ID3DXFont_DrawTextA(font, NULL, NULL, -1, NULL, 0, 0xFF00FF);
++        ok(height == 0, "DrawTextA returned %d, expected 0.\n", height);
++
+ if (0) { /* Causes a lockup on windows 7. */
+         height = ID3DXFont_DrawTextW(font, NULL, testW, -2, &rect, 0, 0xFF00FF);
+         ok(height == 12, "DrawTextW returned %d, expected 12.\n", height);
+@@ -633,6 +642,15 @@ if (0) { /* Causes a lockup on windows 7. */
+         height = ID3DXFont_DrawTextW(font, NULL, testW, 2, &rect, 0, 0xFF00FF);
+         ok(height == 12, "DrawTextW returned %d, expected 12.\n", height);
+ 
++        height = ID3DXFont_DrawTextW(font, NULL, testW, -1, NULL, 0, 0xFF00FF);
++        ok(height == 12, "DrawTextA returned %d, expected 12.\n", height);
++
++        height = ID3DXFont_DrawTextW(font, NULL, testW, -1, NULL, DT_CALCRECT, 0xFF00FF);
++        ok(height == 12, "DrawTextA returned %d, expected 12.\n", height);
++
++        height = ID3DXFont_DrawTextW(font, NULL, NULL, -1, NULL, 0, 0xFF00FF);
++        ok(height == 0, "DrawTextA returned %d, expected 0.\n", height);
++
+         ID3DXFont_Release(font);
+     }
+ }
+-- 
+2.6.2
+

patches/dxgi-GetDesc/0001-dxgi-Implement-IDXGIOutput-GetDesc.patch

@@ -1,53 +0,0 @@
-From 297166d280007d0e4413ec5977497a848dda678b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
-Date: Fri, 19 Dec 2014 21:20:21 +0100
-Subject: dxgi: Implement IDXGIOutput::GetDesc.
-
----
- dlls/dxgi/output.c | 29 +++++++++++++++++++++++++++--
- 1 file changed, 27 insertions(+), 2 deletions(-)
-
-diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c
-index f4a5c29..158491e 100644
---- a/dlls/dxgi/output.c
-+++ b/dlls/dxgi/output.c
-@@ -114,9 +114,34 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetParent(IDXGIOutput *iface,
- 
- static HRESULT STDMETHODCALLTYPE dxgi_output_GetDesc(IDXGIOutput *iface, DXGI_OUTPUT_DESC *desc)
- {
--    FIXME("iface %p, desc %p stub!\n", iface, desc);
-+    struct dxgi_output *This = impl_from_IDXGIOutput(iface);
-+    struct wined3d *wined3d;
-+    MONITORINFOEXW monitor_info;
- 
--    return E_NOTIMPL;
-+    FIXME("iface %p, desc %p semi-stub!\n", iface, desc);
-+
-+    if (!desc)
-+        return DXGI_ERROR_INVALID_CALL;
-+
-+    wined3d = This->adapter->parent->wined3d;
-+
-+    wined3d_mutex_lock();
-+    desc->Monitor = wined3d_get_adapter_monitor(wined3d, This->adapter->ordinal);
-+    wined3d_mutex_unlock();
-+
-+    if (!desc->Monitor)
-+        return DXGI_ERROR_INVALID_CALL;
-+
-+    monitor_info.cbSize = sizeof(monitor_info);
-+    if (!GetMonitorInfoW(desc->Monitor, (MONITORINFO *)&monitor_info))
-+        return DXGI_ERROR_INVALID_CALL;
-+
-+    memcpy(&desc->DeviceName, &monitor_info.szDevice, sizeof(desc->DeviceName));
-+    memcpy(&desc->DesktopCoordinates, &monitor_info.rcMonitor, sizeof(RECT));
-+    desc->AttachedToDesktop = TRUE;
-+    desc->Rotation = DXGI_MODE_ROTATION_IDENTITY;
-+
-+    return S_OK;
- }
- 
- static HRESULT STDMETHODCALLTYPE dxgi_output_GetDisplayModeList(IDXGIOutput *iface,
--- 
-1.9.1
-

patches/dxgi-GetDesc/definition

@@ -1,4 +0,0 @@
-Fixes: Implement IDXGIOutput::GetDesc
-Fixes: [31998] Avseq crashes when multisampling is enabled
-Fixes: [32006] Add implementation for IDXGIOutput::GetDesc
-Category: stable

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/gdi32-MaxPixelFormats/0001-gdi32-Return-maximum-number-of-pixel-formats-when-NU.patch

@@ -1,27 +0,0 @@
-From 69bb805398645531fbc224319ab99dab29129c68 Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Sat, 8 Nov 2014 11:32:11 +0100
-Subject: gdi32: Return maximum number of pixel formats when NULL pointer is
- passed to wglDescribePixelFormat.
-
----
- dlls/gdi32/dibdrv/opengl.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/dlls/gdi32/dibdrv/opengl.c b/dlls/gdi32/dibdrv/opengl.c
-index 28a03f4..edbd2e9 100644
---- a/dlls/gdi32/dibdrv/opengl.c
-+++ b/dlls/gdi32/dibdrv/opengl.c
-@@ -149,7 +149,8 @@ static int dibdrv_wglDescribePixelFormat( HDC hdc, int fmt, UINT size, PIXELFORM
- {
-     int ret = sizeof(pixel_formats) / sizeof(pixel_formats[0]);
- 
--    if (fmt <= 0 || fmt > ret) return ret;
-+    if (!descr) return ret;
-+    if (fmt <= 0 || fmt > ret) return ret; /* FIXME: should this be 0? */
-     if (size < sizeof(*descr)) return 0;
- 
-     memset( descr, 0, sizeof(*descr) );
--- 
-2.1.3
-

patches/gdi32-MaxPixelFormats/definition

@@ -1,2 +0,0 @@
-Fixes: [6176] wglDescribePixelFormat should return max index for NULL descriptor
-Category: stable

patches/gdi32-Symbol_Truetype_Font/definition

@@ -1 +1,2 @@
 Fixes: [33117] Improve detection of symbol charset for old truetype fonts
+Fixes: [12377] Fix font loading in Capella

patches/gitapply.sh

@@ -2,7 +2,7 @@
 #
 # Wrapper to apply binary patches without git.
 #
-# Copyright (C) 2014-2015 Sebastian Lackner
+# Copyright (C) 2014-2016 Sebastian Lackner
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -237,7 +237,7 @@ awk_eof_header='
 BEGIN{
   ofs=1;
 }
-!/^(--- |\+\+\+ |old |new |copy |rename |similarity |index |GIT |literal |delta )/{
+!/^(--- |\+\+\+ |old |deleted |new |copy |rename |similarity |index |GIT |literal |delta )/{
   ofs=0; exit 0;
 }
 END{

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

@@ -1,4 +1,4 @@
-From 6ae55e62a81e4f4ded0ea14926f014b6d6a4b633 Mon Sep 17 00:00:00 2001
+From 3c0f4068c5e5319560525b157e704dccf0e6353e 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,12 +9,12 @@ 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 0b2e422..be3a48b 100644
 --- a/dlls/hal/hal.c
 +++ b/dlls/hal/hal.c
-@@ -155,3 +155,13 @@ KIRQL WINAPI KeGetCurrentIrql(VOID)
-     FIXME( " stub!\n");
-     return 0;
+@@ -172,3 +172,13 @@ void WINAPI WRITE_PORT_ULONG(ULONG *port, ULONG value)
+ {
+     FIXME("(%p %d) stub!\n", port, value);
  }
 +
 +ULONGLONG WINAPI KeQueryPerformanceCounter(LARGE_INTEGER *frequency)
@@ -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 c21806c..243c67b 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.9.0
 

patches/kernel32-CompareString_Length/0001-kernel32-CompareStringW-should-abort-on-the-first-no.patch

@@ -1,64 +0,0 @@
-From 8e2f184541d44755fa67a43e4d8cf8debeeafc82 Mon Sep 17 00:00:00 2001
-From: Dmitry Timoshkov <dmitry@baikal.ru>
-Date: Fri, 13 Nov 2015 20:36:54 +0800
-Subject: kernel32: CompareStringW should abort on the first nonmatching
- character to avoid invalid memory access.
-
-For bug 37556.
-
-Signed-off-by: Dmitry Timoshkov <dmitry@baikal.ru>
----
- libs/wine/sortkey.c | 15 ++++++---------
- 1 file changed, 6 insertions(+), 9 deletions(-)
-
-diff --git a/libs/wine/sortkey.c b/libs/wine/sortkey.c
-index 17b5537..c459cea 100644
---- a/libs/wine/sortkey.c
-+++ b/libs/wine/sortkey.c
-@@ -223,6 +223,8 @@ static inline int compare_unicode_weights(int flags, const WCHAR *str1, int len1
-         len1--;
-         len2--;
-     }
-+    if (len1 && !*str1) len1--;
-+    if (len2 && !*str2) len2--;
-     return len1 - len2;
- }
- 
-@@ -272,6 +274,8 @@ static inline int compare_diacritic_weights(int flags, const WCHAR *str1, int le
-         len1--;
-         len2--;
-     }
-+    if (len1 && !*str1) len1--;
-+    if (len2 && !*str2) len2--;
-     return len1 - len2;
- }
- 
-@@ -321,23 +325,16 @@ static inline int compare_case_weights(int flags, const WCHAR *str1, int len1,
-         len1--;
-         len2--;
-     }
-+    if (len1 && !*str1) len1--;
-+    if (len2 && !*str2) len2--;
-     return len1 - len2;
- }
- 
--static inline int real_length(const WCHAR *str, int len)
--{
--    while (len && !str[len - 1]) len--;
--    return len;
--}
--
- int wine_compare_string(int flags, const WCHAR *str1, int len1,
-                         const WCHAR *str2, int len2)
- {
-     int ret;
- 
--    len1 = real_length(str1, len1);
--    len2 = real_length(str2, len2);
--
-     ret = compare_unicode_weights(flags, str1, len1, str2, len2);
-     if (!ret)
-     {
--- 
-2.6.2
-

patches/kernel32-CompareString_Length/0002-kernel32-tests-Add-some-more-tests-for-NORM_IGNORESY.patch

@@ -1,31 +0,0 @@
-From 9261fada866235424392ac94d78e2d3a3a02ecc7 Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Sat, 14 Nov 2015 20:43:39 +0100
-Subject: kernel32/tests: Add some more tests for NORM_IGNORESYMBOLS.
-
----
- dlls/kernel32/tests/locale.c | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c
-index 7b0212e..a70dc13 100644
---- a/dlls/kernel32/tests/locale.c
-+++ b/dlls/kernel32/tests/locale.c
-@@ -1634,7 +1634,13 @@ static const struct comparestringa_entry comparestringa_data[] = {
-   { LOCALE_SYSTEM_DEFAULT, SORT_STRINGSORT, "'o", -1, "/m", -1, CSTR_LESS_THAN },
-   { LOCALE_SYSTEM_DEFAULT, SORT_STRINGSORT, "/m", -1, "'o", -1, CSTR_GREATER_THAN },
-   { LOCALE_SYSTEM_DEFAULT, 0, "aLuZkUtZ", 8, "aLuZkUtZ", 9, CSTR_EQUAL },
--  { LOCALE_SYSTEM_DEFAULT, 0, "aLuZkUtZ", 7, "aLuZkUtZ\0A", 10, CSTR_LESS_THAN }
-+  { LOCALE_SYSTEM_DEFAULT, 0, "aLuZkUtZ", 7, "aLuZkUtZ\0A", 10, CSTR_LESS_THAN },
-+  { LOCALE_SYSTEM_DEFAULT, 0, "a-", 3, "a\0", 3, CSTR_GREATER_THAN },
-+  { LOCALE_SYSTEM_DEFAULT, 0, "a'", 3, "a\0", 3, CSTR_GREATER_THAN },
-+  { LOCALE_SYSTEM_DEFAULT, SORT_STRINGSORT, "a-", 3, "a\0", 3, CSTR_GREATER_THAN },
-+  { LOCALE_SYSTEM_DEFAULT, SORT_STRINGSORT, "a'", 3, "a\0", 3, CSTR_GREATER_THAN },
-+  { LOCALE_SYSTEM_DEFAULT, NORM_IGNORESYMBOLS, "a.", 3, "a\0", 3, CSTR_EQUAL },
-+  { LOCALE_SYSTEM_DEFAULT, NORM_IGNORESYMBOLS, "a ", 3, "a\0", 3, CSTR_EQUAL },
- };
- 
- static void test_CompareStringA(void)
--- 
-2.6.2
-