Changes to common header files not applicable to open-vm-tools.

diff --git a/open-vm-tools/lib/include/guest_os.h b/open-vm-tools/lib/include/guest_os.h
index 886aaef319bebab285b631852b5a092a7bc511e3..05733237ad25c2b979b88f9ac73020e102eebde0 100644 (file)
--- a/open-vm-tools/lib/include/guest_os.h
+++ b/open-vm-tools/lib/include/guest_os.h
@@ -123,43 +123,49 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
 
 #define ALLWINEIGHT           ALLWINEIGHTSERVER, ALLWINEIGHTCLIENT
 
-#define ALLWINTENSERVER64     BS(WIN_2016SRV_64), BS(WIN_2019SRV_64), \
-                              BS(WIN_2022SRV_64), BS(WIN_2025SRV_64)
+#define ALLWIN_10_SERVER64    BS(WIN_2016SRV_64), BS(WIN_2019SRV_64)
 
-#define ALLWINTENSERVER       ALLWINTENSERVER64
+#define ALLWIN_10_SERVER      ALLWIN_10_SERVER64
 
-#define ALLWINTENCLIENT32     BS(WINTEN)
-#define ALLWINTENCLIENT64     BS(WINTEN_64), BS(ARM_WINTEN_64)
-#define ALLWINTENCLIENT       ALLWINTENCLIENT32, ALLWINTENCLIENT64
+#define ALLWIN_10_CLIENT32    BS(WIN_10)
+#define ALLWIN_10_CLIENT64    BS(WIN_10_64), BS(ARM_WIN_10_64)
+#define ALLWIN_10_CLIENT      ALLWIN_10_CLIENT32, ALLWIN_10_CLIENT64
 
-#define ALLWINTEN32           ALLWINTENCLIENT32
-#define ALLWINTEN64           ALLWINTENCLIENT64, ALLWINTENSERVER
-#define ALLWINTEN             ALLWINTENCLIENT, ALLWINTENSERVER
+#define ALLWIN_10_32          ALLWIN_10_CLIENT32
+#define ALLWIN_10_64          ALLWIN_10_CLIENT64, ALLWIN_10_SERVER
+#define ALLWIN_10             ALLWIN_10_CLIENT,   ALLWIN_10_SERVER
 
-#define ALLWINELEVENCLIENT64  BS(WINELEVEN_64), BS(ARM_WINELEVEN_64)
-#define ALLWINELEVEN64        ALLWINTENCLIENT64
-#define ALLWINELEVEN          ALLWINELEVENCLIENT64
+#define ALLWIN_11_SERVER64    BS(WIN_2022SRV_64), BS(WIN_2025SRV_64)
+#define ALLWIN_11_SERVER      ALLWIN_10_SERVER64
+
+#define ALLWIN_11_CLIENT64    BS(WIN_11_64), BS(ARM_WIN_11_64)
+#define ALLWIN_11_CLIENT      ALLWIN_11_CLIENT64
+
+#define ALLWIN_11_64          ALLWIN_11_CLIENT64, ALLWIN_11_SERVER
+#define ALLWIN_11             ALLWIN_11_CLIENT64, ALLWIN_11_SERVER
 
 #define ALLHYPER_V            BS(HYPER_V)
 
 #define ALLWINVISTA_OR_HIGHER ALLWINVISTA,           ALLWINLONGHORN,     \
                               ALLWIN2008R2,          ALLWINSEVEN,        \
                               ALLWINEIGHTSERVER,     ALLWINEIGHTCLIENT,  \
-                              ALLWINTENSERVER,       ALLWINTENCLIENT,    \
-                              ALLWINELEVENCLIENT64,  ALLHYPER_V          \
+                              ALLWIN_10_SERVER,      ALLWIN_10_CLIENT,   \
+                              ALLWIN_11_SERVER,      ALLWIN_11_CLIENT,   \
+                              ALLHYPER_V
 
 #define ALLWINNT32            BS(WINNT),           ALLWIN2000,          \
                               ALLWINXP32,          ALLWINNET32,         \
                               ALLWINVISTA32,       ALLWINLONGHORN32,    \
                               ALLWINSEVEN32,       ALLWINEIGHTCLIENT32, \
-                              ALLWINTENCLIENT32
+                              ALLWIN_10_CLIENT32
 
 #define ALLWINNT64            ALLWINXP64,            ALLWINNET64,       \
                               ALLWINVISTA64,         ALLWINLONGHORN64,  \
                               ALLWINSEVEN64,         ALLWIN2008R2_64,   \
                               ALLWINEIGHTCLIENT64,   ALLWINEIGHTSERVER, \
-                              ALLWINTENCLIENT64,     ALLWINTENSERVER,   \
-                              ALLWINELEVENCLIENT64,  ALLHYPER_V
+                              ALLWIN_10_CLIENT64,    ALLWIN_10_SERVER,  \
+                              ALLWIN_11_CLIENT64,    ALLWIN_11_SERVER,  \
+                              ALLHYPER_V
 
 #define ALLWINNT              ALLWINNT32, ALLWINNT64
 
@@ -257,11 +263,11 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
 
 #define ALLCRX                BS(CRXSYS1_64), BS(CRXPOD1_64)
 
-#define ALLARM                BS(ARM_WINTEN_64),   BS(ARM_UBUNTU_64),       \
-                              BS(ARM_PHOTON_64),   BS(ARM_VMKERNEL7),       \
-                              BS(ARM_OTHER_64),    BS(ARM_OTHER5XLINUX_64), \
-                              BS(ARM_DEBIAN_64),   BS(ARM_FREEBSD13_64),    \
-                              BS(ARM_FREEBSD14_64)
+#define ALLARM                BS(ARM_WIN_10_64),    BS(ARM_UBUNTU_64),       \
+                              BS(ARM_PHOTON_64),    BS(ARM_VMKERNEL7),       \
+                              BS(ARM_OTHER_64),     BS(ARM_OTHER5XLINUX_64), \
+                              BS(ARM_DEBIAN_64),    BS(ARM_FREEBSD13_64),    \
+                              BS(ARM_FREEBSD14_64), BS(ARM_WIN_11_64)
 
 /*
  * These constants are generated by GuestInfoGetOSName which is in
@@ -542,10 +548,10 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
  * Windows 10 to ensure that things continue to work.
  */
 
-#define STR_OS_WINTEN        "windows9"
-#define STR_OS_WINTEN_X64    "windows9-64"
+#define STR_OS_WIN_10        "windows9"
+#define STR_OS_WIN_10_X64    "windows9-64"
 
-#define STR_OS_WIN_TEN_GENERIC_FULL        "Windows 10"
+#define STR_OS_WIN_10_GENERIC_FULL         "Windows 10"
 #define STR_OS_WIN_10_HOME_FULL            "Windows 10 Home"
 #define STR_OS_WIN_10_EDUCATION_FULL       "Windows 10 Education"
 #define STR_OS_WIN_10_ENTERPRISE_FULL      "Windows 10 Enterprise"
@@ -559,8 +565,17 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
  * No 32-bit support.
  */
 
-#define STR_OS_WINELEVEN        "windows11"
-#define STR_OS_WINELEVEN_X64    "windows11-64"
+#define STR_OS_WIN_11        "windows11"
+#define STR_OS_WIN_11_X64    "windows11-64"
+
+
+#define STR_OS_WIN_11_GENERIC_FULL         "Windows 11"
+#define STR_OS_WIN_11_HOME_FULL            "Windows 11 Home"
+#define STR_OS_WIN_11_EDUCATION_FULL       "Windows 11 Education"
+#define STR_OS_WIN_11_ENTERPRISE_FULL      "Windows 11 Enterprise"
+#define STR_OS_WIN_11_PRO_WORKSTATION_FULL "Windows 11 Pro for Workstations"
+#define STR_OS_WIN_11_PRO_FULL             "Windows 11 Pro"
+#define STR_OS_WIN_11_IOTCORE_FULL         "Windows 11 IoT Core"
 
 /* Windows Server 2016 */
 
@@ -578,12 +593,12 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
 
 #define STR_OS_WIN_2025SRV_X64 "windows2022srvNext-64"
 
-/* THIS SPACE FOR RENT (Windows 10 official server variant names) */
+/* THIS SPACE FOR RENT (Windows 10 and later official server variant names) */
 
-#define STR_OS_WIN_TENSERVER_2016_GENERIC_FULL "Windows Server 2016"
-#define STR_OS_WIN_TENSERVER_2019_GENERIC_FULL "Windows Server 2019"
-#define STR_OS_WIN_TENSERVER_2022_GENERIC_FULL "Windows Server 2022"
-#define STR_OS_WIN_TENSERVER_2025_GENERIC_FULL "Windows Server 2025"
+#define STR_OS_WIN_10_SERVER_2016_GENERIC_FULL "Windows Server 2016"
+#define STR_OS_WIN_10_SERVER_2019_GENERIC_FULL "Windows Server 2019"
+#define STR_OS_WIN_11_SERVER_2022_GENERIC_FULL "Windows Server 2022"
+#define STR_OS_WIN_11_SERVER_2025_GENERIC_FULL "Windows Server 2025"
 
 /* Microsoft Hyper-V */
 #define STR_OS_HYPER_V      "winHyperV"

diff --git a/open-vm-tools/lib/include/guest_os_tables.h b/open-vm-tools/lib/include/guest_os_tables.h
index d9f6a63e310a1ca7d6f74fd3054ae538a36cff10..3e6968c50bc04afafd8436df79dae350e7aff227 100644 (file)
--- a/open-vm-tools/lib/include/guest_os_tables.h
+++ b/open-vm-tools/lib/include/guest_os_tables.h
@@ -56,11 +56,11 @@ extern "C" {
    GOT(GUEST_OS_WINEIGHT)            /* Windows 8 32-bit */                \
    GOT(GUEST_OS_WINEIGHT_64)         /* Windows 8 64-bit */                \
    GOT(GUEST_OS_WINEIGHTSERVER_64)   /* Windows 8 Server 64-bit */         \
-   GOT(GUEST_OS_WINTEN)              /* Windows 10 32-bit */               \
-   GOT(GUEST_OS_WINTEN_64)           /* Windows 10 64-bit */               \
-   GOT(GUEST_OS_ARM_WINTEN_64)       /* Windows 10 Arm 64-bit */           \
-   GOT(GUEST_OS_WINELEVEN_64)        /* Windows 11 64-bit */               \
-   GOT(GUEST_OS_ARM_WINELEVEN_64)    /* Windows 11 Arm 64-bit */           \
+   GOT(GUEST_OS_WIN_10)              /* Windows 10 32-bit */               \
+   GOT(GUEST_OS_WIN_10_64)           /* Windows 10 64-bit */               \
+   GOT(GUEST_OS_ARM_WIN_10_64)       /* Windows 10 Arm 64-bit */           \
+   GOT(GUEST_OS_WIN_11_64)           /* Windows 11 64-bit */               \
+   GOT(GUEST_OS_ARM_WIN_11_64)       /* Windows 11 Arm 64-bit */           \
    GOT(GUEST_OS_WIN_2016SRV_64)      /* Windows Server 2016 64-bit */      \
    GOT(GUEST_OS_WIN_2019SRV_64)      /* Windows Server 2019 64-bit */      \
    GOT(GUEST_OS_WIN_2022SRV_64)      /* Windows Server 2022 64-bit */      \

diff --git a/open-vm-tools/lib/include/hostinfo.h b/open-vm-tools/lib/include/hostinfo.h
index 789a213adf731a722ec695e56ea4db1673bc097b..a53420c977dc37786d8c06aa274a67432bfda920 100644 (file)
--- a/open-vm-tools/lib/include/hostinfo.h
+++ b/open-vm-tools/lib/include/hostinfo.h
@@ -212,6 +212,7 @@ typedef enum {
    OS_WINSEVEN               = 9,
    OS_WIN8                   = 10,
    OS_WIN10                  = 11,
+   OS_WIN11                  = 12,
    OS_UNKNOWN                = 99999 // last, highest value
 } OS_TYPE;
 
@@ -241,6 +242,8 @@ typedef enum {
    OS_DETAIL_WIN8SERVER      = 23,
    OS_DETAIL_WIN10           = 24,
    OS_DETAIL_WIN10SERVER     = 25,
+   OS_DETAIL_WIN11           = 26,
+   OS_DETAIL_WIN11SERVER     = 27,
    OS_DETAIL_UNKNOWN         = 99999  // last, highest value
 } OS_DETAIL_TYPE;