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 #1423 from PatrickvL/newline_cleanup 

Cleanup remnants from the FUNC_EXPORTS removal
This commit is contained in:
Luke Usher 2018-08-30 15:59:04 +01:00 committed by GitHub
parent b40431f976 361504e97b
commit c23b3b25fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 407 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

358
src/CxbxKrnl/EmuD3D8.cpp
View File

File diff suppressed because it is too large Load Diff

7
src/CxbxKrnl/EmuXG.cpp
View File

@ -54,7 +54,6 @@ PVOID WINAPI XTL::EMUPATCH(XGIsSwizzledFormat)
X_D3DFORMAT Format
)
{
//FUNC_EXPORTS
LOG_FUNC_ONE_ARG(Format);
RETURN(FALSE);
@ -139,8 +138,6 @@ VOID WINAPI XTL::EMUPATCH(XGSwizzleBox)
DWORD BytesPerPixel
)
{
//FUNC_EXPORTS
LOG_FUNC_BEGIN
LOG_FUNC_ARG(pSource)
LOG_FUNC_ARG(RowPitch)
@ -201,8 +198,6 @@ HRESULT WINAPI XTL::EMUPATCH(XGWriteSurfaceOrTextureToXPR)
BOOL bWriteSurfaceAsTexture
)
{
//FUNC_EXPORTS
LOG_FUNC_BEGIN
LOG_FUNC_ARG(pResource)
LOG_FUNC_ARG(cPath)
@ -234,8 +229,6 @@ VOID WINAPI XTL::EMUPATCH(XGSetTextureHeader)
UINT Pitch
)
{
//FUNC_EXPORTS
LOG_FUNC_BEGIN
LOG_FUNC_ARG(Width)
LOG_FUNC_ARG(Height)

42
src/CxbxKrnl/EmuXactEng.cpp
View File

@ -73,8 +73,6 @@ HRESULT WINAPI XTL::EMUPATCH(XACTEngineCreate)
X_XACTEngine** ppEngine
)
{
//FUNC_EXPORTS
LOG_FUNC_BEGIN
LOG_FUNC_ARG(pParams)
LOG_FUNC_ARG(ppEngine)
@ -94,8 +92,6 @@ HRESULT WINAPI XTL::EMUPATCH(XACTEngineCreate)
// ******************************************************************
void WINAPI XTL::EMUPATCH(XACTEngineDoWork)()
{
//FUNC_EXPORTS
LOG_FUNC();
// TODO: Anything else required here?
@ -119,8 +115,6 @@ HRESULT WINAPI XTL::EMUPATCH(IXACTEngine_RegisterWaveBank)
X_XACTWaveBank** ppWaveBank
)
{
//FUNC_EXPORTS
LOG_FUNC_BEGIN
LOG_FUNC_ARG(pThis)
LOG_FUNC_ARG(pvData)
@ -145,8 +139,6 @@ HRESULT WINAPI XTL::EMUPATCH(IXACTEngine_RegisterStreamedWaveBank)
X_XACTWaveBank** ppWaveBank
)
{
//FUNC_EXPORTS
LOG_FUNC_BEGIN
LOG_FUNC_ARG(pThis)
LOG_FUNC_ARG(pParams)
@ -171,8 +163,6 @@ HRESULT WINAPI XTL::EMUPATCH(IXACTEngine_CreateSoundBank)
X_XACTSoundBank** ppSoundBank
)
{
//FUNC_EXPORTS
LOG_FUNC_BEGIN
LOG_FUNC_ARG(pThis)
LOG_FUNC_ARG(pvData)
@ -199,8 +189,6 @@ HRESULT WINAPI XTL::EMUPATCH(IXACTEngine_DownloadEffectsImage)
LPVOID* ppImageDesc
)
{
//FUNC_EXPORTS
LOG_FUNC_BEGIN
LOG_FUNC_ARG(pThis)
LOG_FUNC_ARG(pvData)
@ -224,8 +212,6 @@ HRESULT WINAPI XTL::EMUPATCH(IXACTEngine_CreateSoundSource)
X_XACTSoundSource** ppSoundSource
)
{
//FUNC_EXPORTS
LOG_FUNC_BEGIN
LOG_FUNC_ARG(pThis)
LOG_FUNC_ARG(dwFlags)
@ -246,8 +232,6 @@ HRESULT WINAPI XTL::EMUPATCH(IXACTEngine_EnableHeadphones)
BOOL fEnabled
)
{
//FUNC_EXPORTS
LOG_FUNC_BEGIN
LOG_FUNC_ARG(pThis)
LOG_FUNC_ARG(fEnabled)
@ -271,8 +255,6 @@ HRESULT WINAPI XTL::EMUPATCH(IXACTEngine_SetListenerOrientation)
DWORD dwApply
)
{
//FUNC_EXPORTS
LOG_FUNC_BEGIN
LOG_FUNC_ARG(pThis)
LOG_FUNC_ARG(xFront)
@ -299,8 +281,6 @@ HRESULT WINAPI XTL::EMUPATCH(IXACTEngine_SetListenerPosition)
DWORD dwApply
)
{
//FUNC_EXPORTS
LOG_FUNC_BEGIN
LOG_FUNC_ARG(pThis)
LOG_FUNC_ARG(x)
@ -324,8 +304,6 @@ HRESULT WINAPI XTL::EMUPATCH(IXACTEngine_SetListenerVelocity)
DWORD dwApply
)
{
//FUNC_EXPORTS
LOG_FUNC_BEGIN
LOG_FUNC_ARG(pThis)
LOG_FUNC_ARG(x)
@ -347,8 +325,6 @@ HRESULT WINAPI XTL::EMUPATCH(IXACTEngine_SetMasterVolume)
LONG lVolume
)
{
//FUNC_EXPORTS
LOG_FUNC_BEGIN
LOG_FUNC_ARG(pThis)
LOG_FUNC_ARG(wCategory)
@ -366,8 +342,6 @@ HRESULT WINAPI XTL::EMUPATCH(IXACTEngine_CommitDeferredSettings)
X_XACTEngine* pThis
)
{
//FUNC_EXPORTS
LOG_FUNC_ONE_ARG(pThis);
RETURN(S_OK);
@ -383,8 +357,6 @@ HRESULT WINAPI XTL::EMUPATCH(IXACTSoundBank_GetSoundCueIndexFromFriendlyName)
DWORD* pdwSoundCueIndex
)
{
//FUNC_EXPORTS
LOG_FUNC_BEGIN
LOG_FUNC_ARG(pThis)
LOG_FUNC_ARG(pFriendlyName)
@ -406,8 +378,6 @@ HRESULT WINAPI XTL::EMUPATCH(IXACTSoundBank_Play)
X_XACTSoundCue** ppSoundCue
)
{
//FUNC_EXPORTS
LOG_FUNC_BEGIN
LOG_FUNC_ARG(pThis)
LOG_FUNC_ARG(dwSoundCueIndex)
@ -430,8 +400,6 @@ HRESULT WINAPI XTL::EMUPATCH(IXACTSoundBank_Stop)
X_XACTSoundCue* pSoundCue
)
{
//FUNC_EXPORTS
LOG_FUNC_BEGIN
LOG_FUNC_ARG(pThis)
LOG_FUNC_ARG(dwSoundCueIndex)
@ -454,8 +422,6 @@ HRESULT WINAPI XTL::EMUPATCH(IXACTSoundSource_SetPosition)
DWORD dwApply
)
{
//FUNC_EXPORTS
LOG_FUNC_BEGIN
LOG_FUNC_ARG(pThis)
LOG_FUNC_ARG(x)
@ -479,8 +445,6 @@ HRESULT WINAPI XTL::EMUPATCH(IXACTSoundSource_SetVelocity)
DWORD dwApply
)
{
//FUNC_EXPORTS
LOG_FUNC_BEGIN
LOG_FUNC_ARG(pThis)
LOG_FUNC_ARG(x)
@ -501,8 +465,6 @@ HRESULT WINAPI XTL::EMUPATCH(IXACTEngine_RegisterNotification)
PCXACT_NOTIFICATION_DESCRIPTION pNotificationDesc
)
{
//FUNC_EXPORTS
LOG_FUNC_BEGIN
LOG_FUNC_ARG(pThis)
LOG_FUNC_ARG(pNotificationDesc)
@ -521,8 +483,6 @@ HRESULT WINAPI XTL::EMUPATCH(IXACTEngine_GetNotification)
LPVOID pNotification
)
{
//FUNC_EXPORTS
LOG_FUNC_BEGIN
LOG_FUNC_ARG(pThis)
LOG_FUNC_ARG(pNotificationDesc)
@ -544,8 +504,6 @@ HRESULT WINAPI XTL::EMUPATCH(IXACTEngine_UnRegisterWaveBank)
X_XACTWaveBank* pWaveBank
)
{
//FUNC_EXPORTS
LOG_FUNC_BEGIN
LOG_FUNC_ARG(pThis)
LOG_FUNC_ARG(pWaveBank)

10
src/CxbxKrnl/EmuXapi.cpp
View File

@ -1341,8 +1341,6 @@ VOID WINAPI XTL::EMUPATCH(XapiThreadStartup)
DWORD dwDummy2
)
{
//FUNC_EXPORTS
LOG_FUNC_BEGIN
LOG_FUNC_ARG(dwDummy1)
LOG_FUNC_ARG(dwDummy2)
@ -1376,8 +1374,6 @@ VOID WINAPI XTL::EMUPATCH(XRegisterThreadNotifyRoutine)
BOOL fRegister
)
{
//FUNC_EXPORTS
LOG_FUNC_BEGIN
LOG_FUNC_ARG(pThreadNotification)
LOG_FUNC_ARG(fRegister)
@ -1531,8 +1527,6 @@ DWORD WINAPI XTL::EMUPATCH(QueueUserAPC)
DWORD dwData
)
{
//FUNC_EXPORTS
LOG_FUNC_BEGIN
LOG_FUNC_ARG_TYPE(PVOID, pfnAPC)
LOG_FUNC_ARG(hThread)
@ -1567,8 +1561,6 @@ BOOL WINAPI XTL::EMUPATCH(GetOverlappedResult)
BOOL bWait
)
{
//FUNC_EXPORTS
LOG_FUNC_BEGIN
LOG_FUNC_ARG(hFile)
LOG_FUNC_ARG(lpOverlapped)
@ -1594,8 +1586,6 @@ DWORD WINAPI XTL::EMUPATCH(XLaunchNewImageA)
PLAUNCH_DATA pLaunchData
)
{
//FUNC_EXPORTS
// Note : This can be tested using "Innocent tears",
// which relaunches different xbes between scenes;
// One for menus, one for fmvs, etc.