Stefan Dösinger : wined3d: Define WINED3DGAMMARAMP based on D3DGAMMARAMP / DDGAMMARAMP.
Alexandre Julliard
julliard at wine.codeweavers.com
Tue Apr 4 16:15:30 CDT 2006
Module: wine
Branch: refs/heads/master
Commit: c289b3cc51a75f688d1eb334a34425658eca9c33
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c289b3cc51a75f688d1eb334a34425658eca9c33
Author: Stefan Dösinger <stefandoesinger at gmx.at>
Date: Tue Apr 4 13:44:17 2006 +0200
wined3d: Define WINED3DGAMMARAMP based on D3DGAMMARAMP / DDGAMMARAMP.
---
dlls/d3d8/device.c | 4 ++--
dlls/d3d9/device.c | 4 ++--
dlls/wined3d/device.c | 6 +++---
dlls/wined3d/swapchain.c | 4 ++--
include/wine/wined3d_interface.h | 26 ++++++++++++++++----------
5 files changed, 25 insertions(+), 19 deletions(-)
diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c
index 54ffb04..0176459 100644
--- a/dlls/d3d8/device.c
+++ b/dlls/d3d8/device.c
@@ -273,14 +273,14 @@ void WINAPI IDirect3DDevice8Impl_SetGamm
IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface;
TRACE("(%p) Relay\n", This);
- return IWineD3DDevice_SetGammaRamp(This->WineD3DDevice, 0, Flags, pRamp);
+ return IWineD3DDevice_SetGammaRamp(This->WineD3DDevice, 0, Flags, (WINED3DGAMMARAMP *) pRamp);
}
void WINAPI IDirect3DDevice8Impl_GetGammaRamp(LPDIRECT3DDEVICE8 iface, D3DGAMMARAMP* pRamp) {
IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface;
TRACE("(%p) Relay\n", This);
- return IWineD3DDevice_GetGammaRamp(This->WineD3DDevice, 0, pRamp);
+ return IWineD3DDevice_GetGammaRamp(This->WineD3DDevice, 0, (WINED3DGAMMARAMP *) pRamp);
}
HRESULT WINAPI IDirect3DDevice8Impl_CreateTexture(LPDIRECT3DDEVICE8 iface, UINT Width, UINT Height, UINT Levels, DWORD Usage,
diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c
index 3f557f2..ab0ffcb 100644
--- a/dlls/d3d9/device.c
+++ b/dlls/d3d9/device.c
@@ -223,14 +223,14 @@ void WINAPI IDirect3DDevice9Impl_SetGamm
IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface;
TRACE("(%p) Relay\n", This);
- return IWineD3DDevice_SetGammaRamp(This->WineD3DDevice, iSwapChain, Flags, pRamp);
+ return IWineD3DDevice_SetGammaRamp(This->WineD3DDevice, iSwapChain, Flags, (WINED3DGAMMARAMP *) pRamp);
}
void WINAPI IDirect3DDevice9Impl_GetGammaRamp(LPDIRECT3DDEVICE9 iface, UINT iSwapChain, D3DGAMMARAMP* pRamp) {
IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface;
TRACE("(%p) Relay\n", This);
- return IWineD3DDevice_GetGammaRamp(This->WineD3DDevice, iSwapChain, pRamp);
+ return IWineD3DDevice_GetGammaRamp(This->WineD3DDevice, iSwapChain, (WINED3DGAMMARAMP *) pRamp);
}
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 5df1ab2..60e044b 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -6557,20 +6557,20 @@ HRESULT WINAPI IWineD3DDeviceImpl_GetC
return D3D_OK;
}
-void WINAPI IWineD3DDeviceImpl_SetGammaRamp(IWineD3DDevice * iface, UINT iSwapChain, DWORD Flags, CONST D3DGAMMARAMP* pRamp) {
+void WINAPI IWineD3DDeviceImpl_SetGammaRamp(IWineD3DDevice * iface, UINT iSwapChain, DWORD Flags, CONST WINED3DGAMMARAMP* pRamp) {
IWineD3DSwapChain *swapchain;
HRESULT hrc = D3D_OK;
TRACE("Relaying to swapchain\n");
if ((hrc = IWineD3DDeviceImpl_GetSwapChain(iface, iSwapChain, &swapchain)) == D3D_OK) {
- IWineD3DSwapChain_SetGammaRamp(swapchain, Flags, (D3DGAMMARAMP *)pRamp);
+ IWineD3DSwapChain_SetGammaRamp(swapchain, Flags, (WINED3DGAMMARAMP *)pRamp);
IWineD3DSwapChain_Release(swapchain);
}
return;
}
-void WINAPI IWineD3DDeviceImpl_GetGammaRamp(IWineD3DDevice *iface, UINT iSwapChain, D3DGAMMARAMP* pRamp) {
+void WINAPI IWineD3DDeviceImpl_GetGammaRamp(IWineD3DDevice *iface, UINT iSwapChain, WINED3DGAMMARAMP* pRamp) {
IWineD3DSwapChain *swapchain;
HRESULT hrc = D3D_OK;
diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c
index 55bb6e1..ef4e4bd 100644
--- a/dlls/wined3d/swapchain.c
+++ b/dlls/wined3d/swapchain.c
@@ -453,7 +453,7 @@ HRESULT WINAPI IWineD3DSwapChainImpl_Get
return D3D_OK;
}
-HRESULT WINAPI IWineD3DSwapChainImpl_SetGammaRamp(IWineD3DSwapChain *iface, DWORD Flags, CONST D3DGAMMARAMP *pRamp){
+HRESULT WINAPI IWineD3DSwapChainImpl_SetGammaRamp(IWineD3DSwapChain *iface, DWORD Flags, CONST WINED3DGAMMARAMP *pRamp){
IWineD3DSwapChainImpl *This = (IWineD3DSwapChainImpl *)iface;
HDC hDC;
@@ -465,7 +465,7 @@ HRESULT WINAPI IWineD3DSwapChainImpl_Set
}
-HRESULT WINAPI IWineD3DSwapChainImpl_GetGammaRamp(IWineD3DSwapChain *iface, D3DGAMMARAMP *pRamp){
+HRESULT WINAPI IWineD3DSwapChainImpl_GetGammaRamp(IWineD3DSwapChain *iface, WINED3DGAMMARAMP *pRamp){
IWineD3DSwapChainImpl *This = (IWineD3DSwapChainImpl *)iface;
HDC hDC;
diff --git a/include/wine/wined3d_interface.h b/include/wine/wined3d_interface.h
index 73fa410..34bbd8f 100644
--- a/include/wine/wined3d_interface.h
+++ b/include/wine/wined3d_interface.h
@@ -146,17 +146,23 @@ DEFINE_GUID(IID_IWineD3DQuery,
/* Also, D3DCAPS8 is a subset of D3DCAPS9 so can be typecase as long as
none of the 9 fields are accessed when the device is d3d8 */
/* TODO: remove the d3d8/d3d9 dependencies by making a all inclusive WINED3D version */
-#if defined( __WINE_D3D8_H )
+#if defined( __WINE_D3D9_H )
+ /* Identical: */
+# define WINED3DLIGHT D3DLIGHT9
+# define WINED3DMATERIAL D3DMATERIAL9
+# define WINED3DVIEWPORT D3DVIEWPORT9
+# define WINED3DGAMMARAMP D3DGAMMARAMP
+
+#elif defined( __WINE_D3D8_H )
/* Identical: */
# define WINED3DLIGHT D3DLIGHT8
# define WINED3DMATERIAL D3DMATERIAL8
# define WINED3DVIEWPORT D3DVIEWPORT8
+# define WINED3DGAMMARAMP D3DGAMMARAMP
-#else
- /* Identical: */
-# define WINED3DLIGHT D3DLIGHT9
-# define WINED3DMATERIAL D3DMATERIAL9
-# define WINED3DVIEWPORT D3DVIEWPORT9
+#else /* defined (__WINE_D3D_H ) */
+ /* Identical: */
+# define WINED3DGAMMARAMP DDGAMMARAMP
#endif
@@ -345,8 +351,8 @@ DECLARE_INTERFACE_(IWineD3DDevice,IWineD
STDMETHOD(GetDepthStencilSurface)(THIS_ struct IWineD3DSurface** ppZStencilSurface) PURE;
STDMETHOD(SetFVF)(THIS_ DWORD fvf) PURE;
STDMETHOD(GetFVF)(THIS_ DWORD * pfvf) PURE;
- STDMETHOD_(void, SetGammaRamp)(THIS_ UINT iSwapChain, DWORD Flags, CONST D3DGAMMARAMP* pRamp) PURE;
- STDMETHOD_(void, GetGammaRamp)(THIS_ UINT iSwapChain, D3DGAMMARAMP* pRamp) PURE;
+ STDMETHOD_(void, SetGammaRamp)(THIS_ UINT iSwapChain, DWORD Flags, CONST WINED3DGAMMARAMP* pRamp) PURE;
+ STDMETHOD_(void, GetGammaRamp)(THIS_ UINT iSwapChain, WINED3DGAMMARAMP* pRamp) PURE;
STDMETHOD(SetIndices)(THIS_ struct IWineD3DIndexBuffer * pIndexData,UINT BaseVertexIndex) PURE;
STDMETHOD(GetIndices)(THIS_ struct IWineD3DIndexBuffer ** ppIndexData,UINT * pBaseVertexIndex) PURE;
STDMETHOD(SetLight)(THIS_ DWORD Index,CONST WINED3DLIGHT * pLight) PURE;
@@ -1294,8 +1300,8 @@ DECLARE_INTERFACE_(IWineD3DSwapChain,IWi
STDMETHOD(GetRasterStatus)(THIS_ WINED3DRASTER_STATUS *pRasterStatus) PURE;
STDMETHOD(GetDisplayMode)(THIS_ WINED3DDISPLAYMODE *pMode) PURE;
STDMETHOD(GetPresentParameters)(THIS_ WINED3DPRESENT_PARAMETERS *pPresentationParameters) PURE;
- STDMETHOD(SetGammaRamp)(THIS_ DWORD Flags, const D3DGAMMARAMP *pRamp) PURE;
- STDMETHOD(GetGammaRamp)(THIS_ D3DGAMMARAMP *pRamp) PURE;
+ STDMETHOD(SetGammaRamp)(THIS_ DWORD Flags, const WINED3DGAMMARAMP *pRamp) PURE;
+ STDMETHOD(GetGammaRamp)(THIS_ WINED3DGAMMARAMP *pRamp) PURE;
};
#undef INTERFACE
More information about the wine-cvs
mailing list