ShuriZma
/
Cxbx-Reloaded
mirror of https://github.com/Cxbx-Reloaded/Cxbx-Reloaded.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix a crash when GetDisplayMode cannot be found

This commit is contained in:
Luke Usher 2018-01-26 19:49:54 +00:00
parent 881d48b19c
commit 16e038229b
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/CxbxKrnl/EmuD3D8.cpp
View File

@ -2565,14 +2565,16 @@ VOID WINAPI XTL::EMUPATCH(D3DDevice_GetDisplayFieldStatus)(X_D3DFIELD_STATUS *pF
typedef VOID(__stdcall *XB_D3DDevice_GetDisplayMode_t)(X_D3DDISPLAYMODE*); typedef VOID(__stdcall *XB_D3DDevice_GetDisplayMode_t)(X_D3DDISPLAYMODE*);
static XB_D3DDevice_GetDisplayMode_t XB_D3DDevice_GetDisplayMode = (XB_D3DDevice_GetDisplayMode_t)GetXboxFunctionPointer("D3DDevice_GetDisplayMode"); static XB_D3DDevice_GetDisplayMode_t XB_D3DDevice_GetDisplayMode = (XB_D3DDevice_GetDisplayMode_t)GetXboxFunctionPointer("D3DDevice_GetDisplayMode");
// Check the function pointer for validity, if it is not valid, we must abort as we have a missing OOVPA
if (XB_D3DDevice_GetDisplayMode == nullptr) {
CxbxKrnlCleanup("D3DDevice_GetDisplayFieldStatus: Could not locate D3DDevice_GetDisplayMode");
}
// Call the Xbox GetDisplayMode function to retrieve flags for the active video mode
X_D3DDISPLAYMODE displayMode; X_D3DDISPLAYMODE displayMode;
// If we can find the Xbox version of GetDisplayMode, use the real data returned, otherwise
// use a sensible default
if (XB_D3DDevice_GetDisplayMode != nullptr) {
XB_D3DDevice_GetDisplayMode(&displayMode); XB_D3DDevice_GetDisplayMode(&displayMode);
} else {
// We don't show a warning because doing so pollutes the kernel debug log as this function gets called every frame
displayMode.Flags = X_D3DPRESENTFLAG_INTERLACED;
}
// Set the VBlank count // Set the VBlank count
pFieldStatus->VBlankCount = g_VBData.VBlank; pFieldStatus->VBlankCount = g_VBData.VBlank;