From 5ab1ff188c31479d9ebec60d8ad0a3ea5f1c9c8b Mon Sep 17 00:00:00 2001
From: Katayama Hirofumi MZ <katayama.hirofumi.mz@gmail.com>
Date: Fri, 24 Apr 2026 07:02:23 +0900
Subject: [PATCH] [NTUSER][ENG] Remove needless comments (#8896)

JIRA issue: N/A
---
 win32ss/gdi/eng/error.c         | 1 -
 win32ss/user/ntuser/callback.c  | 2 --
 win32ss/user/ntuser/caret.c     | 2 --
 win32ss/user/ntuser/defwnd.c    | 5 -----
 win32ss/user/ntuser/desktop.c   | 2 --
 win32ss/user/ntuser/focus.c     | 5 -----
 win32ss/user/ntuser/hotkey.c    | 4 ----
 win32ss/user/ntuser/input.c     | 1 -
 win32ss/user/ntuser/main.c      | 1 -
 win32ss/user/ntuser/misc.c      | 1 -
 win32ss/user/ntuser/nonclient.c | 1 -
 win32ss/user/ntuser/ntuser.c    | 3 ---
 win32ss/user/ntuser/object.c    | 3 ---
 win32ss/user/ntuser/painting.c  | 3 ---
 win32ss/user/ntuser/userfuncs.h | 1 -
 win32ss/user/ntuser/window.c    | 8 --------
 win32ss/user/ntuser/winpos.c    | 4 ----
 win32ss/user/ntuser/winsta.c    | 1 -
 18 files changed, 48 deletions(-)

diff --git a/win32ss/gdi/eng/error.c b/win32ss/gdi/eng/error.c
index 6ff164ae1c1..b248ba635ba 100644
--- a/win32ss/gdi/eng/error.c
+++ b/win32ss/gdi/eng/error.c
@@ -15,7 +15,6 @@ EngGetLastError(VOID)
 /*
  * @implemented
  * https://learn.microsoft.com/en-us/windows/win32/api/winddi/nf-winddi-engsetlasterror
- * Win: UserSetLastError
  */
 VOID
 APIENTRY
diff --git a/win32ss/user/ntuser/callback.c b/win32ss/user/ntuser/callback.c
index 6c8e121327b..cdf2312cd42 100644
--- a/win32ss/user/ntuser/callback.c
+++ b/win32ss/user/ntuser/callback.c
@@ -1247,7 +1247,6 @@ co_UserCBClientPrinterThunk( PVOID pkt, INT InSize, PVOID pvOutData, INT OutSize
    return 0;
 }
 
-// Win: ClientImmProcessKey
 DWORD
 APIENTRY
 co_IntImmProcessKey(HWND hWnd, HKL hKL, UINT vKey, LPARAM lParam, DWORD dwHotKeyID)
@@ -1272,7 +1271,6 @@ co_IntImmProcessKey(HWND hWnd, HKL hKL, UINT vKey, LPARAM lParam, DWORD dwHotKey
     return ret;
 }
 
-/* Win: ClientImmLoadLayout */
 BOOL
 APIENTRY
 co_ClientImmLoadLayout(
diff --git a/win32ss/user/ntuser/caret.c b/win32ss/user/ntuser/caret.c
index ac5d8ab5057..37a1bd8f08f 100644
--- a/win32ss/user/ntuser/caret.c
+++ b/win32ss/user/ntuser/caret.c
@@ -221,7 +221,6 @@ co_IntSetCaretPos(int X, int Y)
    return FALSE;
 }
 
-/* Win: zzzHideCaret */
 BOOL FASTCALL co_UserHideCaret(PWND Window OPTIONAL)
 {
    PTHREADINFO pti;
@@ -257,7 +256,6 @@ BOOL FASTCALL co_UserHideCaret(PWND Window OPTIONAL)
    return TRUE;
 }
 
-/* Win: zzzShowCaret */
 BOOL FASTCALL co_UserShowCaret(PWND Window OPTIONAL)
 {
    PTHREADINFO pti;
diff --git a/win32ss/user/ntuser/defwnd.c b/win32ss/user/ntuser/defwnd.c
index fdd8ffcc51e..092b32d6e6d 100644
--- a/win32ss/user/ntuser/defwnd.c
+++ b/win32ss/user/ntuser/defwnd.c
@@ -90,7 +90,6 @@ DefWndHandleWindowPosChanging(PWND pWnd, WINDOWPOS* Pos)
     return 0;
 }
 
-/* Win: xxxHandleWindowPosChanged */
 LRESULT FASTCALL
 DefWndHandleWindowPosChanged(PWND pWnd, WINDOWPOS* Pos)
 {
@@ -120,7 +119,6 @@ DefWndHandleWindowPosChanged(PWND pWnd, WINDOWPOS* Pos)
 //
 // Handle a WM_SYSCOMMAND message. Called from DefWindowProc().
 //
-// Win: xxxSysCommand
 LRESULT FASTCALL
 DefWndHandleSysCommand(PWND pWnd, WPARAM wParam, LPARAM lParam)
 {
@@ -361,7 +359,6 @@ DefWndHandleSetCursor(PWND pWnd, WPARAM wParam, LPARAM lParam)
    return FALSE;
 }
 
-/* Win: xxxDWPPrint */
 VOID FASTCALL DefWndPrint( PWND pwnd, HDC hdc, ULONG uFlags)
 {
   /*
@@ -432,7 +429,6 @@ UserPaintCaption(PWND pWnd, INT Flags)
 }
 
 // WM_SETICON
-/* Win: xxxDWP_SetIcon */
 LRESULT FASTCALL
 DefWndSetIcon(PWND pWnd, WPARAM wParam, LPARAM lParam)
 {
@@ -471,7 +467,6 @@ DefWndSetIcon(PWND pWnd, WPARAM wParam, LPARAM lParam)
     return (LRESULT)hIconOld;
 }
 
-/* Win: DWP_GetIcon */
 LRESULT FASTCALL
 DefWndGetIcon(PWND pWnd, WPARAM wParam, LPARAM lParam)
 {
diff --git a/win32ss/user/ntuser/desktop.c b/win32ss/user/ntuser/desktop.c
index 62d8f42d821..6fea894fa03 100644
--- a/win32ss/user/ntuser/desktop.c
+++ b/win32ss/user/ntuser/desktop.c
@@ -1399,7 +1399,6 @@ HWND FASTCALL IntGetDesktopWindow(VOID)
     return pdo->DesktopWindow;
 }
 
-// Win: _GetDesktopWindow
 PWND FASTCALL UserGetDesktopWindow(VOID)
 {
     PDESKTOP pdo = IntGetActiveDesktop();
@@ -1423,7 +1422,6 @@ HWND FASTCALL IntGetMessageWindow(VOID)
     return UserHMGetHandle(pdo->spwndMessage);
 }
 
-// Win: _GetMessageWindow
 PWND FASTCALL UserGetMessageWindow(VOID)
 {
     PDESKTOP pdo = IntGetActiveDesktop();
diff --git a/win32ss/user/ntuser/focus.c b/win32ss/user/ntuser/focus.c
index 7173b766677..8f38ac37592 100644
--- a/win32ss/user/ntuser/focus.c
+++ b/win32ss/user/ntuser/focus.c
@@ -145,7 +145,6 @@ co_IntSendDeactivateMessages(HWND hWndPrev, HWND hWnd, BOOL Clear)
    return Ret;
 }
 
-// Win: xxxFocusSetInputContext
 VOID IntFocusSetInputContext(PWND pWnd, BOOL bActivate, BOOL bCallback)
 {
     PTHREADINFO pti;
@@ -185,7 +184,6 @@ VOID IntFocusSetInputContext(PWND pWnd, BOOL bActivate, BOOL bCallback)
 //
 // Release Active, Capture and Focus Windows associated with this message queue.
 //
-// Win: xxxDeactivate
 BOOL FASTCALL
 IntDeactivateWindow(PTHREADINFO pti, HANDLE tid)
 {
@@ -612,7 +610,6 @@ co_IntSendActivateMessages(PWND WindowPrev, PWND Window, BOOL MouseActivate, BOO
    return InAAPM;
 }
 
-// Win: xxxSendFocusMessages
 VOID FASTCALL
 IntSendFocusMessages( PTHREADINFO pti, PWND pWnd)
 {
@@ -1257,7 +1254,6 @@ co_IntMouseActivateWindow(PWND Wnd)
    return co_IntSetForegroundAndFocusWindow(Wnd, TRUE, TRUE);
 }
 
-/* Win: PWND xxxSetActiveWindow(Wnd) */
 BOOL FASTCALL
 UserSetActiveWindow( _In_opt_ PWND Wnd )
 {
@@ -1311,7 +1307,6 @@ UserSetActiveWindow( _In_opt_ PWND Wnd )
   return FALSE;
 }
 
-// Win: PWND xxxSetFocus(Window)
 HWND FASTCALL
 co_UserSetFocus(PWND Window)
 {
diff --git a/win32ss/user/ntuser/hotkey.c b/win32ss/user/ntuser/hotkey.c
index e4d1ef80874..d775149c35b 100644
--- a/win32ss/user/ntuser/hotkey.c
+++ b/win32ss/user/ntuser/hotkey.c
@@ -331,8 +331,6 @@ co_UserProcessHotKeys(WORD wVk, BOOL bIsDown)
 
 /*
  * DefWndGetHotKey --- GetHotKey message support
- *
- * Win: DWP_GetHotKey
  */
 UINT FASTCALL
 DefWndGetHotKey(PWND pWnd)
@@ -358,8 +356,6 @@ DefWndGetHotKey(PWND pWnd)
 
 /*
  * DefWndSetHotKey --- SetHotKey message support
- *
- * Win: DWP_SetHotKey
  */
 INT FASTCALL
 DefWndSetHotKey(PWND pWnd, WPARAM wParam)
diff --git a/win32ss/user/ntuser/input.c b/win32ss/user/ntuser/input.c
index 959bb5ba8ec..efea1a30237 100644
--- a/win32ss/user/ntuser/input.c
+++ b/win32ss/user/ntuser/input.c
@@ -491,7 +491,6 @@ IsRemoveAttachThread(PTHREADINFO pti)
     return Ret;
 }
 
-// Win: zzzAttachThreadInput
 NTSTATUS FASTCALL
 UserAttachThreadInput(PTHREADINFO ptiFrom, PTHREADINFO ptiTo, BOOL fAttach)
 {
diff --git a/win32ss/user/ntuser/main.c b/win32ss/user/ntuser/main.c
index 8a1843b1ecc..c053eec758b 100644
--- a/win32ss/user/ntuser/main.c
+++ b/win32ss/user/ntuser/main.c
@@ -724,7 +724,6 @@ error:
 VOID
 UserDisplayNotifyShutdown(PPROCESSINFO ppiCurrent);
 
-// Win: xxxDestroyThreadInfo
 NTSTATUS
 NTAPI
 ExitThreadCallback(PETHREAD Thread)
diff --git a/win32ss/user/ntuser/misc.c b/win32ss/user/ntuser/misc.c
index 1912fd3e859..f3aa73c4152 100644
--- a/win32ss/user/ntuser/misc.c
+++ b/win32ss/user/ntuser/misc.c
@@ -35,7 +35,6 @@ _scwprintf(
 
 /*
  * Test the Thread to verify and validate it. Hard to the core tests are required.
- * Win: PtiFromThreadId
  */
 PTHREADINFO
 FASTCALL
diff --git a/win32ss/user/ntuser/nonclient.c b/win32ss/user/ntuser/nonclient.c
index 1587bcef969..60128768435 100644
--- a/win32ss/user/ntuser/nonclient.c
+++ b/win32ss/user/ntuser/nonclient.c
@@ -1300,7 +1300,6 @@ NC_DoNCPaint(PWND pWnd, HDC hDC, INT Flags)
    return 0; // For WM_NCPAINT message, return 0.
 }
 
-/* Win: xxxCalcClientRect */
 LRESULT NC_HandleNCCalcSize( PWND Wnd, WPARAM wparam, RECTL *Rect, BOOL Suspended )
 {
    LRESULT Result = 0;
diff --git a/win32ss/user/ntuser/ntuser.c b/win32ss/user/ntuser/ntuser.c
index d5a40085c37..a019ffb832a 100644
--- a/win32ss/user/ntuser/ntuser.c
+++ b/win32ss/user/ntuser/ntuser.c
@@ -238,14 +238,12 @@ VOID FASTCALL CleanupUserImpl(VOID)
     ExDeleteResourceLite(&UserLock);
 }
 
-// Win: EnterSharedCrit
 VOID FASTCALL UserEnterShared(VOID)
 {
     KeEnterCriticalRegion();
     ExAcquireResourceSharedLite(&UserLock, TRUE);
 }
 
-// Win: EnterCrit
 VOID FASTCALL UserEnterExclusive(VOID)
 {
     ASSERT_NOGDILOCKS();
@@ -254,7 +252,6 @@ VOID FASTCALL UserEnterExclusive(VOID)
     gptiCurrent = PsGetCurrentThreadWin32Thread();
 }
 
-// Win: LeaveCrit
 VOID FASTCALL UserLeave(VOID)
 {
     ASSERT_NOGDILOCKS();
diff --git a/win32ss/user/ntuser/object.c b/win32ss/user/ntuser/object.c
index 36be69bedd4..4c7030ed73f 100644
--- a/win32ss/user/ntuser/object.c
+++ b/win32ss/user/ntuser/object.c
@@ -615,7 +615,6 @@ UserCreateObject( PUSER_HANDLE_TABLE ht,
    return Object;
 }
 
-// Win: HMMarkObjectDestroy
 BOOL
 FASTCALL
 UserMarkObjectDestroy(PVOID Object)
@@ -835,7 +834,6 @@ Exit:
    return Ret;
 }
 
-// Win: HMAssignmentLock
 PVOID FASTCALL UserAssignmentLock(PVOID *ppvObj, PVOID pvNew)
 {
     PVOID pvOld = *ppvObj;
@@ -856,7 +854,6 @@ PVOID FASTCALL UserAssignmentLock(PVOID *ppvObj, PVOID pvNew)
     return pvOld;
 }
 
-// Win: HMAssignmentUnlock
 PVOID FASTCALL UserAssignmentUnlock(PVOID *ppvObj)
 {
     PVOID pvOld = *ppvObj;
diff --git a/win32ss/user/ntuser/painting.c b/win32ss/user/ntuser/painting.c
index 35e4e32a489..a684d74c364 100644
--- a/win32ss/user/ntuser/painting.c
+++ b/win32ss/user/ntuser/painting.c
@@ -1437,7 +1437,6 @@ IntFlashWindowEx(PWND pWnd, PFLASHWINFO pfwi)
    return Ret;
 }
 
-// Win: xxxBeginPaint
 HDC FASTCALL
 IntBeginPaint(PWND Window, PPAINTSTRUCT Ps)
 {
@@ -1534,7 +1533,6 @@ IntBeginPaint(PWND Window, PPAINTSTRUCT Ps)
    return Ps->hdc;
 }
 
-// Win: xxxEndPaint
 BOOL FASTCALL
 IntEndPaint(PWND Wnd, PPAINTSTRUCT Ps)
 {
@@ -1557,7 +1555,6 @@ IntEndPaint(PWND Wnd, PPAINTSTRUCT Ps)
    return TRUE;
 }
 
-// Win: xxxFillWindow
 BOOL FASTCALL
 IntFillWindow(PWND pWndParent,
               PWND pWnd,
diff --git a/win32ss/user/ntuser/userfuncs.h b/win32ss/user/ntuser/userfuncs.h
index 6281d27dd04..a26dc6a6101 100644
--- a/win32ss/user/ntuser/userfuncs.h
+++ b/win32ss/user/ntuser/userfuncs.h
@@ -1,6 +1,5 @@
 #pragma once
 
-// Win: ValidateHmenu
 FORCEINLINE PMENU UserGetMenuObject(HMENU hMenu)
 {
    PMENU pMenu = UserGetObject(gHandleTable, hMenu, TYPE_MENU);
diff --git a/win32ss/user/ntuser/window.c b/win32ss/user/ntuser/window.c
index c9c2cad7e86..5f3bddc64c5 100644
--- a/win32ss/user/ntuser/window.c
+++ b/win32ss/user/ntuser/window.c
@@ -120,7 +120,6 @@ PWND FASTCALL ValidateHwndNoErr(HWND hWnd)
 }
 
 /* Temp HACK */
-// Win: ValidateHwnd
 PWND FASTCALL UserGetWindowObject(HWND hWnd)
 {
     PWND Window;
@@ -1292,7 +1291,6 @@ co_IntSetParent(PWND Wnd, PWND WndNewParent)
    return WndOldParent;
 }
 
-// Win: xxxSetParent
 HWND FASTCALL
 co_UserSetParent(HWND hWndChild, HWND hWndNewParent)
 {
@@ -1372,7 +1370,6 @@ IntUnlinkWindow(PWND Wnd)
     WndSetNext(Wnd, NULL);
 }
 
-// Win: ExpandWindowList
 BOOL FASTCALL IntGrowHwndList(PWINDOWLIST *ppwl)
 {
     PWINDOWLIST pwlOld, pwlNew;
@@ -1393,7 +1390,6 @@ BOOL FASTCALL IntGrowHwndList(PWINDOWLIST *ppwl)
     return TRUE;
 }
 
-// Win: InternalBuildHwndList
 PWINDOWLIST FASTCALL IntPopulateHwndList(PWINDOWLIST pwl, PWND pwnd, DWORD dwFlags)
 {
     ASSERT(!WL_IS_BAD(pwl));
@@ -1423,7 +1419,6 @@ PWINDOWLIST FASTCALL IntPopulateHwndList(PWINDOWLIST pwl, PWND pwnd, DWORD dwFla
     return pwl;
 }
 
-// Win: BuildHwndList
 PWINDOWLIST FASTCALL IntBuildHwndList(PWND pwnd, DWORD dwFlags, PTHREADINFO pti)
 {
     PWINDOWLIST pwl;
@@ -1469,7 +1464,6 @@ PWINDOWLIST FASTCALL IntBuildHwndList(PWND pwnd, DWORD dwFlags, PTHREADINFO pti)
     return pwl;
 }
 
-// Win: FreeHwndList
 VOID FASTCALL IntFreeHwndList(PWINDOWLIST pwlTarget)
 {
     PWINDOWLIST pwl, *ppwl;
@@ -2833,7 +2827,6 @@ cleanup:
    return hwnd;
 }
 
-// Win: xxxDW_DestroyOwnedWindows
 VOID FASTCALL IntDestroyOwnedWindows(PWND Window)
 {
     HWND* List;
@@ -2869,7 +2862,6 @@ VOID FASTCALL IntDestroyOwnedWindows(PWND Window)
     ExFreePoolWithTag(List, USERTAG_WINDOWLIST);
 }
 
-// Win: xxxDestroyWindow
 BOOLEAN co_UserDestroyWindow(PVOID Object)
 {
    HWND hWnd;
diff --git a/win32ss/user/ntuser/winpos.c b/win32ss/user/ntuser/winpos.c
index 6f96f02a8df..43a52ab5cf8 100644
--- a/win32ss/user/ntuser/winpos.c
+++ b/win32ss/user/ntuser/winpos.c
@@ -3021,7 +3021,6 @@ co_WinPosWindowFromPoint(
    return Window;
 }
 
-/* Win: _RealChildWindowFromPoint */
 PWND FASTCALL
 IntRealChildWindowFromPoint(PWND Parent, LONG x, LONG y)
 {
@@ -3064,7 +3063,6 @@ IntRealChildWindowFromPoint(PWND Parent, LONG x, LONG y)
    return pwndHit ? pwndHit : Parent;
 }
 
-/* Win: _ChildWindowFromPointEx */
 PWND APIENTRY
 IntChildWindowFromPointEx(PWND Parent, LONG x, LONG y, UINT uiFlags)
 {
@@ -3116,7 +3114,6 @@ IntChildWindowFromPointEx(PWND Parent, LONG x, LONG y, UINT uiFlags)
    return pwndHit ? pwndHit : Parent;
 }
 
-/* Win: _DeferWindowPos(PSMWP, PWND, PWND, ...) */
 HDWP
 FASTCALL
 IntDeferWindowPos( HDWP hdwp,
@@ -3207,7 +3204,6 @@ END:
     return retvalue;
 }
 
-/* Win: xxxEndDeferWindowPosEx */
 BOOL FASTCALL IntEndDeferWindowPosEx(HDWP hdwp, BOOL bAsync)
 {
     PSMWP pDWP;
diff --git a/win32ss/user/ntuser/winsta.c b/win32ss/user/ntuser/winsta.c
index 0b8d11e1e05..86cfbb7bb58 100644
--- a/win32ss/user/ntuser/winsta.c
+++ b/win32ss/user/ntuser/winsta.c
@@ -406,7 +406,6 @@ CheckWinstaAttributeAccess(ACCESS_MASK DesiredAccess)
     return TRUE;
 }
 
-// Win: _GetProcessWindowStation
 PWINSTATION_OBJECT FASTCALL
 IntGetProcessWindowStation(HWINSTA *phWinSta OPTIONAL)
 {