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 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gresource.go +19 -23 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gseekable.go +41 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsettings.go +99 -67 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsettingsbackend.go +19 -24 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsettingsschema.go +48 -43 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsimpleaction.go +9 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsimpleactiongroup.go +9 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsimpleasyncresult.go +46 -40 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsimpleiostream.go +2 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsimplepermission.go +2 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsimpleproxyresolver.go +8 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsocket.go +87 -72 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsocketaddress.go +11 -19 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsocketaddressenumerator.go +13 -20 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsocketclient.go +54 -44 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsocketconnectable.go +19 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsocketconnection.go +14 -21 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsocketcontrolmessage.go +10 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsocketlistener.go +18 -25 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsocketservice.go +8 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsrvtarget.go +2 -11 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsubprocess.go +40 -39 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsubprocesslauncher.go +34 -31 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gtask.go +70 -52 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gtcpconnection.go +5 -14 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gtcpwrapperconnection.go +3 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gtestdbus.go +16 -22 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gthemedicon.go +10 -19 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gthreadedresolver.go +7 -0 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gthreadedsocketservice.go +2 -12 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gtlsbackend.go +69 -33 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gtlscertificate.go +25 -29 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gtlsclientconnection.go +55 -29 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gtlsconnection.go +56 -46 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gtlsdatabase.go +51 -48 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gtlsfiledatabase.go +2 -13 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gtlsinteraction.go +27 -31 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gtlspassword.go +20 -22 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gtlsserverconnection.go +2 -13 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gunixconnection.go +11 -20 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gunixcredentialsmessage.go +6 -17 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gunixfdlist.go +11 -19 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gunixsocketaddress.go +14 -22 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gvfs.go +18 -24 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gvolume.go +143 -58 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gvolumemonitor.go +11 -19 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gzlibcompressor.go +9 -18 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gzlibdecompressor.go +3 -15 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/main.go +2 -11 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gallocator.go +32 -28 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/garray.go +82 -59 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gasyncqueue.go +56 -39 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gatomic.go +43 -34 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gbacktrace.go +5 -15 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gbase64.go +13 -19 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gbitlock.go +23 -24 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gbookmarkfile.go +69 -61 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gcache.go +10 -15 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gcharset.go +13 -19 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gchecksum.go +23 -25 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gcompletion.go +14 -17 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gconvert.go +25 -28 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gdataset.go +36 -28 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gdate.go +103 -65 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gdatetime.go +107 -66 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gdir.go +12 -19 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/genviron.go +17 -21 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gerror.go +30 -29 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gfileutils.go +45 -38 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/ggettext.go +13 -19 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/ghash.go +81 -53 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/ghmac.go +21 -24 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/ghook.go +28 -26 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/ghostutils.go +11 -18 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/giochannel.go +83 -67
| @@ -98,6 +98,7 @@ type IOChannel struct { | |||
| 98 | 98 | var xIOChannelGLibType func() types.GType | |
| 99 | 99 | ||
| 100 | 100 | func IOChannelGLibType() types.GType { | |
| 101 | + | core.LazyRegister(&xIOChannelGLibType, "GLIB", "g_io_channel_get_type", false) | |
| 101 | 102 | return xIOChannelGLibType() | |
| 102 | 103 | } | |
| 103 | 104 | ||
| @@ -121,6 +122,7 @@ var xNewIOChannelFile func(string, string, **Error) uintptr | |||
| 121 | 122 | // so will not cause problems, as long as no attempt is made to | |
| 122 | 123 | // access the channel after it is closed). | |
| 123 | 124 | func NewIOChannelFile(FilenameVar string, ModeVar string) (*IOChannel, error) { | |
| 125 | + | core.LazyRegister(&xNewIOChannelFile, "GLIB", "g_io_channel_new_file", false) | |
| 124 | 126 | var cerr *Error | |
| 125 | 127 | ||
| 126 | 128 | cret := xNewIOChannelFile(FilenameVar, ModeVar, &cerr) | |
| @@ -158,6 +160,8 @@ var xIOChannelUnixNew func(int) uintptr | |||
| 158 | 160 | // valid file descriptor and socket. If that happens a warning is | |
| 159 | 161 | // issued, and GLib assumes that it is the file descriptor you mean. | |
| 160 | 162 | func IOChannelUnixNew(FdVar int) *IOChannel { | |
| 163 | + | core.LazyRegister(&xIOChannelUnixNew, "GLIB", "g_io_channel_unix_new", false) | |
| 164 | + | ||
| 161 | 165 | cret := xIOChannelUnixNew(FdVar) | |
| 162 | 166 | if cret == 0 { | |
| 163 | 167 | return nil | |
| @@ -171,6 +175,8 @@ var xIOChannelClose func(uintptr) | |||
| 171 | 175 | // flushed, ignoring errors. The channel will not be freed until the | |
| 172 | 176 | // last reference is dropped using g_io_channel_unref(). | |
| 173 | 177 | func (x *IOChannel) Close() { | |
| 178 | + | core.LazyRegister(&xIOChannelClose, "GLIB", "g_io_channel_close", false) | |
| 179 | + | ||
| 174 | 180 | xIOChannelClose(x.GoPointer()) | |
| 175 | 181 | } | |
| 176 | 182 | ||
| @@ -178,6 +184,7 @@ var xIOChannelFlush func(uintptr, **Error) IOStatus | |||
| 178 | 184 | ||
| 179 | 185 | // Flushes the write buffer for the GIOChannel. | |
| 180 | 186 | func (x *IOChannel) Flush() (IOStatus, error) { | |
| 187 | + | core.LazyRegister(&xIOChannelFlush, "GLIB", "g_io_channel_flush", false) | |
| 181 | 188 | var cerr *Error | |
| 182 | 189 | ||
| 183 | 190 | cret := xIOChannelFlush(x.GoPointer(), &cerr) | |
| @@ -193,6 +200,8 @@ var xIOChannelGetBufferCondition func(uintptr) IOCondition | |||
| 193 | 200 | // is data to be read/space to write data in the internal buffers in | |
| 194 | 201 | // the #GIOChannel. Only the flags %G_IO_IN and %G_IO_OUT may be set. | |
| 195 | 202 | func (x *IOChannel) GetBufferCondition() IOCondition { | |
| 203 | + | core.LazyRegister(&xIOChannelGetBufferCondition, "GLIB", "g_io_channel_get_buffer_condition", false) | |
| 204 | + | ||
| 196 | 205 | cret := xIOChannelGetBufferCondition(x.GoPointer()) | |
| 197 | 206 | return cret | |
| 198 | 207 | } | |
| @@ -201,6 +210,8 @@ var xIOChannelGetBufferSize func(uintptr) uint | |||
| 201 | 210 | ||
| 202 | 211 | // Gets the buffer size. | |
| 203 | 212 | func (x *IOChannel) GetBufferSize() uint { | |
| 213 | + | core.LazyRegister(&xIOChannelGetBufferSize, "GLIB", "g_io_channel_get_buffer_size", false) | |
| 214 | + | ||
| 204 | 215 | cret := xIOChannelGetBufferSize(x.GoPointer()) | |
| 205 | 216 | return cret | |
| 206 | 217 | } | |
| @@ -209,6 +220,8 @@ var xIOChannelGetBuffered func(uintptr) bool | |||
| 209 | 220 | ||
| 210 | 221 | // Returns whether @channel is buffered. | |
| 211 | 222 | func (x *IOChannel) GetBuffered() bool { | |
| 223 | + | core.LazyRegister(&xIOChannelGetBuffered, "GLIB", "g_io_channel_get_buffered", false) | |
| 224 | + | ||
| 212 | 225 | cret := xIOChannelGetBuffered(x.GoPointer()) | |
| 213 | 226 | return cret | |
| 214 | 227 | } | |
| @@ -220,6 +233,8 @@ var xIOChannelGetCloseOnUnref func(uintptr) bool | |||
| 220 | 233 | // destroyed. The default value of this is %TRUE for channels created | |
| 221 | 234 | // by g_io_channel_new_file (), and %FALSE for all other channels. | |
| 222 | 235 | func (x *IOChannel) GetCloseOnUnref() bool { | |
| 236 | + | core.LazyRegister(&xIOChannelGetCloseOnUnref, "GLIB", "g_io_channel_get_close_on_unref", false) | |
| 237 | + | ||
| 223 | 238 | cret := xIOChannelGetCloseOnUnref(x.GoPointer()) | |
| 224 | 239 | return cret | |
| 225 | 240 | } | |
| @@ -230,6 +245,8 @@ var xIOChannelGetEncoding func(uintptr) string | |||
| 230 | 245 | // The internal encoding is always UTF-8. The encoding %NULL | |
| 231 | 246 | // makes the channel safe for binary data. | |
| 232 | 247 | func (x *IOChannel) GetEncoding() string { | |
| 248 | + | core.LazyRegister(&xIOChannelGetEncoding, "GLIB", "g_io_channel_get_encoding", false) | |
| 249 | + | ||
| 233 | 250 | cret := xIOChannelGetEncoding(x.GoPointer()) | |
| 234 | 251 | return cret | |
| 235 | 252 | } | |
| @@ -246,6 +263,8 @@ var xIOChannelGetFlags func(uintptr) IOFlags | |||
| 246 | 263 | // should immediately call g_io_channel_get_flags() to update | |
| 247 | 264 | // the internal values of these flags. | |
| 248 | 265 | func (x *IOChannel) GetFlags() IOFlags { | |
| 266 | + | core.LazyRegister(&xIOChannelGetFlags, "GLIB", "g_io_channel_get_flags", false) | |
| 267 | + | ||
| 249 | 268 | cret := xIOChannelGetFlags(x.GoPointer()) | |
| 250 | 269 | return cret | |
| 251 | 270 | } | |
| @@ -257,6 +276,8 @@ var xIOChannelGetLineTerm func(uintptr, *int) string | |||
| 257 | 276 | // indicates autodetection. Since 2.84, the return value is always | |
| 258 | 277 | // nul-terminated. | |
| 259 | 278 | func (x *IOChannel) GetLineTerm(LengthVar *int) string { | |
| 279 | + | core.LazyRegister(&xIOChannelGetLineTerm, "GLIB", "g_io_channel_get_line_term", false) | |
| 280 | + | ||
| 260 | 281 | cret := xIOChannelGetLineTerm(x.GoPointer(), LengthVar) | |
| 261 | 282 | return cret | |
| 262 | 283 | } | |
| @@ -269,6 +290,8 @@ var xIOChannelInit func(uintptr) | |||
| 269 | 290 | // #GIOChannel, and so is not often needed by the application | |
| 270 | 291 | // programmer (unless you are creating a new type of #GIOChannel). | |
| 271 | 292 | func (x *IOChannel) Init() { | |
| 293 | + | core.LazyRegister(&xIOChannelInit, "GLIB", "g_io_channel_init", false) | |
| 294 | + | ||
| 272 | 295 | xIOChannelInit(x.GoPointer()) | |
| 273 | 296 | } | |
| 274 | 297 | ||
| @@ -276,6 +299,8 @@ var xIOChannelRead func(uintptr, string, uint, uint) IOError | |||
| 276 | 299 | ||
| 277 | 300 | // Reads data from a #GIOChannel. | |
| 278 | 301 | func (x *IOChannel) Read(BufVar string, CountVar uint, BytesReadVar uint) IOError { | |
| 302 | + | core.LazyRegister(&xIOChannelRead, "GLIB", "g_io_channel_read", false) | |
| 303 | + | ||
| 279 | 304 | cret := xIOChannelRead(x.GoPointer(), BufVar, CountVar, BytesReadVar) | |
| 280 | 305 | return cret | |
| 281 | 306 | } | |
| @@ -284,6 +309,7 @@ var xIOChannelReadChars func(uintptr, *[]byte, uint, *uint, **Error) IOStatus | |||
| 284 | 309 | ||
| 285 | 310 | // Replacement for g_io_channel_read() with the new API. | |
| 286 | 311 | func (x *IOChannel) ReadChars(BufVar *[]byte, CountVar uint, BytesReadVar *uint) (IOStatus, error) { | |
| 312 | + | core.LazyRegister(&xIOChannelReadChars, "GLIB", "g_io_channel_read_chars", false) | |
| 287 | 313 | var cerr *Error | |
| 288 | 314 | ||
| 289 | 315 | cret := xIOChannelReadChars(x.GoPointer(), BufVar, CountVar, BytesReadVar, &cerr) | |
| @@ -300,6 +326,7 @@ var xIOChannelReadLine func(uintptr, *string, *uint, *uint, **Error) IOStatus | |||
| 300 | 326 | // @str_return will contain allocated memory if the return | |
| 301 | 327 | // is %G_IO_STATUS_NORMAL. | |
| 302 | 328 | func (x *IOChannel) ReadLine(StrReturnVar *string, LengthVar *uint, TerminatorPosVar *uint) (IOStatus, error) { | |
| 329 | + | core.LazyRegister(&xIOChannelReadLine, "GLIB", "g_io_channel_read_line", false) | |
| 303 | 330 | var cerr *Error | |
| 304 | 331 | ||
| 305 | 332 | cret := xIOChannelReadLine(x.GoPointer(), StrReturnVar, LengthVar, TerminatorPosVar, &cerr) | |
| @@ -313,6 +340,7 @@ var xIOChannelReadLineString func(uintptr, *String, uint, **Error) IOStatus | |||
| 313 | 340 | ||
| 314 | 341 | // Reads a line from a #GIOChannel, using a #GString as a buffer. | |
| 315 | 342 | func (x *IOChannel) ReadLineString(BufferVar *String, TerminatorPosVar uint) (IOStatus, error) { | |
| 343 | + | core.LazyRegister(&xIOChannelReadLineString, "GLIB", "g_io_channel_read_line_string", false) | |
| 316 | 344 | var cerr *Error | |
| 317 | 345 | ||
| 318 | 346 | cret := xIOChannelReadLineString(x.GoPointer(), BufferVar, TerminatorPosVar, &cerr) | |
| @@ -326,6 +354,7 @@ var xIOChannelReadToEnd func(uintptr, *[]byte, *uint, **Error) IOStatus | |||
| 326 | 354 | ||
| 327 | 355 | // Reads all the remaining data from the file. | |
| 328 | 356 | func (x *IOChannel) ReadToEnd(StrReturnVar *[]byte, LengthVar *uint) (IOStatus, error) { | |
| 357 | + | core.LazyRegister(&xIOChannelReadToEnd, "GLIB", "g_io_channel_read_to_end", false) | |
| 329 | 358 | var cerr *Error | |
| 330 | 359 | ||
| 331 | 360 | cret := xIOChannelReadToEnd(x.GoPointer(), StrReturnVar, LengthVar, &cerr) | |
| @@ -340,6 +369,7 @@ var xIOChannelReadUnichar func(uintptr, *uint32, **Error) IOStatus | |||
| 340 | 369 | // Reads a Unicode character from @channel. | |
| 341 | 370 | // This function cannot be called on a channel with %NULL encoding. | |
| 342 | 371 | func (x *IOChannel) ReadUnichar(ThecharVar *uint32) (IOStatus, error) { | |
| 372 | + | core.LazyRegister(&xIOChannelReadUnichar, "GLIB", "g_io_channel_read_unichar", false) | |
| 343 | 373 | var cerr *Error | |
| 344 | 374 | ||
| 345 | 375 | cret := xIOChannelReadUnichar(x.GoPointer(), ThecharVar, &cerr) | |
| @@ -353,6 +383,8 @@ var xIOChannelRef func(uintptr) uintptr | |||
| 353 | 383 | ||
| 354 | 384 | // Increments the reference count of a #GIOChannel. | |
| 355 | 385 | func (x *IOChannel) Ref() *IOChannel { | |
| 386 | + | core.LazyRegister(&xIOChannelRef, "GLIB", "g_io_channel_ref", false) | |
| 387 | + | ||
| 356 | 388 | cret := xIOChannelRef(x.GoPointer()) | |
| 357 | 389 | if cret == 0 { | |
| 358 | 390 | return nil | |
| @@ -365,6 +397,8 @@ var xIOChannelIOChannelSeek func(uintptr, int64, SeekType) IOError | |||
| 365 | 397 | // Sets the current position in the #GIOChannel, similar to the standard | |
| 366 | 398 | // library function fseek(). | |
| 367 | 399 | func (x *IOChannel) IOChannelSeek(OffsetVar int64, TypeVar SeekType) IOError { | |
| 400 | + | core.LazyRegister(&xIOChannelIOChannelSeek, "GLIB", "g_io_channel_seek", false) | |
| 401 | + | ||
| 368 | 402 | cret := xIOChannelIOChannelSeek(x.GoPointer(), OffsetVar, TypeVar) | |
| 369 | 403 | return cret | |
| 370 | 404 | } | |
| @@ -373,6 +407,7 @@ var xIOChannelSeekPosition func(uintptr, int64, SeekType, **Error) IOStatus | |||
| 373 | 407 | ||
| 374 | 408 | // Replacement for g_io_channel_seek() with the new API. | |
| 375 | 409 | func (x *IOChannel) SeekPosition(OffsetVar int64, TypeVar SeekType) (IOStatus, error) { | |
| 410 | + | core.LazyRegister(&xIOChannelSeekPosition, "GLIB", "g_io_channel_seek_position", false) | |
| 376 | 411 | var cerr *Error | |
| 377 | 412 | ||
| 378 | 413 | cret := xIOChannelSeekPosition(x.GoPointer(), OffsetVar, TypeVar, &cerr) | |
| @@ -386,6 +421,8 @@ var xIOChannelSetBufferSize func(uintptr, uint) | |||
| 386 | 421 | ||
| 387 | 422 | // Sets the buffer size. | |
| 388 | 423 | func (x *IOChannel) SetBufferSize(SizeVar uint) { | |
| 424 | + | core.LazyRegister(&xIOChannelSetBufferSize, "GLIB", "g_io_channel_set_buffer_size", false) | |
| 425 | + | ||
| 389 | 426 | xIOChannelSetBufferSize(x.GoPointer(), SizeVar) | |
| 390 | 427 | } | |
| 391 | 428 | ||
| @@ -411,6 +448,8 @@ var xIOChannelSetBuffered func(uintptr, bool) | |||
| 411 | 448 | // | |
| 412 | 449 | // The default state of the channel is buffered. | |
| 413 | 450 | func (x *IOChannel) SetBuffered(BufferedVar bool) { | |
| 451 | + | core.LazyRegister(&xIOChannelSetBuffered, "GLIB", "g_io_channel_set_buffered", false) | |
| 452 | + | ||
| 414 | 453 | xIOChannelSetBuffered(x.GoPointer(), BufferedVar) | |
| 415 | 454 | } | |
| 416 | 455 | ||
| @@ -423,6 +462,8 @@ var xIOChannelSetCloseOnUnref func(uintptr, bool) | |||
| 423 | 462 | // Setting this flag to %TRUE for a channel you have already closed | |
| 424 | 463 | // can cause problems when the final reference to the #GIOChannel is dropped. | |
| 425 | 464 | func (x *IOChannel) SetCloseOnUnref(DoCloseVar bool) { | |
| 465 | + | core.LazyRegister(&xIOChannelSetCloseOnUnref, "GLIB", "g_io_channel_set_close_on_unref", false) | |
| 466 | + | ||
| 426 | 467 | xIOChannelSetCloseOnUnref(x.GoPointer(), DoCloseVar) | |
| 427 | 468 | } | |
| 428 | 469 | ||
| @@ -463,6 +504,7 @@ var xIOChannelSetEncoding func(uintptr, uintptr, **Error) IOStatus | |||
| 463 | 504 | // they are "seekable", cannot call g_io_channel_write_chars() after | |
| 464 | 505 | // calling one of the API "read" functions. | |
| 465 | 506 | func (x *IOChannel) SetEncoding(EncodingVar *string) (IOStatus, error) { | |
| 507 | + | core.LazyRegister(&xIOChannelSetEncoding, "GLIB", "g_io_channel_set_encoding", false) | |
| 466 | 508 | var cerr *Error | |
| 467 | 509 | ||
| 468 | 510 | EncodingVarPtr := core.GStrdupNullable(EncodingVar) | |
| @@ -479,6 +521,7 @@ var xIOChannelSetFlags func(uintptr, IOFlags, **Error) IOStatus | |||
| 479 | 521 | ||
| 480 | 522 | // Sets the (writeable) flags in @channel to (@flags & %G_IO_FLAG_SET_MASK). | |
| 481 | 523 | func (x *IOChannel) SetFlags(FlagsVar IOFlags) (IOStatus, error) { | |
| 524 | + | core.LazyRegister(&xIOChannelSetFlags, "GLIB", "g_io_channel_set_flags", false) | |
| 482 | 525 | var cerr *Error | |
| 483 | 526 | ||
| 484 | 527 | cret := xIOChannelSetFlags(x.GoPointer(), FlagsVar, &cerr) | |
| @@ -493,6 +536,8 @@ var xIOChannelSetLineTerm func(uintptr, uintptr, int) | |||
| 493 | 536 | // This sets the string that #GIOChannel uses to determine | |
| 494 | 537 | // where in the file a line break occurs. | |
| 495 | 538 | func (x *IOChannel) SetLineTerm(LineTermVar *string, LengthVar int) { | |
| 539 | + | core.LazyRegister(&xIOChannelSetLineTerm, "GLIB", "g_io_channel_set_line_term", false) | |
| 540 | + | ||
| 496 | 541 | LineTermVarPtr := core.GStrdupNullable(LineTermVar) | |
| 497 | 542 | defer core.GFreeNullable(LineTermVarPtr) | |
| 498 | 543 | ||
| @@ -505,6 +550,7 @@ var xIOChannelShutdown func(uintptr, bool, **Error) IOStatus | |||
| 505 | 550 | // flushed if @flush is %TRUE. The channel will not be freed until the | |
| 506 | 551 | // last reference is dropped using g_io_channel_unref(). | |
| 507 | 552 | func (x *IOChannel) Shutdown(FlushVar bool) (IOStatus, error) { | |
| 553 | + | core.LazyRegister(&xIOChannelShutdown, "GLIB", "g_io_channel_shutdown", false) | |
| 508 | 554 | var cerr *Error | |
| 509 | 555 | ||
| 510 | 556 | cret := xIOChannelShutdown(x.GoPointer(), FlushVar, &cerr) | |
| @@ -521,6 +567,8 @@ var xIOChannelUnixGetFd func(uintptr) int | |||
| 521 | 567 | // On Windows this function returns the file descriptor or socket of | |
| 522 | 568 | // the #GIOChannel. | |
| 523 | 569 | func (x *IOChannel) UnixGetFd() int { | |
| 570 | + | core.LazyRegister(&xIOChannelUnixGetFd, "GLIB", "g_io_channel_unix_get_fd", false) | |
| 571 | + | ||
| 524 | 572 | cret := xIOChannelUnixGetFd(x.GoPointer()) | |
| 525 | 573 | return cret | |
| 526 | 574 | } | |
| @@ -529,6 +577,8 @@ var xIOChannelUnref func(uintptr) | |||
| 529 | 577 | ||
| 530 | 578 | // Decrements the reference count of a #GIOChannel. | |
| 531 | 579 | func (x *IOChannel) Unref() { | |
| 580 | + | core.LazyRegister(&xIOChannelUnref, "GLIB", "g_io_channel_unref", false) | |
| 581 | + | ||
| 532 | 582 | xIOChannelUnref(x.GoPointer()) | |
| 533 | 583 | } | |
| 534 | 584 | ||
| @@ -536,6 +586,8 @@ var xIOChannelWrite func(uintptr, string, uint, uint) IOError | |||
| 536 | 586 | ||
| 537 | 587 | // Writes data to a #GIOChannel. | |
| 538 | 588 | func (x *IOChannel) Write(BufVar string, CountVar uint, BytesWrittenVar uint) IOError { | |
| 589 | + | core.LazyRegister(&xIOChannelWrite, "GLIB", "g_io_channel_write", false) | |
| 590 | + | ||
| 539 | 591 | cret := xIOChannelWrite(x.GoPointer(), BufVar, CountVar, BytesWrittenVar) | |
| 540 | 592 | return cret | |
| 541 | 593 | } | |
| @@ -549,6 +601,7 @@ var xIOChannelWriteChars func(uintptr, []byte, int, *uint, **Error) IOStatus | |||
| 549 | 601 | // may only be made on a channel from which data has been read in the | |
| 550 | 602 | // cases described in the documentation for g_io_channel_set_encoding (). | |
| 551 | 603 | func (x *IOChannel) WriteChars(BufVar []byte, CountVar int, BytesWrittenVar *uint) (IOStatus, error) { | |
| 604 | + | core.LazyRegister(&xIOChannelWriteChars, "GLIB", "g_io_channel_write_chars", false) | |
| 552 | 605 | var cerr *Error | |
| 553 | 606 | ||
| 554 | 607 | cret := xIOChannelWriteChars(x.GoPointer(), BufVar, CountVar, BytesWrittenVar, &cerr) | |
| @@ -563,6 +616,7 @@ var xIOChannelWriteUnichar func(uintptr, uint32, **Error) IOStatus | |||
| 563 | 616 | // Writes a Unicode character to @channel. | |
| 564 | 617 | // This function cannot be called on a channel with %NULL encoding. | |
| 565 | 618 | func (x *IOChannel) WriteUnichar(ThecharVar uint32) (IOStatus, error) { | |
| 619 | + | core.LazyRegister(&xIOChannelWriteUnichar, "GLIB", "g_io_channel_write_unichar", false) | |
| 566 | 620 | var cerr *Error | |
| 567 | 621 | ||
| 568 | 622 | cret := xIOChannelWriteUnichar(x.GoPointer(), ThecharVar, &cerr) | |
| @@ -616,7 +670,7 @@ func (x *IOFuncs) OverrideIoRead(cb func(*IOChannel, string, uint, uint) IOStatu | |||
| 616 | 670 | if cb == nil { | |
| 617 | 671 | x.xIoRead = 0 | |
| 618 | 672 | } else { | |
| 619 | - | x.xIoRead = purego.NewCallback(func(ChannelVarp *IOChannel, BufVarp string, CountVarp uint, BytesReadVarp uint) IOStatus { | |
| 673 | + | x.xIoRead = purego.NewCallback(func(ChannelVarp *IOChannel, BufVarp string, CountVarp uint, BytesReadVarp uint, cerrp **Error) IOStatus { | |
| 620 | 674 | return cb(ChannelVarp, BufVarp, CountVarp, BytesReadVarp) | |
| 621 | 675 | }) | |
| 622 | 676 | } | |
| @@ -632,10 +686,11 @@ func (x *IOFuncs) GetIoRead() func(*IOChannel, string, uint, uint) IOStatus { | |||
| 632 | 686 | if x.xIoRead == 0 { | |
| 633 | 687 | return nil | |
| 634 | 688 | } | |
| 635 | - | var rawCallback func(ChannelVarp *IOChannel, BufVarp string, CountVarp uint, BytesReadVarp uint) IOStatus | |
| 689 | + | var rawCallback func(ChannelVarp *IOChannel, BufVarp string, CountVarp uint, BytesReadVarp uint, cerrp **Error) IOStatus | |
| 636 | 690 | purego.RegisterFunc(&rawCallback, x.xIoRead) | |
| 637 | 691 | return func(ChannelVar *IOChannel, BufVar string, CountVar uint, BytesReadVar uint) IOStatus { | |
| 638 | - | return rawCallback(ChannelVar, BufVar, CountVar, BytesReadVar) | |
| 692 | + | var cerr *Error | |
| 693 | + | return rawCallback(ChannelVar, BufVar, CountVar, BytesReadVar, &cerr) | |
| 639 | 694 | } | |
| 640 | 695 | } | |
| 641 | 696 | ||
| @@ -649,7 +704,7 @@ func (x *IOFuncs) OverrideIoWrite(cb func(*IOChannel, string, uint, uint) IOStat | |||
| 649 | 704 | if cb == nil { | |
| 650 | 705 | x.xIoWrite = 0 | |
| 651 | 706 | } else { | |
| 652 | - | x.xIoWrite = purego.NewCallback(func(ChannelVarp *IOChannel, BufVarp string, CountVarp uint, BytesWrittenVarp uint) IOStatus { | |
| 707 | + | x.xIoWrite = purego.NewCallback(func(ChannelVarp *IOChannel, BufVarp string, CountVarp uint, BytesWrittenVarp uint, cerrp **Error) IOStatus { | |
| 653 | 708 | return cb(ChannelVarp, BufVarp, CountVarp, BytesWrittenVarp) | |
| 654 | 709 | }) | |
| 655 | 710 | } | |
| @@ -665,10 +720,11 @@ func (x *IOFuncs) GetIoWrite() func(*IOChannel, string, uint, uint) IOStatus { | |||
| 665 | 720 | if x.xIoWrite == 0 { | |
| 666 | 721 | return nil | |
| 667 | 722 | } | |
| 668 | - | var rawCallback func(ChannelVarp *IOChannel, BufVarp string, CountVarp uint, BytesWrittenVarp uint) IOStatus | |
| 723 | + | var rawCallback func(ChannelVarp *IOChannel, BufVarp string, CountVarp uint, BytesWrittenVarp uint, cerrp **Error) IOStatus | |
| 669 | 724 | purego.RegisterFunc(&rawCallback, x.xIoWrite) | |
| 670 | 725 | return func(ChannelVar *IOChannel, BufVar string, CountVar uint, BytesWrittenVar uint) IOStatus { | |
| 671 | - | return rawCallback(ChannelVar, BufVar, CountVar, BytesWrittenVar) | |
| 726 | + | var cerr *Error | |
| 727 | + | return rawCallback(ChannelVar, BufVar, CountVar, BytesWrittenVar, &cerr) | |
| 672 | 728 | } | |
| 673 | 729 | } | |
| 674 | 730 | ||
| @@ -680,7 +736,7 @@ func (x *IOFuncs) OverrideIoSeek(cb func(*IOChannel, int64, SeekType) IOStatus) | |||
| 680 | 736 | if cb == nil { | |
| 681 | 737 | x.xIoSeek = 0 | |
| 682 | 738 | } else { | |
| 683 | - | x.xIoSeek = purego.NewCallback(func(ChannelVarp *IOChannel, OffsetVarp int64, TypeVarp SeekType) IOStatus { | |
| 739 | + | x.xIoSeek = purego.NewCallback(func(ChannelVarp *IOChannel, OffsetVarp int64, TypeVarp SeekType, cerrp **Error) IOStatus { | |
| 684 | 740 | return cb(ChannelVarp, OffsetVarp, TypeVarp) | |
| 685 | 741 | }) | |
| 686 | 742 | } | |
| @@ -694,10 +750,11 @@ func (x *IOFuncs) GetIoSeek() func(*IOChannel, int64, SeekType) IOStatus { | |||
| 694 | 750 | if x.xIoSeek == 0 { | |
| 695 | 751 | return nil | |
| 696 | 752 | } | |
| 697 | - | var rawCallback func(ChannelVarp *IOChannel, OffsetVarp int64, TypeVarp SeekType) IOStatus | |
| 753 | + | var rawCallback func(ChannelVarp *IOChannel, OffsetVarp int64, TypeVarp SeekType, cerrp **Error) IOStatus | |
| 698 | 754 | purego.RegisterFunc(&rawCallback, x.xIoSeek) | |
| 699 | 755 | return func(ChannelVar *IOChannel, OffsetVar int64, TypeVar SeekType) IOStatus { | |
| 700 | - | return rawCallback(ChannelVar, OffsetVar, TypeVar) | |
| 756 | + | var cerr *Error | |
| 757 | + | return rawCallback(ChannelVar, OffsetVar, TypeVar, &cerr) | |
| 701 | 758 | } | |
| 702 | 759 | } | |
| 703 | 760 | ||
| @@ -709,7 +766,7 @@ func (x *IOFuncs) OverrideIoClose(cb func(*IOChannel) IOStatus) { | |||
| 709 | 766 | if cb == nil { | |
| 710 | 767 | x.xIoClose = 0 | |
| 711 | 768 | } else { | |
| 712 | - | x.xIoClose = purego.NewCallback(func(ChannelVarp *IOChannel) IOStatus { | |
| 769 | + | x.xIoClose = purego.NewCallback(func(ChannelVarp *IOChannel, cerrp **Error) IOStatus { | |
| 713 | 770 | return cb(ChannelVarp) | |
| 714 | 771 | }) | |
| 715 | 772 | } | |
| @@ -723,10 +780,11 @@ func (x *IOFuncs) GetIoClose() func(*IOChannel) IOStatus { | |||
| 723 | 780 | if x.xIoClose == 0 { | |
| 724 | 781 | return nil | |
| 725 | 782 | } | |
| 726 | - | var rawCallback func(ChannelVarp *IOChannel) IOStatus | |
| 783 | + | var rawCallback func(ChannelVarp *IOChannel, cerrp **Error) IOStatus | |
| 727 | 784 | purego.RegisterFunc(&rawCallback, x.xIoClose) | |
| 728 | 785 | return func(ChannelVar *IOChannel) IOStatus { | |
| 729 | - | return rawCallback(ChannelVar) | |
| 786 | + | var cerr *Error | |
| 787 | + | return rawCallback(ChannelVar, &cerr) | |
| 730 | 788 | } | |
| 731 | 789 | } | |
| 732 | 790 | ||
| @@ -814,7 +872,7 @@ func (x *IOFuncs) OverrideIoSetFlags(cb func(*IOChannel, IOFlags) IOStatus) { | |||
| 814 | 872 | if cb == nil { | |
| 815 | 873 | x.xIoSetFlags = 0 | |
| 816 | 874 | } else { | |
| 817 | - | x.xIoSetFlags = purego.NewCallback(func(ChannelVarp *IOChannel, FlagsVarp IOFlags) IOStatus { | |
| 875 | + | x.xIoSetFlags = purego.NewCallback(func(ChannelVarp *IOChannel, FlagsVarp IOFlags, cerrp **Error) IOStatus { | |
| 818 | 876 | return cb(ChannelVarp, FlagsVarp) | |
| 819 | 877 | }) | |
| 820 | 878 | } | |
| @@ -830,10 +888,11 @@ func (x *IOFuncs) GetIoSetFlags() func(*IOChannel, IOFlags) IOStatus { | |||
| 830 | 888 | if x.xIoSetFlags == 0 { | |
| 831 | 889 | return nil | |
| 832 | 890 | } | |
| 833 | - | var rawCallback func(ChannelVarp *IOChannel, FlagsVarp IOFlags) IOStatus | |
| 891 | + | var rawCallback func(ChannelVarp *IOChannel, FlagsVarp IOFlags, cerrp **Error) IOStatus | |
| 834 | 892 | purego.RegisterFunc(&rawCallback, x.xIoSetFlags) | |
| 835 | 893 | return func(ChannelVar *IOChannel, FlagsVar IOFlags) IOStatus { | |
| 836 | - | return rawCallback(ChannelVar, FlagsVar) | |
| 894 | + | var cerr *Error | |
| 895 | + | return rawCallback(ChannelVar, FlagsVar, &cerr) | |
| 837 | 896 | } | |
| 838 | 897 | } | |
| 839 | 898 | ||
| @@ -881,6 +940,7 @@ type IOCondition int | |||
| 881 | 940 | var xIOConditionGLibType func() types.GType | |
| 882 | 941 | ||
| 883 | 942 | func IOConditionGLibType() types.GType { | |
| 943 | + | core.LazyRegister(&xIOConditionGLibType, "GLIB", "g_io_condition_get_type", false) | |
| 884 | 944 | return xIOConditionGLibType() | |
| 885 | 945 | } | |
| 886 | 946 | ||
| @@ -1016,6 +1076,8 @@ var xIoAddWatch func(*IOChannel, IOCondition, uintptr, uintptr) uint | |||
| 1016 | 1076 | // Adds the #GIOChannel into the default main loop context | |
| 1017 | 1077 | // with the default priority. | |
| 1018 | 1078 | func IoAddWatch(ChannelVar *IOChannel, ConditionVar IOCondition, FuncVar *IOFunc, UserDataVar uintptr) uint { | |
| 1079 | + | core.LazyRegister(&xIoAddWatch, "GLIB", "g_io_add_watch", false) | |
| 1080 | + | ||
| 1019 | 1081 | cret := xIoAddWatch(ChannelVar, ConditionVar, NewCallback(FuncVar), UserDataVar) | |
| 1020 | 1082 | return cret | |
| 1021 | 1083 | } | |
| @@ -1029,6 +1091,8 @@ var xIoAddWatchFull func(*IOChannel, int, IOCondition, uintptr, uintptr, uintptr | |||
| 1029 | 1091 | // and attaches it to the main loop context with g_source_attach(). | |
| 1030 | 1092 | // You can do these steps manually if you need greater control. | |
| 1031 | 1093 | func IoAddWatchFull(ChannelVar *IOChannel, PriorityVar int, ConditionVar IOCondition, FuncVar *IOFunc, UserDataVar uintptr, NotifyVar *DestroyNotify) uint { | |
| 1094 | + | core.LazyRegister(&xIoAddWatchFull, "GLIB", "g_io_add_watch_full", false) | |
| 1095 | + | ||
| 1032 | 1096 | cret := xIoAddWatchFull(ChannelVar, PriorityVar, ConditionVar, NewCallback(FuncVar), UserDataVar, NewCallbackNullable(NotifyVar)) | |
| 1033 | 1097 | return cret | |
| 1034 | 1098 | } | |
| @@ -1037,6 +1101,8 @@ var xIoChannelErrorFromErrno func(int) IOChannelError | |||
| 1037 | 1101 | ||
| 1038 | 1102 | // Converts an `errno` error number to a #GIOChannelError. | |
| 1039 | 1103 | func IoChannelErrorFromErrno(EnVar int) IOChannelError { | |
| 1104 | + | core.LazyRegister(&xIoChannelErrorFromErrno, "GLIB", "g_io_channel_error_from_errno", false) | |
| 1105 | + | ||
| 1040 | 1106 | cret := xIoChannelErrorFromErrno(EnVar) | |
| 1041 | 1107 | return cret | |
| 1042 | 1108 | } | |
| @@ -1058,6 +1124,8 @@ var xIoCreateWatch func(*IOChannel, IOCondition) uintptr | |||
| 1058 | 1124 | // puts the socket in non-blocking mode. This is a side-effect of the | |
| 1059 | 1125 | // implementation and unavoidable. | |
| 1060 | 1126 | func IoCreateWatch(ChannelVar *IOChannel, ConditionVar IOCondition) *Source { | |
| 1127 | + | core.LazyRegister(&xIoCreateWatch, "GLIB", "g_io_create_watch", false) | |
| 1128 | + | ||
| 1061 | 1129 | cret := xIoCreateWatch(ChannelVar, ConditionVar) | |
| 1062 | 1130 | if cret == 0 { | |
| 1063 | 1131 | return nil | |
| @@ -1068,56 +1136,4 @@ func IoCreateWatch(ChannelVar *IOChannel, ConditionVar IOCondition) *Source { | |||
| 1068 | 1136 | func init() { | |
| 1069 | 1137 | core.SetPackageName("GLIB", "glib-2.0") | |
| 1070 | 1138 | core.SetSharedLibraries("GLIB", []string{"libgobject-2.0.so.0", "libglib-2.0.so.0", "libgobject-2.0.0.dylib", "libglib-2.0.0.dylib"}) | |
| 1071 | - | var libs []uintptr | |
| 1072 | - | for _, libPath := range core.GetPaths("GLIB") { | |
| 1073 | - | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 1074 | - | if err != nil { | |
| 1075 | - | panic(err) | |
| 1076 | - | } | |
| 1077 | - | libs = append(libs, lib) | |
| 1078 | - | } | |
| 1079 | - | ||
| 1080 | - | core.PuregoSafeRegister(&xIOConditionGLibType, libs, "g_io_condition_get_type") | |
| 1081 | - | ||
| 1082 | - | core.PuregoSafeRegister(&xIoAddWatch, libs, "g_io_add_watch") | |
| 1083 | - | core.PuregoSafeRegister(&xIoAddWatchFull, libs, "g_io_add_watch_full") | |
| 1084 | - | core.PuregoSafeRegister(&xIoChannelErrorFromErrno, libs, "g_io_channel_error_from_errno") | |
| 1085 | - | core.PuregoSafeRegister(&xIoCreateWatch, libs, "g_io_create_watch") | |
| 1086 | - | ||
| 1087 | - | core.PuregoSafeRegister(&xIOChannelGLibType, libs, "g_io_channel_get_type") | |
| 1088 | - | ||
| 1089 | - | core.PuregoSafeRegister(&xNewIOChannelFile, libs, "g_io_channel_new_file") | |
| 1090 | - | core.PuregoSafeRegister(&xIOChannelUnixNew, libs, "g_io_channel_unix_new") | |
| 1091 | - | ||
| 1092 | - | core.PuregoSafeRegister(&xIOChannelClose, libs, "g_io_channel_close") | |
| 1093 | - | core.PuregoSafeRegister(&xIOChannelFlush, libs, "g_io_channel_flush") | |
| 1094 | - | core.PuregoSafeRegister(&xIOChannelGetBufferCondition, libs, "g_io_channel_get_buffer_condition") | |
| 1095 | - | core.PuregoSafeRegister(&xIOChannelGetBufferSize, libs, "g_io_channel_get_buffer_size") | |
| 1096 | - | core.PuregoSafeRegister(&xIOChannelGetBuffered, libs, "g_io_channel_get_buffered") | |
| 1097 | - | core.PuregoSafeRegister(&xIOChannelGetCloseOnUnref, libs, "g_io_channel_get_close_on_unref") | |
| 1098 | - | core.PuregoSafeRegister(&xIOChannelGetEncoding, libs, "g_io_channel_get_encoding") | |
| 1099 | - | core.PuregoSafeRegister(&xIOChannelGetFlags, libs, "g_io_channel_get_flags") | |
| 1100 | - | core.PuregoSafeRegister(&xIOChannelGetLineTerm, libs, "g_io_channel_get_line_term") | |
| 1101 | - | core.PuregoSafeRegister(&xIOChannelInit, libs, "g_io_channel_init") | |
| 1102 | - | core.PuregoSafeRegister(&xIOChannelRead, libs, "g_io_channel_read") | |
| 1103 | - | core.PuregoSafeRegister(&xIOChannelReadChars, libs, "g_io_channel_read_chars") | |
| 1104 | - | core.PuregoSafeRegister(&xIOChannelReadLine, libs, "g_io_channel_read_line") | |
| 1105 | - | core.PuregoSafeRegister(&xIOChannelReadLineString, libs, "g_io_channel_read_line_string") | |
| 1106 | - | core.PuregoSafeRegister(&xIOChannelReadToEnd, libs, "g_io_channel_read_to_end") | |
| 1107 | - | core.PuregoSafeRegister(&xIOChannelReadUnichar, libs, "g_io_channel_read_unichar") | |
| 1108 | - | core.PuregoSafeRegister(&xIOChannelRef, libs, "g_io_channel_ref") | |
| 1109 | - | core.PuregoSafeRegister(&xIOChannelIOChannelSeek, libs, "g_io_channel_seek") | |
| 1110 | - | core.PuregoSafeRegister(&xIOChannelSeekPosition, libs, "g_io_channel_seek_position") | |
| 1111 | - | core.PuregoSafeRegister(&xIOChannelSetBufferSize, libs, "g_io_channel_set_buffer_size") | |
| 1112 | - | core.PuregoSafeRegister(&xIOChannelSetBuffered, libs, "g_io_channel_set_buffered") | |
| 1113 | - | core.PuregoSafeRegister(&xIOChannelSetCloseOnUnref, libs, "g_io_channel_set_close_on_unref") | |
| 1114 | - | core.PuregoSafeRegister(&xIOChannelSetEncoding, libs, "g_io_channel_set_encoding") | |
| 1115 | - | core.PuregoSafeRegister(&xIOChannelSetFlags, libs, "g_io_channel_set_flags") | |
| 1116 | - | core.PuregoSafeRegister(&xIOChannelSetLineTerm, libs, "g_io_channel_set_line_term") | |
| 1117 | - | core.PuregoSafeRegister(&xIOChannelShutdown, libs, "g_io_channel_shutdown") | |
| 1118 | - | core.PuregoSafeRegister(&xIOChannelUnixGetFd, libs, "g_io_channel_unix_get_fd") | |
| 1119 | - | core.PuregoSafeRegister(&xIOChannelUnref, libs, "g_io_channel_unref") | |
| 1120 | - | core.PuregoSafeRegister(&xIOChannelWrite, libs, "g_io_channel_write") | |
| 1121 | - | core.PuregoSafeRegister(&xIOChannelWriteChars, libs, "g_io_channel_write_chars") | |
| 1122 | - | core.PuregoSafeRegister(&xIOChannelWriteUnichar, libs, "g_io_channel_write_unichar") | |
| 1123 | 1139 | } | |
| @@ -98,6 +98,7 @@ type IOChannel struct { | |||||
| 98 | var xIOChannelGLibType func() types.GType | 98 | var xIOChannelGLibType func() types.GType | ||
| 99 | 99 | ||||
| 100 | func IOChannelGLibType() types.GType { | 100 | func IOChannelGLibType() types.GType { | ||
| 101 | + | core.LazyRegister(&xIOChannelGLibType, "GLIB", "g_io_channel_get_type", false) | |||
| 101 | return xIOChannelGLibType() | 102 | return xIOChannelGLibType() | ||
| 102 | } | 103 | } | ||
| 103 | 104 | ||||
| @@ -121,6 +122,7 @@ var xNewIOChannelFile func(string, string, **Error) uintptr | |||||
| 121 | // so will not cause problems, as long as no attempt is made to | 122 | // so will not cause problems, as long as no attempt is made to | ||
| 122 | // access the channel after it is closed). | 123 | // access the channel after it is closed). | ||
| 123 | func NewIOChannelFile(FilenameVar string, ModeVar string) (*IOChannel, error) { | 124 | func NewIOChannelFile(FilenameVar string, ModeVar string) (*IOChannel, error) { | ||
| 125 | + | core.LazyRegister(&xNewIOChannelFile, "GLIB", "g_io_channel_new_file", false) | |||
| 124 | var cerr *Error | 126 | var cerr *Error | ||
| 125 | 127 | ||||
| 126 | cret := xNewIOChannelFile(FilenameVar, ModeVar, &cerr) | 128 | cret := xNewIOChannelFile(FilenameVar, ModeVar, &cerr) | ||
| @@ -158,6 +160,8 @@ var xIOChannelUnixNew func(int) uintptr | |||||
| 158 | // valid file descriptor and socket. If that happens a warning is | 160 | // valid file descriptor and socket. If that happens a warning is | ||
| 159 | // issued, and GLib assumes that it is the file descriptor you mean. | 161 | // issued, and GLib assumes that it is the file descriptor you mean. | ||
| 160 | func IOChannelUnixNew(FdVar int) *IOChannel { | 162 | func IOChannelUnixNew(FdVar int) *IOChannel { | ||
| 163 | + | core.LazyRegister(&xIOChannelUnixNew, "GLIB", "g_io_channel_unix_new", false) | |||
| 164 | + | ||||
| 161 | cret := xIOChannelUnixNew(FdVar) | 165 | cret := xIOChannelUnixNew(FdVar) | ||
| 162 | if cret == 0 { | 166 | if cret == 0 { | ||
| 163 | return nil | 167 | return nil | ||
| @@ -171,6 +175,8 @@ var xIOChannelClose func(uintptr) | |||||
| 171 | // flushed, ignoring errors. The channel will not be freed until the | 175 | // flushed, ignoring errors. The channel will not be freed until the | ||
| 172 | // last reference is dropped using g_io_channel_unref(). | 176 | // last reference is dropped using g_io_channel_unref(). | ||
| 173 | func (x *IOChannel) Close() { | 177 | func (x *IOChannel) Close() { | ||
| 178 | + | core.LazyRegister(&xIOChannelClose, "GLIB", "g_io_channel_close", false) | |||
| 179 | + | ||||
| 174 | xIOChannelClose(x.GoPointer()) | 180 | xIOChannelClose(x.GoPointer()) | ||
| 175 | } | 181 | } | ||
| 176 | 182 | ||||
| @@ -178,6 +184,7 @@ var xIOChannelFlush func(uintptr, **Error) IOStatus | |||||
| 178 | 184 | ||||
| 179 | // Flushes the write buffer for the GIOChannel. | 185 | // Flushes the write buffer for the GIOChannel. | ||
| 180 | func (x *IOChannel) Flush() (IOStatus, error) { | 186 | func (x *IOChannel) Flush() (IOStatus, error) { | ||
| 187 | + | core.LazyRegister(&xIOChannelFlush, "GLIB", "g_io_channel_flush", false) | |||
| 181 | var cerr *Error | 188 | var cerr *Error | ||
| 182 | 189 | ||||
| 183 | cret := xIOChannelFlush(x.GoPointer(), &cerr) | 190 | cret := xIOChannelFlush(x.GoPointer(), &cerr) | ||
| @@ -193,6 +200,8 @@ var xIOChannelGetBufferCondition func(uintptr) IOCondition | |||||
| 193 | // is data to be read/space to write data in the internal buffers in | 200 | // is data to be read/space to write data in the internal buffers in | ||
| 194 | // the #GIOChannel. Only the flags %G_IO_IN and %G_IO_OUT may be set. | 201 | // the #GIOChannel. Only the flags %G_IO_IN and %G_IO_OUT may be set. | ||
| 195 | func (x *IOChannel) GetBufferCondition() IOCondition { | 202 | func (x *IOChannel) GetBufferCondition() IOCondition { | ||
| 203 | + | core.LazyRegister(&xIOChannelGetBufferCondition, "GLIB", "g_io_channel_get_buffer_condition", false) | |||
| 204 | + | ||||
| 196 | cret := xIOChannelGetBufferCondition(x.GoPointer()) | 205 | cret := xIOChannelGetBufferCondition(x.GoPointer()) | ||
| 197 | return cret | 206 | return cret | ||
| 198 | } | 207 | } | ||
| @@ -201,6 +210,8 @@ var xIOChannelGetBufferSize func(uintptr) uint | |||||
| 201 | 210 | ||||
| 202 | // Gets the buffer size. | 211 | // Gets the buffer size. | ||
| 203 | func (x *IOChannel) GetBufferSize() uint { | 212 | func (x *IOChannel) GetBufferSize() uint { | ||
| 213 | + | core.LazyRegister(&xIOChannelGetBufferSize, "GLIB", "g_io_channel_get_buffer_size", false) | |||
| 214 | + | ||||
| 204 | cret := xIOChannelGetBufferSize(x.GoPointer()) | 215 | cret := xIOChannelGetBufferSize(x.GoPointer()) | ||
| 205 | return cret | 216 | return cret | ||
| 206 | } | 217 | } | ||
| @@ -209,6 +220,8 @@ var xIOChannelGetBuffered func(uintptr) bool | |||||
| 209 | 220 | ||||
| 210 | // Returns whether @channel is buffered. | 221 | // Returns whether @channel is buffered. | ||
| 211 | func (x *IOChannel) GetBuffered() bool { | 222 | func (x *IOChannel) GetBuffered() bool { | ||
| 223 | + | core.LazyRegister(&xIOChannelGetBuffered, "GLIB", "g_io_channel_get_buffered", false) | |||
| 224 | + | ||||
| 212 | cret := xIOChannelGetBuffered(x.GoPointer()) | 225 | cret := xIOChannelGetBuffered(x.GoPointer()) | ||
| 213 | return cret | 226 | return cret | ||
| 214 | } | 227 | } | ||
| @@ -220,6 +233,8 @@ var xIOChannelGetCloseOnUnref func(uintptr) bool | |||||
| 220 | // destroyed. The default value of this is %TRUE for channels created | 233 | // destroyed. The default value of this is %TRUE for channels created | ||
| 221 | // by g_io_channel_new_file (), and %FALSE for all other channels. | 234 | // by g_io_channel_new_file (), and %FALSE for all other channels. | ||
| 222 | func (x *IOChannel) GetCloseOnUnref() bool { | 235 | func (x *IOChannel) GetCloseOnUnref() bool { | ||
| 236 | + | core.LazyRegister(&xIOChannelGetCloseOnUnref, "GLIB", "g_io_channel_get_close_on_unref", false) | |||
| 237 | + | ||||
| 223 | cret := xIOChannelGetCloseOnUnref(x.GoPointer()) | 238 | cret := xIOChannelGetCloseOnUnref(x.GoPointer()) | ||
| 224 | return cret | 239 | return cret | ||
| 225 | } | 240 | } | ||
| @@ -230,6 +245,8 @@ var xIOChannelGetEncoding func(uintptr) string | |||||
| 230 | // The internal encoding is always UTF-8. The encoding %NULL | 245 | // The internal encoding is always UTF-8. The encoding %NULL | ||
| 231 | // makes the channel safe for binary data. | 246 | // makes the channel safe for binary data. | ||
| 232 | func (x *IOChannel) GetEncoding() string { | 247 | func (x *IOChannel) GetEncoding() string { | ||
| 248 | + | core.LazyRegister(&xIOChannelGetEncoding, "GLIB", "g_io_channel_get_encoding", false) | |||
| 249 | + | ||||
| 233 | cret := xIOChannelGetEncoding(x.GoPointer()) | 250 | cret := xIOChannelGetEncoding(x.GoPointer()) | ||
| 234 | return cret | 251 | return cret | ||
| 235 | } | 252 | } | ||
| @@ -246,6 +263,8 @@ var xIOChannelGetFlags func(uintptr) IOFlags | |||||
| 246 | // should immediately call g_io_channel_get_flags() to update | 263 | // should immediately call g_io_channel_get_flags() to update | ||
| 247 | // the internal values of these flags. | 264 | // the internal values of these flags. | ||
| 248 | func (x *IOChannel) GetFlags() IOFlags { | 265 | func (x *IOChannel) GetFlags() IOFlags { | ||
| 266 | + | core.LazyRegister(&xIOChannelGetFlags, "GLIB", "g_io_channel_get_flags", false) | |||
| 267 | + | ||||
| 249 | cret := xIOChannelGetFlags(x.GoPointer()) | 268 | cret := xIOChannelGetFlags(x.GoPointer()) | ||
| 250 | return cret | 269 | return cret | ||
| 251 | } | 270 | } | ||
| @@ -257,6 +276,8 @@ var xIOChannelGetLineTerm func(uintptr, *int) string | |||||
| 257 | // indicates autodetection. Since 2.84, the return value is always | 276 | // indicates autodetection. Since 2.84, the return value is always | ||
| 258 | // nul-terminated. | 277 | // nul-terminated. | ||
| 259 | func (x *IOChannel) GetLineTerm(LengthVar *int) string { | 278 | func (x *IOChannel) GetLineTerm(LengthVar *int) string { | ||
| 279 | + | core.LazyRegister(&xIOChannelGetLineTerm, "GLIB", "g_io_channel_get_line_term", false) | |||
| 280 | + | ||||
| 260 | cret := xIOChannelGetLineTerm(x.GoPointer(), LengthVar) | 281 | cret := xIOChannelGetLineTerm(x.GoPointer(), LengthVar) | ||
| 261 | return cret | 282 | return cret | ||
| 262 | } | 283 | } | ||
| @@ -269,6 +290,8 @@ var xIOChannelInit func(uintptr) | |||||
| 269 | // #GIOChannel, and so is not often needed by the application | 290 | // #GIOChannel, and so is not often needed by the application | ||
| 270 | // programmer (unless you are creating a new type of #GIOChannel). | 291 | // programmer (unless you are creating a new type of #GIOChannel). | ||
| 271 | func (x *IOChannel) Init() { | 292 | func (x *IOChannel) Init() { | ||
| 293 | + | core.LazyRegister(&xIOChannelInit, "GLIB", "g_io_channel_init", false) | |||
| 294 | + | ||||
| 272 | xIOChannelInit(x.GoPointer()) | 295 | xIOChannelInit(x.GoPointer()) | ||
| 273 | } | 296 | } | ||
| 274 | 297 | ||||
| @@ -276,6 +299,8 @@ var xIOChannelRead func(uintptr, string, uint, uint) IOError | |||||
| 276 | 299 | ||||
| 277 | // Reads data from a #GIOChannel. | 300 | // Reads data from a #GIOChannel. | ||
| 278 | func (x *IOChannel) Read(BufVar string, CountVar uint, BytesReadVar uint) IOError { | 301 | func (x *IOChannel) Read(BufVar string, CountVar uint, BytesReadVar uint) IOError { | ||
| 302 | + | core.LazyRegister(&xIOChannelRead, "GLIB", "g_io_channel_read", false) | |||
| 303 | + | ||||
| 279 | cret := xIOChannelRead(x.GoPointer(), BufVar, CountVar, BytesReadVar) | 304 | cret := xIOChannelRead(x.GoPointer(), BufVar, CountVar, BytesReadVar) | ||
| 280 | return cret | 305 | return cret | ||
| 281 | } | 306 | } | ||
| @@ -284,6 +309,7 @@ var xIOChannelReadChars func(uintptr, *[]byte, uint, *uint, **Error) IOStatus | |||||
| 284 | 309 | ||||
| 285 | // Replacement for g_io_channel_read() with the new API. | 310 | // Replacement for g_io_channel_read() with the new API. | ||
| 286 | func (x *IOChannel) ReadChars(BufVar *[]byte, CountVar uint, BytesReadVar *uint) (IOStatus, error) { | 311 | func (x *IOChannel) ReadChars(BufVar *[]byte, CountVar uint, BytesReadVar *uint) (IOStatus, error) { | ||
| 312 | + | core.LazyRegister(&xIOChannelReadChars, "GLIB", "g_io_channel_read_chars", false) | |||
| 287 | var cerr *Error | 313 | var cerr *Error | ||
| 288 | 314 | ||||
| 289 | cret := xIOChannelReadChars(x.GoPointer(), BufVar, CountVar, BytesReadVar, &cerr) | 315 | cret := xIOChannelReadChars(x.GoPointer(), BufVar, CountVar, BytesReadVar, &cerr) | ||
| @@ -300,6 +326,7 @@ var xIOChannelReadLine func(uintptr, *string, *uint, *uint, **Error) IOStatus | |||||
| 300 | // @str_return will contain allocated memory if the return | 326 | // @str_return will contain allocated memory if the return | ||
| 301 | // is %G_IO_STATUS_NORMAL. | 327 | // is %G_IO_STATUS_NORMAL. | ||
| 302 | func (x *IOChannel) ReadLine(StrReturnVar *string, LengthVar *uint, TerminatorPosVar *uint) (IOStatus, error) { | 328 | func (x *IOChannel) ReadLine(StrReturnVar *string, LengthVar *uint, TerminatorPosVar *uint) (IOStatus, error) { | ||
| 329 | + | core.LazyRegister(&xIOChannelReadLine, "GLIB", "g_io_channel_read_line", false) | |||
| 303 | var cerr *Error | 330 | var cerr *Error | ||
| 304 | 331 | ||||
| 305 | cret := xIOChannelReadLine(x.GoPointer(), StrReturnVar, LengthVar, TerminatorPosVar, &cerr) | 332 | cret := xIOChannelReadLine(x.GoPointer(), StrReturnVar, LengthVar, TerminatorPosVar, &cerr) | ||
| @@ -313,6 +340,7 @@ var xIOChannelReadLineString func(uintptr, *String, uint, **Error) IOStatus | |||||
| 313 | 340 | ||||
| 314 | // Reads a line from a #GIOChannel, using a #GString as a buffer. | 341 | // Reads a line from a #GIOChannel, using a #GString as a buffer. | ||
| 315 | func (x *IOChannel) ReadLineString(BufferVar *String, TerminatorPosVar uint) (IOStatus, error) { | 342 | func (x *IOChannel) ReadLineString(BufferVar *String, TerminatorPosVar uint) (IOStatus, error) { | ||
| 343 | + | core.LazyRegister(&xIOChannelReadLineString, "GLIB", "g_io_channel_read_line_string", false) | |||
| 316 | var cerr *Error | 344 | var cerr *Error | ||
| 317 | 345 | ||||
| 318 | cret := xIOChannelReadLineString(x.GoPointer(), BufferVar, TerminatorPosVar, &cerr) | 346 | cret := xIOChannelReadLineString(x.GoPointer(), BufferVar, TerminatorPosVar, &cerr) | ||
| @@ -326,6 +354,7 @@ var xIOChannelReadToEnd func(uintptr, *[]byte, *uint, **Error) IOStatus | |||||
| 326 | 354 | ||||
| 327 | // Reads all the remaining data from the file. | 355 | // Reads all the remaining data from the file. | ||
| 328 | func (x *IOChannel) ReadToEnd(StrReturnVar *[]byte, LengthVar *uint) (IOStatus, error) { | 356 | func (x *IOChannel) ReadToEnd(StrReturnVar *[]byte, LengthVar *uint) (IOStatus, error) { | ||
| 357 | + | core.LazyRegister(&xIOChannelReadToEnd, "GLIB", "g_io_channel_read_to_end", false) | |||
| 329 | var cerr *Error | 358 | var cerr *Error | ||
| 330 | 359 | ||||
| 331 | cret := xIOChannelReadToEnd(x.GoPointer(), StrReturnVar, LengthVar, &cerr) | 360 | cret := xIOChannelReadToEnd(x.GoPointer(), StrReturnVar, LengthVar, &cerr) | ||
| @@ -340,6 +369,7 @@ var xIOChannelReadUnichar func(uintptr, *uint32, **Error) IOStatus | |||||
| 340 | // Reads a Unicode character from @channel. | 369 | // Reads a Unicode character from @channel. | ||
| 341 | // This function cannot be called on a channel with %NULL encoding. | 370 | // This function cannot be called on a channel with %NULL encoding. | ||
| 342 | func (x *IOChannel) ReadUnichar(ThecharVar *uint32) (IOStatus, error) { | 371 | func (x *IOChannel) ReadUnichar(ThecharVar *uint32) (IOStatus, error) { | ||
| 372 | + | core.LazyRegister(&xIOChannelReadUnichar, "GLIB", "g_io_channel_read_unichar", false) | |||
| 343 | var cerr *Error | 373 | var cerr *Error | ||
| 344 | 374 | ||||
| 345 | cret := xIOChannelReadUnichar(x.GoPointer(), ThecharVar, &cerr) | 375 | cret := xIOChannelReadUnichar(x.GoPointer(), ThecharVar, &cerr) | ||
| @@ -353,6 +383,8 @@ var xIOChannelRef func(uintptr) uintptr | |||||
| 353 | 383 | ||||
| 354 | // Increments the reference count of a #GIOChannel. | 384 | // Increments the reference count of a #GIOChannel. | ||
| 355 | func (x *IOChannel) Ref() *IOChannel { | 385 | func (x *IOChannel) Ref() *IOChannel { | ||
| 386 | + | core.LazyRegister(&xIOChannelRef, "GLIB", "g_io_channel_ref", false) | |||
| 387 | + | ||||
| 356 | cret := xIOChannelRef(x.GoPointer()) | 388 | cret := xIOChannelRef(x.GoPointer()) | ||
| 357 | if cret == 0 { | 389 | if cret == 0 { | ||
| 358 | return nil | 390 | return nil | ||
| @@ -365,6 +397,8 @@ var xIOChannelIOChannelSeek func(uintptr, int64, SeekType) IOError | |||||
| 365 | // Sets the current position in the #GIOChannel, similar to the standard | 397 | // Sets the current position in the #GIOChannel, similar to the standard | ||
| 366 | // library function fseek(). | 398 | // library function fseek(). | ||
| 367 | func (x *IOChannel) IOChannelSeek(OffsetVar int64, TypeVar SeekType) IOError { | 399 | func (x *IOChannel) IOChannelSeek(OffsetVar int64, TypeVar SeekType) IOError { | ||
| 400 | + | core.LazyRegister(&xIOChannelIOChannelSeek, "GLIB", "g_io_channel_seek", false) | |||
| 401 | + | ||||
| 368 | cret := xIOChannelIOChannelSeek(x.GoPointer(), OffsetVar, TypeVar) | 402 | cret := xIOChannelIOChannelSeek(x.GoPointer(), OffsetVar, TypeVar) | ||
| 369 | return cret | 403 | return cret | ||
| 370 | } | 404 | } | ||
| @@ -373,6 +407,7 @@ var xIOChannelSeekPosition func(uintptr, int64, SeekType, **Error) IOStatus | |||||
| 373 | 407 | ||||
| 374 | // Replacement for g_io_channel_seek() with the new API. | 408 | // Replacement for g_io_channel_seek() with the new API. | ||
| 375 | func (x *IOChannel) SeekPosition(OffsetVar int64, TypeVar SeekType) (IOStatus, error) { | 409 | func (x *IOChannel) SeekPosition(OffsetVar int64, TypeVar SeekType) (IOStatus, error) { | ||
| 410 | + | core.LazyRegister(&xIOChannelSeekPosition, "GLIB", "g_io_channel_seek_position", false) | |||
| 376 | var cerr *Error | 411 | var cerr *Error | ||
| 377 | 412 | ||||
| 378 | cret := xIOChannelSeekPosition(x.GoPointer(), OffsetVar, TypeVar, &cerr) | 413 | cret := xIOChannelSeekPosition(x.GoPointer(), OffsetVar, TypeVar, &cerr) | ||
| @@ -386,6 +421,8 @@ var xIOChannelSetBufferSize func(uintptr, uint) | |||||
| 386 | 421 | ||||
| 387 | // Sets the buffer size. | 422 | // Sets the buffer size. | ||
| 388 | func (x *IOChannel) SetBufferSize(SizeVar uint) { | 423 | func (x *IOChannel) SetBufferSize(SizeVar uint) { | ||
| 424 | + | core.LazyRegister(&xIOChannelSetBufferSize, "GLIB", "g_io_channel_set_buffer_size", false) | |||
| 425 | + | ||||
| 389 | xIOChannelSetBufferSize(x.GoPointer(), SizeVar) | 426 | xIOChannelSetBufferSize(x.GoPointer(), SizeVar) | ||
| 390 | } | 427 | } | ||
| 391 | 428 | ||||
| @@ -411,6 +448,8 @@ var xIOChannelSetBuffered func(uintptr, bool) | |||||
| 411 | // | 448 | // | ||
| 412 | // The default state of the channel is buffered. | 449 | // The default state of the channel is buffered. | ||
| 413 | func (x *IOChannel) SetBuffered(BufferedVar bool) { | 450 | func (x *IOChannel) SetBuffered(BufferedVar bool) { | ||
| 451 | + | core.LazyRegister(&xIOChannelSetBuffered, "GLIB", "g_io_channel_set_buffered", false) | |||
| 452 | + | ||||
| 414 | xIOChannelSetBuffered(x.GoPointer(), BufferedVar) | 453 | xIOChannelSetBuffered(x.GoPointer(), BufferedVar) | ||
| 415 | } | 454 | } | ||
| 416 | 455 | ||||
| @@ -423,6 +462,8 @@ var xIOChannelSetCloseOnUnref func(uintptr, bool) | |||||
| 423 | // Setting this flag to %TRUE for a channel you have already closed | 462 | // Setting this flag to %TRUE for a channel you have already closed | ||
| 424 | // can cause problems when the final reference to the #GIOChannel is dropped. | 463 | // can cause problems when the final reference to the #GIOChannel is dropped. | ||
| 425 | func (x *IOChannel) SetCloseOnUnref(DoCloseVar bool) { | 464 | func (x *IOChannel) SetCloseOnUnref(DoCloseVar bool) { | ||
| 465 | + | core.LazyRegister(&xIOChannelSetCloseOnUnref, "GLIB", "g_io_channel_set_close_on_unref", false) | |||
| 466 | + | ||||
| 426 | xIOChannelSetCloseOnUnref(x.GoPointer(), DoCloseVar) | 467 | xIOChannelSetCloseOnUnref(x.GoPointer(), DoCloseVar) | ||
| 427 | } | 468 | } | ||
| 428 | 469 | ||||
| @@ -463,6 +504,7 @@ var xIOChannelSetEncoding func(uintptr, uintptr, **Error) IOStatus | |||||
| 463 | // they are "seekable", cannot call g_io_channel_write_chars() after | 504 | // they are "seekable", cannot call g_io_channel_write_chars() after | ||
| 464 | // calling one of the API "read" functions. | 505 | // calling one of the API "read" functions. | ||
| 465 | func (x *IOChannel) SetEncoding(EncodingVar *string) (IOStatus, error) { | 506 | func (x *IOChannel) SetEncoding(EncodingVar *string) (IOStatus, error) { | ||
| 507 | + | core.LazyRegister(&xIOChannelSetEncoding, "GLIB", "g_io_channel_set_encoding", false) | |||
| 466 | var cerr *Error | 508 | var cerr *Error | ||
| 467 | 509 | ||||
| 468 | EncodingVarPtr := core.GStrdupNullable(EncodingVar) | 510 | EncodingVarPtr := core.GStrdupNullable(EncodingVar) | ||
| @@ -479,6 +521,7 @@ var xIOChannelSetFlags func(uintptr, IOFlags, **Error) IOStatus | |||||
| 479 | 521 | ||||
| 480 | // Sets the (writeable) flags in @channel to (@flags & %G_IO_FLAG_SET_MASK). | 522 | // Sets the (writeable) flags in @channel to (@flags & %G_IO_FLAG_SET_MASK). | ||
| 481 | func (x *IOChannel) SetFlags(FlagsVar IOFlags) (IOStatus, error) { | 523 | func (x *IOChannel) SetFlags(FlagsVar IOFlags) (IOStatus, error) { | ||
| 524 | + | core.LazyRegister(&xIOChannelSetFlags, "GLIB", "g_io_channel_set_flags", false) | |||
| 482 | var cerr *Error | 525 | var cerr *Error | ||
| 483 | 526 | ||||
| 484 | cret := xIOChannelSetFlags(x.GoPointer(), FlagsVar, &cerr) | 527 | cret := xIOChannelSetFlags(x.GoPointer(), FlagsVar, &cerr) | ||
| @@ -493,6 +536,8 @@ var xIOChannelSetLineTerm func(uintptr, uintptr, int) | |||||
| 493 | // This sets the string that #GIOChannel uses to determine | 536 | // This sets the string that #GIOChannel uses to determine | ||
| 494 | // where in the file a line break occurs. | 537 | // where in the file a line break occurs. | ||
| 495 | func (x *IOChannel) SetLineTerm(LineTermVar *string, LengthVar int) { | 538 | func (x *IOChannel) SetLineTerm(LineTermVar *string, LengthVar int) { | ||
| 539 | + | core.LazyRegister(&xIOChannelSetLineTerm, "GLIB", "g_io_channel_set_line_term", false) | |||
| 540 | + | ||||
| 496 | LineTermVarPtr := core.GStrdupNullable(LineTermVar) | 541 | LineTermVarPtr := core.GStrdupNullable(LineTermVar) | ||
| 497 | defer core.GFreeNullable(LineTermVarPtr) | 542 | defer core.GFreeNullable(LineTermVarPtr) | ||
| 498 | 543 | ||||
| @@ -505,6 +550,7 @@ var xIOChannelShutdown func(uintptr, bool, **Error) IOStatus | |||||
| 505 | // flushed if @flush is %TRUE. The channel will not be freed until the | 550 | // flushed if @flush is %TRUE. The channel will not be freed until the | ||
| 506 | // last reference is dropped using g_io_channel_unref(). | 551 | // last reference is dropped using g_io_channel_unref(). | ||
| 507 | func (x *IOChannel) Shutdown(FlushVar bool) (IOStatus, error) { | 552 | func (x *IOChannel) Shutdown(FlushVar bool) (IOStatus, error) { | ||
| 553 | + | core.LazyRegister(&xIOChannelShutdown, "GLIB", "g_io_channel_shutdown", false) | |||
| 508 | var cerr *Error | 554 | var cerr *Error | ||
| 509 | 555 | ||||
| 510 | cret := xIOChannelShutdown(x.GoPointer(), FlushVar, &cerr) | 556 | cret := xIOChannelShutdown(x.GoPointer(), FlushVar, &cerr) | ||
| @@ -521,6 +567,8 @@ var xIOChannelUnixGetFd func(uintptr) int | |||||
| 521 | // On Windows this function returns the file descriptor or socket of | 567 | // On Windows this function returns the file descriptor or socket of | ||
| 522 | // the #GIOChannel. | 568 | // the #GIOChannel. | ||
| 523 | func (x *IOChannel) UnixGetFd() int { | 569 | func (x *IOChannel) UnixGetFd() int { | ||
| 570 | + | core.LazyRegister(&xIOChannelUnixGetFd, "GLIB", "g_io_channel_unix_get_fd", false) | |||
| 571 | + | ||||
| 524 | cret := xIOChannelUnixGetFd(x.GoPointer()) | 572 | cret := xIOChannelUnixGetFd(x.GoPointer()) | ||
| 525 | return cret | 573 | return cret | ||
| 526 | } | 574 | } | ||
| @@ -529,6 +577,8 @@ var xIOChannelUnref func(uintptr) | |||||
| 529 | 577 | ||||
| 530 | // Decrements the reference count of a #GIOChannel. | 578 | // Decrements the reference count of a #GIOChannel. | ||
| 531 | func (x *IOChannel) Unref() { | 579 | func (x *IOChannel) Unref() { | ||
| 580 | + | core.LazyRegister(&xIOChannelUnref, "GLIB", "g_io_channel_unref", false) | |||
| 581 | + | ||||
| 532 | xIOChannelUnref(x.GoPointer()) | 582 | xIOChannelUnref(x.GoPointer()) | ||
| 533 | } | 583 | } | ||
| 534 | 584 | ||||
| @@ -536,6 +586,8 @@ var xIOChannelWrite func(uintptr, string, uint, uint) IOError | |||||
| 536 | 586 | ||||
| 537 | // Writes data to a #GIOChannel. | 587 | // Writes data to a #GIOChannel. | ||
| 538 | func (x *IOChannel) Write(BufVar string, CountVar uint, BytesWrittenVar uint) IOError { | 588 | func (x *IOChannel) Write(BufVar string, CountVar uint, BytesWrittenVar uint) IOError { | ||
| 589 | + | core.LazyRegister(&xIOChannelWrite, "GLIB", "g_io_channel_write", false) | |||
| 590 | + | ||||
| 539 | cret := xIOChannelWrite(x.GoPointer(), BufVar, CountVar, BytesWrittenVar) | 591 | cret := xIOChannelWrite(x.GoPointer(), BufVar, CountVar, BytesWrittenVar) | ||
| 540 | return cret | 592 | return cret | ||
| 541 | } | 593 | } | ||
| @@ -549,6 +601,7 @@ var xIOChannelWriteChars func(uintptr, []byte, int, *uint, **Error) IOStatus | |||||
| 549 | // may only be made on a channel from which data has been read in the | 601 | // may only be made on a channel from which data has been read in the | ||
| 550 | // cases described in the documentation for g_io_channel_set_encoding (). | 602 | // cases described in the documentation for g_io_channel_set_encoding (). | ||
| 551 | func (x *IOChannel) WriteChars(BufVar []byte, CountVar int, BytesWrittenVar *uint) (IOStatus, error) { | 603 | func (x *IOChannel) WriteChars(BufVar []byte, CountVar int, BytesWrittenVar *uint) (IOStatus, error) { | ||
| 604 | + | core.LazyRegister(&xIOChannelWriteChars, "GLIB", "g_io_channel_write_chars", false) | |||
| 552 | var cerr *Error | 605 | var cerr *Error | ||
| 553 | 606 | ||||
| 554 | cret := xIOChannelWriteChars(x.GoPointer(), BufVar, CountVar, BytesWrittenVar, &cerr) | 607 | cret := xIOChannelWriteChars(x.GoPointer(), BufVar, CountVar, BytesWrittenVar, &cerr) | ||
| @@ -563,6 +616,7 @@ var xIOChannelWriteUnichar func(uintptr, uint32, **Error) IOStatus | |||||
| 563 | // Writes a Unicode character to @channel. | 616 | // Writes a Unicode character to @channel. | ||
| 564 | // This function cannot be called on a channel with %NULL encoding. | 617 | // This function cannot be called on a channel with %NULL encoding. | ||
| 565 | func (x *IOChannel) WriteUnichar(ThecharVar uint32) (IOStatus, error) { | 618 | func (x *IOChannel) WriteUnichar(ThecharVar uint32) (IOStatus, error) { | ||
| 619 | + | core.LazyRegister(&xIOChannelWriteUnichar, "GLIB", "g_io_channel_write_unichar", false) | |||
| 566 | var cerr *Error | 620 | var cerr *Error | ||
| 567 | 621 | ||||
| 568 | cret := xIOChannelWriteUnichar(x.GoPointer(), ThecharVar, &cerr) | 622 | cret := xIOChannelWriteUnichar(x.GoPointer(), ThecharVar, &cerr) | ||
| @@ -616,7 +670,7 @@ func (x *IOFuncs) OverrideIoRead(cb func(*IOChannel, string, uint, uint) IOStatu | |||||
| 616 | if cb == nil { | 670 | if cb == nil { | ||
| 617 | x.xIoRead = 0 | 671 | x.xIoRead = 0 | ||
| 618 | } else { | 672 | } else { | ||
| 619 | - | x.xIoRead = purego.NewCallback(func(ChannelVarp *IOChannel, BufVarp string, CountVarp uint, BytesReadVarp uint) IOStatus { | 673 | + | x.xIoRead = purego.NewCallback(func(ChannelVarp *IOChannel, BufVarp string, CountVarp uint, BytesReadVarp uint, cerrp **Error) IOStatus { |
| 620 | return cb(ChannelVarp, BufVarp, CountVarp, BytesReadVarp) | 674 | return cb(ChannelVarp, BufVarp, CountVarp, BytesReadVarp) | ||
| 621 | }) | 675 | }) | ||
| 622 | } | 676 | } | ||
| @@ -632,10 +686,11 @@ func (x *IOFuncs) GetIoRead() func(*IOChannel, string, uint, uint) IOStatus { | |||||
| 632 | if x.xIoRead == 0 { | 686 | if x.xIoRead == 0 { | ||
| 633 | return nil | 687 | return nil | ||
| 634 | } | 688 | } | ||
| 635 | - | var rawCallback func(ChannelVarp *IOChannel, BufVarp string, CountVarp uint, BytesReadVarp uint) IOStatus | 689 | + | var rawCallback func(ChannelVarp *IOChannel, BufVarp string, CountVarp uint, BytesReadVarp uint, cerrp **Error) IOStatus |
| 636 | purego.RegisterFunc(&rawCallback, x.xIoRead) | 690 | purego.RegisterFunc(&rawCallback, x.xIoRead) | ||
| 637 | return func(ChannelVar *IOChannel, BufVar string, CountVar uint, BytesReadVar uint) IOStatus { | 691 | return func(ChannelVar *IOChannel, BufVar string, CountVar uint, BytesReadVar uint) IOStatus { | ||
| 638 | - | return rawCallback(ChannelVar, BufVar, CountVar, BytesReadVar) | 692 | + | var cerr *Error |
| 693 | + | return rawCallback(ChannelVar, BufVar, CountVar, BytesReadVar, &cerr) | |||
| 639 | } | 694 | } | ||
| 640 | } | 695 | } | ||
| 641 | 696 | ||||
| @@ -649,7 +704,7 @@ func (x *IOFuncs) OverrideIoWrite(cb func(*IOChannel, string, uint, uint) IOStat | |||||
| 649 | if cb == nil { | 704 | if cb == nil { | ||
| 650 | x.xIoWrite = 0 | 705 | x.xIoWrite = 0 | ||
| 651 | } else { | 706 | } else { | ||
| 652 | - | x.xIoWrite = purego.NewCallback(func(ChannelVarp *IOChannel, BufVarp string, CountVarp uint, BytesWrittenVarp uint) IOStatus { | 707 | + | x.xIoWrite = purego.NewCallback(func(ChannelVarp *IOChannel, BufVarp string, CountVarp uint, BytesWrittenVarp uint, cerrp **Error) IOStatus { |
| 653 | return cb(ChannelVarp, BufVarp, CountVarp, BytesWrittenVarp) | 708 | return cb(ChannelVarp, BufVarp, CountVarp, BytesWrittenVarp) | ||
| 654 | }) | 709 | }) | ||
| 655 | } | 710 | } | ||
| @@ -665,10 +720,11 @@ func (x *IOFuncs) GetIoWrite() func(*IOChannel, string, uint, uint) IOStatus { | |||||
| 665 | if x.xIoWrite == 0 { | 720 | if x.xIoWrite == 0 { | ||
| 666 | return nil | 721 | return nil | ||
| 667 | } | 722 | } | ||
| 668 | - | var rawCallback func(ChannelVarp *IOChannel, BufVarp string, CountVarp uint, BytesWrittenVarp uint) IOStatus | 723 | + | var rawCallback func(ChannelVarp *IOChannel, BufVarp string, CountVarp uint, BytesWrittenVarp uint, cerrp **Error) IOStatus |
| 669 | purego.RegisterFunc(&rawCallback, x.xIoWrite) | 724 | purego.RegisterFunc(&rawCallback, x.xIoWrite) | ||
| 670 | return func(ChannelVar *IOChannel, BufVar string, CountVar uint, BytesWrittenVar uint) IOStatus { | 725 | return func(ChannelVar *IOChannel, BufVar string, CountVar uint, BytesWrittenVar uint) IOStatus { | ||
| 671 | - | return rawCallback(ChannelVar, BufVar, CountVar, BytesWrittenVar) | 726 | + | var cerr *Error |
| 727 | + | return rawCallback(ChannelVar, BufVar, CountVar, BytesWrittenVar, &cerr) | |||
| 672 | } | 728 | } | ||
| 673 | } | 729 | } | ||
| 674 | 730 | ||||
| @@ -680,7 +736,7 @@ func (x *IOFuncs) OverrideIoSeek(cb func(*IOChannel, int64, SeekType) IOStatus) | |||||
| 680 | if cb == nil { | 736 | if cb == nil { | ||
| 681 | x.xIoSeek = 0 | 737 | x.xIoSeek = 0 | ||
| 682 | } else { | 738 | } else { | ||
| 683 | - | x.xIoSeek = purego.NewCallback(func(ChannelVarp *IOChannel, OffsetVarp int64, TypeVarp SeekType) IOStatus { | 739 | + | x.xIoSeek = purego.NewCallback(func(ChannelVarp *IOChannel, OffsetVarp int64, TypeVarp SeekType, cerrp **Error) IOStatus { |
| 684 | return cb(ChannelVarp, OffsetVarp, TypeVarp) | 740 | return cb(ChannelVarp, OffsetVarp, TypeVarp) | ||
| 685 | }) | 741 | }) | ||
| 686 | } | 742 | } | ||
| @@ -694,10 +750,11 @@ func (x *IOFuncs) GetIoSeek() func(*IOChannel, int64, SeekType) IOStatus { | |||||
| 694 | if x.xIoSeek == 0 { | 750 | if x.xIoSeek == 0 { | ||
| 695 | return nil | 751 | return nil | ||
| 696 | } | 752 | } | ||
| 697 | - | var rawCallback func(ChannelVarp *IOChannel, OffsetVarp int64, TypeVarp SeekType) IOStatus | 753 | + | var rawCallback func(ChannelVarp *IOChannel, OffsetVarp int64, TypeVarp SeekType, cerrp **Error) IOStatus |
| 698 | purego.RegisterFunc(&rawCallback, x.xIoSeek) | 754 | purego.RegisterFunc(&rawCallback, x.xIoSeek) | ||
| 699 | return func(ChannelVar *IOChannel, OffsetVar int64, TypeVar SeekType) IOStatus { | 755 | return func(ChannelVar *IOChannel, OffsetVar int64, TypeVar SeekType) IOStatus { | ||
| 700 | - | return rawCallback(ChannelVar, OffsetVar, TypeVar) | 756 | + | var cerr *Error |
| 757 | + | return rawCallback(ChannelVar, OffsetVar, TypeVar, &cerr) | |||
| 701 | } | 758 | } | ||
| 702 | } | 759 | } | ||
| 703 | 760 | ||||
| @@ -709,7 +766,7 @@ func (x *IOFuncs) OverrideIoClose(cb func(*IOChannel) IOStatus) { | |||||
| 709 | if cb == nil { | 766 | if cb == nil { | ||
| 710 | x.xIoClose = 0 | 767 | x.xIoClose = 0 | ||
| 711 | } else { | 768 | } else { | ||
| 712 | - | x.xIoClose = purego.NewCallback(func(ChannelVarp *IOChannel) IOStatus { | 769 | + | x.xIoClose = purego.NewCallback(func(ChannelVarp *IOChannel, cerrp **Error) IOStatus { |
| 713 | return cb(ChannelVarp) | 770 | return cb(ChannelVarp) | ||
| 714 | }) | 771 | }) | ||
| 715 | } | 772 | } | ||
| @@ -723,10 +780,11 @@ func (x *IOFuncs) GetIoClose() func(*IOChannel) IOStatus { | |||||
| 723 | if x.xIoClose == 0 { | 780 | if x.xIoClose == 0 { | ||
| 724 | return nil | 781 | return nil | ||
| 725 | } | 782 | } | ||
| 726 | - | var rawCallback func(ChannelVarp *IOChannel) IOStatus | 783 | + | var rawCallback func(ChannelVarp *IOChannel, cerrp **Error) IOStatus |
| 727 | purego.RegisterFunc(&rawCallback, x.xIoClose) | 784 | purego.RegisterFunc(&rawCallback, x.xIoClose) | ||
| 728 | return func(ChannelVar *IOChannel) IOStatus { | 785 | return func(ChannelVar *IOChannel) IOStatus { | ||
| 729 | - | return rawCallback(ChannelVar) | 786 | + | var cerr *Error |
| 787 | + | return rawCallback(ChannelVar, &cerr) | |||
| 730 | } | 788 | } | ||
| 731 | } | 789 | } | ||
| 732 | 790 | ||||
| @@ -814,7 +872,7 @@ func (x *IOFuncs) OverrideIoSetFlags(cb func(*IOChannel, IOFlags) IOStatus) { | |||||
| 814 | if cb == nil { | 872 | if cb == nil { | ||
| 815 | x.xIoSetFlags = 0 | 873 | x.xIoSetFlags = 0 | ||
| 816 | } else { | 874 | } else { | ||
| 817 | - | x.xIoSetFlags = purego.NewCallback(func(ChannelVarp *IOChannel, FlagsVarp IOFlags) IOStatus { | 875 | + | x.xIoSetFlags = purego.NewCallback(func(ChannelVarp *IOChannel, FlagsVarp IOFlags, cerrp **Error) IOStatus { |
| 818 | return cb(ChannelVarp, FlagsVarp) | 876 | return cb(ChannelVarp, FlagsVarp) | ||
| 819 | }) | 877 | }) | ||
| 820 | } | 878 | } | ||
| @@ -830,10 +888,11 @@ func (x *IOFuncs) GetIoSetFlags() func(*IOChannel, IOFlags) IOStatus { | |||||
| 830 | if x.xIoSetFlags == 0 { | 888 | if x.xIoSetFlags == 0 { | ||
| 831 | return nil | 889 | return nil | ||
| 832 | } | 890 | } | ||
| 833 | - | var rawCallback func(ChannelVarp *IOChannel, FlagsVarp IOFlags) IOStatus | 891 | + | var rawCallback func(ChannelVarp *IOChannel, FlagsVarp IOFlags, cerrp **Error) IOStatus |
| 834 | purego.RegisterFunc(&rawCallback, x.xIoSetFlags) | 892 | purego.RegisterFunc(&rawCallback, x.xIoSetFlags) | ||
| 835 | return func(ChannelVar *IOChannel, FlagsVar IOFlags) IOStatus { | 893 | return func(ChannelVar *IOChannel, FlagsVar IOFlags) IOStatus { | ||
| 836 | - | return rawCallback(ChannelVar, FlagsVar) | 894 | + | var cerr *Error |
| 895 | + | return rawCallback(ChannelVar, FlagsVar, &cerr) | |||
| 837 | } | 896 | } | ||
| 838 | } | 897 | } | ||
| 839 | 898 | ||||
| @@ -881,6 +940,7 @@ type IOCondition int | |||||
| 881 | var xIOConditionGLibType func() types.GType | 940 | var xIOConditionGLibType func() types.GType | ||
| 882 | 941 | ||||
| 883 | func IOConditionGLibType() types.GType { | 942 | func IOConditionGLibType() types.GType { | ||
| 943 | + | core.LazyRegister(&xIOConditionGLibType, "GLIB", "g_io_condition_get_type", false) | |||
| 884 | return xIOConditionGLibType() | 944 | return xIOConditionGLibType() | ||
| 885 | } | 945 | } | ||
| 886 | 946 | ||||
| @@ -1016,6 +1076,8 @@ var xIoAddWatch func(*IOChannel, IOCondition, uintptr, uintptr) uint | |||||
| 1016 | // Adds the #GIOChannel into the default main loop context | 1076 | // Adds the #GIOChannel into the default main loop context | ||
| 1017 | // with the default priority. | 1077 | // with the default priority. | ||
| 1018 | func IoAddWatch(ChannelVar *IOChannel, ConditionVar IOCondition, FuncVar *IOFunc, UserDataVar uintptr) uint { | 1078 | func IoAddWatch(ChannelVar *IOChannel, ConditionVar IOCondition, FuncVar *IOFunc, UserDataVar uintptr) uint { | ||
| 1079 | + | core.LazyRegister(&xIoAddWatch, "GLIB", "g_io_add_watch", false) | |||
| 1080 | + | ||||
| 1019 | cret := xIoAddWatch(ChannelVar, ConditionVar, NewCallback(FuncVar), UserDataVar) | 1081 | cret := xIoAddWatch(ChannelVar, ConditionVar, NewCallback(FuncVar), UserDataVar) | ||
| 1020 | return cret | 1082 | return cret | ||
| 1021 | } | 1083 | } | ||
| @@ -1029,6 +1091,8 @@ var xIoAddWatchFull func(*IOChannel, int, IOCondition, uintptr, uintptr, uintptr | |||||
| 1029 | // and attaches it to the main loop context with g_source_attach(). | 1091 | // and attaches it to the main loop context with g_source_attach(). | ||
| 1030 | // You can do these steps manually if you need greater control. | 1092 | // You can do these steps manually if you need greater control. | ||
| 1031 | func IoAddWatchFull(ChannelVar *IOChannel, PriorityVar int, ConditionVar IOCondition, FuncVar *IOFunc, UserDataVar uintptr, NotifyVar *DestroyNotify) uint { | 1093 | func IoAddWatchFull(ChannelVar *IOChannel, PriorityVar int, ConditionVar IOCondition, FuncVar *IOFunc, UserDataVar uintptr, NotifyVar *DestroyNotify) uint { | ||
| 1094 | + | core.LazyRegister(&xIoAddWatchFull, "GLIB", "g_io_add_watch_full", false) | |||
| 1095 | + | ||||
| 1032 | cret := xIoAddWatchFull(ChannelVar, PriorityVar, ConditionVar, NewCallback(FuncVar), UserDataVar, NewCallbackNullable(NotifyVar)) | 1096 | cret := xIoAddWatchFull(ChannelVar, PriorityVar, ConditionVar, NewCallback(FuncVar), UserDataVar, NewCallbackNullable(NotifyVar)) | ||
| 1033 | return cret | 1097 | return cret | ||
| 1034 | } | 1098 | } | ||
| @@ -1037,6 +1101,8 @@ var xIoChannelErrorFromErrno func(int) IOChannelError | |||||
| 1037 | 1101 | ||||
| 1038 | // Converts an `errno` error number to a #GIOChannelError. | 1102 | // Converts an `errno` error number to a #GIOChannelError. | ||
| 1039 | func IoChannelErrorFromErrno(EnVar int) IOChannelError { | 1103 | func IoChannelErrorFromErrno(EnVar int) IOChannelError { | ||
| 1104 | + | core.LazyRegister(&xIoChannelErrorFromErrno, "GLIB", "g_io_channel_error_from_errno", false) | |||
| 1105 | + | ||||
| 1040 | cret := xIoChannelErrorFromErrno(EnVar) | 1106 | cret := xIoChannelErrorFromErrno(EnVar) | ||
| 1041 | return cret | 1107 | return cret | ||
| 1042 | } | 1108 | } | ||
| @@ -1058,6 +1124,8 @@ var xIoCreateWatch func(*IOChannel, IOCondition) uintptr | |||||
| 1058 | // puts the socket in non-blocking mode. This is a side-effect of the | 1124 | // puts the socket in non-blocking mode. This is a side-effect of the | ||
| 1059 | // implementation and unavoidable. | 1125 | // implementation and unavoidable. | ||
| 1060 | func IoCreateWatch(ChannelVar *IOChannel, ConditionVar IOCondition) *Source { | 1126 | func IoCreateWatch(ChannelVar *IOChannel, ConditionVar IOCondition) *Source { | ||
| 1127 | + | core.LazyRegister(&xIoCreateWatch, "GLIB", "g_io_create_watch", false) | |||
| 1128 | + | ||||
| 1061 | cret := xIoCreateWatch(ChannelVar, ConditionVar) | 1129 | cret := xIoCreateWatch(ChannelVar, ConditionVar) | ||
| 1062 | if cret == 0 { | 1130 | if cret == 0 { | ||
| 1063 | return nil | 1131 | return nil | ||
| @@ -1068,56 +1136,4 @@ func IoCreateWatch(ChannelVar *IOChannel, ConditionVar IOCondition) *Source { | |||||
| 1068 | func init() { | 1136 | func init() { | ||
| 1069 | core.SetPackageName("GLIB", "glib-2.0") | 1137 | core.SetPackageName("GLIB", "glib-2.0") | ||
| 1070 | core.SetSharedLibraries("GLIB", []string{"libgobject-2.0.so.0", "libglib-2.0.so.0", "libgobject-2.0.0.dylib", "libglib-2.0.0.dylib"}) | 1138 | core.SetSharedLibraries("GLIB", []string{"libgobject-2.0.so.0", "libglib-2.0.so.0", "libgobject-2.0.0.dylib", "libglib-2.0.0.dylib"}) | ||
| 1071 | - | var libs []uintptr | |||
| 1072 | - | for _, libPath := range core.GetPaths("GLIB") { | |||
| 1073 | - | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |||
| 1074 | - | if err != nil { | |||
| 1075 | - | panic(err) | |||
| 1076 | - | } | |||
| 1077 | - | libs = append(libs, lib) | |||
| 1078 | - | } | |||
| 1079 | - | ||||
| 1080 | - | core.PuregoSafeRegister(&xIOConditionGLibType, libs, "g_io_condition_get_type") | |||
| 1081 | - | ||||
| 1082 | - | core.PuregoSafeRegister(&xIoAddWatch, libs, "g_io_add_watch") | |||
| 1083 | - | core.PuregoSafeRegister(&xIoAddWatchFull, libs, "g_io_add_watch_full") | |||
| 1084 | - | core.PuregoSafeRegister(&xIoChannelErrorFromErrno, libs, "g_io_channel_error_from_errno") | |||
| 1085 | - | core.PuregoSafeRegister(&xIoCreateWatch, libs, "g_io_create_watch") | |||
| 1086 | - | ||||
| 1087 | - | core.PuregoSafeRegister(&xIOChannelGLibType, libs, "g_io_channel_get_type") | |||
| 1088 | - | ||||
| 1089 | - | core.PuregoSafeRegister(&xNewIOChannelFile, libs, "g_io_channel_new_file") | |||
| 1090 | - | core.PuregoSafeRegister(&xIOChannelUnixNew, libs, "g_io_channel_unix_new") | |||
| 1091 | - | ||||
| 1092 | - | core.PuregoSafeRegister(&xIOChannelClose, libs, "g_io_channel_close") | |||
| 1093 | - | core.PuregoSafeRegister(&xIOChannelFlush, libs, "g_io_channel_flush") | |||
| 1094 | - | core.PuregoSafeRegister(&xIOChannelGetBufferCondition, libs, "g_io_channel_get_buffer_condition") | |||
| 1095 | - | core.PuregoSafeRegister(&xIOChannelGetBufferSize, libs, "g_io_channel_get_buffer_size") | |||
| 1096 | - | core.PuregoSafeRegister(&xIOChannelGetBuffered, libs, "g_io_channel_get_buffered") | |||
| 1097 | - | core.PuregoSafeRegister(&xIOChannelGetCloseOnUnref, libs, "g_io_channel_get_close_on_unref") | |||
| 1098 | - | core.PuregoSafeRegister(&xIOChannelGetEncoding, libs, "g_io_channel_get_encoding") | |||
| 1099 | - | core.PuregoSafeRegister(&xIOChannelGetFlags, libs, "g_io_channel_get_flags") | |||
| 1100 | - | core.PuregoSafeRegister(&xIOChannelGetLineTerm, libs, "g_io_channel_get_line_term") | |||
| 1101 | - | core.PuregoSafeRegister(&xIOChannelInit, libs, "g_io_channel_init") | |||
| 1102 | - | core.PuregoSafeRegister(&xIOChannelRead, libs, "g_io_channel_read") | |||
| 1103 | - | core.PuregoSafeRegister(&xIOChannelReadChars, libs, "g_io_channel_read_chars") | |||
| 1104 | - | core.PuregoSafeRegister(&xIOChannelReadLine, libs, "g_io_channel_read_line") | |||
| 1105 | - | core.PuregoSafeRegister(&xIOChannelReadLineString, libs, "g_io_channel_read_line_string") | |||
| 1106 | - | core.PuregoSafeRegister(&xIOChannelReadToEnd, libs, "g_io_channel_read_to_end") | |||
| 1107 | - | core.PuregoSafeRegister(&xIOChannelReadUnichar, libs, "g_io_channel_read_unichar") | |||
| 1108 | - | core.PuregoSafeRegister(&xIOChannelRef, libs, "g_io_channel_ref") | |||
| 1109 | - | core.PuregoSafeRegister(&xIOChannelIOChannelSeek, libs, "g_io_channel_seek") | |||
| 1110 | - | core.PuregoSafeRegister(&xIOChannelSeekPosition, libs, "g_io_channel_seek_position") | |||
| 1111 | - | core.PuregoSafeRegister(&xIOChannelSetBufferSize, libs, "g_io_channel_set_buffer_size") | |||
| 1112 | - | core.PuregoSafeRegister(&xIOChannelSetBuffered, libs, "g_io_channel_set_buffered") | |||
| 1113 | - | core.PuregoSafeRegister(&xIOChannelSetCloseOnUnref, libs, "g_io_channel_set_close_on_unref") | |||
| 1114 | - | core.PuregoSafeRegister(&xIOChannelSetEncoding, libs, "g_io_channel_set_encoding") | |||
| 1115 | - | core.PuregoSafeRegister(&xIOChannelSetFlags, libs, "g_io_channel_set_flags") | |||
| 1116 | - | core.PuregoSafeRegister(&xIOChannelSetLineTerm, libs, "g_io_channel_set_line_term") | |||
| 1117 | - | core.PuregoSafeRegister(&xIOChannelShutdown, libs, "g_io_channel_shutdown") | |||
| 1118 | - | core.PuregoSafeRegister(&xIOChannelUnixGetFd, libs, "g_io_channel_unix_get_fd") | |||
| 1119 | - | core.PuregoSafeRegister(&xIOChannelUnref, libs, "g_io_channel_unref") | |||
| 1120 | - | core.PuregoSafeRegister(&xIOChannelWrite, libs, "g_io_channel_write") | |||
| 1121 | - | core.PuregoSafeRegister(&xIOChannelWriteChars, libs, "g_io_channel_write_chars") | |||
| 1122 | - | core.PuregoSafeRegister(&xIOChannelWriteUnichar, libs, "g_io_channel_write_unichar") | |||
| 1123 | } | 1139 | } | ||