I have modified, please see the new patch file.
It seems the "new patch file" was not sent to public mailing list. Changhui, would you mind resend your final patch to wine-patches? Also, Vincent, if you could suggest for a better commit message, that would be nice :) You are native English speaker, neither I or Changhui is native. But if the commit message looks good to you, then please ignore me.