fastfetch-cli/fastfetch
1
0
Fork 0
mirror of https://github.com/fastfetch-cli/fastfetch.git synced 2026-11-02 11:23:41 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Terminal (Windows): detect warp version

Browse Source
This commit is contained in:
李通洲
2025-03-06 22:11:36 +08:00
parent c038024108
commit 6ef4f62d5b
5 changed files with 71 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/detection/terminalshell/terminalshell.c
+11 -7
View File
@@ -20,13 +20,14 @@
#include "util/windows/version.h"
#include <windows.h>
static bool getFileVersion(const FFstrbuf* exePath, FFstrbuf* version)
static bool getFileVersion(const FFstrbuf* exePath, const wchar_t* stringName, FFstrbuf* version)
{
wchar_t exePathW[PATH_MAX];
int len = MultiByteToWideChar(CP_UTF8, 0, exePath->chars, (int)exePath->length, exePathW, ARRAY_SIZE(exePathW));
if (len <= 0) return false;
return ffGetFileVersion(exePathW, version);
return ffGetFileVersion(exePathW, stringName, version);
}
#elif __HAIKU__
#include "util/haiku/version.h"
#endif
@@ -98,7 +99,7 @@ static bool getShellVersionPwsh(FFstrbuf* exe, FFstrbuf* version)
}
#ifdef _WIN32
if(getFileVersion(exe, version))
if(getFileVersion(exe, NULL, version))
{
ffStrbufSubstrBeforeLastC(version, '.');
return true;
@@ -291,7 +292,7 @@ bool fftsGetShellVersion(FFstrbuf* exe, const char* exeName, FFstrbuf* exePath,
if(ffStrEqualsIgnCase(exeName, "powershell") || ffStrEqualsIgnCase(exeName, "powershell_ise"))
return getShellVersionWinPowerShell(exe, version);
return getFileVersion(exe, version);
return getFileVersion(exe, NULL, version);
#endif
return false;
@@ -737,7 +738,7 @@ static bool getTerminalVersionWindowsTerminal(FFstrbuf* exe, FFstrbuf* version)
return true;
}
return getFileVersion(exe, version);
return getFileVersion(exe, NULL, version);
}
static bool getTerminalVersionConEmu(FFstrbuf* exe, FFstrbuf* version)
@@ -747,7 +748,7 @@ static bool getTerminalVersionConEmu(FFstrbuf* exe, FFstrbuf* version)
if(version->length)
return true;
return getFileVersion(exe, version);
return getFileVersion(exe, NULL, version);
}
#endif
@@ -839,6 +840,9 @@ bool fftsGetTerminalVersion(FFstrbuf* processName, FF_MAYBE_UNUSED FFstrbuf* exe
if(ffStrbufStartsWithIgnCaseS(processName, "ConEmu"))
return getTerminalVersionConEmu(exe, version);
if(ffStrbufIgnCaseEqualS(processName, "warp.exe"))
return getFileVersion(exe, L"ProductVersion", version);
#endif
#ifndef _WIN32
@@ -914,7 +918,7 @@ bool fftsGetTerminalVersion(FFstrbuf* processName, FF_MAYBE_UNUSED FFstrbuf* exe
#ifdef _WIN32
return getFileVersion(exe, version);
return getFileVersion(exe, NULL, version);
#else
src/detection/terminalshell/terminalshell_windows.c
+1 -1
View File
@@ -87,7 +87,7 @@ static void setShellInfoDetails(FFShellResult* result)
if(wcsncmp(module.szModule, L"clink_dll_", strlen("clink_dll_")) == 0)
{
ffStrbufAppendS(&result->prettyName, " (with Clink ");
ffGetFileVersion(module.szExePath, &result->prettyName);
ffGetFileVersion(module.szExePath, NULL, &result->prettyName);
ffStrbufAppendC(&result->prettyName, ')');
break;
}
src/detection/wm/wm_windows.cpp
+1 -1
View File
@@ -79,7 +79,7 @@ const char* ffDetectWMVersion(const FFstrbuf* wmName, FFstrbuf* result, FF_MAYBE
wchar_t fullPath[MAX_PATH];
wcscpy(fullPath, pPath);
wcscat(fullPath, L"\\dwm.exe");
ffGetFileVersion(fullPath, result);
ffGetFileVersion(fullPath, NULL, result);
}
CoTaskMemFree(pPath);
return NULL;