[ros-diffs] [gbrunmar] 33910: Fixed four more winetests, code taken from wine again