[ros-diffs] [CVS reactos] Merge back commits from winehq