Module: wine Branch: master Commit: 483a2203eb15367314adbc46c73f7f582b9e9479 URL: https://gitlab.winehq.org/wine/wine/-/commit/483a2203eb15367314adbc46c73f7f5...
Author: Alexandre Julliard julliard@winehq.org Date: Thu May 11 22:38:24 2023 +0200
kernelbase: Move Wow64EnableWow64FsRedirection() from kernel32 to kernelbase.
Following recent Windows versions.
---
dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/path.c | 11 ----------- dlls/kernelbase/file.c | 11 +++++++++++ dlls/kernelbase/kernelbase.spec | 1 + 4 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index c85b2aa9f6c..e51cef57638 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1632,8 +1632,8 @@ # @ stub WerpStringLookup @ stdcall -import WideCharToMultiByte(long long wstr long ptr long ptr ptr) @ stdcall WinExec(str long) -@ stdcall Wow64EnableWow64FsRedirection(long) KERNEL32_Wow64EnableWow64FsRedirection @ stdcall -import Wow64DisableWow64FsRedirection(ptr) +@ stdcall -import Wow64EnableWow64FsRedirection(long) @ stdcall Wow64GetThreadContext(long ptr) @ stdcall Wow64GetThreadSelectorEntry(long long ptr) @ stdcall -import Wow64RevertWow64FsRedirection(ptr) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 724f7288bc5..f4bdc08b87e 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -377,17 +377,6 @@ UINT WINAPI GetSystemDirectoryA( LPSTR path, UINT count ) }
-/*********************************************************************** - * Wow64EnableWow64FsRedirection (KERNEL32.@) - * - * Microsoft C++ Redistributable installers are depending on all %eax bits being set. - */ -DWORD /*BOOLEAN*/ WINAPI KERNEL32_Wow64EnableWow64FsRedirection( BOOLEAN enable ) -{ - return set_ntstatus( RtlWow64EnableFsRedirection( enable )); -} - - /*********************************************************************** * wine_get_unix_file_name (KERNEL32.@) Not a Windows API * diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c index b676c50c416..9a88d504fd6 100644 --- a/dlls/kernelbase/file.c +++ b/dlls/kernelbase/file.c @@ -2858,6 +2858,17 @@ BOOL WINAPI DECLSPEC_HOTPATCH Wow64DisableWow64FsRedirection( PVOID *old_value ) }
+/*********************************************************************** + * Wow64EnableWow64FsRedirection (kernelbase.@) + * + * Microsoft C++ Redistributable installers are depending on all %eax bits being set. + */ +DWORD /*BOOLEAN*/ WINAPI kernelbase_Wow64EnableWow64FsRedirection( BOOLEAN enable ) +{ + return set_ntstatus( RtlWow64EnableFsRedirection( enable )); +} + + /*********************************************************************** * Wow64RevertWow64FsRedirection (kernelbase.@) */ diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 9fd9ad5f038..17ae37e824c 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1757,6 +1757,7 @@ # @ stub WerpNotifyUseStringResource @ stdcall WideCharToMultiByte(long long wstr long ptr long ptr ptr) @ stdcall Wow64DisableWow64FsRedirection(ptr) +@ stdcall Wow64EnableWow64FsRedirection(long) kernelbase_Wow64EnableWow64FsRedirection @ stdcall Wow64RevertWow64FsRedirection(ptr) # @ stub Wow64SetThreadDefaultGuestMachine # @ stub -arch=i386 Wow64Transition