Module: wine Branch: refs/heads/master Commit: e71468c7867df877718c53e5f0c68b3b89ef4976 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e71468c7867df877718c53e5...
Author: Stefan Dösinger stefandoesinger@gmx.at Date: Fri Apr 7 00:25:14 2006 +0200
wined3d: Add WINED3DLOCKED_BOX to wined3d_types.h.
---
dlls/d3d8/volume.c | 2 +- dlls/d3d8/volumetexture.c | 2 +- dlls/wined3d/volume.c | 2 +- dlls/wined3d/volumetexture.c | 2 +- include/wine/wined3d_interface.h | 4 ++-- include/wine/wined3d_types.h | 7 +++++++ 6 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/dlls/d3d8/volume.c b/dlls/d3d8/volume.c index b90be9b..5ca962c 100644 --- a/dlls/d3d8/volume.c +++ b/dlls/d3d8/volume.c @@ -152,7 +152,7 @@ HRESULT WINAPI IDirect3DVolume8Impl_GetD HRESULT WINAPI IDirect3DVolume8Impl_LockBox(LPDIRECT3DVOLUME8 iface, D3DLOCKED_BOX *pLockedVolume, CONST D3DBOX *pBox, DWORD Flags) { IDirect3DVolume8Impl *This = (IDirect3DVolume8Impl *)iface; TRACE("(%p) relay %p %p %p %ld\n", This, This->wineD3DVolume, pLockedVolume, pBox, Flags); - return IWineD3DVolume_LockBox(This->wineD3DVolume, pLockedVolume, pBox, Flags); + return IWineD3DVolume_LockBox(This->wineD3DVolume, (WINED3DLOCKED_BOX *) pLockedVolume, pBox, Flags); }
HRESULT WINAPI IDirect3DVolume8Impl_UnlockBox(LPDIRECT3DVOLUME8 iface) { diff --git a/dlls/d3d8/volumetexture.c b/dlls/d3d8/volumetexture.c index 322558f..8714368 100644 --- a/dlls/d3d8/volumetexture.c +++ b/dlls/d3d8/volumetexture.c @@ -169,7 +169,7 @@ HRESULT WINAPI IDirect3DVolumeTexture8Im HRESULT WINAPI IDirect3DVolumeTexture8Impl_LockBox(LPDIRECT3DVOLUMETEXTURE8 iface, UINT Level, D3DLOCKED_BOX *pLockedVolume, CONST D3DBOX *pBox, DWORD Flags) { IDirect3DVolumeTexture8Impl *This = (IDirect3DVolumeTexture8Impl *)iface; TRACE("(%p) Relay %p %p %p %ld\n", This, This->wineD3DVolumeTexture, pLockedVolume, pBox,Flags); - return IWineD3DVolumeTexture_LockBox(This->wineD3DVolumeTexture, Level, pLockedVolume, pBox, Flags); + return IWineD3DVolumeTexture_LockBox(This->wineD3DVolumeTexture, Level, (WINED3DLOCKED_BOX *) pLockedVolume, pBox, Flags); }
HRESULT WINAPI IDirect3DVolumeTexture8Impl_UnlockBox(LPDIRECT3DVOLUMETEXTURE8 iface, UINT Level) { diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 3093b9a..25a50c9 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -159,7 +159,7 @@ HRESULT WINAPI IWineD3DVolumeImpl_GetDes return D3D_OK; }
-HRESULT WINAPI IWineD3DVolumeImpl_LockBox(IWineD3DVolume *iface, D3DLOCKED_BOX* pLockedVolume, CONST D3DBOX* pBox, DWORD Flags) { +HRESULT WINAPI IWineD3DVolumeImpl_LockBox(IWineD3DVolume *iface, WINED3DLOCKED_BOX* pLockedVolume, CONST D3DBOX* pBox, DWORD Flags) { IWineD3DVolumeImpl *This = (IWineD3DVolumeImpl *)iface; FIXME("(%p) : pBox=%p stub\n", This, pBox);
diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c index bd08bcf..850b7e0 100644 --- a/dlls/wined3d/volumetexture.c +++ b/dlls/wined3d/volumetexture.c @@ -229,7 +229,7 @@ HRESULT WINAPI IWineD3DVolumeTextureImpl return D3D_OK;
} -HRESULT WINAPI IWineD3DVolumeTextureImpl_LockBox(IWineD3DVolumeTexture *iface, UINT Level, D3DLOCKED_BOX* pLockedVolume, CONST D3DBOX* pBox, DWORD Flags) { +HRESULT WINAPI IWineD3DVolumeTextureImpl_LockBox(IWineD3DVolumeTexture *iface, UINT Level, WINED3DLOCKED_BOX* pLockedVolume, CONST D3DBOX* pBox, DWORD Flags) { HRESULT hr; IWineD3DVolumeTextureImpl *This = (IWineD3DVolumeTextureImpl *)iface;
diff --git a/include/wine/wined3d_interface.h b/include/wine/wined3d_interface.h index b0c3a9c..6c0dc15 100644 --- a/include/wine/wined3d_interface.h +++ b/include/wine/wined3d_interface.h @@ -992,7 +992,7 @@ DECLARE_INTERFACE_(IWineD3DVolumeTexture /*** IWineD3DVolumeTexture methods ***/ STDMETHOD(GetLevelDesc)(THIS_ UINT Level, WINED3DVOLUME_DESC *pDesc) PURE; STDMETHOD(GetVolumeLevel)(THIS_ UINT Level, struct IWineD3DVolume** ppVolumeLevel) PURE; - STDMETHOD(LockBox)(THIS_ UINT Level, D3DLOCKED_BOX* pLockedVolume, CONST D3DBOX* pBox, DWORD Flags) PURE; + STDMETHOD(LockBox)(THIS_ UINT Level, WINED3DLOCKED_BOX* pLockedVolume, CONST D3DBOX* pBox, DWORD Flags) PURE; STDMETHOD(UnlockBox)(THIS_ UINT Level) PURE; STDMETHOD(AddDirtyBox)(THIS_ CONST D3DBOX* pDirtyBox) PURE; }; @@ -1140,7 +1140,7 @@ DECLARE_INTERFACE_(IWineD3DVolume,IWineD STDMETHOD(GetContainerParent)(THIS_ IUnknown **ppContainerParent) PURE; STDMETHOD(GetContainer)(THIS_ REFIID riid, void ** ppContainer) PURE; STDMETHOD(GetDesc)(THIS_ WINED3DVOLUME_DESC * pDesc) PURE; - STDMETHOD(LockBox)(THIS_ D3DLOCKED_BOX* pLockedVolume, CONST D3DBOX* pBox, DWORD Flags) PURE; + STDMETHOD(LockBox)(THIS_ WINED3DLOCKED_BOX* pLockedVolume, CONST D3DBOX* pBox, DWORD Flags) PURE; STDMETHOD(UnlockBox)(THIS) PURE; STDMETHOD(AddDirtyBox)(THIS_ CONST D3DBOX* pDirtyBox) PURE; STDMETHOD(CleanDirtyBox)(THIS) PURE; diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h index fb9f531..d2704f2 100644 --- a/include/wine/wined3d_types.h +++ b/include/wine/wined3d_types.h @@ -695,6 +695,13 @@ typedef struct _WINED3DLOCKED_RECT { void* pBits; } WINED3DLOCKED_RECT;
+typedef struct _WINED3DLOCKED_BOX { + INT RowPitch; + INT SlicePitch; + void* pBits; +} WINED3DLOCKED_BOX; + + /*Vertex cache optimization hints.*/ typedef struct WINED3DDEVINFO_VCACHE { /*Must be a 4 char code FOURCC (e.g. CACH)*/