Changeset 22081 for branches/swt/src/kernel32

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/src/kernel32/version.cpp (modified) (7 diffs)

branches/swt/src/kernel32/version.cpp

@@ -75 +75 @@
         ODINNT_VERSION,
         {
-            sizeof(OSVERSIONINFOA), ODINNT_MAJOR_VERSION, ODINNT_MINOR_VERSION, 
+            sizeof(OSVERSIONINFOA), ODINNT_MAJOR_VERSION, ODINNT_MINOR_VERSION,
             ODINNT_BUILD_NR, VER_PLATFORM_WIN32_NT, ODINNT_CSDVERSION,
             6, 0, 0, 0
@@ -117 +117 @@
 //******************************************************************************
 //******************************************************************************
-void WIN32API OdinSetVersion(ULONG version) 
+void WIN32API OdinSetVersion(ULONG version)
 {
     switch(version) {
@@ -127 +127 @@
     case WINVERSION_WINXPSP3:
         break;
-    default: 
+    default:
         DebugInt3();
         return;
@@ -139 +139 @@
     char szVersion[16];
 
-    if(PROFILE_GetOdinIniString(PROFILE_WINVERSION_SECTION, PROFILE_WINVERSION_KEY, 
-                                "", szVersion, sizeof(szVersion)-1) > 1) 
+    if(PROFILE_GetOdinIniString(PROFILE_WINVERSION_SECTION, PROFILE_WINVERSION_KEY,
+                                "", szVersion, sizeof(szVersion)-1) > 1)
     {
         if(!stricmp(szVersion, PROFILE_WINVERSION_WIN98)) {
@@ -201 +201 @@
     dprintf(("szCSDVersion %s", lpVersionInformation->szCSDVersion));
 
-    if(lpVersionInformation->dwOSVersionInfoSize == sizeof(OSVERSIONINFOEXA)) 
+    if(lpVersionInformation->dwOSVersionInfoSize == sizeof(OSVERSIONINFOEXA))
     {//Windows 2000 (and up) extension
         LPOSVERSIONINFOEXA lpVersionExInformation = (LPOSVERSIONINFOEXA)lpVersionInformation;
@@ -207 +207 @@
         lpVersionExInformation->wServicePackMajor = VersionData[winversion].getVersionEx.wServicePackMajor;
         lpVersionExInformation->wServicePackMinor = VersionData[winversion].getVersionEx.wServicePackMinor;
+/*
         lpVersionExInformation->wReserved[0]      = VersionData[winversion].getVersionEx.wReserved[0];
         lpVersionExInformation->wReserved[1]      = VersionData[winversion].getVersionEx.wReserved[1];
-    
+*/
+///-------------------------------------------------------------------[swt-os2]
+        lpVersionExInformation->wSuiteMask        = VersionData[winversion].getVersionEx.wSuiteMask;
+        lpVersionExInformation->wProductType      = VersionData[winversion].getVersionEx.wProductType;
+        lpVersionExInformation->wReserved         = VersionData[winversion].getVersionEx.wReserved;
+///----------------------------------------------------------------------------
+
         dprintf(("service pack version %x.%x", lpVersionExInformation->wServicePackMajor, lpVersionExInformation->wServicePackMinor));
     }
-    
+
     SetLastError(ERROR_SUCCESS);
     return(TRUE);
@@ -244 +251 @@
     lstrcpyAtoW(lpVersionInformation->szCSDVersion, VersionData[winversion].getVersionEx.szCSDVersion);
 
-    if(lpVersionInformation->dwOSVersionInfoSize == sizeof(OSVERSIONINFOEXW)) 
+    if(lpVersionInformation->dwOSVersionInfoSize == sizeof(OSVERSIONINFOEXW))
     {//Windows 2000 (and up) extension
         LPOSVERSIONINFOEXW lpVersionExInformation = (LPOSVERSIONINFOEXW)lpVersionInformation;
-    
+
         lpVersionExInformation->wServicePackMajor = VersionData[winversion].getVersionEx.wServicePackMajor;
         lpVersionExInformation->wServicePackMinor = VersionData[winversion].getVersionEx.wServicePackMinor;
+/*
         lpVersionExInformation->wReserved[0]      = VersionData[winversion].getVersionEx.wReserved[0];
         lpVersionExInformation->wReserved[1]      = VersionData[winversion].getVersionEx.wReserved[1];
+*/
+///-------------------------------------------------------------------[swt-os2]
+        lpVersionExInformation->wSuiteMask        = VersionData[winversion].getVersionEx.wSuiteMask;
+        lpVersionExInformation->wProductType      = VersionData[winversion].getVersionEx.wProductType;
+        lpVersionExInformation->wReserved         = VersionData[winversion].getVersionEx.wReserved;
+///----------------------------------------------------------------------------
     }
     SetLastError(ERROR_SUCCESS);