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

Timestamp:

Oct 22, 2003, 2:43:14 PM (22 years ago)

Author:

sandervl

Message:

Use WC_FRAME for the Odin frame window and subclass it; Updates for new keyboard hook

File:

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

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.221 2003-10-20 17:18:14 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.222 2003-10-22 12:43:14 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -81 +81 @@
 BOOL    fDragDropDisabled = FALSE;
 
-char WIN32_CDCLASS[255]       = "Win32CDWindowClass";
-char WIN32_STDCLASS[255]      = "Win32WindowClass";
-char WIN32_STDFRAMECLASS[255] = "Win32FrameClass";
+const char WIN32_CDCLASS[]       = "Win32CDWindowClass";
+      char WIN32_STDCLASS[255]   = "Win32WindowClass";
 
 #define PMMENU_MINBUTTON           0
@@ -106 +105 @@
 HBITMAP hBmpCloseButtonDown   = 0;
 
-static PFNWP pfnFrameWndProc = NULL;
+       PFNWP pfnFrameWndProc = NULL;
 static HWND  hwndFocusChange = 0;
        HWND  hwndCD = 0;
@@ -215 +214 @@
     }
 
+    //We no longer register our own frame window class as there is code in PM
+    //that makes assumptions about frame window class names.
+    //Instead we subclass the frame window right after creating it.
     CLASSINFO FrameClassInfo;
     if(!WinQueryClassInfo (hab, WC_FRAME, &FrameClassInfo)) {
@@ -223 +225 @@
 
     dprintf(("WC_FRAME style %x", FrameClassInfo.flClassStyle));
-
-    // this is our OS/2 window class for frame windows
-    if(!WinRegisterClass(                 /* Register window class        */
-        hab,                               /* Anchor block handle          */
-        (PSZ)WIN32_STDFRAMECLASS,          /* Window class name            */
-        (PFNWP)Win32FrameWindowProc,       /* Address of window procedure  */
-        CS_FRAME,
-        FrameClassInfo.cbWindowData))
-    {
-        dprintf(("WinRegisterClass Win32BaseWindow failed %x", WinGetLastError(hab)));
-        return(FALSE);
-    }
 
     // get the screen dimensions and store them
@@ -506 +496 @@
  POSTMSG_PACKET  *postmsg;
  OSLIBPOINT       point, ClientPoint;
-
+ EXCEPTIONREGISTRATIONRECORD exceptRegRec = {0,0};
+
+    ODIN_SetExceptionHandler(&exceptRegRec);
     // restore our FS selector
     SetWin32TIB();
@@ -583 +575 @@
         RELEASE_WNDOBJ(win32wnd);
         RestoreOS2TIB();
+        ODIN_UnsetExceptionHandler(&exceptRegRec);
 
 #ifdef DEBUG
@@ -1155 +1148 @@
     if(win32wnd) RELEASE_WNDOBJ(win32wnd);
     RestoreOS2TIB();
+    ODIN_UnsetExceptionHandler(&exceptRegRec);
 
 #ifdef DEBUG
@@ -1166 +1160 @@
 
     RestoreOS2TIB();
+    ODIN_UnsetExceptionHandler(&exceptRegRec);
 
 #ifdef DEBUG
@@ -1182 +1177 @@
  MRESULT          rc = 0;
  MSG              winMsg, *pWinMsg;
+ EXCEPTIONREGISTRATIONRECORD exceptRegRec = {0,0};
 
 #ifdef DEBUG
@@ -1187 +1183 @@
 #endif
 
+    ODIN_SetExceptionHandler(&exceptRegRec);
     //Restore our FS selector
     SetWin32TIB();
@@ -2172 +2169 @@
     if(win32wnd) RELEASE_WNDOBJ(win32wnd);
     RestoreOS2TIB();
+    ODIN_UnsetExceptionHandler(&exceptRegRec);
 
 #ifdef DEBUG
@@ -2182 +2180 @@
     if(win32wnd) RELEASE_WNDOBJ(win32wnd);
     RestoreOS2TIB();
+    ODIN_UnsetExceptionHandler(&exceptRegRec);
 
 #ifdef DEBUG
@@ -2192 +2191 @@
     if(win32wnd) RELEASE_WNDOBJ(win32wnd);
     RestoreOS2TIB();
+    ODIN_UnsetExceptionHandler(&exceptRegRec);
 
     //calling WinDefWindowProc here breaks Opera hotlist window (WM_ADJUSTWINDOWPOS)
@@ -2229 +2229 @@
     rc = pfnOldWindowProc(hwnd, msg, mp1, mp2);
 
+    ODIN_SetExceptionHandler(&exceptRegRec);
     SetWin32TIB();
     switch(msg) {
@@ -2250 +2251 @@
     if(win32wnd) RELEASE_WNDOBJ(win32wnd);
     RestoreOS2TIB();
+    ODIN_UnsetExceptionHandler(&exceptRegRec);
     return rc;
 
@@ -2464 +2466 @@
 }
 
-// @@PF Three funcs to override std class names we use in Odin
-//******************************************************************************
-//******************************************************************************
-void WIN32API SetCustomCDClassName(LPSTR pszCDClassName)
-{
-   strcpy(WIN32_CDCLASS, pszCDClassName);
-}
-//******************************************************************************
+//******************************************************************************
+// Override std class names we use in Odin (necessary for keyboard hook)
 //******************************************************************************
 void WIN32API SetCustomStdClassName(LPSTR pszStdClassName)
 {
    strcpy(WIN32_STDCLASS, pszStdClassName);
-}
-//******************************************************************************
-//******************************************************************************
-void WIN32API SetCustomStdFrameClassName(LPSTR pszStdFrameClassName)
-{
-   strcpy(WIN32_STDFRAMECLASS, pszStdFrameClassName);
 }
 //******************************************************************************