Huw Davies : riched20: Handle WM_DESTROY in the host.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 64bbbda2fd54db62c7cb3c031bd2a8b48d78e4e0
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=64bbbda2fd54db62c7cb3c031bd2a8b48d78e4e0

Author: Huw Davies <huw at codeweavers.com>
Date:   Thu Mar 11 08:51:00 2021 +0000

riched20: Handle WM_DESTROY in the host.

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

---

 dlls/riched20/editor.c  | 3 ---
 dlls/riched20/txthost.c | 4 ++++
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c
index 516cd104d31..9ac5d49a3db 100644
--- a/dlls/riched20/editor.c
+++ b/dlls/riched20/editor.c
@@ -4277,9 +4277,6 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam,
   }
   case WM_CREATE:
     return ME_WmCreate(editor, lParam, unicode);
-  case WM_DESTROY:
-    ME_DestroyEditor(editor);
-    return 0;
   case WM_SETCURSOR:
   {
     POINT cursor_pos;
diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c
index 51dccf3b7ed..9f183def2dd 100644
--- a/dlls/riched20/txthost.c
+++ b/dlls/riched20/txthost.c
@@ -780,6 +780,10 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam,
     editor = host->editor;
     switch (msg)
     {
+    case WM_DESTROY:
+        ITextHost_Release( &host->ITextHost_iface );
+        return 0;
+
     case WM_ERASEBKGND:
     {
         HDC hdc = (HDC)wparam;