From dae430ff5872784d7a750f60cf3eb36bc77ef043 Mon Sep 17 00:00:00 2001
From: Andrew Case <andrew@dfir.org>
Date: Sun, 16 Mar 2025 22:19:41 +0000
Subject: [PATCH] Address feedback

---
 volatility3/framework/plugins/windows/deskscan.py   |  4 ----
 volatility3/framework/plugins/windows/desktops.py   |  4 ----
 volatility3/framework/plugins/windows/windows.py    |  4 ----
 .../framework/plugins/windows/windowstations.py     |  2 +-
 .../framework/symbols/windows/extensions/gui.py     | 13 ++++++-------
 5 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/volatility3/framework/plugins/windows/deskscan.py b/volatility3/framework/plugins/windows/deskscan.py
index 2db9c8234..6a8ff9e65 100644
--- a/volatility3/framework/plugins/windows/deskscan.py
+++ b/volatility3/framework/plugins/windows/deskscan.py
@@ -8,7 +8,6 @@ from volatility3.framework import interfaces
 from volatility3.framework.configuration import requirements
 from volatility3.framework.renderers import format_hints
 from volatility3.plugins.windows import desktops, windowstations
-from volatility3.framework.symbols.windows.extensions import gui
 
 vollog = logging.getLogger(__name__)
 
@@ -40,9 +39,6 @@ class DeskScan(desktops.Desktops):
                 plugin=windowstations.WindowStations,
                 version=(1, 0, 0),
             ),
-            requirements.VersionRequirement(
-                name="GUIExtensions", component=gui.GUIExtensions, version=(1, 0, 0)
-            ),
         ]
 
     @classmethod
diff --git a/volatility3/framework/plugins/windows/desktops.py b/volatility3/framework/plugins/windows/desktops.py
index dd1d238d6..1085ff36d 100644
--- a/volatility3/framework/plugins/windows/desktops.py
+++ b/volatility3/framework/plugins/windows/desktops.py
@@ -8,7 +8,6 @@ from volatility3.framework import interfaces, renderers
 from volatility3.framework.configuration import requirements
 from volatility3.framework.renderers import format_hints
 from volatility3.plugins.windows import windowstations
-from volatility3.framework.symbols.windows.extensions import gui
 
 vollog = logging.getLogger(__name__)
 
@@ -37,9 +36,6 @@ class Desktops(interfaces.plugins.PluginInterface):
                 plugin=windowstations.WindowStations,
                 version=(1, 0, 0),
             ),
-            requirements.VersionRequirement(
-                name="GUIExtensions", component=gui.GUIExtensions, version=(1, 0, 0)
-            ),
         ]
 
     @classmethod
diff --git a/volatility3/framework/plugins/windows/windows.py b/volatility3/framework/plugins/windows/windows.py
index ade1df9dc..9d4317df9 100644
--- a/volatility3/framework/plugins/windows/windows.py
+++ b/volatility3/framework/plugins/windows/windows.py
@@ -9,7 +9,6 @@ from volatility3.framework.objects import utility
 from volatility3.framework.configuration import requirements
 from volatility3.framework.renderers import format_hints
 from volatility3.plugins.windows import windowstations
-from volatility3.framework.symbols.windows.extensions import gui
 
 vollog = logging.getLogger(__name__)
 
@@ -34,9 +33,6 @@ class Windows(interfaces.plugins.PluginInterface):
                 component=windowstations.WindowStations,
                 version=(1, 0, 0),
             ),
-            requirements.VersionRequirement(
-                name="GUIExtensions", component=gui.GUIExtensions, version=(1, 0, 0)
-            ),
         ]
 
     @classmethod
diff --git a/volatility3/framework/plugins/windows/windowstations.py b/volatility3/framework/plugins/windows/windowstations.py
index ad1709bfa..1f95b0531 100644
--- a/volatility3/framework/plugins/windows/windowstations.py
+++ b/volatility3/framework/plugins/windows/windowstations.py
@@ -99,7 +99,7 @@ class WindowStations(interfaces.plugins.PluginInterface):
             config_path=config_path,
             sub_path=os.path.join("windows", "gui"),
             filename=symbol_filename,
-            class_types=gui.class_types,
+            class_types=gui.GUIExtensions.class_types,
             table_mapping=table_mapping,
         )
 
diff --git a/volatility3/framework/symbols/windows/extensions/gui.py b/volatility3/framework/symbols/windows/extensions/gui.py
index f811f4313..d1835631f 100644
--- a/volatility3/framework/symbols/windows/extensions/gui.py
+++ b/volatility3/framework/symbols/windows/extensions/gui.py
@@ -325,10 +325,9 @@ class GUIExtensions(interfaces.configuration.VersionableInterface):
                 encoding="utf16",
             )
 
-
-class_types = {
-    "tagWINDOWSTATION": GUIExtensions.tagWINDOWSTATION,
-    "tagDESKTOP": GUIExtensions.tagDESKTOP,
-    "tagWND": GUIExtensions.tagWND,
-    "_LARGE_UNICODE_STRING": GUIExtensions.LARGE_UNICODE_STRING,
-}
+    class_types = {
+        "tagWINDOWSTATION": tagWINDOWSTATION,
+        "tagDESKTOP": tagDESKTOP,
+        "tagWND": tagWND,
+        "_LARGE_UNICODE_STRING": LARGE_UNICODE_STRING,
+    }