[PATCH v6 1/5] cfgmgr32: Always check the DEVPROP_OPERATOR_EQUALS mask while evaluating comparison filters.

[Vibhav Pant]

From: Vibhav Pant

---
 dlls/cfgmgr32/main.c           |  4 +---
 dlls/cfgmgr32/tests/cfgmgr32.c | 13 +++++++++++++
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/dlls/cfgmgr32/main.c b/dlls/cfgmgr32/main.c
index 35b78f8f8af..69004ea4b5c 100644
--- a/dlls/cfgmgr32/main.c
+++ b/dlls/cfgmgr32/main.c
@@ -418,10 +418,8 @@ static HRESULT devprop_filter_eval_compare( const DEV_OBJECT *obj, const DEVPROP
                 cmp = memcmp( prop->Buffer, cmp_prop->Buffer, prop->BufferSize );
                 break;
             }
-            if (op == DEVPROP_OPERATOR_EQUALS)
+            if (op & DEVPROP_OPERATOR_EQUALS)
                 ret = !cmp;
-            else if (op & DEVPROP_OPERATOR_EQUALS && !cmp)
-                ret = TRUE;
             else
                 ret = (op & DEVPROP_OPERATOR_LESS_THAN) ? cmp < 0 : cmp > 0;
         }
diff --git a/dlls/cfgmgr32/tests/cfgmgr32.c b/dlls/cfgmgr32/tests/cfgmgr32.c
index 2652fac3abb..5841a1a8d4b 100644
--- a/dlls/cfgmgr32/tests/cfgmgr32.c
+++ b/dlls/cfgmgr32/tests/cfgmgr32.c
@@ -1145,6 +1145,19 @@ static void test_DevGetObjects( void )
         }
     }

+    memset( filters, 0, sizeof( filters ) );
+    filters[0] = valid_filter;
+    filters[0].Operator = DEVPROP_OPERATOR_NOT_EQUALS;
+    bool_val = FALSE;
+    len = 0;
+    objects = NULL;
+    hr = pDevGetObjects( DevObjectTypeDeviceInterface, DevQueryFlagNone, 0, NULL, 1, filters, &len, &objects );
+    ok( hr == S_OK, "got hr %#lx\n", hr );
+    ok( len > 0, "got len %lu\n", len );
+    ok( !!objects, "got objects %p\n", objects );
+    pDevFreeObjects( len, objects );
+    bool_val = TRUE;
+
     for (i = 0; i < ARRAY_SIZE( test_cases ); i++)
     {
         const DEV_OBJECT *objects = NULL;