From 2aea5e2daeeb51351a2bd06863909277435ba8e0 Mon Sep 17 00:00:00 2001
From: Ronen Lapushner <ronenk17@gmail.com>
Date: Tue, 21 Jan 2025 21:15:24 +0200
Subject: [PATCH] Added initial Windows 11-supporting branding

---
 v2/internal/system/operatingsystem/os.go      |  7 ++--
 .../system/operatingsystem/os_windows.go      | 35 +++++++++++++++++++
 2 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/v2/internal/system/operatingsystem/os.go b/v2/internal/system/operatingsystem/os.go
index 39f1de8e0..028a97b2e 100644
--- a/v2/internal/system/operatingsystem/os.go
+++ b/v2/internal/system/operatingsystem/os.go
@@ -2,9 +2,10 @@ package operatingsystem
 
 // OS contains information about the operating system
 type OS struct {
-	ID      string
-	Name    string
-	Version string
+	ID       string
+	Name     string
+	Version  string
+	Branding string
 }
 
 // Info retrieves information about the current platform
diff --git a/v2/internal/system/operatingsystem/os_windows.go b/v2/internal/system/operatingsystem/os_windows.go
index 38ea43a12..a9aa05a92 100644
--- a/v2/internal/system/operatingsystem/os_windows.go
+++ b/v2/internal/system/operatingsystem/os_windows.go
@@ -4,10 +4,44 @@ package operatingsystem
 
 import (
 	"fmt"
+	"strings"
+	"syscall"
+	"unsafe"
 
+	"golang.org/x/sys/windows"
 	"golang.org/x/sys/windows/registry"
 )
 
+func stripNulls(str string) string {
+	// Split the string into substrings at each null character
+	substrings := strings.Split(str, "\x00")
+
+	// Join the substrings back into a single string
+	strippedStr := strings.Join(substrings, "")
+
+	return strippedStr
+}
+
+func mustStringToUTF16Ptr(input string) *uint16 {
+	input = stripNulls(input)
+	result, err := syscall.UTF16PtrFromString(input)
+	if err != nil {
+		panic(err)
+	}
+	return result
+}
+
+func getBranding() string {
+	var modBranding = syscall.NewLazyDLL("winbrand.dll")
+	var brandingFormatString = modBranding.NewProc("BrandingFormatString")
+
+	windowsLong := mustStringToUTF16Ptr("%WINDOWS_LONG%\x00")
+	ret, _, _ := brandingFormatString.Call(
+		uintptr(unsafe.Pointer(windowsLong)),
+	)
+	return windows.UTF16PtrToString((*uint16)(unsafe.Pointer(ret)))
+}
+
 func platformInfo() (*OS, error) {
 	// Default value
 	var result OS
@@ -27,6 +61,7 @@ func platformInfo() (*OS, error) {
 	result.Name = productName
 	result.Version = fmt.Sprintf("%s (Build: %s)", releaseId, currentBuild)
 	result.ID = displayVersion
+	result.Branding = getBranding()
 
 	return &result, key.Close()
 }