Clean up patch from filip, with small change from me, for MoveFileWithProgressW.