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.44 [235]:**
+**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
@@ -49,13 +49,14 @@ releases, take a look at the
 for more details.*
 
 * Add HTTP Host header in HttpSendRequest instead of HttpOpenRequest ([Wine Bug #28911](https://bugs.winehq.org/show_bug.cgi?id=28911))
-* Add IEnumString stub interface for ACLShellSource ([Wine Bug #18019](https://bugs.winehq.org/show_bug.cgi?id=18019))
 * Add a ProfileList\<UserSID> registry subkey ([Wine Bug #15670](https://bugs.winehq.org/show_bug.cgi?id=15670))
 * 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 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
@@ -64,10 +65,7 @@ for more details.*
 * Add stub for D3DXIntersect
 * Add stub for NtSetLdtEntries/ZwSetLdtEntries ([Wine Bug #26268](https://bugs.winehq.org/show_bug.cgi?id=26268))
 * Add stub for d3d11.D3D11CreateDeviceAndSwapChain ([Wine Bug #33153](https://bugs.winehq.org/show_bug.cgi?id=33153))
-* Add stub for fltlib.FilterLoad ([Wine Bug #38435](https://bugs.winehq.org/show_bug.cgi?id=38435))
 * Add stub for gdiplus.GdipCreateEffect ([Wine Bug #32163](https://bugs.winehq.org/show_bug.cgi?id=32163))
-* Add stub for iphlpapi.ConvertInterfaceLuidToGuid ([Wine Bug #38576](https://bugs.winehq.org/show_bug.cgi?id=38576))
-* Add stub for kernel32.SetFileCompletionNotificationModes (for Steam in Win7 mode) ([Wine Bug #38493](https://bugs.winehq.org/show_bug.cgi?id=38493))
 * Add stub for ntoskrnl.ExAcquireResourceExclusiveLite
 * Add stub for ntoskrnl.ExDeleteResourceLite
 * Add stub for ntoskrnl.ExReleaseResourceForThread
@@ -76,6 +74,7 @@ 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
@@ -88,11 +87,10 @@ for more details.*
 * 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 #36704](https://bugs.winehq.org/show_bug.cgi?id=36704))
+* 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))
-* Also handle '\r' as whitespace in wbemprox queries
-* Also output winedbg system information to the terminal, not only to dialog
+* 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))
@@ -112,27 +110,26 @@ for more details.*
 * D3DCompileShader should filter specific warning messages ([Wine Bug #33770](https://bugs.winehq.org/show_bug.cgi?id=33770))
 * 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 use unixfs for devices without mountpoint
-* Emulate access to KI_USER_SHARED_DATA kernel page on x86_64 ([Wine Bug #33849](https://bugs.winehq.org/show_bug.cgi?id=33849))
 * 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 NULL pointer dereference in get_frame_by_name ([Wine Bug #34982](https://bugs.winehq.org/show_bug.cgi?id=34982))
 * 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 Gothic 1/2 with builtin directmusic caused by wrong return value ([Wine Bug #7425](https://bugs.winehq.org/show_bug.cgi?id=7425))
 * 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))
@@ -159,31 +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))
+* 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))
-* 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))
 * 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))
-* 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
@@ -194,35 +192,39 @@ for more details.*
 * 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))
-* 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))
-* OpenClipboard with current owner shouldn't fail ([Wine Bug #2805](https://bugs.winehq.org/show_bug.cgi?id=2805))
+* 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))
-* Python PIP needs better NtQueryInformationJobObject stub
 * Reduced SetTimer minimum value from 10 ms to 5 ms (improves Silverlight framerates)
 * Return an error when trying to open a terminated process ([Wine Bug #37087](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 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))
-* Revert patch which causes broken rendering in various games ([Wine Bug #38654](https://bugs.winehq.org/show_bug.cgi?id=38654))
+* 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 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)
@@ -237,10 +239,7 @@ for more details.*
 * 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 GdipCreateRegionRgnData ([Wine Bug #34843](https://bugs.winehq.org/show_bug.cgi?id=34843))
 * 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))
@@ -251,14 +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 ObjectTypeInformation class support in NtQueryObject
+* 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))
@@ -272,15 +272,16 @@ for more details.*
 * 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))
-* Use random names when caching very long urls in wininet
 * 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))
+* 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/changelog

@@ -1,3 +1,121 @@
+wine-staging (1.7.46) unstable; urgency=low
+  * Add reference to upstream bug report for various patchsets.
+  * Added patch to improve IoGetDeviceObjectPointer stub to appease SecuROM 5.x.
+  * Added patch to globally invalidate key state on changes in other threads.
+  * Added patch to fix possible use-after-free in wineserver device IPR code.
+  * Added patch to fix wineserver crash when pipe server object is destroyed
+    before client (fixes Wine Staging Bug #393).
+  * Added patches to improve crosscompiling Wine for other platforms.
+  * Added patch to improve output of '--check-libs' on OSX.
+  * Added patch to implement general tab for file property dialog.
+  * Added patch to initialize *lpcDevices in RasEnumDevicesA.
+  * Improved nvcuda-CUDA_Support patchset to search for dylib on OSX.
+  * Improved wined3d-DXTn patchset to search for dylib on OSX.
+  * Updated kernel32-GetVolumePathName to fix several test failures.
+  * Updated ntoskrnl-Emulator patchset to implement emulation of MOVZX
+    instruction on x86_64.
+  * Updated patchset ntdll-WRITECOPY to be compatible with OSX (fixes Wine
+    Staging Bug #399).
+  * Disable patch to avoid crash when NULL pointer is passed to atof / strtod
+    functions (fixed upstream).
+  * Removed patch for implementation of GdipCreateRegionRgnData (accepted
+    upstream).
+  * Removed patch to fix output buffer size for IOCTL_DVD_READ_STRUCTURE
+    requests (accepted upstream).
+  * Removed patch to add stub for kernel32.SetFileCompletionNotificationModes
+    (accepted upstream).
+  * Removed patch to use random names when caching very long urls in wininet
+    (accepted upstream).
+  * Removed patch to fix link notification conditions for riched20 (accepted
+    upstream).
+  * Removed patch to emulate access to USER_SHARE_DATA on x86_64 (accepted
+    upstream).
+  * Removed patch to fix possible use-after-free in wineserver device IPR code
+    (accepted upstream).
+  * Removed patches to implement GetVolumePathName (accepted upstream).
+  * Removed patch for advapi32.GetWindowsAccountDomainSid (accepted upstream).
+  * Removed patch for stub implementation of fltlib.FilterLoad (accepted
+    upstream).
+  * Removed patch for AT_ROUND_TO_PAGE support in NtMapViewOfSection (accepted
+    upstream).
+  * Removed patch to fix linking against libunwind on Linux (fixed upstream).
+ -- Sebastian Lackner <sebastian@fds-team.de>  Sun, 28 Jun 2015 18:20:36 +0200
+
+wine-staging (1.7.45) unstable; urgency=low
+  * Add reference to upstream bug report for various patchsets.
+  * Updated server-Key_State patchset to fix a test failure in
+    comctl32/listview.
+  * Updated shell32-Icons patchset to fix a test failure in comctl32/imagelist.
+  * Updated shlwapi-AssocGetPerceivedType patchset to fix error checking for
+    RegGetValueW.
+  * Updated patch to fix opening clipboard from multiple threads (partially
+    fixed upstream).
+  * Updated patchset for ObjectTypeInformation and fix typename for various
+    additional wineserver object types.
+  * Added patches for FileRenameInformation support (fixes Wine Staging Bug
+    #296).
+  * Added additional tests for behaviour of opening readonly files.
+  * Added patch to fix opening a readonly file with FILE_WRITE_ATTRIBUTES access
+    (fixes Wine Staging Bug #298).
+  * Added patch to silence test failures in ntdll/directory tests.
+  * Added patches for support of FileLinkInformation (fixes Wine Staging Bug
+    #297).
+  * Added patch to restore original error code in rpcrt4 when ReadFile fails
+    with ERROR_MORE_DATA.
+  * Added patch to set NamedPipeState to FILE_PIPE_CLOSING_STATE on broken pipe
+    in NtQueryInformationFile.
+  * Added patch to allow setting pixel format for desktop window.
+  * Added patch to set a proper caption for shell32 Run dialog (by Jared
+    Smudde).
+  * Added patch to support AT_ROUND_TO_PAGE flag in NtMapViewOfSection (fixes
+    Wine Staging Bug 347).
+  * Added patches to fix error code for ReadFile/WriteFile on closed pipe (fixes
+    Wine Staging Bug #348).
+  * Added patch to initialize
+    System\CurrentControlSet\Control\TimeZoneInformation registry keys.
+  * Added patch to implement default homepage button in inetcpl.cpl.
+  * Added patch to fix link notification conditions for riched20.
+  * Added patch to fix endless loop in regedit when importing files with very
+    long lines.
+  * Added patch to improve stubs for NtQueryEaFile.
+  * Added patch for semi-stub of FileFsVolumeInformation information class.
+  * Added patch to use NVX_GPU_MEMORY_INFO extension for more exact video memory
+    accounting on NVIDIA graphic cards.
+  * Added patch to fix handling of periodic advice timers causing high CPU
+    usage.
+  * Added patch to forward GIF encoder requests to windowscodecs.
+  * Added patch to ensure console InsertMode changes take effect immediately.
+  * Added patch to send WM_DROPFILES only when OLE dnd fails.
+  * Added patch with stub for winscard.SCardListReadersA/W.
+  * Added patch to implement fallback to system ping command when CAP_NET_RAW is
+    not available.
+  * Added patch to properly check existence of libunwind before linking against
+    it.
+  * Added patch to implement advapi32.GetWindowsAccountDomainSid.
+  * Removed patch to handle '\r' as whitespace in wbemprox queries (accepted
+    upstream).
+  * Removed patch to make sure OpenClipboard with current owner doesn't fail
+    (accepted upstream).
+  * Removed patch to add IEnumString stub interface for ACLShellSource (fixed
+    upstream).
+  * Removed patch to fix NULL pointer dereference in get_frame_by_name
+    (identical patch accepted upstream).
+  * Removed patch to output winedbg system information also to the terminal
+    (accepted upstream).
+  * Removed patch to fix handling of periodic advice timers causing high CPU
+    usage (accepted upstream).
+  * Removed revert path to fix broken rendering in various games (fixed
+    upstream).
+  * Removed patch to set a valid linker version in winebuild (accepted
+    upstream).
+  * Removed patch to fix wrong return value in directmusic (accepted upstream).
+  * Removed patch to implement support for GetSystemTimes (accepted upstream).
+  * Removed patch to implement file disposition class in
+    SetFileInformationByHandle (accepted upstream).
+  * Removed patch to make additional ddraw functions hotpatchable (accepted
+    upstream).
+ -- Sebastian Lackner <sebastian@fds-team.de>  Sun, 14 Jun 2015 00:38:15 +0200
+
 wine-staging (1.7.44) unstable; urgency=low
   * Added patch to handle '\r' as whitespace in wbemprox queries.
   * Added patch with stubbed ISWbemSecurity interfaces in wbemdisp.

debian/tools/patchinstall.sh.in

@@ -76,6 +76,7 @@ warning()
 
 # Default settings
 patch_enable_all 0
+category_enable_all 0
 enable_patchlist=1
 enable_autoconf=1
 patchlist="/dev/null"

debian/tools/patchupdate.py

@@ -69,6 +69,7 @@ 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          = []
@@ -340,6 +341,7 @@ def read_patchset(revision = None):
     # 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)
@@ -571,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
@@ -618,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")
@@ -720,11 +738,20 @@ def generate_markdown(all_patches, stable_patches):
     # 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
@@ -794,6 +821,9 @@ 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 Staging version

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/Coverity/0002-amstream-Correctly-check-return-values-in-IAMMultiMe.patch

@@ -1,31 +0,0 @@
-From 173d42087f21dae75c8fb7299f5444c3d57a35c7 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
-Date: Sat, 30 May 2015 15:30:36 +0200
-Subject: amstream: Correctly check return values in
- IAMMultiMediaStreamImpl_Initialize (Coverity).
-
----
- dlls/amstream/amstream.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/dlls/amstream/amstream.c b/dlls/amstream/amstream.c
-index 800e48d..fcef7ec 100644
---- a/dlls/amstream/amstream.c
-+++ b/dlls/amstream/amstream.c
-@@ -256,11 +256,11 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_Initialize(IAMMultiMediaStream* if
-         This->StreamType = StreamType;
-         hr = IGraphBuilder_QueryInterface(This->pFilterGraph, &IID_IMediaSeeking, (void**)&This->media_seeking);
-         if (SUCCEEDED(hr))
--            IGraphBuilder_QueryInterface(This->pFilterGraph, &IID_IMediaControl, (void**)&This->media_control);
-+            hr = IGraphBuilder_QueryInterface(This->pFilterGraph, &IID_IMediaControl, (void**)&This->media_control);
-         if (SUCCEEDED(hr))
-             hr = CoCreateInstance(&CLSID_MediaStreamFilter, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (LPVOID*)&This->media_stream_filter);
-         if (SUCCEEDED(hr))
--            IGraphBuilder_AddFilter(This->pFilterGraph, This->media_stream_filter, filternameW);
-+            hr = IGraphBuilder_AddFilter(This->pFilterGraph, This->media_stream_filter, filternameW);
-         if (SUCCEEDED(hr))
-         {
-             IMediaEventEx* media_event = NULL;
--- 
-2.4.2
-

patches/Coverity/0003-kernel32-Correctly-check-for-an-empty-short-filename.patch

@@ -1,26 +0,0 @@
-From 6addc4f5304995f32525dce5422bc6544d7b313d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
-Date: Sat, 30 May 2015 15:36:43 +0200
-Subject: kernel32: Correctly check for an empty short filename in
- GetShortPathNameW (Coverity).
-
----
- dlls/kernel32/path.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c
-index f74b952..09b8b7f 100644
---- a/dlls/kernel32/path.c
-+++ b/dlls/kernel32/path.c
-@@ -528,7 +528,7 @@ DWORD WINAPI GetShortPathNameW( LPCWSTR longpath, LPWSTR shortpath, DWORD shortl
- 
-         /* In rare cases (like "a.abcd") short path may be longer than original path.
-          * Make sure we have enough space in temp buffer. */
--        if (wfd.cAlternateFileName && tmplen < strlenW(wfd.cAlternateFileName))
-+        if (wfd.cAlternateFileName[0] && tmplen < strlenW(wfd.cAlternateFileName))
-         {
-             WCHAR *new_buf;
-             buf_len += strlenW(wfd.cAlternateFileName) - tmplen;
--- 
-2.4.2
-

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/advapi32-OpenSCManagerW/0001-advapi32-Fix-error-handling-in-OpenSCManagerW.patch

@@ -1,28 +0,0 @@
-From 0f3d7e07b53bd1a7c8735bb2c0fa3da0b75dcb96 Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Fri, 8 May 2015 21:53:30 +0200
-Subject: advapi32: Fix error handling in OpenSCManagerW.
-
----
- dlls/advapi32/service.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c
-index 0eb0a47..111009d 100644
---- a/dlls/advapi32/service.c
-+++ b/dlls/advapi32/service.c
-@@ -868,8 +868,9 @@ SC_HANDLE WINAPI OpenSCManagerW( LPCWSTR lpMachineName, LPCWSTR lpDatabaseName,
-     DWORD r;
- 
-     r = SERV_OpenSCManagerW(lpMachineName, lpDatabaseName, dwDesiredAccess, &handle);
--    if (r!=ERROR_SUCCESS)
--        SetLastError(r);
-+
-+    /* last error could still be ERROR_MORE_DATA, so set error unconditionally */
-+    SetLastError(r);
-     return handle;
- }
- 
--- 
-2.4.0
-

patches/advapi32-OpenSCManagerW/definition

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

patches/browseui-ACLShell_IEnumString/0001-browseui-Add-IEnumString-stub-interface-for-ACLShell.patch

@@ -1,123 +0,0 @@
-From 49050987e49d61420d2d46dc167551ff439a537a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
-Date: Wed, 13 May 2015 01:31:35 +0200
-Subject: browseui: Add IEnumString stub interface for ACLShellSource.
-
----
- dlls/browseui/aclsource.c | 72 +++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 72 insertions(+)
-
-diff --git a/dlls/browseui/aclsource.c b/dlls/browseui/aclsource.c
-index 07033cc..bb98b33 100644
---- a/dlls/browseui/aclsource.c
-+++ b/dlls/browseui/aclsource.c
-@@ -44,6 +44,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(browseui);
- 
- typedef struct tagACLMulti {
-     IACList2 IACList2_iface;
-+    IEnumString IEnumString_iface;
-     LONG refCount;
-     DWORD dwOptions;
- } ACLShellSource;
-@@ -53,6 +54,11 @@ static inline ACLShellSource *impl_from_IACList2(IACList2 *iface)
-     return CONTAINING_RECORD(iface, ACLShellSource, IACList2_iface);
- }
- 
-+static inline ACLShellSource *impl_from_IEnumString(IEnumString *iface)
-+{
-+    return CONTAINING_RECORD(iface, ACLShellSource, IEnumString_iface);
-+}
-+
- static void ACLShellSource_Destructor(ACLShellSource *This)
- {
-     TRACE("destroying %p\n", This);
-@@ -69,6 +75,10 @@ static HRESULT WINAPI ACLShellSource_QueryInterface(IACList2 *iface, REFIID iid,
-     {
-         *ppvOut = &This->IACList2_iface;
-     }
-+    else if(IsEqualIID(iid, &IID_IEnumString))
-+    {
-+        *ppvOut = &This->IEnumString_iface;
-+    }
- 
-     if (*ppvOut)
-     {
-@@ -133,6 +143,67 @@ static const IACList2Vtbl ACLMulti_ACList2Vtbl =
-     ACLShellSource_GetOptions
- };
- 
-+static HRESULT WINAPI ACLShellSource_IEnumString_QueryInterface(IEnumString *iface, REFIID iid, LPVOID *ppvOut)
-+{
-+    ACLShellSource *This = impl_from_IEnumString(iface);
-+    return ACLShellSource_QueryInterface(&This->IACList2_iface, iid, ppvOut);
-+}
-+
-+static ULONG WINAPI ACLShellSource_IEnumString_AddRef(IEnumString *iface)
-+{
-+    ACLShellSource *This = impl_from_IEnumString(iface);
-+    return ACLShellSource_AddRef(&This->IACList2_iface);
-+}
-+
-+static ULONG WINAPI ACLShellSource_IEnumString_Release(IEnumString *iface)
-+{
-+    ACLShellSource *This = impl_from_IEnumString(iface);
-+    return ACLShellSource_Release(&This->IACList2_iface);
-+}
-+
-+static HRESULT WINAPI ACLShellSource_IEnumString_Next(IEnumString *iface, ULONG celt, LPOLESTR *rgelt, ULONG *pceltFetched)
-+{
-+    FIXME("(%p, %d, %p, %p): stub\n", iface, celt, rgelt, pceltFetched);
-+
-+    if (celt)
-+        *rgelt = NULL;
-+    if (pceltFetched)
-+        *pceltFetched = 0;
-+
-+    return S_FALSE;
-+}
-+
-+static HRESULT WINAPI ACLShellSource_IEnumString_Reset(IEnumString *iface)
-+{
-+    FIXME("(%p): stub\n", iface);
-+    return S_OK;
-+}
-+
-+static HRESULT WINAPI ACLShellSource_IEnumString_Skip(IEnumString *iface, ULONG celt)
-+{
-+    FIXME("(%p, %u): stub\n", iface, celt);
-+    return E_NOTIMPL;
-+}
-+
-+static HRESULT WINAPI ACLShellSource_IEnumString_Clone(IEnumString *iface, IEnumString **ppOut)
-+{
-+    FIXME("(%p, %p): stub\n", iface, ppOut);
-+    *ppOut = NULL;
-+    return E_OUTOFMEMORY;
-+}
-+
-+static const IEnumStringVtbl ACLShellSource_EnumStringVtbl =
-+{
-+    ACLShellSource_IEnumString_QueryInterface,
-+    ACLShellSource_IEnumString_AddRef,
-+    ACLShellSource_IEnumString_Release,
-+
-+    ACLShellSource_IEnumString_Next,
-+    ACLShellSource_IEnumString_Skip,
-+    ACLShellSource_IEnumString_Reset,
-+    ACLShellSource_IEnumString_Clone
-+};
-+
- HRESULT ACLShellSource_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut)
- {
-     ACLShellSource *This;
-@@ -144,6 +215,7 @@ HRESULT ACLShellSource_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut)
-         return E_OUTOFMEMORY;
- 
-     This->IACList2_iface.lpVtbl = &ACLMulti_ACList2Vtbl;
-+    This->IEnumString_iface.lpVtbl = &ACLShellSource_EnumStringVtbl;
-     This->refCount = 1;
- 
-     TRACE("returning %p\n", This);
--- 
-2.4.0
-

patches/browseui-ACLShell_IEnumString/definition

@@ -1 +0,0 @@
-Fixes: [18019] Add IEnumString stub interface for ACLShellSource

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
+

patches/d3d8-Hotpatch/0001-d3d8-Make-IDirect3DSwapChain8-Present-hotpachable.patch

@@ -1,25 +0,0 @@
-From c8dd8ae321e08d94954fe011de653cc333d0cbbb Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
-Date: Sat, 28 Feb 2015 21:24:54 +0100
-Subject: d3d8: Make IDirect3DSwapChain8::Present hotpachable.
-
----
- dlls/d3d8/swapchain.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/dlls/d3d8/swapchain.c b/dlls/d3d8/swapchain.c
-index 067a3e0..44fc02a 100644
---- a/dlls/d3d8/swapchain.c
-+++ b/dlls/d3d8/swapchain.c
-@@ -86,7 +86,7 @@ static ULONG WINAPI d3d8_swapchain_Release(IDirect3DSwapChain8 *iface)
-     return ref;
- }
- 
--static HRESULT WINAPI d3d8_swapchain_Present(IDirect3DSwapChain8 *iface,
-+static HRESULT WINAPI DECLSPEC_HOTPATCH d3d8_swapchain_Present(IDirect3DSwapChain8 *iface,
-         const RECT *src_rect, const RECT *dst_rect, HWND dst_window_override,
-         const RGNDATA *dirty_region)
- {
--- 
-2.3.0
-

patches/d3d8-Hotpatch/definition

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

patches/d3d9-DesktopWindow/0001-winex11.drv-Allow-changing-the-opengl-pixel-format-o.patch

@@ -0,0 +1,75 @@
+From aced729294b868190d7c133a17e357f56e2c29d6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
+Date: Wed, 3 Jun 2015 22:57:21 +0200
+Subject: winex11.drv: Allow changing the opengl pixel format on the desktop
+ window.
+
+This patch is not 100% correct because the old behavior was more similar to
+windows. However, Direct3D supports using the desktop window to create a
+context and since Wine translates Direct3D to OpenGL, using the desktop
+window will fail because of this limitation. Unless someone comes up with
+a more correct solution or finds an application that breaks because of this,
+it seems to be a suitable workaround as it fixes multiple applications.
+---
+ dlls/d3d9/tests/device.c  | 16 ++++++++++++++++
+ dlls/winex11.drv/opengl.c |  5 ++++-
+ 2 files changed, 20 insertions(+), 1 deletion(-)
+
+diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c
+index cb4a6e8..7872b32 100644
+--- a/dlls/d3d9/tests/device.c
++++ b/dlls/d3d9/tests/device.c
+@@ -10152,6 +10152,21 @@ static void test_resource_priority(void)
+     DestroyWindow(window);
+ }
+ 
++static void test_desktop_window(void)
++{
++    IDirect3DDevice9 *device = NULL;
++    IDirect3D9 *d3d;
++
++    d3d = Direct3DCreate9(D3D_SDK_VERSION);
++    ok(!!d3d, "Failed to create a D3D object.\n");
++
++    device = create_device(d3d, GetDesktopWindow(), NULL);
++    ok(!!device, "Failed to created device on desktop window.\n");
++
++    if (device) IDirect3DDevice9_Release(device);
++    IDirect3D9_Release(d3d);
++}
++
+ START_TEST(device)
+ {
+     WNDCLASSA wc = {0};
+@@ -10262,6 +10277,7 @@ START_TEST(device)
+     test_writeonly_resource();
+     test_lost_device();
+     test_resource_priority();
++    test_desktop_window();
+ 
+     UnregisterClassA("d3d9_test_wc", GetModuleHandleA(NULL));
+ }
+diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c
+index 7b8ba82..72445fb 100644
+--- a/dlls/winex11.drv/opengl.c
++++ b/dlls/winex11.drv/opengl.c
+@@ -1436,12 +1436,15 @@ static BOOL set_pixel_format(HDC hdc, int format, BOOL allow_change)
+ 
+     TRACE("(%p,%d)\n", hdc, format);
+ 
+-    if (!hwnd || hwnd == GetDesktopWindow())
++    if (!hwnd)
+     {
+         WARN( "not a valid window DC %p/%p\n", hdc, hwnd );
+         return FALSE;
+     }
+ 
++    if (hwnd == GetDesktopWindow())
++        FIXME("Using desktop window for OpenGL is not supported on windows\n");
++
+     fmt = get_pixel_format(gdi_display, format, FALSE /* Offscreen */);
+     if (!fmt)
+     {
+-- 
+2.4.2
+

patches/d3d9-DesktopWindow/definition

@@ -0,0 +1 @@
+Fixes: Allow to set pixel format for desktop window

patches/d3dx9_36-DXTn/definition

@@ -1,6 +1,5 @@
 Depends: wined3d-DXTn
 Fixes: [33768] Fix texture corruption in CSI: Fatal Conspiracy
-Fixes: [19231] Fix crash of Trine Demo on start
 Fixes: [37391] Exception during start of fr-043 caused by missing DXTn support
 Fixes: [34692] Fix wrong colors in Wolfenstein (2009)
 Fixes: [24983] Fix crash in Space Rangers2 caused by missing DXTn support

patches/ddraw-Hotpatch/0001-ddraw-Make-some-functions-hotpachable.patch

@@ -1,246 +0,0 @@
-From 2e7afb2a34c951f50d2349dbc9d6453cca60a23c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
-Date: Sat, 28 Feb 2015 21:30:37 +0100
-Subject: ddraw: Make some functions hotpachable.
-
----
- dlls/ddraw/surface.c | 55 ++++++++++++++++++++++++++++------------------------
- 1 file changed, 30 insertions(+), 25 deletions(-)
-
-diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c
-index a387d12..c14ba47 100644
---- a/dlls/ddraw/surface.c
-+++ b/dlls/ddraw/surface.c
-@@ -1153,7 +1153,7 @@ static HRESULT WINAPI ddraw_surface1_Lock(IDirectDrawSurface *iface, RECT *rect,
-  *  For more details, see IWineD3DSurface::UnlockRect
-  *
-  *****************************************************************************/
--static HRESULT WINAPI ddraw_surface7_Unlock(IDirectDrawSurface7 *iface, RECT *pRect)
-+static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Unlock(IDirectDrawSurface7 *iface, RECT *pRect)
- {
-     struct ddraw_surface *surface = impl_from_IDirectDrawSurface7(iface);
-     HRESULT hr;
-@@ -1169,7 +1169,7 @@ static HRESULT WINAPI ddraw_surface7_Unlock(IDirectDrawSurface7 *iface, RECT *pR
-     return hr;
- }
- 
--static HRESULT WINAPI ddraw_surface4_Unlock(IDirectDrawSurface4 *iface, RECT *pRect)
-+static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface4_Unlock(IDirectDrawSurface4 *iface, RECT *pRect)
- {
-     struct ddraw_surface *surface = impl_from_IDirectDrawSurface4(iface);
- 
-@@ -1178,7 +1178,7 @@ static HRESULT WINAPI ddraw_surface4_Unlock(IDirectDrawSurface4 *iface, RECT *pR
-     return ddraw_surface7_Unlock(&surface->IDirectDrawSurface7_iface, pRect);
- }
- 
--static HRESULT WINAPI ddraw_surface3_Unlock(IDirectDrawSurface3 *iface, void *data)
-+static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface3_Unlock(IDirectDrawSurface3 *iface, void *data)
- {
-     struct ddraw_surface *surface = impl_from_IDirectDrawSurface3(iface);
- 
-@@ -1188,7 +1188,7 @@ static HRESULT WINAPI ddraw_surface3_Unlock(IDirectDrawSurface3 *iface, void *da
-     return ddraw_surface7_Unlock(&surface->IDirectDrawSurface7_iface, NULL);
- }
- 
--static HRESULT WINAPI ddraw_surface2_Unlock(IDirectDrawSurface2 *iface, void *data)
-+static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface2_Unlock(IDirectDrawSurface2 *iface, void *data)
- {
-     struct ddraw_surface *surface = impl_from_IDirectDrawSurface2(iface);
- 
-@@ -1198,7 +1198,7 @@ static HRESULT WINAPI ddraw_surface2_Unlock(IDirectDrawSurface2 *iface, void *da
-     return ddraw_surface7_Unlock(&surface->IDirectDrawSurface7_iface, NULL);
- }
- 
--static HRESULT WINAPI ddraw_surface1_Unlock(IDirectDrawSurface *iface, void *data)
-+static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface1_Unlock(IDirectDrawSurface *iface, void *data)
- {
-     struct ddraw_surface *surface = impl_from_IDirectDrawSurface(iface);
- 
-@@ -1208,7 +1208,8 @@ static HRESULT WINAPI ddraw_surface1_Unlock(IDirectDrawSurface *iface, void *dat
-     return ddraw_surface7_Unlock(&surface->IDirectDrawSurface7_iface, NULL);
- }
- 
--static HRESULT WINAPI ddraw_surface7_Flip(IDirectDrawSurface7 *iface, IDirectDrawSurface7 *src, DWORD flags)
-+static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Flip(IDirectDrawSurface7 *iface,
-+        IDirectDrawSurface7 *src, DWORD flags)
- {
-     struct ddraw_surface *dst_impl = impl_from_IDirectDrawSurface7(iface);
-     struct ddraw_surface *src_impl = unsafe_impl_from_IDirectDrawSurface7(src);
-@@ -1330,7 +1331,8 @@ static HRESULT WINAPI ddraw_surface7_Flip(IDirectDrawSurface7 *iface, IDirectDra
-     return hr;
- }
- 
--static HRESULT WINAPI ddraw_surface4_Flip(IDirectDrawSurface4 *iface, IDirectDrawSurface4 *dst, DWORD flags)
-+static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface4_Flip(IDirectDrawSurface4 *iface,
-+        IDirectDrawSurface4 *dst, DWORD flags)
- {
-     struct ddraw_surface *surface = impl_from_IDirectDrawSurface4(iface);
-     struct ddraw_surface *dst_impl = unsafe_impl_from_IDirectDrawSurface4(dst);
-@@ -1341,7 +1343,8 @@ static HRESULT WINAPI ddraw_surface4_Flip(IDirectDrawSurface4 *iface, IDirectDra
-             dst_impl ? &dst_impl->IDirectDrawSurface7_iface : NULL, flags);
- }
- 
--static HRESULT WINAPI ddraw_surface3_Flip(IDirectDrawSurface3 *iface, IDirectDrawSurface3 *dst, DWORD flags)
-+static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface3_Flip(IDirectDrawSurface3 *iface,
-+        IDirectDrawSurface3 *dst, DWORD flags)
- {
-     struct ddraw_surface *surface = impl_from_IDirectDrawSurface3(iface);
-     struct ddraw_surface *dst_impl = unsafe_impl_from_IDirectDrawSurface3(dst);
-@@ -1352,7 +1355,8 @@ static HRESULT WINAPI ddraw_surface3_Flip(IDirectDrawSurface3 *iface, IDirectDra
-             dst_impl ? &dst_impl->IDirectDrawSurface7_iface : NULL, flags);
- }
- 
--static HRESULT WINAPI ddraw_surface2_Flip(IDirectDrawSurface2 *iface, IDirectDrawSurface2 *dst, DWORD flags)
-+static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface2_Flip(IDirectDrawSurface2 *iface,
-+        IDirectDrawSurface2 *dst, DWORD flags)
- {
-     struct ddraw_surface *surface = impl_from_IDirectDrawSurface2(iface);
-     struct ddraw_surface *dst_impl = unsafe_impl_from_IDirectDrawSurface2(dst);
-@@ -1363,7 +1367,8 @@ static HRESULT WINAPI ddraw_surface2_Flip(IDirectDrawSurface2 *iface, IDirectDra
-             dst_impl ? &dst_impl->IDirectDrawSurface7_iface : NULL, flags);
- }
- 
--static HRESULT WINAPI ddraw_surface1_Flip(IDirectDrawSurface *iface, IDirectDrawSurface *dst, DWORD flags)
-+static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface1_Flip(IDirectDrawSurface *iface,
-+        IDirectDrawSurface *dst, DWORD flags)
- {
-     struct ddraw_surface *surface = impl_from_IDirectDrawSurface(iface);
-     struct ddraw_surface *dst_impl = unsafe_impl_from_IDirectDrawSurface(dst);
-@@ -1512,7 +1517,7 @@ static HRESULT ddraw_surface_blt_clipped(struct ddraw_surface *dst_surface, cons
-  *  See IWineD3DSurface::Blt for more details
-  *
-  *****************************************************************************/
--static HRESULT WINAPI ddraw_surface7_Blt(IDirectDrawSurface7 *iface, RECT *DestRect,
-+static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Blt(IDirectDrawSurface7 *iface, RECT *DestRect,
-         IDirectDrawSurface7 *SrcSurface, RECT *SrcRect, DWORD Flags, DDBLTFX *DDBltFx)
- {
-     struct ddraw_surface *dst_surface = impl_from_IDirectDrawSurface7(iface);
-@@ -1560,7 +1565,7 @@ static HRESULT WINAPI ddraw_surface7_Blt(IDirectDrawSurface7 *iface, RECT *DestR
-     }
- }
- 
--static HRESULT WINAPI ddraw_surface4_Blt(IDirectDrawSurface4 *iface, RECT *dst_rect,
-+static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface4_Blt(IDirectDrawSurface4 *iface, RECT *dst_rect,
-         IDirectDrawSurface4 *src_surface, RECT *src_rect, DWORD flags, DDBLTFX *fx)
- {
-     struct ddraw_surface *dst = impl_from_IDirectDrawSurface4(iface);
-@@ -1573,7 +1578,7 @@ static HRESULT WINAPI ddraw_surface4_Blt(IDirectDrawSurface4 *iface, RECT *dst_r
-             src ? &src->IDirectDrawSurface7_iface : NULL, src_rect, flags, fx);
- }
- 
--static HRESULT WINAPI ddraw_surface3_Blt(IDirectDrawSurface3 *iface, RECT *dst_rect,
-+static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface3_Blt(IDirectDrawSurface3 *iface, RECT *dst_rect,
-         IDirectDrawSurface3 *src_surface, RECT *src_rect, DWORD flags, DDBLTFX *fx)
- {
-     struct ddraw_surface *dst = impl_from_IDirectDrawSurface3(iface);
-@@ -1586,7 +1591,7 @@ static HRESULT WINAPI ddraw_surface3_Blt(IDirectDrawSurface3 *iface, RECT *dst_r
-             src_impl ? &src_impl->IDirectDrawSurface7_iface : NULL, src_rect, flags, fx);
- }
- 
--static HRESULT WINAPI ddraw_surface2_Blt(IDirectDrawSurface2 *iface, RECT *dst_rect,
-+static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface2_Blt(IDirectDrawSurface2 *iface, RECT *dst_rect,
-         IDirectDrawSurface2 *src_surface, RECT *src_rect, DWORD flags, DDBLTFX *fx)
- {
-     struct ddraw_surface *dst = impl_from_IDirectDrawSurface2(iface);
-@@ -1599,7 +1604,7 @@ static HRESULT WINAPI ddraw_surface2_Blt(IDirectDrawSurface2 *iface, RECT *dst_r
-             src_impl ? &src_impl->IDirectDrawSurface7_iface : NULL, src_rect, flags, fx);
- }
- 
--static HRESULT WINAPI ddraw_surface1_Blt(IDirectDrawSurface *iface, RECT *dst_rect,
-+static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface1_Blt(IDirectDrawSurface *iface, RECT *dst_rect,
-         IDirectDrawSurface *src_surface, RECT *src_rect, DWORD flags, DDBLTFX *fx)
- {
-     struct ddraw_surface *dst = impl_from_IDirectDrawSurface(iface);
-@@ -2560,7 +2565,7 @@ static HRESULT WINAPI ddraw_surface2_PageUnlock(IDirectDrawSurface2 *iface, DWOR
-  *  DDERR_UNSUPPORTED
-  *
-  *****************************************************************************/
--static HRESULT WINAPI ddraw_surface7_BltBatch(IDirectDrawSurface7 *iface, DDBLTBATCH *Batch, DWORD Count, DWORD Flags)
-+static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_BltBatch(IDirectDrawSurface7 *iface, DDBLTBATCH *Batch, DWORD Count, DWORD Flags)
- {
-     TRACE("iface %p, batch %p, count %u, flags %#x.\n", iface, Batch, Count, Flags);
- 
-@@ -2568,7 +2573,7 @@ static HRESULT WINAPI ddraw_surface7_BltBatch(IDirectDrawSurface7 *iface, DDBLTB
-     return DDERR_UNSUPPORTED;
- }
- 
--static HRESULT WINAPI ddraw_surface4_BltBatch(IDirectDrawSurface4 *iface, DDBLTBATCH *batch, DWORD count, DWORD flags)
-+static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface4_BltBatch(IDirectDrawSurface4 *iface, DDBLTBATCH *batch, DWORD count, DWORD flags)
- {
-     struct ddraw_surface *surface = impl_from_IDirectDrawSurface4(iface);
- 
-@@ -2577,7 +2582,7 @@ static HRESULT WINAPI ddraw_surface4_BltBatch(IDirectDrawSurface4 *iface, DDBLTB
-     return ddraw_surface7_BltBatch(&surface->IDirectDrawSurface7_iface, batch, count, flags);
- }
- 
--static HRESULT WINAPI ddraw_surface3_BltBatch(IDirectDrawSurface3 *iface, DDBLTBATCH *batch, DWORD count, DWORD flags)
-+static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface3_BltBatch(IDirectDrawSurface3 *iface, DDBLTBATCH *batch, DWORD count, DWORD flags)
- {
-     struct ddraw_surface *surface = impl_from_IDirectDrawSurface3(iface);
- 
-@@ -2586,7 +2591,7 @@ static HRESULT WINAPI ddraw_surface3_BltBatch(IDirectDrawSurface3 *iface, DDBLTB
-     return ddraw_surface7_BltBatch(&surface->IDirectDrawSurface7_iface, batch, count, flags);
- }
- 
--static HRESULT WINAPI ddraw_surface2_BltBatch(IDirectDrawSurface2 *iface, DDBLTBATCH *batch, DWORD count, DWORD flags)
-+static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface2_BltBatch(IDirectDrawSurface2 *iface, DDBLTBATCH *batch, DWORD count, DWORD flags)
- {
-     struct ddraw_surface *surface = impl_from_IDirectDrawSurface2(iface);
- 
-@@ -2595,7 +2600,7 @@ static HRESULT WINAPI ddraw_surface2_BltBatch(IDirectDrawSurface2 *iface, DDBLTB
-     return ddraw_surface7_BltBatch(&surface->IDirectDrawSurface7_iface, batch, count, flags);
- }
- 
--static HRESULT WINAPI ddraw_surface1_BltBatch(IDirectDrawSurface *iface, DDBLTBATCH *batch, DWORD count, DWORD flags)
-+static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface1_BltBatch(IDirectDrawSurface *iface, DDBLTBATCH *batch, DWORD count, DWORD flags)
- {
-     struct ddraw_surface *surface = impl_from_IDirectDrawSurface(iface);
- 
-@@ -4042,7 +4047,7 @@ static HRESULT WINAPI ddraw_surface7_GetLOD(IDirectDrawSurface7 *iface, DWORD *M
-  *  For more details, see IWineD3DSurface::BltFast
-  *
-  *****************************************************************************/
--static HRESULT WINAPI ddraw_surface7_BltFast(IDirectDrawSurface7 *iface, DWORD dstx, DWORD dsty,
-+static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_BltFast(IDirectDrawSurface7 *iface, DWORD dstx, DWORD dsty,
-         IDirectDrawSurface7 *Source, RECT *rsrc, DWORD trans)
- {
-     struct ddraw_surface *This = impl_from_IDirectDrawSurface7(iface);
-@@ -4114,7 +4119,7 @@ static HRESULT WINAPI ddraw_surface7_BltFast(IDirectDrawSurface7 *iface, DWORD d
-     }
- }
- 
--static HRESULT WINAPI ddraw_surface4_BltFast(IDirectDrawSurface4 *iface, DWORD dst_x, DWORD dst_y,
-+static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface4_BltFast(IDirectDrawSurface4 *iface, DWORD dst_x, DWORD dst_y,
-         IDirectDrawSurface4 *src_surface, RECT *src_rect, DWORD flags)
- {
-     struct ddraw_surface *dst_impl = impl_from_IDirectDrawSurface4(iface);
-@@ -4127,7 +4132,7 @@ static HRESULT WINAPI ddraw_surface4_BltFast(IDirectDrawSurface4 *iface, DWORD d
-             src_impl ? &src_impl->IDirectDrawSurface7_iface : NULL, src_rect, flags);
- }
- 
--static HRESULT WINAPI ddraw_surface3_BltFast(IDirectDrawSurface3 *iface, DWORD dst_x, DWORD dst_y,
-+static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface3_BltFast(IDirectDrawSurface3 *iface, DWORD dst_x, DWORD dst_y,
-         IDirectDrawSurface3 *src_surface, RECT *src_rect, DWORD flags)
- {
-     struct ddraw_surface *dst_impl = impl_from_IDirectDrawSurface3(iface);
-@@ -4140,7 +4145,7 @@ static HRESULT WINAPI ddraw_surface3_BltFast(IDirectDrawSurface3 *iface, DWORD d
-             src_impl ? &src_impl->IDirectDrawSurface7_iface : NULL, src_rect, flags);
- }
- 
--static HRESULT WINAPI ddraw_surface2_BltFast(IDirectDrawSurface2 *iface, DWORD dst_x, DWORD dst_y,
-+static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface2_BltFast(IDirectDrawSurface2 *iface, DWORD dst_x, DWORD dst_y,
-         IDirectDrawSurface2 *src_surface, RECT *src_rect, DWORD flags)
- {
-     struct ddraw_surface *dst_impl = impl_from_IDirectDrawSurface2(iface);
-@@ -4153,7 +4158,7 @@ static HRESULT WINAPI ddraw_surface2_BltFast(IDirectDrawSurface2 *iface, DWORD d
-             src_impl ? &src_impl->IDirectDrawSurface7_iface : NULL, src_rect, flags);
- }
- 
--static HRESULT WINAPI ddraw_surface1_BltFast(IDirectDrawSurface *iface, DWORD dst_x, DWORD dst_y,
-+static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface1_BltFast(IDirectDrawSurface *iface, DWORD dst_x, DWORD dst_y,
-         IDirectDrawSurface *src_surface, RECT *src_rect, DWORD flags)
- {
-     struct ddraw_surface *dst_impl = impl_from_IDirectDrawSurface(iface);
--- 
-2.3.0
-