Module: wine Branch: master Commit: 1e32ae8bddb87a93a93ec34eedd35ba8c208f027 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e32ae8bddb87a93a93ec34eed...
Author: Hans Leidekker hans@codeweavers.com Date: Wed Oct 5 09:46:26 2016 +0200
wbemprox: Fix the variant type for Win32_SystemEnclosure.ChassisTypes.
Signed-off-by: Hans Leidekker hans@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/wbemprox/builtin.c | 2 +- dlls/wbemprox/tests/query.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 13f708f..4beac36 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -629,7 +629,7 @@ static const struct column col_stdregprov[] = static const struct column col_systemenclosure[] = { { prop_captionW, CIM_STRING }, - { prop_chassistypesW, CIM_UINT16|CIM_FLAG_ARRAY }, + { prop_chassistypesW, CIM_UINT16|CIM_FLAG_ARRAY, VT_I4|VT_ARRAY }, { prop_descriptionW, CIM_STRING }, { prop_lockpresentW, CIM_BOOLEAN }, { prop_manufacturerW, CIM_STRING }, diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index c0889f9..aab819d 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -590,7 +590,6 @@ static void test_Win32_SystemEnclosure( IWbemServices *services ) VariantInit( &val ); hr = IWbemClassObject_Get( obj, chassistypesW, 0, &val, &type, NULL ); ok( hr == S_OK, "failed to get chassis types %08x\n", hr ); - todo_wine ok( V_VT( &val ) == (VT_I4|VT_ARRAY), "unexpected variant type 0x%x\n", V_VT( &val ) ); ok( type == (CIM_UINT16|CIM_FLAG_ARRAY), "unexpected type 0x%x\n", type ); hr = SafeArrayAccessData( V_ARRAY( &val ), (void **)&data );