Slightly cleaned up code
This commit is contained in:
@@ -11,13 +11,15 @@ extern WCHAR szTitle[];
|
||||
extern LPVOID szBuffer;
|
||||
namespace fs = std::filesystem;
|
||||
|
||||
std::wstring PrintTitle() {
|
||||
std::wstring PrintTitle()
|
||||
{
|
||||
wchar_t szWinTitle[2048];
|
||||
StringCchPrintf(szWinTitle, 2048, L"%s", szBuffer);
|
||||
return szWinTitle;
|
||||
}
|
||||
|
||||
std::wstring GetTimeStamp() {
|
||||
std::wstring GetTimeStamp()
|
||||
{
|
||||
SYSTEMTIME lt;
|
||||
GetLocalTime(<);
|
||||
wchar_t ts[TS_LEN];
|
||||
@@ -25,15 +27,18 @@ std::wstring GetTimeStamp() {
|
||||
return ts;
|
||||
}
|
||||
|
||||
void OpenLogFile() {
|
||||
void OpenLogFile()
|
||||
{
|
||||
wchar_t lpszPath[PATH_LEN]{};
|
||||
DWORD dwPathLength = GetModuleFileNameW(NULL, lpszPath, PATH_LEN);
|
||||
DWORD dwError = GetLastError();
|
||||
if (ERROR_INSUFFICIENT_BUFFER == dwError) {
|
||||
if (ERROR_INSUFFICIENT_BUFFER == dwError)
|
||||
{
|
||||
MessageBoxW(NULL, L"Path to logfile is too long! Working without logging.", (LPCWSTR)szTitle, MB_OK | MB_ICONWARNING);
|
||||
return;
|
||||
}
|
||||
if (NULL == dwPathLength) {
|
||||
if (NULL == dwPathLength)
|
||||
{
|
||||
MessageBoxW(NULL, L"Can't get module filename! Working without logging.", (LPCWSTR)szTitle, MB_OK | MB_ICONWARNING);
|
||||
return;
|
||||
}
|
||||
@@ -48,18 +53,23 @@ void OpenLogFile() {
|
||||
log_path = L"d:\\test.log";
|
||||
#endif
|
||||
logfile.open(log_path);
|
||||
if (logfile.is_open()) {
|
||||
if (logfile.is_open())
|
||||
{
|
||||
diag_log(L"Start logging.");
|
||||
diag_log(L"Logfile:", log_path);
|
||||
diag_log(log_path, L"successfully opened.");
|
||||
} else {
|
||||
}
|
||||
else
|
||||
{
|
||||
MessageBoxW(NULL, L"Can't open logfile! Working without logging.", (LPCWSTR)szTitle, MB_OK | MB_ICONWARNING);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
void CloseLogFile() {
|
||||
if (logfile) {
|
||||
void CloseLogFile()
|
||||
{
|
||||
if (logfile)
|
||||
{
|
||||
diag_log(L"End logging.");
|
||||
logfile.close();
|
||||
}
|
||||
|
||||
@@ -9,46 +9,50 @@ std::wstring GetTimeStamp();
|
||||
std::wstring PrintTitle();
|
||||
|
||||
template <typename T1>
|
||||
void diag_log(T1 arg1) {
|
||||
void diag_log(T1 arg1)
|
||||
{
|
||||
logfile << GetTimeStamp() << arg1 << std::endl;
|
||||
}
|
||||
|
||||
template <typename T1, typename T2>
|
||||
void diag_log(T1 arg1, T2 arg2) {
|
||||
void diag_log(T1 arg1, T2 arg2)
|
||||
{
|
||||
logfile << GetTimeStamp() << arg1 << ' ' << arg2 << std::endl;
|
||||
}
|
||||
|
||||
template <typename T1, typename T2, typename T3>
|
||||
void diag_log(T1 arg1, T2 arg2, T3 arg3) {
|
||||
void diag_log(T1 arg1, T2 arg2, T3 arg3)
|
||||
{
|
||||
logfile << GetTimeStamp() << arg1 << ' ' << arg2 << ' ' << arg3 << std::endl;
|
||||
}
|
||||
|
||||
template <typename T1, typename T2, typename T3, typename T4>
|
||||
void diag_log(T1 arg1, T2 arg2, T3 arg3, T4 arg4) {
|
||||
//if (typeid(T4) == typeid(WCHAR)) {
|
||||
// logfile << GetTimeStamp() << arg1 << ' ' << arg2 << ' ' << arg3 << ' ' << PrintTitle() << std::endl;
|
||||
// return;
|
||||
//}
|
||||
void diag_log(T1 arg1, T2 arg2, T3 arg3, T4 arg4)
|
||||
{
|
||||
logfile << GetTimeStamp() << arg1 << ' ' << arg2 << ' ' << arg3 << ' ' << arg4 << std::endl;
|
||||
}
|
||||
|
||||
template <typename T1, typename T2, typename T3, typename T4, typename T5>
|
||||
void diag_log(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5) {
|
||||
void diag_log(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5)
|
||||
{
|
||||
logfile << GetTimeStamp() << arg1 << ' ' << arg2 << ' ' << arg3 << ' ' << arg4 << ' ' << arg5 << std::endl;
|
||||
}
|
||||
|
||||
template <typename T1, typename T2, typename T3, typename T4, typename T5, typename T6>
|
||||
void diag_log(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6) {
|
||||
void diag_log(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6)
|
||||
{
|
||||
logfile << GetTimeStamp() << arg1 << ' ' << arg2 << ' ' << arg3 << ' ' << arg4 << ' ' << arg5 << ' ' << arg6 << std::endl;
|
||||
}
|
||||
|
||||
template <typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7>
|
||||
void diag_log(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6, T7 arg7) {
|
||||
void diag_log(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6, T7 arg7)
|
||||
{
|
||||
logfile << GetTimeStamp() << arg1 << ' ' << arg2 << ' ' << arg3 << ' ' << arg4 << ' ' << arg5 << ' ' << arg6 << ' ' << arg7 << std::endl;
|
||||
}
|
||||
|
||||
template <typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8>
|
||||
void diag_log(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6, T7 arg7, T8 arg8) {
|
||||
void diag_log(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6, T7 arg7, T8 arg8)
|
||||
{
|
||||
logfile << GetTimeStamp() << arg1 << ' ' << arg2 << ' ' << arg3 << ' ' << arg4 << ' ' << arg5 << ' ' << arg6 << ' ' << arg7 << ' ' << arg8 << std::endl;
|
||||
}
|
||||
|
||||
|
||||
@@ -5,13 +5,14 @@
|
||||
#pragma once
|
||||
|
||||
#include "targetver.h"
|
||||
//#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
|
||||
#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
|
||||
// Windows Header Files
|
||||
#include <iostream>
|
||||
#include <fstream>
|
||||
#include <filesystem>
|
||||
#include <string>
|
||||
#include <strsafe.h>
|
||||
#include <shellapi.h>
|
||||
#include <windows.h>
|
||||
#include <CommCtrl.h>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user