diff --git a/dll/win32/setupapi/devinst.c b/dll/win32/setupapi/devinst.c
index c334a2f2c26..05fe8314c66 100644
--- a/dll/win32/setupapi/devinst.c
+++ b/dll/win32/setupapi/devinst.c
@@ -971,7 +971,7 @@ BOOL WINAPI SetupDiClassGuidsFromNameExW(
 
     for (dwIndex = 0; ; dwIndex++)
     {
-        dwLength = 40;
+        dwLength = sizeof(szKeyName) / sizeof(WCHAR);
         lError = RegEnumKeyExW(hClassesKey,
                                dwIndex,
                                szKeyName,
@@ -995,7 +995,7 @@ BOOL WINAPI SetupDiClassGuidsFromNameExW(
                 return FALSE;
             }
 
-            dwLength = MAX_CLASS_NAME_LEN * sizeof(WCHAR);
+            dwLength = sizeof(szClassName);
             if (!RegQueryValueExW(hClassKey,
                                   REGSTR_VAL_CLASS,
                                   NULL,
diff --git a/sdk/tools/winesync/setupapi.cfg b/sdk/tools/winesync/setupapi.cfg
index c2e827708b6..7e64a91a360 100644
--- a/sdk/tools/winesync/setupapi.cfg
+++ b/sdk/tools/winesync/setupapi.cfg
@@ -5,4 +5,4 @@ files:
   dlls/setupapi/misc.c: dll/win32/setupapi/misc.c
   dlls/setupapi/stubs.c: dll/win32/setupapi/stubs.c
 tags:
-  wine: 1ce40299941f03fb14ca73e771c1d6ea0090165a
+  wine: 01080e6750abcad22ac30df0e4efe669b458f8ab