From a31cff0225e2686b533cf7b3cdfcbf8b0fa50e15 Mon Sep 17 00:00:00 2001 From: sithord48 Date: Sat, 31 May 2025 14:42:53 -0400 Subject: [PATCH] chore: Cleanup windows includes --- src/lib/arch/win32/ArchDaemonWindows.cpp | 12 +++++++----- src/lib/arch/win32/ArchDaemonWindows.h | 4 +--- src/lib/arch/win32/ArchLogWindows.cpp | 1 - src/lib/arch/win32/ArchMiscWindows.cpp | 2 +- src/lib/arch/win32/XArchWindows.cpp | 1 - src/lib/platform/MSWindowsKeyState.cpp | 1 + src/lib/platform/MSWindowsProcess.cpp | 4 +++- src/lib/platform/MSWindowsScreen.cpp | 1 - src/lib/platform/MSWindowsScreen.h | 2 -- src/lib/platform/MSWindowsSession.cpp | 3 +-- src/lib/platform/MSWindowsWatchdog.cpp | 2 +- 11 files changed, 15 insertions(+), 18 deletions(-) diff --git a/src/lib/arch/win32/ArchDaemonWindows.cpp b/src/lib/arch/win32/ArchDaemonWindows.cpp index 35f8530de..5d2d437a5 100644 --- a/src/lib/arch/win32/ArchDaemonWindows.cpp +++ b/src/lib/arch/win32/ArchDaemonWindows.cpp @@ -12,7 +12,9 @@ #include "arch/win32/ArchMiscWindows.h" #include "arch/win32/XArchWindows.h" #include "base/Log.h" +#include "common/Constants.h" +inline static const auto kDefaultDaemonName = _T(kAppName); // // ArchDaemonWindows // @@ -604,17 +606,17 @@ void ArchDaemonWindows::stop(const char *name) void ArchDaemonWindows::installDaemon() { // install default daemon if not already installed. - if (!isDaemonInstalled(DEFAULT_DAEMON_NAME)) { + if (!isDaemonInstalled(kDefaultDaemonName)) { char binPath[MAX_PATH]; GetModuleFileName(ArchMiscWindows::instanceWin32(), binPath, MAX_PATH); // wrap in quotes so a malicious user can't start \Program.exe as admin. const auto command = "\"" + std::string(binPath) + "\""; - installDaemon(DEFAULT_DAEMON_NAME, DEFAULT_DAEMON_INFO, command.c_str(), "", ""); + installDaemon(kDefaultDaemonName, DEFAULT_DAEMON_INFO, command.c_str(), "", ""); } - start(DEFAULT_DAEMON_NAME); + start(kDefaultDaemonName); } void ArchDaemonWindows::uninstallDaemon() @@ -628,7 +630,7 @@ void ArchDaemonWindows::uninstallDaemon() } // remove new service if installed. - if (isDaemonInstalled(DEFAULT_DAEMON_NAME)) { - uninstallDaemon(DEFAULT_DAEMON_NAME); + if (isDaemonInstalled(kDefaultDaemonName)) { + uninstallDaemon(kDefaultDaemonName); } } diff --git a/src/lib/arch/win32/ArchDaemonWindows.h b/src/lib/arch/win32/ArchDaemonWindows.h index 81da0ad07..d03e15fda 100644 --- a/src/lib/arch/win32/ArchDaemonWindows.h +++ b/src/lib/arch/win32/ArchDaemonWindows.h @@ -9,7 +9,6 @@ #include "arch/IArchDaemon.h" #include "arch/IArchMultithread.h" -#include "common/Constants.h" #define WIN32_LEAN_AND_MEAN #include @@ -77,7 +76,7 @@ public: int daemonize(const char *name, DaemonFunc const &func) override; bool canInstallDaemon(const char *name) override; bool isDaemonInstalled(const char *name) override; - std::string commandLine() const + std::string commandLine() const override { return m_commandLine; } @@ -136,7 +135,6 @@ private: std::string m_commandLine; }; -#define DEFAULT_DAEMON_NAME _T(kAppName) #define DEFAULT_DAEMON_INFO _T("Runs the Core process on secure desktops (UAC prompts, login screen, etc).") #define LEGACY_SERVER_DAEMON_NAME _T("Deskflow Server") diff --git a/src/lib/arch/win32/ArchLogWindows.cpp b/src/lib/arch/win32/ArchLogWindows.cpp index eb1e70e6e..b7dada6bd 100644 --- a/src/lib/arch/win32/ArchLogWindows.cpp +++ b/src/lib/arch/win32/ArchLogWindows.cpp @@ -6,7 +6,6 @@ */ #include "arch/win32/ArchLogWindows.h" -#include "arch/win32/ArchMiscWindows.h" #include diff --git a/src/lib/arch/win32/ArchMiscWindows.cpp b/src/lib/arch/win32/ArchMiscWindows.cpp index 607a42ce2..f0fa6f76e 100644 --- a/src/lib/arch/win32/ArchMiscWindows.cpp +++ b/src/lib/arch/win32/ArchMiscWindows.cpp @@ -7,11 +7,11 @@ #include "arch/win32/ArchMiscWindows.h" -#include "arch/XArch.h" #include "arch/win32/ArchDaemonWindows.h" #include "arch/win32/XArchWindows.h" #include "base/Log.h" #include "base/String.h" +#include "common/Constants.h" #include diff --git a/src/lib/arch/win32/XArchWindows.cpp b/src/lib/arch/win32/XArchWindows.cpp index b469840d7..b0720f477 100644 --- a/src/lib/arch/win32/XArchWindows.cpp +++ b/src/lib/arch/win32/XArchWindows.cpp @@ -7,7 +7,6 @@ */ #include "arch/win32/XArchWindows.h" -#include "arch/win32/ArchNetworkWinsock.h" #include "base/String.h" std::string windowsErrorToString(DWORD error) diff --git a/src/lib/platform/MSWindowsKeyState.cpp b/src/lib/platform/MSWindowsKeyState.cpp index a4d564d03..2d4a66927 100644 --- a/src/lib/platform/MSWindowsKeyState.cpp +++ b/src/lib/platform/MSWindowsKeyState.cpp @@ -10,6 +10,7 @@ #include "arch/win32/XArchWindows.h" #include "base/IEventQueue.h" #include "base/Log.h" +#include "common/Constants.h" #include "platform/MSWindowsDesks.h" #include "platform/MSWindowsHandle.h" diff --git a/src/lib/platform/MSWindowsProcess.cpp b/src/lib/platform/MSWindowsProcess.cpp index 0e6a54455..b73d04f36 100644 --- a/src/lib/platform/MSWindowsProcess.cpp +++ b/src/lib/platform/MSWindowsProcess.cpp @@ -7,15 +7,17 @@ #include "MSWindowsProcess.h" -#include "arch/XArch.h" #include "arch/win32/XArchWindows.h" #include "base/Log.h" +#include "common/Common.h" +#include "common/Constants.h" #define WIN32_LEAN_AND_MEAN #include #include +#include #include namespace deskflow::platform { diff --git a/src/lib/platform/MSWindowsScreen.cpp b/src/lib/platform/MSWindowsScreen.cpp index 410b398f1..5b5f56385 100644 --- a/src/lib/platform/MSWindowsScreen.cpp +++ b/src/lib/platform/MSWindowsScreen.cpp @@ -22,7 +22,6 @@ #include "deskflow/Clipboard.h" #include "deskflow/KeyMap.h" #include "deskflow/XScreen.h" -#include "mt/Thread.h" #include "platform/MSWindowsClipboard.h" #include "platform/MSWindowsDesks.h" #include "platform/MSWindowsEventQueueBuffer.h" diff --git a/src/lib/platform/MSWindowsScreen.h b/src/lib/platform/MSWindowsScreen.h index 130cd026a..af88275b6 100644 --- a/src/lib/platform/MSWindowsScreen.h +++ b/src/lib/platform/MSWindowsScreen.h @@ -9,8 +9,6 @@ #include "deskflow/ClientArgs.h" #include "deskflow/PlatformScreen.h" -#include "mt/CondVar.h" -#include "mt/Mutex.h" #include "platform/MSWindowsHook.h" #include "platform/MSWindowsPowerManager.h" diff --git a/src/lib/platform/MSWindowsSession.cpp b/src/lib/platform/MSWindowsSession.cpp index 2e6763f95..24ba4c27d 100644 --- a/src/lib/platform/MSWindowsSession.cpp +++ b/src/lib/platform/MSWindowsSession.cpp @@ -6,12 +6,11 @@ #include "platform/MSWindowsSession.h" -#include "arch/XArch.h" #include "arch/win32/XArchWindows.h" #include "base/Log.h" -#include "deskflow/XDeskflow.h" #include +#include MSWindowsSession::MSWindowsSession() : m_activeSessionId(-1) { diff --git a/src/lib/platform/MSWindowsWatchdog.cpp b/src/lib/platform/MSWindowsWatchdog.cpp index f466096f6..753dea70a 100644 --- a/src/lib/platform/MSWindowsWatchdog.cpp +++ b/src/lib/platform/MSWindowsWatchdog.cpp @@ -7,12 +7,12 @@ #include "platform/MSWindowsWatchdog.h" #include "arch/Arch.h" -#include "arch/XArch.h" #include "arch/win32/XArchWindows.h" #include "base/ELevel.h" #include "base/Log.h" #include "base/LogOutputters.h" #include "base/TMethodJob.h" +#include "common/Constants.h" #include "deskflow/App.h" #include "mt/Thread.h" #include "platform/MSWindowsHandle.h"