[ros-diffs] [gschneider] 40392: - Remove error case shortcut, allows results to be computed correctly - Fixes two oleaut32 vartest winetests