marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wbemprox: Return a null variant instead of an empty string if the property isn't set.

oldstable
Hans Leidekker 2012-07-13 11:34:42 +02:00 committed by Alexandre Julliard
parent 5acdba54a0
commit cd5cad6959
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dlls/wbemprox/query.c
View File

@ -728,6 +728,9 @@ static void set_variant( VARTYPE vartype, LONGLONG val, BSTR val_bstr, VARIANT *
V_VT( ret ) = VT_UI4;
V_UI4( ret ) = val;
return;
case VT_NULL:
V_VT( ret ) = VT_NULL;
return;
default:
ERR("unhandled variant type %u\n", vartype);
return;
@ -758,8 +761,13 @@ HRESULT get_propval( const struct view *view, UINT index, const WCHAR *name, VAR
{
case CIM_STRING:
case CIM_DATETIME:
vartype = VT_BSTR;
val_bstr = SysAllocString( (const WCHAR *)(INT_PTR)val );
if (val)
{
vartype = VT_BSTR;
val_bstr = SysAllocString( (const WCHAR *)(INT_PTR)val );
}
else
vartype = VT_NULL;
break;
case CIM_SINT16:
if (!vartype) vartype = VT_I2;