[PATCH 1/2] wbemprox/tests: Add IEnumWbemClassObject::Next() tests.

[Gijs Vermeulen]

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com>
---
 dlls/wbemprox/tests/query.c | 66 +++++++++++++++++++++++++++++++++++++
 1 file changed, 66 insertions(+)

diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c
index 73740f18c8..e99e221c30 100644
--- a/dlls/wbemprox/tests/query.c
+++ b/dlls/wbemprox/tests/query.c
@@ -25,6 +25,7 @@
 #include "initguid.h"
 #include "objidl.h"
 #include "wbemcli.h"
+#include "wine/heap.h"
 #include "wine/test.h"
 
 static HRESULT exec_query( IWbemServices *services, const WCHAR *str, IEnumWbemClassObject **result )
@@ -158,6 +159,70 @@ static void test_associators( IWbemServices *services )
     }
 }
 
+static void test_IEnumWbemClassObject_Next( IWbemServices *services )
+{
+    BSTR wql = SysAllocString( L"wql" ), query = SysAllocString( L"SELECT * FROM Win32_IP4RouteTable" );
+    IWbemClassObject **obj, *obj1;
+    IEnumWbemClassObject *result;
+    DWORD count, num_objects = 0;
+    HRESULT hr;
+    int i;
+
+    hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result );
+    ok( hr == S_OK, "got %08x\n", hr );
+
+    count = 2;
+    hr = IEnumWbemClassObject_Next( result, 10000, 1, NULL, &count );
+    ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr );
+    ok( count == 2, "expected 0, got %u\n", count );
+
+    hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj1, NULL );
+    ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr );
+
+    count = 2;
+    hr = IEnumWbemClassObject_Next( result, 10000, 0, &obj1, &count );
+    todo_wine ok( hr == S_OK, "got %08x\n", hr );
+    todo_wine ok( count == 0, "expected 0, got %u\n", count );
+
+    for (;;)
+    {
+        hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj1, &count );
+        if (hr != S_OK) break;
+        num_objects++;
+        IWbemClassObject_Release(obj1);
+    }
+
+    hr = IEnumWbemClassObject_Reset( result );
+    ok( hr == S_OK, "got %08x\n", hr );
+
+    obj = heap_alloc( num_objects * sizeof( IWbemClassObject * ) );
+
+    count = 0;
+    hr = IEnumWbemClassObject_Next( result, 10000, num_objects, obj, &count );
+    todo_wine ok( hr == S_OK, "got %08x\n", hr );
+    todo_wine ok( count == num_objects, "expected %u, got %u\n", num_objects, count );
+
+    for (i = 0; i < count; i++)
+        IWbemClassObject_Release( obj[i] );
+
+    hr = IEnumWbemClassObject_Reset( result );
+    ok( hr == S_OK, "got %08x\n", hr );
+
+    count = 0;
+    hr = IEnumWbemClassObject_Next( result, 10000, num_objects + 1, obj, &count );
+    todo_wine ok( hr == S_FALSE, "got %08x\n", hr );
+    todo_wine ok( count == num_objects, "expected %u, got %u\n", num_objects, count );
+
+    for (i = 0; i < count; i++)
+        IWbemClassObject_Release( obj[i] );
+
+    heap_free( obj );
+
+    IEnumWbemClassObject_Release( result );
+    SysFreeString( query );
+    SysFreeString( wql );
+}
+
 static void _check_property( ULONG line, IWbemClassObject *obj, const WCHAR *prop, VARTYPE vartype, CIMTYPE cimtype )
 {
     CIMTYPE type = 0xdeadbeef;
@@ -1636,6 +1701,7 @@ START_TEST(query)
     ok( hr == S_OK, "failed to set proxy blanket %08x\n", hr );
 
     test_GetNames( services );
+    test_IEnumWbemClassObject_Next( services );
     test_associators( services );
     test_notification_query_async( services );
     test_query_async( services );
-- 
2.27.0

[PATCH 2/2] wbemprox: Support retrieving more than one object in IEnumWbemClassObject::Next().

[Gijs Vermeulen]

Patch by GitHub user pnevmoslon with some modifications.

Fixes gamepad support in Mortal Kombat 11.

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com>
---
 dlls/wbemprox/class.c       | 21 ++++++++++++---------
 dlls/wbemprox/tests/query.c | 12 ++++++------
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c
index ba7720b098..61adce841a 100644
--- a/dlls/wbemprox/class.c
+++ b/dlls/wbemprox/class.c
@@ -116,24 +116,27 @@ static HRESULT WINAPI enum_class_object_Next(
     struct table *table;
     static int once = 0;
     HRESULT hr;
+    ULONG i;
 
     TRACE("%p, %d, %u, %p, %p\n", iface, lTimeout, uCount, apObjects, puReturned);
 
-    if (!uCount) return WBEM_S_FALSE;
     if (!apObjects || !puReturned) return WBEM_E_INVALID_PARAMETER;
     if (lTimeout != WBEM_INFINITE && !once++) FIXME("timeout not supported\n");
 
     *puReturned = 0;
-    if (ec->index >= view->result_count) return WBEM_S_FALSE;
 
-    table = get_view_table( view, ec->index );
-    hr = create_class_object( table->name, iface, ec->index, NULL, apObjects );
-    if (hr != S_OK) return hr;
+    for (i = 0; i < uCount; ++i)
+    {
+        if (ec->index >= view->result_count) return WBEM_S_FALSE;
+        table = get_view_table( view, ec->index );
+        hr = create_class_object( table->name, iface, ec->index, NULL, apObjects );
+        if (hr != S_OK) return hr;
+
+        ++apObjects;
+        ++ec->index;
+        ++*puReturned;
+    }
 
-    ec->index++;
-    *puReturned = 1;
-    if (ec->index == view->result_count && uCount > 1) return WBEM_S_FALSE;
-    if (uCount > 1) return WBEM_S_TIMEDOUT;
     return WBEM_S_NO_ERROR;
 }
 
diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c
index e99e221c30..e48722f3bc 100644
--- a/dlls/wbemprox/tests/query.c
+++ b/dlls/wbemprox/tests/query.c
@@ -181,8 +181,8 @@ static void test_IEnumWbemClassObject_Next( IWbemServices *services )
 
     count = 2;
     hr = IEnumWbemClassObject_Next( result, 10000, 0, &obj1, &count );
-    todo_wine ok( hr == S_OK, "got %08x\n", hr );
-    todo_wine ok( count == 0, "expected 0, got %u\n", count );
+    ok( hr == S_OK, "got %08x\n", hr );
+    ok( count == 0, "expected 0, got %u\n", count );
 
     for (;;)
     {
@@ -199,8 +199,8 @@ static void test_IEnumWbemClassObject_Next( IWbemServices *services )
 
     count = 0;
     hr = IEnumWbemClassObject_Next( result, 10000, num_objects, obj, &count );
-    todo_wine ok( hr == S_OK, "got %08x\n", hr );
-    todo_wine ok( count == num_objects, "expected %u, got %u\n", num_objects, count );
+    ok( hr == S_OK, "got %08x\n", hr );
+    ok( count == num_objects, "expected %u, got %u\n", num_objects, count );
 
     for (i = 0; i < count; i++)
         IWbemClassObject_Release( obj[i] );
@@ -210,8 +210,8 @@ static void test_IEnumWbemClassObject_Next( IWbemServices *services )
 
     count = 0;
     hr = IEnumWbemClassObject_Next( result, 10000, num_objects + 1, obj, &count );
-    todo_wine ok( hr == S_FALSE, "got %08x\n", hr );
-    todo_wine ok( count == num_objects, "expected %u, got %u\n", num_objects, count );
+    ok( hr == S_FALSE, "got %08x\n", hr );
+    ok( count == num_objects, "expected %u, got %u\n", num_objects, count );
 
     for (i = 0; i < count; i++)
         IWbemClassObject_Release( obj[i] );
-- 
2.27.0