[ros-diffs] [akhaldi] 62987: [WBEMPROX_WINETEST] * Sync with Wine 1.7.17. CORE-8080

Author: akhaldi
Date: Sat Apr 26 17:13:09 2014
New Revision: 62987

URL: http://svn.reactos.org/svn/reactos?rev=62987&view=rev
Log:
[WBEMPROX_WINETEST]
* Sync with Wine 1.7.17.
CORE-8080

Modified:
    trunk/rostests/winetests/wbemprox/query.c
    trunk/rostests/winetests/wbemprox/services.c

Modified: trunk/rostests/winetests/wbemprox/query.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wbemprox/query.…
==============================================================================
--- trunk/rostests/winetests/wbemprox/query.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/wbemprox/query.c	[iso-8859-1] Sat Apr 26 17:13:09 2014
@@ -46,7 +46,7 @@
         {
             VARIANT var;
 
-            IEnumWbemClassObject_Next( *result, WBEM_INFINITE, 1, &obj, &count
);
+            IEnumWbemClassObject_Next( *result, 10000, 1, &obj, &count );
             if (!count) break;
 
             if (IWbemClassObject_Get( obj, captionW, 0, &var, NULL, NULL ) ==
WBEM_S_NO_ERROR)
@@ -616,6 +616,40 @@
     SysFreeString( query );
 }
 
+static void test_GetNames( IWbemServices *services )
+{
+    static const WCHAR queryW[] =
+        {'S','E','L','E','C','T','
','*',' ','F','R','O','M','
','W','i','n','3','2','_',
+        
'O','p','e','r','a','t','i','n','g','S','y','s','t','e','m',0};
+    BSTR wql = SysAllocString( wqlW ), query = SysAllocString( queryW );
+    IEnumWbemClassObject *result;
+    HRESULT hr;
+
+    hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result );
+    ok( hr == S_OK, "got %08x\n", hr );
+
+    for (;;)
+    {
+        IWbemClassObject *obj;
+        SAFEARRAY *names;
+        ULONG count;
+        VARIANT val;
+
+        IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count );
+        if (!count) break;
+
+        VariantInit( &val );
+        hr = IWbemClassObject_GetNames( obj, NULL, WBEM_FLAG_NONSYSTEM_ONLY, &val,
&names );
+        ok( hr == S_OK, "got %08x\n", hr );
+
+        SafeArrayDestroy( names );
+        IWbemClassObject_Release( obj );
+    }
+    IEnumWbemClassObject_Release( result );
+    SysFreeString( query );
+    SysFreeString( wql );
+}
+
 START_TEST(query)
 {
     static const WCHAR cimv2W[] =
{'R','O','O','T','\\','C','I','M','V','2',0};
@@ -654,6 +688,7 @@
     test_StdRegProv( services );
     test_notification_query_async( services );
     test_query_async( services );
+    test_GetNames( services );
 
     SysFreeString( path );
     IWbemServices_Release( services );

Modified: trunk/rostests/winetests/wbemprox/services.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wbemprox/servic…
==============================================================================
--- trunk/rostests/winetests/wbemprox/services.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/wbemprox/services.c	[iso-8859-1] Sat Apr 26 17:13:09 2014
@@ -115,7 +115,7 @@
     {
         const WCHAR *path;
         HRESULT      result;
-        int          todo;
+        BOOL         todo;
         HRESULT      result_broken;
     }
     test[] =
@@ -124,10 +124,10 @@
         { path1W, WBEM_E_INVALID_NAMESPACE },
         { path2W, WBEM_E_INVALID_NAMESPACE },
         { path3W, WBEM_E_INVALID_NAMESPACE },
-        { path4W, WBEM_E_INVALID_NAMESPACE, 0, WBEM_E_INVALID_PARAMETER },
+        { path4W, WBEM_E_INVALID_NAMESPACE, FALSE, WBEM_E_INVALID_PARAMETER },
         { path5W, WBEM_E_INVALID_NAMESPACE },
-        { path6W, 0x800706ba, 1 },
-        { path7W, 0x800706ba, 1 },
+        { path6W, 0x800706ba, TRUE },
+        { path7W, 0x800706ba, TRUE },
         { path8W, WBEM_E_INVALID_NAMESPACE },
         { path9W, S_OK },
         { path10W, WBEM_E_INVALID_PARAMETER },