[PATCH 0/1] MR8551: kernelbase: implement VirtualProtectFromApp

[Kareem Aladli (＠karim_adli)]

This implements the VirtualProtectFromApp function in kernelbase, which was previously a commented out stub.

Even though this function is meant for UWP apps, it is usable in desktop apps, as specified in [Windows documentation](https://learn.microsoft.com/en-us/windows/win32/api/memoryapi/nf-memoryapi-v...).

Fixes Wine-Bug: [https://bugs.winehq.org/show_bug.cgi?id=58482](https://bugs.winehq.org/show_bug.cgi?id=58482)

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/8551

[PATCH 1/1] kernelbase: implement VirtualProtectFromApp

[Kareem Aladli]

From: Kareem Aladli <karimri(a)protonmail.com>

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=58482
Signed-off-by: Kareem Aladli <karimri(a)protonmail.com>

	modified:   dlls/kernelbase/kernelbase.spec
	modified:   dlls/kernelbase/memory.c
	modified:   include/winbase.h
---
 dlls/kernelbase/kernelbase.spec |  2 +-
 dlls/kernelbase/memory.c        | 19 +++++++++++++++++++
 include/winbase.h               |  1 +
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec
index 545c30a1eb8..48471834735 100644
--- a/dlls/kernelbase/kernelbase.spec
+++ b/dlls/kernelbase/kernelbase.spec
@@ -1729,7 +1729,7 @@
 @ stdcall VirtualLock(ptr long)
 @ stdcall VirtualProtect(ptr long long ptr)
 @ stdcall VirtualProtectEx(long ptr long long ptr)
-# @ stub VirtualProtectFromApp
+@ stdcall VirtualProtectFromApp(ptr long long ptr)
 @ stdcall VirtualQuery(ptr ptr long)
 @ stdcall VirtualQueryEx(long ptr ptr long)
 @ stdcall VirtualUnlock(ptr long)
diff --git a/dlls/kernelbase/memory.c b/dlls/kernelbase/memory.c
index 9bf8e291cbe..f035f3988bf 100644
--- a/dlls/kernelbase/memory.c
+++ b/dlls/kernelbase/memory.c
@@ -572,6 +572,25 @@ BOOL WINAPI DECLSPEC_HOTPATCH VirtualProtectEx( HANDLE process, void *addr, SIZE
     return set_ntstatus( NtProtectVirtualMemory( process, &addr, &size, new_prot, old_prot ));
 }
 
+/***********************************************************************
+ *             VirtualProtectFromApp   (kernelbase.@)
+ */
+BOOL WINAPI DECLSPEC_HOTPATCH VirtualProtectFromApp( void *addr, SIZE_T size,
+    ULONG new_prot, ULONG *old_prot )
+{
+    DWORD prot;
+    BOOL ret;
+
+    if (new_prot & ( PAGE_EXECUTE_READWRITE | PAGE_EXECUTE_WRITECOPY ) || !old_prot)
+    {
+        return set_ntstatus( STATUS_INVALID_PARAMETER );
+    }
+
+    ret = VirtualProtect( addr, size, new_prot, &prot );
+    *old_prot = prot;
+
+    return ret;
+}
 
 /***********************************************************************
  *             VirtualQuery   (kernelbase.@)
diff --git a/include/winbase.h b/include/winbase.h
index 29a3ea8fbce..b4fae70dda1 100644
--- a/include/winbase.h
+++ b/include/winbase.h
@@ -2479,6 +2479,7 @@ WINBASEAPI BOOL        WINAPI VirtualFreeEx(HANDLE,LPVOID,SIZE_T,DWORD);
 WINBASEAPI BOOL        WINAPI VirtualLock(LPVOID,SIZE_T);
 WINBASEAPI BOOL        WINAPI VirtualProtect(LPVOID,SIZE_T,DWORD,LPDWORD);
 WINBASEAPI BOOL        WINAPI VirtualProtectEx(HANDLE,LPVOID,SIZE_T,DWORD,LPDWORD);
+WINBASEAPI BOOL        WINAPI VirtualProtectFromApp(LPVOID,SIZE_T,ULONG,PULONG);
 WINBASEAPI SIZE_T      WINAPI VirtualQuery(LPCVOID,PMEMORY_BASIC_INFORMATION,SIZE_T);
 WINBASEAPI SIZE_T      WINAPI VirtualQueryEx(HANDLE,LPCVOID,PMEMORY_BASIC_INFORMATION,SIZE_T);
 WINBASEAPI BOOL        WINAPI VirtualUnlock(LPVOID,SIZE_T);
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/8551

[Nikolay Sivov (＠nsivov)]

Please add some tests for this.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/8551#note_109672