Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
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-winehq
Commits
a77fd7df
Commit
a77fd7df
authored
Jan 10, 2001
by
Gerard Patel
Committed by
Alexandre Julliard
Jan 10, 2001
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added a specific debug channel for dll loading (builtin/native).
parent
4d75640d
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
2 deletions
+14
-2
ntdll.spec
dlls/ntdll/ntdll.spec
+1
-1
module.c
loader/module.c
+7
-1
module.c
loader/ne/module.c
+6
-0
No files found.
dlls/ntdll/ntdll.spec
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)
...
...
loader/module.c
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
++
;
...
...
loader/ne/module.c
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
...
...
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