mirror of
https://github.com/hfiref0x/UACME
synced 2026-06-08 14:39:53 +00:00
hfiref0x
6daa8d4862
Yuubari updated to 1.61. Aside of this multiple fixes and small enhancements has been made across the codebase: - Fix path concatenation logic in supConcatenatePaths (Akagi & Yuubari): strip/handle leading/trailing backslashes correctly, avoid double separators, compute lengths safely and remove fragile boolean flags, and ensure proper null-termination. - Fusion subsystem: add SxsAllocInitUnicodeString helper for safe allocation/copy/init of UNICODE_STRING; use it to populate KeyName and DllName in redirection list entries; extend structures to include KeyName; update FusionOutputCallback to report KeyName and free strings correctly. - Console: replace GetTickCount timeout logic with elapsed-time check to avoid wraparound, using dwStart. - Compress: fix CRC handling by restoring HeaderCrc after check and ensure exception handler sets failure flag (prevents silent return/possible leak). - AIC: free async handle and RPC binding on exception to avoid resource leaks. - Shared/cmdline: correct divider variable types for wide/ansi functions. - Windefend: rename parameter for clarity (MpClientBase -> ImageBase). - Fusutil: remove unused NI_DLL_EXT_SIZE/NI_DLL_AUX_EXT_SIZE defines. These changes address correctness, resource management, and robustness issues observed in path handling, fusion parsing, exception paths and timeouts.
133 lines
3.0 KiB
C
133 lines
3.0 KiB
C
/*******************************************************************************
|
|
*
|
|
* (C) COPYRIGHT AUTHORS, 2022 - 2026
|
|
*
|
|
* TITLE: CONSOLE.C
|
|
*
|
|
* VERSION: 3.69
|
|
*
|
|
* DATE: 12 Feb 2026
|
|
*
|
|
* Debug console.
|
|
*
|
|
* THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF
|
|
* ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED
|
|
* TO THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A
|
|
* PARTICULAR PURPOSE.
|
|
*
|
|
*******************************************************************************/
|
|
|
|
#include "global.h"
|
|
|
|
HANDLE StdOutputHandle = NULL;
|
|
|
|
pswprintf_s _swprintf_s = NULL;
|
|
|
|
VOID ConsolePrint(
|
|
_In_ LPCWSTR Message
|
|
)
|
|
{
|
|
WriteConsole(StdOutputHandle, Message, (ULONG)_strlen(Message), NULL, NULL);
|
|
}
|
|
|
|
VOID ConsolePrintValueUlong(
|
|
_In_ LPCWSTR Message,
|
|
_In_ ULONG Value,
|
|
_In_ BOOL Hexademical
|
|
)
|
|
{
|
|
WCHAR szText[200];
|
|
|
|
if (_swprintf_s) {
|
|
|
|
_swprintf_s(szText, RTL_NUMBER_OF(szText),
|
|
Hexademical ? TEXT("%ws 0x%lX\r\n") : TEXT("%ws %lu\r\n"),
|
|
Message,
|
|
Value);
|
|
|
|
ConsolePrint(szText);
|
|
}
|
|
}
|
|
|
|
VOID ConsolePrintStatus(
|
|
_In_ LPCWSTR Message,
|
|
_In_ NTSTATUS Status
|
|
)
|
|
{
|
|
ConsolePrintValueUlong(Message, Status, TRUE);
|
|
}
|
|
|
|
VOID ConsoleInit(
|
|
VOID
|
|
)
|
|
{
|
|
WCHAR szBuffer[100];
|
|
HMODULE hNtdll = GetModuleHandle(L"ntdll.dll");
|
|
|
|
if (hNtdll == NULL || !AllocConsole())
|
|
return;
|
|
|
|
_swprintf_s = (pswprintf_s)GetProcAddress(hNtdll, "swprintf_s");
|
|
if (_swprintf_s == NULL)
|
|
return;
|
|
|
|
StdOutputHandle = GetStdHandle(STD_OUTPUT_HANDLE);
|
|
SetConsoleMode(StdOutputHandle, ENABLE_PROCESSED_OUTPUT |
|
|
ENABLE_VIRTUAL_TERMINAL_PROCESSING);
|
|
|
|
_swprintf_s(szBuffer, RTL_NUMBER_OF(szBuffer), TEXT("[*] UACMe v%lu.%lu.%lu.%lu\r\n"),
|
|
UCM_VERSION_MAJOR,
|
|
UCM_VERSION_MINOR,
|
|
UCM_VERSION_REVISION,
|
|
UCM_VERSION_BUILD);
|
|
|
|
SetConsoleTitle(szBuffer);
|
|
}
|
|
|
|
BOOL ConsoleIsKeyPressed(
|
|
_In_ WORD VirtualKeyCode
|
|
)
|
|
{
|
|
BOOL bResult = FALSE;
|
|
DWORD numberOfEvents = 0;
|
|
INPUT_RECORD inp1;
|
|
HANDLE nStdHandle = GetStdHandle(STD_INPUT_HANDLE);
|
|
|
|
GetNumberOfConsoleInputEvents(nStdHandle, &numberOfEvents);
|
|
|
|
if (numberOfEvents) {
|
|
|
|
PeekConsoleInput(nStdHandle, &inp1, 1, &numberOfEvents);
|
|
|
|
bResult = (numberOfEvents != 0 &&
|
|
inp1.EventType == KEY_EVENT &&
|
|
inp1.Event.KeyEvent.bKeyDown &&
|
|
inp1.Event.KeyEvent.wVirtualKeyCode == VirtualKeyCode);
|
|
|
|
FlushConsoleInputBuffer(nStdHandle);
|
|
}
|
|
|
|
return bResult;
|
|
}
|
|
|
|
VOID ConsoleRelease(
|
|
VOID
|
|
)
|
|
{
|
|
DWORD dwStart = GetTickCount();
|
|
HANDLE nStdHandle = GetStdHandle(STD_INPUT_HANDLE);
|
|
|
|
if (nStdHandle == NULL || nStdHandle == INVALID_HANDLE_VALUE) {
|
|
FreeConsole();
|
|
return;
|
|
}
|
|
|
|
ConsolePrint(TEXT("[+] Press Enter to exit or wait few seconds and it will close automatically\r\n"));
|
|
|
|
FlushConsoleInputBuffer(nStdHandle);
|
|
while (!ConsoleIsKeyPressed(VK_RETURN) && (GetTickCount() - dwStart) < (10 * 1000))
|
|
Sleep(50);
|
|
|
|
FreeConsole();
|
|
}
|