Release 1.7.48.

(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.43 [235]:**
+**Bug fixes and features in Wine Staging 1.7.48 [238]:**
 
 *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,27 +49,19 @@ 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 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 D3DXTessellateNPatches
 * Add stub for NtSetLdtEntries/ZwSetLdtEntries ([Wine Bug #26268](https://bugs.winehq.org/show_bug.cgi?id=26268))
-* Add stub for advapi32.ImpersonateAnonymousToken
-* Add stub for atl80.AtlIPersistPropertyBag_Save ([Wine Bug #33888](https://bugs.winehq.org/show_bug.cgi?id=33888))
-* 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 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
@@ -78,25 +70,33 @@ 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 D3DCompile2 and D3DCompileFromFile
 * Add stubs for D3DXCreateAnimationController interface
+* Add stubs for d3dx10_43.D3DX10CreateEffectFromFileA/W ([Wine Bug #27739](https://bugs.winehq.org/show_bug.cgi?id=27739))
 * 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 ThreadQuerySetWin32StartAddress info class ([Wine Bug #8277](https://bugs.winehq.org/show_bug.cgi?id=8277))
+* 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))
+* Add wined3d detection for GeForce GT 425M ([Wine Bug #35054](https://bugs.winehq.org/show_bug.cgi?id=35054))
 * Adobe Reader needs ITextSelection_fnGetDuplicate implementation
-* Allocate fake hWnd for wineconsole curses backend ([Wine Bug #34930](https://bugs.winehq.org/show_bug.cgi?id=34930))
 * Allow selection of audio device for PulseAudio backend
 * Allow special characters in pipe names ([Wine Bug #28995](https://bugs.winehq.org/show_bug.cgi?id=28995))
 * Allow to cancel a file operation via progress callback ([Wine Bug #22690](https://bugs.winehq.org/show_bug.cgi?id=22690))
 * Allow to edit winecfg library override by double clicking
 * Allow to open files/directories without any access rights in order to query attributes
 * Allow to override number of quality levels for D3DMULTISAMPLE_NONMASKABLE. ([Wine Bug #12652](https://bugs.winehq.org/show_bug.cgi?id=12652))
+* Allow to set pixel format for desktop window
 * Anno 1602 installer depends on Windows 98 behavior of SHFileOperationW ([Wine Bug #37916](https://bugs.winehq.org/show_bug.cgi?id=37916))
+* Assign a drive serial number during prefix creation/update ([Wine Bug #17823](https://bugs.winehq.org/show_bug.cgi?id=17823))
 * Audio stuttering and performance drops in multiple applications ([Wine Bug #30639](https://bugs.winehq.org/show_bug.cgi?id=30639))
 * Avoid crashing when broken app tries to release surface although refcount is zero ([Wine Bug #18477](https://bugs.winehq.org/show_bug.cgi?id=18477))
 * Avoid race-conditions in NtReadFile() operations with write watches.
 * Avoid race-conditions of async WSARecv() operations with write watches.
+* Avoid race-conditions with long running threadpool tasks
 * Avoid race-conditions with write watches in WS2_async_accept.
 * Avseq crashes when multisampling is enabled ([Wine Bug #31998](https://bugs.winehq.org/show_bug.cgi?id=31998))
 * Basic handling of write watches triggered while we're on the signal stack.
@@ -104,34 +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))
+* Check architecture before trying to load libraries ([Wine Bug #38021](https://bugs.winehq.org/show_bug.cgi?id=38021))
 * 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))
-* Dirtify vertex shader on transformed update to fix graphical corruption ([Wine Bug #38539](https://bugs.winehq.org/show_bug.cgi?id=38539))
-* 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 create foreign thread queues for attach_thread_input requests ([Wine Bug #38562](https://bugs.winehq.org/show_bug.cgi?id=38562))
 * 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))
 * Exception during start of fr-043 caused by missing DXTn support ([Wine Bug #37391](https://bugs.winehq.org/show_bug.cgi?id=37391))
+* Export additional OpenAL32 functions ([Wine Bug #38972](https://bugs.winehq.org/show_bug.cgi?id=38972))
 * Expose PKEY_AudioEndpoint_PhysicalSpeakers device property in PulseAudio driver
 * FEAR 1 installer expects basic_string_wchar_dtor to return NULL ([Wine Bug #37358](https://bugs.winehq.org/show_bug.cgi?id=37358))
-* Fallback to global key state for threads without a queue ([Wine Bug #27238](https://bugs.winehq.org/show_bug.cgi?id=27238))
+* Fake success in kernel32.SetFileCompletionNotificationModes ([Wine Bug #38960](https://bugs.winehq.org/show_bug.cgi?id=38960))
+* 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))
@@ -140,15 +138,19 @@ 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))
+* Fix loading of libraries with incomplete IMAGE_LOAD_CONFIG_DIRECTORY struct
 * Fix missing video introduced by pixelformat changes. ([Wine Bug #36900](https://bugs.winehq.org/show_bug.cgi?id=36900))
 * Fix multithreading issues with fullscreen clipping ([Wine Bug #38087](https://bugs.winehq.org/show_bug.cgi?id=38087))
 * Fix possible segfault in pulse_rd_loop of PulseAudio backend
 * Fix race-condition when threads are killed during shutdown
 * Fix regression caused by blacklisting supported OpenGL extensions ([Wine Bug #38480](https://bugs.winehq.org/show_bug.cgi?id=38480))
 * Fix return value of ScrollWindowEx for invisible windows ([Wine Bug #37706](https://bugs.winehq.org/show_bug.cgi?id=37706))
+* Fix scaling behaviour of images and mipmap levels in IDirect3DTexture2_Load (needed for example by Prezzie Hunt)
+* Fix security cookie handling for UPX compressed executables ([Wine Bug #38949](https://bugs.winehq.org/show_bug.cgi?id=38949))
 * 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))
@@ -156,78 +158,80 @@ 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 exitcode from child process when in wineconsole
 * 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 AMStream GetMultiMediaStream functions ([Wine Bug #37090](https://bugs.winehq.org/show_bug.cgi?id=37090))
 * Implement D3DXGetShaderOutputSemantics
 * Implement DDENUMSURFACES_CANBECREATED in IDirectDraw7::EnumSurfaces ([Wine Bug #17233](https://bugs.winehq.org/show_bug.cgi?id=17233))
 * Implement 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 dbghelp.UnDecorateSymbolNameW ([Wine Bug #38828](https://bugs.winehq.org/show_bug.cgi?id=38828))
+* 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 kernel32.GetSystemTimePreciseAsFileTime ([Wine Bug #38513](https://bugs.winehq.org/show_bug.cgi?id=38513))
+* 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 null.sys to provide \Device\Null ([Wine Bug #38107](https://bugs.winehq.org/show_bug.cgi?id=38107))
-* 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
 * Implement stubs for ntoskrnl.ObReferenceObjectByPointer and ntoskrnl.ObDereferenceObject
-* 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))
+* Implement various vcomp functions ([Wine Bug #31640](https://bugs.winehq.org/show_bug.cgi?id=31640))
 * 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 start wrong executable if whitespace present in name ([Wine Bug #19666](https://bugs.winehq.org/show_bug.cgi?id=19666))
+* Multiple applications needs better NtQueryInformationJobObject stub
 * 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)
-* 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 default palette entries from GetSystemPaletteEntries for non-palette-based devices ([Wine Bug #36895](https://bugs.winehq.org/show_bug.cgi?id=36895))
+* Return dummy ID3DXSkinInfo interface when skinning info not present ([Wine Bug #33904](https://bugs.winehq.org/show_bug.cgi?id=33904))
+* Return fake device type when systemroot is located on virtual disk ([Wine Bug #36546](https://bugs.winehq.org/show_bug.cgi?id=36546))
+* Return proper status codes when NtReadFile/NtWriteFile is called on closed (but not disconnected) pipe
 * SO_CONNECT_TIME returns the appropriate time
 * Scrolling causes mouse and screen to lock in Call to Power II ([Wine Bug #34559](https://bugs.winehq.org/show_bug.cgi?id=34559))
 * Send WM_PAINT event during dialog creation ([Wine Bug #35652](https://bugs.winehq.org/show_bug.cgi?id=35652))
-* Set 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
+* Share source of d3dx9_36 with d3dx9_33 to avoid Wine DLL forwards ([Wine Bug #21817](https://bugs.winehq.org/show_bug.cgi?id=21817))
 * Show unmounted devices in winecfg and allow changing the unix path
+* Silence repeated LocaleNameToLCID/LCIDToLocaleName unsupported flags FIXMEs ([Wine Bug #30076](https://bugs.winehq.org/show_bug.cgi?id=30076))
+* Silence repeated wbemprox "timeout not supported" fixme ([Wine Bug #37618](https://bugs.winehq.org/show_bug.cgi?id=37618))
 * 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)
+* Store registry timestamps with nanoseconds precision ([Wine Bug #38927](https://bugs.winehq.org/show_bug.cgi?id=38927))
 * 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))
 * Support for AllocateAndGetTcpExTableFromStack ([Wine Bug #34372](https://bugs.winehq.org/show_bug.cgi?id=34372))
 * Support for BindImageEx ([Wine Bug #3591](https://bugs.winehq.org/show_bug.cgi?id=3591))
 * Support for CSMT (command stream) to increase graphic performance ([Wine Bug #11674](https://bugs.winehq.org/show_bug.cgi?id=11674))
@@ -237,15 +241,10 @@ 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))
-* 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))
@@ -253,14 +252,14 @@ 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))
@@ -270,12 +269,16 @@ 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 GLX_MESA_query_renderer extension to get more exact GPU infos
+* Use NVX_GPU_MEMORY_INFO extension for more exact video memory accounting on NVIDIA graphic cards
 * Use POSIX implementation to enumerate directory content on FreeBSD ([Wine Bug #35397](https://bugs.winehq.org/show_bug.cgi?id=35397))
 * Use actual program name if available to describe PulseAudio streams
 * Use manual relay for RunDLL_CallEntry16 in shell32 ([Wine Bug #23033](https://bugs.winehq.org/show_bug.cgi?id=23033))
+* Use video memory for rendering targets if possible ([Wine Bug #34906](https://bugs.winehq.org/show_bug.cgi?id=34906))
 * 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

debian/changelog

@@ -1,3 +1,244 @@
+wine-staging (1.7.48) unstable; urgency=low
+  * Update patches for d3dx9_36.D3DXGetShader{Input,Output}Semantics and add
+    additional tests.
+  * Update patchset to query GPU infos with GLX_MESA_query_renderer extension
+    (fixes a regression with broken MESA versions).
+  * Update vcomp patchset and add implementation for various atomic functions.
+  * Updated CSMT patchset to fix crash in Path of Exile after character
+    selection (fixes Wine Staging Bug #451).
+  * Added patch to forward exitcode from child process when in wineconsole.
+  * Added patch to check architecture before trying to load libraries.
+  * Added patch to share source of d3dx9_36 with d3dx9_33 to avoid Wine DLL
+    forwards.
+  * Added patch with stubs for d3dx10_43.D3DX10CreateEffectFromFileA/W.
+  * Added patch to silence repeated LocaleNameToLCID/LCIDToLocaleName
+    unsupported flags FIXMEs.
+  * Added patches to improve security cookie handling.
+  * Added patches to implement ThreadQuerySetWin32StartAddress info class.
+  * Added patch to fake success in kernel32.SetFileCompletionNotificationModes.
+  * Added patch to export additional OpenAL32 functions.
+  * Added patch to return dummy ID3DXSkinInfo interface when skinning info not
+    present.
+  * Added patch to store registry timestamps with nanoseconds precision.
+  * Added patch to implement AMStream GetMultiMediaStream functions.
+  * Added patch with stub for D3DXTessellateNPatches.
+  * Added patch with stubs for D3DCompile2 and D3DCompileFromFile.
+  * Added patch to implement dbghelp.UnDecorateSymbolNameW.
+  * Added patch to add wined3d detection of GeForce GT 425M.
+  * Added patch to use video memory for rendering targets if possible.
+  * Added patch to avoid race-conditions with long running threadpool tasks.
+  * Removed patch to allow to enable/disable InsertMode in wineconsole settings
+    (accepted upstream).
+  * Removed patch to improve IoGetDeviceObjectPointer stub to appease SecuROM
+    5.x (accepted upstream).
+  * Removed patch to forward GIF encoder requests to Windowscodecs (accepted
+    upstream).
+  * Removed patch to ignore garbage after decoding gif lines (accepted
+    upstream).
+  * Removed patch to increase buffer size in widl/typegen.c (accepted upstream).
+  * Removed patch to revert security cookie changes in loader (fixed upstream).
+  * Removed patch to add support 8bpp grayscale TIFF images with 8bpp alpha
+    channel (accepted upstream).
+  * Partrially removed patches for vcomp implementation (accepted upstream).
+ -- Sebastian Lackner <sebastian@fds-team.de>  Wed, 29 Jul 2015 21:11:07 +0200
+
+wine-staging (1.7.47) unstable; urgency=low
+  * Added patch to silence repeated winhttp "no support on this platform"
+    message.
+  * Added patch to silence repeated wbemprox "timeout not supported" fixme.
+  * Added patch to increase buffer size in widl/typegen.c to avoid buffer
+    overflow.
+  * Revert security cookie patch causing regression in multiple applications.
+  * Added patch to use GLX_MESA_query_renderer extension to get more exact GPU
+    infos.
+  * Added initial set of patches for multithreaded vcomp implementation.
+  * Added patch to avoid dereferencing NULL pointer for fonts without VDMX.
+  * Removed patch to implement kernel32.GetNumaProcessorNode (accepted
+    upstream).
+  * Removed patch to initialize *end with NULL on failure in msvcrt.strtod
+    (accepted upstream).
+  * Removed patchset for new Threadpool implementation (accepted upstream).
+  * Partially removed patches for RtlDecompressBuffer implementation (accepted
+    upstream).
+ -- Sebastian Lackner <sebastian@fds-team.de>  Sun, 12 Jul 2015 04:12:43 +0200
+
+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.
+  * Added patch with shell32 placeholder icons to match offsets with Windows.
+  * Added patch to assign a drive serial number during prefix creation/update.
+  * Added patch for support of ws2_32.dll.WSAPoll.
+  * Added patch to allow to enable/disable InsertMode in wineconsole settings.
+  * Added patch for stub of iphlpapi.ConvertInterfaceLuidToGuid.
+  * Added patch to use random names when caching very long urls (fixes Wine
+    Staging Bug #266).
+  * Added patch to fix crash in Gothic 1/2 with builtin directmusic caused by
+    wrong return value.
+  * Added patch to return fake device type when systemroot is located on virtual
+    disk (improves compatibility when wineprefix is on tmpfs).
+  * Added patch to fix NULL pointer dereference in get_frame_by_name.
+  * Added patch to fix handling of opening a file with RootDirectory pointing to
+    a file handle.
+  * Added patch to output winedbg system information also to the terminal, not
+    only to dialog.
+  * Added patch to allow hiding wine version information from applications.
+  * Added patch to fix scaling behaviour of images and mipmap levels in
+    IDirect3DTexture2_Load.
+  * Added patchset to fix various upstream issues detected by Coverity.
+  * Added patch to avoid using unixfs for devices without mountpoint.
+  * Revert upstream patch which causes broken rendering in various games.
+  * Removed patch to reset device state in SysKeyboard*Impl_Acquire (accepted
+    upstream).
+  * Removed patch to avoid creating thread queues for foreign threads in
+    attach_thread_input (accepted upstream).
+  * Removed patch to fix access violation when calling GetStringTypeW with NULL
+    src (accepted upstream).
+  * Removed patch to return correct device type for CD devices without medium
+    (accepted upstream).
+  * Removed patch to fix memory leak in wininet cookie handling (accepted
+    upstream).
+  * Removed patch to allocate fake hWnd for wineconsole curses backend (accepted
+    upstream).
+  * Removed patch to dirtify vertex shader on transformed update (accepted
+    upstream).
+  * Removed patch to avoid appending duplicate NULL characters when importing
+    keys with regedit (accepted upstream).
+  * Removed patch to implement kernel32.GetSystemTimePreciseAsFileTime (accepted
+    upstream).
+  * Removed various patches containing tests (accepted upstream).
+  * Removed patches for advapi32.ImpersonateAnonymousToken (accepted upstream).
+  * Removed patches for Win32_SystemEnclosure support (accepted upstream).
+  * Removed patch with tests for CoWaitForMultipleHandles and WM_QUIT (accepted
+    upstream).
+  * Removed patches for AtlIPersistPropertyBag_Save stub (accepted upstream).
+  * Removed patches to set last error when GetRawInputDeviceList fails (accepted
+    upstream).
+  * Removed patches for \Device\Null driver (fixed upstream with alternative
+    solution).
+  * Removed patches for semi-stub of GetFileVersionInfo[Size]ExA/W (fixed
+    upstream).
+  * Partially removed patches for ITextFont/ITextPara implementation (fixed
+    upstream).
+ -- Sebastian Lackner <sebastian@fds-team.de>  Sun, 31 May 2015 04:43:28 +0200
+
 wine-staging (1.7.43) unstable; urgency=low
   * Disable patchset shell32-Default_Folder_ACLs (fixes Wine Staging Bug #265).
   * Updated patch to calculate msvcrt exponential math operations with higher

debian/control

@@ -14,7 +14,7 @@ Build-Depends: autotools-dev,
                flex,
                fontforge,
                gawk,
-               gcc-4.5 | gcc-4.7 | ubuntu-desktop (<< 1.207),
+               gcc-4.5 | gcc-4.7 | gcc-4.9 | ubuntu-desktop (<< 1.207),
                gettext,
                libacl1-dev,
                libasound2-dev,
@@ -37,6 +37,7 @@ Build-Depends: autotools-dev,
                libmpg123-dev,
                libncurses5-dev | libncurses-dev,
                libopenal-dev (>= 1:1.12) | ubuntu-desktop (<< 1.207),
+               libosmesa6-dev,
                libpcap-dev,
                libpng12-dev,
                libpulse-dev,
@@ -82,10 +83,7 @@ Recommends: libcapi20-3,
             libfontconfig1 | libfontconfig,
             libfreetype6,
             libgnutls26,
-            libgphoto2-6 | libgphoto2-2 (>= 2.4.6),
-            libgphoto2-port10 | libgphoto2-port0 (>= 2.4.6),
             libjpeg8,
-            libopenal1 (>= 1:1.12),
             libosmesa6,
             libpcap0.8,
             libpng12-0,
@@ -139,10 +137,7 @@ Recommends: libcapi20-3,
             libfontconfig1 | libfontconfig,
             libfreetype6,
             libgnutls26,
-            libgphoto2-6 | libgphoto2-2 (>= 2.4.6),
-            libgphoto2-port10 | libgphoto2-port0 (>= 2.4.6),
             libjpeg8,
-            libopenal1 (>= 1:1.12),
             libosmesa6,
             libpcap0.8,
             libpng12-0,

debian/rules

@@ -1,11 +1,8 @@
 #!/usr/bin/make -f
 
-# Use gcc-4.5 if it's available
-ifeq ($(shell which gcc-4.5),)
-	CC = gcc
-else
-	CC = gcc-4.5
-endif
+# Prefer gcc-4.5, then 4.7, then 4.9 - otherwise fallback to gcc.
+export CC = $(shell for _cc in gcc-4.5 gcc-4.7 gcc-4.9 gcc false; do \
+		if which "$$_cc" >/dev/null 2>&1; then echo "$$_cc"; break; fi; done)
 
 %:
 	dh $@ --parallel

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

debian/tools/patchutils.py

@@ -305,6 +305,8 @@ def read_patch(filename):
         if r is not None: return "%s: %s" % (r.group(1), r.group(4)), int(r.group(3))
         r = re.match("^(.*) +%s$" % version, subject, re.IGNORECASE)
         if r is not None: return r.group(1).strip(), int(r.group(3))
+        r = re.match("^(.*)\\(resend\\)$", subject, re.IGNORECASE)
+        if r is not None: return r.group(1).strip(), 1
         return subject, 1
 
     header = {}

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/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/advapi32-ImpersonateAnonymousToken/0001-advapi32-Add-stub-for-ImpersonateAnonymousToken.patch

@@ -1,75 +0,0 @@
-From a996ccc06eebf03b706e28c3af277901b5074e37 Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Thu, 30 Apr 2015 01:37:44 +0200
-Subject: advapi32: Add stub for ImpersonateAnonymousToken.
-
----
- dlls/advapi32/advapi32.spec                                    |  2 +-
- dlls/advapi32/security.c                                       | 10 ++++++++++
- .../api-ms-win-security-base-l1-1-0.spec                       |  2 +-
- .../api-ms-win-security-base-l1-2-0.spec                       |  2 +-
- 4 files changed, 13 insertions(+), 3 deletions(-)
-
-diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec
-index e7b7cf7..9fdd266 100644
---- a/dlls/advapi32/advapi32.spec
-+++ b/dlls/advapi32/advapi32.spec
-@@ -375,7 +375,7 @@
- @ stub I_ScSetServiceBitsA
- # @ stub I_ScSetServiceBitsW
- # @ stub IdentifyCodeAuthzLevelW
--# @ stub ImpersonateAnonymousToken
-+@ stdcall ImpersonateAnonymousToken(long)
- @ stdcall ImpersonateLoggedOnUser(long)
- @ stdcall ImpersonateNamedPipeClient(long)
- @ stdcall ImpersonateSelf(long)
-diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c
-index d27b2e7..de3c82e 100644
---- a/dlls/advapi32/security.c
-+++ b/dlls/advapi32/security.c
-@@ -2501,6 +2501,16 @@ BOOL WINAPI ImpersonateLoggedOnUser(HANDLE hToken)
- }
- 
- /******************************************************************************
-+ * ImpersonateAnonymousToken [ADVAPI32.@]
-+ */
-+BOOL WINAPI ImpersonateAnonymousToken(HANDLE hThread)
-+{
-+    FIXME("(%p)\n", hThread);
-+    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-+    return FALSE;
-+}
-+
-+/******************************************************************************
-  * AccessCheck [ADVAPI32.@]
-  */
- BOOL WINAPI
-diff --git a/dlls/api-ms-win-security-base-l1-1-0/api-ms-win-security-base-l1-1-0.spec b/dlls/api-ms-win-security-base-l1-1-0/api-ms-win-security-base-l1-1-0.spec
-index 548ae83..4277706 100644
---- a/dlls/api-ms-win-security-base-l1-1-0/api-ms-win-security-base-l1-1-0.spec
-+++ b/dlls/api-ms-win-security-base-l1-1-0/api-ms-win-security-base-l1-1-0.spec
-@@ -58,7 +58,7 @@
- @ stdcall GetSidSubAuthorityCount(ptr) advapi32.GetSidSubAuthorityCount
- @ stdcall GetTokenInformation(long long ptr long ptr) advapi32.GetTokenInformation
- @ stub GetWindowsAccountDomainSid
--@ stub ImpersonateAnonymousToken
-+@ stdcall ImpersonateAnonymousToken(long) advapi32.ImpersonateAnonymousToken
- @ stdcall ImpersonateLoggedOnUser(long) advapi32.ImpersonateLoggedOnUser
- @ stdcall ImpersonateSelf(long) advapi32.ImpersonateSelf
- @ stdcall InitializeAcl(ptr long long) advapi32.InitializeAcl
-diff --git a/dlls/api-ms-win-security-base-l1-2-0/api-ms-win-security-base-l1-2-0.spec b/dlls/api-ms-win-security-base-l1-2-0/api-ms-win-security-base-l1-2-0.spec
-index d268183..3adef23 100644
---- a/dlls/api-ms-win-security-base-l1-2-0/api-ms-win-security-base-l1-2-0.spec
-+++ b/dlls/api-ms-win-security-base-l1-2-0/api-ms-win-security-base-l1-2-0.spec
-@@ -64,7 +64,7 @@
- @ stdcall GetSidSubAuthorityCount(ptr) advapi32.GetSidSubAuthorityCount
- @ stdcall GetTokenInformation(long long ptr long ptr) advapi32.GetTokenInformation
- @ stub GetWindowsAccountDomainSid
--@ stub ImpersonateAnonymousToken
-+@ stdcall ImpersonateAnonymousToken(long) advapi32.ImpersonateAnonymousToken
- @ stdcall ImpersonateLoggedOnUser(long) advapi32.ImpersonateLoggedOnUser
- @ stdcall ImpersonateSelf(long) advapi32.ImpersonateSelf
- @ stdcall InitializeAcl(ptr long long) advapi32.InitializeAcl
--- 
-2.4.0
-

patches/advapi32-ImpersonateAnonymousToken/definition

@@ -1 +0,0 @@
-Fixes: Add stub for advapi32.ImpersonateAnonymousToken

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/amstream-GetMultiMediaStream/0001-amstream-Implement-IAMMediaStream-GetMultiMediaStrea.patch

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

patches/amstream-GetMultiMediaStream/definition

@@ -0,0 +1 @@
+Fixes: [37090] Implement AMStream GetMultiMediaStream functions

patches/atl-AtlIPersistPropertyBag_Save/0001-atl-Added-stub-AtlIPersistPropertyBag_Save.patch

@@ -1,100 +0,0 @@
-From d36d6e9c52001d6b2fd7ff5be98cfc1aca650694 Mon Sep 17 00:00:00 2001
-From: Qian Hong <qhong@codeweavers.com>
-Date: Wed, 16 Apr 2014 14:45:53 +0800
-Subject: atl: Added stub AtlIPersistPropertyBag_Save.
-
----
- dlls/atl/atl.c          | 7 +++++++
- dlls/atl/atl.spec       | 2 +-
- dlls/atl100/atl100.spec | 2 +-
- dlls/atl110/atl110.spec | 2 +-
- dlls/atl80/atl80.spec   | 2 +-
- dlls/atl90/atl90.spec   | 2 +-
- 6 files changed, 12 insertions(+), 5 deletions(-)
-
-diff --git a/dlls/atl/atl.c b/dlls/atl/atl.c
-index 795ca9b..84c81f9 100644
---- a/dlls/atl/atl.c
-+++ b/dlls/atl/atl.c
-@@ -285,6 +285,13 @@ HRESULT WINAPI AtlIPersistPropertyBag_Load(LPPROPERTYBAG pPropBag, LPERRORLOG pE
-     return S_OK;
- }
- 
-+HRESULT WINAPI AtlIPersistPropertyBag_Save(LPPROPERTYBAG pPropBag, int unknown1, int unknown2,
-+                                           ATL_PROPMAP_ENTRY *pMap, void *pThis, IUnknown *pUnk)
-+{
-+    FIXME("(%p, %x, %x, %p, %p, %p)\n", pPropBag, unknown1, unknown2, pMap, pThis, pUnk);
-+
-+    return S_OK;
-+}
- /***********************************************************************
-  *           AtlModuleAddTermFunc            [atl100.@]
-  */
-diff --git a/dlls/atl/atl.spec b/dlls/atl/atl.spec
-index aa0f44b..466f07a 100644
---- a/dlls/atl/atl.spec
-+++ b/dlls/atl/atl.spec
-@@ -44,7 +44,7 @@
- 50 stdcall AtlIPersistStreamInit_Load(ptr ptr ptr ptr)
- 51 stdcall AtlIPersistStreamInit_Save(ptr long ptr ptr ptr)
- 52 stdcall AtlIPersistPropertyBag_Load(ptr ptr ptr ptr ptr)
--53 stub AtlIPersistPropertyBag_Save
-+53 stdcall AtlIPersistPropertyBag_Save(ptr long long ptr ptr)
- 54 stdcall AtlGetObjectSourceInterface(ptr ptr ptr ptr ptr)
- 55 stub AtlModuleUnRegisterTypeLib
- 56 stdcall AtlModuleLoadTypeLib(ptr wstr ptr ptr)
-diff --git a/dlls/atl100/atl100.spec b/dlls/atl100/atl100.spec
-index 25fad3d..80b4b16 100644
---- a/dlls/atl100/atl100.spec
-+++ b/dlls/atl100/atl100.spec
-@@ -36,7 +36,7 @@
- 50 stdcall AtlIPersistStreamInit_Load(ptr ptr ptr ptr)
- 51 stdcall AtlIPersistStreamInit_Save(ptr long ptr ptr ptr)
- 52 stdcall AtlIPersistPropertyBag_Load(ptr ptr ptr ptr ptr)
--53 stub AtlIPersistPropertyBag_Save
-+53 stdcall AtlIPersistPropertyBag_Save(ptr long long ptr ptr ptr)
- 54 stdcall AtlGetObjectSourceInterface(ptr ptr ptr ptr ptr)
- 56 stdcall AtlLoadTypeLib(long wstr ptr ptr)
- 58 stdcall AtlModuleAddTermFunc(ptr ptr long)
-diff --git a/dlls/atl110/atl110.spec b/dlls/atl110/atl110.spec
-index 25fad3d..80b4b16 100644
---- a/dlls/atl110/atl110.spec
-+++ b/dlls/atl110/atl110.spec
-@@ -36,7 +36,7 @@
- 50 stdcall AtlIPersistStreamInit_Load(ptr ptr ptr ptr)
- 51 stdcall AtlIPersistStreamInit_Save(ptr long ptr ptr ptr)
- 52 stdcall AtlIPersistPropertyBag_Load(ptr ptr ptr ptr ptr)
--53 stub AtlIPersistPropertyBag_Save
-+53 stdcall AtlIPersistPropertyBag_Save(ptr long long ptr ptr ptr)
- 54 stdcall AtlGetObjectSourceInterface(ptr ptr ptr ptr ptr)
- 56 stdcall AtlLoadTypeLib(long wstr ptr ptr)
- 58 stdcall AtlModuleAddTermFunc(ptr ptr long)
-diff --git a/dlls/atl80/atl80.spec b/dlls/atl80/atl80.spec
-index f313944..e82fba0 100644
---- a/dlls/atl80/atl80.spec
-+++ b/dlls/atl80/atl80.spec
-@@ -38,7 +38,7 @@
- 50 stdcall AtlIPersistStreamInit_Load(ptr ptr ptr ptr)
- 51 stdcall AtlIPersistStreamInit_Save(ptr long ptr ptr ptr)
- 52 stdcall AtlIPersistPropertyBag_Load(ptr ptr ptr ptr ptr)
--53 stub AtlIPersistPropertyBag_Save
-+53 stdcall AtlIPersistPropertyBag_Save(ptr long long ptr ptr ptr)
- 54 stdcall AtlGetObjectSourceInterface(ptr ptr ptr ptr ptr)
- 55 stub AtlUnRegisterTypeLib
- 56 stdcall AtlLoadTypeLib(long wstr ptr ptr)
-diff --git a/dlls/atl90/atl90.spec b/dlls/atl90/atl90.spec
-index 25fad3d..80b4b16 100644
---- a/dlls/atl90/atl90.spec
-+++ b/dlls/atl90/atl90.spec
-@@ -36,7 +36,7 @@
- 50 stdcall AtlIPersistStreamInit_Load(ptr ptr ptr ptr)
- 51 stdcall AtlIPersistStreamInit_Save(ptr long ptr ptr ptr)
- 52 stdcall AtlIPersistPropertyBag_Load(ptr ptr ptr ptr ptr)
--53 stub AtlIPersistPropertyBag_Save
-+53 stdcall AtlIPersistPropertyBag_Save(ptr long long ptr ptr ptr)
- 54 stdcall AtlGetObjectSourceInterface(ptr ptr ptr ptr ptr)
- 56 stdcall AtlLoadTypeLib(long wstr ptr ptr)
- 58 stdcall AtlModuleAddTermFunc(ptr ptr long)
--- 
-2.3.7
-

patches/atl-AtlIPersistPropertyBag_Save/definition

@@ -1,2 +0,0 @@
-Fixes: [33888] Add stub for atl80.AtlIPersistPropertyBag_Save
-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