Set environment variable from executable.
Further improve Windows version.