Marcus Meissner : d3d9: Initialize hr (Coverity).

[Alexandre Julliard]

Module: wine
Branch: master
Commit: ace65a527fe330e065265c9cb52f6f79b3040459
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=ace65a527fe330e065265c9cb5...

Author: Marcus Meissner 
Date:   Mon Jan 26 22:16:21 2009 +0100

d3d9: Initialize hr (Coverity).

---

dlls/d3d9/device.c       |    2 +-
 dlls/d3d9/tests/visual.c |    3 +++
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c
index aff0643..9c5290d 100644
--- a/dlls/d3d9/device.c
+++ b/dlls/d3d9/device.c
@@ -1338,7 +1338,7 @@ static IDirect3DVertexDeclaration9 *getConvertedDecl(IDirect3DDevice9Impl *This,

static HRESULT WINAPI IDirect3DDevice9Impl_SetFVF(LPDIRECT3DDEVICE9EX iface, DWORD FVF) {
     IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface;
-    HRESULT hr;
+    HRESULT hr = S_OK;
     TRACE("(%p) Relay\n" , This);

EnterCriticalSection(&d3d9_cs);
diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c
index d87f3e1..f7e41e0 100644
--- a/dlls/d3d9/tests/visual.c
+++ b/dlls/d3d9/tests/visual.c
@@ -292,6 +292,9 @@ static void lighting_test(IDirect3DDevice9 *device)
     hr = IDirect3DDevice9_SetRenderState(device, D3DRS_COLORWRITEENABLE, D3DCOLORWRITEENABLE_RED | D3DCOLORWRITEENABLE_GREEN | D3DCOLORWRITEENABLE_BLUE);
     ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState failed with %08x\n", hr);

+    hr = IDirect3DDevice9_SetFVF(device, 0);
+    ok(hr == D3D_OK, "IDirect3DDevice9_SetFVF returned %08x\n", hr);
+
     hr = IDirect3DDevice9_SetFVF(device, fvf);
     ok(hr == D3D_OK, "IDirect3DDevice9_SetFVF returned %08x\n", hr);