From 725d2f26120d3e305f8a5a5a33957a6c38305be9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= <carter.li@eoitek.com>
Date: Fri, 24 Mar 2023 23:21:39 +0800
Subject: [PATCH] Windows: fix <Windows.h> header mess

---
 CMakeLists.txt                                        | 4 +++-
 src/common/init.c                                     | 3 +--
 src/common/io/io.h                                    | 1 +
 src/common/processing_windows.c                       | 1 -
 src/common/thread.h                                   | 2 +-
 src/detection/battery/battery_windows.c               | 3 ++-
 src/detection/bluetooth/bluetooth_windows.c           | 1 +
 src/detection/disk/disk_windows.c                     | 1 -
 src/detection/font/font_windows.c                     | 2 +-
 src/detection/memory/memory_windows.c                 | 2 ++
 src/detection/opengl/opengl_windows.c                 | 1 -
 src/detection/swap/swap_windows.cpp                   | 1 +
 src/detection/terminalfont/terminalfont_windows.c     | 2 +-
 src/detection/terminalshell/terminalshell_windows.cpp | 2 +-
 src/detection/uptime/uptime_windows.c                 | 1 -
 src/detection/users/users_windows.c                   | 1 +
 src/detection/wifi/wifi_windows.c                     | 1 +
 src/util/FFstrbuf.h                                   | 3 ++-
 src/util/platform/FFPlatform_windows.c                | 1 -
 src/util/windows/registry.h                           | 2 +-
 src/util/windows/unicode.c                            | 2 ++
 21 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c2ffcfead..5116acb51 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -542,7 +542,9 @@ add_library(libfastfetch OBJECT
 )
 
 target_compile_definitions(libfastfetch PUBLIC _GNU_SOURCE)
-target_compile_definitions(libfastfetch PUBLIC YYJSON_DISABLE_WRITER=1)
+if(WIN32)
+    target_compile_definitions(libfastfetch PUBLIC WIN32_LEAN_AND_MEAN=1)
+endif()
 
 CHECK_INCLUDE_FILE("utmpx.h" HAVE_UTMPX_H)
 if(HAVE_UTMPX_H)
diff --git a/src/common/init.c b/src/common/init.c
index 93547b177..dc422aed6 100644
--- a/src/common/init.c
+++ b/src/common/init.c
@@ -8,9 +8,8 @@
 #include <unistd.h>
 #include <sys/stat.h>
 #ifdef _WIN32
-    #include <wincon.h>
+    #include <windows.h>
     #include <locale.h>
-    #include <shlobj.h>
     #include "util/windows/unicode.h"
 #else
     #include <signal.h>
diff --git a/src/common/io/io.h b/src/common/io/io.h
index f771efac8..e28a9b3c0 100644
--- a/src/common/io/io.h
+++ b/src/common/io/io.h
@@ -7,6 +7,7 @@
 
 #ifdef _WIN32
     #include <fileapi.h>
+    #include <handleapi.h>
     #include <io.h>
     typedef HANDLE FFNativeFD;
 #else
diff --git a/src/common/processing_windows.c b/src/common/processing_windows.c
index 736c121b3..a2db719c1 100644
--- a/src/common/processing_windows.c
+++ b/src/common/processing_windows.c
@@ -1,7 +1,6 @@
 #include "fastfetch.h"
 #include "common/processing.h"
 
-#define WIN32_LEAN_AND_MEAN 1
 #include <Windows.h>
 
 const char* ffProcessAppendStdOut(FFstrbuf* buffer, char* const argv[])
diff --git a/src/common/thread.h b/src/common/thread.h
index c4d223084..0b9bcb7e1 100644
--- a/src/common/thread.h
+++ b/src/common/thread.h
@@ -20,7 +20,7 @@
         }
         #define FF_THREAD_ENTRY_DECL_WRAPPER(fn, paramType) static __stdcall unsigned fn ## ThreadMain (void* data) { fn((paramType)data); return 0; }
         static inline void ffThreadDetach(FFThreadType thread) { CloseHandle(thread); }
-        static inline void ffThreadJoin(FFThreadType thread) { WaitForSingleObject(thread, INFINITE); }
+        static inline void ffThreadJoin(FFThreadType thread) { WaitForSingleObject(thread, 0xffffffff /*INFINITE*/); }
     #else
         #include <pthread.h>
         #define FF_THREAD_MUTEX_INITIALIZER PTHREAD_MUTEX_INITIALIZER
diff --git a/src/detection/battery/battery_windows.c b/src/detection/battery/battery_windows.c
index ce1838613..af7afe892 100644
--- a/src/detection/battery/battery_windows.c
+++ b/src/detection/battery/battery_windows.c
@@ -2,11 +2,12 @@
 #include "util/windows/unicode.h"
 #include "util/mallocHelper.h"
 
+#undef WIN32_LEAN_AND_MEAN
+#include <windows.h>
 #include <setupapi.h>
 #include <batclass.h>
 #include <devguid.h>
 #include <winternl.h>
-#include <powrprof.h>
 
 #ifdef FF_USE_WIN_NTAPI
     NTSYSCALLAPI
diff --git a/src/detection/bluetooth/bluetooth_windows.c b/src/detection/bluetooth/bluetooth_windows.c
index e713302b4..76f0c46d9 100644
--- a/src/detection/bluetooth/bluetooth_windows.c
+++ b/src/detection/bluetooth/bluetooth_windows.c
@@ -1,6 +1,7 @@
 #include "bluetooth.h"
 #include "util/windows/unicode.h"
 
+#include <windows.h>
 #include <bluetoothapis.h>
 
 #pragma GCC diagnostic push
diff --git a/src/detection/disk/disk_windows.c b/src/detection/disk/disk_windows.c
index 2d11739b4..5f9cf82e6 100644
--- a/src/detection/disk/disk_windows.c
+++ b/src/detection/disk/disk_windows.c
@@ -1,6 +1,5 @@
 #include "disk.h"
 
-#define WIN32_LEAN_AND_MEAN 1
 #include <windows.h>
 
 void ffDetectDisksImpl(FFDiskResult* disks)
diff --git a/src/detection/font/font_windows.c b/src/detection/font/font_windows.c
index d858b8b42..642735329 100644
--- a/src/detection/font/font_windows.c
+++ b/src/detection/font/font_windows.c
@@ -1,7 +1,7 @@
 #include "font.h"
 #include "util/windows/unicode.h"
 
-#include <winuser.h>
+#include <windows.h>
 
 void ffDetectFontImpl(const FFinstance* instance, FFFontResult* result)
 {
diff --git a/src/detection/memory/memory_windows.c b/src/detection/memory/memory_windows.c
index d639c2a73..838b2534e 100644
--- a/src/detection/memory/memory_windows.c
+++ b/src/detection/memory/memory_windows.c
@@ -1,5 +1,7 @@
 #include "memory.h"
 
+#include <windows.h>
+
 void ffDetectMemory(FFMemoryStorage* ram)
 {
     MEMORYSTATUSEX statex = {
diff --git a/src/detection/opengl/opengl_windows.c b/src/detection/opengl/opengl_windows.c
index 92e56b974..a3865e550 100644
--- a/src/detection/opengl/opengl_windows.c
+++ b/src/detection/opengl/opengl_windows.c
@@ -2,7 +2,6 @@
 #include "common/printing.h"
 #include "opengl.h"
 
-#define WIN32_LEAN_AND_MEAN 1
 #include <Windows.h>
 #include <GL/gl.h>
 #ifndef GL_SHADING_LANGUAGE_VERSION // For WGL
diff --git a/src/detection/swap/swap_windows.cpp b/src/detection/swap/swap_windows.cpp
index d7f910f95..15d6336f4 100644
--- a/src/detection/swap/swap_windows.cpp
+++ b/src/detection/swap/swap_windows.cpp
@@ -7,6 +7,7 @@ extern "C" {
 
 #include <winternl.h>
 #include <ntstatus.h>
+#include <windows.h>
 
 extern "C"
 void ffDetectSwap(FFMemoryStorage* swap)
diff --git a/src/detection/terminalfont/terminalfont_windows.c b/src/detection/terminalfont/terminalfont_windows.c
index e84d73d9e..da2f0568b 100644
--- a/src/detection/terminalfont/terminalfont_windows.c
+++ b/src/detection/terminalfont/terminalfont_windows.c
@@ -4,7 +4,7 @@
 #include "terminalfont.h"
 #include "util/windows/unicode.h"
 
-#include <wincon.h>
+#include <windows.h>
 
 static void detectMintty(const FFinstance* instance, FFTerminalFontResult* terminalFont)
 {
diff --git a/src/detection/terminalshell/terminalshell_windows.cpp b/src/detection/terminalshell/terminalshell_windows.cpp
index 58dc2c588..83bd37c16 100644
--- a/src/detection/terminalshell/terminalshell_windows.cpp
+++ b/src/detection/terminalshell/terminalshell_windows.cpp
@@ -5,7 +5,7 @@ extern "C" {
 #include "util/mallocHelper.h"
 }
 
-#include <processthreadsapi.h>
+#include <windows.h>
 #include <wchar.h>
 #include <tlhelp32.h>
 
diff --git a/src/detection/uptime/uptime_windows.c b/src/detection/uptime/uptime_windows.c
index 9f2dab02a..657af033b 100644
--- a/src/detection/uptime/uptime_windows.c
+++ b/src/detection/uptime/uptime_windows.c
@@ -1,6 +1,5 @@
 #include "uptime.h"
 
-#define WIN32_LEAN_AND_MEAN
 #include <sysinfoapi.h>
 
 uint64_t ffDetectUptime()
diff --git a/src/detection/users/users_windows.c b/src/detection/users/users_windows.c
index 5c78cfdd7..01fab40a7 100644
--- a/src/detection/users/users_windows.c
+++ b/src/detection/users/users_windows.c
@@ -1,6 +1,7 @@
 #include "users.h"
 #include "util/windows/unicode.h"
 
+#include <windows.h>
 #include <wtsapi32.h>
 
 void ffDetectUsers(FFlist* users, FFstrbuf* error)
diff --git a/src/detection/wifi/wifi_windows.c b/src/detection/wifi/wifi_windows.c
index f13cc5484..e94f0cebd 100644
--- a/src/detection/wifi/wifi_windows.c
+++ b/src/detection/wifi/wifi_windows.c
@@ -2,6 +2,7 @@
 #include "common/library.h"
 #include "util/windows/unicode.h"
 
+#include <windows.h>
 #include <wlanapi.h>
 
 #pragma GCC diagnostic push
diff --git a/src/util/FFstrbuf.h b/src/util/FFstrbuf.h
index e2ef2586a..3d6b12e8f 100644
--- a/src/util/FFstrbuf.h
+++ b/src/util/FFstrbuf.h
@@ -14,7 +14,8 @@
 #include <assert.h>
 
 #ifdef _WIN32
-    #include <shlwapi.h>
+    // #include <shlwapi.h>
+    __stdcall const char* StrStrIA(const char* lpFirst, const char* lpSrch);
     #define strcasestr StrStrIA
 #endif
 
diff --git a/src/util/platform/FFPlatform_windows.c b/src/util/platform/FFPlatform_windows.c
index 60e4249b4..bb793c1d1 100644
--- a/src/util/platform/FFPlatform_windows.c
+++ b/src/util/platform/FFPlatform_windows.c
@@ -1,7 +1,6 @@
 #include "FFPlatform_private.h"
 #include "util/stringUtils.h"
 
-#define WIN32_LEAN_AND_MEAN
 #include <Windows.h>
 #include <shlobj.h>
 
diff --git a/src/util/windows/registry.h b/src/util/windows/registry.h
index d9eb67666..44fd5c430 100644
--- a/src/util/windows/registry.h
+++ b/src/util/windows/registry.h
@@ -5,7 +5,7 @@
 
 #include "fastfetch.h"
 
-#include <winreg.h>
+#include <windows.h>
 
 static inline void wrapRegCloseKey(HKEY* phKey)
 {
diff --git a/src/util/windows/unicode.c b/src/util/windows/unicode.c
index b25cdcdd9..57b3677aa 100644
--- a/src/util/windows/unicode.c
+++ b/src/util/windows/unicode.c
@@ -1,5 +1,7 @@
 #include "unicode.h"
 
+#include <windows.h>
+
 void ffStrbufSetNWS(FFstrbuf* result, uint32_t length, const wchar_t* source)
 {
     if(!length)