Changeset 22081 for branches/swt/include/win/winbase.h

Timestamp:

Aug 23, 2014, 4:21:44 PM (11 years ago)

Author:

rousseau

Message:

Modified or replaced some structures

structures:
o DEVMODEA
o DEVMODEW
o NMLVCUSTOMDRAW
o NOTIFYICONDATAA
o NOTIFYICONDATAW
o OPENFILENAME
o OSVERSIONINFOA
o OSVERSIONINFOW
o OSVERSIONINFOEXA
o OSVERSIONINFOEXW
o SCROLLBARINFO
o SHELLEXECUTEINFOA
o SHELLEXECUTEINFOW
o TTTOOLINFOA
o TTTOOLINFOW

All sources for swt.dll now compile.

File:

• branches/swt/include/win/winbase.h (modified) (2 diffs)

branches/swt/include/win/winbase.h

@@ -1306 +1306 @@
     WORD  wServicePackMajor;
     WORD  wServicePackMinor;
-    WORD  wReserved[2];
+    //~ WORD  wReserved[2];
+///-------------------------------------------------------------------[swt-os2]
+/// From Wine::include/winnt.h
+/// That's handy, to reserve an array of 2 WORDS, call it wReserved, then
+/// use some of the reserved space in a later definition and call the remaining
+/// byte also wReserved.
+        WORD wSuiteMask;
+        BYTE wProductType;  /// Should be named bProductType
+        BYTE wReserved;     /// Should be named bReserved
+///----------------------------------------------------------------------------
 } OSVERSIONINFOEXA, *POSVERSIONINFOEXA, *LPOSVERSIONINFOEXA;
 typedef struct _OSVERSIONINFOEXW {
@@ -1317 +1326 @@
     WORD  wServicePackMajor;
     WORD  wServicePackMinor;
-    WORD  wReserved[2];
-} OSVERSIONINFOEXW, *POSVERSIONINFOEXW, *LPOSVERSIONINFOEXW;
+    //~ WORD  wReserved[2];
+//~ } OSVERSIONINFOEXW, *POSVERSIONINFOEXW, *LPOSVERSIONINFOEXW;
+///-------------------------------------------------------------------[swt-os2]
+/// From Wine::include/winnt.h
+/// That's handy, to reserve an array of 2 WORDS, call it wReserved, then
+/// use some of the reserved space in a later definition and call the remaining
+/// byte also wReserved.
+        WORD wSuiteMask;
+        BYTE wProductType;  /// Should be named bProductType
+        BYTE wReserved;     /// Should be named bReserved
+} OSVERSIONINFOEXW, *POSVERSIONINFOEXW, *LPOSVERSIONINFOEXW, RTL_OSVERSIONINFOEXW, *PRTL_OSVERSIONINFOEXW;
+///----------------------------------------------------------------------------
 
 DECL_WINELIB_TYPE_AW(OSVERSIONINFOEX)