Apply two small changes to the Windows code, according to SF bug

#427345.  These are supposed to support binary data and avoid
buffering problems on Windows.