TheCloud/isle-portable
1
0
Fork 0
mirror of https://github.com/isledecomp/isle-portable.git synced 2025-09-26 14:13:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'isle/master'

Browse Source
This commit is contained in:
Christian Semmler 2025-05-16 12:42:48 -07:00
commit 4ada014dfd
No known key found for this signature in database
GPG Key ID: 086DAA1360BEEE5C
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
LEGO1/mxdirectx/mxdirectxinfo.cpp
View File

@ -42,7 +42,7 @@ MxDriver::MxDriver(LPGUID p_guid)
// FUNCTION: CONFIG 0x00401180 // FUNCTION: CONFIG 0x00401180
// FUNCTION: LEGO1 0x1009ba80 // FUNCTION: LEGO1 0x1009ba80
// FUNCTION: BETA10 0x1011d8b6 // 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_guid = NULL;
m_driverDesc = NULL; m_driverDesc = NULL;
@ -71,7 +71,7 @@ MxDriver::~MxDriver()
// FUNCTION: CONFIG 0x00401330 // FUNCTION: CONFIG 0x00401330
// FUNCTION: LEGO1 0x1009bc30 // FUNCTION: LEGO1 0x1009bc30
// FUNCTION: BETA10 0x1011da89 // 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) { if (m_driverDesc) {
delete[] m_driverDesc; delete[] m_driverDesc;
@ -104,8 +104,8 @@ void MxDriver::Init(LPGUID p_guid, LPSTR p_driverDesc, LPSTR p_driverName)
// FUNCTION: BETA10 0x1011dbd0 // FUNCTION: BETA10 0x1011dbd0
Direct3DDeviceInfo::Direct3DDeviceInfo( Direct3DDeviceInfo::Direct3DDeviceInfo(
LPGUID p_guid, LPGUID p_guid,
LPSTR p_deviceDesc, LPCSTR p_deviceDesc,
LPSTR p_deviceName, LPCSTR p_deviceName,
LPD3DDEVICEDESC p_HWDesc, LPD3DDEVICEDESC p_HWDesc,
LPD3DDEVICEDESC p_HELDesc LPD3DDEVICEDESC p_HELDesc
) )
@ -136,8 +136,8 @@ Direct3DDeviceInfo::~Direct3DDeviceInfo()
// FUNCTION: BETA10 0x1011dca6 // FUNCTION: BETA10 0x1011dca6
void Direct3DDeviceInfo::Initialize( void Direct3DDeviceInfo::Initialize(
LPGUID p_guid, LPGUID p_guid,
LPSTR p_deviceDesc, LPCSTR p_deviceDesc,
LPSTR p_deviceName, LPCSTR p_deviceName,
LPD3DDEVICEDESC p_HWDesc, LPD3DDEVICEDESC p_HWDesc,
LPD3DDEVICEDESC p_HELDesc LPD3DDEVICEDESC p_HELDesc
) )
@ -318,8 +318,8 @@ HRESULT MxDeviceEnumerate::EnumDisplayModesCallback(LPDDSURFACEDESC p_ddsd)
// FUNCTION: BETA10 0x1011e32f // FUNCTION: BETA10 0x1011e32f
HRESULT MxDeviceEnumerate::EnumDevicesCallback( HRESULT MxDeviceEnumerate::EnumDevicesCallback(
LPGUID p_guid, LPGUID p_guid,
LPSTR p_deviceDesc, LPCSTR p_deviceDesc,
LPSTR p_deviceName, LPCSTR p_deviceName,
LPD3DDEVICEDESC p_HWDesc, LPD3DDEVICEDESC p_HWDesc,
LPD3DDEVICEDESC p_HELDesc LPD3DDEVICEDESC p_HELDesc
) )

16
LEGO1/mxdirectx/mxdirectxinfo.h
View File

@ -71,16 +71,16 @@ struct Direct3DDeviceInfo {
~Direct3DDeviceInfo(); ~Direct3DDeviceInfo();
Direct3DDeviceInfo( Direct3DDeviceInfo(
LPGUID p_guid, LPGUID p_guid,
LPSTR p_deviceDesc, LPCSTR p_deviceDesc,
LPSTR p_deviceName, LPCSTR p_deviceName,
LPD3DDEVICEDESC p_HWDesc, LPD3DDEVICEDESC p_HWDesc,
LPD3DDEVICEDESC p_HELDesc LPD3DDEVICEDESC p_HELDesc
); );
void Initialize( void Initialize(
LPGUID p_guid, LPGUID p_guid,
LPSTR p_deviceDesc, LPCSTR p_deviceDesc,
LPSTR p_deviceName, LPCSTR p_deviceName,
LPD3DDEVICEDESC p_HWDesc, LPD3DDEVICEDESC p_HWDesc,
LPD3DDEVICEDESC p_HELDesc LPD3DDEVICEDESC p_HELDesc
); );
@ -119,9 +119,9 @@ struct MxDriver {
MxDriver() {} MxDriver() {}
~MxDriver(); ~MxDriver();
MxDriver(LPGUID p_guid); 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 LPGUID m_guid; // 0x00
char* m_driverDesc; // 0x04 char* m_driverDesc; // 0x04
@ -202,8 +202,8 @@ public:
HRESULT EnumDisplayModesCallback(LPDDSURFACEDESC p_ddsd); HRESULT EnumDisplayModesCallback(LPDDSURFACEDESC p_ddsd);
HRESULT EnumDevicesCallback( HRESULT EnumDevicesCallback(
LPGUID p_guid, LPGUID p_guid,
LPSTR p_deviceDesc, LPCSTR p_deviceDesc,
LPSTR p_deviceName, LPCSTR p_deviceName,
LPD3DDEVICEDESC p_HWDesc, LPD3DDEVICEDESC p_HWDesc,
LPD3DDEVICEDESC p_HELDesc LPD3DDEVICEDESC p_HELDesc
); );

2
LEGO1/omni/src/video/mxdisplaysurface.cpp
View File

@ -204,7 +204,7 @@ MxResult MxDisplaySurface::Create(MxVideoParam& p_videoParam)
ddsd.dwSize = sizeof(ddsd); ddsd.dwSize = sizeof(ddsd);
ddsd.dwBackBufferCount = m_videoParam.GetBackBuffers(); ddsd.dwBackBufferCount = m_videoParam.GetBackBuffers();
ddsd.dwFlags = DDSD_CAPS | DDSD_BACKBUFFERCOUNT; 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)) { if (lpDirectDraw->CreateSurface(&ddsd, &m_ddSurface1, NULL)) {
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "DirectDraw::CreateSurface failed"); SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "DirectDraw::CreateSurface failed");