riched20: Initialize ME_TextEditor members in ME_MakeEditor().

Signed-off-by: Huw Davies <huw@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

riched20: Initialize ME_TextEditor members in ME_MakeEditor().
1bc48be4 · Huw Davies · Alexandre Julliard · 5cc8c9fe · 1bc48be4 · 1bc48be4
Commit 1bc48be4 authored Aug 21, 2017 by Huw Davies Committed by Alexandre Julliard Aug 24, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

editor.c dlls/riched20/editor.c +2 -0

txtsrv.c dlls/riched20/txtsrv.c +0 -2

No files found.
--- a/dlls/riched20/editor.c
+++ b/dlls/riched20/editor.c
@@ -2898,6 +2898,7 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10)
  ed->reOle = NULL;
  ed->bEmulateVersion10 = bEmulateVersion10;
  ed->styleFlags = 0;
+  ed->exStyleFlags = 0;
  ITextHost_TxGetPropertyBits(texthost,
                              (TXTBIT_RICHTEXT|TXTBIT_MULTILINE|
                               TXTBIT_READONLY|TXTBIT_USEPASSWORD|
@@ -2958,6 +2959,7 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10)
  }

  ME_CheckCharOffsets(ed);
+  SetRectEmpty(&ed->rcFormat);
  ed->bDefaultFormatRect = TRUE;
  ITextHost_TxGetSelectionBarWidth(ed->texthost, &selbarwidth);
  if (selbarwidth) {

--- a/dlls/riched20/txtsrv.c
+++ b/dlls/riched20/txtsrv.c
@@ -414,8 +414,6 @@ HRESULT WINAPI CreateTextServices(IUnknown  *pUnkOuter, ITextHost *pITextHost, I
   ITextImpl->IUnknown_inner.lpVtbl = &textservices_inner_vtbl;
   ITextImpl->ITextServices_iface.lpVtbl = &textservices_vtbl;
   ITextImpl->editor = ME_MakeEditor(pITextHost, FALSE);
-   ITextImpl->editor->exStyleFlags = 0;
-   SetRectEmpty(&ITextImpl->editor->rcFormat);

   if (pUnkOuter)
      ITextImpl->outer_unk = pUnkOuter;