Changeset 223 for trunk/src/user32/wndproc.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/wndproc.cpp (modified) (8 diffs)

trunk/src/user32/wndproc.cpp

@@ -1 @@
-/* $Id: wndproc.cpp,v 1.10 1999-06-26 14:09:45 sandervl Exp $ */
+/* $Id: wndproc.cpp,v 1.11 1999-06-26 18:25:08 sandervl Exp $ */
 
 /*
@@ -21 +21 @@
 #include <wndclass.h>
 #include <spy.h>
+#include <wprocess.h>
 #include "dlgconvert.h"
 #include "hooks.h"
@@ -289 +290 @@
  LRESULT rc;
 
+  //Restore our FS selector
+  SetWin32TIB();
+
   if(Msg == WM_MOUSEACTIVATE) 
   {
@@ -302 +306 @@
 
   if(HkCBT::OS2HkCBTProc(hwnd, Msg, wParam, lParam) == TRUE) {//hook swallowed msg
+        RestoreOS2TIB();
         return(0);
   }
@@ -321 +326 @@
         case WM_CREATE:  //Open32 isn't sending WM_NCCREATE messages!!
                 if(curwnd->SendMessageA(hwnd, WM_NCCREATE, 0, lParam) == 0) {
-                       dprintf(("WM_NCCREATE returned FALSE\n"));
-                       return(-1); //don't create window
+                        dprintf(("WM_NCCREATE returned FALSE\n"));
+                        RestoreOS2TIB();
+                        return(-1); //don't create window
                 }
         
@@ -329 +335 @@
 #if 0
                 if(curwnd->SendMessageA(hwnd, WM_NCCALCSIZE, 0, lParam) == 0) {
+                        RestoreOS2TIB();
                         return(-1); //don't create window
                 }
@@ -357 +364 @@
                 delete curwnd;
         }
+        RestoreOS2TIB();
         return rc;
   }
@@ -370 +378 @@
                 wnd = new Win32WindowProc(wclass->GetClassCallback(szClass));
                 wnd->SetWindowHandle(hwnd);
-                return(WndCallback(hwnd, Msg, wParam, lParam));
+                rc = WndCallback(hwnd, Msg, wParam, lParam);
+                RestoreOS2TIB();
+                return rc;
         }
   }
   dprintf(("wnd Callback, can't find window %X %d!!!!\n", hwnd, Msg));
+  RestoreOS2TIB();
   return 0;
 }