Added new test cases:

 * Buffer / Handles
 * Modules / Pages retrieval

1 files changed, 41 insertions, 6 deletions

diff --git a/IntegrationTest/IntegrationTest.cpp b/IntegrationTest/IntegrationTest.cpp
index b7582f7..c7bd04c 100644
--- a/IntegrationTest/IntegrationTest.cpp
+++ b/IntegrationTest/IntegrationTest.cpp
@@ -10,39 +10,74 @@
 #define PRINT_FAIL_MSG() std::wcout << L" [FAIL]" << std::endl
 #define PRINT_OK_MSG() std::wcout << L" [ OK ]" << std::endl
 #define KM_ASSERT_EQUAL(equal, condition, message) \
-	do { PRINT_CHECK_MSG(message); if (condition != equal) { \
+	do { PRINT_CHECK_MSG(message); if ((condition) != (equal)) { \
 		PRINT_FAIL_MSG(); goto error; } else { PRINT_OK_MSG(); } \
 	} while (0);
 
 int main()
 {
-	ULONG_PTR this_pid = GetCurrentProcessId();
+	HANDLE this_pid = (HANDLE)((ULONG_PTR)GetCurrentProcessId());
 
 	KM_ASSERT_EQUAL(true, true, "Integration Test Init");
 
 	try {
-		KInterface &ki = KInterface::getInstance();
+		KInterface& ki = KInterface::getInstance();
 		KM_ASSERT_EQUAL(true, ki.Init(), "Kernel Interface Init");
 		KM_ASSERT_EQUAL(true, ki.Handshake(), "Kernel Interface Handshake");
+		KM_ASSERT_EQUAL(true, ki.getBuffer() != NULL, "Kernel Interface Buffer != NULL");
+		KM_ASSERT_EQUAL(true, ki.getKHandle() != ki.getUHandle() && ki.getKHandle() != NULL && ki.getUHandle() != NULL, "Kernel Interface Handles");
 		KM_ASSERT_EQUAL(SRR_TIMEOUT, ki.RecvWait(), "Kernel Interface Receive Wait");
 		KM_ASSERT_EQUAL(true, ki.Ping(), "Kernel Interface PING - PONG #1");
 		KM_ASSERT_EQUAL(true, ki.Ping(), "Kernel Interface PING - PONG #2");
 		KM_ASSERT_EQUAL(true, ki.Ping(), "Kernel Interface PING - PONG #3");
 
 		{
+			SIZE_T required_modules_found = 0;
+			std::vector<MODULE_DATA> modules;
+			KM_ASSERT_EQUAL(true, ki.Modules(this_pid, modules), "Kernel Interface Modules");
+			for (auto& module : modules) {
+				if (strcmp(module.BaseDllName, "IntegrationTest-kmem.exe") == 0 && strlen(module.BaseDllName) == strlen("IntegrationTest-kmem.exe"))
+				{
+					required_modules_found++;
+				}
+				if (strcmp(module.BaseDllName, "ntdll.dll") == 0 && strlen(module.BaseDllName) == strlen("ntdll.dll"))
+				{
+					required_modules_found++;
+				}
+				if (strcmp(module.BaseDllName, "KERNEL32.DLL") == 0 && strlen(module.BaseDllName) == strlen("KERNEL32.DLL"))
+				{
+					required_modules_found++;
+				}
+			}
+			KM_ASSERT_EQUAL(3, required_modules_found, "Kernel Interface Modules (3 required found)");
+		}
+
+		{
+			SIZE_T found_shmaddr = 0;
+			std::vector<MEMORY_BASIC_INFORMATION> pages;
+			KM_ASSERT_EQUAL(true, ki.Pages(this_pid, pages), "Kernel Interface Pages");
+			for (auto& page : pages) {
+				if (page.BaseAddress == (PVOID)SHMEM_ADDR && page.RegionSize == SHMEM_SIZE) {
+					found_shmaddr++;
+				}
+			}
+			KM_ASSERT_EQUAL(1, found_shmaddr, "Kernel Interface Pages (1 required found)");
+		}
+
+		{
 			PVOID addr = (PVOID)SHMEM_ADDR;
 			SIZE_T size = 0x100;
 
 			KM_ASSERT_EQUAL(true,
-				ki.VAlloc((HANDLE)this_pid, &addr, &size, PAGE_READWRITE), "Kernel Interface VirtualAlloc SHMEM_ADDR");
+				ki.VAlloc(this_pid, &addr, &size, PAGE_READWRITE), "Kernel Interface VirtualAlloc SHMEM_ADDR");
 
 			addr = NULL;
 			size = 0x100;
 
 			KM_ASSERT_EQUAL(true,
-				ki.VAlloc((HANDLE)this_pid, &addr, &size, PAGE_READWRITE), "Kernel Interface VirtualAlloc");
+				ki.VAlloc(this_pid, &addr, &size, PAGE_READWRITE), "Kernel Interface VirtualAlloc");
 			KM_ASSERT_EQUAL(true,
-				ki.VFree((HANDLE)this_pid, addr, size), "Kernel Interface VirtualFree");
+				ki.VFree(this_pid, addr, size), "Kernel Interface VirtualFree");
 		}
 
 		KM_ASSERT_EQUAL(true, ki.Ping(), "Kernel Interface PING - PONG #4");