From f5cb2d47324118c91e4f1760885752c91c49321d Mon Sep 17 00:00:00 2001
From: Anders Jenbo <anders@jenbo.dk>
Date: Fri, 16 May 2025 04:22:40 +0200
Subject: [PATCH 1/2] Use consts in callbacks (#1494)

---
 LEGO1/mxdirectx/mxdirectxinfo.cpp | 16 ++++++++--------
 LEGO1/mxdirectx/mxdirectxinfo.h   | 16 ++++++++--------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/LEGO1/mxdirectx/mxdirectxinfo.cpp b/LEGO1/mxdirectx/mxdirectxinfo.cpp
index 4d2950e3..11ca9da2 100644
--- a/LEGO1/mxdirectx/mxdirectxinfo.cpp
+++ b/LEGO1/mxdirectx/mxdirectxinfo.cpp
@@ -41,7 +41,7 @@ MxDriver::MxDriver(LPGUID p_guid)
 // FUNCTION: CONFIG 0x00401180
 // FUNCTION: LEGO1 0x1009ba80
 // FUNCTION: BETA10 0x1011d8b6
-MxDriver::MxDriver(LPGUID p_guid, LPSTR p_driverDesc, LPSTR p_driverName)
+MxDriver::MxDriver(LPGUID p_guid, LPCSTR p_driverDesc, LPCSTR p_driverName)
 {
 	m_guid = NULL;
 	m_driverDesc = NULL;
@@ -70,7 +70,7 @@ MxDriver::~MxDriver()
 // FUNCTION: CONFIG 0x00401330
 // FUNCTION: LEGO1 0x1009bc30
 // FUNCTION: BETA10 0x1011da89
-void MxDriver::Init(LPGUID p_guid, LPSTR p_driverDesc, LPSTR p_driverName)
+void MxDriver::Init(LPGUID p_guid, LPCSTR p_driverDesc, LPCSTR p_driverName)
 {
 	if (m_driverDesc) {
 		delete[] m_driverDesc;
@@ -103,8 +103,8 @@ void MxDriver::Init(LPGUID p_guid, LPSTR p_driverDesc, LPSTR p_driverName)
 // FUNCTION: BETA10 0x1011dbd0
 Direct3DDeviceInfo::Direct3DDeviceInfo(
 	LPGUID p_guid,
-	LPSTR p_deviceDesc,
-	LPSTR p_deviceName,
+	LPCSTR p_deviceDesc,
+	LPCSTR p_deviceName,
 	LPD3DDEVICEDESC p_HWDesc,
 	LPD3DDEVICEDESC p_HELDesc
 )
@@ -135,8 +135,8 @@ Direct3DDeviceInfo::~Direct3DDeviceInfo()
 // FUNCTION: BETA10 0x1011dca6
 void Direct3DDeviceInfo::Initialize(
 	LPGUID p_guid,
-	LPSTR p_deviceDesc,
-	LPSTR p_deviceName,
+	LPCSTR p_deviceDesc,
+	LPCSTR p_deviceName,
 	LPD3DDEVICEDESC p_HWDesc,
 	LPD3DDEVICEDESC p_HELDesc
 )
@@ -320,8 +320,8 @@ HRESULT MxDeviceEnumerate::EnumDisplayModesCallback(LPDDSURFACEDESC p_ddsd)
 // FUNCTION: BETA10 0x1011e32f
 HRESULT MxDeviceEnumerate::EnumDevicesCallback(
 	LPGUID p_guid,
-	LPSTR p_deviceDesc,
-	LPSTR p_deviceName,
+	LPCSTR p_deviceDesc,
+	LPCSTR p_deviceName,
 	LPD3DDEVICEDESC p_HWDesc,
 	LPD3DDEVICEDESC p_HELDesc
 )
diff --git a/LEGO1/mxdirectx/mxdirectxinfo.h b/LEGO1/mxdirectx/mxdirectxinfo.h
index ac68af79..ba6b1f00 100644
--- a/LEGO1/mxdirectx/mxdirectxinfo.h
+++ b/LEGO1/mxdirectx/mxdirectxinfo.h
@@ -67,16 +67,16 @@ struct Direct3DDeviceInfo {
 	~Direct3DDeviceInfo();
 	Direct3DDeviceInfo(
 		LPGUID p_guid,
-		LPSTR p_deviceDesc,
-		LPSTR p_deviceName,
+		LPCSTR p_deviceDesc,
+		LPCSTR p_deviceName,
 		LPD3DDEVICEDESC p_HWDesc,
 		LPD3DDEVICEDESC p_HELDesc
 	);
 
 	void Initialize(
 		LPGUID p_guid,
-		LPSTR p_deviceDesc,
-		LPSTR p_deviceName,
+		LPCSTR p_deviceDesc,
+		LPCSTR p_deviceName,
 		LPD3DDEVICEDESC p_HWDesc,
 		LPD3DDEVICEDESC p_HELDesc
 	);
@@ -115,9 +115,9 @@ struct MxDriver {
 	MxDriver() {}
 	~MxDriver();
 	MxDriver(LPGUID p_guid);
-	MxDriver(LPGUID p_guid, LPSTR p_driverDesc, LPSTR p_driverName);
+	MxDriver(LPGUID p_guid, LPCSTR p_driverDesc, LPCSTR p_driverName);
 
-	void Init(LPGUID p_guid, LPSTR p_driverDesc, LPSTR p_driverName);
+	void Init(LPGUID p_guid, LPCSTR p_driverDesc, LPCSTR p_driverName);
 
 	LPGUID m_guid;                      // 0x00
 	char* m_driverDesc;                 // 0x04
@@ -198,8 +198,8 @@ public:
 	HRESULT EnumDisplayModesCallback(LPDDSURFACEDESC p_ddsd);
 	HRESULT EnumDevicesCallback(
 		LPGUID p_guid,
-		LPSTR p_deviceDesc,
-		LPSTR p_deviceName,
+		LPCSTR p_deviceDesc,
+		LPCSTR p_deviceName,
 		LPD3DDEVICEDESC p_HWDesc,
 		LPD3DDEVICEDESC p_HELDesc
 	);

From 46ae3fbe892c88d07d5fb88b5c97d29be7b58232 Mon Sep 17 00:00:00 2001
From: Anders Jenbo <anders@jenbo.dk>
Date: Fri, 16 May 2025 06:11:06 +0200
Subject: [PATCH 2/2] Order enums the same way in both places (#1495)

To match LEGO1/mxdirectx/mxdirectdraw.cpp so it's not so confusing to compare uage
---
 LEGO1/omni/src/video/mxdisplaysurface.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LEGO1/omni/src/video/mxdisplaysurface.cpp b/LEGO1/omni/src/video/mxdisplaysurface.cpp
index 3e235d9c..86f1b4dc 100644
--- a/LEGO1/omni/src/video/mxdisplaysurface.cpp
+++ b/LEGO1/omni/src/video/mxdisplaysurface.cpp
@@ -196,7 +196,7 @@ MxResult MxDisplaySurface::Create(MxVideoParam& p_videoParam)
 		ddsd.dwSize = sizeof(ddsd);
 		ddsd.dwBackBufferCount = m_videoParam.GetBackBuffers();
 		ddsd.dwFlags = DDSD_CAPS | DDSD_BACKBUFFERCOUNT;
-		ddsd.ddsCaps.dwCaps = DDSCAPS_3DDEVICE | DDSCAPS_PRIMARYSURFACE | DDSCAPS_FLIP | DDSCAPS_COMPLEX;
+		ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE | DDSCAPS_FLIP | DDSCAPS_3DDEVICE | DDSCAPS_COMPLEX;
 
 		if (lpDirectDraw->CreateSurface(&ddsd, &m_ddSurface1, NULL)) {
 			goto done;