From ec1c19a5de2d19678aee6a0806806a2bf3e71171 Mon Sep 17 00:00:00 2001 From: Spacebrain Date: Thu, 23 Apr 2015 06:09:07 +0200 Subject: [PATCH] Removed *really* useless functions from xD3D9-Null --- src/xrD3D9-Null/IDirect3D9.cpp | 50 ++-- src/xrD3D9-Null/IDirect3DCubeTexture9.cpp | 46 +-- src/xrD3D9-Null/IDirect3DDevice9.cpp | 270 ++++++++---------- src/xrD3D9-Null/IDirect3DDevice9_Caps.cpp | 2 +- src/xrD3D9-Null/IDirect3DIndexBuffer9.cpp | 30 +- src/xrD3D9-Null/IDirect3DPixelShader9.cpp | 14 +- src/xrD3D9-Null/IDirect3DQuery9.cpp | 18 +- src/xrD3D9-Null/IDirect3DStateBlock9.cpp | 16 +- src/xrD3D9-Null/IDirect3DSurface9.cpp | 36 +-- src/xrD3D9-Null/IDirect3DTexture9.cpp | 44 +-- src/xrD3D9-Null/IDirect3DVertexBuffer9.cpp | 30 +- .../IDirect3DVertexDeclaration9.cpp | 14 +- src/xrD3D9-Null/IDirect3DVertexShader9.cpp | 14 +- src/xrD3D9-Null/xrD3D9-Null_OutProc.cpp | 35 --- src/xrD3D9-Null/xrD3D9-Null_OutProc.h | 11 - 15 files changed, 269 insertions(+), 361 deletions(-) diff --git a/src/xrD3D9-Null/IDirect3D9.cpp b/src/xrD3D9-Null/IDirect3D9.cpp index a79489bdceb..998b2947c5d 100644 --- a/src/xrD3D9-Null/IDirect3D9.cpp +++ b/src/xrD3D9-Null/IDirect3D9.cpp @@ -19,7 +19,7 @@ ULONG xrIDirect3D9::AddRef(void) { APIDEBUG("xrIDirect3D9::AddRef"); m_refCount++; - return ULONG_Proc(m_refCount); + return m_refCount; } ULONG xrIDirect3D9::Release(void) @@ -29,9 +29,9 @@ ULONG xrIDirect3D9::Release(void) if (m_refCount < 0) { delete this; - return ULONG_Proc(-1); + return -1; } - return ULONG_Proc(m_refCount); + return m_refCount; } HRESULT xrIDirect3D9::QueryInterface(const IID &iid, void FAR* FAR* ppvObj) @@ -41,20 +41,20 @@ HRESULT xrIDirect3D9::QueryInterface(const IID &iid, void FAR* FAR* ppvObj) { *ppvObj = this; AddRef(); - return HRESULT_Proc(NOERROR); + return NOERROR; } - return HRESULT_Proc(E_NOINTERFACE); + return E_NOINTERFACE; } HRESULT xrIDirect3D9::RegisterSoftwareDevice(void* pInitializeFunction) { APIDEBUG("xrIDirect3D9::RegisterSoftwareDevice"); - return HRESULT_Proc(S_OK); + return S_OK; }; UINT xrIDirect3D9::GetAdapterCount() { APIDEBUG("xrIDirect3D9::GetAdapterCount"); - return ULONG_Proc(1); + return 1; }; HRESULT xrIDirect3D9::GetAdapterIdentifier(UINT Adapter,DWORD Flags,D3DADAPTER_IDENTIFIER9* pIdentifier) @@ -63,56 +63,56 @@ HRESULT xrIDirect3D9::GetAdapterIdentifier(UINT Adapter,DWORD Flags,D3DADAPTER_I sprintf_s(pIdentifier->Driver, "Default Driver"); sprintf_s(pIdentifier->Description, "Default X-Ray Dedicated Adapter"); sprintf_s(pIdentifier->DeviceName, "Dedicated"); - return HRESULT_Proc(S_OK); + return S_OK; }; UINT xrIDirect3D9::GetAdapterModeCount( UINT Adapter,D3DFORMAT Format) { APIDEBUG("xrIDirect3D9::GetAdapterModeCount"); - return ULONG_Proc(1); + return 1; }; HRESULT xrIDirect3D9::EnumAdapterModes(UINT Adapter,D3DFORMAT Format,UINT Mode,D3DDISPLAYMODE* pMode) { APIDEBUG("xrIDirect3D9::EnumAdapterModes"); - return HRESULT_Proc(S_OK); + return S_OK; }; HRESULT xrIDirect3D9::GetAdapterDisplayMode( UINT Adapter,D3DDISPLAYMODE* pMode) { APIDEBUG("xrIDirect3D9::GetAdapterDisplayMode"); pMode->Format = D3DFMT_A8R8G8B8; - return HRESULT_Proc(S_OK); + return S_OK; }; HRESULT xrIDirect3D9::CheckDeviceType( UINT Adapter,D3DDEVTYPE DevType,D3DFORMAT AdapterFormat,D3DFORMAT BackBufferFormat,BOOL bWindowed) { APIDEBUG("xrIDirect3D9::CheckDeviceType"); - return HRESULT_Proc(S_OK); + return S_OK; }; HRESULT xrIDirect3D9::CheckDeviceFormat( UINT Adapter,D3DDEVTYPE DeviceType,D3DFORMAT AdapterFormat,DWORD Usage,D3DRESOURCETYPE RType,D3DFORMAT CheckFormat) { APIDEBUG("xrIDirect3D9::CheckDeviceFormat"); - return HRESULT_Proc(S_OK); + return S_OK; }; HRESULT xrIDirect3D9::CheckDeviceMultiSampleType( UINT Adapter,D3DDEVTYPE DeviceType,D3DFORMAT SurfaceFormat,BOOL Windowed,D3DMULTISAMPLE_TYPE MultiSampleType,DWORD* pQualityLevels) { APIDEBUG("xrIDirect3D9::CheckDeviceMultiSampleType"); - return HRESULT_Proc(S_OK); + return S_OK; }; HRESULT xrIDirect3D9::CheckDepthStencilMatch( UINT Adapter,D3DDEVTYPE DeviceType,D3DFORMAT AdapterFormat,D3DFORMAT RenderTargetFormat,D3DFORMAT DepthStencilFormat) { APIDEBUG("xrIDirect3D9::CheckDepthStencilMatch"); - return HRESULT_Proc(S_OK); + return S_OK; }; HRESULT xrIDirect3D9::CheckDeviceFormatConversion( UINT Adapter,D3DDEVTYPE DeviceType,D3DFORMAT SourceFormat,D3DFORMAT TargetFormat) { APIDEBUG("xrIDirect3D9::CheckDeviceFormatConversion"); - return HRESULT_Proc(S_OK); + return S_OK; }; HRESULT xrIDirect3D9::GetDeviceCaps( UINT Adapter,D3DDEVTYPE DeviceType,D3DCAPS9* pCaps) { APIDEBUG("xrIDirect3D9::GetDeviceCaps"); if (pCaps) ZeroMemory(pCaps,sizeof(D3DCAPS9)); - return HRESULT_Proc(S_OK); + return S_OK; }; HMONITOR xrIDirect3D9::GetAdapterMonitor( UINT Adapter) { @@ -126,19 +126,5 @@ HRESULT xrIDirect3D9::CreateDevice (UINT Adapter,D3DDEVTYPE DeviceType,HWND hFoc *ppReturnedDeviceInterface = NULL; xrIDirect3DDevice9* I = new xrIDirect3DDevice9(this, pPresentationParameters); *ppReturnedDeviceInterface = I; - return HRESULT_Proc(S_OK); + return S_OK; }; -//------------------------------------------------------------------- -/* -HRESULT xrIDirect3D9::HRESULT_Proc(HRESULT ret) -{ - return ret; -} - -ULONG xrIDirect3D9::ULONG_Proc(ULONG ret) -{ - return ret; -} -*/ - - diff --git a/src/xrD3D9-Null/IDirect3DCubeTexture9.cpp b/src/xrD3D9-Null/IDirect3DCubeTexture9.cpp index d66dee1cb07..6c2ebe7319c 100644 --- a/src/xrD3D9-Null/IDirect3DCubeTexture9.cpp +++ b/src/xrD3D9-Null/IDirect3DCubeTexture9.cpp @@ -29,16 +29,16 @@ HRESULT xrIDirect3DCubeTexture9::QueryInterface( REFIID riid, void** ppvObj) { *ppvObj = this; AddRef(); - return HRESULT_Proc(NOERROR); + return NOERROR; } - return HRESULT_Proc(E_NOINTERFACE); + return E_NOINTERFACE; } ULONG xrIDirect3DCubeTexture9::AddRef() { APIDEBUG("xrIDirect3DCubeTexture9::AddRef"); m_refCount++; - return ULONG_Proc(m_refCount); + return m_refCount; } ULONG xrIDirect3DCubeTexture9::Release() @@ -48,9 +48,9 @@ ULONG xrIDirect3DCubeTexture9::Release() if (m_refCount < 0) { delete this; - return ULONG_Proc(-1); + return -1; } - return ULONG_Proc(m_refCount); + return m_refCount; } /*** IDirect3DBaseTexture9 methods ***/ @@ -59,21 +59,21 @@ HRESULT xrIDirect3DCubeTexture9::GetDevice( IDirect3DDevice9** ppDevice) APIDEBUG("xrIDirect3DCubeTexture9::GetDevice"); m_pIDirect3DDevice9->AddRef(); *ppDevice = m_pIDirect3DDevice9; - return HRESULT_Proc(S_OK); + return S_OK; } -HRESULT xrIDirect3DCubeTexture9::SetPrivateData ( REFGUID refguid,CONST void* pData,DWORD SizeOfData,DWORD Flags) { APIDEBUG("xrIDirect3DCubeTexture9::SetPrivateData"); return HRESULT_Proc(S_OK); }; -HRESULT xrIDirect3DCubeTexture9::GetPrivateData ( REFGUID refguid,void* pData,DWORD* pSizeOfData) { APIDEBUG("xrIDirect3DCubeTexture9::GetPrivateData"); return HRESULT_Proc(S_OK); }; -HRESULT xrIDirect3DCubeTexture9::FreePrivateData ( REFGUID refguid) { APIDEBUG("xrIDirect3DCubeTexture9::FreePrivateData"); return HRESULT_Proc(S_OK); }; -DWORD xrIDirect3DCubeTexture9::SetPriority ( DWORD PriorityNew) { APIDEBUG("xrIDirect3DCubeTexture9::SetPriority"); DWORD old = Priority; Priority = PriorityNew; return DWORD_Proc(old); }; -DWORD xrIDirect3DCubeTexture9::GetPriority () { APIDEBUG("xrIDirect3DCubeTexture9::GetPriority"); return DWORD_Proc(Priority); }; -void xrIDirect3DCubeTexture9::PreLoad () { APIDEBUG("xrIDirect3DCubeTexture9::PreLoad"); return VOID_proc(); }; +HRESULT xrIDirect3DCubeTexture9::SetPrivateData ( REFGUID refguid,CONST void* pData,DWORD SizeOfData,DWORD Flags) { APIDEBUG("xrIDirect3DCubeTexture9::SetPrivateData"); return S_OK; }; +HRESULT xrIDirect3DCubeTexture9::GetPrivateData ( REFGUID refguid,void* pData,DWORD* pSizeOfData) { APIDEBUG("xrIDirect3DCubeTexture9::GetPrivateData"); return S_OK; }; +HRESULT xrIDirect3DCubeTexture9::FreePrivateData ( REFGUID refguid) { APIDEBUG("xrIDirect3DCubeTexture9::FreePrivateData"); return S_OK; }; +DWORD xrIDirect3DCubeTexture9::SetPriority ( DWORD PriorityNew) { APIDEBUG("xrIDirect3DCubeTexture9::SetPriority"); DWORD old = Priority; Priority = PriorityNew; return old; }; +DWORD xrIDirect3DCubeTexture9::GetPriority () { APIDEBUG("xrIDirect3DCubeTexture9::GetPriority"); return Priority; }; +void xrIDirect3DCubeTexture9::PreLoad () { APIDEBUG("xrIDirect3DCubeTexture9::PreLoad"); }; D3DRESOURCETYPE xrIDirect3DCubeTexture9::GetType () { APIDEBUG("xrIDirect3DCubeTexture9::GetType"); return D3DRTYPE_TEXTURE; }; -DWORD xrIDirect3DCubeTexture9::SetLOD ( DWORD LODNew) { APIDEBUG("xrIDirect3DCubeTexture9::SetLOD"); DWORD old = LOD; LOD = LODNew; return DWORD_Proc(old); }; -DWORD xrIDirect3DCubeTexture9::GetLOD () { APIDEBUG("xrIDirect3DCubeTexture9::GetLOD"); return DWORD_Proc(LOD); }; -DWORD xrIDirect3DCubeTexture9::GetLevelCount () { APIDEBUG("xrIDirect3DCubeTexture9::GetLevelCount"); return DWORD_Proc(Levels); }; -HRESULT xrIDirect3DCubeTexture9::SetAutoGenFilterType ( D3DTEXTUREFILTERTYPE iFilterType) { APIDEBUG("xrIDirect3DCubeTexture9::SetAutoGenFilterType"); FilterType = iFilterType; return HRESULT_Proc(S_OK); }; -D3DTEXTUREFILTERTYPE xrIDirect3DCubeTexture9::GetAutoGenFilterType () { APIDEBUG("xrIDirect3DCubeTexture9::GetAutoGenFilterType"); return D3DTEXTUREFILTERTYPE(FilterType); }; -void xrIDirect3DCubeTexture9::GenerateMipSubLevels () { APIDEBUG("xrIDirect3DCubeTexture9::GenerateMipSubLevels"); return VOID_proc(); }; +DWORD xrIDirect3DCubeTexture9::SetLOD ( DWORD LODNew) { APIDEBUG("xrIDirect3DCubeTexture9::SetLOD"); DWORD old = LOD; LOD = LODNew; return old; }; +DWORD xrIDirect3DCubeTexture9::GetLOD () { APIDEBUG("xrIDirect3DCubeTexture9::GetLOD"); return LOD; }; +DWORD xrIDirect3DCubeTexture9::GetLevelCount () { APIDEBUG("xrIDirect3DCubeTexture9::GetLevelCount"); return Levels; }; +HRESULT xrIDirect3DCubeTexture9::SetAutoGenFilterType ( D3DTEXTUREFILTERTYPE iFilterType) { APIDEBUG("xrIDirect3DCubeTexture9::SetAutoGenFilterType"); FilterType = iFilterType; return S_OK; }; +D3DTEXTUREFILTERTYPE xrIDirect3DCubeTexture9::GetAutoGenFilterType () { APIDEBUG("xrIDirect3DCubeTexture9::GetAutoGenFilterType"); return FilterType; }; +void xrIDirect3DCubeTexture9::GenerateMipSubLevels () { APIDEBUG("xrIDirect3DCubeTexture9::GenerateMipSubLevels"); }; HRESULT xrIDirect3DCubeTexture9::GetLevelDesc ( UINT Level,D3DSURFACE_DESC *pDesc) { @@ -89,7 +89,7 @@ HRESULT xrIDirect3DCubeTexture9::GetLevelDesc ( UINT Level,D3DSURFACE_DESC pDesc->Width = Width; pDesc->Height = Height; - return HRESULT_Proc(S_OK); + return S_OK; }; HRESULT xrIDirect3DCubeTexture9::GetCubeMapSurface( D3DCUBEMAP_FACES FaceType,UINT Level,IDirect3DSurface9** ppCubeMapSurface) @@ -100,8 +100,8 @@ HRESULT xrIDirect3DCubeTexture9::GetCubeMapSurface( D3DCUBEMAP_FACES FaceTyp xrIDirect3DSurface9* I = new xrIDirect3DSurface9(m_pIDirect3DDevice9, Width,Height,Format,D3DMULTISAMPLE_TYPE(0),0); *ppCubeMapSurface = I; - return HRESULT_Proc(S_OK); + return S_OK; }; -HRESULT xrIDirect3DCubeTexture9::LockRect ( D3DCUBEMAP_FACES FaceType, UINT Level,D3DLOCKED_RECT* pLockedRect,CONST RECT* pRect,DWORD Flags) { APIDEBUG("xrIDirect3DCubeTexture9::LockRect"); return HRESULT_Proc(S_OK); }; -HRESULT xrIDirect3DCubeTexture9::UnlockRect ( D3DCUBEMAP_FACES FaceType, UINT Level) { APIDEBUG("xrIDirect3DCubeTexture9::UnlockRect"); return HRESULT_Proc(S_OK); }; -HRESULT xrIDirect3DCubeTexture9::AddDirtyRect ( D3DCUBEMAP_FACES FaceType, CONST RECT* pDirtyRect) { APIDEBUG("xrIDirect3DCubeTexture9::AddDirtyRect"); return HRESULT_Proc(S_OK); }; \ No newline at end of file +HRESULT xrIDirect3DCubeTexture9::LockRect ( D3DCUBEMAP_FACES FaceType, UINT Level,D3DLOCKED_RECT* pLockedRect,CONST RECT* pRect,DWORD Flags) { APIDEBUG("xrIDirect3DCubeTexture9::LockRect"); return S_OK; }; +HRESULT xrIDirect3DCubeTexture9::UnlockRect ( D3DCUBEMAP_FACES FaceType, UINT Level) { APIDEBUG("xrIDirect3DCubeTexture9::UnlockRect"); return S_OK; }; +HRESULT xrIDirect3DCubeTexture9::AddDirtyRect ( D3DCUBEMAP_FACES FaceType, CONST RECT* pDirtyRect) { APIDEBUG("xrIDirect3DCubeTexture9::AddDirtyRect"); return S_OK; }; \ No newline at end of file diff --git a/src/xrD3D9-Null/IDirect3DDevice9.cpp b/src/xrD3D9-Null/IDirect3DDevice9.cpp index 17fb9bc01aa..fbe90066aeb 100644 --- a/src/xrD3D9-Null/IDirect3DDevice9.cpp +++ b/src/xrD3D9-Null/IDirect3DDevice9.cpp @@ -63,7 +63,7 @@ ULONG xrIDirect3DDevice9::AddRef(void) { APIDEBUG("xrIDirect3DDevice9::AddRef"); m_refCount++; - return ULONG_Proc(m_refCount); + return m_refCount; } ULONG xrIDirect3DDevice9::Release(void) @@ -73,9 +73,9 @@ ULONG xrIDirect3DDevice9::Release(void) if (m_refCount < 0) { delete this; - return ULONG_Proc(0); + return 0; } - return ULONG_Proc(m_refCount); + return m_refCount; } HRESULT xrIDirect3DDevice9::QueryInterface(const IID &iid, void FAR* FAR* ppvObj) @@ -85,86 +85,86 @@ HRESULT xrIDirect3DDevice9::QueryInterface(const IID &iid, void FAR* FAR* ppvObj { *ppvObj = this; AddRef(); - return HRESULT_Proc(NOERROR); + return NOERROR; } - return HRESULT_Proc(E_NOINTERFACE); + return E_NOINTERFACE; } HRESULT xrIDirect3DDevice9::TestCooperativeLevel() { APIDEBUG("xrIDirect3DDevice9::TestCooperativeLevel"); - return HRESULT_Proc(S_OK); }; + return S_OK; }; UINT xrIDirect3DDevice9::GetAvailableTextureMem() { APIDEBUG("xrIDirect3DDevice9::GetAvailableTextureMem"); - return UINT_Proc(AvailableTextureMem); }; + return AvailableTextureMem; }; HRESULT xrIDirect3DDevice9::EvictManagedResources() { APIDEBUG("xrIDirect3DDevice9::EvictManagedResources"); - return HRESULT_Proc(S_OK); }; + return S_OK; }; HRESULT xrIDirect3DDevice9::GetDirect3D( IDirect3D9** ppD3D9) { APIDEBUG("xrIDirect3DDevice9::GetDirect3D"); m_pIDirect3D9->AddRef(); *ppD3D9 = m_pIDirect3D9; - return HRESULT_Proc(S_OK); + return S_OK; }; HRESULT xrIDirect3DDevice9::GetDisplayMode( UINT iSwapChain,D3DDISPLAYMODE* pMode) { APIDEBUG("xrIDirect3DDevice9::GetDisplayMode"); - return HRESULT_Proc(S_OK); }; + return S_OK; }; HRESULT xrIDirect3DDevice9::GetCreationParameters( D3DDEVICE_CREATION_PARAMETERS *pParameters) { APIDEBUG("xrIDirect3DDevice9::GetCreationParameters"); - return HRESULT_Proc(S_OK); }; + return S_OK; }; HRESULT xrIDirect3DDevice9::SetCursorProperties( UINT XHotSpot,UINT YHotSpot,IDirect3DSurface9* pCursorBitmap) { APIDEBUG("xrIDirect3DDevice9::SetCursorProperties"); - return HRESULT_Proc(S_OK); }; + return S_OK; }; void xrIDirect3DDevice9::SetCursorPosition( int X,int Y,DWORD Flags) { APIDEBUG("xrIDirect3DDevice9::SetCursorPosition"); - VOID_proc(); }; +}; BOOL xrIDirect3DDevice9::ShowCursor( BOOL bShow) { APIDEBUG("xrIDirect3DDevice9::ShowCursor"); - return BOOL_Proc(bShow); }; + return bShow; }; HRESULT xrIDirect3DDevice9::CreateAdditionalSwapChain( D3DPRESENT_PARAMETERS* pPresentationParameters,IDirect3DSwapChain9** pSwapChain) { APIDEBUG("xrIDirect3DDevice9::CreateAdditionalSwapChain"); - return HRESULT_Proc(S_OK); }; + return S_OK; }; HRESULT xrIDirect3DDevice9::GetSwapChain( UINT iSwapChain,IDirect3DSwapChain9** pSwapChain) { APIDEBUG("xrIDirect3DDevice9::GetSwapChain"); - return HRESULT_Proc(S_OK); }; + return S_OK; }; UINT xrIDirect3DDevice9::GetNumberOfSwapChains() { APIDEBUG("xrIDirect3DDevice9::GetNumberOfSwapChains"); - return UINT_Proc(1); }; + return 1; }; HRESULT xrIDirect3DDevice9::Reset( D3DPRESENT_PARAMETERS* pPresentationParameters) { APIDEBUG("xrIDirect3DDevice9::Reset"); - return HRESULT_Proc(S_OK); }; + return S_OK; }; HRESULT xrIDirect3DDevice9::Present( CONST RECT* pSourceRect,CONST RECT* pDestRect,HWND hDestWindowOverride,CONST RGNDATA* pDirtyRegion) { APIDEBUG("xrIDirect3DDevice9::Present"); - return HRESULT_Proc(S_OK); }; + return S_OK; }; HRESULT xrIDirect3DDevice9::GetBackBuffer( UINT iSwapChain,UINT iBackBuffer,D3DBACKBUFFER_TYPE Type,IDirect3DSurface9** ppBackBuffer) { APIDEBUG("xrIDirect3DDevice9::GetBackBuffer"); - return HRESULT_Proc(S_OK); }; + return S_OK; }; HRESULT xrIDirect3DDevice9::GetRasterStatus( UINT iSwapChain,D3DRASTER_STATUS* pRasterStatus) { APIDEBUG("xrIDirect3DDevice9::GetRasterStatus"); - return HRESULT_Proc(S_OK); }; + return S_OK; }; HRESULT xrIDirect3DDevice9::SetDialogBoxMode( BOOL bEnableDialogs) -{ APIDEBUG("xrIDirect3DDevice9::SetDialogBoxMode"); return HRESULT_Proc(S_OK); }; +{ APIDEBUG("xrIDirect3DDevice9::SetDialogBoxMode"); return S_OK; }; void xrIDirect3DDevice9::SetGammaRamp( UINT iSwapChain,DWORD Flags,CONST D3DGAMMARAMP* pRamp) -{ APIDEBUG("xrIDirect3DDevice9::SetGammaRamp"); VOID_proc(); }; +{ APIDEBUG("xrIDirect3DDevice9::SetGammaRamp");}; void xrIDirect3DDevice9::GetGammaRamp( UINT iSwapChain,D3DGAMMARAMP* pRamp) -{ APIDEBUG("xrIDirect3DDevice9::GetGammaRamp"); VOID_proc(); }; +{ APIDEBUG("xrIDirect3DDevice9::GetGammaRamp");}; HRESULT xrIDirect3DDevice9::CreateTexture( UINT Width,UINT Height,UINT Levels,DWORD Usage,D3DFORMAT Format,D3DPOOL Pool,IDirect3DTexture9** ppTexture,HANDLE* pSharedHandle) { @@ -174,11 +174,11 @@ HRESULT xrIDirect3DDevice9::CreateTexture( UINT Width,UINT Height,UINT Levels,D xrIDirect3DTexture9* I = new xrIDirect3DTexture9(this, Width,Height,Levels,Usage,Format,Pool); *ppTexture = I; - return HRESULT_Proc(S_OK); + return S_OK; }; HRESULT xrIDirect3DDevice9::CreateVolumeTexture( UINT Width,UINT Height,UINT Depth,UINT Levels,DWORD Usage,D3DFORMAT Format,D3DPOOL Pool,IDirect3DVolumeTexture9** ppVolumeTexture,HANDLE* pSharedHandle) -{ APIDEBUG("xrIDirect3DDevice9::CreateVolumeTexture"); return HRESULT_Proc(S_OK); }; +{ APIDEBUG("xrIDirect3DDevice9::CreateVolumeTexture"); return S_OK; }; HRESULT xrIDirect3DDevice9::CreateCubeTexture( UINT EdgeLength,UINT Levels,DWORD Usage,D3DFORMAT Format,D3DPOOL Pool,IDirect3DCubeTexture9** ppCubeTexture,HANDLE* pSharedHandle) { @@ -188,7 +188,7 @@ HRESULT xrIDirect3DDevice9::CreateCubeTexture( UINT EdgeLength,UINT Levels,DWOR xrIDirect3DCubeTexture9* I = new xrIDirect3DCubeTexture9(this, EdgeLength, EdgeLength,Levels,Usage,Format,Pool); *ppCubeTexture = I; - return HRESULT_Proc(S_OK); + return S_OK; }; HRESULT xrIDirect3DDevice9::CreateVertexBuffer( UINT Length,DWORD Usage,DWORD FVF,D3DPOOL Pool,IDirect3DVertexBuffer9** ppVertexBuffer,HANDLE* pSharedHandle) @@ -199,7 +199,7 @@ HRESULT xrIDirect3DDevice9::CreateVertexBuffer( UINT Length,DWORD Usage,DWORD F xrIDirect3DVertexBuffer9* I = new xrIDirect3DVertexBuffer9(this, Length, Usage, FVF, Pool); *ppVertexBuffer = I; - return HRESULT_Proc(S_OK); + return S_OK; }; HRESULT xrIDirect3DDevice9::CreateIndexBuffer( UINT Length,DWORD Usage,D3DFORMAT Format,D3DPOOL Pool,IDirect3DIndexBuffer9** ppIndexBuffer,HANDLE* pSharedHandle) { @@ -209,32 +209,32 @@ HRESULT xrIDirect3DDevice9::CreateIndexBuffer( UINT Length,DWORD Usage,D3DFORMA xrIDirect3DIndexBuffer9* I = new xrIDirect3DIndexBuffer9(this, Length, Usage, Format, Pool); *ppIndexBuffer = I; - return HRESULT_Proc(S_OK); + return S_OK; }; HRESULT xrIDirect3DDevice9::CreateRenderTarget( UINT Width,UINT Height,D3DFORMAT Format,D3DMULTISAMPLE_TYPE MultiSample,DWORD MultisampleQuality,BOOL Lockable,IDirect3DSurface9** ppSurface,HANDLE* pSharedHandle) -{ APIDEBUG("xrIDirect3DDevice9::CreateRenderTarget"); return HRESULT_Proc(S_OK); }; +{ APIDEBUG("xrIDirect3DDevice9::CreateRenderTarget"); return S_OK; }; HRESULT xrIDirect3DDevice9::CreateDepthStencilSurface( UINT Width,UINT Height,D3DFORMAT Format,D3DMULTISAMPLE_TYPE MultiSample,DWORD MultisampleQuality,BOOL Discard,IDirect3DSurface9** ppSurface,HANDLE* pSharedHandle) -{ APIDEBUG("xrIDirect3DDevice9::CreateDepthStencilSurface"); return HRESULT_Proc(S_OK); }; +{ APIDEBUG("xrIDirect3DDevice9::CreateDepthStencilSurface"); return S_OK; }; HRESULT xrIDirect3DDevice9::UpdateSurface( IDirect3DSurface9* pSourceSurface,CONST RECT* pSourceRect,IDirect3DSurface9* pDestinationSurface,CONST POINT* pDestPoint) -{ APIDEBUG("xrIDirect3DDevice9::UpdateSurface"); return HRESULT_Proc(S_OK); }; +{ APIDEBUG("xrIDirect3DDevice9::UpdateSurface"); return S_OK; }; HRESULT xrIDirect3DDevice9::UpdateTexture( IDirect3DBaseTexture9* pSourceTexture,IDirect3DBaseTexture9* pDestinationTexture) -{ APIDEBUG("xrIDirect3DDevice9::UpdateTexture"); return HRESULT_Proc(S_OK); }; +{ APIDEBUG("xrIDirect3DDevice9::UpdateTexture"); return S_OK; }; HRESULT xrIDirect3DDevice9::GetRenderTargetData( IDirect3DSurface9* pRenderTarget,IDirect3DSurface9* pDestSurface) -{ APIDEBUG("xrIDirect3DDevice9::GetRenderTargetData"); return HRESULT_Proc(S_OK); }; +{ APIDEBUG("xrIDirect3DDevice9::GetRenderTargetData"); return S_OK; }; HRESULT xrIDirect3DDevice9::GetFrontBufferData( UINT iSwapChain,IDirect3DSurface9* pDestSurface) -{ APIDEBUG("xrIDirect3DDevice9::GetFrontBufferData"); return HRESULT_Proc(S_OK); }; +{ APIDEBUG("xrIDirect3DDevice9::GetFrontBufferData"); return S_OK; }; HRESULT xrIDirect3DDevice9::StretchRect( IDirect3DSurface9* pSourceSurface,CONST RECT* pSourceRect,IDirect3DSurface9* pDestSurface,CONST RECT* pDestRect,D3DTEXTUREFILTERTYPE Filter) -{ APIDEBUG("xrIDirect3DDevice9::StretchRect"); return HRESULT_Proc(S_OK); }; +{ APIDEBUG("xrIDirect3DDevice9::StretchRect"); return S_OK; }; HRESULT xrIDirect3DDevice9::ColorFill( IDirect3DSurface9* pSurface,CONST RECT* pRect,D3DCOLOR color) -{ APIDEBUG("xrIDirect3DDevice9::ColorFill"); return HRESULT_Proc(S_OK); }; +{ APIDEBUG("xrIDirect3DDevice9::ColorFill"); return S_OK; }; HRESULT xrIDirect3DDevice9::CreateOffscreenPlainSurface( UINT Width,UINT Height,D3DFORMAT Format,D3DPOOL Pool,IDirect3DSurface9** ppSurface,HANDLE* pSharedHandle) -{ APIDEBUG("xrIDirect3DDevice9::CreateOffscreenPlainSurface"); return HRESULT_Proc(S_OK); }; +{ APIDEBUG("xrIDirect3DDevice9::CreateOffscreenPlainSurface"); return S_OK; }; HRESULT xrIDirect3DDevice9::SetRenderTarget( DWORD RenderTargetIndex,IDirect3DSurface9* pRenderTarget) -{ APIDEBUG("xrIDirect3DDevice9::SetRenderTarget"); return HRESULT_Proc(S_OK); }; +{ APIDEBUG("xrIDirect3DDevice9::SetRenderTarget"); return S_OK; }; HRESULT xrIDirect3DDevice9::GetRenderTarget( DWORD RenderTargetIndex,IDirect3DSurface9** ppRenderTarget) -{ APIDEBUG("xrIDirect3DDevice9::GetRenderTarget"); return HRESULT_Proc(S_OK); }; +{ APIDEBUG("xrIDirect3DDevice9::GetRenderTarget"); return S_OK; }; HRESULT xrIDirect3DDevice9::SetDepthStencilSurface( IDirect3DSurface9* pNewZStencil) -{ APIDEBUG("xrIDirect3DDevice9::SetDepthStencilSurface"); return HRESULT_Proc(S_OK); }; +{ APIDEBUG("xrIDirect3DDevice9::SetDepthStencilSurface"); return S_OK; }; HRESULT xrIDirect3DDevice9::GetDepthStencilSurface( IDirect3DSurface9** ppZStencilSurface) { APIDEBUG("xrIDirect3DDevice9::GetDepthStencilSurface"); @@ -243,217 +243,185 @@ HRESULT xrIDirect3DDevice9::GetDepthStencilSurface( IDirect3DSurface9** ppZSten xrIDirect3DSurface9* I = new xrIDirect3DSurface9(this, 0, 0, D3DFORMAT(0), D3DMULTISAMPLE_TYPE(0),0); *ppZStencilSurface = I; - return HRESULT_Proc(S_OK); + return S_OK; }; HRESULT xrIDirect3DDevice9::BeginScene() -{ APIDEBUG("xrIDirect3DDevice9::BeginScene"); return HRESULT_Proc(S_OK); }; +{ APIDEBUG("xrIDirect3DDevice9::BeginScene"); return S_OK; }; HRESULT xrIDirect3DDevice9::EndScene() -{ APIDEBUG("xrIDirect3DDevice9::EndScene"); return HRESULT_Proc(S_OK); }; +{ APIDEBUG("xrIDirect3DDevice9::EndScene"); return S_OK; }; HRESULT xrIDirect3DDevice9::Clear( DWORD Count,CONST D3DRECT* pRects,DWORD Flags,D3DCOLOR Color,float Z,DWORD Stencil) -{ APIDEBUG("xrIDirect3DDevice9::Clear"); return HRESULT_Proc(S_OK); }; +{ APIDEBUG("xrIDirect3DDevice9::Clear"); return S_OK; }; HRESULT xrIDirect3DDevice9::SetTransform( D3DTRANSFORMSTATETYPE State,CONST D3DMATRIX* pMatrix) -{ APIDEBUG("xrIDirect3DDevice9::SetTransform"); return HRESULT_Proc(S_OK); }; +{ APIDEBUG("xrIDirect3DDevice9::SetTransform"); return S_OK; }; HRESULT xrIDirect3DDevice9::GetTransform( D3DTRANSFORMSTATETYPE State,D3DMATRIX* pMatrix) -{ APIDEBUG("xrIDirect3DDevice9::GetTransform"); return HRESULT_Proc(S_OK); }; +{ APIDEBUG("xrIDirect3DDevice9::GetTransform"); return S_OK; }; HRESULT xrIDirect3DDevice9::MultiplyTransform( D3DTRANSFORMSTATETYPE,CONST D3DMATRIX*) -{ APIDEBUG("xrIDirect3DDevice9::MultiplyTransform"); return HRESULT_Proc(S_OK); }; +{ APIDEBUG("xrIDirect3DDevice9::MultiplyTransform"); return S_OK; }; HRESULT xrIDirect3DDevice9::SetViewport( CONST D3DVIEWPORT9* pViewport) -{ APIDEBUG("xrIDirect3DDevice9::SetViewport"); return HRESULT_Proc(S_OK); }; +{ APIDEBUG("xrIDirect3DDevice9::SetViewport"); return S_OK; }; HRESULT xrIDirect3DDevice9::GetViewport( D3DVIEWPORT9* pViewport) -{ APIDEBUG("xrIDirect3DDevice9::GetViewport"); return HRESULT_Proc(S_OK); }; +{ APIDEBUG("xrIDirect3DDevice9::GetViewport"); return S_OK; }; HRESULT xrIDirect3DDevice9::SetMaterial( CONST D3DMATERIAL9* pMaterial) -{ APIDEBUG("xrIDirect3DDevice9::SetMaterial"); return HRESULT_Proc(S_OK); }; +{ APIDEBUG("xrIDirect3DDevice9::SetMaterial"); return S_OK; }; HRESULT xrIDirect3DDevice9::GetMaterial( D3DMATERIAL9* pMaterial) -{ APIDEBUG("xrIDirect3DDevice9::GetMaterial"); return HRESULT_Proc(S_OK); }; +{ APIDEBUG("xrIDirect3DDevice9::GetMaterial"); return S_OK; }; HRESULT xrIDirect3DDevice9::SetLight( DWORD Index,CONST D3DLIGHT9*) -{ APIDEBUG("xrIDirect3DDevice9::SetLight"); return HRESULT_Proc(S_OK); }; +{ APIDEBUG("xrIDirect3DDevice9::SetLight"); return S_OK; }; HRESULT xrIDirect3DDevice9::GetLight( DWORD Index,D3DLIGHT9*) -{ APIDEBUG("xrIDirect3DDevice9::GetLight"); return HRESULT_Proc(S_OK); }; +{ APIDEBUG("xrIDirect3DDevice9::GetLight"); return S_OK; }; HRESULT xrIDirect3DDevice9::LightEnable( DWORD Index,BOOL Enable) -{ APIDEBUG("xrIDirect3DDevice9::LightEnable"); return HRESULT_Proc(S_OK); }; +{ APIDEBUG("xrIDirect3DDevice9::LightEnable"); return S_OK; }; HRESULT xrIDirect3DDevice9::GetLightEnable( DWORD Index,BOOL* pEnable) -{ APIDEBUG("xrIDirect3DDevice9::GetLightEnable"); return HRESULT_Proc(S_OK); }; +{ APIDEBUG("xrIDirect3DDevice9::GetLightEnable"); return S_OK; }; HRESULT xrIDirect3DDevice9::SetClipPlane( DWORD Index,CONST float* pPlane) -{ APIDEBUG("xrIDirect3DDevice9::SetClipPlane"); return HRESULT_Proc(S_OK); }; +{ APIDEBUG("xrIDirect3DDevice9::SetClipPlane"); return S_OK; }; HRESULT xrIDirect3DDevice9::GetClipPlane( DWORD Index,float* pPlane) -{ APIDEBUG("xrIDirect3DDevice9::GetClipPlane"); return HRESULT_Proc(S_OK); }; +{ APIDEBUG("xrIDirect3DDevice9::GetClipPlane"); return S_OK; }; HRESULT xrIDirect3DDevice9::SetRenderState( D3DRENDERSTATETYPE State,DWORD Value) -{ APIDEBUG("xrIDirect3DDevice9::SetRenderState"); return HRESULT_Proc(S_OK); }; +{ APIDEBUG("xrIDirect3DDevice9::SetRenderState"); return S_OK; }; HRESULT xrIDirect3DDevice9::GetRenderState( D3DRENDERSTATETYPE State,DWORD* pValue) -{ APIDEBUG("xrIDirect3DDevice9::GetRenderState"); return HRESULT_Proc(S_OK); }; +{ APIDEBUG("xrIDirect3DDevice9::GetRenderState"); return S_OK; }; HRESULT xrIDirect3DDevice9::CreateStateBlock( D3DSTATEBLOCKTYPE Type,IDirect3DStateBlock9** ppSB) { APIDEBUG("xrIDirect3DDevice9::CreateStateBlock"); *ppSB = NULL; xrIDirect3DStateBlock9* I = new xrIDirect3DStateBlock9(this); *ppSB = I; - return HRESULT_Proc(S_OK); + return S_OK; }; HRESULT xrIDirect3DDevice9::BeginStateBlock() -{ APIDEBUG("xrIDirect3DDevice9::BeginStateBlock"); return HRESULT_Proc(S_OK); }; +{ APIDEBUG("xrIDirect3DDevice9::BeginStateBlock"); return S_OK; }; HRESULT xrIDirect3DDevice9::EndStateBlock( IDirect3DStateBlock9** ppSB) -{ APIDEBUG("xrIDirect3DDevice9::EndStateBlock"); return HRESULT_Proc(S_OK); }; +{ APIDEBUG("xrIDirect3DDevice9::EndStateBlock"); return S_OK; }; HRESULT xrIDirect3DDevice9::SetClipStatus( CONST D3DCLIPSTATUS9* pClipStatus) -{ APIDEBUG("xrIDirect3DDevice9::SetClipStatus"); return HRESULT_Proc(S_OK); }; +{ APIDEBUG("xrIDirect3DDevice9::SetClipStatus"); return S_OK; }; HRESULT xrIDirect3DDevice9::GetClipStatus( D3DCLIPSTATUS9* pClipStatus) -{ APIDEBUG("xrIDirect3DDevice9::GetClipStatus"); return HRESULT_Proc(S_OK); }; +{ APIDEBUG("xrIDirect3DDevice9::GetClipStatus"); return S_OK; }; HRESULT xrIDirect3DDevice9::GetTexture( DWORD Stage,IDirect3DBaseTexture9** ppTexture) -{ APIDEBUG("xrIDirect3DDevice9::GetTexture"); return HRESULT_Proc(S_OK); }; +{ APIDEBUG("xrIDirect3DDevice9::GetTexture"); return S_OK; }; HRESULT xrIDirect3DDevice9::SetTexture( DWORD Stage,IDirect3DBaseTexture9* pTexture) -{ APIDEBUG("xrIDirect3DDevice9::SetTexture"); return HRESULT_Proc(S_OK); }; +{ APIDEBUG("xrIDirect3DDevice9::SetTexture"); return S_OK; }; HRESULT xrIDirect3DDevice9::GetTextureStageState( DWORD Stage,D3DTEXTURESTAGESTATETYPE Type,DWORD* pValue) -{ APIDEBUG("xrIDirect3DDevice9::GetTextureStageState"); return HRESULT_Proc(S_OK); }; +{ APIDEBUG("xrIDirect3DDevice9::GetTextureStageState"); return S_OK; }; HRESULT xrIDirect3DDevice9::SetTextureStageState( DWORD Stage,D3DTEXTURESTAGESTATETYPE Type,DWORD Value) -{ APIDEBUG("xrIDirect3DDevice9::SetTextureStageState"); return HRESULT_Proc(S_OK); }; +{ APIDEBUG("xrIDirect3DDevice9::SetTextureStageState"); return S_OK; }; HRESULT xrIDirect3DDevice9::GetSamplerState( DWORD Sampler,D3DSAMPLERSTATETYPE Type,DWORD* pValue) -{ APIDEBUG("xrIDirect3DDevice9::GetSamplerState"); return HRESULT_Proc(S_OK); }; +{ APIDEBUG("xrIDirect3DDevice9::GetSamplerState"); return S_OK; }; HRESULT xrIDirect3DDevice9::SetSamplerState( DWORD Sampler,D3DSAMPLERSTATETYPE Type,DWORD Value) -{ APIDEBUG("xrIDirect3DDevice9::SetSamplerState"); return HRESULT_Proc(S_OK); }; +{ APIDEBUG("xrIDirect3DDevice9::SetSamplerState"); return S_OK; }; HRESULT xrIDirect3DDevice9::ValidateDevice( DWORD* pNumPasses) -{ APIDEBUG("xrIDirect3DDevice9::ValidateDevice"); return HRESULT_Proc(S_OK); }; +{ APIDEBUG("xrIDirect3DDevice9::ValidateDevice"); return S_OK; }; HRESULT xrIDirect3DDevice9::SetPaletteEntries( UINT PaletteNumber,CONST PALETTEENTRY* pEntries) -{ APIDEBUG("xrIDirect3DDevice9::SetPaletteEntries"); return HRESULT_Proc(S_OK); }; +{ APIDEBUG("xrIDirect3DDevice9::SetPaletteEntries"); return S_OK; }; HRESULT xrIDirect3DDevice9::GetPaletteEntries( UINT PaletteNumber,PALETTEENTRY* pEntries) -{ APIDEBUG("xrIDirect3DDevice9::GetPaletteEntries"); return HRESULT_Proc(S_OK); }; +{ APIDEBUG("xrIDirect3DDevice9::GetPaletteEntries"); return S_OK; }; HRESULT xrIDirect3DDevice9::SetCurrentTexturePalette( UINT PaletteNumber) -{ APIDEBUG("xrIDirect3DDevice9::SetCurrentTexturePalette"); return HRESULT_Proc(S_OK); }; +{ APIDEBUG("xrIDirect3DDevice9::SetCurrentTexturePalette"); return S_OK; }; HRESULT xrIDirect3DDevice9::GetCurrentTexturePalette( UINT *PaletteNumber) -{ APIDEBUG("xrIDirect3DDevice9::GetCurrentTexturePalette"); return HRESULT_Proc(S_OK); }; +{ APIDEBUG("xrIDirect3DDevice9::GetCurrentTexturePalette"); return S_OK; }; HRESULT xrIDirect3DDevice9::SetScissorRect( CONST RECT* pRect) -{ APIDEBUG("xrIDirect3DDevice9::SetScissorRect"); return HRESULT_Proc(S_OK); }; +{ APIDEBUG("xrIDirect3DDevice9::SetScissorRect"); return S_OK; }; HRESULT xrIDirect3DDevice9::GetScissorRect( RECT* pRect) -{ APIDEBUG("xrIDirect3DDevice9::GetScissorRect"); return HRESULT_Proc(S_OK); }; +{ APIDEBUG("xrIDirect3DDevice9::GetScissorRect"); return S_OK; }; HRESULT xrIDirect3DDevice9::SetSoftwareVertexProcessing( BOOL bSoftware) -{ APIDEBUG("xrIDirect3DDevice9::SetSoftwareVertexProcessing"); return HRESULT_Proc(S_OK); }; +{ APIDEBUG("xrIDirect3DDevice9::SetSoftwareVertexProcessing"); return S_OK; }; BOOL xrIDirect3DDevice9::GetSoftwareVertexProcessing() { APIDEBUG("xrIDirect3DDevice9::GetSoftwareVertexProcessing"); return TRUE; }; HRESULT xrIDirect3DDevice9::SetNPatchMode( float nSegments) -{ APIDEBUG("xrIDirect3DDevice9::SetNPatchMode"); return HRESULT_Proc(S_OK); }; +{ APIDEBUG("xrIDirect3DDevice9::SetNPatchMode"); return S_OK; }; float xrIDirect3DDevice9::GetNPatchMode() -{ APIDEBUG("xrIDirect3DDevice9::GetNPatchMode"); return FLOAT_Proc(0.0f); }; +{ APIDEBUG("xrIDirect3DDevice9::GetNPatchMode"); return 0.0f; }; HRESULT xrIDirect3DDevice9::DrawPrimitive( D3DPRIMITIVETYPE PrimitiveType,UINT StartVertex,UINT PrimitiveCount) -{ APIDEBUG("xrIDirect3DDevice9::DrawPrimitive"); return HRESULT_Proc(S_OK); }; +{ APIDEBUG("xrIDirect3DDevice9::DrawPrimitive"); return S_OK; }; HRESULT xrIDirect3DDevice9::DrawIndexedPrimitive( D3DPRIMITIVETYPE,INT BaseVertexIndex,UINT MinVertexIndex,UINT NumVertices,UINT startIndex,UINT primCount) -{ APIDEBUG("xrIDirect3DDevice9::DrawIndexedPrimitive"); return HRESULT_Proc(S_OK); }; +{ APIDEBUG("xrIDirect3DDevice9::DrawIndexedPrimitive"); return S_OK; }; HRESULT xrIDirect3DDevice9::DrawPrimitiveUP( D3DPRIMITIVETYPE PrimitiveType,UINT PrimitiveCount,CONST void* pVertexStreamZeroData,UINT VertexStreamZeroStride) -{ APIDEBUG("xrIDirect3DDevice9::DrawPrimitiveUP"); return HRESULT_Proc(S_OK); }; +{ APIDEBUG("xrIDirect3DDevice9::DrawPrimitiveUP"); return S_OK; }; HRESULT xrIDirect3DDevice9::DrawIndexedPrimitiveUP( D3DPRIMITIVETYPE PrimitiveType,UINT MinVertexIndex,UINT NumVertices,UINT PrimitiveCount,CONST void* pIndexData,D3DFORMAT IndexDataFormat,CONST void* pVertexStreamZeroData,UINT VertexStreamZeroStride) -{ APIDEBUG("xrIDirect3DDevice9::DrawIndexedPrimitiveUP"); return HRESULT_Proc(S_OK); }; +{ APIDEBUG("xrIDirect3DDevice9::DrawIndexedPrimitiveUP"); return S_OK; }; HRESULT xrIDirect3DDevice9::ProcessVertices( UINT SrcStartIndex,UINT DestIndex,UINT VertexCount,IDirect3DVertexBuffer9* pDestBuffer,IDirect3DVertexDeclaration9* pVertexDecl,DWORD Flags) -{ APIDEBUG("xrIDirect3DDevice9::ProcessVertices"); return HRESULT_Proc(S_OK); }; +{ APIDEBUG("xrIDirect3DDevice9::ProcessVertices"); return S_OK; }; HRESULT xrIDirect3DDevice9::CreateVertexDeclaration( CONST D3DVERTEXELEMENT9* pVertexElements,IDirect3DVertexDeclaration9** ppDecl) { APIDEBUG("xrIDirect3DDevice9::CreateVertexDeclaration"); *ppDecl = NULL; xrIDirect3DVertexDeclaration9* I = new xrIDirect3DVertexDeclaration9(this); *ppDecl = I; - return HRESULT_Proc(S_OK); + return S_OK; }; HRESULT xrIDirect3DDevice9::SetVertexDeclaration( IDirect3DVertexDeclaration9* pDecl) -{ APIDEBUG("xrIDirect3DDevice9::SetVertexDeclaration"); return HRESULT_Proc(S_OK); }; +{ APIDEBUG("xrIDirect3DDevice9::SetVertexDeclaration"); return S_OK; }; HRESULT xrIDirect3DDevice9::GetVertexDeclaration( IDirect3DVertexDeclaration9** ppDecl) -{ APIDEBUG("xrIDirect3DDevice9::GetVertexDeclaration"); return HRESULT_Proc(S_OK); }; +{ APIDEBUG("xrIDirect3DDevice9::GetVertexDeclaration"); return S_OK; }; HRESULT xrIDirect3DDevice9::SetFVF( DWORD FVF) -{ APIDEBUG("xrIDirect3DDevice9::SetFVF"); return HRESULT_Proc(S_OK); }; +{ APIDEBUG("xrIDirect3DDevice9::SetFVF"); return S_OK; }; HRESULT xrIDirect3DDevice9::GetFVF( DWORD* pFVF) -{ APIDEBUG("xrIDirect3DDevice9::GetFVF"); return HRESULT_Proc(S_OK); }; +{ APIDEBUG("xrIDirect3DDevice9::GetFVF"); return S_OK; }; HRESULT xrIDirect3DDevice9::CreateVertexShader( CONST DWORD* pFunction,IDirect3DVertexShader9** ppShader) { APIDEBUG("xrIDirect3DDevice9::CreateVertexShader"); *ppShader = NULL; xrIDirect3DVertexShader9* I = new xrIDirect3DVertexShader9(this); *ppShader = I; - return HRESULT_Proc(S_OK); + return S_OK; }; HRESULT xrIDirect3DDevice9::SetVertexShader( IDirect3DVertexShader9* pShader) -{ APIDEBUG("xrIDirect3DDevice9::SetVertexShader"); return HRESULT_Proc(S_OK); }; +{ APIDEBUG("xrIDirect3DDevice9::SetVertexShader"); return S_OK; }; HRESULT xrIDirect3DDevice9::GetVertexShader( IDirect3DVertexShader9** ppShader) -{ APIDEBUG("xrIDirect3DDevice9::GetVertexShader"); return HRESULT_Proc(S_OK); }; +{ APIDEBUG("xrIDirect3DDevice9::GetVertexShader"); return S_OK; }; HRESULT xrIDirect3DDevice9::SetVertexShaderConstantF( UINT StartRegister,CONST float* pConstantData,UINT Vector4fCount) -{ APIDEBUG("xrIDirect3DDevice9::SetVertexShaderConstantF"); return HRESULT_Proc(S_OK); }; +{ APIDEBUG("xrIDirect3DDevice9::SetVertexShaderConstantF"); return S_OK; }; HRESULT xrIDirect3DDevice9::GetVertexShaderConstantF( UINT StartRegister,float* pConstantData,UINT Vector4fCount) -{ APIDEBUG("xrIDirect3DDevice9::GetVertexShaderConstantF"); return HRESULT_Proc(S_OK); }; +{ APIDEBUG("xrIDirect3DDevice9::GetVertexShaderConstantF"); return S_OK; }; HRESULT xrIDirect3DDevice9::SetVertexShaderConstantI( UINT StartRegister,CONST int* pConstantData,UINT Vector4iCount) -{ APIDEBUG("xrIDirect3DDevice9::SetVertexShaderConstantI"); return HRESULT_Proc(S_OK); }; +{ APIDEBUG("xrIDirect3DDevice9::SetVertexShaderConstantI"); return S_OK; }; HRESULT xrIDirect3DDevice9::GetVertexShaderConstantI( UINT StartRegister,int* pConstantData,UINT Vector4iCount) -{ APIDEBUG("xrIDirect3DDevice9::GetVertexShaderConstantI"); return HRESULT_Proc(S_OK); }; +{ APIDEBUG("xrIDirect3DDevice9::GetVertexShaderConstantI"); return S_OK; }; HRESULT xrIDirect3DDevice9::SetVertexShaderConstantB( UINT StartRegister,CONST BOOL* pConstantData,UINT BoolCount) -{ APIDEBUG("xrIDirect3DDevice9::SetVertexShaderConstantB"); return HRESULT_Proc(S_OK); }; +{ APIDEBUG("xrIDirect3DDevice9::SetVertexShaderConstantB"); return S_OK; }; HRESULT xrIDirect3DDevice9::GetVertexShaderConstantB( UINT StartRegister,BOOL* pConstantData,UINT BoolCount) -{ APIDEBUG("xrIDirect3DDevice9::GetVertexShaderConstantB"); return HRESULT_Proc(S_OK); }; +{ APIDEBUG("xrIDirect3DDevice9::GetVertexShaderConstantB"); return S_OK; }; HRESULT xrIDirect3DDevice9::SetStreamSource( UINT StreamNumber,IDirect3DVertexBuffer9* pStreamData,UINT OffsetInBytes,UINT Stride) -{ APIDEBUG("xrIDirect3DDevice9::SetStreamSource"); return HRESULT_Proc(S_OK); }; +{ APIDEBUG("xrIDirect3DDevice9::SetStreamSource"); return S_OK; }; HRESULT xrIDirect3DDevice9::GetStreamSource( UINT StreamNumber,IDirect3DVertexBuffer9** ppStreamData,UINT* pOffsetInBytes,UINT* pStride) -{ APIDEBUG("xrIDirect3DDevice9::GetStreamSource"); return HRESULT_Proc(S_OK); }; +{ APIDEBUG("xrIDirect3DDevice9::GetStreamSource"); return S_OK; }; HRESULT xrIDirect3DDevice9::SetStreamSourceFreq( UINT StreamNumber,UINT Setting) -{ APIDEBUG("xrIDirect3DDevice9::SetStreamSourceFreq"); return HRESULT_Proc(S_OK); }; +{ APIDEBUG("xrIDirect3DDevice9::SetStreamSourceFreq"); return S_OK; }; HRESULT xrIDirect3DDevice9::GetStreamSourceFreq( UINT StreamNumber,UINT* pSetting) -{ APIDEBUG("xrIDirect3DDevice9::GetStreamSourceFreq"); return HRESULT_Proc(S_OK); }; +{ APIDEBUG("xrIDirect3DDevice9::GetStreamSourceFreq"); return S_OK; }; HRESULT xrIDirect3DDevice9::SetIndices( IDirect3DIndexBuffer9* pIndexData) -{ APIDEBUG("xrIDirect3DDevice9::SetIndices"); return HRESULT_Proc(S_OK); }; +{ APIDEBUG("xrIDirect3DDevice9::SetIndices"); return S_OK; }; HRESULT xrIDirect3DDevice9::GetIndices( IDirect3DIndexBuffer9** ppIndexData) -{ APIDEBUG("xrIDirect3DDevice9::GetIndices"); return HRESULT_Proc(S_OK); }; +{ APIDEBUG("xrIDirect3DDevice9::GetIndices"); return S_OK; }; HRESULT xrIDirect3DDevice9::CreatePixelShader( CONST DWORD* pFunction,IDirect3DPixelShader9** ppShader) { APIDEBUG("xrIDirect3DDevice9::CreatePixelShader"); *ppShader = NULL; xrIDirect3DPixelShader9* I = new xrIDirect3DPixelShader9(this); *ppShader = I; - return HRESULT_Proc(S_OK); + return S_OK; }; HRESULT xrIDirect3DDevice9::SetPixelShader( IDirect3DPixelShader9* pShader) -{ APIDEBUG("xrIDirect3DDevice9::SetPixelShader"); return HRESULT_Proc(S_OK); }; +{ APIDEBUG("xrIDirect3DDevice9::SetPixelShader"); return S_OK; }; HRESULT xrIDirect3DDevice9::GetPixelShader( IDirect3DPixelShader9** ppShader) -{ APIDEBUG("xrIDirect3DDevice9::GetPixelShader"); return HRESULT_Proc(S_OK); }; +{ APIDEBUG("xrIDirect3DDevice9::GetPixelShader"); return S_OK; }; HRESULT xrIDirect3DDevice9::SetPixelShaderConstantF( UINT StartRegister,CONST float* pConstantData,UINT Vector4fCount) -{ APIDEBUG("xrIDirect3DDevice9::SetPixelShaderConstantF"); return HRESULT_Proc(S_OK); }; +{ APIDEBUG("xrIDirect3DDevice9::SetPixelShaderConstantF"); return S_OK; }; HRESULT xrIDirect3DDevice9::GetPixelShaderConstantF( UINT StartRegister,float* pConstantData,UINT Vector4fCount) -{ APIDEBUG("xrIDirect3DDevice9::GetPixelShaderConstantF"); return HRESULT_Proc(S_OK); }; +{ APIDEBUG("xrIDirect3DDevice9::GetPixelShaderConstantF"); return S_OK; }; HRESULT xrIDirect3DDevice9::SetPixelShaderConstantI( UINT StartRegister,CONST int* pConstantData,UINT Vector4iCount) -{ APIDEBUG("xrIDirect3DDevice9::SetPixelShaderConstantI"); return HRESULT_Proc(S_OK); }; -HRESULT xrIDirect3DDevice9::GetPixelShaderConstantI ( UINT StartRegister,int* pConstantData,UINT Vector4iCount) { APIDEBUG("xrIDirect3DDevice9::GetPixelShaderConstantI"); return HRESULT_Proc(S_OK); }; -HRESULT xrIDirect3DDevice9::SetPixelShaderConstantB ( UINT StartRegister,CONST BOOL* pConstantData,UINT BoolCount) { APIDEBUG("xrIDirect3DDevice9::SetPixelShaderConstantB"); return HRESULT_Proc(S_OK); }; -HRESULT xrIDirect3DDevice9::GetPixelShaderConstantB ( UINT StartRegister,BOOL* pConstantData,UINT BoolCount) { APIDEBUG("xrIDirect3DDevice9::GetPixelShaderConstantB"); return HRESULT_Proc(S_OK); }; -HRESULT xrIDirect3DDevice9::DrawRectPatch ( UINT Handle,CONST float* pNumSegs,CONST D3DRECTPATCH_INFO* pRectPatchInfo) { APIDEBUG("xrIDirect3DDevice9::DrawRectPatch"); return HRESULT_Proc(S_OK); }; -HRESULT xrIDirect3DDevice9::DrawTriPatch ( UINT Handle,CONST float* pNumSegs,CONST D3DTRIPATCH_INFO* pTriPatchInfo) { APIDEBUG("xrIDirect3DDevice9::DrawTriPatch"); return HRESULT_Proc(S_OK); }; -HRESULT xrIDirect3DDevice9::DeletePatch ( UINT Handle) { APIDEBUG("xrIDirect3DDevice9::DeletePatch"); return HRESULT_Proc(S_OK); }; +{ APIDEBUG("xrIDirect3DDevice9::SetPixelShaderConstantI"); return S_OK; }; +HRESULT xrIDirect3DDevice9::GetPixelShaderConstantI ( UINT StartRegister,int* pConstantData,UINT Vector4iCount) { APIDEBUG("xrIDirect3DDevice9::GetPixelShaderConstantI"); return S_OK; }; +HRESULT xrIDirect3DDevice9::SetPixelShaderConstantB ( UINT StartRegister,CONST BOOL* pConstantData,UINT BoolCount) { APIDEBUG("xrIDirect3DDevice9::SetPixelShaderConstantB"); return S_OK; }; +HRESULT xrIDirect3DDevice9::GetPixelShaderConstantB ( UINT StartRegister,BOOL* pConstantData,UINT BoolCount) { APIDEBUG("xrIDirect3DDevice9::GetPixelShaderConstantB"); return S_OK; }; +HRESULT xrIDirect3DDevice9::DrawRectPatch ( UINT Handle,CONST float* pNumSegs,CONST D3DRECTPATCH_INFO* pRectPatchInfo) { APIDEBUG("xrIDirect3DDevice9::DrawRectPatch"); return S_OK; }; +HRESULT xrIDirect3DDevice9::DrawTriPatch ( UINT Handle,CONST float* pNumSegs,CONST D3DTRIPATCH_INFO* pTriPatchInfo) { APIDEBUG("xrIDirect3DDevice9::DrawTriPatch"); return S_OK; }; +HRESULT xrIDirect3DDevice9::DeletePatch ( UINT Handle) { APIDEBUG("xrIDirect3DDevice9::DeletePatch"); return S_OK; }; HRESULT xrIDirect3DDevice9::CreateQuery ( D3DQUERYTYPE Type,IDirect3DQuery9** ppQuery) { APIDEBUG("xrIDirect3DDevice9::CreateQuery"); *ppQuery = NULL; xrIDirect3DQuery9* I = new xrIDirect3DQuery9(this, Type); *ppQuery = I; - return HRESULT_Proc(S_OK); -}; -//--------------------------------------------------------------------------------------------- -/* -HRESULT xrIDirect3DDevice9::HRESULT_Proc(HRESULT ret) -{ - return ret; -}; - -ULONG xrIDirect3DDevice9::ULONG_Proc(ULONG ret) -{ - return ret; -}; - -UINT xrIDirect3DDevice9::UINT_Proc(UINT ret) -{ - return ret; -}; - -BOOL xrIDirect3DDevice9::BOOL_Proc(BOOL ret) -{ - return ret; -}; - -float xrIDirect3DDevice9::FLOAT_Proc(float ret) -{ - return ret; -}; -void xrIDirect3DDevice9::VOID_proc() -{ - int x=0; - x=x; + return S_OK; }; -*/ \ No newline at end of file diff --git a/src/xrD3D9-Null/IDirect3DDevice9_Caps.cpp b/src/xrD3D9-Null/IDirect3DDevice9_Caps.cpp index b351a57b973..b58bf63bea2 100644 --- a/src/xrD3D9-Null/IDirect3DDevice9_Caps.cpp +++ b/src/xrD3D9-Null/IDirect3DDevice9_Caps.cpp @@ -311,5 +311,5 @@ HRESULT xrIDirect3DDevice9::GetDeviceCaps( D3DCAPS9* pCaps) - return HRESULT_Proc(S_OK); + return S_OK; }; \ No newline at end of file diff --git a/src/xrD3D9-Null/IDirect3DIndexBuffer9.cpp b/src/xrD3D9-Null/IDirect3DIndexBuffer9.cpp index b73eca7c431..47332406bf8 100644 --- a/src/xrD3D9-Null/IDirect3DIndexBuffer9.cpp +++ b/src/xrD3D9-Null/IDirect3DIndexBuffer9.cpp @@ -44,16 +44,16 @@ HRESULT xrIDirect3DIndexBuffer9::QueryInterface( REFIID riid, void** ppvObj) { *ppvObj = this; AddRef(); - return HRESULT_Proc(NOERROR); + return NOERROR; } - return HRESULT_Proc(E_NOINTERFACE); + return E_NOINTERFACE; } ULONG xrIDirect3DIndexBuffer9::AddRef() { APIDEBUG("xrIDirect3DIndexBuffer9::AddRef"); m_refCount++; - return ULONG_Proc(m_refCount); + return m_refCount; } ULONG xrIDirect3DIndexBuffer9::Release() @@ -64,9 +64,9 @@ ULONG xrIDirect3DIndexBuffer9::Release() { delete[] m_pBuffer; delete this; - return ULONG_Proc(-1); + return -1; } - return ULONG_Proc(m_refCount); + return m_refCount; } /*** IDirect3DResource9 methods ***/ @@ -75,20 +75,20 @@ HRESULT __stdcall xrIDirect3DIndexBuffer9::GetDevice ( IDirect3DDevice9** ppD APIDEBUG("xrIDirect3DIndexBuffer9::GetDevice"); m_pIDirect3DDevice9->AddRef(); *ppDevice = m_pIDirect3DDevice9; - return HRESULT_Proc(S_OK); + return S_OK; }; -HRESULT __stdcall xrIDirect3DIndexBuffer9::SetPrivateData ( REFGUID refguid,CONST void* pData,DWORD SizeOfData,DWORD Flags) {APIDEBUG("xrIDirect3DIndexBuffer9::SetPrivateData");return HRESULT_Proc(S_OK);}; -HRESULT __stdcall xrIDirect3DIndexBuffer9::GetPrivateData ( REFGUID refguid,void* pData,DWORD* pSizeOfData) {APIDEBUG("xrIDirect3DIndexBuffer9::GetPrivateData");return HRESULT_Proc(S_OK);}; -HRESULT __stdcall xrIDirect3DIndexBuffer9::FreePrivateData( REFGUID refguid) {APIDEBUG("xrIDirect3DIndexBuffer9::FreePrivateData");return HRESULT_Proc(S_OK);}; -DWORD __stdcall xrIDirect3DIndexBuffer9::SetPriority ( DWORD PriorityNew) {APIDEBUG("xrIDirect3DIndexBuffer9::SetPriority");DWORD old = Priority; Priority = PriorityNew; return DWORD_Proc(old);}; -DWORD __stdcall xrIDirect3DIndexBuffer9::GetPriority () {APIDEBUG("xrIDirect3DIndexBuffer9::GetPriority");return DWORD_Proc(Priority);}; -void __stdcall xrIDirect3DIndexBuffer9::PreLoad () {APIDEBUG("xrIDirect3DIndexBuffer9::PreLoad");return VOID_proc();}; +HRESULT __stdcall xrIDirect3DIndexBuffer9::SetPrivateData ( REFGUID refguid,CONST void* pData,DWORD SizeOfData,DWORD Flags) {APIDEBUG("xrIDirect3DIndexBuffer9::SetPrivateData");return S_OK;}; +HRESULT __stdcall xrIDirect3DIndexBuffer9::GetPrivateData ( REFGUID refguid,void* pData,DWORD* pSizeOfData) {APIDEBUG("xrIDirect3DIndexBuffer9::GetPrivateData");return S_OK;}; +HRESULT __stdcall xrIDirect3DIndexBuffer9::FreePrivateData( REFGUID refguid) {APIDEBUG("xrIDirect3DIndexBuffer9::FreePrivateData");return S_OK;}; +DWORD __stdcall xrIDirect3DIndexBuffer9::SetPriority ( DWORD PriorityNew) {APIDEBUG("xrIDirect3DIndexBuffer9::SetPriority");DWORD old = Priority; Priority = PriorityNew; return old;}; +DWORD __stdcall xrIDirect3DIndexBuffer9::GetPriority () {APIDEBUG("xrIDirect3DIndexBuffer9::GetPriority");return Priority;}; +void __stdcall xrIDirect3DIndexBuffer9::PreLoad () {APIDEBUG("xrIDirect3DIndexBuffer9::PreLoad");}; D3DRESOURCETYPE __stdcall xrIDirect3DIndexBuffer9::GetType () {APIDEBUG("xrIDirect3DIndexBuffer9::GetType");return D3DRESOURCETYPE(0);}; HRESULT __stdcall xrIDirect3DIndexBuffer9::Lock ( UINT OffsetToLock,UINT SizeToLock,void** ppbData,DWORD Flags) { APIDEBUG("xrIDirect3DIndexBuffer9::Lock"); *ppbData = m_pBuffer + OffsetToLock; - return HRESULT_Proc(S_OK); + return S_OK; }; -HRESULT __stdcall xrIDirect3DIndexBuffer9::Unlock () {APIDEBUG("xrIDirect3DIndexBuffer9::Unlock");return HRESULT_Proc(S_OK);}; -HRESULT __stdcall xrIDirect3DIndexBuffer9::GetDesc ( D3DINDEXBUFFER_DESC *pDesc) {APIDEBUG("xrIDirect3DIndexBuffer9::GetDesc");return HRESULT_Proc(S_OK);}; +HRESULT __stdcall xrIDirect3DIndexBuffer9::Unlock () {APIDEBUG("xrIDirect3DIndexBuffer9::Unlock");return S_OK;}; +HRESULT __stdcall xrIDirect3DIndexBuffer9::GetDesc ( D3DINDEXBUFFER_DESC *pDesc) {APIDEBUG("xrIDirect3DIndexBuffer9::GetDesc");return S_OK;}; diff --git a/src/xrD3D9-Null/IDirect3DPixelShader9.cpp b/src/xrD3D9-Null/IDirect3DPixelShader9.cpp index b3982cecde4..5bda6e5d04d 100644 --- a/src/xrD3D9-Null/IDirect3DPixelShader9.cpp +++ b/src/xrD3D9-Null/IDirect3DPixelShader9.cpp @@ -19,16 +19,16 @@ HRESULT xrIDirect3DPixelShader9::QueryInterface( REFIID riid, void** ppvObj) { *ppvObj = this; AddRef(); - return HRESULT_Proc(NOERROR); + return NOERROR; } - return HRESULT_Proc(E_NOINTERFACE); + return E_NOINTERFACE; } ULONG xrIDirect3DPixelShader9::AddRef() { APIDEBUG("xrIDirect3DPixelShader9::AddRef"); m_refCount++; - return ULONG_Proc(m_refCount); + return m_refCount; } ULONG xrIDirect3DPixelShader9::Release() @@ -38,9 +38,9 @@ ULONG xrIDirect3DPixelShader9::Release() if (m_refCount < 0) { delete this; - return ULONG_Proc(-1); + return -1; } - return ULONG_Proc(m_refCount); + return m_refCount; } /*** IDirect3DResource9 methods ***/ @@ -49,11 +49,11 @@ HRESULT __stdcall xrIDirect3DPixelShader9::GetDevice ( IDirect3DDevice9** ppD APIDEBUG("xrIDirect3DPixelShader9::GetDevice"); m_pIDirect3DDevice9->AddRef(); *ppDevice = m_pIDirect3DDevice9; - return HRESULT_Proc(S_OK); + return S_OK; }; HRESULT __stdcall xrIDirect3DPixelShader9::GetFunction(void* pData,UINT* pSizeOfData) { APIDEBUG("xrIDirect3DPixelShader9::GetFunction"); *pSizeOfData = 0; - return HRESULT_Proc(S_OK); + return S_OK; }; \ No newline at end of file diff --git a/src/xrD3D9-Null/IDirect3DQuery9.cpp b/src/xrD3D9-Null/IDirect3DQuery9.cpp index 53c450ae179..ebe8235e095 100644 --- a/src/xrD3D9-Null/IDirect3DQuery9.cpp +++ b/src/xrD3D9-Null/IDirect3DQuery9.cpp @@ -22,16 +22,16 @@ HRESULT xrIDirect3DQuery9::QueryInterface( REFIID riid, void** ppvObj) { *ppvObj = this; AddRef(); - return HRESULT_Proc(NOERROR); + return NOERROR; } - return HRESULT_Proc(E_NOINTERFACE); + return E_NOINTERFACE; } ULONG xrIDirect3DQuery9::AddRef() { APIDEBUG("xrIDirect3DQuery9::AddRef"); m_refCount++; - return ULONG_Proc(m_refCount); + return m_refCount; } ULONG xrIDirect3DQuery9::Release() @@ -41,10 +41,10 @@ ULONG xrIDirect3DQuery9::Release() if (m_refCount < 0) { delete this; - return ULONG_Proc(-1); + return -1; } - return ULONG_Proc(m_refCount); + return m_refCount; } /*** IDirect3DQuery9 methods ***/ @@ -53,7 +53,7 @@ HRESULT xrIDirect3DQuery9::GetDevice ( IDirect3DDevice9** ppDevice) APIDEBUG("xrIDirect3DQuery9::GetDevice"); m_pIDirect3DDevice9->AddRef(); *ppDevice = m_pIDirect3DDevice9; - return HRESULT_Proc(S_OK); + return S_OK; }; D3DQUERYTYPE xrIDirect3DQuery9::GetType () { @@ -63,18 +63,18 @@ D3DQUERYTYPE xrIDirect3DQuery9::GetType () DWORD xrIDirect3DQuery9::GetDataSize () { APIDEBUG("xrIDirect3DQuery9::GetDataSize"); - return DWORD_Proc(DataSize); + return DataSize; }; HRESULT xrIDirect3DQuery9::Issue ( DWORD dwIssueFlags) { APIDEBUG("xrIDirect3DQuery9::Issue"); - return HRESULT_Proc(S_OK); + return S_OK; }; HRESULT xrIDirect3DQuery9::GetData ( void* pData,DWORD dwSize,DWORD dwGetDataFlags) { APIDEBUG("xrIDirect3DQuery9::GetData"); dwSize = 0; - return HRESULT_Proc(S_OK); + return S_OK; }; //----------------------------------------------------------------------- /* diff --git a/src/xrD3D9-Null/IDirect3DStateBlock9.cpp b/src/xrD3D9-Null/IDirect3DStateBlock9.cpp index 0b7f4d0926a..46ac31e7c97 100644 --- a/src/xrD3D9-Null/IDirect3DStateBlock9.cpp +++ b/src/xrD3D9-Null/IDirect3DStateBlock9.cpp @@ -19,16 +19,16 @@ HRESULT xrIDirect3DStateBlock9::QueryInterface( REFIID riid, void** ppvObj) { *ppvObj = this; AddRef(); - return HRESULT_Proc(NOERROR); + return NOERROR; } - return HRESULT_Proc(E_NOINTERFACE); + return E_NOINTERFACE; } ULONG xrIDirect3DStateBlock9::AddRef() { APIDEBUG("xrIDirect3DStateBlock9::AddRef"); m_refCount++; - return ULONG_Proc(m_refCount); + return m_refCount; } ULONG xrIDirect3DStateBlock9::Release() @@ -38,9 +38,9 @@ ULONG xrIDirect3DStateBlock9::Release() if (m_refCount < 0) { delete this; - return ULONG_Proc(-1); + return -1; } - return ULONG_Proc(m_refCount); + return m_refCount; } /*** IDirect3DResource9 methods ***/ @@ -49,8 +49,8 @@ HRESULT __stdcall xrIDirect3DStateBlock9::GetDevice ( IDirect3DDevice9** ppDe APIDEBUG("xrIDirect3DStateBlock9::GetDevice"); m_pIDirect3DDevice9->AddRef(); *ppDevice = m_pIDirect3DDevice9; - return HRESULT_Proc(S_OK); + return S_OK; }; -HRESULT __stdcall xrIDirect3DStateBlock9::Capture() { APIDEBUG("xrIDirect3DStateBlock9::Capture"); return HRESULT_Proc(S_OK); }; -HRESULT __stdcall xrIDirect3DStateBlock9::Apply() { APIDEBUG("xrIDirect3DStateBlock9::Apply"); return HRESULT_Proc(S_OK);}; \ No newline at end of file +HRESULT __stdcall xrIDirect3DStateBlock9::Capture() { APIDEBUG("xrIDirect3DStateBlock9::Capture"); return S_OK; }; +HRESULT __stdcall xrIDirect3DStateBlock9::Apply() { APIDEBUG("xrIDirect3DStateBlock9::Apply"); return S_OK;}; \ No newline at end of file diff --git a/src/xrD3D9-Null/IDirect3DSurface9.cpp b/src/xrD3D9-Null/IDirect3DSurface9.cpp index ffb9b85d9f0..37960cf78b6 100644 --- a/src/xrD3D9-Null/IDirect3DSurface9.cpp +++ b/src/xrD3D9-Null/IDirect3DSurface9.cpp @@ -37,16 +37,16 @@ HRESULT xrIDirect3DSurface9::QueryInterface( REFIID riid, void** ppvObj) { *ppvObj = this; AddRef(); - return HRESULT_Proc(NOERROR); + return NOERROR; } - return HRESULT_Proc(E_NOINTERFACE); + return E_NOINTERFACE; } ULONG xrIDirect3DSurface9::AddRef() { APIDEBUG("xrIDirect3DSurface9::AddRef"); m_refCount++; - return ULONG_Proc(m_refCount); + return m_refCount; } ULONG xrIDirect3DSurface9::Release() @@ -56,9 +56,9 @@ ULONG xrIDirect3DSurface9::Release() if (m_refCount < 0) { delete this; - return ULONG_Proc(-1); + return -1; } - return ULONG_Proc(m_refCount); + return m_refCount; } /*** IDirect3DResource9 methods ***/ @@ -67,17 +67,17 @@ HRESULT xrIDirect3DSurface9::GetDevice ( IDirect3DDevice9** ppDevice) APIDEBUG("xrIDirect3DSurface9::GetDevice"); m_pIDirect3DDevice9->AddRef(); *ppDevice = m_pIDirect3DDevice9; - return HRESULT_Proc(S_OK); + return S_OK; }; -HRESULT xrIDirect3DSurface9::SetPrivateData ( REFGUID refguid,CONST void* pData,DWORD SizeOfData,DWORD Flags) {APIDEBUG("xrIDirect3DSurface9::SetPrivateData");return HRESULT_Proc(S_OK);}; -HRESULT xrIDirect3DSurface9::GetPrivateData ( REFGUID refguid,void* pData,DWORD* pSizeOfData) {APIDEBUG("xrIDirect3DSurface9::GetPrivateData");return HRESULT_Proc(S_OK);}; -HRESULT xrIDirect3DSurface9::FreePrivateData( REFGUID refguid) {APIDEBUG("xrIDirect3DSurface9::FreePrivateData");return HRESULT_Proc(S_OK);}; -DWORD xrIDirect3DSurface9::SetPriority ( DWORD PriorityNew) {APIDEBUG("xrIDirect3DSurface9::SetPriority"); DWORD old = Priority; Priority = PriorityNew; return DWORD_Proc(old);}; -DWORD xrIDirect3DSurface9::GetPriority () {APIDEBUG("xrIDirect3DSurface9::GetPriority");return DWORD_Proc(Priority);}; -void xrIDirect3DSurface9::PreLoad () {APIDEBUG("xrIDirect3DSurface9::PreLoad"); VOID_proc();}; +HRESULT xrIDirect3DSurface9::SetPrivateData ( REFGUID refguid,CONST void* pData,DWORD SizeOfData,DWORD Flags) {APIDEBUG("xrIDirect3DSurface9::SetPrivateData");return S_OK;}; +HRESULT xrIDirect3DSurface9::GetPrivateData ( REFGUID refguid,void* pData,DWORD* pSizeOfData) {APIDEBUG("xrIDirect3DSurface9::GetPrivateData");return S_OK;}; +HRESULT xrIDirect3DSurface9::FreePrivateData( REFGUID refguid) {APIDEBUG("xrIDirect3DSurface9::FreePrivateData");return S_OK;}; +DWORD xrIDirect3DSurface9::SetPriority ( DWORD PriorityNew) {APIDEBUG("xrIDirect3DSurface9::SetPriority"); DWORD old = Priority; Priority = PriorityNew; return old;}; +DWORD xrIDirect3DSurface9::GetPriority () {APIDEBUG("xrIDirect3DSurface9::GetPriority");return Priority;}; +void xrIDirect3DSurface9::PreLoad () {APIDEBUG("xrIDirect3DSurface9::PreLoad"); }; D3DRESOURCETYPE xrIDirect3DSurface9::GetType () {APIDEBUG("xrIDirect3DSurface9::GetType");return D3DRESOURCETYPE(0);}; -HRESULT xrIDirect3DSurface9::GetContainer ( REFIID riid,void** ppContainer) {APIDEBUG("xrIDirect3DSurface9::GetContainer");return HRESULT_Proc(S_OK);}; +HRESULT xrIDirect3DSurface9::GetContainer ( REFIID riid,void** ppContainer) {APIDEBUG("xrIDirect3DSurface9::GetContainer");return S_OK;}; HRESULT xrIDirect3DSurface9::GetDesc ( D3DSURFACE_DESC *pDesc) { APIDEBUG("xrIDirect3DSurface9::GetDesc"); @@ -91,7 +91,7 @@ HRESULT xrIDirect3DSurface9::GetDesc ( D3DSURFACE_DESC *pDesc) pDesc->MultiSampleQuality = MultiSampleQuality; pDesc->Width = Width; pDesc->Height = Height; - return HRESULT_Proc(S_OK); + return S_OK; }; HRESULT xrIDirect3DSurface9::LockRect ( D3DLOCKED_RECT* pLockedRect,CONST RECT* pRect,DWORD Flags) { @@ -108,7 +108,7 @@ HRESULT xrIDirect3DSurface9::LockRect ( D3DLOCKED_RECT* pLockedRect,CONST REC pLockedRect->Pitch = 4; pLockedRect->pBits = m_pLockedData; - return HRESULT_Proc(S_OK); + return S_OK; }; HRESULT xrIDirect3DSurface9::UnlockRect () { @@ -123,7 +123,7 @@ HRESULT xrIDirect3DSurface9::UnlockRect () delete[] m_pLockedData; m_pLockedData = NULL; - return HRESULT_Proc(S_OK); + return S_OK; }; -HRESULT xrIDirect3DSurface9::GetDC ( HDC *phdc) {APIDEBUG("xrIDirect3DSurface9::GetDC");return HRESULT_Proc(S_OK);}; -HRESULT xrIDirect3DSurface9::ReleaseDC ( HDC hdc) {APIDEBUG("xrIDirect3DSurface9::ReleaseDC");return HRESULT_Proc(S_OK);}; \ No newline at end of file +HRESULT xrIDirect3DSurface9::GetDC ( HDC *phdc) {APIDEBUG("xrIDirect3DSurface9::GetDC");return S_OK;}; +HRESULT xrIDirect3DSurface9::ReleaseDC ( HDC hdc) {APIDEBUG("xrIDirect3DSurface9::ReleaseDC");return S_OK;}; \ No newline at end of file diff --git a/src/xrD3D9-Null/IDirect3DTexture9.cpp b/src/xrD3D9-Null/IDirect3DTexture9.cpp index d1e27804a0a..b24183f6e2a 100644 --- a/src/xrD3D9-Null/IDirect3DTexture9.cpp +++ b/src/xrD3D9-Null/IDirect3DTexture9.cpp @@ -29,16 +29,16 @@ HRESULT xrIDirect3DTexture9::QueryInterface( REFIID riid, void** ppvObj) { *ppvObj = this; AddRef(); - return HRESULT_Proc(NOERROR); + return NOERROR; } - return HRESULT_Proc(E_NOINTERFACE); + return E_NOINTERFACE; } ULONG xrIDirect3DTexture9::AddRef() { APIDEBUG("xrIDirect3DTexture9::AddRef"); m_refCount++; - return ULONG_Proc(m_refCount); + return m_refCount; } ULONG xrIDirect3DTexture9::Release() @@ -48,9 +48,9 @@ ULONG xrIDirect3DTexture9::Release() if (m_refCount < 0) { delete this; - return ULONG_Proc(-1); + return -1; } - return ULONG_Proc(m_refCount); + return m_refCount; } /*** IDirect3DBaseTexture9 methods ***/ @@ -59,21 +59,21 @@ HRESULT xrIDirect3DTexture9::GetDevice( IDirect3DDevice9** ppDevice) APIDEBUG("xrIDirect3DTexture9::GetDevice"); m_pIDirect3DDevice9->AddRef(); *ppDevice = m_pIDirect3DDevice9; - return HRESULT_Proc(S_OK); + return S_OK; } -HRESULT xrIDirect3DTexture9::SetPrivateData ( REFGUID refguid,CONST void* pData,DWORD SizeOfData,DWORD Flags) { APIDEBUG("xrIDirect3DTexture9::SetPrivateData"); return HRESULT_Proc(S_OK); }; -HRESULT xrIDirect3DTexture9::GetPrivateData ( REFGUID refguid,void* pData,DWORD* pSizeOfData) { APIDEBUG("xrIDirect3DTexture9::GetPrivateData"); return HRESULT_Proc(S_OK); }; -HRESULT xrIDirect3DTexture9::FreePrivateData ( REFGUID refguid) { APIDEBUG("xrIDirect3DTexture9::FreePrivateData"); return HRESULT_Proc(S_OK); }; -DWORD xrIDirect3DTexture9::SetPriority ( DWORD PriorityNew) { APIDEBUG("xrIDirect3DTexture9::SetPriority"); DWORD old = Priority; Priority = PriorityNew; return DWORD_Proc(old); }; -DWORD xrIDirect3DTexture9::GetPriority () { APIDEBUG("xrIDirect3DTexture9::GetPriority"); return DWORD_Proc(Priority); }; -void xrIDirect3DTexture9::PreLoad () { APIDEBUG("xrIDirect3DTexture9::PreLoad"); return VOID_proc(); }; +HRESULT xrIDirect3DTexture9::SetPrivateData ( REFGUID refguid,CONST void* pData,DWORD SizeOfData,DWORD Flags) { APIDEBUG("xrIDirect3DTexture9::SetPrivateData"); return S_OK; }; +HRESULT xrIDirect3DTexture9::GetPrivateData ( REFGUID refguid,void* pData,DWORD* pSizeOfData) { APIDEBUG("xrIDirect3DTexture9::GetPrivateData"); return S_OK; }; +HRESULT xrIDirect3DTexture9::FreePrivateData ( REFGUID refguid) { APIDEBUG("xrIDirect3DTexture9::FreePrivateData"); return S_OK; }; +DWORD xrIDirect3DTexture9::SetPriority ( DWORD PriorityNew) { APIDEBUG("xrIDirect3DTexture9::SetPriority"); DWORD old = Priority; Priority = PriorityNew; return old; }; +DWORD xrIDirect3DTexture9::GetPriority () { APIDEBUG("xrIDirect3DTexture9::GetPriority"); return Priority; }; +void xrIDirect3DTexture9::PreLoad () { APIDEBUG("xrIDirect3DTexture9::PreLoad"); }; D3DRESOURCETYPE xrIDirect3DTexture9::GetType () { APIDEBUG("xrIDirect3DTexture9::GetType"); return D3DRTYPE_TEXTURE; }; -DWORD xrIDirect3DTexture9::SetLOD ( DWORD LODNew) { APIDEBUG("xrIDirect3DTexture9::SetLOD"); DWORD old = LOD; LOD = LODNew; return DWORD_Proc(old); }; -DWORD xrIDirect3DTexture9::GetLOD () { APIDEBUG("xrIDirect3DTexture9::GetLOD"); return DWORD_Proc(LOD); }; -DWORD xrIDirect3DTexture9::GetLevelCount () { APIDEBUG("xrIDirect3DTexture9::GetLevelCount"); return DWORD_Proc(Levels); }; -HRESULT xrIDirect3DTexture9::SetAutoGenFilterType ( D3DTEXTUREFILTERTYPE iFilterType) { APIDEBUG("xrIDirect3DTexture9::SetAutoGenFilterType"); FilterType = iFilterType; return HRESULT_Proc(S_OK); }; +DWORD xrIDirect3DTexture9::SetLOD ( DWORD LODNew) { APIDEBUG("xrIDirect3DTexture9::SetLOD"); DWORD old = LOD; LOD = LODNew; return old; }; +DWORD xrIDirect3DTexture9::GetLOD () { APIDEBUG("xrIDirect3DTexture9::GetLOD"); return LOD; }; +DWORD xrIDirect3DTexture9::GetLevelCount () { APIDEBUG("xrIDirect3DTexture9::GetLevelCount"); return Levels; }; +HRESULT xrIDirect3DTexture9::SetAutoGenFilterType ( D3DTEXTUREFILTERTYPE iFilterType) { APIDEBUG("xrIDirect3DTexture9::SetAutoGenFilterType"); FilterType = iFilterType; return S_OK; }; D3DTEXTUREFILTERTYPE xrIDirect3DTexture9::GetAutoGenFilterType () { APIDEBUG("xrIDirect3DTexture9::GetAutoGenFilterType"); return D3DTEXTUREFILTERTYPE(FilterType); }; -void xrIDirect3DTexture9::GenerateMipSubLevels () { APIDEBUG("xrIDirect3DTexture9::GenerateMipSubLevels"); return VOID_proc(); }; +void xrIDirect3DTexture9::GenerateMipSubLevels () { APIDEBUG("xrIDirect3DTexture9::GenerateMipSubLevels"); }; HRESULT xrIDirect3DTexture9::GetLevelDesc ( UINT Level,D3DSURFACE_DESC *pDesc) { @@ -89,7 +89,7 @@ HRESULT xrIDirect3DTexture9::GetLevelDesc ( UINT Level,D3DSURFACE_DESC *pD pDesc->Width = Width; pDesc->Height = Height; - return HRESULT_Proc(S_OK); + return S_OK; }; HRESULT xrIDirect3DTexture9::GetSurfaceLevel ( UINT Level,IDirect3DSurface9** ppSurfaceLevel) @@ -100,8 +100,8 @@ HRESULT xrIDirect3DTexture9::GetSurfaceLevel ( UINT Level,IDirect3DSurface9 xrIDirect3DSurface9* I = new xrIDirect3DSurface9(m_pIDirect3DDevice9, Width,Height,Format,D3DMULTISAMPLE_TYPE(0),0); *ppSurfaceLevel = I; - return HRESULT_Proc(S_OK); + return S_OK; }; -HRESULT xrIDirect3DTexture9::LockRect ( UINT Level,D3DLOCKED_RECT* pLockedRect,CONST RECT* pRect,DWORD Flags) { APIDEBUG("xrIDirect3DTexture9::LockRect"); return HRESULT_Proc(S_OK); }; -HRESULT xrIDirect3DTexture9::UnlockRect ( UINT Level) { APIDEBUG("xrIDirect3DTexture9::UnlockRect"); return HRESULT_Proc(S_OK); }; -HRESULT xrIDirect3DTexture9::AddDirtyRect ( CONST RECT* pDirtyRect) { APIDEBUG("xrIDirect3DTexture9::AddDirtyRect"); return HRESULT_Proc(S_OK); }; \ No newline at end of file +HRESULT xrIDirect3DTexture9::LockRect ( UINT Level,D3DLOCKED_RECT* pLockedRect,CONST RECT* pRect,DWORD Flags) { APIDEBUG("xrIDirect3DTexture9::LockRect"); return S_OK; }; +HRESULT xrIDirect3DTexture9::UnlockRect ( UINT Level) { APIDEBUG("xrIDirect3DTexture9::UnlockRect"); return S_OK; }; +HRESULT xrIDirect3DTexture9::AddDirtyRect ( CONST RECT* pDirtyRect) { APIDEBUG("xrIDirect3DTexture9::AddDirtyRect"); return S_OK; }; \ No newline at end of file diff --git a/src/xrD3D9-Null/IDirect3DVertexBuffer9.cpp b/src/xrD3D9-Null/IDirect3DVertexBuffer9.cpp index a5ef0876b1e..2b9a1968e14 100644 --- a/src/xrD3D9-Null/IDirect3DVertexBuffer9.cpp +++ b/src/xrD3D9-Null/IDirect3DVertexBuffer9.cpp @@ -32,16 +32,16 @@ HRESULT xrIDirect3DVertexBuffer9::QueryInterface( REFIID riid, void** ppvObj) { *ppvObj = this; AddRef(); - return HRESULT_Proc(NOERROR); + return NOERROR; } - return HRESULT_Proc(E_NOINTERFACE); + return E_NOINTERFACE; } ULONG xrIDirect3DVertexBuffer9::AddRef() { APIDEBUG("xrIDirect3DVertexBuffer9::AddRef"); m_refCount++; - return ULONG_Proc(m_refCount); + return m_refCount; } ULONG xrIDirect3DVertexBuffer9::Release() @@ -52,9 +52,9 @@ ULONG xrIDirect3DVertexBuffer9::Release() { delete[] m_pBuffer; delete this; - return ULONG_Proc(-1); + return -1; } - return ULONG_Proc(m_refCount); + return m_refCount; } /*** IDirect3DResource9 methods ***/ @@ -63,20 +63,20 @@ HRESULT __stdcall xrIDirect3DVertexBuffer9::GetDevice ( IDirect3DDevice9** pp APIDEBUG("xrIDirect3DVertexBuffer9::GetDevice"); m_pIDirect3DDevice9->AddRef(); *ppDevice = m_pIDirect3DDevice9; - return HRESULT_Proc(S_OK); + return S_OK; }; -HRESULT __stdcall xrIDirect3DVertexBuffer9::SetPrivateData ( REFGUID refguid,CONST void* pData,DWORD SizeOfData,DWORD Flags) {APIDEBUG("xrIDirect3DVertexBuffer9::SetPrivateData");return HRESULT_Proc(S_OK);}; -HRESULT __stdcall xrIDirect3DVertexBuffer9::GetPrivateData ( REFGUID refguid,void* pData,DWORD* pSizeOfData) {APIDEBUG("xrIDirect3DVertexBuffer9::GetPrivateData");return HRESULT_Proc(S_OK);}; -HRESULT __stdcall xrIDirect3DVertexBuffer9::FreePrivateData( REFGUID refguid) {APIDEBUG("xrIDirect3DVertexBuffer9::FreePrivateData");return HRESULT_Proc(S_OK);}; -DWORD __stdcall xrIDirect3DVertexBuffer9::SetPriority ( DWORD PriorityNew) {APIDEBUG("xrIDirect3DVertexBuffer9::SetPriority");DWORD old = Priority; Priority = PriorityNew; return DWORD_Proc(old);}; -DWORD __stdcall xrIDirect3DVertexBuffer9::GetPriority () {APIDEBUG("xrIDirect3DVertexBuffer9::GetPriority");return DWORD_Proc(Priority);}; -void __stdcall xrIDirect3DVertexBuffer9::PreLoad () {APIDEBUG("xrIDirect3DVertexBuffer9::PreLoad");return VOID_proc();}; +HRESULT __stdcall xrIDirect3DVertexBuffer9::SetPrivateData ( REFGUID refguid,CONST void* pData,DWORD SizeOfData,DWORD Flags) {APIDEBUG("xrIDirect3DVertexBuffer9::SetPrivateData");return S_OK;}; +HRESULT __stdcall xrIDirect3DVertexBuffer9::GetPrivateData ( REFGUID refguid,void* pData,DWORD* pSizeOfData) {APIDEBUG("xrIDirect3DVertexBuffer9::GetPrivateData");return S_OK;}; +HRESULT __stdcall xrIDirect3DVertexBuffer9::FreePrivateData( REFGUID refguid) {APIDEBUG("xrIDirect3DVertexBuffer9::FreePrivateData");return S_OK;}; +DWORD __stdcall xrIDirect3DVertexBuffer9::SetPriority ( DWORD PriorityNew) {APIDEBUG("xrIDirect3DVertexBuffer9::SetPriority");DWORD old = Priority; Priority = PriorityNew; return old;}; +DWORD __stdcall xrIDirect3DVertexBuffer9::GetPriority () {APIDEBUG("xrIDirect3DVertexBuffer9::GetPriority");return Priority;}; +void __stdcall xrIDirect3DVertexBuffer9::PreLoad () {APIDEBUG("xrIDirect3DVertexBuffer9::PreLoad");}; D3DRESOURCETYPE __stdcall xrIDirect3DVertexBuffer9::GetType () {APIDEBUG("xrIDirect3DVertexBuffer9::GetType");return D3DRESOURCETYPE(0);}; HRESULT __stdcall xrIDirect3DVertexBuffer9::Lock ( UINT OffsetToLock,UINT SizeToLock,void** ppbData,DWORD Flags) { APIDEBUG("xrIDirect3DVertexBuffer9::Lock"); *ppbData = m_pBuffer + OffsetToLock; - return HRESULT_Proc(S_OK); + return S_OK; }; -HRESULT __stdcall xrIDirect3DVertexBuffer9::Unlock () {APIDEBUG("xrIDirect3DVertexBuffer9::Unlock");return HRESULT_Proc(S_OK);}; -HRESULT __stdcall xrIDirect3DVertexBuffer9::GetDesc ( D3DVERTEXBUFFER_DESC *pDesc) {APIDEBUG("xrIDirect3DVertexBuffer9::GetDesc");return HRESULT_Proc(S_OK);}; +HRESULT __stdcall xrIDirect3DVertexBuffer9::Unlock () {APIDEBUG("xrIDirect3DVertexBuffer9::Unlock");return S_OK;}; +HRESULT __stdcall xrIDirect3DVertexBuffer9::GetDesc ( D3DVERTEXBUFFER_DESC *pDesc) {APIDEBUG("xrIDirect3DVertexBuffer9::GetDesc");return S_OK;}; diff --git a/src/xrD3D9-Null/IDirect3DVertexDeclaration9.cpp b/src/xrD3D9-Null/IDirect3DVertexDeclaration9.cpp index d0a41a7297e..1854f3c1dc7 100644 --- a/src/xrD3D9-Null/IDirect3DVertexDeclaration9.cpp +++ b/src/xrD3D9-Null/IDirect3DVertexDeclaration9.cpp @@ -19,16 +19,16 @@ HRESULT xrIDirect3DVertexDeclaration9::QueryInterface( REFIID riid, void** ppv { *ppvObj = this; AddRef(); - return HRESULT_Proc(NOERROR); + return NOERROR; } - return HRESULT_Proc(E_NOINTERFACE); + return E_NOINTERFACE; } ULONG xrIDirect3DVertexDeclaration9::AddRef() { APIDEBUG("xrIDirect3DVertexDeclaration9::AddRef"); m_refCount++; - return ULONG_Proc(m_refCount); + return m_refCount; } ULONG xrIDirect3DVertexDeclaration9::Release() @@ -38,9 +38,9 @@ ULONG xrIDirect3DVertexDeclaration9::Release() if (m_refCount < 0) { delete this; - return ULONG_Proc(-1); + return -1; } - return ULONG_Proc(m_refCount); + return m_refCount; } /*** IDirect3DResource9 methods ***/ @@ -49,10 +49,10 @@ HRESULT __stdcall xrIDirect3DVertexDeclaration9::GetDevice ( IDirect3DDevice9 APIDEBUG("xrIDirect3DVertexDeclaration9::GetDevice"); m_pIDirect3DDevice9->AddRef(); *ppDevice = m_pIDirect3DDevice9; - return HRESULT_Proc(S_OK); + return S_OK; }; HRESULT __stdcall xrIDirect3DVertexDeclaration9::GetDeclaration( D3DVERTEXELEMENT9* pD3DVertexElement9,UINT* pNumElements) { APIDEBUG("xrIDirect3DVertexDeclaration9::GetDeclaration"); - return HRESULT_Proc(S_OK); + return S_OK; }; \ No newline at end of file diff --git a/src/xrD3D9-Null/IDirect3DVertexShader9.cpp b/src/xrD3D9-Null/IDirect3DVertexShader9.cpp index f7ff1cbfb54..ab13c3c6da0 100644 --- a/src/xrD3D9-Null/IDirect3DVertexShader9.cpp +++ b/src/xrD3D9-Null/IDirect3DVertexShader9.cpp @@ -19,16 +19,16 @@ HRESULT xrIDirect3DVertexShader9::QueryInterface( REFIID riid, void** ppvObj) { *ppvObj = this; AddRef(); - return HRESULT_Proc(NOERROR); + return NOERROR; } - return HRESULT_Proc(E_NOINTERFACE); + return E_NOINTERFACE; } ULONG xrIDirect3DVertexShader9::AddRef() { APIDEBUG("xrIDirect3DVertexShader9::AddRef"); m_refCount++; - return ULONG_Proc(m_refCount); + return m_refCount; } ULONG xrIDirect3DVertexShader9::Release() @@ -38,9 +38,9 @@ ULONG xrIDirect3DVertexShader9::Release() if (m_refCount < 0) { delete this; - return ULONG_Proc(-1); + return -1; } - return ULONG_Proc(m_refCount); + return m_refCount; } /*** IDirect3DResource9 methods ***/ @@ -49,11 +49,11 @@ HRESULT __stdcall xrIDirect3DVertexShader9::GetDevice ( IDirect3DDevice9** pp APIDEBUG("xrIDirect3DVertexShader9::GetDevice"); m_pIDirect3DDevice9->AddRef(); *ppDevice = m_pIDirect3DDevice9; - return HRESULT_Proc(S_OK); + return S_OK; }; HRESULT __stdcall xrIDirect3DVertexShader9::GetFunction(void* pData,UINT* pSizeOfData) { APIDEBUG("xrIDirect3DVertexShader9::GetFunction"); *pSizeOfData = 0; - return HRESULT_Proc(S_OK); + return S_OK; }; \ No newline at end of file diff --git a/src/xrD3D9-Null/xrD3D9-Null_OutProc.cpp b/src/xrD3D9-Null/xrD3D9-Null_OutProc.cpp index fa0aa9c7e39..c136473b8b6 100644 --- a/src/xrD3D9-Null/xrD3D9-Null_OutProc.cpp +++ b/src/xrD3D9-Null/xrD3D9-Null_OutProc.cpp @@ -1,42 +1,7 @@ #include "stdafx.h" #include -HRESULT HRESULT_Proc(HRESULT ret) -{ - return ret; -}; - -ULONG ULONG_Proc(ULONG ret) -{ - return ret; -}; - -UINT UINT_Proc(UINT ret) -{ - return ret; -}; - -BOOL BOOL_Proc(BOOL ret) -{ - return ret; -}; - -float FLOAT_Proc(float ret) -{ - return ret; -}; -void VOID_proc() -{ - int x=0; - x=x; -}; - -DWORD DWORD_Proc(DWORD ret) -{ - return ret; -} -//----------------------------------------------------------------------- void LogOut( const char *format, ... ) { va_list argptr; diff --git a/src/xrD3D9-Null/xrD3D9-Null_OutProc.h b/src/xrD3D9-Null/xrD3D9-Null_OutProc.h index e86d190e53f..ccc4b67a62a 100644 --- a/src/xrD3D9-Null/xrD3D9-Null_OutProc.h +++ b/src/xrD3D9-Null/xrD3D9-Null_OutProc.h @@ -1,14 +1,3 @@ - - -//--------------------------------------------------------------------------- -extern HRESULT HRESULT_Proc(HRESULT ret); -extern ULONG ULONG_Proc(ULONG ret); -extern UINT UINT_Proc(UINT ret); -extern DWORD DWORD_Proc(DWORD ret); -extern BOOL BOOL_Proc(BOOL ret); -extern float FLOAT_Proc(float ret); -extern void VOID_proc(); -//--------------------------------------------------------------------------- extern void LogOut( const char *format, ... ); extern void LogOut_File( const char *format, ... );