fastfetch-cli/fastfetch
1
0
Fork 0
mirror of https://github.com/fastfetch-cli/fastfetch.git synced 2026-09-13 10:52:08 +02:00
Code Issues Packages Projects Releases 10 Wiki Activity

Terminal (Windows): removes using of Win32 registry APIs

Browse Source
This commit is contained in:
李通洲
2026-04-21 23:41:34 +08:00
parent dbb060eb62
commit bf0564f9e5
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/windows/registry.c
-4
View File
@@ -192,10 +192,6 @@ static bool processRegValue(const FFRegValueArg* arg, const ULONG regType, const
}
case FF_ARG_TYPE_BUFFER: {
if (regType != REG_BINARY) {
goto type_mismatch;
}
FFArgBuffer* buffer = (FFArgBuffer*) arg->value;
if (buffer->length == 0) {
buffer->data = malloc(regDataLen);
src/detection/terminalshell/terminalshell_windows.c
+9 -5
View File
@@ -160,18 +160,22 @@ static bool getTerminalFromEnv(FFTerminalResult* result) {
static bool detectDefaultTerminal(FFTerminalResult* result) {
wchar_t regPath[128] = L"SOFTWARE\\Classes\\PackagedCom\\ClassIndex\\";
wchar_t* uuid = regPath + strlen("SOFTWARE\\Classes\\PackagedCom\\ClassIndex\\");
DWORD bufSize = 80;
if (RegGetValueW(HKEY_CURRENT_USER, L"Console\\%%Startup", L"DelegationTerminal", RRF_RT_REG_SZ, NULL, uuid, &bufSize) == ERROR_SUCCESS) {
FF_AUTO_CLOSE_FD HANDLE hkcu = NULL;
if (ffRegOpenKeyForRead(HKEY_CURRENT_USER, L"Console\\%%Startup", &hkcu, NULL) &&
ffRegReadData(hkcu, L"DelegationTerminal", &(FFArgBuffer) {
.data = uuid,
.length = (uint32_t) (sizeof(regPath) - (size_t) (uuid - regPath) * sizeof(wchar_t)),
}, NULL)) {
if (wcscmp(uuid, L"{00000000-0000-0000-0000-000000000000}") == 0 || // Let Windows decide
wcscmp(uuid, L"{B23D10C0-E52E-411E-9D5B-C09FDF709C7D}") == 0) // Conhost
{
goto conhost;
}
FF_AUTO_CLOSE_FD HANDLE hKey = NULL;
if (ffRegOpenKeyForRead(HKEY_LOCAL_MACHINE, regPath, &hKey, NULL)) {
FF_AUTO_CLOSE_FD HANDLE hklm = NULL;
if (ffRegOpenKeyForRead(HKEY_LOCAL_MACHINE, regPath, &hklm, NULL)) {
FF_STRBUF_AUTO_DESTROY path = ffStrbufCreate();
if (ffRegGetSubKey(hKey, 0, &path, NULL)) {
if (ffRegGetSubKey(hklm, 0, &path, NULL)) {
if (ffStrbufStartsWithS(&path, "Microsoft.WindowsTerminal")) {
ffStrbufSetS(&result->processName, "WindowsTerminal.exe");
ffStrbufSetS(&result->prettyName, "WindowsTerminal");