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
157be051
Commit
157be051
authored
Feb 14, 2023
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ntdll: Use the standard unixlib macro for Unix calls.
parent
0ac2166c
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
9 additions
and
11 deletions
+9
-11
loader.c
dlls/ntdll/loader.c
+4
-4
signal_arm.c
dlls/ntdll/signal_arm.c
+1
-1
signal_arm64.c
dlls/ntdll/signal_arm64.c
+1
-1
signal_x86_64.c
dlls/ntdll/signal_x86_64.c
+1
-1
time.c
dlls/ntdll/time.c
+1
-1
unixlib.h
dlls/ntdll/unixlib.h
+1
-3
No files found.
dlls/ntdll/loader.c
View file @
157be051
...
...
@@ -77,7 +77,7 @@ static DWORD (WINAPI *pCtrlRoutine)(void *);
SYSTEM_DLL_INIT_BLOCK
LdrSystemDllInitBlock
=
{
0xf0
};
unixlib_handle_t
ntdll_unix
_handle
=
0
;
unixlib_handle_t
__wine_unixlib
_handle
=
0
;
/* windows directory */
const
WCHAR
windows_dir
[]
=
L"C:
\\
windows"
;
...
...
@@ -2627,7 +2627,7 @@ static NTSTATUS load_so_dll( LPCWSTR load_path, const UNICODE_STRING *nt_name,
struct
load_so_dll_params
params
=
{
*
nt_name
,
&
module
};
TRACE
(
"trying %s as so lib
\n
"
,
debugstr_us
(
nt_name
)
);
if
((
status
=
NTDLL_UNIX_CALL
(
load_so_dll
,
&
params
)))
if
((
status
=
WINE_UNIX_CALL
(
unix_
load_so_dll
,
&
params
)))
{
WARN
(
"failed to load .so lib %s
\n
"
,
debugstr_us
(
nt_name
)
);
if
(
status
==
STATUS_INVALID_IMAGE_FORMAT
)
status
=
STATUS_INVALID_IMAGE_NOT_MZ
;
...
...
@@ -3153,7 +3153,7 @@ static NTSTATUS load_dll( const WCHAR *load_path, const WCHAR *libname, DWORD fl
switch
(
nts
)
{
case
STATUS_INVALID_IMAGE_NOT_MZ
:
/* not in PE format, maybe it's a .so file */
if
(
ntdll_unix
_handle
)
nts
=
load_so_dll
(
load_path
,
&
nt_name
,
flags
,
pwm
);
if
(
__wine_unixlib
_handle
)
nts
=
load_so_dll
(
load_path
,
&
nt_name
,
flags
,
pwm
);
break
;
case
STATUS_SUCCESS
:
/* valid PE file */
...
...
@@ -4121,7 +4121,7 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR
NtQueryVirtualMemory
(
GetCurrentProcess
(),
LdrInitializeThunk
,
MemoryBasicInformation
,
&
meminfo
,
sizeof
(
meminfo
),
NULL
);
NtQueryVirtualMemory
(
GetCurrentProcess
(),
meminfo
.
AllocationBase
,
MemoryWineUnixFuncs
,
&
ntdll_unix_handle
,
sizeof
(
ntdll_unix
_handle
),
NULL
);
&
__wine_unixlib_handle
,
sizeof
(
__wine_unixlib
_handle
),
NULL
);
peb
->
LdrData
=
&
ldr
;
peb
->
FastPebLock
=
&
peb_lock
;
...
...
dlls/ntdll/signal_arm.c
View file @
157be051
...
...
@@ -165,7 +165,7 @@ static NTSTATUS virtual_unwind( ULONG type, DISPATCHER_CONTEXT *dispatch, CONTEX
{
struct
unwind_builtin_dll_params
params
=
{
type
,
dispatch
,
context
};
status
=
NTDLL_UNIX_CALL
(
unwind_builtin_dll
,
&
params
);
status
=
WINE_UNIX_CALL
(
unix_
unwind_builtin_dll
,
&
params
);
if
(
status
!=
STATUS_SUCCESS
)
return
status
;
if
(
dispatch
->
EstablisherFrame
)
...
...
dlls/ntdll/signal_arm64.c
View file @
157be051
...
...
@@ -199,7 +199,7 @@ static NTSTATUS virtual_unwind( ULONG type, DISPATCHER_CONTEXT *dispatch, CONTEX
{
struct
unwind_builtin_dll_params
params
=
{
type
,
dispatch
,
context
};
status
=
NTDLL_UNIX_CALL
(
unwind_builtin_dll
,
&
params
);
status
=
WINE_UNIX_CALL
(
unix_
unwind_builtin_dll
,
&
params
);
if
(
status
!=
STATUS_SUCCESS
)
return
status
;
if
(
dispatch
->
EstablisherFrame
)
...
...
dlls/ntdll/signal_x86_64.c
View file @
157be051
...
...
@@ -282,7 +282,7 @@ static NTSTATUS virtual_unwind( ULONG type, DISPATCHER_CONTEXT *dispatch, CONTEX
{
struct
unwind_builtin_dll_params
params
=
{
type
,
dispatch
,
context
};
status
=
NTDLL_UNIX_CALL
(
unwind_builtin_dll
,
&
params
);
status
=
WINE_UNIX_CALL
(
unix_
unwind_builtin_dll
,
&
params
);
if
(
!
status
&&
dispatch
->
LanguageHandler
&&
!
module
)
{
FIXME
(
"calling personality routine in system library not supported yet
\n
"
);
...
...
dlls/ntdll/time.c
View file @
157be051
...
...
@@ -374,7 +374,7 @@ LONGLONG WINAPI RtlGetSystemTimePrecise( void )
{
LONGLONG
ret
;
NTDLL_UNIX_CALL
(
system_time_precise
,
&
ret
);
WINE_UNIX_CALL
(
unix_
system_time_precise
,
&
ret
);
return
ret
;
}
...
...
dlls/ntdll/unixlib.h
View file @
157be051
...
...
@@ -45,8 +45,6 @@ enum ntdll_unix_funcs
unix_system_time_precise
,
};
extern
unixlib_handle_t
ntdll_unix_handle
;
#define NTDLL_UNIX_CALL( func, params ) __wine_unix_call_dispatcher( ntdll_unix_handle, unix_ ## func, params )
extern
unixlib_handle_t
__wine_unixlib_handle
DECLSPEC_HIDDEN
;
#endif
/* __NTDLL_UNIXLIB_H */
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