As suggested by Sebastian Lackner, I am submitting his much simpler version of the fix. Only one line is touched. The patch file is attached.

The bugzilla link is http://bugs.winehq.org/show_bug.cgi?id=36504