Version 5.8.26

ufrisk · ufrisk · commit 819aefc7118e · 2024-02-29T00:35:03.000+01:00
diff --git a/includes/leechcore.h b/includes/leechcore.h
@@ -14,7 +14,7 @@
 // (c) Ulf Frisk, 2020-2024
 // Author: Ulf Frisk, pcileech@frizk.net
 //
-// Header Version: 2.16.1
+// Header Version: 2.17
 //
 
 #ifndef __LEECHCORE_H__
diff --git a/includes/lib32/leechcore.lib b/includes/lib32/leechcore.lib
diff --git a/includes/lib32/vmm.lib b/includes/lib32/vmm.lib
diff --git a/includes/lib64/leechcore.lib b/includes/lib64/leechcore.lib
diff --git a/includes/lib64/vmm.lib b/includes/lib64/vmm.lib
diff --git a/includes/libarm64/leechcore.lib b/includes/libarm64/leechcore.lib
diff --git a/includes/libarm64/vmm.lib b/includes/libarm64/vmm.lib
diff --git a/m_vmemd/version.h b/m_vmemd/version.h
@@ -3,8 +3,8 @@
 
 #define VERSION_MAJOR               5
 #define VERSION_MINOR               8
-#define VERSION_REVISION            25
-#define VERSION_BUILD               145
+#define VERSION_REVISION            26
+#define VERSION_BUILD               146
 
 #define VER_FILE_DESCRIPTION_STR    "MemProcFS : Plugin vmemd"
 #define VER_FILE_VERSION            VERSION_MAJOR, VERSION_MINOR, VERSION_REVISION, VERSION_BUILD
diff --git a/memprocfs/ob/ob.h b/memprocfs/ob/ob.h
@@ -99,7 +99,7 @@ PVOID Ob_AllocEx(_In_opt_ VMM_HANDLE H, _In_ DWORD tag, _In_ UINT uFlags, _In_ S
 * -- pfnRef_1 = optional callback for when object reach refcount = 1 at DECREF.
 * -- return = allocated object on success, with refcount = 1, - NULL on fail.
 */
-inline PVOID Ob_Alloc(_In_ DWORD tag, _In_ UINT uFlags, _In_ SIZE_T uBytes, _In_opt_ OB_CLEANUP_CB pfnRef_0, _In_opt_ OB_CLEANUP_CB pfnRef_1)
+__forceinline PVOID Ob_Alloc(_In_ DWORD tag, _In_ UINT uFlags, _In_ SIZE_T uBytes, _In_opt_ OB_CLEANUP_CB pfnRef_0, _In_opt_ OB_CLEANUP_CB pfnRef_1)
 {
     return Ob_AllocEx(NULL, tag, uFlags, uBytes, pfnRef_0, pfnRef_1);
 }
diff --git a/memprocfs/oscompatibility.h b/memprocfs/oscompatibility.h
@@ -55,6 +55,7 @@ typedef struct tdSID { BYTE pb[12]; } SID, *PSID;
 typedef DWORD(*PTHREAD_START_ROUTINE)(PVOID);
 typedef DWORD(*LPTHREAD_START_ROUTINE)(PVOID);
 typedef int(*_CoreCrtNonSecureSearchSortCompareFunction)(void const *, void const *);
+#define __forceinline                       inline __attribute__((always_inline))
 #define errno_t                             int
 #define CONST                               const
 #define TRUE                                1
diff --git a/memprocfs/version.h b/memprocfs/version.h
@@ -3,8 +3,8 @@
 
 #define VERSION_MAJOR               5
 #define VERSION_MINOR               8
-#define VERSION_REVISION            25
-#define VERSION_BUILD               145
+#define VERSION_REVISION            26
+#define VERSION_BUILD               146
 
 #define VER_FILE_DESCRIPTION_STR    "MemProcFS"
 #define VER_FILE_VERSION            VERSION_MAJOR, VERSION_MINOR, VERSION_REVISION, VERSION_BUILD
diff --git a/vmm/ob/ob.h b/vmm/ob/ob.h
@@ -100,7 +100,7 @@ PVOID Ob_AllocEx(_In_opt_ VMM_HANDLE H, _In_ DWORD tag, _In_ UINT uFlags, _In_ S
 * -- pfnRef_1 = optional callback for when object reach refcount = 1 at DECREF.
 * -- return = allocated object on success, with refcount = 1, - NULL on fail.
 */
-inline PVOID Ob_Alloc(_In_ DWORD tag, _In_ UINT uFlags, _In_ SIZE_T uBytes, _In_opt_ OB_CLEANUP_CB pfnRef_0, _In_opt_ OB_CLEANUP_CB pfnRef_1)
+__forceinline PVOID Ob_Alloc(_In_ DWORD tag, _In_ UINT uFlags, _In_ SIZE_T uBytes, _In_opt_ OB_CLEANUP_CB pfnRef_0, _In_opt_ OB_CLEANUP_CB pfnRef_1)
 {
     return Ob_AllocEx(NULL, tag, uFlags, uBytes, pfnRef_0, pfnRef_1);
 }
diff --git a/vmm/oscompatibility.c b/vmm/oscompatibility.c
@@ -451,7 +451,7 @@ BOOL AcquireSRWLockExclusive_Try(_Inout_ PSRWLOCK SRWLock)
 {
     DWORD dwZero = 0;
     __sync_fetch_and_add_4(&SRWLock->c, 1);
-    if(atomic_compare_exchange_strong(&SRWLock->xchg, &dwZero, 1)) {
+    if(atomic_compare_exchange_strong((atomic_uint*)&SRWLock->xchg, &dwZero, 1)) {
         return TRUE;
     }
     __sync_sub_and_fetch_4(&SRWLock->c, 1);
@@ -464,7 +464,7 @@ VOID AcquireSRWLockExclusive(_Inout_ PSRWLOCK SRWLock)
     __sync_fetch_and_add_4(&SRWLock->c, 1);
     while(TRUE) {
         dwZero = 0;
-        if(atomic_compare_exchange_strong(&SRWLock->xchg, &dwZero, 1)) {
+        if(atomic_compare_exchange_strong((atomic_uint*)&SRWLock->xchg, &dwZero, 1)) {
             return;
         }
         futex(&SRWLock->xchg, FUTEX_WAIT, 1, NULL, NULL, 0);
@@ -479,7 +479,7 @@ BOOL AcquireSRWLockExclusive_Timeout(_Inout_ PSRWLOCK SRWLock, _In_ DWORD dwMill
     __sync_fetch_and_add_4(&SRWLock->c, 1);
     while(TRUE) {
         dwZero = 0;
-        if(atomic_compare_exchange_strong(&SRWLock->xchg, &dwZero, 1)) {
+        if(atomic_compare_exchange_strong((atomic_uint*)&SRWLock->xchg, &dwZero, 1)) {
             return TRUE;
         }
         if((dwMilliseconds != 0) && (dwMilliseconds != 0xffffffff)) {
@@ -501,7 +501,7 @@ BOOL AcquireSRWLockExclusive_Timeout(_Inout_ PSRWLOCK SRWLock, _In_ DWORD dwMill
 VOID ReleaseSRWLockExclusive(_Inout_ PSRWLOCK SRWLock)
 {
     DWORD dwOne = 1;
-    if(atomic_compare_exchange_strong(&SRWLock->xchg, &dwOne, 0)) {
+    if(atomic_compare_exchange_strong((atomic_uint*)&SRWLock->xchg, &dwOne, 0)) {
         if(__sync_sub_and_fetch_4(&SRWLock->c, 1)) {
             futex(&SRWLock->xchg, FUTEX_WAKE, 1, NULL, NULL, 0);
         }
diff --git a/vmm/oscompatibility.h b/vmm/oscompatibility.h
@@ -70,6 +70,7 @@ typedef struct tdSID                        { BYTE pb[12]; } SID, *PSID;
 typedef DWORD(*PTHREAD_START_ROUTINE)(PVOID);
 typedef DWORD(*LPTHREAD_START_ROUTINE)(PVOID);
 typedef int(*_CoreCrtNonSecureSearchSortCompareFunction)(void const *, void const *);
+#define __forceinline                       inline __attribute__((always_inline))
 #define WINAPI
 #define errno_t                             int
 #define CONST                               const
diff --git a/vmm/pe.h b/vmm/pe.h
@@ -221,7 +221,7 @@ LPSTR PE_EatForwardedFunctionNameValidate(
 * -- return = success: number of entries. fail: 0.
 */
 DWORD PE_EatGetNumberOfEx(_In_ VMM_HANDLE H, _In_ PVMM_PROCESS pProcess, _In_opt_ QWORD vaModuleBase, _In_reads_opt_(0x1000) PBYTE pbModuleHeaderOpt);
-inline DWORD PE_EatGetNumberOf(_In_ VMM_HANDLE H, _In_ PVMM_PROCESS pProcess, _In_opt_ QWORD vaModuleBase)
+__forceinline DWORD PE_EatGetNumberOf(_In_ VMM_HANDLE H, _In_ PVMM_PROCESS pProcess, _In_opt_ QWORD vaModuleBase)
 {
     return PE_EatGetNumberOfEx(H, pProcess, vaModuleBase, NULL);
 }
@@ -236,7 +236,7 @@ inline DWORD PE_EatGetNumberOf(_In_ VMM_HANDLE H, _In_ PVMM_PROCESS pProcess, _I
 * -- return = success: number of entries. fail: 0.
 */
 DWORD PE_IatGetNumberOfEx(_In_ VMM_HANDLE H, _In_ PVMM_PROCESS pProcess, _In_opt_ QWORD vaModuleBase, _In_reads_opt_(0x1000) PBYTE pbModuleHeaderOpt);
-inline DWORD PE_IatGetNumberOf(_In_ VMM_HANDLE H, _In_ PVMM_PROCESS pProcess, _In_opt_ QWORD vaModuleBase)
+__forceinline DWORD PE_IatGetNumberOf(_In_ VMM_HANDLE H, _In_ PVMM_PROCESS pProcess, _In_opt_ QWORD vaModuleBase)
 {
     return PE_IatGetNumberOfEx(H, pProcess, vaModuleBase, NULL);
 }
diff --git a/vmm/version.h b/vmm/version.h
@@ -3,8 +3,8 @@
 
 #define VERSION_MAJOR               5
 #define VERSION_MINOR               8
-#define VERSION_REVISION            25
-#define VERSION_BUILD               145
+#define VERSION_REVISION            26
+#define VERSION_BUILD               146
 
 #define VER_FILE_DESCRIPTION_STR    "MemProcFS : Core"
 #define VER_FILE_VERSION            VERSION_MAJOR, VERSION_MINOR, VERSION_REVISION, VERSION_BUILD
diff --git a/vmm/vmm.c b/vmm/vmm.c
@@ -843,7 +843,7 @@ PVMM_PROCESS VmmProcessGetEx(_In_ VMM_HANDLE H, _In_opt_ PVMMOB_PROCESS_TABLE pt
 * -- dwPID
 * -- return = a process struct, or NULL if not found.
 */
-inline PVMM_PROCESS VmmProcessGet(_In_ VMM_HANDLE H, _In_ DWORD dwPID)
+__forceinline PVMM_PROCESS VmmProcessGet(_In_ VMM_HANDLE H, _In_ DWORD dwPID)
 {
     return VmmProcessGetEx(H, NULL, dwPID, 0);
 }
diff --git a/vmm/vmmlog.c b/vmm/vmmlog.c
@@ -41,7 +41,7 @@ typedef struct tdVMMLOG_CONTEXT {
 /*
 * Helper function to get a log module info object.
 */
-inline PVMMLOG_CONTEXT_MODULEINFO VmmLog_GetModuleInfo(_In_ VMM_HANDLE H, _In_ VMM_MODULE_ID MID)
+__forceinline PVMMLOG_CONTEXT_MODULEINFO VmmLog_GetModuleInfo(_In_ VMM_HANDLE H, _In_ VMM_MODULE_ID MID)
 {
     PVMMLOG_CONTEXT ctxLog = H->log;
     if(!ctxLog) { return NULL; }
diff --git a/vmm/vmmwinpool.c b/vmm/vmmwinpool.c
@@ -31,7 +31,7 @@
 * -- dwPoolType
 * -- return
 */
-inline VMM_MAP_POOL_TP VmmWinPool_PoolTypeConvert(_In_ DWORD dwPoolType)
+__forceinline VMM_MAP_POOL_TP VmmWinPool_PoolTypeConvert(_In_ DWORD dwPoolType)
 {
     if(dwPoolType & 1) {
         return VMM_MAP_POOL_TP_PagedPool;
diff --git a/vmmpyc/version.h b/vmmpyc/version.h
@@ -3,8 +3,8 @@
 
 #define VERSION_MAJOR               5
 #define VERSION_MINOR               8
-#define VERSION_REVISION            25
-#define VERSION_BUILD               145
+#define VERSION_REVISION            26
+#define VERSION_BUILD               146
 
 #define VER_FILE_DESCRIPTION_STR    "MemProcFS : Python API"
 #define VER_FILE_VERSION            VERSION_MAJOR, VERSION_MINOR, VERSION_REVISION, VERSION_BUILD
diff --git a/vmmrust/leechcore_example/Cargo.toml b/vmmrust/leechcore_example/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "leechcore_example"
-version = "5.8.25"
+version = "5.8.26"
 edition = "2021"
 publish = false
 
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.8.25"
+version = "5.8.26"
 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.8.25"
+version = "5.8.26"
 edition = "2021"
 description = "MemProcFS - Physical Memory Analysis Framework"
 homepage = "https://github.com/ufrisk/MemProcFS"
diff --git a/vmmrust/memprocfs_example/Cargo.toml b/vmmrust/memprocfs_example/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "memprocfs_example"
-version = "5.8.25"
+version = "5.8.26"
 edition = "2021"
 publish = false
 

Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ PVOID Ob_AllocEx(_In_opt_ VMM_HANDLE H, _In_ DWORD tag, _In_ UINT uFlags, _In_ S`
`99`	`99`	`* -- pfnRef_1 = optional callback for when object reach refcount = 1 at DECREF.`
`100`	`100`	`* -- return = allocated object on success, with refcount = 1, - NULL on fail.`
`101`	`101`	`*/`
`102`		`-inline PVOID Ob_Alloc(_In_ DWORD tag, _In_ UINT uFlags, _In_ SIZE_T uBytes, _In_opt_ OB_CLEANUP_CB pfnRef_0, _In_opt_ OB_CLEANUP_CB pfnRef_1)`
	`102`	`+__forceinline PVOID Ob_Alloc(_In_ DWORD tag, _In_ UINT uFlags, _In_ SIZE_T uBytes, _In_opt_ OB_CLEANUP_CB pfnRef_0, _In_opt_ OB_CLEANUP_CB pfnRef_1)`
`103`	`103`	`{`
`104`	`104`	`return Ob_AllocEx(NULL, tag, uFlags, uBytes, pfnRef_0, pfnRef_1);`
`105`	`105`	`}`