Juan Lang : setupapi: Don't abort key enumeration early.
Alexandre Julliard
julliard at winehq.org
Mon Oct 15 11:27:49 CDT 2007
Module: wine
Branch: master
Commit: 162911baef8f5488a4bc1fbfdec70f621c51a381
URL: http://source.winehq.org/git/wine.git/?a=commit;h=162911baef8f5488a4bc1fbfdec70f621c51a381
Author: Juan Lang <juan.lang at gmail.com>
Date: Fri Oct 12 08:26:56 2007 -0700
setupapi: Don't abort key enumeration early.
---
dlls/setupapi/devinst.c | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c
index 4087710..8abd2e7 100644
--- a/dlls/setupapi/devinst.c
+++ b/dlls/setupapi/devinst.c
@@ -1998,6 +1998,8 @@ static void SETUPDI_AddDeviceInterfaces(SP_DEVINFO_DATA *dev, HKEY key,
SETUPDI_SetInterfaceSymbolicLink(iface, symbolicLink);
RegCloseKey(subKey);
}
+ /* Allow enumeration to continue */
+ l = ERROR_SUCCESS;
}
}
/* FIXME: find and add all the device's interfaces to the device */
@@ -2071,6 +2073,8 @@ static void SETUPDI_EnumerateMatchingInterfaces(HDEVINFO DeviceInfoSet,
}
RegCloseKey(subKey);
}
+ /* Allow enumeration to continue */
+ l = ERROR_SUCCESS;
}
}
if (enumKey != INVALID_HANDLE_VALUE)
@@ -2190,6 +2194,8 @@ static void SETUPDI_EnumerateMatchingDevices(HDEVINFO DeviceInfoSet,
}
RegCloseKey(subKey);
}
+ /* Allow enumeration to continue */
+ l = ERROR_SUCCESS;
}
}
}
@@ -2241,6 +2247,8 @@ static void SETUPDI_EnumerateDevices(HDEVINFO DeviceInfoSet, const GUID *class,
subKeyName, subKey, class, flags);
RegCloseKey(subKey);
}
+ /* Allow enumeration to continue */
+ l = ERROR_SUCCESS;
}
}
}
More information about the wine-cvs
mailing list