4.36 beta

This commit is contained in:
Igor Pavlov
2006-03-12 00:00:00 +00:00
committed by Kornel Lesiński
parent 191cf6781a
commit 8304895f29
37 changed files with 2120 additions and 25 deletions

View File

@@ -57,8 +57,7 @@ HRESULT COutBuffer::FlushPart()
UInt32 size = (_streamPos >= _pos) ? (_bufferSize - _streamPos) : (_pos - _streamPos);
HRESULT result = S_OK;
#ifdef _NO_EXCEPTIONS
if (ErrorCode != S_OK)
result = ErrorCode;
result = ErrorCode;
#endif
if (_buffer2 != 0)
{
@@ -68,7 +67,7 @@ HRESULT COutBuffer::FlushPart()
if (_stream != 0
#ifdef _NO_EXCEPTIONS
&& (ErrorCode != S_OK)
&& (ErrorCode == S_OK)
#endif
)
{