I think it's fine merging it like this, as it's used by winewayland and winex11.
You could then probably safely change wineandroid too, in a separate MR if you like.
This leaves winemac, which can probably keep using the old interface for now. Or, if you want to convert it as well, I can run some tests to make sure it still reports reasonable formats.