W0LF/wCenterWindow-1
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Slightly cleaned up code

Browse Source
This commit is contained in:
dreamforceinc
2022-02-12 18:13:19 +03:00
parent b5e040f3d5
commit f58e6a99cb
3 changed files with 37 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
wCenterWindow/Logger.cpp
View File

@@ -11,13 +11,15 @@ extern WCHAR szTitle[];
extern LPVOID szBuffer; extern LPVOID szBuffer;
namespace fs = std::filesystem; namespace fs = std::filesystem;
std::wstring PrintTitle() { std::wstring PrintTitle()
{
wchar_t szWinTitle[2048]; wchar_t szWinTitle[2048];
StringCchPrintf(szWinTitle, 2048, L"%s", szBuffer); StringCchPrintf(szWinTitle, 2048, L"%s", szBuffer);
return szWinTitle; return szWinTitle;
} }
std::wstring GetTimeStamp() { std::wstring GetTimeStamp()
{
SYSTEMTIME lt; SYSTEMTIME lt;
GetLocalTime(&lt); GetLocalTime(&lt);
wchar_t ts[TS_LEN]; wchar_t ts[TS_LEN];
@@ -25,15 +27,18 @@ std::wstring GetTimeStamp() {
return ts; return ts;
} }
void OpenLogFile() { void OpenLogFile()
{
wchar_t lpszPath[PATH_LEN]{}; wchar_t lpszPath[PATH_LEN]{};
DWORD dwPathLength = GetModuleFileNameW(NULL, lpszPath, PATH_LEN); DWORD dwPathLength = GetModuleFileNameW(NULL, lpszPath, PATH_LEN);
DWORD dwError = GetLastError(); 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); MessageBoxW(NULL, L"Path to logfile is too long! Working without logging.", (LPCWSTR)szTitle, MB_OK | MB_ICONWARNING);
return; return;
} }
if (NULL == dwPathLength) { if (NULL == dwPathLength)
{
MessageBoxW(NULL, L"Can't get module filename! Working without logging.", (LPCWSTR)szTitle, MB_OK | MB_ICONWARNING); MessageBoxW(NULL, L"Can't get module filename! Working without logging.", (LPCWSTR)szTitle, MB_OK | MB_ICONWARNING);
return; return;
} }
@@ -48,18 +53,23 @@ void OpenLogFile() {
log_path = L"d:\\test.log"; log_path = L"d:\\test.log";
#endif #endif
logfile.open(log_path); logfile.open(log_path);
if (logfile.is_open()) { if (logfile.is_open())
{
diag_log(L"Start logging."); diag_log(L"Start logging.");
diag_log(L"Logfile:", log_path); diag_log(L"Logfile:", log_path);
diag_log(log_path, L"successfully opened."); 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); MessageBoxW(NULL, L"Can't open logfile! Working without logging.", (LPCWSTR)szTitle, MB_OK | MB_ICONWARNING);
} }
return; return;
} }
void CloseLogFile() { void CloseLogFile()
if (logfile) { {
if (logfile)
{
diag_log(L"End logging."); diag_log(L"End logging.");
logfile.close(); logfile.close();
} }

28
wCenterWindow/Logger.h
View File

@@ -9,46 +9,50 @@ std::wstring GetTimeStamp();
std::wstring PrintTitle(); std::wstring PrintTitle();
template <typename T1> template <typename T1>
void diag_log(T1 arg1) { void diag_log(T1 arg1)
{
logfile << GetTimeStamp() << arg1 << std::endl; logfile << GetTimeStamp() << arg1 << std::endl;
} }
template <typename T1, typename T2> 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; logfile << GetTimeStamp() << arg1 << ' ' << arg2 << std::endl;
} }
template <typename T1, typename T2, typename T3> 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; logfile << GetTimeStamp() << arg1 << ' ' << arg2 << ' ' << arg3 << std::endl;
} }
template <typename T1, typename T2, typename T3, typename T4> template <typename T1, typename T2, typename T3, typename T4>
void diag_log(T1 arg1, T2 arg2, T3 arg3, T4 arg4) { 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;
//}
logfile << GetTimeStamp() << arg1 << ' ' << arg2 << ' ' << arg3 << ' ' << arg4 << std::endl; logfile << GetTimeStamp() << arg1 << ' ' << arg2 << ' ' << arg3 << ' ' << arg4 << std::endl;
} }
template <typename T1, typename T2, typename T3, typename T4, typename T5> 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; logfile << GetTimeStamp() << arg1 << ' ' << arg2 << ' ' << arg3 << ' ' << arg4 << ' ' << arg5 << std::endl;
} }
template <typename T1, typename T2, typename T3, typename T4, typename T5, typename T6> 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; 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> 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; 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> 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; logfile << GetTimeStamp() << arg1 << ' ' << arg2 << ' ' << arg3 << ' ' << arg4 << ' ' << arg5 << ' ' << arg6 << ' ' << arg7 << ' ' << arg8 << std::endl;
} }

3
wCenterWindow/framework.h
View File

@@ -5,13 +5,14 @@
#pragma once #pragma once
#include "targetver.h" #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 // Windows Header Files
#include <iostream> #include <iostream>
#include <fstream> #include <fstream>
#include <filesystem> #include <filesystem>
#include <string> #include <string>
#include <strsafe.h> #include <strsafe.h>
#include <shellapi.h>
#include <windows.h> #include <windows.h>
#include <CommCtrl.h> #include <CommCtrl.h>