From 9fe46f867c29468e7580332944cd67cbd581b845 Mon Sep 17 00:00:00 2001
From: W0LF <dreamforce@yandex.ru>
Date: Sat, 20 May 2023 12:51:45 +0300
Subject: [PATCH] Added globals.h header file for global variables.

---
 wCenterWindow/Logger.h              |  8 ++++----
 wCenterWindow/framework.h           |  4 ----
 wCenterWindow/globals.h             | 12 ++++++++++++
 wCenterWindow/wCenterWindow.cpp     |  3 ++-
 wCenterWindow/wCenterWindow.vcxproj |  1 +
 5 files changed, 19 insertions(+), 9 deletions(-)
 create mode 100644 wCenterWindow/globals.h

diff --git a/wCenterWindow/Logger.h b/wCenterWindow/Logger.h
index 5a2d885..b845e76 100644
--- a/wCenterWindow/Logger.h
+++ b/wCenterWindow/Logger.h
@@ -5,13 +5,13 @@
 // Usage: LOG_TO_FILE(L"%s(%d): Log message", TEXT(__FUNCTION__), __LINE__);
 //
 #pragma once
-#include "framework.h"
+#include "globals.h"
+#include "wCenterWindow.h"
 
-#define DBUFLEN 256
 #define LOG_TO_FILE(fmt, ...) do { StringCchPrintfW(debugBuffer, DBUFLEN, fmt, ##__VA_ARGS__); logfile << GetTimeStamp() << debugBuffer << std::endl; } while (0)
 
 SYSTEMTIME lt;
-wchar_t debugTimeBuffer[32];
+wchar_t debugTimeBuffer[TBUFLEN];
 wchar_t debugBuffer[DBUFLEN];
 std::wofstream logfile;
 
@@ -20,7 +20,7 @@ extern wchar_t szTitle[];
 wchar_t* GetTimeStamp()
 {
 	GetLocalTime(&lt);
-	StringCchPrintfW(debugTimeBuffer, 32, L"%d-%02d-%02d %02d:%02d:%02d.%03d | ", lt.wYear, lt.wMonth, lt.wDay, lt.wHour, lt.wMinute, lt.wSecond, lt.wMilliseconds);
+	StringCchPrintfW(debugTimeBuffer, TBUFLEN, L"%d-%02d-%02d %02d:%02d:%02d.%03d | ", lt.wYear, lt.wMonth, lt.wDay, lt.wHour, lt.wMinute, lt.wSecond, lt.wMilliseconds);
 	return debugTimeBuffer;
 }
 
diff --git a/wCenterWindow/framework.h b/wCenterWindow/framework.h
index 9da34e8..0ac4dbf 100644
--- a/wCenterWindow/framework.h
+++ b/wCenterWindow/framework.h
@@ -17,7 +17,3 @@
 // Project Specific Header Files
 #include "logger.h"
 #include "VersionInfo.h"
-
-// Extern variables
-#define MAX_LOADSTRING 50
-WCHAR szTitle[MAX_LOADSTRING];          // wCenterWindow's title
diff --git a/wCenterWindow/globals.h b/wCenterWindow/globals.h
new file mode 100644
index 0000000..60cc4a1
--- /dev/null
+++ b/wCenterWindow/globals.h
@@ -0,0 +1,12 @@
+// wCenterWindow
+// globals.h
+//
+#pragma once
+
+#define MAX_LOADSTRING 50
+#define TBUFLEN 32
+#define DBUFLEN 256
+
+extern WCHAR szTitle[MAX_LOADSTRING];
+extern std::wofstream logfile;
+
diff --git a/wCenterWindow/wCenterWindow.cpp b/wCenterWindow/wCenterWindow.cpp
index 690df8b..4e914b4 100644
--- a/wCenterWindow/wCenterWindow.cpp
+++ b/wCenterWindow/wCenterWindow.cpp
@@ -7,6 +7,7 @@
 // TODO: Make x64 version.
 //
 #include "framework.h"
+#include "globals.h"
 #include "logger.h"
 #include "wCenterWindow.h"
 
@@ -20,7 +21,7 @@
 
 // Global variables:
 HINSTANCE			hInst;									// Instance
-extern WCHAR		szTitle[];
+WCHAR				szTitle[MAX_LOADSTRING];				// wCenterWindow's title
 WCHAR				szClass[MAX_LOADSTRING];				// Window's class
 WCHAR				szWinTitle[256];
 WCHAR				szWinClass[256];
diff --git a/wCenterWindow/wCenterWindow.vcxproj b/wCenterWindow/wCenterWindow.vcxproj
index b7be72f..76aa750 100644
--- a/wCenterWindow/wCenterWindow.vcxproj
+++ b/wCenterWindow/wCenterWindow.vcxproj
@@ -187,6 +187,7 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="framework.h" />
+    <ClInclude Include="globals.h" />
     <ClInclude Include="logger.h" />
     <ClInclude Include="resource.h" />
     <ClInclude Include="targetver.h" />