Module: wine Branch: refs/heads/master Commit: f6ed704f96e336d76960d299a36ec76fb2e1759c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f6ed704f96e336d76960d299...
Author: Stefan Dösinger stefandoesinger@gmx.at Date: Mon Apr 3 14:54:16 2006 +0200
wined3d: Make use of WINED3DDEVICE_CREATION_PARAMETERS.
---
dlls/d3d8/device.c | 2 +- dlls/d3d9/device.c | 2 +- dlls/wined3d/device.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- include/wine/wined3d_interface.h | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 720bc4a..96f44f0 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -150,7 +150,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_GetD HRESULT WINAPI IDirect3DDevice8Impl_GetCreationParameters(LPDIRECT3DDEVICE8 iface, D3DDEVICE_CREATION_PARAMETERS *pParameters) { IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; TRACE("(%p) Relay\n", This); - return IWineD3DDevice_GetCreationParameters(This->WineD3DDevice, pParameters); + return IWineD3DDevice_GetCreationParameters(This->WineD3DDevice, (WINED3DDEVICE_CREATION_PARAMETERS *) pParameters); }
HRESULT WINAPI IDirect3DDevice8Impl_SetCursorProperties(LPDIRECT3DDEVICE8 iface, UINT XHotSpot, UINT YHotSpot, IDirect3DSurface8* pCursorBitmap) { diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index d87eab4..9c68e84 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -138,7 +138,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_Ge HRESULT WINAPI IDirect3DDevice9Impl_GetCreationParameters(LPDIRECT3DDEVICE9 iface, D3DDEVICE_CREATION_PARAMETERS *pParameters) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; TRACE("(%p) Relay\n", This); - return IWineD3DDevice_GetCreationParameters(This->WineD3DDevice, pParameters); + return IWineD3DDevice_GetCreationParameters(This->WineD3DDevice, (WINED3DDEVICE_CREATION_PARAMETERS *) pParameters); }
HRESULT WINAPI IDirect3DDevice9Impl_SetCursorProperties(LPDIRECT3DDEVICE9 iface, UINT XHotSpot, UINT YHotSpot, IDirect3DSurface9* pCursorBitmap) { diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ff47d57..14d1b5e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6549,7 +6549,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetDia }
-HRESULT WINAPI IWineD3DDeviceImpl_GetCreationParameters(IWineD3DDevice *iface, D3DDEVICE_CREATION_PARAMETERS *pParameters) { +HRESULT WINAPI IWineD3DDeviceImpl_GetCreationParameters(IWineD3DDevice *iface, WINED3DDEVICE_CREATION_PARAMETERS *pParameters) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; TRACE("(%p) : pParameters %p\n", This, pParameters);
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f852536..817f05d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -521,7 +521,7 @@ typedef struct IWineD3DDeviceImpl IWineD3DStateBlockImpl *updateStateBlock;
/* Internal use fields */ - D3DDEVICE_CREATION_PARAMETERS createParms; + WINED3DDEVICE_CREATION_PARAMETERS createParms; UINT adapterNo; D3DDEVTYPE devType;
diff --git a/include/wine/wined3d_interface.h b/include/wine/wined3d_interface.h index 8a007f5..6478d8d 100644 --- a/include/wine/wined3d_interface.h +++ b/include/wine/wined3d_interface.h @@ -324,7 +324,7 @@ DECLARE_INTERFACE_(IWineD3DDevice,IWineD STDMETHOD(EvictManagedResources)(THIS) PURE; STDMETHOD_(UINT, GetAvailableTextureMem)(THIS) PURE; STDMETHOD(GetBackBuffer)(THIS_ UINT iSwapChain, UINT BackBuffer, WINED3DBACKBUFFER_TYPE, struct IWineD3DSurface** ppBackBuffer) PURE; - STDMETHOD(GetCreationParameters)(THIS_ D3DDEVICE_CREATION_PARAMETERS *pParameters) PURE; + STDMETHOD(GetCreationParameters)(THIS_ WINED3DDEVICE_CREATION_PARAMETERS *pParameters) PURE; STDMETHOD(GetDeviceCaps)(THIS_ WINED3DCAPS* pCaps) PURE; STDMETHOD(GetDirect3D)(THIS_ IWineD3D** ppD3D) PURE; STDMETHOD(GetDisplayMode)(THIS_ UINT iSwapChain, WINED3DDISPLAYMODE* pMode) PURE;
-
Alexandre Julliard