Changeset 223 for trunk/src/user32/wndclass.cpp

Timestamp:

Jun 26, 1999, 8:25:08 PM (26 years ago)

Author:

sandervl

Message:

FS changes for msg callbacks & OS2/Open32 apis

File:

• trunk/src/user32/wndclass.cpp (modified) (10 diffs)

trunk/src/user32/wndclass.cpp

@@ -1 @@
-/* $Id: wndclass.cpp,v 1.12 1999-06-26 15:07:01 sandervl Exp $ */
+/* $Id: wndclass.cpp,v 1.13 1999-06-26 18:25:08 sandervl Exp $ */
 
 /*
@@ -25 +25 @@
 #include <nameid.h>
 #include <spy.h>
+#include <wprocess.h>
 #include "hooks.h"
 
@@ -70 +71 @@
  LRESULT rc;
 
+  //Restore our FS selector
+  SetWin32TIB();
+
   PostSpyMessage(hwnd, Msg, wParam, lParam);
   switch(Msg)
@@ -75 +79 @@
         case WM_LBUTTONDOWN:
                 rc = ButtonHandler(hwnd, Msg, wParam, lParam);
+                //Restore our FS selector
+                SetWin32TIB();
 
                 NotifyParent(hwnd, Msg, wParam, lParam);
@@ -97 +103 @@
         case WM_RBUTTONDOWN:
                 rc = ButtonHandler(hwnd, Msg, wParam, lParam);
+                //Restore our FS selector
+                SetWin32TIB();
                 NotifyParent(hwnd, Msg, wParam, lParam);
+                RestoreOS2TIB();
                 return rc;
 
@@ -104 +113 @@
                 break;
   }
-  return ButtonHandler(hwnd, Msg, wParam, lParam);
+  rc = ButtonHandler(hwnd, Msg, wParam, lParam);
+  RestoreOS2TIB();
+  return rc;
 }
 //******************************************************************************
@@ -827 +838 @@
  Win32WindowProc      *window;
 
+  //Restore our FS selector
+  SetWin32TIB();
+
   if(Msg == WM_MOUSEACTIVATE) 
   {
@@ -839 +853 @@
 
   if(HkCBT::OS2HkCBTProc(hwnd, Msg, wParam, lParam) == TRUE) {//hook swallowed msg
+        RestoreOS2TIB();
         return(0);
   }
@@ -862 +877 @@
 
                         NotifyParent(hwnd, WM_CREATE, wParam, lParam);
+                        RestoreOS2TIB();
                         return(rc);
 
@@ -898 +914 @@
                         break;
                 }
-                return wclass->GetWinCallback()(hwnd, Msg, wParam, lParam);
+                rc = wclass->GetWinCallback()(hwnd, Msg, wParam, lParam);
+                RestoreOS2TIB();
+                return rc;
         }
   }
   dprintf(("OS2ToWinCallback: couldn't find class procedure of window %X\n", hwnd));
+  RestoreOS2TIB();
   return(0);
 }