| Index: ddraw/glDirect3DVertexBuffer.cpp |
| — | — | @@ -26,85 +26,109 @@ |
| 27 | 27 |
|
| 28 | 28 | glDirect3DVertexBuffer7::glDirect3DVertexBuffer7(glDirect3D7 *glD3D7, D3DVERTEXBUFFERDESC desc, DWORD flags)
|
| 29 | 29 | {
|
| | 30 | + TRACE_ENTER(4,14,this,14,glD3D7,14,&desc,9,flags);
|
| 30 | 31 | this->glD3D7 = glD3D7;
|
| 31 | 32 | glD3D7->AddRef();
|
| 32 | 33 | refcount = 1;
|
| 33 | 34 | vbdesc = desc;
|
| 34 | 35 | this->flags = flags;
|
| | 36 | + TRACE_EXIT(-1,0);
|
| 35 | 37 | }
|
| 36 | 38 |
|
| 37 | 39 | glDirect3DVertexBuffer7::~glDirect3DVertexBuffer7()
|
| 38 | 40 | {
|
| | 41 | + TRACE_ENTER(1,14,this);
|
| 39 | 42 | glD3D7->Release();
|
| | 43 | + TRACE_EXIT(-1,0);
|
| 40 | 44 | }
|
| 41 | 45 |
|
| 42 | 46 | ULONG WINAPI glDirect3DVertexBuffer7::AddRef()
|
| 43 | 47 | {
|
| 44 | | - if(!this) return 0;
|
| | 48 | + TRACE_ENTER(1,14,this);
|
| | 49 | + if(!this) TRACE_RET(8,0);
|
| 45 | 50 | refcount++;
|
| | 51 | + TRACE_EXIT(8,refcount);
|
| 46 | 52 | return refcount;
|
| 47 | 53 | }
|
| 48 | 54 | ULONG WINAPI glDirect3DVertexBuffer7::Release()
|
| 49 | 55 | {
|
| 50 | | - if(!this) return 0;
|
| | 56 | + TRACE_ENTER(1,14,this);
|
| | 57 | + if(!this) TRACE_RET(8,0);
|
| 51 | 58 | ULONG ret;
|
| 52 | 59 | refcount--;
|
| 53 | 60 | ret = refcount;
|
| 54 | 61 | if(refcount == 0) delete this;
|
| | 62 | + TRACE_EXIT(8,ret);
|
| 55 | 63 | return ret;
|
| 56 | 64 | }
|
| 57 | 65 |
|
| 58 | 66 | HRESULT WINAPI glDirect3DVertexBuffer7::QueryInterface(REFIID riid, void** ppvObj)
|
| 59 | 67 | {
|
| 60 | | - if(!this) return DDERR_INVALIDPARAMS;
|
| 61 | | - if(!ppvObj) return DDERR_INVALIDPARAMS;
|
| | 68 | + TRACE_ENTER(3,14,this,24,&riid,14,ppvObj);
|
| | 69 | + if(!this) TRACE_RET(23,DDERR_INVALIDOBJECT);
|
| | 70 | + if(!ppvObj) TRACE_RET(23,DDERR_INVALIDPARAMS);
|
| 62 | 71 | if(riid == IID_IUnknown)
|
| 63 | 72 | {
|
| 64 | 73 | this->AddRef();
|
| 65 | 74 | *ppvObj = this;
|
| | 75 | + TRACE_VAR("*ppvObj",14,*ppvObj);
|
| | 76 | + TRACE_EXIT(23,D3D_OK);
|
| 66 | 77 | return D3D_OK;
|
| 67 | 78 | }
|
| | 79 | + TRACE_EXIT(23,E_NOINTERFACE);
|
| 68 | 80 | return E_NOINTERFACE;
|
| 69 | 81 | }
|
| 70 | 82 |
|
| 71 | 83 | HRESULT WINAPI glDirect3DVertexBuffer7::GetVertexBufferDesc(LPD3DVERTEXBUFFERDESC lpVBDesc)
|
| 72 | 84 | {
|
| 73 | | - if(!this) return DDERR_INVALIDPARAMS;
|
| 74 | | - if(!lpVBDesc) return DDERR_INVALIDPARAMS;
|
| | 85 | + TRACE_ENTER(2,14,this,14,lpVBDesc);
|
| | 86 | + if(!this) TRACE_RET(23,DDERR_INVALIDOBJECT);
|
| | 87 | + if(!lpVBDesc) TRACE_RET(23,DDERR_INVALIDPARAMS);
|
| 75 | 88 | *lpVBDesc = vbdesc;
|
| | 89 | + TRACE_EXIT(23,D3D_OK);
|
| 76 | 90 | return D3D_OK;
|
| 77 | 91 | }
|
| 78 | 92 |
|
| 79 | 93 | HRESULT WINAPI glDirect3DVertexBuffer7::Lock(DWORD dwFlags, LPVOID* lplpData, LPDWORD lpdwSize)
|
| 80 | 94 | {
|
| 81 | | - if(!this) return DDERR_INVALIDPARAMS;
|
| | 95 | + TRACE_ENTER(4,14,this,9,dwFlags,14,lplpData,14,lpdwSize);
|
| | 96 | + if(!this) TRACE_RET(23,DDERR_INVALIDOBJECT);
|
| 82 | 97 | FIXME("glDirect3DVertexBuffer7::Lock: stub");
|
| | 98 | + TRACE_EXIT(23,DDERR_GENERIC);
|
| 83 | 99 | return DDERR_GENERIC;
|
| 84 | 100 | }
|
| 85 | 101 |
|
| 86 | 102 | HRESULT WINAPI glDirect3DVertexBuffer7::Optimize(LPDIRECT3DDEVICE7 lpD3DDevice, DWORD dwFlags)
|
| 87 | 103 | {
|
| 88 | | - if(!this) return DDERR_INVALIDPARAMS;
|
| | 104 | + TRACE_ENTER(3,14,this,14,lpD3DDevice,9,dwFlags);
|
| | 105 | + if(!this) TRACE_RET(23,DDERR_INVALIDOBJECT);
|
| 89 | 106 | FIXME("glDirect3DVertexBuffer7::Optimize: stub");
|
| | 107 | + TRACE_EXIT(23,DDERR_GENERIC);
|
| 90 | 108 | return DDERR_GENERIC;
|
| 91 | 109 | }
|
| 92 | 110 | HRESULT WINAPI glDirect3DVertexBuffer7::ProcessVertices(DWORD dwVertexOp, DWORD dwDestIndex, DWORD dwCount,
|
| 93 | 111 | LPDIRECT3DVERTEXBUFFER7 lpSrcBuffer, DWORD dwSrcIndex, LPDIRECT3DDEVICE7 lpD3DDevice, DWORD dwFlags)
|
| 94 | 112 | {
|
| 95 | | - if(!this) return DDERR_INVALIDPARAMS;
|
| | 113 | + TRACE_ENTER(8,14,this,9,dwVertexOp,8,dwDestIndex,8,dwCount,14,lpSrcBuffer,8,dwSrcIndex,14,lpD3DDevice,9,dwFlags);
|
| | 114 | + if(!this) TRACE_RET(23,DDERR_INVALIDOBJECT);
|
| 96 | 115 | FIXME("glDirect3DVertexBuffer7::ProcessVertices: stub");
|
| | 116 | + TRACE_EXIT(23,DDERR_GENERIC);
|
| 97 | 117 | return DDERR_GENERIC;
|
| 98 | 118 | }
|
| 99 | 119 | HRESULT WINAPI glDirect3DVertexBuffer7::ProcessVerticesStrided(DWORD dwVertexOp, DWORD dwDestIndex, DWORD dwCount,
|
| 100 | 120 | LPD3DDRAWPRIMITIVESTRIDEDDATA lpVertexArray, DWORD dwSrcIndex, LPDIRECT3DDEVICE7 lpD3DDevice, DWORD dwFlags)
|
| 101 | 121 | {
|
| 102 | | - if(!this) return DDERR_INVALIDPARAMS;
|
| | 122 | + TRACE_ENTER(8,14,this,9,dwVertexOp,8,dwDestIndex,8,dwCount,14,lpVertexArray,8,dwSrcIndex,14,lpD3DDevice,9,dwFlags);
|
| | 123 | + if(!this) TRACE_RET(23,DDERR_INVALIDOBJECT);
|
| 103 | 124 | FIXME("glDirect3DVertexBuffer7::ProcessVerticesStrided: stub");
|
| | 125 | + TRACE_EXIT(23,DDERR_GENERIC);
|
| 104 | 126 | return DDERR_GENERIC;
|
| 105 | 127 | }
|
| 106 | 128 | HRESULT WINAPI glDirect3DVertexBuffer7::Unlock()
|
| 107 | 129 | {
|
| 108 | | - if(!this) return DDERR_INVALIDPARAMS;
|
| | 130 | + TRACE_ENTER(1,14,this);
|
| | 131 | + if(!this) TRACE_RET(23,DDERR_INVALIDOBJECT);
|
| 109 | 132 | FIXME("glDirect3DVertexBuffer7::Unlock: stub");
|
| | 133 | + TRACE_EXIT(23,DDERR_GENERIC);
|
| 110 | 134 | return DDERR_GENERIC;
|
| 111 | 135 | } |
| \ No newline at end of file |
| Index: ddraw |
| Property changes on: ddraw |
| ___________________________________________________________________ |
| Modified: svn:ignore |
| ## -6,3 +6,4 ## |
| 112 | 136 | Release no DXGL |
| 113 | 137 | ddraw.vcxproj.user |
| 114 | 138 | Debug No MSVCRT |
| | 139 | +Debug Trace |
| Index: . |
| Property changes on: . |
| ___________________________________________________________________ |
| Modified: svn:ignore |
| ## -11,3 +11,4 ## |
| 115 | 140 | *.vcxproj.user |
| 116 | 141 | Debug No MSVCRT |
| 117 | 142 | pingme.txt |
| | 143 | +Debug Trace |