Changeset 7200 for trunk/src

Timestamp:

Oct 25, 2001, 12:40:45 PM (24 years ago)

Author:

sandervl

Message:

WM_ACTIVATEAPP fix

Location:

trunk/src/user32

Files:

• pmwindow.cpp (modified) (5 diffs)
• win32wbase.cpp (modified) (2 diffs)

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.157 2001-10-24 15:41:54 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.158 2001-10-25 10:40:45 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -62 +62 @@
 
 static PFNWP pfnFrameWndProc = NULL;
+static HWND  hwndFocusChange = 0;
 
 MRESULT EXPENTRY Win32WindowProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2);
@@ -1253 +1254 @@
 #endif
 
-#ifdef DEBUG
     case WM_FOCUSCHANGE:
     {
@@ -1261 +1261 @@
         USHORT fsFocusChange = SHORT2FROMMP(mp2);
 
+        //Save window that gains focus so we can determine which
+        //process we lose activation to
+        hwndFocusChange = (HWND)mp1;
+
         dprintf(("PMFRAME:WM_FOCUSCHANGE %x %x (%x) %x %x", win32wnd->getWindowHandle(), OS2ToWin32Handle(hwndFocus), hwndFocus, usSetFocus, fsFocusChange));
         goto RunDefFrameWndProc;
     }
 
+#ifdef DEBUG
     case WM_SETFOCUS:
     {
@@ -1285 +1290 @@
                 WinSendDlgItemMsg(hwnd, FID_TITLEBAR, TBM_SETHILITE, mp1, 0);
             }
-            WinSendDlgItemMsg(hwnd, FID_CLIENT, WM_ACTIVATE, mp1, mp2);
+            if(SHORT1FROMMP(mp1) == 0) {
+                //deactivate
+                WinSendDlgItemMsg(hwnd, FID_CLIENT, WM_ACTIVATE, mp1, mp2);
+            }
+            PID pidThis, pidPartner, pidTemp;
+            TID tidPartner;
+            HENUM henum;
+            HWND  hwndEnum;
+
+            WinQueryWindowProcess(hwnd, &pidThis, NULL);
+            WinQueryWindowProcess(hwndFocusChange, &pidPartner, &tidPartner);
+
+            if(pidThis != pidPartner) {
+                //Gain or lose activation to window in other process
+                //must send WM_ACTIVATEAPP to top-level windows
+
+                //Iterate over all child windows of the desktop
+                henum = WinBeginEnumWindows(HWND_DESKTOP);
+
+                while(hwndEnum = WinGetNextWindow(henum))
+                {
+                    WinQueryWindowProcess(hwndEnum, &pidTemp, NULL);
+                    if(pidTemp == pidThis)
+                    {
+                        SendMessageA(OS2ToWin32Handle(hwndEnum), WM_ACTIVATEAPP_W, (WPARAM)SHORT1FROMMP(mp1), (LPARAM)tidPartner);
+                    }
+                }
+                WinEndEnumWindows(henum);
+            }
+            if(SHORT1FROMMP(mp1)) {
+                //activate
+                WinSendDlgItemMsg(hwnd, FID_CLIENT, WM_ACTIVATE, mp1, mp2);
+            }
 
             //CB: show owner behind the dialog

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.295 2001-10-24 15:41:54 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.296 2001-10-25 10:40:45 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -1001 +1001 @@
     }
 
-    rc = SendInternalMessageA(WM_ACTIVATE, 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;
+    return SendInternalMessageA(WM_ACTIVATE, MAKELONG((fActivate) ? WA_ACTIVE : WA_INACTIVE, fMinimized), hwnd);
 }
 //******************************************************************************