https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c7ba53e3fbca233059d4d…
commit c7ba53e3fbca233059d4d8e391e6c246bb9323de
Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com>
AuthorDate: Thu Aug 25 12:07:32 2022 +0900
Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com>
CommitDate: Thu Aug 25 12:07:32 2022 +0900
[NTUSER] Follow-up of 9e7c2ba
CORE-11700
---
win32ss/user/ntuser/ime.c | 16 +++++-----------
1 file changed, 5 insertions(+), 11 deletions(-)
diff --git a/win32ss/user/ntuser/ime.c b/win32ss/user/ntuser/ime.c
index 424c18c44fe..35d8b66bda5 100644
--- a/win32ss/user/ntuser/ime.c
+++ b/win32ss/user/ntuser/ime.c
@@ -991,18 +991,12 @@ UserGetImeInfoEx(
{
do
{
- if (_wcsnicmp(pkl->piiex->wszImeFile, pInfoEx->wszImeFile,
+ if (pkl->piiex &&
+ _wcsnicmp(pkl->piiex->wszImeFile, pInfoEx->wszImeFile,
RTL_NUMBER_OF(pkl->piiex->wszImeFile)) == 0)
{
- if (pkl->piiex)
- {
- *pInfoEx = *pkl->piiex;
- return TRUE;
- }
- else
- {
- ERR("!pkl->piiex at %p\n", pkl->hkl);
- }
+ *pInfoEx = *pkl->piiex;
+ return TRUE;
}
pkl = pkl->pklNext;
@@ -1010,7 +1004,7 @@ UserGetImeInfoEx(
}
else
{
- /* Do nothing */
+ ERR("SearchType: %d\n", SearchType);
}
return FALSE;