Merge pull request #179 from ddkwork/main

up

go.mod

@@ -4,13 +4,14 @@ go 1.22.5
 
 require (
 	github.com/ddkwork/app v0.0.0-20240718002212-c6cbd767fae3
-	github.com/ddkwork/golibrary v0.0.0-20240717170943-d7de0350c797
+	github.com/ddkwork/golibrary v0.0.0-20240727162945-a82f6b828603
+	github.com/ebitengine/purego v0.8.0-alpha.3.0.20240717153933-b9dbbd0c9d2c
 	github.com/richardwilkes/unison v0.72.1
 	github.com/saferwall/pe v1.5.4
 	github.com/stretchr/testify v1.9.0
 	github.com/tc-hib/winres v0.3.1
 	github.com/winlabs/gowin32 v0.0.0-20221003142512-0d265587d3c9
-	golang.org/x/exp v0.0.0-20240707233637-46b078467d37
+	golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
 	golang.org/x/image v0.18.0
 	golang.org/x/sys v0.22.0
 )
@@ -23,8 +24,7 @@ require (
 	github.com/dave/dst v0.27.3 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/dc0d/caseconv v0.5.0 // indirect
-	github.com/dlclark/regexp2 v1.11.0 // indirect
-	github.com/ebitengine/purego v0.7.1 // indirect
+	github.com/dlclark/regexp2 v1.11.2 // indirect
 	github.com/edsrzf/mmap-go v1.1.0 // indirect
 	github.com/fatih/color v1.17.0 // indirect
 	github.com/go-enry/go-enry/v2 v2.8.8 // indirect
@@ -41,7 +41,7 @@ require (
 	github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 // indirect
 	github.com/pkg/term v1.2.0-beta.2 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
-	github.com/richardwilkes/json v0.2.0 // indirect
+	github.com/richardwilkes/json v0.3.0 // indirect
 	github.com/richardwilkes/toolbox v1.114.2 // indirect
 	github.com/rivo/uniseg v0.4.7 // indirect
 	github.com/secDre4mer/pkcs7 v0.0.0-20240322103146-665324a4461d // indirect
@@ -50,11 +50,10 @@ require (
 	github.com/spyre-project/spyre v1.2.5 // indirect
 	github.com/valyala/fastjson v1.6.4 // indirect
 	github.com/yuin/goldmark v1.7.4 // indirect
-	github.com/zzl/go-win32api/v2 v2.2.0 // indirect
 	golang.org/x/arch v0.8.0 // indirect
 	golang.org/x/mod v0.19.0 // indirect
 	golang.org/x/sync v0.7.0 // indirect
-	golang.org/x/term v0.21.0 // indirect
+	golang.org/x/term v0.22.0 // indirect
 	golang.org/x/text v0.16.0 // indirect
 	golang.org/x/tools v0.23.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect

go.sum

@@ -23,28 +23,22 @@ 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-20240714171558-3b830dbd6c00 h1:78MgVUfTffHeTnxoTYUl4OwNnBz9z3ugkApYvzEaOBU=
-github.com/ddkwork/app v0.0.0-20240714171558-3b830dbd6c00/go.mod h1:7VP9CDuccR0lQBG/pKKKXRC52PaaNq8nWIlr+RgOGsA=
-github.com/ddkwork/app v0.0.0-20240716104333-4b68d89d9d11 h1:M+2oNfF7pxdoNkX5/oFuV9g9iiS5yIaMd0crIkaC7og=
-github.com/ddkwork/app v0.0.0-20240716104333-4b68d89d9d11/go.mod h1:7VP9CDuccR0lQBG/pKKKXRC52PaaNq8nWIlr+RgOGsA=
-github.com/ddkwork/app v0.0.0-20240716110527-699716c9d650 h1:OM/8g17qtblkAAqG6smVvASob5Lkh5THSx6HOuODvWI=
-github.com/ddkwork/app v0.0.0-20240716110527-699716c9d650/go.mod h1:7VP9CDuccR0lQBG/pKKKXRC52PaaNq8nWIlr+RgOGsA=
-github.com/ddkwork/app v0.0.0-20240717093853-e49604d06270 h1:+bdhJhjAWVDEANJEhsnPUFt71l8b7xLmoeqMLkE2S00=
-github.com/ddkwork/app v0.0.0-20240717093853-e49604d06270/go.mod h1:JZ8G48oSviC5IZVEwt2Y7oixi53T+6LPPHMoF6cVX/g=
-github.com/ddkwork/app v0.0.0-20240717094219-9d6164d7a7c6 h1:+S91wVdqkxXpTddWKc/b4tAfzEPsTChy5vzLO3sH37E=
-github.com/ddkwork/app v0.0.0-20240717094219-9d6164d7a7c6/go.mod h1:JZ8G48oSviC5IZVEwt2Y7oixi53T+6LPPHMoF6cVX/g=
 github.com/ddkwork/app v0.0.0-20240718002212-c6cbd767fae3 h1:/gxCtpRUSeed27MTqIJZu8MV2S5TY6y8slROLl4ioPk=
 github.com/ddkwork/app v0.0.0-20240718002212-c6cbd767fae3/go.mod h1:RmBHcrxQUcz6jbQvc1nSpJmIUkBuQBo64cbo0h/ViRM=
-github.com/ddkwork/golibrary v0.0.0-20240712101659-3e8e94c302a5 h1:6rn0icpHmhadXBtu+NHAcixdzTWLeMrlVXOD9SsmVwQ=
-github.com/ddkwork/golibrary v0.0.0-20240712101659-3e8e94c302a5/go.mod h1:OkAuwYE7f9YhHNged3ZYaNPGYuDZWUIvHOgpe+viFXc=
-github.com/ddkwork/golibrary v0.0.0-20240717084633-72ca3d8ddfec h1:L9/Z3A656qlz8tVXaMk2WymCruBISy5cg5orRcI1Jbk=
-github.com/ddkwork/golibrary v0.0.0-20240717084633-72ca3d8ddfec/go.mod h1:OkAuwYE7f9YhHNged3ZYaNPGYuDZWUIvHOgpe+viFXc=
-github.com/ddkwork/golibrary v0.0.0-20240717170943-d7de0350c797 h1:yIiKhiH3uNKZuC5PYmhVzwgyl9XhXnPVc8zsqi8IxW4=
-github.com/ddkwork/golibrary v0.0.0-20240717170943-d7de0350c797/go.mod h1:OkAuwYE7f9YhHNged3ZYaNPGYuDZWUIvHOgpe+viFXc=
-github.com/dlclark/regexp2 v1.11.0 h1:G/nrcoOa7ZXlpoa/91N3X7mM3r8eIlMBBJZvsz/mxKI=
-github.com/dlclark/regexp2 v1.11.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
-github.com/ebitengine/purego v0.7.1 h1:6/55d26lG3o9VCZX8lping+bZcmShseiqlh2bnUDiPA=
-github.com/ebitengine/purego v0.7.1/go.mod h1:ah1In8AOtksoNK6yk5z1HTJeUkC1Ez4Wk2idgGslMwQ=
+github.com/ddkwork/golibrary v0.0.0-20240720085141-1b713cf9e19e h1:u5hUtjHsHR1v2rqCteop8ScZ5YlJAfP5mgJQvSSzRyM=
+github.com/ddkwork/golibrary v0.0.0-20240720085141-1b713cf9e19e/go.mod h1:0IXSq21U+npWvR6HoOux/uKDa0WZd9aCbs9A7A8oKIA=
+github.com/ddkwork/golibrary v0.0.0-20240720085616-a8fa39506c43 h1:cgHsYmLFUwqKzGTXFLp+KESVaoHlXlpB6460oEsc/6w=
+github.com/ddkwork/golibrary v0.0.0-20240720085616-a8fa39506c43/go.mod h1:0IXSq21U+npWvR6HoOux/uKDa0WZd9aCbs9A7A8oKIA=
+github.com/ddkwork/golibrary v0.0.0-20240726111718-088eb10b0626 h1:/LmGmTeIrh4n69FWYJy61HJ9xxkGGevKkzfwJfVlirc=
+github.com/ddkwork/golibrary v0.0.0-20240726111718-088eb10b0626/go.mod h1:0IXSq21U+npWvR6HoOux/uKDa0WZd9aCbs9A7A8oKIA=
+github.com/ddkwork/golibrary v0.0.0-20240726120225-55a9b27a579e h1:4FXh/NdzQfq2EZ6WycrD22CurtihpeveRPoRnG6kXg8=
+github.com/ddkwork/golibrary v0.0.0-20240726120225-55a9b27a579e/go.mod h1:0IXSq21U+npWvR6HoOux/uKDa0WZd9aCbs9A7A8oKIA=
+github.com/ddkwork/golibrary v0.0.0-20240727162945-a82f6b828603 h1:mgXGCl6iRWfEWBQcLdpboO/KKr1lXULLJBcrPOLrWl8=
+github.com/ddkwork/golibrary v0.0.0-20240727162945-a82f6b828603/go.mod h1:0IXSq21U+npWvR6HoOux/uKDa0WZd9aCbs9A7A8oKIA=
+github.com/dlclark/regexp2 v1.11.2 h1:/u628IuisSTwri5/UKloiIsH8+qF2Pu7xEQX+yIKg68=
+github.com/dlclark/regexp2 v1.11.2/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
+github.com/ebitengine/purego v0.8.0-alpha.3.0.20240717153933-b9dbbd0c9d2c h1:dd9+CKXixweGJgsHBQXg2s6JFXvOdBX69zzmuKKvraE=
+github.com/ebitengine/purego v0.8.0-alpha.3.0.20240717153933-b9dbbd0c9d2c/go.mod h1:b94LtM1jUWDZPKDyENVhB0WsLdLWFApjbNw5AyxmKyI=
 github.com/edsrzf/mmap-go v1.1.0 h1:6EUwBLQ/Mcr1EYLE4Tn1VdW1A4ckqCQWZBw8Hr0kjpQ=
 github.com/edsrzf/mmap-go v1.1.0/go.mod h1:19H/e8pUPLicwkyNgOykDXkJ9F0MHE+Z52B8EIth78Q=
 github.com/fatih/color v1.17.0 h1:GlRw1BRJxkpqUCBKzKOw098ed57fEsKeNjpTe3cSjK4=
@@ -98,8 +92,8 @@ github.com/pkg/term v1.2.0-beta.2/go.mod h1:E25nymQcrSllhX42Ok8MRm1+hyBdHY0dCeiK
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/richardwilkes/json v0.2.0 h1:ddwSjl9tc89Nv1mI3P7UnCJow8c6hq/l6TLoPlwdyLQ=
-github.com/richardwilkes/json v0.2.0/go.mod h1:QgGoe60liiLHPD/FkIApP5LMuReHWMN6TaMJf2GT6n8=
+github.com/richardwilkes/json v0.3.0 h1:Rk7tgpaEudc2C+Vg5pt0idJDX8/wXqxBlt3Uz8A/oXY=
+github.com/richardwilkes/json v0.3.0/go.mod h1:+7qk1QXSKh+NkY0meiJwK57rPnVRbltG3bYnt40Ak4c=
 github.com/richardwilkes/toolbox v1.114.2 h1:4dAoJzIDZpk6IpDI8LKP/LGwFnKNxhD1ycI1mFL8YyM=
 github.com/richardwilkes/toolbox v1.114.2/go.mod h1:xJGESnNS91N8YxxKqfGaJMoFog4Mhi+yRGhOCX5mlrw=
 github.com/richardwilkes/unison v0.72.1 h1:shEsaahiiIbp2CpWvNyOJlhqTcg6kPIoLQG2fgIug6U=
@@ -141,16 +135,14 @@ github.com/winlabs/gowin32 v0.0.0-20221003142512-0d265587d3c9/go.mod h1:N51TYkG9
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 github.com/yuin/goldmark v1.7.4 h1:BDXOHExt+A7gwPCJgPIIq7ENvceR7we7rOS9TNoLZeg=
 github.com/yuin/goldmark v1.7.4/go.mod h1:uzxRWxtg69N339t3louHJ7+O03ezfj6PlliRlaOzY1E=
-github.com/zzl/go-win32api/v2 v2.2.0 h1:vLVc9ATxK1wY4qcT4XhahieFfgI1AngkCzsQXuDVlew=
-github.com/zzl/go-win32api/v2 v2.2.0/go.mod h1:doi6ewHPdh9tDmqe837Ro7IwqtB9yE+1fC8suK/Ssj0=
 golang.org/x/arch v0.8.0 h1:3wRIsP3pM4yUptoR96otTUOXI367OS0+c9eeRi9doIc=
 golang.org/x/arch v0.8.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/exp v0.0.0-20240707233637-46b078467d37 h1:uLDX+AfeFCct3a2C7uIWBKMJIR3CJMhcgfrUAqjRK6w=
-golang.org/x/exp v0.0.0-20240707233637-46b078467d37/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY=
+golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0LeHDbnYEryqj5Q1ug8=
+golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY=
 golang.org/x/image v0.18.0 h1:jGzIakQa/ZXI1I0Fxvaa9W7yP25TqT6cHIHn+6CqvSQ=
 golang.org/x/image v0.18.0/go.mod h1:4yyo5vMFQjVjUcVk4jEQcU9MGy/rulF5WvUILseCM2E=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
@@ -182,8 +174,8 @@ golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
 golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.21.0 h1:WVXCp+/EBEHOj53Rvu+7KiT/iElMrO8ACK16SMZ3jaA=
-golang.org/x/term v0.21.0/go.mod h1:ooXLefLobQVslOqselCNF4SxFAaoS6KujMbsGzSDmX0=
+golang.org/x/term v0.22.0 h1:BbsgPEJULsl2fV/AT3v15Mjva5yXKQDyKf+TbDz7QJk=
+golang.org/x/term v0.22.0/go.mod h1:F3qCibpT5AMpCRfhfT53vVJwhLtIVHhB9XDjfFvnMI4=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=

main.go

@@ -10,7 +10,7 @@ import (
 func main() {
 	// testSdkCommands()
 	ux.Run() // wait ..........................
-	// testDisassembly() // quick show
+	//testDisassembly() // quick show
 	// testParsePe()
 	// testScript()
 }

plugin/symbol/Ntdll.go

@@ -1,8 +1,9 @@
 package symbol
 
 type (
-	InterfaceNtdll interface{}
-	objectNtdll    struct{}
+	InterfaceNtdll interface {
+	}
+	objectNtdll struct{}
 )
 
 func NewGeneratedFileNtdll() InterfaceNtdll { return &objectNtdll{} }

plugin/symbol/Win32u.go

@@ -1,8 +1,9 @@
 package symbol
 
 type (
-	InterfaceWin32u interface{}
-	objectWin32u    struct{}
+	InterfaceWin32u interface {
+	}
+	objectWin32u struct{}
 )
 
 func NewGeneratedFileWin32u() InterfaceWin32u { return &objectWin32u{} }

push.cmd

@@ -0,0 +1,3 @@
+git add .
+git commit -m "xx"
+git push