Version 5.4.5

ufrisk · Mar 16, 2023 · 30cadd5 · 30cadd5
1 parent d9f8f4f
commit 30cadd5
Show file tree

Hide file tree

Showing 13 changed files with 24 additions and 12 deletions.
diff --git a/includes/vmmdll.h b/includes/vmmdll.h
@@ -186,6 +186,7 @@ VOID VMMDLL_MemFree(_Frees_ptr_opt_ PVOID pvMem);
 #define VMMDLL_OPT_CORE_VERBOSE_EXTRA                   0x4000000300000000  // RW
 #define VMMDLL_OPT_CORE_VERBOSE_EXTRA_TLP               0x4000000400000000  // RW
 #define VMMDLL_OPT_CORE_MAX_NATIVE_ADDRESS              0x4000000800000000  // R
+#define VMMDLL_OPT_CORE_LEECHCORE_HANDLE                0x4000001000000000  // R - underlying leechcore handle (do not close).
 
 #define VMMDLL_OPT_CORE_SYSTEM                          0x2000000100000000  // R
 #define VMMDLL_OPT_CORE_MEMORYMODEL                     0x2000000200000000  // R

diff --git a/m_vmemd/version.h b/m_vmemd/version.h
@@ -3,8 +3,8 @@
 
 #define VERSION_MAJOR               5
 #define VERSION_MINOR               4
-#define VERSION_REVISION            4
-#define VERSION_BUILD               105
+#define VERSION_REVISION            5
+#define VERSION_BUILD               106
 
 #define VER_FILE_DESCRIPTION_STR    "MemProcFS : Plugin vmemd"
 #define VER_FILE_VERSION            VERSION_MAJOR, VERSION_MINOR, VERSION_REVISION, VERSION_BUILD

diff --git a/memprocfs/version.h b/memprocfs/version.h
@@ -3,8 +3,8 @@
 
 #define VERSION_MAJOR               5
 #define VERSION_MINOR               4
-#define VERSION_REVISION            4
-#define VERSION_BUILD               105
+#define VERSION_REVISION            5
+#define VERSION_BUILD               106
 
 #define VER_FILE_DESCRIPTION_STR    "MemProcFS"
 #define VER_FILE_VERSION            VERSION_MAJOR, VERSION_MINOR, VERSION_REVISION, VERSION_BUILD

diff --git a/vmm/version.h b/vmm/version.h
@@ -3,8 +3,8 @@
 
 #define VERSION_MAJOR               5
 #define VERSION_MINOR               4
-#define VERSION_REVISION            4
-#define VERSION_BUILD               105
+#define VERSION_REVISION            5
+#define VERSION_BUILD               106
 
 #define VER_FILE_DESCRIPTION_STR    "MemProcFS : Core"
 #define VER_FILE_VERSION            VERSION_MAJOR, VERSION_MINOR, VERSION_REVISION, VERSION_BUILD

diff --git a/vmm/vmmdll.c b/vmm/vmmdll.c
@@ -223,6 +223,9 @@ BOOL VMMDLL_ConfigGet_Impl(_In_ VMM_HANDLE H, _In_ ULONG64 fOption, _Out_ PULONG
         case VMMDLL_OPT_CORE_MAX_NATIVE_ADDRESS:
             *pqwValue = H->dev.paMax;
             return TRUE;
+        case VMMDLL_OPT_CORE_LEECHCORE_HANDLE:
+            *pqwValue = (ULONG64)H->hLC;
+            return TRUE;
         default:
             // non-recognized option - possibly a device option to pass along to leechcore.dll
             return LcGetOption(H->hLC, fOption, pqwValue);

diff --git a/vmm/vmmdll.h b/vmm/vmmdll.h
@@ -186,6 +186,7 @@ VOID VMMDLL_MemFree(_Frees_ptr_opt_ PVOID pvMem);
 #define VMMDLL_OPT_CORE_VERBOSE_EXTRA                   0x4000000300000000  // RW
 #define VMMDLL_OPT_CORE_VERBOSE_EXTRA_TLP               0x4000000400000000  // RW
 #define VMMDLL_OPT_CORE_MAX_NATIVE_ADDRESS              0x4000000800000000  // R
+#define VMMDLL_OPT_CORE_LEECHCORE_HANDLE                0x4000001000000000  // R - underlying leechcore handle (do not close).
 
 #define VMMDLL_OPT_CORE_SYSTEM                          0x2000000100000000  // R
 #define VMMDLL_OPT_CORE_MEMORYMODEL                     0x2000000200000000  // R

diff --git a/vmmjava/vmm/IVmm.java b/vmmjava/vmm/IVmm.java
@@ -58,6 +58,7 @@ public static IVmm initializeVmm(String vmmNativeLibraryPath, String argv[])
 	public static final long OPT_CORE_VERBOSE_EXTRA 			= 0x4000000300000000L;
 	public static final long OPT_CORE_VERBOSE_EXTRA_TLP 		= 0x4000000400000000L;
 	public static final long OPT_CORE_MAX_NATIVE_ADDRESS 		= 0x4000000800000000L;
+	public static final long OPT_CORE_LEECHCORE_HANDLE          = 0x4000001000000000L;
 
 	public static final long OPT_CORE_SYSTEM 					= 0x2000000100000000L;
 	public static final long OPT_CORE_MEMORYMODEL 				= 0x2000000200000000L;

diff --git a/vmmpyc/version.h b/vmmpyc/version.h
@@ -3,8 +3,8 @@
 
 #define VERSION_MAJOR               5
 #define VERSION_MINOR               4
-#define VERSION_REVISION            4
-#define VERSION_BUILD               105
+#define VERSION_REVISION            5
+#define VERSION_BUILD               106
 
 #define VER_FILE_DESCRIPTION_STR    "MemProcFS : Python API"
 #define VER_FILE_VERSION            VERSION_MAJOR, VERSION_MINOR, VERSION_REVISION, VERSION_BUILD

diff --git a/vmmrust/m_example_plugin/Cargo.toml b/vmmrust/m_example_plugin/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "m_example_plugin"
-version = "5.4.4"
+version = "5.4.5"
 edition = "2021"
 publish = false
 

diff --git a/vmmrust/memprocfs/Cargo.toml b/vmmrust/memprocfs/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "memprocfs"
-version = "5.4.4"
+version = "5.4.5"
 edition = "2021"
 description = "MemProcFS - Physical Memory Analysis Framework"
 homepage = "https://github.com/ufrisk/MemProcFS"

diff --git a/vmmrust/memprocfs/src/lib_memprocfs.rs b/vmmrust/memprocfs/src/lib_memprocfs.rs
@@ -143,6 +143,8 @@ pub const CONFIG_OPT_CORE_VERBOSE_EXTRA             : u64 = 0x4000000300000000;
 pub const CONFIG_OPT_CORE_VERBOSE_EXTRA_TLP         : u64 = 0x4000000400000000;
 /// Get max native physical memory address.
 pub const CONFIG_OPT_CORE_MAX_NATIVE_ADDRESS        : u64 = 0x4000000800000000;
+/// Get the LeechCore native handle. (void*) (do not close/free).
+pub const CONFIG_OPT_CORE_LEECHCORE_HANDLE          : u64 = 0x4000001000000000;
 /// Get the numeric system type according to VMM C-API.
 pub const CONFIG_OPT_CORE_SYSTEM                    : u64 = 0x2000000100000000;
 /// Get the numeric memory model type according to the VMM C-API.

diff --git a/vmmrust/memprocfs_example/Cargo.toml b/vmmrust/memprocfs_example/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "memprocfs_example"
-version = "5.4.4"
+version = "5.4.5"
 edition = "2021"
 publish = false
 

diff --git a/vmmsharp/vmmsharp.cs b/vmmsharp/vmmsharp.cs
@@ -37,6 +37,7 @@ public static class lc
         public static ulong OPT_CORE_VERSION_MINOR =            0x4000000600000000;
         public static ulong OPT_CORE_VERSION_REVISION =         0x4000000700000000;
         public static ulong OPT_CORE_ADDR_MAX =                 0x1000000800000000;
+        public static ulong VMMDLL_OPT_CORE_LEECHCORE_HANDLE =  0x4000001000000000;
 
         public static ulong OPT_MEMORYINFO_VALID =              0x0200000100000000;
         public static ulong OPT_MEMORYINFO_FLAG_32BIT =         0x0200000300000000;
@@ -1099,6 +1100,7 @@ public struct MAP_THREADENTRY
             public ulong ftCreateTime;
             public ulong ftExitTime;
             public ulong vaStartAddress;
+            public ulong vaWin32StartAddress;
             public ulong vaStackBaseUser;
             public ulong vaStackLimitUser;
             public ulong vaStackBaseKernel;
@@ -1623,6 +1625,7 @@ public unsafe MAP_THREADENTRY[] Map_GetThread(uint pid)
                 e.ftCreateTime = n.ftCreateTime;
                 e.ftExitTime = n.ftExitTime;
                 e.vaStartAddress = n.vaStartAddress;
+                e.vaWin32StartAddress = n.vaWin32StartAddress;
                 e.vaStackBaseUser = n.vaStackBaseUser;
                 e.vaStackLimitUser = n.vaStackLimitUser;
                 e.vaStackBaseKernel = n.vaStackBaseKernel;
@@ -2896,7 +2899,8 @@ internal struct VMMDLL_MAP_THREADENTRY
             internal byte bSuspendCount;
             internal byte bWaitReason;
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)] internal byte[] _FutureUse1;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 15)] internal uint[] _FutureUse2;
+            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 13)] internal uint[] _FutureUse2;
+            internal ulong vaWin32StartAddress;
         }
 
         [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]