Now framework functioning.

NextCenturyCorporation · Apr 18, 2018 · 75c9fa0 · 75c9fa0
1 parent c0fe38d
commit 75c9fa0
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 19 deletions.
diff --git a/control/win-kernel/WinVirtUE/Driver.cpp b/control/win-kernel/WinVirtUE/Driver.cpp
@@ -101,9 +101,8 @@ DriverEntry(
 	OBJECT_ATTRIBUTES WVUThdObjAttr = { 0,0,0,0,0,0 };
 	OBJECT_ATTRIBUTES WVUPortObjAttr = { 0,0,0,0,0,0 };
 	PSECURITY_DESCRIPTOR pWVUPortSecDsc = NULL;
-#if MFS
 	HANDLE ThreadHandle = (HANDLE)-1;
-#endif
+
 	CLIENT_ID ClientId = { (HANDLE)-1,(HANDLE)-1 };
 	UNICODE_STRING usPortName = { 0,0,NULL };	
 
@@ -199,7 +198,7 @@ DriverEntry(
 		}
 	}
 
-#if MFS
+
 	InitializeObjectAttributes(&WVUThdObjAttr, NULL, OBJ_KERNEL_HANDLE, NULL, NULL);
 	// create thread, register stuff and etc
 	Status = PsCreateSystemThread(&ThreadHandle, GENERIC_ALL, &WVUThdObjAttr, NULL, &ClientId, WVUMainThreadStart, &Globals.WVUThreadStartEvent);
@@ -235,7 +234,6 @@ DriverEntry(
 		goto ErrorExit;
 		break;
 	}
-#endif
 
 	goto Exit;  // normal non-error return
 

diff --git a/control/win-kernel/WinVirtUE/Driver.h b/control/win-kernel/WinVirtUE/Driver.h
@@ -7,6 +7,7 @@
 #pragma once
 #include "common.h"
 #include "PortMsgTrans.h"
+#include "WinVirtUE.h"
 #include "externs.h"
 
 #define DEVICE_TYPE_SHUTDOWN    0xDEADBEEF

diff --git a/control/win-kernel/WinVirtUE/FltMgrCallbacks.cpp b/control/win-kernel/WinVirtUE/FltMgrCallbacks.cpp
@@ -7,15 +7,17 @@
 #include "FltMgrCallbacks.h"
 #define COMMON_POOL_TAG FLTMGR_OP_CALLBACK_POOL_TAG
 
+static ULONG_PTR OperationStatusCtx = 1;
+
+#pragma region Operation Registration Data
+
 //
 // The data below is all discardable and pageable.
 //
 
 #pragma data_seg( "INIT" )
 #pragma const_seg( "INIT" )
-
-static ULONG_PTR OperationStatusCtx = 1;
-
+
 //
 //  operation registration
 //
@@ -300,6 +302,8 @@ CONST FLT_OPERATION_REGISTRATION OperationCallbacks[] = {
 #pragma data_seg()
 #pragma const_seg()
 
+#pragma endregion
+
 /*************************************************************************
 MiniFilter callback routines.
 *************************************************************************/

diff --git a/control/win-kernel/WinVirtUE/FltMgrCallbacks.h b/control/win-kernel/WinVirtUE/FltMgrCallbacks.h
@@ -6,7 +6,7 @@
 */
 #pragma once
 #include "common.h"
-
+#include "externs.h"
 
 /**
 ** Operation Callbacks

diff --git a/control/win-kernel/WinVirtUE/FltMgrReg.cpp b/control/win-kernel/WinVirtUE/FltMgrReg.cpp
@@ -29,7 +29,7 @@ CONST FLT_REGISTRATION FilterRegistration = {
 #endif
 
     ContextRegistrationData,            //  ContextRegistration
-    NULL,                 //  Operation callbacks
+	OperationCallbacks,                 //  Operation callbacks
 
     (PFLT_FILTER_UNLOAD_CALLBACK)WVUUnload,                              //  MiniFilterUnload
 

diff --git a/control/win-kernel/WinVirtUE/WinVirtUE.cpp b/control/win-kernel/WinVirtUE/WinVirtUE.cpp
@@ -42,14 +42,6 @@ WVUMainThreadStart(PVOID  StartContext)
 		goto ErrorExit;
 	}
 
-	Status = PsSetCreateProcessNotifyRoutineEx(ProcessNotifyCallbackEx, FALSE);
-	if (FALSE == NT_SUCCESS(Status))
-	{
-		WVU_DEBUG_PRINT(LOG_WVU_MAINTHREAD, ERROR_LEVEL_ID, "PsSetCreateProcessNotifyRoutineEx(ProcessNotifyCallbackEx, FALSE) "
-			"Add Failed! Status=%08x\n", Status);
-		goto ErrorExit;
-	}
-
 	Status = PsSetCreateThreadNotifyRoutine(ThreadCreateCallback);
 	if (FALSE == NT_SUCCESS(Status))
 	{
@@ -66,7 +58,6 @@ WVUMainThreadStart(PVOID  StartContext)
 		goto ErrorExit;
 	}
 
-
 	WVU_DEBUG_PRINT(LOG_WVU_MAINTHREAD, TRACE_LEVEL_ID, "Calling KeSetEvent(WVUMainThreadStartEvt, IO_NO_INCREMENT, TRUE) . . .\n");
 #pragma warning(suppress: 28160) // stupid warning about the wait arg TRUE . . . sheesh
 	Signaled = KeSetEvent(WVUMainThreadStartEvt, IO_NO_INCREMENT, TRUE);

diff --git a/control/win-kernel/WinVirtUE/WinVirtUE.vcxproj b/control/win-kernel/WinVirtUE/WinVirtUE.vcxproj
@@ -173,6 +173,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Link>
       <AdditionalDependencies>fltmgr.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalOptions>/INTEGRITYCHECK %(AdditionalOptions)</AdditionalOptions>
     </Link>
     <Inf>
       <EnableVerbose>true</EnableVerbose>
@@ -185,6 +186,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Link>
       <AdditionalDependencies>fltmgr.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalOptions>/INTEGRITYCHECK %(AdditionalOptions)</AdditionalOptions>
     </Link>
     <Inf>
       <EnableVerbose>true</EnableVerbose>

diff --git a/control/win-kernel/WinVirtUE/config.h b/control/win-kernel/WinVirtUE/config.h
@@ -20,7 +20,8 @@
 */
 //#define LOG_MODULES LOG_NONE
 //#define LOG_MODULES (LOG_CORE|LOG_WVU_MAIN|LOG_NOTIFY_PROCS|LOG_WVU_MAINTHREAD|LOG_WVU_CONTAINER|LOG_WVU_IOCTL)
-#define LOG_MODULES (LOG_WVU_MAINTHREAD|LOG_FILE_CREATE|LOG_FILE_OP|LOG_CTX)
+//#define LOG_MODULES (LOG_WVU_MAINTHREAD|LOG_FILE_CREATE|LOG_FILE_OP|LOG_CTX)
+#define LOG_MODULES LOG_ALL
 
 /*
 * If enabled, attaching a kernel debugger to the machine will BSOD the system.