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
ee147d92
Commit
ee147d92
authored
Dec 01, 2022
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ntdll: Replace the __wine_unix_call() syscall by a function calling through the dispatcher.
parent
7e680152
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
12 additions
and
26 deletions
+12
-26
loader.c
dlls/ntdll/loader.c
+10
-0
ntdll.spec
dlls/ntdll/ntdll.spec
+1
-1
loader.c
dlls/ntdll/unix/loader.c
+0
-10
unixlib.h
dlls/ntdll/unixlib.h
+1
-1
syscall.c
dlls/wow64/syscall.c
+0
-13
syscall.h
dlls/wow64/syscall.h
+0
-1
No files found.
dlls/ntdll/loader.c
View file @
ee147d92
...
...
@@ -3192,6 +3192,16 @@ NTSTATUS WINAPI __wine_ctrl_routine( void *arg )
RtlExitUserThread
(
ret
);
}
/***********************************************************************
* __wine_unix_call
*/
NTSTATUS
WINAPI
__wine_unix_call
(
unixlib_handle_t
handle
,
unsigned
int
code
,
void
*
args
)
{
return
__wine_unix_call_dispatcher
(
handle
,
code
,
args
);
}
/******************************************************************
* LdrLoadDll (NTDLL.@)
*/
...
...
dlls/ntdll/ntdll.spec
View file @
ee147d92
...
...
@@ -1690,7 +1690,7 @@
@ cdecl -syscall wine_server_handle_to_fd(long long ptr ptr)
# Unix interface
@ stdcall
-syscall
__wine_unix_call(int64 long ptr)
@ stdcall __wine_unix_call(int64 long ptr)
@ stdcall -syscall __wine_unix_spawnvp(long ptr)
@ stdcall __wine_ctrl_routine(ptr)
@ extern -private __wine_syscall_dispatcher
...
...
dlls/ntdll/unix/loader.c
View file @
ee147d92
...
...
@@ -356,7 +356,6 @@ static void * const syscalls[] =
NtWriteVirtualMemory
,
NtYieldExecution
,
__wine_dbg_write
,
__wine_unix_call
,
__wine_unix_spawnvp
,
wine_nt_to_unix_file_name
,
wine_server_call
,
...
...
@@ -1348,15 +1347,6 @@ NTSTATUS ntdll_init_syscalls( ULONG id, SYSTEM_SERVICE_TABLE *table, void **disp
/***********************************************************************
* __wine_unix_call
*/
NTSTATUS
WINAPI
__wine_unix_call
(
unixlib_handle_t
handle
,
unsigned
int
code
,
void
*
args
)
{
return
((
unixlib_entry_t
*
)(
UINT_PTR
)
handle
)[
code
](
args
);
}
/***********************************************************************
* load_so_dll
*/
static
NTSTATUS
load_so_dll
(
void
*
args
)
...
...
dlls/ntdll/unixlib.h
View file @
ee147d92
...
...
@@ -48,6 +48,6 @@ enum ntdll_unix_funcs
extern
unixlib_handle_t
ntdll_unix_handle
;
#define NTDLL_UNIX_CALL( func, params ) __wine_unix_call( ntdll_unix_handle, unix_ ## func, params )
#define NTDLL_UNIX_CALL( func, params ) __wine_unix_call
_dispatcher
( ntdll_unix_handle, unix_ ## func, params )
#endif
/* __NTDLL_UNIXLIB_H */
dlls/wow64/syscall.c
View file @
ee147d92
...
...
@@ -321,19 +321,6 @@ NTSTATUS WINAPI wow64___wine_dbg_write( UINT *args )
/**********************************************************************
* wow64___wine_unix_call
*/
NTSTATUS
WINAPI
wow64___wine_unix_call
(
UINT
*
args
)
{
unixlib_handle_t
handle
=
get_ulong64
(
&
args
);
unsigned
int
code
=
get_ulong
(
&
args
);
void
*
args_ptr
=
get_ptr
(
&
args
);
return
__wine_unix_call
(
handle
,
code
,
args_ptr
);
}
/**********************************************************************
* wow64___wine_unix_spawnvp
*/
NTSTATUS
WINAPI
wow64___wine_unix_spawnvp
(
UINT
*
args
)
...
...
dlls/wow64/syscall.h
View file @
ee147d92
...
...
@@ -255,7 +255,6 @@
SYSCALL_ENTRY( NtWriteVirtualMemory ) \
SYSCALL_ENTRY( NtYieldExecution ) \
SYSCALL_ENTRY( __wine_dbg_write ) \
SYSCALL_ENTRY( __wine_unix_call ) \
SYSCALL_ENTRY( __wine_unix_spawnvp ) \
SYSCALL_ENTRY( wine_nt_to_unix_file_name ) \
SYSCALL_ENTRY( wine_server_call ) \
...
...
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