March 2009 - Wine-Commits - list.winehq.org

Henri Verbeet : d3d10core: Only destroy the device when it doesn' t have any references left.
by Alexandre Julliard March 23, 2009

March 23, 2009

Module: wine Branch: master Commit: 27a6bb5f081c6f1b5c48f2346ee6d35a138ba776 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27a6bb5f081c6f1b5c48f2346… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 23 08:30:17 2009 +0100 d3d10core: Only destroy the device when it doesn't have any references left. --- dlls/d3d10core/device.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 1406c38..7320f92 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -75,7 +75,10 @@ static ULONG STDMETHODCALLTYPE d3d10_device_inner_Release(IUnknown *iface) TRACE("%p decreasing refcount to %u\n", This, refcount); - if (This->wined3d_device) IWineD3DDevice_Release(This->wined3d_device); + if (!refcount) + { + if (This->wined3d_device) IWineD3DDevice_Release(This->wined3d_device); + } return refcount; }

1 0

Henri Verbeet : d3d8: Fix locking.
by Alexandre Julliard March 23, 2009

March 23, 2009

Module: wine Branch: master Commit: 775ea907a3ff9ca1bf420272d722758ae8fadce5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=775ea907a3ff9ca1bf420272d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 23 08:30:16 2009 +0100 d3d8: Fix locking. --- dlls/d3d8/device.c | 19 +++++-------------- dlls/d3d8/directx.c | 4 ++++ dlls/d3d8/pixelshader.c | 2 ++ dlls/d3d8/stateblock.c | 28 ++++++++++++++++++++++++---- dlls/d3d8/vertexdeclaration.c | 2 ++ dlls/d3d8/vertexshader.c | 7 ++++++- 6 files changed, 43 insertions(+), 19 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index d5f71fc..119d33d 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -820,10 +820,11 @@ static HRESULT IDirect3DDevice8Impl_CreateSurface(LPDIRECT3DDEVICE8 iface, UINT TRACE("(%p) : w(%d) h(%d) fmt(%d) surf@%p\n", This, Width, Height, Format, *ppSurface); - /* Not called from the VTable, no locking needed */ + EnterCriticalSection(&d3d8_cs); hrc = IWineD3DDevice_CreateSurface(This->WineD3DDevice, Width, Height, wined3dformat_from_d3dformat(Format), Lockable, Discard, Level, &object->wineD3DSurface, Type, Usage & WINED3DUSAGE_MASK, (WINED3DPOOL)Pool, MultiSample,MultisampleQuality, NULL, SURFACE_OPENGL, (IUnknown *)object); + LeaveCriticalSection(&d3d8_cs); if (hrc != D3D_OK || NULL == object->wineD3DSurface) { /* free up object */ FIXME("(%p) call to IWineD3DDevice_CreateSurface failed\n", This); @@ -841,9 +842,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CreateRenderTarget(LPDIRECT3DDEVICE8 HRESULT hr; TRACE("Relay\n"); - EnterCriticalSection(&d3d8_cs); hr = IDirect3DDevice8Impl_CreateSurface(iface, Width, Height, Format, Lockable, FALSE /* Discard */, 0 /* Level */ , ppSurface, D3DRTYPE_SURFACE, D3DUSAGE_RENDERTARGET, D3DPOOL_DEFAULT, MultiSample, 0); - LeaveCriticalSection(&d3d8_cs); return hr; } @@ -852,11 +851,9 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CreateDepthStencilSurface(LPDIRECT3DD TRACE("Relay\n"); /* TODO: Verify that Discard is false */ - EnterCriticalSection(&d3d8_cs); hr = IDirect3DDevice8Impl_CreateSurface(iface, Width, Height, Format, TRUE /* Lockable */, FALSE, 0 /* Level */ ,ppSurface, D3DRTYPE_SURFACE, D3DUSAGE_DEPTHSTENCIL, D3DPOOL_DEFAULT, MultiSample, 0); - LeaveCriticalSection(&d3d8_cs); return hr; } @@ -865,10 +862,8 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CreateImageSurface(LPDIRECT3DDEVICE8 HRESULT hr; TRACE("Relay\n"); - EnterCriticalSection(&d3d8_cs); hr = IDirect3DDevice8Impl_CreateSurface(iface, Width, Height, Format, TRUE /* Loackable */ , FALSE /*Discard*/ , 0 /* Level */ , ppSurface, D3DRTYPE_SURFACE, 0 /* Usage (undefined/none) */ , D3DPOOL_SYSTEMMEM, D3DMULTISAMPLE_NONE, 0 /* MultisampleQuality */); - LeaveCriticalSection(&d3d8_cs); return hr; } @@ -894,13 +889,13 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CopyRects(LPDIRECT3DDEVICE8 iface, ID winedesc.Width = &srcWidth; winedesc.Height = &srcHeight; winedesc.Size = &srcSize; + EnterCriticalSection(&d3d8_cs); IWineD3DSurface_GetDesc(Source->wineD3DSurface, &winedesc); winedesc.Format = &destFormat; winedesc.Width = &destWidth; winedesc.Height = &destHeight; winedesc.Size = NULL; - EnterCriticalSection(&d3d8_cs); IWineD3DSurface_GetDesc(Dest->wineD3DSurface, &winedesc); /* Check that the source and destination formats match */ @@ -1759,16 +1754,15 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CreateVertexShader(LPDIRECT3DDEVICE8 object->ref = 1; object->lpVtbl = &Direct3DVertexShader8_Vtbl; - EnterCriticalSection(&d3d8_cs); hrc = IDirect3DDevice8Impl_CreateVertexDeclaration(iface, pDeclaration, &object->vertex_declaration); if (FAILED(hrc)) { ERR("(%p) : IDirect3DDeviceImpl_CreateVertexDeclaration call failed\n", This); - LeaveCriticalSection(&d3d8_cs); HeapFree(GetProcessHeap(), 0, object); *ppShader = 0; return D3DERR_INVALIDCALL; } + EnterCriticalSection(&d3d8_cs); handle = d3d8_allocate_handle(&This->handle_table, object); if (handle == D3D8_INVALID_HANDLE) { @@ -2023,10 +2017,10 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetVertexShaderDeclaration(LPDIRECT3D EnterCriticalSection(&d3d8_cs); shader = d3d8_get_object(&This->handle_table, pVertexShader - (VS_HIGHESTFIXEDFXF + 1)); + LeaveCriticalSection(&d3d8_cs); if (!shader) { WARN("Invalid handle (%#x) passed.\n", pVertexShader); - LeaveCriticalSection(&d3d8_cs); return D3DERR_INVALIDCALL; } declaration = (IDirect3DVertexDeclaration8Impl *)shader->vertex_declaration; @@ -2034,7 +2028,6 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetVertexShaderDeclaration(LPDIRECT3D /* If pData is NULL, we just return the required size of the buffer. */ if (!pData) { *pSizeOfData = declaration->elements_size; - LeaveCriticalSection(&d3d8_cs); return D3D_OK; } @@ -2042,12 +2035,10 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetVertexShaderDeclaration(LPDIRECT3D * we should write the required size and return D3DERR_MOREDATA. * That's not actually true. */ if (*pSizeOfData < declaration->elements_size) { - LeaveCriticalSection(&d3d8_cs); return D3DERR_INVALIDCALL; } CopyMemory(pData, declaration->elements, declaration->elements_size); - LeaveCriticalSection(&d3d8_cs); return D3D_OK; } diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index b87b26d..45d914b 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -71,7 +71,9 @@ static ULONG WINAPI IDirect3D8Impl_Release(LPDIRECT3D8 iface) { if (ref == 0) { TRACE("Releasing wined3d %p\n", This->WineD3D); + EnterCriticalSection(&d3d8_cs); IWineD3D_Release(This->WineD3D); + LeaveCriticalSection(&d3d8_cs); HeapFree(GetProcessHeap(), 0, This); } @@ -389,7 +391,9 @@ static HRESULT WINAPI IDirect3D8Impl_CreateDevice(LPDIRECT3D8 iface, UINT Adapte object->decls = HeapAlloc(GetProcessHeap(), 0, object->declArraySize * sizeof(*object->decls)); if(!object->decls) { ERR("Out of memory\n"); + EnterCriticalSection(&d3d8_cs); IWineD3DDevice_Release(object->WineD3DDevice); + LeaveCriticalSection(&d3d8_cs); HeapFree(GetProcessHeap(), 0, object); *ppReturnedDeviceInterface = NULL; hr = E_OUTOFMEMORY; diff --git a/dlls/d3d8/pixelshader.c b/dlls/d3d8/pixelshader.c index 5cfb0ca..ae8d15f 100644 --- a/dlls/d3d8/pixelshader.c +++ b/dlls/d3d8/pixelshader.c @@ -56,7 +56,9 @@ static ULONG WINAPI IDirect3DPixelShader8Impl_Release(IDirect3DPixelShader8 * if TRACE("(%p) : ReleaseRef to %d\n", This, ref); if (ref == 0) { + EnterCriticalSection(&d3d8_cs); IWineD3DPixelShader_Release(This->wineD3DPixelShader); + LeaveCriticalSection(&d3d8_cs); HeapFree(GetProcessHeap(), 0, This); } return ref; diff --git a/dlls/d3d8/stateblock.c b/dlls/d3d8/stateblock.c index cb9958a..ace9211 100644 --- a/dlls/d3d8/stateblock.c +++ b/dlls/d3d8/stateblock.c @@ -58,7 +58,9 @@ static ULONG WINAPI IDirect3DStateBlock8Impl_Release(IDirect3DStateBlock8 *iface TRACE("(%p) : ReleaseRef to %d\n", This, ref); if (ref == 0) { + EnterCriticalSection(&d3d8_cs); IWineD3DStateBlock_Release(This->wineD3DStateBlock); + LeaveCriticalSection(&d3d8_cs); HeapFree(GetProcessHeap(), 0, This); } return ref; @@ -88,14 +90,32 @@ static HRESULT WINAPI IDirect3DStateBlock8Impl_GetDevice(IDirect3DStateBlock8 *i static HRESULT WINAPI IDirect3DStateBlock8Impl_Capture(IDirect3DStateBlock8 *iface) { IDirect3DStateBlock8Impl *This = (IDirect3DStateBlock8Impl *)iface; - TRACE("(%p) Relay\n", This); - return IWineD3DStateBlock_Capture(This->wineD3DStateBlock); + HRESULT hr; + + TRACE("(%p) Relay\n", This); + + EnterCriticalSection(&d3d8_cs); + + hr = IWineD3DStateBlock_Capture(This->wineD3DStateBlock); + + LeaveCriticalSection(&d3d8_cs); + + return hr; } static HRESULT WINAPI IDirect3DStateBlock8Impl_Apply(IDirect3DStateBlock8 *iface) { IDirect3DStateBlock8Impl *This = (IDirect3DStateBlock8Impl *)iface; - TRACE("(%p) Relay\n", This); - return IWineD3DStateBlock_Apply(This->wineD3DStateBlock); + HRESULT hr; + + TRACE("(%p) Relay\n", This); + + EnterCriticalSection(&d3d8_cs); + + hr = IWineD3DStateBlock_Apply(This->wineD3DStateBlock); + + LeaveCriticalSection(&d3d8_cs); + + return hr; } const IDirect3DStateBlock8Vtbl Direct3DStateBlock8_Vtbl = diff --git a/dlls/d3d8/vertexdeclaration.c b/dlls/d3d8/vertexdeclaration.c index debeca0..46957d0 100644 --- a/dlls/d3d8/vertexdeclaration.c +++ b/dlls/d3d8/vertexdeclaration.c @@ -61,7 +61,9 @@ static ULONG WINAPI IDirect3DVertexDeclaration8Impl_Release(IDirect3DVertexDecla TRACE("(%p) : Releasing to %d\n", This, ref_count); if (!ref_count) { + EnterCriticalSection(&d3d8_cs); IWineD3DVertexDeclaration_Release(This->wined3d_vertex_declaration); + LeaveCriticalSection(&d3d8_cs); HeapFree(GetProcessHeap(), 0, This->elements); HeapFree(GetProcessHeap(), 0, This); } diff --git a/dlls/d3d8/vertexshader.c b/dlls/d3d8/vertexshader.c index 8cd822b..4ea8b52 100644 --- a/dlls/d3d8/vertexshader.c +++ b/dlls/d3d8/vertexshader.c @@ -57,7 +57,12 @@ static ULONG WINAPI IDirect3DVertexShader8Impl_Release(IDirect3DVertexShader8 *i if (ref == 0) { IDirect3DVertexDeclaration8_Release(This->vertex_declaration); - if (This->wineD3DVertexShader) IWineD3DVertexShader_Release(This->wineD3DVertexShader); + if (This->wineD3DVertexShader) + { + EnterCriticalSection(&d3d8_cs); + IWineD3DVertexShader_Release(This->wineD3DVertexShader); + LeaveCriticalSection(&d3d8_cs); + } HeapFree(GetProcessHeap(), 0, This); } return ref;

1 0

Henri Verbeet : d3d8: Get rid of resource.c.
by Alexandre Julliard March 23, 2009

March 23, 2009

Module: wine Branch: master Commit: 72b53787582dbeb31bf090aab360e65c722f3cd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72b53787582dbeb31bf090aab… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 23 08:30:16 2009 +0100 d3d8: Get rid of resource.c. --- dlls/d3d8/Makefile.in | 1 - dlls/d3d8/cubetexture.c | 8 +++- dlls/d3d8/d3d8_private.h | 1 - dlls/d3d8/indexbuffer.c | 8 +++- dlls/d3d8/resource.c | 133 --------------------------------------------- dlls/d3d8/stateblock.c | 19 ++++++- dlls/d3d8/surface.c | 8 +++- dlls/d3d8/texture.c | 8 +++- dlls/d3d8/vertexbuffer.c | 8 +++- dlls/d3d8/volumetexture.c | 8 +++- 10 files changed, 59 insertions(+), 143 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=72b53787582dbeb31bf09…

1 0

Henri Verbeet : d3d9: Get rid of basetexture.c.
by Alexandre Julliard March 23, 2009

March 23, 2009

Module: wine Branch: master Commit: 82dd5bc2a107fbe8baa4ea7e421d63a502dc06d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82dd5bc2a107fbe8baa4ea7e4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 23 08:30:16 2009 +0100 d3d9: Get rid of basetexture.c. --- dlls/d3d9/Makefile.in | 1 - dlls/d3d9/basetexture.c | 172 ---------------------------------------------- dlls/d3d9/cubetexture.c | 2 +- dlls/d3d9/d3d9_private.h | 2 - 4 files changed, 1 insertions(+), 176 deletions(-) diff --git a/dlls/d3d9/Makefile.in b/dlls/d3d9/Makefile.in index f581b68..a9ec68d 100644 --- a/dlls/d3d9/Makefile.in +++ b/dlls/d3d9/Makefile.in @@ -7,7 +7,6 @@ IMPORTLIB = d3d9 IMPORTS = dxguid uuid wined3d kernel32 C_SRCS = \ - basetexture.c \ cubetexture.c \ d3d9_main.c \ device.c \ diff --git a/dlls/d3d9/basetexture.c b/dlls/d3d9/basetexture.c deleted file mode 100644 index b349f51..0000000 --- a/dlls/d3d9/basetexture.c +++ /dev/null @@ -1,172 +0,0 @@ -/* - * IDirect3DBaseTexture9 implementation - * - * Copyright 2002-2004 Jason Edmeades - * Raphael Junqueira - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "config.h" -#include "d3d9_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(d3d9); - -/* IDirect3DBaseTexture9 IUnknown parts follow: */ -static HRESULT WINAPI IDirect3DBaseTexture9Impl_QueryInterface(LPDIRECT3DBASETEXTURE9 iface, REFIID riid, LPVOID* ppobj) { - IDirect3DBaseTexture9Impl *This = (IDirect3DBaseTexture9Impl *)iface; - TRACE("(%p) Relay\n" , This); - if (IsEqualGUID(riid, &IID_IUnknown) - || IsEqualGUID(riid, &IID_IDirect3DResource9) - || IsEqualGUID(riid, &IID_IDirect3DBaseTexture9)) { - IDirect3DBaseTexture9_AddRef(iface); - *ppobj = This; - return S_OK; - } - - WARN("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), ppobj); - *ppobj = NULL; - return E_NOINTERFACE; -} - -static ULONG WINAPI IDirect3DBaseTexture9Impl_AddRef(LPDIRECT3DBASETEXTURE9 iface) { - IDirect3DBaseTexture9Impl *This = (IDirect3DBaseTexture9Impl *)iface; - ULONG ref = InterlockedIncrement(&This->ref); - - TRACE("(%p) : AddRef from %d\n", This, ref - 1); - - return ref; -} - -static ULONG WINAPI IDirect3DBaseTexture9Impl_Release(LPDIRECT3DBASETEXTURE9 iface) { - IDirect3DBaseTexture9Impl *This = (IDirect3DBaseTexture9Impl *)iface; - ULONG ref = InterlockedDecrement(&This->ref); - - TRACE("(%p) : ReleaseRef to %d\n", This, ref); - - if (ref == 0) { - IWineD3DBaseTexture_Release(This->wineD3DBaseTexture); - HeapFree(GetProcessHeap(), 0, This); - } - return ref; -} - -/* IDirect3DBaseTexture9 IDirect3DResource9 Interface follow: */ -static HRESULT WINAPI IDirect3DBaseTexture9Impl_GetDevice(LPDIRECT3DBASETEXTURE9 iface, IDirect3DDevice9** ppDevice) { - IDirect3DBaseTexture9Impl *This = (IDirect3DBaseTexture9Impl *)iface; - TRACE("(%p) Relay\n" , This); - return IDirect3DResource9Impl_GetDevice((LPDIRECT3DRESOURCE9) This, ppDevice); -} - -static HRESULT WINAPI IDirect3DBaseTexture9Impl_SetPrivateData(LPDIRECT3DBASETEXTURE9 iface, REFGUID refguid, CONST void* pData, DWORD SizeOfData, DWORD Flags) { - IDirect3DBaseTexture9Impl *This = (IDirect3DBaseTexture9Impl *)iface; - TRACE("(%p) Relay\n" , This); - return IWineD3DBaseTexture_SetPrivateData(This->wineD3DBaseTexture, refguid, pData, SizeOfData, Flags); -} - -static HRESULT WINAPI IDirect3DBaseTexture9Impl_GetPrivateData(LPDIRECT3DBASETEXTURE9 iface, REFGUID refguid, void* pData, DWORD* pSizeOfData) { - IDirect3DBaseTexture9Impl *This = (IDirect3DBaseTexture9Impl *)iface; - TRACE("(%p) Relay\n" , This); - return IWineD3DBaseTexture_GetPrivateData(This->wineD3DBaseTexture, refguid, pData, pSizeOfData); -} - -static HRESULT WINAPI IDirect3DBaseTexture9Impl_FreePrivateData(LPDIRECT3DBASETEXTURE9 iface, REFGUID refguid) { - IDirect3DBaseTexture9Impl *This = (IDirect3DBaseTexture9Impl *)iface; - TRACE("(%p) Relay\n" , This); - return IWineD3DBaseTexture_FreePrivateData(This->wineD3DBaseTexture, refguid); -} - -static DWORD WINAPI IDirect3DBaseTexture9Impl_SetPriority(LPDIRECT3DBASETEXTURE9 iface, DWORD PriorityNew) { - IDirect3DBaseTexture9Impl *This = (IDirect3DBaseTexture9Impl *)iface; - TRACE("(%p) Relay\n" , This); - return IWineD3DBaseTexture_SetPriority(This->wineD3DBaseTexture, PriorityNew); -} - -static DWORD WINAPI IDirect3DBaseTexture9Impl_GetPriority(LPDIRECT3DBASETEXTURE9 iface) { - IDirect3DBaseTexture9Impl *This = (IDirect3DBaseTexture9Impl *)iface; - TRACE("(%p) Relay\n" , This); - return IWineD3DBaseTexture_GetPriority(This->wineD3DBaseTexture); -} - -static void WINAPI IDirect3DBaseTexture9Impl_PreLoad(LPDIRECT3DBASETEXTURE9 iface) { - IDirect3DBaseTexture9Impl *This = (IDirect3DBaseTexture9Impl *)iface; - TRACE("(%p) Relay\n" , This); - IWineD3DBaseTexture_PreLoad(This->wineD3DBaseTexture); - return ; -} - -static D3DRESOURCETYPE WINAPI IDirect3DBaseTexture9Impl_GetType(LPDIRECT3DBASETEXTURE9 iface) { - IDirect3DBaseTexture9Impl *This = (IDirect3DBaseTexture9Impl *)iface; - TRACE("(%p) Relay\n" , This); - return IWineD3DBaseTexture_GetType(This->wineD3DBaseTexture); -} - -/* IDirect3DBaseTexture9 Interface follow: */ -static DWORD WINAPI IDirect3DBaseTexture9Impl_SetLOD(LPDIRECT3DBASETEXTURE9 iface, DWORD LODNew) { - IDirect3DBaseTexture9Impl *This = (IDirect3DBaseTexture9Impl *)iface; - TRACE("(%p) Relay\n" , This); - return IWineD3DBaseTexture_SetLOD(This->wineD3DBaseTexture, LODNew); -} - -DWORD WINAPI IDirect3DBaseTexture9Impl_GetLOD(LPDIRECT3DBASETEXTURE9 iface) { - IDirect3DBaseTexture9Impl *This = (IDirect3DBaseTexture9Impl *)iface; - TRACE("(%p) Relay\n" , This); - return IWineD3DBaseTexture_GetLOD(This->wineD3DBaseTexture); -} - -static DWORD WINAPI IDirect3DBaseTexture9Impl_GetLevelCount(LPDIRECT3DBASETEXTURE9 iface) { - IDirect3DBaseTexture9Impl *This = (IDirect3DBaseTexture9Impl *)iface; - TRACE("(%p) Relay\n" , This); - return IWineD3DBaseTexture_GetLevelCount(This->wineD3DBaseTexture); -} - -static HRESULT WINAPI IDirect3DBaseTexture9Impl_SetAutoGenFilterType(LPDIRECT3DBASETEXTURE9 iface, D3DTEXTUREFILTERTYPE FilterType) { - IDirect3DBaseTexture9Impl *This = (IDirect3DBaseTexture9Impl *)iface; - TRACE("(%p) Relay\n" , This); - return IWineD3DBaseTexture_SetAutoGenFilterType(This->wineD3DBaseTexture, (WINED3DTEXTUREFILTERTYPE) FilterType); -} - -static D3DTEXTUREFILTERTYPE WINAPI IDirect3DBaseTexture9Impl_GetAutoGenFilterType(LPDIRECT3DBASETEXTURE9 iface) { - IDirect3DBaseTexture9Impl *This = (IDirect3DBaseTexture9Impl *)iface; - TRACE("(%p) Relay\n" , This); - return (D3DTEXTUREFILTERTYPE) IWineD3DBaseTexture_GetAutoGenFilterType(This->wineD3DBaseTexture); -} - -static void WINAPI IDirect3DBaseTexture9Impl_GenerateMipSubLevels(LPDIRECT3DBASETEXTURE9 iface) { - IDirect3DBaseTexture9Impl *This = (IDirect3DBaseTexture9Impl *)iface; - TRACE("(%p) Relay\n" , This); - IWineD3DBaseTexture_GenerateMipSubLevels(This->wineD3DBaseTexture); -} - -const IDirect3DBaseTexture9Vtbl Direct3DBaseTexture9_Vtbl = -{ - IDirect3DBaseTexture9Impl_QueryInterface, - IDirect3DBaseTexture9Impl_AddRef, - IDirect3DBaseTexture9Impl_Release, - IDirect3DBaseTexture9Impl_GetDevice, - IDirect3DBaseTexture9Impl_SetPrivateData, - IDirect3DBaseTexture9Impl_GetPrivateData, - IDirect3DBaseTexture9Impl_FreePrivateData, - IDirect3DBaseTexture9Impl_SetPriority, - IDirect3DBaseTexture9Impl_GetPriority, - IDirect3DBaseTexture9Impl_PreLoad, - IDirect3DBaseTexture9Impl_GetType, - IDirect3DBaseTexture9Impl_SetLOD, - IDirect3DBaseTexture9Impl_GetLOD, - IDirect3DBaseTexture9Impl_GetLevelCount, - IDirect3DBaseTexture9Impl_SetAutoGenFilterType, - IDirect3DBaseTexture9Impl_GetAutoGenFilterType, - IDirect3DBaseTexture9Impl_GenerateMipSubLevels -}; diff --git a/dlls/d3d9/cubetexture.c b/dlls/d3d9/cubetexture.c index 430d5de..77a5070 100644 --- a/dlls/d3d9/cubetexture.c +++ b/dlls/d3d9/cubetexture.c @@ -176,7 +176,7 @@ static DWORD WINAPI IDirect3DCubeTexture9Impl_GetLOD(LPDIRECT3DCUBETEXTURE9 ifac TRACE("(%p) Relay\n", This); EnterCriticalSection(&d3d9_cs); - ret = IDirect3DBaseTexture9Impl_GetLOD((LPDIRECT3DBASETEXTURE9) This); + ret = IWineD3DCubeTexture_GetLOD(This->wineD3DCubeTexture); LeaveCriticalSection(&d3d9_cs); return ret; } diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 2a4b10d..1885ead 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -389,8 +389,6 @@ typedef struct IDirect3DBaseTexture9Impl } IDirect3DBaseTexture9Impl; -extern DWORD WINAPI IDirect3DBaseTexture9Impl_GetLOD(LPDIRECT3DBASETEXTURE9 iface); - /* --------------------- */ /* IDirect3DCubeTexture9 */ /* --------------------- */

1 0

Henri Verbeet : d3d9: Get rid of resource.c.
by Alexandre Julliard March 23, 2009

March 23, 2009

Module: wine Branch: master Commit: 435b528e8314ce878eead89901a058915bbae347 URL: http://source.winehq.org/git/wine.git/?a=commit;h=435b528e8314ce878eead8990… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 23 08:30:16 2009 +0100 d3d9: Get rid of resource.c. --- dlls/d3d9/Makefile.in | 1 - dlls/d3d9/cubetexture.c | 8 ++- dlls/d3d9/d3d9_private.h | 20 ------- dlls/d3d9/indexbuffer.c | 8 ++- dlls/d3d9/resource.c | 135 --------------------------------------------- dlls/d3d9/stateblock.c | 8 ++- dlls/d3d9/surface.c | 8 ++- dlls/d3d9/texture.c | 8 ++- dlls/d3d9/vertexbuffer.c | 8 ++- dlls/d3d9/volumetexture.c | 15 +++++- 10 files changed, 56 insertions(+), 163 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=435b528e8314ce878eead…

1 0

Henri Verbeet : d3d9: Fix locking.
by Alexandre Julliard March 23, 2009

March 23, 2009

Module: wine Branch: master Commit: fd3d769a12b018a29ccdcc4779f2f227d4a41904 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd3d769a12b018a29ccdcc477… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 23 08:30:16 2009 +0100 d3d9: Fix locking. It appears there are some calls to wined3d missing critical sections. --- dlls/d3d9/device.c | 35 +++++---- dlls/d3d9/directx.c | 3 + dlls/d3d9/indexbuffer.c | 2 + dlls/d3d9/pixelshader.c | 9 ++- dlls/d3d9/swapchain.c | 9 ++- dlls/d3d9/vertexbuffer.c | 9 ++- dlls/d3d9/volume.c | 69 ++++++++++++++++- dlls/d3d9/volumetexture.c | 184 +++++++++++++++++++++++++++++++++++++++++---- 8 files changed, 283 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fd3d769a12b018a29ccdc…

1 0

Henri Verbeet : d3d8: Get rid of basetexture.c.
by Alexandre Julliard March 23, 2009

March 23, 2009

Module: wine Branch: master Commit: 7c0931b7c2beccb73d7a1674ca2414d717684130 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c0931b7c2beccb73d7a1674c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 23 08:30:16 2009 +0100 d3d8: Get rid of basetexture.c. --- dlls/d3d8/Makefile.in | 1 - dlls/d3d8/basetexture.c | 164 ----------------------------------------------- 2 files changed, 0 insertions(+), 165 deletions(-) diff --git a/dlls/d3d8/Makefile.in b/dlls/d3d8/Makefile.in index 11a46fc..3d6c3cf 100644 --- a/dlls/d3d8/Makefile.in +++ b/dlls/d3d8/Makefile.in @@ -7,7 +7,6 @@ IMPORTLIB = d3d8 IMPORTS = dxguid uuid wined3d kernel32 C_SRCS = \ - basetexture.c \ cubetexture.c \ d3d8_main.c \ device.c \ diff --git a/dlls/d3d8/basetexture.c b/dlls/d3d8/basetexture.c deleted file mode 100644 index 122c22d..0000000 --- a/dlls/d3d8/basetexture.c +++ /dev/null @@ -1,164 +0,0 @@ -/* - * IDirect3DBaseTexture8 implementation - * - * Copyright 2005 Oliver Stieber - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "config.h" -#include "d3d8_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(d3d8); - -/* IDirect3DBaseTexture8 IUnknown parts follow: */ -static HRESULT WINAPI IDirect3DBaseTexture8Impl_QueryInterface(LPDIRECT3DBASETEXTURE8 iface, REFIID riid, LPVOID *ppobj) { - IDirect3DBaseTexture8Impl *This = (IDirect3DBaseTexture8Impl *)iface; - TRACE("(%p) Relay\n" , This); - if (IsEqualGUID(riid, &IID_IUnknown) - || IsEqualGUID(riid, &IID_IDirect3DResource8) - || IsEqualGUID(riid, &IID_IDirect3DBaseTexture8)) { - IUnknown_AddRef(iface); - *ppobj = This; - return S_OK; - } - - WARN("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), ppobj); - - *ppobj = NULL; - return E_NOINTERFACE; -} - -static ULONG WINAPI IDirect3DBaseTexture8Impl_AddRef(LPDIRECT3DBASETEXTURE8 iface) { - IDirect3DBaseTexture8Impl *This = (IDirect3DBaseTexture8Impl *)iface; - ULONG ref = InterlockedIncrement(&This->ref); - - TRACE("(%p) : AddRef from %d\n", This, ref - 1); - - return ref; -} - -static ULONG WINAPI IDirect3DBaseTexture8Impl_Release(LPDIRECT3DBASETEXTURE8 iface) { - IDirect3DBaseTexture8Impl *This = (IDirect3DBaseTexture8Impl *)iface; - ULONG ref = InterlockedDecrement(&This->ref); - - TRACE("(%p) : ReleaseRef to %d\n", This, ref); - - if (ref == 0) { - IWineD3DBaseTexture_Release(This->wineD3DBaseTexture); - HeapFree(GetProcessHeap(), 0, This); - } - - return ref; -} - -/* IDirect3DBaseTexture8 IDirect3DResource8 Interface follow: */ -static HRESULT WINAPI IDirect3DBaseTexture8Impl_GetDevice(LPDIRECT3DBASETEXTURE8 iface, IDirect3DDevice8 **ppDevice) { - IDirect3DBaseTexture8Impl *This = (IDirect3DBaseTexture8Impl *)iface; - TRACE("(%p) Relay\n" , This); - - return IDirect3DResource8Impl_GetDevice((LPDIRECT3DRESOURCE8) This, ppDevice); -} - -static HRESULT WINAPI IDirect3DBaseTexture8Impl_SetPrivateData(LPDIRECT3DBASETEXTURE8 iface, REFGUID refguid, CONST void* pData, DWORD SizeOfData, DWORD Flags) { - IDirect3DBaseTexture8Impl *This = (IDirect3DBaseTexture8Impl *)iface; - TRACE("(%p) Relay\n" , This); - - return IWineD3DBaseTexture_SetPrivateData(This->wineD3DBaseTexture, refguid, pData, SizeOfData, Flags); -} - -static HRESULT WINAPI IDirect3DBaseTexture8Impl_GetPrivateData(LPDIRECT3DBASETEXTURE8 iface, REFGUID refguid, void* pData, DWORD* pSizeOfData) { - IDirect3DBaseTexture8Impl *This = (IDirect3DBaseTexture8Impl *)iface; - TRACE("(%p) Relay\n" , This); - - return IWineD3DBaseTexture_GetPrivateData(This->wineD3DBaseTexture, refguid, pData, pSizeOfData); -} - -static HRESULT WINAPI IDirect3DBaseTexture8Impl_FreePrivateData(LPDIRECT3DBASETEXTURE8 iface, REFGUID refguid) { - IDirect3DBaseTexture8Impl *This = (IDirect3DBaseTexture8Impl *)iface; - TRACE("(%p) Relay\n" , This); - - return IWineD3DBaseTexture_FreePrivateData(This->wineD3DBaseTexture, refguid); -} - -static DWORD WINAPI IDirect3DBaseTexture8Impl_SetPriority(LPDIRECT3DBASETEXTURE8 iface, DWORD PriorityNew) { - IDirect3DBaseTexture8Impl *This = (IDirect3DBaseTexture8Impl *)iface; - TRACE("(%p) Relay\n" , This); - - return IWineD3DBaseTexture_SetPriority(This->wineD3DBaseTexture, PriorityNew); -} - -static DWORD WINAPI IDirect3DBaseTexture8Impl_GetPriority(LPDIRECT3DBASETEXTURE8 iface) { - IDirect3DBaseTexture8Impl *This = (IDirect3DBaseTexture8Impl *)iface; - TRACE("(%p) Relay\n" , This); - - return IWineD3DBaseTexture_GetPriority(This->wineD3DBaseTexture); -} - -static void WINAPI IDirect3DBaseTexture8Impl_PreLoad(LPDIRECT3DBASETEXTURE8 iface) { - IDirect3DBaseTexture8Impl *This = (IDirect3DBaseTexture8Impl *)iface; - TRACE("(%p) Relay\n" , This); - - IWineD3DBaseTexture_PreLoad(This->wineD3DBaseTexture); - return; -} - -static D3DRESOURCETYPE WINAPI IDirect3DBaseTexture8Impl_GetType(LPDIRECT3DBASETEXTURE8 iface) { - IDirect3DBaseTexture8Impl *This = (IDirect3DBaseTexture8Impl *)iface; - TRACE("(%p) Relay\n" , This); - - return IWineD3DBaseTexture_GetType(This->wineD3DBaseTexture); -} - -/* IDirect3DBaseTexture8 Interface follow: */ -static DWORD WINAPI IDirect3DBaseTexture8Impl_SetLOD(LPDIRECT3DBASETEXTURE8 iface, DWORD LODNew) { - IDirect3DBaseTexture8Impl *This = (IDirect3DBaseTexture8Impl *)iface; - TRACE("(%p) Relay\n" , This); - - return IWineD3DBaseTexture_SetLOD(This->wineD3DBaseTexture, LODNew); -} - -static DWORD WINAPI IDirect3DBaseTexture8Impl_GetLOD(LPDIRECT3DBASETEXTURE8 iface) { - IDirect3DBaseTexture8Impl *This = (IDirect3DBaseTexture8Impl *)iface; - TRACE("(%p) Relay\n" , This); - - return IWineD3DBaseTexture_GetLOD(This->wineD3DBaseTexture); -} - -static DWORD WINAPI IDirect3DBaseTexture8Impl_GetLevelCount(LPDIRECT3DBASETEXTURE8 iface) { - IDirect3DBaseTexture8Impl *This = (IDirect3DBaseTexture8Impl *)iface; - TRACE("(%p) Relay\n" , This); - - return IWineD3DBaseTexture_GetLevelCount(This->wineD3DBaseTexture); -} - -const IDirect3DBaseTexture8Vtbl Direct3DBaseTexture8_Vtbl = -{ - IDirect3DBaseTexture8Impl_QueryInterface, - IDirect3DBaseTexture8Impl_AddRef, - IDirect3DBaseTexture8Impl_Release, - IDirect3DBaseTexture8Impl_GetDevice, - IDirect3DBaseTexture8Impl_SetPrivateData, - IDirect3DBaseTexture8Impl_GetPrivateData, - IDirect3DBaseTexture8Impl_FreePrivateData, - IDirect3DBaseTexture8Impl_SetPriority, - IDirect3DBaseTexture8Impl_GetPriority, - IDirect3DBaseTexture8Impl_PreLoad, - IDirect3DBaseTexture8Impl_GetType, - - IDirect3DBaseTexture8Impl_SetLOD, - IDirect3DBaseTexture8Impl_GetLOD, - IDirect3DBaseTexture8Impl_GetLevelCount -};

1 0

Henri Verbeet : wined3d: Set the currently active context to NULL when it' s destroyed.
by Alexandre Julliard March 23, 2009

March 23, 2009

Module: wine Branch: master Commit: 1f4e7b27ed73214a764e33b9bf2df193b17d57ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f4e7b27ed73214a764e33b9b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 23 08:30:15 2009 +0100 wined3d: Set the currently active context to NULL when it's destroyed. This should make us crash when trying to use the "currently active" context after it has been destroyed, rather than messing around with freed memory. --- dlls/wined3d/context.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 4ae7c3d..c7db25a 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1010,6 +1010,12 @@ void DestroyContext(IWineD3DDeviceImpl *This, WineD3DContext *context) { LEAVE_GL(); + if (This->activeContext == context) + { + This->activeContext = NULL; + TRACE("Destroying the active context.\n"); + } + /* Cleanup the GL context */ pwglMakeCurrent(NULL, NULL); if(context->isPBuffer) {

1 0

Roderick Colenbrander : wined3d: Add WGL_ARB_pixel_format detection.
by Alexandre Julliard March 23, 2009

March 23, 2009

Module: wine Branch: master Commit: 9181ddcd167b01983ac1682968ab4be427b35d88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9181ddcd167b01983ac168296… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sun Mar 15 10:01:43 2009 +0100 wined3d: Add WGL_ARB_pixel_format detection. Right now we assume that the extension is there but this isn't always the case. The next patch in this series will add a non-WGL_ARB_pixel_format codepath to help VirtualBox and others. --- dlls/wined3d/directx.c | 4 ++++ dlls/wined3d/wined3d_gl.h | 1 + 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 2ec60d4..4a6a1b1 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1434,6 +1434,10 @@ static BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { gl_info->supported[WGL_ARB_PBUFFER] = TRUE; TRACE_(d3d_caps)("FOUND: WGL_ARB_pbuffer support\n"); } + if (!strcmp(ThisExtn, "WGL_ARB_pixel_format")) { + gl_info->supported[WGL_ARB_PIXEL_FORMAT] = TRUE; + TRACE_(d3d_caps)("FOUND: WGL_ARB_pixel_format support\n"); + } if (!strcmp(ThisExtn, "WGL_WINE_pixel_format_passthrough")) { gl_info->supported[WGL_WINE_PIXEL_FORMAT_PASSTHROUGH] = TRUE; TRACE_(d3d_caps)("FOUND: WGL_WINE_pixel_format_passthrough support\n"); diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 3aa23e1..06d2f47 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -3462,6 +3462,7 @@ typedef enum _GL_SupportedExt { /* WGL extensions */ WGL_ARB_PBUFFER, + WGL_ARB_PIXEL_FORMAT, WGL_WINE_PIXEL_FORMAT_PASSTHROUGH, OPENGL_SUPPORTED_EXT_END

1 0

Roderick Colenbrander : wined3d: Add a classic WGL pixel format backend as not all OpenGL implementations support WGL_ARB_pixel_format .
by Alexandre Julliard March 23, 2009

March 23, 2009

Module: wine Branch: master Commit: 4544efc9724fd49e2dec9544971bd8069f1ee145 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4544efc9724fd49e2dec95449… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sun Mar 15 11:30:10 2009 +0100 wined3d: Add a classic WGL pixel format backend as not all OpenGL implementations support WGL_ARB_pixel_format. This should help for instance VirtualBox. --- dlls/wined3d/directx.c | 170 ++++++++++++++++++++++++++++++++---------------- 1 files changed, 114 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4544efc9724fd49e2dec9…

1 0