Commit 162911ba authored by Juan Lang's avatar Juan Lang Committed by Alexandre Julliard

setupapi: Don't abort key enumeration early.

parent 8b5faacf
...@@ -1998,6 +1998,8 @@ static void SETUPDI_AddDeviceInterfaces(SP_DEVINFO_DATA *dev, HKEY key, ...@@ -1998,6 +1998,8 @@ static void SETUPDI_AddDeviceInterfaces(SP_DEVINFO_DATA *dev, HKEY key,
SETUPDI_SetInterfaceSymbolicLink(iface, symbolicLink); SETUPDI_SetInterfaceSymbolicLink(iface, symbolicLink);
RegCloseKey(subKey); RegCloseKey(subKey);
} }
/* Allow enumeration to continue */
l = ERROR_SUCCESS;
} }
} }
/* FIXME: find and add all the device's interfaces to the device */ /* FIXME: find and add all the device's interfaces to the device */
...@@ -2071,6 +2073,8 @@ static void SETUPDI_EnumerateMatchingInterfaces(HDEVINFO DeviceInfoSet, ...@@ -2071,6 +2073,8 @@ static void SETUPDI_EnumerateMatchingInterfaces(HDEVINFO DeviceInfoSet,
} }
RegCloseKey(subKey); RegCloseKey(subKey);
} }
/* Allow enumeration to continue */
l = ERROR_SUCCESS;
} }
} }
if (enumKey != INVALID_HANDLE_VALUE) if (enumKey != INVALID_HANDLE_VALUE)
...@@ -2190,6 +2194,8 @@ static void SETUPDI_EnumerateMatchingDevices(HDEVINFO DeviceInfoSet, ...@@ -2190,6 +2194,8 @@ static void SETUPDI_EnumerateMatchingDevices(HDEVINFO DeviceInfoSet,
} }
RegCloseKey(subKey); RegCloseKey(subKey);
} }
/* Allow enumeration to continue */
l = ERROR_SUCCESS;
} }
} }
} }
...@@ -2241,6 +2247,8 @@ static void SETUPDI_EnumerateDevices(HDEVINFO DeviceInfoSet, const GUID *class, ...@@ -2241,6 +2247,8 @@ static void SETUPDI_EnumerateDevices(HDEVINFO DeviceInfoSet, const GUID *class,
subKeyName, subKey, class, flags); subKeyName, subKey, class, flags);
RegCloseKey(subKey); RegCloseKey(subKey);
} }
/* Allow enumeration to continue */
l = ERROR_SUCCESS;
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment