- Fix a warning caused by the TAB patch.

- Initialize *pcb to a large value before calling the stream-out callback (to make applications that don't set *pcb at all happy). - Don't flush the output stream when error condition is set.

- Fix a warning caused by the TAB patch.
cb836344 · Krzysztof Foltman · Alexandre Julliard · fcd67649 · cb836344
Commit cb836344 authored Jun 20, 2005 by Krzysztof Foltman Committed by Alexandre Julliard Jun 20, 2005
Hide whitespace changes
Inline Side-by-side

Showing with 15 additions and 2 deletions

writer.c dlls/riched20/writer.c +15 -2

No files found.
--- a/dlls/riched20/writer.c
+++ b/dlls/riched20/writer.c
@@ -45,11 +45,23 @@ ME_StreamOutFlush(ME_TextEditor *editor)
 {
  LONG nStart = 0;
  LONG nWritten = 0;
+  LONG nRemaining = 0;
  EDITSTREAM *stream = editor->pStream->stream;

  do {
+    TRACE("sending %lu bytes\n", editor->pStream->pos - nStart);
+    /* Some apps seem not to set *pcb unless a problem arises, relying
+      on initial random nWritten value, which is usually >STREAMOUT_BUFFER_SIZE */
+    nRemaining = editor->pStream->pos - nStart;
+    nWritten = 0xDEADBEEF;
    stream->dwError = stream->pfnCallback(stream->dwCookie, editor->pStream->buffer + nStart,
                                          editor->pStream->pos - nStart, &nWritten);
+    TRACE("error=%lu written=%lu\n", stream->dwError, nWritten);
+    if (nWritten > (editor->pStream->pos - nStart) || nWritten<0) {
+      FIXME("Invalid returned written size *pcb: 0x%x (%ld) instead of %ld\n", 
+            (unsigned)nWritten, nWritten, nRemaining);
+      nWritten = nRemaining;
+    }
    if (nWritten == 0 || stream->dwError)
      return FALSE;
    editor->pStream->written += nWritten;
@@ -64,6 +76,7 @@ static LONG
 ME_StreamOutFree(ME_TextEditor *editor)
 {
  LONG written = editor->pStream->written;
+  TRACE("total length = %lu\n", written);

  FREE_OBJ(editor->pStream);
  editor->pStream = NULL;
@@ -782,7 +795,7 @@ ME_StreamOut(ME_TextEditor *editor, DWORD dwFormat, EDITSTREAM *stream)
    ME_StreamOutRTF(editor, nStart, nTo - nStart, dwFormat);
  else if (dwFormat & SF_TEXT || dwFormat & SF_TEXTIZED)
    ME_StreamOutText(editor, nStart, nTo - nStart, dwFormat);
-  
-  ME_StreamOutFlush(editor);
+  if (!editor->pStream->stream->dwError)
+    ME_StreamOutFlush(editor);
  return ME_StreamOutFree(editor);
 }