hfiref0x · hfiref0x · Oct 27, 2025 · Sep 21, 2025 · Oct 3, 2025 · Oct 4, 2025
diff --git a/Source/CHANGELOG.txt b/Source/CHANGELOG.txt
@@ -1,3 +1,9 @@
+v2.1.0
+win11 25H2 compatibility improvements
+fixed incorrect object quota information dump
+more descriptions for object types
+internal rearrangement
+
 v2.0.9
 internal rearrangement
 updated RTLs (ntos, ntsup, treelist)

diff --git a/Source/Plugins/ApiSetView/ApiSetView.vcxproj b/Source/Plugins/ApiSetView/ApiSetView.vcxproj
@@ -96,24 +96,32 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\Shared\minirtl\hextou64.c" />
     <ClCompile Include="..\..\Shared\minirtl\ultostr.c" />
     <ClCompile Include="..\..\Shared\minirtl\_strcat.c" />
     <ClCompile Include="..\..\Shared\minirtl\_strcmpi.c" />
     <ClCompile Include="..\..\Shared\minirtl\_strcpy.c" />
     <ClCompile Include="..\..\Shared\minirtl\_strend.c" />
     <ClCompile Include="..\..\Shared\minirtl\_strlen.c" />
+    <ClCompile Include="..\..\Shared\minirtl\_strncmp.c" />
     <ClCompile Include="..\..\Shared\minirtl\_strncmpi.c" />
     <ClCompile Include="..\..\Shared\minirtl\_strncpy.c" />
     <ClCompile Include="..\..\Shared\minirtl\_strstri.c" />
+    <ClCompile Include="..\..\Shared\ntos\ntsup.c" />
     <ClCompile Include="..\..\Shared\treelist\treelist.c" />
+    <ClCompile Include="..\utils.c" />
     <ClCompile Include="main.c" />
     <ClCompile Include="query.c" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\Shared\minirtl\minirtl.h" />
     <ClInclude Include="..\..\Shared\minirtl\rtltypes.h" />
+    <ClInclude Include="..\..\Shared\ntos\apisetx.h" />
+    <ClInclude Include="..\..\Shared\ntos\ntos.h" />
+    <ClInclude Include="..\..\Shared\ntos\ntsup.h" />
     <ClInclude Include="..\..\Shared\treelist\treelist.h" />
     <ClInclude Include="..\plugin_def.h" />
+    <ClInclude Include="..\utils.h" />
     <ClInclude Include="global.h" />
     <ClInclude Include="query.h" />
     <ClInclude Include="resource.h" />

diff --git a/Source/Plugins/ApiSetView/ApiSetView.vcxproj.filters b/Source/Plugins/ApiSetView/ApiSetView.vcxproj.filters
@@ -19,6 +19,9 @@
     <Filter Include="treelist">
       <UniqueIdentifier>{83c6e752-f5b5-48a7-8e6f-231cba8a450d}</UniqueIdentifier>
     </Filter>
+    <Filter Include="ntos">
+      <UniqueIdentifier>{315785cb-45b6-49b7-ad7e-eb6925ca5197}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="main.c">
@@ -57,6 +60,18 @@
     <ClCompile Include="..\..\Shared\minirtl\_strncpy.c">
       <Filter>minirtl</Filter>
     </ClCompile>
+    <ClCompile Include="..\utils.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Shared\ntos\ntsup.c">
+      <Filter>ntos</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Shared\minirtl\_strncmp.c">
+      <Filter>minirtl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Shared\minirtl\hextou64.c">
+      <Filter>minirtl</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="global.h">
@@ -83,6 +98,18 @@
     <ClInclude Include="..\..\Shared\treelist\treelist.h">
       <Filter>treelist</Filter>
     </ClInclude>
+    <ClInclude Include="..\utils.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Shared\ntos\apisetx.h">
+      <Filter>ntos</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Shared\ntos\ntos.h">
+      <Filter>ntos</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Shared\ntos\ntsup.h">
+      <Filter>ntos</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="Resource.rc">

diff --git a/Source/Plugins/ApiSetView/Resource.rc b/Source/Plugins/ApiSetView/Resource.rc
diff --git a/Source/Plugins/ApiSetView/global.h b/Source/Plugins/ApiSetView/global.h
@@ -1,12 +1,12 @@
 /*******************************************************************************
 *
-*  (C) COPYRIGHT AUTHORS, 2019 - 2021
+*  (C) COPYRIGHT AUTHORS, 2019 - 2025
 *
 *  TITLE:       GLOBAL.H
 *
-*  VERSION:     1.11
+*  VERSION:     1.20
 *
-*  DATE:        01 Oct 2021
+*  DATE:        03 Oct 2025
 *
 *  Common header file for the Windows Object Explorer ApiSetView plugin.
 *
@@ -56,3 +56,5 @@
 // Declared in main.c
 //
 extern GUI_CONTEXT g_ctx;
+
+#include "utils.h"
diff --git a/Source/Plugins/ApiSetView/main.c b/Source/Plugins/ApiSetView/main.c
@@ -4,9 +4,9 @@
 *
 *  TITLE:       MAIN.C
 *
-*  VERSION:     1.15
+*  VERSION:     1.20
 *
-*  DATE:        22 Aug 2025
+*  DATE:        03 Oct 2025
 *
 *  WinObjEx64 ApiSetView plugin.
 *

diff --git a/Source/Plugins/ApiSetView/query.c b/Source/Plugins/ApiSetView/query.c
@@ -4,9 +4,9 @@
 *
 *  TITLE:       QUERY.C
 *
-*  VERSION:     1.15
+*  VERSION:     1.20
 *
-*  DATE:        22 Aug 2025
+*  DATE:        03 Oct 2025
 *
 *  Query and output ApiSet specific data.
 *
@@ -54,37 +54,6 @@ VOID DisplayErrorText(
 #endif
 }
 
-/*
-* TreeListAddItem
-*
-* Purpose:
-*
-* Insert new treelist item.
-*
-*/
-HTREEITEM TreeListAddItem(
-    _In_ HWND TreeList,
-    _In_opt_ HTREEITEM hParent,
-    _In_ UINT mask,
-    _In_ UINT state,
-    _In_ UINT stateMask,
-    _In_opt_ LPWSTR pszText,
-    _In_opt_ PVOID subitems
-)
-{
-    TVINSERTSTRUCT tvitem;
-    PTL_SUBITEMS si = (PTL_SUBITEMS)subitems;
-
-    RtlZeroMemory(&tvitem, sizeof(tvitem));
-    tvitem.hParent = hParent;
-    tvitem.item.mask = mask;
-    tvitem.item.state = state;
-    tvitem.item.stateMask = stateMask;
-    tvitem.item.pszText = pszText;
-    tvitem.hInsertAfter = TVI_LAST;
-    return TreeList_InsertTreeItem(TreeList, &tvitem, si);
-}
-
 /*
 * IsRangeValid
 *
@@ -212,7 +181,7 @@ HTREEITEM OutNamespaceEntry(
     tlSubItems.Text[1] = T_EmptyString;
     tlSubItems.Count = 2;
 
-    h_tviRootItem = TreeListAddItem(
+    h_tviRootItem = supTreeListAddItem(
         g_ctx.TreeList,
         RootItem,
         TVIF_TEXT | TVIF_STATE,
@@ -233,7 +202,7 @@ HTREEITEM OutNamespaceEntry(
                 tlSubItems.Text[1] = T_EmptyString;
                 tlSubItems.Count = 2;
 
-                TreeListAddItem(
+                supTreeListAddItem(
                     g_ctx.TreeList,
                     h_tviRootItem,
                     TVIF_TEXT | TVIF_STATE,
@@ -255,7 +224,7 @@ HTREEITEM OutNamespaceEntry(
             tlSubItems.Text[0] = szBuffer;
             tlSubItems.Text[1] = T_EmptyString;
             tlSubItems.Count = 2;
-            TreeListAddItem(
+            supTreeListAddItem(
                 g_ctx.TreeList,
                 h_tviRootItem,
                 TVIF_TEXT | TVIF_STATE,
@@ -331,7 +300,7 @@ void OutNamespaceValue(
         tlSubItems.Text[1] = T_EmptyString;
     }
 
-    TreeListAddItem(
+    supTreeListAddItem(
         g_ctx.TreeList,
         RootItem,
         TVIF_TEXT | TVIF_STATE,
@@ -710,7 +679,7 @@ VOID WINAPI ListApiSetFromFileWorker(
     //
     // Parse and output apiset.
     //
-    h_tviRootItem = TreeListAddItem(
+    h_tviRootItem = supTreeListAddItem(
         g_ctx.TreeList,
         (HTREEITEM)NULL,
         TVIF_TEXT | TVIF_STATE,
@@ -721,7 +690,7 @@ VOID WINAPI ListApiSetFromFileWorker(
 
     if (h_tviRootItem) {
 
-        h_tviSubItem = TreeListAddItem(
+        h_tviSubItem = supTreeListAddItem(
             g_ctx.TreeList,
             (HTREEITEM)h_tviRootItem,
             TVIF_TEXT | TVIF_STATE,

diff --git a/Source/Plugins/ApiSetView/ui.h b/Source/Plugins/ApiSetView/ui.h
@@ -1,12 +1,12 @@
 /*******************************************************************************
 *
-*  (C) COPYRIGHT AUTHORS, 2019 - 2022
+*  (C) COPYRIGHT AUTHORS, 2019 - 2025
 *
 *  TITLE:       UI.H
 *
-*  VERSION:     1.13
+*  VERSION:     1.20
 *
-*  DATE:        10 Jun 2022
+*  DATE:        03 Oct 2025
 *
 *  WinObjEx64 ApiSetView UI constants, definitions and includes.
 *
@@ -50,13 +50,3 @@ typedef struct _GUI_CONTEXT {
     //
     WINOBJEX_PARAM_BLOCK ParamBlock;
 } GUI_CONTEXT, *PGUI_CONTEXT;
-
-typedef struct _TL_SUBITEMS_FIXED {
-    ULONG       Count;
-    ULONG       ColorFlags;
-    COLORREF    BgColor;
-    COLORREF    FontColor;
-    PVOID       UserParam;
-    LPTSTR      CustomTooltip;
-    LPTSTR      Text[2];
-} TL_SUBITEMS_FIXED, * PTL_SUBITEMS_FIXED;
diff --git a/Source/Plugins/ExamplePlugin/Resource.rc b/Source/Plugins/ExamplePlugin/Resource.rc
diff --git a/Source/Plugins/ImageScope/ImageScope.vcxproj b/Source/Plugins/ImageScope/ImageScope.vcxproj
@@ -107,20 +107,22 @@
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\Shared\minirtl\hextou64.c" />
     <ClCompile Include="..\..\Shared\minirtl\u64tohex.c" />
     <ClCompile Include="..\..\Shared\minirtl\_strcat.c" />
     <ClCompile Include="..\..\Shared\minirtl\_strcmp.c" />
     <ClCompile Include="..\..\Shared\minirtl\_strcmpi.c" />
     <ClCompile Include="..\..\Shared\minirtl\_strcpy.c" />
     <ClCompile Include="..\..\Shared\minirtl\_strlen.c" />
     <ClCompile Include="..\..\Shared\minirtl\_strncmp.c" />
+    <ClCompile Include="..\..\Shared\minirtl\_strncmpi.c" />
     <ClCompile Include="..\..\Shared\minirtl\_strncpy.c" />
     <ClCompile Include="..\..\Shared\ntos\ntsup.c" />
     <ClCompile Include="..\..\Shared\tabs\tabsctrl.c" />
     <ClCompile Include="..\..\Shared\treelist\treelist.c" />
+    <ClCompile Include="..\utils.c" />
     <ClCompile Include="main.c" />
     <ClCompile Include="query.c" />
-    <ClCompile Include="sup.c" />
     <ClCompile Include="ui.c" />
   </ItemGroup>
   <ItemGroup>
@@ -132,10 +134,10 @@
     <ClInclude Include="..\..\Shared\tabs\tabsctrl.h" />
     <ClInclude Include="..\..\Shared\treelist\treelist.h" />
     <ClInclude Include="..\plugin_def.h" />
+    <ClInclude Include="..\utils.h" />
     <ClInclude Include="global.h" />
     <ClInclude Include="query.h" />
     <ClInclude Include="resource.h" />
-    <ClInclude Include="sup.h" />
     <ClInclude Include="ui.h" />
   </ItemGroup>
   <ItemGroup>

diff --git a/Source/Plugins/ImageScope/ImageScope.vcxproj.filters b/Source/Plugins/ImageScope/ImageScope.vcxproj.filters
@@ -57,9 +57,6 @@
     <ClCompile Include="..\..\Shared\minirtl\_strncpy.c">
       <Filter>minirtl</Filter>
     </ClCompile>
-    <ClCompile Include="sup.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\Shared\ntos\ntsup.c">
       <Filter>ntos</Filter>
     </ClCompile>
@@ -75,6 +72,15 @@
     <ClCompile Include="..\..\Shared\minirtl\_strcat.c">
       <Filter>minirtl</Filter>
     </ClCompile>
+    <ClCompile Include="..\utils.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Shared\minirtl\hextou64.c">
+      <Filter>minirtl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Shared\minirtl\_strncmpi.c">
+      <Filter>minirtl</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="resource.h">
@@ -107,15 +113,15 @@
     <ClInclude Include="..\..\Shared\treelist\treelist.h">
       <Filter>treelist</Filter>
     </ClInclude>
-    <ClInclude Include="sup.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\Shared\sdk\extdef.h">
       <Filter>sdk</Filter>
     </ClInclude>
     <ClInclude Include="..\..\Shared\ntos\ntsup.h">
       <Filter>ntos</Filter>
     </ClInclude>
+    <ClInclude Include="..\utils.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="Resource.rc">

diff --git a/Source/Plugins/ImageScope/Resource.rc b/Source/Plugins/ImageScope/Resource.rc
diff --git a/Source/Plugins/ImageScope/global.h b/Source/Plugins/ImageScope/global.h
@@ -1,12 +1,12 @@
 /*******************************************************************************
 *
-*  (C) COPYRIGHT AUTHORS, 2020 - 2021
+*  (C) COPYRIGHT AUTHORS, 2020 - 2025
 *
 *  TITLE:       GLOBAL.H
 *
-*  VERSION:     1.00
+*  VERSION:     1.20
 *
-*  DATE:        01 Oct 2021
+*  DATE:        03 Oct 2025
 *
 *  Common header file for the Windows Object Explorer ImageScope plugin.
 *
@@ -51,7 +51,6 @@
 #include "sdk/extdef.h"
 #include "resource.h"
 #include "query.h"
-#include "sup.h"
 #include "ui.h"
 
 //declared in main.c
@@ -65,3 +64,4 @@ extern WINOBJEX_PLUGIN* g_plugin;
 #define kdDebugPrint(f, ...) 
 #endif
 
+#include "utils.h"
diff --git a/Source/Plugins/ImageScope/main.c b/Source/Plugins/ImageScope/main.c
@@ -4,9 +4,9 @@
 *
 *  TITLE:       MAIN.C
 *
-*  VERSION:     1.21
+*  VERSION:     1.22
 *
-*  DATE:        22 Aug 2025
+*  DATE:        03 Oct 2025
 *
 *  WinObjEx64 ImageScope plugin.
 *

diff --git a/Source/Plugins/ImageScope/query.c b/Source/Plugins/ImageScope/query.c
@@ -4,9 +4,9 @@
 *
 *  TITLE:       QUERY.C
 *
-*  VERSION:     1.21
+*  VERSION:     1.22
 *
-*  DATE:        22 Aug 2025
+*  DATE:        03 Oct 2025
 *
 *  ImageScope main logic.
 *