Skip to content

Commit 5defbb4

Browse files
author
Pavel Kovalenko
committed
Merge pull request #22 from SpaceBrain/pvsfixes
Various fixes in xrD3D9-Null
2 parents c4a7c11 + ec1c19a commit 5defbb4

20 files changed

+283
-417
lines changed

‎src/xrD3D9-Null/IDirect3D9.cpp

Lines changed: 19 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,8 @@
22
#include "IDirect3D9.h"
33
#include "IDirect3DDevice9.h"
44
#include "xrD3D9-Null_OutProc.h"
5+
#include <stdio.h>
56

6-
#include <stdlib.h>
7-
#include <objbase.h>
8-
#include <windows.h>
9-
#include "stdio.h"
107

118
const GUID DECLSPEC_SELECTANY IID_IDirect3D9;
129

@@ -22,7 +19,7 @@ ULONG xrIDirect3D9::AddRef(void)
2219
{
2320
APIDEBUG("xrIDirect3D9::AddRef");
2421
m_refCount++;
25-
return ULONG_Proc(m_refCount);
22+
return m_refCount;
2623
}
2724

2825
ULONG xrIDirect3D9::Release(void)
@@ -32,9 +29,9 @@ ULONG xrIDirect3D9::Release(void)
3229
if (m_refCount < 0)
3330
{
3431
delete this;
35-
return ULONG_Proc(-1);
32+
return -1;
3633
}
37-
return ULONG_Proc(m_refCount);
34+
return m_refCount;
3835
}
3936

4037
HRESULT xrIDirect3D9::QueryInterface(const IID &iid, void FAR* FAR* ppvObj)
@@ -44,20 +41,20 @@ HRESULT xrIDirect3D9::QueryInterface(const IID &iid, void FAR* FAR* ppvObj)
4441
{
4542
*ppvObj = this;
4643
AddRef();
47-
return HRESULT_Proc(NOERROR);
44+
return NOERROR;
4845
}
49-
return HRESULT_Proc(E_NOINTERFACE);
46+
return E_NOINTERFACE;
5047
}
5148

5249
HRESULT xrIDirect3D9::RegisterSoftwareDevice(void* pInitializeFunction)
5350
{
5451
APIDEBUG("xrIDirect3D9::RegisterSoftwareDevice");
55-
return HRESULT_Proc(S_OK);
52+
return S_OK;
5653
};
5754
UINT xrIDirect3D9::GetAdapterCount()
5855
{
5956
APIDEBUG("xrIDirect3D9::GetAdapterCount");
60-
return ULONG_Proc(1);
57+
return 1;
6158
};
6259

6360
HRESULT xrIDirect3D9::GetAdapterIdentifier(UINT Adapter,DWORD Flags,D3DADAPTER_IDENTIFIER9* pIdentifier)
@@ -66,56 +63,56 @@ HRESULT xrIDirect3D9::GetAdapterIdentifier(UINT Adapter,DWORD Flags,D3DADAPTER_I
6663
sprintf_s(pIdentifier->Driver, "Default Driver");
6764
sprintf_s(pIdentifier->Description, "Default X-Ray Dedicated Adapter");
6865
sprintf_s(pIdentifier->DeviceName, "Dedicated");
69-
return HRESULT_Proc(S_OK);
66+
return S_OK;
7067
};
7168
UINT xrIDirect3D9::GetAdapterModeCount( UINT Adapter,D3DFORMAT Format)
7269
{
7370
APIDEBUG("xrIDirect3D9::GetAdapterModeCount");
74-
return ULONG_Proc(1);
71+
return 1;
7572
};
7673

7774
HRESULT xrIDirect3D9::EnumAdapterModes(UINT Adapter,D3DFORMAT Format,UINT Mode,D3DDISPLAYMODE* pMode)
7875
{
7976
APIDEBUG("xrIDirect3D9::EnumAdapterModes");
80-
return HRESULT_Proc(S_OK);
77+
return S_OK;
8178
};
8279
HRESULT xrIDirect3D9::GetAdapterDisplayMode( UINT Adapter,D3DDISPLAYMODE* pMode)
8380
{
8481
APIDEBUG("xrIDirect3D9::GetAdapterDisplayMode");
8582
pMode->Format = D3DFMT_A8R8G8B8;
86-
return HRESULT_Proc(S_OK);
83+
return S_OK;
8784
};
8885
HRESULT xrIDirect3D9::CheckDeviceType( UINT Adapter,D3DDEVTYPE DevType,D3DFORMAT AdapterFormat,D3DFORMAT BackBufferFormat,BOOL bWindowed)
8986
{
9087
APIDEBUG("xrIDirect3D9::CheckDeviceType");
91-
return HRESULT_Proc(S_OK);
88+
return S_OK;
9289
};
9390
HRESULT xrIDirect3D9::CheckDeviceFormat( UINT Adapter,D3DDEVTYPE DeviceType,D3DFORMAT AdapterFormat,DWORD Usage,D3DRESOURCETYPE RType,D3DFORMAT CheckFormat)
9491
{
9592
APIDEBUG("xrIDirect3D9::CheckDeviceFormat");
96-
return HRESULT_Proc(S_OK);
93+
return S_OK;
9794
};
9895
HRESULT xrIDirect3D9::CheckDeviceMultiSampleType( UINT Adapter,D3DDEVTYPE DeviceType,D3DFORMAT SurfaceFormat,BOOL Windowed,D3DMULTISAMPLE_TYPE MultiSampleType,DWORD* pQualityLevels)
9996
{
10097
APIDEBUG("xrIDirect3D9::CheckDeviceMultiSampleType");
101-
return HRESULT_Proc(S_OK);
98+
return S_OK;
10299
};
103100
HRESULT xrIDirect3D9::CheckDepthStencilMatch( UINT Adapter,D3DDEVTYPE DeviceType,D3DFORMAT AdapterFormat,D3DFORMAT RenderTargetFormat,D3DFORMAT DepthStencilFormat)
104101
{
105102
APIDEBUG("xrIDirect3D9::CheckDepthStencilMatch");
106-
return HRESULT_Proc(S_OK);
103+
return S_OK;
107104
};
108105
HRESULT xrIDirect3D9::CheckDeviceFormatConversion( UINT Adapter,D3DDEVTYPE DeviceType,D3DFORMAT SourceFormat,D3DFORMAT TargetFormat)
109106
{
110107
APIDEBUG("xrIDirect3D9::CheckDeviceFormatConversion");
111-
return HRESULT_Proc(S_OK);
108+
return S_OK;
112109
};
113110
HRESULT xrIDirect3D9::GetDeviceCaps( UINT Adapter,D3DDEVTYPE DeviceType,D3DCAPS9* pCaps)
114111
{
115112
APIDEBUG("xrIDirect3D9::GetDeviceCaps");
116113
if (pCaps)
117114
ZeroMemory(pCaps,sizeof(D3DCAPS9));
118-
return HRESULT_Proc(S_OK);
115+
return S_OK;
119116
};
120117
HMONITOR xrIDirect3D9::GetAdapterMonitor( UINT Adapter)
121118
{
@@ -129,19 +126,5 @@ HRESULT xrIDirect3D9::CreateDevice (UINT Adapter,D3DDEVTYPE DeviceType,HWND hFoc
129126
*ppReturnedDeviceInterface = NULL;
130127
xrIDirect3DDevice9* I = new xrIDirect3DDevice9(this, pPresentationParameters);
131128
*ppReturnedDeviceInterface = I;
132-
return HRESULT_Proc(S_OK);
129+
return S_OK;
133130
};
134-
//-------------------------------------------------------------------
135-
/*
136-
HRESULT xrIDirect3D9::HRESULT_Proc(HRESULT ret)
137-
{
138-
return ret;
139-
}
140-
141-
ULONG xrIDirect3D9::ULONG_Proc(ULONG ret)
142-
{
143-
return ret;
144-
}
145-
*/
146-
147-

‎src/xrD3D9-Null/IDirect3D9.h

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
1-
//---------------------------------
2-
#include <stdlib.h>
3-
#include <objbase.h>
4-
#include <windows.h>
5-
6-
#include "d3d9.h"
1+
#include "stdafx.h"
72

83
/*
94
//---------------------------------

‎src/xrD3D9-Null/IDirect3DCubeTexture9.cpp

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,16 @@ HRESULT xrIDirect3DCubeTexture9::QueryInterface( REFIID riid, void** ppvObj)
2929
{
3030
*ppvObj = this;
3131
AddRef();
32-
return HRESULT_Proc(NOERROR);
32+
return NOERROR;
3333
}
34-
return HRESULT_Proc(E_NOINTERFACE);
34+
return E_NOINTERFACE;
3535
}
3636

3737
ULONG xrIDirect3DCubeTexture9::AddRef()
3838
{
3939
APIDEBUG("xrIDirect3DCubeTexture9::AddRef");
4040
m_refCount++;
41-
return ULONG_Proc(m_refCount);
41+
return m_refCount;
4242
}
4343

4444
ULONG xrIDirect3DCubeTexture9::Release()
@@ -48,9 +48,9 @@ ULONG xrIDirect3DCubeTexture9::Release()
4848
if (m_refCount < 0)
4949
{
5050
delete this;
51-
return ULONG_Proc(-1);
51+
return -1;
5252
}
53-
return ULONG_Proc(m_refCount);
53+
return m_refCount;
5454
}
5555

5656
/*** IDirect3DBaseTexture9 methods ***/
@@ -59,21 +59,21 @@ HRESULT xrIDirect3DCubeTexture9::GetDevice( IDirect3DDevice9** ppDevice)
5959
APIDEBUG("xrIDirect3DCubeTexture9::GetDevice");
6060
m_pIDirect3DDevice9->AddRef();
6161
*ppDevice = m_pIDirect3DDevice9;
62-
return HRESULT_Proc(S_OK);
62+
return S_OK;
6363
}
64-
HRESULT xrIDirect3DCubeTexture9::SetPrivateData ( REFGUID refguid,CONST void* pData,DWORD SizeOfData,DWORD Flags) { APIDEBUG("xrIDirect3DCubeTexture9::SetPrivateData"); return HRESULT_Proc(S_OK); };
65-
HRESULT xrIDirect3DCubeTexture9::GetPrivateData ( REFGUID refguid,void* pData,DWORD* pSizeOfData) { APIDEBUG("xrIDirect3DCubeTexture9::GetPrivateData"); return HRESULT_Proc(S_OK); };
66-
HRESULT xrIDirect3DCubeTexture9::FreePrivateData ( REFGUID refguid) { APIDEBUG("xrIDirect3DCubeTexture9::FreePrivateData"); return HRESULT_Proc(S_OK); };
67-
DWORD xrIDirect3DCubeTexture9::SetPriority ( DWORD PriorityNew) { APIDEBUG("xrIDirect3DCubeTexture9::SetPriority"); DWORD old = Priority; Priority = PriorityNew; return DWORD_Proc(old); };
68-
DWORD xrIDirect3DCubeTexture9::GetPriority () { APIDEBUG("xrIDirect3DCubeTexture9::GetPriority"); return DWORD_Proc(Priority); };
69-
void xrIDirect3DCubeTexture9::PreLoad () { APIDEBUG("xrIDirect3DCubeTexture9::PreLoad"); return VOID_proc(); };
64+
HRESULT xrIDirect3DCubeTexture9::SetPrivateData ( REFGUID refguid,CONST void* pData,DWORD SizeOfData,DWORD Flags) { APIDEBUG("xrIDirect3DCubeTexture9::SetPrivateData"); return S_OK; };
65+
HRESULT xrIDirect3DCubeTexture9::GetPrivateData ( REFGUID refguid,void* pData,DWORD* pSizeOfData) { APIDEBUG("xrIDirect3DCubeTexture9::GetPrivateData"); return S_OK; };
66+
HRESULT xrIDirect3DCubeTexture9::FreePrivateData ( REFGUID refguid) { APIDEBUG("xrIDirect3DCubeTexture9::FreePrivateData"); return S_OK; };
67+
DWORD xrIDirect3DCubeTexture9::SetPriority ( DWORD PriorityNew) { APIDEBUG("xrIDirect3DCubeTexture9::SetPriority"); DWORD old = Priority; Priority = PriorityNew; return old; };
68+
DWORD xrIDirect3DCubeTexture9::GetPriority () { APIDEBUG("xrIDirect3DCubeTexture9::GetPriority"); return Priority; };
69+
void xrIDirect3DCubeTexture9::PreLoad () { APIDEBUG("xrIDirect3DCubeTexture9::PreLoad"); };
7070
D3DRESOURCETYPE xrIDirect3DCubeTexture9::GetType () { APIDEBUG("xrIDirect3DCubeTexture9::GetType"); return D3DRTYPE_TEXTURE; };
71-
DWORD xrIDirect3DCubeTexture9::SetLOD ( DWORD LODNew) { APIDEBUG("xrIDirect3DCubeTexture9::SetLOD"); DWORD old = LOD; LOD = LODNew; return DWORD_Proc(old); };
72-
DWORD xrIDirect3DCubeTexture9::GetLOD () { APIDEBUG("xrIDirect3DCubeTexture9::GetLOD"); return DWORD_Proc(LOD); };
73-
DWORD xrIDirect3DCubeTexture9::GetLevelCount () { APIDEBUG("xrIDirect3DCubeTexture9::GetLevelCount"); return DWORD_Proc(Levels); };
74-
HRESULT xrIDirect3DCubeTexture9::SetAutoGenFilterType ( D3DTEXTUREFILTERTYPE iFilterType) { APIDEBUG("xrIDirect3DCubeTexture9::SetAutoGenFilterType"); FilterType = iFilterType; return HRESULT_Proc(S_OK); };
75-
D3DTEXTUREFILTERTYPE xrIDirect3DCubeTexture9::GetAutoGenFilterType () { APIDEBUG("xrIDirect3DCubeTexture9::GetAutoGenFilterType"); return D3DTEXTUREFILTERTYPE(FilterType); };
76-
void xrIDirect3DCubeTexture9::GenerateMipSubLevels () { APIDEBUG("xrIDirect3DCubeTexture9::GenerateMipSubLevels"); return VOID_proc(); };
71+
DWORD xrIDirect3DCubeTexture9::SetLOD ( DWORD LODNew) { APIDEBUG("xrIDirect3DCubeTexture9::SetLOD"); DWORD old = LOD; LOD = LODNew; return old; };
72+
DWORD xrIDirect3DCubeTexture9::GetLOD () { APIDEBUG("xrIDirect3DCubeTexture9::GetLOD"); return LOD; };
73+
DWORD xrIDirect3DCubeTexture9::GetLevelCount () { APIDEBUG("xrIDirect3DCubeTexture9::GetLevelCount"); return Levels; };
74+
HRESULT xrIDirect3DCubeTexture9::SetAutoGenFilterType ( D3DTEXTUREFILTERTYPE iFilterType) { APIDEBUG("xrIDirect3DCubeTexture9::SetAutoGenFilterType"); FilterType = iFilterType; return S_OK; };
75+
D3DTEXTUREFILTERTYPE xrIDirect3DCubeTexture9::GetAutoGenFilterType () { APIDEBUG("xrIDirect3DCubeTexture9::GetAutoGenFilterType"); return FilterType; };
76+
void xrIDirect3DCubeTexture9::GenerateMipSubLevels () { APIDEBUG("xrIDirect3DCubeTexture9::GenerateMipSubLevels"); };
7777

7878
HRESULT xrIDirect3DCubeTexture9::GetLevelDesc ( UINT Level,D3DSURFACE_DESC *pDesc)
7979
{
@@ -89,7 +89,7 @@ HRESULT xrIDirect3DCubeTexture9::GetLevelDesc ( UINT Level,D3DSURFACE_DESC
8989
pDesc->Width = Width;
9090
pDesc->Height = Height;
9191

92-
return HRESULT_Proc(S_OK);
92+
return S_OK;
9393
};
9494

9595
HRESULT xrIDirect3DCubeTexture9::GetCubeMapSurface( D3DCUBEMAP_FACES FaceType,UINT Level,IDirect3DSurface9** ppCubeMapSurface)
@@ -100,8 +100,8 @@ HRESULT xrIDirect3DCubeTexture9::GetCubeMapSurface( D3DCUBEMAP_FACES FaceTyp
100100
xrIDirect3DSurface9* I = new xrIDirect3DSurface9(m_pIDirect3DDevice9, Width,Height,Format,D3DMULTISAMPLE_TYPE(0),0);
101101
*ppCubeMapSurface = I;
102102

103-
return HRESULT_Proc(S_OK);
103+
return S_OK;
104104
};
105-
HRESULT xrIDirect3DCubeTexture9::LockRect ( D3DCUBEMAP_FACES FaceType, UINT Level,D3DLOCKED_RECT* pLockedRect,CONST RECT* pRect,DWORD Flags) { APIDEBUG("xrIDirect3DCubeTexture9::LockRect"); return HRESULT_Proc(S_OK); };
106-
HRESULT xrIDirect3DCubeTexture9::UnlockRect ( D3DCUBEMAP_FACES FaceType, UINT Level) { APIDEBUG("xrIDirect3DCubeTexture9::UnlockRect"); return HRESULT_Proc(S_OK); };
107-
HRESULT xrIDirect3DCubeTexture9::AddDirtyRect ( D3DCUBEMAP_FACES FaceType, CONST RECT* pDirtyRect) { APIDEBUG("xrIDirect3DCubeTexture9::AddDirtyRect"); return HRESULT_Proc(S_OK); };
105+
HRESULT xrIDirect3DCubeTexture9::LockRect ( D3DCUBEMAP_FACES FaceType, UINT Level,D3DLOCKED_RECT* pLockedRect,CONST RECT* pRect,DWORD Flags) { APIDEBUG("xrIDirect3DCubeTexture9::LockRect"); return S_OK; };
106+
HRESULT xrIDirect3DCubeTexture9::UnlockRect ( D3DCUBEMAP_FACES FaceType, UINT Level) { APIDEBUG("xrIDirect3DCubeTexture9::UnlockRect"); return S_OK; };
107+
HRESULT xrIDirect3DCubeTexture9::AddDirtyRect ( D3DCUBEMAP_FACES FaceType, CONST RECT* pDirtyRect) { APIDEBUG("xrIDirect3DCubeTexture9::AddDirtyRect"); return S_OK; };

0 commit comments

Comments
 (0)