From a3f0c2fb034a3c4eef8b7c7f3f2d3251b4f46a48 Mon Sep 17 00:00:00 2001
From: Jason Denis <denisj@ainfosec.com>
Date: Tue, 13 Jan 2026 11:09:32 -0500
Subject: [PATCH] OXT-1831 Support 2022 EWDK

Signed-off-by: Jason Denis <denisj@ainfosec.com>
---
 .gitmodules             | 20 ++++++++++----------
 glasswddm               |  2 +-
 installer/installer.wxs | 10 ----------
 ivc                     |  2 +-
 pv-display-helper       |  2 +-
 xenusbdevice            |  2 +-
 xenvusb                 |  2 +-
 7 files changed, 15 insertions(+), 25 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 2515779..9bd3fa5 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,7 +1,3 @@
-[submodule "xenbus"]
-	path = xenbus
-	url = https://github.com/OpenXT/xenbus.git
-	branch = openxt-staging-9.0
 [submodule "xenvusb"]
 	path = xenvusb
 	url = https://github.com/OpenXT/xenvusb.git
@@ -12,16 +8,20 @@
 	branch = master
 [submodule "ivc"]
 	path = ivc
-	url = https://gitlab.com/ericch/ivc.git
-	branch = troy-winbuild
+	url = https://gitlab.com/vglass/ivc.git
+	branch = master
 [submodule "pv-display-helper"]
 	path = pv-display-helper
-	url = https://gitlab.com/ericch/pv-display-helper.git
-	branch = troy-winbuild
+	url = https://gitlab.com/vglass/pv-display-helper.git
+	branch = master
 [submodule "glasswddm"]
 	path = glasswddm
-	url = https://gitlab.com/ericch/glasswddm.git
-	branch = 9.0.0-unify
+	url = https://gitlab.com/vglass/glasswddm.git
+	branch = master
+[submodule "xenbus"]
+	path = xenbus
+	url = https://github.com/OpenXT/xenbus.git
+	branch = openxt-staging-9.0
 [submodule "xencons"]
 	path = xencons
 	url = https://github.com/OpenXT/xencons.git
diff --git a/glasswddm b/glasswddm
index d0aa805..cb4f7b0 160000
--- a/glasswddm
+++ b/glasswddm
@@ -1 +1 @@
-Subproject commit d0aa8055fda3bd52a8442daf8eb13ff5477706e7
+Subproject commit cb4f7b08f43bf17991be4ca5c41dab0484161b6d
diff --git a/installer/installer.wxs b/installer/installer.wxs
index 90bc36e..ebb2ef8 100644
--- a/installer/installer.wxs
+++ b/installer/installer.wxs
@@ -74,7 +74,6 @@
         <File Id='XenbusCat' Source='$(var.DIR_XENBUS)xenbus.cat' />
         <File Id='XenSys' Source='$(var.DIR_XENBUS)xen.sys' />
         <File Id='XenfiltSys' Source='$(var.DIR_XENBUS)xenfilt.sys' />
-        <File Id='XenbusCoinst' Source='$(var.DIR_XENBUS)xenbus_coinst.dll' />
         <File Id='XenbusMonitorDll' Source='$(var.DIR_XENBUS)xenbus_monitor.dll' />
         <File Id='XenbusMonitorExe' Source='$(var.DIR_XENBUS)xenbus_monitor.exe' />
         <difx:Driver AddRemovePrograms='no' PlugAndPlayPrompt='no' />
@@ -83,7 +82,6 @@
         <File Id='XenconsSys' Source='$(var.DIR_XENCONS)xencons.sys' KeyPath='yes' />
         <File Id='XenconsInf' Source='$(var.DIR_XENCONS)xencons.inf' />
         <File Id='XenconsCat' Source='$(var.DIR_XENCONS)xencons.cat' />
-        <File Id='XenconsCoinst' Source='$(var.DIR_XENCONS)xencons_coinst.dll' />
         <File Id='XenconsMonitorDll' Source='$(var.DIR_XENCONS)xencons_monitor.dll' />
         <File Id='XenconsMonitorExe' Source='$(var.DIR_XENCONS)xencons_monitor.exe' />
         <File Id='XenconsTtyExe' Source='$(var.DIR_XENCONS)xencons_tty.exe' />
@@ -93,7 +91,6 @@
         <File Id='XenifaceSys' Source='$(var.DIR_XENIFACE)xeniface.sys' KeyPath='yes' />
         <File Id='XenifaceInf' Source='$(var.DIR_XENIFACE)xeniface.inf' />
         <File Id='XenifaceCat' Source='$(var.DIR_XENIFACE)xeniface.cat' />
-        <File Id='XenifaceCoinst' Source='$(var.DIR_XENIFACE)xeniface_coinst.dll' />
         <File Id='XenagentDll' Source='$(var.DIR_XENIFACE)xenagent.dll' />
         <File Id='XenagentExe' Source='$(var.DIR_XENIFACE)xenagent.exe' />
         <difx:Driver AddRemovePrograms='no' PlugAndPlayPrompt='no' />
@@ -102,28 +99,24 @@
         <File Id='XenhidSys' Source='$(var.DIR_XENHID)xenhid.sys' KeyPath='yes' />
         <File Id='XenhidInf' Source='$(var.DIR_XENHID)xenhid.inf' />
         <File Id='XenhidCat' Source='$(var.DIR_XENHID)xenhid.cat' />
-        <File Id='XenhidCoinst' Source='$(var.DIR_XENHID)xenhid_coinst.dll' />
         <difx:Driver AddRemovePrograms='no' PlugAndPlayPrompt='no' />
       </Component>
       <Component Id='Xenvkbd' Guid='B3C80249-E80F-4CA4-A293-8E858B45288C' Directory='Xenvkbd'>
         <File Id='XenvkbdSys' Source='$(var.DIR_XENVKBD)xenvkbd.sys' KeyPath='yes' />
         <File Id='XenvkbdInf' Source='$(var.DIR_XENVKBD)xenvkbd.inf' />
         <File Id='XenvkbdCat' Source='$(var.DIR_XENVKBD)xenvkbd.cat' />
-        <File Id='XenvkbdCoinst' Source='$(var.DIR_XENVKBD)xenvkbd_coinst.dll' />
         <difx:Driver AddRemovePrograms='no' PlugAndPlayPrompt='no' />
       </Component>
       <Component Id='Xenvif' Guid='AA02F568-3DC4-43B6-83BC-75832CA4E4F0' Directory='Xenvif'>
         <File Id='XenvifSys' Source='$(var.DIR_XENVIF)xenvif.sys' KeyPath='yes' />
         <File Id='XenvifInf' Source='$(var.DIR_XENVIF)xenvif.inf' />
         <File Id='XenvifCat' Source='$(var.DIR_XENVIF)xenvif.cat' />
-        <File Id='XenvifCoinst' Source='$(var.DIR_XENVIF)xenvif_coinst.dll' />
         <difx:Driver AddRemovePrograms='no' PlugAndPlayPrompt='no' />
       </Component>
       <Component Id='Xennet' Guid='3E83BF0A-9405-4523-B418-605D33EC0345' Directory='Xennet'>
         <File Id='XennetSys' Source='$(var.DIR_XENNET)xennet.sys' KeyPath='yes' />
         <File Id='XennetInf' Source='$(var.DIR_XENNET)xennet.inf' />
         <File Id='XennetCat' Source='$(var.DIR_XENNET)xennet.cat' />
-        <File Id='XennetCoinst' Source='$(var.DIR_XENNET)xennet_coinst.dll' />
         <difx:Driver AddRemovePrograms='no' PlugAndPlayPrompt='no' />
       </Component>
       <Component Id='Xenvbd' Guid='30D77968-F9A7-4466-8436-2A3020F007F3' Directory='Xenvbd'>
@@ -132,7 +125,6 @@
         <File Id='XenvbdCat' Source='$(var.DIR_XENVBD)xenvbd.cat' />
         <File Id='XencrshSys' Source='$(var.DIR_XENVBD)xencrsh.sys' />
         <File Id='XendiskSys' Source='$(var.DIR_XENVBD)xendisk.sys' />
-        <File Id='XenvbdCoinst' Source='$(var.DIR_XENVBD)xenvbd_coinst.dll' />
         <difx:Driver AddRemovePrograms='no' PlugAndPlayPrompt='no' />
       </Component>
     </ComponentGroup>
@@ -141,14 +133,12 @@
         <File Id='XenvusbSys' Source='$(var.DIR_XENVUSB)xenvusb.sys' KeyPath='yes' />
         <File Id='XenvusbInf' Source='$(var.DIR_XENVUSB)xenvusb.inf' />
         <File Id='XenvusbCat' Source='$(var.DIR_XENVUSB)xenvusb.cat' />
-        <File Id='XenvusbCoinst' Source='$(var.DIR_XENVUSB)xenvusb_coinst.dll' />
         <difx:Driver AddRemovePrograms='no' PlugAndPlayPrompt='no' />
       </Component>
       <Component Id='Xenusbdevice' Guid='3D2B8FE3-A2C4-4D78-B0D1-35D5DFFEBE9A' Directory='Xenusbdevice'>
         <File Id='XenusbdeviceSys' Source='$(var.DIR_XENUSBDEVICE)xenusbdevice.sys' KeyPath='yes' />
         <File Id='XenusbdeviceInf' Source='$(var.DIR_XENUSBDEVICE)xenusbdevice.inf' />
         <File Id='XenusbdeviceCat' Source='$(var.DIR_XENUSBDEVICE)xenusbdevice.cat' />
-        <File Id='XenusbdeviceCoinst' Source='$(var.DIR_XENUSBDEVICE)xenusbdevice_coinst.dll' />
         <difx:Driver AddRemovePrograms='no' PlugAndPlayPrompt='no' />
       </Component>
     </ComponentGroup>
diff --git a/ivc b/ivc
index 64929d2..b586799 160000
--- a/ivc
+++ b/ivc
@@ -1 +1 @@
-Subproject commit 64929d2530405b71b082aaab0f897965af2edef4
+Subproject commit b58679951d6ed03bca00dc2aea8d286dc555af04
diff --git a/pv-display-helper b/pv-display-helper
index 3cf21d2..426f0b9 160000
--- a/pv-display-helper
+++ b/pv-display-helper
@@ -1 +1 @@
-Subproject commit 3cf21d2ba06d86a30092f25cadb1ba18ff095e09
+Subproject commit 426f0b991b704ee48e805bf5cbe3040663a99308
diff --git a/xenusbdevice b/xenusbdevice
index 8efb58b..312951e 160000
--- a/xenusbdevice
+++ b/xenusbdevice
@@ -1 +1 @@
-Subproject commit 8efb58bc0ee320a00a207ab46554a37ab850696f
+Subproject commit 312951e2026fdda1e605f73184abbb215e32cea8
diff --git a/xenvusb b/xenvusb
index c6e314d..ddfdfab 160000
--- a/xenvusb
+++ b/xenvusb
@@ -1 +1 @@
-Subproject commit c6e314d2973e0f59852e00d864923f198878e3ac
+Subproject commit ddfdfab297861b7bc312f9d10961f22184a57afb