| Index: ddraw/glDirect3DMaterial.cpp |
| — | — | @@ -73,7 +73,7 @@ |
| 74 | 74 | }
|
| 75 | 75 | if(riid == IID_IDirect3DMaterial2)
|
| 76 | 76 | {
|
| 77 | | - this - AddRef();
|
| | 77 | + this->AddRef();
|
| 78 | 78 | *ppvObj = glD3DM2;
|
| 79 | 79 | TRACE_VAR("*ppvObj",14,*ppvObj);
|
| 80 | 80 | TRACE_EXIT(23,D3D_OK);
|
| — | — | @@ -81,7 +81,7 @@ |
| 82 | 82 | }
|
| 83 | 83 | if(riid == IID_IDirect3DMaterial)
|
| 84 | 84 | {
|
| 85 | | - this - AddRef();
|
| | 85 | + this->AddRef();
|
| 86 | 86 | *ppvObj = glD3DM1;
|
| 87 | 87 | TRACE_VAR("*ppvObj", 14, *ppvObj);
|
| 88 | 88 | TRACE_EXIT(23, D3D_OK);
|
| — | — | @@ -102,6 +102,7 @@ |
| 103 | 103 |
|
| 104 | 104 | ULONG WINAPI glDirect3DMaterial3::Release()
|
| 105 | 105 | {
|
| | 106 | + TRACE_ENTER(1, 14, this);
|
| 106 | 107 | if(!this) TRACE_RET(ULONG,8,0);
|
| 107 | 108 | ULONG ret;
|
| 108 | 109 | refcount--;
|
| Index: ddraw/glDirectDrawSurface.cpp |
| — | — | @@ -683,7 +683,7 @@ |
| 684 | 684 |
|
| 685 | 685 | HRESULT WINAPI glDirectDrawSurface7::AddAttachedSurface(LPDIRECTDRAWSURFACE7 lpDDSAttachedSurface)
|
| 686 | 686 | {
|
| 687 | | - TRACE_ENTER(2, 14, this, 15, lpDDSAttachedSurface);
|
| | 687 | + TRACE_ENTER(2, 14, this, 14, lpDDSAttachedSurface);
|
| 688 | 688 | if (!this) TRACE_RET(HRESULT, 23, DDERR_INVALIDOBJECT);
|
| 689 | 689 | if (!lpDDSAttachedSurface) TRACE_RET(HRESULT, 23, DDERR_INVALIDPARAMS);
|
| 690 | 690 | LPDIRECTDRAWSURFACE7 dds7;
|
| — | — | @@ -1703,7 +1703,7 @@ |
| 1704 | 1704 | device = glD3DDev7;
|
| 1705 | 1705 | handle = device->AddTexture(this);
|
| 1706 | 1706 | if(handle == -1) TRACE_RET(HRESULT,23,DDERR_OUTOFMEMORY);
|
| 1707 | | - device->AddRef();
|
| | 1707 | + //device->AddRef();
|
| 1708 | 1708 | *lpHandle = handle;
|
| 1709 | 1709 | TRACE_VAR("*lpHandle",9,*lpHandle);
|
| 1710 | 1710 | TRACE_EXIT(23,D3D_OK);
|
| — | — | @@ -1757,7 +1757,7 @@ |
| 1758 | 1758 | }
|
| 1759 | 1759 | HRESULT WINAPI glDirectDrawSurface1::AddAttachedSurface(LPDIRECTDRAWSURFACE lpDDSAttachedSurface)
|
| 1760 | 1760 | {
|
| 1761 | | - TRACE_ENTER(2, 14, this, 15, lpDDSAttachedSurface);
|
| | 1761 | + TRACE_ENTER(2, 14, this, 14, lpDDSAttachedSurface);
|
| 1762 | 1762 | if (!this) TRACE_RET(HRESULT, 23, DDERR_INVALIDOBJECT);
|
| 1763 | 1763 | if (!lpDDSAttachedSurface) TRACE_RET(HRESULT, 23, DDERR_INVALIDPARAMS);
|
| 1764 | 1764 | LPDIRECTDRAWSURFACE7 dds7;
|
| — | — | @@ -2062,7 +2062,7 @@ |
| 2063 | 2063 | }
|
| 2064 | 2064 | HRESULT WINAPI glDirectDrawSurface2::AddAttachedSurface(LPDIRECTDRAWSURFACE2 lpDDSAttachedSurface)
|
| 2065 | 2065 | {
|
| 2066 | | - TRACE_ENTER(2, 14, this, 15, lpDDSAttachedSurface);
|
| | 2066 | + TRACE_ENTER(2, 14, this, 14, lpDDSAttachedSurface);
|
| 2067 | 2067 | if (!this) TRACE_RET(HRESULT, 23, DDERR_INVALIDOBJECT);
|
| 2068 | 2068 | if (!lpDDSAttachedSurface) TRACE_RET(HRESULT, 23, DDERR_INVALIDPARAMS);
|
| 2069 | 2069 | LPDIRECTDRAWSURFACE7 dds7;
|
| — | — | @@ -2391,7 +2391,7 @@ |
| 2392 | 2392 | }
|
| 2393 | 2393 | HRESULT WINAPI glDirectDrawSurface3::AddAttachedSurface(LPDIRECTDRAWSURFACE3 lpDDSAttachedSurface)
|
| 2394 | 2394 | {
|
| 2395 | | - TRACE_ENTER(2, 14, this, 15, lpDDSAttachedSurface);
|
| | 2395 | + TRACE_ENTER(2, 14, this, 14, lpDDSAttachedSurface);
|
| 2396 | 2396 | if (!this) TRACE_RET(HRESULT, 23, DDERR_INVALIDOBJECT);
|
| 2397 | 2397 | if (!lpDDSAttachedSurface) TRACE_RET(HRESULT, 23, DDERR_INVALIDPARAMS);
|
| 2398 | 2398 | LPDIRECTDRAWSURFACE7 dds7;
|
| — | — | @@ -2727,7 +2727,7 @@ |
| 2728 | 2728 | }
|
| 2729 | 2729 | HRESULT WINAPI glDirectDrawSurface4::AddAttachedSurface(LPDIRECTDRAWSURFACE4 lpDDSAttachedSurface)
|
| 2730 | 2730 | {
|
| 2731 | | - TRACE_ENTER(2, 14, this, 15, lpDDSAttachedSurface);
|
| | 2731 | + TRACE_ENTER(2, 14, this, 14, lpDDSAttachedSurface);
|
| 2732 | 2732 | if (!this) TRACE_RET(HRESULT, 23, DDERR_INVALIDOBJECT);
|
| 2733 | 2733 | if (!lpDDSAttachedSurface) TRACE_RET(HRESULT, 23, DDERR_INVALIDPARAMS);
|
| 2734 | 2734 | LPDIRECTDRAWSURFACE7 dds7;
|
| Index: ddraw/trace.c |
| — | — | @@ -947,7 +947,7 @@ |
| 948 | 948 | if(!arg) WriteFile(outfile,"NULL",4,&byteswritten,NULL);
|
| 949 | 949 | else
|
| 950 | 950 | {
|
| 951 | | - WriteFile(outfile,"L\"",1,&byteswritten,NULL);
|
| | 951 | + WriteFile(outfile,"L\"",2,&byteswritten,NULL);
|
| 952 | 952 | buffersize = WideCharToMultiByte(CP_UTF8,0,(wchar_t*)arg,-1,NULL,0,NULL,NULL);
|
| 953 | 953 | mbcsbuffer = (char*)malloc(buffersize);
|
| 954 | 954 | if(!mbcsbuffer) WriteFile(outfile,"OUT OF MEMORY",13,&byteswritten,NULL);
|