From 7bfd1c795b419bfc94777ddae65923107baccc67 Mon Sep 17 00:00:00 2001
From: RadWolfie <RadWolfie@users.noreply.github.com>
Date: Mon, 30 Mar 2020 03:55:46 -0500
Subject: [PATCH] move GetLastErrorString and FreeLastErrorString to loader
 source file

---
 src/common/AddressRanges.cpp | 28 ----------------------------
 src/common/AddressRanges.h   |  4 ----
 src/loader/cxbxr-ldr.cpp     | 27 +++++++++++++++++++++++++++
 3 files changed, 27 insertions(+), 32 deletions(-)

diff --git a/src/common/AddressRanges.cpp b/src/common/AddressRanges.cpp
index 86584bbb7..103a35101 100644
--- a/src/common/AddressRanges.cpp
+++ b/src/common/AddressRanges.cpp
@@ -56,31 +56,3 @@ bool VerifyWow64()
 
 	return (bIsWow64 != FALSE);
 }
-
-LPTSTR GetLastErrorString()
-{
-	DWORD err = GetLastError();
-
-	// Translate ErrorCode to String.
-	LPTSTR Error = nullptr;
-	if (::FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
-		NULL,
-		err,
-		0,
-		(LPTSTR)&Error,
-		0,
-		NULL) == 0) {
-		// Failed in translating.
-	}
-
-	return Error;
-}
-
-void FreeLastErrorString(LPTSTR Error)
-{
-	if (Error) {
-		::LocalFree(Error);
-		Error = nullptr;
-	}
-}
-
diff --git a/src/common/AddressRanges.h b/src/common/AddressRanges.h
index 6438f938d..1723cf2e0 100644
--- a/src/common/AddressRanges.h
+++ b/src/common/AddressRanges.h
@@ -113,7 +113,3 @@ extern bool IsOptionalAddressRange(const int index);
 extern int AddressRangeGetSystemFlags(const int index);
 
 extern bool VerifyWow64();
-
-extern LPTSTR GetLastErrorString();
-extern void FreeLastErrorString(LPTSTR Error);
-extern void OutputMessage(const char* msg);
diff --git a/src/loader/cxbxr-ldr.cpp b/src/loader/cxbxr-ldr.cpp
index afec8e3c3..8c1b8ef4e 100644
--- a/src/loader/cxbxr-ldr.cpp
+++ b/src/loader/cxbxr-ldr.cpp
@@ -104,6 +104,33 @@ void OutputMessage(const char* msg)
 	}
 }
 
+LPTSTR GetLastErrorString()
+{
+	DWORD err = GetLastError();
+
+	// Translate ErrorCode to String.
+	LPTSTR Error = nullptr;
+	if (::FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
+		NULL,
+		err,
+		0,
+		(LPTSTR)&Error,
+		0,
+		NULL) == 0) {
+		// Failed in translating.
+	}
+
+	return Error;
+}
+
+void FreeLastErrorString(LPTSTR Error)
+{
+	if (Error) {
+		::LocalFree(Error);
+		Error = nullptr;
+	}
+}
+
 #define EMULATION_DLL "cxbxr-emu.dll"
 
 DWORD CALLBACK rawMain()