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
bef13366
Commit
bef13366
authored
Jan 11, 2005
by
Mike Hearn
Committed by
Alexandre Julliard
Jan 11, 2005
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Give a more informative error when a DLL fails to initialize during
startup.
parent
61b5e90d
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
1 deletion
+14
-1
loader.c
dlls/ntdll/loader.c
+14
-1
No files found.
dlls/ntdll/loader.c
View file @
bef13366
...
...
@@ -104,6 +104,7 @@ static CRITICAL_SECTION loader_section = { &critsect_debug, -1, 0, 0, 0, 0 };
static
WINE_MODREF
*
cached_modref
;
static
WINE_MODREF
*
current_modref
;
static
WINE_MODREF
*
last_failed_modref
;
static
NTSTATUS
load_dll
(
LPCWSTR
load_path
,
LPCWSTR
libname
,
DWORD
flags
,
WINE_MODREF
**
pwm
);
static
FARPROC
find_named_export
(
HMODULE
module
,
const
IMAGE_EXPORT_DIRECTORY
*
exports
,
...
...
@@ -893,9 +894,16 @@ static NTSTATUS process_attach( WINE_MODREF *wm, LPVOID lpReserved )
WINE_MODREF
*
prev
=
current_modref
;
current_modref
=
wm
;
if
(
MODULE_InitDLL
(
wm
,
DLL_PROCESS_ATTACH
,
lpReserved
))
{
wm
->
ldr
.
Flags
|=
LDR_PROCESS_ATTACHED
;
}
else
{
/* point to the name so LdrInitializeThunk can print it */
last_failed_modref
=
wm
;
WARN
(
"Initialization of %s failed
\n
"
,
debugstr_w
(
wm
->
ldr
.
BaseDllName
.
Buffer
));
status
=
STATUS_DLL_INIT_FAILED
;
}
current_modref
=
prev
;
}
...
...
@@ -1980,7 +1988,12 @@ void WINAPI LdrInitializeThunk( HANDLE main_file, ULONG unknown2, ULONG unknown3
if
((
status
=
fixup_imports
(
wm
,
load_path
))
!=
STATUS_SUCCESS
)
goto
error
;
if
((
status
=
alloc_process_tls
())
!=
STATUS_SUCCESS
)
goto
error
;
if
((
status
=
alloc_thread_tls
())
!=
STATUS_SUCCESS
)
goto
error
;
if
((
status
=
process_attach
(
wm
,
(
LPVOID
)
1
))
!=
STATUS_SUCCESS
)
goto
error
;
if
((
status
=
process_attach
(
wm
,
(
LPVOID
)
1
))
!=
STATUS_SUCCESS
)
{
if
(
last_failed_modref
)
ERR
(
"%s failed to initialize, aborting
\n
"
,
debugstr_w
(
last_failed_modref
->
ldr
.
BaseDllName
.
Buffer
)
+
1
);
goto
error
;
}
RtlLeaveCriticalSection
(
&
loader_section
);
...
...
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