[PATCH] msctf: Check TF_GetThreadMgr error in DocumentMgr_Destructor.

Zhiyi Zhang zzhang at codeweavers.com
Tue Aug 27 08:06:41 CDT 2019


Thread manager could be already destroyed when calling DocumentMgr_Destructor.
This remove the error dialog when closing Unreal Engine 4 games.

Signed-off-by: Zhiyi Zhang <zzhang at codeweavers.com>
---
 dlls/msctf/documentmgr.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/dlls/msctf/documentmgr.c b/dlls/msctf/documentmgr.c
index dd49cd022f..44856db632 100644
--- a/dlls/msctf/documentmgr.c
+++ b/dlls/msctf/documentmgr.c
@@ -77,11 +77,15 @@ static inline EnumTfContext *impl_from_IEnumTfContexts(IEnumTfContexts *iface)
 
 static void DocumentMgr_Destructor(DocumentMgr *This)
 {
-    ITfThreadMgr *tm;
+    ITfThreadMgr *tm = NULL;
     TRACE("destroying %p\n", This);
 
     TF_GetThreadMgr(&tm);
-    ThreadMgr_OnDocumentMgrDestruction(tm, &This->ITfDocumentMgr_iface);
+    if (tm)
+    {
+        ThreadMgr_OnDocumentMgrDestruction(tm, &This->ITfDocumentMgr_iface);
+        ITfThreadMgr_Release(tm);
+    }
 
     if (This->contextStack[0])
         ITfContext_Release(This->contextStack[0]);
-- 
2.23.0.rc1




More information about the wine-devel mailing list