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
1d169078
Commit
1d169078
authored
Nov 10, 2022
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ntdll: Use a proper Unix syscall for init_builtin_dll().
parent
f7332ab4
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
13 deletions
+11
-13
loader.c
dlls/ntdll/loader.c
+2
-7
loader.c
dlls/ntdll/unix/loader.c
+7
-4
unixlib.h
dlls/ntdll/unixlib.h
+2
-2
No files found.
dlls/ntdll/loader.c
View file @
1d169078
...
...
@@ -1574,7 +1574,7 @@ static NTSTATUS MODULE_InitDLL( WINE_MODREF *wm, UINT reason, LPVOID lpReserved
if
(
wm
->
ldr
.
Flags
&
LDR_DONT_RESOLVE_REFS
)
return
STATUS_SUCCESS
;
if
(
wm
->
ldr
.
TlsIndex
!=
-
1
)
call_tls_callbacks
(
wm
->
ldr
.
DllBase
,
reason
);
if
(
wm
->
ldr
.
Flags
&
LDR_WINE_INTERNAL
&&
reason
==
DLL_PROCESS_ATTACH
)
unix_funcs
->
init_builtin_dll
(
wm
->
ldr
.
DllBase
);
NTDLL_UNIX_CALL
(
init_builtin_dll
,
wm
->
ldr
.
DllBase
);
if
(
!
entry
)
return
STATUS_SUCCESS
;
if
(
TRACE_ON
(
relay
))
...
...
@@ -4208,7 +4208,7 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR
}
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
);
if
(
wm
->
ldr
.
Flags
&
LDR_WINE_INTERNAL
)
NTDLL_UNIX_CALL
(
init_builtin_dll
,
wm
->
ldr
.
DllBase
);
if
(
wm
->
ldr
.
ActivationContext
)
RtlDeactivateActivationContext
(
0
,
cookie
);
process_breakpoint
();
}
...
...
@@ -4602,10 +4602,6 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved )
}
static
void
CDECL
init_builtin_dll_fallback
(
void
*
module
)
{
}
static
NTSTATUS
CDECL
unwind_builtin_dll_fallback
(
ULONG
type
,
struct
_DISPATCHER_CONTEXT
*
dispatch
,
CONTEXT
*
context
)
{
...
...
@@ -4621,7 +4617,6 @@ static LONGLONG WINAPI RtlGetSystemTimePrecise_fallback(void)
static
const
struct
unix_funcs
unix_fallbacks
=
{
init_builtin_dll_fallback
,
unwind_builtin_dll_fallback
,
RtlGetSystemTimePrecise_fallback
,
};
...
...
dlls/ntdll/unix/loader.c
View file @
1d169078
...
...
@@ -1931,7 +1931,7 @@ static BOOL get_relocbase(caddr_t mapbase, caddr_t *relocbase)
/*************************************************************************
* init_builtin_dll
*/
static
void
CDECL
init_builtin_dll
(
void
*
module
)
static
NTSTATUS
init_builtin_dll
(
void
*
module
)
{
#ifdef HAVE_DLINFO
void
*
handle
=
NULL
;
...
...
@@ -1945,10 +1945,10 @@ static void CDECL init_builtin_dll( void *module )
const
Elf32_Dyn
*
dyn
;
#endif
if
(
!
(
handle
=
get_builtin_so_handle
(
module
)))
return
;
if
(
!
(
handle
=
get_builtin_so_handle
(
module
)))
return
STATUS_SUCCESS
;
if
(
dlinfo
(
handle
,
RTLD_DI_LINKMAP
,
&
map
))
map
=
NULL
;
release_builtin_module
(
module
);
if
(
!
map
)
return
;
if
(
!
map
)
return
STATUS_SUCCESS
;
for
(
dyn
=
map
->
l_ld
;
dyn
->
d_tag
;
dyn
++
)
{
...
...
@@ -1976,6 +1976,7 @@ static void CDECL init_builtin_dll( void *module )
for
(
i
=
0
;
i
<
init_arraysz
/
sizeof
(
*
init_array
);
i
++
)
init_array
[
i
](
main_argc
,
main_argv
,
main_envp
);
#endif
return
STATUS_SUCCESS
;
}
...
...
@@ -2154,7 +2155,6 @@ static ULONG_PTR get_image_address(void)
*/
static
struct
unix_funcs
unix_funcs
=
{
init_builtin_dll
,
unwind_builtin_dll
,
RtlGetSystemTimePrecise
,
};
...
...
@@ -2166,10 +2166,12 @@ static struct unix_funcs unix_funcs =
const
unixlib_entry_t
__wine_unix_call_funcs
[]
=
{
load_so_dll
,
init_builtin_dll
,
};
static
NTSTATUS
wow64_load_so_dll
(
void
*
args
)
{
return
STATUS_INVALID_IMAGE_FORMAT
;
}
static
NTSTATUS
wow64_init_builtin_dll
(
void
*
args
)
{
return
STATUS_UNSUCCESSFUL
;
}
/***********************************************************************
* __wine_unix_call_wow64_funcs
...
...
@@ -2177,6 +2179,7 @@ static NTSTATUS wow64_load_so_dll( void *args ) { return STATUS_INVALID_IMAGE_FO
const
unixlib_entry_t
__wine_unix_call_wow64_funcs
[]
=
{
wow64_load_so_dll
,
wow64_init_builtin_dll
,
};
...
...
dlls/ntdll/unixlib.h
View file @
1d169078
...
...
@@ -34,6 +34,7 @@ struct load_so_dll_params
enum
ntdll_unix_funcs
{
unix_load_so_dll
,
unix_init_builtin_dll
,
};
extern
unixlib_handle_t
ntdll_unix_handle
;
...
...
@@ -41,12 +42,11 @@ extern unixlib_handle_t ntdll_unix_handle;
#define NTDLL_UNIX_CALL( func, params ) __wine_unix_call( ntdll_unix_handle, unix_ ## func, params )
/* increment this when you change the function table */
#define NTDLL_UNIXLIB_VERSION 13
6
#define NTDLL_UNIXLIB_VERSION 13
7
struct
unix_funcs
{
/* loader functions */
void
(
CDECL
*
init_builtin_dll
)(
void
*
module
);
NTSTATUS
(
CDECL
*
unwind_builtin_dll
)(
ULONG
type
,
struct
_DISPATCHER_CONTEXT
*
dispatch
,
CONTEXT
*
context
);
/* other Win32 API functions */
...
...
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