Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Johnny Cai
wine
Commits
a77fd7df
Commit
a77fd7df
authored
24 years ago
by
Gerard Patel
Committed by
Alexandre Julliard
24 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Added a specific debug channel for dll loading (builtin/native).
parent
4d75640d
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
dlls/ntdll/ntdll.spec
+1
-1
1 addition, 1 deletion
dlls/ntdll/ntdll.spec
loader/module.c
+7
-1
7 additions, 1 deletion
loader/module.c
loader/ne/module.c
+6
-0
6 additions, 0 deletions
loader/ne/module.c
with
14 additions
and
2 deletions
dlls/ntdll/ntdll.spec
+
1
−
1
View file @
a77fd7df
...
...
@@ -3,7 +3,7 @@ type win32
debug_channels (aspi atom cdrom console ddraw debug delayhlp dll dosfs dosmem
file fixup global heap int int10 int16 int17 int19 int21 int31
io local module ntdll process profile reg relay resource segment
io local
loaddll
module ntdll process profile reg relay resource segment
seh selector server snoop string system tape task thread thunk
timer toolhelp tweak ver virtual vxd win32)
...
...
This diff is collapsed.
Click to expand it.
loader/module.c
+
7
−
1
View file @
a77fd7df
...
...
@@ -23,6 +23,7 @@
DEFAULT_DEBUG_CHANNEL
(
module
);
DECLARE_DEBUG_CHANNEL
(
win32
);
DECLARE_DEBUG_CHANNEL
(
loaddll
);
WINE_MODREF
*
MODULE_modref_list
=
NULL
;
...
...
@@ -1306,6 +1307,7 @@ WINE_MODREF *MODULE_LoadLibraryExA( LPCSTR libname, HFILE hfile, DWORD flags )
int
i
;
module_loadorder_t
*
plo
;
LPSTR
filename
,
p
;
const
char
*
filetype
=
""
;
if
(
!
libname
)
return
NULL
;
...
...
@@ -1396,16 +1398,19 @@ WINE_MODREF *MODULE_LoadLibraryExA( LPCSTR libname, HFILE hfile, DWORD flags )
case
MODULE_LOADORDER_DLL
:
TRACE
(
"Trying native dll '%s'
\n
"
,
filename
);
pwm
=
PE_LoadLibraryExA
(
filename
,
flags
);
filetype
=
"native"
;
break
;
case
MODULE_LOADORDER_SO
:
TRACE
(
"Trying so-library '%s'
\n
"
,
filename
);
pwm
=
ELF_LoadLibraryExA
(
filename
,
flags
);
filetype
=
"so"
;
break
;
case
MODULE_LOADORDER_BI
:
TRACE
(
"Trying built-in '%s'
\n
"
,
filename
);
pwm
=
BUILTIN32_LoadLibraryExA
(
filename
,
flags
);
filetype
=
"builtin"
;
break
;
default:
...
...
@@ -1421,7 +1426,8 @@ WINE_MODREF *MODULE_LoadLibraryExA( LPCSTR libname, HFILE hfile, DWORD flags )
{
/* Initialize DLL just loaded */
TRACE
(
"Loaded module '%s' at 0x%08x,
\n
"
,
filename
,
pwm
->
module
);
if
(
!
TRACE_ON
(
module
))
TRACE_
(
loaddll
)(
"Loaded module '%s' : %s
\n
"
,
filename
,
filetype
);
/* Set the refCount here so that an attach failure will */
/* decrement the dependencies through the MODULE_FreeLibrary call. */
pwm
->
refCount
++
;
...
...
This diff is collapsed.
Click to expand it.
loader/ne/module.c
+
6
−
0
View file @
a77fd7df
...
...
@@ -28,6 +28,7 @@
#include
"server.h"
DEFAULT_DEBUG_CHANNEL
(
module
);
DECLARE_DEBUG_CHANNEL
(
loaddll
);
/*
* Segment table entry
...
...
@@ -896,6 +897,7 @@ static HINSTANCE16 MODULE_LoadModule16( LPCSTR libname, BOOL implicit, BOOL lib_
HINSTANCE16
hinst
;
int
i
;
module_loadorder_t
*
plo
;
const
char
*
filetype
=
""
;
plo
=
MODULE_GetLoadOrder
(
libname
,
FALSE
);
...
...
@@ -906,11 +908,13 @@ static HINSTANCE16 MODULE_LoadModule16( LPCSTR libname, BOOL implicit, BOOL lib_
case
MODULE_LOADORDER_DLL
:
TRACE
(
"Trying native dll '%s'
\n
"
,
libname
);
hinst
=
NE_LoadModule
(
libname
,
lib_only
);
filetype
=
"native"
;
break
;
case
MODULE_LOADORDER_BI
:
TRACE
(
"Trying built-in '%s'
\n
"
,
libname
);
hinst
=
BUILTIN_LoadModule
(
libname
);
filetype
=
"builtin"
;
break
;
default:
...
...
@@ -947,6 +951,8 @@ static HINSTANCE16 MODULE_LoadModule16( LPCSTR libname, BOOL implicit, BOOL lib_
}
TRACE
(
"Loaded module '%s' at 0x%04x.
\n
"
,
libname
,
hinst
);
if
(
!
TRACE_ON
(
module
))
TRACE_
(
loaddll
)(
"Loaded module '%s' : %s
\n
"
,
libname
,
filetype
);
/*
* Call initialization routines for all loaded DLLs. Note that
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment