The first commit is an adaptation of https://gitlab.winehq.org/rbernon/wine/-/commit/8af64a92bc6c286e3072f4e5a906..., removing the parts that could potentially lead to functional changes.
The second commit leverages the new design to provide the fix for the `unicode_vkey` input test.