To see how complete this merge request is, I synchronized the status with git master (https://gitlab.winehq.org/rhabacker/wine/-/commits/afunix), which worked quite well, and used it to build wine from the git master branch. The included tests for ws2_32 ran without any problems, as did the test binaries available at https://bugs.winehq.org/show_bug.cgi?id=52568.
Is it possible to merge this changes ?