Updates to Windows stuff from Markus Mauhart.
6 files changed