| Index: ddraw/glDirectDraw.cpp |
| — | — | @@ -612,7 +612,7 @@ |
| 613 | 613 |
|
| 614 | 614 | HRESULT WINAPI glDirectDraw7::QueryInterface(REFIID riid, void** ppvObj)
|
| 615 | 615 | {
|
| 616 | | - TRACE_ENTER(3,this,24,riid,14,ppvObj);
|
| | 616 | + TRACE_ENTER(3,14,this,24,&riid,14,ppvObj);
|
| 617 | 617 | if(!this) TRACE_RET(23,DDERR_INVALIDOBJECT);
|
| 618 | 618 | if(!ppvObj) TRACE_RET(23,DDERR_INVALIDPARAMS);
|
| 619 | 619 | if(riid == IID_IUnknown)
|
| Index: ddraw/glDirectDrawClipper.cpp |
| — | — | @@ -21,28 +21,37 @@ |
| 22 | 22 |
|
| 23 | 23 | glDirectDrawClipper::glDirectDrawClipper()
|
| 24 | 24 | {
|
| | 25 | + TRACE_ENTER(1,14,this);
|
| 25 | 26 | initialized = false;
|
| 26 | 27 | refcount = 1;
|
| | 28 | + TRACE_EXIT(-1,0);
|
| 27 | 29 | }
|
| 28 | 30 |
|
| 29 | 31 | glDirectDrawClipper::glDirectDrawClipper(DWORD dwFlags, glDirectDraw7 *parent)
|
| 30 | 32 | {
|
| | 33 | + TRACE_ENTER(3,14,this,9,dwFlags,14,parent);
|
| 31 | 34 | initialized = false;
|
| 32 | 35 | refcount = 1;
|
| 33 | 36 | Initialize((LPDIRECTDRAW)parent,dwFlags);
|
| | 37 | + TRACE_EXIT(-1,0);
|
| 34 | 38 | }
|
| 35 | 39 | glDirectDrawClipper::~glDirectDrawClipper()
|
| 36 | 40 | {
|
| | 41 | + TRACE_ENTER(1,14,this);
|
| 37 | 42 | if(glDD7) glDD7->DeleteClipper(this);
|
| | 43 | + TRACE_EXIT(-1,0);
|
| 38 | 44 | }
|
| 39 | 45 | HRESULT WINAPI glDirectDrawClipper::QueryInterface(REFIID riid, LPVOID* obp)
|
| 40 | 46 | {
|
| 41 | | - if(!this) return DDERR_INVALIDPARAMS;
|
| 42 | | - if(!obp) return DDERR_INVALIDPARAMS;
|
| | 47 | + TRACE_ENTER(3,14,this,24,&riid,14,obp);
|
| | 48 | + if(!this) TRACE_RET(23,DDERR_INVALIDOBJECT);
|
| | 49 | + if(!obp) TRACE_RET(23,DDERR_INVALIDPARAMS);
|
| 43 | 50 | if(riid == IID_IUnknown)
|
| 44 | 51 | {
|
| 45 | 52 | this->AddRef();
|
| 46 | 53 | *obp = this;
|
| | 54 | + TRACE_VAR("*obp",14,*obp);
|
| | 55 | + TRACE_EXIT(23,DD_OK);
|
| 47 | 56 | return DD_OK;
|
| 48 | 57 | }
|
| 49 | 58 | if(riid == IID_IDirectDrawClipper)
|
| — | — | @@ -49,42 +58,55 @@ |
| 50 | 59 | {
|
| 51 | 60 | *obp = this;
|
| 52 | 61 | this->AddRef();
|
| 53 | | - return S_OK;
|
| | 62 | + TRACE_VAR("*obp",14,*obp);
|
| | 63 | + TRACE_EXIT(23,DD_OK);
|
| | 64 | + return DD_OK;
|
| 54 | 65 | }
|
| | 66 | + TRACE_EXIT(23,E_NOINTERFACE);
|
| 55 | 67 | return E_NOINTERFACE;
|
| 56 | 68 | }
|
| 57 | 69 | ULONG WINAPI glDirectDrawClipper::AddRef()
|
| 58 | 70 | {
|
| 59 | | - if(!this) return 0;
|
| | 71 | + TRACE_ENTER(1,14,this);
|
| | 72 | + if(!this) TRACE_RET(8,0);
|
| 60 | 73 | refcount++;
|
| | 74 | + TRACE_EXIT(8,refcount);
|
| 61 | 75 | return refcount;
|
| 62 | 76 | }
|
| 63 | 77 | ULONG WINAPI glDirectDrawClipper::Release()
|
| 64 | 78 | {
|
| 65 | | - if(!this) return 0;
|
| | 79 | + TRACE_ENTER(1,14,this);
|
| | 80 | + if(!this) TRACE_RET(8,0);
|
| 66 | 81 | ULONG ret;
|
| 67 | 82 | refcount--;
|
| 68 | 83 | ret = refcount;
|
| 69 | 84 | if(refcount == 0) delete this;
|
| | 85 | + TRACE_EXIT(8,ret);
|
| 70 | 86 | return ret;
|
| 71 | 87 | }
|
| 72 | 88 | HRESULT WINAPI glDirectDrawClipper::GetClipList(LPRECT lpRect, LPRGNDATA lpClipList, LPDWORD lpdwSize)
|
| 73 | 89 | {
|
| 74 | | - if(!this) return DDERR_INVALIDPARAMS;
|
| | 90 | + TRACE_ENTER(4,14,this,26,lpRect,14,lpClipList,14,lpdwSize);
|
| | 91 | + if(!this) TRACE_RET(23,DDERR_INVALIDOBJECT);
|
| 75 | 92 | FIXME("IDirectDrawClipper::GetClipList: stub");
|
| | 93 | + TRACE_EXIT(23,DDERR_GENERIC);
|
| 76 | 94 | ERR(DDERR_GENERIC);
|
| 77 | 95 | }
|
| 78 | 96 | HRESULT WINAPI glDirectDrawClipper::GetHWnd(HWND FAR *lphWnd)
|
| 79 | 97 | {
|
| 80 | | - if(!this) return DDERR_INVALIDPARAMS;
|
| | 98 | + TRACE_ENTER(2,14,this,14,lphWnd);
|
| | 99 | + if(!this) TRACE_RET(23,DDERR_INVALIDOBJECT);
|
| | 100 | + if(!hWnd) TRACE_RET(23,DDERR_NOHWND);
|
| 81 | 101 | *lphWnd = hWnd;
|
| 82 | | - if(!hWnd) return DDERR_INVALIDOBJECT;
|
| | 102 | + TRACE_VAR("*lphWnd",13,*lphWnd);
|
| | 103 | + TRACE_EXIT(23,DD_OK);
|
| 83 | 104 | return DD_OK;
|
| 84 | 105 | }
|
| 85 | 106 | HRESULT WINAPI glDirectDrawClipper::Initialize(LPDIRECTDRAW lpDD, DWORD dwFlags)
|
| 86 | 107 | {
|
| 87 | | - if(!this) return DDERR_INVALIDPARAMS;
|
| 88 | | - if(initialized) return DDERR_ALREADYINITIALIZED;
|
| | 108 | + TRACE_ENTER(3,14,this,14,lpDD,9,dwFlags);
|
| | 109 | + if(!this) TRACE_RET(23,DDERR_INVALIDOBJECT);
|
| | 110 | + if(initialized) TRACE_RET(23,DDERR_ALREADYINITIALIZED);
|
| 89 | 111 | glDD7 = (glDirectDraw7*)lpDD;
|
| 90 | 112 | if(glDD7) hasparent = true;
|
| 91 | 113 | else hasparent = false;
|
| — | — | @@ -91,23 +113,30 @@ |
| 92 | 114 | hWnd = NULL;
|
| 93 | 115 | refcount = 1;
|
| 94 | 116 | initialized = true;
|
| | 117 | + TRACE_EXIT(23,DD_OK);
|
| 95 | 118 | return DD_OK;
|
| 96 | 119 | }
|
| 97 | 120 | HRESULT WINAPI glDirectDrawClipper::IsClipListChanged(BOOL FAR *lpbChanged)
|
| 98 | 121 | {
|
| 99 | | - if(!this) return DDERR_INVALIDPARAMS;
|
| | 122 | + TRACE_ENTER(2,14,this,14,lpbChanged);
|
| | 123 | + if(!this) TRACE_RET(23,DDERR_INVALIDOBJECT);
|
| 100 | 124 | FIXME("IDirectDrawClipper::IsClipListChanged: stub");
|
| | 125 | + TRACE_EXIT(23,DDERR_GENERIC);
|
| 101 | 126 | ERR(DDERR_GENERIC);
|
| 102 | 127 | }
|
| 103 | 128 | HRESULT WINAPI glDirectDrawClipper::SetClipList(LPRGNDATA lpClipList, DWORD dwFlags)
|
| 104 | 129 | {
|
| 105 | | - if(!this) return DDERR_INVALIDPARAMS;
|
| | 130 | + TRACE_ENTER(3,14,this,14,lpClipList,9,dwFlags);
|
| | 131 | + if(!this) TRACE_RET(23,DDERR_INVALIDOBJECT);
|
| 106 | 132 | FIXME("IDirectDrawClipper::SetClipList: stub");
|
| | 133 | + TRACE_EXIT(23,DDERR_GENERIC);
|
| 107 | 134 | ERR(DDERR_GENERIC);
|
| 108 | 135 | }
|
| 109 | 136 | HRESULT WINAPI glDirectDrawClipper::SetHWnd(DWORD dwFlags, HWND hWnd)
|
| 110 | 137 | {
|
| 111 | | - if(!this) return DDERR_INVALIDPARAMS;
|
| | 138 | + TRACE_ENTER(3,14,this,9,dwFlags,13,hWnd);
|
| | 139 | + if(!this) TRACE_RET(23,DDERR_INVALIDOBJECT);
|
| 112 | 140 | this->hWnd = hWnd;
|
| | 141 | + TRACE_EXIT(23,DD_OK);
|
| 113 | 142 | return DD_OK;
|
| 114 | 143 | }
|