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

Merge pull request #1036 from LukeUsher/various-experiments 

Fix Debug Build & Nullptr Dereference
This commit is contained in:
Luke Usher 2018-04-04 16:51:44 +01:00 committed by GitHub
parent 6f55bcc6da 5a977e65d6
commit 130e0d91ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/CxbxKrnl/EmuDSoundInline.hpp
View File

@ -417,6 +417,10 @@ inline void DSoundBufferTransferSettings(
LONG lVolume, lPan;
DS3DBUFFER ds3dBuffer;
if (pDSBufferOld == nullptr) {
return;
}
pDSBufferOld->GetVolume(&lVolume);
pDSBufferOld->GetFrequency(&dwFrequency);
pDSBufferOld->GetPan(&lPan);

6
src/CxbxKrnl/EmuXapi.cpp
View File

@ -151,7 +151,7 @@ VOID WINAPI XTL::EMUPATCH(XInitDevices)
LOG_FUNC_BEGIN
LOG_FUNC_ARG(dwPreallocTypeCount)
LOG_FUNC_ARG(PreallocTypes)
LOG_FUNC_ARG((DWORD)PreallocTypes)
LOG_FUNC_END;
for(int v=0;v<XINPUT_SETSTATE_SLOTS;v++)
@ -872,7 +872,7 @@ LPVOID WINAPI XTL::EMUPATCH(CreateFiber)
LOG_FUNC_BEGIN
LOG_FUNC_ARG(dwStackSize)
LOG_FUNC_ARG(lpStartRoutine)
LOG_FUNC_ARG((PVOID)lpStartRoutine)
LOG_FUNC_ARG(lpParameter)
LOG_FUNC_END;
@ -895,7 +895,7 @@ VOID WINAPI XTL::EMUPATCH(DeleteFiber)
)
{
FUNC_EXPORTS
LOG_FUNC_ONE_ARG(DeleteFiber);
LOG_FUNC_ONE_ARG((DWORD)DeleteFiber);
DeleteFiber(lpFiber);
}