@julliard "Please don't change things that don't need changing" - OK so wine is not accepting patches that both improve legibility and reduces complexity while making it easy for review by splitting up into separate patches? Clear. By the way, this particular DLL is beyond broken, I don't see why you're so resistant to changing its code when there are tests that cover all this.