(Windows) Add required function return values
(Windows) Rename variable to avoid using predefined macro