[NTUSER] Refactoring ime.c

s/WINAPI/NTAPI/
CORE-11700
This commit is contained in:
Katayama Hirofumi MZ 2022-02-09 11:51:27 +09:00
parent 5d5cc57869
commit e52ce89be3

View file

@ -313,7 +313,7 @@ HIMC FASTCALL IntAssociateInputContext(PWND pWnd, PIMC pImc)
} }
DWORD DWORD
APIENTRY NTAPI
NtUserSetThreadLayoutHandles(HKL hNewKL, HKL hOldKL) NtUserSetThreadLayoutHandles(HKL hNewKL, HKL hOldKL)
{ {
PTHREADINFO pti; PTHREADINFO pti;
@ -399,7 +399,7 @@ IntImmProcessKey(PUSER_MESSAGE_QUEUE MessageQueue, PWND pWnd, UINT Msg, WPARAM w
} }
NTSTATUS NTSTATUS
APIENTRY NTAPI
NtUserBuildHimcList(DWORD dwThreadId, DWORD dwCount, HIMC *phList, LPDWORD pdwCount) NtUserBuildHimcList(DWORD dwThreadId, DWORD dwCount, HIMC *phList, LPDWORD pdwCount)
{ {
NTSTATUS ret = STATUS_UNSUCCESSFUL; NTSTATUS ret = STATUS_UNSUCCESSFUL;
@ -509,7 +509,7 @@ static VOID FASTCALL UserSetImeConversionKeyState(PTHREADINFO pti, DWORD dwConve
} }
DWORD DWORD
APIENTRY NTAPI
NtUserNotifyIMEStatus(HWND hwnd, BOOL fOpen, DWORD dwConversion) NtUserNotifyIMEStatus(HWND hwnd, BOOL fOpen, DWORD dwConversion)
{ {
PWND pwnd; PWND pwnd;
@ -552,7 +552,7 @@ Quit:
} }
DWORD DWORD
APIENTRY NTAPI
NtUserCheckImeHotKey( NtUserCheckImeHotKey(
DWORD VirtualKey, DWORD VirtualKey,
LPARAM lParam) LPARAM lParam)
@ -562,7 +562,7 @@ NtUserCheckImeHotKey(
} }
BOOL BOOL
APIENTRY NTAPI
NtUserDisableThreadIme( NtUserDisableThreadIme(
DWORD dwThreadID) DWORD dwThreadID)
{ {
@ -630,7 +630,7 @@ Quit:
} }
DWORD DWORD
APIENTRY NTAPI
NtUserGetAppImeLevel(HWND hWnd) NtUserGetAppImeLevel(HWND hWnd)
{ {
DWORD ret = 0; DWORD ret = 0;
@ -708,7 +708,7 @@ BOOL FASTCALL UserGetImeInfoEx(LPVOID pUnknown, PIMEINFOEX pInfoEx, IMEINFOEXCLA
} }
BOOL BOOL
APIENTRY NTAPI
NtUserGetImeInfoEx( NtUserGetImeInfoEx(
PIMEINFOEX pImeInfoEx, PIMEINFOEX pImeInfoEx,
IMEINFOEXCLASS SearchType) IMEINFOEXCLASS SearchType)
@ -733,18 +733,18 @@ NtUserGetImeInfoEx(
_SEH2_END; _SEH2_END;
ret = UserGetImeInfoEx(NULL, &ImeInfoEx, SearchType); ret = UserGetImeInfoEx(NULL, &ImeInfoEx, SearchType);
if (ret) if (!ret)
goto Quit;
_SEH2_TRY
{ {
_SEH2_TRY *pImeInfoEx = ImeInfoEx;
{
*pImeInfoEx = ImeInfoEx;
}
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{
ret = FALSE;
}
_SEH2_END;
} }
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{
ret = FALSE;
}
_SEH2_END;
Quit: Quit:
UserLeave(); UserLeave();
@ -752,7 +752,7 @@ Quit:
} }
BOOL BOOL
APIENTRY NTAPI
NtUserSetAppImeLevel(HWND hWnd, DWORD dwLevel) NtUserSetAppImeLevel(HWND hWnd, DWORD dwLevel)
{ {
BOOL ret = FALSE; BOOL ret = FALSE;
@ -807,7 +807,7 @@ BOOL FASTCALL UserSetImeInfoEx(LPVOID pUnknown, PIMEINFOEX pImeInfoEx)
} }
BOOL BOOL
APIENTRY NTAPI
NtUserSetImeInfoEx(PIMEINFOEX pImeInfoEx) NtUserSetImeInfoEx(PIMEINFOEX pImeInfoEx)
{ {
BOOL ret = FALSE; BOOL ret = FALSE;
@ -836,7 +836,7 @@ Quit:
return ret; return ret;
} }
BOOL APIENTRY BOOL NTAPI
NtUserSetImeOwnerWindow(HWND hImeWnd, HWND hwndFocus) NtUserSetImeOwnerWindow(HWND hImeWnd, HWND hwndFocus)
{ {
BOOL ret = FALSE; BOOL ret = FALSE;
@ -960,7 +960,7 @@ BOOLEAN UserDestroyInputContext(PVOID Object)
return TRUE; return TRUE;
} }
BOOL APIENTRY NtUserDestroyInputContext(HIMC hIMC) BOOL NTAPI NtUserDestroyInputContext(HIMC hIMC)
{ {
PIMC pIMC; PIMC pIMC;
BOOL ret = FALSE; BOOL ret = FALSE;
@ -1053,7 +1053,7 @@ PIMC FASTCALL UserCreateInputContext(ULONG_PTR dwClientImcData)
} }
HIMC HIMC
APIENTRY NTAPI
NtUserCreateInputContext(ULONG_PTR dwClientImcData) NtUserCreateInputContext(ULONG_PTR dwClientImcData)
{ {
PIMC pIMC; PIMC pIMC;
@ -1141,7 +1141,7 @@ DWORD FASTCALL IntAssociateInputContextEx(PWND pWnd, PIMC pIMC, DWORD dwFlags)
} }
DWORD DWORD
APIENTRY NTAPI
NtUserAssociateInputContext(HWND hWnd, HIMC hIMC, DWORD dwFlags) NtUserAssociateInputContext(HWND hWnd, HIMC hIMC, DWORD dwFlags)
{ {
DWORD ret = 2; DWORD ret = 2;
@ -1194,7 +1194,7 @@ BOOL FASTCALL UserUpdateInputContext(PIMC pIMC, DWORD dwType, DWORD_PTR dwValue)
} }
BOOL BOOL
APIENTRY NTAPI
NtUserUpdateInputContext( NtUserUpdateInputContext(
HIMC hIMC, HIMC hIMC,
DWORD dwType, DWORD dwType,
@ -1220,7 +1220,7 @@ Quit:
} }
DWORD_PTR DWORD_PTR
APIENTRY NTAPI
NtUserQueryInputContext(HIMC hIMC, DWORD dwType) NtUserQueryInputContext(HIMC hIMC, DWORD dwType)
{ {
PIMC pIMC; PIMC pIMC;