From 52d9b951a5c308cb7369055e3d029a67c653b0dc Mon Sep 17 00:00:00 2001
From: jonschz <jonschz@users.noreply.github.com>
Date: Sun, 7 Jul 2024 20:00:07 +0200
Subject: [PATCH] Extract LegoDeviceEnumerate to dedicated file

---
 LEGO1/mxdirectx/legodxinfo.cpp  |  6 +++---
 LEGO1/mxdirectx/legodxinfo.h    | 22 ++++++++++++++++++++++
 LEGO1/mxdirectx/mxdirectxinfo.h | 17 +----------------
 3 files changed, 26 insertions(+), 19 deletions(-)
 create mode 100644 LEGO1/mxdirectx/legodxinfo.h

diff --git a/LEGO1/mxdirectx/legodxinfo.cpp b/LEGO1/mxdirectx/legodxinfo.cpp
index edf8a79c..63bedc7e 100644
--- a/LEGO1/mxdirectx/legodxinfo.cpp
+++ b/LEGO1/mxdirectx/legodxinfo.cpp
@@ -1,4 +1,4 @@
-#include "mxdirectxinfo.h"
+#include "legodxinfo.h"
 
 #include <assert.h>
 #include <stdio.h> // for vsprintf
@@ -7,7 +7,7 @@
 
 // FUNCTION: CONFIG 0x004027d0
 // FUNCTION: BETA10 0x1011cb70
-int MxDeviceEnumerate::FormatDeviceName(char* p_buffer, const MxDriver* p_ddInfo, const Direct3DDeviceInfo* p_d3dInfo)
+int LegoDeviceEnumerate::FormatDeviceName(char* p_buffer, const MxDriver* p_ddInfo, const Direct3DDeviceInfo* p_d3dInfo)
 	const
 {
 	int number = 0;
@@ -29,7 +29,7 @@ int MxDeviceEnumerate::FormatDeviceName(char* p_buffer, const MxDriver* p_ddInfo
 // FUNCTION: CONFIG 0x00402620
 // FUNCTION: LEGO1 0x1009cf20
 // FUNCTION: BETA10 0x1011c8b3
-int MxDeviceEnumerate::ProcessDeviceBytes(int p_deviceNum, GUID& p_guid)
+int LegoDeviceEnumerate::ProcessDeviceBytes(int p_deviceNum, GUID& p_guid)
 {
 	if (!IsInitialized()) {
 		return -1;
diff --git a/LEGO1/mxdirectx/legodxinfo.h b/LEGO1/mxdirectx/legodxinfo.h
new file mode 100644
index 00000000..9311ebd8
--- /dev/null
+++ b/LEGO1/mxdirectx/legodxinfo.h
@@ -0,0 +1,22 @@
+#ifndef LEGODXINFO_H
+#define LEGODXINFO_H
+
+#include "mxdirectxinfo.h"
+
+// VTABLE: CONFIG 0x4060e4
+// VTABLE: LEGO1 0x100d9cc8
+// VTABLE: BETA10 0x101befb4
+// SIZE 0x14
+class LegoDeviceEnumerate : public MxDeviceEnumerate {
+	int ProcessDeviceBytes(int p_deviceNum, GUID& p_guid);
+	int FormatDeviceName(char* p_buffer, const MxDriver* p_ddInfo, const Direct3DDeviceInfo* p_d3dInfo) const;
+
+	// SYNTHETIC: BETA10 0x100d8d10
+	// LegoDeviceEnumerate::LegoDeviceEnumerate
+
+	// SYNTHETIC: LEGO1 0x1007b590
+	// SYNTHETIC: BETA10 0x100d8da0
+	// LegoDeviceEnumerate::~LegoDeviceEnumerate
+};
+
+#endif // LEGODXINFO_H
diff --git a/LEGO1/mxdirectx/mxdirectxinfo.h b/LEGO1/mxdirectx/mxdirectxinfo.h
index e585cd1e..9cf36814 100644
--- a/LEGO1/mxdirectx/mxdirectxinfo.h
+++ b/LEGO1/mxdirectx/mxdirectxinfo.h
@@ -204,9 +204,7 @@ class MxDeviceEnumerate {
 	);
 	const char* EnumerateErrorToString(HRESULT p_error);
 	int ParseDeviceName(const char* p_deviceId);
-	int ProcessDeviceBytes(int p_deviceNum, GUID& p_guid);
 	int GetDevice(int p_deviceNum, MxDriver*& p_driver, Direct3DDeviceInfo*& p_device);
-	int FormatDeviceName(char* p_buffer, const MxDriver* p_ddInfo, const Direct3DDeviceInfo* p_d3dInfo) const;
 	int BETA_1011cc65(int p_idx, char* p_buffer);
 
 	int FUN_1009d0d0();
@@ -251,24 +249,11 @@ class MxDeviceEnumerate {
 	// FUNCTION: BETA10 0x1011d320
 	unsigned char IsInitialized() const { return m_initialized; }
 
-private:
+protected:
 	list<MxDriver> m_list;       // 0x04
 	unsigned char m_initialized; // 0x10
 };
 
-// VTABLE: CONFIG 0x4060e4
-// VTABLE: LEGO1 0x100d9cc8
-// VTABLE: BETA10 0x101befb4
-// SIZE 0x14
-class LegoDeviceEnumerate : public MxDeviceEnumerate {};
-
-// SYNTHETIC: BETA10 0x100d8d10
-// LegoDeviceEnumerate::LegoDeviceEnumerate
-
-// SYNTHETIC: LEGO1 0x1007b590
-// SYNTHETIC: BETA10 0x100d8da0
-// LegoDeviceEnumerate::~LegoDeviceEnumerate
-
 // TEMPLATE: BETA10 0x1011c1b0
 // list<Direct3DDeviceInfo,allocator<Direct3DDeviceInfo> >::iterator::operator*