From 437966018f14cb2e1feb0abc56ba2df916ff69ba Mon Sep 17 00:00:00 2001
From: Yaribz <yaribzh@gmail.com>
Date: Wed, 10 Apr 2024 20:23:55 +0200
Subject: [PATCH 1/3] add GetOSUpdateBuildRevision function

Returns the current Update Build Revision (UBR) of the Win32 operating
system if applicable, or undef otherwise. The UBR number is the last
part of the build numbers used by Microsoft to identify the exact
Windows revisions.
---
 Win32.pm |  7 +++++++
 Win32.xs | 35 +++++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+)

diff --git a/Win32.pm b/Win32.pm
index 2ad726a..c7a672e 100644
--- a/Win32.pm
+++ b/Win32.pm
@@ -1144,6 +1144,13 @@ different major/minor version number than Windows XP.
 Similarly the name "WinWin32s" should have been "Win32s" but has been
 kept as-is for backwards compatibility reasons too.
 
+=item Win32::GetOSUpdateBuildRevision()
+
+Returns the current Update Build Revision (UBR) of the Win32 operating
+system if applicable, or undef otherwise. The UBR number is the last
+part of the build numbers used by Microsoft to identify the exact
+Windows revisions.
+
 =item Win32::GetOSVersion()
 
 [CORE] Returns the list (STRING, MAJOR, MINOR, BUILD, ID), where the
diff --git a/Win32.xs b/Win32.xs
index 3166c29..6495681 100644
--- a/Win32.xs
+++ b/Win32.xs
@@ -1132,6 +1132,40 @@ XS(w32_GetOSVersion)
     PUTBACK;
 }
 
+XS(w32_GetOSUpdateBuildRevision)
+{
+    dXSARGS;
+    LONG status;
+    DWORD val, val_size = sizeof(val);
+    PFNRegGetValueA pfnRegGetValueA;
+    HMODULE module;
+    
+    if (items)
+        Perl_croak(aTHX_ "usage: Win32::GetOSUpdateBuildRevision()");
+
+    EXTEND(SP, 1);
+
+    module = GetModuleHandleA("advapi32.dll");
+    GETPROC(RegGetValueA);
+    if (!pfnRegGetValueA)
+        XSRETURN_UNDEF;
+
+    status = pfnRegGetValueA(
+        HKEY_LOCAL_MACHINE,
+        "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion",
+        "UBR",
+        RRF_RT_REG_DWORD,
+        NULL,
+        &val,
+        &val_size
+    );
+
+    if (status == ERROR_SUCCESS)
+        XSRETURN_IV(val);
+
+    XSRETURN_UNDEF;
+}
+
 XS(w32_IsWinNT)
 {
     dXSARGS;
@@ -2058,6 +2092,7 @@ BOOT:
     newXS("Win32::DomainName", w32_DomainName, file);
     newXS("Win32::FsType", w32_FsType, file);
     newXS("Win32::GetOSVersion", w32_GetOSVersion, file);
+    newXS("Win32::GetOSUpdateBuildRevision", w32_GetOSUpdateBuildRevision, file);
     newXS("Win32::IsWinNT", w32_IsWinNT, file);
     newXS("Win32::IsWin95", w32_IsWin95, file);
     newXS("Win32::FormatMessage", w32_FormatMessage, file);

From f51f23c1dcf5530187b1c7b762f1fb98f113056c Mon Sep 17 00:00:00 2001
From: Yaribz <yaribzh@gmail.com>
Date: Wed, 10 Apr 2024 20:48:32 +0200
Subject: [PATCH 2/3] include UBR in description returned by GetOSName

Append the UBR number to the build number returned in the $desc string
by the _GetOSName function when it cannot resolve the build number to a
specific version.
---
 Win32.pm | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Win32.pm b/Win32.pm
index c7a672e..c00093d 100644
--- a/Win32.pm
+++ b/Win32.pm
@@ -596,6 +596,8 @@ sub _GetOSName {
                 }
                 else {
                     $desc = " Build $build";
+                    my $ubr = Win32::GetOSUpdateBuildRevision();
+                    $desc.=".$ubr" if(defined $ubr);
                 }
             }
             else {
@@ -620,6 +622,8 @@ sub _GetOSName {
                     }
                     else {
                         $desc = "Build $build";
+                        my $ubr = Win32::GetOSUpdateBuildRevision();
+                        $desc.=".$ubr" if(defined $ubr);
                     }
                 }
             }

From 1448ab1f63040fff40fa6d3f6975573b3c4ec9b0 Mon Sep 17 00:00:00 2001
From: Yaribz <yaribzh@gmail.com>
Date: Wed, 10 Apr 2024 23:16:09 +0200
Subject: [PATCH 3/3] add GetOSFullVersion function

In scalar context returns a string containing the full version of the
Win32 operating system (including revision number if applicable), in
following format: <major>.<minor>.<build>.<revision> (example for
Windows 10 version 22H2 build 19045.4170: "10.0.19045.4170"). In list
context returns the same numbers in a list instead: ($major, $minor,
$build, $revision).
---
 Win32.pm | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/Win32.pm b/Win32.pm
index c00093d..f0be017 100644
--- a/Win32.pm
+++ b/Win32.pm
@@ -30,6 +30,7 @@ package Win32;
     );
     @EXPORT_OK = qw(
         GetOSName
+        GetOSFullVersion
         SW_HIDE
         SW_SHOWNORMAL
         SW_SHOWMINIMIZED
@@ -378,6 +379,14 @@ sub GetOSDisplayName {
     return $name;
 }
 
+sub GetOSFullVersion {
+  my(undef, $major, $minor, $build) = Win32::GetOSVersion();
+  my @os_full_version = ($major, $minor, $build);
+  my $rev = Win32::GetOSUpdateBuildRevision();
+  push(@os_full_version, $rev) if(defined $rev);
+  return wantarray ? @os_full_version : join('.',@os_full_version);
+}
+
 sub _GetSystemMetrics {
     my($index,$metrics) = @_;
     return Win32::GetSystemMetrics($index) unless ref $metrics;
@@ -1096,6 +1105,15 @@ Win32::GetProductInfo() and Win32::GetSystemMetrics() functions provide
 the base information to check for certain capabilities, or for families
 of OS releases.
 
+=item Win32::GetOSFullVersion()
+
+In scalar context returns a string containing the full version of the
+Win32 operating system (including revision number if applicable), in
+following format: C<major.minor.build.revision> (example for Windows 10
+version 22H2 build 19045.4170: C<"10.0.19045.4170">). In list context
+returns the same numbers in a list instead:
+C<($major, $minor, $build, $revision)> (example: C<(10, 0, 19045, 4170)>).
+
 =item Win32::GetOSName()
 
 In scalar context returns the name of the Win32 operating system