Skip to content

W
wine-winehq
Commit d6829bdc authored by Martin Storsjö's avatar Martin Storsjö Committed by Alexandre Julliard
Browse files
Options

ntdll: Avoid accidentally picking up ntdll's __wine_unix_call_funcs for other DLLs.

When f7332ab4 switched load_so_dll over to a proper Unix syscall, ntdll.so started providing the symbol __wine_unix_call_funcs. When a DLL calls NtQueryVirtualMemory(MemoryWineUnixFuncs), it can do so speculatively, not knowing whether the corresponding unix lib actually does provide anything. When ntdll.so started providing this symbol, then such speculative calls to NtQueryVirtualMemory(MemoryWineUnixFuncs) would end up returning ntdll's __wine_unix_call_funcs if the intended DLL's unix library lacked one. This is the case with bcrypt, where the unix library doesn't provide __wine_unix_call_funcs if gnutls is unavailable. This fixes crashes after f7332ab4, in builds without gnutls. Signed-off-by: 's avatarMartin Storsjö <martin@martin.st>
parent c2a43def
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
dlls/ntdll/unix/unix_private.h
View file @ d6829bdc
...@@ -43,8 +43,8 @@ static const WORD current_machine = IMAGE_FILE_MACHINE_ARM64; ...@@ -43,8 +43,8 @@ static const WORD current_machine = IMAGE_FILE_MACHINE_ARM64;
extern WORD native_machine DECLSPEC_HIDDEN; extern WORD native_machine DECLSPEC_HIDDEN;
extern HMODULE ntdll_module DECLSPEC_HIDDEN; extern HMODULE ntdll_module DECLSPEC_HIDDEN;
extern const unixlib_entry_t __wine_unix_call_funcs[]; extern const unixlib_entry_t __wine_unix_call_funcs[] DECLSPEC_HIDDEN;
extern const unixlib_entry_t __wine_unix_call_wow64_funcs[]; extern const unixlib_entry_t __wine_unix_call_wow64_funcs[] DECLSPEC_HIDDEN;
static const BOOL is_win64 = (sizeof(void *) > sizeof(int)); static const BOOL is_win64 = (sizeof(void *) > sizeof(int));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment