http://bugs.winehq.org/show_bug.cgi?id=28186
--- Comment #2 from Hugh McMaster hugh.mcmaster@outlook.com --- Created attachment 47495 --> http://bugs.winehq.org/attachment.cgi?id=47495 Patch
This patch should address all of François's concerns. If I've missed something, please let me know.
Any and all feedback welcome.