[ros-diffs] [reactos] 01/01: [MSCTFIME][SDK] s/IMCCLock/CicIMCCLock/ and s/IMCLock/CicIMCLock/

[Katayama Hirofumi MZ]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1726ee83e7b673c3bd415…

commit 1726ee83e7b673c3bd415476aec0ee24de80a586
Author:     Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com>
AuthorDate: Fri Dec 22 14:52:49 2023 +0900
Commit:     Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com>
CommitDate: Fri Dec 22 14:52:49 2023 +0900

    [MSCTFIME][SDK] s/IMCCLock/CicIMCCLock/ and s/IMCLock/CicIMCLock/
    
    Refactoring. CORE-19360
---
 dll/ime/msctfime/msctfime.cpp       | 28 ++++++++++++++--------------
 sdk/include/reactos/cicero/cicimc.h | 30 +++++++++++++++---------------
 2 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/dll/ime/msctfime/msctfime.cpp b/dll/ime/msctfime/msctfime.cpp
index 1164df5c733..cfb29f4db17 100644
--- a/dll/ime/msctfime/msctfime.cpp
+++ b/dll/ime/msctfime/msctfime.cpp
@@ -565,11 +565,11 @@ public:
 
     HRESULT
     GetGuidAtom(
-        _Inout_ IMCLock& imcLock,
+        _Inout_ CicIMCLock& imcLock,
         _In_ BYTE iAtom,
         _Out_opt_ LPDWORD pdwGuidAtom);
 
-    HRESULT CreateInputContext(ITfThreadMgr *pThreadMgr, IMCLock& imcLock);
+    HRESULT CreateInputContext(ITfThreadMgr *pThreadMgr, CicIMCLock& imcLock);
     HRESULT DestroyInputContext();
 };
 
@@ -665,11 +665,11 @@ CicInputContext::OnEndComposition(
  */
 HRESULT
 CicInputContext::GetGuidAtom(
-    _Inout_ IMCLock& imcLock,
+    _Inout_ CicIMCLock& imcLock,
     _In_ BYTE iAtom,
     _Out_opt_ LPDWORD pdwGuidAtom)
 {
-    IMCCLock<CTFIMECONTEXT> imeContext(imcLock.get().hCompStr);
+    CicIMCCLock<CTFIMECONTEXT> imeContext(imcLock.get().hCompStr);
     HRESULT hr = imeContext.m_hr;
     if (!imeContext)
         hr = E_FAIL;
@@ -690,7 +690,7 @@ CicInputContext::GetGuidAtom(
  * @unimplemented
  */
 HRESULT
-CicInputContext::CreateInputContext(ITfThreadMgr *pThreadMgr, IMCLock& imcLock)
+CicInputContext::CreateInputContext(ITfThreadMgr *pThreadMgr, CicIMCLock& imcLock)
 {
     //FIXME
     return E_NOTIMPL;
@@ -1069,7 +1069,7 @@ public:
     HRESULT DestroyInputContext(TLS *pTLS, HIMC hIMC);
 
     void PostTransMsg(HWND hWnd, INT cTransMsgs, LPTRANSMSG pTransMsgs);
-    void GetDocumentManager(IMCCLock<CTFIMECONTEXT>& imeContext);
+    void GetDocumentManager(CicIMCCLock<CTFIMECONTEXT>& imeContext);
 
     HRESULT ConfigureGeneral(TLS* pTLS, ITfThreadMgr *pThreadMgr, HKL hKL, HWND hWnd);
     HRESULT ConfigureRegisterWord(TLS* pTLS, ITfThreadMgr *pThreadMgr, HKL hKL, HWND
hWnd, LPVOID lpData);
@@ -1675,7 +1675,7 @@ CicBridge::~CicBridge()
         UnInitIMMX(pTLS);
 }
 
-void CicBridge::GetDocumentManager(IMCCLock<CTFIMECONTEXT>& imeContext)
+void CicBridge::GetDocumentManager(CicIMCCLock<CTFIMECONTEXT>& imeContext)
 {
     CicInputContext *pCicIC = imeContext.get().m_pCicIC;
     if (pCicIC)
@@ -1695,7 +1695,7 @@ void
CicBridge::GetDocumentManager(IMCCLock<CTFIMECONTEXT>& imeContext)
  */
 HRESULT CicBridge::CreateInputContext(TLS *pTLS, HIMC hIMC)
 {
-    IMCLock imcLock(hIMC);
+    CicIMCLock imcLock(hIMC);
     HRESULT hr = imcLock.m_hr;
     if (!imcLock)
         hr = E_FAIL;
@@ -1710,7 +1710,7 @@ HRESULT CicBridge::CreateInputContext(TLS *pTLS, HIMC hIMC)
         imcLock.get().hCtfImeContext = hCtfImeContext;
     }
 
-    IMCCLock<CTFIMECONTEXT> imeContext(imcLock.get().hCtfImeContext);
+    CicIMCCLock<CTFIMECONTEXT> imeContext(imcLock.get().hCtfImeContext);
     CicInputContext *pCicIC = imeContext.get().m_pCicIC;
     if (!pCicIC)
     {
@@ -1758,7 +1758,7 @@ HRESULT CicBridge::CreateInputContext(TLS *pTLS, HIMC hIMC)
  */
 HRESULT CicBridge::DestroyInputContext(TLS *pTLS, HIMC hIMC)
 {
-    IMCLock imcLock(hIMC);
+    CicIMCLock imcLock(hIMC);
     HRESULT hr = imcLock.m_hr;
     if (!imcLock)
         hr = E_FAIL;
@@ -1766,7 +1766,7 @@ HRESULT CicBridge::DestroyInputContext(TLS *pTLS, HIMC hIMC)
         return hr;
 
     hr = E_FAIL;
-    IMCCLock<CTFIMECONTEXT> imeContext(imcLock.get().hCtfImeContext);
+    CicIMCCLock<CTFIMECONTEXT> imeContext(imcLock.get().hCtfImeContext);
     if (imeContext)
         hr = imeContext.m_hr;
 
@@ -2515,7 +2515,7 @@ CtfImeGetGuidAtom(
 {
     TRACE("(%p, 0x%lX, %p)\n", hIMC, dwUnknown, pdwGuidAtom);
 
-    IMCLock imcLock(hIMC);
+    CicIMCLock imcLock(hIMC);
 
     HRESULT hr = imcLock.m_hr;
     if (!imcLock)
@@ -2523,7 +2523,7 @@ CtfImeGetGuidAtom(
     if (FAILED(hr))
         return hr;
 
-    IMCCLock<CTFIMECONTEXT> imccLock(imcLock.get().hCtfImeContext);
+    CicIMCCLock<CTFIMECONTEXT> imccLock(imcLock.get().hCtfImeContext);
     hr = imccLock.m_hr;
     if (!imccLock)
         hr = E_FAIL;
@@ -2550,7 +2550,7 @@ CtfImeIsGuidMapEnable(
 
     BOOL ret = FALSE;
     HRESULT hr;
-    IMCLock imcLock(hIMC);
+    CicIMCLock imcLock(hIMC);
 
     hr = imcLock.m_hr;
     if (!imcLock)
diff --git a/sdk/include/reactos/cicero/cicimc.h b/sdk/include/reactos/cicero/cicimc.h
index 81a642ec067..18b25bdb191 100644
--- a/sdk/include/reactos/cicero/cicimc.h
+++ b/sdk/include/reactos/cicero/cicimc.h
@@ -7,13 +7,13 @@
 
 #pragma once
 
-// class IMCCLOCK<T_DATA>;
-// class IMCCLock<T_DATA>;
-// class _IMCLock;
-// class IMCLock;
+// class CIC_IMCC_LOCK<T_DATA>;
+// class CicIMCCLock<T_DATA>;
+// class CIC_IMC_LOCK;
+// class CicIMCLock;
 
 template <typename T_DATA>
-class IMCCLOCK
+class CIC_IMCC_LOCK
 {
 protected:
     T_DATA *m_pIMCC;
@@ -22,7 +22,7 @@ public:
     HIMCC m_hIMCC;
     HRESULT m_hr;
 
-    IMCCLOCK(HIMCC hIMCC)
+    CIC_IMCC_LOCK(HIMCC hIMCC)
     {
         m_pIMCC = NULL;
         m_hr = S_OK;
@@ -31,15 +31,15 @@ public:
 };
 
 template <typename T_DATA>
-class IMCCLock : public IMCCLOCK<T_DATA>
+class CicIMCCLock : public CIC_IMCC_LOCK<T_DATA>
 {
 public:
-    IMCCLock(HIMCC hIMCC) : IMCCLOCK<T_DATA>(hIMCC)
+    CicIMCCLock(HIMCC hIMCC) : CIC_IMCC_LOCK<T_DATA>(hIMCC)
     {
         if (hIMCC)
             _LockIMCC(this->m_hIMCC, &this->m_pIMCC);
     }
-    ~IMCCLock()
+    ~CicIMCCLock()
     {
         unlock();
     }
@@ -78,7 +78,7 @@ protected:
     }
 };
 
-class IMCLOCK
+class CIC_IMC_LOCK
 {
 protected:
     LPINPUTCONTEXTDX m_pIC;
@@ -88,7 +88,7 @@ public:
     HRESULT m_hr;
     DWORD m_dw3;
 
-    IMCLOCK(HIMC hIMC)
+    CIC_IMC_LOCK(HIMC hIMC)
     {
         m_pIC = NULL;
         m_hIMC = hIMC;
@@ -102,14 +102,14 @@ public:
     }
 };
 
-class IMCLock : public IMCLOCK
+class CicIMCLock : public CIC_IMC_LOCK
 {
 public:
-    IMCLock(HIMC hIMC) : IMCLOCK(hIMC)
+    CicIMCLock(HIMC hIMC) : CIC_IMC_LOCK(hIMC)
     {
         m_hr = _LockIMC(hIMC, &m_pIC);
     }
-    ~IMCLock()
+    ~CicIMCLock()
     {
         unlock();
     }
@@ -136,7 +136,7 @@ public:
         if (ImmGetIMCCSize(m_pIC->hCompStr) < sizeof(COMPOSITIONSTRING))
             return FALSE;
 
-        IMCCLock<COMPOSITIONSTRING> imccLock(m_pIC->hCompStr);
+        CicIMCCLock<COMPOSITIONSTRING> imccLock(m_pIC->hCompStr);
         if (!imccLock)
             return FALSE;