H. Verbeet : d3d9: Check for a NULL shader in IDirect3DDevice9Impl_GetVertexShader

Alexandre Julliard julliard at wine.codeweavers.com
Wed Dec 14 05:23:31 CST 2005


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

Author: H. Verbeet <hverbeet at gmail.com>
Date:   Wed Dec 14 11:29:05 2005 +0100

d3d9: Check for a NULL shader in IDirect3DDevice9Impl_GetVertexShader
before getting the parent.

---

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

diff --git a/dlls/d3d9/vertexshader.c b/dlls/d3d9/vertexshader.c
index e4f76b9..034b097 100644
--- a/dlls/d3d9/vertexshader.c
+++ b/dlls/d3d9/vertexshader.c
@@ -148,7 +148,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_GetV
 
     TRACE("(%p) : Relay  device@%p\n", This, This->WineD3DDevice);
     hrc = IWineD3DDevice_GetVertexShader(This->WineD3DDevice, &pShader);
-    if(hrc == D3D_OK){
+    if(hrc == D3D_OK && pShader != NULL){
        hrc = IWineD3DVertexShader_GetParent(pShader, (IUnknown **)ppShader);
        IWineD3DVertexShader_Release(pShader);
     } else {




More information about the wine-cvs mailing list