Changeset 6040 for trunk/src

Timestamp:

Jun 17, 2001, 11:08:01 PM (24 years ago)

Author:

sandervl

Message:

WS_VISIBLE flag change allowed in SetWindowLong; scrollbar fix for sizebox/grip style

Location:

trunk/src/user32

Files:

• display.cpp (modified) (10 diffs)
• pmwindow.cpp (modified) (2 diffs)
• scroll.cpp (modified) (2 diffs)
• win32wbase.cpp (modified) (3 diffs)

trunk/src/user32/display.cpp

@@ -1 @@
-/* $Id: display.cpp,v 1.10 2000-10-26 17:22:23 sandervl Exp $ */
+/* $Id: display.cpp,v 1.11 2001-06-17 21:08:00 sandervl Exp $ */
 /*
  * Display/Monitor Win32 apis
@@ -434 +434 @@
     RECT rcWork;
 
-    dprintf(("USER32:  GetMonitorInfoA\n"));
+    dprintf(("USER32: GetMonitorInfoA %x %x", hMonitor, lpMonitorInfo));
 
     if ((hMonitor == xPRIMARY_MONITOR) &&
@@ -462 +462 @@
     RECT rcWork;
 
-    dprintf(("USER32:  GetMonitorInfoW\n"));
+    dprintf(("USER32: GetMonitorInfoW %x %x", hMonitor, lpMonitorInfo));
 
     if ((hMonitor == xPRIMARY_MONITOR) &&
@@ -490 +490 @@
    WINDOWPLACEMENT wp;
 
-    dprintf(("USER32:  MonitorFromWindow\n"));
+    dprintf(("USER32: MonitorFromWindow %x %x", hWnd, dwFlags));
 
     if (dwFlags & (MONITOR_DEFAULTTOPRIMARY | MONITOR_DEFAULTTONEAREST))
@@ -502 +502 @@
     }
 
+    dprintf(("USER32: MonitorFromWindow failed"));
     return NULL;
 }
@@ -508 +509 @@
 HMONITOR WIN32API MonitorFromRect(LPRECT lprcScreenCoords, DWORD dwFlags)
 {
-    dprintf(("USER32:  MonitorFromRect\n"));
+    dprintf(("USER32: MonitorFromRect (%d,%d)(%d,%d) %x", lprcScreenCoords->left, lprcScreenCoords->top, lprcScreenCoords->right, lprcScreenCoords->bottom, dwFlags));
 
       if ((dwFlags & (MONITOR_DEFAULTTOPRIMARY | MONITOR_DEFAULTTONEAREST)) ||
@@ -518 +519 @@
         return xPRIMARY_MONITOR;
     }
+    dprintf(("USER32: MonitorFromRect failed"));
     return NULL;
 }
@@ -524 +526 @@
 HMONITOR WIN32API MonitorFromPoint(POINT ptScreenCoords, DWORD dwFlags)
 {
-  dprintf(("USER32:  MonitorFromPoint\n"));
+  dprintf(("USER32: MonitorFromPoint (%d,%d) %x", ptScreenCoords.x, ptScreenCoords.y, dwFlags));
 
   if ((dwFlags & (MONITOR_DEFAULTTOPRIMARY | MONITOR_DEFAULTTONEAREST)) ||
@@ -535 +537 @@
   }
 
+  dprintf(("USER32: MonitorFromPoint failed"));
   return NULL;
 }
@@ -545 +548 @@
         LPARAM          dwData)
 {
-  dprintf(("USER32:  EnumDisplayMonitors\n"));
-
     RECT rcLimit;
+
+    dprintf(("USER32: EnumDisplayMonitors %x %x %x %x", hdcOptionalForPainting, lprcEnumMonitorsThatIntersect, lpfnEnumProc, dwData));
 
     if (!lpfnEnumProc)

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.136 2001-06-14 11:30:56 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.137 2001-06-17 21:08:00 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -1183 +1183 @@
 #ifdef DEBUG
     case WM_QUERYFOCUSCHAIN:
-        dprintf(("PMFRAME:WM_QUERYFOCUSCHAIN %x fsCmd %x parent %x", win32wnd->getWindowHandle(), SHORT1FROMMP(mp1), mp2));
+        dprintf2(("PMFRAME:WM_QUERYFOCUSCHAIN %x fsCmd %x parent %x", win32wnd->getWindowHandle(), SHORT1FROMMP(mp1), mp2));
 
         RestoreOS2TIB();
         rc = pfnFrameWndProc(hwnd, msg, mp1, mp2);
         SetWin32TIB();
-        dprintf(("PMFRAME:WM_QUERYFOCUSCHAIN %x fsCmd %x parent %x returned %x", win32wnd->getWindowHandle(), SHORT1FROMMP(mp1), mp2, rc));
+        dprintf2(("PMFRAME:WM_QUERYFOCUSCHAIN %x fsCmd %x parent %x returned %x", win32wnd->getWindowHandle(), SHORT1FROMMP(mp1), mp2, rc));
         break;
 //        goto RunDefFrameWndProc;

trunk/src/user32/scroll.cpp

@@ -1 @@
-/* $Id: scroll.cpp,v 1.39 2001-06-09 14:50:19 sandervl Exp $ */
+/* $Id: scroll.cpp,v 1.40 2001-06-17 21:08:00 sandervl Exp $ */
 /*
  * Scrollbar control
@@ -670 +670 @@
   CREATESTRUCTA *lpCreat = (CREATESTRUCTA *)lParam;
 
-  if (!(lpCreat->style & (SBS_SIZEBOX | SBS_SIZEGRIP)) && (lpCreat->style & (SBS_LEFTALIGN | SBS_RIGHTALIGN)))
+#ifdef __WIN32OS2__
+  if (!((lpCreat->style & (SBS_SIZEBOX | SBS_SIZEGRIP)) && !(lpCreat->style & (SBS_SIZEBOXTOPLEFTALIGN | SBS_SIZEBOXBOTTOMRIGHTALIGN))))
+#endif
   {
     if (lpCreat->style & SBS_VERT)

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.270 2001-06-14 14:49:17 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.271 2001-06-17 21:08:01 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -3463 +3463 @@
                     break;
                 }
-                value &= ~(WS_CHILD|WS_VISIBLE);      /* Some bits can't be changed this way (WINE) */
+                dprintf(("SetWindowLong GWL_STYLE %x old %x new style %x (%x)", getWindowHandle(), dwStyle, value));
+#ifdef DEBUG
+                if((value & WS_CHILD) != (dwStyle & WS_CHILD)) {
+                    DebugInt3(); //is this allowed?
+                }
+#endif
+                value &= ~(WS_CHILD);
                 ss.styleOld = getStyle();
-                ss.styleNew = value | (ss.styleOld & (WS_CHILD|WS_VISIBLE));
-                dprintf(("SetWindowLong GWL_STYLE %x old %x new style %x", getWindowHandle(), ss.styleOld, ss.styleNew));
+                ss.styleNew = value | (ss.styleOld & WS_CHILD);
                 SendInternalMessageA(WM_STYLECHANGING,GWL_STYLE,(LPARAM)&ss);
                 setStyle(ss.styleNew);
                 SendInternalMessageA(WM_STYLECHANGED,GWL_STYLE,(LPARAM)&ss);
                 OSLibSetWindowStyle(getOS2FrameWindowHandle(), getOS2WindowHandle(), getStyle(), getExStyle());
+
+                //TODO: Might not be correct to use ShowWindow here
+                if((ss.styleOld & WS_VISIBLE) != (ss.styleNew & WS_VISIBLE)) {
+                    if(ss.styleNew & WS_VISIBLE)
+                         ShowWindow(SW_SHOWNOACTIVATE);
+                    else ShowWindow(SW_HIDE);
+                }
 #ifdef DEBUG
                 PrintWindowStyle(ss.styleNew, 0);
@@ -3705 +3717 @@
  Win32BaseWindow *window;
 
+////TODO: temporary workaround for crashes in Opera (pmwinx; releasesemaphore)
+////      while browsing
+////      Not thread safe now!
 ////    lock(&critsect);
     if(HwGetWindowHandleData(hwnd, (DWORD *)&window) == TRUE) {