From dc80785993a64adfefa8c9489ec158fbd692fda8 Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Tue, 2 Jan 2024 20:02:32 -0500
Subject: [PATCH] Change type

---
 LEGO1/mxdirect3d.cpp |  8 ++++----
 LEGO1/mxdirect3d.h   | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/LEGO1/mxdirect3d.cpp b/LEGO1/mxdirect3d.cpp
index 756b942b..0c621503 100644
--- a/LEGO1/mxdirect3d.cpp
+++ b/LEGO1/mxdirect3d.cpp
@@ -147,7 +147,7 @@ MxDeviceModeFinder::~MxDeviceModeFinder()
 }
 
 // FUNCTION: LEGO1 0x1009ba80
-MxDeviceEnumerateElement::MxDeviceEnumerateElement(GUID FAR* p_guid, LPSTR p_driverDesc, LPSTR p_driverName)
+MxDeviceEnumerateElement::MxDeviceEnumerateElement(LPGUID p_guid, LPSTR p_driverDesc, LPSTR p_driverName)
 {
 	m_guid = NULL;
 	m_driverDesc = NULL;
@@ -171,7 +171,7 @@ MxDeviceEnumerateElement::~MxDeviceEnumerateElement()
 }
 
 // FUNCTION: LEGO1 0x1009bc30
-void MxDeviceEnumerateElement::Init(GUID FAR* p_guid, LPSTR p_driverDesc, LPSTR p_driverName)
+void MxDeviceEnumerateElement::Init(LPGUID p_guid, LPSTR p_driverDesc, LPSTR p_driverName)
 {
 	if (m_driverDesc) {
 		delete[] m_driverDesc;
@@ -206,7 +206,7 @@ MxDeviceEnumerate::MxDeviceEnumerate()
 }
 
 // FUNCTION: LEGO1 0x1009c070
-BOOL MxDeviceEnumerate::EnumDirectDrawCallback(GUID FAR* p_guid, LPSTR p_driverDesc, LPSTR p_driverName)
+BOOL MxDeviceEnumerate::EnumDirectDrawCallback(LPGUID p_guid, LPSTR p_driverDesc, LPSTR p_driverName)
 {
 	MxDeviceEnumerateElement device(p_guid, p_driverDesc, p_driverName);
 	m_list.push_back(device);
@@ -309,7 +309,7 @@ MxResult MxDeviceEnumerate::DoEnumerate()
 }
 
 // FUNCTION: LEGO1 0x1009c710
-BOOL CALLBACK DirectDrawEnumerateCallback(GUID FAR* p_guid, LPSTR p_driverDesc, LPSTR p_driverName, LPVOID p_context)
+BOOL CALLBACK DirectDrawEnumerateCallback(LPGUID p_guid, LPSTR p_driverDesc, LPSTR p_driverName, LPVOID p_context)
 {
 	MxDeviceEnumerate* deviceEnumerate = (MxDeviceEnumerate*) p_context;
 	return deviceEnumerate->EnumDirectDrawCallback(p_guid, p_driverDesc, p_driverName);
diff --git a/LEGO1/mxdirect3d.h b/LEGO1/mxdirect3d.h
index 937cd75b..92fa2fb8 100644
--- a/LEGO1/mxdirect3d.h
+++ b/LEGO1/mxdirect3d.h
@@ -77,11 +77,11 @@ struct MxDeviceEnumerate0x184Element {
 struct MxDeviceEnumerateElement {
 	MxDeviceEnumerateElement() {}
 	~MxDeviceEnumerateElement();
-	MxDeviceEnumerateElement(GUID FAR* p_guid, LPSTR p_driverDesc, LPSTR p_driverName);
+	MxDeviceEnumerateElement(LPGUID p_guid, LPSTR p_driverDesc, LPSTR p_driverName);
 
-	void Init(GUID FAR* p_guid, LPSTR p_driverDesc, LPSTR p_driverName);
+	void Init(LPGUID p_guid, LPSTR p_driverDesc, LPSTR p_driverName);
 
-	GUID* m_guid;                                   // 0x00
+	LPGUID m_guid;                                  // 0x00
 	LPSTR m_driverDesc;                             // 0x04
 	LPSTR m_driverName;                             // 0x08
 	DDCAPS m_ddCaps;                                // 0x0c
@@ -116,7 +116,7 @@ class MxDeviceEnumerate {
 
 	virtual MxResult DoEnumerate(); // vtable+0x00
 
-	BOOL EnumDirectDrawCallback(GUID FAR* p_guid, LPSTR p_driverDesc, LPSTR p_driverName);
+	BOOL EnumDirectDrawCallback(LPGUID p_guid, LPSTR p_driverDesc, LPSTR p_driverName);
 	const char* EnumerateErrorToString(HRESULT p_error);
 	MxS32 ParseDeviceName(const char* p_deviceId);
 	MxResult FUN_1009d030(MxS32 p_und1, undefined** p_und2, undefined** p_und3);
@@ -130,7 +130,7 @@ class MxDeviceEnumerate {
 	MxBool m_unk0x10;                      // 0x10
 };
 
-BOOL CALLBACK DirectDrawEnumerateCallback(GUID FAR* p_guid, LPSTR p_driverDesc, LPSTR p_driverName, LPVOID p_context);
+BOOL CALLBACK DirectDrawEnumerateCallback(LPGUID p_guid, LPSTR p_driverDesc, LPSTR p_driverName, LPVOID p_context);
 HRESULT CALLBACK DisplayModesEnumerateCallback(LPDDSURFACEDESC, LPVOID);
 HRESULT CALLBACK DevicesEnumerateCallback(
 	LPGUID p_lpGuid,