Module: wine Branch: refs/heads/master Commit: 6e27152c964bff5a8465fbfb88c4a86e8c8d9bee URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6e27152c964bff5a8465fbfb...
Author: Stefan Dösinger stefandoesinger@gmx.at Date: Sat Feb 11 20:30:48 2006 +0100
ddraw: Small function corrections. The pPlaneEquation parameter of IDirect3DDevice7::SetClipPlane is not const IDirect3DDevice2::NextViewport takes an IDirect3DDevice2 interface, not an IDirect3DDevice3, the same for IDirect3DDevice::NextViewport.
---
dlls/ddraw/d3d_private.h | 4 ++-- dlls/ddraw/device_main.c | 4 ++-- dlls/ddraw/device_opengl.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dlls/ddraw/d3d_private.h b/dlls/ddraw/d3d_private.h index 9503768..d55b80c 100644 --- a/dlls/ddraw/d3d_private.h +++ b/dlls/ddraw/d3d_private.h @@ -957,13 +957,13 @@ Thunk_IDirect3DDeviceImpl_1_DeleteViewpo LPDIRECT3DVIEWPORT lpDirect3DViewport);
HRESULT WINAPI -Thunk_IDirect3DDeviceImpl_2_NextViewport(LPDIRECT3DDEVICE3 iface, +Thunk_IDirect3DDeviceImpl_2_NextViewport(LPDIRECT3DDEVICE2 iface, LPDIRECT3DVIEWPORT2 lpDirect3DViewport2, LPDIRECT3DVIEWPORT2* lplpDirect3DViewport2, DWORD dwFlags);
HRESULT WINAPI -Thunk_IDirect3DDeviceImpl_1_NextViewport(LPDIRECT3DDEVICE3 iface, +Thunk_IDirect3DDeviceImpl_1_NextViewport(LPDIRECT3DDEVICE iface, LPDIRECT3DVIEWPORT lpDirect3DViewport, LPDIRECT3DVIEWPORT* lplpDirect3DViewport, DWORD dwFlags); diff --git a/dlls/ddraw/device_main.c b/dlls/ddraw/device_main.c index 98efdf2..087e8ed 100644 --- a/dlls/ddraw/device_main.c +++ b/dlls/ddraw/device_main.c @@ -1599,7 +1599,7 @@ Thunk_IDirect3DDeviceImpl_1_DeleteViewpo }
HRESULT WINAPI -Thunk_IDirect3DDeviceImpl_2_NextViewport(LPDIRECT3DDEVICE3 iface, +Thunk_IDirect3DDeviceImpl_2_NextViewport(LPDIRECT3DDEVICE2 iface, LPDIRECT3DVIEWPORT2 lpDirect3DViewport2, LPDIRECT3DVIEWPORT2* lplpDirect3DViewport2, DWORD dwFlags) @@ -1612,7 +1612,7 @@ Thunk_IDirect3DDeviceImpl_2_NextViewport }
HRESULT WINAPI -Thunk_IDirect3DDeviceImpl_1_NextViewport(LPDIRECT3DDEVICE3 iface, +Thunk_IDirect3DDeviceImpl_1_NextViewport(LPDIRECT3DDEVICE iface, LPDIRECT3DVIEWPORT lpDirect3DViewport, LPDIRECT3DVIEWPORT* lplpDirect3DViewport, DWORD dwFlags) diff --git a/dlls/ddraw/device_opengl.c b/dlls/ddraw/device_opengl.c index 16c5e94..e2e6299 100644 --- a/dlls/ddraw/device_opengl.c +++ b/dlls/ddraw/device_opengl.c @@ -2615,7 +2615,7 @@ GL_IDirect3DDeviceImpl_7_LightEnable(LPD }
HRESULT WINAPI -GL_IDirect3DDeviceImpl_7_SetClipPlane(LPDIRECT3DDEVICE7 iface, DWORD dwIndex, CONST D3DVALUE* pPlaneEquation) +GL_IDirect3DDeviceImpl_7_SetClipPlane(LPDIRECT3DDEVICE7 iface, DWORD dwIndex, D3DVALUE* pPlaneEquation) { IDirect3DDeviceImpl *This = (IDirect3DDeviceImpl *)iface; IDirect3DDeviceGLImpl* glThis = (IDirect3DDeviceGLImpl*) This;