From a2208ace94ff0158f79fcbd89ff5dc713deb916f Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Thu, 10 Oct 2024 23:15:46 +0200
Subject: [PATCH] fix: Workaround VirtIO display driver bug (#788)

---
 assets/win11x64-enterprise-eval.xml | 5 +++++
 assets/win11x64-enterprise.xml      | 5 +++++
 assets/win11x64-iot.xml             | 5 +++++
 assets/win11x64-ltsc.xml            | 5 +++++
 assets/win11x64.xml                 | 5 +++++
 assets/win2025-eval.xml             | 5 +++++
 assets/win2025.xml                  | 5 +++++
 src/install.sh                      | 4 ++++
 8 files changed, 39 insertions(+)

diff --git a/assets/win11x64-enterprise-eval.xml b/assets/win11x64-enterprise-eval.xml
index 555d1f4..3072a69 100644
--- a/assets/win11x64-enterprise-eval.xml
+++ b/assets/win11x64-enterprise-eval.xml
@@ -443,6 +443,11 @@
         </SynchronousCommand>
         <SynchronousCommand wcm:action="add">
           <Order>22</Order>
+          <CommandLine>pnputil -i -a C:\Windows\Drivers\viogpudo\viogpudo.inf</CommandLine>
+          <Description>Install VirtIO display driver</Description>
+        </SynchronousCommand>
+        <SynchronousCommand wcm:action="add">
+          <Order>23</Order>
           <CommandLine>cmd /C if exist "C:\OEM\install.bat" start "Install" "cmd /C C:\OEM\install.bat"</CommandLine>
           <Description>Execute custom script from the OEM folder if exists</Description>
         </SynchronousCommand>
diff --git a/assets/win11x64-enterprise.xml b/assets/win11x64-enterprise.xml
index 88983f0..ffb0d72 100644
--- a/assets/win11x64-enterprise.xml
+++ b/assets/win11x64-enterprise.xml
@@ -446,6 +446,11 @@
         </SynchronousCommand>
         <SynchronousCommand wcm:action="add">
           <Order>22</Order>
+          <CommandLine>pnputil -i -a C:\Windows\Drivers\viogpudo\viogpudo.inf</CommandLine>
+          <Description>Install VirtIO display driver</Description>
+        </SynchronousCommand>
+        <SynchronousCommand wcm:action="add">
+          <Order>23</Order>
           <CommandLine>cmd /C if exist "C:\OEM\install.bat" start "Install" "cmd /C C:\OEM\install.bat"</CommandLine>
           <Description>Execute custom script from the OEM folder if exists</Description>
         </SynchronousCommand>
diff --git a/assets/win11x64-iot.xml b/assets/win11x64-iot.xml
index 79fc392..96d29e1 100644
--- a/assets/win11x64-iot.xml
+++ b/assets/win11x64-iot.xml
@@ -452,6 +452,11 @@
         </SynchronousCommand>
         <SynchronousCommand wcm:action="add">
           <Order>22</Order>
+          <CommandLine>pnputil -i -a C:\Windows\Drivers\viogpudo\viogpudo.inf</CommandLine>
+          <Description>Install VirtIO display driver</Description>
+        </SynchronousCommand>
+        <SynchronousCommand wcm:action="add">
+          <Order>23</Order>
           <CommandLine>cmd /C if exist "C:\OEM\install.bat" start "Install" "cmd /C C:\OEM\install.bat"</CommandLine>
           <Description>Execute custom script from the OEM folder if exists</Description>
         </SynchronousCommand>
diff --git a/assets/win11x64-ltsc.xml b/assets/win11x64-ltsc.xml
index 584ff9e..8a680e5 100644
--- a/assets/win11x64-ltsc.xml
+++ b/assets/win11x64-ltsc.xml
@@ -452,6 +452,11 @@
         </SynchronousCommand>
         <SynchronousCommand wcm:action="add">
           <Order>22</Order>
+          <CommandLine>pnputil -i -a C:\Windows\Drivers\viogpudo\viogpudo.inf</CommandLine>
+          <Description>Install VirtIO display driver</Description>
+        </SynchronousCommand>
+        <SynchronousCommand wcm:action="add">
+          <Order>23</Order>
           <CommandLine>cmd /C if exist "C:\OEM\install.bat" start "Install" "cmd /C C:\OEM\install.bat"</CommandLine>
           <Description>Execute custom script from the OEM folder if exists</Description>
         </SynchronousCommand>
diff --git a/assets/win11x64.xml b/assets/win11x64.xml
index 71ecdf9..ca65c1a 100644
--- a/assets/win11x64.xml
+++ b/assets/win11x64.xml
@@ -446,6 +446,11 @@
         </SynchronousCommand>
         <SynchronousCommand wcm:action="add">
           <Order>22</Order>
+          <CommandLine>pnputil -i -a C:\Windows\Drivers\viogpudo\viogpudo.inf</CommandLine>
+          <Description>Install VirtIO display driver</Description>
+        </SynchronousCommand>
+        <SynchronousCommand wcm:action="add">
+          <Order>23</Order>
           <CommandLine>cmd /C if exist "C:\OEM\install.bat" start "Install" "cmd /C C:\OEM\install.bat"</CommandLine>
           <Description>Execute custom script from the OEM folder if exists</Description>
         </SynchronousCommand>
diff --git a/assets/win2025-eval.xml b/assets/win2025-eval.xml
index 70aa09c..fc44ff1 100644
--- a/assets/win2025-eval.xml
+++ b/assets/win2025-eval.xml
@@ -337,6 +337,11 @@
         </SynchronousCommand>
         <SynchronousCommand wcm:action="add">
           <Order>21</Order>
+          <CommandLine>pnputil -i -a C:\Windows\Drivers\viogpudo\viogpudo.inf</CommandLine>
+          <Description>Install VirtIO display driver</Description>
+        </SynchronousCommand>
+        <SynchronousCommand wcm:action="add">
+          <Order>22</Order>
           <CommandLine>cmd /C if exist "C:\OEM\install.bat" start "Install" "cmd /C C:\OEM\install.bat"</CommandLine>
           <Description>Execute custom script from the OEM folder if exists</Description>
         </SynchronousCommand>
diff --git a/assets/win2025.xml b/assets/win2025.xml
index 66871a5..2c53caf 100644
--- a/assets/win2025.xml
+++ b/assets/win2025.xml
@@ -340,6 +340,11 @@
         </SynchronousCommand>
         <SynchronousCommand wcm:action="add">
           <Order>21</Order>
+          <CommandLine>pnputil -i -a C:\Windows\Drivers\viogpudo\viogpudo.inf</CommandLine>
+          <Description>Install VirtIO display driver</Description>
+        </SynchronousCommand>
+        <SynchronousCommand wcm:action="add">
+          <Order>22</Order>
           <CommandLine>cmd /C if exist "C:\OEM\install.bat" start "Install" "cmd /C C:\OEM\install.bat"</CommandLine>
           <Description>Execute custom script from the OEM folder if exists</Description>
         </SynchronousCommand>
diff --git a/src/install.sh b/src/install.sh
index a1c290a..cf9cac1 100644
--- a/src/install.sh
+++ b/src/install.sh
@@ -701,6 +701,9 @@ addDriver() {
     "winvista"* )
       [[ "${driver,,}" == "viorng" ]] && return 0
       ;;
+    "win11x64"* | "win2025"* )
+      [[ "${driver,,}" == "viogpudo" ]] && return 0
+      ;;
   esac
 
   local dest="$path/$target/$driver"
@@ -737,6 +740,7 @@ addDrivers() {
   addDriver "$version" "$drivers" "$target" "smbus"
   addDriver "$version" "$drivers" "$target" "qxldod"
   addDriver "$version" "$drivers" "$target" "viorng"
+  addDriver "$version" "$drivers" "$target" "viomem"  
   addDriver "$version" "$drivers" "$target" "viostor"
   addDriver "$version" "$drivers" "$target" "NetKVM"
   addDriver "$version" "$drivers" "$target" "Balloon"