[PATCH 0/3] MR10176: cfgmgr32/tests: Tweak the test results for some testbot VMs.

[Rémi Bernon]

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/10176

[PATCH 1/3] cfgmgr32/tests: Add results for missing permissions

[Rémi Bernon]

From: Rémi Bernon <[e-mail]>

---
 dlls/cfgmgr32/tests/cfgmgr32.c | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/dlls/cfgmgr32/tests/cfgmgr32.c b/dlls/cfgmgr32/tests/cfgmgr32.c
index 68a5a7a9dc3..d840ca33660 100644
--- a/dlls/cfgmgr32/tests/cfgmgr32.c
+++ b/dlls/cfgmgr32/tests/cfgmgr32.c
@@ -2280,20 +2280,26 @@ static void test_CM_Open_Class_Key(void)
     ret = CM_Open_Class_KeyW( &guid, NULL, KEY_QUERY_VALUE, RegDisposition_OpenExisting, &hkey, CM_OPEN_CLASS_KEY_INSTALLER );
     ok_x4( ret, ==, CR_NO_SUCH_REGISTRY_KEY );
     ret = CM_Open_Class_KeyW( &guid, NULL, KEY_QUERY_VALUE, RegDisposition_OpenAlways, &hkey, CM_OPEN_CLASS_KEY_INSTALLER );
-    ok_x4( ret, ==, CR_SUCCESS );
-    check_object_name( hkey, L"\\REGISTRY\\MACHINE\\SYSTEM\\ControlSet001\\Control\\Class\\{cdcdcdcd-cdcd-cdcd-cdcd-cdcdcdcdcdcd}" );
-    RegCloseKey( hkey );
-    ret = RegDeleteKeyW( HKEY_LOCAL_MACHINE, L"SYSTEM\\ControlSet001\\Control\\Class\\{cdcdcdcd-cdcd-cdcd-cdcd-cdcdcdcdcdcd}" );
-    ok_x4( ret, ==, ERROR_SUCCESS );
+    if (ret != CR_ACCESS_DENIED)
+    {
+        ok_x4( ret, ==, CR_SUCCESS );
+        check_object_name( hkey, L"\\REGISTRY\\MACHINE\\SYSTEM\\ControlSet001\\Control\\Class\\{cdcdcdcd-cdcd-cdcd-cdcd-cdcdcdcdcdcd}" );
+        RegCloseKey( hkey );
+        ret = RegDeleteKeyW( HKEY_LOCAL_MACHINE, L"SYSTEM\\ControlSet001\\Control\\Class\\{cdcdcdcd-cdcd-cdcd-cdcd-cdcdcdcdcdcd}" );
+        ok_x4( ret, ==, ERROR_SUCCESS );
+    }
 
     ret = CM_Open_Class_KeyW( &guid, NULL, KEY_QUERY_VALUE, RegDisposition_OpenExisting, &hkey, CM_OPEN_CLASS_KEY_INTERFACE );
     ok_x4( ret, ==, CR_NO_SUCH_REGISTRY_KEY );
     ret = CM_Open_Class_KeyW( &guid, NULL, KEY_QUERY_VALUE, RegDisposition_OpenAlways, &hkey, CM_OPEN_CLASS_KEY_INTERFACE );
-    ok_x4( ret, ==, CR_SUCCESS );
-    check_object_name( hkey, L"\\REGISTRY\\MACHINE\\SYSTEM\\ControlSet001\\Control\\DeviceClasses\\{cdcdcdcd-cdcd-cdcd-cdcd-cdcdcdcdcdcd}" );
-    RegCloseKey( hkey );
-    ret = RegDeleteKeyW( HKEY_LOCAL_MACHINE, L"SYSTEM\\ControlSet001\\Control\\DeviceClasses\\{cdcdcdcd-cdcd-cdcd-cdcd-cdcdcdcdcdcd}" );
-    ok_x4( ret, ==, ERROR_SUCCESS );
+    if (ret != CR_ACCESS_DENIED)
+    {
+        ok_x4( ret, ==, CR_SUCCESS );
+        check_object_name( hkey, L"\\REGISTRY\\MACHINE\\SYSTEM\\ControlSet001\\Control\\DeviceClasses\\{cdcdcdcd-cdcd-cdcd-cdcd-cdcdcdcdcdcd}" );
+        RegCloseKey( hkey );
+        ret = RegDeleteKeyW( HKEY_LOCAL_MACHINE, L"SYSTEM\\ControlSet001\\Control\\DeviceClasses\\{cdcdcdcd-cdcd-cdcd-cdcd-cdcdcdcdcdcd}" );
+        ok_x4( ret, ==, ERROR_SUCCESS );
+    }
 }
 
 static void test_CM_Get_Class_Registry_Property(void)
@@ -2812,7 +2818,7 @@ static void test_CM_Open_Device_Interface_Key(void)
     ret = CM_Open_Device_Interface_KeyW( L"DISPLAY_ADAPTER", KEY_QUERY_VALUE, RegDisposition_OpenExisting, &hkey, 0 );
     ok_x4( ret, ==, CR_INVALID_DATA );
     ret = CM_Open_Device_Interface_KeyW( L"\\\\?\\WINETEST#WINETEST#0123456#{5b45201d-f2f2-4f3b-85bb-30ff1f953599}", KEY_QUERY_VALUE, RegDisposition_OpenAlways, &hkey, 0 );
-    ok_x4( ret, ==, CR_NO_SUCH_DEVICE_INTERFACE );
+    if (ret != CR_ACCESS_DENIED) ok_x4( ret, ==, CR_NO_SUCH_DEVICE_INTERFACE );
 
     ret = CM_Open_Device_Interface_KeyW( iface, KEY_QUERY_VALUE, RegDisposition_OpenExisting, &hkey, 0 );
     if (ret == CR_NO_SUCH_REGISTRY_KEY) ret = CM_Open_Device_Interface_KeyW( iface, KEY_QUERY_VALUE, RegDisposition_OpenAlways, &hkey, 0 );
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/10176

[PATCH 2/3] cfgmgr32/tests: Skip some localized names tests.

[Rémi Bernon]

From: Rémi Bernon <[e-mail]>

---
 dlls/cfgmgr32/tests/Makefile.in |  2 +-
 dlls/cfgmgr32/tests/cfgmgr32.c  | 53 +++++++++++++++++++++++----------
 2 files changed, 38 insertions(+), 17 deletions(-)

diff --git a/dlls/cfgmgr32/tests/Makefile.in b/dlls/cfgmgr32/tests/Makefile.in
index 90f5ac496a3..97d777ecfbb 100644
--- a/dlls/cfgmgr32/tests/Makefile.in
+++ b/dlls/cfgmgr32/tests/Makefile.in
@@ -1,5 +1,5 @@
 TESTDLL = cfgmgr32.dll
-IMPORTS = cfgmgr32 setupapi ole32 uuid advapi32
+IMPORTS = cfgmgr32 user32 setupapi ole32 uuid advapi32
 
 SOURCES = \
 	cfgmgr32.c
diff --git a/dlls/cfgmgr32/tests/cfgmgr32.c b/dlls/cfgmgr32/tests/cfgmgr32.c
index d840ca33660..e2f9ab17d81 100644
--- a/dlls/cfgmgr32/tests/cfgmgr32.c
+++ b/dlls/cfgmgr32/tests/cfgmgr32.c
@@ -2445,11 +2445,14 @@ static void test_CM_Get_Class_Registry_Property(void)
 
 static void test_CM_Get_Class_Property(void)
 {
+    BOOL localized = LOWORD( GetKeyboardLayout( 0 ) ) != 0x0409;
     GUID guid = GUID_DEVCLASS_DISPLAY;
     BYTE buffer[1024];
     DWORD type, len;
     CONFIGRET ret;
 
+    if (localized) skip( "skipping some localized names tests\n" );
+
     ret = CM_Get_Class_Property_ExW( &guid, &DEVPKEY_DeviceClass_Name, NULL, NULL, NULL, 0, NULL );
     ok_x4( ret, ==, CR_INVALID_POINTER );
     ret = CM_Get_Class_Property_ExW( NULL, &DEVPKEY_DeviceClass_Name, &type, buffer, &len, 0, NULL );
@@ -2467,11 +2470,11 @@ static void test_CM_Get_Class_Property(void)
     len = 0;
     ret = CM_Get_Class_Property_ExW( &guid, &DEVPKEY_DeviceClass_Name, &type, NULL, &len, 0, NULL );
     ok_x4( ret, ==, CR_BUFFER_SMALL );
-    ok_x4( len, ==, 0x22 );
+    if (!localized) ok_x4( len, ==, 0x22 );
     len = 1;
     ret = CM_Get_Class_Property_ExW( &guid, &DEVPKEY_DeviceClass_Name, &type, buffer, &len, 0, NULL );
     ok_x4( ret, ==, CR_BUFFER_SMALL );
-    ok_x4( len, ==, 0x22 );
+    if (!localized) ok_x4( len, ==, 0x22 );
 
     len = sizeof(buffer);
     memset( &guid, 0xcd, sizeof(guid) );
@@ -2491,8 +2494,11 @@ static void test_CM_Get_Class_Property(void)
     ret = CM_Get_Class_Property_ExW( &guid, &DEVPKEY_DeviceClass_Name, &type, buffer, &len, 0, NULL );
     ok_x4( ret, ==, CR_SUCCESS );
     ok_x4( type, ==, DEVPROP_TYPE_STRING );
-    ok_x4( len, ==, 0x22 );
-    ok_wcs( L"Display adapters", (WCHAR *)buffer );
+    if (!localized)
+    {
+        ok_x4( len, ==, 0x22 );
+        ok_wcs( L"Display adapters", (WCHAR *)buffer );
+    }
 
     type = 0xdeadbeef;
     len = sizeof(buffer);
@@ -2500,8 +2506,11 @@ static void test_CM_Get_Class_Property(void)
     ret = CM_Get_Class_Property_ExW( &guid, &DEVPKEY_NAME, &type, buffer, &len, 0, NULL );
     ok_x4( ret, ==, CR_SUCCESS );
     ok_x4( type, ==, DEVPROP_TYPE_STRING );
-    ok_x4( len, ==, 0x22 );
-    ok_wcs( L"Display adapters", (WCHAR *)buffer );
+    if (!localized)
+    {
+        ok_x4( len, ==, 0x22 );
+        ok_wcs( L"Display adapters", (WCHAR *)buffer );
+    }
 
     type = 0xdeadbeef;
     len = sizeof(buffer);
@@ -2509,8 +2518,11 @@ static void test_CM_Get_Class_Property(void)
     ret = CM_Get_Class_Property_ExW( &guid, &DEVPKEY_DeviceClass_ClassName, &type, buffer, &len, 0, NULL );
     ok_x4( ret, ==, CR_SUCCESS );
     ok_x4( type, ==, DEVPROP_TYPE_STRING );
-    ok_x4( len, ==, 0x10 );
-    ok_wcs( L"Display", (WCHAR *)buffer );
+    if (!localized)
+    {
+        ok_x4( len, ==, 0x10 );
+        ok_wcs( L"Display", (WCHAR *)buffer );
+    }
 
     len = sizeof(buffer);
     ret = CM_Get_Class_Property_ExW( &guid, &DEVPKEY_DeviceClass_UpperFilters, &type, buffer, &len, 0, NULL );
@@ -2572,8 +2584,11 @@ static void test_CM_Get_Class_Property(void)
     ret = CM_Get_Class_Property_ExW( &guid, &DEVPKEY_DeviceClass_Name, &type, buffer, &len, 0, NULL );
     ok_x4( ret, ==, CR_SUCCESS );
     ok_x4( type, ==, DEVPROP_TYPE_STRING );
-    ok_x4( len, ==, 0x30 );
-    ok_wcs( L"Human Interface Devices", (WCHAR *)buffer );
+    if (!localized)
+    {
+        ok_x4( len, ==, 0x30 );
+        ok_wcs( L"Human Interface Devices", (WCHAR *)buffer );
+    }
 
     type = 0xdeadbeef;
     len = sizeof(buffer);
@@ -2581,8 +2596,11 @@ static void test_CM_Get_Class_Property(void)
     ret = CM_Get_Class_Property_ExW( &guid, &DEVPKEY_NAME, &type, buffer, &len, 0, NULL );
     ok_x4( ret, ==, CR_SUCCESS );
     ok_x4( type, ==, DEVPROP_TYPE_STRING );
-    ok_x4( len, ==, 0x30 );
-    ok_wcs( L"Human Interface Devices", (WCHAR *)buffer );
+    if (!localized)
+    {
+        ok_x4( len, ==, 0x30 );
+        ok_wcs( L"Human Interface Devices", (WCHAR *)buffer );
+    }
 
     type = 0xdeadbeef;
     len = sizeof(buffer);
@@ -2822,10 +2840,13 @@ static void test_CM_Open_Device_Interface_Key(void)
 
     ret = CM_Open_Device_Interface_KeyW( iface, KEY_QUERY_VALUE, RegDisposition_OpenExisting, &hkey, 0 );
     if (ret == CR_NO_SUCH_REGISTRY_KEY) ret = CM_Open_Device_Interface_KeyW( iface, KEY_QUERY_VALUE, RegDisposition_OpenAlways, &hkey, 0 );
-    ok_x4( ret, ==, CR_SUCCESS );
-    check_object_name( hkey, expect );
-    RegCloseKey( hkey );
-    if (ret == CR_NO_SUCH_REGISTRY_KEY) RegDeleteKeyW( HKEY_LOCAL_MACHINE, expect + wcslen( L"\\REGISTRY\\MACHINE\\" ) );
+    if (ret != CR_ACCESS_DENIED)
+    {
+        ok_x4( ret, ==, CR_SUCCESS );
+        check_object_name( hkey, expect );
+        RegCloseKey( hkey );
+        if (ret == CR_NO_SUCH_REGISTRY_KEY) RegDeleteKeyW( HKEY_LOCAL_MACHINE, expect + wcslen( L"\\REGISTRY\\MACHINE\\" ) );
+    }
 
     for (UINT flag = 1; flag; flag <<= 1)
     {
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/10176

[PATCH 3/3] cfgmgr32/tests: Skip some HID devices tests if none are present.

[Rémi Bernon]

From: Rémi Bernon <[e-mail]>

---
 dlls/cfgmgr32/tests/cfgmgr32.c | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/dlls/cfgmgr32/tests/cfgmgr32.c b/dlls/cfgmgr32/tests/cfgmgr32.c
index e2f9ab17d81..676537c97bd 100644
--- a/dlls/cfgmgr32/tests/cfgmgr32.c
+++ b/dlls/cfgmgr32/tests/cfgmgr32.c
@@ -619,6 +619,11 @@ static void test_CM_Get_Device_Interface_Property_Keys(void)
     guid = GUID_DEVINTERFACE_HID;
     ret = CM_Get_Device_Interface_List_SizeW( &size, &guid, NULL, CM_GET_DEVICE_INTERFACE_LIST_PRESENT );
     ok_x4( ret, ==, CR_SUCCESS );
+    if (broken( size == 1 ))
+    {
+        skip( "No HID device present, skipping tests\n" );
+        return;
+    }
     iface = malloc( size * sizeof(*iface) );
     ok_ptr( iface, !=, NULL );
     ret = CM_Get_Device_Interface_ListW( &guid, NULL, iface, size, CM_GET_DEVICE_INTERFACE_LIST_PRESENT );
@@ -696,6 +701,11 @@ static void test_CM_Get_Device_Interface_PropertyW(void)
     guid = GUID_DEVINTERFACE_HID;
     ret = CM_Get_Device_Interface_List_SizeW( &len, &guid, NULL, CM_GET_DEVICE_INTERFACE_LIST_PRESENT );
     ok_x4( ret, ==, CR_SUCCESS );
+    if (broken( len == 1 ))
+    {
+        skip( "No HID device present, skipping tests\n" );
+        return;
+    }
     iface = malloc( len * sizeof(*iface) );
     ok_ptr( iface, !=, NULL );
     ret = CM_Get_Device_Interface_ListW( &guid, NULL, iface, len, CM_GET_DEVICE_INTERFACE_LIST_PRESENT );
@@ -2719,6 +2729,11 @@ static void test_CM_Get_Device_Interface_List(void)
 
     ret = CM_Get_Device_Interface_ListW( &guid, NULL, buffer, size, CM_GET_DEVICE_INTERFACE_LIST_PRESENT );
     ok_x4( ret, ==, CR_SUCCESS );
+    if (broken( !*buffer ))
+    {
+        skip( "No HID device present, skipping tests\n" );
+        goto skip_tests;
+    }
     ok( !wcsncmp( buffer, L"\\\\?\\HID#", 8 ), "got %s\n", debugstr_wn( buffer, size ) );
     for (tmp = buffer; *tmp; tmp = tmp + wcslen( tmp ) + 1)
     {
@@ -2777,6 +2792,7 @@ static void test_CM_Get_Device_Interface_List(void)
     free( buffer );
 
 
+skip_tests:
     guid = GUID_DEVINTERFACE_DISPLAY_ADAPTER;
 
     size = 0;
@@ -2823,6 +2839,11 @@ static void test_CM_Open_Device_Interface_Key(void)
 
     guid = GUID_DEVINTERFACE_HID;
     ret = CM_Get_Device_Interface_ListW( &guid, NULL, iface, ARRAY_SIZE(iface), CM_GET_DEVICE_INTERFACE_LIST_PRESENT );
+    if (broken( !*iface ))
+    {
+        skip( "No HID device present, skipping tests\n" );
+        return;
+    }
     ok_x4( ret, ==, CR_SUCCESS );
 
     wcscpy( name, iface + 4 );
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/10176