Looks good to me. One thing to note though is that d3drm_device_init() is never called with version = 2 right now. This is probably a bug in the d3drm2 -> d3drm3 thunks and not a reason to delay this match IMHO. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/60#note_800