Changeset 2533 for trunk/src

Timestamp:

Jan 27, 2000, 10:50:03 PM (26 years ago)

Author:

sandervl

Message:

fixed fs corruption; send WM_CHILDACTIVATE to child windows

Location:

trunk/src/user32

Files:

• oslibmsg.cpp (modified) (2 diffs)
• pmframe.cpp (modified) (2 diffs)
• pmwindow.cpp (modified) (2 diffs)
• win32wbase.cpp (modified) (2 diffs)
• win32wbase.h (modified) (2 diffs)
• win32wmdichild.cpp (modified) (2 diffs)
• win32wmdichild.h (modified) (2 diffs)
• wndmsg.cpp (modified) (2 diffs)

trunk/src/user32/oslibmsg.cpp

@@ -1 @@
-/* $Id: oslibmsg.cpp,v 1.26 2000-01-18 20:10:40 sandervl Exp $ */
+/* $Id: oslibmsg.cpp,v 1.27 2000-01-27 21:50:01 sandervl Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -441 +441 @@
     packet->wParam = wParam;
     packet->lParam = lParam;
-    return _O32_PostThreadMessage(threadid, WIN32APP_POSTMSG-OPEN32_MSGDIFF, ((fUnicode) ? WIN32MSG_MAGICW : WIN32MSG_MAGICA), (LPARAM)packet);
-}
-//******************************************************************************
-//******************************************************************************
-
+    return O32_PostThreadMessage(threadid, WIN32APP_POSTMSG-OPEN32_MSGDIFF, ((fUnicode) ? WIN32MSG_MAGICW : WIN32MSG_MAGICA), (LPARAM)packet);
+}
+//******************************************************************************
+//******************************************************************************
+

trunk/src/user32/pmframe.cpp

@@ -1 @@
-/* $Id: pmframe.cpp,v 1.39 2000-01-26 18:02:35 cbratschi Exp $ */
+/* $Id: pmframe.cpp,v 1.40 2000-01-27 21:50:01 sandervl Exp $ */
 /*
  * Win32 Frame Managment Code for OS/2
@@ -13 +13 @@
 #define INCL_GPI
 
-#include <os2.h>                        /* PM header file               */
 #include <os2wrap.h>
 #include <stdlib.h>

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.81 2000-01-21 13:30:34 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.82 2000-01-27 21:50:01 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -287 +287 @@
 
     case WM_CALCVALIDRECTS:
-#if 1
+#if 0
     {
       PRECTL oldRect = (PRECTL)mp1,newRect = oldRect+1;

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.146 2000-01-27 17:21:09 cbratschi Exp $ */
+/* $Id: win32wbase.cpp,v 1.147 2000-01-27 21:50:01 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -820 +820 @@
     }
 #endif
+    /* child windows get WM_CHILDACTIVATE message */
+    if((getStyle() & (WS_CHILD | WS_POPUP)) == WS_CHILD )
+    {
+        SendInternalMessageA(WM_CHILDACTIVATE, 0, 0L);
+        return 0;
+    }
+
     rc = SendInternalMessageA(WM_ACTIVATE, MAKELONG((fActivate) ? WA_ACTIVE : WA_INACTIVE, fMinimized), hwnd);
 

trunk/src/user32/win32wbase.h

@@ -1 @@
-/* $Id: win32wbase.h,v 1.75 2000-01-27 17:21:09 cbratschi Exp $ */
+/* $Id: win32wbase.h,v 1.76 2000-01-27 21:50:02 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -106 +106 @@
          ULONG  MsgPosChanging(LPARAM lp);
          ULONG  MsgPosChanged(LPARAM lp);
-virtual  ULONG  MsgActivate(BOOL fActivate, BOOL fMinimized, HWND hwnd, HWND hwndOS2Win);
+         ULONG  MsgActivate(BOOL fActivate, BOOL fMinimized, HWND hwnd, HWND hwndOS2Win);
          ULONG  MsgSetFocus(HWND hwnd);
          ULONG  MsgKillFocus(HWND hwnd);

trunk/src/user32/win32wmdichild.cpp

@@ -1 @@
-/* $Id: win32wmdichild.cpp,v 1.19 2000-01-18 20:10:59 sandervl Exp $ */
+/* $Id: win32wmdichild.cpp,v 1.20 2000-01-27 21:50:03 sandervl Exp $ */
 /*
  * Win32 MDI Child Window Class for OS/2
@@ -57 +57 @@
 //******************************************************************************
 //******************************************************************************
-ULONG Win32MDIChildWindow::MsgActivate(BOOL fActivate, BOOL fMinimized, HWND hwnd, HWND hwndOS2Win)
-{
- ULONG rc, procidhwnd = -1, threadidhwnd = 0;
-
-    //According to SDK docs, if app returns FALSE & window is being deactivated,
-    //default processing is cancelled
-    //TODO: According to Wine we should proceed anyway if window is sysmodal
-#if 0
-    if(SendInternalMessageA(WM_NCACTIVATE, fActivate, 0) == FALSE && !fActivate)
-    {
-        return 0;
-    }
-#endif
-
-    if(fActivate)
-    {
-         rc = SendInternalMessageA(WM_CHILDACTIVATE, MAKELONG((fActivate) ? WA_ACTIVE : WA_INACTIVE, fMinimized), hwnd);
-         if(hwndOS2Win) {
-            threadidhwnd = O32_GetWindowThreadProcessId(hwndOS2Win, &procidhwnd);
-         }
-
-         if(fActivate) {
-                SendInternalMessageA(WM_ACTIVATEAPP, 1, dwThreadId);    //activate; specify window thread id
-         }
-         else   SendInternalMessageA(WM_ACTIVATEAPP, 0, threadidhwnd);  //deactivate; specify thread id of other process
-         return rc;
-    }
-    else return 1;
-}
-//******************************************************************************
-//******************************************************************************
 BOOL Win32MDIChildWindow::isMDIChild()
 {

trunk/src/user32/win32wmdichild.h

@@ -1 @@
-/* $Id: win32wmdichild.h,v 1.6 2000-01-18 20:08:17 sandervl Exp $ */
+/* $Id: win32wmdichild.h,v 1.7 2000-01-27 21:50:03 sandervl Exp $ */
 /*
  * Win32 MDI Client Window Class for OS/2
@@ -24 +24 @@
 virtual        ~Win32MDIChildWindow();
 
-virtual  ULONG  MsgActivate(BOOL fActivate, BOOL fMinimized, HWND hwnd, HWND hwndOS2Win);
-
    static HWND  createChild(Win32MDIClientWindow *client, LPMDICREATESTRUCTA cs);
            void childGetMinMaxInfo(MINMAXINFO* lpMinMax);

trunk/src/user32/wndmsg.cpp

@@ -1 @@
-/* $Id: wndmsg.cpp,v 1.10 2000-01-18 20:11:25 sandervl Exp $ */
+/* $Id: wndmsg.cpp,v 1.11 2000-01-27 21:50:03 sandervl Exp $ */
 /*
  * Win32 window message text function for OS/2
@@ -712 +712 @@
         if(PostSpyMessage(hwnd, Msg, wParam, lParam) == FALSE)
         {
+#if 1
+            if(!CheckCurFS()) {
+                dprintf(("FS CORRUPT!!!!"));
+            }
+#endif
             if(fInternalMsg) {
                     dprintf(("SendInternalMessage%c %s for %x %x %x", unicode, GetMsgText(Msg), hwnd, wParam, lParam));