Release 1.8.

Also remove two references in the wined3d-Revert_PixelFormat patchset.

.gitignore

@@ -1,3 +1,3 @@
-debian/tools/wine
+staging/wine
 *.pyc
 .patchupdate.cache

README.md

@@ -34,26 +34,25 @@ Wine. All those differences are also documented on the
 Included bug fixes and improvements
 -----------------------------------
 
-**Bug fixes and features in Wine Staging 1.7.55 [269]:**
+**Bug fixes and features in Wine Staging 1.8 [268]:**
 
 *Note: The following list only contains features and bug fixes which are not
 yet available in vanilla Wine. They are removed from the list as soon as they
 are included upstream. The list also includes features and fixes from previous
 releases, take a look at the
-[changelog](https://github.com/wine-compholio/wine-staging/blob/master/debian/changelog)
+[changelog](https://github.com/wine-compholio/wine-staging/blob/master/staging/changelog)
 for more details.*
 
 * Add IDragSourceHelper stub interface ([Wine Bug #24699](https://bugs.winehq.org/show_bug.cgi?id=24699))
 * Add IHTMLLocation::hash property's getter implementation ([Wine Bug #32967](https://bugs.winehq.org/show_bug.cgi?id=32967))
 * Add a ProfileList\<UserSID> registry subkey ([Wine Bug #15670](https://bugs.winehq.org/show_bug.cgi?id=15670))
-* Add implementation for IDXGIOutput::GetDesc ([Wine Bug #32006](https://bugs.winehq.org/show_bug.cgi?id=32006))
+* Add a stub driver for tdi.sys ([Wine Bug #35693](https://bugs.winehq.org/show_bug.cgi?id=35693))
 * Add implementation for comctl32.PROPSHEET_InsertPage. ([Wine Bug #25625](https://bugs.winehq.org/show_bug.cgi?id=25625))
 * Add implementation for mfplat.MFTEnum ([Wine Bug #39309](https://bugs.winehq.org/show_bug.cgi?id=39309))
 * Add implementation for mfplat.MFTRegister ([Wine Bug #37811](https://bugs.winehq.org/show_bug.cgi?id=37811))
 * Add implementation for msidb commandline tool
 * Add implementation for shlwapi.AssocGetPerceivedType
 * Add nvapi stubs required for GPU PhysX support
-* Add partial implementation of ITfThreadMgrEx_ActivateEx ([Wine Bug #39564](https://bugs.winehq.org/show_bug.cgi?id=39564))
 * Add performance library registry keys needed by MS SQL Server Management Studio Express 2008 R2 ([Wine Bug #33661](https://bugs.winehq.org/show_bug.cgi?id=33661))
 * Add semi-stub for FileFsVolumeInformation information class ([Wine Bug #21466](https://bugs.winehq.org/show_bug.cgi?id=21466))
 * Add shell32 placeholder icons to match offsets with Windows ([Wine Bug #30185](https://bugs.winehq.org/show_bug.cgi?id=30185))
@@ -85,7 +84,6 @@ for more details.*
 * 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 dinput EnumDevices callback with broken calling convention ([Wine Bug #27664](https://bugs.winehq.org/show_bug.cgi?id=27664))
 * Allow non-nullterminated string as working directory in kernel32.create_startup_info
 * Allow selection of audio device for PulseAudio backend
 * Allow special characters in pipe names ([Wine Bug #28995](https://bugs.winehq.org/show_bug.cgi?id=28995))
@@ -93,8 +91,10 @@ for more details.*
 * 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 debug registers separately in NtSetContextThread ([Wine Bug #39454](https://bugs.winehq.org/show_bug.cgi?id=39454))
 * Allow to set pixel format for desktop window
 * Allow to specify default display frequency in registry
+* Also send WM_CAPTURECHANGE when capture has not changed ([Wine Bug #13683](https://bugs.winehq.org/show_bug.cgi?id=13683))
 * Always use 64-bit registry view on WOW64 setups
 * Anno 1602 installer depends on Windows 98 behavior of SHFileOperationW ([Wine Bug #37916](https://bugs.winehq.org/show_bug.cgi?id=37916))
 * Assign a drive serial number during prefix creation/update ([Wine Bug #17823](https://bugs.winehq.org/show_bug.cgi?id=17823))
@@ -103,7 +103,6 @@ for more details.*
 * Avoid race-conditions in NtReadFile() operations with write watches.
 * Avoid race-conditions of async WSARecv() operations with write watches.
 * Avoid race-conditions with write watches in WS2_async_accept.
-* Avseq crashes when multisampling is enabled ([Wine Bug #31998](https://bugs.winehq.org/show_bug.cgi?id=31998))
 * Basic handling of write watches triggered while we're on the signal stack.
 * Basic support for CUDA
 * Black & White needs DXTn software decoding support ([Wine Bug #14939](https://bugs.winehq.org/show_bug.cgi?id=14939))
@@ -111,6 +110,7 @@ for more details.*
 * Calculate msvcrt exponential math operations with higher precision ([Wine Bug #37149](https://bugs.winehq.org/show_bug.cgi?id=37149))
 * Catch invalid memory accesses in imagehlp.CheckSumMappedFile
 * Check architecture before trying to load libraries ([Wine Bug #38021](https://bugs.winehq.org/show_bug.cgi?id=38021))
+* Check handle type for HSPFILEQ handles ([Wine Bug #12332](https://bugs.winehq.org/show_bug.cgi?id=12332))
 * Codepage conversion should fail when destination length is < 0
 * CompareString should abort on first non-matching character ([Wine Bug #37556](https://bugs.winehq.org/show_bug.cgi?id=37556))
 * Create Microsoft\Windows\Themes directory during Wineprefix creation ([Wine Bug #34910](https://bugs.winehq.org/show_bug.cgi?id=34910))
@@ -120,21 +120,20 @@ for more details.*
 * Do not allow interruption of system APC in server_select ([Wine Bug #14697](https://bugs.winehq.org/show_bug.cgi?id=14697))
 * Do not allow to deallocate thread stack for current thread
 * Do not fail when a used context is passed to wglShareLists ([Wine Bug #11436](https://bugs.winehq.org/show_bug.cgi?id=11436))
-* Do not require SeBackupPrivilege in load_registry and unload_registry ([Wine Bug #28729](https://bugs.winehq.org/show_bug.cgi?id=28729))
+* Do not hold reference on parent process in wineserver ([Wine Bug #37087](https://bugs.winehq.org/show_bug.cgi?id=37087))
 * Do not signal threads until they are really gone
 * Do not use unixfs for devices without mountpoint
 * Do not wait for hook thread startup in IDirectInput8::Initialize ([Wine Bug #21403](https://bugs.winehq.org/show_bug.cgi?id=21403))
-* Enforce that surfaces are flushed after ReleaseDC ([Wine Bug #39465](https://bugs.winehq.org/show_bug.cgi?id=39465))
 * Ensure NtProtectVirtualMemory and NtCreateSection are on separate pages ([Wine Bug #33162](https://bugs.winehq.org/show_bug.cgi?id=33162))
+* Ensure default route IP addresses are returned first in gethostbyname ([Wine Bug #22819](https://bugs.winehq.org/show_bug.cgi?id=22819))
 * Exception during start of fr-043 caused by missing DXTn support ([Wine Bug #37391](https://bugs.winehq.org/show_bug.cgi?id=37391))
 * Export additional OpenAL32 functions ([Wine Bug #38972](https://bugs.winehq.org/show_bug.cgi?id=38972))
 * Expose PKEY_AudioEndpoint_PhysicalSpeakers device property in PulseAudio driver
-* FEAR 1 installer expects basic_string_wchar_dtor to return NULL ([Wine Bug #37358](https://bugs.winehq.org/show_bug.cgi?id=37358))
 * Fake success in IViewObject::Draw stub ([Wine Bug #30611](https://bugs.winehq.org/show_bug.cgi?id=30611))
 * Fake success in kernel32.SetFileCompletionNotificationModes ([Wine Bug #38960](https://bugs.winehq.org/show_bug.cgi?id=38960))
 * Fallback to default comspec when %COMSPEC% is not set
 * Fallback to system ping command when CAP_NET_RAW is not available ([Wine Bug #8332](https://bugs.winehq.org/show_bug.cgi?id=8332))
-* Fix access violation in MSYS2 git when cloning repository
+* Fix broken textures in XIII Century: Death or Glory ([Wine Bug #25419](https://bugs.winehq.org/show_bug.cgi?id=25419))
 * Fix calculation of listbox size when horizontal scrollbar is present ([Wine Bug #38142](https://bugs.winehq.org/show_bug.cgi?id=38142))
 * Fix caps lock state issues with multiple processes ([Wine Bug #35907](https://bugs.winehq.org/show_bug.cgi?id=35907))
 * Fix comparison of punctuation characters in lstrcmp ([Wine Bug #10767](https://bugs.winehq.org/show_bug.cgi?id=10767))
@@ -143,30 +142,28 @@ for more details.*
 * Fix crash of winedevice when relocation entry crosses page boundary ([Wine Bug #28254](https://bugs.winehq.org/show_bug.cgi?id=28254))
 * Fix detection of case-insensitive systems in MSYS2
 * Fix device paths in HKLM\SYSTEM\MountedDevices ([Wine Bug #38235](https://bugs.winehq.org/show_bug.cgi?id=38235))
-* Fix endless loop in regedit when importing files with very long lines
 * Fix error handling in DeferWindowPos when passing an invalid HWND ([Wine Bug #23187](https://bugs.winehq.org/show_bug.cgi?id=23187))
-* Fix flickering introduced by pixelformat changes. ([Wine Bug #35718](https://bugs.winehq.org/show_bug.cgi?id=35718))
+* Fix font loading in Capella ([Wine Bug #12377](https://bugs.winehq.org/show_bug.cgi?id=12377))
 * Fix for ConnectNamedPort return value in overlapped mode ([Wine Bug #16550](https://bugs.winehq.org/show_bug.cgi?id=16550))
 * Fix for programs leaking wndproc slots ([Wine Bug #32451](https://bugs.winehq.org/show_bug.cgi?id=32451))
 * Fix graphical corruption in FarCry 3 with NVIDIA drivers ([Wine Bug #35062](https://bugs.winehq.org/show_bug.cgi?id=35062))
-* Fix gray screen on startup introduced by pixelformat changes. ([Wine Bug #35975](https://bugs.winehq.org/show_bug.cgi?id=35975))
 * Fix handling of ANSI NTLM credentials ([Wine Bug #37063](https://bugs.winehq.org/show_bug.cgi?id=37063))
 * Fix handling of empty section and key name for profile files. ([Wine Bug #8036](https://bugs.winehq.org/show_bug.cgi?id=8036))
 * Fix handling of invert_y in DrawTextExW ([Wine Bug #22109](https://bugs.winehq.org/show_bug.cgi?id=22109))
 * Fix handling of window attributes for WS_EX_LAYERED | WS_EX_COMPOSITED ([Wine Bug #37876](https://bugs.winehq.org/show_bug.cgi?id=37876))
+* Fix implementation of NtQueryInformationProcess for ProcessDebugFlags
 * Fix implementation of msvcrt.close when stdout == stderr
+* Fix issue causing applications to report magic loopback address instead of real IP ([Wine Bug #37271](https://bugs.winehq.org/show_bug.cgi?id=37271))
 * Fix issues with dragging layers between images in Adobe Photoshop 7.0 ([Wine Bug #12007](https://bugs.winehq.org/show_bug.cgi?id=12007))
-* Fix missing video introduced by pixelformat changes. ([Wine Bug #36900](https://bugs.winehq.org/show_bug.cgi?id=36900))
 * Fix multithreading issues with fullscreen clipping ([Wine Bug #38087](https://bugs.winehq.org/show_bug.cgi?id=38087))
+* Fix possible leak of explorer.exe processes and implement proper desktop refcounting
 * Fix possible segfault in pulse_rd_loop of PulseAudio backend
 * Fix race-condition when threads are killed during shutdown
-* Fix regression caused by blacklisting supported OpenGL extensions ([Wine Bug #38480](https://bugs.winehq.org/show_bug.cgi?id=38480))
 * Fix return value of ScrollWindowEx for invisible windows ([Wine Bug #37706](https://bugs.winehq.org/show_bug.cgi?id=37706))
 * Fix scaling behaviour of images and mipmap levels in IDirect3DTexture2_Load (needed for example by Prezzie Hunt)
 * Fix texture corruption in CSI: Fatal Conspiracy ([Wine Bug #33768](https://bugs.winehq.org/show_bug.cgi?id=33768))
 * Fix the initialization of combined DACLs when the new DACL is empty ([Wine Bug #38423](https://bugs.winehq.org/show_bug.cgi?id=38423))
 * Fix unintentional leaks with ntdll internals
-* Fix wined3d performance drop introduced by pixelformat changes. ([Wine Bug #35655](https://bugs.winehq.org/show_bug.cgi?id=35655))
 * Fix wrong colors in Wolfenstein (2009) ([Wine Bug #34692](https://bugs.winehq.org/show_bug.cgi?id=34692))
 * Fix wrong defition of ntoskrnl.IoReleaseCancelSpinLock function.
 * Fix wrong version of ID3DXEffect interface for d3dx9_24
@@ -176,13 +173,13 @@ for more details.*
 * 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 socket type for protocol IPPROTO_IPV6 in getaddrinfo
 * Implement AMStream GetMultiMediaStream functions ([Wine Bug #37090](https://bugs.winehq.org/show_bug.cgi?id=37090))
 * Implement D3DXGetShaderOutputSemantics
 * Implement DDENUMSURFACES_CANBECREATED in IDirectDraw7::EnumSurfaces ([Wine Bug #17233](https://bugs.winehq.org/show_bug.cgi?id=17233))
 * Implement FileNamesInformation class support for NtQueryDirectoryFile
 * Implement FolderImpl_Items and stubbed FolderItems interface
 * Implement ID3DXEffect::FindNextValidTechnique ([Wine Bug #34101](https://bugs.winehq.org/show_bug.cgi?id=34101))
-* Implement IDXGIOutput::GetDesc
 * Implement SystemHandleInformation info class
 * Implement a Courier New replacement font ([Wine Bug #20456](https://bugs.winehq.org/show_bug.cgi?id=20456))
 * Implement a Microsoft Yahei replacement font ([Wine Bug #13829](https://bugs.winehq.org/show_bug.cgi?id=13829))
@@ -190,6 +187,7 @@ for more details.*
 * Implement additional stub functions in authz.dll
 * Implement an Arial replacement font ([Wine Bug #32323](https://bugs.winehq.org/show_bug.cgi?id=32323))
 * Implement default homepage button in inetcpl.cpl
+* Implement dinput device property DIPROP_USERNAME ([Wine Bug #39667](https://bugs.winehq.org/show_bug.cgi?id=39667))
 * Implement enumeration of sound devices and basic properties to dxdiagn ([Wine Bug #32613](https://bugs.winehq.org/show_bug.cgi?id=32613))
 * Implement exclusive mode in PulseAudio backend ([Wine Bug #37042](https://bugs.winehq.org/show_bug.cgi?id=37042))
 * Implement general tab for file property dialog
@@ -212,6 +210,7 @@ for more details.*
 * Implement support for "Purist Mode" (override for all dlls)
 * Improve INetFwAuthorizedApplication::get_ProcessImageFileName stub
 * Improve ReadDataAvailable handling in FilePipeLocalInformation class
+* Improve detection of symbol charset for old truetype fonts ([Wine Bug #33117](https://bugs.winehq.org/show_bug.cgi?id=33117))
 * Improve startup performance by delaying font initialization
 * Improve stub for AEV_GetVolumeRange ([Wine Bug #35658](https://bugs.winehq.org/show_bug.cgi?id=35658))
 * Improve stub for ID3DXEffectImpl_CloneEffect
@@ -220,6 +219,7 @@ for more details.*
 * Improve stubs for AEV_{Get,Set}Mute
 * Improve stubs for dxgi MakeWindowAssociation and GetWindowAssociation
 * Improvement for heap allocation performance
+* Initial implementation of wusa.exe (MSU package installer) ([Wine Bug #26757](https://bugs.winehq.org/show_bug.cgi?id=26757))
 * 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))
@@ -238,6 +238,7 @@ for more details.*
 * Process APC calls before starting process
 * Properly close sockets when WSACleanup is called ([Wine Bug #18670](https://bugs.winehq.org/show_bug.cgi?id=18670))
 * Properly handle multiple registry notifications per key
+* Properly implement GetLargestConsoleWindowSize ([Wine Bug #10919](https://bugs.winehq.org/show_bug.cgi?id=10919))
 * Properly implement imagehlp.ImageLoad and ImageUnload ([Wine Bug #23455](https://bugs.winehq.org/show_bug.cgi?id=23455))
 * Properly initialize caps->dwZBufferBitDepths in ddraw7_GetCaps ([Wine Bug #27002](https://bugs.winehq.org/show_bug.cgi?id=27002))
 * Properly render themed buttons when they are pressed ([Wine Bug #37584](https://bugs.winehq.org/show_bug.cgi?id=37584))
@@ -247,13 +248,11 @@ for more details.*
 * Return STATUS_INVALID_DEVICE_REQUEST when trying to call NtReadFile on directory
 * Return WN_NOT_CONNECTED from WNetGetUniversalName REMOTE_NAME_INFO_LEVEL stub ([Wine Bug #39452](https://bugs.winehq.org/show_bug.cgi?id=39452))
 * Return a valid mesh in D3DXCreateTeapot ([Wine Bug #36884](https://bugs.winehq.org/show_bug.cgi?id=36884))
-* Return an error when trying to open a terminated process ([Wine Bug #37087](https://bugs.winehq.org/show_bug.cgi?id=37087))
 * Return correct IMediaSeeking stream positions in quartz
 * Return correct values for GetThreadTimes function ([Wine Bug #20230](https://bugs.winehq.org/show_bug.cgi?id=20230))
 * Return dummy ID3DXSkinInfo interface when skinning info not present ([Wine Bug #33904](https://bugs.winehq.org/show_bug.cgi?id=33904))
 * Return fake device type when systemroot is located on virtual disk ([Wine Bug #36546](https://bugs.winehq.org/show_bug.cgi?id=36546))
 * Return proper status codes when NtReadFile/NtWriteFile is called on closed (but not disconnected) pipe
-* Revert patch to prepare GL resources before calling context_apply_fbo_state ([Wine Bug #39536](https://bugs.winehq.org/show_bug.cgi?id=39536))
 * SHFileOperation with FO_MOVE should create new directory on Vista+ ([Wine Bug #25207](https://bugs.winehq.org/show_bug.cgi?id=25207))
 * SO_CONNECT_TIME returns the appropriate time
 * Send WM_PAINT event during dialog creation ([Wine Bug #35652](https://bugs.winehq.org/show_bug.cgi?id=35652))
@@ -261,10 +260,11 @@ for more details.*
 * Set NamedPipeState to FILE_PIPE_CLOSING_STATE on broken pipe in NtQueryInformationFile
 * Share source of d3dx9_36 with d3dx9_33 to avoid Wine DLL forwards ([Wine Bug #21817](https://bugs.winehq.org/show_bug.cgi?id=21817))
 * Show unmounted devices in winecfg and allow changing the unix path
-* Show windows version when collecting system info in winedbg
+* Silence repeated FIXME message in surface_cpu_blt
 * Silence repeated LocaleNameToLCID/LCIDToLocaleName unsupported flags FIXMEs ([Wine Bug #30076](https://bugs.winehq.org/show_bug.cgi?id=30076))
 * Skip unknown item when decoding a CMS certificate ([Wine Bug #34388](https://bugs.winehq.org/show_bug.cgi?id=34388))
 * Software support for Environmental Audio Extensions (EAX)
+* Start SERVICE_FILE_SYSTEM_DRIVER services with winedevice ([Wine Bug #35824](https://bugs.winehq.org/show_bug.cgi?id=35824))
 * Super Mario 3: Mario Forever fails to load keyboard mapping from profile files. ([Wine Bug #18099](https://bugs.winehq.org/show_bug.cgi?id=18099))
 * Support for AllocateAndGetTcpExTableFromStack ([Wine Bug #34372](https://bugs.winehq.org/show_bug.cgi?id=34372))
 * Support for BindImageEx ([Wine Bug #3591](https://bugs.winehq.org/show_bug.cgi?id=3591))
@@ -311,5 +311,4 @@ for more details.*
 * XEMBED support for embedding Wine windows inside Linux applications
 * eRacer Demo doesn't correctly display text ([Wine Bug #29598](https://bugs.winehq.org/show_bug.cgi?id=29598))
 * ntdll is missing WinSqm[Start|End]Session implementation ([Wine Bug #31971](https://bugs.winehq.org/show_bug.cgi?id=31971))
-* wglDescribePixelFormat should return max index for NULL descriptor ([Wine Bug #6176](https://bugs.winehq.org/show_bug.cgi?id=6176))
 

debian/compat

@@ -1 +0,0 @@
-7

debian/control

@@ -1,327 +0,0 @@
-Source: wine-staging
-Section: otherosfs
-Priority: optional
-Maintainer: Erich E. Hoover <erich.e.hoover@gmail.com>
-XSBC-Original-Maintainer: Scott Ritchie <scottritchie@ubuntu.com>
-Build-Depends: autotools-dev,
-               autoconf,
-               bison,
-               bsdmainutils,
-               debhelper (>= 7),
-               docbook-to-man,
-               docbook-utils,
-               docbook-xsl,
-               flex,
-               fontforge,
-               gawk,
-               gcc-4.5 | gcc-4.7 | gcc-4.9 | ubuntu-desktop (<< 1.207),
-               gettext,
-               libacl1-dev,
-               libasound2-dev,
-               libcapi20-dev,
-               libcups2-dev,
-               libdbus-1-dev,
-               libesd0 | libesd-alsa0,
-               libesd0-dev,
-               libfontconfig1-dev | libfontconfig-dev,
-               libfreetype6-dev,
-               libgl1-mesa-dev | nvidia-glx-dev | fglrx-driver-dev | libgl-dev,
-               libglu1-mesa-dev | libglu-dev,
-               libgnutls-dev,
-               libgphoto2-dev | libgphoto2-6-dev | libgphoto2-2-dev (>= 2.4.6),
-               libgsm1-dev,
-               libgtk-3-dev,
-               libice-dev,
-               libjpeg-dev,
-               liblcms2-dev | ubuntu-desktop (<< 1.267),
-               libldap2-dev, libldap-dev,
-               libmpg123-dev,
-               libncurses5-dev | libncurses-dev,
-               libopenal-dev (>= 1:1.12) | ubuntu-desktop (<< 1.207),
-               libosmesa6-dev,
-               libpcap-dev,
-               libpng12-dev,
-               libpulse-dev,
-               libsane-dev,
-               libssl-dev,
-               libstdc++6-4.5-dev | libstdc++-dev,
-               libtiff5-dev | libtiff4-dev | libtiff-dev,
-               libtxc-dxtn-s2tc-dev,
-               libv4l-dev,
-               libva-dev,
-               libx11-dev,
-               libxcomposite-dev,
-               libxcursor-dev,
-               libxext-dev,
-               libxi-dev,
-               libxinerama-dev,
-               libxml2-dev,
-               libxrandr-dev,
-               libxrender-dev,
-               libxslt1-dev,
-               libxt-dev,
-               libxxf86vm-dev,
-               linux-kernel-headers,
-               linux-libc-dev,
-               patch,
-               perl,
-               prelink,
-               sharutils,
-               unixodbc-dev,
-               x11proto-xinerama-dev
-Standards-Version: 3.9.5
-
-Package: wine-staging-i386
-Architecture: i386
-Multi-Arch: foreign
-Pre-Depends: dpkg (>= 1.14.12ubuntu3), ${misc:Pre-Depends}
-Depends:    ${shlibs:Depends},
-            libasound2-plugins,
-            libncurses5
-Recommends: libcapi20-3,
-            libcups2,
-            libdbus-1-3,
-            libfontconfig1 | libfontconfig,
-            libfreetype6,
-            libgnutls26,
-            libgtk-3-0,
-            libjpeg8,
-            libosmesa6,
-            libpcap0.8,
-            libpng12-0,
-            libpulse0,
-            libsane,
-            libssl1.0.0,
-            libtiff5 | libtiff4,
-            libtxc-dxtn-s2tc0,
-            libv4l-0,
-            libva-drm1,
-            libva-x11-1,
-            libxcomposite1,
-            libxcursor1,
-            libxi6,
-            libxinerama1,
-            libxrandr2,
-            libxrender1,
-            libxslt1.1,
-            libxt6,
-            libxxf86vm1,
-            libodbc1,
-            libgsm1
-Section: otherosfs
-Priority: optional
-Description: special build of the popular Wine software
- The Staging Edition is a special build of the popular Wine software
- with patches representing my current staging tree for Wine.
- .
- Microsoft Windows Compatibility Layer (Binary Emulator and Library)
- Wine is a compatibility layer for running Windows applications on Linux.
- Applications are run at full speed without the need of cpu emulation. Wine
- does not require Microsoft Windows, however it can use native system dll
- files in place of its own if they are available.
- .
- This package provides support for loading 32-bit x86 Windows applications
- .
- This package is based on a recent Wine beta.  While many more applications
- will work, there may be some loss of functionality compared with the stable
- release provided by the regular wine package.
-
-Package: wine-staging-amd64
-Architecture: amd64
-Multi-Arch: foreign
-Pre-Depends: dpkg (>= 1.14.12ubuntu3), ${misc:Pre-Depends}
-Depends:    ${shlibs:Depends},
-            libasound2-plugins,
-            libncurses5
-Recommends: libcapi20-3,
-            libcups2,
-            libdbus-1-3,
-            libfontconfig1 | libfontconfig,
-            libfreetype6,
-            libgnutls26,
-            libgtk-3-0,
-            libjpeg8,
-            libosmesa6,
-            libpcap0.8,
-            libpng12-0,
-            libpulse0,
-            libsane,
-            libssl1.0.0,
-            libtiff5 | libtiff4,
-            libtxc-dxtn-s2tc0,
-            libv4l-0,
-            libva-drm1,
-            libva-x11-1,
-            libxcomposite1,
-            libxcursor1,
-            libxi6,
-            libxinerama1,
-            libxrandr2,
-            libxrender1,
-            libxslt1.1,
-            libxt6,
-            libxxf86vm1,
-            libodbc1,
-            libgsm1
-Section: otherosfs
-Priority: optional
-Description: special build of the popular Wine software
- The Staging Edition is a special build of the popular Wine software
- with patches representing my current staging tree for Wine.
- .
- Microsoft Windows Compatibility Layer (Binary Emulator and Library)
- Wine is a compatibility layer for running Windows applications on Linux.
- Applications are run at full speed without the need of cpu emulation. Wine
- does not require Microsoft Windows, however it can use native system dll
- files in place of its own if they are available.
- .
- This package provides support for loading 64-bit x86 Windows applications
- .
- This package is based on a recent Wine beta.  While many more applications
- will work, there may be some loss of functionality compared with the stable
- release provided by the regular wine package.
-
-Package: wine-staging
-Architecture: i386 amd64
-Multi-Arch: foreign
-Pre-Depends: dpkg (>= 1.14.12ubuntu3), ${misc:Pre-Depends}
-Depends:    ${misc:Depends}, ${shlibs:Depends},
-            wine-staging-i386  (= ${binary:Version}) [i386 amd64],
-            wine-staging-amd64 (= ${binary:Version}) [amd64],
-Section: otherosfs
-Priority: optional
-Description: special build of the popular Wine software
- The Staging Edition is a special build of the popular Wine software
- with patches representing my current staging tree for Wine.
- .
- Microsoft Windows Compatibility Layer (Binary Emulator and Library)
- Wine is a compatibility layer for running Windows applications on Linux.
- Applications are run at full speed without the need of cpu emulation. Wine
- does not require Microsoft Windows, however it can use native system dll
- files in place of its own if they are available.
- .
- This package includes a program loader for running unmodified Windows
- executables as well as the Wine project's free version of the Windows API
- for running programs ported from Windows.
- .
- This package is based on a recent Wine beta.  While many more applications
- will work, there may be some loss of functionality compared with the stable
- release provided by the regular wine package.
-
-Package: wine-staging-dev
-Architecture: i386 amd64
-Pre-Depends: dpkg (>= 1.14.12ubuntu3), ${misc:Pre-Depends}
-Depends:    libc6-dev,
-            ${shlibs:Depends},
-            wine-staging-i386  (= ${binary:Version}) [i386 amd64],
-            wine-staging-amd64 (= ${binary:Version}) [amd64],
-Section: libdevel
-Priority: optional
-Description: special build of the popular Wine software
- The Staging Edition is a special build of the popular Wine software
- with patches representing my current staging tree for Wine.
- .
- Microsoft Windows Compatibility Layer (Binary Emulator and Library)
- Wine is a compatibility layer for running Windows applications on Linux.
- Applications are run at full speed without the need of cpu emulation. Wine
- does not require Microsoft Windows, however it can use native system dll
- files in place of its own if they are available.
- .
- This package consists of the development files needed to compile programs
- using wine's free version of the Microsoft Windows API.
-
-Package: wine-staging-dbg
-Architecture: i386 amd64
-Multi-Arch: same
-Pre-Depends: dpkg (>= 1.14.12ubuntu3), ${misc:Pre-Depends}
-Depends:    ${shlibs:Depends},
-            wine-staging-i386  (= ${binary:Version}) [i386 amd64],
-            wine-staging-amd64 (= ${binary:Version}) [amd64],
-Section: debug
-Priority: optional
-Description: special build of the popular Wine software
- The Staging Edition is a special build of the popular Wine software
- with patches representing my current staging tree for Wine.
- .
- Microsoft Windows Compatibility Layer (Binary Emulator and Library)
- Wine is a compatibility layer for running Windows applications on Linux.
- Applications are run at full speed without the need of cpu emulation. Wine
- does not require Microsoft Windows, however it can use native system dll
- files in place of its own if they are available.
- .
- This package includes debugging symbols useful for reporting crashes and other
- failures.
-
-Package: wine-staging-compat
-Architecture: i386 amd64
-Depends: wine-staging, ${misc:Depends}
-Section: otherosfs
-Priority: optional
-Replaces:   wine, wine1.4, wine1.5, wine1.6, wine1.7, wine-i386, wine1.4-i386,
-            wine1.5-i386, wine1.6-i386, wine1.7-i386, ine-amd64, wine1.4-amd64,
-            wine1.5-amd64, wine1.6-amd64, wine1.7-amd64
-Conflicts:  wine, wine-i386, wine-amd64
-Provides:   wine, wine1.4, wine1.5, wine1.6, wine1.7, wine-i386, wine1.4-i386,
-            wine1.5-i386, wine1.6-i386, wine1.7-i386, wine-amd64 [amd64],
-            wine1.4-amd64 [amd64], wine1.5-amd64 [amd64], wine1.6-amd64 [amd64],
-            wine1.7-amd64 [amd64]
-Description: special build of the popular Wine software
- The Staging Edition is a special build of the popular Wine software
- with patches representing our current staging tree for Wine.
- .
- Microsoft Windows Compatibility Layer (Binary Emulator and Library)
- Wine is a compatibility layer for running Windows applications on Linux.
- Applications are run at full speed without the need of cpu emulation. Wine
- does not require Microsoft Windows, however it can use native system dll
- files in place of its own if they are available.
- .
- This package includes a program loader for running unmodified Windows
- executables as well as the Wine project's free version of the Windows API
- for running programs ported from Windows.
- .
- This package is based on a recent Wine beta.  While many more applications
- will work, there may be some loss of functionality compared with the stable
- release provided by the regular wine package.
- .
- This compatibility package allows to use Wine Staging system-wide as
- the default Wine version.
-
-Package: wine-compholio
-Architecture: i386 amd64
-Depends: wine-staging, ${misc:Depends}
-Priority: extra
-Section: oldlibs
-Description: Transitional dummy package
- This is a transitional dummy package. It can safely be removed.
-
-Package: wine-compholio-i386
-Architecture: i386
-Depends: wine-staging-i386, ${misc:Depends}
-Priority: extra
-Section: oldlibs
-Description: Transitional dummy package
- This is a transitional dummy package. It can safely be removed.
-
-Package: wine-compholio-amd64
-Architecture: amd64
-Depends: wine-staging-amd64, ${misc:Depends}
-Priority: extra
-Section: oldlibs
-Description: Transitional dummy package
- This is a transitional dummy package. It can safely be removed.
-
-Package: wine-compholio-dev
-Architecture: i386 amd64
-Depends: wine-staging-dev, ${misc:Depends}
-Priority: extra
-Section: oldlibs
-Description: Transitional dummy package
- This is a transitional dummy package. It can safely be removed.
-
-Package: wine-compholio-dbg
-Architecture: i386 amd64
-Depends: wine-staging-dbg, ${misc:Depends}
-Priority: extra
-Section: oldlibs
-Description: Transitional dummy package
- This is a transitional dummy package. It can safely be removed.

debian/copyright

@@ -1,226 +0,0 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: Wine Staging
-Source: http://www.winehq.com/ and http://www.wine-staging.com/
-
-Files: *
-Copyright: 1993-2015, the Wine project authors
-           2014-2015, the Wine Staging project authors
-License: LGPL-2.1
-
-Files: patches/fonts-Missing_Fonts/0001-fonts-Add-Liberation-Sans-as-an-Arial-replacement.patch
-Copyright: 2007, Red Hat
-License: LiberationFontLicense
-
-Files: patches/fonts-Missing_Fonts/0002-fonts-Add-WenQuanYi-Micro-Hei-as-a-Microsoft-Yahei-r.patch
-Copyright: 2008-2009, WenQuanYi Board of Trustees
-           2007, Google Corporation
-           2003-2004, Electronic Font Open Laboratory
-           1990-2003, Wada Laboratory, the University of Tokyo
-License: Apache-2 or GPL-3+ with font embedding exceptions
-
-Files: patches/fonts-Missing_Fonts/0003-fonts-Add-Courier-Prime-as-a-Courier-New-replacement
-Copyright: 2013, Quote-Unquote Apps
-License: OFL1.1
-
-License: LGPL-2.1
- This software 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 program 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.
- .
- On Debian systems, the complete text of the GNU Library General Public
- License can be found in /usr/share/common-licenses/LGPL-2.1 file.
-
-License: LiberationFontLicense
- LICENSE AGREEMENT AND LIMITED PRODUCT WARRANTY
- LIBERATION FONT SOFTWARE
- .
- This agreement governs the use of the Software and any updates to the Software,
- regardless of the delivery mechanism. Subject to the following terms, Red Hat,
- Inc. ("Red Hat") grants to the user ("Client") a license to this work pursuant
- to the GNU General Public License v.2 with the exceptions set forth below and
- such other terms as our set forth in this End User License Agreement.
- .
- 1.The Software and License Exception. LIBERATION font software  (the "Software")
- consists of TrueType-OpenType formatted font software for rendering LIBERATION
- typefaces in sans serif, serif, and monospaced character styles. You are licensed
- to use, modify, copy, and distribute the Software pursuant to the GNU General
- Public License v.2 with the following exceptions:
- (a)As a special exception, if you create a document which uses this font, and
- embed this font or unaltered portions of this font into the document, this font
- does not by itself cause the resulting document to be covered by the GNU General
- Public License. This exception does not however invalidate any other reasons why
- the document might be covered by the GNU General Public License. If you modify
- this font, you may extend this exception to your version of the font, but you
- are not obligated to do so. If you do not wish to do so, delete this exception
- statement from your version.
- (b)As a further exception, any distribution of the object code of the Software
- in a physical product must provide you the right to access and modify the source
- code for the Software and to reinstall that modified version of the Software in
- object code form on the same physical product on which you received it.
- 2.Intellectual Property Rights. The Software and each of its components,
- including the source code, documentation, appearance, structure and organization
- are owned by Red Hat and others and are protected under copyright and other laws.
- Title to the Software and any component, or to any copy, modification, or merged
- portion shall remain with the aforementioned, subject to the applicable license.
- The "LIBERATION" trademark is a trademark of Red Hat, Inc. in the U.S. and other
- countries. This agreement does not permit Client to distribute modified versions
- of the Software using Red Hat's trademarks. If Client makes a redistribution of
- a modified version of the Software, then Client must modify the files names to
- remove any reference to the Red Hat trademarks and must not use the Red Hat
- trademarks in any way to reference or promote the modified Software.
- 3.Limited Warranty. To the maximum extent permitted under applicable law, the
- Software is provided and licensed "as is" without warranty of any kind,
- expressed or implied, including the implied warranties of merchantability,
- non-infringement or fitness for a particular purpose. Red Hat does not warrant
- that the functions contained in the Software will meet Client's requirements or
- that the operation of the Software will be entirely error free or appear
- precisely as described in the accompanying documentation.
- 4.Limitation of Remedies and Liability. To the maximum extent permitted by
- applicable law, Red Hat or any Red Hat authorized dealer will not be liable to
- Client for any incidental or consequential damages, including lost profits or
- lost savings arising out of the use or inability to use the Software, even if
- Red Hat or such dealer has been advised of the possibility of such damages.
- 5.General. If any provision of this agreement is held to be unenforceable, that
- shall not affect the enforceability of the remaining provisions. This agreement
- shall be governed by the laws of the State of North Carolina and of the United
- States, without regard to any conflict of laws provisions, except that the
- United Nations Convention on the International Sale of Goods shall not apply.
- Copyright © 2007 Red Hat, Inc. All rights reserved. LIBERATION is a trademark
- of Red Hat, Inc.
-
-License: GPL-3+ with font embedding exceptions
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
- .
- This program 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 General Public License for more details.
- .
- As a special exception, if you create a document which uses this font,
- and embed this font or unaltered portions of this font into the
- document, this font does not by itself cause the resulting document to
- be covered by the GNU General Public License. This exception does not
- however invalidate any other reasons why the document might be covered
- by the GNU General Public License. If you modify this font, you may
- extend this exception to your version of the font, but you are not
- obligated to do so. If you do not wish to do so, delete this exception
- statement from your version.
- .
- On Debian systems, the complete text of the GNU General Public License
- version 3 can be found in /usr/share/common-licenses/GPL-3 file.
-
-License: OFL1.1
- Copyright (c) 2013, Quote-Unquote Apps (http://quoteunquoteapps.com),
- with Reserved Font Name Courier Prime.
- .
- This Font Software is licensed under the SIL Open Font License, Version 1.1.
- This license is copied below, and is also available with a FAQ at:
- http://scripts.sil.org/OFL
- .
- PREAMBLE
- The goals of the Open Font License (OFL) are to stimulate worldwide
- development of collaborative font projects, to support the font creation
- efforts of academic and linguistic communities, and to provide a free and
- open framework in which fonts may be shared and improved in partnership
- with others.
- .
- The OFL allows the licensed fonts to be used, studied, modified and
- redistributed freely as long as they are not sold by themselves. The
- fonts, including any derivative works, can be bundled, embedded, 
- redistributed and/or sold with any software provided that any reserved
- names are not used by derivative works. The fonts and derivatives,
- however, cannot be released under any other type of license. The
- requirement for fonts to remain under this license does not apply
- to any document created using the fonts or their derivatives.
- .
- DEFINITIONS
- "Font Software" refers to the set of files released by the Copyright
- Holder(s) under this license and clearly marked as such. This may
- include source files, build scripts and documentation.
- .
- "Reserved Font Name" refers to any names specified as such after the
- copyright statement(s).
- .
- "Original Version" refers to the collection of Font Software components as
- distributed by the Copyright Holder(s).
- .
- "Modified Version" refers to any derivative made by adding to, deleting,
- or substituting -- in part or in whole -- any of the components of the
- Original Version, by changing formats or by porting the Font Software to a
- new environment.
- .
- "Author" refers to any designer, engineer, programmer, technical
- writer or other person who contributed to the Font Software.
- .
- PERMISSION & CONDITIONS
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of the Font Software, to use, study, copy, merge, embed, modify,
- redistribute, and sell modified and unmodified copies of the Font
- Software, subject to the following conditions:
- .
- 1) Neither the Font Software nor any of its individual components,
- in Original or Modified Versions, may be sold by itself.
- .
- 2) Original or Modified Versions of the Font Software may be bundled,
- redistributed and/or sold with any software, provided that each copy
- contains the above copyright notice and this license. These can be
- included either as stand-alone text files, human-readable headers or
- in the appropriate machine-readable metadata fields within text or
- binary files as long as those fields can be easily viewed by the user.
- .
- 3) No Modified Version of the Font Software may use the Reserved Font
- Name(s) unless explicit written permission is granted by the corresponding
- Copyright Holder. This restriction only applies to the primary font name as
- presented to the users.
- .
- 4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
- Software shall not be used to promote, endorse or advertise any
- Modified Version, except to acknowledge the contribution(s) of the
- Copyright Holder(s) and the Author(s) or with their explicit written
- permission.
- .
- 5) The Font Software, modified or unmodified, in part or in whole,
- must be distributed entirely under this license, and must not be
- distributed under any other license. The requirement for fonts to
- remain under this license does not apply to any document created
- using the Font Software.
- .
- TERMINATION
- This license becomes null and void if any of the above conditions are
- not met.
- .
- DISCLAIMER
- THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
- OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
- COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
- DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
- OTHER DEALINGS IN THE FONT SOFTWARE.
-
-License: Apache-2
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
- .
- http://www.apache.org/licenses/LICENSE-2.0
- .
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- .
- On Debian systems, the complete text of the Apache License 2.0 can be
- found in /usr/share/common-licenses/Apache-2.0 file.

debian/rules

@@ -1,85 +0,0 @@
-#!/usr/bin/make -f
-
-# 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
-
-
-override_dh_auto_configure:
-
-	# Apply our patches, reconfigure, and update the wineserver protocol request data
-	"$(CURDIR)/patches/patchinstall.sh" DESTDIR="$(CURDIR)" --all
-
-	# Run configure
-ifeq ($(DEB_BUILD_ARCH), amd64)
-	./configure --prefix=/opt/wine-staging \
-				--libdir=\$${prefix}/lib64 \
-				--mandir=\$${prefix}/share/man \
-				--infodir=\$${prefix}/share/info \
-				--enable-win64 \
-				--without-gstreamer \
-				--with-xattr \
-				$(CONFFLAGS)
-else
-	./configure --prefix=/opt/wine-staging \
-				--libdir=\$${prefix}/lib \
-				--mandir=\$${prefix}/share/man \
-				--infodir=\$${prefix}/share/info \
-				--without-gstreamer \
-				--with-xattr \
-				$(CONFFLAGS)
-endif
-
-
-override_dh_auto_test:
-	# Wine's test suite does not pass on build daemons, skip it for now
-
-
-override_dh_installdocs:
-	dh_installdocs --link-doc=wine-staging
-
-
-override_dh_install:
-	dh_install --fail-missing
-
-	# These files will end up in multiple packages otherwise
-	rm -f debian/wine-staging/opt/wine-staging/bin/wine
-	rm -f debian/wine-staging/opt/wine-staging/bin/wine-preloader
-	rm -f debian/wine-staging/opt/wine-staging/bin/wine64
-	rm -f debian/wine-staging/opt/wine-staging/bin/wine64-preloader
-
-	# Create compatibility symlinks
-	mkdir -p debian/wine-compholio/opt/wine-compholio/bin
-	mkdir -p debian/wine-staging-compat/usr/bin
-
-	for _file in $$(ls "debian/wine-staging/opt/wine-staging/bin"); do \
-		ln -s "/opt/wine-staging/bin/$$_file" "debian/wine-compholio/opt/wine-compholio/bin/$$_file"; \
-		ln -s "/opt/wine-staging/bin/$$_file" "debian/wine-staging-compat/usr/bin/$$_file"; \
-	done
-
-	# Architecture specific compatibility symlinks
-ifeq ($(DEB_HOST_ARCH),amd64)
-	for _file in wine wine-preloader wine64 wine64-preloader; do \
-		ln -s "/opt/wine-staging/bin/$$_file" "debian/wine-compholio/opt/wine-compholio/bin/$$_file"; \
-		ln -s "/opt/wine-staging/bin/$$_file" "debian/wine-staging-compat/usr/bin/$$_file"; \
-	done
-else
-	for _file in wine wine-preloader; do \
-		ln -s "/opt/wine-staging/bin/$$_file" "debian/wine-compholio/opt/wine-compholio/bin/$$_file"; \
-		ln -s "/opt/wine-staging/bin/$$_file" "debian/wine-staging-compat/usr/bin/$$_file"; \
-	done
-endif
-
-override_dh_strip:
-	dh_strip -Xwine-pthread -Xwine-kthread --dbg-package=wine-staging-dbg
-
-
-override_dh_shlibdeps:
-ifeq ($(DEB_HOST_ARCH),amd64)
-	dh_shlibdeps -l $(CURDIR)/debian/tmp/opt/wine-staging/lib64/
-else
-	dh_shlibdeps -l $(CURDIR)/debian/tmp/opt/wine-staging/lib/
-endif

debian/source/format

@@ -1 +0,0 @@
-3.0 (native)

debian/wine-staging-amd64.install

@@ -1,4 +0,0 @@
-/opt/wine-staging/lib64/libwine.so*
-/opt/wine-staging/lib64/wine
-/opt/wine-staging/bin/wine64
-/opt/wine-staging/bin/wine64-preloader

debian/wine-staging-amd64.lintian-overrides

@@ -1,3 +0,0 @@
-# Wine preloader needs static linking to reserve memory and work properly, see
-# the comments at loader/preloader.c for a fuller explanation
-wine-staging-amd64 binary: statically-linked-binary opt/wine-staging/bin/wine64-preloader

debian/wine-staging-dev.install

@@ -1 +0,0 @@
-/opt/wine-staging/include

debian/wine-staging-i386.install

@@ -1,8 +0,0 @@
-/opt/wine-staging/lib/libwine.so*
-/opt/wine-staging/lib/wine
-/opt/wine-staging/bin/wine
-/opt/wine-staging/bin/wine-preloader
-/opt/wine-staging/share/man/man?/wine.?*
-/opt/wine-staging/share/man/de.UTF-8/man?/wine.?*
-/opt/wine-staging/share/man/fr.UTF-8/man?/wine.?*
-/opt/wine-staging/share/man/pl.UTF-8/man?/wine.?*

debian/wine-staging-i386.lintian-overrides

@@ -1,3 +0,0 @@
-# Wine preloader needs static linking to reserve memory and work properly, see
-# the comments at loader/preloader.c for a fuller explanation
-wine-staging-i386 binary: statically-linked-binary opt/wine-staging/bin/wine-preloader

debian/wine-staging.docs

@@ -1,4 +0,0 @@
-documentation/README.*
-ANNOUNCE
-AUTHORS
-README

debian/wine-staging.install

@@ -1,28 +0,0 @@
-/opt/wine-staging/bin
-/opt/wine-staging/share/applications
-/opt/wine-staging/share/wine
-/opt/wine-staging/share/man/de.UTF-8/man?/winemaker.?*
-/opt/wine-staging/share/man/de.UTF-8/man?/wineserver.?*
-/opt/wine-staging/share/man/fr.UTF-8/man?/winemaker.?*
-/opt/wine-staging/share/man/fr.UTF-8/man?/wineserver.?*
-/opt/wine-staging/share/man/man?/msiexec.?*
-/opt/wine-staging/share/man/man?/notepad.?*
-/opt/wine-staging/share/man/man?/regedit.?*
-/opt/wine-staging/share/man/man?/regsvr32.?*
-/opt/wine-staging/share/man/man?/widl.?*
-/opt/wine-staging/share/man/man?/wineboot.?*
-/opt/wine-staging/share/man/man?/winebuild.?*
-/opt/wine-staging/share/man/man?/winecfg.?*
-/opt/wine-staging/share/man/man?/wineconsole.?*
-/opt/wine-staging/share/man/man?/winecpp.?*
-/opt/wine-staging/share/man/man?/winedbg.?*
-/opt/wine-staging/share/man/man?/winedump.?*
-/opt/wine-staging/share/man/man?/winefile.?*
-/opt/wine-staging/share/man/man?/wineg++.?*
-/opt/wine-staging/share/man/man?/winegcc.?*
-/opt/wine-staging/share/man/man?/winemaker.?*
-/opt/wine-staging/share/man/man?/winemine.?*
-/opt/wine-staging/share/man/man?/winepath.?*
-/opt/wine-staging/share/man/man?/wineserver.?*
-/opt/wine-staging/share/man/man?/wmc.?*
-/opt/wine-staging/share/man/man?/wrc.?*

patches/Coverity/0001-sfnt2fon-Don-t-leak-output-name-if-specified-multipl.patch

@@ -0,0 +1,29 @@
+From 6f561502fe458837f3a5b27f477b1a52f33d88ba Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andr=C3=A9=20Hentschel?= <nerv@dawncrow.de>
+Date: Mon, 16 Nov 2015 22:36:40 +0100
+Subject: sfnt2fon: Don't leak output name if specified multiple times
+ (Coverity)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: André Hentschel <nerv@dawncrow.de>
+---
+ tools/sfnt2fon/sfnt2fon.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tools/sfnt2fon/sfnt2fon.c b/tools/sfnt2fon/sfnt2fon.c
+index 7612bc2..f825ae4 100644
+--- a/tools/sfnt2fon/sfnt2fon.c
++++ b/tools/sfnt2fon/sfnt2fon.c
+@@ -654,6 +654,7 @@ static char **parse_options( int argc, char **argv )
+             option_defchar = atoi( optarg );
+             break;
+         case 'o':
++            free( option_output );
+             option_output = strdup( optarg );
+             break;
+         case 'q':
+-- 
+2.6.2
+

patches/Coverity/0002-winedump-Free-debug-string-in-case-it-was-not-freed-.patch

@@ -0,0 +1,30 @@
+From 792e99d66b40481fb81042d51a12c861d8b33b51 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andr=C3=A9=20Hentschel?= <nerv@dawncrow.de>
+Date: Mon, 16 Nov 2015 22:36:38 +0100
+Subject: winedump: Free debug string in case it was not freed in for-loop
+ (Coverity)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: André Hentschel <nerv@dawncrow.de>
+---
+ tools/winedump/msc.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c
+index 5890b29..3f1fd98 100644
+--- a/tools/winedump/msc.c
++++ b/tools/winedump/msc.c
+@@ -1378,6 +1378,8 @@ BOOL codeview_dump_symbols(const void* root, unsigned long size)
+             dump_data((const void*)sym, sym->generic.len + 2, "  ");
+         }
+     }
++
++    free(curr_func);
+     return TRUE;
+ }
+ 
+-- 
+2.6.2
+

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

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

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

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

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

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

patches/dinput-DIPROP_USERNAME/0001-dinput-Implement-device-property-DIPROP_USERNAME.patch

@@ -0,0 +1,177 @@
+From 4eb926239cec9c6dfa489056bb30d698039926a1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bernhard=20=C3=9Cbelacker?= <bernhardu@vr-web.de>
+Date: Tue, 24 Nov 2015 21:13:50 +0100
+Subject: dinput: Implement device property DIPROP_USERNAME.
+
+https://bugs.winehq.org/show_bug.cgi?id=39667
+
+Probably same issue as in https://bugs.winehq.org/show_bug.cgi?id=12432 .
+(Attached backtrace seems equal.)
+
+Steps to reproduce:
+- start launcher
+- "Configure Controller"
+- leave dialog with "Cancel"
+- crash
+
+MotoGP 3 demo launcher uses ConfigureDevices for the key mapping.
+This seems because the result of a GetProperty(DIPROP_USERNAME) is used
+without checking.
+---
+ dlls/dinput/device.c         | 39 +++++++++++++++++++++++++++++++++++++++
+ dlls/dinput/device_private.h |  1 +
+ dlls/dinput8/tests/device.c  | 29 +++++++++++++++++++++++++++--
+ 3 files changed, 67 insertions(+), 2 deletions(-)
+
+diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c
+index e525f01..41fb2c4 100644
+--- a/dlls/dinput/device.c
++++ b/dlls/dinput/device.c
+@@ -778,11 +778,13 @@ HRESULT _build_action_map(LPDIRECTINPUTDEVICE8W iface, LPDIACTIONFORMATW lpdiaf,
+ 
+ HRESULT _set_action_map(LPDIRECTINPUTDEVICE8W iface, LPDIACTIONFORMATW lpdiaf, LPCWSTR lpszUserName, DWORD dwFlags, LPCDIDATAFORMAT df)
+ {
++    static const WCHAR emptyW[] = { 0 };
+     IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface);
+     DIDATAFORMAT data_format;
+     DIOBJECTDATAFORMAT *obj_df = NULL;
+     DIPROPDWORD dp;
+     DIPROPRANGE dpr;
++    DIPROPSTRING dps;
+     WCHAR username[MAX_PATH];
+     DWORD username_size = MAX_PATH;
+     int i, action = 0, num_actions = 0;
+@@ -863,6 +865,13 @@ HRESULT _set_action_map(LPDIRECTINPUTDEVICE8W iface, LPDIACTIONFORMATW lpdiaf, L
+     else
+         lstrcpynW(username, lpszUserName, MAX_PATH);
+ 
++    dps.diph.dwSize = sizeof(dps);
++    dps.diph.dwHeaderSize = sizeof(DIPROPHEADER);
++    dps.diph.dwObj = 0;
++    dps.diph.dwHow = DIPH_DEVICE;
++    lstrcpynW(dps.wsz, (dwFlags & DIDSAM_NOUSER) ? emptyW : username, sizeof(dps.wsz)/sizeof(WCHAR));
++    IDirectInputDevice8_SetProperty(iface, DIPROP_USERNAME, &dps.diph);
++
+     /* Save the settings to disk */
+     save_mapping_settings(iface, lpdiaf, username);
+ 
+@@ -1100,6 +1109,9 @@ ULONG WINAPI IDirectInputDevice2WImpl_Release(LPDIRECTINPUTDEVICE8W iface)
+     /* Free action mapping */
+     HeapFree(GetProcessHeap(), 0, This->action_map);
+ 
++    /* Free username */
++    HeapFree(GetProcessHeap(), 0, This->username);
++
+     EnterCriticalSection( &This->dinput->crit );
+     list_remove( &This->entry );
+     LeaveCriticalSection( &This->dinput->crit );
+@@ -1251,6 +1263,17 @@ HRESULT WINAPI IDirectInputDevice2WImpl_GetProperty(LPDIRECTINPUTDEVICE8W iface,
+             TRACE("buffersize = %d\n", pd->dwData);
+             break;
+         }
++        case (DWORD_PTR) DIPROP_USERNAME:
++        {
++            LPDIPROPSTRING ps = (LPDIPROPSTRING)pdiph;
++
++            if (pdiph->dwSize != sizeof(DIPROPSTRING)) return DIERR_INVALIDPARAM;
++
++            ps->wsz[0] = 0;
++            if (This->username)
++                lstrcpynW(ps->wsz, This->username, sizeof(ps->wsz)/sizeof(WCHAR));
++            break;
++        }
+         case (DWORD_PTR) DIPROP_VIDPID:
+             FIXME("DIPROP_VIDPID not implemented\n");
+             return DIERR_UNSUPPORTED;
+@@ -1324,6 +1347,22 @@ HRESULT WINAPI IDirectInputDevice2WImpl_SetProperty(
+             LeaveCriticalSection(&This->crit);
+             break;
+         }
++        case (DWORD_PTR) DIPROP_USERNAME:
++        {
++            LPCDIPROPSTRING ps = (LPCDIPROPSTRING)pdiph;
++
++            if (pdiph->dwSize != sizeof(DIPROPSTRING)) return DIERR_INVALIDPARAM;
++
++            if (!This->username)
++                This->username = HeapAlloc(GetProcessHeap(), 0, sizeof(ps->wsz));
++            if (!This->username)
++                return DIERR_OUTOFMEMORY;
++
++            This->username[0] = 0;
++            if (ps->wsz)
++                lstrcpynW(This->username, ps->wsz, sizeof(ps->wsz)/sizeof(WCHAR));
++            break;
++        }
+         default:
+             WARN("Unknown property %s\n", debugstr_guid(rguid));
+             return DIERR_UNSUPPORTED;
+diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h
+index 52bbec4..44fa46a 100644
+--- a/dlls/dinput/device_private.h
++++ b/dlls/dinput/device_private.h
+@@ -81,6 +81,7 @@ struct IDirectInputDeviceImpl
+     /* Action mapping */
+     int                         num_actions; /* number of actions mapped */
+     ActionMap                  *action_map;  /* array of mappings */
++    WCHAR                      *username;    /* set by 'SetActionMap' */
+ };
+ 
+ extern BOOL get_app_key(HKEY*, HKEY*) DECLSPEC_HIDDEN;
+diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c
+index 6495559..b5e27ad 100644
+--- a/dlls/dinput8/tests/device.c
++++ b/dlls/dinput8/tests/device.c
+@@ -223,8 +223,8 @@ static BOOL CALLBACK enumeration_callback(const DIDEVICEINSTANCEA *lpddi, IDirec
+     dps.wsz[0] = '\0';
+ 
+     hr = IDirectInputDevice_GetProperty(lpdid, DIPROP_USERNAME, &dps.diph);
+-    todo_wine ok (SUCCEEDED(hr), "GetProperty failed hr=%08x\n", hr);
+-    todo_wine ok (!lstrcmpW(usernameW, dps.wsz), "Username not set correctly expected=%s, got=%s\n", wine_dbgstr_wn(usernameW, -1), wine_dbgstr_wn(dps.wsz, -1));
++    ok (SUCCEEDED(hr), "GetProperty failed hr=%08x\n", hr);
++    ok (!lstrcmpW(usernameW, dps.wsz), "Username not set correctly expected=%s, got=%s\n", wine_dbgstr_wn(usernameW, -1), wine_dbgstr_wn(dps.wsz, -1));
+ 
+     /* Test buffer size */
+     memset(&dp, 0, sizeof(dp));
+@@ -275,6 +275,7 @@ static void test_action_mapping(void)
+     HINSTANCE hinst = GetModuleHandleA(NULL);
+     IDirectInput8A *pDI = NULL;
+     DIACTIONFORMATA af;
++    DIPROPSTRING dps;
+     struct enum_data data =  {pDI, &af, NULL, NULL, NULL, 0};
+     HWND hwnd;
+ 
+@@ -342,6 +343,30 @@ static void test_action_mapping(void)
+ 
+         af.dwDataSize = 4 * sizeof(actionMapping) / sizeof(actionMapping[0]);
+         af.dwNumActions = sizeof(actionMapping) / sizeof(actionMapping[0]);
++
++        /* test DIDSAM_NOUSER */
++        dps.diph.dwSize = sizeof(dps);
++        dps.diph.dwHeaderSize = sizeof(DIPROPHEADER);
++        dps.diph.dwObj = 0;
++        dps.diph.dwHow = DIPH_DEVICE;
++        dps.wsz[0] = '\0';
++
++        hr = IDirectInputDevice_GetProperty(data.keyboard, DIPROP_USERNAME, &dps.diph);
++        ok (SUCCEEDED(hr), "GetProperty failed hr=%08x\n", hr);
++        ok (dps.wsz[0] != 0, "Expected any username, got=%s\n", wine_dbgstr_wn(dps.wsz, -1));
++
++        hr = IDirectInputDevice8_SetActionMap(data.keyboard, data.lpdiaf, NULL, DIDSAM_NOUSER);
++        ok (SUCCEEDED(hr), "SetActionMap failed hr=%08x\n", hr);
++
++        dps.diph.dwSize = sizeof(dps);
++        dps.diph.dwHeaderSize = sizeof(DIPROPHEADER);
++        dps.diph.dwObj = 0;
++        dps.diph.dwHow = DIPH_DEVICE;
++        dps.wsz[0] = '\0';
++
++        hr = IDirectInputDevice_GetProperty(data.keyboard, DIPROP_USERNAME, &dps.diph);
++        ok (SUCCEEDED(hr), "GetProperty failed hr=%08x\n", hr);
++        ok (dps.wsz[0] == 0, "Expected empty username, got=%s\n", wine_dbgstr_wn(dps.wsz, -1));
+     }
+ 
+     if (data.mouse != NULL)
+-- 
+2.6.2
+