Stefan Dösinger : wined3d: Add WINED3DRASTERSTATUS to wined3d_types.h.

[Alexandre Julliard]

Module: wine
Branch: refs/heads/master
Commit: 08c38a87e145548137f900c1adf8626abd41d57c
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=08c38a87e145548137f900c1...

Author: Stefan Dösinger 
Date:   Tue Apr  4 00:27:28 2006 +0200

wined3d: Add WINED3DRASTERSTATUS to wined3d_types.h.

---

dlls/d3d8/device.c               |    2 +-
 dlls/d3d9/device.c               |    2 +-
 dlls/d3d9/swapchain.c            |    2 +-
 dlls/wined3d/device.c            |    2 +-
 dlls/wined3d/swapchain.c         |    2 +-
 include/wine/wined3d_interface.h |    4 ++--
 include/wine/wined3d_types.h     |    5 +++++
 7 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c
index 96f44f0..54ffb04 100644
--- a/dlls/d3d8/device.c
+++ b/dlls/d3d8/device.c
@@ -266,7 +266,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_GetR
     IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface;
     TRACE("(%p) Relay\n", This);

-    return IWineD3DDevice_GetRasterStatus(This->WineD3DDevice, 0, pRasterStatus);
+    return IWineD3DDevice_GetRasterStatus(This->WineD3DDevice, 0, (WINED3DRASTER_STATUS *) pRasterStatus);
 }

void WINAPI IDirect3DDevice8Impl_SetGammaRamp(LPDIRECT3DDEVICE8 iface, DWORD Flags, CONST D3DGAMMARAMP* pRamp) {
diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c
index 9c68e84..3f557f2 100644
--- a/dlls/d3d9/device.c
+++ b/dlls/d3d9/device.c
@@ -208,7 +208,7 @@ HRESULT  WINAPI  IDirect3DDevice9Impl_Ge
     IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface;
     TRACE("(%p) Relay\n", This);

-    return IWineD3DDevice_GetRasterStatus(This->WineD3DDevice, iSwapChain, pRasterStatus);        
+    return IWineD3DDevice_GetRasterStatus(This->WineD3DDevice, iSwapChain, (WINED3DRASTER_STATUS *) pRasterStatus);        
 }

HRESULT WINAPI IDirect3DDevice9Impl_SetDialogBoxMode(LPDIRECT3DDEVICE9 iface, BOOL bEnableDialogs) {
diff --git a/dlls/d3d9/swapchain.c b/dlls/d3d9/swapchain.c
index 7382a9e..4eac38e 100644
--- a/dlls/d3d9/swapchain.c
+++ b/dlls/d3d9/swapchain.c
@@ -94,7 +94,7 @@ HRESULT WINAPI IDirect3DSwapChain9Impl_G
 HRESULT WINAPI IDirect3DSwapChain9Impl_GetRasterStatus(LPDIRECT3DSWAPCHAIN9 iface, D3DRASTER_STATUS* pRasterStatus) {
     IDirect3DSwapChain9Impl *This = (IDirect3DSwapChain9Impl *)iface;
     TRACE("(%p) Relay\n", This);
-    return IWineD3DSwapChain_GetRasterStatus(This->wineD3DSwapChain, pRasterStatus);
+    return IWineD3DSwapChain_GetRasterStatus(This->wineD3DSwapChain, (WINED3DRASTER_STATUS *) pRasterStatus);
 }

HRESULT WINAPI IDirect3DSwapChain9Impl_GetDisplayMode(LPDIRECT3DSWAPCHAIN9 iface, D3DDISPLAYMODE* pMode) {
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 14d1b5e..5df1ab2 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -5454,7 +5454,7 @@ BOOL     WINAPI  IWineD3DDeviceImpl_GetS
 }

-HRESULT  WINAPI  IWineD3DDeviceImpl_GetRasterStatus(IWineD3DDevice *iface, UINT iSwapChain, D3DRASTER_STATUS* pRasterStatus) {
+HRESULT  WINAPI  IWineD3DDeviceImpl_GetRasterStatus(IWineD3DDevice *iface, UINT iSwapChain, WINED3DRASTER_STATUS* pRasterStatus) {
     IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface;
     IWineD3DSwapChain *swapChain;
     HRESULT hr;
diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c
index f2e6a56..55bb6e1 100644
--- a/dlls/wined3d/swapchain.c
+++ b/dlls/wined3d/swapchain.c
@@ -381,7 +381,7 @@ HRESULT WINAPI IWineD3DSwapChainImpl_Get

}

-HRESULT WINAPI IWineD3DSwapChainImpl_GetRasterStatus(IWineD3DSwapChain *iface, D3DRASTER_STATUS*pRasterStatus) {
+HRESULT WINAPI IWineD3DSwapChainImpl_GetRasterStatus(IWineD3DSwapChain *iface, WINED3DRASTER_STATUS *pRasterStatus) {
     IWineD3DSwapChainImpl *This = (IWineD3DSwapChainImpl *)iface;
     static BOOL showFixmes = TRUE;
     pRasterStatus->InVBlank = TRUE;
diff --git a/include/wine/wined3d_interface.h b/include/wine/wined3d_interface.h
index 6478d8d..f64ff92 100644
--- a/include/wine/wined3d_interface.h
+++ b/include/wine/wined3d_interface.h
@@ -329,7 +329,7 @@ DECLARE_INTERFACE_(IWineD3DDevice,IWineD
     STDMETHOD(GetDirect3D)(THIS_ IWineD3D** ppD3D) PURE;
     STDMETHOD(GetDisplayMode)(THIS_ UINT iSwapChain, WINED3DDISPLAYMODE* pMode) PURE;
     STDMETHOD_(UINT, GetNumberOfSwapChains)(THIS) PURE;
-    STDMETHOD(GetRasterStatus)(THIS_ UINT iSwapChain, D3DRASTER_STATUS* pRasterStatus) PURE;
+    STDMETHOD(GetRasterStatus)(THIS_ UINT iSwapChain, WINED3DRASTER_STATUS* pRasterStatus) PURE;
     STDMETHOD(GetSwapChain)(THIS_ UINT iSwapChain, struct IWineD3DSwapChain **pSwapChain) PURE;
     STDMETHOD(Reset)(THIS_ WINED3DPRESENT_PARAMETERS* pPresentationParameters) PURE;
     STDMETHOD(SetDialogBoxMode)(THIS_ BOOL bEnableDialogs) PURE;
@@ -1293,7 +1293,7 @@ DECLARE_INTERFACE_(IWineD3DSwapChain,IWi
     STDMETHOD(Present)(THIS_ CONST RECT *pSourceRect, CONST RECT *pDestRect, HWND hDestWindowOverride, CONST RGNDATA *pDirtyRegion, DWORD dwFlags) PURE;
     STDMETHOD(GetFrontBufferData)(THIS_ IWineD3DSurface *pDestSurface) PURE;
     STDMETHOD(GetBackBuffer)(THIS_ UINT iBackBuffer, WINED3DBACKBUFFER_TYPE Type, IWineD3DSurface **ppBackBuffer) PURE;
-    STDMETHOD(GetRasterStatus)(THIS_ D3DRASTER_STATUS *pRasterStatus) PURE;
+    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;
diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h
index a072981..da42bcb 100644
--- a/include/wine/wined3d_types.h
+++ b/include/wine/wined3d_types.h
@@ -631,6 +631,11 @@ typedef struct _WINED3DDEVINFO_STAGETIMI
     float         ComputationProcessingPercent;
 } WINED3DDEVINFO_STAGETIMINGS;

+typedef struct _WINED3DRASTER_STATUS {
+    BOOL            InVBlank;
+    UINT            ScanLine;
+} WINED3DRASTER_STATUS;
+

typedef struct WINED3DRESOURCESTATS {
     BOOL                bThrashing;