[ros-diffs] [reactos] 01/01: [IMM32] Renaming: s/g_pImeDpiList/gpImeDpiList/ (#4434)

[Katayama Hirofumi MZ]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3c1697146fe8bfc799640…

commit 3c1697146fe8bfc799640c3ce0d7f06fb9bb6353
Author:     Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com>
AuthorDate: Fri Apr 8 19:02:08 2022 +0900
Commit:     GitHub <noreply(a)github.com>
CommitDate: Fri Apr 8 19:02:08 2022 +0900

    [IMM32] Renaming: s/g_pImeDpiList/gpImeDpiList/ (#4434)
    
    Improve debuggability. CORE-11700
---
 dll/win32/imm32/ime.c     | 22 +++++++++++-----------
 dll/win32/imm32/imm.c     |  2 +-
 dll/win32/imm32/precomp.h |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/dll/win32/imm32/ime.c b/dll/win32/imm32/ime.c
index 9afaa66b8d1..82ca39adbb4 100644
--- a/dll/win32/imm32/ime.c
+++ b/dll/win32/imm32/ime.c
@@ -14,14 +14,14 @@
 WINE_DEFAULT_DEBUG_CHANNEL(imm);
 
 RTL_CRITICAL_SECTION gcsImeDpi; // Win: gcsImeDpi
-PIMEDPI g_pImeDpiList = NULL;
+PIMEDPI gpImeDpiList = NULL; // Win: gpImeDpi
 
 PIMEDPI APIENTRY Imm32FindImeDpi(HKL hKL)
 {
     PIMEDPI pImeDpi;
 
     RtlEnterCriticalSection(&gcsImeDpi);
-    for (pImeDpi = g_pImeDpiList; pImeDpi != NULL; pImeDpi = pImeDpi->pNext)
+    for (pImeDpi = gpImeDpiList; pImeDpi != NULL; pImeDpi = pImeDpi->pNext)
     {
         if (pImeDpi->hKL == hKL)
             break;
@@ -269,8 +269,8 @@ PIMEDPI APIENTRY Ime32LoadImeDpi(HKL hKL, BOOL bLock)
             pImeDpiNew->cLockObj = 1;
         }
 
-        pImeDpiNew->pNext = g_pImeDpiList;
-        g_pImeDpiList = pImeDpiNew;
+        pImeDpiNew->pNext = gpImeDpiList;
+        gpImeDpiList = pImeDpiNew;
 
         RtlLeaveCriticalSection(&gcsImeDpi);
         return pImeDpiNew;
@@ -310,7 +310,7 @@ BOOL APIENTRY Imm32ReleaseIME(HKL hKL)
 
     RtlEnterCriticalSection(&gcsImeDpi);
 
-    for (pImeDpi0 = g_pImeDpiList; pImeDpi0; pImeDpi0 = pImeDpi0->pNext)
+    for (pImeDpi0 = gpImeDpiList; pImeDpi0; pImeDpi0 = pImeDpi0->pNext)
     {
         if (pImeDpi0->hKL == hKL)
             break;
@@ -326,13 +326,13 @@ BOOL APIENTRY Imm32ReleaseIME(HKL hKL)
         goto Quit;
     }
 
-    if (g_pImeDpiList == pImeDpi0)
+    if (gpImeDpiList == pImeDpi0)
     {
-        g_pImeDpiList = pImeDpi0->pNext;
+        gpImeDpiList = pImeDpi0->pNext;
     }
-    else if (g_pImeDpiList)
+    else if (gpImeDpiList)
     {
-        for (pImeDpi1 = g_pImeDpiList; pImeDpi1; pImeDpi1 = pImeDpi1->pNext)
+        for (pImeDpi1 = gpImeDpiList; pImeDpi1; pImeDpi1 = pImeDpi1->pNext)
         {
             if (pImeDpi1->pNext == pImeDpi0)
             {
@@ -729,7 +729,7 @@ PIMEDPI WINAPI ImmLockImeDpi(HKL hKL)
     RtlEnterCriticalSection(&gcsImeDpi);
 
     /* Find by hKL */
-    for (pImeDpi = g_pImeDpiList; pImeDpi; pImeDpi = pImeDpi->pNext)
+    for (pImeDpi = gpImeDpiList; pImeDpi; pImeDpi = pImeDpi->pNext)
     {
         if (pImeDpi->hKL == hKL) /* found */
         {
@@ -779,7 +779,7 @@ VOID WINAPI ImmUnlockImeDpi(PIMEDPI pImeDpi)
     }
 
     /* Remove from list */
-    for (ppEntry = &g_pImeDpiList; *ppEntry; ppEntry = &((*ppEntry)->pNext))
+    for (ppEntry = &gpImeDpiList; *ppEntry; ppEntry = &((*ppEntry)->pNext))
     {
         if (*ppEntry == pImeDpi) /* found */
         {
diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c
index c5544580dda..9eb0b0b54fd 100644
--- a/dll/win32/imm32/imm.c
+++ b/dll/win32/imm32/imm.c
@@ -161,7 +161,7 @@ BOOL WINAPI ImmFreeLayout(DWORD dwUnknown)
     {
         RtlEnterCriticalSection(&gcsImeDpi);
 Retry:
-        for (pImeDpi = g_pImeDpiList; pImeDpi; pImeDpi = pImeDpi->pNext)
+        for (pImeDpi = gpImeDpiList; pImeDpi; pImeDpi = pImeDpi->pNext)
         {
             if (Imm32ReleaseIME(pImeDpi->hKL))
                 goto Retry;
diff --git a/dll/win32/imm32/precomp.h b/dll/win32/imm32/precomp.h
index 4ddcd216e53..9139c3d0ce1 100644
--- a/dll/win32/imm32/precomp.h
+++ b/dll/win32/imm32/precomp.h
@@ -71,7 +71,7 @@ typedef struct REG_IME
 
 extern HMODULE g_hImm32Inst;
 extern RTL_CRITICAL_SECTION gcsImeDpi;
-extern PIMEDPI g_pImeDpiList;
+extern PIMEDPI gpImeDpiList;
 extern PSERVERINFO gpsi;
 extern SHAREDINFO gSharedInfo;
 extern BYTE g_bClientRegd;