Wine-staging-2.22

Cybermax · Post by **Cybermax** » Mon Dec 11, 2017 2:54 pm

If anyone is interested for testing purposes, I have put up a fork of wine-staging and have rebased changes to it so it patches and compiles with wine-2.22.

git pull https://github.com/SveSop/wine-staging.git

Follow usual howto's to compile wine-staging-2.22.

I have used some common sense, but not being a coder, I cannot guarantee there should not be improvement to a couple of the patches that seemed implemented in a different form than from wine-staging. Just something to fiddle with while waiting for slackner to update wine-staging i guess...

Personal patch-notes:

Code: Select all

advapi32-GetExplicitEntriesFromAclW
	0001-advapi32-Implement-GetExplicitEntriesFromAclW.patch (fixed)
advapi32-BuildSecurityDescriptor
	0001-advapi32-Implement-BuildSecurityDescriptorW.patch (Implemented in 2.22 - removed)
	0002-advapi32-tests-Add-basic-tests-for-BuildSecurityDesc.patch (fixed)
ntdll-APC_Start_Process
	0001-ntdll-Process-APC-calls-before-starting-process.patch (fixed)
advapi32-Token_Integrity_Level
	0008-ntdll-Implement-process-token-elevation-through-mani.patch (fixed)
combase-RoApi
	0003-combase-Implement-RoGetActivationFactory.patch (fixed)
	0004-combase-Implement-RoActivateInstance.patch (fixed)
	0005-combase-Add-stub-for-RoGetApartmentIdentifier.patch (fixed)
	0007-combase-Add-stub-for-RoRegisterForApartmentShutdown.patch (fixed)
	0008-combase-Add-stub-for-RoGetServerActivatableClasses.patch (fixed)
	0009-combase-Add-stub-for-RoRegisterActivationFactories.patch (fixed)
	0010-combase-Add-stub-for-CleanupTlsOleState.patch (fixed)
d3d11-Depth_Bias
	0004-d3d11-Add-support-for-SlopeScaledDepthBias-in-RSSetS.patch (fixed)
kernel32-SetFileCompletionNotificationModes
	0006-server-Skip-async-completion-when-possible.patch (fixed)
kernelbase-PathCchCombineEx
	0001-kernelbase-Add-semi-stub-for-PathCchCombineEx.patch (fixed)
loader-OSX_Preloader
	0002-loader-Implement-preloader-for-Mac-OS.patch (fixed)
ntdll-ThreadTime
	0001-ntdll-Return-correct-values-in-GetThreadTimes-for-al.patch (fixed)
ntdll-Attach_Process_DLLs (Removed patchset)
	0001-ntdll-Ensure-process-dlls-are-not-attached-too-early.patch (Implemented in 2.22 - removed)
ntdll-Hide_Wine_Exports
	0001-ntdll-Add-support-for-hiding-wine-version-informatio.patch (fixed)
ntdll-x86_64_ExceptionInformation
	0002-ntdll-Avoid-crash-when-trying-to-access-page-prot-of.patch (Implemented in 2.22 - removed)
ntdll-CLI_Images
	0001-ntdll-Load-CLI-.NET-images-in-the-same-way-as-Window.patch (fixed)
ntdll-DllRedirects
	0005-ntdll-Implement-loader-redirection-scheme.patch (fixed)
ntdll-RtlQueryPackageIdentity
	0003-ntdll-tests-Add-basic-tests-for-RtlQueryPackageIdent.patch (fixed)
ntdll-LdrRegisterDllNotification
	0001-ntdll-Implement-LdrRegisterDllNotification-and-LdrUn.patch (fixed)
rasapi32-RasGetConnectionStatistics (Removed patchset)
	0001-rasapi32-Add-stub-for-RasGetConnectionStatistics.patch (Implemented in 2.22 - removed)
user32-Mouse_Message_Hwnd
	0002-user32-tests-Add-tests-for-clicking-through-layered-.patch (fixed)
	0003-user32-tests-Add-tests-for-window-region-of-layered-.patch (fixed)
user32-WindowDisplayAffinity
	0001-user32-Add-stubs-for-GetWindowDisplayAffinity-and-Se.patch (fixed)
wined3d-Copy_Resource_Typeless
	0002-wined3d-Add-WINED3DFMT_R8G8B8A8_SNORM-to-WINED3DFMT_.patch (fixed)
	0003-wined3d-Implement-copying-sub-resources-between-comp.patch (Implemented/codechange)
	0004-wined3d-Use-wined3d_cs_emit_copy_sub_resource-also-f.patch (Implemented/codechange)
wined3d-Viewports
	0001-wined3d-Allow-arbitrary-viewports-for-d3d11.patch (fixed)
wined3d-Dual_Source_Blending
	0002-d3d11-tests-Add-basic-dual-source-blend-test.patch (fixed)
wined3d-GenerateMips
	0001-d3d11-tests-Add-basic-test-for-mipmap-level-generati.patch (fixed)
	0002-wined3d-Implement-generation-of-mip-maps-for-shader-.patch (fixed)
xaudio2-get_al_format (Removed patchset)
	0001-xaudio2-Add-support-for-float-formats-with-more-than.patch (Implemented in 2.22 - removed)

Bob Wya · Post by **Bob Wya** » Mon Dec 11, 2017 6:02 pm

Lovely, but the wine-staging patches/patchinstall.sh script hasn't been updated to the correct Upstream commit hash and release version: patchinstall.sh

Bob

rboxeur · Post by **rboxeur** » Mon Dec 11, 2017 9:08 pm

Thanks for doing a such nice work

. I tried to build it on LinuxMint 18.2 for a Wine Wow64.

For those wondering how to use these revised scripts -- then please refer to https://github.com/wine-compholio/wine- ... /Packaging

Download Wine 2.22 sources and decompress

Code: Select all

wget https://dl.winehq.org/wine/source/2.x/wine-2.22.tar.xz
tar xvJf wine-2.22.tar.xz

Download partial patches and copy them to the Wine folder

Code: Select all

git clone https://github.com/SveSop/wine-staging.git wine-staging-2.22_partial
cp -avf wine-staging-2.22_partial/*  wine-2.22/

Go to Wine folder and apply those patches

Code: Select all

cd wine-2.22
./patches/patchinstall.sh DESTDIR="$(pwd)" --all
autoreconf -f

Linux 64 Bits
It works with options --enable-win64 --without-hal --without-oss (my personal options !)

Linux 32 Bits -- -- Inside a chroot for wine32-tools and wine32-build (Old WoW64 Way)
It works!

Cybermax · Post by **Cybermax** » Tue Dec 12, 2017 3:25 am

Bob Wya wrote:Lovely, but the wine-staging patches/patchinstall.sh script hasn't been updated to the correct Upstream commit hash and release version: patchinstall.sh

Bob

Oopsie..

Tried an update now to correct the commit hash and version.

I just saw Slackner had requested a build on dev.wine-staging.com, so hopefully something is up with a proper official release

C

giaco79 · Post by **giaco79** » Tue Dec 12, 2017 12:29 pm

I can't see any development build for 3.0-rc1 either.
While the staging build often comes a few days, or more, after the release the development one is usually ready within a few hours.
Is that unrelated?

I'm not complaining, just curious

Bob Wya · Post by **Bob Wya** » Tue Dec 12, 2017 3:09 pm

There never was a Wine Staging release corresponding to Wine 1.9.24...
(Prior to stabilising Wine version 2.0.)
So I'd assume there will not be a Wine Staging version 2.22.
But TBH I can't really see the point in inventing one at this point...

The Wine 3.0 release is the more important target.
Which Slackner is clearly refactoring against ...

Bob

Cybermax · Post by **Cybermax** » Tue Dec 12, 2017 4:13 pm

Yeah, the only reason I decided to do an attempt at rebasing staging-2.21 against 2.22, was just to learn a thing or two... while waiting

The work ahead will be done against 3.0... Tried to take a look at staging-3.0, but massive codechange and me being a utter noob decided i would not bother with that at all

We might not see staging releases against all the rc's coming either.. but hopefully one before newyears incase there are some performance improvements

The 2.0.x CSMT is still king of performance in dx9 vs. 2.x due to the CSMT changes. Perhaps something nice in store for 3.0.x in the performance departement

C

rboxeur · Post by **rboxeur** » Tue Dec 12, 2017 10:26 pm

Don't worry! We all are waiting for Wine-Staging 3.X series for EOY 2017 and 2018

2018 should be a pretty nice year to hack/crack/patch Wine

. Dark Souls III will be ported/playable using Wine before April 30, 2018.

All Wine contributors and hackers are on their starting blocks

Wine-staging-2.22

Wine-staging-2.22

Re: Wine-staging-2.22

Re: Wine-staging-2.22

Re: Wine-staging-2.22

Re: Wine-staging-2.22

Re: Wine-staging-2.22

Re: Wine-staging-2.22

Re: Wine-staging-2.22