From 8b9c9a5bd2ced7936de1f3d1eb0265850d2dee1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan-Otto=20Kr=C3=B6pke?= <mail@jkroepke.de>
Date: Mon, 10 Jul 2023 02:26:44 +0200
Subject: [PATCH] Remove HelpNameTable
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jan-Otto Kröpke <mail@jkroepke.de>
---
 perflib/nametable.go |  5 -----
 perflib/perflib.go   | 35 +++++++++++------------------------
 perflib/raw_types.go |  4 ----
 3 files changed, 11 insertions(+), 33 deletions(-)

diff --git a/perflib/nametable.go b/perflib/nametable.go
index 64ca6ebd..cd717e4f 100644
--- a/perflib/nametable.go
+++ b/perflib/nametable.go
@@ -12,16 +12,11 @@ import (
 // (for many use cases the index is sufficient)
 
 var CounterNameTable = *QueryNameTable("Counter 009")
-var HelpNameTable = *QueryNameTable("Help 009")
 
 func (p *perfObjectType) LookupName() string {
 	return CounterNameTable.LookupString(p.ObjectNameTitleIndex)
 }
 
-func (p *perfObjectType) LookupHelp() string {
-	return HelpNameTable.LookupString(p.ObjectHelpTitleIndex)
-}
-
 type NameTable struct {
 	byIndex  map[uint32]string
 	byString map[string]uint32
diff --git a/perflib/perflib.go b/perflib/perflib.go
index 33bf0df3..2b3c462d 100644
--- a/perflib/perflib.go
+++ b/perflib/perflib.go
@@ -127,13 +127,9 @@ const averageCount64Type = 1073874176
 
 // PerfObject Top-level performance object (like "Process").
 type PerfObject struct {
-	Name string
-	// Same index you pass to QueryPerformanceData
-	NameIndex     uint
-	HelpText      string
-	HelpTextIndex uint
-	Instances     []*PerfInstance
-	CounterDefs   []*PerfCounterDef
+	Name        string
+	Instances   []*PerfInstance
+	CounterDefs []*PerfCounterDef
 
 	Frequency int64
 
@@ -152,10 +148,7 @@ type PerfInstance struct {
 }
 
 type PerfCounterDef struct {
-	Name          string
-	NameIndex     uint
-	HelpText      string
-	HelpTextIndex uint
+	Name string
 
 	// For debugging - subject to removal. CounterType is a perflib
 	// implementation detail (see perflib.h) and should not be used outside
@@ -330,14 +323,11 @@ func QueryPerformanceData(query string) ([]*PerfObject, error) {
 		counterDefs := make([]*PerfCounterDef, numCounterDefs)
 
 		objects[i] = &PerfObject{
-			Name:          obj.LookupName(),
-			NameIndex:     uint(obj.ObjectNameTitleIndex),
-			HelpText:      obj.LookupHelp(),
-			HelpTextIndex: uint(obj.ObjectHelpTitleIndex),
-			Instances:     instances,
-			CounterDefs:   counterDefs,
-			Frequency:     obj.PerfFreq,
-			rawData:       obj,
+			Name:        obj.LookupName(),
+			Instances:   instances,
+			CounterDefs: counterDefs,
+			Frequency:   obj.PerfFreq,
+			rawData:     obj,
 		}
 
 		for i := 0; i < numCounterDefs; i++ {
@@ -348,11 +338,8 @@ func QueryPerformanceData(query string) ([]*PerfObject, error) {
 			}
 
 			counterDefs[i] = &PerfCounterDef{
-				Name:          def.LookupName(),
-				NameIndex:     uint(def.CounterNameTitleIndex),
-				HelpText:      def.LookupHelp(),
-				HelpTextIndex: uint(def.CounterHelpTitleIndex),
-				rawData:       def,
+				Name:    def.LookupName(),
+				rawData: def,
 
 				CounterType: def.CounterType,
 
diff --git a/perflib/raw_types.go b/perflib/raw_types.go
index 891bd8ee..f9d76a7d 100644
--- a/perflib/raw_types.go
+++ b/perflib/raw_types.go
@@ -133,10 +133,6 @@ func (p *perfCounterDefinition) LookupName() string {
 	return CounterNameTable.LookupString(p.CounterNameTitleIndex)
 }
 
-func (p *perfCounterDefinition) LookupHelp() string {
-	return HelpNameTable.LookupString(p.CounterHelpTitleIndex)
-}
-
 /*
 perfCounterBlock
 See: https://msdn.microsoft.com/en-us/library/windows/desktop/aa373147(v=vs.85).aspx