From 57981ed02538db3cbfeaec3d4ed8392c5657fa6e Mon Sep 17 00:00:00 2001
From: Katayama Hirofumi MZ <katayama.hirofumi.mz@gmail.com>
Date: Sat, 24 May 2025 23:23:22 +0900
Subject: [PATCH] [KBSWITCH] Unlink ntdll and add vDbgPrintExWithPrefix

CORE-18546
---
 base/applications/kbswitch/CMakeLists.txt |  2 +-
 base/applications/kbswitch/kbswitch.c     | 22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/base/applications/kbswitch/CMakeLists.txt b/base/applications/kbswitch/CMakeLists.txt
index 3c42fcd7283..df29ebba358 100644
--- a/base/applications/kbswitch/CMakeLists.txt
+++ b/base/applications/kbswitch/CMakeLists.txt
@@ -3,7 +3,7 @@ add_rc_deps(kbswitch.rc ${CMAKE_CURRENT_SOURCE_DIR}/res/kbswitch.ico)
 add_executable(kbswitch kbswitch.c kbswitch.rc)
 set_module_type(kbswitch win32gui UNICODE)
 target_link_libraries(kbswitch wine)
-add_importlibs(kbswitch advapi32 imm32 user32 shell32 shlwapi gdi32 msvcrt kernel32 ntdll)
+add_importlibs(kbswitch advapi32 imm32 user32 shell32 shlwapi gdi32 msvcrt kernel32)
 add_cd_file(TARGET kbswitch DESTINATION reactos/system32 FOR all)
 
 add_subdirectory(kbsdll)
diff --git a/base/applications/kbswitch/kbswitch.c b/base/applications/kbswitch/kbswitch.c
index f111263e947..d31cd3215a8 100644
--- a/base/applications/kbswitch/kbswitch.c
+++ b/base/applications/kbswitch/kbswitch.c
@@ -45,6 +45,28 @@ HWND      g_hwndLastActive = NULL;
 INT       g_cKLs = 0;
 HKL       g_ahKLs[64];
 
+ULONG
+NTAPI
+vDbgPrintExWithPrefix(IN PCCH Prefix,
+                      IN ULONG ComponentId,
+                      IN ULONG Level,
+                      IN PCCH Format,
+                      IN va_list ap)
+{
+    CHAR Buffer[512];
+
+    SIZE_T PrefixLength = strlen(Prefix);
+    strncpy(Buffer, Prefix, PrefixLength);
+
+    _vsnprintf(Buffer + PrefixLength,
+               sizeof(Buffer) - PrefixLength,
+               Format,
+               ap);
+
+    OutputDebugStringA(Buffer);
+    return 0;
+}
+
 typedef struct
 {
     DWORD dwLayoutId;