Revert "Test"

This reverts commit c6b1e89.

Author: itsmikethetech

Virtual Display Driver (HDR)/MttVDD/Common.h

@@ -79,10 +79,6 @@ EVT_IDD_CX_MONITOR_QUERY_TARGET_MODES2 VirtualDisplayDriverEvtIddCxMonitorQueryT
 EVT_IDD_CX_ADAPTER_COMMIT_MODES2 VirtualDisplayDriverEvtIddCxAdapterCommitModes2;
 
 EVT_IDD_CX_MONITOR_SET_GAMMA_RAMP VirtualDisplayDriverEvtIddCxMonitorSetGammaRamp;
-EVT_IDD_CX_DEVICE_IO_CONTROL MttVddEvtIoDeviceControl;
-
-// Forward declaration for IOCTL queue setup function
-NTSTATUS SetupIoctlQueue(WDFDEVICE Device);
 
 struct
 {
@@ -156,7 +152,16 @@ const char* XorCursorSupportLevelToString(IDDCX_XOR_CURSOR_SUPPORT level) {
 
 vector<unsigned char> Microsoft::IndirectDisp::IndirectDeviceContext::s_KnownMonitorEdid; //Changed to support static vector
 
+struct IndirectDeviceContextWrapper
+{
+	IndirectDeviceContext* pContext;
 
+	void Cleanup()
+	{
+		delete pContext;
+		pContext = nullptr;
+	}
+};
 void LogQueries(const char* severity, const std::wstring& xmlName) {
 	if (xmlName.find(L"logging") == std::wstring::npos) { 
 		int size_needed = WideCharToMultiByte(CP_UTF8, 0, xmlName.c_str(), (int)xmlName.size(), NULL, 0, NULL, NULL);
@@ -629,6 +634,10 @@ void InitializeD3DDeviceAndLogGPU() {
 	vddlog("i", logtext.c_str());
 }
 
+
+// This macro creates the methods for accessing an IndirectDeviceContextWrapper as a context for a WDF object
+WDF_DECLARE_CONTEXT_TYPE(IndirectDeviceContextWrapper);
+
 extern "C" BOOL WINAPI DllMain(
 	_In_ HINSTANCE hInstance,
 	_In_ UINT dwReason,
@@ -1774,9 +1783,6 @@ NTSTATUS VirtualDisplayDriverDeviceAdd(WDFDRIVER Driver, PWDFDEVICE_INIT pDevice
 	IddConfig.EvtIddCxMonitorAssignSwapChain = VirtualDisplayDriverMonitorAssignSwapChain;
 	IddConfig.EvtIddCxMonitorUnassignSwapChain = VirtualDisplayDriverMonitorUnassignSwapChain;
 
-	// Enable IOCTL handling
-	IddConfig.EvtIddCxDeviceIoControl = MttVddEvtIoDeviceControl;
-
 	if (IDD_IS_FIELD_AVAILABLE(IDD_CX_CLIENT_CONFIG, EvtIddCxAdapterQueryTargetInfo))
 	{
 		IddConfig.EvtIddCxAdapterQueryTargetInfo = VirtualDisplayDriverEvtIddCxAdapterQueryTargetInfo;

Virtual Display Driver (HDR)/MttVDD/Driver.cpp

@@ -16,28 +16,6 @@
 #include <vector>
 
 #include "Trace.h"
-#include "mttvdd-ioctl.h"
-#include "Common.h"
-
-// Forward declaration for the IndirectDeviceContext class
-namespace Microsoft
-{
-    namespace IndirectDisp
-    {
-        class IndirectDeviceContext;
-    }
-}
-
-// Forward declarations for driver-defined context type
-struct IndirectDeviceContextWrapper
-{
-    Microsoft::IndirectDisp::IndirectDeviceContext* pContext;
-
-    void Cleanup();  // Just declare it, don't implement
-};
-
-// The WDF context access function is defined by WDF_DECLARE_CONTEXT_TYPE macro
-WDF_DECLARE_CONTEXT_TYPE(IndirectDeviceContextWrapper);
 
 namespace Microsoft
 {
@@ -107,26 +85,18 @@ namespace Microsoft
             void FinishInit();
 
             void CreateMonitor(unsigned int index);
-            NTSTATUS CreateMonitorWithParams(ULONG Width, ULONG Height, ULONG RefreshRate, GUID* MonitorId);
-            NTSTATUS DestroyMonitor(ULONG MonitorIndex);
-            NTSTATUS SetMonitorMode(ULONG MonitorIndex, ULONG Width, ULONG Height, ULONG RefreshRate);
-            NTSTATUS SetPreferredMode(ULONG MonitorIndex, ULONG Width, ULONG Height, ULONG RefreshRate);
-            NTSTATUS SetGpuPreference(LUID AdapterLuid);
-            ULONG GetMonitorCount();
 
             void AssignSwapChain(IDDCX_MONITOR& Monitor, IDDCX_SWAPCHAIN SwapChain, LUID RenderAdapter, HANDLE NewFrameEvent);
             void UnassignSwapChain();
 
         protected:
+
             WDFDEVICE m_WdfDevice;
             IDDCX_ADAPTER m_Adapter;
             IDDCX_MONITOR m_Monitor;
             IDDCX_MONITOR m_Monitor2;
 
             std::unique_ptr<SwapChainProcessor> m_ProcessingThread;
-            
-            // Store a list of connected monitors and their info
-            std::vector<std::pair<IDDCX_MONITOR, GUID>> m_Monitors;
 
         public:
             static const DISPLAYCONFIG_VIDEO_SIGNAL_INFO s_KnownMonitorModes[];

Virtual Display Driver (HDR)/MttVDD/Driver.h

@@ -36,16 +36,12 @@
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Driver.cpp" />
-    <ClCompile Include="mttioctl.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\..\Downloads\wudfwdm.h">
       <DeploymentContent>true</DeploymentContent>
     </ClInclude>
     <ClInclude Include="Driver.h" />
-    <ClInclude Include="mttvdd-ioctl.h" />
     <ClInclude Include="Trace.h" />
   </ItemGroup>
   <ItemGroup>