From 71534674c98c6973d54b8a313a37fce3ce142948 Mon Sep 17 00:00:00 2001 From: PatrickvL Date: Thu, 4 May 2017 14:15:50 +0200 Subject: [PATCH] Standardized "unimplemented" logging --- src/CxbxKrnl/EmuD3D8.cpp | 30 +++++++++++++++--------------- src/CxbxKrnl/EmuDSound.cpp | 17 +++++++++-------- 2 files changed, 24 insertions(+), 23 deletions(-) diff --git a/src/CxbxKrnl/EmuD3D8.cpp b/src/CxbxKrnl/EmuD3D8.cpp index 5b6b665f3..0492928ce 100644 --- a/src/CxbxKrnl/EmuD3D8.cpp +++ b/src/CxbxKrnl/EmuD3D8.cpp @@ -2186,6 +2186,7 @@ HRESULT WINAPI XTL::EMUPATCH(D3DDevice_BeginStateBig)() //ULONG ret = g_pD3DDevice8->BeginStateBlock(); + LOG_UNIMPLEMENTED(); CxbxKrnlCleanup("BeginStateBig is not implemented"); @@ -6900,7 +6901,7 @@ VOID WINAPI XTL::EMUPATCH(D3DDevice_SetRenderState_EdgeAntiAlias) // TODO: Analyze performance and compatibility (undefined behavior on PC with triangles or points) // g_pD3DDevice8->SetRenderState(D3DRS_EDGEANTIALIAS, Value); -// EmuWarning("SetRenderState_EdgeAntiAlias not implemented!"); +// LOG_UNIMPLEMENTED(); @@ -6978,7 +6979,7 @@ VOID WINAPI XTL::EMUPATCH(D3DDevice_SetRenderState_Dxt1NoiseEnable) ");\n", Value); - EmuWarning("SetRenderState_Dxt1NoiseEnable not implemented!"); + LOG_UNIMPLEMENTED(); @@ -7559,7 +7560,7 @@ VOID WINAPI XTL::EMUPATCH(D3DDevice_SetRenderState_ShadowFunc) // EmuXB2PC_D3DCMPFUNC(Value); // this warning just gets annoying - // EmuWarning("ShadowFunc not implemented"); + // LOG_UNIMPLEMENTED(); @@ -7790,7 +7791,7 @@ XTL::X_D3DVertexBuffer* WINAPI XTL::EMUPATCH(D3DDevice_GetStreamSource2) ");\n", StreamNumber, pStride); - EmuWarning("Not correctly implemented yet!"); + LOG_UNIMPLEMENTED(); X_D3DVertexBuffer* pVertexBuffer = NULL; *pStride = 0; @@ -8754,7 +8755,7 @@ VOID WINAPI XTL::EMUPATCH(D3DDevice_SelectVertexShaderDirect) ");\n", pVAF,Address); - DbgPrintf("NOT YET IMPLEMENTED!\n"); + LOG_UNIMPLEMENTED(); } @@ -8858,7 +8859,7 @@ HRESULT WINAPI XTL::EMUPATCH(D3DDevice_SetVertexShaderInputDirect) ");\n", pVAF, StreamCount, pStreamInputs); - DbgPrintf("NOT YET IMPLEMENTED!\n"); + LOG_UNIMPLEMENTED(); @@ -8886,7 +8887,7 @@ HRESULT WINAPI XTL::EMUPATCH(D3DDevice_GetVertexShaderInput) ");\n", pHandle, pStreamCount, pStreamInputs); - DbgPrintf("NOT YET IMPLEMENTED!\n"); + LOG_UNIMPLEMENTED(); @@ -8914,7 +8915,7 @@ HRESULT WINAPI XTL::EMUPATCH(D3DDevice_SetVertexShaderInput) ");\n", Handle, StreamCount, pStreamInputs); - DbgPrintf("NOT YET IMPLEMENTED!\n"); + LOG_UNIMPLEMENTED(); @@ -8941,7 +8942,7 @@ VOID WINAPI XTL::EMUPATCH(D3DDevice_RunVertexStateShader) ");\n", Address,pData); - DbgPrintf("NOT YET IMPLEMENTED!\n"); + LOG_UNIMPLEMENTED(); } @@ -8965,9 +8966,7 @@ VOID WINAPI XTL::EMUPATCH(D3DDevice_LoadVertexShaderProgram) ");\n", pFunction,Address); - DbgPrintf("NOT YET IMPLEMENTED!\n"); - - + LOG_UNIMPLEMENTED(); } // ****************************************************************** @@ -9762,7 +9761,7 @@ VOID WINAPI XTL::EMUPATCH(D3DDevice_KickPushBuffer)() DbgPrintf("EmuD3D8: EmuD3DDevice_KickPushBuffer()\n"); // TODO -oDxbx : Locate the current PushBuffer address, and supply that to RunPushBuffer (without a fixup) - EmuWarning("D3DDevice_KickPushBuffer is not yet implemented!"); + LOG_UNIMPLEMENTED(); } @@ -10157,9 +10156,9 @@ HRESULT WINAPI XTL::EMUPATCH(D3DDevice_BeginPushBuffer) // TODO: Implement. Easier said than done with Direct3D, but OpenGL // can emulate this functionality rather easily. + LOG_UNIMPLEMENTED(); // CxbxKrnlCleanup("BeginPushBuffer is not yet implemented!\n" // "This is going to be a difficult fix for Direct3D but NOT OpenGL!"); - LOG_UNIMPLEMENTED(); @@ -10296,7 +10295,7 @@ HRESULT WINAPI XTL::EMUPATCH(D3D_MakeRequestedSpace)( DWORD Unknown1, DWORD Unkn // NOTE: This function is not meant to me emulated. Just use it to find out // the function that is calling it, and emulate that instead!!! If necessary, // create an XRef... - + LOG_UNIMPLEMENTED(); __asm int 3; CxbxKrnlCleanup("D3D::MakeRequestedSpace not implemented (tell blueshogun)"); @@ -10316,6 +10315,7 @@ void WINAPI XTL::EMUPATCH(D3DDevice_MakeSpace)() // NOTE: Like the above function, this should not be emulated. The intended // usage is the same as above. + LOG_UNIMPLEMENTED(); __asm int 3; CxbxKrnlCleanup("D3DDevice::MakeSpace not implemented (tell blueshogun)"); diff --git a/src/CxbxKrnl/EmuDSound.cpp b/src/CxbxKrnl/EmuDSound.cpp index 5a3281c8e..9bb59a81f 100644 --- a/src/CxbxKrnl/EmuDSound.cpp +++ b/src/CxbxKrnl/EmuDSound.cpp @@ -49,6 +49,7 @@ namespace xboxkrnl #include "EmuAlloc.h" #include "EmuXTL.h" #include "MemoryManager.h" +#include "Logging.h" #include #include @@ -698,7 +699,7 @@ HRESULT WINAPI XTL::EMUPATCH(IDirectSoundBuffer_SetMixBinVolumes) // NOTE: Use this function for XDK 3911 only because the implementation was changed // somewhere around the December 2001 (4134) update (or earlier, maybe). - EmuWarning("EmuIDirectSoundBuffer_SetMixBinVolumes not yet implemented"); + LOG_UNIMPLEMENTED(); return DS_OK; } @@ -1533,7 +1534,7 @@ extern "C" HRESULT __stdcall XTL::EMUPATCH(IDirectSoundBuffer_StopEx) if(pBuffer->EmuDirectSoundBuffer8 == 0) EmuWarning("pBuffer->EmuDirectSoundBuffer8 == 0"); - EmuWarning("StopEx not yet implemented!"); + LOG_UNIMPLEMENTED(); @@ -1954,7 +1955,7 @@ HRESULT WINAPI XTL::EMUPATCH(DirectSound_CDirectSoundStream_GetStatus) ");\n", pThis, pdwStatus); - EmuWarning("EmuDirectSound_CDirectSoundStream_GetStatus is not yet implemented"); + LOG_UNIMPLEMENTED(); *pdwStatus = DSBSTATUS_PLAYING; @@ -2864,7 +2865,7 @@ HRESULT WINAPI XTL::EMUPATCH(DirectSound_CDirectSoundStream_SetLFO) // TODO: Implement - EmuWarning("EmuDirectSound_CDirectSoundStream_SetLFO not yet implemented!"); + LOG_UNIMPLEMENTED(); return S_OK; } @@ -3082,7 +3083,7 @@ HRESULT WINAPI XTL::EMUPATCH(IDirectSoundBuffer_Pause) // // // This function wasn't part of the XDK until 4721. // // TODO: Implement time stamp feature (a thread maybe?) -// EmuWarning("IDirectSoundBuffer_PauseEx not fully implemented!"); +// LOG_UNIMPLEMENTED(); // // HRESULT ret; // @@ -3336,7 +3337,7 @@ extern "C" HRESULT __stdcall XTL::EMUPATCH(IDirectSoundBuffer_PlayEx) if(pBuffer->EmuDirectSoundBuffer8 == 0) EmuWarning("pBuffer->EmuDirectSoundBuffer8 == 0"); -// EmuWarning("PlayEx not yet implemented!"); +// LOG_UNIMPLEMENTED(); // TODO: Handle other non-PC standard flags DWORD dwPCFlags = ( dwFlags & DSBPLAY_LOOPING ) ? DSBPLAY_LOOPING : 0; @@ -3408,7 +3409,7 @@ HRESULT WINAPI XTL::EMUPATCH(DirectSound_CDirectSoundStream_SetPitch) HRESULT hRet = S_OK; - EmuWarning("IDirectSoundStream_SetPitch not yet implemented!"); + LOG_UNIMPLEMENTED(); @@ -3874,7 +3875,7 @@ HRESULT WINAPI XTL::EMUPATCH(XFileCreateMediaObjectAsync) // TODO: Implement - EmuWarning( "XFileCreateMediaObjectAsync not yet (properly) implemented!!!" ); + LOG_UNIMPLEMENTED(); *ppMediaObject = new X_XFileMediaObject();