Monitor reconstructed

LogThread was canceled
add a sleep into log method, cost little CPU resource now

Author: michaelchen1996

APIHOOK/Monitor/LogThread.cpp renamed to APIHOOK/Monitor/Log.cpp

@@ -1,9 +1,9 @@
 #include "stdafx.h"
-#include "LogThread.h"
+#include "Log.h"
 
-DWORD WINAPI LogThreadProc(LPVOID lpParameter)
+void Log()
 {
-	OutputDebugString(L"This in LogThread\n");
+	OutputDebugString(TEXT("This in LogThread\n"));
 
 	HANDLE hSemaphoreStatus = NULL;
 	HANDLE hMailslotLog = NULL;
@@ -13,45 +13,46 @@ DWORD WINAPI LogThreadProc(LPVOID lpParameter)
 	DWORD dwFileSize = MAX_FILE_SIZE+1;
 	DWORD dwWrittenSize = 0;
 	BOOL isStopped = FALSE;
-	WCHAR szReadBuf[MAX_LOG_SIZE];
-	WCHAR szCurrentLogPath[MAX_PATH];
+	TCHAR szReadBuf[MAX_LOG_SIZE];
+	TCHAR szCurrentLogPath[MAX_PATH];
+	TCHAR szCurrentDirectory[MAX_PATH];
 
-	//Get Monitor.exe directory, in order to read config file
-	GetModuleDirectory(szCurrentDirectory);
+	//Get log directory, in order to read config file
+	GetCurrentDirectory(MAX_PATH, szCurrentDirectory);
 	StringCbCopy(szCurrentLogPath, MAX_PATH, szCurrentDirectory);
-	StringCbCat(szCurrentLogPath, MAX_PATH, L"Logs\\");
+	StringCbCat(szCurrentLogPath, MAX_PATH, TEXT("\\Logs\\"));
 	if (CreateDirectory(szCurrentLogPath, NULL))
 	{
-		OutputDebugString(L"Create New Log Directory\n");
+		OutputDebugString(TEXT("Create New Log Directory\n"));
 	}
 	else if (ERROR_ALREADY_EXISTS == GetLastError())
 	{
-		OutputDebugString(L"Log Directory Exists\n");
+		OutputDebugString(TEXT("Log Directory Exists\n"));
 	}
 	else
 	{
-		OutputDebugString(L"CreateDirectory ERROR\n");
-		return 0;
+		OutputDebugString(TEXT("CreateDirectory ERROR\n"));
+		return;
 	}
 
 	//create status semaphore
-	hSemaphoreStatus = CreateSemaphore(NULL, 0, 1, L"APIHOOK_Monitor_Semaphore_Status");
+	hSemaphoreStatus = CreateSemaphore(NULL, 0, 1, TEXT("APIHOOK_Monitor_Semaphore_Status"));
 	if (!hSemaphoreStatus)
 	{
-		OutputDebugString(L"CreateSemaphore ERROR\n");
-		return 0;
+		OutputDebugString(TEXT("CreateSemaphore ERROR\n"));
+		return;
 	}
 
 	//create mailslot
-	hMailslotLog = CreateMailslot(L"\\\\.\\mailslot\\APIHOOK\\Monitor\\Log", 0, 0, NULL);
+	hMailslotLog = CreateMailslot(TEXT("\\\\.\\mailslot\\APIHOOK\\Monitor\\Log"), 0, 0, NULL);
 	if (INVALID_HANDLE_VALUE == hMailslotLog)
 	{
-		OutputDebugString(L"CreateMailslot ERROR\n");
-		return 0;
+		OutputDebugString(TEXT("CreateMailslot ERROR\n"));
+		return;
 	}
 
 	//it is time to create the new process DllInject.exe
-	ReleaseSemaphore(hSemaphoreInject, 1, NULL);
+	MyCreateProcess(TEXT("DllInject.exe"));
 
 	//read from slot and write to file
 	while (!isStopped || 1 < dwMessageRemain)
@@ -65,7 +66,7 @@ DWORD WINAPI LogThreadProc(LPVOID lpParameter)
 		{
 			//read
 			ReadFile(hMailslotLog, szReadBuf, dwMessageSize, NULL, NULL);
-			szReadBuf[dwMessageSize/sizeof(WCHAR)] = L'\0';
+			szReadBuf[dwMessageSize/sizeof(WCHAR)] = TEXT('\0');
 			OutputDebugString(szReadBuf);
 
 			//use new file or not
@@ -75,44 +76,49 @@ DWORD WINAPI LogThreadProc(LPVOID lpParameter)
 				{
 					CloseHandle(hLogFile);
 				}
-				RefreshFileName(szCurrentLogPath);
+				RefreshFileName(szCurrentLogPath, szCurrentDirectory);
 				hLogFile = CreateFile(szCurrentLogPath, GENERIC_WRITE, 0, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL);
 				if (INVALID_HANDLE_VALUE == hLogFile)
 				{
-					OutputDebugString(L"CreateFile ERROR\n");
-					return 0;
+					OutputDebugString(TEXT("CreateFile ERROR\n"));
+					return;
 				}
 				dwFileSize = 0;
 			}
 			//do write
 			WriteFile(hLogFile, szReadBuf, dwMessageSize, &dwWrittenSize, NULL);
 			if (dwMessageSize != dwWrittenSize)
 			{
-				OutputDebugString(L"WriteFile ERROR\n");
-				return 0;
+				OutputDebugString(TEXT("WriteFile ERROR\n"));
+				return;
 			}
 			dwFileSize += dwMessageSize;
 		}
+		if (!isStopped && dwMessageRemain <= 1)
+		{
+			Sleep(1000);
+			OutputDebugString(TEXT("Sleep Here\n"));
+		}
 	}
 
 	CloseHandle(hLogFile);
 	hLogFile = NULL;
 	CloseHandle(hSemaphoreStatus);
 	hSemaphoreStatus = NULL;
 
-	OutputDebugString(L"LogThread Finish\n");
+	OutputDebugString(TEXT("LogThread Finish\n"));
 
-	return 0;
+	return;
 }
 
 
-VOID RefreshFileName(PWCHAR szCurrentLogPath)
+void RefreshFileName(PTCHAR szCurrentLogPath, LPCTSTR szCurrentDirectory)
 {
 	SYSTEMTIME st;
 	GetLocalTime(&st);
-	WCHAR szBuf[MAX_PATH];
+	TCHAR szBuf[MAX_PATH];
 	swprintf_s(szBuf,
-		L"Logs\\ALIHOOK_Monitor_Log_%hu_%hu_%hu_%hu_%hu_%hu_%hu.txt", 
+		TEXT("\\Logs\\ALIHOOK_Monitor_Log_%hu_%hu_%hu_%hu_%hu_%hu_%hu.txt"),
 		st.wYear, 
 		st.wMonth,
 		st.wDay,
@@ -123,27 +129,4 @@ VOID RefreshFileName(PWCHAR szCurrentLogPath)
 	);
 	StringCbCopy(szCurrentLogPath, MAX_PATH, szCurrentDirectory);
 	StringCbCat(szCurrentLogPath, MAX_PATH, szBuf);
-}
-
-
-VOID GetModuleDirectory(PWCHAR szCurrentDirectory)
-{
-	DWORD dwCurDirPathLen;
-	dwCurDirPathLen = GetModuleFileName(NULL, szCurrentDirectory, MAX_PATH);
-	if (!dwCurDirPathLen)
-	{
-		OutputDebugString(L"GetModuleFileName ERROR\n");
-		return;
-	}
-	SIZE_T i = 0;
-	StringCbLengthW(szCurrentDirectory, MAX_PATH, &i);
-	if (0 == i)
-	{
-		OutputDebugString(L"GetModuleFileName ERROR\n");
-		return;
-	}
-	for (; i > 0 && L'\\' != szCurrentDirectory[i - 1]; i--) {}
-	szCurrentDirectory[i] = L'\0';
-	OutputDebugString(szCurrentDirectory);
-	OutputDebugString(L"\n");
 }

APIHOOK/Monitor/Log.h

@@ -0,0 +1,14 @@
+#pragma once
+
+#ifndef __LOG__
+#define __LOG__
+#include "Monitor.h"
+#endif // !__LOG__
+
+
+#define MAX_LOG_SIZE 260
+#define MAX_FILE_SIZE 1024 * 1024
+
+
+void Log();
+void RefreshFileName(PTCHAR szCurrentLogPath, LPCTSTR szCurrentDirectory);

APIHOOK/Monitor/LogThread.h

@@ -6,10 +6,10 @@
 
 int wmain(int argc, wchar_t *argv[], wchar_t *envp[])
 {
-
 	if (2 != argc) {
 		ShowHelp();
 		int i;
+		printf_s("1.start\n2.stop\n3.restart\n\ninput:");
 		scanf_s("%d", &i);
 		switch(i)
 		{
@@ -22,124 +22,109 @@ int wmain(int argc, wchar_t *argv[], wchar_t *envp[])
 		case 3:
 			RestartMonitor();
 			break;
+		default:
+			ShowHelp();
 		}
 	}
-	else if (CSTR_EQUAL == CompareString(LOCALE_SYSTEM_DEFAULT, LINGUISTIC_IGNORECASE, argv[1], -1, L"start", -1))
+	else if (CSTR_EQUAL == CompareString(LOCALE_SYSTEM_DEFAULT, LINGUISTIC_IGNORECASE, argv[1], -1, TEXT("start"), -1))
 	{
 		StartMonitor();
 	}
-	else if (CSTR_EQUAL == CompareString(LOCALE_SYSTEM_DEFAULT, LINGUISTIC_IGNORECASE, argv[1], -1, L"stop", -1))
+	else if (CSTR_EQUAL == CompareString(LOCALE_SYSTEM_DEFAULT, LINGUISTIC_IGNORECASE, argv[1], -1, TEXT("stop"), -1))
 	{
 		StopMonitor();
 	}
-	else if (CSTR_EQUAL == CompareString(LOCALE_SYSTEM_DEFAULT, LINGUISTIC_IGNORECASE, argv[1], -1, L"restart", -1))
+	else if (CSTR_EQUAL == CompareString(LOCALE_SYSTEM_DEFAULT, LINGUISTIC_IGNORECASE, argv[1], -1, TEXT("restart"), -1))
 	{
 		RestartMonitor();
 	}
 	else
 	{
-		OutputDebugString(L"Tooooooo Many\n");
+		OutputDebugString(TEXT("Tooooooo Many\n"));
 		ShowHelp();
 	}
 
 	system("PAUSE");
     return 0;
 }
 
+
 void ShowHelp()
 {
-	OutputDebugString(L"Help: Monitor.exe start|stop|restart\n");
-	//TODO: showhelp
+	printf_s("Help: Monitor.exe start|stop|restart\n");
 }
 
+
 void StartMonitor()
 {
-	OutputDebugString(L"Do start \n");
+	OutputDebugString(TEXT("Do start \n"));
 
 	HANDLE hMutexSingleton = NULL;
-	HANDLE hThreadLog = NULL;
-	WCHAR szDllInjectPath[MAX_PATH];
 
-	hMutexSingleton = CreateMutex(NULL, TRUE, L"APIHOOK_Monitor_Mutex_Singleton");
+	hMutexSingleton = CreateMutex(NULL, TRUE, TEXT("APIHOOK_Monitor_Mutex_Singleton"));
 	if (ERROR_ALREADY_EXISTS == GetLastError())
 	{
-		OutputDebugString(L"ERROR_ALREADY_EXISTS\n");
+		OutputDebugString(TEXT("ERROR_ALREADY_EXISTS\n"));
 		printf("ERROR_ALREADY_EXISTS\n");
 		ShowHelp();
 		return;
 	}
 	if (!hMutexSingleton)
 	{
-		OutputDebugString(L"CreateMutex ERROR\n");
-		return;
-	}
-
-	hSemaphoreInject = CreateSemaphore(NULL, 0, 1, L"APIHOOK_Monitor_Semaphore_Inject");
-	if (!hSemaphoreInject)
-	{
-		OutputDebugString(L"CreateSemaphore ERROR\n");
-		return;
-	}
-
-	//create LogThread
-	hThreadLog = CreateThread(NULL, 0, LogThreadProc, NULL, 0, NULL);
-	if (!hThreadLog)
-	{
-		OutputDebugString(L"CreateThread ERROR\n");
+		OutputDebugString(TEXT("CreateMutex ERROR\n"));
 		return;
 	}
-	WaitForSingleObject(hSemaphoreInject, INFINITE);
 
-	//create DllInject.exe process
-	STARTUPINFO si;
-	PROCESS_INFORMATION pi;
-	ZeroMemory(&si, sizeof(si));
-	ZeroMemory(&pi, sizeof(pi));
-	StringCbCopy(szDllInjectPath, MAX_PATH, szCurrentDirectory);
-	StringCbCat(szDllInjectPath, MAX_PATH, L"DllInject.exe");
-	if (!CreateProcess(szDllInjectPath, NULL, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi))
-	{
-		OutputDebugString(L"CreateProcess DllInject.exe ERROR\n");
-		return;
-	}
-	OutputDebugString(L"CreateProcess DllInject.exe\n");
-	WaitForSingleObject(pi.hProcess, INFINITE);
-	OutputDebugString(L"DllInject.exe Finished\n");
+	Log();
 
-	WaitForSingleObject(hThreadLog, INFINITE);
 	ReleaseMutex(hMutexSingleton);
 	CloseHandle(hMutexSingleton);
 	hMutexSingleton = NULL;
-	CloseHandle(hSemaphoreInject);
-	hSemaphoreInject = NULL;
+
 }
 
+
 void StopMonitor()
 {
-	OutputDebugString(L"Do stop \n");
+	OutputDebugString(TEXT("Do stop \n"));
+
+	MyCreateProcess(TEXT("DllUnInject.dll"));
+
+}
+
+
+void RestartMonitor()
+{
+	OutputDebugString(TEXT("Do restart \n"));
+	StopMonitor();
+	StartMonitor();
+}
+
 
-	WCHAR szDllUnInjectPath[MAX_PATH];
+void MyCreateProcess(LPCTSTR szProcessName)
+{
+	TCHAR szCurrentDirectory[MAX_PATH];
+	TCHAR szProcessPath[MAX_PATH];
 	STARTUPINFO si;
 	PROCESS_INFORMATION pi;
 
 	ZeroMemory(&si, sizeof(si));
 	ZeroMemory(&pi, sizeof(pi));
-	StringCbCopy(szDllUnInjectPath, MAX_PATH, szCurrentDirectory);
-	StringCbCat(szDllUnInjectPath, MAX_PATH, L"DllUnInject.exe");
-	if (!CreateProcess(szDllUnInjectPath, NULL, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi))
+	GetCurrentDirectory(MAX_PATH, szCurrentDirectory);
+	StringCbCopy(szProcessPath, MAX_PATH, szCurrentDirectory);
+	StringCbCat(szProcessPath, MAX_PATH, TEXT("\\"));
+	StringCbCat(szProcessPath, MAX_PATH, szProcessName);
+	OutputDebugString(TEXT("CreateProcess "));
+	OutputDebugString(szProcessPath);
+	OutputDebugString(TEXT("\n"));
+	if (!CreateProcess(szProcessPath, NULL, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi))
 	{
-		OutputDebugString(L"CreateProcess DllUnInject.exe ERROR\n");
+		OutputDebugString(TEXT("CreateProcess "));
+		OutputDebugString(szProcessName);
+		OutputDebugString(TEXT(" ERROR\n"));
 		return;
 	}
-	OutputDebugString(L"CreateProcess DllUnInject.exe\n");
 	WaitForSingleObject(pi.hProcess, INFINITE);
-	OutputDebugString(L"DllUnInject.exe Finished\n");
-
-}
-
-void RestartMonitor()
-{
-	OutputDebugString(L"Do restart \n");
-	StopMonitor();
-	StartMonitor();
+	OutputDebugString(szProcessName);
+	OutputDebugString(TEXT(" Finished\n"));
 }