Release 1.7.48.

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.46 [236]:**
+**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
@@ -50,8 +50,6 @@ 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 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
@@ -60,11 +58,9 @@ for more details.*
 * 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 d3d11.D3D11CreateDeviceAndSwapChain ([Wine Bug #33153](https://bugs.winehq.org/show_bug.cgi?id=33153))
 * Add stub for gdiplus.GdipCreateEffect ([Wine Bug #32163](https://bugs.winehq.org/show_bug.cgi?id=32163))
 * Add stub for ntoskrnl.ExAcquireResourceExclusiveLite
 * Add stub for ntoskrnl.ExDeleteResourceLite
@@ -77,17 +73,20 @@ for more details.*
 * 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 wined3d detection for GeForce GT 425M ([Wine Bug #35054](https://bugs.winehq.org/show_bug.cgi?id=35054))
 * Adobe Reader needs ITextSelection_fnGetDuplicate implementation
 * Allow selection of audio device for PulseAudio backend
 * Allow special characters in pipe names ([Wine Bug #28995](https://bugs.winehq.org/show_bug.cgi?id=28995))
 * Allow to cancel a file operation via progress callback ([Wine Bug #22690](https://bugs.winehq.org/show_bug.cgi?id=22690))
 * Allow to edit winecfg library override by double clicking
-* Allow to enable/disable InsertMode in wineconsole settings ([Wine Bug #38697](https://bugs.winehq.org/show_bug.cgi?id=38697))
 * Allow to open files/directories without any access rights in order to query attributes
 * Allow to override number of quality levels for D3DMULTISAMPLE_NONMASKABLE. ([Wine Bug #12652](https://bugs.winehq.org/show_bug.cgi?id=12652))
 * Allow to set pixel format for desktop window
@@ -97,6 +96,7 @@ for more details.*
 * 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,6 +104,7 @@ 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))
@@ -113,14 +114,13 @@ for more details.*
 * 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))
+* 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 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))
@@ -142,6 +142,7 @@ for more details.*
 * 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
@@ -149,6 +150,7 @@ for more details.*
 * 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,23 +158,23 @@ 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))
+* 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))
 * GetMessage should remove already seen messages with higher priority ([Wine Bug #28884](https://bugs.winehq.org/show_bug.cgi?id=28884))
 * GetMonitorInfo returns the same name for all monitors ([Wine Bug #37709](https://bugs.winehq.org/show_bug.cgi?id=37709))
 * GetSecurityInfo returns NULL DACL for process object ([Wine Bug #15980](https://bugs.winehq.org/show_bug.cgi?id=15980))
 * Globally invalidate key state on changes in other threads ([Wine Bug #29871](https://bugs.winehq.org/show_bug.cgi?id=29871))
 * Graphical issues in Inquisitor ([Wine Bug #32490](https://bugs.winehq.org/show_bug.cgi?id=32490))
-* Ignore 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 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))
@@ -186,9 +188,7 @@ for more details.*
 * 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
@@ -205,7 +205,6 @@ for more details.*
 * MediaCoder needs CUDA for video encoding ([Wine Bug #37664](https://bugs.winehq.org/show_bug.cgi?id=37664))
 * Multiple applications need EnumDisplayDevicesW implementation ([Wine Bug #34978](https://bugs.winehq.org/show_bug.cgi?id=34978))
 * Multiple applications needs better NtQueryInformationJobObject stub
-* Multiple applications start wrong executable if whitespace present in name ([Wine Bug #19666](https://bugs.winehq.org/show_bug.cgi?id=19666))
 * Need for Speed 3 installer requires devices in HKEY_DYN_DATA ([Wine Bug #7115](https://bugs.winehq.org/show_bug.cgi?id=7115))
 * Only send WM_DROPFILES when OLE dnd fails ([Wine Bug #29081](https://bugs.winehq.org/show_bug.cgi?id=29081))
 * Other Pipelight-specific enhancements
@@ -217,19 +216,22 @@ for more details.*
 * Return an error when trying to open a terminated process ([Wine Bug #37087](https://bugs.winehq.org/show_bug.cgi?id=37087))
 * Return correct IMediaSeeking stream positions in quartz
 * Return correct values for GetThreadTimes function ([Wine Bug #20230](https://bugs.winehq.org/show_bug.cgi?id=20230))
-* Return 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))
-* 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
+* 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))
@@ -253,7 +255,6 @@ for more details.*
 * 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))
@@ -272,16 +273,17 @@ 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 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
 * 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,67 @@
+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.

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/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/Coverity/0001-ws2_32-Fix-uninitialized-memory-access-in-do_poll-Co.patch

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

patches/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/comctl32-LoadIconMetric/0001-comctl32-Implement-LoadIconMetric-function.patch

@@ -1,30 +1,20 @@
-From 3e8d16b07793f5794702e31dc08a55a71f46fa1f Mon Sep 17 00:00:00 2001
+From 74254e3904454c5d088bf400d3d58107aa2b138b Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Thu, 7 Aug 2014 01:41:25 +0200
 Subject: comctl32: Implement LoadIconMetric function.
 
+Changes by Alistair Leslie-Hughes:
+* Moved LoadIconMetric to commctrl.c
+* Changed INT, PCWSTR type
+* Added function to include/commctrl.h
 ---
- dlls/comctl32/Makefile.in   |  1 +
  dlls/comctl32/comctl32.spec |  1 +
- dlls/comctl32/icon.c        | 68 +++++++++++++++++++++++++++++++++++++++++++++
- include/commctrl.h          |  6 ++++
- 4 files changed, 76 insertions(+)
- create mode 100644 dlls/comctl32/icon.c
+ dlls/comctl32/commctrl.c    | 40 ++++++++++++++++++++++++++++++++++++++++
+ include/commctrl.h          |  7 +++++++
+ 3 files changed, 48 insertions(+)
 
-diff --git a/dlls/comctl32/Makefile.in b/dlls/comctl32/Makefile.in
-index e63f0ac..af49017 100644
---- a/dlls/comctl32/Makefile.in
-+++ b/dlls/comctl32/Makefile.in
-@@ -16,6 +16,7 @@ C_SRCS = \
- 	flatsb.c \
- 	header.c \
- 	hotkey.c \
-+	icon.c \
- 	imagelist.c \
- 	ipaddress.c \
- 	listview.c \
 diff --git a/dlls/comctl32/comctl32.spec b/dlls/comctl32/comctl32.spec
-index 0bd8b13..2b96891 100644
+index 1e92e5f..e61dfbf 100644
 --- a/dlls/comctl32/comctl32.spec
 +++ b/dlls/comctl32/comctl32.spec
 @@ -88,6 +88,7 @@
@@ -35,56 +25,36 @@ index 0bd8b13..2b96891 100644
  381 stdcall -ordinal LoadIconWithScaleDown(ptr wstr long long ptr)
  382 stdcall -noname SmoothScrollWindow(ptr)
  383 stub -noname DoReaderMode
-diff --git a/dlls/comctl32/icon.c b/dlls/comctl32/icon.c
-new file mode 100644
-index 0000000..a664e2c
---- /dev/null
-+++ b/dlls/comctl32/icon.c
-@@ -0,0 +1,68 @@
-+/*
-+ * Comctl32 Icon functions
-+ *
+diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c
+index e18c27d..462ecf8 100644
+--- a/dlls/comctl32/commctrl.c
++++ b/dlls/comctl32/commctrl.c
+@@ -3,6 +3,7 @@
+  *
+  * Copyright 1997 Dimitrie O. Paun
+  * Copyright 1998,2000 Eric Kohl
 + * Copyright 2014 Michael Müller
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+  *
+  * This library is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU Lesser General Public
+@@ -1646,3 +1647,42 @@ HRESULT WINAPI LoadIconWithScaleDown(HINSTANCE hinst, PCWSTR name, int cx, int c
+     FIXME("stub: %p %s %d %d %p\n", hinst, wine_dbgstr_w(name), cx, cy, icon);
+     return E_NOTIMPL;
+ }
++
++/***********************************************************************
++ * LoadIconMetric [COMCTL32.@]
 + */
-+
-+#include <stdarg.h>
-+#include <string.h>
-+#include "windef.h"
-+#include "winbase.h"
-+#include "wingdi.h"
-+#include "winuser.h"
-+#include "winnls.h"
-+#include "commctrl.h"
-+#include "comctl32.h"
-+#include "wine/debug.h"
-+
-+WINE_DEFAULT_DEBUG_CHANNEL(commctrl);
-+
-+HRESULT WINAPI
-+LoadIconMetric (HINSTANCE hinst, PCWSTR name, INT size, HICON *icon)
++HRESULT WINAPI LoadIconMetric(HINSTANCE hinst, const WCHAR *name, int size, HICON *icon)
 +{
-+    INT width, height;
++    int width, height;
 +
 +    TRACE("(%p %s %d %p)\n", hinst, debugstr_w(name), size, icon);
 +
 +    if (!icon)
 +        return E_INVALIDARG;
 +
-+    /* windows sets it to zero in a case of failure */
++    /* Windows sets it to zero in a case of failure. */
 +    *icon = NULL;
 +
 +    if (!name)
@@ -92,40 +62,42 @@ index 0000000..a664e2c
 +
 +    if (size == LIM_SMALL)
 +    {
-+        width  = GetSystemMetrics( SM_CXSMICON );
-+        height = GetSystemMetrics( SM_CYSMICON );
++        width  = GetSystemMetrics(SM_CXSMICON);
++        height = GetSystemMetrics(SM_CYSMICON);
 +    }
 +    else if (size == LIM_LARGE)
 +    {
-+        width  = GetSystemMetrics( SM_CXICON );
-+        height = GetSystemMetrics( SM_CYICON );
++        width  = GetSystemMetrics(SM_CXICON);
++        height = GetSystemMetrics(SM_CYICON);
 +    }
 +    else
 +        return E_INVALIDARG;
 +
-+    *icon = LoadImageW( hinst, name, IMAGE_ICON, width, height, LR_SHARED );
++    /* FIXME: This doesn't seem to work properly yet with file names. */
++    *icon = LoadImageW(hinst, name, IMAGE_ICON, width, height, 0);
 +    if (*icon)
 +        return S_OK;
 +
 +    return HRESULT_FROM_WIN32(GetLastError());
 +}
 diff --git a/include/commctrl.h b/include/commctrl.h
-index 0bcaeb6..525f356 100644
+index 0bcaeb6..662dca1 100644
 --- a/include/commctrl.h
 +++ b/include/commctrl.h
-@@ -1374,6 +1374,12 @@ typedef struct tagTBADDBITMAP {
- #define HIST_ADDTOFAVORITES     3
- #define HIST_VIEWTREE           4
+@@ -42,6 +42,13 @@ BOOL WINAPI InitCommonControlsEx (const INITCOMMONCONTROLSEX*);
+ LANGID WINAPI GetMUILanguage (VOID);
+ VOID WINAPI InitMUILanguage (LANGID uiLang);
  
 +enum _LI_METRIC
 +{
-+   LIM_SMALL,
-+   LIM_LARGE,
++    LIM_SMALL,
++    LIM_LARGE
 +};
 +
- typedef struct tagTBSAVEPARAMSA {
-     HKEY   hkr;
-     LPCSTR pszSubKey;
++HRESULT WINAPI LoadIconMetric(HINSTANCE, const WCHAR *, int, HICON *);
+ HRESULT WINAPI LoadIconWithScaleDown(HINSTANCE, PCWSTR, int, int, HICON *);
+ 
+ #define COMCTL32_VERSION                5  /* dll version */
 -- 
-2.1.3
+2.4.5
 

patches/comctl32-LoadIconMetric/0002-comctl32-tests-Add-tests-for-LoadIconMetric-function.patch

@@ -1,14 +1,18 @@
-From 12e3dc5ffa57a18e67e8e30dd5c15e3dc0727e19 Mon Sep 17 00:00:00 2001
+From 54e59f6203fc4e8ce1a3855f51de9ba179bf7ef5 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Thu, 7 Aug 2014 01:54:28 +0200
 Subject: comctl32/tests: Add tests for LoadIconMetric function.
 
+Changes by Alistair Leslie-Hughes:
+* Changed PCWSTR, CHAR, INT
+* Changed LoadIconMetric to pLoadIconMetric
+  (caused a compile error since it's in the header).
 ---
- dlls/comctl32/tests/misc.c | 84 ++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 84 insertions(+)
+ dlls/comctl32/tests/misc.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 60 insertions(+)
 
 diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c
-index 69a7db4..55ea14a 100644
+index 280b46c..3d2231e 100644
 --- a/dlls/comctl32/tests/misc.c
 +++ b/dlls/comctl32/tests/misc.c
 @@ -20,6 +20,7 @@
@@ -23,99 +27,75 @@ index 69a7db4..55ea14a 100644
  static INT (WINAPI * pStr_GetPtrW)(LPCWSTR, LPWSTR, INT);
  static BOOL (WINAPI * pStr_SetPtrW)(LPWSTR, LPCWSTR);
  
-+static HRESULT (WINAPI * LoadIconMetric)(HINSTANCE, PCWSTR, INT, HICON*);
++static HRESULT (WINAPI * pLoadIconMetric)(HINSTANCE, const WCHAR *, int, HICON *);
 +
  static HMODULE hComctl32 = 0;
  
  #define COMCTL32_GET_PROC(ordinal, func) \
-@@ -205,6 +208,86 @@ static void test_TaskDialogIndirect(void)
+@@ -205,6 +208,62 @@ static void test_TaskDialogIndirect(void)
      ok(ptr == ptr2, "got wrong pointer for ordinal 345, %p expected %p\n", ptr2, ptr);
  }
  
 +static void test_LoadIconMetric(void)
 +{
-+    static const WCHAR nonExistingFile[] = {'d','o','e','s','n','o','t','e','x','i','s','t','.','i','c','o','\0'};
-+    HINSTANCE hinst;
-+    void *ptr;
-+    HICON icon;
++    static const WCHAR non_existing_fileW[] = {'n','o','n','e','x','i','s','t','i','n','g','.','i','c','o','\0'};
 +    HRESULT result;
 +    ICONINFO info;
-+    BOOL res;
-+    INT bytes;
++    HICON icon;
 +    BITMAP bmp;
++    void *ptr;
++    int bytes;
++    BOOL res;
 +
-+    hinst = LoadLibraryA("comctl32.dll");
-+
-+    LoadIconMetric = (void *)GetProcAddress(hinst, "LoadIconMetric");
-+    if (!LoadIconMetric)
++    pLoadIconMetric = (void *)GetProcAddress(hComctl32, "LoadIconMetric");
++    if (!pLoadIconMetric)
 +    {
 +        win_skip("LoadIconMetric not exported by name\n");
 +        return;
 +    }
 +
-+    ptr = GetProcAddress(hinst, (const CHAR*)380);
-+    ok(ptr == LoadIconMetric, "got wrong pointer for ordinal 380, %p expected %p\n",
-+       ptr, LoadIconMetric);
++    ptr = GetProcAddress(hComctl32, (const char *)380);
++    ok(ptr == pLoadIconMetric, "got wrong pointer for ordinal 380, %p expected %p\n",
++       ptr, pLoadIconMetric);
 +
-+    result = LoadIconMetric(NULL, (PCWSTR)IDI_APPLICATION, LIM_SMALL, &icon);
-+    ok(result == S_OK, "Expected S_OK, got %x\n", result);
-+    if (result == S_OK)
-+    {
-+        res = GetIconInfo(icon, &info);
-+        ok(res, "Failed to get icon info\n");
-+        if (res && info.hbmColor)
-+        {
-+            bytes = GetObjectA(info.hbmColor, sizeof(bmp), &bmp);
-+            ok(bytes > 0, "Failed to get bitmap info for icon\n");
-+            if (bytes > 0)
-+            {
-+                ok(bmp.bmWidth  == GetSystemMetrics( SM_CXSMICON ), "Wrong icon width\n");
-+                ok(bmp.bmHeight == GetSystemMetrics( SM_CYSMICON ), "Wrong icon height\n");
-+            }
-+        }
-+        DestroyIcon(icon);
-+    }
-+
-+    result = LoadIconMetric(NULL, (PCWSTR)IDI_APPLICATION, LIM_LARGE, &icon);
-+    ok(result == S_OK, "Expected S_OK, got %x\n", result);
-+    if (result == S_OK)
-+    {
-+        res = GetIconInfo(icon, &info);
-+        ok(res, "Failed to get icon info\n");
-+        if (res && info.hbmColor)
-+        {
-+            bytes = GetObjectA(info.hbmColor, sizeof(bmp), &bmp);
-+            ok(bytes > 0, "Failed to get bitmap info for icon\n");
-+            if (bytes > 0)
-+            {
-+                ok(bmp.bmWidth  == GetSystemMetrics( SM_CXICON ), "Wrong icon width\n");
-+                ok(bmp.bmHeight == GetSystemMetrics( SM_CYICON ), "Wrong icon height\n");
-+            }
-+        }
-+        DestroyIcon(icon);
-+    }
-+
-+    result = LoadIconMetric(NULL, (PCWSTR)IDI_APPLICATION, 0x100, &icon);
++    result = pLoadIconMetric(NULL, MAKEINTRESOURCEW(IDI_APPLICATION), 0x100, &icon);
 +    ok(result == E_INVALIDARG, "Expected E_INVALIDARG, got %x\n", result);
-+    if (result == S_OK) DestroyIcon(icon);
 +
 +    icon = (HICON)0x1234;
-+    result = LoadIconMetric(NULL, NULL, LIM_LARGE, &icon);
++    result = pLoadIconMetric(NULL, NULL, LIM_LARGE, &icon);
 +    ok(result == E_INVALIDARG, "Expected E_INVALIDARG, got %x\n", result);
-+    ok(icon == (HICON)0, "Expected 0x0, got %p\n", icon);
-+    if (result == S_OK) DestroyIcon(icon);
++    ok(icon == NULL, "Expected NULL, got %p\n", icon);
 +
-+    result = LoadIconMetric(NULL, nonExistingFile, LIM_LARGE, &icon);
++    result = pLoadIconMetric(NULL, non_existing_fileW, LIM_LARGE, &icon);
 +    ok(result == HRESULT_FROM_WIN32(ERROR_RESOURCE_TYPE_NOT_FOUND),
-+       "Expected 80070715, got %x\n", result);
-+    if (result == S_OK) DestroyIcon(icon);
++       "Expected HRESULT_FROM_WIN32(ERROR_RESOURCE_TYPE_NOT_FOUND), got %x\n", result);
++
++    result = pLoadIconMetric(NULL, MAKEINTRESOURCEW(IDI_APPLICATION), LIM_SMALL, &icon);
++    ok(result == S_OK, "Expected S_OK, got %x\n", result);
++    res = GetIconInfo(icon, &info);
++    ok(res, "Failed to get icon info, error %d\n", GetLastError());
++    bytes = GetObjectA(info.hbmColor, sizeof(bmp), &bmp);
++    ok(bytes > 0, "Failed to get bitmap info for icon\n");
++    ok(bmp.bmWidth  == GetSystemMetrics(SM_CXSMICON), "Wrong icon width\n");
++    ok(bmp.bmHeight == GetSystemMetrics(SM_CYSMICON), "Wrong icon height\n");
++    DestroyIcon(icon);
++
++    result = pLoadIconMetric(NULL, MAKEINTRESOURCEW(IDI_APPLICATION), LIM_LARGE, &icon);
++    ok(result == S_OK, "Expected S_OK, got %x\n", result);
++    res = GetIconInfo(icon, &info);
++    ok(res, "Failed to get icon info, error %d\n", GetLastError());
++    bytes = GetObjectA(info.hbmColor, sizeof(bmp), &bmp);
++    ok(bytes > 0, "Failed to get bitmap info for icon\n");
++    ok(bmp.bmWidth  == GetSystemMetrics(SM_CXICON), "Wrong icon width\n");
++    ok(bmp.bmHeight == GetSystemMetrics(SM_CYICON), "Wrong icon height\n");
++    DestroyIcon(icon);
 +}
 +
 +
  START_TEST(misc)
  {
      ULONG_PTR ctx_cookie;
-@@ -220,6 +303,7 @@ START_TEST(misc)
+@@ -220,6 +279,7 @@ START_TEST(misc)
          return;
  
      test_TaskDialogIndirect();
@@ -124,5 +104,5 @@ index 69a7db4..55ea14a 100644
      unload_v6_module(ctx_cookie, hCtx);
  }
 -- 
-1.8.3.2
+2.4.5
 

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

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

@@ -1,42 +0,0 @@
-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/d3d11-D3D11CreateDeviceAndSwapChain/0001-d3d11-add-a-stub-for-D3D11CreateDeviceAndSwapChain.patch

@@ -1,46 +0,0 @@
-From 84ef0e10eed439613ce503470eb000f79628fe6c Mon Sep 17 00:00:00 2001
-From: Austin English <austinenglish@gmail.com>
-Date: Tue, 23 Dec 2014 18:30:51 -0600
-Subject: d3d11: add a stub for D3D11CreateDeviceAndSwapChain
-
----
- dlls/d3d11/d3d11.spec   |  2 +-
- dlls/d3d11/d3d11_main.c | 12 ++++++++++++
- 2 files changed, 13 insertions(+), 1 deletion(-)
-
-diff --git a/dlls/d3d11/d3d11.spec b/dlls/d3d11/d3d11.spec
-index 52d7bcb..2d6c877 100644
---- a/dlls/d3d11/d3d11.spec
-+++ b/dlls/d3d11/d3d11.spec
-@@ -3,7 +3,7 @@
- @ stub D3D11CoreGetLayeredDeviceSize
- @ stub D3D11CoreRegisterLayers
- @ stdcall D3D11CreateDevice(ptr long ptr long ptr long long ptr ptr ptr)
--@ stub D3D11CreateDeviceAndSwapChain
-+@ stdcall D3D11CreateDeviceAndSwapChain(ptr long ptr long ptr long long ptr ptr ptr ptr ptr)
- @ stub D3DKMTCloseAdapter
- @ stub D3DKMTCreateAllocation
- @ stub D3DKMTCreateContext
-diff --git a/dlls/d3d11/d3d11_main.c b/dlls/d3d11/d3d11_main.c
-index ec8236f..bf8f42f 100644
---- a/dlls/d3d11/d3d11_main.c
-+++ b/dlls/d3d11/d3d11_main.c
-@@ -54,3 +54,15 @@ HRESULT WINAPI D3D11CreateDevice(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver_t
-             flags, feature_levels, levels, sdk_version, device, feature_level, context);
-     return E_OUTOFMEMORY;
- }
-+
-+HRESULT WINAPI D3D11CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver_type,
-+        HMODULE swrast, UINT flags, const D3D_FEATURE_LEVEL *feature_levels, UINT levels,
-+        UINT sdk_version, const DXGI_SWAP_CHAIN_DESC *swapchain_desc, IDXGISwapChain **swapchain,
-+        ID3D11Device **device, D3D_FEATURE_LEVEL *feature_level, ID3D11DeviceContext **immediate_context)
-+{
-+    FIXME("adapter %p, driver_type %s, swrast %p, flags %#x, feature_levels %p, levels %#x, sdk_version %d, "
-+            "swapchain_desc %p, swapchain %p, device %p, feature_level %p, immediate_context %p stub!\n",
-+            adapter, debug_d3d_driver_type(driver_type), swrast, flags, feature_levels, levels, sdk_version,
-+            swapchain_desc, swapchain, device, feature_level, immediate_context);
-+    return E_INVALIDARG;
-+}
--- 
-2.3.5
-

patches/d3d11-D3D11CreateDeviceAndSwapChain/definition

@@ -1,2 +0,0 @@
-Fixes: [33153] Add stub for d3d11.D3D11CreateDeviceAndSwapChain
-Category: stable

patches/d3dcompiler_43-D3DCompile/0001-d3dcompiler_43-Add-D3DCompileFromFile-stub.-try-3.patch

@@ -0,0 +1,57 @@
+From 13f3dd44fe48a06d9b8dafd4b499383cf17ff3e9 Mon Sep 17 00:00:00 2001
+From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
+Date: Thu, 23 Jul 2015 19:09:32 +1000
+Subject: d3dcompiler_43: Add D3DCompileFromFile stub. (try 3)
+
+---
+ dlls/d3dcompiler_43/compiler.c          | 9 +++++++++
+ dlls/d3dcompiler_46/d3dcompiler_46.spec | 2 +-
+ dlls/d3dcompiler_47/d3dcompiler_47.spec | 2 +-
+ 3 files changed, 11 insertions(+), 2 deletions(-)
+
+diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c
+index 114b4c1..5dce856 100644
+--- a/dlls/d3dcompiler_43/compiler.c
++++ b/dlls/d3dcompiler_43/compiler.c
+@@ -763,3 +763,12 @@ HRESULT WINAPI D3DDisassemble(const void *data, SIZE_T size, UINT flags, const c
+             data, size, flags, comments, disassembly);
+     return E_NOTIMPL;
+ }
++
++HRESULT WINAPI D3DCompileFromFile(const WCHAR *filename, const D3D_SHADER_MACRO *defines, ID3DInclude *includes,
++        const char *entrypoint, const char *target, UINT flags1, UINT flags2, ID3DBlob **code, ID3DBlob **errors)
++{
++    FIXME("filename %s, defines %p, includes %p, entrypoint %s, target %s, flags1 %x, flags2 %x, code %p, errors %p\n",
++            debugstr_w(filename), defines, includes, debugstr_a(entrypoint), debugstr_a(target), flags1, flags2, code, errors);
++
++    return E_NOTIMPL;
++}
+diff --git a/dlls/d3dcompiler_46/d3dcompiler_46.spec b/dlls/d3dcompiler_46/d3dcompiler_46.spec
+index 5811b40..e36a8c0 100644
+--- a/dlls/d3dcompiler_46/d3dcompiler_46.spec
++++ b/dlls/d3dcompiler_46/d3dcompiler_46.spec
+@@ -1,7 +1,7 @@
+ @ stdcall D3DAssemble(ptr long str ptr ptr long ptr ptr)
+ @ stdcall D3DCompile(ptr long str ptr ptr str str long long ptr ptr)
+ @ stub D3DCompile2
+-@ stub D3DCompileFromFile
++@ stdcall D3DCompileFromFile(wstr ptr ptr str str long long ptr ptr)
+ @ stub D3DCompressShaders
+ @ stdcall D3DCreateBlob(long ptr)
+ @ stub D3DDecompressShaders
+diff --git a/dlls/d3dcompiler_47/d3dcompiler_47.spec b/dlls/d3dcompiler_47/d3dcompiler_47.spec
+index 40ad977..a0df93e 100644
+--- a/dlls/d3dcompiler_47/d3dcompiler_47.spec
++++ b/dlls/d3dcompiler_47/d3dcompiler_47.spec
+@@ -1,7 +1,7 @@
+ @ stdcall D3DAssemble(ptr long str ptr ptr long ptr ptr)
+ @ stdcall D3DCompile(ptr long str ptr ptr str str long long ptr ptr)
+ @ stub D3DCompile2
+-@ stub D3DCompileFromFile
++@ stdcall D3DCompileFromFile(wstr ptr ptr str str long long ptr ptr)
+ @ stub D3DCompressShaders
+ @ stdcall D3DCreateBlob(long ptr)
+ @ stub D3DCreateFunctionLinkingGraph
+-- 
+2.4.5
+

patches/d3dcompiler_43-D3DCompile/0002-d3dcompiler_43-Implement-semi-stub-for-D3DCompile2.patch

@@ -0,0 +1,90 @@
+From 8e9d8ee497c06533082707f091339a20f2af5be1 Mon Sep 17 00:00:00 2001
+From: Sebastian Lackner <sebastian@fds-team.de>
+Date: Wed, 29 Jul 2015 17:58:02 +0200
+Subject: d3dcompiler_43: Implement semi-stub for D3DCompile2.
+
+---
+ dlls/d3dcompiler_43/compiler.c          | 28 ++++++++++++++++++++++++----
+ dlls/d3dcompiler_46/d3dcompiler_46.spec |  2 +-
+ dlls/d3dcompiler_47/d3dcompiler_47.spec |  2 +-
+ 3 files changed, 26 insertions(+), 6 deletions(-)
+
+diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c
+index 5dce856..33ef916 100644
+--- a/dlls/d3dcompiler_43/compiler.c
++++ b/dlls/d3dcompiler_43/compiler.c
+@@ -692,16 +692,23 @@ static HRESULT compile_shader(const char *preproc_shader, const char *target, co
+     return S_OK;
+ }
+ 
+-HRESULT WINAPI D3DCompile(const void *data, SIZE_T data_size, const char *filename,
++HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filename,
+         const D3D_SHADER_MACRO *defines, ID3DInclude *include, const char *entrypoint,
+-        const char *target, UINT sflags, UINT eflags, ID3DBlob **shader, ID3DBlob **error_messages)
++        const char *target, UINT sflags, UINT eflags, UINT secondary_flags,
++        const void *secondary_data, SIZE_T secondary_data_size, ID3DBlob **shader,
++        ID3DBlob **error_messages)
+ {
+     HRESULT hr;
+ 
+     TRACE("data %p, data_size %lu, filename %s, defines %p, include %p, entrypoint %s,\n"
+-            "target %s, sflags %#x, eflags %#x, shader %p, error_messages %p\n",
++            "target %s, sflags %#x, eflags %#x, secondary_flags %#x, secondary_data %p,\n"
++            "secondary_data_size %lu, shader %p, error_messages %p\n",
+             data, data_size, debugstr_a(filename), defines, include, debugstr_a(entrypoint),
+-            debugstr_a(target), sflags, eflags, shader, error_messages);
++            debugstr_a(target), sflags, eflags, secondary_flags, secondary_data,
++            secondary_data_size, shader, error_messages);
++
++    if (secondary_data)
++        FIXME("secondary data not implemented yet\n");
+ 
+     if (shader) *shader = NULL;
+     if (error_messages) *error_messages = NULL;
+@@ -717,6 +724,19 @@ HRESULT WINAPI D3DCompile(const void *data, SIZE_T data_size, const char *filena
+     return hr;
+ }
+ 
++HRESULT WINAPI D3DCompile(const void *data, SIZE_T data_size, const char *filename,
++        const D3D_SHADER_MACRO *defines, ID3DInclude *include, const char *entrypoint,
++        const char *target, UINT sflags, UINT eflags, ID3DBlob **shader, ID3DBlob **error_messages)
++{
++    TRACE("data %p, data_size %lu, filename %s, defines %p, include %p, entrypoint %s,\n"
++            "target %s, sflags %#x, eflags %#x, shader %p, error_messages %p\n",
++            data, data_size, debugstr_a(filename), defines, include, debugstr_a(entrypoint),
++            debugstr_a(target), sflags, eflags, shader, error_messages);
++
++    return D3DCompile2(data, data_size, filename, defines, include, entrypoint, target, sflags,
++            eflags, 0, NULL, 0, shader, error_messages);
++}
++
+ HRESULT WINAPI D3DPreprocess(const void *data, SIZE_T size, const char *filename,
+         const D3D_SHADER_MACRO *defines, ID3DInclude *include,
+         ID3DBlob **shader, ID3DBlob **error_messages)
+diff --git a/dlls/d3dcompiler_46/d3dcompiler_46.spec b/dlls/d3dcompiler_46/d3dcompiler_46.spec
+index e36a8c0..1b145c8a 100644
+--- a/dlls/d3dcompiler_46/d3dcompiler_46.spec
++++ b/dlls/d3dcompiler_46/d3dcompiler_46.spec
+@@ -1,6 +1,6 @@
+ @ stdcall D3DAssemble(ptr long str ptr ptr long ptr ptr)
+ @ stdcall D3DCompile(ptr long str ptr ptr str str long long ptr ptr)
+-@ stub D3DCompile2
++@ stdcall D3DCompile2(ptr long str ptr ptr str str long long long ptr long ptr ptr)
+ @ stdcall D3DCompileFromFile(wstr ptr ptr str str long long ptr ptr)
+ @ stub D3DCompressShaders
+ @ stdcall D3DCreateBlob(long ptr)
+diff --git a/dlls/d3dcompiler_47/d3dcompiler_47.spec b/dlls/d3dcompiler_47/d3dcompiler_47.spec
+index a0df93e..efa4767 100644
+--- a/dlls/d3dcompiler_47/d3dcompiler_47.spec
++++ b/dlls/d3dcompiler_47/d3dcompiler_47.spec
+@@ -1,6 +1,6 @@
+ @ stdcall D3DAssemble(ptr long str ptr ptr long ptr ptr)
+ @ stdcall D3DCompile(ptr long str ptr ptr str str long long ptr ptr)
+-@ stub D3DCompile2
++@ stdcall D3DCompile2(ptr long str ptr ptr str str long long long ptr long ptr ptr)
+ @ stdcall D3DCompileFromFile(wstr ptr ptr str str long long ptr ptr)
+ @ stub D3DCompressShaders
+ @ stdcall D3DCreateBlob(long ptr)
+-- 
+2.4.5
+

patches/d3dcompiler_43-D3DCompile/definition

@@ -0,0 +1 @@
+Fixes: Add stubs for D3DCompile2 and D3DCompileFromFile

patches/d3drm-Specfile/0001-d3drm-Mark-DllCanUnloadNow-and-DllGetClassObject-as-.patch

@@ -1,24 +0,0 @@
-From 348d1eafe2d80017509ebfb79832a7465fd1693b Mon Sep 17 00:00:00 2001
-From: Amine Khaldi <amine.khaldi@reactos.org>
-Date: Sun, 22 Feb 2015 22:39:25 +0100
-Subject: d3drm: Mark DllCanUnloadNow and DllGetClassObject as private.
-
----
- dlls/d3drm/d3drm.spec | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/dlls/d3drm/d3drm.spec b/dlls/d3drm/d3drm.spec
-index 4108a72..e83fb0b 100644
---- a/dlls/d3drm/d3drm.spec
-+++ b/dlls/d3drm/d3drm.spec
-@@ -19,5 +19,5 @@
- @ stdcall D3DRMVectorScale(ptr ptr float)
- @ stdcall D3DRMVectorSubtract(ptr ptr ptr)
- @ stdcall Direct3DRMCreate(ptr)
--@ stub DllCanUnloadNow
--@ stub DllGetClassObject
-+@ stub -private DllCanUnloadNow
-+@ stub -private DllGetClassObject
--- 
-2.3.0
-

patches/d3drm-Specfile/definition

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

patches/d3dx10_43-D3DX10CreateEffectFromFile/0001-d3dx10_43-Add-ID3DX10ThreadPump-interface.patch

@@ -0,0 +1,98 @@
+From f6d41cfa9447e79a432628db4c4d51eef49dd2ed Mon Sep 17 00:00:00 2001
+From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
+Date: Wed, 15 Jul 2015 13:37:50 +1000
+Subject: d3dx10_43: Add ID3DX10ThreadPump interface.
+
+---
+ include/Makefile.in    |  1 +
+ include/d3dx10core.idl | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 67 insertions(+)
+ create mode 100644 include/d3dx10core.idl
+
+diff --git a/include/Makefile.in b/include/Makefile.in
+index b524326..e0c1561 100644
+--- a/include/Makefile.in
++++ b/include/Makefile.in
+@@ -32,6 +32,7 @@ PUBLIC_IDL_H_SRCS = \
+ 	d3d11_1.idl \
+ 	d3d11sdklayers.idl \
+ 	d3dcommon.idl \
++	d3dx10core.idl \
+ 	ddstream.idl \
+ 	devicetopology.idl \
+ 	dimm.idl \
+diff --git a/include/d3dx10core.idl b/include/d3dx10core.idl
+new file mode 100644
+index 0000000..d352670
+--- /dev/null
++++ b/include/d3dx10core.idl
+@@ -0,0 +1,66 @@
++/*
++ * Copyright 2015 Alistair Leslie-Hughes
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation; either
++ * version 2.1 of the License, or (at your option) any later version.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this library; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
++ */
++
++import "oaidl.idl";
++import "ocidl.idl";
++import "dxgi.idl";
++import "d3dcommon.idl";
++
++[
++    object,
++    local,
++    pointer_default(unique)
++]
++interface ID3DX10DataLoader
++{
++    HRESULT Load();
++    HRESULT Decompress([out] void **data, [in] SIZE_T *bytes);
++    HRESULT Destroy();
++};
++
++[
++    object,
++    local,
++    pointer_default(unique)
++]
++interface ID3DX10DataProcessor
++{
++    HRESULT Process([in] void *data, [in] SIZE_T bytes);
++    HRESULT CreateDeviceObject([out] void **dataobject);
++    HRESULT Destroy();
++};
++
++
++[
++    object,
++    local,
++    pointer_default(unique),
++    uuid(C93FECFA-6967-478a-ABBC-402D90621FCB)
++]
++interface ID3DX10ThreadPump : IUnknown
++{
++    HRESULT AddWorkItem([in] ID3DX10DataLoader *loader, [in] ID3DX10DataProcessor *processor,
++                        [in] HRESULT *result, [out] void **object);
++    UINT GetWorkItemCount();
++
++    HRESULT WaitForAllItems();
++    HRESULT ProcessDeviceWorkItems([in] UINT count);
++
++    HRESULT PurgeAllItems();
++    HRESULT GetQueueStatus([in] UINT *queue, [in] UINT *processqueue, [in] UINT *devicequeue);
++};
+-- 
+2.4.5
+