Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-06 11:12:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

[IMM32] Renaming: s/g_csImeDpi/gcsImeDpi/ (#4433)

Browse source 
Improve debuggability. CORE-11700
This commit is contained in:
Katayama Hirofumi MZ 2022-04-08 18:21:54 +09:00 • committed by GitHub
parent eebe11ae0c
commit 895909e695
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

30
dll/win32/imm32/ime.c
View file

@ -6,27 +6,27 @@
* Copyright 2002, 2003, 2007 CodeWeavers, Aric Stewart * Copyright 2002, 2003, 2007 CodeWeavers, Aric Stewart
* Copyright 2017 James Tabor <james.tabor@reactos.org> * Copyright 2017 James Tabor <james.tabor@reactos.org>
* Copyright 2018 Amine Khaldi <amine.khaldi@reactos.org> * Copyright 2018 Amine Khaldi <amine.khaldi@reactos.org>
* Copyright 2020-2021 Katayama Hirofumi MZ <katayama.hirofumi.mz@gmail.com> * Copyright 2020-2022 Katayama Hirofumi MZ <katayama.hirofumi.mz@gmail.com>
*/ */
#include "precomp.h" #include "precomp.h"
WINE_DEFAULT_DEBUG_CHANNEL(imm); WINE_DEFAULT_DEBUG_CHANNEL(imm);
RTL_CRITICAL_SECTION g_csImeDpi; RTL_CRITICAL_SECTION gcsImeDpi; // Win: gcsImeDpi
PIMEDPI g_pImeDpiList = NULL; PIMEDPI g_pImeDpiList = NULL;
PIMEDPI APIENTRY Imm32FindImeDpi(HKL hKL) PIMEDPI APIENTRY Imm32FindImeDpi(HKL hKL)
{ {
PIMEDPI pImeDpi; PIMEDPI pImeDpi;
RtlEnterCriticalSection(&g_csImeDpi); RtlEnterCriticalSection(&gcsImeDpi);
for (pImeDpi = g_pImeDpiList; pImeDpi != NULL; pImeDpi = pImeDpi->pNext) for (pImeDpi = g_pImeDpiList; pImeDpi != NULL; pImeDpi = pImeDpi->pNext)
{ {
if (pImeDpi->hKL == hKL) if (pImeDpi->hKL == hKL)
break; break;
} }
RtlLeaveCriticalSection(&g_csImeDpi); RtlLeaveCriticalSection(&gcsImeDpi);
return pImeDpi; return pImeDpi;
} }
@ -247,7 +247,7 @@ PIMEDPI APIENTRY Ime32LoadImeDpi(HKL hKL, BOOL bLock)
return FALSE; return FALSE;
} }
RtlEnterCriticalSection(&g_csImeDpi); RtlEnterCriticalSection(&gcsImeDpi);
pImeDpiFound = Imm32FindImeDpi(hKL); pImeDpiFound = Imm32FindImeDpi(hKL);
if (pImeDpiFound) if (pImeDpiFound)
@ -255,7 +255,7 @@ PIMEDPI APIENTRY Ime32LoadImeDpi(HKL hKL, BOOL bLock)
if (!bLock) if (!bLock)
pImeDpiFound->dwFlags &= ~IMEDPI_FLAG_LOCKED; pImeDpiFound->dwFlags &= ~IMEDPI_FLAG_LOCKED;
RtlLeaveCriticalSection(&g_csImeDpi); RtlLeaveCriticalSection(&gcsImeDpi);
Imm32FreeImeDpi(pImeDpiNew, FALSE); Imm32FreeImeDpi(pImeDpiNew, FALSE);
ImmLocalFree(pImeDpiNew); ImmLocalFree(pImeDpiNew);
@ -272,7 +272,7 @@ PIMEDPI APIENTRY Ime32LoadImeDpi(HKL hKL, BOOL bLock)
pImeDpiNew->pNext = g_pImeDpiList; pImeDpiNew->pNext = g_pImeDpiList;
g_pImeDpiList = pImeDpiNew; g_pImeDpiList = pImeDpiNew;
RtlLeaveCriticalSection(&g_csImeDpi); RtlLeaveCriticalSection(&gcsImeDpi);
return pImeDpiNew; return pImeDpiNew;
} }
} }
@ -308,7 +308,7 @@ BOOL APIENTRY Imm32ReleaseIME(HKL hKL)
BOOL ret = TRUE; BOOL ret = TRUE;
PIMEDPI pImeDpi0, pImeDpi1; PIMEDPI pImeDpi0, pImeDpi1;
RtlEnterCriticalSection(&g_csImeDpi); RtlEnterCriticalSection(&gcsImeDpi);
for (pImeDpi0 = g_pImeDpiList; pImeDpi0; pImeDpi0 = pImeDpi0->pNext) for (pImeDpi0 = g_pImeDpiList; pImeDpi0; pImeDpi0 = pImeDpi0->pNext)
{ {
@ -346,7 +346,7 @@ BOOL APIENTRY Imm32ReleaseIME(HKL hKL)
ImmLocalFree(pImeDpi0); ImmLocalFree(pImeDpi0);
Quit: Quit:
RtlLeaveCriticalSection(&g_csImeDpi); RtlLeaveCriticalSection(&gcsImeDpi);
return ret; return ret;
} }
@ -726,7 +726,7 @@ PIMEDPI WINAPI ImmLockImeDpi(HKL hKL)
TRACE("(%p)\n", hKL); TRACE("(%p)\n", hKL);
RtlEnterCriticalSection(&g_csImeDpi); RtlEnterCriticalSection(&gcsImeDpi);
/* Find by hKL */ /* Find by hKL */
for (pImeDpi = g_pImeDpiList; pImeDpi; pImeDpi = pImeDpi->pNext) for (pImeDpi = g_pImeDpiList; pImeDpi; pImeDpi = pImeDpi->pNext)
@ -742,7 +742,7 @@ PIMEDPI WINAPI ImmLockImeDpi(HKL hKL)
} }
} }
RtlLeaveCriticalSection(&g_csImeDpi); RtlLeaveCriticalSection(&gcsImeDpi);
return pImeDpi; return pImeDpi;
} }
@ -758,13 +758,13 @@ VOID WINAPI ImmUnlockImeDpi(PIMEDPI pImeDpi)
if (pImeDpi == NULL) if (pImeDpi == NULL)
return; return;
RtlEnterCriticalSection(&g_csImeDpi); RtlEnterCriticalSection(&gcsImeDpi);
/* unlock */ /* unlock */
--(pImeDpi->cLockObj); --(pImeDpi->cLockObj);
if (pImeDpi->cLockObj != 0) if (pImeDpi->cLockObj != 0)
{ {
RtlLeaveCriticalSection(&g_csImeDpi); RtlLeaveCriticalSection(&gcsImeDpi);
return; return;
} }
@ -773,7 +773,7 @@ VOID WINAPI ImmUnlockImeDpi(PIMEDPI pImeDpi)
if ((pImeDpi->dwFlags & IMEDPI_FLAG_LOCKED) == 0 || if ((pImeDpi->dwFlags & IMEDPI_FLAG_LOCKED) == 0 ||
(pImeDpi->ImeInfo.fdwProperty & IME_PROP_END_UNLOAD) == 0) (pImeDpi->ImeInfo.fdwProperty & IME_PROP_END_UNLOAD) == 0)
{ {
RtlLeaveCriticalSection(&g_csImeDpi); RtlLeaveCriticalSection(&gcsImeDpi);
return; return;
} }
} }
@ -791,7 +791,7 @@ VOID WINAPI ImmUnlockImeDpi(PIMEDPI pImeDpi)
Imm32FreeImeDpi(pImeDpi, TRUE); Imm32FreeImeDpi(pImeDpi, TRUE);
ImmLocalFree(pImeDpi); ImmLocalFree(pImeDpi);
RtlLeaveCriticalSection(&g_csImeDpi); RtlLeaveCriticalSection(&gcsImeDpi);
} }
/*********************************************************************** /***********************************************************************

8
dll/win32/imm32/imm.c
View file

@ -29,7 +29,7 @@ static BOOL APIENTRY ImmInitializeGlobals(HMODULE hMod)
if (g_bClientRegd) if (g_bClientRegd)
return TRUE; return TRUE;
status = RtlInitializeCriticalSection(&g_csImeDpi); status = RtlInitializeCriticalSection(&gcsImeDpi);
if (NT_ERROR(status)) if (NT_ERROR(status))
return FALSE; return FALSE;
@ -159,14 +159,14 @@ BOOL WINAPI ImmFreeLayout(DWORD dwUnknown)
} }
else if (dwUnknown == 2) else if (dwUnknown == 2)
{ {
RtlEnterCriticalSection(&g_csImeDpi); RtlEnterCriticalSection(&gcsImeDpi);
Retry: Retry:
for (pImeDpi = g_pImeDpiList; pImeDpi; pImeDpi = pImeDpi->pNext) for (pImeDpi = g_pImeDpiList; pImeDpi; pImeDpi = pImeDpi->pNext)
{ {
if (Imm32ReleaseIME(pImeDpi->hKL)) if (Imm32ReleaseIME(pImeDpi->hKL))
goto Retry; goto Retry;
} }
RtlLeaveCriticalSection(&g_csImeDpi); RtlLeaveCriticalSection(&gcsImeDpi);
} }
else else
{ {
@ -1291,7 +1291,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpReserved)
break; break;
case DLL_PROCESS_DETACH: case DLL_PROCESS_DETACH:
RtlDeleteCriticalSection(&g_csImeDpi); RtlDeleteCriticalSection(&gcsImeDpi);
TRACE("imm32.dll is unloaded\n"); TRACE("imm32.dll is unloaded\n");
break; break;
} }

2
dll/win32/imm32/precomp.h
View file

@ -70,7 +70,7 @@ typedef struct REG_IME
} REG_IME, *PREG_IME; } REG_IME, *PREG_IME;
extern HMODULE g_hImm32Inst; extern HMODULE g_hImm32Inst;
extern RTL_CRITICAL_SECTION g_csImeDpi; extern RTL_CRITICAL_SECTION gcsImeDpi;
extern PIMEDPI g_pImeDpiList; extern PIMEDPI g_pImeDpiList;
extern PSERVERINFO gpsi; extern PSERVERINFO gpsi;
extern SHAREDINFO gSharedInfo; extern SHAREDINFO gSharedInfo;