Rico Schüller : d3d10: Add null_type.

[Alexandre Julliard]

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

Author: Rico Schüller <kgbricola at web.de>
Date:   Thu Oct  1 11:53:57 2009 +0200

d3d10: Add null_type.

---

 dlls/d3d10/effect.c |   28 ++++++++++++++++++++++------
 1 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c
index 9c654a4..6a69077 100644
--- a/dlls/d3d10/effect.c
+++ b/dlls/d3d10/effect.c
@@ -57,16 +57,22 @@ static struct d3d10_effect_technique null_technique =
         {&d3d10_effect_technique_vtbl, NULL, NULL, 0, 0, NULL, NULL};
 static struct d3d10_effect_pass null_pass =
         {&d3d10_effect_pass_vtbl, NULL, NULL, 0, 0, 0, NULL, NULL};
+static struct d3d10_effect_type null_type =
+        {&d3d10_effect_type_vtbl, 0, {NULL, NULL, 0}, NULL, NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL};
 static struct d3d10_effect_variable null_local_buffer =
-        {(ID3D10EffectVariableVtbl *)&d3d10_effect_constant_buffer_vtbl, NULL, NULL, NULL, NULL, 0, 0, 0, 0, NULL, NULL, NULL};
+        {(ID3D10EffectVariableVtbl *)&d3d10_effect_constant_buffer_vtbl,
+        NULL, NULL, NULL, NULL, 0, 0, 0, 0, &null_type, NULL, NULL};
 static struct d3d10_effect_variable null_variable =
-        {&d3d10_effect_variable_vtbl, NULL, NULL, NULL, NULL, 0, 0, 0, 0, NULL, NULL, NULL};
+        {&d3d10_effect_variable_vtbl, NULL, NULL, NULL, NULL, 0, 0, 0, 0, &null_type, NULL, NULL};
 static struct d3d10_effect_variable null_scalar_variable =
-        {(ID3D10EffectVariableVtbl *)&d3d10_effect_scalar_variable_vtbl, NULL, NULL, NULL, NULL, 0, 0, 0, 0, NULL, NULL, NULL};
+        {(ID3D10EffectVariableVtbl *)&d3d10_effect_scalar_variable_vtbl,
+        NULL, NULL, NULL, NULL, 0, 0, 0, 0, &null_type, NULL, NULL};
 static struct d3d10_effect_variable null_vector_variable =
-        {(ID3D10EffectVariableVtbl *)&d3d10_effect_vector_variable_vtbl, NULL, NULL, NULL, NULL, 0, 0, 0, 0, NULL, NULL, NULL};
+        {(ID3D10EffectVariableVtbl *)&d3d10_effect_vector_variable_vtbl,
+        NULL, NULL, NULL, NULL, 0, 0, 0, 0, &null_type, NULL, NULL};
 static struct d3d10_effect_variable null_matrix_variable =
-        {(ID3D10EffectVariableVtbl *)&d3d10_effect_matrix_variable_vtbl, NULL, NULL, NULL, NULL, 0, 0, 0, 0, NULL, NULL, NULL};
+        {(ID3D10EffectVariableVtbl *)&d3d10_effect_matrix_variable_vtbl,
+        NULL, NULL, NULL, NULL, 0, 0, 0, 0, &null_type, NULL, NULL};
 
 static struct d3d10_effect_type *get_fx10_type(struct d3d10_effect *effect, const char *data, DWORD offset);
 
@@ -3249,7 +3255,17 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_type_GetDesc(ID3D10EffectType *ifa
 
     TRACE("iface %p, desc %p\n", iface, desc);
 
-    if (!desc) return E_INVALIDARG;
+    if (This == &null_type)
+    {
+        WARN("Null type specified\n");
+        return E_FAIL;
+    }
+
+    if (!desc)
+    {
+        WARN("Invalid argument specified\n");
+        return E_INVALIDARG;
+    }
 
     desc->TypeName = This->name;
     desc->Class = This->type_class;