Release 1.7.46.

(The tests and a fix for a corner case might still be useful,
so leaving the patch there for now.)

README.md

@@ -39,7 +39,7 @@ Wine. All those differences are also documented on the
 Included bug fixes and improvements
 -----------------------------------
 
-**Bug fixes and features in Wine Staging 1.7.41 [218]:**
+**Bug fixes and features in Wine Staging 1.7.46 [236]:**
 
 *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
@@ -48,21 +48,23 @@ releases, take a look at the
 [changelog](https://github.com/wine-compholio/wine-staging/blob/master/debian/changelog)
 for more details.*
 
-* Add Dynamic DST exceptions for Israel Standard Time ([Wine Bug #36374](https://bugs.winehq.org/show_bug.cgi?id=36374))
+* Add HTTP Host header in HttpSendRequest instead of HttpOpenRequest ([Wine Bug #28911](https://bugs.winehq.org/show_bug.cgi?id=28911))
 * Add a ProfileList\<UserSID> registry subkey ([Wine Bug #15670](https://bugs.winehq.org/show_bug.cgi?id=15670))
-* Add default ACLs for user shell folders
 * Add implementation for CreateThreadpool ([Wine Bug #35192](https://bugs.winehq.org/show_bug.cgi?id=35192))
+* Add implementation for kernel32.GetNumaProcessorNode ([Wine Bug #38660](https://bugs.winehq.org/show_bug.cgi?id=38660))
 * Add implementation for mfplat.MFTRegister ([Wine Bug #37811](https://bugs.winehq.org/show_bug.cgi?id=37811))
+* 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 GetFileVersionInfoExA/W ([Wine Bug #38098](https://bugs.winehq.org/show_bug.cgi?id=38098))
-* Add semi-stub for GetFileVersionInfoSizeExA/W ([Wine Bug #38090](https://bugs.winehq.org/show_bug.cgi?id=38090))
+* 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 fltmgr.sys (filter manager driver) ([Wine Bug #23583](https://bugs.winehq.org/show_bug.cgi?id=23583))
 * Add stub for D3DXComputeNormalMap
 * Add stub for D3DXComputeTangentFrameEx ([Wine Bug #31984](https://bugs.winehq.org/show_bug.cgi?id=31984))
+* Add stub for D3DXFrameFind ([Wine Bug #38334](https://bugs.winehq.org/show_bug.cgi?id=38334))
 * Add stub for D3DXIntersect
 * Add stub for NtSetLdtEntries/ZwSetLdtEntries ([Wine Bug #26268](https://bugs.winehq.org/show_bug.cgi?id=26268))
-* Add stub for WinSqmIsOptedIn ([Wine Bug #38388](https://bugs.winehq.org/show_bug.cgi?id=38388))
+* Add stub for d3d11.D3D11CreateDeviceAndSwapChain ([Wine Bug #33153](https://bugs.winehq.org/show_bug.cgi?id=33153))
 * Add stub for gdiplus.GdipCreateEffect ([Wine Bug #32163](https://bugs.winehq.org/show_bug.cgi?id=32163))
 * Add stub for ntoskrnl.ExAcquireResourceExclusiveLite
 * Add stub for ntoskrnl.ExDeleteResourceLite
@@ -72,21 +74,26 @@ for more details.*
 * 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 winsta.WinStationEnumerateW ([Wine Bug #38102](https://bugs.winehq.org/show_bug.cgi?id=38102))
+* Add stubbed ISWbemSecurity interfaces in wbemdisp
 * Add stubs for D3DXCreateAnimationController interface
 * Add support for CopyFileEx progress callback ([Wine Bug #22692](https://bugs.winehq.org/show_bug.cgi?id=22692))
 * 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 support for wbemprox Win32_SystemEnclosure table ([Wine Bug #34517](https://bugs.winehq.org/show_bug.cgi?id=34517))
 * Adobe Reader needs ITextSelection_fnGetDuplicate implementation
 * Allow selection of audio device for PulseAudio backend
 * Allow special characters in pipe names ([Wine Bug #28995](https://bugs.winehq.org/show_bug.cgi?id=28995))
 * 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 enable/disable InsertMode in wineconsole settings ([Wine Bug #38697](https://bugs.winehq.org/show_bug.cgi?id=38697))
 * 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
 * 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 crash when trying to bind mshtml event scripts to window ([Wine Bug #38419](https://bugs.winehq.org/show_bug.cgi?id=38419))
 * 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.
@@ -97,30 +104,32 @@ for more details.*
 * 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))
+* Create HKLM\Software\Microsoft\Cryptography\MachineGuid registry key ([Wine Bug #38508](https://bugs.winehq.org/show_bug.cgi?id=38508))
+* 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 append duplicate NULL characters when importing keys with regedit ([Wine Bug #37575](https://bugs.winehq.org/show_bug.cgi?id=37575))
 * Do not fail when a used context is passed to wglShareLists ([Wine Bug #11436](https://bugs.winehq.org/show_bug.cgi?id=11436))
-* Emulate access to KI_USER_SHARED_DATA kernel page on x86_64 ([Wine Bug #33849](https://bugs.winehq.org/show_bug.cgi?id=33849))
+* Do not use unixfs for devices without mountpoint
 * Enforce that surfaces are flushed after ReleaseDC
 * Ensure NtProtectVirtualMemory and NtCreateSection are on separate pages ([Wine Bug #33162](https://bugs.winehq.org/show_bug.cgi?id=33162))
 * Ensure X11 input events are handled even without explicit message loop ([Wine Bug #8854](https://bugs.winehq.org/show_bug.cgi?id=8854))
+* Ensure console InsertMode changes take effect immediately
 * Exception during start of fr-043 caused by missing DXTn support ([Wine Bug #37391](https://bugs.winehq.org/show_bug.cgi?id=37391))
 * 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))
 * Fallback to global key state for threads without a queue ([Wine Bug #27238](https://bugs.winehq.org/show_bug.cgi?id=27238))
+* 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 NULL dereference in ICSeqCompressFrameStart ([Wine Bug #27595](https://bugs.winehq.org/show_bug.cgi?id=27595))
-* Fix access violation when calling GetStringTypeW with NULL src. ([Wine Bug #37759](https://bugs.winehq.org/show_bug.cgi?id=37759))
 * Fix black screen on startup introduced by pixelformat changes. ([Wine Bug #35950](https://bugs.winehq.org/show_bug.cgi?id=35950))
 * 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 in clip_cursor_notify caused by uninitialized TLS ([Wine Bug #36915](https://bugs.winehq.org/show_bug.cgi?id=36915))
-* Fix crash of Trine Demo on start ([Wine Bug #19231](https://bugs.winehq.org/show_bug.cgi?id=19231))
 * Fix crash of winedevice when relocation entry crosses page boundary ([Wine Bug #28254](https://bugs.winehq.org/show_bug.cgi?id=28254))
 * Fix cursor clip regression / broken raw input in multiple games ([Wine Bug #33479](https://bugs.winehq.org/show_bug.cgi?id=33479))
 * 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 flickering introduced by pixelformat changes. ([Wine Bug #35718](https://bugs.winehq.org/show_bug.cgi?id=35718))
 * Fix for ConnectNamedPort return value in overlapped mode ([Wine Bug #16550](https://bugs.winehq.org/show_bug.cgi?id=16550))
 * Fix for programs leaking wndproc slots ([Wine Bug #32451](https://bugs.winehq.org/show_bug.cgi?id=32451))
@@ -129,6 +138,7 @@ for more details.*
 * Fix handling of ANSI NTLM credentials ([Wine Bug #37063](https://bugs.winehq.org/show_bug.cgi?id=37063))
 * Fix handling of empty section and key name for profile files. ([Wine Bug #8036](https://bugs.winehq.org/show_bug.cgi?id=8036))
 * Fix handling of invert_y in DrawTextExW ([Wine Bug #22109](https://bugs.winehq.org/show_bug.cgi?id=22109))
+* Fix handling of opening a file with RootDirectory pointing to a file handle
 * Fix handling of opening read-only files for FILE_DELETE_ON_CLOSE ([Wine Bug #38417](https://bugs.winehq.org/show_bug.cgi?id=38417))
 * Fix handling of window attributes for WS_EX_LAYERED | WS_EX_COMPOSITED ([Wine Bug #37876](https://bugs.winehq.org/show_bug.cgi?id=37876))
 * Fix issues with dragging layers between images in Adobe Photoshop 7.0 ([Wine Bug #12007](https://bugs.winehq.org/show_bug.cgi?id=12007))
@@ -136,8 +146,9 @@ for more details.*
 * 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 #38264](https://bugs.winehq.org/show_bug.cgi?id=38264))
+* 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 unintentional leaks with ntdll internals
 * Fix wined3d performance drop introduced by pixelformat changes. ([Wine Bug #35655](https://bugs.winehq.org/show_bug.cgi?id=35655))
@@ -145,30 +156,32 @@ for more details.*
 * 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))
-* Games For Windows Live 1.x expects a valid linker version in the PE header ([Wine Bug #28768](https://bugs.winehq.org/show_bug.cgi?id=28768))
+* Forward GIF encoder requests to windowscodecs ([Wine Bug #34356](https://bugs.winehq.org/show_bug.cgi?id=34356))
+* Free RPC parameters allocated by application before anything else ([Wine Bug #36743](https://bugs.winehq.org/show_bug.cgi?id=36743))
 * 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))
-* Hearthstone fails to start ([Wine Bug #36216](https://bugs.winehq.org/show_bug.cgi?id=36216))
-* IOCTL_DVD_READ_STRUCTURE expects the wrong size of output buffer for some requests ([Wine Bug #37767](https://bugs.winehq.org/show_bug.cgi?id=37767))
+* Ignore garbage after decoding gif lines ([Wine Bug #32227](https://bugs.winehq.org/show_bug.cgi?id=32227))
 * Ignore unsupported flags for CoInternetSetFeatureEnabled ([Wine Bug #35197](https://bugs.winehq.org/show_bug.cgi?id=35197))
 * Implement D3DXGetShaderOutputSemantics
 * Implement DDENUMSURFACES_CANBECREATED in IDirectDraw7::EnumSurfaces ([Wine Bug #17233](https://bugs.winehq.org/show_bug.cgi?id=17233))
 * Implement ID3DXEffect::FindNextValidTechnique ([Wine Bug #34101](https://bugs.winehq.org/show_bug.cgi?id=34101))
 * Implement IDXGIOutput::GetDesc
-* Implement SetFileInformationByHandle
 * Implement a Microsoft Yahei replacement font ([Wine Bug #13829](https://bugs.winehq.org/show_bug.cgi?id=13829))
 * Implement additional stubs for vcomp dlls ([Wine Bug #31640](https://bugs.winehq.org/show_bug.cgi?id=31640))
 * Implement an Arial replacement font ([Wine Bug #32323](https://bugs.winehq.org/show_bug.cgi?id=32323))
 * Implement combase.WindowsSubstring function
+* Implement default homepage button in inetcpl.cpl
 * Implement empty enumerator for IWiaDevMgr::EnumDeviceInfo ([Wine Bug #27775](https://bugs.winehq.org/show_bug.cgi?id=27775))
 * 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 locking and synchronization of key states ([Wine Bug #31899](https://bugs.winehq.org/show_bug.cgi?id=31899))
-* Implement mscoree._CorValidateImage for mono runtime
+* 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
+* Implement proper handling of CLI .NET images in Wine library loader ([Wine Bug #38661](https://bugs.winehq.org/show_bug.cgi?id=38661))
 * Implement stub for ntoskrnl.IoGetAttachedDeviceReference
 * Implement stub for ntoskrnl.KeDelayExecutionThread.
 * Implement stubs for ntoskrnl.Ex{Acquire,Release}FastMutexUnsafe
@@ -176,40 +189,44 @@ for more details.*
 * Implement threadpool timers ([Wine Bug #37306](https://bugs.winehq.org/show_bug.cgi?id=37306))
 * Implement threadpool wait objects
 * Implement threadpool work items ([Wine Bug #32531](https://bugs.winehq.org/show_bug.cgi?id=32531))
+* Improve ReadDataAvailable handling in FilePipeLocalInformation class
 * 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
 * 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))
-* Lockfree algorithm for filedescriptor cache (improves file access speed)
-* MSVCRT crashes when NULL is passed as string to atof or strtod ([Wine Bug #32550](https://bugs.winehq.org/show_bug.cgi?id=32550))
 * MSYS2 expects correct handling of WRITECOPY memory protection ([Wine Bug #35561](https://bugs.winehq.org/show_bug.cgi?id=35561))
 * Make it possible to change media center / tablet pc status ([Wine Bug #18732](https://bugs.winehq.org/show_bug.cgi?id=18732))
 * 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))
+* Multiple applications needs better NtQueryInformationJobObject stub
 * Multiple applications start wrong executable if whitespace present in name ([Wine Bug #19666](https://bugs.winehq.org/show_bug.cgi?id=19666))
 * Need for Speed 3 installer requires devices in HKEY_DYN_DATA ([Wine Bug #7115](https://bugs.winehq.org/show_bug.cgi?id=7115))
+* Only send WM_DROPFILES when OLE dnd fails ([Wine Bug #29081](https://bugs.winehq.org/show_bug.cgi?id=29081))
 * 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
 * Process Hacker 2.x needs ntoskrnl.ProbeForRead ([Wine Bug #38103](https://bugs.winehq.org/show_bug.cgi?id=38103))
-* Properly handle closing sockets during a select call ([Wine Bug #38399](https://bugs.winehq.org/show_bug.cgi?id=38399))
-* Python PIP needs better NtQueryInformationJobObject stub
-* Recognize localhost as local machine in wbemprox
 * Reduced SetTimer minimum value from 10 ms to 5 ms (improves Silverlight framerates)
-* Reset device state in SysKeyboard*Impl_Acquire ([Wine Bug #11607](https://bugs.winehq.org/show_bug.cgi?id=11607))
 * Return an error when trying to open a terminated process ([Wine Bug #37087](https://bugs.winehq.org/show_bug.cgi?id=37087))
-* Return correct IMediaSeeking stream positions in quartz ([Wine Bug #23174](https://bugs.winehq.org/show_bug.cgi?id=23174))
-* Return correct device type for cd devices without medium
+* 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 default palette entries from GetSystemPaletteEntries for non-palette-based devices
+* 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
 * SO_CONNECT_TIME returns the appropriate time
 * Scrolling causes mouse and screen to lock in Call to Power II ([Wine Bug #34559](https://bugs.winehq.org/show_bug.cgi?id=34559))
+* SecuROM 5.x media validation fails ([Wine Bug #21448](https://bugs.winehq.org/show_bug.cgi?id=21448))
 * Send WM_PAINT event during dialog creation ([Wine Bug #35652](https://bugs.winehq.org/show_bug.cgi?id=35652))
-* Set last error when GetRawInputDeviceList fails ([Wine Bug #37667](https://bugs.winehq.org/show_bug.cgi?id=37667))
+* Set NamedPipeState to FILE_PIPE_CLOSING_STATE on broken pipe in NtQueryInformationFile
 * Show unmounted devices in winecfg and allow changing the unix path
+* 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 8bpp grayscale TIFF images with 8bpp alpha channel ([Wine Bug #38027](https://bugs.winehq.org/show_bug.cgi?id=38027))
@@ -221,16 +238,11 @@ for more details.*
 * 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 Dynamic DST (daylight saving time) information in registry
-* Support for GdipCreateRegionRgnData ([Wine Bug #34843](https://bugs.winehq.org/show_bug.cgi?id=34843))
+* Support for FileFsFullSizeInformation information class
 * Support for GetFinalPathNameByHandle ([Wine Bug #34851](https://bugs.winehq.org/show_bug.cgi?id=34851))
-* Support for GetSystemTimes ([Wine Bug #19813](https://bugs.winehq.org/show_bug.cgi?id=19813))
-* Support for GetVolumePathName
 * 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 ITextDocument_fnRange function ([Wine Bug #12458](https://bugs.winehq.org/show_bug.cgi?id=12458))
-* Support for ITextRange, ITextFont and ITextPara ([Wine Bug #18303](https://bugs.winehq.org/show_bug.cgi?id=18303))
 * Support for Junction Points ([Wine Bug #12401](https://bugs.winehq.org/show_bug.cgi?id=12401))
 * Support for KF_FLAG_DEFAULT_PATH in SHGetKnownFolderPath ([Wine Bug #30385](https://bugs.winehq.org/show_bug.cgi?id=30385))
 * Support for LoadIconMetric ([Wine Bug #35375](https://bugs.winehq.org/show_bug.cgi?id=35375))
@@ -238,13 +250,15 @@ for more details.*
 * Support for NVIDIA video encoder library (nvencodeapi)
 * Support for NtQuerySection ([Wine Bug #37338](https://bugs.winehq.org/show_bug.cgi?id=37338))
 * Support for NtSetInformationFile class FileDispositionInformation ([Wine Bug #30397](https://bugs.winehq.org/show_bug.cgi?id=30397))
+* Support for NtSetInformationFile class FileLinkInformation
+* Support for NtSetInformationFile class FileRenameInformation ([Wine Bug #30399](https://bugs.winehq.org/show_bug.cgi?id=30399))
 * Support for PulseAudio backend for audio ([Wine Bug #10495](https://bugs.winehq.org/show_bug.cgi?id=10495))
 * Support for RtlDecompressBuffer ([Wine Bug #37449](https://bugs.winehq.org/show_bug.cgi?id=37449))
 * Support for SHCreateSessionKey ([Wine Bug #35630](https://bugs.winehq.org/show_bug.cgi?id=35630))
 * Support for TransmitFile ([Wine Bug #5048](https://bugs.winehq.org/show_bug.cgi?id=5048))
 * 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 ([Wine Bug #34406](https://bugs.winehq.org/show_bug.cgi?id=34406))
+* 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))
@@ -254,9 +268,12 @@ for more details.*
 * 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))
 * Try harder to get the host name address in getaddrinfo() ([Wine Bug #29609](https://bugs.winehq.org/show_bug.cgi?id=29609))
 * 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 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))
 * Voobly expects correct handling of WRITECOPY memory protection ([Wine Bug #29384](https://bugs.winehq.org/show_bug.cgi?id=29384))
@@ -264,6 +281,7 @@ for more details.*
 * 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))
+* msvcrt.strtod should initialize *end with NULL on failure
 * 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))
 

debian/tools/patchinstall.sh.in

@@ -32,9 +32,11 @@ usage()
 	echo "Configuration:"
 	echo "  DESTDIR=path         Specify the path to the wine source tree"
 	echo "  --all                Select all patches"
+	echo "  --force-autoconf     Run autoreconf and tools/make_requests after each patch"
 	echo "  --help               Display this help and exit"
 	echo "  --no-patchlist       Do not apply patchlist (needed for 'wine --patches')"
 	echo "  --no-autoconf        Do not run autoreconf and tools/make_requests"
+	echo "  --version            Show version information"
 	echo "  -W patchset          Exclude a specific patchset"
 	echo ""
 	echo "Backends:"
@@ -46,6 +48,17 @@ usage()
 	echo ""
 }}
 
+# Show version information
+version()
+{{
+	echo "Wine Staging {latest_staging_version}"
+	echo "Copyright (C) 2014-2015 the Wine Staging project authors."
+	echo ""
+	echo "Patchset to be applied on upstream Wine:"
+	echo "  commit {latest_wine_commit}"
+	echo ""
+}}
+
 # Critical error, abort
 abort()
 {{
@@ -63,11 +76,11 @@ warning()
 
 # Default settings
 patch_enable_all 0
+category_enable_all 0
 enable_patchlist=1
 enable_autoconf=1
 patchlist="/dev/null"
 backend="patch"
-enable=1
 
 # Find location of patches
 patchdir="$(dirname "$(readlink -f "$0")")"
@@ -85,16 +98,6 @@ if test "$#" -eq 0; then
 fi
 
 while test "$#" -gt 0; do
-	if patch_enable "$1" "$enable"; then
-		shift
-		enable=1
-		continue
-	fi
-
-	if test "$enable" -ne 1; then
-		abort "Wrong use of -W commandline argument, expected patchname."
-	fi
-
 	case "$1" in
 		DESTDIR=*)
 			DESTDIR="${{1#*=}}"
@@ -111,6 +114,11 @@ while test "$#" -gt 0; do
 			shift
 			;;
 
+		--force-autoconf)
+			enable_autoconf=2
+			shift
+			;;
+
 		--help)
 			usage
 			exit 0
@@ -126,21 +134,30 @@ while test "$#" -gt 0; do
 			shift
 			;;
 
+		--version)
+			version
+			exit 0
+			;;
+
 		-W)
-			enable=2
+			# Disable patchset
+			if ! patch_enable "$2" 2; then
+				abort "Wrong usage of -W commandline argument, expected patchname."
+			fi
+			shift
 			shift
 			;;
 
 		*)
-			abort "Unknown commandline argument $1"
-			exit 1
+			# Enable patchset
+			if ! patch_enable "$1" 1; then
+				abort "Unknown commandline argument $1."
+			fi
+			shift
+			;;
 	esac
 done
 
-if test "$enable" -ne 1; then
-	abort "Missing argument for -W, expected patchname."
-fi
-
 # Determine DESTDIR if not explicitly specified
 if test -z "$DESTDIR" -a -f ./tools/make_requests; then
 	DESTDIR="$(pwd)"
@@ -154,6 +171,85 @@ if ! cd "$DESTDIR"; then
 	abort "Unable to change directory to $DESTDIR."
 fi
 
+# Helper to update configure / the wineserver protocol if required
+if ! command -v diff >/dev/null 2>&1 ||
+   ! command -v grep >/dev/null 2>&1 ||
+   ! command -v cmp >/dev/null 2>&1; then
+
+	update_configure()
+	{{
+		autoreconf -f
+	}}
+
+	update_protocol()
+	{{
+		./tools/make_requests
+	}}
+
+else
+
+	update_configure()
+	{{
+		_file="./configure"
+
+		if ! cp -a "$_file" "$_file.old"; then
+			abort "failed to create $_file.old"
+		fi
+
+		if ! autoreconf -f; then
+			rm "$_file.old"
+			unset _file
+			return 1
+		fi
+
+		# Shifting by 62 bits is undefined behaviour when off_t is 32-bit, see also
+		# https://launchpad.net/ubuntu/+source/autoconf/2.69-6 - the bug is still
+		# present in some other distros (including Archlinux).
+		_large_off_old="^#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))$"
+		_large_off_new="#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))"
+		sed -i'' -e "s|$_large_off_old|$_large_off_new|g" "$_file"
+		unset _large_off_old _large_off_new
+
+		# Restore original timestamp when nothing changed
+		if ! cmp "$_file.old" "$_file" >/dev/null; then
+			rm "$_file.old"
+		else
+			mv "$_file.old" "$_file"
+		fi
+
+		unset _file
+		return 0
+	}}
+
+	update_protocol()
+	{{
+		_file="./include/wine/server_protocol.h"
+
+		if ! cp -a "$_file" "$_file.old"; then
+			abort "failed to create $_file.old"
+		fi
+
+		if ! ./tools/make_requests; then
+			rm "$_file.old"
+			unset _file
+			return 1
+		fi
+
+		# Restore original timestamp when nothing changed
+		if diff -u "$_file.old" "$_file" |
+		   grep -v "^[+-]#define SERVER_PROTOCOL_VERSION" |
+		   grep -v "^\(+++\|---\)" | grep -q "^[+-]"; then
+			rm "$_file.old"
+		else
+			mv "$_file.old" "$_file"
+		fi
+
+		unset _file
+		return 0
+	}}
+fi
+
+
 # Most backends will try to use git, either directly or indirectly.
 # Unfortunately this does not work when "$DESTDIR" points to a
 # subdirectory of a git tree, which has the effect that no patches
@@ -172,7 +268,12 @@ if test "$backend" = "patch"; then
 		gitapply_args=""
 	fi
 
-	patch_apply_file ()
+	if test "$enable_autoconf" -gt 1; then
+		warning "Ignoring commandline argument --force-autoconf."
+		enable_autoconf=1
+	fi
+
+	patch_apply_file()
 	{{
 		echo "Applying $1"
 		if ! "$patchdir/gitapply.sh" $gitapply_args < "$1"; then
@@ -196,18 +297,25 @@ elif test "$backend" = "epatch"; then
 		abort "Shell functions epatch/ebegin/eend not found. You have to source this script from your ebuild."
 	fi
 
-	patch_apply_file ()
+	if test "$enable_autoconf" -gt 1; then
+		warning "Ignoring commandline argument --force-autoconf."
+		enable_autoconf=1
+	fi
+
+	patch_apply_file()
 	{{
-		shortname="$(basename "$1")"
+		_shortname="$(basename "$1")"
 		if grep -q "^GIT binary patch" "$1"; then
-			ebegin "Applying $shortname"
-			"$patchdir/gitapply.sh" $gitapply_args < "$1" || \
+			ebegin "Applying $_shortname"
+			if ! "$patchdir/gitapply.sh" $gitapply_args < "$1"; then
 				die "Failed Patch: $1!"
+			fi
 			eend
 
 		else
 			epatch "$1" # epatch calls die upon failure
 		fi
+		unset _shortname
 	}}
 
 # GIT backend - apply patches using 'git am'
@@ -217,12 +325,44 @@ elif test "$backend" = "git" -o "$backend" = "git-am"; then
 		abort "Backend 'git-am' not possible when DESTDIR points to a git subdirectory."
 	fi
 
-	patch_apply_file ()
+	patch_apply_file()
 	{{
 		echo "Applying $1"
 		if ! git am "$1"; then
 			abort "Failed to apply patch, aborting!"
 		fi
+		if test "$enable_autoconf" -gt 1; then
+			_do_commit=0
+
+			# Run 'autoreconf -f' if required
+			if git show --pretty=format: --name-only | grep -q "^\(configure.ac\|aclocal.m4\)$"; then
+				if ! update_configure; then
+					abort "'autoreconf -f' failed."
+				fi
+				git add ./configure
+				git add ./include/config.h.in
+				_do_commit=1
+			fi
+
+			# Run './tools/make_requests' if required
+			if git show --pretty=format: --name-only | grep -q "^server/"; then
+				if ! update_protocol; then
+					abort "'./tools/make_requests' failed."
+				fi
+				git add ./include/wine/server_protocol.h
+				git add ./server/trace.c
+				git add ./server/request.h
+				_do_commit=1
+			fi
+
+			if test "$_do_commit" -ne 0; then
+				if ! git commit --amend --reuse-message HEAD; then
+					abort "Failed to include autogenerated changes in commit."
+				fi
+			fi
+
+			unset _do_commit
+		fi
 	}}
 
 # Git apply backend
@@ -232,7 +372,12 @@ elif test "$backend" = "git-apply"; then
 		abort "Backend 'git-apply' not possible when DESTDIR points to a git subdirectory."
 	fi
 
-	patch_apply_file ()
+	if test "$enable_autoconf" -gt 1; then
+		warning "Ignoring commandline argument --force-autoconf."
+		enable_autoconf=1
+	fi
+
+	patch_apply_file()
 	{{
 		echo "Applying $1"
 		if ! git apply "$1"; then
@@ -252,20 +397,21 @@ elif test "$backend" = "stg"; then
 	enable_patchlist=0
 	enable_autoconf=0
 
-	patch_apply_file ()
+	patch_apply_file()
 	{{
 		echo "Applying $1"
-		shortname="$(basename "$1")"
-		if ! echo "staging/$shortname" | cat - "$1" | stg import; then
+		_shortname="$(basename "$1")"
+		if ! echo "staging/$_shortname" | cat - "$1" | stg import; then
 			abort "Failed to apply patch, aborting!"
 		fi
+		unset _shortname
 	}}
 
 else
 	abort "Selected backend $backend not supported."
 fi
 
-patch_apply ()
+patch_apply()
 {{
 	patch_apply_file "$patchdir/$1"
 }}
@@ -337,13 +483,12 @@ EOF
 fi
 
 if test "$enable_autoconf" -eq 1; then
-	if ! autoreconf -f; then
+	if ! update_configure; then
 		abort "'autoreconf -f' failed."
 	fi
-	if ! ./tools/make_requests; then
+	if ! update_protocol; then
 		abort "'./tools/make_requests' failed."
 	fi
 fi
-
 # Success
 exit 0

debian/tools/patchupdate.py

@@ -43,8 +43,9 @@ import xml.dom.minidom
 _devnull = open(os.devnull, 'wb')
 
 # Cached information to speed up patch dependency checks
-latest_wine_commit  = None
-cached_patch_result = {}
+latest_wine_commit     = None
+latest_staging_version = None
+cached_patch_result    = {}
 
 class config(object):
     path_cache              = ".patchupdate.cache"
@@ -68,12 +69,14 @@ class PatchUpdaterError(RuntimeError):
 class PatchSet(object):
     def __init__(self, name, directory):
         self.name           = name
+        self.is_category    = False
         self.variable       = None
         self.directory      = directory
         self.fixes          = []
         self.changes        = []
         self.disabled       = False
         self.ifdefined      = None
+        self.categories     = []
 
         self.files          = []
         self.patches        = []
@@ -176,11 +179,13 @@ def _read_changelog():
             r = re.match("^([a-zA-Z0-9][^(]*)\((.*)\) ([^;]*)", line)
             if r: yield (r.group(1).strip(), r.group(2).strip(), r.group(3).strip())
 
-def _stable_compholio_version():
+def _latest_staging_version(only_stable=False):
     """Get version number of the latest stable release."""
     for package, version, distro in _read_changelog():
         if distro.lower() != "unreleased":
             return version
+        elif not only_stable:
+            return "%s (unreleased)" % version
 
 def _latest_wine_commit(commit=None):
     """Get latest wine commit."""
@@ -188,7 +193,7 @@ def _latest_wine_commit(commit=None):
         raise PatchUpdaterError("Please create a symlink to the wine repository in %s" % config.path_wine)
     if commit is None:
         commit = subprocess.check_output(["git", "rev-parse", "origin/master"], cwd=config.path_wine).strip()
-    assert len(commit) == 40
+    assert len(commit) == 40 and commit == commit.lower()
     return commit
 
 def enum_directories(revision, path):
@@ -230,6 +235,7 @@ def read_patchset(revision = None):
     all_patches = {}
     name_to_id  = {}
     all_bugids  = set()
+    categories  = {}
 
     # Read in sorted order (to ensure created Makefile doesn't change too much)
     for name, directory in sorted(enum_directories(revision, config.path_patches)):
@@ -294,6 +300,12 @@ def read_patchset(revision = None):
                     if i != j and any([fnmatch.fnmatch(f, val) for f in other_patch.modified_files]):
                         patch.auto_depends.add(j)
 
+            elif key == "category":
+                val = "category-%s" % val
+                if name_to_id.has_key(val):
+                    raise PatchUpdaterError("Category name in definition file %s collides with patchset %s" % (filename, val))
+                patch.categories.append(val)
+
             elif key == "fixes":
                 r = re.match("^[0-9]+$", val)
                 if r:
@@ -318,6 +330,24 @@ def read_patchset(revision = None):
             elif revision is None:
                 print "WARNING: Ignoring unknown command in definition file %s: %s" % (filename, line)
 
+        # If patch is not disabled then finally add it to the category
+        if not patch.disabled:
+            for category in patch.categories:
+                if not categories.has_key(category):
+                    categories[category] = set()
+                categories[category].add(i)
+
+
+    # Add virtual targets for all the categories
+    for category, indices in categories.iteritems():
+        patch = PatchSet(category, directory)
+        patch.is_category = True
+        patch.depends = indices
+
+        i = next(unique_id)
+        all_patches[i] = patch
+        name_to_id[name] = i
+
     # To simplify the task of keeping the bug list up-to-date, list all bugs
     # which might require attention.
     if revision is None:
@@ -543,38 +573,42 @@ def generate_script(all_patches):
             chunk_size = 20
             with progressbar.ProgressBar(desc=filename, total=2 ** len(indices) / chunk_size) as progress:
 
-                def test_apply(bitstring):
-                    set_apply = [(i, all_patches[i]) for u, i in zip(bitstring, indices) if u]
-                    set_skip  = [(i, all_patches[i]) for u, i in zip(bitstring, indices) if not u]
+                def test_apply(current):
+                    set_apply = [(i, all_patches[i]) for i in current]
+                    set_skip  = [(i, all_patches[i]) for i in indices if i not in current]
 
                     # Check if there is any patch2 which depends directly or indirectly on patch1.
                     # If this is the case we found an impossible situation, we can be skipped in this test.
                     for i, patch1 in set_apply:
                         for j, patch2 in set_skip:
                             if causal_time_smaller(patch2.verify_time, patch1.verify_time):
-                                return True # we can skip this test
+                                return None # we can skip this test
 
                     try:
                         original = original_content
                         for i, _ in set_apply:
                             original = patchutils.apply_patch(original, selected_patches[i][1], fuzz=0)
                     except patchutils.PatchApplyError:
-                        return False
+                        return current
 
-                    return True # everything is fine
+                    return None # everything is fine
 
-                def test_apply_seq(bitstrings):
-                    for bitstring in bitstrings:
-                        if not test_apply(bitstring):
-                            return False
-                    return True
+                def test_apply_seq(current_list):
+                    for current in current_list:
+                        failed = test_apply(current)
+                        if failed is not None:
+                            return failed
+                    return None
 
-                it = _split_seq(itertools.product([0,1], repeat=len(indices)), chunk_size)
-                for k, res in enumerate(pool.imap_unordered(test_apply_seq, it)):
-                    if not res:
+                iterables = []
+                for i in xrange(0, len(indices) + 1):
+                    iterables.append(itertools.combinations(indices, i))
+                it = _split_seq(itertools.chain(*iterables), chunk_size)
+                for k, failed in enumerate(pool.imap_unordered(test_apply_seq, it)):
+                    if failed is not None:
                         progress.finish("<failed to apply>")
                         raise PatchUpdaterError("Changes to file %s don't apply: %s" %
-                                                (filename, ", ".join([all_patches[i].name for i in indices])))
+                                                (filename, ", ".join([all_patches[i].name for i in failed])))
                     progress.update(k)
 
             # Update the dependency cache
@@ -590,11 +624,23 @@ def generate_script(all_patches):
     lines.append("patch_enable_all ()\n")
     lines.append("{\n")
     for i, patch in sorted([(i, all_patches[i]) for i in resolved], key=lambda x:x[1].name):
+        if patch.is_category: continue
         patch.variable = "enable_%s" % patch.name.replace("-","_").replace(".","_")
         lines.append("\t%s=\"$1\"\n" % patch.variable)
     lines.append("}\n")
     lines.append("\n")
-    lines.append("# Enable or disable a specific patchset\n")
+
+    lines.append("# Enable or disable all categories\n")
+    lines.append("category_enable_all ()\n")
+    lines.append("{\n")
+    for i, patch in sorted([(i, all_patches[i]) for i in resolved], key=lambda x:x[1].name):
+        if not patch.is_category: continue
+        patch.variable = "enable_%s" % patch.name.replace("-","_").replace(".","_")
+        lines.append("\t%s=\"$1\"\n" % patch.variable)
+    lines.append("}\n")
+    lines.append("\n")
+
+    lines.append("# Enable or disable a specific patchset/category\n")
     lines.append("patch_enable ()\n")
     lines.append("{\n")
     lines.append("\tcase \"$1\" in\n")
@@ -628,6 +674,11 @@ def generate_script(all_patches):
     # Generate code for applying all patchsets
     lines = []
     for i, patch in [(i, all_patches[i]) for i in resolved]:
+
+        # Categories do not have any files associated, so just skip over
+        if len(patch.files) == 0:
+            continue
+
         lines.append("# Patchset %s\n" % patch.name)
         lines.append("# |\n")
 
@@ -658,14 +709,16 @@ def generate_script(all_patches):
     with open(config.path_template_script) as template_fp:
         template = template_fp.read()
     with open(config.path_script, "w") as fp:
-        fp.write(template.format(patch_helpers="".join(lines_helpers).rstrip("\n"),
+        fp.write(template.format(latest_staging_version=_latest_staging_version(),
+                                 latest_wine_commit=latest_wine_commit,
+                                 patch_helpers="".join(lines_helpers).rstrip("\n"),
                                  patch_resolver="".join(lines_resolver).rstrip("\n"),
                                  patch_apply="".join(lines_apply).rstrip("\n")))
 
     # Add changes to git
     subprocess.call(["git", "add", config.path_script])
 
-def generate_markdown(all_patches, stable_patches, stable_compholio_version):
+def generate_markdown(all_patches, stable_patches):
     """Generate README.md including information about specific patches and bugfixes."""
 
     def _format_bug(mode, bugid, bugname):
@@ -685,11 +738,20 @@ def generate_markdown(all_patches, stable_patches, stable_compholio_version):
     # Compare with fixes for latest stable version
     for _, patch in stable_patches.iteritems():
         for bugid, bugname in patch.fixes:
-            key = bugid if bugid is not None else bugname
-            if all_fixes.has_key(key):
-                all_fixes[key][0] = 0
+            if bugid is not None and all_fixes.has_key(bugid):
+                all_fixes[bugid][0] = 0
+            elif all_fixes.has_key(bugname):
+                all_fixes[bugname][0] = 0
+            elif bugid is None:
+                for k, v in all_fixes.iteritems():
+                    if v[2] != bugname: continue
+                    if v[1] is None: continue
+                    all_fixes[v[1]][0] = 0
+                    break
+                else:
+                    all_fixes[bugname] = [-1, None, bugname]
             else:
-                all_fixes[key] = [-1, bugid, bugname]
+                all_fixes[bugid] = [-1, bugid, bugname]
 
     # Generate lists for all new and old fixes
     new_fixes = [(mode, bugid, bugname) for dummy, (mode, bugid, bugname) in
@@ -711,7 +773,7 @@ def generate_markdown(all_patches, stable_patches, stable_compholio_version):
             lines.append(_format_bug(mode, bugid, bugname))
         lines.append("")
         lines.append("")
-    lines.append("**Bug fixes and features in Wine Staging %s [%d]:**" % (stable_compholio_version, len(old_fixes)))
+    lines.append("**Bug fixes and features in Wine Staging %s [%d]:**" % (latest_staging_version, len(old_fixes)))
     lines.append("")
     lines.append("*Note: The following list only contains features and bug fixes which are not")
     lines.append("yet available in vanilla Wine. They are removed from the list as soon as they")
@@ -732,6 +794,25 @@ def generate_markdown(all_patches, stable_patches, stable_compholio_version):
     # Add changes to git
     subprocess.call(["git", "add", config.path_README_md])
 
+def wrap_changelog():
+
+    lines = []
+    with open(config.path_changelog) as fp:
+        for line in fp:
+            if line.startswith("  *") and len(line.rstrip("\n")) > 80:
+                wrapped = textwrap.wrap(line[3:].strip(), 80 - 4)
+                lines.append("  * %s\n" % "\n    ".join(wrapped))
+            else:
+                lines.append(line)
+
+    with open(config.path_changelog, "w") as fp:
+        for line in lines:
+            fp.write(line)
+
+    # Add changes to git
+    subprocess.call(["git", "add", config.path_changelog])
+
+
 if __name__ == "__main__":
 
     # Hack to avoid KeyboardInterrupts on different threads
@@ -740,19 +821,23 @@ if __name__ == "__main__":
         raise RuntimeError("CTRL+C pressed")
     signal.signal(signal.SIGINT, _sig_int)
 
+    tools_directory = os.path.dirname(os.path.realpath(__file__))
+    os.chdir(os.path.join(tools_directory, "./../.."))
+
     try:
 
-        # Get information about Wine and Compholio version
+        # Get information about Wine and Staging version
         latest_wine_commit       = _latest_wine_commit(sys.argv[1] if len(sys.argv) >= 2 else None)
-        stable_compholio_version = _stable_compholio_version()
+        latest_staging_version   = _latest_staging_version(only_stable=True)
 
         # Read current and stable patches
         all_patches    = read_patchset()
-        stable_patches = read_patchset(revision="v%s" % stable_compholio_version)
+        stable_patches = read_patchset(revision="v%s" % latest_staging_version)
 
         generate_ifdefined(all_patches)
         generate_script(all_patches)
-        generate_markdown(all_patches, stable_patches, stable_compholio_version)
+        generate_markdown(all_patches, stable_patches)
+        wrap_changelog()
 
     except PatchUpdaterError as e:
         print ""

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

@@ -1,4 +1,4 @@
-From aa76ae0448583e87dbe7f374101eb5b20d55dea8 Mon Sep 17 00:00:00 2001
+From 267583000e05b5ed8da1122df0830556fe7e69f6 Mon Sep 17 00:00:00 2001
 From: "Erich E. Hoover" <erich.e.hoover@gmail.com>
 Date: Fri, 8 Aug 2014 19:33:14 -0600
 Subject: Appease the blessed version of gcc (4.5) when -Werror is enabled.
@@ -12,10 +12,10 @@ Subject: Appease the blessed version of gcc (4.5) when -Werror is enabled.
  5 files changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c
-index 0c10ffa..2f35992 100644
+index f9cb71c..81f6131 100644
 --- a/dlls/d3d9/tests/visual.c
 +++ b/dlls/d3d9/tests/visual.c
-@@ -11161,7 +11161,7 @@ static void yuv_layout_test(void)
+@@ -11967,7 +11967,7 @@ static void yuv_layout_test(void)
      IDirect3D9 *d3d;
      D3DCOLOR color;
      DWORD ref_color;
@@ -25,7 +25,7 @@ index 0c10ffa..2f35992 100644
      IDirect3DDevice9 *device;
      ULONG refcount;
 diff --git a/dlls/netapi32/netapi32.c b/dlls/netapi32/netapi32.c
-index d2a61fa..bb7ac1c 100644
+index 7a1d408..649c866 100644
 --- a/dlls/netapi32/netapi32.c
 +++ b/dlls/netapi32/netapi32.c
 @@ -779,7 +779,7 @@ static NET_API_STATUS share_info_to_samba( DWORD level, const BYTE *buf, unsigne
@@ -38,7 +38,7 @@ index d2a61fa..bb7ac1c 100644
  
      if (servername && !(server = strdup_unixcp( servername ))) return ERROR_OUTOFMEMORY;
 diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c
-index e32cb54..ddf972d 100644
+index 14eac39..ebff9f1 100644
 --- a/dlls/winealsa.drv/mmdevdrv.c
 +++ b/dlls/winealsa.drv/mmdevdrv.c
 @@ -359,7 +359,7 @@ static WCHAR *construct_device_id(EDataFlow flow, const WCHAR *chunk1, const cha
@@ -51,18 +51,18 @@ index e32cb54..ddf972d 100644
      static const WCHAR dashW[] = {' ','-',' ',0};
      static const size_t dashW_len = (sizeof(dashW) / sizeof(*dashW)) - 1;
 diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
-index f3e921c..fa64436 100644
+index f69a2ce..00232a5 100644
 --- a/dlls/wined3d/glsl_shader.c
 +++ b/dlls/wined3d/glsl_shader.c
-@@ -5834,7 +5834,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const
+@@ -6706,7 +6706,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const
      GLuint vs_id = 0;
      GLuint gs_id = 0;
      GLuint ps_id = 0;
 -    struct list *ps_list, *vs_list;
 +    struct list *ps_list = NULL, *vs_list = NULL;
+     WORD attribs_map;
+     struct wined3d_string_buffer *tmp_name;
  
-     if (!(context->shader_update_mask & (1 << WINED3D_SHADER_TYPE_VERTEX)))
-     {
 diff --git a/tools/makedep.c b/tools/makedep.c
 index 54aab45..103422e 100644
 --- a/tools/makedep.c
@@ -77,5 +77,5 @@ index 54aab45..103422e 100644
      expand = get_make_variable( make, name );
      if (!expand) return NULL;
 -- 
-2.2.1
+2.4.2
 

patches/Compiler_Warnings/definition

@@ -0,0 +1 @@
+Category: stable

patches/Coverity/0001-ws2_32-Fix-uninitialized-memory-access-in-do_poll-Co.patch

@@ -0,0 +1,25 @@
+From eba72a3ed5d6f61c92ce2926d8305d19dc66425b Mon Sep 17 00:00:00 2001
+From: Sebastian Lackner <sebastian@fds-team.de>
+Date: Sat, 30 May 2015 17:08:18 +0200
+Subject: ws2_32: Fix uninitialized memory access in do_poll (Coverity).
+
+---
+ dlls/ws2_32/socket.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c
+index fdf68a3..60c6ec5 100644
+--- a/dlls/ws2_32/socket.c
++++ b/dlls/ws2_32/socket.c
+@@ -4794,7 +4794,7 @@ static int do_poll(struct pollfd *pollfds, int count, int timeout)
+     struct timeval tv1, tv2;
+     int ret, torig = timeout;
+ 
+-    if (timeout > 0) gettimeofday( &tv1, 0 );
++    if (timeout >= 0) gettimeofday( &tv1, 0 );
+ 
+     while ((ret = poll( pollfds, count, timeout )) < 0)
+     {
+-- 
+2.4.2
+

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

@@ -1,4 +1,4 @@
-From 948a8706d6045fb6f8f624072bfa6ab97e91dc16 Mon Sep 17 00:00:00 2001
+From 598daa857778080524e3de4a5668a834ab084564 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Thu, 2 Oct 2014 19:44:31 +0200
 Subject: kernel32: Add winediag message to show warning, that this isn't
@@ -9,7 +9,7 @@ Subject: kernel32: Add winediag message to show warning, that this isn't
  1 file changed, 10 insertions(+)
 
 diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c
-index 0a087ab..1052a79 100644
+index 2c8074b..70b2579 100644
 --- a/dlls/kernel32/process.c
 +++ b/dlls/kernel32/process.c
 @@ -65,6 +65,7 @@
@@ -27,15 +27,15 @@ index 0a087ab..1052a79 100644
 +    /* Wine developers don't like it, when bug are reported with Wine versions containing our patches. */
 +    if (CreateEventA(0, 0, 0, "__winestaging_warn_event") && GetLastError() != ERROR_ALREADY_EXISTS)
 +    {
-+        FIXME_(winediag)("Wine Staging is a testing version containing experimental patches.\n");
++        FIXME_(winediag)("Wine Staging %s is a testing version containing experimental patches.\n", wine_get_version());
 +        FIXME_(winediag)("Please report bugs at http://bugs.wine-staging.com (instead of winehq.org).\n");
 +    }
 +    else
-+        WARN_(winediag)("Wine Staging is a testing version containing experimental patches.\n");
++        WARN_(winediag)("Wine Staging %s is a testing version containing experimental patches.\n", wine_get_version());
 +
      SetLastError( 0 );  /* clear error code */
      if (peb->BeingDebugged) DbgBreakPoint();
      return call_process_entry( peb, entry );
 -- 
-2.1.3
+2.4.1
 

patches/Staging/0006-loader-Print-library-paths-for-check-libs-on-Mac-OS-.patch

@@ -0,0 +1,64 @@
+From b4a2543264f9eb91fc259a81dea872eee3c14aba Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
+Date: Sat, 27 Jun 2015 19:28:51 +0200
+Subject: loader: Print library paths for --check-libs on Mac OS X.
+
+---
+ loader/main.c | 27 ++++++++++++++++++++++++++-
+ 1 file changed, 26 insertions(+), 1 deletion(-)
+
+diff --git a/loader/main.c b/loader/main.c
+index 44804e1..4d9126e 100644
+--- a/loader/main.c
++++ b/loader/main.c
+@@ -48,6 +48,7 @@
+ #include "main.h"
+ 
+ #ifdef __APPLE__
++#include <mach-o/dyld.h>
+ 
+ #ifndef __clang__
+ __asm__(".zerofill WINE_DOS, WINE_DOS, ___wine_dos, 0x40000000");
+@@ -73,6 +74,26 @@ static inline void reserve_area( void *addr, size_t size )
+     wine_mmap_add_reserved_area( addr, size );
+ }
+ 
++static const char *get_macho_library_path( const char *libname )
++{
++    unsigned int path_len, libname_len = strlen( libname );
++    uint32_t i, count = _dyld_image_count();
++
++    for (i = 0; i < count; i++)
++    {
++        const char *path = _dyld_get_image_name( i );
++        if (!path) continue;
++
++        path_len = strlen( path );
++        if (path_len < libname_len + 1) continue;
++        if (path[path_len - libname_len - 1] != '/') continue;
++        if (strcmp( path + path_len - libname_len, libname )) continue;
++
++        return path;
++    }
++    return NULL;
++}
++
+ #else  /* __APPLE__ */
+ 
+ /* the preloader will set this variable */
+@@ -181,7 +202,11 @@ static void check_command_line( int argc, char *argv[] )
+                 else
+             #endif
+                 {
+-                    printf( "%s: found\n", *wine_libs );
++                    const char *path = NULL;
++                #ifdef __APPLE__
++                    path = get_macho_library_path( *wine_libs );
++                #endif
++                    printf( "%s: %s\n", *wine_libs, path ? path : "found");
+                 }
+                 wine_dlclose( lib_handle, NULL, 0 );
+             }
+-- 
+2.4.3
+

patches/Staging/definition

@@ -0,0 +1 @@
+Category: stable

patches/advapi32-LsaLookupSids/0004-advapi32-Fallback-to-Sid-string-when-LookupAccountSi.patch

@@ -1,14 +1,14 @@
-From 9a19e77a0334f91e370e73099066484f20b24321 Mon Sep 17 00:00:00 2001
+From 616c17cc58a4943d3a367704943e737d5713740d Mon Sep 17 00:00:00 2001
 From: Qian Hong <qhong@codeweavers.com>
 Date: Tue, 7 Apr 2015 11:23:34 +0800
 Subject: advapi32: Fallback to Sid string when LookupAccountSid fails.
 
 ---
- dlls/advapi32/lsa.c | 30 ++++++++++++++++++++++++++++++
- 1 file changed, 30 insertions(+)
+ dlls/advapi32/lsa.c | 31 +++++++++++++++++++++++++++++++
+ 1 file changed, 31 insertions(+)
 
 diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c
-index 258b8ca..2b2c6b6 100644
+index 258b8ca..93afa20 100644
 --- a/dlls/advapi32/lsa.c
 +++ b/dlls/advapi32/lsa.c
 @@ -29,6 +29,7 @@
@@ -41,7 +41,7 @@ index 258b8ca..2b2c6b6 100644
      }
  
      /* now we have full length needed for both */
-@@ -593,6 +609,20 @@ NTSTATUS WINAPI LsaLookupSids(
+@@ -593,6 +609,21 @@ NTSTATUS WINAPI LsaLookupSids(
                  heap_free(domain.Buffer);
              }
          }
@@ -52,6 +52,7 @@ index 258b8ca..2b2c6b6 100644
 +            if (ConvertSidToStringSidW(Sids[i], &strsid))
 +            {
 +                name_size = strlenW(strsid) + 1;
++                mapped++;
 +
 +                (*Names)[i].Name.Buffer = name_buffer;
 +                memcpy((*Names)[i].Name.Buffer, strsid, name_size * sizeof(WCHAR));

patches/advapi32-LsaLookupSids/0005-advapi32-tests-Test-prefix-and-use-of-TokenPrimaryGr.patch

@@ -0,0 +1,95 @@
+From f0290aad953e988b1a15e214ecfc57f21dc136af Mon Sep 17 00:00:00 2001
+From: Qian Hong <qhong@codeweavers.com>
+Date: Tue, 28 Apr 2015 23:28:50 +0800
+Subject: advapi32/tests: Test prefix and use of TokenPrimaryGroup Sid.
+
+---
+ dlls/advapi32/tests/security.c | 35 ++++++++++++++++++++++++++++++-----
+ 1 file changed, 30 insertions(+), 5 deletions(-)
+
+diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
+index f3fc682..6a716d6 100644
+--- a/dlls/advapi32/tests/security.c
++++ b/dlls/advapi32/tests/security.c
+@@ -2514,19 +2514,21 @@ static void test_granted_access(HANDLE handle, ACCESS_MASK access,
+ static void test_process_security(void)
+ {
+     BOOL res;
++    PTOKEN_USER user;
+     PTOKEN_OWNER owner;
+     PTOKEN_PRIMARY_GROUP group;
+-    PSID AdminSid = NULL, UsersSid = NULL;
++    PSID AdminSid = NULL, UsersSid = NULL, UserSid = NULL;
+     PACL Acl = NULL, ThreadAcl = NULL;
+     SECURITY_DESCRIPTOR *SecurityDescriptor = NULL, *ThreadSecurityDescriptor = NULL;
+-    char buffer[MAX_PATH];
++    char buffer[MAX_PATH], account[MAX_PATH], domain[MAX_PATH];
+     PROCESS_INFORMATION info;
+     STARTUPINFOA startup;
+     SECURITY_ATTRIBUTES psa, tsa;
+     HANDLE token, event;
+-    DWORD size;
++    DWORD size, acc_size, dom_size, ret;
+     SID_IDENTIFIER_AUTHORITY SIDAuthWorld = { SECURITY_WORLD_SID_AUTHORITY };
+     PSID EveryoneSid = NULL;
++    SID_NAME_USE use;
+ 
+     Acl = HeapAlloc(GetProcessHeap(), 0, 256);
+     res = InitializeAcl(Acl, 256, ACL_REVISION);
+@@ -2558,7 +2560,8 @@ static void test_process_security(void)
+     owner = HeapAlloc(GetProcessHeap(), 0, size);
+     res = GetTokenInformation( token, TokenOwner, owner, size, &size );
+     ok(res, "GetTokenInformation failed with error %d\n", GetLastError());
+-    AdminSid = ((TOKEN_OWNER*)owner)->Owner;
++    AdminSid = owner->Owner;
++    test_sid_str(AdminSid);
+ 
+     res = GetTokenInformation( token, TokenPrimaryGroup, NULL, 0, &size );
+     ok(!res, "Expected failure, got %d\n", res);
+@@ -2568,13 +2571,34 @@ static void test_process_security(void)
+     group = HeapAlloc(GetProcessHeap(), 0, size);
+     res = GetTokenInformation( token, TokenPrimaryGroup, group, size, &size );
+     ok(res, "GetTokenInformation failed with error %d\n", GetLastError());
+-    UsersSid = ((TOKEN_PRIMARY_GROUP*)group)->PrimaryGroup;
++    UsersSid = group->PrimaryGroup;
++    test_sid_str(UsersSid);
++
++    acc_size = sizeof(account);
++    dom_size = sizeof(domain);
++    ret = LookupAccountSidA( NULL, UsersSid, account, &acc_size, domain, &dom_size, &use );
++    ok(ret, "LookupAccountSid failed with %d\n", ret);
++    todo_wine ok(use == SidTypeGroup, "expect SidTypeGroup, got %d\n", use);
++    todo_wine ok(!strcmp(account, "None"), "expect None, got %s\n", account);
++
++    res = GetTokenInformation( token, TokenUser, NULL, 0, &size );
++    ok(!res, "Expected failure, got %d\n", res);
++    ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER,
++       "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError());
++
++    user = HeapAlloc(GetProcessHeap(), 0, size);
++    res = GetTokenInformation( token, TokenUser, user, size, &size );
++    ok(res, "GetTokenInformation failed with error %d\n", GetLastError());
++    UserSid = user->User.Sid;
++    test_sid_str(UserSid);
++    todo_wine ok(EqualPrefixSid(UsersSid, UserSid), "TokenPrimaryGroup Sid and TokenUser Sid don't match.\n");
+ 
+     CloseHandle( token );
+     if (!res)
+     {
+         HeapFree(GetProcessHeap(), 0, group);
+         HeapFree(GetProcessHeap(), 0, owner);
++        HeapFree(GetProcessHeap(), 0, user);
+         HeapFree(GetProcessHeap(), 0, Acl);
+         return;
+     }
+@@ -2681,6 +2705,7 @@ static void test_process_security(void)
+     CloseHandle( event );
+     HeapFree(GetProcessHeap(), 0, group);
+     HeapFree(GetProcessHeap(), 0, owner);
++    HeapFree(GetProcessHeap(), 0, user);
+     HeapFree(GetProcessHeap(), 0, Acl);
+     HeapFree(GetProcessHeap(), 0, SecurityDescriptor);
+     HeapFree(GetProcessHeap(), 0, ThreadAcl);
+-- 
+2.3.5
+

patches/advapi32-LsaLookupSids/0006-server-Create-primary-group-using-DOMAIN_GROUP_RID_U.patch

@@ -0,0 +1,38 @@
+From 5487b4720e24aaa7a10719fc36bc23c851a48a9b Mon Sep 17 00:00:00 2001
+From: Qian Hong <qhong@codeweavers.com>
+Date: Tue, 28 Apr 2015 22:35:26 +0800
+Subject: server: Create primary group using DOMAIN_GROUP_RID_USERS.
+
+---
+ dlls/advapi32/tests/security.c | 2 +-
+ server/token.c                 | 1 +
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
+index 25b34ba4..573119f 100644
+--- a/dlls/advapi32/tests/security.c
++++ b/dlls/advapi32/tests/security.c
+@@ -2591,7 +2591,7 @@ static void test_process_security(void)
+     ok(res, "GetTokenInformation failed with error %d\n", GetLastError());
+     UserSid = user->User.Sid;
+     test_sid_str(UserSid);
+-    todo_wine ok(EqualPrefixSid(UsersSid, UserSid), "TokenPrimaryGroup Sid and TokenUser Sid don't match.\n");
++    ok(EqualPrefixSid(UsersSid, UserSid), "TokenPrimaryGroup Sid and TokenUser Sid don't match.\n");
+ 
+     CloseHandle( token );
+     if (!res)
+diff --git a/server/token.c b/server/token.c
+index e57cbc6..be8c53b 100644
+--- a/server/token.c
++++ b/server/token.c
+@@ -695,6 +695,7 @@ struct token *token_create_admin( void )
+             { security_local_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY },
+             { security_interactive_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY },
+             { security_authenticated_user_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY },
++            { security_domain_users_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY|SE_GROUP_OWNER },
+             { alias_admins_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY|SE_GROUP_OWNER },
+             { alias_users_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY },
+             { logon_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY|SE_GROUP_LOGON_ID },
+-- 
+2.3.5
+

patches/advapi32-LsaLookupSids/0007-advapi32-Fix-name-and-use-of-DOMAIN_GROUP_RID_USERS.patch

@@ -0,0 +1,53 @@
+From 83517396c266c2de290670128d678770f5d79cc9 Mon Sep 17 00:00:00 2001
+From: Qian Hong <qhong@codeweavers.com>
+Date: Tue, 28 Apr 2015 23:00:08 +0800
+Subject: advapi32: Fix name and use of DOMAIN_GROUP_RID_USERS.
+
+---
+ dlls/advapi32/security.c       | 7 +++++--
+ dlls/advapi32/tests/security.c | 4 ++--
+ 2 files changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c
+index d27b2e7..2362dd5 100644
+--- a/dlls/advapi32/security.c
++++ b/dlls/advapi32/security.c
+@@ -191,7 +191,7 @@ static const WCHAR Domain_Admins[] = { 'D','o','m','a','i','n',' ','A','d','m','
+ static const WCHAR Domain_Computers[] = { 'D','o','m','a','i','n',' ','C','o','m','p','u','t','e','r','s',0 };
+ static const WCHAR Domain_Controllers[] = { 'D','o','m','a','i','n',' ','C','o','n','t','r','o','l','l','e','r','s',0 };
+ static const WCHAR Domain_Guests[] = { 'D','o','m','a','i','n',' ','G','u','e','s','t','s',0 };
+-static const WCHAR Domain_Users[] = { 'D','o','m','a','i','n',' ','U','s','e','r','s',0 };
++static const WCHAR None[] = { 'N','o','n','e',0 };
+ static const WCHAR Enterprise_Admins[] = { 'E','n','t','e','r','p','r','i','s','e',' ','A','d','m','i','n','s',0 };
+ static const WCHAR ENTERPRISE_DOMAIN_CONTROLLERS[] = { 'E','N','T','E','R','P','R','I','S','E',' ','D','O','M','A','I','N',' ','C','O','N','T','R','O','L','L','E','R','S',0 };
+ static const WCHAR Everyone[] = { 'E','v','e','r','y','o','n','e',0 };
+@@ -2206,7 +2206,10 @@ LookupAccountSidW(
+                             ac = Domain_Admins;
+                             break;
+                         case DOMAIN_GROUP_RID_USERS:
+-                            ac = Domain_Users;
++                            /* MSDN says the name of DOMAIN_GROUP_RID_USERS is Domain Users,
++                             * tests show that MSDN seems to be wrong. */
++                            ac = None;
++                            use = 2;
+                             break;
+                         case DOMAIN_GROUP_RID_GUESTS:
+                             ac = Domain_Guests;
+diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
+index 573119f..490ce26 100644
+--- a/dlls/advapi32/tests/security.c
++++ b/dlls/advapi32/tests/security.c
+@@ -2578,8 +2578,8 @@ static void test_process_security(void)
+     dom_size = sizeof(domain);
+     ret = LookupAccountSidA( NULL, UsersSid, account, &acc_size, domain, &dom_size, &use );
+     ok(ret, "LookupAccountSid failed with %d\n", ret);
+-    todo_wine ok(use == SidTypeGroup, "expect SidTypeGroup, got %d\n", use);
+-    todo_wine ok(!strcmp(account, "None"), "expect None, got %s\n", account);
++    ok(use == SidTypeGroup, "expect SidTypeGroup, got %d\n", use);
++    ok(!strcmp(account, "None"), "expect None, got %s\n", account);
+ 
+     res = GetTokenInformation( token, TokenUser, NULL, 0, &size );
+     ok(!res, "Expected failure, got %d\n", res);
+-- 
+2.3.5
+

patches/advapi32-LsaLookupSids/definition

@@ -0,0 +1,2 @@
+Depends: server-Misc_ACL
+Depends: server-CreateProcess_ACLs

patches/combase-String/definition

@@ -1 +1,2 @@
 Fixes: Implement combase.WindowsSubstring function
+Category: stable

patches/configure-Absolute_RPATH/definition

@@ -1 +1,2 @@
 Fixes: [26256] Support for setcap on wine-preloader
+Category: stable

patches/configure-Crosscompiling/0001-configure.ac-Search-for-otool-using-AC_CHECK_TOOL.patch

@@ -0,0 +1,39 @@
+From 463cba8291e1dba1f381e0930926bc0c4bc26916 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
+Date: Sun, 21 Jun 2015 20:00:18 +0200
+Subject: configure.ac: Search for otool using AC_CHECK_TOOL.
+
+This is necessary to allow using otool from custom host toolchains like i686-apple-darwin12-otool.
+---
+ aclocal.m4   | 2 +-
+ configure.ac | 1 +
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/aclocal.m4 b/aclocal.m4
+index 3d43721..9993de1 100644
+--- a/aclocal.m4
++++ b/aclocal.m4
+@@ -62,7 +62,7 @@ LIBS="-l$1 $5 $LIBS"
+   AC_LINK_IFELSE([AC_LANG_CALL([], [$2])],
+   [case "$LIBEXT" in
+     dll) AS_VAR_SET(ac_Lib,[`$ac_cv_path_LDD conftest.exe | grep "$1" | sed -e "s/dll.*/dll/"';2,$d'`]) ;;
+-    dylib) AS_VAR_SET(ac_Lib,[`otool -L conftest$ac_exeext | grep "ac_lib_pattern\\.[[0-9A-Za-z.]]*dylib" | sed -e "s/^.*\/\(ac_lib_pattern\.[[0-9A-Za-z.]]*dylib\).*$/\1/"';2,$d'`]) ;;
++    dylib) AS_VAR_SET(ac_Lib,[`$ac_cv_prog_OTOOL -L conftest$ac_exeext | grep "ac_lib_pattern\\.[[0-9A-Za-z.]]*dylib" | sed -e "s/^.*\/\(ac_lib_pattern\.[[0-9A-Za-z.]]*dylib\).*$/\1/"';2,$d'`]) ;;
+     *) AS_VAR_SET(ac_Lib,[`$READELF -d conftest$ac_exeext | grep "NEEDED.*ac_lib_pattern\\.$LIBEXT" | sed -e "s/^.*\\m4_dquote(\\(ac_lib_pattern\\.$LIBEXT[[^	 ]]*\\)\\).*$/\1/"';2,$d'`])
+        AS_VAR_IF([ac_Lib],[],
+              [AS_VAR_SET(ac_Lib,[`$LDD conftest$ac_exeext | grep "ac_lib_pattern\\.$LIBEXT" | sed -e "s/^.*\(ac_lib_pattern\.$LIBEXT[[^	 ]]*\).*$/\1/"';2,$d'`])]) ;;
+diff --git a/configure.ac b/configure.ac
+index f9df3f0..3587a12 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -268,6 +268,7 @@ fi
+ 
+ AC_CHECK_TOOLS(AR,[ar gar],ar)
+ AC_CHECK_TOOL(STRIP,strip,strip)
++AC_CHECK_TOOL(OTOOL,otool,otool)
+ AC_SUBST(ARFLAGS,rc)
+ AC_PROG_RANLIB
+ AC_PROG_LN_S
+-- 
+2.4.3
+

patches/configure-Crosscompiling/0002-configure.ac-Remove-check-for-strength-reduce-bug.patch

@@ -0,0 +1,42 @@
+From eb555bcc219bdd332d0bff45aa66c26f7a846307 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
+Date: Sun, 21 Jun 2015 20:04:34 +0200
+Subject: configure.ac: Remove check for strength-reduce bug.
+
+This was bug was fixed in gcc-2.7.2.1 which was released 19 years ago.
+When cross compiling, the configure check currently assumes that the bug
+is present, which produces a lot of noise with non-gcc compilers.
+---
+ configure.ac | 16 ----------------
+ 1 file changed, 16 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 3587a12..fa6a542 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1788,22 +1788,6 @@ if test "x${GCC}" = "xyes"
+ then
+   EXTRACFLAGS="-Wall -pipe"
+ 
+-  dnl Check for strength-reduce bug
+-  AC_CACHE_CHECK( [for gcc strength-reduce bug], ac_cv_c_gcc_strength_bug,
+-                  AC_RUN_IFELSE([AC_LANG_PROGRAM([[int L[[4]] = {0,1,2,3};]],
+-[[static int Array[[3]];
+-  unsigned int B = 3;
+-  int i;
+-  for(i=0; i<B; i++) Array[[i]] = i - 3;
+-  for(i=0; i<4 - 1; i++) L[[i]] = L[[i + 1]];
+-  L[[i]] = 4;
+-  return (Array[[1]] != -2 || L[[2]] != 3)]])],
+-    [ac_cv_c_gcc_strength_bug="no"],[ac_cv_c_gcc_strength_bug="yes"],[ac_cv_c_gcc_strength_bug="yes"]) )
+-  if test "$ac_cv_c_gcc_strength_bug" = "yes"
+-  then
+-    EXTRACFLAGS="$EXTRACFLAGS -fno-strength-reduce"
+-  fi
+-
+   dnl Check for some compiler flags
+   WINE_TRY_CFLAGS([-fno-builtin],[AC_SUBST(BUILTINFLAG,"-fno-builtin")])
+   WINE_TRY_CFLAGS([-fno-strict-aliasing])
+-- 
+2.4.3
+