dev

HyperDbg · Feb 21, 2025 · 054674e · 054674e
1 parent 8df7cef
commit 054674e
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 25 deletions.
diff --git a/plugin/hookApiMgr/hookApiMgr.go b/plugin/hookApiMgr/hookApiMgr.go
@@ -68,10 +68,7 @@ type (
 func New() *object { return &object{} }
 
 func (o *object) DecodeStack(api, stack string, argsInput ...string) (argList []ArgList, ok bool) {
-	lines := stream.NewBuffer(stack).ToLines()
-
 	argList = make([]ArgList, 0)
-
 	fnCut := func(orig string) (list []string) {
 		list = make([]string, 0)
 		orig = strings.TrimSpace(orig)
@@ -85,7 +82,7 @@ func (o *object) DecodeStack(api, stack string, argsInput ...string) (argList []
 		return
 	}
 
-	for _, line := range lines {
+	for line := range strings.Lines(stack) {
 		if line == "" {
 			continue
 		}

diff --git a/plugin/symbol/symbol.go b/plugin/symbol/symbol.go
@@ -1,11 +1 @@
 package symbol
-
-type (
-	Interface interface {
-		// Fn() (ok bool)
-	}
-	object   struct{}
-	Ntoskrnl interface{}
-)
-
-func New() Interface { return &object{} }
diff --git a/plugin/symbol/symbol_test.go b/plugin/symbol/symbol_test.go
@@ -10,12 +10,11 @@ import (
 )
 
 func TestName(t *testing.T) {
-	lines := stream.ReadFileToLines(`ssdtTable.txt`)
 	ntdll := make([]string, 0)
 	win32u := make([]string, 0)
-	for i, line := range lines {
+	for line := range stream.ReadFileToLines(`ssdtTable.txt`) {
 		if strings.Contains(line, "win32u") {
-			win32u = append(win32u, lines[i:]...)
+			win32u = append(win32u, line) //todo test
 			break
 		}
 		ntdll = append(ntdll, line)

diff --git a/sdk/bindgen/bind_test.go b/sdk/bindgen/bind_test.go
@@ -112,7 +112,7 @@ func TestName(t *testing.T) {
 
 func TestBindMacros(t *testing.T) {
 	headerFile := "merged_headers.h"
-	macros := extractMacros(stream.NewBuffer(headerFile).ToLines())
+	macros := extractMacros(stream.ReadFileToLines(headerFile))
 	// println(macros.GoString())
 	// return
 	mylog.Trace("number of macros", macros.Len())

diff --git a/sdk/bindgen/constants/constants_gen_test.go b/sdk/bindgen/constants/constants_gen_test.go
@@ -1,6 +1,7 @@
 package constants
 
 import (
+	"github.com/ddkwork/golibrary/safemap"
 	"path/filepath"
 	"strconv"
 	"strings"
@@ -20,11 +21,11 @@ func TestGenConstants(t *testing.T) {
 }
 
 func genConstants(fileName string) {
-	m := safemap.NewOrdered[string, string]()
-	for i, s := range stream.NewBuffer(fileName).ToLines() {
-		if i == 4 {
-			// break // test
-		}
+	m := new(safemap.M[string, string])
+	for s := range stream.ReadFileToLines(fileName) {
+		//if i == 4 {
+		//	// break // test
+		//}
 		split := strings.Split(s, " ")
 		v := split[1]
 		if fileName == "ioctl.txt" {

diff --git a/sdk/bindgen/macros_decode.go b/sdk/bindgen/macros_decode.go
@@ -1,19 +1,20 @@
 package bindgen
 
 import (
+	"iter"
 	"strings"
 
 	"github.com/ddkwork/golibrary/safemap"
 )
 
-func extractMacros(lines []string) *safemap.M[string, string] {
+func extractMacros(lines iter.Seq[string]) *safemap.M[string, string] {
 	macros := new(safemap.M[string, string])
 	macros.Set("PAGE_SIZE", "4096")
 	var macroName string
 	var macroValue strings.Builder
 	inMacro := false
 
-	for _, line := range lines {
+	for line := range lines {
 		if strings.HasPrefix(line, "#define") {
 			if inMacro {
 				// Finish the previous macro