Provider = CatalogEntry->Provider;
/* Check for a match */
- if ((Provider) &&
- !(memcmp(&CatalogEntry->ProtocolInfo.ProviderId,
- ProviderId,
- sizeof(GUID))))
+ if (Provider &&
+ IsEqualGUID(&CatalogEntry->ProtocolInfo.ProviderId, ProviderId))
{
/* Found a match */
return Provider;
/* Get this entry */
CatalogEntry = CONTAINING_RECORD(Entry, TCATALOG_ENTRY, CatalogLink);
- /* Remove it */
+ /* Remove it and dereference it */
WsTcRemoveCatalogItem(Catalog, CatalogEntry);
-
- /* Dereference it */
WsTcEntryDereference(CatalogEntry);
/* Move to the next entry */