r4999: more win32 changes