Alexandre Julliard : ntdll: Remove load_builtin_dll() and get_load_order() from the Unix interface.
Alexandre Julliard
julliard at winehq.org
Tue Mar 30 15:19:49 CDT 2021
Module: wine
Branch: master
Commit: f55f0b8448b6810f583784235d809bdbb10b2d6d
URL: https://source.winehq.org/git/wine.git/?a=commit;h=f55f0b8448b6810f583784235d809bdbb10b2d6d
Author: Alexandre Julliard <julliard at winehq.org>
Date: Tue Mar 30 10:20:54 2021 +0200
ntdll: Remove load_builtin_dll() and get_load_order() from the Unix interface.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/ntdll/unix/loader.c | 17 -----------------
dlls/ntdll/unix/loadorder.c | 2 +-
dlls/ntdll/unix/unix_private.h | 13 ++++++++++++-
dlls/ntdll/unixlib.h | 16 +---------------
4 files changed, 14 insertions(+), 34 deletions(-)
diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c
index 7c4572e6b0e..4c76865019b 100644
--- a/dlls/ntdll/unix/loader.c
+++ b/dlls/ntdll/unix/loader.c
@@ -1374,21 +1374,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
*
@@ -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,
diff --git a/dlls/ntdll/unix/loadorder.c b/dlls/ntdll/unix/loadorder.c
index 67a7473dc7f..49af8eb6adb 100644
--- a/dlls/ntdll/unix/loadorder.c
+++ b/dlls/ntdll/unix/loadorder.c
@@ -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;
diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h
index 05ba8202ee7..3987cc6c4d0 100644
--- a/dlls/ntdll/unix/unix_private.h
+++ b/dlls/ntdll/unix/unix_private.h
@@ -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 )
{
diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h
index 80e4eaefc75..04ae8230b1a 100644
--- a/dlls/ntdll/unixlib.h
+++ b/dlls/ntdll/unixlib.h
@@ -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 119
+#define NTDLL_UNIXLIB_VERSION 120
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 );
More information about the wine-cvs
mailing list