Aric Stewart : msctf: Correct handling if NULL for pdimFocus in ITfThreadMgr::SetFocus.
Alexandre Julliard
julliard at winehq.org
Tue Sep 1 11:05:39 CDT 2009
Module: wine
Branch: master
Commit: ae51d05d780ae118001e01ab270d0c49ce98a8f1
URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae51d05d780ae118001e01ab270d0c49ce98a8f1
Author: Aric Stewart <aric at codeweavers.com>
Date: Mon Aug 31 14:48:40 2009 -0500
msctf: Correct handling if NULL for pdimFocus in ITfThreadMgr::SetFocus.
---
dlls/msctf/threadmgr.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/dlls/msctf/threadmgr.c b/dlls/msctf/threadmgr.c
index 9fb1b5d..4b21b56 100644
--- a/dlls/msctf/threadmgr.c
+++ b/dlls/msctf/threadmgr.c
@@ -389,7 +389,9 @@ static HRESULT WINAPI ThreadMgr_SetFocus( ITfThreadMgr* iface, ITfDocumentMgr *p
TRACE("(%p) %p\n",This,pdimFocus);
- if (!pdimFocus || FAILED(IUnknown_QueryInterface(pdimFocus,&IID_ITfDocumentMgr,(LPVOID*) &check)))
+ if (!pdimFocus)
+ check = NULL;
+ else if (FAILED(IUnknown_QueryInterface(pdimFocus,&IID_ITfDocumentMgr,(LPVOID*) &check)))
return E_INVALIDARG;
ITfThreadMgrEventSink_OnSetFocus((ITfThreadMgrEventSink*)&This->ThreadMgrEventSinkVtbl, check, This->focus);
More information about the wine-cvs
mailing list