mirror of
https://github.com/reactos/reactos.git
synced 2024-12-28 01:55:19 +00:00
OSVERSIONINFO and OSVERSIONINFOEX properly declared
Corrected some PEB fields svn path=/trunk/; revision=4096
This commit is contained in:
parent
035dcd8224
commit
26c473a88d
4 changed files with 59 additions and 6 deletions
|
@ -2135,7 +2135,7 @@ FindNextFileA(
|
|||
WINBOOL
|
||||
STDCALL
|
||||
GetVersionExA(
|
||||
LPOSVERSIONINFO lpVersionInformation
|
||||
LPOSVERSIONINFOA lpVersionInformation
|
||||
);
|
||||
|
||||
#define CreateWindowA(lpClassName, lpWindowName, dwStyle, x, y,\
|
||||
|
|
|
@ -145,7 +145,9 @@ typedef struct _PEB
|
|||
PVOID LoaderLock; // A0h
|
||||
ULONG OSMajorVersion; // A4h
|
||||
ULONG OSMinorVersion; // A8h
|
||||
ULONG OSBuildNumber; // ACh
|
||||
USHORT OSBuildNumber; // ACh
|
||||
UCHAR SPMajorVersion; // AEh
|
||||
UCHAR SPMinorVersion; // AFh
|
||||
ULONG OSPlatformId; // B0h
|
||||
ULONG ImageSubSystem; // B4h
|
||||
ULONG ImageSubSystemMajorVersion; // B8h
|
||||
|
|
|
@ -2898,14 +2898,65 @@ typedef struct _OFNOTIFY {
|
|||
LPTSTR pszFile;
|
||||
} OFNOTIFY, *LPOFNOTIFY;
|
||||
|
||||
typedef struct _OSVERSIONINFO {
|
||||
typedef struct _OSVERSIONINFOA {
|
||||
DWORD dwOSVersionInfoSize;
|
||||
DWORD dwMajorVersion;
|
||||
DWORD dwMinorVersion;
|
||||
DWORD dwBuildNumber;
|
||||
DWORD dwPlatformId;
|
||||
TCHAR szCSDVersion[ 128 ];
|
||||
} OSVERSIONINFO, *POSVERSIONINFO, *LPOSVERSIONINFO;
|
||||
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;
|
||||
|
||||
#ifdef UNICODE
|
||||
typedef OSVERSIONINFOA OSVERSIONINFO;
|
||||
#else
|
||||
typedef OSVERSIONINFOW OSVERSIONINFO;
|
||||
#endif
|
||||
|
||||
typedef struct _OSVERSIONINFOEXA
|
||||
#ifdef __cplusplus
|
||||
: public OSVERSIONINFOA
|
||||
{
|
||||
#else
|
||||
{
|
||||
OSVERSIONINFOA;
|
||||
#endif
|
||||
WORD wServicePackMajor;
|
||||
WORD wServicePackMinor;
|
||||
WORD wSuiteMask;
|
||||
BYTE wProductType;
|
||||
BYTE wReserved;
|
||||
} OSVERSIONINFOEXA, *POSVERSIONINFOEXA, *LPOSVERSIONINFOEXA;
|
||||
|
||||
typedef struct _OSVERSIONINFOEXW
|
||||
#ifdef __cplusplus
|
||||
: public OSVERSIONINFOW
|
||||
{
|
||||
#else
|
||||
{
|
||||
OSVERSIONINFOW;
|
||||
#endif
|
||||
WORD wServicePackMajor;
|
||||
WORD wServicePackMinor;
|
||||
WORD wSuiteMask;
|
||||
BYTE wProductType;
|
||||
BYTE wReserved;
|
||||
} OSVERSIONINFOEXW, *POSVERSIONINFOEXW, *LPOSVERSIONINFOEXW;
|
||||
|
||||
#ifdef UNICODE
|
||||
typedef OSVERSIONINFOEXA OSVERSIONINFOEX;
|
||||
#else
|
||||
typedef OSVERSIONINFOEXW OSVERSIONINFOEX;
|
||||
#endif
|
||||
|
||||
typedef struct tagTEXTMETRIC {
|
||||
LONG tmHeight;
|
||||
|
|
|
@ -2152,7 +2152,7 @@ FindNextFileW(
|
|||
WINBOOL
|
||||
STDCALL
|
||||
GetVersionExW(
|
||||
LPOSVERSIONINFO lpVersionInformation
|
||||
LPOSVERSIONINFOW lpVersionInformation
|
||||
);
|
||||
|
||||
#define CreateWindowW(lpClassName, lpWindowName, dwStyle, x, y,\
|
||||
|
|
Loading…
Reference in a new issue