Merge pull request #199 from ddkwork/main

bump lib

go.mod

@@ -3,9 +3,9 @@ module github.com/ddkwork/HyperDbg
 go 1.24.0
 
 require (
-	github.com/ddkwork/app v0.0.0-20250216082845-4869c8b3f227
-	github.com/ddkwork/golibrary v0.0.88-0.20250216081829-938757a0a8d6
-	github.com/ddkwork/unison v0.0.0-20250216082844-0412938391e8
+	github.com/ddkwork/app v0.0.0-20250221064752-588a6259b45f
+	github.com/ddkwork/golibrary v0.0.91-0.20250221042854-2f9e8bc45b92
+	github.com/ddkwork/unison v0.0.0-20250221064127-b3a4eae98f92
 	github.com/ebitengine/purego v0.8.1
 	github.com/saferwall/pe v1.5.6
 	github.com/tc-hib/winres v0.3.1
@@ -16,17 +16,20 @@ require (
 )
 
 require (
+	gioui.org v0.8.0 // indirect
+	gioui.org/shader v1.0.8 // indirect
 	github.com/alecthomas/chroma/v2 v2.15.0 // indirect
 	github.com/aquasecurity/table v1.8.0 // indirect
 	github.com/axgle/mahonia v0.0.0-20180208002826-3358181d7394 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/dave/dst v0.27.3 // indirect
 	github.com/dc0d/caseconv v0.5.0 // indirect
-	github.com/ddkwork/toolbox v0.0.0-20250216082843-1298db805727 // indirect
+	github.com/ddkwork/toolbox v0.0.0-20250221043304-e2865d103f34 // indirect
 	github.com/dlclark/regexp2 v1.11.5 // indirect
 	github.com/edsrzf/mmap-go v1.2.0 // indirect
 	github.com/go-enry/go-enry/v2 v2.9.1 // indirect
 	github.com/go-enry/go-oniguruma v1.2.1 // indirect
+	github.com/go-text/typesetting v0.2.1 // indirect
 	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/gorpher/gowin32 v0.0.12 // indirect
@@ -44,6 +47,7 @@ require (
 	github.com/yuin/goldmark v1.7.8 // indirect
 	golang.org/x/arch v0.12.0 // indirect
 	golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67 // indirect
+	golang.org/x/exp/shiny v0.0.0-20240707233637-46b078467d37 // indirect
 	golang.org/x/mod v0.23.0 // indirect
 	golang.org/x/sync v0.11.0 // indirect
 	golang.org/x/term v0.27.0 // indirect

go.sum

@@ -1,8 +1,14 @@
+eliasnaur.com/font v0.0.0-20230308162249-dd43949cb42d h1:ARo7NCVvN2NdhLlJE9xAbKweuI9L6UgfTbYb0YwPacY=
+eliasnaur.com/font v0.0.0-20230308162249-dd43949cb42d/go.mod h1:OYVuxibdk9OSLX8vAqydtRPP87PyTFcT9uH3MlEGBQA=
+gioui.org v0.8.0 h1:QV5p5JvsmSmGiIXVYOKn6d9YDliTfjtLlVf5J+BZ9Pg=
+gioui.org v0.8.0/go.mod h1:vEMmpxMOd/iwJhXvGVIzWEbxMWhnMQ9aByOGQdlQ8rc=
+gioui.org/cpu v0.0.0-20210808092351-bfe733dd3334/go.mod h1:A8M0Cn5o+vY5LTMlnRoK3O5kG+rH0kWfJjeKd9QpBmQ=
+gioui.org/shader v1.0.8 h1:6ks0o/A+b0ne7RzEqRZK5f4Gboz2CfG+mVliciy6+qA=
+gioui.org/shader v1.0.8/go.mod h1:mWdiME581d/kV7/iEhLmUgUK5iZ09XR5XpduXzbePVM=
 github.com/PuerkitoBio/goquery v1.6.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc=
-github.com/alecthomas/assert/v2 v2.7.0 h1:QtqSACNS3tF7oasA8CU6A6sXZSBDqnm7RfpLl9bZqbE=
-github.com/alecthomas/assert/v2 v2.7.0/go.mod h1:Bze95FyfUr7x34QZrjL+XP+0qgp/zg8yS+TtBj1WA3k=
-github.com/alecthomas/chroma/v2 v2.14.0 h1:R3+wzpnUArGcQz7fCETQBzO5n9IMNi13iIs46aU4V9E=
-github.com/alecthomas/chroma/v2 v2.14.0/go.mod h1:QolEbTfmUHIMVpBqxeDnNBj2uoeI4EbYP4i6n68SG4I=
+github.com/alecthomas/assert/v2 v2.11.0 h1:2Q9r3ki8+JYXvGsDyBXwH3LcJ+WK5D0gc5E8vS6K3D0=
+github.com/alecthomas/assert/v2 v2.11.0/go.mod h1:Bze95FyfUr7x34QZrjL+XP+0qgp/zg8yS+TtBj1WA3k=
+github.com/alecthomas/chroma/v2 v2.15.0 h1:LxXTQHFoYrstG2nnV9y2X5O94sOBzf0CIUpSTbpxvMc=
 github.com/alecthomas/chroma/v2 v2.15.0/go.mod h1:gUhVLrPDXPtp/f+L1jo9xepo9gL4eLwRuGAunSZMkio=
 github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc=
 github.com/alecthomas/repr v0.4.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4=
@@ -24,24 +30,15 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8Yc
 github.com/daviddengcn/go-colortext v1.0.0/go.mod h1:zDqEI5NVUop5QPpVJUxE9UO10hRnmkD5G4Pmri9+m4c=
 github.com/dc0d/caseconv v0.5.0 h1:z3Ki2zszD03beetWyNAGa3NOAbnDJk+bX0tvcx9BKjQ=
 github.com/dc0d/caseconv v0.5.0/go.mod h1:/CrBBNtMoPTPf0INHrwyyhDrDjAJ9PFE+WuxSJHU0ZE=
-github.com/ddkwork/app v0.0.0-20250101153827-07e59abd2824 h1:Nf50QWgtNgKYC8JsmjL7opgP3W3+4OvOGOVlYp1FB28=
-github.com/ddkwork/app v0.0.0-20250101153827-07e59abd2824/go.mod h1:O4sjtfER9foiqIALt6kfskwuwMz0aGEQM1Jea+ooWDU=
-github.com/ddkwork/app v0.0.0-20250216082845-4869c8b3f227 h1:YqPQ1BB6koEF5+WICCYjqu0aV1f66ddl3ON3NF+k8pE=
-github.com/ddkwork/app v0.0.0-20250216082845-4869c8b3f227/go.mod h1:4BAIvkRq28vnkMJvjVnRiS1k8dcTFIk5oGtyhk7JdOc=
-github.com/ddkwork/golibrary v0.0.0-20250101093329-d96f6524ebe4 h1:V32GfCpHQp5dZXTKw8K4BhKbtbmaUaP31t5eRpInN/g=
-github.com/ddkwork/golibrary v0.0.0-20250101093329-d96f6524ebe4/go.mod h1:fzfhl61kUu+Sn22VCEojlYr9lE8X0SZmbOocICR+0s0=
-github.com/ddkwork/golibrary v0.0.88-0.20250216081829-938757a0a8d6 h1:pzAz7RXIGMMSd1MjBbxFCNKN+KdZ14jelGcg7Vc1Ejg=
-github.com/ddkwork/golibrary v0.0.88-0.20250216081829-938757a0a8d6/go.mod h1:XrYTnxQY1W3x6uqco4OMyZtaObXTo0lsC7Tzbf6Ab9Q=
-github.com/ddkwork/toolbox v0.0.0-20250101105944-e2445f71afc4 h1:e03pkrQ3N74Fzbn5fEwudMnUdANaqUS/5ONQNErkrsI=
-github.com/ddkwork/toolbox v0.0.0-20250101105944-e2445f71afc4/go.mod h1:c5Vq5AcHpAt6sJAT+61PPaxUZB/xKOKT2O3DahvEGHM=
-github.com/ddkwork/toolbox v0.0.0-20250216082843-1298db805727 h1:sBYlmvsxH4OcPQTe8tTlGsHeBoZHn6vzYaUL7XyvrNA=
-github.com/ddkwork/toolbox v0.0.0-20250216082843-1298db805727/go.mod h1:4DuCrTvn7Q8d7fyiIxkq85iMT8XnsHqS1nATVbYc1K0=
-github.com/ddkwork/unison v0.0.0-20250101110142-818e695fe1c0 h1:vw++zj8psjTZ5ZdFX/3Pgk3bVOKyn2Q+7B+Rd2dVkOs=
-github.com/ddkwork/unison v0.0.0-20250101110142-818e695fe1c0/go.mod h1:MvErivnq7Ujcxhq9+iR+ytOd8l+dZGGat1twHJAsJps=
-github.com/ddkwork/unison v0.0.0-20250216082844-0412938391e8 h1:MMzOE/Fo0yl9X1MINjquImWVOvKI9ja/oBL1DjVslTk=
-github.com/ddkwork/unison v0.0.0-20250216082844-0412938391e8/go.mod h1:paE76hBCsPLhOyV4SycApaUguR7H7Djhl8GrVuoZndE=
-github.com/dlclark/regexp2 v1.11.4 h1:rPYF9/LECdNymJufQKmri9gV604RvvABwgOA8un7yAo=
-github.com/dlclark/regexp2 v1.11.4/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
+github.com/ddkwork/app v0.0.0-20250221064752-588a6259b45f h1:v1qcqWKvIoyMmKaD0uTIVxjW+pNr1q56R+tzLx7Wlus=
+github.com/ddkwork/app v0.0.0-20250221064752-588a6259b45f/go.mod h1:DyDBFU1MIUvhZRulm6INJgbeiQe4UlpihDsAxuREFDY=
+github.com/ddkwork/golibrary v0.0.91-0.20250221042854-2f9e8bc45b92 h1:Be4l8KskZlsUQA4Zim5erRpI9RAWemCJo+lTTKtKXJc=
+github.com/ddkwork/golibrary v0.0.91-0.20250221042854-2f9e8bc45b92/go.mod h1:1gL0UKrg1P09z/AiaAWWtWxMT7a8+X8mWU6Ok9sYc8s=
+github.com/ddkwork/toolbox v0.0.0-20250221043304-e2865d103f34 h1:L7nNbyx/xAtXavCXcnANYUCAMk+sX2UqyB3C17yCyGs=
+github.com/ddkwork/toolbox v0.0.0-20250221043304-e2865d103f34/go.mod h1:y0nLLadZl0tIv9sUOSGL8JjRXSwe0oBEaEWMlhVmMAI=
+github.com/ddkwork/unison v0.0.0-20250221064127-b3a4eae98f92 h1:xonhMPyeIq1LHNbzWTj2OfJ3wHf0B3HuE378SuNQfZQ=
+github.com/ddkwork/unison v0.0.0-20250221064127-b3a4eae98f92/go.mod h1:XnNWXLonAcky/MUM5GsJbXLrSuQknCx/MRbE0aKc1AM=
+github.com/dlclark/regexp2 v1.11.5 h1:Q/sSnsKerHeCkc/jSTNq1oCm7KiVgUMZRDUoRu0JQZQ=
 github.com/dlclark/regexp2 v1.11.5/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
 github.com/ebitengine/purego v0.8.1 h1:sdRKd6plj7KYW33EH5As6YKfe8m9zbN9JMrOjNVF/BE=
 github.com/ebitengine/purego v0.8.1/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ=
@@ -54,6 +51,10 @@ github.com/go-enry/go-oniguruma v1.2.1 h1:k8aAMuJfMrqm/56SG2lV9Cfti6tC4x8673aHCc
 github.com/go-enry/go-oniguruma v1.2.1/go.mod h1:bWDhYP+S6xZQgiRL7wlTScFYBe023B6ilRZbCAD5Hf4=
 github.com/go-quicktest/qt v1.101.0 h1:O1K29Txy5P2OK0dGo59b7b0LR6wKfIhttaAhHUyn7eI=
 github.com/go-quicktest/qt v1.101.0/go.mod h1:14Bz/f7NwaXPtdYEgzsx46kqSxVwTbzVZsDC26tQJow=
+github.com/go-text/typesetting v0.2.1 h1:x0jMOGyO3d1qFAPI0j4GSsh7M0Q3Ypjzr4+CEVg82V8=
+github.com/go-text/typesetting v0.2.1/go.mod h1:mTOxEwasOFpAMBjEQDhdWRckoLLeI/+qrQeBCTGEt6M=
+github.com/go-text/typesetting-utils v0.0.0-20241103174707-87a29e9e6066 h1:qCuYC+94v2xrb1PoS4NIDe7DGYtLnU2wWiQe9a1B1c0=
+github.com/go-text/typesetting-utils v0.0.0-20241103174707-87a29e9e6066/go.mod h1:DDxDdQEnB70R8owOx3LVpEFvpMK9eeH1o2r0yZhFI9o=
 github.com/golangplus/bytes v0.0.0-20160111154220-45c989fe5450/go.mod h1:Bk6SMAONeMXrxql8uvOKuAZSu8aM5RUGv+1C6IJaEho=
 github.com/golangplus/bytes v1.0.0/go.mod h1:AdRaCFwmc/00ZzELMWb01soso6W1R/++O1XL80yAn+A=
 github.com/golangplus/fmt v1.0.0/go.mod h1:zpM0OfbMCjPtd2qkTD/jX2MgiFCqklhSUFyDW44gVQE=
@@ -135,13 +136,11 @@ golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5y
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67 h1:1UoZQm6f0P/ZO0w1Ri+f+ifG/gXhegadRdwBIXEFWDo=
 golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67/go.mod h1:qj5a5QZpwLU2NLQudwIN5koi3beDhSAlJwa67PuM98c=
-golang.org/x/image v0.23.0 h1:HseQ7c2OpPKTPVzNjG5fwJsOTCiiwS4QdsYi5XU6H68=
-golang.org/x/image v0.23.0/go.mod h1:wJJBTdLfCCf3tiHa1fNxpZmUI4mmoZvwMCPP0ddoNKY=
+golang.org/x/exp/shiny v0.0.0-20240707233637-46b078467d37 h1:SOSg7+sueresE4IbmmGM60GmlIys+zNX63d6/J4CMtU=
+golang.org/x/exp/shiny v0.0.0-20240707233637-46b078467d37/go.mod h1:3F+MieQB7dRYLTmnncoFbb1crS5lfQoTfDgQy6K4N0o=
 golang.org/x/image v0.24.0 h1:AN7zRgVsbvmTfNyqIbbOraYL8mSwcKncEj8ofjgzcMQ=
 golang.org/x/image v0.24.0/go.mod h1:4b/ITuLfqYq1hqZcjofwctIhi7sZh2WaCjvsBNjjya8=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
-golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4=
-golang.org/x/mod v0.22.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
 golang.org/x/mod v0.23.0 h1:Zb7khfcRGKk+kqfxFaP5tZqCnDZMjC5VtUBs87Hr6QM=
 golang.org/x/mod v0.23.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
 golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -152,8 +151,7 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
-golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w=
 golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -165,8 +163,6 @@ golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
-golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
 golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
@@ -178,14 +174,11 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
-golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
+golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
 golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/tools v0.28.0 h1:WuB6qZ4RPCQo5aP3WdKZS7i595EdWqWR8vqJTlwTVK8=
-golang.org/x/tools v0.28.0/go.mod h1:dcIOrVd3mfQKTgrDVQHqCPMWy6lnhfhtX3hLXYVLfRw=
 golang.org/x/tools v0.30.0 h1:BgcpHewrV5AUp2G9MebG4XPFI1E2W41zU1SaqVA9vJY=
 golang.org/x/tools v0.30.0/go.mod h1:c347cR/OJfw5TI+GfX7RUPNMdDRRbjvYTS0jPyvsVtY=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

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
 		}

plugin/symbol/symbol.go

@@ -1,11 +1 @@
 package symbol
-
-type (
-	Interface interface {
-		// Fn() (ok bool)
-	}
-	object   struct{}
-	Ntoskrnl interface{}
-)
-
-func New() Interface { return &object{} }

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)

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())
@@ -192,10 +192,10 @@ func TestBindMacros(t *testing.T) {
 		//}
 		v := value
 		if isAlphabetOrUnderscore(v) {
-			v = stream.ToCamelUpper(v, false)
+			v = stream.ToCamelUpper(v)
 		}
 
-		k = stream.ToCamelUpper(k, false)
+		k = stream.ToCamelUpper(k)
 		switch {
 		case strings.HasPrefix(k, "DEBUGGER_ERROR"):
 			after, found := strings.CutPrefix(k, "DEBUGGER_ERROR")
@@ -207,7 +207,7 @@ func TestBindMacros(t *testing.T) {
 			enumIoctls.Set(k, k)
 		}
 
-		g.P(stream.ToCamelUpper(k, false) + "=" + v)
+		g.P(stream.ToCamelUpper(k) + "=" + v)
 		macros.Delete(k)
 		return true
 	})

sdk/bindgen/constants/constants_gen_test.go

@@ -1,6 +1,7 @@
 package constants
 
 import (
+	"github.com/ddkwork/golibrary/safemap"
 	"path/filepath"
 	"strconv"
 	"strings"
@@ -20,20 +21,20 @@ 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" {
 			v = "0x" + v
 		}
-		m.Set(stream.ToCamelUpper(split[0], false), v)
+		m.Set(stream.ToCamelUpper(split[0]), v)
 	}
 
-	kind := stream.ToCamelUpper(stream.BaseName(fileName), false) + "Kind"
+	kind := stream.ToCamelUpper(stream.BaseName(fileName)) + "Kind"
 
 	g := stream.NewGeneratedFile()
 	g.P("package constants")
@@ -54,7 +55,7 @@ func genConstants(fileName string) {
 	g.P("switch k {")
 	for _, p := range m.List() {
 		g.P("case ", p.Value, ":")
-		g.P("return ", strconv.Quote(stream.ToCamelUpper(p.Key, false)))
+		g.P("return ", strconv.Quote(stream.ToCamelUpper(p.Key)))
 	}
 	g.P("default:")
 	g.P("return \"unknown ", kind, " \"+fmt.Sprint(k)")

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

sdk/sdk_test.go

@@ -20,7 +20,7 @@ func TestGenInterface(t *testing.T) {
 	g.P(`package sdk`)
 	g.P(`import "unsafe"`)
 	g.P(`type API interface {`)
-	for _, s := range stream.ToLines("sdk.go") {
+	for s := range stream.ReadFileToLines("sdk.go") {
 		if strings.HasPrefix(s, "func ") {
 			s = strings.TrimPrefix(s, "func ")
 			if strings.Contains(s, "{") && strings.Contains(s, "}") {