update for HEAD-2003021201

[reactos.git] / include / structs.h

diff --git a/include/structs.h b/include/structs.h
index 56e0947..5cae0a4 100644 (file)
--- a/include/structs.h
+++ b/include/structs.h
@@ -503,7 +503,7 @@ typedef struct tagLOGFONTW {
   BYTE lfClipPrecision;
   BYTE lfQuality;
   BYTE lfPitchAndFamily;
-  LPWSTR lfFaceName;
+  WCHAR lfFaceName[LF_FACESIZE];
 } LOGFONTW, *LPLOGFONTW, *PLOGFONTW;
 
 typedef struct {
@@ -2434,6 +2434,8 @@ typedef struct tagMETAFILEPICT {
   LONG      xExt;
   LONG      yExt;
   HMETAFILE hMF;
+#else
+  LONG      mm; // robd
 #endif
 } METAFILEPICT, *PMETAFILEPICT, *LPMETAFILEPICT;
 
@@ -2896,14 +2898,81 @@ typedef struct _OFNOTIFY {
   LPTSTR         pszFile;
 } OFNOTIFY, *LPOFNOTIFY;
 
-typedef struct _OSVERSIONINFO {
+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;
-  TCHAR szCSDVersion[ 128 ];
-} OSVERSIONINFO, *POSVERSIONINFO, *LPOSVERSIONINFO;
+  WCHAR szCSDVersion[ 128 ];
+} OSVERSIONINFOW, *POSVERSIONINFOW, *LPOSVERSIONINFOW;
+
+#ifdef UNICODE
+typedef OSVERSIONINFOA OSVERSIONINFO;
+#else
+typedef OSVERSIONINFOW OSVERSIONINFO;
+#endif
+
+typedef struct _OSVERSIONINFOEXA
+#if defined(__cplusplus)
+: public OSVERSIONINFOA
+{
+#elif 0
+{
+ OSVERSIONINFOA;
+#else
+{
+ DWORD dwOSVersionInfoSize;
+ DWORD dwMajorVersion;
+ DWORD dwMinorVersion;
+ DWORD dwBuildNumber;
+ DWORD dwPlatformId;
+ CHAR szCSDVersion[ 128 ];
+#endif
+ WORD wServicePackMajor;
+ WORD wServicePackMinor;
+ WORD wSuiteMask;
+ BYTE wProductType;
+ BYTE wReserved;
+} OSVERSIONINFOEXA, *POSVERSIONINFOEXA, *LPOSVERSIONINFOEXA;
+
+typedef struct _OSVERSIONINFOEXW
+#if defined(__cplusplus)
+: public OSVERSIONINFOW
+{
+#elif 0
+{
+ OSVERSIONINFOW;
+#else
+{
+ DWORD dwOSVersionInfoSize;
+ DWORD dwMajorVersion;
+ DWORD dwMinorVersion;
+ DWORD dwBuildNumber;
+ DWORD dwPlatformId;
+ WCHAR szCSDVersion[ 128 ];
+#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;