d3d8: Return D3DERR_INVALIDCALL when trying to delete an invalid pixel shader.

It appears this is fixed on Vista/Win7 to be consistent with DeleteVertexShader(). Match the more consistent behaviour of Vista/Win7 and mark the previous behaviour as broken.

d3d8: Return D3DERR_INVALIDCALL when trying to delete an invalid pixel shader.
212ee15b · Henri Verbeet · Alexandre Julliard · 64e6e956 · 212ee15b · 212ee15b
Commit 212ee15b authored Dec 01, 2009 by Henri Verbeet Committed by Alexandre Julliard Dec 01, 2009
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

device.c dlls/d3d8/device.c +1 -1

device.c dlls/d3d8/tests/device.c +2 -2

No files found.
--- a/dlls/d3d8/device.c
+++ b/dlls/d3d8/device.c
@@ -2316,7 +2316,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_DeletePixelShader(LPDIRECT3DDEVICE8 i
    {
        WARN("Invalid handle (%#x) passed.\n", pShader);
        wined3d_mutex_unlock();
-        return D3D_OK;
+        return D3DERR_INVALIDCALL;
    }
    IWineD3DDevice_GetPixelShader(This->WineD3DDevice, &cur);

--- a/dlls/d3d8/tests/device.c
+++ b/dlls/d3d8/tests/device.c
@@ -1084,9 +1084,9 @@ static void test_shader(void)
        /* Check for double delete. */
        hr = IDirect3DDevice8_DeletePixelShader(pDevice, hPixelShader2);
-        ok(hr == D3D_OK, "IDirect3DDevice8_DeletePixelShader returned %#08x\n", hr);
+        ok(hr == D3DERR_INVALIDCALL || broken(hr == D3D_OK), "IDirect3DDevice8_DeletePixelShader returned %#08x\n", hr);
        hr = IDirect3DDevice8_DeletePixelShader(pDevice, hPixelShader);
-        ok(hr == D3D_OK, "IDirect3DDevice8_DeletePixelShader returned %#08x\n", hr);
+        ok(hr == D3DERR_INVALIDCALL || broken(hr == D3D_OK), "IDirect3DDevice8_DeletePixelShader returned %#08x\n", hr);
    }
    else
    {