[DF-598] small refactoring in win32's part