[ros-diffs] [chorns] 15271: Copy w32api from trunk