Looks good, I'd like to make a few style tweaks, would you mind checking out https://gitlab.winehq.org/rbernon/wine/-/commit/755168812251b76fcd3211c22913befacfb6916e and updating the MR if you're fine with it? -- https://gitlab.winehq.org/wine/wine/-/merge_requests/181#note_1808