Hi Wei,
The patch looks good to me now. However, we're late in code freeze phrase and this patch is invasive for not widely tested setups, so I'd prefer to defer it until after code freeze. Please resend it after Wine 3.0 is released.
Thanks, Jacek