* include/winbase.h (OSVERSIONINFOEX): Add definition.

	* include/winnt.h: Add VER_NT_* and VER_SUITE_* defines.

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 9075a59..35d39c5 100644 (file)
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,8 @@
+2001-11-12  Corinna Vinschen  <corinna@vinschen.de>
+
+       * include/winbase.h (OSVERSIONINFOEX): Add definition.
+       * include/winnt.h: Add VER_NT_* and VER_SUITE_* defines.
+
 2001-11-10  Robert Collins  <rbtcollins@hotmail.com>
 
        * include/winnt.h: Add Danny Smith's text comment about gcc compiler warnings

diff --git a/winsup/w32api/include/winbase.h b/winsup/w32api/include/winbase.h
index 2892fd5..a75a7d5 100644 (file)
--- a/winsup/w32api/include/winbase.h
+++ b/winsup/w32api/include/winbase.h
@@ -857,6 +857,32 @@ typedef struct _OSVERSIONINFOW {
        DWORD dwPlatformId;
        WCHAR szCSDVersion[128];
 } OSVERSIONINFOW,*POSVERSIONINFOW,*LPOSVERSIONINFOW;
+typedef struct _OSVERSIONINFOEXA {
+       DWORD dwOSVersionInfoSize;
+       DWORD dwMajorVersion;
+       DWORD dwMinorVersion;
+       DWORD dwBuildNumber;
+       DWORD dwPlatformId;
+       CHAR szCSDVersion[128];
+       WORD wServicePackMajor;
+       WORD wServicePackMinor;
+       WORD wSuiteMask;
+       BYTE wProductType;
+       BYTE wReserved;
+} OSVERSIONINFOEXA,*POSVERSIONINFOEXA,*LPOSVERSIONINFOEXA;
+typedef struct _OSVERSIONINFOEXW {
+       DWORD dwOSVersionInfoSize;
+       DWORD dwMajorVersion;
+       DWORD dwMinorVersion;
+       DWORD dwBuildNumber;
+       DWORD dwPlatformId;
+       WCHAR szCSDVersion[128];
+       WORD wServicePackMajor;
+       WORD wServicePackMinor;
+       WORD wSuiteMask;
+       BYTE wProductType;
+       BYTE wReserved;
+} OSVERSIONINFOEXW,*POSVERSIONINFOEXW,*LPOSVERSIONINFOEXW;
 typedef struct _MEMORYSTATUS {
        DWORD dwLength;
        DWORD dwMemoryLoad;
@@ -1585,6 +1611,7 @@ typedef STARTUPINFOW STARTUPINFO,*LPSTARTUPINFO;
 typedef WIN32_FIND_DATAW WIN32_FIND_DATA,*LPWIN32_FIND_DATA;
 typedef HW_PROFILE_INFOW HW_PROFILE_INFO,*LPHW_PROFILE_INFO;
 typedef OSVERSIONINFOW OSVERSIONINFO,*POSVERSIONINFO,*LPOSVERSIONINFO;
+typedef OSVERSIONINFOEXW OSVERSIONINFOEX,*POSVERSIONINFOEX,*LPOSVERSIONINFOEX;
 #define AccessCheckAndAuditAlarm AccessCheckAndAuditAlarmW
 #define AddAtom AddAtomW
 #define BackupEventLog BackupEventLogW
@@ -1721,6 +1748,7 @@ typedef STARTUPINFOA STARTUPINFO,*LPSTARTUPINFO;
 typedef WIN32_FIND_DATAA WIN32_FIND_DATA,*LPWIN32_FIND_DATA;
 typedef HW_PROFILE_INFOA HW_PROFILE_INFO,*LPHW_PROFILE_INFO;
 typedef OSVERSIONINFOA OSVERSIONINFO,*POSVERSIONINFO,*LPOSVERSIONINFO;
+typedef OSVERSIONINFOEXA OSVERSIONINFOEX,*POSVERSIONINFOEX,*LPOSVERSIONINFOEX;
 #define AccessCheckAndAuditAlarm AccessCheckAndAuditAlarmA
 #define AddAtom AddAtomA
 #define BackupEventLog BackupEventLogA

diff --git a/winsup/w32api/include/winnt.h b/winsup/w32api/include/winnt.h
index b7c7229..ec7c810 100644 (file)
--- a/winsup/w32api/include/winnt.h
+++ b/winsup/w32api/include/winnt.h
@@ -1078,6 +1078,16 @@ typedef BYTE BOOLEAN,*PBOOLEAN;
 #define IsReparseTagValid(x) (!((x)&~IO_REPARSE_TAG_VALID_VALUES)&&((x)>IO_REPARSE_TAG_RESERVED_RANGE))
 #define IO_REPARSE_TAG_SYMBOLIC_LINK IO_REPARSE_TAG_RESERVED_ZERO
 #define IO_REPARSE_TAG_MOUNT_POINT 0xA0000003
+#define VER_NT_WORKSTATION 1
+#define VER_NT_DOMAIN_CONTROLLER 2
+#define VER_NT_SERVER 3
+#define VER_SUITE_SMALLBUSINESS 1
+#define VER_SUITE_ENTERPRISE 2
+#define VER_SUITE_BACKOFFICE 4
+#define VER_SUITE_TERMINAL 16
+#define VER_SUITE_SMALLBUSINESS_RESTRICTED 32
+#define VER_SUITE_DATACENTER 128
+#define VER_SUITE_PERSONAL 512
 #ifndef RC_INVOKED
 typedef DWORD ACCESS_MASK;
 #ifndef _GUID_DEFINED /* also defined in basetyps.h */