Rob Shearman : d3d8/9: Use WINED3D_OK instead of D3D_OK in vertexshader.c.

[Alexandre Julliard]

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

Author: Rob Shearman <robertshearman(a)gmail.com>
Date:   Fri Oct  3 12:55:51 2008 +0100

d3d8/9: Use WINED3D_OK instead of D3D_OK in vertexshader.c.

---

 dlls/d3d8/vertexshader.c |    4 ++--
 dlls/d3d9/vertexshader.c |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/d3d8/vertexshader.c b/dlls/d3d8/vertexshader.c
index 3af93b4..16a809e 100644
--- a/dlls/d3d8/vertexshader.c
+++ b/dlls/d3d8/vertexshader.c
@@ -67,11 +67,11 @@ static ULONG WINAPI IDirect3DVertexShader8Impl_Release(IDirect3DVertexShader8 *i
 static HRESULT WINAPI IDirect3DVertexShader8Impl_GetDevice(IDirect3DVertexShader8 *iface, IDirect3DDevice8** ppDevice) {
     IDirect3DVertexShader8Impl *This = (IDirect3DVertexShader8Impl *)iface;
     IWineD3DDevice *myDevice = NULL;
-    HRESULT hr = D3D_OK;
+    HRESULT hr;
     TRACE("(%p) : Relay\n", This);
 
     hr = IWineD3DVertexShader_GetDevice(This->wineD3DVertexShader, &myDevice);
-    if (D3D_OK == hr && myDevice != NULL) {
+    if (WINED3D_OK == hr && myDevice != NULL) {
         hr = IWineD3DDevice_GetParent(myDevice, (IUnknown **)ppDevice);
         IWineD3DDevice_Release(myDevice);
     } else {
diff --git a/dlls/d3d9/vertexshader.c b/dlls/d3d9/vertexshader.c
index d40d0a5..abe283d 100644
--- a/dlls/d3d9/vertexshader.c
+++ b/dlls/d3d9/vertexshader.c
@@ -69,12 +69,12 @@ static ULONG WINAPI IDirect3DVertexShader9Impl_Release(LPDIRECT3DVERTEXSHADER9 i
 static HRESULT WINAPI IDirect3DVertexShader9Impl_GetDevice(LPDIRECT3DVERTEXSHADER9 iface, IDirect3DDevice9** ppDevice) {
     IDirect3DVertexShader9Impl *This = (IDirect3DVertexShader9Impl *)iface;
     IWineD3DDevice *myDevice = NULL;
-    HRESULT hr = D3D_OK;
+    HRESULT hr;
     TRACE("(%p) : Relay\n", This);
 
     EnterCriticalSection(&d3d9_cs);
     hr = IWineD3DVertexShader_GetDevice(This->wineD3DVertexShader, &myDevice);
-    if (D3D_OK == hr && myDevice != NULL) {
+    if (WINED3D_OK == hr && myDevice != NULL) {
         hr = IWineD3DDevice_GetParent(myDevice, (IUnknown **)ppDevice);
         IWineD3DDevice_Release(myDevice);
     } else {