diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2001-11-12 20:53:47 +0300 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2001-11-12 20:53:47 +0300 |
| commit | 192b4f62615bde11364f74b3c53afaad2722425b (patch) | |
| tree | ff613a6e8cf0b213bce5425fb28639740009161b | |
| parent | 697b8c0c32fdd050b91b583500e756c3cf707461 (diff) | |
* include/winbase.h (OSVERSIONINFOEX): Add definition.
* include/winnt.h: Add VER_NT_* and VER_SUITE_* defines.
| -rw-r--r-- | winsup/w32api/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/w32api/include/winbase.h | 28 | ||||
| -rw-r--r-- | winsup/w32api/include/winnt.h | 10 |
3 files changed, 43 insertions, 0 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index 9075a5909..35d39c559 100644 --- 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 2892fd5fa..a75a7d5b1 100644 --- 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 b7c72293c..ec7c81029 100644 --- 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 */ |