isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2026-01-18 14:01:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename p_context to p_d

Browse Source
This commit is contained in:
disinvite 2025-07-14 20:52:43 -04:00
parent 7fd9b89137
commit c78fc3e47a
2 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
LEGO1/mxdirectx/mxdirectxinfo.cpp
View File

@ -278,13 +278,10 @@ void MxDeviceEnumerate::BuildErrorString(const char* p_format, ...)
// FUNCTION: CONFIG 0x00401bf0 // FUNCTION: CONFIG 0x00401bf0
// FUNCTION: LEGO1 0x1009c4f0 // FUNCTION: LEGO1 0x1009c4f0
// FUNCTION: BETA10 0x1011e1dd // FUNCTION: BETA10 0x1011e1dd
HRESULT CALLBACK MxDeviceEnumerate::DisplayModesEnumerateCallback(LPDDSURFACEDESC p_ddsd, LPVOID p_context) HRESULT CALLBACK MxDeviceEnumerate::DisplayModesEnumerateCallback(LPDDSURFACEDESC p_ddsd, LPVOID p_d)
{ {
if (p_context == NULL) { assert(p_d);
assert(0); return ((MxDeviceEnumerate*) p_d)->EnumDisplayModesCallback(p_ddsd);
}
return ((MxDeviceEnumerate*) p_context)->EnumDisplayModesCallback(p_ddsd);
} }
// FUNCTION: CONFIG 0x00401c10 // FUNCTION: CONFIG 0x00401c10
@ -296,15 +293,14 @@ HRESULT CALLBACK MxDeviceEnumerate::DevicesEnumerateCallback(
LPSTR p_deviceName, LPSTR p_deviceName,
LPD3DDEVICEDESC p_HWDesc, LPD3DDEVICEDESC p_HWDesc,
LPD3DDEVICEDESC p_HELDesc, LPD3DDEVICEDESC p_HELDesc,
LPVOID p_context LPVOID p_d
) )
{ {
if (p_context == NULL) { if (p_d == NULL) {
assert(0); assert(0);
} }
return ((MxDeviceEnumerate*) p_context) return ((MxDeviceEnumerate*) p_d)->EnumDevicesCallback(p_guid, p_deviceDesc, p_deviceName, p_HWDesc, p_HELDesc);
->EnumDevicesCallback(p_guid, p_deviceDesc, p_deviceName, p_HWDesc, p_HELDesc);
} }
// FUNCTION: CONFIG 0x00401c40 // FUNCTION: CONFIG 0x00401c40
@ -368,13 +364,10 @@ int MxDeviceEnumerate::DoEnumerate()
// FUNCTION: LEGO1 0x1009c710 // FUNCTION: LEGO1 0x1009c710
// FUNCTION: BETA10 0x1011e476 // FUNCTION: BETA10 0x1011e476
BOOL CALLBACK BOOL CALLBACK
MxDeviceEnumerate::DirectDrawEnumerateCallback(LPGUID p_guid, LPSTR p_driverDesc, LPSTR p_driverName, LPVOID p_context) MxDeviceEnumerate::DirectDrawEnumerateCallback(LPGUID p_guid, LPSTR p_driverDesc, LPSTR p_driverName, LPVOID p_d)
{ {
if (p_context == NULL) { assert(p_d);
assert(0); return ((MxDeviceEnumerate*) p_d)->EnumDirectDrawCallback(p_guid, p_driverDesc, p_driverName);
}
return ((MxDeviceEnumerate*) p_context)->EnumDirectDrawCallback(p_guid, p_driverDesc, p_driverName);
} }
// FUNCTION: CONFIG 0x00401e30 // FUNCTION: CONFIG 0x00401e30

7
LEGO1/mxdirectx/mxdirectxinfo.h
View File

@ -204,16 +204,15 @@ class MxDeviceEnumerate {
); );
const char* EnumerateErrorToString(HRESULT p_error); const char* EnumerateErrorToString(HRESULT p_error);
static void BuildErrorString(const char*, ...); static void BuildErrorString(const char*, ...);
static BOOL CALLBACK static BOOL CALLBACK DirectDrawEnumerateCallback(LPGUID p_guid, LPSTR p_driverDesc, LPSTR p_driverName, LPVOID p_d);
DirectDrawEnumerateCallback(LPGUID p_guid, LPSTR p_driverDesc, LPSTR p_driverName, LPVOID p_context); static HRESULT CALLBACK DisplayModesEnumerateCallback(LPDDSURFACEDESC p_ddsd, LPVOID p_d);
static HRESULT CALLBACK DisplayModesEnumerateCallback(LPDDSURFACEDESC p_ddsd, LPVOID p_context);
static HRESULT CALLBACK DevicesEnumerateCallback( static HRESULT CALLBACK DevicesEnumerateCallback(
LPGUID p_guid, LPGUID p_guid,
LPSTR p_deviceDesc, LPSTR p_deviceDesc,
LPSTR p_deviceName, LPSTR p_deviceName,
LPD3DDEVICEDESC p_HWDesc, LPD3DDEVICEDESC p_HWDesc,
LPD3DDEVICEDESC p_HELDesc, LPD3DDEVICEDESC p_HELDesc,
LPVOID p_context LPVOID p_d
); );
friend class MxDirect3D; friend class MxDirect3D;