From: Danny S. <dan...@us...> - 2001-11-22 21:41:16
|
Update of /cvsroot/mingw/w32api/include In directory usw-pr-cvs1:/tmp/cvs-serv12038/w32api/include Modified Files: winbase.h winnt.h Log Message: * include/winbase.h (OSVERSIONINFO[AW],VER_PLATFORM_WIN32s, VER_PLATFORM_WIN32_WINDOWS,VER_PLATFORM_WIN32_NT): Move from here... * include/winnt.h: ... to here. * include/winbase.h (VerifyVersionInfo[AW]): Add declaration. * include/winnt.h (OSVERSIONINFOEX[AW]): Add structure definitions and typedefs. (VER_NT_WORKSTATION,VER_NT_DOMAIN_CONTROLLER,VER_NT_SERVER): Add defines. Index: winbase.h =================================================================== RCS file: /cvsroot/mingw/w32api/include/winbase.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** winbase.h 2001/09/04 20:48:14 1.4 --- winbase.h 2001/11/22 21:41:13 1.5 *************** *** 428,434 **** #define CBR_128000 128000 #define CBR_256000 256000 - #define VER_PLATFORM_WIN32s 0 - #define VER_PLATFORM_WIN32_WINDOWS 1 - #define VER_PLATFORM_WIN32_NT 2 #define BACKUP_INVALID 0 #define BACKUP_DATA 1 --- 428,431 ---- *************** *** 842,861 **** LONG DaylightBias; } TIME_ZONE_INFORMATION,*LPTIME_ZONE_INFORMATION; - typedef struct _OSVERSIONINFOA { - DWORD dwOSVersionInfoSize; - DWORD dwMajorVersion; - DWORD dwMinorVersion; - DWORD dwBuildNumber; - DWORD dwPlatformId; - CHAR szCSDVersion[128]; - } OSVERSIONINFOA,*POSVERSIONINFOA,*LPOSVERSIONINFOA; - typedef struct _OSVERSIONINFOW { - DWORD dwOSVersionInfoSize; - DWORD dwMajorVersion; - DWORD dwMinorVersion; - DWORD dwBuildNumber; - DWORD dwPlatformId; - WCHAR szCSDVersion[128]; - } OSVERSIONINFOW,*POSVERSIONINFOW,*LPOSVERSIONINFOW; typedef struct _MEMORYSTATUS { DWORD dwLength; --- 839,842 ---- *************** *** 1547,1550 **** --- 1528,1533 ---- BOOL WINAPI UpdateResourceA(HANDLE,LPCSTR,LPCSTR,WORD,PVOID,DWORD); BOOL WINAPI UpdateResourceW(HANDLE,LPCWSTR,LPCWSTR,WORD,PVOID,DWORD); + BOOL WINAPI VerifyVersionInfoA(LPOSVERSIONINFOEXA,DWORD,DWORDLONG); + BOOL WINAPI VerifyVersionInfoW(LPOSVERSIONINFOEXW,DWORD,DWORDLONG); PVOID WINAPI VirtualAlloc(PVOID,DWORD,DWORD,DWORD); BOOL WINAPI VirtualFree(PVOID,DWORD,DWORD); *************** *** 1585,1589 **** 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; #define AccessCheckAndAuditAlarm AccessCheckAndAuditAlarmW #define AddAtom AddAtomW --- 1568,1571 ---- *************** *** 1711,1714 **** --- 1693,1697 ---- #define SetVolumeLabel SetVolumeLabelW #define UpdateResource UpdateResourceW + #define VerifyVersionInfo VerifyVersionInfoW #define WaitNamedPipe WaitNamedPipeW #define WritePrivateProfileSection WritePrivateProfileSectionW *************** *** 1721,1725 **** 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; #define AccessCheckAndAuditAlarm AccessCheckAndAuditAlarmA #define AddAtom AddAtomA --- 1704,1707 ---- *************** *** 1847,1850 **** --- 1829,1833 ---- #define SetVolumeLabel SetVolumeLabelA #define UpdateResource UpdateResourceA + #define VerifyVersionInfo VerifyVersionInfoA #define WaitNamedPipe WaitNamedPipeA #define WritePrivateProfileSection WritePrivateProfileSectionA Index: winnt.h =================================================================== RCS file: /cvsroot/mingw/w32api/include/winnt.h,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** winnt.h 2001/11/05 00:27:06 1.13 --- winnt.h 2001/11/22 21:41:14 1.14 *************** *** 1055,1058 **** --- 1055,1064 ---- #define TAPE_UNLOCK 4 #define TAPE_FORMAT 5 + #define VER_PLATFORM_WIN32s 0 + #define VER_PLATFORM_WIN32_WINDOWS 1 + #define VER_PLATFORM_WIN32_NT 2 + #define VER_NT_WORKSTATION 1 + #define VER_NT_DOMAIN_CONTROLLER 2 + #define VER_NT_SERVER 3 #define BTYPE(x) ((x)&N_BTMASK) #define ISPTR(x) (((x)&N_TMASK)==(IMAGE_SYM_DTYPE_POINTER<<N_BTSHFT)) *************** *** 2000,2003 **** --- 2006,2051 ---- DWORD DataOffset; } EVENTLOGRECORD,*PEVENTLOGRECORD; + typedef struct _OSVERSIONINFOA { + DWORD dwOSVersionInfoSize; + DWORD dwMajorVersion; + DWORD dwMinorVersion; + DWORD dwBuildNumber; + DWORD dwPlatformId; + CHAR szCSDVersion[128]; + } OSVERSIONINFOA,*POSVERSIONINFOA,*LPOSVERSIONINFOA; + typedef struct _OSVERSIONINFOW { + DWORD dwOSVersionInfoSize; + DWORD dwMajorVersion; + DWORD dwMinorVersion; + DWORD dwBuildNumber; + 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; #pragma pack(push,2) typedef struct _IMAGE_VXD_HEADER { *************** *** 2527,2530 **** --- 2575,2586 ---- WORD UnparsedNameLength; } REPARSE_POINT_INFORMATION, *PREPARSE_POINT_INFORMATION; + + #ifdef UNICODE + typedef OSVERSIONINFOW OSVERSIONINFO,*POSVERSIONINFO,*LPOSVERSIONINFO; + typedef OSVERSIONINFOEXW OSVERSIONINFOEX,*POSVERSIONINFOEX,*LPOSVERSIONINFOEX; + #else + typedef OSVERSIONINFOA OSVERSIONINFO,*POSVERSIONINFO,*LPOSVERSIONINFO; + typedef OSVERSIONINFOEXA OSVERSIONINFOEX,*POSVERSIONINFOEX,*LPOSVERSIONINFOEX; + #endif #if defined(__GNUC__) |