Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-cw
Commits
a46515d4
Commit
a46515d4
authored
Feb 26, 2021
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ntdll: Get rid of attach_implicitly_loaded_dlls().
This should no longer happen. Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
9e01af75
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
30 deletions
+0
-30
loader.c
dlls/ntdll/loader.c
+0
-30
No files found.
dlls/ntdll/loader.c
View file @
a46515d4
...
...
@@ -1438,35 +1438,6 @@ static NTSTATUS process_attach( WINE_MODREF *wm, LPVOID lpReserved )
}
/**********************************************************************
* attach_implicitly_loaded_dlls
*
* Attach to the (builtin) dlls that have been implicitly loaded because
* of a dependency at the Unix level, but not imported at the Win32 level.
*/
static
void
attach_implicitly_loaded_dlls
(
LPVOID
reserved
)
{
for
(;;)
{
PLIST_ENTRY
mark
,
entry
;
mark
=
&
NtCurrentTeb
()
->
Peb
->
LdrData
->
InLoadOrderModuleList
;
for
(
entry
=
mark
->
Flink
;
entry
!=
mark
;
entry
=
entry
->
Flink
)
{
LDR_DATA_TABLE_ENTRY
*
mod
=
CONTAINING_RECORD
(
entry
,
LDR_DATA_TABLE_ENTRY
,
InLoadOrderLinks
);
if
(
!
(
mod
->
Flags
&
LDR_IMAGE_IS_DLL
))
continue
;
if
(
mod
->
Flags
&
(
LDR_LOAD_IN_PROGRESS
|
LDR_PROCESS_ATTACHED
))
continue
;
TRACE
(
"found implicitly loaded %s, attaching to it
\n
"
,
debugstr_w
(
mod
->
BaseDllName
.
Buffer
));
process_attach
(
CONTAINING_RECORD
(
mod
,
WINE_MODREF
,
ldr
),
reserved
);
break
;
/* restart the search from the start */
}
if
(
entry
==
mark
)
break
;
/* nothing found */
}
}
/*************************************************************************
* process_detach
*
...
...
@@ -3536,7 +3507,6 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR
NtTerminateProcess
(
GetCurrentProcess
(),
status
);
}
}
attach_implicitly_loaded_dlls
(
context
);
unix_funcs
->
virtual_release_address_space
();
if
(
wm
->
ldr
.
TlsIndex
!=
-
1
)
call_tls_callbacks
(
wm
->
ldr
.
DllBase
,
DLL_PROCESS_ATTACH
);
if
(
wm
->
ldr
.
Flags
&
LDR_WINE_INTERNAL
)
unix_funcs
->
init_builtin_dll
(
wm
->
ldr
.
DllBase
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment