From 3750b88ba499e35f1985ea53e1b59daca13e1d3b Mon Sep 17 00:00:00 2001
From: David McDonald <dgmcdona@uno.edu>
Date: Tue, 25 Feb 2025 10:12:07 -0600
Subject: [PATCH] Windows WindowStations: Fix issue with native types

---
 .../plugins/windows/windowstations.py         |  3 +-
 .../windows/gui/gui-win10-10586-x64.json      | 38 +++++++++----------
 .../windows/gui/gui-win10-15063-x64.json      | 38 +++++++++----------
 .../windows/gui/gui-win10-16299-x64.json      | 38 +++++++++----------
 .../windows/gui/gui-win10-17134-x64.json      | 38 +++++++++----------
 .../windows/gui/gui-win10-17763-x64.json      | 38 +++++++++----------
 .../windows/gui/gui-win10-18362-x64.json      | 38 +++++++++----------
 .../windows/gui/gui-win10-19041-x64.json      | 38 +++++++++----------
 .../windows/gui/gui-win10-19577-x64.json      | 38 +++++++++----------
 .../symbols/windows/gui/gui-win7sp0-x64.json  | 38 +++++++++----------
 .../symbols/windows/gui/gui-win7sp1-x64.json  | 38 +++++++++----------
 .../symbols/windows/gui/gui-win8-x64.json     | 38 +++++++++----------
 12 files changed, 211 insertions(+), 210 deletions(-)

diff --git a/volatility3/framework/plugins/windows/windowstations.py b/volatility3/framework/plugins/windows/windowstations.py
index cb6a52b88..6dac484f5 100644
--- a/volatility3/framework/plugins/windows/windowstations.py
+++ b/volatility3/framework/plugins/windows/windowstations.py
@@ -64,7 +64,8 @@ class WindowStations(interfaces.plugins.PluginInterface):
         Returns:
             The name of the constructed GUI table
         """
-        native_types = context.symbol_space[symbol_table].natives
+
+        native_types = intermed.native.x64NativeTable
 
         if not symbols.symbol_table_is_64bit(context, symbol_table):
             raise NotImplementedError(
diff --git a/volatility3/framework/symbols/windows/gui/gui-win10-10586-x64.json b/volatility3/framework/symbols/windows/gui/gui-win10-10586-x64.json
index 5f280725c..4533c6eba 100644
--- a/volatility3/framework/symbols/windows/gui/gui-win10-10586-x64.json
+++ b/volatility3/framework/symbols/windows/gui/gui-win10-10586-x64.json
@@ -4225,21 +4225,21 @@
     "Blue": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 8
     }, 
     "Green": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 4
     }, 
     "Red": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 0
     }
@@ -8099,112 +8099,112 @@
     "_41": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 48
     }, 
     "_42": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 52
     }, 
     "_43": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 56
     }, 
     "_44": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 60
     }, 
     "_34": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 44
     }, 
     "_14": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 12
     }, 
     "_13": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 8
     }, 
     "_12": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 4
     }, 
     "_11": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 0
     }, 
     "_24": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 28
     }, 
     "_31": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 32
     }, 
     "_33": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 40
     }, 
     "_32": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 36
     }, 
     "_22": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 20
     }, 
     "_23": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 24
     }, 
     "_21": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 16
     }
diff --git a/volatility3/framework/symbols/windows/gui/gui-win10-15063-x64.json b/volatility3/framework/symbols/windows/gui/gui-win10-15063-x64.json
index 26e7356b9..4405d0375 100644
--- a/volatility3/framework/symbols/windows/gui/gui-win10-15063-x64.json
+++ b/volatility3/framework/symbols/windows/gui/gui-win10-15063-x64.json
@@ -4225,21 +4225,21 @@
     "Blue": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 8
     }, 
     "Green": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 4
     }, 
     "Red": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 0
     }
@@ -8099,112 +8099,112 @@
     "_41": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 48
     }, 
     "_42": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 52
     }, 
     "_43": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 56
     }, 
     "_44": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 60
     }, 
     "_34": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 44
     }, 
     "_14": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 12
     }, 
     "_13": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 8
     }, 
     "_12": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 4
     }, 
     "_11": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 0
     }, 
     "_24": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 28
     }, 
     "_31": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 32
     }, 
     "_33": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 40
     }, 
     "_32": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 36
     }, 
     "_22": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 20
     }, 
     "_23": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 24
     }, 
     "_21": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 16
     }
diff --git a/volatility3/framework/symbols/windows/gui/gui-win10-16299-x64.json b/volatility3/framework/symbols/windows/gui/gui-win10-16299-x64.json
index bde774987..67fb6c531 100644
--- a/volatility3/framework/symbols/windows/gui/gui-win10-16299-x64.json
+++ b/volatility3/framework/symbols/windows/gui/gui-win10-16299-x64.json
@@ -4225,21 +4225,21 @@
     "Blue": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 8
     }, 
     "Green": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 4
     }, 
     "Red": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 0
     }
@@ -8099,112 +8099,112 @@
     "_41": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 48
     }, 
     "_42": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 52
     }, 
     "_43": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 56
     }, 
     "_44": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 60
     }, 
     "_34": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 44
     }, 
     "_14": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 12
     }, 
     "_13": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 8
     }, 
     "_12": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 4
     }, 
     "_11": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 0
     }, 
     "_24": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 28
     }, 
     "_31": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 32
     }, 
     "_33": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 40
     }, 
     "_32": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 36
     }, 
     "_22": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 20
     }, 
     "_23": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 24
     }, 
     "_21": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 16
     }
diff --git a/volatility3/framework/symbols/windows/gui/gui-win10-17134-x64.json b/volatility3/framework/symbols/windows/gui/gui-win10-17134-x64.json
index cd5ca7169..d341a3fd0 100644
--- a/volatility3/framework/symbols/windows/gui/gui-win10-17134-x64.json
+++ b/volatility3/framework/symbols/windows/gui/gui-win10-17134-x64.json
@@ -4225,21 +4225,21 @@
     "Blue": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 8
     }, 
     "Green": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 4
     }, 
     "Red": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 0
     }
@@ -8099,112 +8099,112 @@
     "_41": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 48
     }, 
     "_42": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 52
     }, 
     "_43": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 56
     }, 
     "_44": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 60
     }, 
     "_34": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 44
     }, 
     "_14": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 12
     }, 
     "_13": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 8
     }, 
     "_12": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 4
     }, 
     "_11": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 0
     }, 
     "_24": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 28
     }, 
     "_31": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 32
     }, 
     "_33": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 40
     }, 
     "_32": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 36
     }, 
     "_22": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 20
     }, 
     "_23": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 24
     }, 
     "_21": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 16
     }
diff --git a/volatility3/framework/symbols/windows/gui/gui-win10-17763-x64.json b/volatility3/framework/symbols/windows/gui/gui-win10-17763-x64.json
index 00d3f61f3..a9c2e5995 100644
--- a/volatility3/framework/symbols/windows/gui/gui-win10-17763-x64.json
+++ b/volatility3/framework/symbols/windows/gui/gui-win10-17763-x64.json
@@ -4225,21 +4225,21 @@
     "Blue": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 8
     }, 
     "Green": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 4
     }, 
     "Red": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 0
     }
@@ -8099,112 +8099,112 @@
     "_41": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 48
     }, 
     "_42": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 52
     }, 
     "_43": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 56
     }, 
     "_44": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 60
     }, 
     "_34": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 44
     }, 
     "_14": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 12
     }, 
     "_13": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 8
     }, 
     "_12": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 4
     }, 
     "_11": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 0
     }, 
     "_24": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 28
     }, 
     "_31": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 32
     }, 
     "_33": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 40
     }, 
     "_32": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 36
     }, 
     "_22": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 20
     }, 
     "_23": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 24
     }, 
     "_21": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 16
     }
diff --git a/volatility3/framework/symbols/windows/gui/gui-win10-18362-x64.json b/volatility3/framework/symbols/windows/gui/gui-win10-18362-x64.json
index dc458970e..22f6d17b4 100644
--- a/volatility3/framework/symbols/windows/gui/gui-win10-18362-x64.json
+++ b/volatility3/framework/symbols/windows/gui/gui-win10-18362-x64.json
@@ -4225,21 +4225,21 @@
     "Blue": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 8
     }, 
     "Green": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 4
     }, 
     "Red": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 0
     }
@@ -8099,112 +8099,112 @@
     "_41": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 48
     }, 
     "_42": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 52
     }, 
     "_43": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 56
     }, 
     "_44": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 60
     }, 
     "_34": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 44
     }, 
     "_14": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 12
     }, 
     "_13": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 8
     }, 
     "_12": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 4
     }, 
     "_11": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 0
     }, 
     "_24": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 28
     }, 
     "_31": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 32
     }, 
     "_33": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 40
     }, 
     "_32": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 36
     }, 
     "_22": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 20
     }, 
     "_23": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 24
     }, 
     "_21": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 16
     }
diff --git a/volatility3/framework/symbols/windows/gui/gui-win10-19041-x64.json b/volatility3/framework/symbols/windows/gui/gui-win10-19041-x64.json
index 09f518451..f26523a1a 100644
--- a/volatility3/framework/symbols/windows/gui/gui-win10-19041-x64.json
+++ b/volatility3/framework/symbols/windows/gui/gui-win10-19041-x64.json
@@ -4225,21 +4225,21 @@
     "Blue": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 8
     }, 
     "Green": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 4
     }, 
     "Red": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 0
     }
@@ -8099,112 +8099,112 @@
     "_41": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 48
     }, 
     "_42": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 52
     }, 
     "_43": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 56
     }, 
     "_44": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 60
     }, 
     "_34": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 44
     }, 
     "_14": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 12
     }, 
     "_13": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 8
     }, 
     "_12": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 4
     }, 
     "_11": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 0
     }, 
     "_24": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 28
     }, 
     "_31": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 32
     }, 
     "_33": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 40
     }, 
     "_32": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 36
     }, 
     "_22": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 20
     }, 
     "_23": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 24
     }, 
     "_21": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 16
     }
diff --git a/volatility3/framework/symbols/windows/gui/gui-win10-19577-x64.json b/volatility3/framework/symbols/windows/gui/gui-win10-19577-x64.json
index 5c9f4d814..7a1a405a3 100644
--- a/volatility3/framework/symbols/windows/gui/gui-win10-19577-x64.json
+++ b/volatility3/framework/symbols/windows/gui/gui-win10-19577-x64.json
@@ -4225,21 +4225,21 @@
     "Blue": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 8
     }, 
     "Green": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 4
     }, 
     "Red": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 0
     }
@@ -8099,112 +8099,112 @@
     "_41": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 48
     }, 
     "_42": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 52
     }, 
     "_43": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 56
     }, 
     "_44": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 60
     }, 
     "_34": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 44
     }, 
     "_14": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 12
     }, 
     "_13": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 8
     }, 
     "_12": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 4
     }, 
     "_11": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 0
     }, 
     "_24": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 28
     }, 
     "_31": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 32
     }, 
     "_33": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 40
     }, 
     "_32": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 36
     }, 
     "_22": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 20
     }, 
     "_23": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 24
     }, 
     "_21": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 16
     }
diff --git a/volatility3/framework/symbols/windows/gui/gui-win7sp0-x64.json b/volatility3/framework/symbols/windows/gui/gui-win7sp0-x64.json
index 6c2e7dd17..80de6b279 100644
--- a/volatility3/framework/symbols/windows/gui/gui-win7sp0-x64.json
+++ b/volatility3/framework/symbols/windows/gui/gui-win7sp0-x64.json
@@ -4812,21 +4812,21 @@
 				"Blue": {
 					"type": {
 						"kind": "base",
-						"name": "f32"
+						"name": "float"
 					},
 					"offset": 8
 				},
 				"Green": {
 					"type": {
 						"kind": "base",
-						"name": "f32"
+						"name": "float"
 					},
 					"offset": 4
 				},
 				"Red": {
 					"type": {
 						"kind": "base",
-						"name": "f32"
+						"name": "float"
 					},
 					"offset": 0
 				}
@@ -8686,112 +8686,112 @@
 				"_41": {
 					"type": {
 						"kind": "base",
-						"name": "f32"
+						"name": "float"
 					},
 					"offset": 48
 				},
 				"_42": {
 					"type": {
 						"kind": "base",
-						"name": "f32"
+						"name": "float"
 					},
 					"offset": 52
 				},
 				"_43": {
 					"type": {
 						"kind": "base",
-						"name": "f32"
+						"name": "float"
 					},
 					"offset": 56
 				},
 				"_44": {
 					"type": {
 						"kind": "base",
-						"name": "f32"
+						"name": "float"
 					},
 					"offset": 60
 				},
 				"_34": {
 					"type": {
 						"kind": "base",
-						"name": "f32"
+						"name": "float"
 					},
 					"offset": 44
 				},
 				"_14": {
 					"type": {
 						"kind": "base",
-						"name": "f32"
+						"name": "float"
 					},
 					"offset": 12
 				},
 				"_13": {
 					"type": {
 						"kind": "base",
-						"name": "f32"
+						"name": "float"
 					},
 					"offset": 8
 				},
 				"_12": {
 					"type": {
 						"kind": "base",
-						"name": "f32"
+						"name": "float"
 					},
 					"offset": 4
 				},
 				"_11": {
 					"type": {
 						"kind": "base",
-						"name": "f32"
+						"name": "float"
 					},
 					"offset": 0
 				},
 				"_24": {
 					"type": {
 						"kind": "base",
-						"name": "f32"
+						"name": "float"
 					},
 					"offset": 28
 				},
 				"_31": {
 					"type": {
 						"kind": "base",
-						"name": "f32"
+						"name": "float"
 					},
 					"offset": 32
 				},
 				"_33": {
 					"type": {
 						"kind": "base",
-						"name": "f32"
+						"name": "float"
 					},
 					"offset": 40
 				},
 				"_32": {
 					"type": {
 						"kind": "base",
-						"name": "f32"
+						"name": "float"
 					},
 					"offset": 36
 				},
 				"_22": {
 					"type": {
 						"kind": "base",
-						"name": "f32"
+						"name": "float"
 					},
 					"offset": 20
 				},
 				"_23": {
 					"type": {
 						"kind": "base",
-						"name": "f32"
+						"name": "float"
 					},
 					"offset": 24
 				},
 				"_21": {
 					"type": {
 						"kind": "base",
-						"name": "f32"
+						"name": "float"
 					},
 					"offset": 16
 				}
diff --git a/volatility3/framework/symbols/windows/gui/gui-win7sp1-x64.json b/volatility3/framework/symbols/windows/gui/gui-win7sp1-x64.json
index 76e3d8100..2d4b63380 100644
--- a/volatility3/framework/symbols/windows/gui/gui-win7sp1-x64.json
+++ b/volatility3/framework/symbols/windows/gui/gui-win7sp1-x64.json
@@ -4181,21 +4181,21 @@
     "Blue": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 8
     }, 
     "Green": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 4
     }, 
     "Red": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 0
     }
@@ -8072,112 +8072,112 @@
     "_41": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 48
     }, 
     "_42": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 52
     }, 
     "_43": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 56
     }, 
     "_44": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 60
     }, 
     "_34": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 44
     }, 
     "_14": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 12
     }, 
     "_13": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 8
     }, 
     "_12": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 4
     }, 
     "_11": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 0
     }, 
     "_24": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 28
     }, 
     "_31": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 32
     }, 
     "_33": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 40
     }, 
     "_32": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 36
     }, 
     "_22": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 20
     }, 
     "_23": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 24
     }, 
     "_21": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 16
     }
diff --git a/volatility3/framework/symbols/windows/gui/gui-win8-x64.json b/volatility3/framework/symbols/windows/gui/gui-win8-x64.json
index 3f3193e35..ffc2bf90b 100644
--- a/volatility3/framework/symbols/windows/gui/gui-win8-x64.json
+++ b/volatility3/framework/symbols/windows/gui/gui-win8-x64.json
@@ -4181,21 +4181,21 @@
     "Blue": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 8
     }, 
     "Green": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 4
     }, 
     "Red": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 0
     }
@@ -8055,112 +8055,112 @@
     "_41": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 48
     }, 
     "_42": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 52
     }, 
     "_43": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 56
     }, 
     "_44": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 60
     }, 
     "_34": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 44
     }, 
     "_14": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 12
     }, 
     "_13": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 8
     }, 
     "_12": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 4
     }, 
     "_11": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 0
     }, 
     "_24": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 28
     }, 
     "_31": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 32
     }, 
     "_33": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 40
     }, 
     "_32": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 36
     }, 
     "_22": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 20
     }, 
     "_23": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 24
     }, 
     "_21": {
      "type": {
       "kind": "base", 
-      "name": "f32"
+      "name": "float"
      }, 
      "offset": 16
     }