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
| @@ -405,7 +405,7 @@ func (x *MountIface) OverrideUnmountFinish(cb func(Mount, AsyncResult) bool) { | |||
| 405 | 405 | if cb == nil { | |
| 406 | 406 | x.xUnmountFinish = 0 | |
| 407 | 407 | } else { | |
| 408 | - | x.xUnmountFinish = purego.NewCallback(func(MountVarp uintptr, ResultVarp uintptr) bool { | |
| 408 | + | x.xUnmountFinish = purego.NewCallback(func(MountVarp uintptr, ResultVarp uintptr, cerrp **glib.Error) bool { | |
| 409 | 409 | return cb(&MountBase{Ptr: MountVarp}, &AsyncResultBase{Ptr: ResultVarp}) | |
| 410 | 410 | }) | |
| 411 | 411 | } | |
| @@ -417,10 +417,11 @@ func (x *MountIface) GetUnmountFinish() func(Mount, AsyncResult) bool { | |||
| 417 | 417 | if x.xUnmountFinish == 0 { | |
| 418 | 418 | return nil | |
| 419 | 419 | } | |
| 420 | - | var rawCallback func(MountVarp uintptr, ResultVarp uintptr) bool | |
| 420 | + | var rawCallback func(MountVarp uintptr, ResultVarp uintptr, cerrp **glib.Error) bool | |
| 421 | 421 | purego.RegisterFunc(&rawCallback, x.xUnmountFinish) | |
| 422 | 422 | return func(MountVar Mount, ResultVar AsyncResult) bool { | |
| 423 | - | return rawCallback(MountVar.GoPointer(), ResultVar.GoPointer()) | |
| 423 | + | var cerr *glib.Error | |
| 424 | + | return rawCallback(MountVar.GoPointer(), ResultVar.GoPointer(), &cerr) | |
| 424 | 425 | } | |
| 425 | 426 | } | |
| 426 | 427 | ||
| @@ -455,7 +456,7 @@ func (x *MountIface) OverrideEjectFinish(cb func(Mount, AsyncResult) bool) { | |||
| 455 | 456 | if cb == nil { | |
| 456 | 457 | x.xEjectFinish = 0 | |
| 457 | 458 | } else { | |
| 458 | - | x.xEjectFinish = purego.NewCallback(func(MountVarp uintptr, ResultVarp uintptr) bool { | |
| 459 | + | x.xEjectFinish = purego.NewCallback(func(MountVarp uintptr, ResultVarp uintptr, cerrp **glib.Error) bool { | |
| 459 | 460 | return cb(&MountBase{Ptr: MountVarp}, &AsyncResultBase{Ptr: ResultVarp}) | |
| 460 | 461 | }) | |
| 461 | 462 | } | |
| @@ -467,10 +468,11 @@ func (x *MountIface) GetEjectFinish() func(Mount, AsyncResult) bool { | |||
| 467 | 468 | if x.xEjectFinish == 0 { | |
| 468 | 469 | return nil | |
| 469 | 470 | } | |
| 470 | - | var rawCallback func(MountVarp uintptr, ResultVarp uintptr) bool | |
| 471 | + | var rawCallback func(MountVarp uintptr, ResultVarp uintptr, cerrp **glib.Error) bool | |
| 471 | 472 | purego.RegisterFunc(&rawCallback, x.xEjectFinish) | |
| 472 | 473 | return func(MountVar Mount, ResultVar AsyncResult) bool { | |
| 473 | - | return rawCallback(MountVar.GoPointer(), ResultVar.GoPointer()) | |
| 474 | + | var cerr *glib.Error | |
| 475 | + | return rawCallback(MountVar.GoPointer(), ResultVar.GoPointer(), &cerr) | |
| 474 | 476 | } | |
| 475 | 477 | } | |
| 476 | 478 | ||
| @@ -505,7 +507,7 @@ func (x *MountIface) OverrideRemountFinish(cb func(Mount, AsyncResult) bool) { | |||
| 505 | 507 | if cb == nil { | |
| 506 | 508 | x.xRemountFinish = 0 | |
| 507 | 509 | } else { | |
| 508 | - | x.xRemountFinish = purego.NewCallback(func(MountVarp uintptr, ResultVarp uintptr) bool { | |
| 510 | + | x.xRemountFinish = purego.NewCallback(func(MountVarp uintptr, ResultVarp uintptr, cerrp **glib.Error) bool { | |
| 509 | 511 | return cb(&MountBase{Ptr: MountVarp}, &AsyncResultBase{Ptr: ResultVarp}) | |
| 510 | 512 | }) | |
| 511 | 513 | } | |
| @@ -517,10 +519,11 @@ func (x *MountIface) GetRemountFinish() func(Mount, AsyncResult) bool { | |||
| 517 | 519 | if x.xRemountFinish == 0 { | |
| 518 | 520 | return nil | |
| 519 | 521 | } | |
| 520 | - | var rawCallback func(MountVarp uintptr, ResultVarp uintptr) bool | |
| 522 | + | var rawCallback func(MountVarp uintptr, ResultVarp uintptr, cerrp **glib.Error) bool | |
| 521 | 523 | purego.RegisterFunc(&rawCallback, x.xRemountFinish) | |
| 522 | 524 | return func(MountVar Mount, ResultVar AsyncResult) bool { | |
| 523 | - | return rawCallback(MountVar.GoPointer(), ResultVar.GoPointer()) | |
| 525 | + | var cerr *glib.Error | |
| 526 | + | return rawCallback(MountVar.GoPointer(), ResultVar.GoPointer(), &cerr) | |
| 524 | 527 | } | |
| 525 | 528 | } | |
| 526 | 529 | ||
| @@ -561,7 +564,7 @@ func (x *MountIface) OverrideGuessContentTypeFinish(cb func(Mount, AsyncResult) | |||
| 561 | 564 | if cb == nil { | |
| 562 | 565 | x.xGuessContentTypeFinish = 0 | |
| 563 | 566 | } else { | |
| 564 | - | x.xGuessContentTypeFinish = purego.NewCallback(func(MountVarp uintptr, ResultVarp uintptr) []string { | |
| 567 | + | x.xGuessContentTypeFinish = purego.NewCallback(func(MountVarp uintptr, ResultVarp uintptr, cerrp **glib.Error) []string { | |
| 565 | 568 | return cb(&MountBase{Ptr: MountVarp}, &AsyncResultBase{Ptr: ResultVarp}) | |
| 566 | 569 | }) | |
| 567 | 570 | } | |
| @@ -573,10 +576,11 @@ func (x *MountIface) GetGuessContentTypeFinish() func(Mount, AsyncResult) []stri | |||
| 573 | 576 | if x.xGuessContentTypeFinish == 0 { | |
| 574 | 577 | return nil | |
| 575 | 578 | } | |
| 576 | - | var rawCallback func(MountVarp uintptr, ResultVarp uintptr) []string | |
| 579 | + | var rawCallback func(MountVarp uintptr, ResultVarp uintptr, cerrp **glib.Error) []string | |
| 577 | 580 | purego.RegisterFunc(&rawCallback, x.xGuessContentTypeFinish) | |
| 578 | 581 | return func(MountVar Mount, ResultVar AsyncResult) []string { | |
| 579 | - | return rawCallback(MountVar.GoPointer(), ResultVar.GoPointer()) | |
| 582 | + | var cerr *glib.Error | |
| 583 | + | return rawCallback(MountVar.GoPointer(), ResultVar.GoPointer(), &cerr) | |
| 580 | 584 | } | |
| 581 | 585 | } | |
| 582 | 586 | ||
| @@ -586,7 +590,7 @@ func (x *MountIface) OverrideGuessContentTypeSync(cb func(Mount, bool, *Cancella | |||
| 586 | 590 | if cb == nil { | |
| 587 | 591 | x.xGuessContentTypeSync = 0 | |
| 588 | 592 | } else { | |
| 589 | - | x.xGuessContentTypeSync = purego.NewCallback(func(MountVarp uintptr, ForceRescanVarp bool, CancellableVarp uintptr) []string { | |
| 593 | + | x.xGuessContentTypeSync = purego.NewCallback(func(MountVarp uintptr, ForceRescanVarp bool, CancellableVarp uintptr, cerrp **glib.Error) []string { | |
| 590 | 594 | return cb(&MountBase{Ptr: MountVarp}, ForceRescanVarp, CancellableNewFromInternalPtr(CancellableVarp)) | |
| 591 | 595 | }) | |
| 592 | 596 | } | |
| @@ -598,10 +602,11 @@ func (x *MountIface) GetGuessContentTypeSync() func(Mount, bool, *Cancellable) [ | |||
| 598 | 602 | if x.xGuessContentTypeSync == 0 { | |
| 599 | 603 | return nil | |
| 600 | 604 | } | |
| 601 | - | var rawCallback func(MountVarp uintptr, ForceRescanVarp bool, CancellableVarp uintptr) []string | |
| 605 | + | var rawCallback func(MountVarp uintptr, ForceRescanVarp bool, CancellableVarp uintptr, cerrp **glib.Error) []string | |
| 602 | 606 | purego.RegisterFunc(&rawCallback, x.xGuessContentTypeSync) | |
| 603 | 607 | return func(MountVar Mount, ForceRescanVar bool, CancellableVar *Cancellable) []string { | |
| 604 | - | return rawCallback(MountVar.GoPointer(), ForceRescanVar, CancellableVar.GoPointer()) | |
| 608 | + | var cerr *glib.Error | |
| 609 | + | return rawCallback(MountVar.GoPointer(), ForceRescanVar, CancellableVar.GoPointer(), &cerr) | |
| 605 | 610 | } | |
| 606 | 611 | } | |
| 607 | 612 | ||
| @@ -661,7 +666,7 @@ func (x *MountIface) OverrideUnmountWithOperationFinish(cb func(Mount, AsyncResu | |||
| 661 | 666 | if cb == nil { | |
| 662 | 667 | x.xUnmountWithOperationFinish = 0 | |
| 663 | 668 | } else { | |
| 664 | - | x.xUnmountWithOperationFinish = purego.NewCallback(func(MountVarp uintptr, ResultVarp uintptr) bool { | |
| 669 | + | x.xUnmountWithOperationFinish = purego.NewCallback(func(MountVarp uintptr, ResultVarp uintptr, cerrp **glib.Error) bool { | |
| 665 | 670 | return cb(&MountBase{Ptr: MountVarp}, &AsyncResultBase{Ptr: ResultVarp}) | |
| 666 | 671 | }) | |
| 667 | 672 | } | |
| @@ -673,10 +678,11 @@ func (x *MountIface) GetUnmountWithOperationFinish() func(Mount, AsyncResult) bo | |||
| 673 | 678 | if x.xUnmountWithOperationFinish == 0 { | |
| 674 | 679 | return nil | |
| 675 | 680 | } | |
| 676 | - | var rawCallback func(MountVarp uintptr, ResultVarp uintptr) bool | |
| 681 | + | var rawCallback func(MountVarp uintptr, ResultVarp uintptr, cerrp **glib.Error) bool | |
| 677 | 682 | purego.RegisterFunc(&rawCallback, x.xUnmountWithOperationFinish) | |
| 678 | 683 | return func(MountVar Mount, ResultVar AsyncResult) bool { | |
| 679 | - | return rawCallback(MountVar.GoPointer(), ResultVar.GoPointer()) | |
| 684 | + | var cerr *glib.Error | |
| 685 | + | return rawCallback(MountVar.GoPointer(), ResultVar.GoPointer(), &cerr) | |
| 680 | 686 | } | |
| 681 | 687 | } | |
| 682 | 688 | ||
| @@ -711,7 +717,7 @@ func (x *MountIface) OverrideEjectWithOperationFinish(cb func(Mount, AsyncResult | |||
| 711 | 717 | if cb == nil { | |
| 712 | 718 | x.xEjectWithOperationFinish = 0 | |
| 713 | 719 | } else { | |
| 714 | - | x.xEjectWithOperationFinish = purego.NewCallback(func(MountVarp uintptr, ResultVarp uintptr) bool { | |
| 720 | + | x.xEjectWithOperationFinish = purego.NewCallback(func(MountVarp uintptr, ResultVarp uintptr, cerrp **glib.Error) bool { | |
| 715 | 721 | return cb(&MountBase{Ptr: MountVarp}, &AsyncResultBase{Ptr: ResultVarp}) | |
| 716 | 722 | }) | |
| 717 | 723 | } | |
| @@ -723,10 +729,11 @@ func (x *MountIface) GetEjectWithOperationFinish() func(Mount, AsyncResult) bool | |||
| 723 | 729 | if x.xEjectWithOperationFinish == 0 { | |
| 724 | 730 | return nil | |
| 725 | 731 | } | |
| 726 | - | var rawCallback func(MountVarp uintptr, ResultVarp uintptr) bool | |
| 732 | + | var rawCallback func(MountVarp uintptr, ResultVarp uintptr, cerrp **glib.Error) bool | |
| 727 | 733 | purego.RegisterFunc(&rawCallback, x.xEjectWithOperationFinish) | |
| 728 | 734 | return func(MountVar Mount, ResultVar AsyncResult) bool { | |
| 729 | - | return rawCallback(MountVar.GoPointer(), ResultVar.GoPointer()) | |
| 735 | + | var cerr *glib.Error | |
| 736 | + | return rawCallback(MountVar.GoPointer(), ResultVar.GoPointer(), &cerr) | |
| 730 | 737 | } | |
| 731 | 738 | } | |
| 732 | 739 | ||
| @@ -885,6 +892,7 @@ type Mount interface { | |||
| 885 | 892 | var xMountGLibType func() types.GType | |
| 886 | 893 | ||
| 887 | 894 | func MountGLibType() types.GType { | |
| 895 | + | core.LazyRegister(&xMountGLibType, "GIO", "g_mount_get_type", false) | |
| 888 | 896 | return xMountGLibType() | |
| 889 | 897 | } | |
| 890 | 898 | ||
| @@ -1219,75 +1227,196 @@ func (x *MountBase) Unshadow() { | |||
| 1219 | 1227 | XGMountUnshadow(x.GoPointer()) | |
| 1220 | 1228 | } | |
| 1221 | 1229 | ||
| 1230 | + | var XGMountCanEject func(uintptr) bool = func(instance uintptr) bool { | |
| 1231 | + | core.LazyRegister(&xXGMountCanEject, "GIO", "g_mount_can_eject", false) | |
| 1232 | + | return xXGMountCanEject(instance) | |
| 1233 | + | } | |
| 1234 | + | ||
| 1235 | + | var ( | |
| 1236 | + | xXGMountCanEject func(uintptr) bool | |
| 1237 | + | XGMountCanUnmount func(uintptr) bool = func(instance uintptr) bool { | |
| 1238 | + | core.LazyRegister(&xXGMountCanUnmount, "GIO", "g_mount_can_unmount", false) | |
| 1239 | + | return xXGMountCanUnmount(instance) | |
| 1240 | + | } | |
| 1241 | + | ) | |
| 1242 | + | var ( | |
| 1243 | + | xXGMountCanUnmount func(uintptr) bool | |
| 1244 | + | XGMountEject func(uintptr, MountUnmountFlags, uintptr, uintptr, uintptr) = func(instance uintptr, FlagsVarp MountUnmountFlags, CancellableVarp uintptr, CallbackVarp uintptr, UserDataVarp uintptr) { | |
| 1245 | + | core.LazyRegister(&xXGMountEject, "GIO", "g_mount_eject", false) | |
| 1246 | + | xXGMountEject(instance, FlagsVarp, CancellableVarp, CallbackVarp, UserDataVarp) | |
| 1247 | + | } | |
| 1248 | + | ) | |
| 1249 | + | var ( | |
| 1250 | + | xXGMountEject func(uintptr, MountUnmountFlags, uintptr, uintptr, uintptr) | |
| 1251 | + | XGMountEjectFinish func(uintptr, uintptr, **glib.Error) bool = func(instance uintptr, ResultVarp uintptr, cerrp **glib.Error) bool { | |
| 1252 | + | core.LazyRegister(&xXGMountEjectFinish, "GIO", "g_mount_eject_finish", false) | |
| 1253 | + | return xXGMountEjectFinish(instance, ResultVarp, cerrp) | |
| 1254 | + | } | |
| 1255 | + | ) | |
| 1256 | + | var ( | |
| 1257 | + | xXGMountEjectFinish func(uintptr, uintptr, **glib.Error) bool | |
| 1258 | + | XGMountEjectWithOperation func(uintptr, MountUnmountFlags, uintptr, uintptr, uintptr, uintptr) = func(instance uintptr, FlagsVarp MountUnmountFlags, MountOperationVarp uintptr, CancellableVarp uintptr, CallbackVarp uintptr, UserDataVarp uintptr) { | |
| 1259 | + | core.LazyRegister(&xXGMountEjectWithOperation, "GIO", "g_mount_eject_with_operation", false) | |
| 1260 | + | xXGMountEjectWithOperation(instance, FlagsVarp, MountOperationVarp, CancellableVarp, CallbackVarp, UserDataVarp) | |
| 1261 | + | } | |
| 1262 | + | ) | |
| 1263 | + | var ( | |
| 1264 | + | xXGMountEjectWithOperation func(uintptr, MountUnmountFlags, uintptr, uintptr, uintptr, uintptr) | |
| 1265 | + | XGMountEjectWithOperationFinish func(uintptr, uintptr, **glib.Error) bool = func(instance uintptr, ResultVarp uintptr, cerrp **glib.Error) bool { | |
| 1266 | + | core.LazyRegister(&xXGMountEjectWithOperationFinish, "GIO", "g_mount_eject_with_operation_finish", false) | |
| 1267 | + | return xXGMountEjectWithOperationFinish(instance, ResultVarp, cerrp) | |
| 1268 | + | } | |
| 1269 | + | ) | |
| 1270 | + | var ( | |
| 1271 | + | xXGMountEjectWithOperationFinish func(uintptr, uintptr, **glib.Error) bool | |
| 1272 | + | XGMountGetDefaultLocation func(uintptr) uintptr = func(instance uintptr) uintptr { | |
| 1273 | + | core.LazyRegister(&xXGMountGetDefaultLocation, "GIO", "g_mount_get_default_location", false) | |
| 1274 | + | return xXGMountGetDefaultLocation(instance) | |
| 1275 | + | } | |
| 1276 | + | ) | |
| 1222 | 1277 | var ( | |
| 1223 | - | XGMountCanEject func(uintptr) bool | |
| 1224 | - | XGMountCanUnmount func(uintptr) bool | |
| 1225 | - | XGMountEject func(uintptr, MountUnmountFlags, uintptr, uintptr, uintptr) | |
| 1226 | - | XGMountEjectFinish func(uintptr, uintptr, **glib.Error) bool | |
| 1227 | - | XGMountEjectWithOperation func(uintptr, MountUnmountFlags, uintptr, uintptr, uintptr, uintptr) | |
| 1228 | - | XGMountEjectWithOperationFinish func(uintptr, uintptr, **glib.Error) bool | |
| 1229 | - | XGMountGetDefaultLocation func(uintptr) uintptr | |
| 1230 | - | XGMountGetDrive func(uintptr) uintptr | |
| 1231 | - | XGMountGetIcon func(uintptr) uintptr | |
| 1232 | - | XGMountGetName func(uintptr) string | |
| 1233 | - | XGMountGetRoot func(uintptr) uintptr | |
| 1234 | - | XGMountGetSortKey func(uintptr) string | |
| 1235 | - | XGMountGetSymbolicIcon func(uintptr) uintptr | |
| 1236 | - | XGMountGetUuid func(uintptr) string | |
| 1237 | - | XGMountGetVolume func(uintptr) uintptr | |
| 1238 | - | XGMountGuessContentType func(uintptr, bool, uintptr, uintptr, uintptr) | |
| 1239 | - | XGMountGuessContentTypeFinish func(uintptr, uintptr, **glib.Error) []string | |
| 1240 | - | XGMountGuessContentTypeSync func(uintptr, bool, uintptr, **glib.Error) []string | |
| 1241 | - | XGMountIsShadowed func(uintptr) bool | |
| 1242 | - | XGMountRemount func(uintptr, MountMountFlags, uintptr, uintptr, uintptr, uintptr) | |
| 1243 | - | XGMountRemountFinish func(uintptr, uintptr, **glib.Error) bool | |
| 1244 | - | XGMountShadow func(uintptr) | |
| 1245 | - | XGMountUnmount func(uintptr, MountUnmountFlags, uintptr, uintptr, uintptr) | |
| 1246 | - | XGMountUnmountFinish func(uintptr, uintptr, **glib.Error) bool | |
| 1247 | - | XGMountUnmountWithOperation func(uintptr, MountUnmountFlags, uintptr, uintptr, uintptr, uintptr) | |
| 1248 | - | XGMountUnmountWithOperationFinish func(uintptr, uintptr, **glib.Error) bool | |
| 1249 | - | XGMountUnshadow func(uintptr) | |
| 1278 | + | xXGMountGetDefaultLocation func(uintptr) uintptr | |
| 1279 | + | XGMountGetDrive func(uintptr) uintptr = func(instance uintptr) uintptr { | |
| 1280 | + | core.LazyRegister(&xXGMountGetDrive, "GIO", "g_mount_get_drive", false) | |
| 1281 | + | return xXGMountGetDrive(instance) | |
| 1282 | + | } | |
| 1283 | + | ) | |
| 1284 | + | var ( | |
| 1285 | + | xXGMountGetDrive func(uintptr) uintptr | |
| 1286 | + | XGMountGetIcon func(uintptr) uintptr = func(instance uintptr) uintptr { | |
| 1287 | + | core.LazyRegister(&xXGMountGetIcon, "GIO", "g_mount_get_icon", false) | |
| 1288 | + | return xXGMountGetIcon(instance) | |
| 1289 | + | } | |
| 1290 | + | ) | |
| 1291 | + | var ( | |
| 1292 | + | xXGMountGetIcon func(uintptr) uintptr | |
| 1293 | + | XGMountGetName func(uintptr) string = func(instance uintptr) string { | |
| 1294 | + | core.LazyRegister(&xXGMountGetName, "GIO", "g_mount_get_name", false) | |
| 1295 | + | return xXGMountGetName(instance) | |
| 1296 | + | } | |
| 1297 | + | ) | |
| 1298 | + | var ( | |
| 1299 | + | xXGMountGetName func(uintptr) string | |
| 1300 | + | XGMountGetRoot func(uintptr) uintptr = func(instance uintptr) uintptr { | |
| 1301 | + | core.LazyRegister(&xXGMountGetRoot, "GIO", "g_mount_get_root", false) | |
| 1302 | + | return xXGMountGetRoot(instance) | |
| 1303 | + | } | |
| 1250 | 1304 | ) | |
| 1305 | + | var ( | |
| 1306 | + | xXGMountGetRoot func(uintptr) uintptr | |
| 1307 | + | XGMountGetSortKey func(uintptr) string = func(instance uintptr) string { | |
| 1308 | + | core.LazyRegister(&xXGMountGetSortKey, "GIO", "g_mount_get_sort_key", false) | |
| 1309 | + | return xXGMountGetSortKey(instance) | |
| 1310 | + | } | |
| 1311 | + | ) | |
| 1312 | + | var ( | |
| 1313 | + | xXGMountGetSortKey func(uintptr) string | |
| 1314 | + | XGMountGetSymbolicIcon func(uintptr) uintptr = func(instance uintptr) uintptr { | |
| 1315 | + | core.LazyRegister(&xXGMountGetSymbolicIcon, "GIO", "g_mount_get_symbolic_icon", false) | |
| 1316 | + | return xXGMountGetSymbolicIcon(instance) | |
| 1317 | + | } | |
| 1318 | + | ) | |
| 1319 | + | var ( | |
| 1320 | + | xXGMountGetSymbolicIcon func(uintptr) uintptr | |
| 1321 | + | XGMountGetUuid func(uintptr) string = func(instance uintptr) string { | |
| 1322 | + | core.LazyRegister(&xXGMountGetUuid, "GIO", "g_mount_get_uuid", false) | |
| 1323 | + | return xXGMountGetUuid(instance) | |
| 1324 | + | } | |
| 1325 | + | ) | |
| 1326 | + | var ( | |
| 1327 | + | xXGMountGetUuid func(uintptr) string | |
| 1328 | + | XGMountGetVolume func(uintptr) uintptr = func(instance uintptr) uintptr { | |
| 1329 | + | core.LazyRegister(&xXGMountGetVolume, "GIO", "g_mount_get_volume", false) | |
| 1330 | + | return xXGMountGetVolume(instance) | |
| 1331 | + | } | |
| 1332 | + | ) | |
| 1333 | + | var ( | |
| 1334 | + | xXGMountGetVolume func(uintptr) uintptr | |
| 1335 | + | XGMountGuessContentType func(uintptr, bool, uintptr, uintptr, uintptr) = func(instance uintptr, ForceRescanVarp bool, CancellableVarp uintptr, CallbackVarp uintptr, UserDataVarp uintptr) { | |
| 1336 | + | core.LazyRegister(&xXGMountGuessContentType, "GIO", "g_mount_guess_content_type", false) | |
| 1337 | + | xXGMountGuessContentType(instance, ForceRescanVarp, CancellableVarp, CallbackVarp, UserDataVarp) | |
| 1338 | + | } | |
| 1339 | + | ) | |
| 1340 | + | var ( | |
| 1341 | + | xXGMountGuessContentType func(uintptr, bool, uintptr, uintptr, uintptr) | |
| 1342 | + | XGMountGuessContentTypeFinish func(uintptr, uintptr, **glib.Error) []string = func(instance uintptr, ResultVarp uintptr, cerrp **glib.Error) []string { | |
| 1343 | + | core.LazyRegister(&xXGMountGuessContentTypeFinish, "GIO", "g_mount_guess_content_type_finish", false) | |
| 1344 | + | return xXGMountGuessContentTypeFinish(instance, ResultVarp, cerrp) | |
| 1345 | + | } | |
| 1346 | + | ) | |
| 1347 | + | var ( | |
| 1348 | + | xXGMountGuessContentTypeFinish func(uintptr, uintptr, **glib.Error) []string | |
| 1349 | + | XGMountGuessContentTypeSync func(uintptr, bool, uintptr, **glib.Error) []string = func(instance uintptr, ForceRescanVarp bool, CancellableVarp uintptr, cerrp **glib.Error) []string { | |
| 1350 | + | core.LazyRegister(&xXGMountGuessContentTypeSync, "GIO", "g_mount_guess_content_type_sync", false) | |
| 1351 | + | return xXGMountGuessContentTypeSync(instance, ForceRescanVarp, CancellableVarp, cerrp) | |
| 1352 | + | } | |
| 1353 | + | ) | |
| 1354 | + | var ( | |
| 1355 | + | xXGMountGuessContentTypeSync func(uintptr, bool, uintptr, **glib.Error) []string | |
| 1356 | + | XGMountIsShadowed func(uintptr) bool = func(instance uintptr) bool { | |
| 1357 | + | core.LazyRegister(&xXGMountIsShadowed, "GIO", "g_mount_is_shadowed", false) | |
| 1358 | + | return xXGMountIsShadowed(instance) | |
| 1359 | + | } | |
| 1360 | + | ) | |
| 1361 | + | var ( | |
| 1362 | + | xXGMountIsShadowed func(uintptr) bool | |
| 1363 | + | XGMountRemount func(uintptr, MountMountFlags, uintptr, uintptr, uintptr, uintptr) = func(instance uintptr, FlagsVarp MountMountFlags, MountOperationVarp uintptr, CancellableVarp uintptr, CallbackVarp uintptr, UserDataVarp uintptr) { | |
| 1364 | + | core.LazyRegister(&xXGMountRemount, "GIO", "g_mount_remount", false) | |
| 1365 | + | xXGMountRemount(instance, FlagsVarp, MountOperationVarp, CancellableVarp, CallbackVarp, UserDataVarp) | |
| 1366 | + | } | |
| 1367 | + | ) | |
| 1368 | + | var ( | |
| 1369 | + | xXGMountRemount func(uintptr, MountMountFlags, uintptr, uintptr, uintptr, uintptr) | |
| 1370 | + | XGMountRemountFinish func(uintptr, uintptr, **glib.Error) bool = func(instance uintptr, ResultVarp uintptr, cerrp **glib.Error) bool { | |
| 1371 | + | core.LazyRegister(&xXGMountRemountFinish, "GIO", "g_mount_remount_finish", false) | |
| 1372 | + | return xXGMountRemountFinish(instance, ResultVarp, cerrp) | |
| 1373 | + | } | |
| 1374 | + | ) | |
| 1375 | + | var ( | |
| 1376 | + | xXGMountRemountFinish func(uintptr, uintptr, **glib.Error) bool | |
| 1377 | + | XGMountShadow func(uintptr) = func(instance uintptr) { | |
| 1378 | + | core.LazyRegister(&xXGMountShadow, "GIO", "g_mount_shadow", false) | |
| 1379 | + | xXGMountShadow(instance) | |
| 1380 | + | } | |
| 1381 | + | ) | |
| 1382 | + | var ( | |
| 1383 | + | xXGMountShadow func(uintptr) | |
| 1384 | + | XGMountUnmount func(uintptr, MountUnmountFlags, uintptr, uintptr, uintptr) = func(instance uintptr, FlagsVarp MountUnmountFlags, CancellableVarp uintptr, CallbackVarp uintptr, UserDataVarp uintptr) { | |
| 1385 | + | core.LazyRegister(&xXGMountUnmount, "GIO", "g_mount_unmount", false) | |
| 1386 | + | xXGMountUnmount(instance, FlagsVarp, CancellableVarp, CallbackVarp, UserDataVarp) | |
| 1387 | + | } | |
| 1388 | + | ) | |
| 1389 | + | var ( | |
| 1390 | + | xXGMountUnmount func(uintptr, MountUnmountFlags, uintptr, uintptr, uintptr) | |
| 1391 | + | XGMountUnmountFinish func(uintptr, uintptr, **glib.Error) bool = func(instance uintptr, ResultVarp uintptr, cerrp **glib.Error) bool { | |
| 1392 | + | core.LazyRegister(&xXGMountUnmountFinish, "GIO", "g_mount_unmount_finish", false) | |
| 1393 | + | return xXGMountUnmountFinish(instance, ResultVarp, cerrp) | |
| 1394 | + | } | |
| 1395 | + | ) | |
| 1396 | + | var ( | |
| 1397 | + | xXGMountUnmountFinish func(uintptr, uintptr, **glib.Error) bool | |
| 1398 | + | XGMountUnmountWithOperation func(uintptr, MountUnmountFlags, uintptr, uintptr, uintptr, uintptr) = func(instance uintptr, FlagsVarp MountUnmountFlags, MountOperationVarp uintptr, CancellableVarp uintptr, CallbackVarp uintptr, UserDataVarp uintptr) { | |
| 1399 | + | core.LazyRegister(&xXGMountUnmountWithOperation, "GIO", "g_mount_unmount_with_operation", false) | |
| 1400 | + | xXGMountUnmountWithOperation(instance, FlagsVarp, MountOperationVarp, CancellableVarp, CallbackVarp, UserDataVarp) | |
| 1401 | + | } | |
| 1402 | + | ) | |
| 1403 | + | var ( | |
| 1404 | + | xXGMountUnmountWithOperation func(uintptr, MountUnmountFlags, uintptr, uintptr, uintptr, uintptr) | |
| 1405 | + | XGMountUnmountWithOperationFinish func(uintptr, uintptr, **glib.Error) bool = func(instance uintptr, ResultVarp uintptr, cerrp **glib.Error) bool { | |
| 1406 | + | core.LazyRegister(&xXGMountUnmountWithOperationFinish, "GIO", "g_mount_unmount_with_operation_finish", false) | |
| 1407 | + | return xXGMountUnmountWithOperationFinish(instance, ResultVarp, cerrp) | |
| 1408 | + | } | |
| 1409 | + | ) | |
| 1410 | + | var ( | |
| 1411 | + | xXGMountUnmountWithOperationFinish func(uintptr, uintptr, **glib.Error) bool | |
| 1412 | + | XGMountUnshadow func(uintptr) = func(instance uintptr) { | |
| 1413 | + | core.LazyRegister(&xXGMountUnshadow, "GIO", "g_mount_unshadow", false) | |
| 1414 | + | xXGMountUnshadow(instance) | |
| 1415 | + | } | |
| 1416 | + | ) | |
| 1417 | + | var xXGMountUnshadow func(uintptr) | |
| 1251 | 1418 | ||
| 1252 | 1419 | func init() { | |
| 1253 | 1420 | core.SetPackageName("GIO", "gio-2.0") | |
| 1254 | 1421 | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0", "libgio-2.0.0.dylib"}) | |
| 1255 | - | var libs []uintptr | |
| 1256 | - | for _, libPath := range core.GetPaths("GIO") { | |
| 1257 | - | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 1258 | - | if err != nil { | |
| 1259 | - | panic(err) | |
| 1260 | - | } | |
| 1261 | - | libs = append(libs, lib) | |
| 1262 | - | } | |
| 1263 | - | ||
| 1264 | - | core.PuregoSafeRegister(&xMountGLibType, libs, "g_mount_get_type") | |
| 1265 | - | ||
| 1266 | - | core.PuregoSafeRegister(&XGMountCanEject, libs, "g_mount_can_eject") | |
| 1267 | - | core.PuregoSafeRegister(&XGMountCanUnmount, libs, "g_mount_can_unmount") | |
| 1268 | - | core.PuregoSafeRegister(&XGMountEject, libs, "g_mount_eject") | |
| 1269 | - | core.PuregoSafeRegister(&XGMountEjectFinish, libs, "g_mount_eject_finish") | |
| 1270 | - | core.PuregoSafeRegister(&XGMountEjectWithOperation, libs, "g_mount_eject_with_operation") | |
| 1271 | - | core.PuregoSafeRegister(&XGMountEjectWithOperationFinish, libs, "g_mount_eject_with_operation_finish") | |
| 1272 | - | core.PuregoSafeRegister(&XGMountGetDefaultLocation, libs, "g_mount_get_default_location") | |
| 1273 | - | core.PuregoSafeRegister(&XGMountGetDrive, libs, "g_mount_get_drive") | |
| 1274 | - | core.PuregoSafeRegister(&XGMountGetIcon, libs, "g_mount_get_icon") | |
| 1275 | - | core.PuregoSafeRegister(&XGMountGetName, libs, "g_mount_get_name") | |
| 1276 | - | core.PuregoSafeRegister(&XGMountGetRoot, libs, "g_mount_get_root") | |
| 1277 | - | core.PuregoSafeRegister(&XGMountGetSortKey, libs, "g_mount_get_sort_key") | |
| 1278 | - | core.PuregoSafeRegister(&XGMountGetSymbolicIcon, libs, "g_mount_get_symbolic_icon") | |
| 1279 | - | core.PuregoSafeRegister(&XGMountGetUuid, libs, "g_mount_get_uuid") | |
| 1280 | - | core.PuregoSafeRegister(&XGMountGetVolume, libs, "g_mount_get_volume") | |
| 1281 | - | core.PuregoSafeRegister(&XGMountGuessContentType, libs, "g_mount_guess_content_type") | |
| 1282 | - | core.PuregoSafeRegister(&XGMountGuessContentTypeFinish, libs, "g_mount_guess_content_type_finish") | |
| 1283 | - | core.PuregoSafeRegister(&XGMountGuessContentTypeSync, libs, "g_mount_guess_content_type_sync") | |
| 1284 | - | core.PuregoSafeRegister(&XGMountIsShadowed, libs, "g_mount_is_shadowed") | |
| 1285 | - | core.PuregoSafeRegister(&XGMountRemount, libs, "g_mount_remount") | |
| 1286 | - | core.PuregoSafeRegister(&XGMountRemountFinish, libs, "g_mount_remount_finish") | |
| 1287 | - | core.PuregoSafeRegister(&XGMountShadow, libs, "g_mount_shadow") | |
| 1288 | - | core.PuregoSafeRegister(&XGMountUnmount, libs, "g_mount_unmount") | |
| 1289 | - | core.PuregoSafeRegister(&XGMountUnmountFinish, libs, "g_mount_unmount_finish") | |
| 1290 | - | core.PuregoSafeRegister(&XGMountUnmountWithOperation, libs, "g_mount_unmount_with_operation") | |
| 1291 | - | core.PuregoSafeRegister(&XGMountUnmountWithOperationFinish, libs, "g_mount_unmount_with_operation_finish") | |
| 1292 | - | core.PuregoSafeRegister(&XGMountUnshadow, libs, "g_mount_unshadow") | |
| 1293 | 1422 | } | |
| @@ -405,7 +405,7 @@ func (x *MountIface) OverrideUnmountFinish(cb func(Mount, AsyncResult) bool) { | |||||
| 405 | if cb == nil { | 405 | if cb == nil { | ||
| 406 | x.xUnmountFinish = 0 | 406 | x.xUnmountFinish = 0 | ||
| 407 | } else { | 407 | } else { | ||
| 408 | - | x.xUnmountFinish = purego.NewCallback(func(MountVarp uintptr, ResultVarp uintptr) bool { | 408 | + | x.xUnmountFinish = purego.NewCallback(func(MountVarp uintptr, ResultVarp uintptr, cerrp **glib.Error) bool { |
| 409 | return cb(&MountBase{Ptr: MountVarp}, &AsyncResultBase{Ptr: ResultVarp}) | 409 | return cb(&MountBase{Ptr: MountVarp}, &AsyncResultBase{Ptr: ResultVarp}) | ||
| 410 | }) | 410 | }) | ||
| 411 | } | 411 | } | ||
| @@ -417,10 +417,11 @@ func (x *MountIface) GetUnmountFinish() func(Mount, AsyncResult) bool { | |||||
| 417 | if x.xUnmountFinish == 0 { | 417 | if x.xUnmountFinish == 0 { | ||
| 418 | return nil | 418 | return nil | ||
| 419 | } | 419 | } | ||
| 420 | - | var rawCallback func(MountVarp uintptr, ResultVarp uintptr) bool | 420 | + | var rawCallback func(MountVarp uintptr, ResultVarp uintptr, cerrp **glib.Error) bool |
| 421 | purego.RegisterFunc(&rawCallback, x.xUnmountFinish) | 421 | purego.RegisterFunc(&rawCallback, x.xUnmountFinish) | ||
| 422 | return func(MountVar Mount, ResultVar AsyncResult) bool { | 422 | return func(MountVar Mount, ResultVar AsyncResult) bool { | ||
| 423 | - | return rawCallback(MountVar.GoPointer(), ResultVar.GoPointer()) | 423 | + | var cerr *glib.Error |
| 424 | + | return rawCallback(MountVar.GoPointer(), ResultVar.GoPointer(), &cerr) | |||
| 424 | } | 425 | } | ||
| 425 | } | 426 | } | ||
| 426 | 427 | ||||
| @@ -455,7 +456,7 @@ func (x *MountIface) OverrideEjectFinish(cb func(Mount, AsyncResult) bool) { | |||||
| 455 | if cb == nil { | 456 | if cb == nil { | ||
| 456 | x.xEjectFinish = 0 | 457 | x.xEjectFinish = 0 | ||
| 457 | } else { | 458 | } else { | ||
| 458 | - | x.xEjectFinish = purego.NewCallback(func(MountVarp uintptr, ResultVarp uintptr) bool { | 459 | + | x.xEjectFinish = purego.NewCallback(func(MountVarp uintptr, ResultVarp uintptr, cerrp **glib.Error) bool { |
| 459 | return cb(&MountBase{Ptr: MountVarp}, &AsyncResultBase{Ptr: ResultVarp}) | 460 | return cb(&MountBase{Ptr: MountVarp}, &AsyncResultBase{Ptr: ResultVarp}) | ||
| 460 | }) | 461 | }) | ||
| 461 | } | 462 | } | ||
| @@ -467,10 +468,11 @@ func (x *MountIface) GetEjectFinish() func(Mount, AsyncResult) bool { | |||||
| 467 | if x.xEjectFinish == 0 { | 468 | if x.xEjectFinish == 0 { | ||
| 468 | return nil | 469 | return nil | ||
| 469 | } | 470 | } | ||
| 470 | - | var rawCallback func(MountVarp uintptr, ResultVarp uintptr) bool | 471 | + | var rawCallback func(MountVarp uintptr, ResultVarp uintptr, cerrp **glib.Error) bool |
| 471 | purego.RegisterFunc(&rawCallback, x.xEjectFinish) | 472 | purego.RegisterFunc(&rawCallback, x.xEjectFinish) | ||
| 472 | return func(MountVar Mount, ResultVar AsyncResult) bool { | 473 | return func(MountVar Mount, ResultVar AsyncResult) bool { | ||
| 473 | - | return rawCallback(MountVar.GoPointer(), ResultVar.GoPointer()) | 474 | + | var cerr *glib.Error |
| 475 | + | return rawCallback(MountVar.GoPointer(), ResultVar.GoPointer(), &cerr) | |||
| 474 | } | 476 | } | ||
| 475 | } | 477 | } | ||
| 476 | 478 | ||||
| @@ -505,7 +507,7 @@ func (x *MountIface) OverrideRemountFinish(cb func(Mount, AsyncResult) bool) { | |||||
| 505 | if cb == nil { | 507 | if cb == nil { | ||
| 506 | x.xRemountFinish = 0 | 508 | x.xRemountFinish = 0 | ||
| 507 | } else { | 509 | } else { | ||
| 508 | - | x.xRemountFinish = purego.NewCallback(func(MountVarp uintptr, ResultVarp uintptr) bool { | 510 | + | x.xRemountFinish = purego.NewCallback(func(MountVarp uintptr, ResultVarp uintptr, cerrp **glib.Error) bool { |
| 509 | return cb(&MountBase{Ptr: MountVarp}, &AsyncResultBase{Ptr: ResultVarp}) | 511 | return cb(&MountBase{Ptr: MountVarp}, &AsyncResultBase{Ptr: ResultVarp}) | ||
| 510 | }) | 512 | }) | ||
| 511 | } | 513 | } | ||
| @@ -517,10 +519,11 @@ func (x *MountIface) GetRemountFinish() func(Mount, AsyncResult) bool { | |||||
| 517 | if x.xRemountFinish == 0 { | 519 | if x.xRemountFinish == 0 { | ||
| 518 | return nil | 520 | return nil | ||
| 519 | } | 521 | } | ||
| 520 | - | var rawCallback func(MountVarp uintptr, ResultVarp uintptr) bool | 522 | + | var rawCallback func(MountVarp uintptr, ResultVarp uintptr, cerrp **glib.Error) bool |
| 521 | purego.RegisterFunc(&rawCallback, x.xRemountFinish) | 523 | purego.RegisterFunc(&rawCallback, x.xRemountFinish) | ||
| 522 | return func(MountVar Mount, ResultVar AsyncResult) bool { | 524 | return func(MountVar Mount, ResultVar AsyncResult) bool { | ||
| 523 | - | return rawCallback(MountVar.GoPointer(), ResultVar.GoPointer()) | 525 | + | var cerr *glib.Error |
| 526 | + | return rawCallback(MountVar.GoPointer(), ResultVar.GoPointer(), &cerr) | |||
| 524 | } | 527 | } | ||
| 525 | } | 528 | } | ||
| 526 | 529 | ||||
| @@ -561,7 +564,7 @@ func (x *MountIface) OverrideGuessContentTypeFinish(cb func(Mount, AsyncResult) | |||||
| 561 | if cb == nil { | 564 | if cb == nil { | ||
| 562 | x.xGuessContentTypeFinish = 0 | 565 | x.xGuessContentTypeFinish = 0 | ||
| 563 | } else { | 566 | } else { | ||
| 564 | - | x.xGuessContentTypeFinish = purego.NewCallback(func(MountVarp uintptr, ResultVarp uintptr) []string { | 567 | + | x.xGuessContentTypeFinish = purego.NewCallback(func(MountVarp uintptr, ResultVarp uintptr, cerrp **glib.Error) []string { |
| 565 | return cb(&MountBase{Ptr: MountVarp}, &AsyncResultBase{Ptr: ResultVarp}) | 568 | return cb(&MountBase{Ptr: MountVarp}, &AsyncResultBase{Ptr: ResultVarp}) | ||
| 566 | }) | 569 | }) | ||
| 567 | } | 570 | } | ||
| @@ -573,10 +576,11 @@ func (x *MountIface) GetGuessContentTypeFinish() func(Mount, AsyncResult) []stri | |||||
| 573 | if x.xGuessContentTypeFinish == 0 { | 576 | if x.xGuessContentTypeFinish == 0 { | ||
| 574 | return nil | 577 | return nil | ||
| 575 | } | 578 | } | ||
| 576 | - | var rawCallback func(MountVarp uintptr, ResultVarp uintptr) []string | 579 | + | var rawCallback func(MountVarp uintptr, ResultVarp uintptr, cerrp **glib.Error) []string |
| 577 | purego.RegisterFunc(&rawCallback, x.xGuessContentTypeFinish) | 580 | purego.RegisterFunc(&rawCallback, x.xGuessContentTypeFinish) | ||
| 578 | return func(MountVar Mount, ResultVar AsyncResult) []string { | 581 | return func(MountVar Mount, ResultVar AsyncResult) []string { | ||
| 579 | - | return rawCallback(MountVar.GoPointer(), ResultVar.GoPointer()) | 582 | + | var cerr *glib.Error |
| 583 | + | return rawCallback(MountVar.GoPointer(), ResultVar.GoPointer(), &cerr) | |||
| 580 | } | 584 | } | ||
| 581 | } | 585 | } | ||
| 582 | 586 | ||||
| @@ -586,7 +590,7 @@ func (x *MountIface) OverrideGuessContentTypeSync(cb func(Mount, bool, *Cancella | |||||
| 586 | if cb == nil { | 590 | if cb == nil { | ||
| 587 | x.xGuessContentTypeSync = 0 | 591 | x.xGuessContentTypeSync = 0 | ||
| 588 | } else { | 592 | } else { | ||
| 589 | - | x.xGuessContentTypeSync = purego.NewCallback(func(MountVarp uintptr, ForceRescanVarp bool, CancellableVarp uintptr) []string { | 593 | + | x.xGuessContentTypeSync = purego.NewCallback(func(MountVarp uintptr, ForceRescanVarp bool, CancellableVarp uintptr, cerrp **glib.Error) []string { |
| 590 | return cb(&MountBase{Ptr: MountVarp}, ForceRescanVarp, CancellableNewFromInternalPtr(CancellableVarp)) | 594 | return cb(&MountBase{Ptr: MountVarp}, ForceRescanVarp, CancellableNewFromInternalPtr(CancellableVarp)) | ||
| 591 | }) | 595 | }) | ||
| 592 | } | 596 | } | ||
| @@ -598,10 +602,11 @@ func (x *MountIface) GetGuessContentTypeSync() func(Mount, bool, *Cancellable) [ | |||||
| 598 | if x.xGuessContentTypeSync == 0 { | 602 | if x.xGuessContentTypeSync == 0 { | ||
| 599 | return nil | 603 | return nil | ||
| 600 | } | 604 | } | ||
| 601 | - | var rawCallback func(MountVarp uintptr, ForceRescanVarp bool, CancellableVarp uintptr) []string | 605 | + | var rawCallback func(MountVarp uintptr, ForceRescanVarp bool, CancellableVarp uintptr, cerrp **glib.Error) []string |
| 602 | purego.RegisterFunc(&rawCallback, x.xGuessContentTypeSync) | 606 | purego.RegisterFunc(&rawCallback, x.xGuessContentTypeSync) | ||
| 603 | return func(MountVar Mount, ForceRescanVar bool, CancellableVar *Cancellable) []string { | 607 | return func(MountVar Mount, ForceRescanVar bool, CancellableVar *Cancellable) []string { | ||
| 604 | - | return rawCallback(MountVar.GoPointer(), ForceRescanVar, CancellableVar.GoPointer()) | 608 | + | var cerr *glib.Error |
| 609 | + | return rawCallback(MountVar.GoPointer(), ForceRescanVar, CancellableVar.GoPointer(), &cerr) | |||
| 605 | } | 610 | } | ||
| 606 | } | 611 | } | ||
| 607 | 612 | ||||
| @@ -661,7 +666,7 @@ func (x *MountIface) OverrideUnmountWithOperationFinish(cb func(Mount, AsyncResu | |||||
| 661 | if cb == nil { | 666 | if cb == nil { | ||
| 662 | x.xUnmountWithOperationFinish = 0 | 667 | x.xUnmountWithOperationFinish = 0 | ||
| 663 | } else { | 668 | } else { | ||
| 664 | - | x.xUnmountWithOperationFinish = purego.NewCallback(func(MountVarp uintptr, ResultVarp uintptr) bool { | 669 | + | x.xUnmountWithOperationFinish = purego.NewCallback(func(MountVarp uintptr, ResultVarp uintptr, cerrp **glib.Error) bool { |
| 665 | return cb(&MountBase{Ptr: MountVarp}, &AsyncResultBase{Ptr: ResultVarp}) | 670 | return cb(&MountBase{Ptr: MountVarp}, &AsyncResultBase{Ptr: ResultVarp}) | ||
| 666 | }) | 671 | }) | ||
| 667 | } | 672 | } | ||
| @@ -673,10 +678,11 @@ func (x *MountIface) GetUnmountWithOperationFinish() func(Mount, AsyncResult) bo | |||||
| 673 | if x.xUnmountWithOperationFinish == 0 { | 678 | if x.xUnmountWithOperationFinish == 0 { | ||
| 674 | return nil | 679 | return nil | ||
| 675 | } | 680 | } | ||
| 676 | - | var rawCallback func(MountVarp uintptr, ResultVarp uintptr) bool | 681 | + | var rawCallback func(MountVarp uintptr, ResultVarp uintptr, cerrp **glib.Error) bool |
| 677 | purego.RegisterFunc(&rawCallback, x.xUnmountWithOperationFinish) | 682 | purego.RegisterFunc(&rawCallback, x.xUnmountWithOperationFinish) | ||
| 678 | return func(MountVar Mount, ResultVar AsyncResult) bool { | 683 | return func(MountVar Mount, ResultVar AsyncResult) bool { | ||
| 679 | - | return rawCallback(MountVar.GoPointer(), ResultVar.GoPointer()) | 684 | + | var cerr *glib.Error |
| 685 | + | return rawCallback(MountVar.GoPointer(), ResultVar.GoPointer(), &cerr) | |||
| 680 | } | 686 | } | ||
| 681 | } | 687 | } | ||
| 682 | 688 | ||||
| @@ -711,7 +717,7 @@ func (x *MountIface) OverrideEjectWithOperationFinish(cb func(Mount, AsyncResult | |||||
| 711 | if cb == nil { | 717 | if cb == nil { | ||
| 712 | x.xEjectWithOperationFinish = 0 | 718 | x.xEjectWithOperationFinish = 0 | ||
| 713 | } else { | 719 | } else { | ||
| 714 | - | x.xEjectWithOperationFinish = purego.NewCallback(func(MountVarp uintptr, ResultVarp uintptr) bool { | 720 | + | x.xEjectWithOperationFinish = purego.NewCallback(func(MountVarp uintptr, ResultVarp uintptr, cerrp **glib.Error) bool { |
| 715 | return cb(&MountBase{Ptr: MountVarp}, &AsyncResultBase{Ptr: ResultVarp}) | 721 | return cb(&MountBase{Ptr: MountVarp}, &AsyncResultBase{Ptr: ResultVarp}) | ||
| 716 | }) | 722 | }) | ||
| 717 | } | 723 | } | ||
| @@ -723,10 +729,11 @@ func (x *MountIface) GetEjectWithOperationFinish() func(Mount, AsyncResult) bool | |||||
| 723 | if x.xEjectWithOperationFinish == 0 { | 729 | if x.xEjectWithOperationFinish == 0 { | ||
| 724 | return nil | 730 | return nil | ||
| 725 | } | 731 | } | ||
| 726 | - | var rawCallback func(MountVarp uintptr, ResultVarp uintptr) bool | 732 | + | var rawCallback func(MountVarp uintptr, ResultVarp uintptr, cerrp **glib.Error) bool |
| 727 | purego.RegisterFunc(&rawCallback, x.xEjectWithOperationFinish) | 733 | purego.RegisterFunc(&rawCallback, x.xEjectWithOperationFinish) | ||
| 728 | return func(MountVar Mount, ResultVar AsyncResult) bool { | 734 | return func(MountVar Mount, ResultVar AsyncResult) bool { | ||
| 729 | - | return rawCallback(MountVar.GoPointer(), ResultVar.GoPointer()) | 735 | + | var cerr *glib.Error |
| 736 | + | return rawCallback(MountVar.GoPointer(), ResultVar.GoPointer(), &cerr) | |||
| 730 | } | 737 | } | ||
| 731 | } | 738 | } | ||
| 732 | 739 | ||||
| @@ -885,6 +892,7 @@ type Mount interface { | |||||
| 885 | var xMountGLibType func() types.GType | 892 | var xMountGLibType func() types.GType | ||
| 886 | 893 | ||||
| 887 | func MountGLibType() types.GType { | 894 | func MountGLibType() types.GType { | ||
| 895 | + | core.LazyRegister(&xMountGLibType, "GIO", "g_mount_get_type", false) | |||
| 888 | return xMountGLibType() | 896 | return xMountGLibType() | ||
| 889 | } | 897 | } | ||
| 890 | 898 | ||||
| @@ -1219,75 +1227,196 @@ func (x *MountBase) Unshadow() { | |||||
| 1219 | XGMountUnshadow(x.GoPointer()) | 1227 | XGMountUnshadow(x.GoPointer()) | ||
| 1220 | } | 1228 | } | ||
| 1221 | 1229 | ||||
| 1230 | + | var XGMountCanEject func(uintptr) bool = func(instance uintptr) bool { | |||
| 1231 | + | core.LazyRegister(&xXGMountCanEject, "GIO", "g_mount_can_eject", false) | |||
| 1232 | + | return xXGMountCanEject(instance) | |||
| 1233 | + | } | |||
| 1234 | + | ||||
| 1235 | + | var ( | |||
| 1236 | + | xXGMountCanEject func(uintptr) bool | |||
| 1237 | + | XGMountCanUnmount func(uintptr) bool = func(instance uintptr) bool { | |||
| 1238 | + | core.LazyRegister(&xXGMountCanUnmount, "GIO", "g_mount_can_unmount", false) | |||
| 1239 | + | return xXGMountCanUnmount(instance) | |||
| 1240 | + | } | |||
| 1241 | + | ) | |||
| 1242 | + | var ( | |||
| 1243 | + | xXGMountCanUnmount func(uintptr) bool | |||
| 1244 | + | XGMountEject func(uintptr, MountUnmountFlags, uintptr, uintptr, uintptr) = func(instance uintptr, FlagsVarp MountUnmountFlags, CancellableVarp uintptr, CallbackVarp uintptr, UserDataVarp uintptr) { | |||
| 1245 | + | core.LazyRegister(&xXGMountEject, "GIO", "g_mount_eject", false) | |||
| 1246 | + | xXGMountEject(instance, FlagsVarp, CancellableVarp, CallbackVarp, UserDataVarp) | |||
| 1247 | + | } | |||
| 1248 | + | ) | |||
| 1249 | + | var ( | |||
| 1250 | + | xXGMountEject func(uintptr, MountUnmountFlags, uintptr, uintptr, uintptr) | |||
| 1251 | + | XGMountEjectFinish func(uintptr, uintptr, **glib.Error) bool = func(instance uintptr, ResultVarp uintptr, cerrp **glib.Error) bool { | |||
| 1252 | + | core.LazyRegister(&xXGMountEjectFinish, "GIO", "g_mount_eject_finish", false) | |||
| 1253 | + | return xXGMountEjectFinish(instance, ResultVarp, cerrp) | |||
| 1254 | + | } | |||
| 1255 | + | ) | |||
| 1256 | + | var ( | |||
| 1257 | + | xXGMountEjectFinish func(uintptr, uintptr, **glib.Error) bool | |||
| 1258 | + | XGMountEjectWithOperation func(uintptr, MountUnmountFlags, uintptr, uintptr, uintptr, uintptr) = func(instance uintptr, FlagsVarp MountUnmountFlags, MountOperationVarp uintptr, CancellableVarp uintptr, CallbackVarp uintptr, UserDataVarp uintptr) { | |||
| 1259 | + | core.LazyRegister(&xXGMountEjectWithOperation, "GIO", "g_mount_eject_with_operation", false) | |||
| 1260 | + | xXGMountEjectWithOperation(instance, FlagsVarp, MountOperationVarp, CancellableVarp, CallbackVarp, UserDataVarp) | |||
| 1261 | + | } | |||
| 1262 | + | ) | |||
| 1263 | + | var ( | |||
| 1264 | + | xXGMountEjectWithOperation func(uintptr, MountUnmountFlags, uintptr, uintptr, uintptr, uintptr) | |||
| 1265 | + | XGMountEjectWithOperationFinish func(uintptr, uintptr, **glib.Error) bool = func(instance uintptr, ResultVarp uintptr, cerrp **glib.Error) bool { | |||
| 1266 | + | core.LazyRegister(&xXGMountEjectWithOperationFinish, "GIO", "g_mount_eject_with_operation_finish", false) | |||
| 1267 | + | return xXGMountEjectWithOperationFinish(instance, ResultVarp, cerrp) | |||
| 1268 | + | } | |||
| 1269 | + | ) | |||
| 1270 | + | var ( | |||
| 1271 | + | xXGMountEjectWithOperationFinish func(uintptr, uintptr, **glib.Error) bool | |||
| 1272 | + | XGMountGetDefaultLocation func(uintptr) uintptr = func(instance uintptr) uintptr { | |||
| 1273 | + | core.LazyRegister(&xXGMountGetDefaultLocation, "GIO", "g_mount_get_default_location", false) | |||
| 1274 | + | return xXGMountGetDefaultLocation(instance) | |||
| 1275 | + | } | |||
| 1276 | + | ) | |||
| 1222 | var ( | 1277 | var ( | ||
| 1223 | - | XGMountCanEject func(uintptr) bool | 1278 | + | xXGMountGetDefaultLocation func(uintptr) uintptr |
| 1224 | - | XGMountCanUnmount func(uintptr) bool | 1279 | + | XGMountGetDrive func(uintptr) uintptr = func(instance uintptr) uintptr { |
| 1225 | - | XGMountEject func(uintptr, MountUnmountFlags, uintptr, uintptr, uintptr) | 1280 | + | core.LazyRegister(&xXGMountGetDrive, "GIO", "g_mount_get_drive", false) |
| 1226 | - | XGMountEjectFinish func(uintptr, uintptr, **glib.Error) bool | 1281 | + | return xXGMountGetDrive(instance) |
| 1227 | - | XGMountEjectWithOperation func(uintptr, MountUnmountFlags, uintptr, uintptr, uintptr, uintptr) | 1282 | + | } |
| 1228 | - | XGMountEjectWithOperationFinish func(uintptr, uintptr, **glib.Error) bool | 1283 | + | ) |
| 1229 | - | XGMountGetDefaultLocation func(uintptr) uintptr | 1284 | + | var ( |
| 1230 | - | XGMountGetDrive func(uintptr) uintptr | 1285 | + | xXGMountGetDrive func(uintptr) uintptr |
| 1231 | - | XGMountGetIcon func(uintptr) uintptr | 1286 | + | XGMountGetIcon func(uintptr) uintptr = func(instance uintptr) uintptr { |
| 1232 | - | XGMountGetName func(uintptr) string | 1287 | + | core.LazyRegister(&xXGMountGetIcon, "GIO", "g_mount_get_icon", false) |
| 1233 | - | XGMountGetRoot func(uintptr) uintptr | 1288 | + | return xXGMountGetIcon(instance) |
| 1234 | - | XGMountGetSortKey func(uintptr) string | 1289 | + | } |
| 1235 | - | XGMountGetSymbolicIcon func(uintptr) uintptr | 1290 | + | ) |
| 1236 | - | XGMountGetUuid func(uintptr) string | 1291 | + | var ( |
| 1237 | - | XGMountGetVolume func(uintptr) uintptr | 1292 | + | xXGMountGetIcon func(uintptr) uintptr |
| 1238 | - | XGMountGuessContentType func(uintptr, bool, uintptr, uintptr, uintptr) | 1293 | + | XGMountGetName func(uintptr) string = func(instance uintptr) string { |
| 1239 | - | XGMountGuessContentTypeFinish func(uintptr, uintptr, **glib.Error) []string | 1294 | + | core.LazyRegister(&xXGMountGetName, "GIO", "g_mount_get_name", false) |
| 1240 | - | XGMountGuessContentTypeSync func(uintptr, bool, uintptr, **glib.Error) []string | 1295 | + | return xXGMountGetName(instance) |
| 1241 | - | XGMountIsShadowed func(uintptr) bool | 1296 | + | } |
| 1242 | - | XGMountRemount func(uintptr, MountMountFlags, uintptr, uintptr, uintptr, uintptr) | 1297 | + | ) |
| 1243 | - | XGMountRemountFinish func(uintptr, uintptr, **glib.Error) bool | 1298 | + | var ( |
| 1244 | - | XGMountShadow func(uintptr) | 1299 | + | xXGMountGetName func(uintptr) string |
| 1245 | - | XGMountUnmount func(uintptr, MountUnmountFlags, uintptr, uintptr, uintptr) | 1300 | + | XGMountGetRoot func(uintptr) uintptr = func(instance uintptr) uintptr { |
| 1246 | - | XGMountUnmountFinish func(uintptr, uintptr, **glib.Error) bool | 1301 | + | core.LazyRegister(&xXGMountGetRoot, "GIO", "g_mount_get_root", false) |
| 1247 | - | XGMountUnmountWithOperation func(uintptr, MountUnmountFlags, uintptr, uintptr, uintptr, uintptr) | 1302 | + | return xXGMountGetRoot(instance) |
| 1248 | - | XGMountUnmountWithOperationFinish func(uintptr, uintptr, **glib.Error) bool | 1303 | + | } |
| 1249 | - | XGMountUnshadow func(uintptr) | |||
| 1250 | ) | 1304 | ) | ||
| 1305 | + | var ( | |||
| 1306 | + | xXGMountGetRoot func(uintptr) uintptr | |||
| 1307 | + | XGMountGetSortKey func(uintptr) string = func(instance uintptr) string { | |||
| 1308 | + | core.LazyRegister(&xXGMountGetSortKey, "GIO", "g_mount_get_sort_key", false) | |||
| 1309 | + | return xXGMountGetSortKey(instance) | |||
| 1310 | + | } | |||
| 1311 | + | ) | |||
| 1312 | + | var ( | |||
| 1313 | + | xXGMountGetSortKey func(uintptr) string | |||
| 1314 | + | XGMountGetSymbolicIcon func(uintptr) uintptr = func(instance uintptr) uintptr { | |||
| 1315 | + | core.LazyRegister(&xXGMountGetSymbolicIcon, "GIO", "g_mount_get_symbolic_icon", false) | |||
| 1316 | + | return xXGMountGetSymbolicIcon(instance) | |||
| 1317 | + | } | |||
| 1318 | + | ) | |||
| 1319 | + | var ( | |||
| 1320 | + | xXGMountGetSymbolicIcon func(uintptr) uintptr | |||
| 1321 | + | XGMountGetUuid func(uintptr) string = func(instance uintptr) string { | |||
| 1322 | + | core.LazyRegister(&xXGMountGetUuid, "GIO", "g_mount_get_uuid", false) | |||
| 1323 | + | return xXGMountGetUuid(instance) | |||
| 1324 | + | } | |||
| 1325 | + | ) | |||
| 1326 | + | var ( | |||
| 1327 | + | xXGMountGetUuid func(uintptr) string | |||
| 1328 | + | XGMountGetVolume func(uintptr) uintptr = func(instance uintptr) uintptr { | |||
| 1329 | + | core.LazyRegister(&xXGMountGetVolume, "GIO", "g_mount_get_volume", false) | |||
| 1330 | + | return xXGMountGetVolume(instance) | |||
| 1331 | + | } | |||
| 1332 | + | ) | |||
| 1333 | + | var ( | |||
| 1334 | + | xXGMountGetVolume func(uintptr) uintptr | |||
| 1335 | + | XGMountGuessContentType func(uintptr, bool, uintptr, uintptr, uintptr) = func(instance uintptr, ForceRescanVarp bool, CancellableVarp uintptr, CallbackVarp uintptr, UserDataVarp uintptr) { | |||
| 1336 | + | core.LazyRegister(&xXGMountGuessContentType, "GIO", "g_mount_guess_content_type", false) | |||
| 1337 | + | xXGMountGuessContentType(instance, ForceRescanVarp, CancellableVarp, CallbackVarp, UserDataVarp) | |||
| 1338 | + | } | |||
| 1339 | + | ) | |||
| 1340 | + | var ( | |||
| 1341 | + | xXGMountGuessContentType func(uintptr, bool, uintptr, uintptr, uintptr) | |||
| 1342 | + | XGMountGuessContentTypeFinish func(uintptr, uintptr, **glib.Error) []string = func(instance uintptr, ResultVarp uintptr, cerrp **glib.Error) []string { | |||
| 1343 | + | core.LazyRegister(&xXGMountGuessContentTypeFinish, "GIO", "g_mount_guess_content_type_finish", false) | |||
| 1344 | + | return xXGMountGuessContentTypeFinish(instance, ResultVarp, cerrp) | |||
| 1345 | + | } | |||
| 1346 | + | ) | |||
| 1347 | + | var ( | |||
| 1348 | + | xXGMountGuessContentTypeFinish func(uintptr, uintptr, **glib.Error) []string | |||
| 1349 | + | XGMountGuessContentTypeSync func(uintptr, bool, uintptr, **glib.Error) []string = func(instance uintptr, ForceRescanVarp bool, CancellableVarp uintptr, cerrp **glib.Error) []string { | |||
| 1350 | + | core.LazyRegister(&xXGMountGuessContentTypeSync, "GIO", "g_mount_guess_content_type_sync", false) | |||
| 1351 | + | return xXGMountGuessContentTypeSync(instance, ForceRescanVarp, CancellableVarp, cerrp) | |||
| 1352 | + | } | |||
| 1353 | + | ) | |||
| 1354 | + | var ( | |||
| 1355 | + | xXGMountGuessContentTypeSync func(uintptr, bool, uintptr, **glib.Error) []string | |||
| 1356 | + | XGMountIsShadowed func(uintptr) bool = func(instance uintptr) bool { | |||
| 1357 | + | core.LazyRegister(&xXGMountIsShadowed, "GIO", "g_mount_is_shadowed", false) | |||
| 1358 | + | return xXGMountIsShadowed(instance) | |||
| 1359 | + | } | |||
| 1360 | + | ) | |||
| 1361 | + | var ( | |||
| 1362 | + | xXGMountIsShadowed func(uintptr) bool | |||
| 1363 | + | XGMountRemount func(uintptr, MountMountFlags, uintptr, uintptr, uintptr, uintptr) = func(instance uintptr, FlagsVarp MountMountFlags, MountOperationVarp uintptr, CancellableVarp uintptr, CallbackVarp uintptr, UserDataVarp uintptr) { | |||
| 1364 | + | core.LazyRegister(&xXGMountRemount, "GIO", "g_mount_remount", false) | |||
| 1365 | + | xXGMountRemount(instance, FlagsVarp, MountOperationVarp, CancellableVarp, CallbackVarp, UserDataVarp) | |||
| 1366 | + | } | |||
| 1367 | + | ) | |||
| 1368 | + | var ( | |||
| 1369 | + | xXGMountRemount func(uintptr, MountMountFlags, uintptr, uintptr, uintptr, uintptr) | |||
| 1370 | + | XGMountRemountFinish func(uintptr, uintptr, **glib.Error) bool = func(instance uintptr, ResultVarp uintptr, cerrp **glib.Error) bool { | |||
| 1371 | + | core.LazyRegister(&xXGMountRemountFinish, "GIO", "g_mount_remount_finish", false) | |||
| 1372 | + | return xXGMountRemountFinish(instance, ResultVarp, cerrp) | |||
| 1373 | + | } | |||
| 1374 | + | ) | |||
| 1375 | + | var ( | |||
| 1376 | + | xXGMountRemountFinish func(uintptr, uintptr, **glib.Error) bool | |||
| 1377 | + | XGMountShadow func(uintptr) = func(instance uintptr) { | |||
| 1378 | + | core.LazyRegister(&xXGMountShadow, "GIO", "g_mount_shadow", false) | |||
| 1379 | + | xXGMountShadow(instance) | |||
| 1380 | + | } | |||
| 1381 | + | ) | |||
| 1382 | + | var ( | |||
| 1383 | + | xXGMountShadow func(uintptr) | |||
| 1384 | + | XGMountUnmount func(uintptr, MountUnmountFlags, uintptr, uintptr, uintptr) = func(instance uintptr, FlagsVarp MountUnmountFlags, CancellableVarp uintptr, CallbackVarp uintptr, UserDataVarp uintptr) { | |||
| 1385 | + | core.LazyRegister(&xXGMountUnmount, "GIO", "g_mount_unmount", false) | |||
| 1386 | + | xXGMountUnmount(instance, FlagsVarp, CancellableVarp, CallbackVarp, UserDataVarp) | |||
| 1387 | + | } | |||
| 1388 | + | ) | |||
| 1389 | + | var ( | |||
| 1390 | + | xXGMountUnmount func(uintptr, MountUnmountFlags, uintptr, uintptr, uintptr) | |||
| 1391 | + | XGMountUnmountFinish func(uintptr, uintptr, **glib.Error) bool = func(instance uintptr, ResultVarp uintptr, cerrp **glib.Error) bool { | |||
| 1392 | + | core.LazyRegister(&xXGMountUnmountFinish, "GIO", "g_mount_unmount_finish", false) | |||
| 1393 | + | return xXGMountUnmountFinish(instance, ResultVarp, cerrp) | |||
| 1394 | + | } | |||
| 1395 | + | ) | |||
| 1396 | + | var ( | |||
| 1397 | + | xXGMountUnmountFinish func(uintptr, uintptr, **glib.Error) bool | |||
| 1398 | + | XGMountUnmountWithOperation func(uintptr, MountUnmountFlags, uintptr, uintptr, uintptr, uintptr) = func(instance uintptr, FlagsVarp MountUnmountFlags, MountOperationVarp uintptr, CancellableVarp uintptr, CallbackVarp uintptr, UserDataVarp uintptr) { | |||
| 1399 | + | core.LazyRegister(&xXGMountUnmountWithOperation, "GIO", "g_mount_unmount_with_operation", false) | |||
| 1400 | + | xXGMountUnmountWithOperation(instance, FlagsVarp, MountOperationVarp, CancellableVarp, CallbackVarp, UserDataVarp) | |||
| 1401 | + | } | |||
| 1402 | + | ) | |||
| 1403 | + | var ( | |||
| 1404 | + | xXGMountUnmountWithOperation func(uintptr, MountUnmountFlags, uintptr, uintptr, uintptr, uintptr) | |||
| 1405 | + | XGMountUnmountWithOperationFinish func(uintptr, uintptr, **glib.Error) bool = func(instance uintptr, ResultVarp uintptr, cerrp **glib.Error) bool { | |||
| 1406 | + | core.LazyRegister(&xXGMountUnmountWithOperationFinish, "GIO", "g_mount_unmount_with_operation_finish", false) | |||
| 1407 | + | return xXGMountUnmountWithOperationFinish(instance, ResultVarp, cerrp) | |||
| 1408 | + | } | |||
| 1409 | + | ) | |||
| 1410 | + | var ( | |||
| 1411 | + | xXGMountUnmountWithOperationFinish func(uintptr, uintptr, **glib.Error) bool | |||
| 1412 | + | XGMountUnshadow func(uintptr) = func(instance uintptr) { | |||
| 1413 | + | core.LazyRegister(&xXGMountUnshadow, "GIO", "g_mount_unshadow", false) | |||
| 1414 | + | xXGMountUnshadow(instance) | |||
| 1415 | + | } | |||
| 1416 | + | ) | |||
| 1417 | + | var xXGMountUnshadow func(uintptr) | |||
| 1251 | 1418 | ||||
| 1252 | func init() { | 1419 | func init() { | ||
| 1253 | core.SetPackageName("GIO", "gio-2.0") | 1420 | core.SetPackageName("GIO", "gio-2.0") | ||
| 1254 | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0", "libgio-2.0.0.dylib"}) | 1421 | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0", "libgio-2.0.0.dylib"}) | ||
| 1255 | - | var libs []uintptr | |||
| 1256 | - | for _, libPath := range core.GetPaths("GIO") { | |||
| 1257 | - | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |||
| 1258 | - | if err != nil { | |||
| 1259 | - | panic(err) | |||
| 1260 | - | } | |||
| 1261 | - | libs = append(libs, lib) | |||
| 1262 | - | } | |||
| 1263 | - | ||||
| 1264 | - | core.PuregoSafeRegister(&xMountGLibType, libs, "g_mount_get_type") | |||
| 1265 | - | ||||
| 1266 | - | core.PuregoSafeRegister(&XGMountCanEject, libs, "g_mount_can_eject") | |||
| 1267 | - | core.PuregoSafeRegister(&XGMountCanUnmount, libs, "g_mount_can_unmount") | |||
| 1268 | - | core.PuregoSafeRegister(&XGMountEject, libs, "g_mount_eject") | |||
| 1269 | - | core.PuregoSafeRegister(&XGMountEjectFinish, libs, "g_mount_eject_finish") | |||
| 1270 | - | core.PuregoSafeRegister(&XGMountEjectWithOperation, libs, "g_mount_eject_with_operation") | |||
| 1271 | - | core.PuregoSafeRegister(&XGMountEjectWithOperationFinish, libs, "g_mount_eject_with_operation_finish") | |||
| 1272 | - | core.PuregoSafeRegister(&XGMountGetDefaultLocation, libs, "g_mount_get_default_location") | |||
| 1273 | - | core.PuregoSafeRegister(&XGMountGetDrive, libs, "g_mount_get_drive") | |||
| 1274 | - | core.PuregoSafeRegister(&XGMountGetIcon, libs, "g_mount_get_icon") | |||
| 1275 | - | core.PuregoSafeRegister(&XGMountGetName, libs, "g_mount_get_name") | |||
| 1276 | - | core.PuregoSafeRegister(&XGMountGetRoot, libs, "g_mount_get_root") | |||
| 1277 | - | core.PuregoSafeRegister(&XGMountGetSortKey, libs, "g_mount_get_sort_key") | |||
| 1278 | - | core.PuregoSafeRegister(&XGMountGetSymbolicIcon, libs, "g_mount_get_symbolic_icon") | |||
| 1279 | - | core.PuregoSafeRegister(&XGMountGetUuid, libs, "g_mount_get_uuid") | |||
| 1280 | - | core.PuregoSafeRegister(&XGMountGetVolume, libs, "g_mount_get_volume") | |||
| 1281 | - | core.PuregoSafeRegister(&XGMountGuessContentType, libs, "g_mount_guess_content_type") | |||
| 1282 | - | core.PuregoSafeRegister(&XGMountGuessContentTypeFinish, libs, "g_mount_guess_content_type_finish") | |||
| 1283 | - | core.PuregoSafeRegister(&XGMountGuessContentTypeSync, libs, "g_mount_guess_content_type_sync") | |||
| 1284 | - | core.PuregoSafeRegister(&XGMountIsShadowed, libs, "g_mount_is_shadowed") | |||
| 1285 | - | core.PuregoSafeRegister(&XGMountRemount, libs, "g_mount_remount") | |||
| 1286 | - | core.PuregoSafeRegister(&XGMountRemountFinish, libs, "g_mount_remount_finish") | |||
| 1287 | - | core.PuregoSafeRegister(&XGMountShadow, libs, "g_mount_shadow") | |||
| 1288 | - | core.PuregoSafeRegister(&XGMountUnmount, libs, "g_mount_unmount") | |||
| 1289 | - | core.PuregoSafeRegister(&XGMountUnmountFinish, libs, "g_mount_unmount_finish") | |||
| 1290 | - | core.PuregoSafeRegister(&XGMountUnmountWithOperation, libs, "g_mount_unmount_with_operation") | |||
| 1291 | - | core.PuregoSafeRegister(&XGMountUnmountWithOperationFinish, libs, "g_mount_unmount_with_operation_finish") | |||
| 1292 | - | core.PuregoSafeRegister(&XGMountUnshadow, libs, "g_mount_unshadow") | |||
| 1293 | } | 1422 | } | ||