[RFC PATCH 2/2] wined3d: Let GetRasterStatus return D3DERR_INVALIDCALL.

[Florian Köberle]

---
 dlls/d3d9/tests/device.c      |    1 -
 dlls/wined3d/swapchain_base.c |    2 +-
 2 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c
index 0acedcb..2345c34 100644
--- a/dlls/d3d9/tests/device.c
+++ b/dlls/d3d9/tests/device.c
@@ -2771,7 +2771,6 @@ static void test_get_raster_status(void)
     if ((caps.Caps & D3DCAPS_READ_SCANLINE) == 0) {
         ZeroMemory( &rasterStatus, sizeof(rasterStatus) );
         hr = IDirect3DDevice9_GetRasterStatus(pDevice, 0, &rasterStatus);
-        todo_wine
         ok(hr == D3DERR_INVALIDCALL, "GetRasterStatus should return D3DERR_INVALIDCALL\n");
     } else {
         skip("Device supports D3DCAPS_READ_SCANLINE\n");
diff --git a/dlls/wined3d/swapchain_base.c b/dlls/wined3d/swapchain_base.c
index 1817de2..3f2a4e5 100644
--- a/dlls/wined3d/swapchain_base.c
+++ b/dlls/wined3d/swapchain_base.c
@@ -131,7 +131,7 @@ HRESULT WINAPI IWineD3DBaseSwapChainImpl_GetRasterStatus(IWineD3DSwapChain *ifac
         FIXME("iface %p, raster_status %p stub!\n", iface, pRasterStatus);
         warned = TRUE;
     }
-    return WINED3D_OK;
+    return WINED3DERR_INVALIDCALL;
 }

HRESULT WINAPI IWineD3DBaseSwapChainImpl_GetDisplayMode(IWineD3DSwapChain *iface, WINED3DDISPLAYMODE*pMode) {

[Henri Verbeet]

On 17 July 2010 12:43, Florian Köberle  wrote:
> diff --git a/dlls/wined3d/swapchain_base.c b/dlls/wined3d/swapchain_base.c
> index 1817de2..3f2a4e5 100644
> --- a/dlls/wined3d/swapchain_base.c
> +++ b/dlls/wined3d/swapchain_base.c
> @@ -131,7 +131,7 @@ HRESULT WINAPI IWineD3DBaseSwapChainImpl_GetRasterStatus(IWineD3DSwapChain *ifac
>         FIXME("iface %p, raster_status %p stub!\n", iface, pRasterStatus);
>         warned = TRUE;
>     }
> - return WINED3D_OK;
> - return WINED3DERR_INVALIDCALL;
>
> }

I think that makes sense, but I don't think we're supposed to touch
"pRasterStatus" either in that case.