[WIN32] build fixes.
Merge pull request #641 from wsoltys/july_window

[WIN32] build fixes.