Huw Davies : riched20: Initialize ME_TextEditor members in ME_MakeEditor() .
Alexandre Julliard
julliard at winehq.org
Wed Aug 23 19:54:07 CDT 2017
Module: wine
Branch: master
Commit: 1bc48be4a78a1991c0d6c04d7a12f0cc438f0211
URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bc48be4a78a1991c0d6c04d7a12f0cc438f0211
Author: Huw Davies <huw at codeweavers.com>
Date: Mon Aug 21 12:31:46 2017 +0100
riched20: Initialize ME_TextEditor members in ME_MakeEditor().
Signed-off-by: Huw Davies <huw at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/riched20/editor.c | 2 ++
dlls/riched20/txtsrv.c | 2 --
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c
index 3cd80be..51b0cad 100644
--- 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) {
diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c
index 2a2149e..eb61e4e 100644
--- 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;
More information about the wine-cvs
mailing list