From 086a1a4ed2cf776c01130c02a13565fff9cbcf8b Mon Sep 17 00:00:00 2001 From: Hans Leidekker Date: Wed, 23 Dec 2015 11:07:39 +0100 Subject: [PATCH] wbemprox: Set correct variant type if array property value is NULL. Signed-off-by: Hans Leidekker Signed-off-by: Alexandre Julliard --- dlls/wbemprox/query.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 7fedf89d571..53e1044eea6 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -841,7 +841,8 @@ HRESULT get_propval( const struct view *view, UINT index, const WCHAR *name, VAR CIMTYPE basetype = view->table->columns[column].type & CIM_TYPE_MASK; val_ptr = to_safearray( (const struct array *)(INT_PTR)val, basetype ); - if (!vartype) vartype = to_vartype( basetype ) | VT_ARRAY; + if (!val_ptr) vartype = VT_NULL; + else if (!vartype) vartype = to_vartype( basetype ) | VT_ARRAY; goto done; } switch (view->table->columns[column].type & COL_TYPE_MASK)