[ros-diffs] [akhaldi] 71735: [WBEMPROX_WINETEST] Sync with Wine Staging 1.9.11. CORE-11368

Author: akhaldi
Date: Sat Jul  2 13:07:46 2016
New Revision: 71735

URL: http://svn.reactos.org/svn/reactos?rev=71735&view=rev
Log:
[WBEMPROX_WINETEST] Sync with Wine Staging 1.9.11. CORE-11368

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 Jul  2 13:07:46 2016
@@ -147,6 +147,29 @@
     SysFreeString( query );
 }
 
+static void test_associators( IWbemServices *services )
+{
+    static const WCHAR query1[] =
+       
{'A','S','S','O','C','I','A','T','O','R','S','
','O','F','
','{','W','i','n','3','2','_',
+        
'L','o','g','i','c','a','l','D','i','s','k','.','D','e','v','i','c','e','I','D','=','"','C',':','"','}',0};
+    static const WCHAR query2[] =
+       
{'A','S','S','O','C','I','A','T','O','R','S','
','O','F','
','{','W','i','n','3','2','_',
+        
'L','o','g','i','c','a','l','D','i','s','k','.','D','e','v','i','c','e','I','D','=','"','C',':','"','}','
',
+         'W','H','E','R','E','
','A','s','s','o','c','C','l','a','s','s','
','=','
','W','i','n','3','2','_',
+        
'L','o','g','i','c','a','l','D','i','s','k','T','o','P','a','r','t','i','t','i','o','n',0};
+    static const WCHAR *test[] = { query1, query2 };
+    HRESULT hr;
+    IEnumWbemClassObject *result;
+    UINT i;
+
+    for (i = 0; i < sizeof(test)/sizeof(test[0]); i++)
+    {
+        hr = exec_query( services, test[i], &result );
+        todo_wine ok( hr == S_OK, "query %u failed: %08x\n", i, hr );
+        if (result) IEnumWbemClassObject_Release( result );
+    }
+}
+
 static void test_Win32_Service( IWbemServices *services )
 {
     static const WCHAR returnvalueW[] =
{'R','e','t','u','r','n','V','a','l','u','e',0};
@@ -1054,6 +1077,7 @@
     ok( hr == S_OK, "failed to set proxy blanket %08x\n", hr );
 
     test_select( services );
+    test_associators( services );
     test_Win32_Bios( services );
     test_Win32_Process( services );
     test_Win32_Service( 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 Jul  2 13:07:46 2016
@@ -168,10 +168,7 @@
     {
         resource = SysAllocString( test[i].path );
         hr = IWbemLocator_ConnectServer( locator, resource, NULL, NULL, NULL, 0, NULL,
NULL, &services );
-        if (test[i].todo) todo_wine
-            ok( hr == test[i].result || broken(hr == test[i].result_broken),
-                "%u: expected %08x got %08x\n", i, test[i].result, hr );
-        else
+        todo_wine_if (test[i].todo)
             ok( hr == test[i].result || broken(hr == test[i].result_broken),
                 "%u: expected %08x got %08x\n", i, test[i].result, hr );
         SysFreeString( resource );