Changeset 22081 for branches/swt/src

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.

Location:

branches/swt/src

Files:

• kernel32/version.cpp (modified) (7 diffs)
• user32/scroll.cpp (modified) (10 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);

branches/swt/src/user32/scroll.cpp

@@ -140 +140 @@
           lprect->left--;
           lprect->right++;
-        } 
-        else 
+        }
+        else
         if (win32wnd->getStyle() & WS_VSCROLL)
             lprect->right++;
@@ -164 +164 @@
           lprect->top--;
           lprect->bottom++;
-        } 
-        else 
+        }
+        else
         if (win32wnd->getStyle() & WS_HSCROLL)
           lprect->bottom++;
@@ -982 +982 @@
             SCROLL_DrawMovingThumb(hdc, &rect, vertical, arrowSize, thumbSize);
 #ifdef __WIN32OS2__
-            //This message is sent in Windows when the user clicks on the 
+            //This message is sent in Windows when the user clicks on the
             //scroll thumb (even without moving) (NT4, SP6)
             SendMessageA( hwndOwner, vertical ? WM_VSCROLL : WM_HSCROLL,
@@ -1343 +1343 @@
             infoPtr->Page = info->nPage;
             action |= SA_SSI_REPAINT_INTERIOR;
-            bChangeParams = TRUE; 
+            bChangeParams = TRUE;
         }
     }
@@ -1368 +1368 @@
             infoPtr->MinVal = 0;
             infoPtr->MaxVal = 0;
-            bChangeParams = TRUE; 
+            bChangeParams = TRUE;
         }
         else
@@ -1378 +1378 @@
                 infoPtr->MinVal = info->nMin;
                 infoPtr->MaxVal = info->nMax;
-                bChangeParams = TRUE; 
+                bChangeParams = TRUE;
             }
         }
@@ -1416 +1416 @@
           new_flags = ESB_DISABLE_BOTH;
           action |= SA_SSI_REFRESH;
-        } 
-        else 
+        }
+        else
         if (nBar != SB_CTL && bChangeParams)
         {
@@ -1424 +1424 @@
           goto done;
         }
-      } 
+      }
       else  /* Show and enable scroll-bar */
       {
@@ -1587 +1587 @@
 //testestset
     static int nestlevel = 0;
-    
+
     //NOTE: This is an ugly workaround for an endless loop in CVP
     //      Need to make sure there isn't a better fix.
-    if(++nestlevel == 1) 
+    if(++nestlevel == 1)
         SetScrollInfo( hwnd, nBar, &info, bRedraw );
     nestlevel--;
@@ -1764 +1764 @@
   SCROLL_GetScrollBarRect(hwnd,nBar,&psbi->rcScrollBar,&arrowSize,&psbi->dxyLineButton,&psbi->xyThumbTop);
   psbi->xyThumbBottom = psbi->xyThumbTop+psbi->dxyLineButton;
-  psbi->bogus = 0; //CB: undocumented!
+  //~ psbi->bogus = 0; //CB: undocumented!
+///-------------------------------------------------------------------[swt-os2]
+  psbi->reserved = 0; //CB: undocumented!
+///----------------------------------------------------------------------------
   psbi->rgstate[0] = IsWindowVisible(hwnd) ? STATE_SYSTEM_INVISIBLE:0;
   psbi->rgstate[1] = psbi->rgstate[2] = psbi->rgstate[3] = psbi->rgstate[4] = psbi->rgstate[5] = psbi->rgstate[0]; //CB: todo