Changeset 10275 for trunk/src/user32/pmwindow.cpp

Timestamp:

Oct 20, 2003, 7:17:23 PM (22 years ago)

Author:

sandervl

Message:

PM windows should have no owner if none is specified. (instead of their parent)

File:

• trunk/src/user32/pmwindow.cpp (modified) (17 diffs)

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.219 2003-08-22 13:16:45 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.220 2003-10-20 17:17:22 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -19 +19 @@
 #define INCL_DOSDEVIOCTL
 #define INCL_WINTRACKRECT
+#define INCL_BASE
 
 #include <os2wrap.h>
@@ -53 +54 @@
 #include <winscan.h>
 #include <oslibdnd.h>
+#include <custombuild.h>
 #include <win\dbt.h>
 #include "dragdrop.h"
@@ -504 +506 @@
  POSTMSG_PACKET  *postmsg;
  OSLIBPOINT       point, ClientPoint;
-
+ EXCEPTIONREGISTRATIONRECORD exceptRegRec = {0,0};
+
+    ODIN_SetExceptionHandler(&exceptRegRec);
     // restore our FS selector
     SetWin32TIB();
@@ -581 +585 @@
         RELEASE_WNDOBJ(win32wnd);
         RestoreOS2TIB();
+        ODIN_UnsetExceptionHandler(&exceptRegRec);
 
 #ifdef DEBUG
@@ -749 +754 @@
     }
    
+#ifdef DEBUG
     case WM_SETFOCUS:
     {
         HWND hwndFocus = (HWND)mp1;
         dprintf(("OS2: WM_SETFOCUS %x %x (%x) %d cur focus %x", win32wnd->getWindowHandle(), mp1, OS2ToWin32Handle(hwndFocus), mp2, WinQueryFocus(HWND_DESKTOP)));
-        break;
-    }
+        if(WinQueryFocus(HWND_DESKTOP) == win32wnd->getOS2FrameWindowHandle()) {
+            dprintf(("WARNING: Focus set to frame window"));
+        }
+        break;
+    }
+#endif
 
     //Handle all focus processed during WM_FOCUSCHANGED; PM doesn't like focus
@@ -1148 +1158 @@
     if(win32wnd) RELEASE_WNDOBJ(win32wnd);
     RestoreOS2TIB();
+    ODIN_UnsetExceptionHandler(&exceptRegRec);
 
 #ifdef DEBUG
@@ -1157 +1168 @@
 //  dprintf(("OS2: RunDefWndProc msg %x for %x", msg, hwnd));
     if(win32wnd) RELEASE_WNDOBJ(win32wnd);
+
     RestoreOS2TIB();
+    ODIN_UnsetExceptionHandler(&exceptRegRec);
 
 #ifdef DEBUG
@@ -1174 +1187 @@
  MRESULT          rc = 0;
  MSG              winMsg, *pWinMsg;
+ EXCEPTIONREGISTRATIONRECORD exceptRegRec = {0,0};
 
 #ifdef DEBUG
@@ -1179 +1193 @@
 #endif
 
+    ODIN_SetExceptionHandler(&exceptRegRec);
     //Restore our FS selector
     SetWin32TIB();
@@ -1890 +1905 @@
         rc = pfnFrameWndProc(hwnd, msg, mp1, mp2);
         SetWin32TIB();
-        dprintf2(("PMFRAME:WM_QUERYFOCUSCHAIN %x fsCmd %x parent %x returned %x", win32wnd->getWindowHandle(), SHORT1FROMMP(mp1), (mp2) ? OS2ToWin32Handle((DWORD)mp2) : 0, (rc) ? OS2ToWin32Handle((DWORD)rc) : 0));
+        dprintf2(("PMFRAME:WM_QUERYFOCUSCHAIN %x fsCmd %x parent %x returned %x (%x)", win32wnd->getWindowHandle(), SHORT1FROMMP(mp1), (mp2) ? OS2ToWin32Handle((DWORD)mp2) : 0, (rc) ? OS2ToWin32Handle((DWORD)rc) : 0, rc));
         break;
 //        goto RunDefFrameWndProc;
@@ -2164 +2179 @@
     if(win32wnd) RELEASE_WNDOBJ(win32wnd);
     RestoreOS2TIB();
+    ODIN_UnsetExceptionHandler(&exceptRegRec);
 
 #ifdef DEBUG
@@ -2174 +2190 @@
     if(win32wnd) RELEASE_WNDOBJ(win32wnd);
     RestoreOS2TIB();
+    ODIN_UnsetExceptionHandler(&exceptRegRec);
 
 #ifdef DEBUG
@@ -2184 +2201 @@
     if(win32wnd) RELEASE_WNDOBJ(win32wnd);
     RestoreOS2TIB();
+    ODIN_UnsetExceptionHandler(&exceptRegRec);
+
     //calling WinDefWindowProc here breaks Opera hotlist window (WM_ADJUSTWINDOWPOS)
 //    return pfnFrameWndProc(hwnd, msg, mp1, mp2);
@@ -2200 +2219 @@
     TEB             *teb;
     MRESULT          rc = 0;
+    EXCEPTIONREGISTRATIONRECORD exceptRegRec = {0,0};
 
     //Restore our FS selector
@@ -2218 +2238 @@
     RestoreOS2TIB();
     rc = pfnOldWindowProc(hwnd, msg, mp1, mp2);
+
+    ODIN_SetExceptionHandler(&exceptRegRec);
     SetWin32TIB();
     switch(msg) {
@@ -2239 +2261 @@
     if(win32wnd) RELEASE_WNDOBJ(win32wnd);
     RestoreOS2TIB();
+    ODIN_UnsetExceptionHandler(&exceptRegRec);
     return rc;