Alexandre Julliard : wow64: Forward NtWow64IsProcessorFeaturePresent() to the CPU backend.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 911cdcda04b3da478cdcf2b431637d8982a399a1
URL:    https://gitlab.winehq.org/wine/wine/-/commit/911cdcda04b3da478cdcf2b431637d8...

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Wed Mar 15 11:50:46 2023 +0100

wow64: Forward NtWow64IsProcessorFeaturePresent() to the CPU backend.

---

 dlls/wow64/syscall.c        |  4 +++-
 dlls/wow64cpu/cpu.c         | 10 ++++++++++
 dlls/wow64cpu/wow64cpu.spec |  1 +
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c
index e79b8cd9ff6..d057fcc256e 100644
--- a/dlls/wow64/syscall.c
+++ b/dlls/wow64/syscall.c
@@ -102,6 +102,7 @@ static WOW64INFO *wow64info;
 /* cpu backend dll functions */
 static void *   (WINAPI *pBTCpuGetBopCode)(void);
 static NTSTATUS (WINAPI *pBTCpuGetContext)(HANDLE,HANDLE,void *,void *);
+static BOOLEAN  (WINAPI *pBTCpuIsProcessorFeaturePresent)(UINT);
 static void     (WINAPI *pBTCpuProcessInit)(void);
 static NTSTATUS (WINAPI *pBTCpuSetContext)(HANDLE,HANDLE,void *,void *);
 static void     (WINAPI *pBTCpuThreadInit)(void);
@@ -629,7 +630,7 @@ NTSTATUS WINAPI wow64_NtWow64IsProcessorFeaturePresent( UINT *args )
 {
     UINT feature = get_ulong( &args );
 
-    return RtlIsProcessorFeaturePresent( feature );
+    return pBTCpuIsProcessorFeaturePresent && pBTCpuIsProcessorFeaturePresent( feature );
 }
 
 
@@ -835,6 +836,7 @@ static DWORD WINAPI process_init( RTL_RUN_ONCE *once, void *param, void **contex
     module = load_64bit_module( get_cpu_dll_name() );
     GET_PTR( BTCpuGetBopCode );
     GET_PTR( BTCpuGetContext );
+    GET_PTR( BTCpuIsProcessorFeaturePresent );
     GET_PTR( BTCpuProcessInit );
     GET_PTR( BTCpuThreadInit );
     GET_PTR( BTCpuResetToConsistentState );
diff --git a/dlls/wow64cpu/cpu.c b/dlls/wow64cpu/cpu.c
index 7911f7e8b72..aacd3ea4b85 100644
--- a/dlls/wow64cpu/cpu.c
+++ b/dlls/wow64cpu/cpu.c
@@ -352,6 +352,16 @@ void * WINAPI __wine_get_unix_opcode(void)
 }
 
 
+/**********************************************************************
+ *           BTCpuIsProcessorFeaturePresent  (wow64cpu.@)
+ */
+BOOLEAN WINAPI BTCpuIsProcessorFeaturePresent( UINT feature )
+{
+    /* assume CPU features are the same for 32- and 64-bit */
+    return RtlIsProcessorFeaturePresent( feature );
+}
+
+
 /**********************************************************************
  *           BTCpuGetContext  (wow64cpu.@)
  */
diff --git a/dlls/wow64cpu/wow64cpu.spec b/dlls/wow64cpu/wow64cpu.spec
index 48c4800a611..179f050687b 100644
--- a/dlls/wow64cpu/wow64cpu.spec
+++ b/dlls/wow64cpu/wow64cpu.spec
@@ -1,5 +1,6 @@
 @ stdcall BTCpuGetBopCode()
 @ stdcall BTCpuGetContext(long long ptr ptr)
+@ stdcall BTCpuIsProcessorFeaturePresent(long)
 @ stdcall BTCpuProcessInit()
 @ stdcall BTCpuResetToConsistentState(ptr)
 @ stdcall BTCpuSetContext(long long ptr ptr)