Wine staging update.

[Alistair Leslie-Hughes]

Hi Dmitry,

Thanks for you feedback.

>>Thanks for updating the staged patches, that's a real challege.
>While at the moment all the patches apply cleanly there are a couple
>of problems I spotted so far:
>1. compiled wine-staging is not able to start up:
>wine client error:0: version mismatch 549/544.
>Your wine binary was not upgraded correctly,
>or you have an older one somewhere in your PATH.
>Or maybe the wrong wineserver is still running?
>(there is no wineserver instances running and various other local wine branches
>do work as expected).
Thanks,  Ill look into this shortly.  It hopefully will be simple to correct.

>2. what is the reason of removing the patch with the tests as part of
https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fwine-staging%2Fwine-staging%2Fcommit%2F950a11ae1deb75955cd9ee3842b5bc43c39877bc&data=02%7C01%7C%7Cd7e722c7e5764ab9e03208d579c163e0%7C84df9e7fe9f640afb435aaaaaaaaaaaa%7C1%7C0%7C636548793866734289&sdata=bdzGR3YgmfYiPertKU9H2mOk7f1N69rcAU4o4y0bxu4%3D&reserved=0

This for some reason, cause linker errors of duplicate functions, So I though it was already merged.
I'll restore the tests in my next push.

Thanks again
Alistair.