Merge pull request #370 from LinusDierheimer/dev

Release 1.8.2

.github/workflows/push.yml

@@ -189,16 +189,16 @@ jobs:
         run: ctest
 
       - name: create zip archive
-        run: zip fastfetch-windows.zip *.dll fastfetch.exe flashfetch.exe
+        run: zip fastfetch-$(./fastfetch --version-raw)-Windows.zip *.dll fastfetch.exe flashfetch.exe
 
       - name: upload artifacts
         uses: actions/upload-artifact@v3
         with:
           name: fastfetch-windows
-          path: ./fastfetch-windows.zip
+          path: ./fastfetch-*-Windows.zip
 
-  windows-old:
-    name: Windows-old
+  win7:
+    name: Win7
     runs-on: windows-latest
     permissions:
       security-events: write
@@ -263,13 +263,13 @@ jobs:
         run: ctest
 
       - name: create zip archive
-        run: zip fastfetch-windows-old.zip *.dll fastfetch.exe flashfetch.exe
+        run: zip fastfetch-$(./fastfetch --version-raw)-Win7.zip *.dll fastfetch.exe flashfetch.exe
 
       - name: upload artifacts
         uses: actions/upload-artifact@v3
         with:
-          name: fastfetch-windows-old
-          path: ./fastfetch-windows-old.zip
+          name: fastfetch-win7
+          path: ./fastfetch-*-Win7.zip
 
   release:
     if: github.event_name == 'push' && github.ref == 'refs/heads/master' && github.repository == 'LinusDierheimer/fastfetch'
@@ -280,6 +280,7 @@ jobs:
       - macos
       - freebsd
       - windows
+      - win7
     permissions:
       contents: write
     steps:
@@ -299,4 +300,4 @@ jobs:
           tag: ${{ needs.linux.outputs.ffversion }}
           commit: ${{ github.sha }}
           artifactErrorsFailBuild: true
-          artifacts: fastfetch-linux/*,fastfetch-macos/*,fastfetch-freebsd/*,fastfetch-windows/*
+          artifacts: fastfetch-linux/*,fastfetch-macos/*,fastfetch-freebsd/*,fastfetch-windows/*,fastfetch-win7/*

CHANGELOG.md

@@ -1,3 +1,12 @@
+# 1.8.2
+
+Bugfixes:
+
+* Fix memleaks Users module (Windows)
+* Fix shell detection when installed with scoop (Windows)
+* Don't use libcJSON as wlanapi's dll name (Windows)
+* Align artifact names to other platforms (Windows)
+
 # 1.8.1
 
 Notable Changes:
@@ -61,7 +70,7 @@ Logos:
 
 Bugfixes:
 * Fixes disk size detection on 32bit Linux (#337)
-* Fixes cpu freq detection in WSL 
+* Fixes cpu freq detection in WSL
 * Fixes internal bug of FFstrbuf
 * Fixes some memory leaks
 * Fixes segfault if 0 is given as argument index
@@ -137,12 +146,12 @@ Other:
 
 # 1.7.0
 
-This release brings support for MacOS!  
+This release brings support for MacOS!
 The basics things are working, but it is far from feature parity with Linux.
 I developed this in a VM, so bugs on real hardware are likely.
 If you have a Mac and no idea what to do with your free time, i am very happy to accept pull requests / work on issues.
 
-A lot of things were changed under the hood to make this possible, which should bring better performance and stability on all platforms. 
+A lot of things were changed under the hood to make this possible, which should bring better performance and stability on all platforms.
 
 Besides that, the following things have changed:
 
@@ -208,7 +217,7 @@ Features:
 * Load `/etc/fastfetch/config.conf` before user config
 * Disk: print one decimal point if size < 100GB
 * `--title-fqdn` option, to print fully qualified domain name instead of host name in title
- 
+
 Logos:
 * updated old NixOS logo
 

CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.12.0) # target_link_libraries with OBJECT libs & project homepage url
 
 project(fastfetch
-    VERSION 1.8.1
+    VERSION 1.8.2
     LANGUAGES C
     DESCRIPTION "Fast system information tool"
     HOMEPAGE_URL "https://github.com/LinusDierheimer/fastfetch"
@@ -654,6 +654,7 @@ if(APPLE)
         PRIVATE "-weak_framework MediaRemote -F /System/Library/PrivateFrameworks"
     )
 elseif(WIN32)
+    target_compile_definitions(libfastfetch PRIVATE -D_WIN32_WINNT=0x0601)
     target_link_libraries(libfastfetch
         PRIVATE "dwmapi"
         PRIVATE "gdi32"

README.md

@@ -12,17 +12,18 @@ Fastfetch is a [neofetch](https://github.com/dylanaraps/neofetch)-like tool for
 
 ## Customization
 
-With customization and speed being two competing goals, this project actually builds two executables.  
-The main one being `fastfetch`, which can be very greatly configured via flags. These flags can be made persistent in `~/.config/fastfetch/config.conf`. To view the available options run `fastfetch --help`.  
-The second executable being built is called `flashfetch`, which is configured at compile time to eliminate any possible overhead. Configuration of it can be very easily done in [`src/flashfetch.c`](src/flashfetch.c).  
-At the moment the performance difference is measurable, but too small to be human recognizable. But the leap will get bigger with more and more options coming, and on slow machines this might actually make a difference.  
+With customization and speed being two competing goals, this project actually builds two executables.
+
+* The main one being `fastfetch`, which can be very greatly configured via flags. These flags can be made persistent in `~/.config/fastfetch/config.conf`. To view the available options run `fastfetch --help`.
+* The second executable being built is called `flashfetch`, which is configured at compile time to eliminate any possible overhead. Configuration of it can be very easily done in [`src/flashfetch.c`](src/flashfetch.c).
+
+At the moment the performance difference is measurable, but too small to be human recognizable. But the leap will get bigger with more and more options coming, and on slow machines this might actually make a difference.
 
 There are some premade config files in [`presets`](presets), including the ones used for the screenshots above. You can load them using `--load-config <filename>`. They may also serve as a good example for format arguments.
 
 ## Dependencies
 
-Fastfetch dynamically loads needed libraries if they are available. On Linux, its only hard dependencies are `libc` (any implementation of the c standard library), `libdl` and [`libpthread`](https://man7.org/linux/man-pages/man7/pthreads.7.html) (if built with multithreading support). They are all shipped with [`glibc`](https://www.gnu.org/software/libc/), which is already installed on most linux distributions.  
-
+Fastfetch dynamically loads needed libraries if they are available. On Linux, its only hard dependencies are `libc` (any implementation of the c standard library), `libdl` and [`libpthread`](https://man7.org/linux/man-pages/man7/pthreads.7.html) (if built with multithreading support). They are all shipped with [`glibc`](https://www.gnu.org/software/libc/), which is already installed on most linux distributions.
 
 The following libraries are used if present at runtime:
 
@@ -66,9 +67,9 @@ For the image logo, iTerm with iterm image protocol should work. Apple Terminal
 * [`libvulkan`](https://www.vulkan.org/): Vulkan module. Usually has been provided by GPU drivers. [`vulkan-loader`](https://github.com/msys2/MINGW-packages/tree/master/mingw-w64-vulkan-loader) [`vulkan-headers`](https://github.com/msys2/MINGW-packages/tree/master/mingw-w64-vulkan-headers)
 * [`libOpenCL`](https://www.khronos.org/opencl/): OpenCL module. [`opencl-icd`](https://github.com/msys2/MINGW-packages/tree/master/mingw-w64-opencl-icd)
 
-Note: In Windows 7, 8 and 8.1, [ConEmu](https://conemu.github.io/en/AnsiEscapeCodes.html) is required to run fastfetch due to [the lack of ASCII escape code native support](https://en.wikipedia.org/wiki/ANSI_escape_code#DOS,_OS/2,_and_Windows). In addition, special build `fastfetch-windows-old` in [Github Actions](https://github.com/LinusDierheimer/fastfetch/actions) is provided to support these old systems, which
+Note: In Windows 7, 8 and 8.1, [ConEmu](https://conemu.github.io/en/AnsiEscapeCodes.html) is required to run fastfetch due to [the lack of ASCII escape code native support](https://en.wikipedia.org/wiki/ANSI_escape_code#DOS,_OS/2,_and_Windows). In addition, special build `fastfetch-win7` is provided to support these old systems, which
 
-1. Build with the ancient MSVCRT C runtime library, instead of the modern [UCRT](https://learn.microsoft.com/en-us/cpp/windows/universal-crt-deployment) C runtime library
+1. Build with the ancient [MSVCRT](https://en.wikipedia.org/wiki/Microsoft_Windows_library_files#MSVCRT.DLL,_MSVCP*.DLL_and_CRTDLL.DLL) C runtime library, instead of the modern [UCRT](https://learn.microsoft.com/en-us/cpp/windows/universal-crt-deployment) C runtime library
 2. Disable stdout application buffer, which seems to problematic for ConEmu.
 
 For the image logo, only chafa is supported due to [the design flaw of ConPTY](https://github.com/microsoft/terminal/issues/1173). In addition, chafa support is not built by default due to the massive dependencies of imagemagick. You must built it yourself.
@@ -118,7 +119,7 @@ Konsole, Gnome Terminal, Tilix, XFCE4 Terminal, Alacritty, Kitty, LXTerminal, De
 
 ## Building
 
-fastfetch uses [`cmake`](https://cmake.org/) for building. [`pkg-config`](https://www.freedesktop.org/wiki/Software/pkg-config/) is recommended for better library detection. The simplest steps to build the fastfetch and flashfetch binaries are:  
+fastfetch uses [`cmake`](https://cmake.org/) for building. [`pkg-config`](https://www.freedesktop.org/wiki/Software/pkg-config/) is recommended for better library detection. The simplest steps to build the fastfetch and flashfetch binaries are:
 ```bash
 mkdir -p build
 cd build
@@ -134,7 +135,7 @@ Currently GCC or clang is required (MSVC is not supported). MSYS2 with CLANG64 s
 
 1. Install [MSYS2](https://www.msys2.org/#installation)
 1. Open `MSYS2 CLANG64` (not `MSYS2 / MSYS`, which targets cygwin C runtime)
-1. Install dependencies  
+1. Install dependencies
 ```bash
 pacman -Syu mingw-w64-clang-x86_64-cmake mingw-w64-clang-x86_64-pkgconf mingw-w64-clang-x86_64-clang mingw-w64-clang-x86_64-cjson mingw-w64-clang-x86_64-vulkan-loader mingw-w64-clang-x86_64-opencl-icd
 ```

src/detection/terminalshell/terminalshell_windows.cpp

@@ -120,6 +120,8 @@ static uint32_t getShellInfo(FFTerminalShellResult* result, uint32_t pid)
         ffStrbufIgnCaseEqualS(&result->shellPrettyName, "gdb")           ||
         ffStrbufIgnCaseEqualS(&result->shellPrettyName, "lldb")          ||
         ffStrbufIgnCaseEqualS(&result->shellPrettyName, "guake-wrapped") ||
+        ffStrbufIgnCaseEqualS(&result->shellPrettyName, "fastfetch")     || //scoop warps the real binaries with a "shim" exe
+        ffStrbufIgnCaseEqualS(&result->shellPrettyName, "flashfetch")    ||
         ffStrbufContainIgnCaseS(&result->shellPrettyName, "debug")
     ) {
         ffStrbufClear(&result->shellProcessName);

src/detection/users/users_windows.c

@@ -2,27 +2,7 @@
 #include "util/windows/unicode.h"
 
 #include <wtsapi32.h>
-
-//at the time of writing, <wtsapi32.h> of MinGW doesn't have the definition of WTSEnumerateSessionsExW
-typedef struct _WTS_SESSION_INFO_1W {
-    DWORD ExecEnvId;
-    WTS_CONNECTSTATE_CLASS State;
-    DWORD SessionId;
-    LPWSTR pSessionName;
-    LPWSTR pHostName;
-    LPWSTR pUserName;
-    LPWSTR pDomainName;
-    LPWSTR pFarmName;
-} WTS_SESSION_INFO_1W, * PWTS_SESSION_INFO_1W;
-
-BOOL
-WINAPI
-WTSEnumerateSessionsExW(
-    HANDLE hServer,
-    DWORD* pLevel,
-    DWORD Filter,
-    PWTS_SESSION_INFO_1W* ppSessionInfo,
-    DWORD* pCount);
+#include "wtsapi32_extend.h"
 
 void ffDetectUsers(FFlist* users, FFstrbuf* error)
 {
@@ -48,7 +28,7 @@ void ffDetectUsers(FFlist* users, FFstrbuf* error)
         ffStrbufInitF((FFstrbuf*)ffListAdd(users), "%s\\%s", domainName.chars, userName.chars);
     }
 
-    WTSFreeMemory(sessionInfo);
+    WTSFreeMemoryExW(WTSTypeSessionInfoLevel1, sessionInfo, 1);
 
     if(users->length == 0)
         ffStrbufAppendS(error, "Unable to detect users");

src/detection/users/wtsapi32_extend.h

@@ -0,0 +1,45 @@
+#pragma once
+
+//at the time of writing, <wtsapi32.h> of MinGW doesn't have the definition of WTSEnumerateSessionsExW and friends
+
+#if (_WIN32_WINNT >= 0x0601)
+
+typedef struct _WTS_SESSION_INFO_1A {
+  DWORD ExecEnvId;
+  WTS_CONNECTSTATE_CLASS State;
+  DWORD SessionId;
+  LPSTR pSessionName;
+  LPSTR pHostName;
+  LPSTR pUserName;
+  LPSTR pDomainName;
+  LPSTR pFarmName;
+} WTS_SESSION_INFO_1A, *PWTS_SESSION_INFO_1A;
+
+typedef struct _WTS_SESSION_INFO_1W {
+  DWORD ExecEnvId;
+  WTS_CONNECTSTATE_CLASS State;
+  DWORD SessionId;
+  LPWSTR pSessionName;
+  LPWSTR pHostName;
+  LPWSTR pUserName;
+  LPWSTR pDomainName;
+  LPWSTR pFarmName;
+} WTS_SESSION_INFO_1W, * PWTS_SESSION_INFO_1W;
+
+#define WTS_SESSION_INFO_1 __MINGW_NAME_AW(WTS_SESSION_INFO_1)
+#define PWTS_SESSION_INFO_1 __MINGW_NAME_AW(PWTS_SESSION_INFO_1)
+
+WINBOOL WINAPI WTSEnumerateSessionsExA(HANDLE hServer,DWORD* pLevel,DWORD Filter,PWTS_SESSION_INFO_1A* ppSessionInfo,DWORD* pCount);
+WINBOOL WINAPI WTSEnumerateSessionsExW(HANDLE hServer,DWORD* pLevel,DWORD Filter,PWTS_SESSION_INFO_1W* ppSessionInfo,DWORD* pCount);
+#define WTSEnumerateSessionsEx __MINGW_NAME_AW(WTSEnumerateSessionsEx)
+
+typedef enum _WTS_TYPE_CLASS {
+  WTSTypeProcessInfoLevel0,
+  WTSTypeProcessInfoLevel1,
+  WTSTypeSessionInfoLevel1
+} WTS_TYPE_CLASS;
+BOOL WTSFreeMemoryExA(WTS_TYPE_CLASS WTSTypeClass,PVOID pMemory,ULONG NumberOfEntries);
+BOOL WTSFreeMemoryExW(WTS_TYPE_CLASS WTSTypeClass,PVOID pMemory,ULONG NumberOfEntries);
+#define WTSFreeMemoryEx __MINGW_NAME_AW(WTSFreeMemoryEx)
+
+#endif /*(_WIN32_WINNT >= 0x0601)*/

src/detection/wifi/wifi_windows.c

@@ -40,9 +40,9 @@ static void convertIfStateToString(WLAN_INTERFACE_STATE state, FFstrbuf* result)
     }
 }
 
-const char* ffDetectWifi(const FFinstance* instance, FFlist* result)
+const char* ffDetectWifi(FF_UNUSED_PARAM const FFinstance* instance, FFlist* result)
 {
-    FF_LIBRARY_LOAD(wlanapi, &instance->config.libcJSON, "dlopen wlanapi"FF_LIBRARY_EXTENSION" failed", "wlanapi"FF_LIBRARY_EXTENSION, 1)
+    FF_LIBRARY_LOAD(wlanapi, NULL, "dlopen wlanapi"FF_LIBRARY_EXTENSION" failed", "wlanapi"FF_LIBRARY_EXTENSION, 1)
     FF_LIBRARY_LOAD_SYMBOL_MESSAGE(wlanapi, WlanOpenHandle)
     FF_LIBRARY_LOAD_SYMBOL_MESSAGE(wlanapi, WlanEnumInterfaces)
     FF_LIBRARY_LOAD_SYMBOL_MESSAGE(wlanapi, WlanQueryInterface)