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
f55f0b84
Commit
f55f0b84
authored
Mar 30, 2021
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ntdll: Remove load_builtin_dll() and get_load_order() from the Unix interface.
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
bb065801
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
34 deletions
+14
-34
loader.c
dlls/ntdll/unix/loader.c
+0
-17
loadorder.c
dlls/ntdll/unix/loadorder.c
+1
-1
unix_private.h
dlls/ntdll/unix/unix_private.h
+12
-1
unixlib.h
dlls/ntdll/unixlib.h
+1
-15
No files found.
dlls/ntdll/unix/loader.c
View file @
f55f0b84
...
...
@@ -1375,21 +1375,6 @@ done:
/***********************************************************************
* load_builtin_dll
*/
static
NTSTATUS
CDECL
load_builtin_dll
(
UNICODE_STRING
*
nt_name
,
void
**
module
,
SECTION_IMAGE_INFORMATION
*
image_info
,
BOOL
prefer_native
)
{
SIZE_T
size
;
NTSTATUS
status
;
status
=
find_builtin_dll
(
nt_name
,
module
,
&
size
,
image_info
,
current_machine
,
prefer_native
);
if
(
status
==
STATUS_IMAGE_NOT_AT_BASE
)
status
=
STATUS_SUCCESS
;
return
status
;
}
/***********************************************************************
* load_builtin
*
* Load the builtin dll if specified by load order configuration.
...
...
@@ -1794,11 +1779,9 @@ static struct unix_funcs unix_funcs =
ntdll_tan
,
virtual_release_address_space
,
load_so_dll
,
load_builtin_dll
,
init_builtin_dll
,
init_unix_lib
,
unwind_builtin_dll
,
get_load_order
,
__wine_dbg_get_channel_flags
,
__wine_dbg_strdup
,
__wine_dbg_output
,
...
...
dlls/ntdll/unix/loadorder.c
View file @
f55f0b84
...
...
@@ -378,7 +378,7 @@ static enum loadorder get_load_order_value( HANDLE std_key, HANDLE app_key, WCHA
* Return the loadorder of a module.
* The system directory and '.dll' extension is stripped from the path.
*/
enum
loadorder
CDECL
get_load_order
(
const
UNICODE_STRING
*
nt_name
)
enum
loadorder
get_load_order
(
const
UNICODE_STRING
*
nt_name
)
{
static
const
WCHAR
prefixW
[]
=
{
'\\'
,
'?'
,
'?'
,
'\\'
};
enum
loadorder
ret
=
LO_INVALID
;
...
...
dlls/ntdll/unix/unix_private.h
View file @
f55f0b84
...
...
@@ -400,7 +400,18 @@ static inline void context_init_xstate( CONTEXT *context, void *xstate_buffer )
}
#endif
extern
enum
loadorder
CDECL
get_load_order
(
const
UNICODE_STRING
*
nt_name
)
DECLSPEC_HIDDEN
;
enum
loadorder
{
LO_INVALID
,
LO_DISABLED
,
LO_NATIVE
,
LO_BUILTIN
,
LO_NATIVE_BUILTIN
,
/* native then builtin */
LO_BUILTIN_NATIVE
,
/* builtin then native */
LO_DEFAULT
/* nothing specified, use default strategy */
};
extern
enum
loadorder
get_load_order
(
const
UNICODE_STRING
*
nt_name
)
DECLSPEC_HIDDEN
;
static
inline
size_t
ntdll_wcslen
(
const
WCHAR
*
str
)
{
...
...
dlls/ntdll/unixlib.h
View file @
f55f0b84
...
...
@@ -25,19 +25,8 @@
struct
_DISPATCHER_CONTEXT
;
enum
loadorder
{
LO_INVALID
,
LO_DISABLED
,
LO_NATIVE
,
LO_BUILTIN
,
LO_NATIVE_BUILTIN
,
/* native then builtin */
LO_BUILTIN_NATIVE
,
/* builtin then native */
LO_DEFAULT
/* nothing specified, use default strategy */
};
/* increment this when you change the function table */
#define NTDLL_UNIXLIB_VERSION 1
19
#define NTDLL_UNIXLIB_VERSION 1
20
struct
unix_funcs
{
...
...
@@ -85,13 +74,10 @@ struct unix_funcs
/* loader functions */
NTSTATUS
(
CDECL
*
load_so_dll
)(
UNICODE_STRING
*
nt_name
,
void
**
module
);
NTSTATUS
(
CDECL
*
load_builtin_dll
)(
UNICODE_STRING
*
name
,
void
**
module
,
SECTION_IMAGE_INFORMATION
*
image_info
,
BOOL
prefer_native
);
void
(
CDECL
*
init_builtin_dll
)(
void
*
module
);
NTSTATUS
(
CDECL
*
init_unix_lib
)(
void
*
module
,
DWORD
reason
,
const
void
*
ptr_in
,
void
*
ptr_out
);
NTSTATUS
(
CDECL
*
unwind_builtin_dll
)(
ULONG
type
,
struct
_DISPATCHER_CONTEXT
*
dispatch
,
CONTEXT
*
context
);
enum
loadorder
(
CDECL
*
get_load_order
)(
const
UNICODE_STRING
*
nt_name
);
/* debugging functions */
unsigned
char
(
CDECL
*
dbg_get_channel_flags
)(
struct
__wine_debug_channel
*
channel
);
...
...
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