Merge branch 'fastfetch-cli:dev' into emerge-set-diff

Author: hydrospherics

src/common/impl/FFPlatform_windows.c

@@ -19,7 +19,7 @@ static void getExePath(FFPlatform* platform)
     wchar_t exePathW[MAX_PATH];
 
     FF_AUTO_CLOSE_FD HANDLE hPath = CreateFileW(
-        ffGetProcessParams()->ImagePathName.Buffer,
+        ffGetPeb()->ProcessParameters->ImagePathName.Buffer,
         GENERIC_READ,
         FILE_SHARE_READ,
         NULL,
@@ -38,7 +38,10 @@ static void getExePath(FFPlatform* platform)
     }
 
     if (platform->exePath.length == 0)
-        ffStrbufSetNWS(&platform->exePath, ffGetProcessParams()->ImagePathName.Length / 2, ffGetProcessParams()->ImagePathName.Buffer);
+    {
+        PCUNICODE_STRING imagePathName = &ffGetPeb()->ProcessParameters->ImagePathName;
+        ffStrbufSetNWS(&platform->exePath, imagePathName->Length / sizeof(wchar_t), imagePathName->Buffer);
+    }
 
     ffStrbufReplaceAllC(&platform->exePath, '\\', '/');
 }
@@ -196,7 +199,7 @@ static void getUserShell(FFPlatform* platform)
 static const char* detectWine(void)
 {
     const char * __cdecl wine_get_version(void);
-    HMODULE hntdll = GetModuleHandleW(L"ntdll.dll");
+    void* hntdll = ffLibraryGetModule(L"ntdll.dll");
     if (!hntdll) return NULL;
     FF_LIBRARY_LOAD_SYMBOL_LAZY(hntdll, wine_get_version);
     if (!ffwine_get_version) return NULL;
@@ -296,16 +299,15 @@ static void getSystemArchitecture(FFPlatformSysinfo* info)
 
 static void getCwd(FFPlatform* platform)
 {
-    PCURDIR cwd = &ffGetProcessParams()->CurrentDirectory;
+    PCURDIR cwd = &ffGetPeb()->ProcessParameters->CurrentDirectory;
     ffStrbufSetNWS(&platform->cwd, cwd->DosPath.Length / sizeof(WCHAR), cwd->DosPath.Buffer);
     ffStrbufReplaceAllC(&platform->cwd, '\\', '/');
     ffStrbufEnsureEndsWithC(&platform->cwd, '/');
 }
 
 void ffPlatformInitImpl(FFPlatform* platform)
 {
-    static_assert(offsetof(TEB, Reserved1[8]) == sizeof(NT_TIB) + sizeof(PVOID) /*EnvironmentPointer*/, "Structure layout mismatch detected.");
-    platform->pid = (uint32_t) (uintptr_t) ((CLIENT_ID*) &NtCurrentTeb()->Reserved1[8])->UniqueProcess;
+    platform->pid = (uint32_t) (uintptr_t) ffGetTeb()->ClientId.UniqueProcess;
     getExePath(platform);
     getCwd(platform);
     getHomeDir(platform);

src/common/impl/io_windows.c

@@ -8,7 +8,7 @@
 
 static bool createSubfolders(wchar_t* fileName)
 {
-    HANDLE hRoot = ffGetProcessParams()->CurrentDirectory.Handle;
+    HANDLE hRoot = ffGetPeb()->ProcessParameters->CurrentDirectory.Handle;
     bool closeRoot = false;
     wchar_t* ptr = fileName;
 
@@ -69,7 +69,7 @@ static bool createSubfolders(wchar_t* fileName)
     // Rooted path on current drive: \foo\bar
     else if (ptr[0] == L'\\')
     {
-        UNICODE_STRING* dosPath = &ffGetProcessParams()->CurrentDirectory.DosPath;
+        UNICODE_STRING* dosPath = &ffGetPeb()->ProcessParameters->CurrentDirectory.DosPath;
         wchar_t driveRoot[] = { dosPath->Buffer[0], L':', L'\\', L'\0' };
         hRoot = CreateFileW(
             driveRoot,

src/common/impl/library.c

@@ -1,6 +1,13 @@
 #include "fastfetch.h"
 #include "common/library.h"
 
+#if _WIN32
+#include "common/debug.h"
+#include "common/windows/nt.h"
+#include <errno.h>
+#include <ntstatus.h>
+#endif
+
 #ifndef FF_DISABLE_DLOPEN
 
 #include <stdarg.h>
@@ -36,7 +43,7 @@ static void* libraryLoad(const char* path, int maxVersion)
     if (pathLen == instance.state.platform.exePath.length)
         return result;
 
-    char absPath[MAX_PATH + 1];
+    char absPath[MAX_PATH * 2];
     strcpy(mempcpy(absPath, instance.state.platform.exePath.chars, pathLen + 1), path);
     return dlopen(absPath, FF_DLOPEN_FLAGS);
 
@@ -92,3 +99,81 @@ void* ffLibraryLoad(const char* path, int maxVersion, ...)
 }
 
 #endif
+
+#if _WIN32
+
+void* dlopen(const char* path, FF_MAYBE_UNUSED int mode)
+{
+    wchar_t pathW[MAX_PATH + 1];
+    ULONG pathWBytes = 0;
+
+    NTSTATUS status = RtlUTF8ToUnicodeN(pathW, sizeof(pathW), &pathWBytes, path, (uint32_t)strlen(path) + 1);
+    if (!NT_SUCCESS(status))
+    {
+        FF_DEBUG("RtlUTF8ToUnicodeN failed for path %s with status 0x%08lX: %s", path, status, ffDebugNtStatus(status));
+        return NULL;
+    }
+
+    PVOID module = NULL;
+    status = LdrLoadDll(NULL, NULL, &(UNICODE_STRING) {
+        .Length = (USHORT) pathWBytes - sizeof(wchar_t), // Exclude null terminator
+        .MaximumLength = (USHORT) pathWBytes,
+        .Buffer = pathW,
+    }, &module);
+
+    if (!NT_SUCCESS(status))
+    {
+        FF_DEBUG("LdrLoadDll failed for path %s with status 0x%08lX: %s", path, status, ffDebugNtStatus(status));
+        return NULL;
+    }
+
+    return module;
+}
+
+int dlclose(void* handle)
+{
+    NTSTATUS status = LdrUnloadDll(handle);
+    if (!NT_SUCCESS(status))
+    {
+        FF_DEBUG("LdrUnloadDll failed for handle %p with status 0x%08lX: %s", handle, status, ffDebugNtStatus(status));
+        return -1;
+    }
+    return 0;
+}
+
+void* dlsym(void* handle, const char* symbol)
+{
+    void* address;
+    USHORT symbolBytes = (USHORT) strlen(symbol) + 1;
+    NTSTATUS status = LdrGetProcedureAddress(handle, &(ANSI_STRING) {
+        .Length = symbolBytes - sizeof(char),
+        .MaximumLength = symbolBytes,
+        .Buffer = (char*) symbol,
+    }, 0, &address);
+    if (!NT_SUCCESS(status))
+    {
+        FF_DEBUG("LdrGetProcedureAddress failed for symbol %s with status 0x%08lX: %s", symbol, status, ffDebugNtStatus(status));
+        return NULL;
+    }
+    return address;
+}
+
+void* ffLibraryGetModule(const wchar_t* libraryFileName)
+{
+    assert(libraryFileName != NULL && "Use \"ffGetPeb()->ImageBaseAddress\" instead");
+
+    void* module = NULL;
+    USHORT libraryFileNameBytes = (USHORT) (wcslen(libraryFileName) * sizeof(wchar_t)) + sizeof(wchar_t);
+    NTSTATUS status = LdrGetDllHandle(NULL, NULL, &(UNICODE_STRING) {
+        .Length = libraryFileNameBytes - sizeof(wchar_t),
+        .MaximumLength = libraryFileNameBytes,
+        .Buffer = (wchar_t*) libraryFileName,
+    }, &module);
+    if (!NT_SUCCESS(status))
+    {
+        FF_DEBUG("LdrGetDllHandle failed for library %ls with status 0x%08lX: %s", libraryFileName, status, ffDebugNtStatus(status));
+        return NULL;
+    }
+    return module;
+}
+#endif

src/common/impl/networking_windows.c

@@ -24,19 +24,19 @@ static const char* initWsaData(WSADATA* wsaData)
     }
 
     //Dummy socket needed for WSAIoctl
-    SOCKET sockfd = socket(AF_INET, SOCK_STREAM, 0);
+    SOCKET sockfd = WSASocketW(AF_INET, SOCK_STREAM, 0, NULL, 0, 0);
     if(sockfd == INVALID_SOCKET) {
-        FF_DEBUG("socket(AF_INET, SOCK_STREAM) failed");
+        FF_DEBUG("WSASocketW(AF_INET, SOCK_STREAM) failed");
         WSACleanup();
-        return "socket(AF_INET, SOCK_STREAM) failed";
+        return "WSASocketW(AF_INET, SOCK_STREAM) failed";
     }
 
     DWORD dwBytes;
     GUID guid = WSAID_CONNECTEX;
     if(WSAIoctl(sockfd, SIO_GET_EXTENSION_FUNCTION_POINTER,
-                    &guid, sizeof(guid),
-                    &ConnectEx, sizeof(ConnectEx),
-                    &dwBytes, NULL, NULL) != 0) {
+                &guid, sizeof(guid),
+                &ConnectEx, sizeof(ConnectEx),
+                &dwBytes, NULL, NULL) != 0) {
         FF_DEBUG("WSAIoctl(sockfd, SIO_GET_EXTENSION_FUNCTION_POINTER) failed");
         closesocket(sockfd);
         WSACleanup();
@@ -92,26 +92,33 @@ const char* ffNetworkingSendHttpRequest(FFNetworkingState* state, const char* ho
         return "initWsaData() failed before";
     }
 
-    struct addrinfo* addr;
-    struct addrinfo hints = {
+    ADDRINFOW* addr;
+    ADDRINFOW hints = {
+        .ai_flags = AI_NUMERICSERV,
         .ai_family = state->ipv6 ? AF_INET6 : AF_INET,
         .ai_socktype = SOCK_STREAM,
-        .ai_flags = AI_NUMERICSERV,
     };
 
+    wchar_t hostW[256];
+    if (!NT_SUCCESS(RtlUTF8ToUnicodeN(hostW, (ULONG) sizeof(hostW), NULL, host, (ULONG) strlen(host) + 1)))
+    {
+        FF_DEBUG("Failed to convert host to wide string: %s", host);
+        return "Failed to convert host to wide string";
+    }
+
     FF_DEBUG("Resolving address: %s (%s)", host, state->ipv6 ? "IPv6" : "IPv4");
-    if(getaddrinfo(host, "80", &hints, &addr) != 0)
+    if(GetAddrInfoW(hostW, L"80", &hints, &addr) != 0)
     {
-        FF_DEBUG("getaddrinfo() failed");
-        return "getaddrinfo() failed";
+        FF_DEBUG("GetAddrInfoW() failed");
+        return "GetAddrInfoW() failed";
     }
 
-    state->sockfd = socket(addr->ai_family, addr->ai_socktype, addr->ai_protocol);
+    state->sockfd = WSASocketW(addr->ai_family, addr->ai_socktype, addr->ai_protocol, NULL, 0, 0);
     if(state->sockfd == INVALID_SOCKET)
     {
-        FF_DEBUG("socket() failed");
-        freeaddrinfo(addr);
-        return "socket() failed";
+        FF_DEBUG("WSASocketW() failed");
+        FreeAddrInfoW(addr);
+        return "WSASocketW() failed";
     }
 
     DWORD flag = 1;
@@ -143,7 +150,7 @@ const char* ffNetworkingSendHttpRequest(FFNetworkingState* state, const char* ho
     {
         FF_DEBUG("bind() failed: %s", ffDebugWin32Error((DWORD) WSAGetLastError()));
         closesocket(state->sockfd);
-        freeaddrinfo(addr);
+        FreeAddrInfoW(addr);
         state->sockfd = INVALID_SOCKET;
         return "bind() failed";
     }
@@ -156,7 +163,7 @@ const char* ffNetworkingSendHttpRequest(FFNetworkingState* state, const char* ho
     if (state->overlapped.hEvent == WSA_INVALID_EVENT) {
         FF_DEBUG("WSACreateEvent() failed");
         closesocket(state->sockfd);
-        freeaddrinfo(addr);
+        FreeAddrInfoW(addr);
         state->sockfd = INVALID_SOCKET;
         return "WSACreateEvent() failed";
     }
@@ -200,7 +207,7 @@ const char* ffNetworkingSendHttpRequest(FFNetworkingState* state, const char* ho
     BOOL result = ConnectEx(state->sockfd, addr->ai_addr, (int)addr->ai_addrlen,
                           state->command.chars, state->command.length, &sent, &state->overlapped);
 
-    freeaddrinfo(addr);
+    FreeAddrInfoW(addr);
     addr = NULL;
 
     if(!result)
@@ -302,10 +309,14 @@ const char* ffNetworkingRecvHttpResponse(FFNetworkingState* state, FFstrbuf* buf
         FF_DEBUG("Data reception loop #%d, current buffer size: %u, available space: %u",
                  ++recvCount, buffer->length, ffStrbufGetFree(buffer));
 
-        ssize_t received = recv(state->sockfd, buffer->chars + buffer->length, (int)ffStrbufGetFree(buffer), 0);
+        DWORD received = 0, recvFlags = 0;
+        int recvResult = WSARecv(state->sockfd, &(WSABUF) {
+            .buf = buffer->chars + buffer->length,
+            .len = (ULONG) ffStrbufGetFree(buffer),
+        }, 1, &received, &recvFlags, NULL, NULL);
 
-        if (received <= 0) {
-            if (received == 0) {
+        if (recvResult == SOCKET_ERROR || received == 0) {
+            if (recvResult == 0 && received == 0) {
                 FF_DEBUG("Connection closed (received=0)");
             } else {
                 FF_DEBUG("Reception failed: %s", ffDebugWin32Error((DWORD) WSAGetLastError()));
@@ -316,7 +327,7 @@ const char* ffNetworkingRecvHttpResponse(FFNetworkingState* state, FFstrbuf* buf
         buffer->length += (uint32_t) received;
         buffer->chars[buffer->length] = '\0';
 
-        FF_DEBUG("Successfully received %zd bytes of data, total: %u bytes", received, buffer->length);
+        FF_DEBUG("Successfully received %u bytes of data, total: %u bytes", (unsigned) received, buffer->length);
 
         // Check if HTTP header end marker is found
         if (headerEnd == 0) {

src/common/library.h

@@ -6,11 +6,10 @@
 #ifndef FF_DISABLE_DLOPEN
 
 #if defined(_WIN32)
-    #include <libloaderapi.h>
     #define FF_DLOPEN_FLAGS 0
-    FF_C_NODISCARD static inline void* dlopen(const char* path, int mode) { FF_UNUSED(mode); return LoadLibraryA(path); }
-    FF_C_NODISCARD static inline void* dlsym(void* handle, const char* symbol) { return (void*) GetProcAddress((HMODULE)handle, symbol); }
-    static inline int dlclose(void* handle) { return !FreeLibrary((HMODULE)handle); }
+    FF_C_NODISCARD void* dlopen(const char* path, int mode);
+    FF_C_NODISCARD void* dlsym(void* handle, const char* symbol);
+    int dlclose(void* handle);
 #else
     #include <dlfcn.h>
 #endif
@@ -30,6 +29,10 @@ static inline void ffLibraryUnload(void** handle)
         dlclose(*handle);
 }
 
+#if __cplusplus
+#define __auto_type auto
+#endif
+
 #define FF_LIBRARY_SYMBOL(symbolName) \
     __typeof__(&symbolName) ff ## symbolName;
 
@@ -38,13 +41,8 @@ static inline void ffLibraryUnload(void** handle)
     if(libraryObjectName == NULL) \
         return returnValue;
 
-#if _WIN32
-#define FF_LIBRARY_LOAD_MESSAGE(libraryObjectName, libraryFileName, maxVersion, ...) \
-    FF_LIBRARY_LOAD(libraryObjectName, "LoadLibraryA(" libraryFileName ") failed", libraryFileName, maxVersion, ##__VA_ARGS__)
-#else
 #define FF_LIBRARY_LOAD_MESSAGE(libraryObjectName, libraryFileName, maxVersion, ...) \
     FF_LIBRARY_LOAD(libraryObjectName, "dlopen(" libraryFileName ") failed", libraryFileName, maxVersion, ##__VA_ARGS__)
-#endif
 
 #define FF_LIBRARY_LOAD_SYMBOL_ADDRESS(library, symbolMapping, symbolName, returnValue) \
     symbolMapping = (__typeof__(&symbolName)) dlsym(library, #symbolName); \
@@ -106,3 +104,7 @@ void* ffLibraryLoad(const char* path, int maxVersion, ...);
     FF_LIBRARY_LOAD_SYMBOL_ADDRESS(library, (varName)->ff ## symbolName, symbolName, returnValue);
 
 #endif
+
+#if _WIN32
+void* ffLibraryGetModule(const wchar_t* libraryFileName);
+#endif

src/common/windows/com.cpp

@@ -17,7 +17,8 @@ static const char* doInitCom()
         return "CoInitializeEx() failed";
 
     // Set general COM security levels
-    if (FAILED(CoInitializeSecurity(
+
+    HRESULT hRes = CoInitializeSecurity(
         NULL,
         -1,                          // COM authentication
         NULL,                        // Authentication services
@@ -27,7 +28,9 @@ static const char* doInitCom()
         NULL,                        // Authentication info
         EOAC_NONE,                   // Additional capabilities
         NULL                         // Reserved
-    )))
+    );
+
+    if (FAILED(hRes) && hRes != RPC_E_TOO_LATE /* Has been set by a random dll */)
     {
         CoUninitialize();
         return "CoInitializeSecurity() failed";