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

Cleanup some EmuFS related comments 

Find/Replace didn't catch these when removing the EmuFS calls
This commit is contained in:
Luke Usher 2016-09-26 13:36:53 +01:00
parent 4c40dd67aa
commit f5110ac081
7 changed files with 253 additions and 253 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

164
src/CxbxKrnl/EmuD3D8.cpp
View File

@ -279,9 +279,9 @@ VOID XTL::EmuD3DInit(Xbe::Header *XbeHeader, uint32 XbeHeaderSize)
PresParam.AutoDepthStencilFormat = 0x2A; /* X_D3DFMT_D24S8 */
PresParam.SwapEffect = XTL::D3DSWAPEFFECT_DISCARD;
// XBox FS
XTL::EmuIDirect3D8_CreateDevice(0, XTL::D3DDEVTYPE_HAL, 0, D3DCREATE_HARDWARE_VERTEXPROCESSING, &PresParam, &g_pD3DDevice8);
// Win2k/XP FS
}
}
@ -708,9 +708,9 @@ static DWORD WINAPI EmuUpdateTickCount(LPVOID)
if(g_pVBCallback != NULL)
{
// Xbox FS
g_pVBCallback(&g_VBData);
// Win2k/XP FS
}
g_VBData.Swap = 0;
@ -1084,9 +1084,9 @@ static void EmuVerifyResourceIsRegistered(XTL::X_D3DResource *pResource)
}
}
// XBox FS;
;
XTL::EmuIDirect3DResource8_Register(pResource, 0/*(PVOID)pResource->Data*/);
// Win2k/XP FS
if(pResource->Lock != X_D3DRESOURCE_LOCK_FLAG_NOSIZE)
{
@ -4174,7 +4174,7 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetVertexData4ub
");\n",
GetCurrentThreadId(), Register, a, b, c, d);
// Xbox FS
DWORD dwA = a, dwB = b, dwC = c, dwD = d;
@ -4205,7 +4205,7 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetVertexData4s
");\n",
GetCurrentThreadId(), Register, a, b, c, d);
// Xbox FS
DWORD dwA = a, dwB = b, dwC = c, dwD = d;
@ -4429,9 +4429,9 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_Present
if(g_pSwapCallback != NULL)
{
// Xbox FS
g_pSwapCallback(&g_SwapData);
// Win2k/XP FS
}
}
@ -4485,9 +4485,9 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_Swap
if(g_pSwapCallback != NULL)
{
// Xbox FS
g_pSwapCallback(&g_SwapData);
// Win2k/XP FS
}
}
@ -4566,7 +4566,7 @@ HRESULT WINAPI XTL::EmuIDirect3DResource8_Register
{
EmuWarning( szString );
// Xbox FS
return hRet;
}
@ -5311,7 +5311,7 @@ ULONG WINAPI XTL::EmuIDirect3DResource8_Release
{
EmuWarning("NULL texture!");
// Xbox FS
return 0;
}
@ -9514,7 +9514,7 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetPixelShaderProgram
//hRet = XTL::EmuIDirect3DDevice8_SetPixelShader( dwHandle );
//
// Xbox FS
return S_OK;
}
@ -9528,7 +9528,7 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_CreateStateBlock
DWORD *pToken
)
{
// Win2K/XP FS
DbgPrintf("EmuD3D8 (0x%X): EmuIDirect3DDevice8_CreateStateBlock\n"
"(\n"
@ -9545,7 +9545,7 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_CreateStateBlock
if(FAILED(hRet))
EmuWarning("CreateStateBlock failed!\n");
// Xbox FS
return hRet;
}
@ -9560,7 +9560,7 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_InsertCallback
DWORD Context
)
{
// Win2K/XP FS
/*DbgP*/printf("EmuD3D8 (0x%X): EmuIDirect3DDevice8_InsertCallback\n"
"(\n"
@ -9577,7 +9577,7 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_InsertCallback
g_CallbackType = Type;
g_CallbackParam = Context;
// Xbox FS
}
// ******************************************************************
@ -9590,7 +9590,7 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_DrawRectPatch
CONST D3DRECTPATCH_INFO *pRectPatchInfo
)
{
// Win2K/XP FS
DbgPrintf("EmuD3D8 (0x%X): EmuIDirect3DDevice8_DrawRectPatch\n"
"(\n"
@ -9605,7 +9605,7 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_DrawRectPatch
if(FAILED(hRet))
EmuWarning("DrawRectPatch failed!\n");
// Xbox FS
return hRet;
}
@ -9619,7 +9619,7 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_GetProjectionViewportMatrix
D3DXMATRIX *pProjectionViewport
)
{
// Win2K/XP FS
DbgPrintf("EmuD3D8 (0x%X): EmuIDirect3DDevice8_GetProjectionViewportMatrix\n"
"(\n"
@ -9674,7 +9674,7 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_GetProjectionViewportMatrix
// __asm int 3;
// Xbox FS
return S_OK;
}
@ -9688,7 +9688,7 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_BackFillMode
DWORD Value
)
{
// Win2K/XP FS
DbgPrintf("EmuD3D8 (0x%X): EmuIDirect3DDevice8_BackFillMode\n"
"(\n"
@ -9707,7 +9707,7 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_BackFillMode
// of Direct3D was specifically created to take advantage of certain NVIDIA
// GPU registers and provide more OpenGL-like features IHMO.
// Xbox FS
return S_OK;
}
@ -9718,7 +9718,7 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_BackFillMode
VOID WINAPI XTL::EmuD3DDevice_KickOff()
{
// Win2K/XP FS
DbgPrintf("EmuD3D8 (0x%X): EmuD3DDevice_KickOff()\n", GetCurrentThreadId());
@ -9730,7 +9730,7 @@ VOID WINAPI XTL::EmuD3DDevice_KickOff()
// __asm int 3;
// Xbox FS
}
// ******************************************************************
@ -9749,7 +9749,7 @@ XTL::X_D3DResource* WINAPI XTL::EmuIDirect3DDevice8_GetTexture2(DWORD Stage)
// Get the active texture from this stage
X_D3DResource* pRet = EmuD3DActiveTexture[Stage];
// Xbox FS
return pRet;
}
@ -9759,7 +9759,7 @@ XTL::X_D3DResource* WINAPI XTL::EmuIDirect3DDevice8_GetTexture2(DWORD Stage)
// ******************************************************************
VOID WINAPI XTL::EmuD3DDevice_SetStateVB( ULONG Unknown1 )
{
// Win2k/XP FS
DbgPrintf("EmuD3D8 (0x%X): EmuD3DDevice_SetStateVB\n"
"(\n"
@ -9778,7 +9778,7 @@ VOID WINAPI XTL::EmuD3DDevice_SetStateVB( ULONG Unknown1 )
// ******************************************************************
VOID WINAPI XTL::EmuD3DDevice_SetStateUP()
{
// Win2k/XP FS
DbgPrintf("EmuD3D8 (0x%X): EmuD3DDevice_SetStateUP()\n", GetCurrentThreadId());
@ -9793,7 +9793,7 @@ VOID WINAPI XTL::EmuD3DDevice_SetStateUP()
// ******************************************************************
void WINAPI XTL::EmuIDirect3DDevice8_SetStipple( DWORD* pPattern )
{
// Win2k/XP FS
DbgPrintf("EmuD3D8 (0x%X): EmuIDirect3DDevice8_SetStipple\n"
"(\n"
@ -9836,7 +9836,7 @@ void WINAPI XTL::EmuIDirect3DDevice8_SetSwapCallback
// ******************************************************************
HRESULT WINAPI XTL::EmuIDirect3DDevice8_PersistDisplay()
{
// Win2k/XP FS
DbgPrintf("EmuD3D8 (0x%X): EmuIDirect3DDevice8_PersistDisplay()\n", GetCurrentThreadId());
@ -9898,7 +9898,7 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_PersistDisplay()
}
}*/
// Xbox FS
return hRet;
}
@ -9909,7 +9909,7 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_PersistDisplay()
// ******************************************************************
void WINAPI XTL::EmuIDirect3DDevice8_Unknown1()
{
// Win2k/XP FS
DbgPrintf("EmuD3D8 (0x%X): EmuIDirect3DDevice8_Unknown1()\n", GetCurrentThreadId());
@ -9919,7 +9919,7 @@ void WINAPI XTL::EmuIDirect3DDevice8_Unknown1()
// the only major thing going on inside of it is a call to the kernel
// function AvSendTVEncoderOption, we can probably ignore it.
// Xbox FS
}
// ******************************************************************
@ -9943,7 +9943,7 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_PrimeVertexCache
// TODO: Implement
EmuWarning("PrimeVertexCache is not supported!");
// Win2k/XP FS
return S_OK;
}
@ -9968,7 +9968,7 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetRenderState_SampleAlpha
EmuWarning("SampleAlpha not supported!");
// Xbox FS
return S_OK;
}
@ -10041,7 +10041,7 @@ VOID __fastcall XTL::EmuIDirect3DDevice8_SetRenderState_Deferred
D3DRS_PATCHSEGMENTS = 115, // DWORD number of segments per edge when drawing patches
*/
// Xbox FS
}
// ******************************************************************
@ -10052,7 +10052,7 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_DeleteStateBlock
DWORD Token
)
{
// Win2k/XP FS
DbgPrintf("EmuD3D8 (0x%X): EmuIDirect3DDevice8_DeleteStateBlock\n"
"(\n"
@ -10062,7 +10062,7 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_DeleteStateBlock
HRESULT hRet = g_pD3DDevice8->DeleteStateBlock(Token);
// Xbox FS
return hRet;
}
@ -10078,7 +10078,7 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetModelView
CONST D3DMATRIX *pComposite
)
{
// Win2k/XP FS
DbgPrintf("EmuD3D8 (0x%X): EmuIDirect3DDevice8_SetModelView\n"
"(\n"
@ -10091,7 +10091,7 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetModelView
// TODO: Implement
// CxbxKrnlCleanup("SetModelView not yet implemented (should be easy fix, tell blueshogun)");
// Xbox FS
return S_OK;
}
@ -10101,11 +10101,11 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetModelView
// ******************************************************************
void WINAPI XTL::EmuIDirect3DDevice8_FlushVertexCache()
{
// Win2k/XP FS
DbgPrintf("EmuD3D8 (0x%X): EmuIDirect3DDevice8_FlushVertexCache();\n", GetCurrentThreadId());
// Xbox FS
}
// ******************************************************************
@ -10116,7 +10116,7 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_BeginPushBuffer
X_D3DPushBuffer *pPushBuffer
)
{
// Win2k/XP FS
DbgPrintf("EmuD3D8 (0x%X): EmuIDirect3DDevice8_BeginPushBuffer\n"
"(\n"
@ -10129,7 +10129,7 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_BeginPushBuffer
// "This is going to be a difficult fix for Direct3D but NOT OpenGL!");
EmuWarning("BeginPushBuffer is not yet implemented!");
// Xbox FS
return S_OK;
}
@ -10139,11 +10139,11 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_BeginPushBuffer
// ******************************************************************
HRESULT WINAPI XTL::EmuIDirect3DDevice8_EndPushBuffer()
{
// Win2k/XP FS
DbgPrintf("EmuD3D8 (0x%X): EmuIDirect3DDevice8_EndPushBuffer();\n", GetCurrentThreadId());
// Xbox FS
return S_OK;
}
@ -10153,7 +10153,7 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_EndPushBuffer()
// ******************************************************************
void WINAPI XTL::EmuXMETAL_StartPush(void* Unknown)
{
// Win2k/XP FS
DbgPrintf("EmuD3D8 (0x%X): EmuXMETAL_StartPush\n"
"(\n"
@ -10164,7 +10164,7 @@ void WINAPI XTL::EmuXMETAL_StartPush(void* Unknown)
// Only use for debugging.
__asm int 3;
// Xbox FS
}
// ******************************************************************
@ -10172,7 +10172,7 @@ void WINAPI XTL::EmuXMETAL_StartPush(void* Unknown)
// ******************************************************************
HRESULT WINAPI XTL::EmuIDirect3DDevice8_GetModelView(D3DXMATRIX* pModelView)
{
// Win2k/XP FS
DbgPrintf("EmuD3D8 (0x%X): EmuIDirect3DDevice8_GetModelView\n"
"(\n"
@ -10187,7 +10187,7 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_GetModelView(D3DXMATRIX* pModelView)
*pModelView = mtxWorld * mtxView;
// Xbox FS
return S_OK;
}
@ -10197,7 +10197,7 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_GetModelView(D3DXMATRIX* pModelView)
// ******************************************************************
HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetBackMaterial(D3DMATERIAL8* pMaterial)
{
// Win2k/XP FS
DbgPrintf("EmuD3D8 (0x%X): EmuIDirect3DDevice8_SetBackMaterial\n"
"(\n"
@ -10206,7 +10206,7 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetBackMaterial(D3DMATERIAL8* pMaterial)
EmuWarning("SetBackMaterial is not supported!");
// Xbox FS
return S_OK;
}
@ -10221,7 +10221,7 @@ HRESULT WINAPI XTL::EmuIDirect3D8_GetAdapterIdentifier
D3DADAPTER_IDENTIFIER8* pIdentifier
)
{
// Win2k/XP FS
DbgPrintf("EmuD3D8 (0x%X): EmuIDirect3D8_GetAdapterIdentifier\n"
"(\n"
@ -10241,7 +10241,7 @@ HRESULT WINAPI XTL::EmuIDirect3D8_GetAdapterIdentifier
if(FAILED(hRet))
EmuWarning("GetAdapterIdentifier failed!");
// Xbox FS
return hRet;
}
@ -10251,7 +10251,7 @@ HRESULT WINAPI XTL::EmuIDirect3D8_GetAdapterIdentifier
// ******************************************************************
HRESULT WINAPI XTL::EmuD3D_MakeRequestedSpace( DWORD Unknown1, DWORD Unknown2 )
{
// Win2k/XP FS
DbgPrintf("EmuD3D8 (0x%X): EmuD3D_MakeRequestedSpace\n"
"(\n"
@ -10266,7 +10266,7 @@ HRESULT WINAPI XTL::EmuD3D_MakeRequestedSpace( DWORD Unknown1, DWORD Unknown2 )
__asm int 3;
CxbxKrnlCleanup("D3D::MakeRequestedSpace not implemented (tell blueshogun)");
// Xbox FS
return S_OK;
}
@ -10276,7 +10276,7 @@ HRESULT WINAPI XTL::EmuD3D_MakeRequestedSpace( DWORD Unknown1, DWORD Unknown2 )
// ******************************************************************
void WINAPI XTL::EmuD3DDevice_MakeSpace()
{
// Win2k/XP FS
DbgPrintf( "EmuD3D8 (0x%X): EmuD3DDevice_MakeSpace();\n", GetCurrentThreadId());
@ -10286,7 +10286,7 @@ void WINAPI XTL::EmuD3DDevice_MakeSpace()
__asm int 3;
CxbxKrnlCleanup("D3DDevice::MakeSpace not implemented (tell blueshogun)");
// Xbox FS
}
// ******************************************************************
@ -10294,14 +10294,14 @@ void WINAPI XTL::EmuD3DDevice_MakeSpace()
// ******************************************************************
void WINAPI XTL::EmuD3D_SetCommonDebugRegisters()
{
// Win2k/XP FS
DbgPrintf( "EmuD3D8 (0x%X): EmuD3D_SetCommonDebugRegisters();\n", GetCurrentThreadId());
// NOTE: I added this because I was too lazy to deal with emulating certain render
// states that use it.
// Xbox FS
}
// ******************************************************************
@ -10309,7 +10309,7 @@ void WINAPI XTL::EmuD3D_SetCommonDebugRegisters()
// ******************************************************************
void WINAPI XTL::EmuD3D_BlockOnTime( DWORD Unknown1, int Unknown2 )
{
// Win2k/XP FS
DbgPrintf("EmuD3D8 (0x%X): EmuD3D_BlockOnTime\n"
"(\n"
@ -10324,7 +10324,7 @@ void WINAPI XTL::EmuD3D_BlockOnTime( DWORD Unknown1, int Unknown2 )
// __asm int 3;
CxbxKrnlCleanup("D3D::BlockOnTime not implemented (tell blueshogun)");
// Xbox FS
}
// ******************************************************************
@ -10332,7 +10332,7 @@ void WINAPI XTL::EmuD3D_BlockOnTime( DWORD Unknown1, int Unknown2 )
// ******************************************************************
void WINAPI XTL::EmuD3D_BlockOnResource( X_D3DResource* pResource )
{
// Win2k/XP FS
DbgPrintf("EmuD3D8 (0x%X): EmuD3D_BlockOnResource\n"
"(\n"
@ -10342,7 +10342,7 @@ void WINAPI XTL::EmuD3D_BlockOnResource( X_D3DResource* pResource )
// TODO: Implement
// NOTE: Azurik appears to call this directly from numerous points
// Xbox FS
}
// ******************************************************************
@ -10353,7 +10353,7 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_GetPushBufferOffset
DWORD *pOffset
)
{
// Win2k/XP FS
DbgPrintf("EmuD3D8 (0x%X): EmuIDirect3DDevice8_GetPushBufferOffset\n"
"(\n"
@ -10363,7 +10363,7 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_GetPushBufferOffset
// TODO: Implement
*pOffset = 0;
// Xbox FS
return S_OK;
}
@ -10379,7 +10379,7 @@ HRESULT WINAPI XTL::EmuIDirect3DCubeTexture8_GetCubeMapSurface
X_D3DSurface** ppCubeMapSurface
)
{
// Win2k/XP FS
DbgPrintf("EmuD3D8 (0x%X): EmuIDirect3DCubeTexture8_GetCubeMapSurface\n"
"(\n"
@ -10396,7 +10396,7 @@ HRESULT WINAPI XTL::EmuIDirect3DCubeTexture8_GetCubeMapSurface
hRet = pThis->EmuCubeTexture8->GetCubeMapSurface( FaceType, Level, &(*ppCubeMapSurface)->EmuSurface8 );
// Xbox FS
return hRet;
}
@ -10411,7 +10411,7 @@ XTL::X_D3DSurface* WINAPI XTL::EmuIDirect3DCubeTexture8_GetCubeMapSurface2
UINT Level
)
{
// Win2k/XP FS
DbgPrintf("EmuD3D8 (0x%X): EmuIDirect3DCubeTexture8_GetCubeMapSurface2\n"
"(\n"
@ -10427,7 +10427,7 @@ XTL::X_D3DSurface* WINAPI XTL::EmuIDirect3DCubeTexture8_GetCubeMapSurface2
hRet = pThis->EmuCubeTexture8->GetCubeMapSurface( FaceType, Level, &pCubeMapSurface->EmuSurface8 );
// Xbox FS
return pCubeMapSurface;
}
@ -10441,7 +10441,7 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_GetPixelShader
DWORD* pHandle
)
{
// Win2k/XP FS
DbgPrintf("EmuD3D8 (0x%X): EmuIDirect3DDevice8_GetPixelShader\n"
"(\n"
@ -10452,7 +10452,7 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_GetPixelShader
// TODO: This implementation is very wrong, but better than nothing.
*pHandle = g_dwCurrentPixelShader;
// Xbox FS
return S_OK;
}
@ -10462,7 +10462,7 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_GetPixelShader
// ******************************************************************
HRESULT WINAPI XTL::EmuIDirect3DDevice8_GetPersistedSurface(X_D3DSurface **ppSurface)
{
// Win2k/XP FS
DbgPrintf("EmuD3D8 (0x%X): EmuIDirect3DDevice8_GetPersistedSurface\n"
"(\n"
@ -10492,7 +10492,7 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_GetPersistedSurface(X_D3DSurface **ppSur
EmuWarning( "Could not create temporary surface!" );
}
// Xbox FS
return S_OK;
}
@ -10502,7 +10502,7 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_GetPersistedSurface(X_D3DSurface **ppSur
// ******************************************************************
XTL::X_D3DSurface* WINAPI XTL::EmuIDirect3DDevice8_GetPersistedSurface2()
{
// Win2k/XP FS
DbgPrintf("EmuD3D8 (0x%X): EmuIDirect3DDevice8_GetPersistedSurface()\n", GetCurrentThreadId());
@ -10529,7 +10529,7 @@ XTL::X_D3DSurface* WINAPI XTL::EmuIDirect3DDevice8_GetPersistedSurface2()
EmuWarning( "Could not create temporary surface!" );
}
// Xbox FS
return pSurface;
}
@ -10610,7 +10610,7 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_GetScissors
// ******************************************************************
HRESULT WINAPI XTL::EmuIDirect3DDevice8_GetBackMaterial(D3DMATERIAL8* pMaterial)
{
// Win2k/XP FS
DbgPrintf("EmuD3D8 (0x%X): EmuIDirect3DDevice8_GetBackMaterial\n"
"(\n"
@ -10624,7 +10624,7 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_GetBackMaterial(D3DMATERIAL8* pMaterial)
if( pMaterial )
g_pD3DDevice8->GetMaterial( pMaterial );
// Xbox FS
return S_OK;
}
@ -10653,7 +10653,7 @@ void WINAPI XTL::EmuD3D_LazySetPointParams( void* Device )
// ******************************************************************
HRESULT WINAPI XTL::EmuIDirect3DDevice8_GetMaterial(D3DMATERIAL8* pMaterial)
{
// Win2k/XP FS
DbgPrintf("EmuD3D8 (0x%X): EmuIDirect3DDevice8_GetMaterial\n"
"(\n"
@ -10663,7 +10663,7 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_GetMaterial(D3DMATERIAL8* pMaterial)
if( pMaterial )
g_pD3DDevice8->GetMaterial( pMaterial );
// Xbox FS
return S_OK;
}

120
src/CxbxKrnl/EmuDSound.cpp
View File

@ -1909,7 +1909,7 @@ HRESULT WINAPI XTL::EmuCDirectSoundStream_GetInfo
LPXMEDIAINFO pInfo
)
{
// Win2k/XP FS
DbgPrintf("EmuDSound (0x%X): EmuCDirectSoundStream_GetInfo\n"
"(\n"
@ -1929,7 +1929,7 @@ HRESULT WINAPI XTL::EmuCDirectSoundStream_GetInfo
pInfo->dwMaxLookahead = 0x4000;
}
// Xbox FS
return DS_OK;
}
@ -2987,7 +2987,7 @@ HRESULT WINAPI XTL::EmuIDirectSound_EnableHeadphones
BOOL fEnabled
)
{
// Win2k/XP FS
DbgPrintf("EmuDSound (0x%X): EmuIDirectSound_EnableHeadphones\n"
"(\n"
@ -2996,7 +2996,7 @@ HRESULT WINAPI XTL::EmuIDirectSound_EnableHeadphones
");\n",
GetCurrentThreadId(), pThis, fEnabled);
// Xbox FS
return DS_OK;
}
@ -3009,7 +3009,7 @@ ULONG WINAPI XTL::EmuIDirectSoundBuffer8_AddRef
X_CDirectSoundBuffer *pThis
)
{
// Win2k/XP FS
DbgPrintf("EmuDSound (0x%X): EmuIDirectSoundBuffer_AddRef\n"
"(\n"
@ -3033,7 +3033,7 @@ ULONG WINAPI XTL::EmuIDirectSoundBuffer8_AddRef
}
}
// Xbox FS
return ret;
}
@ -3047,7 +3047,7 @@ HRESULT WINAPI XTL::EmuIDirectSoundBuffer8_Pause
DWORD dwPause
)
{
// Win2k/XP FS
DbgPrintf("EmuDSound (0x%X): EmuIDirectSoundBuffer_Pause\n"
"(\n"
@ -3076,7 +3076,7 @@ HRESULT WINAPI XTL::EmuIDirectSoundBuffer8_Pause
}
}*/
// Xbox FS
return ret;
}
@ -3091,7 +3091,7 @@ HRESULT WINAPI XTL::EmuIDirectSoundBuffer8_Pause
// DWORD dwPause
//)
//{
// // Win2k/XP FS
//
//
// DbgPrintf("EmuDSound (0x%X): EmuIDirectSoundBuffer_PauseEx\n"
// "(\n"
@ -3123,7 +3123,7 @@ HRESULT WINAPI XTL::EmuIDirectSoundBuffer8_Pause
// }
// }
//
// // Xbox FS
//
//
// return ret;
//}
@ -3138,7 +3138,7 @@ HRESULT WINAPI XTL::EmuIDirectSound8_GetOutputLevels
BOOL bResetPeakValues
)
{
// Win2k/XP FS
DbgPrintf("EmuDSound (0x%X): EmuIDirectSound8_GetOutputLevels\n"
"(\n"
@ -3164,7 +3164,7 @@ HRESULT WINAPI XTL::EmuCDirectSoundStream_SetEG
LPVOID pEnvelopeDesc
)
{
// Win2k/XP FS
DbgPrintf("EmuDSound (0x%X): EmuCDirectSoundStream_SetEG\n"
"(\n"
@ -3175,7 +3175,7 @@ HRESULT WINAPI XTL::EmuCDirectSoundStream_SetEG
// TODO: Implement this...
// Xbox FS
return S_OK;
}
@ -3185,7 +3185,7 @@ HRESULT WINAPI XTL::EmuCDirectSoundStream_SetEG
// ******************************************************************
HRESULT WINAPI XTL::EmuIDirectSoundStream_Flush()
{
// Win2k/XP FS
DbgPrintf("EmuDSound (0x%X): EmuIDirectSoundStream_Flush()\n", GetCurrentThreadId() );
@ -3206,7 +3206,7 @@ extern "C" HRESULT WINAPI XTL::EmuIDirectSoundStream_FlushEx
DWORD dwFlags
)
{
// Win2k/XP FS
DbgPrintf("EmuDSound (0x%X): EmuIDirectSoundStream_FlushEx\n"
"(\n"
@ -3218,7 +3218,7 @@ extern "C" HRESULT WINAPI XTL::EmuIDirectSoundStream_FlushEx
// TODO: Actually implement
// Xbox FS
return S_OK;
}
@ -3263,7 +3263,7 @@ HRESULT WINAPI XTL::EmuXAudioDownloadEffectsImage
LPVOID *ppImageDesc
)
{
// Win2k/XP FS
DbgPrintf("EmuDSound (0x%X): EmuXAudioDownloadEffectsImage\n"
"(\n"
@ -3274,7 +3274,7 @@ HRESULT WINAPI XTL::EmuXAudioDownloadEffectsImage
");\n",
GetCurrentThreadId(), pszImageName, pImageLoc, dwFlags, ppImageDesc );
// Xbox FS
return S_OK;
}
@ -3301,7 +3301,7 @@ HRESULT WINAPI XTL::EmuIDirectSoundBuffer8_SetFilter
EmuWarning("IDirectSoundBuffer8_SetFilter not yet supported!");
// Xbox FS
return S_OK;
}
@ -3328,7 +3328,7 @@ HRESULT WINAPI XTL::EmuCDirectSoundStream_SetFilter
EmuWarning("CDirectSoundStream_SetFilter not yet supported!");
// Xbox FS
return S_OK;
}
@ -3404,7 +3404,7 @@ HRESULT WINAPI XTL::EmuIDirectSound8_GetCaps
pDSCaps->dwMemoryAllocated = DSCapsPC.dwFreeHwMemBytes; // TODO: Bytes or MegaBytes?
}
// Xbox FS
return S_OK;
}
@ -3431,7 +3431,7 @@ HRESULT WINAPI XTL::EmuCDirectSoundStream_SetPitch
EmuWarning("IDirectSoundStream_SetPitch not yet implemented!");
// Xbox FS
return hRet;
}
@ -3441,7 +3441,7 @@ HRESULT WINAPI XTL::EmuCDirectSoundStream_SetPitch
// ******************************************************************
DWORD WINAPI XTL::EmuDirectSoundGetSampleTime()
{
// Win2k/XP FS
DbgPrintf("EmuDSound (0x%X): EmuDirectSoundGetSampleTime();\n", GetCurrentThreadId());
@ -3470,7 +3470,7 @@ HRESULT WINAPI XTL::EmuCDirectSoundStream_SetMixBinVolumes
const LONG* alVolumes
)
{
// Win2k/XP FS
DbgPrintf("EmuDSound (0x%X): EmuCDirectSoundStream_SetMixBinVolumes\n"
"(\n"
@ -3483,7 +3483,7 @@ HRESULT WINAPI XTL::EmuCDirectSoundStream_SetMixBinVolumes
// NOTE: Use this function for XDK 3911 only because the implementation was changed
// somewhere around the March 2002 (4361) update (or earlier, maybe).
// Xbox FS
return S_OK;
}
@ -3497,7 +3497,7 @@ HRESULT WINAPI XTL::EmuCDirectSoundStream_SetMixBinVolumes2
LPVOID pMixBins
)
{
// Win2k/XP FS
DbgPrintf("EmuDSound (0x%X): EmuCDirectSoundStream_SetMixBinVolumes\n"
"(\n"
@ -3508,7 +3508,7 @@ HRESULT WINAPI XTL::EmuCDirectSoundStream_SetMixBinVolumes2
// NOTE: Read the above notes, and the rest is self explanitory...
// Xbox FS
return S_OK;
}
@ -3576,7 +3576,7 @@ HRESULT WINAPI XTL::EmuCDirectSoundStream_SetFormat
LPCWAVEFORMATEX pwfxFormat
)
{
// Win2k/XP FS
DbgPrintf("EmuDSound (0x%X): EmuCDirectSoundStream_SetFormat\n"
"(\n"
@ -3608,7 +3608,7 @@ HRESULT WINAPI XTL::EmuIDirectSoundBuffer8_SetOutputBuffer
X_CDirectSoundBuffer* pOutputBuffer
)
{
// Win2k/XP FS
DbgPrintf("EmuDSound (0x%X): EmuIDirectSoundBuffer8_SetOutputBuffer\n"
"(\n"
@ -3619,7 +3619,7 @@ HRESULT WINAPI XTL::EmuIDirectSoundBuffer8_SetOutputBuffer
// TODO: Implement
// Xbox FS
return S_OK;
}
@ -3633,7 +3633,7 @@ HRESULT WINAPI XTL::EmuCDirectSoundStream_SetOutputBuffer
X_CDirectSoundBuffer* pOutputBuffer
)
{
// Win2k/XP FS
DbgPrintf("EmuDSound (0x%X): EmuCDirectSoundStream_SetOutputBuffer\n"
"(\n"
@ -3644,7 +3644,7 @@ HRESULT WINAPI XTL::EmuCDirectSoundStream_SetOutputBuffer
// TODO: Implement
// Xbox FS
return S_OK;
}
@ -3658,7 +3658,7 @@ HRESULT WINAPI XTL::EmuXFileCreateMediaObjectEx
void** ppMediaObject
)
{
// Win2k/XP FS
DbgPrintf("EmuDSound (0x%X): EmuXFileCreateMediaObjectEx\n"
"(\n"
@ -3669,7 +3669,7 @@ HRESULT WINAPI XTL::EmuXFileCreateMediaObjectEx
// TODO: Implement
// Xbox FS
return E_FAIL;
}
@ -3684,7 +3684,7 @@ HRESULT WINAPI XTL::EmuXWaveFileCreateMediaObject
void **ppMediaObject
)
{
// Win2k/XP FS
DbgPrintf("EmuDSound (0x%X): EmuXWaveFileCreateMediaObject\n"
"(\n"
@ -3696,7 +3696,7 @@ HRESULT WINAPI XTL::EmuXWaveFileCreateMediaObject
// TODO: Implement
// Xbox FS
return E_FAIL;
}
@ -3710,7 +3710,7 @@ HRESULT WINAPI XTL::EmuIDirectSoundBuffer8_SetEG
LPVOID pEnvelopeDesc
)
{
// Win2k/XP FS
DbgPrintf("EmuDSound (0x%X): EmuIDirectSoundBuffer8_SetEG\n"
"(\n"
@ -3721,7 +3721,7 @@ HRESULT WINAPI XTL::EmuIDirectSoundBuffer8_SetEG
// TODO: Implement
// Xbox FS
return S_OK;
}
@ -3738,7 +3738,7 @@ HRESULT WINAPI XTL::EmuIDirectSound8_GetEffectData
DWORD dwDataSize
)
{
// Win2k/XP FS
DbgPrintf("EmuDSound (0x%X): EmuIDirectSound8_GetEffectData\n"
"(\n"
@ -3754,7 +3754,7 @@ HRESULT WINAPI XTL::EmuIDirectSound8_GetEffectData
if( !pvData )
pvData = CxbxMalloc( dwDataSize );
// Xbox FS
return S_OK;
}
@ -3769,7 +3769,7 @@ HRESULT WINAPI XTL::EmuIDirectSoundBuffer8_SetNotificationPositions
LPCDSBPOSITIONNOTIFY paNotifies
)
{
// Win2k/XP FS
DbgPrintf("EmuDSound (0x%X): EmuIDirectSoundBuffer8_SetNotificationPositions\n"
"(\n"
@ -3806,7 +3806,7 @@ HRESULT WINAPI XTL::EmuIDirectSoundBuffer8_SetNotificationPositions
}
}
// Xbox FS
return hr;
}
@ -3883,7 +3883,7 @@ HRESULT WINAPI XTL::EmuXFileCreateMediaObjectAsync
void **ppMediaObject
)
{
// Win2k/XP FS
DbgPrintf("EmuDSound (0x%X): EmuXFileCreateMediaObjectAsync\n"
"(\n"
@ -3899,7 +3899,7 @@ HRESULT WINAPI XTL::EmuXFileCreateMediaObjectAsync
*ppMediaObject = new X_XFileMediaObject();
// Xbox FS
return S_OK;
}
@ -3915,7 +3915,7 @@ HRESULT WINAPI XTL::EmuXFileMediaObject_Seek
LPDWORD pdwAbsolute
)
{
// Win2k/XP FS
DbgPrintf("EmuDSound (0x%X): EmuXFileMediaObject_Seek\n"
"(\n"
@ -3928,7 +3928,7 @@ HRESULT WINAPI XTL::EmuXFileMediaObject_Seek
// TODO: Implement
// Xbox FS
return S_OK;
}
@ -3938,7 +3938,7 @@ HRESULT WINAPI XTL::EmuXFileMediaObject_Seek
// ******************************************************************
VOID WINAPI XTL::EmuXFileMediaObject_DoWork(X_XFileMediaObject* pThis)
{
// Win2k/XP FS
DbgPrintf("EmuDSound (0x%X): EmuXFileMediaObject_DoWork\n"
"(\n"
@ -3948,7 +3948,7 @@ VOID WINAPI XTL::EmuXFileMediaObject_DoWork(X_XFileMediaObject* pThis)
// TODO: Implement
// Xbox FS
}
// ******************************************************************
@ -3960,7 +3960,7 @@ HRESULT WINAPI XTL::EmuXFileMediaObject_GetStatus
LPDWORD pdwStatus
)
{
// Win2k/XP FS
DbgPrintf("EmuDSound (0x%X): EmuXFileMediaObject_GetStatus\n"
"(\n"
@ -3971,7 +3971,7 @@ HRESULT WINAPI XTL::EmuXFileMediaObject_GetStatus
// TODO: Implement
// Xbox FS
return DS_OK;
}
@ -3985,7 +3985,7 @@ HRESULT WINAPI XTL::EmuXFileMediaObject_GetInfo
XMEDIAINFO *pInfo
)
{
// Win2k/XP FS
DbgPrintf("EmuDSound (0x%X): EmuXFileMediaObject_GetStatus\n"
"(\n"
@ -3996,7 +3996,7 @@ HRESULT WINAPI XTL::EmuXFileMediaObject_GetInfo
// TODO: Implement
// Xbox FS
return DS_OK;
}
@ -4011,7 +4011,7 @@ HRESULT WINAPI XTL::EmuXFileMediaObject_Process
LPXMEDIAPACKET pOutputBuffer
)
{
// Win2k/XP FS
DbgPrintf("EmuDSound (0x%X): EmuXFileMediaObject_Process\n"
"(\n"
@ -4023,7 +4023,7 @@ HRESULT WINAPI XTL::EmuXFileMediaObject_Process
// TODO: Implement
// Xbox FS
return DS_OK;
}
@ -4033,7 +4033,7 @@ HRESULT WINAPI XTL::EmuXFileMediaObject_Process
// ******************************************************************
ULONG WINAPI XTL::EmuXFileMediaObject_AddRef(X_XFileMediaObject *pThis)
{
// Win2k/XP FS
DbgPrintf("EmuDSound (0x%X): EmuXFileMediaObject_AddRef\n"
"(\n"
@ -4049,7 +4049,7 @@ ULONG WINAPI XTL::EmuXFileMediaObject_AddRef(X_XFileMediaObject *pThis)
Ret = pThis->EmuRefCount;
}
// Xbox FS
return Ret;
}
@ -4059,7 +4059,7 @@ ULONG WINAPI XTL::EmuXFileMediaObject_AddRef(X_XFileMediaObject *pThis)
// ******************************************************************
ULONG WINAPI XTL::EmuXFileMediaObject_Release(X_XFileMediaObject *pThis)
{
// Win2k/XP FS
DbgPrintf("EmuDSound (0x%X): EmuXFileMediaObject_Release\n"
"(\n"
@ -4079,7 +4079,7 @@ ULONG WINAPI XTL::EmuXFileMediaObject_Release(X_XFileMediaObject *pThis)
Ret = pThis->EmuRefCount;
}
// Xbox FS
return Ret;
}
@ -4089,7 +4089,7 @@ ULONG WINAPI XTL::EmuXFileMediaObject_Release(X_XFileMediaObject *pThis)
// ******************************************************************
HRESULT WINAPI XTL::EmuXFileMediaObject_Discontinuity(X_XFileMediaObject *pThis)
{
// Win2k/XP FS
DbgPrintf("EmuDSound (0x%X): EmuXFileMediaObject_Discontinuity\n"
"(\n"
@ -4097,7 +4097,7 @@ HRESULT WINAPI XTL::EmuXFileMediaObject_Discontinuity(X_XFileMediaObject *pThis)
");\n",
GetCurrentThreadId(), pThis);
// Xbox FS
return DS_OK;
}

48
src/CxbxKrnl/EmuKrnl.cpp
View File

@ -1133,7 +1133,7 @@ static unsigned int WINAPI PCSTProxy
callComplete:
// Win2k/XP FS
// call thread notification routine(s)
if(g_iThreadNotificationCount != 0)
@ -1297,7 +1297,7 @@ using namespace xboxkrnl;
// ******************************************************************
XBSYSAPI EXPORTNUM(1) xboxkrnl::PVOID NTAPI xboxkrnl::AvGetSavedDataAddress()
{
// Win2k/XP FS
DbgPrintf("EmuKrnl (0x%X): AvGetSavedDataAddress();\n", GetCurrentThreadId() );
@ -1341,7 +1341,7 @@ XBSYSAPI EXPORTNUM(1) xboxkrnl::PVOID NTAPI xboxkrnl::AvGetSavedDataAddress()
fclose(fp);
}*/
// Xbox FS
return NULL;//g_pPersistedData;
}
@ -1357,7 +1357,7 @@ XBSYSAPI EXPORTNUM(2) VOID NTAPI xboxkrnl::AvSendTVEncoderOption
OUT ULONG *Result
)
{
// Win2k/XP FS
DbgPrintf("EmuKrnl (0x%X): AvSendTVEncoderOption\n"
"(\n"
@ -1421,7 +1421,7 @@ XBSYSAPI EXPORTNUM(9) VOID NTAPI xboxkrnl::HalReadSMCTrayState
DWORD* Count
)
{
// Win2k/XP FS
DbgPrintf("EmuKrnl (0x%X): HalReadSMCTrayState\n"
"(\n"
@ -1443,7 +1443,7 @@ XBSYSAPI EXPORTNUM(9) VOID NTAPI xboxkrnl::HalReadSMCTrayState
*State = TRAY_OPEN;
// *Count = 1;
// Xbox FS
}
// ******************************************************************
@ -1506,7 +1506,7 @@ XBSYSAPI EXPORTNUM(17) VOID NTAPI xboxkrnl::ExFreePool
IN PVOID P
)
{
// Win2k/XP FS
DbgPrintf("EmuKrnl (0x%X): ExFreePool\n"
"(\n"
@ -1516,7 +1516,7 @@ XBSYSAPI EXPORTNUM(17) VOID NTAPI xboxkrnl::ExFreePool
CxbxFree(P);
// Xbox FS
}
// ******************************************************************
@ -1667,7 +1667,7 @@ XBSYSAPI EXPORTNUM(25) xboxkrnl::NTSTATUS NTAPI xboxkrnl::ExReadWriteRefurbInfo
// TODO: What does this do?
EmuWarning( "ExReadWriteRefurbInfo ignored!" );
// Xbox FS
return STATUS_SUCCESS;
}
@ -1696,7 +1696,7 @@ XBSYSAPI EXPORTNUM(29) xboxkrnl::NTSTATUS NTAPI xboxkrnl::ExSaveNonVolatileSetti
// TODO: Later.
// Xbox FS
return STATUS_SUCCESS;
}
@ -1792,7 +1792,7 @@ XBSYSAPI EXPORTNUM(45) xboxkrnl::NTSTATUS NTAPI xboxkrnl::HalReadSMBusValue
// Write BYTE
}
// Xbox FS
return STATUS_SUCCESS;
}
@ -1817,7 +1817,7 @@ XBSYSAPI EXPORTNUM(47) VOID xboxkrnl::HalRegisterShutdownNotification
EmuWarning("HalRegisterShutdownNotification not implemented!\n");
// Xbox FS
return;
}
@ -1844,7 +1844,7 @@ XBSYSAPI EXPORTNUM(49) VOID DECLSPEC_NORETURN xboxkrnl::HalReturnToFirmware
CxbxKrnlCleanup("Xbe has rebooted : HalReturnToFirmware(%d)", Routine);
}
// Xbox FS
}
// ******************************************************************
@ -1871,7 +1871,7 @@ XBSYSAPI EXPORTNUM(50) xboxkrnl::NTSTATUS NTAPI xboxkrnl::HalWriteSMBusValue
// TODO: Later.
// Xbox FS
return STATUS_SUCCESS;
}
@ -1983,7 +1983,7 @@ XBSYSAPI EXPORTNUM(91) xboxkrnl::NTSTATUS NTAPI xboxkrnl::IoDismountVolumeByName
IN PSTRING VolumeName
)
{
// Win2k/XP FS
DbgPrintf("EmuKrnl (0x%X): IoDismountVolumeByName\n"
"(\n"
@ -1994,7 +1994,7 @@ XBSYSAPI EXPORTNUM(91) xboxkrnl::NTSTATUS NTAPI xboxkrnl::IoDismountVolumeByName
// TODO: Anything?
NTSTATUS ret = STATUS_SUCCESS;
// Xbox FS
return ret;
}
@ -2007,7 +2007,7 @@ XBSYSAPI EXPORTNUM(95) VOID NTAPI xboxkrnl::KeBugCheck
IN ULONG BugCheckMode
)
{
// Win2k/XP FS
DbgPrintf("EmuKrnl (0x%X): KeBugCheck\n"
"(\n"
@ -2017,7 +2017,7 @@ XBSYSAPI EXPORTNUM(95) VOID NTAPI xboxkrnl::KeBugCheck
// TODO: Investigate XapiFiberStartup maybe?
// Xbox FS
}
// ******************************************************************
@ -2028,7 +2028,7 @@ XBSYSAPI EXPORTNUM(98) xboxkrnl::LONG NTAPI xboxkrnl::KeConnectInterrupt
IN PKINTERRUPT InterruptObject
)
{
// Win2k/XP FS
DbgPrintf("EmuKrnl (0x%X): KeConnectInterrupt\n"
"(\n"
@ -2036,7 +2036,7 @@ XBSYSAPI EXPORTNUM(98) xboxkrnl::LONG NTAPI xboxkrnl::KeConnectInterrupt
");\n",
GetCurrentThreadId(), InterruptObject);
// Xbox FS
return 0;
}
@ -3421,7 +3421,7 @@ XBSYSAPI EXPORTNUM(206) xboxkrnl::NTSTATUS NTAPI xboxkrnl::NtQueueApcThread
IN ULONG ApcReserved OPTIONAL
)
{
// Win2k/XP FS
DbgPrintf("EmuKrnl (0x%X): NtQueueApcThread\n"
"(\n"
@ -3443,7 +3443,7 @@ XBSYSAPI EXPORTNUM(206) xboxkrnl::NTSTATUS NTAPI xboxkrnl::NtQueueApcThread
if( FAILED( ret ) )
EmuWarning( "NtQueueApcThread failed!" );
// Xbox FS
return ret;
}
@ -4515,7 +4515,7 @@ XBSYSAPI EXPORTNUM(279) xboxkrnl::BOOLEAN NTAPI xboxkrnl::RtlEqualString
IN BOOLEAN CaseSensitive
)
{
// Win2k/XP FS
DbgPrintf("EmuKrnl (0x%X): RtlEqualString\n"
"(\n"
@ -4527,7 +4527,7 @@ XBSYSAPI EXPORTNUM(279) xboxkrnl::BOOLEAN NTAPI xboxkrnl::RtlEqualString
BOOLEAN bRet = NtDll::RtlEqualString( (NtDll::PSTRING)String1, (NtDll::PSTRING)String2, (NtDll::BOOLEAN)CaseSensitive );
// Xbox FS
return bRet;
}

12
src/CxbxKrnl/EmuXG.cpp
View File

@ -337,7 +337,7 @@ HRESULT WINAPI XTL::EmuXGWriteSurfaceOrTextureToXPR
BOOL bWriteSurfaceAsTexture
)
{
// Win2k/XP FS
DbgPrintf("EmuXapi (0x%X): EmuXGWriteSurfaceOrTextureToXPR\n"
"(\n"
@ -353,7 +353,7 @@ HRESULT WINAPI XTL::EmuXGWriteSurfaceOrTextureToXPR
EmuWarning("(Temporarily) ignoring EmuXGWriteSurfaceOrTextureToXPR. Need file specs.");
// Xbox FS
return S_OK;
}
@ -374,7 +374,7 @@ VOID WINAPI XTL::EmuXGSetTextureHeader
UINT Pitch
)
{
// Win2k/XP FS
DbgPrintf("EmuXapi (0x%X): EmuXGSetTextureHeader\n"
"(\n"
@ -439,7 +439,7 @@ VOID WINAPI XTL::EmuXGSetTextureHeader
// D3DCOLOR_XRGB(
DbgPrintf( "pTexture->Format:= 0x%.08X\n", pTexture->Format );
// Xbox FS
}
// ******************************************************************
@ -452,7 +452,7 @@ VOID WINAPI XTL::EmuXGSetTextureHeader
// void **ppFont
//)
//{
// // Win2k/XP FS
//
//
// DbgPrintf("EmuXapi (0x%X): EmuXFONT_OpenBitmapFontFromMemory\n"
// "(\n"
@ -464,7 +464,7 @@ VOID WINAPI XTL::EmuXGSetTextureHeader
//
// __asm int 3;
//
// // Xbox FS
//
//
// return E_FAIL;
//}

8
src/CxbxKrnl/EmuXOnline.cpp
View File

@ -218,7 +218,7 @@ HRESULT WINAPI XOnlineLaunchNewImage
LPVOID pLaunchData
)
{
// Win2k/XP FS
DbgPrintf("XOnline (0x%X): EmuXOnlineLaunchNewImage\n"
"(\n"
@ -229,7 +229,7 @@ HRESULT WINAPI XOnlineLaunchNewImage
// TODO: Launch another .xbe from Cxbx someday?
// Xbox FS
return E_FAIL;
}
@ -246,7 +246,7 @@ HRESULT WINAPI XTL::EmuXOnlineLogon
HANDLE pHandle
)
{
// Win2k/XP FS
DbgPrintf("XOnline (0x%X): EmuXOnlineLogon\n"
"(\n"
@ -260,7 +260,7 @@ HRESULT WINAPI XTL::EmuXOnlineLogon
// TODO: What will it take to log on to Xbox Live?
// Xbox FS
return HRESULT(0x80151000L); // XONLINE_E_LOGON_NO_NETWORK_CONNECTION
}

54
src/CxbxKrnl/EmuXactEng.cpp
View File

@ -68,7 +68,7 @@ HRESULT WINAPI XTL::EmuXACTEngineCreate
X_XACTEngine** ppEngine
)
{
// Win2k/XP FS
DbgPrintf("EmuXactEng (0x%X): EmuXACTEngineCreate\n"
"(\n"
@ -81,7 +81,7 @@ HRESULT WINAPI XTL::EmuXACTEngineCreate
*ppEngine = (X_XACTEngine*) CxbxMalloc( sizeof( X_XACTEngine ) );
// Xbox FS
return S_OK;
}
@ -91,7 +91,7 @@ HRESULT WINAPI XTL::EmuXACTEngineCreate
// ******************************************************************
void WINAPI XTL::EmuXACTEngineDoWork()
{
// Win2k/XP FS
DbgPrintf("EmuXactEng (0x%X): EmuXACTEngineCreate()\n", GetCurrentThreadId() );
@ -102,7 +102,7 @@ void WINAPI XTL::EmuXACTEngineDoWork()
//EmuDirectSoundDoWork();
//
// Xbox FS
}
// ******************************************************************
@ -116,7 +116,7 @@ HRESULT WINAPI XTL::EmuIXACTEngine_RegisterWaveBank
X_XACTWaveBank** ppWaveBank
)
{
// Win2k/XP FS
DbgPrintf("EmuXactEng (0x%X): EmuIXACTEngine_RegisterWaveBank\n"
"(\n"
@ -131,7 +131,7 @@ HRESULT WINAPI XTL::EmuIXACTEngine_RegisterWaveBank
*ppWaveBank = (X_XACTWaveBank*) CxbxMalloc( sizeof( X_XACTWaveBank ) );
// Xbox FS
return S_OK;
}
@ -146,7 +146,7 @@ HRESULT WINAPI XTL::EmuIXACTEngine_RegisterStreamedWaveBank
X_XACTWaveBank** ppWaveBank
)
{
// Win2k/XP FS
DbgPrintf("EmuXactEng (0x%X): EmuIXACTEngine_RegisterWaveBank\n"
"(\n"
@ -160,7 +160,7 @@ HRESULT WINAPI XTL::EmuIXACTEngine_RegisterStreamedWaveBank
*ppWaveBank = (X_XACTWaveBank*) CxbxMalloc( sizeof( X_XACTWaveBank ) );
// Xbox FS
return S_OK;
}
@ -176,7 +176,7 @@ HRESULT WINAPI XTL::EmuIXACTEngine_CreateSoundBank
X_XACTSoundBank** ppSoundBank
)
{
// Win2k/XP FS
DbgPrintf("EmuXactEng (0x%X): EmuIXACTEngine_CreateSoundBank\n"
"(\n"
@ -191,7 +191,7 @@ HRESULT WINAPI XTL::EmuIXACTEngine_CreateSoundBank
*ppSoundBank = (X_XACTSoundBank*) CxbxMalloc( sizeof( X_XACTSoundBank ) );
// Xbox FS
return S_OK;
}
@ -208,7 +208,7 @@ HRESULT WINAPI XTL::EmuIXACTEngine_DownloadEffectsImage
LPVOID* ppImageDesc
)
{
// Win2k/XP FS
DbgPrintf("EmuXactEng (0x%X): EmuIXACTEngine_DownloadEffectsImage\n"
"(\n"
@ -222,7 +222,7 @@ HRESULT WINAPI XTL::EmuIXACTEngine_DownloadEffectsImage
// TODO: Implement
// Xbox FS
return S_OK;
}
@ -237,7 +237,7 @@ HRESULT WINAPI XTL::EmuIXACTEngine_CreateSoundSource
X_XACTSoundSource** ppSoundSource
)
{
// Win2k/XP FS
DbgPrintf("EmuXactEng (0x%X): EmuIXACTEngine_CreateSoundSource\n"
"(\n"
@ -263,7 +263,7 @@ HRESULT WINAPI XTL::EmuIXACTEngine_EnableHeadphones
BOOL fEnabled
)
{
// Win2k/XP FS
DbgPrintf("EmuXactEng (0x%X): EmuIXACTEngine_EnableHeadphones\n"
"(\n"
@ -292,7 +292,7 @@ HRESULT WINAPI XTL::EmuIXACTEngine_SetListenerOrientation
DWORD dwApply
)
{
// Win2k/XP FS
DbgPrintf("EmuXactEng (0x%X): EmuIXACTEngine_SetListenerOrientation\n"
"(\n"
@ -324,7 +324,7 @@ HRESULT WINAPI XTL::EmuIXACTEngine_SetListenerPosition
DWORD dwApply
)
{
// Win2k/XP FS
DbgPrintf("EmuXactEng (0x%X): EmuIXACTEngine_SetListenerPosition\n"
"(\n"
@ -353,7 +353,7 @@ HRESULT WINAPI XTL::EmuIXACTEngine_SetListenerVelocity
DWORD dwApply
)
{
// Win2k/XP FS
DbgPrintf("EmuXactEng (0x%X): EmuIXACTEngine_SetListenerVelocity\n"
"(\n"
@ -380,7 +380,7 @@ HRESULT WINAPI XTL::EmuIXACTEngine_SetMasterVolume
LONG lVolume
)
{
// Win2k/XP FS
DbgPrintf("EmuXactEng (0x%X): EmuIXACTEngine_SetMasterVolume\n"
"(\n"
@ -400,7 +400,7 @@ HRESULT WINAPI XTL::EmuIXACTEngine_SetMasterVolume
// ******************************************************************
HRESULT WINAPI XTL::EmuIXACTEngine_CommitDeferredSettings(X_XACTEngine* pThis)
{
// Win2k/XP FS
DbgPrintf("EmuXactEng (0x%X): EmuIXACTEngine_CommitDeferredSettings\n"
"(\n"
@ -423,7 +423,7 @@ HRESULT WINAPI XTL::EmuIXACTSoundBank_GetSoundCueIndexFromFriendlyName
DWORD* pdwSoundCueIndex
)
{
// Win2k/XP FS
DbgPrintf("EmuXactEng (0x%X): EmuIXACTSoundBank_GetSoundCueIndexFromFriendlyName\n"
"(\n"
@ -450,7 +450,7 @@ HRESULT WINAPI XTL::EmuIXACTSoundBank_Play
X_XACTSoundCue** ppSoundCue
)
{
// Win2k/XP FS
DbgPrintf("EmuXactEng (0x%X): EmuIXACTSoundBank_Play\n"
"(\n"
@ -478,7 +478,7 @@ HRESULT WINAPI XTL::EmuIXACTSoundBank_Stop
X_XACTSoundCue* pSoundCue
)
{
// Win2k/XP FS
DbgPrintf("EmuXactEng (0x%X): EmuIXACTSoundBank_Stop\n"
"(\n"
@ -506,7 +506,7 @@ HRESULT WINAPI XTL::EmuIXACTSoundSource_SetPosition
DWORD dwApply
)
{
// Win2k/XP FS
DbgPrintf("EmuXactEng (0x%X): EmuIXACTSoundSource_SetPosition\n"
"(\n"
@ -535,7 +535,7 @@ HRESULT WINAPI XTL::EmuIXACTSoundSource_SetVelocity
DWORD dwApply
)
{
// Win2k/XP FS
DbgPrintf("EmuXactEng (0x%X): EmuIXACTSoundSource_SetVelocity\n"
"(\n"
@ -561,7 +561,7 @@ HRESULT WINAPI XTL::EmuIXACTEngine_RegisterNotification
PCXACT_NOTIFICATION_DESCRIPTION pNotificationDesc
)
{
// Win2k/XP FS
DbgPrintf("EmuXactEng (0x%X): EmuIXACTEngine_RegisterNotification\n"
"(\n"
@ -585,7 +585,7 @@ HRESULT WINAPI XTL::EmuIXACTEngine_GetNotification
LPVOID pNotification
)
{
// Win2k/XP FS
DbgPrintf("EmuXactEng (0x%X): EmuIXACTEngine_GetNotification\n"
"(\n"
@ -612,7 +612,7 @@ HRESULT WINAPI XTL::EmuIXACTEngine_UnRegisterWaveBank
X_XACTWaveBank* pWaveBank
)
{
// Win2k/XP FS
DbgPrintf("EmuXactEng (0x%X): EmuIXACTEngine_UnRegisterWaveBank\n"
"(\n"

100
src/CxbxKrnl/EmuXapi.cpp
View File

@ -916,7 +916,7 @@ LPVOID WINAPI XTL::EmuXLoadSectionA
LPCSTR pSectionName
)
{
// Win2k/XP FS
DbgPrintf("EmuXapi (0x%X): EmuXLoadSectionA\n"
"(\n"
@ -928,7 +928,7 @@ LPVOID WINAPI XTL::EmuXLoadSectionA
EmuWarning("Redirecting EmuXLoadSectionA to EmuXGetSectionHandleA\n");
LPVOID pRet = EmuXGetSectionHandleA(pSectionName);
// Xbox FS
return pRet;
}
@ -941,7 +941,7 @@ BOOL WINAPI XTL::EmuXFreeSectionA
LPCSTR pSectionName
)
{
// Win2k/XP FS
DbgPrintf("EmuXapi (0x%X): EmuXFreeSectionA\n"
"(\n"
@ -952,7 +952,7 @@ BOOL WINAPI XTL::EmuXFreeSectionA
// TODO: Implement (if necessary)?
// CxbxKrnlCleanup( "XFreeSectionA is not implemented" );
// Xbox FS
return TRUE;
}
@ -965,7 +965,7 @@ HANDLE WINAPI XTL::EmuXGetSectionHandleA
LPCSTR pSectionName
)
{
// Win2k/XP FS
DbgPrintf("EmuXapi (0x%X): EmuXGetSectionHandleA\n"
"(\n"
@ -983,7 +983,7 @@ HANDLE WINAPI XTL::EmuXGetSectionHandleA
}
}
// Xbox FS
return (LPVOID) pRet;
}
@ -996,7 +996,7 @@ LPVOID WINAPI XTL::EmuXLoadSectionByHandle
HANDLE hSection
)
{
// Win2k/XP FS
DbgPrintf("EmuXapi (0x%X): EmuXLoadSectionByHandle\n"
"(\n"
@ -1007,7 +1007,7 @@ LPVOID WINAPI XTL::EmuXLoadSectionByHandle
// The handle should contain the address of this section by the hack
// used in EmuXGetSectionHandleA.
// Xbox FS
return (LPVOID) hSection;
}
@ -1020,7 +1020,7 @@ BOOL WINAPI XTL::EmuXFreeSectionByHandle
HANDLE hSection
)
{
// Win2k/XP FS
DbgPrintf("EmuXapi (0x%X): EmuXFreeSectionByHandle\n"
"(\n"
@ -1031,7 +1031,7 @@ BOOL WINAPI XTL::EmuXFreeSectionByHandle
// TODO: Implement (if necessary)?
// CxbxKrnlCleanup( "XFreeSectionByHandle is not implemented" );
// Xbox FS
return TRUE;
}
@ -1044,7 +1044,7 @@ DWORD WINAPI XTL::EmuXGetSectionSize
HANDLE hSection
)
{
// Win2k/XP FS
DbgPrintf("EmuXapi (0x%X): EmuXGetSectionSize\n"
"(\n"
@ -1078,7 +1078,7 @@ DWORD WINAPI XTL::EmuQueueUserAPC
DWORD dwData
)
{
// Win2k/XP FS
DbgPrintf("EmuXapi (0x%X): EmuQueueUserAPC\n"
"(\n"
@ -1101,7 +1101,7 @@ DWORD WINAPI XTL::EmuQueueUserAPC
if(!dwRet)
EmuWarning("QueueUserAPC failed!");
// Xbox FS
return dwRet;
}
@ -1117,7 +1117,7 @@ BOOL WINAPI XTL::EmuGetOverlappedResult
BOOL bWait
)
{
// Win2k/XP FS
DbgPrintf("EmuXapi (0x%X): EmuGetOverlappedResult\n"
"(\n"
@ -1133,7 +1133,7 @@ BOOL WINAPI XTL::EmuGetOverlappedResult
// if(bWait)
// bRet = TRUE; // Sucker...
// Xbox FS
return bRet;
}
@ -1147,7 +1147,7 @@ DWORD WINAPI XTL::EmuXLaunchNewImage
PLAUNCH_DATA pLaunchData
)
{
// Win2k/XP FS
DbgPrintf("EmuXapi (0x%X): EmuXLaunchNewImage\n"
"(\n"
@ -1212,7 +1212,7 @@ DWORD WINAPI XTL::EmuXLaunchNewImage
// Temporary Hack (Unreal): Jump back to the entry point
// uint32* start = (uint32*) 0x21C13B;
// Xbox FS
/*__asm
{
@ -1235,7 +1235,7 @@ DWORD WINAPI XTL::EmuXGetLaunchInfo
PLAUNCH_DATA pLaunchData
)
{
// Win2k/XP FS
DbgPrintf("EmuXapi (0x%X): EmuXGetLaunchInfo\n"
"(\n"
@ -1291,7 +1291,7 @@ DWORD WINAPI XTL::EmuXGetLaunchInfo
dwRet = ERROR_SUCCESS;
}
// Xbox FS
return dwRet;
}
@ -1304,7 +1304,7 @@ VOID WINAPI XTL::EmuXSetProcessQuantumLength
DWORD dwMilliseconds
)
{
// Win2k/XP FS
DbgPrintf("EmuXapi (0x%X): EmuXSetProcessQuantumLength\n"
"(\n"
@ -1315,7 +1315,7 @@ VOID WINAPI XTL::EmuXSetProcessQuantumLength
// TODO: Implement?
EmuWarning("XSetProcessQuantumLength is being ignored!");
// Xbox FS
}
// ******************************************************************
@ -1323,7 +1323,7 @@ VOID WINAPI XTL::EmuXSetProcessQuantumLength
// ******************************************************************
DWORD WINAPI XTL::EmuXGetFileCacheSize()
{
// Win2k/XP FS
DbgPrintf("EmuXapi (0x%X): EmuXGetFileCacheSize()\n", GetCurrentThreadId());
@ -1347,7 +1347,7 @@ DWORD WINAPI XTL::EmuSignalObjectAndWait
BOOL bAlertable
)
{
// Win2k/XP FS
DbgPrintf("EmuXapi (0x%X): EmuSignalObjectAndWait\n"
"(\n"
@ -1360,7 +1360,7 @@ DWORD WINAPI XTL::EmuSignalObjectAndWait
DWORD dwRet = SignalObjectAndWait( hObjectToSignal, hObjectToWaitOn, dwMilliseconds, bAlertable );
// Xbox FS
return dwRet;
}
@ -1370,7 +1370,7 @@ DWORD WINAPI XTL::EmuSignalObjectAndWait
// ******************************************************************
BOOL WINAPI XTL::EmuPulseEvent( HANDLE hEvent )
{
// Win2k/XP FS
DbgPrintf("EmuXapi (0x%X): EmuPulseEvent\n"
"(\n"
@ -1383,7 +1383,7 @@ BOOL WINAPI XTL::EmuPulseEvent( HANDLE hEvent )
BOOL bRet = PulseEvent( hEvent );
// Xbox FS
return bRet;
}
@ -1400,7 +1400,7 @@ MMRESULT WINAPI XTL::EmutimeSetEvent
UINT fuEvent
)
{
// Win2k/XP FS
DbgPrintf("EmuXapi (0x%X): EmutimeSetEvent\n"
"(\n"
@ -1414,7 +1414,7 @@ MMRESULT WINAPI XTL::EmutimeSetEvent
MMRESULT Ret = timeSetEvent( uDelay, uResolution, fptc, (DWORD_PTR) dwUser, fuEvent );
// Xbox FS
return Ret;
}
@ -1427,7 +1427,7 @@ MMRESULT WINAPI XTL::EmutimeKillEvent
UINT uTimerID
)
{
// Win2k/XP FS
DbgPrintf("EmuXapi (0x%X): EmuReleaseSemaphore\n"
"(\n"
@ -1437,7 +1437,7 @@ MMRESULT WINAPI XTL::EmutimeKillEvent
MMRESULT Ret = timeKillEvent( uTimerID );
// Xbox FS
return Ret;
}
@ -1453,7 +1453,7 @@ VOID WINAPI XTL::EmuRaiseException
CONST ULONG_PTR *lpArguments // array of arguments
)
{
// Win2k/XP FS
DbgPrintf("EmuXapi (0x%X): EmuRaiseException\n"
"(\n"
@ -1467,7 +1467,7 @@ VOID WINAPI XTL::EmuRaiseException
// TODO: Implement or not?
// RaiseException(dwExceptionCode, dwExceptionFlags, nNumberOfArguments, (*(ULONG_PTR**) &lpArguments));
// Xbox FS
}
// ******************************************************************
@ -1478,7 +1478,7 @@ DWORD WINAPI XTL::EmuGetFileAttributesA
LPCSTR lpFileName // name of file or directory
)
{
// Win2k/XP FS
DbgPrintf("EmuXapi (0x%X): EmuGetFileAttributesA\n"
"(\n"
@ -1521,7 +1521,7 @@ DWORD WINAPI XTL::EmuXMountMUA
PCHAR pchDrive
)
{
// Win2k/XP FS
DbgPrintf("EmuXapi (0x%X): EmuXMountMUA\n"
"(\n"
@ -1534,7 +1534,7 @@ DWORD WINAPI XTL::EmuXMountMUA
// TODO: Actually allow memory card emulation? This might make transferring
// game saves a bit easier if the memory card directory was configurable. =]
// Xbox FS
return E_FAIL;
}
@ -1549,7 +1549,7 @@ HANDLE WINAPI XTL::EmuCreateWaitableTimerA
LPCSTR lpTimerName // object name
)
{
// Win2k/XP FS
DbgPrintf("EmuXapi (0x%X): EmuCreateWaitableTimerA\n"
"(\n"
@ -1565,7 +1565,7 @@ HANDLE WINAPI XTL::EmuCreateWaitableTimerA
HANDLE hRet = CreateWaitableTimerA( NULL, bManualReset, lpTimerName );
// Xbox FS
return hRet;
}
@ -1584,7 +1584,7 @@ BOOL WINAPI XTL::EmuSetWaitableTimer
)
{
// Win2k/XP FS
DbgPrintf("EmuXapi (0x%X): EmuSetWaitableTimer\n"
"(\n"
@ -1603,7 +1603,7 @@ BOOL WINAPI XTL::EmuSetWaitableTimer
if(!Ret)
EmuWarning("SetWaitableTimer failed!");
// Xbox FS
return Ret;
}
@ -1618,7 +1618,7 @@ DWORD WINAPI XTL::EmuXMountAlternateTitle
PCHAR pchDrive
)
{
// Win2k/XP FS
DbgPrintf("EmuXapi (0x%X): EmuXMountAlternateTitle\n"
"(\n"
@ -1630,7 +1630,7 @@ DWORD WINAPI XTL::EmuXMountAlternateTitle
// TODO: Anything?
// Xbox FS
return ERROR_SUCCESS;
}
@ -1640,7 +1640,7 @@ DWORD WINAPI XTL::EmuXMountAlternateTitle
// ******************************************************************
DWORD WINAPI XTL::EmuXUnmountAlternateTitle(CHAR chDrive)
{
// Win2k/XP FS
DbgPrintf("EmuXapi (0x%X): EmuXUnmountAlternativeTitle\n"
"(\n"
@ -1658,11 +1658,11 @@ DWORD WINAPI XTL::EmuXUnmountAlternateTitle(CHAR chDrive)
// ******************************************************************
DWORD WINAPI XTL::EmuXGetDeviceEnumerationStatus()
{
// Win2k/XP FS
DbgPrintf("EmuXapi (0x%X): EmuXGetDeviceEnumerationStatus()\n", GetCurrentThreadId());
// Xbox FS
return XDEVICE_ENUMERATION_IDLE;
}
@ -1676,7 +1676,7 @@ DWORD WINAPI XTL::EmuXInputGetDeviceDescription
PVOID pDescription
)
{
// Win2k/XP FS
DbgPrintf("EmuXapi (0x%X): EmuXInputGetDeviceDescription\n"
"(\n"
@ -1687,7 +1687,7 @@ DWORD WINAPI XTL::EmuXInputGetDeviceDescription
// TODO: Lightgun support?
// Xbox FS
return ERROR_NOT_SUPPORTED; // ERROR_DEVICE_NOT_CONNECTED;
}
@ -1697,14 +1697,14 @@ DWORD WINAPI XTL::EmuXInputGetDeviceDescription
// ******************************************************************
int WINAPI XTL::EmuXAutoPowerDownResetTimer()
{
// Win2k/XP FS
DbgPrintf("EmuXapi (0x%X): EmuXAutoPowerDownResetTimer()\n",
GetCurrentThreadId());
// Meh, that's what the 'X' is for! =]
// Xbox FS
return TRUE;
}
@ -1720,7 +1720,7 @@ DWORD WINAPI XTL::EmuXMountMURootA
)
{
// Win2k/XP FS
DbgPrintf("EmuXapi (0x%X): EmuXMountMURootA\n"
"(\n"
@ -1732,7 +1732,7 @@ DWORD WINAPI XTL::EmuXMountMURootA
// TODO: The params are probably wrong...
// Xbox FS
return ERROR_SUCCESS;
}