zontreck/wine
1
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine.git synced 2024-11-19 17:06:04 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

ntdll: Don't re-add a module dependency if it already exists.

Browse source 
Today, calling add_module_dependency() multiple times with the same
arguments results in duplicate edges.

Duplicate edges are harmless, but bloats memory usage.  The number of
duplicate edges does not affect the dependency graph; the graph is
determined by the set of unique edges.

Consciously avoid duplicates by checking for them in
add_module_dependency_after().  This allows us to generate a unique
dependency edge for all imports of export forwarders that belong to the
same DLL.
This commit is contained in:
Jinoh Kang 2024-04-18 23:23:43 +09:00
parent 70c7ad699e
commit 7686456a4e
1 changed files with 24 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
dlls/ntdll/loader.c
View file

@ -925,6 +925,21 @@ static void remove_single_list_entry( LDRP_CSLIST *list, SINGLE_LIST_ENTRY *entr
entry->Next = NULL;
}
static LDR_DEPENDENCY *find_module_dependency( LDR_DDAG_NODE *from, LDR_DDAG_NODE *to )
{
SINGLE_LIST_ENTRY *entry, *mark = from->Dependencies.Tail;
if (!mark) return NULL;
for (entry = mark->Next; entry != mark; entry = entry->Next)
{
LDR_DEPENDENCY *dep = CONTAINING_RECORD( entry, LDR_DEPENDENCY, dependency_to_entry );
if (dep->dependency_from == from && dep->dependency_to == to) return dep;
}
return NULL;
}
/**********************************************************************
* add_module_dependency_after
*/
@ -933,6 +948,15 @@ static BOOL add_module_dependency_after( LDR_DDAG_NODE *from, LDR_DDAG_NODE *to,
{
LDR_DEPENDENCY *dep;
if ((dep = find_module_dependency( from, to )))
{
/* Dependency already exists; consume the module reference stolen from the caller */
LDR_DATA_TABLE_ENTRY *mod = CONTAINING_RECORD( to->Modules.Flink, LDR_DATA_TABLE_ENTRY, NodeModuleLink );
WINE_MODREF *wm = CONTAINING_RECORD( mod, WINE_MODREF, ldr );
LdrUnloadDll( wm->ldr.DllBase );
return TRUE;
}
if (!(dep = RtlAllocateHeap( GetProcessHeap(), 0, sizeof(*dep) ))) return FALSE;
dep->dependency_from = from;