Thomas Faber : wbemprox: Allocate a large enough buffer in get_computername.

[Alexandre Julliard]

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

Author: Thomas Faber 
Date:   Sun Feb 22 21:17:46 2015 +0100

wbemprox: Allocate a large enough buffer in get_computername.

---

dlls/wbemprox/builtin.c     |  2 +-
 dlls/wbemprox/tests/query.c | 51 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+), 1 deletion(-)

diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c
index 16c58a8..6ead196 100644
--- a/dlls/wbemprox/builtin.c
+++ b/dlls/wbemprox/builtin.c
@@ -1121,7 +1121,7 @@ static UINT64 get_total_physical_memory(void)
 static WCHAR *get_computername(void)
 {
     WCHAR *ret;
-    DWORD size = MAX_COMPUTERNAME_LENGTH;
+    DWORD size = MAX_COMPUTERNAME_LENGTH + 1;

if (!(ret = heap_alloc( size * sizeof(WCHAR) ))) return NULL;
     GetComputerNameW( ret, &size );
diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c
index 467a63c..bdac50d 100644
--- a/dlls/wbemprox/tests/query.c
+++ b/dlls/wbemprox/tests/query.c
@@ -341,6 +341,56 @@ static void test_Win32_Process( IWbemServices *services )
     IWbemClassObject_Release( out );
 }

+static void test_Win32_ComputerSystem( IWbemServices *services )
+{
+    static const WCHAR nameW[] = {'N','a','m','e',0};
+    static const WCHAR queryW[] =
+        {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_',
+         'C','o','m','p','u','t','e','r','S','y','s','t','e','m',0};
+    BSTR wql = SysAllocString( wqlW ), query = SysAllocString( queryW );
+    IEnumWbemClassObject *result;
+    IWbemClassObject *service;
+    VARIANT value;
+    CIMTYPE type;
+    HRESULT hr;
+    WCHAR compname[MAX_COMPUTERNAME_LENGTH + 1];
+    DWORD len, count;
+
+    len = sizeof(compname) / sizeof(compname[0]);
+    if (!GetComputerNameW( compname, &len ))
+        compname[0] = 0;
+
+    if (!compname[0])
+    {
+        skip( "Failed to get computer name\n" );
+        return;
+    }
+
+    hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result );
+    if (hr != S_OK)
+    {
+        win_skip( "Win32_ComputerSystem not available\n" );
+        return;
+    }
+
+    IEnumWbemClassObject_Next( result, 10000, 1, &service, &count );
+    ok( hr == S_OK, "got %08x\n", hr );
+
+    type = 0xdeadbeef;
+    VariantInit( &value );
+    hr = IWbemClassObject_Get( service, nameW, 0, &value, &type, NULL );
+    ok( hr == S_OK, "failed to get computer name %08x\n", hr );
+    ok( V_VT( &value ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &value ) );
+    ok( type == CIM_STRING, "unexpected type 0x%x\n", type );
+    ok( !lstrcmpiW( V_BSTR( &value ), compname ), "got %s, expected %s\n", wine_dbgstr_w(V_BSTR(&value)), wine_dbgstr_w(compname) );
+    VariantClear( &value );
+
+    IWbemClassObject_Release( service );
+    IEnumWbemClassObject_Release( result );
+    SysFreeString( query );
+    SysFreeString( wql );
+}
+
 static void test_StdRegProv( IWbemServices *services )
 {
     static const WCHAR enumkeyW[] = {'E','n','u','m','K','e','y',0};
@@ -756,6 +806,7 @@ START_TEST(query)
     test_select( services );
     test_Win32_Process( services );
     test_Win32_Service( services );
+    test_Win32_ComputerSystem( services );
     test_StdRegProv( services );
     test_notification_query_async( services );
     test_query_async( services );