Changeset 7294 for trunk/src

Timestamp:

Nov 7, 2001, 4:36:10 PM (24 years ago)

Author:

sandervl

Message:

EndDialog fix

Location:

trunk/src/user32

Files:

• pmwindow.cpp (modified) (4 diffs)
• scroll.cpp (modified) (5 diffs)
• win32dlg.cpp (modified) (2 diffs)
• win32wbase.cpp (modified) (6 diffs)

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.163 2001-10-29 13:54:39 achimha Exp $ */
+/* $Id: pmwindow.cpp,v 1.164 2001-11-07 15:36:09 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -247 +247 @@
 //******************************************************************************
 //CD notification window class
+#define TIMERID_DRIVEPOLL       0x1717
 //******************************************************************************
 MRESULT EXPENTRY Win32CDWindowProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2)
@@ -299 +300 @@
            drive[0]++;
         }
-        WinStartTimer(hab, hwnd, 17, 32*60);
-////        WinStartTimer(hab, hwnd, 17, 32*3);
-////        WinStartTimer(hab, hwnd, 17, 5000);
+        WinStartTimer(hab, hwnd, TIMERID_DRIVEPOLL, 32*60);
+////        WinStartTimer(hab, hwnd, TIMERID_DRIVEPOLL, 32*3);
+////        WinStartTimer(hab, hwnd, TIMERID_DRIVEPOLL, 5000);
         rc = (MRESULT)FALSE;
         break;
@@ -373 +374 @@
 
     case WM_DESTROY:
-        WinStopTimer(hab, hwnd, 17);
+        WinStopTimer(hab, hwnd, TIMERID_DRIVEPOLL);
         break;
 

trunk/src/user32/scroll.cpp

@@ -1 @@
-/* $Id: scroll.cpp,v 1.45 2001-10-24 09:53:14 sandervl Exp $ */
+/* $Id: scroll.cpp,v 1.46 2001-11-07 15:36:10 sandervl Exp $ */
 /*
  * Scrollbar control
@@ -1269 +1269 @@
     dprintf(("USER32: SetScrollInfo %x %d",hwnd,nBar));
 
+    if(info == NULL) return 0; //Last error not changed (NT4, SP6)
+
     if (!(infoPtr = SCROLL_GetInfoPtr(hwnd,nBar))) return 0;
     if (info->fMask & ~(SIF_ALL | SIF_DISABLENOSCROLL)) return 0;
@@ -1347 +1349 @@
     {
       new_flags = infoPtr->flags;
-      if (infoPtr->MinVal >= infoPtr->MaxVal - MAX( infoPtr->Page-1, 0 ))
+      if (infoPtr->MinVal >= infoPtr->MaxVal - MAX( infoPtr->Page-1, 0))
       {
         /* Hide or disable scroll-bar */
@@ -1539 +1541 @@
   SCROLLBAR_INFO *infoPtr;
 
+    dprintf(("GetScrollRange %x %d %x %x", hwnd, nBar, lpMin, lpMax));
     infoPtr = SCROLL_GetInfoPtr(hwnd,nBar);
     if (!infoPtr)
@@ -1665 +1668 @@
     return FALSE;
   }
+
+  dprintf(("GetScrollBarInfo %x %d %x", hwnd, idObject, psbi));
 
   INT nBar,arrowSize;

trunk/src/user32/win32dlg.cpp

@@ -1 @@
-/* $Id: win32dlg.cpp,v 1.71 2001-10-28 10:38:13 sandervl Exp $ */
+/* $Id: win32dlg.cpp,v 1.72 2001-11-07 15:36:10 sandervl Exp $ */
 /*
  * Win32 Dialog Code for OS/2
@@ -1081 +1081 @@
 BOOL Win32Dialog::endDialog(int retval)
 {
+    HWND hwnd = getWindowHandle();
+
     dialogFlags |= DF_END;
     idResult = retval;
 
+//    BOOL wasEnabled = (dlgInfo.flags & DF_OWNERENABLED);
+
+//    if (wasEnabled && (owner = GetWindow( hwnd, GW_OWNER )))
+//        DIALOG_EnableOwner( owner );
+
+    /* Windows sets the focus to the dialog itself in EndDialog */
+
+    if (::IsChild(hwnd, GetFocus()))
+       ::SetFocus( hwnd );
+
+    /* Don't have to send a ShowWindow(SW_HIDE), just do
+       SetWindowPos with SWP_HIDEWINDOW as done in Windows */
+
+    ::SetWindowPos(hwnd, (HWND)0, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE
+                 | SWP_NOZORDER | SWP_NOACTIVATE | SWP_HIDEWINDOW);
+
+    /* unblock dialog loop */
+    PostMessageA(hwnd, WM_NULL, 0, 0); 
     return TRUE;
 }

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.297 2001-10-28 10:38:13 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.298 2001-11-07 15:36:10 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -2471 +2471 @@
         return TRUE;
     }
+
 #if 0
     /* Fix redundant flags */
@@ -2483 +2484 @@
     }
 
-    if(cx < 0) cx = 0;
-    if(cy < 0) cy = 0;
+////    if(cx < 0) cx = 0;
+////    if(cy < 0) cy = 0;
 
     if((rectWindow.right - rectWindow.left == cx) && (rectWindow.bottom - rectWindow.top == cy)) {
@@ -2506 +2507 @@
         }
     }
+    /* TODO: Check hwndInsertAfter */
+
 #endif
 
@@ -2646 +2649 @@
          wpos->y      = rectWindow.top;
     }
-
+   
     WINDOWPOS wpOld = *wpos;
-    SendInternalMessageA(WM_WINDOWPOSCHANGING, 0, (LPARAM)wpos);
+    if(!(wpos->flags & SWP_NOSENDCHANGING))
+        SendInternalMessageA(WM_WINDOWPOSCHANGING, 0, (LPARAM)wpos);
 
     if ((wpos->hwndInsertAfter != wpOld.hwndInsertAfter) ||
@@ -3447 +3451 @@
 
   hwndActive = OSLibWinQueryActiveWindow();
-
   return OS2ToWin32Handle(hwndActive);
 }