Merge pull request #344 from bnema/chore/upstream-foundations
chore(deps): integrate approved upstream foundations
921 files · +28709 -25527
M docs/first-presentation.md +5 -2
| @@ -46,5 +46,8 @@ labels. Set `DUMBER_MACHINE_GPU_PROFILE` to one of `generic-gpu`, | |||
| 46 | 46 | `integrated-gpu`, `discrete-gpu`, `hybrid-gpu`, `virtual-gpu`, or `unknown-gpu`; | |
| 47 | 47 | do not use a device model or other identifier. Publish only the seven reviewed | |
| 48 | 48 | JSON files to an external Gist. Raw logs and temporary XDG homes are removed and | |
| 49 | - | must not be published. A missing or incomplete timeline, non-DMABUF backend, or | |
| 50 | - | invalid run fails collection. | |
| 49 | + | must not be published. `metadata.json` derives the selected | |
| 50 | + | `github.com/bnema/purego-cef2gtk` pseudo-version and its full immutable Git | |
| 51 | + | origin hash from Go module metadata; branch selectors or missing origin metadata | |
| 52 | + | fail collection. A missing or incomplete timeline, non-DMABUF backend, or invalid | |
| 53 | + | run also fails collection. | |
| @@ -46,5 +46,8 @@ labels. Set `DUMBER_MACHINE_GPU_PROFILE` to one of `generic-gpu`, | |||||
| 46 | `integrated-gpu`, `discrete-gpu`, `hybrid-gpu`, `virtual-gpu`, or `unknown-gpu`; | 46 | `integrated-gpu`, `discrete-gpu`, `hybrid-gpu`, `virtual-gpu`, or `unknown-gpu`; | ||
| 47 | do not use a device model or other identifier. Publish only the seven reviewed | 47 | do not use a device model or other identifier. Publish only the seven reviewed | ||
| 48 | JSON files to an external Gist. Raw logs and temporary XDG homes are removed and | 48 | JSON files to an external Gist. Raw logs and temporary XDG homes are removed and | ||
| 49 | - | must not be published. A missing or incomplete timeline, non-DMABUF backend, or | 49 | + | must not be published. `metadata.json` derives the selected |
| 50 | - | invalid run fails collection. | 50 | + | `github.com/bnema/purego-cef2gtk` pseudo-version and its full immutable Git |
| 51 | + | origin hash from Go module metadata; branch selectors or missing origin metadata | |||
| 52 | + | fail collection. A missing or incomplete timeline, non-DMABUF backend, or invalid | |||
| 53 | + | run also fails collection. | |||
M go.mod +5 -5
| @@ -6,11 +6,11 @@ require ( | |||
| 6 | 6 | github.com/a-h/templ v0.3.1020 | |
| 7 | 7 | github.com/andybalholm/brotli v1.2.2 | |
| 8 | 8 | github.com/bnema/purego v0.11.0-bnema.4 | |
| 9 | - | github.com/bnema/purego-cef v0.13.3 | |
| 10 | - | github.com/bnema/purego-cef2gtk v0.8.4 | |
| 11 | - | github.com/bnema/purego-pipewire v0.1.4 | |
| 12 | - | github.com/bnema/purego-sqlite v0.1.3 | |
| 13 | - | github.com/bnema/puregotk v0.7.0 | |
| 9 | + | github.com/bnema/purego-cef v0.13.4-0.20260714140305-f0b7414af67e | |
| 10 | + | github.com/bnema/purego-cef2gtk v0.8.4-0.20260714160309-bbd397409ebe | |
| 11 | + | github.com/bnema/purego-pipewire v0.1.5-0.20260714124450-6504b9cdf02a | |
| 12 | + | github.com/bnema/purego-sqlite v0.1.4-0.20260714131321-3614fe683b9c | |
| 13 | + | github.com/bnema/puregotk v0.7.1-0.20260714170452-0b6b9b901234 | |
| 14 | 14 | github.com/charmbracelet/bubbles v1.0.0 | |
| 15 | 15 | github.com/charmbracelet/bubbletea v1.3.10 | |
| 16 | 16 | github.com/charmbracelet/lipgloss v1.1.0 | |
| @@ -6,11 +6,11 @@ require ( | |||||
| 6 | github.com/a-h/templ v0.3.1020 | 6 | github.com/a-h/templ v0.3.1020 | ||
| 7 | github.com/andybalholm/brotli v1.2.2 | 7 | github.com/andybalholm/brotli v1.2.2 | ||
| 8 | github.com/bnema/purego v0.11.0-bnema.4 | 8 | github.com/bnema/purego v0.11.0-bnema.4 | ||
| 9 | - | github.com/bnema/purego-cef v0.13.3 | 9 | + | github.com/bnema/purego-cef v0.13.4-0.20260714140305-f0b7414af67e |
| 10 | - | github.com/bnema/purego-cef2gtk v0.8.4 | 10 | + | github.com/bnema/purego-cef2gtk v0.8.4-0.20260714160309-bbd397409ebe |
| 11 | - | github.com/bnema/purego-pipewire v0.1.4 | 11 | + | github.com/bnema/purego-pipewire v0.1.5-0.20260714124450-6504b9cdf02a |
| 12 | - | github.com/bnema/purego-sqlite v0.1.3 | 12 | + | github.com/bnema/purego-sqlite v0.1.4-0.20260714131321-3614fe683b9c |
| 13 | - | github.com/bnema/puregotk v0.7.0 | 13 | + | github.com/bnema/puregotk v0.7.1-0.20260714170452-0b6b9b901234 |
| 14 | github.com/charmbracelet/bubbles v1.0.0 | 14 | github.com/charmbracelet/bubbles v1.0.0 | ||
| 15 | github.com/charmbracelet/bubbletea v1.3.10 | 15 | github.com/charmbracelet/bubbletea v1.3.10 | ||
| 16 | github.com/charmbracelet/lipgloss v1.1.0 | 16 | github.com/charmbracelet/lipgloss v1.1.0 | ||
M go.sum +12 -0 generated file: collapsed
A internal/infrastructure/persistence/sqlite/history_repo_benchmark_test.go +71 -0
| @@ -0,0 +1,71 @@ | |||
| 1 | + | package sqlite_test | |
| 2 | + | ||
| 3 | + | import ( | |
| 4 | + | "fmt" | |
| 5 | + | "path/filepath" | |
| 6 | + | "testing" | |
| 7 | + | ||
| 8 | + | "github.com/bnema/dumber/internal/domain/entity" | |
| 9 | + | "github.com/bnema/dumber/internal/domain/repository" | |
| 10 | + | "github.com/bnema/dumber/internal/infrastructure/persistence/sqlite" | |
| 11 | + | ) | |
| 12 | + | ||
| 13 | + | // newHistoryBenchmarkRepository creates a representative local history corpus | |
| 14 | + | // outside the measured operation. Sidebar reads use GetRecent and omnibox | |
| 15 | + | // history suggestions use Search. | |
| 16 | + | func newHistoryBenchmarkRepository(b *testing.B) (repository.HistoryRepository, func()) { | |
| 17 | + | b.Helper() | |
| 18 | + | ||
| 19 | + | ctx := historyTestCtx() | |
| 20 | + | db, err := sqlite.NewConnection(ctx, filepath.Join(b.TempDir(), "dumber.db")) | |
| 21 | + | if err != nil { | |
| 22 | + | b.Fatal(err) | |
| 23 | + | } | |
| 24 | + | ||
| 25 | + | b.Cleanup(func() { | |
| 26 | + | if err := db.Close(); err != nil { | |
| 27 | + | b.Errorf("close benchmark database: %v", err) | |
| 28 | + | } | |
| 29 | + | }) | |
| 30 | + | ||
| 31 | + | repo := sqlite.NewHistoryRepository(db) | |
| 32 | + | for i := range 200 { | |
| 33 | + | entry := &entity.HistoryEntry{ | |
| 34 | + | URL: fmt.Sprintf("https://example%d.test/dumber/history/%d", i%20, i), | |
| 35 | + | Title: fmt.Sprintf("Dumber history entry %d", i), | |
| 36 | + | } | |
| 37 | + | if err := repo.Save(ctx, entry); err != nil { | |
| 38 | + | b.Fatal(err) | |
| 39 | + | } | |
| 40 | + | } | |
| 41 | + | ||
| 42 | + | return repo, func() {} | |
| 43 | + | } | |
| 44 | + | ||
| 45 | + | func BenchmarkHistorySQLiteSidebarRecent(b *testing.B) { | |
| 46 | + | repo, closeDB := newHistoryBenchmarkRepository(b) | |
| 47 | + | defer closeDB() | |
| 48 | + | ctx := historyTestCtx() | |
| 49 | + | ||
| 50 | + | b.ReportAllocs() | |
| 51 | + | b.ResetTimer() | |
| 52 | + | for range b.N { | |
| 53 | + | if _, err := repo.GetRecent(ctx, 50, 0); err != nil { | |
| 54 | + | b.Fatal(err) | |
| 55 | + | } | |
| 56 | + | } | |
| 57 | + | } | |
| 58 | + | ||
| 59 | + | func BenchmarkHistorySQLiteOmniboxSearch(b *testing.B) { | |
| 60 | + | repo, closeDB := newHistoryBenchmarkRepository(b) | |
| 61 | + | defer closeDB() | |
| 62 | + | ctx := historyTestCtx() | |
| 63 | + | ||
| 64 | + | b.ReportAllocs() | |
| 65 | + | b.ResetTimer() | |
| 66 | + | for range b.N { | |
| 67 | + | if _, err := repo.Search(ctx, "dumber history", 10); err != nil { | |
| 68 | + | b.Fatal(err) | |
| 69 | + | } | |
| 70 | + | } | |
| 71 | + | } | |
| @@ -0,0 +1,71 @@ | |||||
| 1 | + | package sqlite_test | |||
| 2 | + | ||||
| 3 | + | import ( | |||
| 4 | + | "fmt" | |||
| 5 | + | "path/filepath" | |||
| 6 | + | "testing" | |||
| 7 | + | ||||
| 8 | + | "github.com/bnema/dumber/internal/domain/entity" | |||
| 9 | + | "github.com/bnema/dumber/internal/domain/repository" | |||
| 10 | + | "github.com/bnema/dumber/internal/infrastructure/persistence/sqlite" | |||
| 11 | + | ) | |||
| 12 | + | ||||
| 13 | + | // newHistoryBenchmarkRepository creates a representative local history corpus | |||
| 14 | + | // outside the measured operation. Sidebar reads use GetRecent and omnibox | |||
| 15 | + | // history suggestions use Search. | |||
| 16 | + | func newHistoryBenchmarkRepository(b *testing.B) (repository.HistoryRepository, func()) { | |||
| 17 | + | b.Helper() | |||
| 18 | + | ||||
| 19 | + | ctx := historyTestCtx() | |||
| 20 | + | db, err := sqlite.NewConnection(ctx, filepath.Join(b.TempDir(), "dumber.db")) | |||
| 21 | + | if err != nil { | |||
| 22 | + | b.Fatal(err) | |||
| 23 | + | } | |||
| 24 | + | ||||
| 25 | + | b.Cleanup(func() { | |||
| 26 | + | if err := db.Close(); err != nil { | |||
| 27 | + | b.Errorf("close benchmark database: %v", err) | |||
| 28 | + | } | |||
| 29 | + | }) | |||
| 30 | + | ||||
| 31 | + | repo := sqlite.NewHistoryRepository(db) | |||
| 32 | + | for i := range 200 { | |||
| 33 | + | entry := &entity.HistoryEntry{ | |||
| 34 | + | URL: fmt.Sprintf("https://example%d.test/dumber/history/%d", i%20, i), | |||
| 35 | + | Title: fmt.Sprintf("Dumber history entry %d", i), | |||
| 36 | + | } | |||
| 37 | + | if err := repo.Save(ctx, entry); err != nil { | |||
| 38 | + | b.Fatal(err) | |||
| 39 | + | } | |||
| 40 | + | } | |||
| 41 | + | ||||
| 42 | + | return repo, func() {} | |||
| 43 | + | } | |||
| 44 | + | ||||
| 45 | + | func BenchmarkHistorySQLiteSidebarRecent(b *testing.B) { | |||
| 46 | + | repo, closeDB := newHistoryBenchmarkRepository(b) | |||
| 47 | + | defer closeDB() | |||
| 48 | + | ctx := historyTestCtx() | |||
| 49 | + | ||||
| 50 | + | b.ReportAllocs() | |||
| 51 | + | b.ResetTimer() | |||
| 52 | + | for range b.N { | |||
| 53 | + | if _, err := repo.GetRecent(ctx, 50, 0); err != nil { | |||
| 54 | + | b.Fatal(err) | |||
| 55 | + | } | |||
| 56 | + | } | |||
| 57 | + | } | |||
| 58 | + | ||||
| 59 | + | func BenchmarkHistorySQLiteOmniboxSearch(b *testing.B) { | |||
| 60 | + | repo, closeDB := newHistoryBenchmarkRepository(b) | |||
| 61 | + | defer closeDB() | |||
| 62 | + | ctx := historyTestCtx() | |||
| 63 | + | ||||
| 64 | + | b.ReportAllocs() | |||
| 65 | + | b.ResetTimer() | |||
| 66 | + | for range b.N { | |||
| 67 | + | if _, err := repo.Search(ctx, "dumber history", 10); err != nil { | |||
| 68 | + | b.Fatal(err) | |||
| 69 | + | } | |||
| 70 | + | } | |||
| 71 | + | } | |||
M internal/logging/first_presentation_collector_test.go +132 -1
| @@ -2,6 +2,7 @@ package logging | |||
| 2 | 2 | ||
| 3 | 3 | import ( | |
| 4 | 4 | "encoding/json" | |
| 5 | + | "fmt" | |
| 5 | 6 | "os" | |
| 6 | 7 | "os/exec" | |
| 7 | 8 | "path/filepath" | |
| @@ -143,8 +144,9 @@ func TestFirstPresentationCollectorSanitizesMachineLocalValues(t *testing.T) { | |||
| 143 | 144 | } | |
| 144 | 145 | for _, required := range []string{ | |
| 145 | 146 | `"measured_source_revision"`, | |
| 147 | + | `"version": "v0.8.4-0.20260714160309-bbd397409ebe"`, | |
| 146 | 148 | `"tag": "v0.8.4"`, | |
| 147 | - | `"revision": "f217ece342dea3ef2a3f98671fcd16a39ad0037d"`, | |
| 149 | + | `"revision": "bbd397409ebed75a5979c1e4566a2ef319f6a484"`, | |
| 148 | 150 | } { | |
| 149 | 151 | require.Contains(t, artifacts.String(), required) | |
| 150 | 152 | } | |
| @@ -166,6 +168,135 @@ func TestFirstPresentationCollectorSanitizesMachineLocalValues(t *testing.T) { | |||
| 166 | 168 | require.Equal(t, "integrated-gpu", metadata.Comparison.MachineGPUProfile) | |
| 167 | 169 | } | |
| 168 | 170 | ||
| 171 | + | func TestFirstPresentationCollectorDerivesSelectedImmutableModuleProvenance(t *testing.T) { | |
| 172 | + | repoRoot, err := filepath.Abs(filepath.Join("..", "..")) | |
| 173 | + | require.NoError(t, err) | |
| 174 | + | temp := t.TempDir() | |
| 175 | + | runtime := filepath.Join(temp, "cef-147-runtime") | |
| 176 | + | require.NoError(t, os.Mkdir(runtime, 0o755)) | |
| 177 | + | binary := filepath.Join(temp, "dumber") | |
| 178 | + | require.NoError(t, os.WriteFile(binary, collectorTestBinary(validFirstPresentationLog), 0o755)) | |
| 179 | + | ||
| 180 | + | // This exact pseudo-version is deliberately newer than the former v0.8.4 | |
| 181 | + | // hardcode; the collector must report what the selected module says. | |
| 182 | + | const version = "v0.8.5-0.20300102030405-bbd397409ebe" | |
| 183 | + | const revision = "bbd397409ebed75a5979c1e4566a2ef319f6a484" | |
| 184 | + | goBin := collectorProvenanceGo(t, temp, version, revision, "") | |
| 185 | + | output := filepath.Join(temp, "artifacts") | |
| 186 | + | cmd := exec.Command(filepath.Join(repoRoot, "scripts", "collect_first_presentation.sh")) | |
| 187 | + | cmd.Dir = repoRoot | |
| 188 | + | cmd.Env = append(os.Environ(), | |
| 189 | + | "DISPLAY=:test", | |
| 190 | + | "DUMBER_CEF_DIR="+runtime, | |
| 191 | + | "DUMBER_FIRST_PRESENTATION_BIN="+binary, | |
| 192 | + | "DUMBER_FIRST_PRESENTATION_OUTPUT="+output, | |
| 193 | + | "DUMBER_FIRST_PRESENTATION_TIMEOUT_SECONDS=1", | |
| 194 | + | "PATH="+filepath.Dir(goBin)+":"+os.Getenv("PATH"), | |
| 195 | + | ) | |
| 196 | + | result, err := cmd.CombinedOutput() | |
| 197 | + | require.NoErrorf(t, err, "collector failed: %s", result) | |
| 198 | + | ||
| 199 | + | var metadata struct { | |
| 200 | + | Upstream struct { | |
| 201 | + | Module string `json:"module"` | |
| 202 | + | Version string `json:"version"` | |
| 203 | + | Tag string `json:"tag"` | |
| 204 | + | Revision string `json:"revision"` | |
| 205 | + | } `json:"upstream"` | |
| 206 | + | } | |
| 207 | + | contents, err := os.ReadFile(filepath.Join(output, "metadata.json")) | |
| 208 | + | require.NoError(t, err) | |
| 209 | + | require.NoError(t, json.Unmarshal(contents, &metadata)) | |
| 210 | + | require.Equal(t, "github.com/bnema/purego-cef2gtk", metadata.Upstream.Module) | |
| 211 | + | require.Equal(t, version, metadata.Upstream.Version) | |
| 212 | + | require.Equal(t, "v0.8.5", metadata.Upstream.Tag) | |
| 213 | + | require.Equal(t, revision, metadata.Upstream.Revision) | |
| 214 | + | ||
| 215 | + | script, err := os.ReadFile(filepath.Join(repoRoot, "scripts", "collect_first_presentation.sh")) | |
| 216 | + | require.NoError(t, err) | |
| 217 | + | require.NotContains(t, string(script), "f217ece342dea3ef2a3f98671fcd16a39ad0037d") | |
| 218 | + | } | |
| 219 | + | ||
| 220 | + | func TestFirstPresentationCollectorRejectsNonImmutableModuleProvenanceWithoutLeaks(t *testing.T) { | |
| 221 | + | repoRoot, err := filepath.Abs(filepath.Join("..", "..")) | |
| 222 | + | require.NoError(t, err) | |
| 223 | + | ||
| 224 | + | for _, test := range []struct { | |
| 225 | + | name, version, revision, ref string | |
| 226 | + | }{ | |
| 227 | + | {name: "branch selector", version: "main", ref: "main"}, | |
| 228 | + | {name: "missing origin", version: "v0.8.5-0.20300102030405-bbd397409ebe"}, | |
| 229 | + | {name: "named origin ref", version: "v0.8.5-0.20300102030405-bbd397409ebe", revision: "bbd397409ebed75a5979c1e4566a2ef319f6a484", ref: "main"}, | |
| 230 | + | } { | |
| 231 | + | t.Run(test.name, func(t *testing.T) { | |
| 232 | + | temp := t.TempDir() | |
| 233 | + | runtime := filepath.Join(temp, "cef-147-runtime") | |
| 234 | + | require.NoError(t, os.Mkdir(runtime, 0o755)) | |
| 235 | + | binary := filepath.Join(temp, "dumber") | |
| 236 | + | require.NoError(t, os.WriteFile(binary, collectorTestBinary(validFirstPresentationLog), 0o755)) | |
| 237 | + | ||
| 238 | + | goBin := collectorProvenanceGo(t, temp, test.version, test.revision, test.ref) | |
| 239 | + | output := filepath.Join(temp, "artifacts") | |
| 240 | + | cmd := exec.Command(filepath.Join(repoRoot, "scripts", "collect_first_presentation.sh")) | |
| 241 | + | cmd.Dir = repoRoot | |
| 242 | + | cmd.Env = append(os.Environ(), | |
| 243 | + | "DISPLAY=:test", | |
| 244 | + | "DUMBER_CEF_DIR="+runtime, | |
| 245 | + | "DUMBER_FIRST_PRESENTATION_BIN="+binary, | |
| 246 | + | "DUMBER_FIRST_PRESENTATION_OUTPUT="+output, | |
| 247 | + | "PATH="+filepath.Dir(goBin)+":"+os.Getenv("PATH"), | |
| 248 | + | ) | |
| 249 | + | result, runErr := cmd.CombinedOutput() | |
| 250 | + | require.Errorf(t, runErr, "collector accepted nonimmutable module provenance: %s", result) | |
| 251 | + | require.Contains(t, string(result), "immutable module provenance is unavailable") | |
| 252 | + | require.NotContains(t, string(result), temp) | |
| 253 | + | require.NoFileExists(t, filepath.Join(output, "metadata.json")) | |
| 254 | + | for _, name := range runArtifactNames() { | |
| 255 | + | require.NoFileExists(t, filepath.Join(output, name)) | |
| 256 | + | } | |
| 257 | + | }) | |
| 258 | + | } | |
| 259 | + | } | |
| 260 | + | ||
| 261 | + | func collectorProvenanceGo(t *testing.T, temp, version, revision, ref string) string { | |
| 262 | + | t.Helper() | |
| 263 | + | infoPath := filepath.Join(temp, "module.info") | |
| 264 | + | info := map[string]any{"Version": version} | |
| 265 | + | if revision != "" { | |
| 266 | + | info["Origin"] = map[string]string{ | |
| 267 | + | "VCS": "git", "URL": "https://github.com/bnema/purego-cef2gtk", "Hash": revision, "Ref": ref, | |
| 268 | + | } | |
| 269 | + | } | |
| 270 | + | infoJSON, err := json.Marshal(info) | |
| 271 | + | require.NoError(t, err) | |
| 272 | + | require.NoError(t, os.WriteFile(infoPath, infoJSON, 0o600)) | |
| 273 | + | ||
| 274 | + | selectedJSON, err := json.Marshal(map[string]string{ | |
| 275 | + | "Path": "github.com/bnema/purego-cef2gtk", "Version": version, | |
| 276 | + | }) | |
| 277 | + | require.NoError(t, err) | |
| 278 | + | downloadedJSON, err := json.Marshal(map[string]string{ | |
| 279 | + | "Path": "github.com/bnema/purego-cef2gtk", "Version": version, "Info": infoPath, | |
| 280 | + | }) | |
| 281 | + | require.NoError(t, err) | |
| 282 | + | binDir := filepath.Join(temp, "bin") | |
| 283 | + | require.NoError(t, os.Mkdir(binDir, 0o755)) | |
| 284 | + | goBin := filepath.Join(binDir, "go") | |
| 285 | + | script := fmt.Sprintf(`#!/bin/sh | |
| 286 | + | if [ "$1" = "list" ] && [ "$2" = "-m" ] && [ "$3" = "-json" ] && [ "$4" = "github.com/bnema/purego-cef2gtk" ]; then | |
| 287 | + | printf '%%s\n' '%s' | |
| 288 | + | exit 0 | |
| 289 | + | fi | |
| 290 | + | if [ "$1" = "mod" ] && [ "$2" = "download" ] && [ "$3" = "-json" ] && [ "$4" = "github.com/bnema/purego-cef2gtk@%s" ]; then | |
| 291 | + | printf '%%s\n' '%s' | |
| 292 | + | exit 0 | |
| 293 | + | fi | |
| 294 | + | exit 1 | |
| 295 | + | `, selectedJSON, version, downloadedJSON) | |
| 296 | + | require.NoError(t, os.WriteFile(goBin, []byte(script), 0o755)) | |
| 297 | + | return goBin | |
| 298 | + | } | |
| 299 | + | ||
| 169 | 300 | func TestFirstPresentationCollectorDefaultsToXDGStateEvidenceDirectory(t *testing.T) { | |
| 170 | 301 | repoRoot, err := filepath.Abs(filepath.Join("..", "..")) | |
| 171 | 302 | require.NoError(t, err) | |
| @@ -2,6 +2,7 @@ package logging | |||||
| 2 | 2 | ||||
| 3 | import ( | 3 | import ( | ||
| 4 | "encoding/json" | 4 | "encoding/json" | ||
| 5 | + | "fmt" | |||
| 5 | "os" | 6 | "os" | ||
| 6 | "os/exec" | 7 | "os/exec" | ||
| 7 | "path/filepath" | 8 | "path/filepath" | ||
| @@ -143,8 +144,9 @@ func TestFirstPresentationCollectorSanitizesMachineLocalValues(t *testing.T) { | |||||
| 143 | } | 144 | } | ||
| 144 | for _, required := range []string{ | 145 | for _, required := range []string{ | ||
| 145 | `"measured_source_revision"`, | 146 | `"measured_source_revision"`, | ||
| 147 | + | `"version": "v0.8.4-0.20260714160309-bbd397409ebe"`, | |||
| 146 | `"tag": "v0.8.4"`, | 148 | `"tag": "v0.8.4"`, | ||
| 147 | - | `"revision": "f217ece342dea3ef2a3f98671fcd16a39ad0037d"`, | 149 | + | `"revision": "bbd397409ebed75a5979c1e4566a2ef319f6a484"`, |
| 148 | } { | 150 | } { | ||
| 149 | require.Contains(t, artifacts.String(), required) | 151 | require.Contains(t, artifacts.String(), required) | ||
| 150 | } | 152 | } | ||
| @@ -166,6 +168,135 @@ func TestFirstPresentationCollectorSanitizesMachineLocalValues(t *testing.T) { | |||||
| 166 | require.Equal(t, "integrated-gpu", metadata.Comparison.MachineGPUProfile) | 168 | require.Equal(t, "integrated-gpu", metadata.Comparison.MachineGPUProfile) | ||
| 167 | } | 169 | } | ||
| 168 | 170 | ||||
| 171 | + | func TestFirstPresentationCollectorDerivesSelectedImmutableModuleProvenance(t *testing.T) { | |||
| 172 | + | repoRoot, err := filepath.Abs(filepath.Join("..", "..")) | |||
| 173 | + | require.NoError(t, err) | |||
| 174 | + | temp := t.TempDir() | |||
| 175 | + | runtime := filepath.Join(temp, "cef-147-runtime") | |||
| 176 | + | require.NoError(t, os.Mkdir(runtime, 0o755)) | |||
| 177 | + | binary := filepath.Join(temp, "dumber") | |||
| 178 | + | require.NoError(t, os.WriteFile(binary, collectorTestBinary(validFirstPresentationLog), 0o755)) | |||
| 179 | + | ||||
| 180 | + | // This exact pseudo-version is deliberately newer than the former v0.8.4 | |||
| 181 | + | // hardcode; the collector must report what the selected module says. | |||
| 182 | + | const version = "v0.8.5-0.20300102030405-bbd397409ebe" | |||
| 183 | + | const revision = "bbd397409ebed75a5979c1e4566a2ef319f6a484" | |||
| 184 | + | goBin := collectorProvenanceGo(t, temp, version, revision, "") | |||
| 185 | + | output := filepath.Join(temp, "artifacts") | |||
| 186 | + | cmd := exec.Command(filepath.Join(repoRoot, "scripts", "collect_first_presentation.sh")) | |||
| 187 | + | cmd.Dir = repoRoot | |||
| 188 | + | cmd.Env = append(os.Environ(), | |||
| 189 | + | "DISPLAY=:test", | |||
| 190 | + | "DUMBER_CEF_DIR="+runtime, | |||
| 191 | + | "DUMBER_FIRST_PRESENTATION_BIN="+binary, | |||
| 192 | + | "DUMBER_FIRST_PRESENTATION_OUTPUT="+output, | |||
| 193 | + | "DUMBER_FIRST_PRESENTATION_TIMEOUT_SECONDS=1", | |||
| 194 | + | "PATH="+filepath.Dir(goBin)+":"+os.Getenv("PATH"), | |||
| 195 | + | ) | |||
| 196 | + | result, err := cmd.CombinedOutput() | |||
| 197 | + | require.NoErrorf(t, err, "collector failed: %s", result) | |||
| 198 | + | ||||
| 199 | + | var metadata struct { | |||
| 200 | + | Upstream struct { | |||
| 201 | + | Module string `json:"module"` | |||
| 202 | + | Version string `json:"version"` | |||
| 203 | + | Tag string `json:"tag"` | |||
| 204 | + | Revision string `json:"revision"` | |||
| 205 | + | } `json:"upstream"` | |||
| 206 | + | } | |||
| 207 | + | contents, err := os.ReadFile(filepath.Join(output, "metadata.json")) | |||
| 208 | + | require.NoError(t, err) | |||
| 209 | + | require.NoError(t, json.Unmarshal(contents, &metadata)) | |||
| 210 | + | require.Equal(t, "github.com/bnema/purego-cef2gtk", metadata.Upstream.Module) | |||
| 211 | + | require.Equal(t, version, metadata.Upstream.Version) | |||
| 212 | + | require.Equal(t, "v0.8.5", metadata.Upstream.Tag) | |||
| 213 | + | require.Equal(t, revision, metadata.Upstream.Revision) | |||
| 214 | + | ||||
| 215 | + | script, err := os.ReadFile(filepath.Join(repoRoot, "scripts", "collect_first_presentation.sh")) | |||
| 216 | + | require.NoError(t, err) | |||
| 217 | + | require.NotContains(t, string(script), "f217ece342dea3ef2a3f98671fcd16a39ad0037d") | |||
| 218 | + | } | |||
| 219 | + | ||||
| 220 | + | func TestFirstPresentationCollectorRejectsNonImmutableModuleProvenanceWithoutLeaks(t *testing.T) { | |||
| 221 | + | repoRoot, err := filepath.Abs(filepath.Join("..", "..")) | |||
| 222 | + | require.NoError(t, err) | |||
| 223 | + | ||||
| 224 | + | for _, test := range []struct { | |||
| 225 | + | name, version, revision, ref string | |||
| 226 | + | }{ | |||
| 227 | + | {name: "branch selector", version: "main", ref: "main"}, | |||
| 228 | + | {name: "missing origin", version: "v0.8.5-0.20300102030405-bbd397409ebe"}, | |||
| 229 | + | {name: "named origin ref", version: "v0.8.5-0.20300102030405-bbd397409ebe", revision: "bbd397409ebed75a5979c1e4566a2ef319f6a484", ref: "main"}, | |||
| 230 | + | } { | |||
| 231 | + | t.Run(test.name, func(t *testing.T) { | |||
| 232 | + | temp := t.TempDir() | |||
| 233 | + | runtime := filepath.Join(temp, "cef-147-runtime") | |||
| 234 | + | require.NoError(t, os.Mkdir(runtime, 0o755)) | |||
| 235 | + | binary := filepath.Join(temp, "dumber") | |||
| 236 | + | require.NoError(t, os.WriteFile(binary, collectorTestBinary(validFirstPresentationLog), 0o755)) | |||
| 237 | + | ||||
| 238 | + | goBin := collectorProvenanceGo(t, temp, test.version, test.revision, test.ref) | |||
| 239 | + | output := filepath.Join(temp, "artifacts") | |||
| 240 | + | cmd := exec.Command(filepath.Join(repoRoot, "scripts", "collect_first_presentation.sh")) | |||
| 241 | + | cmd.Dir = repoRoot | |||
| 242 | + | cmd.Env = append(os.Environ(), | |||
| 243 | + | "DISPLAY=:test", | |||
| 244 | + | "DUMBER_CEF_DIR="+runtime, | |||
| 245 | + | "DUMBER_FIRST_PRESENTATION_BIN="+binary, | |||
| 246 | + | "DUMBER_FIRST_PRESENTATION_OUTPUT="+output, | |||
| 247 | + | "PATH="+filepath.Dir(goBin)+":"+os.Getenv("PATH"), | |||
| 248 | + | ) | |||
| 249 | + | result, runErr := cmd.CombinedOutput() | |||
| 250 | + | require.Errorf(t, runErr, "collector accepted nonimmutable module provenance: %s", result) | |||
| 251 | + | require.Contains(t, string(result), "immutable module provenance is unavailable") | |||
| 252 | + | require.NotContains(t, string(result), temp) | |||
| 253 | + | require.NoFileExists(t, filepath.Join(output, "metadata.json")) | |||
| 254 | + | for _, name := range runArtifactNames() { | |||
| 255 | + | require.NoFileExists(t, filepath.Join(output, name)) | |||
| 256 | + | } | |||
| 257 | + | }) | |||
| 258 | + | } | |||
| 259 | + | } | |||
| 260 | + | ||||
| 261 | + | func collectorProvenanceGo(t *testing.T, temp, version, revision, ref string) string { | |||
| 262 | + | t.Helper() | |||
| 263 | + | infoPath := filepath.Join(temp, "module.info") | |||
| 264 | + | info := map[string]any{"Version": version} | |||
| 265 | + | if revision != "" { | |||
| 266 | + | info["Origin"] = map[string]string{ | |||
| 267 | + | "VCS": "git", "URL": "https://github.com/bnema/purego-cef2gtk", "Hash": revision, "Ref": ref, | |||
| 268 | + | } | |||
| 269 | + | } | |||
| 270 | + | infoJSON, err := json.Marshal(info) | |||
| 271 | + | require.NoError(t, err) | |||
| 272 | + | require.NoError(t, os.WriteFile(infoPath, infoJSON, 0o600)) | |||
| 273 | + | ||||
| 274 | + | selectedJSON, err := json.Marshal(map[string]string{ | |||
| 275 | + | "Path": "github.com/bnema/purego-cef2gtk", "Version": version, | |||
| 276 | + | }) | |||
| 277 | + | require.NoError(t, err) | |||
| 278 | + | downloadedJSON, err := json.Marshal(map[string]string{ | |||
| 279 | + | "Path": "github.com/bnema/purego-cef2gtk", "Version": version, "Info": infoPath, | |||
| 280 | + | }) | |||
| 281 | + | require.NoError(t, err) | |||
| 282 | + | binDir := filepath.Join(temp, "bin") | |||
| 283 | + | require.NoError(t, os.Mkdir(binDir, 0o755)) | |||
| 284 | + | goBin := filepath.Join(binDir, "go") | |||
| 285 | + | script := fmt.Sprintf(`#!/bin/sh | |||
| 286 | + | if [ "$1" = "list" ] && [ "$2" = "-m" ] && [ "$3" = "-json" ] && [ "$4" = "github.com/bnema/purego-cef2gtk" ]; then | |||
| 287 | + | printf '%%s\n' '%s' | |||
| 288 | + | exit 0 | |||
| 289 | + | fi | |||
| 290 | + | if [ "$1" = "mod" ] && [ "$2" = "download" ] && [ "$3" = "-json" ] && [ "$4" = "github.com/bnema/purego-cef2gtk@%s" ]; then | |||
| 291 | + | printf '%%s\n' '%s' | |||
| 292 | + | exit 0 | |||
| 293 | + | fi | |||
| 294 | + | exit 1 | |||
| 295 | + | `, selectedJSON, version, downloadedJSON) | |||
| 296 | + | require.NoError(t, os.WriteFile(goBin, []byte(script), 0o755)) | |||
| 297 | + | return goBin | |||
| 298 | + | } | |||
| 299 | + | ||||
| 169 | func TestFirstPresentationCollectorDefaultsToXDGStateEvidenceDirectory(t *testing.T) { | 300 | func TestFirstPresentationCollectorDefaultsToXDGStateEvidenceDirectory(t *testing.T) { | ||
| 170 | repoRoot, err := filepath.Abs(filepath.Join("..", "..")) | 301 | repoRoot, err := filepath.Abs(filepath.Join("..", "..")) | ||
| 171 | require.NoError(t, err) | 302 | require.NoError(t, err) | ||
M scripts/collect_first_presentation.sh +78 -9
| @@ -31,8 +31,78 @@ else | |||
| 31 | 31 | fi | |
| 32 | 32 | readonly output | |
| 33 | 33 | readonly upstream_module="github.com/bnema/purego-cef2gtk" | |
| 34 | - | readonly upstream_tag="v0.8.4" | |
| 35 | - | readonly upstream_revision="f217ece342dea3ef2a3f98671fcd16a39ad0037d" | |
| 34 | + | ||
| 35 | + | # Resolve the version selected by this checkout, then obtain its immutable VCS | |
| 36 | + | # origin from Go's cached module metadata. Do not infer a revision from a tag, | |
| 37 | + | # a branch, or a truncated pseudo-version suffix. | |
| 38 | + | resolve_upstream_provenance() { | |
| 39 | + | local selected_metadata selected_version downloaded_metadata | |
| 40 | + | ||
| 41 | + | selected_metadata="$(go list -m -json "$upstream_module" 2>/dev/null)" || { | |
| 42 | + | echo "first-presentation: immutable module provenance is unavailable" >&2 | |
| 43 | + | exit 2 | |
| 44 | + | } | |
| 45 | + | selected_version="$(python3 - "$upstream_module" "$selected_metadata" <<'PY' | |
| 46 | + | import json, sys | |
| 47 | + | try: | |
| 48 | + | metadata = json.loads(sys.argv[2]) | |
| 49 | + | if metadata.get("Path") != sys.argv[1] or not isinstance(metadata.get("Version"), str): | |
| 50 | + | raise ValueError | |
| 51 | + | print(metadata["Version"]) | |
| 52 | + | except (AttributeError, TypeError, ValueError, json.JSONDecodeError): | |
| 53 | + | raise SystemExit("first-presentation: immutable module provenance is unavailable") | |
| 54 | + | PY | |
| 55 | + | )" || exit $? | |
| 56 | + | downloaded_metadata="$(go mod download -json "$upstream_module@$selected_version" 2>/dev/null)" || { | |
| 57 | + | echo "first-presentation: immutable module provenance is unavailable" >&2 | |
| 58 | + | exit 2 | |
| 59 | + | } | |
| 60 | + | ||
| 61 | + | python3 - "$upstream_module" "$selected_metadata" "$downloaded_metadata" <<'PY' | |
| 62 | + | import json, re, sys | |
| 63 | + | ||
| 64 | + | module, selected_raw, downloaded_raw = sys.argv[1:] | |
| 65 | + | ||
| 66 | + | def fail(): | |
| 67 | + | # Do not expose Go cache locations or other machine-local values. | |
| 68 | + | raise SystemExit("first-presentation: immutable module provenance is unavailable") | |
| 69 | + | ||
| 70 | + | try: | |
| 71 | + | selected = json.loads(selected_raw) | |
| 72 | + | downloaded = json.loads(downloaded_raw) | |
| 73 | + | version = selected["Version"] | |
| 74 | + | if selected.get("Path") != module or downloaded.get("Path") != module: | |
| 75 | + | fail() | |
| 76 | + | if downloaded.get("Version") != version: | |
| 77 | + | fail() | |
| 78 | + | # A selected pseudo-version is an exact immutable selector, never a branch. | |
| 79 | + | match = re.fullmatch(r"(v\d+\.\d+\.\d+)-0\.\d{14}-([0-9a-f]{12})", version) | |
| 80 | + | if not match: | |
| 81 | + | fail() | |
| 82 | + | info_path = downloaded.get("Info") | |
| 83 | + | if not isinstance(info_path, str) or not info_path: | |
| 84 | + | fail() | |
| 85 | + | with open(info_path, encoding="utf-8") as info_file: | |
| 86 | + | info = json.load(info_file) | |
| 87 | + | origin = info.get("Origin") or downloaded.get("Origin") | |
| 88 | + | if info.get("Version") != version or not isinstance(origin, dict): | |
| 89 | + | fail() | |
| 90 | + | revision = origin.get("Hash") | |
| 91 | + | if origin.get("VCS") != "git" or origin.get("URL") != "https://github.com/bnema/purego-cef2gtk": | |
| 92 | + | fail() | |
| 93 | + | if not isinstance(revision, str) or not re.fullmatch(r"[0-9a-f]{40}", revision): | |
| 94 | + | fail() | |
| 95 | + | if not revision.startswith(match.group(2)): | |
| 96 | + | fail() | |
| 97 | + | # A named ref can move. Only the immutable hash itself is acceptable. | |
| 98 | + | if origin.get("Ref") not in (None, "", revision): | |
| 99 | + | fail() | |
| 100 | + | except (AttributeError, KeyError, OSError, TypeError, ValueError, json.JSONDecodeError): | |
| 101 | + | fail() | |
| 102 | + | ||
| 103 | + | print("\t".join((version, match.group(1), revision))) | |
| 104 | + | PY | |
| 105 | + | } | |
| 36 | 106 | ||
| 37 | 107 | # The artifact destination is caller-controlled. Never empty or recursively | |
| 38 | 108 | # clear it: collection only writes to a newly-created directory whose parent is | |
| @@ -66,10 +136,9 @@ prepare_output | |||
| 66 | 136 | [[ -x "$binary" ]] || { echo "first-presentation: executable not found: $binary" >&2; exit 2; } | |
| 67 | 137 | [[ -d "$runtime" ]] || { echo "first-presentation: CEF runtime not found: $runtime" >&2; exit 2; } | |
| 68 | 138 | [[ -n "${WAYLAND_DISPLAY:-}${DISPLAY:-}" ]] || { echo "first-presentation: a current Wayland/X11 display is required" >&2; exit 2; } | |
| 69 | - | [[ "$(go list -m -f '{{.Version}}' "$upstream_module")" == "$upstream_tag" ]] || { | |
| 70 | - | echo "first-presentation: expected $upstream_module@$upstream_tag" >&2 | |
| 71 | - | exit 2 | |
| 72 | - | } | |
| 139 | + | upstream_provenance="$(resolve_upstream_provenance)" || exit $? | |
| 140 | + | IFS=$'\t' read -r upstream_version upstream_tag upstream_revision <<<"$upstream_provenance" | |
| 141 | + | readonly upstream_version upstream_tag upstream_revision | |
| 73 | 142 | ||
| 74 | 143 | # Raw logs and temporary XDG homes may contain machine-local paths. Keep them | |
| 75 | 144 | # outside the committed artifact directory and always remove them. | |
| @@ -80,9 +149,9 @@ cleanup_work_root() { | |||
| 80 | 149 | rm -rf -- "$work_root" | |
| 81 | 150 | } | |
| 82 | 151 | trap cleanup_work_root EXIT | |
| 83 | - | python3 - "$output/metadata.json" "$binary" "$timeout_seconds" "$upstream_module" "$upstream_tag" "$upstream_revision" <<'PY' | |
| 152 | + | python3 - "$output/metadata.json" "$binary" "$timeout_seconds" "$upstream_module" "$upstream_version" "$upstream_tag" "$upstream_revision" <<'PY' | |
| 84 | 153 | import hashlib, json, os, platform, subprocess, sys | |
| 85 | - | path, binary, timeout, upstream_module, upstream_tag, upstream_revision = sys.argv[1:] | |
| 154 | + | path, binary, timeout, upstream_module, upstream_version, upstream_tag, upstream_revision = sys.argv[1:] | |
| 86 | 155 | with open(binary, "rb") as candidate: | |
| 87 | 156 | binary_sha256 = hashlib.file_digest(candidate, "sha256").hexdigest() | |
| 88 | 157 | ||
| @@ -102,7 +171,7 @@ json.dump({ | |||
| 102 | 171 | "binary": {"label": "dumber", "sha256": binary_sha256}, | |
| 103 | 172 | "timeout_seconds": int(timeout), | |
| 104 | 173 | "measured_source_revision": subprocess.check_output(["git", "-c", f"safe.directory={os.getcwd()}", "rev-parse", "HEAD"], text=True).strip(), | |
| 105 | - | "upstream": {"module": upstream_module, "tag": upstream_tag, "revision": upstream_revision}, | |
| 174 | + | "upstream": {"module": upstream_module, "version": upstream_version, "tag": upstream_tag, "revision": upstream_revision}, | |
| 106 | 175 | "comparison": {"os": os_label, "architecture": architecture, "display_protocol": display_protocol, "machine_gpu_profile": gpu_profile}, | |
| 107 | 176 | "render_configuration": {"backend": "gdk-dmabuf", "buffer_sharing": "dmabuf", "renderer": "vulkan"} | |
| 108 | 177 | }, open(path, "w"), indent=2, sort_keys=True) | |
| @@ -31,8 +31,78 @@ else | |||||
| 31 | fi | 31 | fi | ||
| 32 | readonly output | 32 | readonly output | ||
| 33 | readonly upstream_module="github.com/bnema/purego-cef2gtk" | 33 | readonly upstream_module="github.com/bnema/purego-cef2gtk" | ||
| 34 | - | readonly upstream_tag="v0.8.4" | 34 | + | |
| 35 | - | readonly upstream_revision="f217ece342dea3ef2a3f98671fcd16a39ad0037d" | 35 | + | # Resolve the version selected by this checkout, then obtain its immutable VCS |
| 36 | + | # origin from Go's cached module metadata. Do not infer a revision from a tag, | |||
| 37 | + | # a branch, or a truncated pseudo-version suffix. | |||
| 38 | + | resolve_upstream_provenance() { | |||
| 39 | + | local selected_metadata selected_version downloaded_metadata | |||
| 40 | + | ||||
| 41 | + | selected_metadata="$(go list -m -json "$upstream_module" 2>/dev/null)" || { | |||
| 42 | + | echo "first-presentation: immutable module provenance is unavailable" >&2 | |||
| 43 | + | exit 2 | |||
| 44 | + | } | |||
| 45 | + | selected_version="$(python3 - "$upstream_module" "$selected_metadata" <<'PY' | |||
| 46 | + | import json, sys | |||
| 47 | + | try: | |||
| 48 | + | metadata = json.loads(sys.argv[2]) | |||
| 49 | + | if metadata.get("Path") != sys.argv[1] or not isinstance(metadata.get("Version"), str): | |||
| 50 | + | raise ValueError | |||
| 51 | + | print(metadata["Version"]) | |||
| 52 | + | except (AttributeError, TypeError, ValueError, json.JSONDecodeError): | |||
| 53 | + | raise SystemExit("first-presentation: immutable module provenance is unavailable") | |||
| 54 | + | PY | |||
| 55 | + | )" || exit $? | |||
| 56 | + | downloaded_metadata="$(go mod download -json "$upstream_module@$selected_version" 2>/dev/null)" || { | |||
| 57 | + | echo "first-presentation: immutable module provenance is unavailable" >&2 | |||
| 58 | + | exit 2 | |||
| 59 | + | } | |||
| 60 | + | ||||
| 61 | + | python3 - "$upstream_module" "$selected_metadata" "$downloaded_metadata" <<'PY' | |||
| 62 | + | import json, re, sys | |||
| 63 | + | ||||
| 64 | + | module, selected_raw, downloaded_raw = sys.argv[1:] | |||
| 65 | + | ||||
| 66 | + | def fail(): | |||
| 67 | + | # Do not expose Go cache locations or other machine-local values. | |||
| 68 | + | raise SystemExit("first-presentation: immutable module provenance is unavailable") | |||
| 69 | + | ||||
| 70 | + | try: | |||
| 71 | + | selected = json.loads(selected_raw) | |||
| 72 | + | downloaded = json.loads(downloaded_raw) | |||
| 73 | + | version = selected["Version"] | |||
| 74 | + | if selected.get("Path") != module or downloaded.get("Path") != module: | |||
| 75 | + | fail() | |||
| 76 | + | if downloaded.get("Version") != version: | |||
| 77 | + | fail() | |||
| 78 | + | # A selected pseudo-version is an exact immutable selector, never a branch. | |||
| 79 | + | match = re.fullmatch(r"(v\d+\.\d+\.\d+)-0\.\d{14}-([0-9a-f]{12})", version) | |||
| 80 | + | if not match: | |||
| 81 | + | fail() | |||
| 82 | + | info_path = downloaded.get("Info") | |||
| 83 | + | if not isinstance(info_path, str) or not info_path: | |||
| 84 | + | fail() | |||
| 85 | + | with open(info_path, encoding="utf-8") as info_file: | |||
| 86 | + | info = json.load(info_file) | |||
| 87 | + | origin = info.get("Origin") or downloaded.get("Origin") | |||
| 88 | + | if info.get("Version") != version or not isinstance(origin, dict): | |||
| 89 | + | fail() | |||
| 90 | + | revision = origin.get("Hash") | |||
| 91 | + | if origin.get("VCS") != "git" or origin.get("URL") != "https://github.com/bnema/purego-cef2gtk": | |||
| 92 | + | fail() | |||
| 93 | + | if not isinstance(revision, str) or not re.fullmatch(r"[0-9a-f]{40}", revision): | |||
| 94 | + | fail() | |||
| 95 | + | if not revision.startswith(match.group(2)): | |||
| 96 | + | fail() | |||
| 97 | + | # A named ref can move. Only the immutable hash itself is acceptable. | |||
| 98 | + | if origin.get("Ref") not in (None, "", revision): | |||
| 99 | + | fail() | |||
| 100 | + | except (AttributeError, KeyError, OSError, TypeError, ValueError, json.JSONDecodeError): | |||
| 101 | + | fail() | |||
| 102 | + | ||||
| 103 | + | print("\t".join((version, match.group(1), revision))) | |||
| 104 | + | PY | |||
| 105 | + | } | |||
| 36 | 106 | ||||
| 37 | # The artifact destination is caller-controlled. Never empty or recursively | 107 | # The artifact destination is caller-controlled. Never empty or recursively | ||
| 38 | # clear it: collection only writes to a newly-created directory whose parent is | 108 | # clear it: collection only writes to a newly-created directory whose parent is | ||
| @@ -66,10 +136,9 @@ prepare_output | |||||
| 66 | [[ -x "$binary" ]] || { echo "first-presentation: executable not found: $binary" >&2; exit 2; } | 136 | [[ -x "$binary" ]] || { echo "first-presentation: executable not found: $binary" >&2; exit 2; } | ||
| 67 | [[ -d "$runtime" ]] || { echo "first-presentation: CEF runtime not found: $runtime" >&2; exit 2; } | 137 | [[ -d "$runtime" ]] || { echo "first-presentation: CEF runtime not found: $runtime" >&2; exit 2; } | ||
| 68 | [[ -n "${WAYLAND_DISPLAY:-}${DISPLAY:-}" ]] || { echo "first-presentation: a current Wayland/X11 display is required" >&2; exit 2; } | 138 | [[ -n "${WAYLAND_DISPLAY:-}${DISPLAY:-}" ]] || { echo "first-presentation: a current Wayland/X11 display is required" >&2; exit 2; } | ||
| 69 | - | [[ "$(go list -m -f '{{.Version}}' "$upstream_module")" == "$upstream_tag" ]] || { | 139 | + | upstream_provenance="$(resolve_upstream_provenance)" || exit $? |
| 70 | - | echo "first-presentation: expected $upstream_module@$upstream_tag" >&2 | 140 | + | IFS=$'\t' read -r upstream_version upstream_tag upstream_revision <<<"$upstream_provenance" |
| 71 | - | exit 2 | 141 | + | readonly upstream_version upstream_tag upstream_revision |
| 72 | - | } | |||
| 73 | 142 | ||||
| 74 | # Raw logs and temporary XDG homes may contain machine-local paths. Keep them | 143 | # Raw logs and temporary XDG homes may contain machine-local paths. Keep them | ||
| 75 | # outside the committed artifact directory and always remove them. | 144 | # outside the committed artifact directory and always remove them. | ||
| @@ -80,9 +149,9 @@ cleanup_work_root() { | |||||
| 80 | rm -rf -- "$work_root" | 149 | rm -rf -- "$work_root" | ||
| 81 | } | 150 | } | ||
| 82 | trap cleanup_work_root EXIT | 151 | trap cleanup_work_root EXIT | ||
| 83 | - | python3 - "$output/metadata.json" "$binary" "$timeout_seconds" "$upstream_module" "$upstream_tag" "$upstream_revision" <<'PY' | 152 | + | python3 - "$output/metadata.json" "$binary" "$timeout_seconds" "$upstream_module" "$upstream_version" "$upstream_tag" "$upstream_revision" <<'PY' |
| 84 | import hashlib, json, os, platform, subprocess, sys | 153 | import hashlib, json, os, platform, subprocess, sys | ||
| 85 | - | path, binary, timeout, upstream_module, upstream_tag, upstream_revision = sys.argv[1:] | 154 | + | path, binary, timeout, upstream_module, upstream_version, upstream_tag, upstream_revision = sys.argv[1:] |
| 86 | with open(binary, "rb") as candidate: | 155 | with open(binary, "rb") as candidate: | ||
| 87 | binary_sha256 = hashlib.file_digest(candidate, "sha256").hexdigest() | 156 | binary_sha256 = hashlib.file_digest(candidate, "sha256").hexdigest() | ||
| 88 | 157 | ||||
| @@ -102,7 +171,7 @@ json.dump({ | |||||
| 102 | "binary": {"label": "dumber", "sha256": binary_sha256}, | 171 | "binary": {"label": "dumber", "sha256": binary_sha256}, | ||
| 103 | "timeout_seconds": int(timeout), | 172 | "timeout_seconds": int(timeout), | ||
| 104 | "measured_source_revision": subprocess.check_output(["git", "-c", f"safe.directory={os.getcwd()}", "rev-parse", "HEAD"], text=True).strip(), | 173 | "measured_source_revision": subprocess.check_output(["git", "-c", f"safe.directory={os.getcwd()}", "rev-parse", "HEAD"], text=True).strip(), | ||
| 105 | - | "upstream": {"module": upstream_module, "tag": upstream_tag, "revision": upstream_revision}, | 174 | + | "upstream": {"module": upstream_module, "version": upstream_version, "tag": upstream_tag, "revision": upstream_revision}, |
| 106 | "comparison": {"os": os_label, "architecture": architecture, "display_protocol": display_protocol, "machine_gpu_profile": gpu_profile}, | 175 | "comparison": {"os": os_label, "architecture": architecture, "display_protocol": display_protocol, "machine_gpu_profile": gpu_profile}, | ||
| 107 | "render_configuration": {"backend": "gdk-dmabuf", "buffer_sharing": "dmabuf", "renderer": "vulkan"} | 176 | "render_configuration": {"backend": "gdk-dmabuf", "buffer_sharing": "dmabuf", "renderer": "vulkan"} | ||
| 108 | }, open(path, "w"), indent=2, sort_keys=True) | 177 | }, open(path, "w"), indent=2, sort_keys=True) | ||
M vendor/github.com/bnema/purego-cef/cef/bridge.go +8 -13 generated file: collapsed
M vendor/github.com/bnema/purego-cef2gtk/internal/cefadapter/accelerated_paint.go +34 -37 generated file: collapsed
M vendor/github.com/bnema/purego-cef2gtk/internal/dmabuf/frame.go +38 -19 generated file: collapsed
M vendor/github.com/bnema/purego-cef2gtk/internal/gtkgdk/renderer.go +89 -69 generated file: collapsed
M vendor/github.com/bnema/purego-pipewire/internal/core/player.go +5 -0 generated file: collapsed
M vendor/github.com/bnema/purego-pipewire/internal/core/player_rt.go +10 -6 generated file: collapsed
M vendor/github.com/bnema/purego-pipewire/internal/core/pwbuffer.go +66 -32 generated file: collapsed
M vendor/github.com/bnema/purego-sqlite/driver/driver.go +268 -63 generated file: collapsed
M vendor/github.com/bnema/purego-sqlite/internal/core/db.go +8 -0 generated file: collapsed
M vendor/github.com/bnema/purego-sqlite/internal/core/rows.go +13 -0 generated file: collapsed
M vendor/github.com/bnema/purego-sqlite/internal/loader/loader.go +23 -5 generated file: collapsed
M vendor/github.com/bnema/purego-sqlite/internal/ports/in/ports_gen.go +3 -0 generated file: collapsed
M vendor/github.com/bnema/puregotk/internal/core/core.go +197 -4 generated file: collapsed
M vendor/github.com/bnema/puregotk/pkg/core/core.go +10 -0 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-about-dialog.go +99 -64 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-about-window.go +95 -62 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-accent-color.go +7 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-action-row.go +33 -29 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-alert-dialog.go +66 -47 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-animation-target.go +10 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-animation-util.go +4 -12 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-animation.go +24 -26 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-application-window.go +14 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-application.go +3 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-avatar.go +22 -25 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-banner.go +23 -26 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-bin.go +5 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-bottom-sheet.go +47 -38 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-breakpoint-bin.go +10 -19 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-breakpoint.go +33 -37 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-button-content.go +18 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-button-row.go +10 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-carousel-indicator-dots.go +5 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-carousel-indicator-lines.go +5 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-carousel.go +47 -37 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-clamp-layout.go +14 -20 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-clamp-scrollable.go +17 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-clamp.go +17 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-combo-row.go +34 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-dialog.go +45 -38 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-easing.go +3 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-entry-row.go +40 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-enum-list-model.go +13 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-expander-row.go +40 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-flap.go +61 -48 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-fold-threshold-policy.go +10 -1 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-header-bar.go +36 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-inline-view-switcher.go +18 -24 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-layout-slot.go +4 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-layout.go +7 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-leaflet.go +69 -56 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-length-unit.go +5 -14 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-main.go +5 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-message-dialog.go +63 -44 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-multi-layout-view.go +17 -23 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-navigation-direction.go +10 -1 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-navigation-split-view.go +36 -32 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-navigation-view.go +60 -49 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-overlay-split-view.go +48 -38 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-password-entry-row.go +2 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-preferences-dialog.go +23 -25 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-preferences-group.go +24 -26 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-preferences-page.go +38 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-preferences-row.go +18 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-preferences-window.go +31 -29 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-shortcut-label.go +10 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-shortcuts-dialog.go +4 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-shortcuts-item.go +23 -25 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-shortcuts-section.go +8 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-sidebar-item.go +45 -37 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-sidebar-section.go +24 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-sidebar.go +41 -39 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-spin-row.go +40 -34 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-spinner-paintable.go +5 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-spinner.go +2 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-split-button.go +39 -34 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-spring-animation.go +34 -30 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-spring-params.go +17 -21 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-squeezer.go +49 -44 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-status-page.go +20 -24 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-style-manager.go +25 -28 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-swipe-tracker.go +33 -30 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-swipeable.go +33 -21 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-switch-row.go +6 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-tab-bar.go +35 -32 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-tab-button.go +5 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-tab-overview.go +45 -37 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-tab-view.go +123 -87 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-timed-animation.go +30 -28 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-toast-overlay.go +9 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-toast.go +41 -36 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-toggle-group.go +64 -51 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-toolbar-view.go +40 -35 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-version.go +7 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-view-stack.go +78 -62 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-view-switcher-bar.go +9 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-view-switcher-sidebar.go +15 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-view-switcher-title.go +19 -23 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-view-switcher.go +10 -20 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-window-title.go +10 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-window.go +14 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-wrap-box.go +66 -46 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-wrap-layout.go +57 -46 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/cairo/main.go +36 -79 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkapplaunchcontext.go +10 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcairo.go +12 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcairocontext.go +3 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcicpparams.go +20 -25 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkclipboard.go +34 -32 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcolorstate.go +12 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcontentdeserializer.go +26 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcontentformats.go +28 -31 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcontentprovider.go +23 -28 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcontentserializer.go +26 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcursor.go +12 -21 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdevice.go +36 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdevicepad.go +27 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdevicetool.go +10 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdisplay.go +51 -43 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdisplaymanager.go +10 -20 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdmabuftexture.go +3 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdmabuftexturebuilder.go +53 -41 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdrag.go +20 -28 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdragsurface.go +6 -14 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdragsurfacesize.go +3 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdrawcontext.go +11 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdrop.go +19 -24 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkenums.go +21 -1 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkevents.go +120 -118 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkframeclock.go +22 -24 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkframetimings.go +17 -20 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkglcontext.go +40 -36 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkgltexture.go +4 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkgltexturebuilder.go +41 -35 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkkeys.go +19 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkmemorytexture.go +2 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkmemorytexturebuilder.go +42 -35 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkmonitor.go +27 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkpaintable.go +63 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkpango.go +4 -12 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkpixbuf.go +2 -12 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkpopup.go +47 -26 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkpopuplayout.go +36 -32 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkrgba.go +19 -21 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkseat.go +11 -20 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdksnapshot.go +7 -0 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdksurface.go +46 -40 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdktexture.go +27 -31 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdktoplevel.go +157 -66 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdktoplevellayout.go +24 -25 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdktoplevelsize.go +9 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdktypes.go +95 -72 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkvulkancontext.go +3 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdkpixbuf/gdk-pixbuf-animation.go +26 -32 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdkpixbuf/gdk-pixbuf-core.go +9 -0 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdkpixbuf/gdk-pixbuf-io.go +25 -23 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdkpixbuf/gdk-pixbuf-loader.go +13 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdkpixbuf/gdk-pixbuf-simple-anim.go +8 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdkpixbuf/gdk-pixbuf-transform.go +11 -1 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdkpixbuf/gdk-pixbuf.go +102 -79 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdkpixbuf/main.go +5 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gaction.go +59 -31 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gactiongroup.go +96 -39 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gactionmap.go +33 -21 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gappinfo.go +244 -116 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gapplication.go +79 -55 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gapplicationcommandline.go +31 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gasyncinitable.go +25 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gasyncresult.go +26 -19 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gbufferedinputstream.go +26 -29 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gbufferedoutputstream.go +11 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gbytesicon.go +4 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gcancellable.go +26 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gcharsetconverter.go +8 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gcontenttype.go +30 -26 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gconverter.go +23 -20 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gconverterinputstream.go +3 -14 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gconverteroutputstream.go +3 -14 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gcredentials.go +12 -21 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdatagrambased.go +45 -30 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdatainputstream.go +31 -35 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdataoutputstream.go +14 -23 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusactiongroup.go +2 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusaddress.go +10 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusauthobserver.go +6 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusconnection.go +77 -66 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbuserror.go +16 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusinterface.go +26 -19 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusinterfaceskeleton.go +25 -24 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusintrospection.go +54 -56 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusmenumodel.go +2 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusmessage.go +88 -64 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusmethodinvocation.go +35 -30 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusnameowning.go +10 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusnamewatching.go +10 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusobject.go +19 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusobjectmanager.go +26 -19 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusobjectmanagerclient.go +16 -23 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusobjectmanagerserver.go +13 -20 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusobjectproxy.go +3 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusobjectskeleton.go +12 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusproxy.go +42 -38 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusserver.go +14 -20 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusutils.go +24 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdebugcontroller.go +12 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdebugcontrollerdbus.go +4 -14 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdrive.go +214 -82 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdtlsclientconnection.go +34 -24 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdtlsconnection.go +207 -80 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdtlsserverconnection.go +2 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gemblem.go +6 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gemblemedicon.go +9 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gfile.go +1148 -450 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gfileattribute.go +13 -19 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gfileenumerator.go +34 -35 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gfileicon.go +3 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gfileinfo.go +138 -84 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gfileinputstream.go +17 -23 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gfileiostream.go +23 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gfilemonitor.go +9 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gfilenamecompleter.go +8 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gfileoutputstream.go +23 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gfilterinputstream.go +6 -14 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gfilteroutputstream.go +6 -14 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gicon.go +32 -25 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/ginetaddress.go +40 -34 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/ginetaddressmask.go +14 -21 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/ginetsocketaddress.go +10 -19 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/ginitable.go +11 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/ginputstream.go +52 -48 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gioenums.go +90 -1 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gioerror.go +6 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/giomodule.go +26 -29 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gioscheduler.go +4 -12 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/giostream.go +25 -29 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/giotypes.go +70 -60 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/giptosmessage.go +6 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gipv6tclassmessage.go +6 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/glistmodel.go +33 -21 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gliststore.go +22 -24 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gloadableicon.go +27 -23 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gmemoryinputstream.go +8 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gmemorymonitor.go +2 -12 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gmemoryoutputstream.go +13 -19 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gmenu.go +62 -50 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gmenumodel.go +31 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gmount.go +215 -86 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gmountoperation.go +40 -32 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gnativesocketaddress.go +2 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gnativevolumemonitor.go +7 -0 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gnetworkaddress.go +11 -21 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gnetworking.go +3 -14 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gnetworkmonitor.go +49 -31 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gnetworkservice.go +12 -19 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gnotification.go +26 -26 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/goutputstream.go +86 -72 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gpermission.go +33 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gpollableinputstream.go +30 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gpollableoutputstream.go +41 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gpollableutils.go +7 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gpowerprofilemonitor.go +7 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gpropertyaction.go +2 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gproxy.go +35 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gproxyaddress.go +16 -21 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gproxyaddressenumerator.go +7 -0 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gproxyresolver.go +35 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gremoteactiongroup.go +12 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gresolver.go +75 -67
| @@ -90,7 +90,7 @@ func (x *ResolverClass) OverrideLookupByName(cb func(*Resolver, string, *Cancell | |||
| 90 | 90 | if cb == nil { | |
| 91 | 91 | x.xLookupByName = 0 | |
| 92 | 92 | } else { | |
| 93 | - | x.xLookupByName = purego.NewCallback(func(ResolverVarp uintptr, HostnameVarp string, CancellableVarp uintptr) uintptr { | |
| 93 | + | x.xLookupByName = purego.NewCallback(func(ResolverVarp uintptr, HostnameVarp string, CancellableVarp uintptr, cerrp **glib.Error) uintptr { | |
| 94 | 94 | ret := cb(ResolverNewFromInternalPtr(ResolverVarp), HostnameVarp, CancellableNewFromInternalPtr(CancellableVarp)) | |
| 95 | 95 | if ret == nil { | |
| 96 | 96 | return 0 | |
| @@ -105,10 +105,11 @@ func (x *ResolverClass) GetLookupByName() func(*Resolver, string, *Cancellable) | |||
| 105 | 105 | if x.xLookupByName == 0 { | |
| 106 | 106 | return nil | |
| 107 | 107 | } | |
| 108 | - | var rawCallback func(ResolverVarp uintptr, HostnameVarp string, CancellableVarp uintptr) uintptr | |
| 108 | + | var rawCallback func(ResolverVarp uintptr, HostnameVarp string, CancellableVarp uintptr, cerrp **glib.Error) uintptr | |
| 109 | 109 | purego.RegisterFunc(&rawCallback, x.xLookupByName) | |
| 110 | 110 | return func(ResolverVar *Resolver, HostnameVar string, CancellableVar *Cancellable) *glib.List { | |
| 111 | - | rawRet := rawCallback(ResolverVar.GoPointer(), HostnameVar, CancellableVar.GoPointer()) | |
| 111 | + | var cerr *glib.Error | |
| 112 | + | rawRet := rawCallback(ResolverVar.GoPointer(), HostnameVar, CancellableVar.GoPointer(), &cerr) | |
| 112 | 113 | if rawRet == 0 { | |
| 113 | 114 | return nil | |
| 114 | 115 | } | |
| @@ -144,7 +145,7 @@ func (x *ResolverClass) OverrideLookupByNameFinish(cb func(*Resolver, AsyncResul | |||
| 144 | 145 | if cb == nil { | |
| 145 | 146 | x.xLookupByNameFinish = 0 | |
| 146 | 147 | } else { | |
| 147 | - | x.xLookupByNameFinish = purego.NewCallback(func(ResolverVarp uintptr, ResultVarp uintptr) uintptr { | |
| 148 | + | x.xLookupByNameFinish = purego.NewCallback(func(ResolverVarp uintptr, ResultVarp uintptr, cerrp **glib.Error) uintptr { | |
| 148 | 149 | ret := cb(ResolverNewFromInternalPtr(ResolverVarp), &AsyncResultBase{Ptr: ResultVarp}) | |
| 149 | 150 | if ret == nil { | |
| 150 | 151 | return 0 | |
| @@ -159,10 +160,11 @@ func (x *ResolverClass) GetLookupByNameFinish() func(*Resolver, AsyncResult) *gl | |||
| 159 | 160 | if x.xLookupByNameFinish == 0 { | |
| 160 | 161 | return nil | |
| 161 | 162 | } | |
| 162 | - | var rawCallback func(ResolverVarp uintptr, ResultVarp uintptr) uintptr | |
| 163 | + | var rawCallback func(ResolverVarp uintptr, ResultVarp uintptr, cerrp **glib.Error) uintptr | |
| 163 | 164 | purego.RegisterFunc(&rawCallback, x.xLookupByNameFinish) | |
| 164 | 165 | return func(ResolverVar *Resolver, ResultVar AsyncResult) *glib.List { | |
| 165 | - | rawRet := rawCallback(ResolverVar.GoPointer(), ResultVar.GoPointer()) | |
| 166 | + | var cerr *glib.Error | |
| 167 | + | rawRet := rawCallback(ResolverVar.GoPointer(), ResultVar.GoPointer(), &cerr) | |
| 166 | 168 | if rawRet == 0 { | |
| 167 | 169 | return nil | |
| 168 | 170 | } | |
| @@ -175,7 +177,7 @@ func (x *ResolverClass) OverrideLookupByAddress(cb func(*Resolver, *InetAddress, | |||
| 175 | 177 | if cb == nil { | |
| 176 | 178 | x.xLookupByAddress = 0 | |
| 177 | 179 | } else { | |
| 178 | - | x.xLookupByAddress = purego.NewCallback(func(ResolverVarp uintptr, AddressVarp uintptr, CancellableVarp uintptr) string { | |
| 180 | + | x.xLookupByAddress = purego.NewCallback(func(ResolverVarp uintptr, AddressVarp uintptr, CancellableVarp uintptr, cerrp **glib.Error) string { | |
| 179 | 181 | return cb(ResolverNewFromInternalPtr(ResolverVarp), InetAddressNewFromInternalPtr(AddressVarp), CancellableNewFromInternalPtr(CancellableVarp)) | |
| 180 | 182 | }) | |
| 181 | 183 | } | |
| @@ -186,10 +188,11 @@ func (x *ResolverClass) GetLookupByAddress() func(*Resolver, *InetAddress, *Canc | |||
| 186 | 188 | if x.xLookupByAddress == 0 { | |
| 187 | 189 | return nil | |
| 188 | 190 | } | |
| 189 | - | var rawCallback func(ResolverVarp uintptr, AddressVarp uintptr, CancellableVarp uintptr) string | |
| 191 | + | var rawCallback func(ResolverVarp uintptr, AddressVarp uintptr, CancellableVarp uintptr, cerrp **glib.Error) string | |
| 190 | 192 | purego.RegisterFunc(&rawCallback, x.xLookupByAddress) | |
| 191 | 193 | return func(ResolverVar *Resolver, AddressVar *InetAddress, CancellableVar *Cancellable) string { | |
| 192 | - | return rawCallback(ResolverVar.GoPointer(), AddressVar.GoPointer(), CancellableVar.GoPointer()) | |
| 194 | + | var cerr *glib.Error | |
| 195 | + | return rawCallback(ResolverVar.GoPointer(), AddressVar.GoPointer(), CancellableVar.GoPointer(), &cerr) | |
| 193 | 196 | } | |
| 194 | 197 | } | |
| 195 | 198 | ||
| @@ -221,7 +224,7 @@ func (x *ResolverClass) OverrideLookupByAddressFinish(cb func(*Resolver, AsyncRe | |||
| 221 | 224 | if cb == nil { | |
| 222 | 225 | x.xLookupByAddressFinish = 0 | |
| 223 | 226 | } else { | |
| 224 | - | x.xLookupByAddressFinish = purego.NewCallback(func(ResolverVarp uintptr, ResultVarp uintptr) string { | |
| 227 | + | x.xLookupByAddressFinish = purego.NewCallback(func(ResolverVarp uintptr, ResultVarp uintptr, cerrp **glib.Error) string { | |
| 225 | 228 | return cb(ResolverNewFromInternalPtr(ResolverVarp), &AsyncResultBase{Ptr: ResultVarp}) | |
| 226 | 229 | }) | |
| 227 | 230 | } | |
| @@ -232,10 +235,11 @@ func (x *ResolverClass) GetLookupByAddressFinish() func(*Resolver, AsyncResult) | |||
| 232 | 235 | if x.xLookupByAddressFinish == 0 { | |
| 233 | 236 | return nil | |
| 234 | 237 | } | |
| 235 | - | var rawCallback func(ResolverVarp uintptr, ResultVarp uintptr) string | |
| 238 | + | var rawCallback func(ResolverVarp uintptr, ResultVarp uintptr, cerrp **glib.Error) string | |
| 236 | 239 | purego.RegisterFunc(&rawCallback, x.xLookupByAddressFinish) | |
| 237 | 240 | return func(ResolverVar *Resolver, ResultVar AsyncResult) string { | |
| 238 | - | return rawCallback(ResolverVar.GoPointer(), ResultVar.GoPointer()) | |
| 241 | + | var cerr *glib.Error | |
| 242 | + | return rawCallback(ResolverVar.GoPointer(), ResultVar.GoPointer(), &cerr) | |
| 239 | 243 | } | |
| 240 | 244 | } | |
| 241 | 245 | ||
| @@ -244,7 +248,7 @@ func (x *ResolverClass) OverrideLookupService(cb func(*Resolver, string, *Cancel | |||
| 244 | 248 | if cb == nil { | |
| 245 | 249 | x.xLookupService = 0 | |
| 246 | 250 | } else { | |
| 247 | - | x.xLookupService = purego.NewCallback(func(ResolverVarp uintptr, RrnameVarp string, CancellableVarp uintptr) uintptr { | |
| 251 | + | x.xLookupService = purego.NewCallback(func(ResolverVarp uintptr, RrnameVarp string, CancellableVarp uintptr, cerrp **glib.Error) uintptr { | |
| 248 | 252 | ret := cb(ResolverNewFromInternalPtr(ResolverVarp), RrnameVarp, CancellableNewFromInternalPtr(CancellableVarp)) | |
| 249 | 253 | if ret == nil { | |
| 250 | 254 | return 0 | |
| @@ -259,10 +263,11 @@ func (x *ResolverClass) GetLookupService() func(*Resolver, string, *Cancellable) | |||
| 259 | 263 | if x.xLookupService == 0 { | |
| 260 | 264 | return nil | |
| 261 | 265 | } | |
| 262 | - | var rawCallback func(ResolverVarp uintptr, RrnameVarp string, CancellableVarp uintptr) uintptr | |
| 266 | + | var rawCallback func(ResolverVarp uintptr, RrnameVarp string, CancellableVarp uintptr, cerrp **glib.Error) uintptr | |
| 263 | 267 | purego.RegisterFunc(&rawCallback, x.xLookupService) | |
| 264 | 268 | return func(ResolverVar *Resolver, RrnameVar string, CancellableVar *Cancellable) *glib.List { | |
| 265 | - | rawRet := rawCallback(ResolverVar.GoPointer(), RrnameVar, CancellableVar.GoPointer()) | |
| 269 | + | var cerr *glib.Error | |
| 270 | + | rawRet := rawCallback(ResolverVar.GoPointer(), RrnameVar, CancellableVar.GoPointer(), &cerr) | |
| 266 | 271 | if rawRet == 0 { | |
| 267 | 272 | return nil | |
| 268 | 273 | } | |
| @@ -298,7 +303,7 @@ func (x *ResolverClass) OverrideLookupServiceFinish(cb func(*Resolver, AsyncResu | |||
| 298 | 303 | if cb == nil { | |
| 299 | 304 | x.xLookupServiceFinish = 0 | |
| 300 | 305 | } else { | |
| 301 | - | x.xLookupServiceFinish = purego.NewCallback(func(ResolverVarp uintptr, ResultVarp uintptr) uintptr { | |
| 306 | + | x.xLookupServiceFinish = purego.NewCallback(func(ResolverVarp uintptr, ResultVarp uintptr, cerrp **glib.Error) uintptr { | |
| 302 | 307 | ret := cb(ResolverNewFromInternalPtr(ResolverVarp), &AsyncResultBase{Ptr: ResultVarp}) | |
| 303 | 308 | if ret == nil { | |
| 304 | 309 | return 0 | |
| @@ -313,10 +318,11 @@ func (x *ResolverClass) GetLookupServiceFinish() func(*Resolver, AsyncResult) *g | |||
| 313 | 318 | if x.xLookupServiceFinish == 0 { | |
| 314 | 319 | return nil | |
| 315 | 320 | } | |
| 316 | - | var rawCallback func(ResolverVarp uintptr, ResultVarp uintptr) uintptr | |
| 321 | + | var rawCallback func(ResolverVarp uintptr, ResultVarp uintptr, cerrp **glib.Error) uintptr | |
| 317 | 322 | purego.RegisterFunc(&rawCallback, x.xLookupServiceFinish) | |
| 318 | 323 | return func(ResolverVar *Resolver, ResultVar AsyncResult) *glib.List { | |
| 319 | - | rawRet := rawCallback(ResolverVar.GoPointer(), ResultVar.GoPointer()) | |
| 324 | + | var cerr *glib.Error | |
| 325 | + | rawRet := rawCallback(ResolverVar.GoPointer(), ResultVar.GoPointer(), &cerr) | |
| 320 | 326 | if rawRet == 0 { | |
| 321 | 327 | return nil | |
| 322 | 328 | } | |
| @@ -329,7 +335,7 @@ func (x *ResolverClass) OverrideLookupRecords(cb func(*Resolver, string, Resolve | |||
| 329 | 335 | if cb == nil { | |
| 330 | 336 | x.xLookupRecords = 0 | |
| 331 | 337 | } else { | |
| 332 | - | x.xLookupRecords = purego.NewCallback(func(ResolverVarp uintptr, RrnameVarp string, RecordTypeVarp ResolverRecordType, CancellableVarp uintptr) uintptr { | |
| 338 | + | x.xLookupRecords = purego.NewCallback(func(ResolverVarp uintptr, RrnameVarp string, RecordTypeVarp ResolverRecordType, CancellableVarp uintptr, cerrp **glib.Error) uintptr { | |
| 333 | 339 | ret := cb(ResolverNewFromInternalPtr(ResolverVarp), RrnameVarp, RecordTypeVarp, CancellableNewFromInternalPtr(CancellableVarp)) | |
| 334 | 340 | if ret == nil { | |
| 335 | 341 | return 0 | |
| @@ -344,10 +350,11 @@ func (x *ResolverClass) GetLookupRecords() func(*Resolver, string, ResolverRecor | |||
| 344 | 350 | if x.xLookupRecords == 0 { | |
| 345 | 351 | return nil | |
| 346 | 352 | } | |
| 347 | - | var rawCallback func(ResolverVarp uintptr, RrnameVarp string, RecordTypeVarp ResolverRecordType, CancellableVarp uintptr) uintptr | |
| 353 | + | var rawCallback func(ResolverVarp uintptr, RrnameVarp string, RecordTypeVarp ResolverRecordType, CancellableVarp uintptr, cerrp **glib.Error) uintptr | |
| 348 | 354 | purego.RegisterFunc(&rawCallback, x.xLookupRecords) | |
| 349 | 355 | return func(ResolverVar *Resolver, RrnameVar string, RecordTypeVar ResolverRecordType, CancellableVar *Cancellable) *glib.List { | |
| 350 | - | rawRet := rawCallback(ResolverVar.GoPointer(), RrnameVar, RecordTypeVar, CancellableVar.GoPointer()) | |
| 356 | + | var cerr *glib.Error | |
| 357 | + | rawRet := rawCallback(ResolverVar.GoPointer(), RrnameVar, RecordTypeVar, CancellableVar.GoPointer(), &cerr) | |
| 351 | 358 | if rawRet == 0 { | |
| 352 | 359 | return nil | |
| 353 | 360 | } | |
| @@ -383,7 +390,7 @@ func (x *ResolverClass) OverrideLookupRecordsFinish(cb func(*Resolver, AsyncResu | |||
| 383 | 390 | if cb == nil { | |
| 384 | 391 | x.xLookupRecordsFinish = 0 | |
| 385 | 392 | } else { | |
| 386 | - | x.xLookupRecordsFinish = purego.NewCallback(func(ResolverVarp uintptr, ResultVarp uintptr) uintptr { | |
| 393 | + | x.xLookupRecordsFinish = purego.NewCallback(func(ResolverVarp uintptr, ResultVarp uintptr, cerrp **glib.Error) uintptr { | |
| 387 | 394 | ret := cb(ResolverNewFromInternalPtr(ResolverVarp), &AsyncResultBase{Ptr: ResultVarp}) | |
| 388 | 395 | if ret == nil { | |
| 389 | 396 | return 0 | |
| @@ -398,10 +405,11 @@ func (x *ResolverClass) GetLookupRecordsFinish() func(*Resolver, AsyncResult) *g | |||
| 398 | 405 | if x.xLookupRecordsFinish == 0 { | |
| 399 | 406 | return nil | |
| 400 | 407 | } | |
| 401 | - | var rawCallback func(ResolverVarp uintptr, ResultVarp uintptr) uintptr | |
| 408 | + | var rawCallback func(ResolverVarp uintptr, ResultVarp uintptr, cerrp **glib.Error) uintptr | |
| 402 | 409 | purego.RegisterFunc(&rawCallback, x.xLookupRecordsFinish) | |
| 403 | 410 | return func(ResolverVar *Resolver, ResultVar AsyncResult) *glib.List { | |
| 404 | - | rawRet := rawCallback(ResolverVar.GoPointer(), ResultVar.GoPointer()) | |
| 411 | + | var cerr *glib.Error | |
| 412 | + | rawRet := rawCallback(ResolverVar.GoPointer(), ResultVar.GoPointer(), &cerr) | |
| 405 | 413 | if rawRet == 0 { | |
| 406 | 414 | return nil | |
| 407 | 415 | } | |
| @@ -437,7 +445,7 @@ func (x *ResolverClass) OverrideLookupByNameWithFlagsFinish(cb func(*Resolver, A | |||
| 437 | 445 | if cb == nil { | |
| 438 | 446 | x.xLookupByNameWithFlagsFinish = 0 | |
| 439 | 447 | } else { | |
| 440 | - | x.xLookupByNameWithFlagsFinish = purego.NewCallback(func(ResolverVarp uintptr, ResultVarp uintptr) uintptr { | |
| 448 | + | x.xLookupByNameWithFlagsFinish = purego.NewCallback(func(ResolverVarp uintptr, ResultVarp uintptr, cerrp **glib.Error) uintptr { | |
| 441 | 449 | ret := cb(ResolverNewFromInternalPtr(ResolverVarp), &AsyncResultBase{Ptr: ResultVarp}) | |
| 442 | 450 | if ret == nil { | |
| 443 | 451 | return 0 | |
| @@ -452,10 +460,11 @@ func (x *ResolverClass) GetLookupByNameWithFlagsFinish() func(*Resolver, AsyncRe | |||
| 452 | 460 | if x.xLookupByNameWithFlagsFinish == 0 { | |
| 453 | 461 | return nil | |
| 454 | 462 | } | |
| 455 | - | var rawCallback func(ResolverVarp uintptr, ResultVarp uintptr) uintptr | |
| 463 | + | var rawCallback func(ResolverVarp uintptr, ResultVarp uintptr, cerrp **glib.Error) uintptr | |
| 456 | 464 | purego.RegisterFunc(&rawCallback, x.xLookupByNameWithFlagsFinish) | |
| 457 | 465 | return func(ResolverVar *Resolver, ResultVar AsyncResult) *glib.List { | |
| 458 | - | rawRet := rawCallback(ResolverVar.GoPointer(), ResultVar.GoPointer()) | |
| 466 | + | var cerr *glib.Error | |
| 467 | + | rawRet := rawCallback(ResolverVar.GoPointer(), ResultVar.GoPointer(), &cerr) | |
| 459 | 468 | if rawRet == 0 { | |
| 460 | 469 | return nil | |
| 461 | 470 | } | |
| @@ -468,7 +477,7 @@ func (x *ResolverClass) OverrideLookupByNameWithFlags(cb func(*Resolver, string, | |||
| 468 | 477 | if cb == nil { | |
| 469 | 478 | x.xLookupByNameWithFlags = 0 | |
| 470 | 479 | } else { | |
| 471 | - | x.xLookupByNameWithFlags = purego.NewCallback(func(ResolverVarp uintptr, HostnameVarp string, FlagsVarp ResolverNameLookupFlags, CancellableVarp uintptr) uintptr { | |
| 480 | + | x.xLookupByNameWithFlags = purego.NewCallback(func(ResolverVarp uintptr, HostnameVarp string, FlagsVarp ResolverNameLookupFlags, CancellableVarp uintptr, cerrp **glib.Error) uintptr { | |
| 472 | 481 | ret := cb(ResolverNewFromInternalPtr(ResolverVarp), HostnameVarp, FlagsVarp, CancellableNewFromInternalPtr(CancellableVarp)) | |
| 473 | 482 | if ret == nil { | |
| 474 | 483 | return 0 | |
| @@ -483,10 +492,11 @@ func (x *ResolverClass) GetLookupByNameWithFlags() func(*Resolver, string, Resol | |||
| 483 | 492 | if x.xLookupByNameWithFlags == 0 { | |
| 484 | 493 | return nil | |
| 485 | 494 | } | |
| 486 | - | var rawCallback func(ResolverVarp uintptr, HostnameVarp string, FlagsVarp ResolverNameLookupFlags, CancellableVarp uintptr) uintptr | |
| 495 | + | var rawCallback func(ResolverVarp uintptr, HostnameVarp string, FlagsVarp ResolverNameLookupFlags, CancellableVarp uintptr, cerrp **glib.Error) uintptr | |
| 487 | 496 | purego.RegisterFunc(&rawCallback, x.xLookupByNameWithFlags) | |
| 488 | 497 | return func(ResolverVar *Resolver, HostnameVar string, FlagsVar ResolverNameLookupFlags, CancellableVar *Cancellable) *glib.List { | |
| 489 | - | rawRet := rawCallback(ResolverVar.GoPointer(), HostnameVar, FlagsVar, CancellableVar.GoPointer()) | |
| 498 | + | var cerr *glib.Error | |
| 499 | + | rawRet := rawCallback(ResolverVar.GoPointer(), HostnameVar, FlagsVar, CancellableVar.GoPointer(), &cerr) | |
| 490 | 500 | if rawRet == 0 { | |
| 491 | 501 | return nil | |
| 492 | 502 | } | |
| @@ -516,6 +526,7 @@ type ResolverNameLookupFlags int | |||
| 516 | 526 | var xResolverNameLookupFlagsGLibType func() types.GType | |
| 517 | 527 | ||
| 518 | 528 | func ResolverNameLookupFlagsGLibType() types.GType { | |
| 529 | + | core.LazyRegister(&xResolverNameLookupFlagsGLibType, "GIO", "g_resolver_name_lookup_flags_get_type", false) | |
| 519 | 530 | return xResolverNameLookupFlagsGLibType() | |
| 520 | 531 | } | |
| 521 | 532 | ||
| @@ -533,6 +544,8 @@ var xResolverErrorQuark func() glib.Quark | |||
| 533 | 544 | ||
| 534 | 545 | // Gets the #GResolver Error Quark. | |
| 535 | 546 | func ResolverErrorQuark() glib.Quark { | |
| 547 | + | core.LazyRegister(&xResolverErrorQuark, "GIO", "g_resolver_error_quark", false) | |
| 548 | + | ||
| 536 | 549 | cret := xResolverErrorQuark() | |
| 537 | 550 | return cret | |
| 538 | 551 | } | |
| @@ -563,6 +576,7 @@ type Resolver struct { | |||
| 563 | 576 | var xResolverGLibType func() types.GType | |
| 564 | 577 | ||
| 565 | 578 | func ResolverGLibType() types.GType { | |
| 579 | + | core.LazyRegister(&xResolverGLibType, "GIO", "g_resolver_get_type", false) | |
| 566 | 580 | return xResolverGLibType() | |
| 567 | 581 | } | |
| 568 | 582 | ||
| @@ -576,6 +590,8 @@ var xResolverGetTimeout func(uintptr) uint | |||
| 576 | 590 | ||
| 577 | 591 | // Get the timeout applied to all resolver lookups. See #GResolver:timeout. | |
| 578 | 592 | func (x *Resolver) GetTimeout() uint { | |
| 593 | + | core.LazyRegister(&xResolverGetTimeout, "GIO", "g_resolver_get_timeout", false) | |
| 594 | + | ||
| 579 | 595 | cret := xResolverGetTimeout(x.GoPointer()) | |
| 580 | 596 | return cret | |
| 581 | 597 | } | |
| @@ -592,6 +608,7 @@ var xResolverLookupByAddress func(uintptr, uintptr, uintptr, **glib.Error) strin | |||
| 592 | 608 | // operation, in which case @error (if non-%NULL) will be set to | |
| 593 | 609 | // %G_IO_ERROR_CANCELLED. | |
| 594 | 610 | func (x *Resolver) LookupByAddress(AddressVar *InetAddress, CancellableVar *Cancellable) (string, error) { | |
| 611 | + | core.LazyRegister(&xResolverLookupByAddress, "GIO", "g_resolver_lookup_by_address", false) | |
| 595 | 612 | var cerr *glib.Error | |
| 596 | 613 | ||
| 597 | 614 | cret := xResolverLookupByAddress(x.GoPointer(), AddressVar.GoPointer(), CancellableVar.GoPointer(), &cerr) | |
| @@ -607,6 +624,8 @@ var xResolverLookupByAddressAsync func(uintptr, uintptr, uintptr, uintptr, uintp | |||
| 607 | 624 | // associated hostname, and eventually calls @callback, which must | |
| 608 | 625 | // call g_resolver_lookup_by_address_finish() to get the final result. | |
| 609 | 626 | func (x *Resolver) LookupByAddressAsync(AddressVar *InetAddress, CancellableVar *Cancellable, CallbackVar *AsyncReadyCallback, UserDataVar uintptr) { | |
| 627 | + | core.LazyRegister(&xResolverLookupByAddressAsync, "GIO", "g_resolver_lookup_by_address_async", false) | |
| 628 | + | ||
| 610 | 629 | xResolverLookupByAddressAsync(x.GoPointer(), AddressVar.GoPointer(), CancellableVar.GoPointer(), glib.NewCallbackNullable(CallbackVar), UserDataVar) | |
| 611 | 630 | } | |
| 612 | 631 | ||
| @@ -619,6 +638,7 @@ var xResolverLookupByAddressFinish func(uintptr, uintptr, **glib.Error) string | |||
| 619 | 638 | // a value from #GResolverError. If the operation was cancelled, | |
| 620 | 639 | // @error will be set to %G_IO_ERROR_CANCELLED. | |
| 621 | 640 | func (x *Resolver) LookupByAddressFinish(ResultVar AsyncResult) (string, error) { | |
| 641 | + | core.LazyRegister(&xResolverLookupByAddressFinish, "GIO", "g_resolver_lookup_by_address_finish", false) | |
| 622 | 642 | var cerr *glib.Error | |
| 623 | 643 | ||
| 624 | 644 | cret := xResolverLookupByAddressFinish(x.GoPointer(), ResultVar.GoPointer(), &cerr) | |
| @@ -654,6 +674,7 @@ var xResolverLookupByName func(uintptr, string, uintptr, **glib.Error) uintptr | |||
| 654 | 674 | // address, it may be easier to create a #GNetworkAddress and use its | |
| 655 | 675 | // #GSocketConnectable interface. | |
| 656 | 676 | func (x *Resolver) LookupByName(HostnameVar string, CancellableVar *Cancellable) (*glib.List, error) { | |
| 677 | + | core.LazyRegister(&xResolverLookupByName, "GIO", "g_resolver_lookup_by_name", false) | |
| 657 | 678 | var cerr *glib.Error | |
| 658 | 679 | ||
| 659 | 680 | cret := xResolverLookupByName(x.GoPointer(), HostnameVar, CancellableVar.GoPointer(), &cerr) | |
| @@ -673,6 +694,8 @@ var xResolverLookupByNameAsync func(uintptr, string, uintptr, uintptr, uintptr) | |||
| 673 | 694 | // must call g_resolver_lookup_by_name_finish() to get the result. | |
| 674 | 695 | // See g_resolver_lookup_by_name() for more details. | |
| 675 | 696 | func (x *Resolver) LookupByNameAsync(HostnameVar string, CancellableVar *Cancellable, CallbackVar *AsyncReadyCallback, UserDataVar uintptr) { | |
| 697 | + | core.LazyRegister(&xResolverLookupByNameAsync, "GIO", "g_resolver_lookup_by_name_async", false) | |
| 698 | + | ||
| 676 | 699 | xResolverLookupByNameAsync(x.GoPointer(), HostnameVar, CancellableVar.GoPointer(), glib.NewCallbackNullable(CallbackVar), UserDataVar) | |
| 677 | 700 | } | |
| 678 | 701 | ||
| @@ -685,6 +708,7 @@ var xResolverLookupByNameFinish func(uintptr, uintptr, **glib.Error) uintptr | |||
| 685 | 708 | // a value from #GResolverError. If the operation was cancelled, | |
| 686 | 709 | // @error will be set to %G_IO_ERROR_CANCELLED. | |
| 687 | 710 | func (x *Resolver) LookupByNameFinish(ResultVar AsyncResult) (*glib.List, error) { | |
| 711 | + | core.LazyRegister(&xResolverLookupByNameFinish, "GIO", "g_resolver_lookup_by_name_finish", false) | |
| 688 | 712 | var cerr *glib.Error | |
| 689 | 713 | ||
| 690 | 714 | cret := xResolverLookupByNameFinish(x.GoPointer(), ResultVar.GoPointer(), &cerr) | |
| @@ -703,6 +727,7 @@ var xResolverLookupByNameWithFlags func(uintptr, string, ResolverNameLookupFlags | |||
| 703 | 727 | // the lookup behavior with @flags. For example this can be used to limit | |
| 704 | 728 | // results with %G_RESOLVER_NAME_LOOKUP_FLAGS_IPV4_ONLY. | |
| 705 | 729 | func (x *Resolver) LookupByNameWithFlags(HostnameVar string, FlagsVar ResolverNameLookupFlags, CancellableVar *Cancellable) (*glib.List, error) { | |
| 730 | + | core.LazyRegister(&xResolverLookupByNameWithFlags, "GIO", "g_resolver_lookup_by_name_with_flags", false) | |
| 706 | 731 | var cerr *glib.Error | |
| 707 | 732 | ||
| 708 | 733 | cret := xResolverLookupByNameWithFlags(x.GoPointer(), HostnameVar, FlagsVar, CancellableVar.GoPointer(), &cerr) | |
| @@ -722,6 +747,8 @@ var xResolverLookupByNameWithFlagsAsync func(uintptr, string, ResolverNameLookup | |||
| 722 | 747 | // must call g_resolver_lookup_by_name_with_flags_finish() to get the result. | |
| 723 | 748 | // See g_resolver_lookup_by_name() for more details. | |
| 724 | 749 | func (x *Resolver) LookupByNameWithFlagsAsync(HostnameVar string, FlagsVar ResolverNameLookupFlags, CancellableVar *Cancellable, CallbackVar *AsyncReadyCallback, UserDataVar uintptr) { | |
| 750 | + | core.LazyRegister(&xResolverLookupByNameWithFlagsAsync, "GIO", "g_resolver_lookup_by_name_with_flags_async", false) | |
| 751 | + | ||
| 725 | 752 | xResolverLookupByNameWithFlagsAsync(x.GoPointer(), HostnameVar, FlagsVar, CancellableVar.GoPointer(), glib.NewCallbackNullable(CallbackVar), UserDataVar) | |
| 726 | 753 | } | |
| 727 | 754 | ||
| @@ -734,6 +761,7 @@ var xResolverLookupByNameWithFlagsFinish func(uintptr, uintptr, **glib.Error) ui | |||
| 734 | 761 | // a value from #GResolverError. If the operation was cancelled, | |
| 735 | 762 | // @error will be set to %G_IO_ERROR_CANCELLED. | |
| 736 | 763 | func (x *Resolver) LookupByNameWithFlagsFinish(ResultVar AsyncResult) (*glib.List, error) { | |
| 764 | + | core.LazyRegister(&xResolverLookupByNameWithFlagsFinish, "GIO", "g_resolver_lookup_by_name_with_flags_finish", false) | |
| 737 | 765 | var cerr *glib.Error | |
| 738 | 766 | ||
| 739 | 767 | cret := xResolverLookupByNameWithFlagsFinish(x.GoPointer(), ResultVar.GoPointer(), &cerr) | |
| @@ -759,6 +787,7 @@ var xResolverLookupRecords func(uintptr, string, ResolverRecordType, uintptr, ** | |||
| 759 | 787 | // operation, in which case @error (if non-%NULL) will be set to | |
| 760 | 788 | // %G_IO_ERROR_CANCELLED. | |
| 761 | 789 | func (x *Resolver) LookupRecords(RrnameVar string, RecordTypeVar ResolverRecordType, CancellableVar *Cancellable) (*glib.List, error) { | |
| 790 | + | core.LazyRegister(&xResolverLookupRecords, "GIO", "g_resolver_lookup_records", false) | |
| 762 | 791 | var cerr *glib.Error | |
| 763 | 792 | ||
| 764 | 793 | cret := xResolverLookupRecords(x.GoPointer(), RrnameVar, RecordTypeVar, CancellableVar.GoPointer(), &cerr) | |
| @@ -778,6 +807,8 @@ var xResolverLookupRecordsAsync func(uintptr, string, ResolverRecordType, uintpt | |||
| 778 | 807 | // g_resolver_lookup_records_finish() to get the final result. See | |
| 779 | 808 | // g_resolver_lookup_records() for more details. | |
| 780 | 809 | func (x *Resolver) LookupRecordsAsync(RrnameVar string, RecordTypeVar ResolverRecordType, CancellableVar *Cancellable, CallbackVar *AsyncReadyCallback, UserDataVar uintptr) { | |
| 810 | + | core.LazyRegister(&xResolverLookupRecordsAsync, "GIO", "g_resolver_lookup_records_async", false) | |
| 811 | + | ||
| 781 | 812 | xResolverLookupRecordsAsync(x.GoPointer(), RrnameVar, RecordTypeVar, CancellableVar.GoPointer(), glib.NewCallbackNullable(CallbackVar), UserDataVar) | |
| 782 | 813 | } | |
| 783 | 814 | ||
| @@ -792,6 +823,7 @@ var xResolverLookupRecordsFinish func(uintptr, uintptr, **glib.Error) uintptr | |||
| 792 | 823 | // a value from #GResolverError. If the operation was cancelled, | |
| 793 | 824 | // @error will be set to %G_IO_ERROR_CANCELLED. | |
| 794 | 825 | func (x *Resolver) LookupRecordsFinish(ResultVar AsyncResult) (*glib.List, error) { | |
| 826 | + | core.LazyRegister(&xResolverLookupRecordsFinish, "GIO", "g_resolver_lookup_records_finish", false) | |
| 795 | 827 | var cerr *glib.Error | |
| 796 | 828 | ||
| 797 | 829 | cret := xResolverLookupRecordsFinish(x.GoPointer(), ResultVar.GoPointer(), &cerr) | |
| @@ -828,6 +860,7 @@ var xResolverLookupService func(uintptr, string, string, string, uintptr, **glib | |||
| 828 | 860 | // to create a #GNetworkService and use its #GSocketConnectable | |
| 829 | 861 | // interface. | |
| 830 | 862 | func (x *Resolver) LookupService(ServiceVar string, ProtocolVar string, DomainVar string, CancellableVar *Cancellable) (*glib.List, error) { | |
| 863 | + | core.LazyRegister(&xResolverLookupService, "GIO", "g_resolver_lookup_service", false) | |
| 831 | 864 | var cerr *glib.Error | |
| 832 | 865 | ||
| 833 | 866 | cret := xResolverLookupService(x.GoPointer(), ServiceVar, ProtocolVar, DomainVar, CancellableVar.GoPointer(), &cerr) | |
| @@ -848,6 +881,8 @@ var xResolverLookupServiceAsync func(uintptr, string, string, string, uintptr, u | |||
| 848 | 881 | // get the final result. See g_resolver_lookup_service() for more | |
| 849 | 882 | // details. | |
| 850 | 883 | func (x *Resolver) LookupServiceAsync(ServiceVar string, ProtocolVar string, DomainVar string, CancellableVar *Cancellable, CallbackVar *AsyncReadyCallback, UserDataVar uintptr) { | |
| 884 | + | core.LazyRegister(&xResolverLookupServiceAsync, "GIO", "g_resolver_lookup_service_async", false) | |
| 885 | + | ||
| 851 | 886 | xResolverLookupServiceAsync(x.GoPointer(), ServiceVar, ProtocolVar, DomainVar, CancellableVar.GoPointer(), glib.NewCallbackNullable(CallbackVar), UserDataVar) | |
| 852 | 887 | } | |
| 853 | 888 | ||
| @@ -860,6 +895,7 @@ var xResolverLookupServiceFinish func(uintptr, uintptr, **glib.Error) uintptr | |||
| 860 | 895 | // a value from #GResolverError. If the operation was cancelled, | |
| 861 | 896 | // @error will be set to %G_IO_ERROR_CANCELLED. | |
| 862 | 897 | func (x *Resolver) LookupServiceFinish(ResultVar AsyncResult) (*glib.List, error) { | |
| 898 | + | core.LazyRegister(&xResolverLookupServiceFinish, "GIO", "g_resolver_lookup_service_finish", false) | |
| 863 | 899 | var cerr *glib.Error | |
| 864 | 900 | ||
| 865 | 901 | cret := xResolverLookupServiceFinish(x.GoPointer(), ResultVar.GoPointer(), &cerr) | |
| @@ -884,6 +920,8 @@ var xResolverSetDefault func(uintptr) | |||
| 884 | 920 | // implements its own cache policies on top of that, and then set | |
| 885 | 921 | // itself as the default resolver for all later code to use. | |
| 886 | 922 | func (x *Resolver) SetDefault() { | |
| 923 | + | core.LazyRegister(&xResolverSetDefault, "GIO", "g_resolver_set_default", false) | |
| 924 | + | ||
| 887 | 925 | xResolverSetDefault(x.GoPointer()) | |
| 888 | 926 | } | |
| 889 | 927 | ||
| @@ -891,6 +929,8 @@ var xResolverSetTimeout func(uintptr, uint) | |||
| 891 | 929 | ||
| 892 | 930 | // Set the timeout applied to all resolver lookups. See #GResolver:timeout. | |
| 893 | 931 | func (x *Resolver) SetTimeout(TimeoutMsVar uint) { | |
| 932 | + | core.LazyRegister(&xResolverSetTimeout, "GIO", "g_resolver_set_timeout", false) | |
| 933 | + | ||
| 894 | 934 | xResolverSetTimeout(x.GoPointer(), TimeoutMsVar) | |
| 895 | 935 | } | |
| 896 | 936 | ||
| @@ -971,6 +1011,8 @@ var xResolverFreeAddresses func(*glib.List) | |||
| 971 | 1011 | // (This is a convenience method; you can also simply free the results | |
| 972 | 1012 | // by hand.) | |
| 973 | 1013 | func ResolverFreeAddresses(AddressesVar *glib.List) { | |
| 1014 | + | core.LazyRegister(&xResolverFreeAddresses, "GIO", "g_resolver_free_addresses", false) | |
| 1015 | + | ||
| 974 | 1016 | xResolverFreeAddresses(AddressesVar) | |
| 975 | 1017 | } | |
| 976 | 1018 | ||
| @@ -981,6 +1023,8 @@ var xResolverFreeTargets func(*glib.List) | |||
| 981 | 1023 | // (This is a convenience method; you can also simply free the | |
| 982 | 1024 | // results by hand.) | |
| 983 | 1025 | func ResolverFreeTargets(TargetsVar *glib.List) { | |
| 1026 | + | core.LazyRegister(&xResolverFreeTargets, "GIO", "g_resolver_free_targets", false) | |
| 1027 | + | ||
| 984 | 1028 | xResolverFreeTargets(TargetsVar) | |
| 985 | 1029 | } | |
| 986 | 1030 | ||
| @@ -990,6 +1034,7 @@ var xResolverGetDefault func() uintptr | |||
| 990 | 1034 | // with it. #GResolver may use its reference count as a hint about how | |
| 991 | 1035 | // many threads it should allocate for concurrent DNS resolutions. | |
| 992 | 1036 | func ResolverGetDefault() *Resolver { | |
| 1037 | + | core.LazyRegister(&xResolverGetDefault, "GIO", "g_resolver_get_default", false) | |
| 993 | 1038 | var cls *Resolver | |
| 994 | 1039 | ||
| 995 | 1040 | cret := xResolverGetDefault() | |
| @@ -1005,41 +1050,4 @@ func ResolverGetDefault() *Resolver { | |||
| 1005 | 1050 | func init() { | |
| 1006 | 1051 | core.SetPackageName("GIO", "gio-2.0") | |
| 1007 | 1052 | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0", "libgio-2.0.0.dylib"}) | |
| 1008 | - | var libs []uintptr | |
| 1009 | - | for _, libPath := range core.GetPaths("GIO") { | |
| 1010 | - | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 1011 | - | if err != nil { | |
| 1012 | - | panic(err) | |
| 1013 | - | } | |
| 1014 | - | libs = append(libs, lib) | |
| 1015 | - | } | |
| 1016 | - | ||
| 1017 | - | core.PuregoSafeRegister(&xResolverNameLookupFlagsGLibType, libs, "g_resolver_name_lookup_flags_get_type") | |
| 1018 | - | ||
| 1019 | - | core.PuregoSafeRegister(&xResolverErrorQuark, libs, "g_resolver_error_quark") | |
| 1020 | - | ||
| 1021 | - | core.PuregoSafeRegister(&xResolverGLibType, libs, "g_resolver_get_type") | |
| 1022 | - | ||
| 1023 | - | core.PuregoSafeRegister(&xResolverGetTimeout, libs, "g_resolver_get_timeout") | |
| 1024 | - | core.PuregoSafeRegister(&xResolverLookupByAddress, libs, "g_resolver_lookup_by_address") | |
| 1025 | - | core.PuregoSafeRegister(&xResolverLookupByAddressAsync, libs, "g_resolver_lookup_by_address_async") | |
| 1026 | - | core.PuregoSafeRegister(&xResolverLookupByAddressFinish, libs, "g_resolver_lookup_by_address_finish") | |
| 1027 | - | core.PuregoSafeRegister(&xResolverLookupByName, libs, "g_resolver_lookup_by_name") | |
| 1028 | - | core.PuregoSafeRegister(&xResolverLookupByNameAsync, libs, "g_resolver_lookup_by_name_async") | |
| 1029 | - | core.PuregoSafeRegister(&xResolverLookupByNameFinish, libs, "g_resolver_lookup_by_name_finish") | |
| 1030 | - | core.PuregoSafeRegister(&xResolverLookupByNameWithFlags, libs, "g_resolver_lookup_by_name_with_flags") | |
| 1031 | - | core.PuregoSafeRegister(&xResolverLookupByNameWithFlagsAsync, libs, "g_resolver_lookup_by_name_with_flags_async") | |
| 1032 | - | core.PuregoSafeRegister(&xResolverLookupByNameWithFlagsFinish, libs, "g_resolver_lookup_by_name_with_flags_finish") | |
| 1033 | - | core.PuregoSafeRegister(&xResolverLookupRecords, libs, "g_resolver_lookup_records") | |
| 1034 | - | core.PuregoSafeRegister(&xResolverLookupRecordsAsync, libs, "g_resolver_lookup_records_async") | |
| 1035 | - | core.PuregoSafeRegister(&xResolverLookupRecordsFinish, libs, "g_resolver_lookup_records_finish") | |
| 1036 | - | core.PuregoSafeRegister(&xResolverLookupService, libs, "g_resolver_lookup_service") | |
| 1037 | - | core.PuregoSafeRegister(&xResolverLookupServiceAsync, libs, "g_resolver_lookup_service_async") | |
| 1038 | - | core.PuregoSafeRegister(&xResolverLookupServiceFinish, libs, "g_resolver_lookup_service_finish") | |
| 1039 | - | core.PuregoSafeRegister(&xResolverSetDefault, libs, "g_resolver_set_default") | |
| 1040 | - | core.PuregoSafeRegister(&xResolverSetTimeout, libs, "g_resolver_set_timeout") | |
| 1041 | - | ||
| 1042 | - | core.PuregoSafeRegister(&xResolverFreeAddresses, libs, "g_resolver_free_addresses") | |
| 1043 | - | core.PuregoSafeRegister(&xResolverFreeTargets, libs, "g_resolver_free_targets") | |
| 1044 | - | core.PuregoSafeRegister(&xResolverGetDefault, libs, "g_resolver_get_default") | |
| 1045 | 1053 | } | |
| @@ -90,7 +90,7 @@ func (x *ResolverClass) OverrideLookupByName(cb func(*Resolver, string, *Cancell | |||||
| 90 | if cb == nil { | 90 | if cb == nil { | ||
| 91 | x.xLookupByName = 0 | 91 | x.xLookupByName = 0 | ||
| 92 | } else { | 92 | } else { | ||
| 93 | - | x.xLookupByName = purego.NewCallback(func(ResolverVarp uintptr, HostnameVarp string, CancellableVarp uintptr) uintptr { | 93 | + | x.xLookupByName = purego.NewCallback(func(ResolverVarp uintptr, HostnameVarp string, CancellableVarp uintptr, cerrp **glib.Error) uintptr { |
| 94 | ret := cb(ResolverNewFromInternalPtr(ResolverVarp), HostnameVarp, CancellableNewFromInternalPtr(CancellableVarp)) | 94 | ret := cb(ResolverNewFromInternalPtr(ResolverVarp), HostnameVarp, CancellableNewFromInternalPtr(CancellableVarp)) | ||
| 95 | if ret == nil { | 95 | if ret == nil { | ||
| 96 | return 0 | 96 | return 0 | ||
| @@ -105,10 +105,11 @@ func (x *ResolverClass) GetLookupByName() func(*Resolver, string, *Cancellable) | |||||
| 105 | if x.xLookupByName == 0 { | 105 | if x.xLookupByName == 0 { | ||
| 106 | return nil | 106 | return nil | ||
| 107 | } | 107 | } | ||
| 108 | - | var rawCallback func(ResolverVarp uintptr, HostnameVarp string, CancellableVarp uintptr) uintptr | 108 | + | var rawCallback func(ResolverVarp uintptr, HostnameVarp string, CancellableVarp uintptr, cerrp **glib.Error) uintptr |
| 109 | purego.RegisterFunc(&rawCallback, x.xLookupByName) | 109 | purego.RegisterFunc(&rawCallback, x.xLookupByName) | ||
| 110 | return func(ResolverVar *Resolver, HostnameVar string, CancellableVar *Cancellable) *glib.List { | 110 | return func(ResolverVar *Resolver, HostnameVar string, CancellableVar *Cancellable) *glib.List { | ||
| 111 | - | rawRet := rawCallback(ResolverVar.GoPointer(), HostnameVar, CancellableVar.GoPointer()) | 111 | + | var cerr *glib.Error |
| 112 | + | rawRet := rawCallback(ResolverVar.GoPointer(), HostnameVar, CancellableVar.GoPointer(), &cerr) | |||
| 112 | if rawRet == 0 { | 113 | if rawRet == 0 { | ||
| 113 | return nil | 114 | return nil | ||
| 114 | } | 115 | } | ||
| @@ -144,7 +145,7 @@ func (x *ResolverClass) OverrideLookupByNameFinish(cb func(*Resolver, AsyncResul | |||||
| 144 | if cb == nil { | 145 | if cb == nil { | ||
| 145 | x.xLookupByNameFinish = 0 | 146 | x.xLookupByNameFinish = 0 | ||
| 146 | } else { | 147 | } else { | ||
| 147 | - | x.xLookupByNameFinish = purego.NewCallback(func(ResolverVarp uintptr, ResultVarp uintptr) uintptr { | 148 | + | x.xLookupByNameFinish = purego.NewCallback(func(ResolverVarp uintptr, ResultVarp uintptr, cerrp **glib.Error) uintptr { |
| 148 | ret := cb(ResolverNewFromInternalPtr(ResolverVarp), &AsyncResultBase{Ptr: ResultVarp}) | 149 | ret := cb(ResolverNewFromInternalPtr(ResolverVarp), &AsyncResultBase{Ptr: ResultVarp}) | ||
| 149 | if ret == nil { | 150 | if ret == nil { | ||
| 150 | return 0 | 151 | return 0 | ||
| @@ -159,10 +160,11 @@ func (x *ResolverClass) GetLookupByNameFinish() func(*Resolver, AsyncResult) *gl | |||||
| 159 | if x.xLookupByNameFinish == 0 { | 160 | if x.xLookupByNameFinish == 0 { | ||
| 160 | return nil | 161 | return nil | ||
| 161 | } | 162 | } | ||
| 162 | - | var rawCallback func(ResolverVarp uintptr, ResultVarp uintptr) uintptr | 163 | + | var rawCallback func(ResolverVarp uintptr, ResultVarp uintptr, cerrp **glib.Error) uintptr |
| 163 | purego.RegisterFunc(&rawCallback, x.xLookupByNameFinish) | 164 | purego.RegisterFunc(&rawCallback, x.xLookupByNameFinish) | ||
| 164 | return func(ResolverVar *Resolver, ResultVar AsyncResult) *glib.List { | 165 | return func(ResolverVar *Resolver, ResultVar AsyncResult) *glib.List { | ||
| 165 | - | rawRet := rawCallback(ResolverVar.GoPointer(), ResultVar.GoPointer()) | 166 | + | var cerr *glib.Error |
| 167 | + | rawRet := rawCallback(ResolverVar.GoPointer(), ResultVar.GoPointer(), &cerr) | |||
| 166 | if rawRet == 0 { | 168 | if rawRet == 0 { | ||
| 167 | return nil | 169 | return nil | ||
| 168 | } | 170 | } | ||
| @@ -175,7 +177,7 @@ func (x *ResolverClass) OverrideLookupByAddress(cb func(*Resolver, *InetAddress, | |||||
| 175 | if cb == nil { | 177 | if cb == nil { | ||
| 176 | x.xLookupByAddress = 0 | 178 | x.xLookupByAddress = 0 | ||
| 177 | } else { | 179 | } else { | ||
| 178 | - | x.xLookupByAddress = purego.NewCallback(func(ResolverVarp uintptr, AddressVarp uintptr, CancellableVarp uintptr) string { | 180 | + | x.xLookupByAddress = purego.NewCallback(func(ResolverVarp uintptr, AddressVarp uintptr, CancellableVarp uintptr, cerrp **glib.Error) string { |
| 179 | return cb(ResolverNewFromInternalPtr(ResolverVarp), InetAddressNewFromInternalPtr(AddressVarp), CancellableNewFromInternalPtr(CancellableVarp)) | 181 | return cb(ResolverNewFromInternalPtr(ResolverVarp), InetAddressNewFromInternalPtr(AddressVarp), CancellableNewFromInternalPtr(CancellableVarp)) | ||
| 180 | }) | 182 | }) | ||
| 181 | } | 183 | } | ||
| @@ -186,10 +188,11 @@ func (x *ResolverClass) GetLookupByAddress() func(*Resolver, *InetAddress, *Canc | |||||
| 186 | if x.xLookupByAddress == 0 { | 188 | if x.xLookupByAddress == 0 { | ||
| 187 | return nil | 189 | return nil | ||
| 188 | } | 190 | } | ||
| 189 | - | var rawCallback func(ResolverVarp uintptr, AddressVarp uintptr, CancellableVarp uintptr) string | 191 | + | var rawCallback func(ResolverVarp uintptr, AddressVarp uintptr, CancellableVarp uintptr, cerrp **glib.Error) string |
| 190 | purego.RegisterFunc(&rawCallback, x.xLookupByAddress) | 192 | purego.RegisterFunc(&rawCallback, x.xLookupByAddress) | ||
| 191 | return func(ResolverVar *Resolver, AddressVar *InetAddress, CancellableVar *Cancellable) string { | 193 | return func(ResolverVar *Resolver, AddressVar *InetAddress, CancellableVar *Cancellable) string { | ||
| 192 | - | return rawCallback(ResolverVar.GoPointer(), AddressVar.GoPointer(), CancellableVar.GoPointer()) | 194 | + | var cerr *glib.Error |
| 195 | + | return rawCallback(ResolverVar.GoPointer(), AddressVar.GoPointer(), CancellableVar.GoPointer(), &cerr) | |||
| 193 | } | 196 | } | ||
| 194 | } | 197 | } | ||
| 195 | 198 | ||||
| @@ -221,7 +224,7 @@ func (x *ResolverClass) OverrideLookupByAddressFinish(cb func(*Resolver, AsyncRe | |||||
| 221 | if cb == nil { | 224 | if cb == nil { | ||
| 222 | x.xLookupByAddressFinish = 0 | 225 | x.xLookupByAddressFinish = 0 | ||
| 223 | } else { | 226 | } else { | ||
| 224 | - | x.xLookupByAddressFinish = purego.NewCallback(func(ResolverVarp uintptr, ResultVarp uintptr) string { | 227 | + | x.xLookupByAddressFinish = purego.NewCallback(func(ResolverVarp uintptr, ResultVarp uintptr, cerrp **glib.Error) string { |
| 225 | return cb(ResolverNewFromInternalPtr(ResolverVarp), &AsyncResultBase{Ptr: ResultVarp}) | 228 | return cb(ResolverNewFromInternalPtr(ResolverVarp), &AsyncResultBase{Ptr: ResultVarp}) | ||
| 226 | }) | 229 | }) | ||
| 227 | } | 230 | } | ||
| @@ -232,10 +235,11 @@ func (x *ResolverClass) GetLookupByAddressFinish() func(*Resolver, AsyncResult) | |||||
| 232 | if x.xLookupByAddressFinish == 0 { | 235 | if x.xLookupByAddressFinish == 0 { | ||
| 233 | return nil | 236 | return nil | ||
| 234 | } | 237 | } | ||
| 235 | - | var rawCallback func(ResolverVarp uintptr, ResultVarp uintptr) string | 238 | + | var rawCallback func(ResolverVarp uintptr, ResultVarp uintptr, cerrp **glib.Error) string |
| 236 | purego.RegisterFunc(&rawCallback, x.xLookupByAddressFinish) | 239 | purego.RegisterFunc(&rawCallback, x.xLookupByAddressFinish) | ||
| 237 | return func(ResolverVar *Resolver, ResultVar AsyncResult) string { | 240 | return func(ResolverVar *Resolver, ResultVar AsyncResult) string { | ||
| 238 | - | return rawCallback(ResolverVar.GoPointer(), ResultVar.GoPointer()) | 241 | + | var cerr *glib.Error |
| 242 | + | return rawCallback(ResolverVar.GoPointer(), ResultVar.GoPointer(), &cerr) | |||
| 239 | } | 243 | } | ||
| 240 | } | 244 | } | ||
| 241 | 245 | ||||
| @@ -244,7 +248,7 @@ func (x *ResolverClass) OverrideLookupService(cb func(*Resolver, string, *Cancel | |||||
| 244 | if cb == nil { | 248 | if cb == nil { | ||
| 245 | x.xLookupService = 0 | 249 | x.xLookupService = 0 | ||
| 246 | } else { | 250 | } else { | ||
| 247 | - | x.xLookupService = purego.NewCallback(func(ResolverVarp uintptr, RrnameVarp string, CancellableVarp uintptr) uintptr { | 251 | + | x.xLookupService = purego.NewCallback(func(ResolverVarp uintptr, RrnameVarp string, CancellableVarp uintptr, cerrp **glib.Error) uintptr { |
| 248 | ret := cb(ResolverNewFromInternalPtr(ResolverVarp), RrnameVarp, CancellableNewFromInternalPtr(CancellableVarp)) | 252 | ret := cb(ResolverNewFromInternalPtr(ResolverVarp), RrnameVarp, CancellableNewFromInternalPtr(CancellableVarp)) | ||
| 249 | if ret == nil { | 253 | if ret == nil { | ||
| 250 | return 0 | 254 | return 0 | ||
| @@ -259,10 +263,11 @@ func (x *ResolverClass) GetLookupService() func(*Resolver, string, *Cancellable) | |||||
| 259 | if x.xLookupService == 0 { | 263 | if x.xLookupService == 0 { | ||
| 260 | return nil | 264 | return nil | ||
| 261 | } | 265 | } | ||
| 262 | - | var rawCallback func(ResolverVarp uintptr, RrnameVarp string, CancellableVarp uintptr) uintptr | 266 | + | var rawCallback func(ResolverVarp uintptr, RrnameVarp string, CancellableVarp uintptr, cerrp **glib.Error) uintptr |
| 263 | purego.RegisterFunc(&rawCallback, x.xLookupService) | 267 | purego.RegisterFunc(&rawCallback, x.xLookupService) | ||
| 264 | return func(ResolverVar *Resolver, RrnameVar string, CancellableVar *Cancellable) *glib.List { | 268 | return func(ResolverVar *Resolver, RrnameVar string, CancellableVar *Cancellable) *glib.List { | ||
| 265 | - | rawRet := rawCallback(ResolverVar.GoPointer(), RrnameVar, CancellableVar.GoPointer()) | 269 | + | var cerr *glib.Error |
| 270 | + | rawRet := rawCallback(ResolverVar.GoPointer(), RrnameVar, CancellableVar.GoPointer(), &cerr) | |||
| 266 | if rawRet == 0 { | 271 | if rawRet == 0 { | ||
| 267 | return nil | 272 | return nil | ||
| 268 | } | 273 | } | ||
| @@ -298,7 +303,7 @@ func (x *ResolverClass) OverrideLookupServiceFinish(cb func(*Resolver, AsyncResu | |||||
| 298 | if cb == nil { | 303 | if cb == nil { | ||
| 299 | x.xLookupServiceFinish = 0 | 304 | x.xLookupServiceFinish = 0 | ||
| 300 | } else { | 305 | } else { | ||
| 301 | - | x.xLookupServiceFinish = purego.NewCallback(func(ResolverVarp uintptr, ResultVarp uintptr) uintptr { | 306 | + | x.xLookupServiceFinish = purego.NewCallback(func(ResolverVarp uintptr, ResultVarp uintptr, cerrp **glib.Error) uintptr { |
| 302 | ret := cb(ResolverNewFromInternalPtr(ResolverVarp), &AsyncResultBase{Ptr: ResultVarp}) | 307 | ret := cb(ResolverNewFromInternalPtr(ResolverVarp), &AsyncResultBase{Ptr: ResultVarp}) | ||
| 303 | if ret == nil { | 308 | if ret == nil { | ||
| 304 | return 0 | 309 | return 0 | ||
| @@ -313,10 +318,11 @@ func (x *ResolverClass) GetLookupServiceFinish() func(*Resolver, AsyncResult) *g | |||||
| 313 | if x.xLookupServiceFinish == 0 { | 318 | if x.xLookupServiceFinish == 0 { | ||
| 314 | return nil | 319 | return nil | ||
| 315 | } | 320 | } | ||
| 316 | - | var rawCallback func(ResolverVarp uintptr, ResultVarp uintptr) uintptr | 321 | + | var rawCallback func(ResolverVarp uintptr, ResultVarp uintptr, cerrp **glib.Error) uintptr |
| 317 | purego.RegisterFunc(&rawCallback, x.xLookupServiceFinish) | 322 | purego.RegisterFunc(&rawCallback, x.xLookupServiceFinish) | ||
| 318 | return func(ResolverVar *Resolver, ResultVar AsyncResult) *glib.List { | 323 | return func(ResolverVar *Resolver, ResultVar AsyncResult) *glib.List { | ||
| 319 | - | rawRet := rawCallback(ResolverVar.GoPointer(), ResultVar.GoPointer()) | 324 | + | var cerr *glib.Error |
| 325 | + | rawRet := rawCallback(ResolverVar.GoPointer(), ResultVar.GoPointer(), &cerr) | |||
| 320 | if rawRet == 0 { | 326 | if rawRet == 0 { | ||
| 321 | return nil | 327 | return nil | ||
| 322 | } | 328 | } | ||
| @@ -329,7 +335,7 @@ func (x *ResolverClass) OverrideLookupRecords(cb func(*Resolver, string, Resolve | |||||
| 329 | if cb == nil { | 335 | if cb == nil { | ||
| 330 | x.xLookupRecords = 0 | 336 | x.xLookupRecords = 0 | ||
| 331 | } else { | 337 | } else { | ||
| 332 | - | x.xLookupRecords = purego.NewCallback(func(ResolverVarp uintptr, RrnameVarp string, RecordTypeVarp ResolverRecordType, CancellableVarp uintptr) uintptr { | 338 | + | x.xLookupRecords = purego.NewCallback(func(ResolverVarp uintptr, RrnameVarp string, RecordTypeVarp ResolverRecordType, CancellableVarp uintptr, cerrp **glib.Error) uintptr { |
| 333 | ret := cb(ResolverNewFromInternalPtr(ResolverVarp), RrnameVarp, RecordTypeVarp, CancellableNewFromInternalPtr(CancellableVarp)) | 339 | ret := cb(ResolverNewFromInternalPtr(ResolverVarp), RrnameVarp, RecordTypeVarp, CancellableNewFromInternalPtr(CancellableVarp)) | ||
| 334 | if ret == nil { | 340 | if ret == nil { | ||
| 335 | return 0 | 341 | return 0 | ||
| @@ -344,10 +350,11 @@ func (x *ResolverClass) GetLookupRecords() func(*Resolver, string, ResolverRecor | |||||
| 344 | if x.xLookupRecords == 0 { | 350 | if x.xLookupRecords == 0 { | ||
| 345 | return nil | 351 | return nil | ||
| 346 | } | 352 | } | ||
| 347 | - | var rawCallback func(ResolverVarp uintptr, RrnameVarp string, RecordTypeVarp ResolverRecordType, CancellableVarp uintptr) uintptr | 353 | + | var rawCallback func(ResolverVarp uintptr, RrnameVarp string, RecordTypeVarp ResolverRecordType, CancellableVarp uintptr, cerrp **glib.Error) uintptr |
| 348 | purego.RegisterFunc(&rawCallback, x.xLookupRecords) | 354 | purego.RegisterFunc(&rawCallback, x.xLookupRecords) | ||
| 349 | return func(ResolverVar *Resolver, RrnameVar string, RecordTypeVar ResolverRecordType, CancellableVar *Cancellable) *glib.List { | 355 | return func(ResolverVar *Resolver, RrnameVar string, RecordTypeVar ResolverRecordType, CancellableVar *Cancellable) *glib.List { | ||
| 350 | - | rawRet := rawCallback(ResolverVar.GoPointer(), RrnameVar, RecordTypeVar, CancellableVar.GoPointer()) | 356 | + | var cerr *glib.Error |
| 357 | + | rawRet := rawCallback(ResolverVar.GoPointer(), RrnameVar, RecordTypeVar, CancellableVar.GoPointer(), &cerr) | |||
| 351 | if rawRet == 0 { | 358 | if rawRet == 0 { | ||
| 352 | return nil | 359 | return nil | ||
| 353 | } | 360 | } | ||
| @@ -383,7 +390,7 @@ func (x *ResolverClass) OverrideLookupRecordsFinish(cb func(*Resolver, AsyncResu | |||||
| 383 | if cb == nil { | 390 | if cb == nil { | ||
| 384 | x.xLookupRecordsFinish = 0 | 391 | x.xLookupRecordsFinish = 0 | ||
| 385 | } else { | 392 | } else { | ||
| 386 | - | x.xLookupRecordsFinish = purego.NewCallback(func(ResolverVarp uintptr, ResultVarp uintptr) uintptr { | 393 | + | x.xLookupRecordsFinish = purego.NewCallback(func(ResolverVarp uintptr, ResultVarp uintptr, cerrp **glib.Error) uintptr { |
| 387 | ret := cb(ResolverNewFromInternalPtr(ResolverVarp), &AsyncResultBase{Ptr: ResultVarp}) | 394 | ret := cb(ResolverNewFromInternalPtr(ResolverVarp), &AsyncResultBase{Ptr: ResultVarp}) | ||
| 388 | if ret == nil { | 395 | if ret == nil { | ||
| 389 | return 0 | 396 | return 0 | ||
| @@ -398,10 +405,11 @@ func (x *ResolverClass) GetLookupRecordsFinish() func(*Resolver, AsyncResult) *g | |||||
| 398 | if x.xLookupRecordsFinish == 0 { | 405 | if x.xLookupRecordsFinish == 0 { | ||
| 399 | return nil | 406 | return nil | ||
| 400 | } | 407 | } | ||
| 401 | - | var rawCallback func(ResolverVarp uintptr, ResultVarp uintptr) uintptr | 408 | + | var rawCallback func(ResolverVarp uintptr, ResultVarp uintptr, cerrp **glib.Error) uintptr |
| 402 | purego.RegisterFunc(&rawCallback, x.xLookupRecordsFinish) | 409 | purego.RegisterFunc(&rawCallback, x.xLookupRecordsFinish) | ||
| 403 | return func(ResolverVar *Resolver, ResultVar AsyncResult) *glib.List { | 410 | return func(ResolverVar *Resolver, ResultVar AsyncResult) *glib.List { | ||
| 404 | - | rawRet := rawCallback(ResolverVar.GoPointer(), ResultVar.GoPointer()) | 411 | + | var cerr *glib.Error |
| 412 | + | rawRet := rawCallback(ResolverVar.GoPointer(), ResultVar.GoPointer(), &cerr) | |||
| 405 | if rawRet == 0 { | 413 | if rawRet == 0 { | ||
| 406 | return nil | 414 | return nil | ||
| 407 | } | 415 | } | ||
| @@ -437,7 +445,7 @@ func (x *ResolverClass) OverrideLookupByNameWithFlagsFinish(cb func(*Resolver, A | |||||
| 437 | if cb == nil { | 445 | if cb == nil { | ||
| 438 | x.xLookupByNameWithFlagsFinish = 0 | 446 | x.xLookupByNameWithFlagsFinish = 0 | ||
| 439 | } else { | 447 | } else { | ||
| 440 | - | x.xLookupByNameWithFlagsFinish = purego.NewCallback(func(ResolverVarp uintptr, ResultVarp uintptr) uintptr { | 448 | + | x.xLookupByNameWithFlagsFinish = purego.NewCallback(func(ResolverVarp uintptr, ResultVarp uintptr, cerrp **glib.Error) uintptr { |
| 441 | ret := cb(ResolverNewFromInternalPtr(ResolverVarp), &AsyncResultBase{Ptr: ResultVarp}) | 449 | ret := cb(ResolverNewFromInternalPtr(ResolverVarp), &AsyncResultBase{Ptr: ResultVarp}) | ||
| 442 | if ret == nil { | 450 | if ret == nil { | ||
| 443 | return 0 | 451 | return 0 | ||
| @@ -452,10 +460,11 @@ func (x *ResolverClass) GetLookupByNameWithFlagsFinish() func(*Resolver, AsyncRe | |||||
| 452 | if x.xLookupByNameWithFlagsFinish == 0 { | 460 | if x.xLookupByNameWithFlagsFinish == 0 { | ||
| 453 | return nil | 461 | return nil | ||
| 454 | } | 462 | } | ||
| 455 | - | var rawCallback func(ResolverVarp uintptr, ResultVarp uintptr) uintptr | 463 | + | var rawCallback func(ResolverVarp uintptr, ResultVarp uintptr, cerrp **glib.Error) uintptr |
| 456 | purego.RegisterFunc(&rawCallback, x.xLookupByNameWithFlagsFinish) | 464 | purego.RegisterFunc(&rawCallback, x.xLookupByNameWithFlagsFinish) | ||
| 457 | return func(ResolverVar *Resolver, ResultVar AsyncResult) *glib.List { | 465 | return func(ResolverVar *Resolver, ResultVar AsyncResult) *glib.List { | ||
| 458 | - | rawRet := rawCallback(ResolverVar.GoPointer(), ResultVar.GoPointer()) | 466 | + | var cerr *glib.Error |
| 467 | + | rawRet := rawCallback(ResolverVar.GoPointer(), ResultVar.GoPointer(), &cerr) | |||
| 459 | if rawRet == 0 { | 468 | if rawRet == 0 { | ||
| 460 | return nil | 469 | return nil | ||
| 461 | } | 470 | } | ||
| @@ -468,7 +477,7 @@ func (x *ResolverClass) OverrideLookupByNameWithFlags(cb func(*Resolver, string, | |||||
| 468 | if cb == nil { | 477 | if cb == nil { | ||
| 469 | x.xLookupByNameWithFlags = 0 | 478 | x.xLookupByNameWithFlags = 0 | ||
| 470 | } else { | 479 | } else { | ||
| 471 | - | x.xLookupByNameWithFlags = purego.NewCallback(func(ResolverVarp uintptr, HostnameVarp string, FlagsVarp ResolverNameLookupFlags, CancellableVarp uintptr) uintptr { | 480 | + | x.xLookupByNameWithFlags = purego.NewCallback(func(ResolverVarp uintptr, HostnameVarp string, FlagsVarp ResolverNameLookupFlags, CancellableVarp uintptr, cerrp **glib.Error) uintptr { |
| 472 | ret := cb(ResolverNewFromInternalPtr(ResolverVarp), HostnameVarp, FlagsVarp, CancellableNewFromInternalPtr(CancellableVarp)) | 481 | ret := cb(ResolverNewFromInternalPtr(ResolverVarp), HostnameVarp, FlagsVarp, CancellableNewFromInternalPtr(CancellableVarp)) | ||
| 473 | if ret == nil { | 482 | if ret == nil { | ||
| 474 | return 0 | 483 | return 0 | ||
| @@ -483,10 +492,11 @@ func (x *ResolverClass) GetLookupByNameWithFlags() func(*Resolver, string, Resol | |||||
| 483 | if x.xLookupByNameWithFlags == 0 { | 492 | if x.xLookupByNameWithFlags == 0 { | ||
| 484 | return nil | 493 | return nil | ||
| 485 | } | 494 | } | ||
| 486 | - | var rawCallback func(ResolverVarp uintptr, HostnameVarp string, FlagsVarp ResolverNameLookupFlags, CancellableVarp uintptr) uintptr | 495 | + | var rawCallback func(ResolverVarp uintptr, HostnameVarp string, FlagsVarp ResolverNameLookupFlags, CancellableVarp uintptr, cerrp **glib.Error) uintptr |
| 487 | purego.RegisterFunc(&rawCallback, x.xLookupByNameWithFlags) | 496 | purego.RegisterFunc(&rawCallback, x.xLookupByNameWithFlags) | ||
| 488 | return func(ResolverVar *Resolver, HostnameVar string, FlagsVar ResolverNameLookupFlags, CancellableVar *Cancellable) *glib.List { | 497 | return func(ResolverVar *Resolver, HostnameVar string, FlagsVar ResolverNameLookupFlags, CancellableVar *Cancellable) *glib.List { | ||
| 489 | - | rawRet := rawCallback(ResolverVar.GoPointer(), HostnameVar, FlagsVar, CancellableVar.GoPointer()) | 498 | + | var cerr *glib.Error |
| 499 | + | rawRet := rawCallback(ResolverVar.GoPointer(), HostnameVar, FlagsVar, CancellableVar.GoPointer(), &cerr) | |||
| 490 | if rawRet == 0 { | 500 | if rawRet == 0 { | ||
| 491 | return nil | 501 | return nil | ||
| 492 | } | 502 | } | ||
| @@ -516,6 +526,7 @@ type ResolverNameLookupFlags int | |||||
| 516 | var xResolverNameLookupFlagsGLibType func() types.GType | 526 | var xResolverNameLookupFlagsGLibType func() types.GType | ||
| 517 | 527 | ||||
| 518 | func ResolverNameLookupFlagsGLibType() types.GType { | 528 | func ResolverNameLookupFlagsGLibType() types.GType { | ||
| 529 | + | core.LazyRegister(&xResolverNameLookupFlagsGLibType, "GIO", "g_resolver_name_lookup_flags_get_type", false) | |||
| 519 | return xResolverNameLookupFlagsGLibType() | 530 | return xResolverNameLookupFlagsGLibType() | ||
| 520 | } | 531 | } | ||
| 521 | 532 | ||||
| @@ -533,6 +544,8 @@ var xResolverErrorQuark func() glib.Quark | |||||
| 533 | 544 | ||||
| 534 | // Gets the #GResolver Error Quark. | 545 | // Gets the #GResolver Error Quark. | ||
| 535 | func ResolverErrorQuark() glib.Quark { | 546 | func ResolverErrorQuark() glib.Quark { | ||
| 547 | + | core.LazyRegister(&xResolverErrorQuark, "GIO", "g_resolver_error_quark", false) | |||
| 548 | + | ||||
| 536 | cret := xResolverErrorQuark() | 549 | cret := xResolverErrorQuark() | ||
| 537 | return cret | 550 | return cret | ||
| 538 | } | 551 | } | ||
| @@ -563,6 +576,7 @@ type Resolver struct { | |||||
| 563 | var xResolverGLibType func() types.GType | 576 | var xResolverGLibType func() types.GType | ||
| 564 | 577 | ||||
| 565 | func ResolverGLibType() types.GType { | 578 | func ResolverGLibType() types.GType { | ||
| 579 | + | core.LazyRegister(&xResolverGLibType, "GIO", "g_resolver_get_type", false) | |||
| 566 | return xResolverGLibType() | 580 | return xResolverGLibType() | ||
| 567 | } | 581 | } | ||
| 568 | 582 | ||||
| @@ -576,6 +590,8 @@ var xResolverGetTimeout func(uintptr) uint | |||||
| 576 | 590 | ||||
| 577 | // Get the timeout applied to all resolver lookups. See #GResolver:timeout. | 591 | // Get the timeout applied to all resolver lookups. See #GResolver:timeout. | ||
| 578 | func (x *Resolver) GetTimeout() uint { | 592 | func (x *Resolver) GetTimeout() uint { | ||
| 593 | + | core.LazyRegister(&xResolverGetTimeout, "GIO", "g_resolver_get_timeout", false) | |||
| 594 | + | ||||
| 579 | cret := xResolverGetTimeout(x.GoPointer()) | 595 | cret := xResolverGetTimeout(x.GoPointer()) | ||
| 580 | return cret | 596 | return cret | ||
| 581 | } | 597 | } | ||
| @@ -592,6 +608,7 @@ var xResolverLookupByAddress func(uintptr, uintptr, uintptr, **glib.Error) strin | |||||
| 592 | // operation, in which case @error (if non-%NULL) will be set to | 608 | // operation, in which case @error (if non-%NULL) will be set to | ||
| 593 | // %G_IO_ERROR_CANCELLED. | 609 | // %G_IO_ERROR_CANCELLED. | ||
| 594 | func (x *Resolver) LookupByAddress(AddressVar *InetAddress, CancellableVar *Cancellable) (string, error) { | 610 | func (x *Resolver) LookupByAddress(AddressVar *InetAddress, CancellableVar *Cancellable) (string, error) { | ||
| 611 | + | core.LazyRegister(&xResolverLookupByAddress, "GIO", "g_resolver_lookup_by_address", false) | |||
| 595 | var cerr *glib.Error | 612 | var cerr *glib.Error | ||
| 596 | 613 | ||||
| 597 | cret := xResolverLookupByAddress(x.GoPointer(), AddressVar.GoPointer(), CancellableVar.GoPointer(), &cerr) | 614 | cret := xResolverLookupByAddress(x.GoPointer(), AddressVar.GoPointer(), CancellableVar.GoPointer(), &cerr) | ||
| @@ -607,6 +624,8 @@ var xResolverLookupByAddressAsync func(uintptr, uintptr, uintptr, uintptr, uintp | |||||
| 607 | // associated hostname, and eventually calls @callback, which must | 624 | // associated hostname, and eventually calls @callback, which must | ||
| 608 | // call g_resolver_lookup_by_address_finish() to get the final result. | 625 | // call g_resolver_lookup_by_address_finish() to get the final result. | ||
| 609 | func (x *Resolver) LookupByAddressAsync(AddressVar *InetAddress, CancellableVar *Cancellable, CallbackVar *AsyncReadyCallback, UserDataVar uintptr) { | 626 | func (x *Resolver) LookupByAddressAsync(AddressVar *InetAddress, CancellableVar *Cancellable, CallbackVar *AsyncReadyCallback, UserDataVar uintptr) { | ||
| 627 | + | core.LazyRegister(&xResolverLookupByAddressAsync, "GIO", "g_resolver_lookup_by_address_async", false) | |||
| 628 | + | ||||
| 610 | xResolverLookupByAddressAsync(x.GoPointer(), AddressVar.GoPointer(), CancellableVar.GoPointer(), glib.NewCallbackNullable(CallbackVar), UserDataVar) | 629 | xResolverLookupByAddressAsync(x.GoPointer(), AddressVar.GoPointer(), CancellableVar.GoPointer(), glib.NewCallbackNullable(CallbackVar), UserDataVar) | ||
| 611 | } | 630 | } | ||
| 612 | 631 | ||||
| @@ -619,6 +638,7 @@ var xResolverLookupByAddressFinish func(uintptr, uintptr, **glib.Error) string | |||||
| 619 | // a value from #GResolverError. If the operation was cancelled, | 638 | // a value from #GResolverError. If the operation was cancelled, | ||
| 620 | // @error will be set to %G_IO_ERROR_CANCELLED. | 639 | // @error will be set to %G_IO_ERROR_CANCELLED. | ||
| 621 | func (x *Resolver) LookupByAddressFinish(ResultVar AsyncResult) (string, error) { | 640 | func (x *Resolver) LookupByAddressFinish(ResultVar AsyncResult) (string, error) { | ||
| 641 | + | core.LazyRegister(&xResolverLookupByAddressFinish, "GIO", "g_resolver_lookup_by_address_finish", false) | |||
| 622 | var cerr *glib.Error | 642 | var cerr *glib.Error | ||
| 623 | 643 | ||||
| 624 | cret := xResolverLookupByAddressFinish(x.GoPointer(), ResultVar.GoPointer(), &cerr) | 644 | cret := xResolverLookupByAddressFinish(x.GoPointer(), ResultVar.GoPointer(), &cerr) | ||
| @@ -654,6 +674,7 @@ var xResolverLookupByName func(uintptr, string, uintptr, **glib.Error) uintptr | |||||
| 654 | // address, it may be easier to create a #GNetworkAddress and use its | 674 | // address, it may be easier to create a #GNetworkAddress and use its | ||
| 655 | // #GSocketConnectable interface. | 675 | // #GSocketConnectable interface. | ||
| 656 | func (x *Resolver) LookupByName(HostnameVar string, CancellableVar *Cancellable) (*glib.List, error) { | 676 | func (x *Resolver) LookupByName(HostnameVar string, CancellableVar *Cancellable) (*glib.List, error) { | ||
| 677 | + | core.LazyRegister(&xResolverLookupByName, "GIO", "g_resolver_lookup_by_name", false) | |||
| 657 | var cerr *glib.Error | 678 | var cerr *glib.Error | ||
| 658 | 679 | ||||
| 659 | cret := xResolverLookupByName(x.GoPointer(), HostnameVar, CancellableVar.GoPointer(), &cerr) | 680 | cret := xResolverLookupByName(x.GoPointer(), HostnameVar, CancellableVar.GoPointer(), &cerr) | ||
| @@ -673,6 +694,8 @@ var xResolverLookupByNameAsync func(uintptr, string, uintptr, uintptr, uintptr) | |||||
| 673 | // must call g_resolver_lookup_by_name_finish() to get the result. | 694 | // must call g_resolver_lookup_by_name_finish() to get the result. | ||
| 674 | // See g_resolver_lookup_by_name() for more details. | 695 | // See g_resolver_lookup_by_name() for more details. | ||
| 675 | func (x *Resolver) LookupByNameAsync(HostnameVar string, CancellableVar *Cancellable, CallbackVar *AsyncReadyCallback, UserDataVar uintptr) { | 696 | func (x *Resolver) LookupByNameAsync(HostnameVar string, CancellableVar *Cancellable, CallbackVar *AsyncReadyCallback, UserDataVar uintptr) { | ||
| 697 | + | core.LazyRegister(&xResolverLookupByNameAsync, "GIO", "g_resolver_lookup_by_name_async", false) | |||
| 698 | + | ||||
| 676 | xResolverLookupByNameAsync(x.GoPointer(), HostnameVar, CancellableVar.GoPointer(), glib.NewCallbackNullable(CallbackVar), UserDataVar) | 699 | xResolverLookupByNameAsync(x.GoPointer(), HostnameVar, CancellableVar.GoPointer(), glib.NewCallbackNullable(CallbackVar), UserDataVar) | ||
| 677 | } | 700 | } | ||
| 678 | 701 | ||||
| @@ -685,6 +708,7 @@ var xResolverLookupByNameFinish func(uintptr, uintptr, **glib.Error) uintptr | |||||
| 685 | // a value from #GResolverError. If the operation was cancelled, | 708 | // a value from #GResolverError. If the operation was cancelled, | ||
| 686 | // @error will be set to %G_IO_ERROR_CANCELLED. | 709 | // @error will be set to %G_IO_ERROR_CANCELLED. | ||
| 687 | func (x *Resolver) LookupByNameFinish(ResultVar AsyncResult) (*glib.List, error) { | 710 | func (x *Resolver) LookupByNameFinish(ResultVar AsyncResult) (*glib.List, error) { | ||
| 711 | + | core.LazyRegister(&xResolverLookupByNameFinish, "GIO", "g_resolver_lookup_by_name_finish", false) | |||
| 688 | var cerr *glib.Error | 712 | var cerr *glib.Error | ||
| 689 | 713 | ||||
| 690 | cret := xResolverLookupByNameFinish(x.GoPointer(), ResultVar.GoPointer(), &cerr) | 714 | cret := xResolverLookupByNameFinish(x.GoPointer(), ResultVar.GoPointer(), &cerr) | ||
| @@ -703,6 +727,7 @@ var xResolverLookupByNameWithFlags func(uintptr, string, ResolverNameLookupFlags | |||||
| 703 | // the lookup behavior with @flags. For example this can be used to limit | 727 | // the lookup behavior with @flags. For example this can be used to limit | ||
| 704 | // results with %G_RESOLVER_NAME_LOOKUP_FLAGS_IPV4_ONLY. | 728 | // results with %G_RESOLVER_NAME_LOOKUP_FLAGS_IPV4_ONLY. | ||
| 705 | func (x *Resolver) LookupByNameWithFlags(HostnameVar string, FlagsVar ResolverNameLookupFlags, CancellableVar *Cancellable) (*glib.List, error) { | 729 | func (x *Resolver) LookupByNameWithFlags(HostnameVar string, FlagsVar ResolverNameLookupFlags, CancellableVar *Cancellable) (*glib.List, error) { | ||
| 730 | + | core.LazyRegister(&xResolverLookupByNameWithFlags, "GIO", "g_resolver_lookup_by_name_with_flags", false) | |||
| 706 | var cerr *glib.Error | 731 | var cerr *glib.Error | ||
| 707 | 732 | ||||
| 708 | cret := xResolverLookupByNameWithFlags(x.GoPointer(), HostnameVar, FlagsVar, CancellableVar.GoPointer(), &cerr) | 733 | cret := xResolverLookupByNameWithFlags(x.GoPointer(), HostnameVar, FlagsVar, CancellableVar.GoPointer(), &cerr) | ||
| @@ -722,6 +747,8 @@ var xResolverLookupByNameWithFlagsAsync func(uintptr, string, ResolverNameLookup | |||||
| 722 | // must call g_resolver_lookup_by_name_with_flags_finish() to get the result. | 747 | // must call g_resolver_lookup_by_name_with_flags_finish() to get the result. | ||
| 723 | // See g_resolver_lookup_by_name() for more details. | 748 | // See g_resolver_lookup_by_name() for more details. | ||
| 724 | func (x *Resolver) LookupByNameWithFlagsAsync(HostnameVar string, FlagsVar ResolverNameLookupFlags, CancellableVar *Cancellable, CallbackVar *AsyncReadyCallback, UserDataVar uintptr) { | 749 | func (x *Resolver) LookupByNameWithFlagsAsync(HostnameVar string, FlagsVar ResolverNameLookupFlags, CancellableVar *Cancellable, CallbackVar *AsyncReadyCallback, UserDataVar uintptr) { | ||
| 750 | + | core.LazyRegister(&xResolverLookupByNameWithFlagsAsync, "GIO", "g_resolver_lookup_by_name_with_flags_async", false) | |||
| 751 | + | ||||
| 725 | xResolverLookupByNameWithFlagsAsync(x.GoPointer(), HostnameVar, FlagsVar, CancellableVar.GoPointer(), glib.NewCallbackNullable(CallbackVar), UserDataVar) | 752 | xResolverLookupByNameWithFlagsAsync(x.GoPointer(), HostnameVar, FlagsVar, CancellableVar.GoPointer(), glib.NewCallbackNullable(CallbackVar), UserDataVar) | ||
| 726 | } | 753 | } | ||
| 727 | 754 | ||||
| @@ -734,6 +761,7 @@ var xResolverLookupByNameWithFlagsFinish func(uintptr, uintptr, **glib.Error) ui | |||||
| 734 | // a value from #GResolverError. If the operation was cancelled, | 761 | // a value from #GResolverError. If the operation was cancelled, | ||
| 735 | // @error will be set to %G_IO_ERROR_CANCELLED. | 762 | // @error will be set to %G_IO_ERROR_CANCELLED. | ||
| 736 | func (x *Resolver) LookupByNameWithFlagsFinish(ResultVar AsyncResult) (*glib.List, error) { | 763 | func (x *Resolver) LookupByNameWithFlagsFinish(ResultVar AsyncResult) (*glib.List, error) { | ||
| 764 | + | core.LazyRegister(&xResolverLookupByNameWithFlagsFinish, "GIO", "g_resolver_lookup_by_name_with_flags_finish", false) | |||
| 737 | var cerr *glib.Error | 765 | var cerr *glib.Error | ||
| 738 | 766 | ||||
| 739 | cret := xResolverLookupByNameWithFlagsFinish(x.GoPointer(), ResultVar.GoPointer(), &cerr) | 767 | cret := xResolverLookupByNameWithFlagsFinish(x.GoPointer(), ResultVar.GoPointer(), &cerr) | ||
| @@ -759,6 +787,7 @@ var xResolverLookupRecords func(uintptr, string, ResolverRecordType, uintptr, ** | |||||
| 759 | // operation, in which case @error (if non-%NULL) will be set to | 787 | // operation, in which case @error (if non-%NULL) will be set to | ||
| 760 | // %G_IO_ERROR_CANCELLED. | 788 | // %G_IO_ERROR_CANCELLED. | ||
| 761 | func (x *Resolver) LookupRecords(RrnameVar string, RecordTypeVar ResolverRecordType, CancellableVar *Cancellable) (*glib.List, error) { | 789 | func (x *Resolver) LookupRecords(RrnameVar string, RecordTypeVar ResolverRecordType, CancellableVar *Cancellable) (*glib.List, error) { | ||
| 790 | + | core.LazyRegister(&xResolverLookupRecords, "GIO", "g_resolver_lookup_records", false) | |||
| 762 | var cerr *glib.Error | 791 | var cerr *glib.Error | ||
| 763 | 792 | ||||
| 764 | cret := xResolverLookupRecords(x.GoPointer(), RrnameVar, RecordTypeVar, CancellableVar.GoPointer(), &cerr) | 793 | cret := xResolverLookupRecords(x.GoPointer(), RrnameVar, RecordTypeVar, CancellableVar.GoPointer(), &cerr) | ||
| @@ -778,6 +807,8 @@ var xResolverLookupRecordsAsync func(uintptr, string, ResolverRecordType, uintpt | |||||
| 778 | // g_resolver_lookup_records_finish() to get the final result. See | 807 | // g_resolver_lookup_records_finish() to get the final result. See | ||
| 779 | // g_resolver_lookup_records() for more details. | 808 | // g_resolver_lookup_records() for more details. | ||
| 780 | func (x *Resolver) LookupRecordsAsync(RrnameVar string, RecordTypeVar ResolverRecordType, CancellableVar *Cancellable, CallbackVar *AsyncReadyCallback, UserDataVar uintptr) { | 809 | func (x *Resolver) LookupRecordsAsync(RrnameVar string, RecordTypeVar ResolverRecordType, CancellableVar *Cancellable, CallbackVar *AsyncReadyCallback, UserDataVar uintptr) { | ||
| 810 | + | core.LazyRegister(&xResolverLookupRecordsAsync, "GIO", "g_resolver_lookup_records_async", false) | |||
| 811 | + | ||||
| 781 | xResolverLookupRecordsAsync(x.GoPointer(), RrnameVar, RecordTypeVar, CancellableVar.GoPointer(), glib.NewCallbackNullable(CallbackVar), UserDataVar) | 812 | xResolverLookupRecordsAsync(x.GoPointer(), RrnameVar, RecordTypeVar, CancellableVar.GoPointer(), glib.NewCallbackNullable(CallbackVar), UserDataVar) | ||
| 782 | } | 813 | } | ||
| 783 | 814 | ||||
| @@ -792,6 +823,7 @@ var xResolverLookupRecordsFinish func(uintptr, uintptr, **glib.Error) uintptr | |||||
| 792 | // a value from #GResolverError. If the operation was cancelled, | 823 | // a value from #GResolverError. If the operation was cancelled, | ||
| 793 | // @error will be set to %G_IO_ERROR_CANCELLED. | 824 | // @error will be set to %G_IO_ERROR_CANCELLED. | ||
| 794 | func (x *Resolver) LookupRecordsFinish(ResultVar AsyncResult) (*glib.List, error) { | 825 | func (x *Resolver) LookupRecordsFinish(ResultVar AsyncResult) (*glib.List, error) { | ||
| 826 | + | core.LazyRegister(&xResolverLookupRecordsFinish, "GIO", "g_resolver_lookup_records_finish", false) | |||
| 795 | var cerr *glib.Error | 827 | var cerr *glib.Error | ||
| 796 | 828 | ||||
| 797 | cret := xResolverLookupRecordsFinish(x.GoPointer(), ResultVar.GoPointer(), &cerr) | 829 | cret := xResolverLookupRecordsFinish(x.GoPointer(), ResultVar.GoPointer(), &cerr) | ||
| @@ -828,6 +860,7 @@ var xResolverLookupService func(uintptr, string, string, string, uintptr, **glib | |||||
| 828 | // to create a #GNetworkService and use its #GSocketConnectable | 860 | // to create a #GNetworkService and use its #GSocketConnectable | ||
| 829 | // interface. | 861 | // interface. | ||
| 830 | func (x *Resolver) LookupService(ServiceVar string, ProtocolVar string, DomainVar string, CancellableVar *Cancellable) (*glib.List, error) { | 862 | func (x *Resolver) LookupService(ServiceVar string, ProtocolVar string, DomainVar string, CancellableVar *Cancellable) (*glib.List, error) { | ||
| 863 | + | core.LazyRegister(&xResolverLookupService, "GIO", "g_resolver_lookup_service", false) | |||
| 831 | var cerr *glib.Error | 864 | var cerr *glib.Error | ||
| 832 | 865 | ||||
| 833 | cret := xResolverLookupService(x.GoPointer(), ServiceVar, ProtocolVar, DomainVar, CancellableVar.GoPointer(), &cerr) | 866 | cret := xResolverLookupService(x.GoPointer(), ServiceVar, ProtocolVar, DomainVar, CancellableVar.GoPointer(), &cerr) | ||
| @@ -848,6 +881,8 @@ var xResolverLookupServiceAsync func(uintptr, string, string, string, uintptr, u | |||||
| 848 | // get the final result. See g_resolver_lookup_service() for more | 881 | // get the final result. See g_resolver_lookup_service() for more | ||
| 849 | // details. | 882 | // details. | ||
| 850 | func (x *Resolver) LookupServiceAsync(ServiceVar string, ProtocolVar string, DomainVar string, CancellableVar *Cancellable, CallbackVar *AsyncReadyCallback, UserDataVar uintptr) { | 883 | func (x *Resolver) LookupServiceAsync(ServiceVar string, ProtocolVar string, DomainVar string, CancellableVar *Cancellable, CallbackVar *AsyncReadyCallback, UserDataVar uintptr) { | ||
| 884 | + | core.LazyRegister(&xResolverLookupServiceAsync, "GIO", "g_resolver_lookup_service_async", false) | |||
| 885 | + | ||||
| 851 | xResolverLookupServiceAsync(x.GoPointer(), ServiceVar, ProtocolVar, DomainVar, CancellableVar.GoPointer(), glib.NewCallbackNullable(CallbackVar), UserDataVar) | 886 | xResolverLookupServiceAsync(x.GoPointer(), ServiceVar, ProtocolVar, DomainVar, CancellableVar.GoPointer(), glib.NewCallbackNullable(CallbackVar), UserDataVar) | ||
| 852 | } | 887 | } | ||
| 853 | 888 | ||||
| @@ -860,6 +895,7 @@ var xResolverLookupServiceFinish func(uintptr, uintptr, **glib.Error) uintptr | |||||
| 860 | // a value from #GResolverError. If the operation was cancelled, | 895 | // a value from #GResolverError. If the operation was cancelled, | ||
| 861 | // @error will be set to %G_IO_ERROR_CANCELLED. | 896 | // @error will be set to %G_IO_ERROR_CANCELLED. | ||
| 862 | func (x *Resolver) LookupServiceFinish(ResultVar AsyncResult) (*glib.List, error) { | 897 | func (x *Resolver) LookupServiceFinish(ResultVar AsyncResult) (*glib.List, error) { | ||
| 898 | + | core.LazyRegister(&xResolverLookupServiceFinish, "GIO", "g_resolver_lookup_service_finish", false) | |||
| 863 | var cerr *glib.Error | 899 | var cerr *glib.Error | ||
| 864 | 900 | ||||
| 865 | cret := xResolverLookupServiceFinish(x.GoPointer(), ResultVar.GoPointer(), &cerr) | 901 | cret := xResolverLookupServiceFinish(x.GoPointer(), ResultVar.GoPointer(), &cerr) | ||
| @@ -884,6 +920,8 @@ var xResolverSetDefault func(uintptr) | |||||
| 884 | // implements its own cache policies on top of that, and then set | 920 | // implements its own cache policies on top of that, and then set | ||
| 885 | // itself as the default resolver for all later code to use. | 921 | // itself as the default resolver for all later code to use. | ||
| 886 | func (x *Resolver) SetDefault() { | 922 | func (x *Resolver) SetDefault() { | ||
| 923 | + | core.LazyRegister(&xResolverSetDefault, "GIO", "g_resolver_set_default", false) | |||
| 924 | + | ||||
| 887 | xResolverSetDefault(x.GoPointer()) | 925 | xResolverSetDefault(x.GoPointer()) | ||
| 888 | } | 926 | } | ||
| 889 | 927 | ||||
| @@ -891,6 +929,8 @@ var xResolverSetTimeout func(uintptr, uint) | |||||
| 891 | 929 | ||||
| 892 | // Set the timeout applied to all resolver lookups. See #GResolver:timeout. | 930 | // Set the timeout applied to all resolver lookups. See #GResolver:timeout. | ||
| 893 | func (x *Resolver) SetTimeout(TimeoutMsVar uint) { | 931 | func (x *Resolver) SetTimeout(TimeoutMsVar uint) { | ||
| 932 | + | core.LazyRegister(&xResolverSetTimeout, "GIO", "g_resolver_set_timeout", false) | |||
| 933 | + | ||||
| 894 | xResolverSetTimeout(x.GoPointer(), TimeoutMsVar) | 934 | xResolverSetTimeout(x.GoPointer(), TimeoutMsVar) | ||
| 895 | } | 935 | } | ||
| 896 | 936 | ||||
| @@ -971,6 +1011,8 @@ var xResolverFreeAddresses func(*glib.List) | |||||
| 971 | // (This is a convenience method; you can also simply free the results | 1011 | // (This is a convenience method; you can also simply free the results | ||
| 972 | // by hand.) | 1012 | // by hand.) | ||
| 973 | func ResolverFreeAddresses(AddressesVar *glib.List) { | 1013 | func ResolverFreeAddresses(AddressesVar *glib.List) { | ||
| 1014 | + | core.LazyRegister(&xResolverFreeAddresses, "GIO", "g_resolver_free_addresses", false) | |||
| 1015 | + | ||||
| 974 | xResolverFreeAddresses(AddressesVar) | 1016 | xResolverFreeAddresses(AddressesVar) | ||
| 975 | } | 1017 | } | ||
| 976 | 1018 | ||||
| @@ -981,6 +1023,8 @@ var xResolverFreeTargets func(*glib.List) | |||||
| 981 | // (This is a convenience method; you can also simply free the | 1023 | // (This is a convenience method; you can also simply free the | ||
| 982 | // results by hand.) | 1024 | // results by hand.) | ||
| 983 | func ResolverFreeTargets(TargetsVar *glib.List) { | 1025 | func ResolverFreeTargets(TargetsVar *glib.List) { | ||
| 1026 | + | core.LazyRegister(&xResolverFreeTargets, "GIO", "g_resolver_free_targets", false) | |||
| 1027 | + | ||||
| 984 | xResolverFreeTargets(TargetsVar) | 1028 | xResolverFreeTargets(TargetsVar) | ||
| 985 | } | 1029 | } | ||
| 986 | 1030 | ||||
| @@ -990,6 +1034,7 @@ var xResolverGetDefault func() uintptr | |||||
| 990 | // with it. #GResolver may use its reference count as a hint about how | 1034 | // with it. #GResolver may use its reference count as a hint about how | ||
| 991 | // many threads it should allocate for concurrent DNS resolutions. | 1035 | // many threads it should allocate for concurrent DNS resolutions. | ||
| 992 | func ResolverGetDefault() *Resolver { | 1036 | func ResolverGetDefault() *Resolver { | ||
| 1037 | + | core.LazyRegister(&xResolverGetDefault, "GIO", "g_resolver_get_default", false) | |||
| 993 | var cls *Resolver | 1038 | var cls *Resolver | ||
| 994 | 1039 | ||||
| 995 | cret := xResolverGetDefault() | 1040 | cret := xResolverGetDefault() | ||
| @@ -1005,41 +1050,4 @@ func ResolverGetDefault() *Resolver { | |||||
| 1005 | func init() { | 1050 | func init() { | ||
| 1006 | core.SetPackageName("GIO", "gio-2.0") | 1051 | core.SetPackageName("GIO", "gio-2.0") | ||
| 1007 | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0", "libgio-2.0.0.dylib"}) | 1052 | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0", "libgio-2.0.0.dylib"}) | ||
| 1008 | - | var libs []uintptr | |||
| 1009 | - | for _, libPath := range core.GetPaths("GIO") { | |||
| 1010 | - | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |||
| 1011 | - | if err != nil { | |||
| 1012 | - | panic(err) | |||
| 1013 | - | } | |||
| 1014 | - | libs = append(libs, lib) | |||
| 1015 | - | } | |||
| 1016 | - | ||||
| 1017 | - | core.PuregoSafeRegister(&xResolverNameLookupFlagsGLibType, libs, "g_resolver_name_lookup_flags_get_type") | |||
| 1018 | - | ||||
| 1019 | - | core.PuregoSafeRegister(&xResolverErrorQuark, libs, "g_resolver_error_quark") | |||
| 1020 | - | ||||
| 1021 | - | core.PuregoSafeRegister(&xResolverGLibType, libs, "g_resolver_get_type") | |||
| 1022 | - | ||||
| 1023 | - | core.PuregoSafeRegister(&xResolverGetTimeout, libs, "g_resolver_get_timeout") | |||
| 1024 | - | core.PuregoSafeRegister(&xResolverLookupByAddress, libs, "g_resolver_lookup_by_address") | |||
| 1025 | - | core.PuregoSafeRegister(&xResolverLookupByAddressAsync, libs, "g_resolver_lookup_by_address_async") | |||
| 1026 | - | core.PuregoSafeRegister(&xResolverLookupByAddressFinish, libs, "g_resolver_lookup_by_address_finish") | |||
| 1027 | - | core.PuregoSafeRegister(&xResolverLookupByName, libs, "g_resolver_lookup_by_name") | |||
| 1028 | - | core.PuregoSafeRegister(&xResolverLookupByNameAsync, libs, "g_resolver_lookup_by_name_async") | |||
| 1029 | - | core.PuregoSafeRegister(&xResolverLookupByNameFinish, libs, "g_resolver_lookup_by_name_finish") | |||
| 1030 | - | core.PuregoSafeRegister(&xResolverLookupByNameWithFlags, libs, "g_resolver_lookup_by_name_with_flags") | |||
| 1031 | - | core.PuregoSafeRegister(&xResolverLookupByNameWithFlagsAsync, libs, "g_resolver_lookup_by_name_with_flags_async") | |||
| 1032 | - | core.PuregoSafeRegister(&xResolverLookupByNameWithFlagsFinish, libs, "g_resolver_lookup_by_name_with_flags_finish") | |||
| 1033 | - | core.PuregoSafeRegister(&xResolverLookupRecords, libs, "g_resolver_lookup_records") | |||
| 1034 | - | core.PuregoSafeRegister(&xResolverLookupRecordsAsync, libs, "g_resolver_lookup_records_async") | |||
| 1035 | - | core.PuregoSafeRegister(&xResolverLookupRecordsFinish, libs, "g_resolver_lookup_records_finish") | |||
| 1036 | - | core.PuregoSafeRegister(&xResolverLookupService, libs, "g_resolver_lookup_service") | |||
| 1037 | - | core.PuregoSafeRegister(&xResolverLookupServiceAsync, libs, "g_resolver_lookup_service_async") | |||
| 1038 | - | core.PuregoSafeRegister(&xResolverLookupServiceFinish, libs, "g_resolver_lookup_service_finish") | |||
| 1039 | - | core.PuregoSafeRegister(&xResolverSetDefault, libs, "g_resolver_set_default") | |||
| 1040 | - | core.PuregoSafeRegister(&xResolverSetTimeout, libs, "g_resolver_set_timeout") | |||
| 1041 | - | ||||
| 1042 | - | core.PuregoSafeRegister(&xResolverFreeAddresses, libs, "g_resolver_free_addresses") | |||
| 1043 | - | core.PuregoSafeRegister(&xResolverFreeTargets, libs, "g_resolver_free_targets") | |||
| 1044 | - | core.PuregoSafeRegister(&xResolverGetDefault, libs, "g_resolver_get_default") | |||
| 1045 | } | 1053 | } | ||