From 28959a2dfd96671e7f5dd3fb3917720ee95ed8a4 Mon Sep 17 00:00:00 2001
From: Katayama Hirofumi MZ <katayama.hirofumi.mz@gmail.com>
Date: Wed, 12 Jan 2022 14:08:10 +0900
Subject: [PATCH] [NTUSER] Follow-up of #4271 (36740ca)

- Delete the excessive comments.
- Delete the debugging leftover.
CORE-11700
---
 win32ss/include/ntuser.h  |  2 --
 win32ss/user/ntuser/ime.c | 14 +++++++-------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/win32ss/include/ntuser.h b/win32ss/include/ntuser.h
index a53f7012838..e6db897fa4b 100644
--- a/win32ss/include/ntuser.h
+++ b/win32ss/include/ntuser.h
@@ -1186,9 +1186,7 @@ typedef struct tagIMEINFOEX
 typedef enum IMEINFOEXCLASS
 {
     ImeInfoExKeyboardLayout,
-#if 1
     ImeInfoExKeyboardLayoutTFS,
-#endif
     ImeInfoExImeWindow,
     ImeInfoExImeFileName
 } IMEINFOEXCLASS;
diff --git a/win32ss/user/ntuser/ime.c b/win32ss/user/ntuser/ime.c
index e6c6ff150c2..48faba31700 100644
--- a/win32ss/user/ntuser/ime.c
+++ b/win32ss/user/ntuser/ime.c
@@ -171,13 +171,13 @@ BOOL FASTCALL UserGetImeInfoEx(LPVOID pUnknown, PIMEINFOEX pInfoEx, IMEINFOEXCLA
     {
         do
         {
-            if (pInfoEx->hkl == pkl->hkl) /* Matched */
+            if (pInfoEx->hkl == pkl->hkl)
             {
                 if (!pkl->piiex)
                     break;
 
-                *pInfoEx = *pkl->piiex; /* Get */
-                return TRUE; /* Found */
+                *pInfoEx = *pkl->piiex;
+                return TRUE;
             }
 
             pkl = pkl->pklNext;
@@ -189,10 +189,10 @@ BOOL FASTCALL UserGetImeInfoEx(LPVOID pUnknown, PIMEINFOEX pInfoEx, IMEINFOEXCLA
         {
             if (pkl->piiex &&
                 _wcsnicmp(pkl->piiex->wszImeFile, pInfoEx->wszImeFile,
-                          RTL_NUMBER_OF(pkl->piiex->wszImeFile)) == 0) /* Matched */
+                          RTL_NUMBER_OF(pkl->piiex->wszImeFile)) == 0)
             {
-                *pInfoEx = *pkl->piiex; /* Get */
-                return TRUE; /* Found */
+                *pInfoEx = *pkl->piiex;
+                return TRUE;
             }
 
             pkl = pkl->pklNext;
@@ -203,7 +203,7 @@ BOOL FASTCALL UserGetImeInfoEx(LPVOID pUnknown, PIMEINFOEX pInfoEx, IMEINFOEXCLA
         /* Do nothing */
     }
 
-    return FALSE; /* Not found */
+    return FALSE;
 }
 
 BOOL