ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

scrrun: Move IO mode check to writing helper. 

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2022-02-20 17:09:14 +03:00 committed by Alexandre Julliard
parent 2a4b57624f
commit a9c4bda481
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
dlls/scrrun/filesystem.c
View File

@ -609,11 +609,14 @@ static HRESULT WINAPI textstream_ReadAll(ITextStream *iface, BSTR *text)
return read_from_buffer(This, This->read_buf_size, text, 0) ? S_FALSE : E_OUTOFMEMORY;
}
static HRESULT textstream_writestr(struct textstream *stream, BSTR text)
static HRESULT textstream_write(struct textstream *stream, BSTR text)
{
DWORD written = 0;
BOOL ret;
if (textstream_check_iomode(stream, IOWrite))
return CTL_E_BADFILEMODE;
if (stream->unicode) {
ret = WriteFile(stream->file, text, SysStringByteLen(text), &written, NULL);
return (ret && written == SysStringByteLen(text)) ? S_OK : create_error(GetLastError());
@ -636,14 +639,11 @@ static HRESULT textstream_writestr(struct textstream *stream, BSTR text)
static HRESULT WINAPI textstream_Write(ITextStream *iface, BSTR text)
{
struct textstream *This = impl_from_ITextStream(iface);
struct textstream *stream = impl_from_ITextStream(iface);
TRACE("(%p)->(%s)\n", This, debugstr_w(text));
TRACE("%p, %s.\n", iface, debugstr_w(text));
if (textstream_check_iomode(This, IOWrite))
return CTL_E_BADFILEMODE;
return textstream_writestr(This, text);
return textstream_write(stream, text);
}
static HRESULT textstream_writecrlf(struct textstream *stream)
@ -669,17 +669,14 @@ static HRESULT textstream_writecrlf(struct textstream *stream)
static HRESULT WINAPI textstream_WriteLine(ITextStream *iface, BSTR text)
{
struct textstream *This = impl_from_ITextStream(iface);
struct textstream *stream = impl_from_ITextStream(iface);
HRESULT hr;
TRACE("(%p)->(%s)\n", This, debugstr_w(text));
TRACE("%p, %s.\n", iface, debugstr_w(text));
if (textstream_check_iomode(This, IOWrite))
return CTL_E_BADFILEMODE;
hr = textstream_writestr(This, text);
hr = textstream_write(stream, text);
if (SUCCEEDED(hr))
hr = textstream_writecrlf(This);
hr = textstream_writecrlf(stream);
return hr;
}