diff --git a/WeaselServer/WeaselService.cpp b/WeaselServer/WeaselService.cpp
index 1545a45d8..75cd71959 100644
--- a/WeaselServer/WeaselService.cpp
+++ b/WeaselServer/WeaselService.cpp
@@ -66,7 +66,9 @@ void WeaselService::Start(DWORD dwArgc = 0, PWSTR* pszArgv = NULL) {
 
     // Perform service-specific initialization.
     // if (IsWindowsVistaOrGreater())
-    { RegisterApplicationRestart(NULL, 0); }
+    {  // always
+      RegisterApplicationRestart(NULL, 0);
+    }
     boost::thread{[this] { app.Run(); }};
     // Tell SCM that the service is started.
     SetServiceStatus(SERVICE_RUNNING);
diff --git a/WeaselSetup/imesetup.cpp b/WeaselSetup/imesetup.cpp
index 0880e7ff0..706219533 100644
--- a/WeaselSetup/imesetup.cpp
+++ b/WeaselSetup/imesetup.cpp
@@ -314,8 +314,10 @@ int register_text_service(const std::wstring& tsf_path,
   if (!register_ime) {
     params = L" /u " + params;  // unregister
   }
-  // if (silent)  // always silent
-  { params = L" /s " + params; }
+  // if (silent)
+  {  // always silent
+    params = L" /s " + params;
+  }
 
   if (!SetEnvironmentVariable(L"TEXTSERVICE_PROFILE",
                               hant ? L"hant" : L"hans")) {
diff --git a/WeaselTSF/Compartment.cpp b/WeaselTSF/Compartment.cpp
index a45e0d1f9..86517fdab 100644
--- a/WeaselTSF/Compartment.cpp
+++ b/WeaselTSF/Compartment.cpp
@@ -7,8 +7,8 @@
 #include "CandidateList.h"
 #include "LanguageBar.h"
 
-STDAPI CCompartmentEventSink::QueryInterface(REFIID riid,
-                                             _Outptr_ void** ppvObj) {
+STDMETHODIMP CCompartmentEventSink::QueryInterface(REFIID riid,
+                                                   _Outptr_ void** ppvObj) {
   if (ppvObj == nullptr)
     return E_INVALIDARG;
 
@@ -43,7 +43,7 @@ STDAPI_(ULONG) CCompartmentEventSink::Release() {
   return cr;
 }
 
-STDAPI CCompartmentEventSink::OnChange(_In_ REFGUID guidCompartment) {
+STDMETHODIMP CCompartmentEventSink::OnChange(_In_ REFGUID guidCompartment) {
   return _callback(guidCompartment);
 }
 
diff --git a/WeaselTSF/Composition.cpp b/WeaselTSF/Composition.cpp
index 62852bc7f..a9ea97790 100644
--- a/WeaselTSF/Composition.cpp
+++ b/WeaselTSF/Composition.cpp
@@ -24,7 +24,7 @@ class CStartCompositionEditSession : public CEditSession {
   BOOL _inlinePreeditEnabled;
 };
 
-STDAPI CStartCompositionEditSession::DoEditSession(TfEditCookie ec) {
+STDMETHODIMP CStartCompositionEditSession::DoEditSession(TfEditCookie ec) {
   HRESULT hr = E_FAIL;
   com_ptr<ITfInsertAtSelection> pInsertAtSelection;
   com_ptr<ITfRange> pRangeComposition;
@@ -102,7 +102,7 @@ class CEndCompositionEditSession : public CEditSession {
   BOOL _clear;
 };
 
-STDAPI CEndCompositionEditSession::DoEditSession(TfEditCookie ec) {
+STDMETHODIMP CEndCompositionEditSession::DoEditSession(TfEditCookie ec) {
   /* Clear the dummy text we set before, if any. */
   if (_pComposition == nullptr)
     return S_OK;
@@ -158,7 +158,7 @@ class CGetTextExtentEditSession : public CEditSession {
   bool _enhancedPosition;
 };
 
-STDAPI CGetTextExtentEditSession::DoEditSession(TfEditCookie ec) {
+STDMETHODIMP CGetTextExtentEditSession::DoEditSession(TfEditCookie ec) {
   com_ptr<ITfInsertAtSelection> pInsertAtSelection;
   com_ptr<ITfRange> pRangeComposition;
   ITfRange* pRange;
@@ -265,7 +265,7 @@ class CInlinePreeditEditSession : public CEditSession {
   const std::shared_ptr<weasel::Context> _context;
 };
 
-STDAPI CInlinePreeditEditSession::DoEditSession(TfEditCookie ec) {
+STDMETHODIMP CInlinePreeditEditSession::DoEditSession(TfEditCookie ec) {
   std::wstring preedit = _context->preedit.str;
 
   com_ptr<ITfRange> pRangeComposition;
@@ -393,8 +393,8 @@ void WeaselTSF::_UpdateComposition(com_ptr<ITfContext> pContext) {
 }
 
 /* Composition State */
-STDAPI WeaselTSF::OnCompositionTerminated(TfEditCookie ecWrite,
-                                          ITfComposition* pComposition) {
+STDMETHODIMP WeaselTSF::OnCompositionTerminated(TfEditCookie ecWrite,
+                                                ITfComposition* pComposition) {
   // NOTE:
   // This will be called when an edit session ended up with an empty composition
   // string, Even if it is closed normally. Silly M$.
diff --git a/WeaselTSF/DisplayAttributeInfo.cpp b/WeaselTSF/DisplayAttributeInfo.cpp
index a18bdb4f0..85c276a44 100644
--- a/WeaselTSF/DisplayAttributeInfo.cpp
+++ b/WeaselTSF/DisplayAttributeInfo.cpp
@@ -30,8 +30,9 @@ CDisplayAttributeInfoInput::~CDisplayAttributeInfoInput() {
   DllRelease();
 }
 
-STDAPI CDisplayAttributeInfoInput::QueryInterface(REFIID riid,
-                                                  _Outptr_ void** ppvObj) {
+STDMETHODIMP CDisplayAttributeInfoInput::QueryInterface(
+    REFIID riid,
+    _Outptr_ void** ppvObj) {
   if (ppvObj == nullptr)
     return E_INVALIDARG;
 
@@ -66,7 +67,7 @@ ULONG CDisplayAttributeInfoInput::Release(void) {
   return cr;
 }
 
-STDAPI CDisplayAttributeInfoInput::GetGUID(_Out_ GUID* pguid) {
+STDMETHODIMP CDisplayAttributeInfoInput::GetGUID(_Out_ GUID* pguid) {
   if (pguid == nullptr)
     return E_INVALIDARG;
 
@@ -78,7 +79,7 @@ STDAPI CDisplayAttributeInfoInput::GetGUID(_Out_ GUID* pguid) {
   return S_OK;
 }
 
-STDAPI CDisplayAttributeInfoInput::GetDescription(_Out_ BSTR* pbstrDesc) {
+STDMETHODIMP CDisplayAttributeInfoInput::GetDescription(_Out_ BSTR* pbstrDesc) {
   BSTR tempDesc;
 
   if (pbstrDesc == nullptr) {
@@ -96,7 +97,7 @@ STDAPI CDisplayAttributeInfoInput::GetDescription(_Out_ BSTR* pbstrDesc) {
   return S_OK;
 }
 
-STDAPI CDisplayAttributeInfoInput::GetAttributeInfo(
+STDMETHODIMP CDisplayAttributeInfoInput::GetAttributeInfo(
     _Out_ TF_DISPLAYATTRIBUTE* ptfDisplayAttr) {
   if (ptfDisplayAttr == nullptr) {
     return E_INVALIDARG;
@@ -107,11 +108,11 @@ STDAPI CDisplayAttributeInfoInput::GetAttributeInfo(
   return S_OK;
 }
 
-STDAPI CDisplayAttributeInfoInput::SetAttributeInfo(
+STDMETHODIMP CDisplayAttributeInfoInput::SetAttributeInfo(
     _In_ const TF_DISPLAYATTRIBUTE* /*ptfDisplayAttr*/) {
   return E_NOTIMPL;
 }
 
-STDAPI CDisplayAttributeInfoInput::Reset() {
+STDMETHODIMP CDisplayAttributeInfoInput::Reset() {
   return SetAttributeInfo(_pDisplayAttribute);
 }
diff --git a/WeaselTSF/DisplayAttributeProvider.cpp b/WeaselTSF/DisplayAttributeProvider.cpp
index 25b3a2fb0..e792542ae 100644
--- a/WeaselTSF/DisplayAttributeProvider.cpp
+++ b/WeaselTSF/DisplayAttributeProvider.cpp
@@ -4,7 +4,7 @@
 #include "EnumDisplayAttributeInfo.h"
 #include "DisplayAttributeInfo.h"
 
-STDAPI WeaselTSF::EnumDisplayAttributeInfo(
+STDMETHODIMP WeaselTSF::EnumDisplayAttributeInfo(
     __RPC__deref_out_opt IEnumTfDisplayAttributeInfo** ppEnum) {
   CEnumDisplayAttributeInfo* pAttributeEnum = nullptr;
 
@@ -24,7 +24,7 @@ STDAPI WeaselTSF::EnumDisplayAttributeInfo(
   return S_OK;
 }
 
-STDAPI WeaselTSF::GetDisplayAttributeInfo(
+STDMETHODIMP WeaselTSF::GetDisplayAttributeInfo(
     __RPC__in REFGUID guidInfo,
     __RPC__deref_out_opt ITfDisplayAttributeInfo** ppInfo) {
   if (ppInfo == nullptr) {
diff --git a/WeaselTSF/EditSession.cpp b/WeaselTSF/EditSession.cpp
index 8f4d50367..ec9589415 100644
--- a/WeaselTSF/EditSession.cpp
+++ b/WeaselTSF/EditSession.cpp
@@ -3,7 +3,7 @@
 #include "CandidateList.h"
 #include "ResponseParser.h"
 
-STDAPI WeaselTSF::DoEditSession(TfEditCookie ec) {
+STDMETHODIMP WeaselTSF::DoEditSession(TfEditCookie ec) {
   // get commit string from server
   std::wstring commit;
   weasel::Config config;
diff --git a/WeaselTSF/EnumDisplayAttributeInfo.cpp b/WeaselTSF/EnumDisplayAttributeInfo.cpp
index 293df2bae..840b69a49 100644
--- a/WeaselTSF/EnumDisplayAttributeInfo.cpp
+++ b/WeaselTSF/EnumDisplayAttributeInfo.cpp
@@ -15,8 +15,8 @@ CEnumDisplayAttributeInfo::~CEnumDisplayAttributeInfo() {
   DllRelease();
 }
 
-STDAPI CEnumDisplayAttributeInfo::QueryInterface(REFIID riid,
-                                                 _Outptr_ void** ppvObj) {
+STDMETHODIMP CEnumDisplayAttributeInfo::QueryInterface(REFIID riid,
+                                                       _Outptr_ void** ppvObj) {
   if (ppvObj == nullptr)
     return E_INVALIDARG;
 
@@ -51,7 +51,7 @@ STDAPI_(ULONG) CEnumDisplayAttributeInfo::Release() {
   return cr;
 }
 
-STDAPI CEnumDisplayAttributeInfo::Clone(
+STDMETHODIMP CEnumDisplayAttributeInfo::Clone(
     _Out_ IEnumTfDisplayAttributeInfo** ppEnum) {
   CEnumDisplayAttributeInfo* pClone = nullptr;
 
@@ -74,11 +74,11 @@ STDAPI CEnumDisplayAttributeInfo::Clone(
   return S_OK;
 }
 
-STDAPI CEnumDisplayAttributeInfo::Next(ULONG ulCount,
-                                       __RPC__out_ecount_part(ulCount,
-                                                              *pcFetched)
-                                           ITfDisplayAttributeInfo** rgInfo,
-                                       __RPC__out ULONG* pcFetched) {
+STDMETHODIMP CEnumDisplayAttributeInfo::Next(
+    ULONG ulCount,
+    __RPC__out_ecount_part(ulCount, *pcFetched)
+        ITfDisplayAttributeInfo** rgInfo,
+    __RPC__out ULONG* pcFetched) {
   ULONG fetched;
 
   fetched = 0;
@@ -116,12 +116,12 @@ STDAPI CEnumDisplayAttributeInfo::Next(ULONG ulCount,
   return (fetched == ulCount) ? S_OK : S_FALSE;
 }
 
-STDAPI CEnumDisplayAttributeInfo::Reset() {
+STDMETHODIMP CEnumDisplayAttributeInfo::Reset() {
   _index = 0;
   return S_OK;
 }
 
-STDAPI CEnumDisplayAttributeInfo::Skip(ULONG ulCount) {
+STDMETHODIMP CEnumDisplayAttributeInfo::Skip(ULONG ulCount) {
   if ((ulCount + _index) > 1 || (ulCount + _index) < ulCount) {
     _index = 1;
     return S_FALSE;
diff --git a/WeaselTSF/KeyEventSink.cpp b/WeaselTSF/KeyEventSink.cpp
index c885dddf9..6a18c13f0 100644
--- a/WeaselTSF/KeyEventSink.cpp
+++ b/WeaselTSF/KeyEventSink.cpp
@@ -62,7 +62,7 @@ void WeaselTSF::_ProcessKeyEvent(WPARAM wParam, LPARAM lParam, BOOL* pfEaten) {
   }
 }
 
-STDAPI WeaselTSF::OnSetFocus(BOOL fForeground) {
+STDMETHODIMP WeaselTSF::OnSetFocus(BOOL fForeground) {
   if (fForeground)
     m_client.FocusIn();
   else {
@@ -83,10 +83,10 @@ STDAPI WeaselTSF::OnSetFocus(BOOL fForeground) {
  *  and for OnKeyDown() to check if the key has already been sent to the server.
  */
 
-STDAPI WeaselTSF::OnTestKeyDown(ITfContext* pContext,
-                                WPARAM wParam,
-                                LPARAM lParam,
-                                BOOL* pfEaten) {
+STDMETHODIMP WeaselTSF::OnTestKeyDown(ITfContext* pContext,
+                                      WPARAM wParam,
+                                      LPARAM lParam,
+                                      BOOL* pfEaten) {
   _fTestKeyUpPending = FALSE;
   if (_fTestKeyDownPending) {
     *pfEaten = TRUE;
@@ -99,10 +99,10 @@ STDAPI WeaselTSF::OnTestKeyDown(ITfContext* pContext,
   return S_OK;
 }
 
-STDAPI WeaselTSF::OnKeyDown(ITfContext* pContext,
-                            WPARAM wParam,
-                            LPARAM lParam,
-                            BOOL* pfEaten) {
+STDMETHODIMP WeaselTSF::OnKeyDown(ITfContext* pContext,
+                                  WPARAM wParam,
+                                  LPARAM lParam,
+                                  BOOL* pfEaten) {
   _fTestKeyUpPending = FALSE;
   if (_fTestKeyDownPending) {
     _fTestKeyDownPending = FALSE;
@@ -114,10 +114,10 @@ STDAPI WeaselTSF::OnKeyDown(ITfContext* pContext,
   return S_OK;
 }
 
-STDAPI WeaselTSF::OnTestKeyUp(ITfContext* pContext,
-                              WPARAM wParam,
-                              LPARAM lParam,
-                              BOOL* pfEaten) {
+STDMETHODIMP WeaselTSF::OnTestKeyUp(ITfContext* pContext,
+                                    WPARAM wParam,
+                                    LPARAM lParam,
+                                    BOOL* pfEaten) {
   _fTestKeyDownPending = FALSE;
   if (_fTestKeyUpPending) {
     *pfEaten = TRUE;
@@ -130,10 +130,10 @@ STDAPI WeaselTSF::OnTestKeyUp(ITfContext* pContext,
   return S_OK;
 }
 
-STDAPI WeaselTSF::OnKeyUp(ITfContext* pContext,
-                          WPARAM wParam,
-                          LPARAM lParam,
-                          BOOL* pfEaten) {
+STDMETHODIMP WeaselTSF::OnKeyUp(ITfContext* pContext,
+                                WPARAM wParam,
+                                LPARAM lParam,
+                                BOOL* pfEaten) {
   _fTestKeyDownPending = FALSE;
   if (_fTestKeyUpPending) {
     _fTestKeyUpPending = FALSE;
@@ -146,9 +146,9 @@ STDAPI WeaselTSF::OnKeyUp(ITfContext* pContext,
   return S_OK;
 }
 
-STDAPI WeaselTSF::OnPreservedKey(ITfContext* pContext,
-                                 REFGUID rguid,
-                                 BOOL* pfEaten) {
+STDMETHODIMP WeaselTSF::OnPreservedKey(ITfContext* pContext,
+                                       REFGUID rguid,
+                                       BOOL* pfEaten) {
   *pfEaten = FALSE;
   return S_OK;
 }
diff --git a/WeaselTSF/LanguageBar.cpp b/WeaselTSF/LanguageBar.cpp
index 0ab85bec7..c21d92ce8 100644
--- a/WeaselTSF/LanguageBar.cpp
+++ b/WeaselTSF/LanguageBar.cpp
@@ -70,7 +70,7 @@ CLangBarItemButton::~CLangBarItemButton() {
   DllRelease();
 }
 
-STDAPI CLangBarItemButton::QueryInterface(REFIID riid, void** ppvObject) {
+STDMETHODIMP CLangBarItemButton::QueryInterface(REFIID riid, void** ppvObject) {
   if (ppvObject == NULL)
     return E_INVALIDARG;
 
@@ -100,7 +100,7 @@ STDAPI_(ULONG) CLangBarItemButton::Release() {
   return cr;
 }
 
-STDAPI CLangBarItemButton::GetInfo(TF_LANGBARITEMINFO* pInfo) {
+STDMETHODIMP CLangBarItemButton::GetInfo(TF_LANGBARITEMINFO* pInfo) {
   pInfo->clsidService = c_clsidTextService;
   pInfo->guidItem = _guid;
   pInfo->dwStyle = TF_LBI_STYLE_BTN_BUTTON | TF_LBI_STYLE_BTN_MENU |
@@ -110,12 +110,12 @@ STDAPI CLangBarItemButton::GetInfo(TF_LANGBARITEMINFO* pInfo) {
   return S_OK;
 }
 
-STDAPI CLangBarItemButton::GetStatus(DWORD* pdwStatus) {
+STDMETHODIMP CLangBarItemButton::GetStatus(DWORD* pdwStatus) {
   *pdwStatus = _status;
   return S_OK;
 }
 
-STDAPI CLangBarItemButton::Show(BOOL fShow) {
+STDMETHODIMP CLangBarItemButton::Show(BOOL fShow) {
   SetLangbarStatus(TF_LBI_STATUS_HIDDEN, fShow ? FALSE : TRUE);
   return S_OK;
 }
@@ -135,7 +135,7 @@ static LANGID GetActiveProfileLangId() {
   return profile.langid;
 }
 
-STDAPI CLangBarItemButton::GetTooltipString(BSTR* pbstrToolTip) {
+STDMETHODIMP CLangBarItemButton::GetTooltipString(BSTR* pbstrToolTip) {
   LANGID langid = get_language_id();
   if (langid == TEXTSERVICE_LANGID_HANS) {
     *pbstrToolTip = SysAllocString(L"左键切换模式，右键打开菜单");
@@ -149,9 +149,9 @@ STDAPI CLangBarItemButton::GetTooltipString(BSTR* pbstrToolTip) {
   return (*pbstrToolTip == NULL) ? E_OUTOFMEMORY : S_OK;
 }
 
-STDAPI CLangBarItemButton::OnClick(TfLBIClick click,
-                                   POINT pt,
-                                   const RECT* prcArea) {
+STDMETHODIMP CLangBarItemButton::OnClick(TfLBIClick click,
+                                         POINT pt,
+                                         const RECT* prcArea) {
   if (click == TF_LBI_CLK_LEFT) {
     _pTextService->_HandleLangBarMenuSelect(
         ascii_mode ? ID_WEASELTRAY_DISABLE_ASCII : ID_WEASELTRAY_ENABLE_ASCII);
@@ -183,7 +183,7 @@ STDAPI CLangBarItemButton::OnClick(TfLBIClick click,
   return S_OK;
 }
 
-STDAPI CLangBarItemButton::InitMenu(ITfMenu* pMenu) {
+STDMETHODIMP CLangBarItemButton::InitMenu(ITfMenu* pMenu) {
   HMENU menu = LoadMenuW(g_hInst, MAKEINTRESOURCE(IDR_MENU_POPUP));
   HMENU popupMenu = GetSubMenu(menu, 0);
   HMENU2ITfMenu(popupMenu, pMenu);
@@ -191,12 +191,12 @@ STDAPI CLangBarItemButton::InitMenu(ITfMenu* pMenu) {
   return S_OK;
 }
 
-STDAPI CLangBarItemButton::OnMenuSelect(UINT wID) {
+STDMETHODIMP CLangBarItemButton::OnMenuSelect(UINT wID) {
   _pTextService->_HandleLangBarMenuSelect(wID);
   return S_OK;
 }
 
-STDAPI CLangBarItemButton::GetIcon(HICON* phIcon) {
+STDMETHODIMP CLangBarItemButton::GetIcon(HICON* phIcon) {
   if (ascii_mode) {
     if (_style.current_ascii_icon.empty())
       *phIcon = (HICON)LoadImageW(g_hInst, MAKEINTRESOURCEW(IDI_EN), IMAGE_ICON,
@@ -221,14 +221,14 @@ STDAPI CLangBarItemButton::GetIcon(HICON* phIcon) {
   return (*phIcon == NULL) ? E_FAIL : S_OK;
 }
 
-STDAPI CLangBarItemButton::GetText(BSTR* pbstrText) {
+STDMETHODIMP CLangBarItemButton::GetText(BSTR* pbstrText) {
   *pbstrText = SysAllocString(L"WeaselTSF Button");
   return (*pbstrText == NULL) ? E_OUTOFMEMORY : S_OK;
 }
 
-STDAPI CLangBarItemButton::AdviseSink(REFIID riid,
-                                      IUnknown* punk,
-                                      DWORD* pdwCookie) {
+STDMETHODIMP CLangBarItemButton::AdviseSink(REFIID riid,
+                                            IUnknown* punk,
+                                            DWORD* pdwCookie) {
   if (!IsEqualIID(riid, IID_ITfLangBarItemSink))
     return CONNECT_E_CANNOTCONNECT;
   if (_pLangBarItemSink != NULL)
@@ -243,7 +243,7 @@ STDAPI CLangBarItemButton::AdviseSink(REFIID riid,
   return S_OK;
 }
 
-STDAPI CLangBarItemButton::UnadviseSink(DWORD dwCookie) {
+STDMETHODIMP CLangBarItemButton::UnadviseSink(DWORD dwCookie) {
   if (dwCookie != LANGBARITEMSINK_COOKIE || _pLangBarItemSink == NULL)
     return CONNECT_E_NOCONNECTION;
   _pLangBarItemSink = NULL;
diff --git a/WeaselTSF/Server.cpp b/WeaselTSF/Server.cpp
index cf3f75f1b..94c9aed82 100644
--- a/WeaselTSF/Server.cpp
+++ b/WeaselTSF/Server.cpp
@@ -27,7 +27,7 @@ class CClassFactory : public IClassFactory {
   STDMETHODIMP LockServer(BOOL fLock);
 };
 
-STDAPI CClassFactory::QueryInterface(REFIID riid, void** ppvObject) {
+STDMETHODIMP CClassFactory::QueryInterface(REFIID riid, void** ppvObject) {
   if (IsEqualIID(riid, IID_IClassFactory) || IsEqualIID(riid, IID_IUnknown)) {
     *ppvObject = this;
     DllAddRef();
@@ -47,9 +47,9 @@ STDAPI_(ULONG) CClassFactory::Release() {
   return g_cRefDll + 1;
 }
 
-STDAPI CClassFactory::CreateInstance(IUnknown* pUnkOuter,
-                                     REFIID riid,
-                                     void** ppvObject) {
+STDMETHODIMP CClassFactory::CreateInstance(IUnknown* pUnkOuter,
+                                           REFIID riid,
+                                           void** ppvObject) {
   WeaselTSF* pCase;
   HRESULT hr;
   if (ppvObject == NULL)
@@ -64,7 +64,7 @@ STDAPI CClassFactory::CreateInstance(IUnknown* pUnkOuter,
   return hr;
 }
 
-STDAPI CClassFactory::LockServer(BOOL fLock) {
+STDMETHODIMP CClassFactory::LockServer(BOOL fLock) {
   if (fLock)
     DllAddRef();
   else
diff --git a/WeaselTSF/TextEditSink.cpp b/WeaselTSF/TextEditSink.cpp
index a6bc1f02d..4ca30cc27 100644
--- a/WeaselTSF/TextEditSink.cpp
+++ b/WeaselTSF/TextEditSink.cpp
@@ -17,9 +17,9 @@ static BOOL IsRangeCovered(TfEditCookie ec,
   return TRUE;
 }
 
-STDAPI WeaselTSF::OnEndEdit(ITfContext* pContext,
-                            TfEditCookie ecReadOnly,
-                            ITfEditRecord* pEditRecord) {
+STDMETHODIMP WeaselTSF::OnEndEdit(ITfContext* pContext,
+                                  TfEditCookie ecReadOnly,
+                                  ITfEditRecord* pEditRecord) {
   BOOL fSelectionChanged;
   IEnumTfRanges* pEnumTextChanges;
   ITfRange* pRange;
@@ -56,9 +56,9 @@ STDAPI WeaselTSF::OnEndEdit(ITfContext* pContext,
   return S_OK;
 }
 
-STDAPI WeaselTSF::OnLayoutChange(ITfContext* pContext,
-                                 TfLayoutCode lcode,
-                                 ITfContextView* pContextView) {
+STDMETHODIMP WeaselTSF::OnLayoutChange(ITfContext* pContext,
+                                       TfLayoutCode lcode,
+                                       ITfContextView* pContextView) {
   if (!_IsComposing())
     return S_OK;
 
diff --git a/WeaselTSF/ThreadMgrEventSink.cpp b/WeaselTSF/ThreadMgrEventSink.cpp
index a46ca3786..cc49a0ffb 100644
--- a/WeaselTSF/ThreadMgrEventSink.cpp
+++ b/WeaselTSF/ThreadMgrEventSink.cpp
@@ -1,16 +1,16 @@
 #include "stdafx.h"
 #include "WeaselTSF.h"
 
-STDAPI WeaselTSF::OnInitDocumentMgr(ITfDocumentMgr* pDocMgr) {
+STDMETHODIMP WeaselTSF::OnInitDocumentMgr(ITfDocumentMgr* pDocMgr) {
   return S_OK;
 }
 
-STDAPI WeaselTSF::OnUninitDocumentMgr(ITfDocumentMgr* pDocMgr) {
+STDMETHODIMP WeaselTSF::OnUninitDocumentMgr(ITfDocumentMgr* pDocMgr) {
   return S_OK;
 }
 
-STDAPI WeaselTSF::OnSetFocus(ITfDocumentMgr* pDocMgrFocus,
-                             ITfDocumentMgr* pDocMgrPrevFocus) {
+STDMETHODIMP WeaselTSF::OnSetFocus(ITfDocumentMgr* pDocMgrFocus,
+                                   ITfDocumentMgr* pDocMgrPrevFocus) {
   _InitTextEditSink(pDocMgrFocus);
 
   com_ptr<ITfDocumentMgr> pCandidateListDocumentMgr;
@@ -27,11 +27,11 @@ STDAPI WeaselTSF::OnSetFocus(ITfDocumentMgr* pDocMgrFocus,
   return S_OK;
 }
 
-STDAPI WeaselTSF::OnPushContext(ITfContext* pContext) {
+STDMETHODIMP WeaselTSF::OnPushContext(ITfContext* pContext) {
   return S_OK;
 }
 
-STDAPI WeaselTSF::OnPopContext(ITfContext* pContext) {
+STDMETHODIMP WeaselTSF::OnPopContext(ITfContext* pContext) {
   return S_OK;
 }
 
diff --git a/WeaselTSF/WeaselTSF.cpp b/WeaselTSF/WeaselTSF.cpp
index 2e7dcffd9..53290b0d4 100644
--- a/WeaselTSF/WeaselTSF.cpp
+++ b/WeaselTSF/WeaselTSF.cpp
@@ -41,7 +41,7 @@ WeaselTSF::~WeaselTSF() {
   DllRelease();
 }
 
-STDAPI WeaselTSF::QueryInterface(REFIID riid, void** ppvObject) {
+STDMETHODIMP WeaselTSF::QueryInterface(REFIID riid, void** ppvObject) {
   if (ppvObject == NULL)
     return E_INVALIDARG;
 
@@ -76,11 +76,11 @@ STDAPI WeaselTSF::QueryInterface(REFIID riid, void** ppvObject) {
   return E_NOINTERFACE;
 }
 
-STDAPI_(ULONG) WeaselTSF::AddRef() {
+STDMETHODIMP_(ULONG) WeaselTSF::AddRef() {
   return ++_cRef;
 }
 
-STDAPI_(ULONG) WeaselTSF::Release() {
+STDMETHODIMP_(ULONG) WeaselTSF::Release() {
   LONG cr = --_cRef;
 
   assert(_cRef >= 0);
@@ -91,11 +91,12 @@ STDAPI_(ULONG) WeaselTSF::Release() {
   return cr;
 }
 
-STDAPI WeaselTSF::Activate(ITfThreadMgr* pThreadMgr, TfClientId tfClientId) {
+STDMETHODIMP WeaselTSF::Activate(ITfThreadMgr* pThreadMgr,
+                                 TfClientId tfClientId) {
   return ActivateEx(pThreadMgr, tfClientId, 0U);
 }
 
-STDAPI WeaselTSF::Deactivate() {
+STDMETHODIMP WeaselTSF::Deactivate() {
   m_client.EndSession();
 
   _InitTextEditSink(com_ptr<ITfDocumentMgr>());
@@ -120,9 +121,9 @@ STDAPI WeaselTSF::Deactivate() {
   return S_OK;
 }
 
-STDAPI WeaselTSF::ActivateEx(ITfThreadMgr* pThreadMgr,
-                             TfClientId tfClientId,
-                             DWORD dwFlags) {
+STDMETHODIMP WeaselTSF::ActivateEx(ITfThreadMgr* pThreadMgr,
+                                   TfClientId tfClientId,
+                                   DWORD dwFlags) {
   com_ptr<ITfDocumentMgr> pDocMgrFocus;
   _activateFlags = dwFlags;