Changeset 5137 for trunk/src/user32/window.cpp

Timestamp:

Feb 15, 2001, 1:33:01 AM (25 years ago)

Author:

sandervl

Message:

SetFocus fixes during WM_SETFOCUS

File:

• trunk/src/user32/window.cpp (modified) (5 diffs)

trunk/src/user32/window.cpp

@@ -1 @@
-/* $Id: window.cpp,v 1.87 2001-02-03 18:52:02 sandervl Exp $ */
+/* $Id: window.cpp,v 1.88 2001-02-15 00:33:01 sandervl Exp $ */
 /*
  * Win32 window apis for OS/2
@@ -34 +34 @@
 #include "user32.h"
 #include "winicon.h"
+#include "oslibmsg.h"
 #include <win\winpos.h>
 #include <win\win.h>
@@ -668 +669 @@
 HWND WIN32API SetFocus (HWND hwnd)
 {
-    HWND lastFocus, lastFocus_W, hwnd_O;
-    BOOL activate;
+ HWND lastFocus, lastFocus_W, hwnd_O;
+ BOOL activate;
+ TEB *teb;
+
+    teb = GetThreadTEB();
+    if(teb == NULL) {
+        DebugInt3();
+        return 0;
+    }
 
     hwnd_O    = Win32ToOS2Handle (hwnd);
@@ -678 +686 @@
     dprintf(("SetFocus %x (%x) -> %x (%x)\n", lastFocus_W, lastFocus, hwnd, hwnd_O));
 
+    //PM doesn't allow SetFocus calls during WM_SETFOCUS message processing; 
+    //must delay this function call
+    if(teb->o.odin.fWM_SETFOCUS) {
+        dprintf(("USER32: Delay SetFocus call!"));
+        teb->o.odin.hwndFocus = hwnd;
+        //mp1 = win32 window handle
+        //mp2 = activate flag
+        OSLibPostMessageDirect(hwnd_O, WIN32APP_SETFOCUSMSG, hwnd, activate);
+        return lastFocus_W;
+    }
     return (OSLibWinSetFocus (OSLIB_HWND_DESKTOP, hwnd_O, activate)) ? lastFocus_W : 0;
 }
@@ -684 +702 @@
 HWND WIN32API GetFocus(void)
 {
-    HWND hwnd;
+ TEB *teb;
+ HWND hwnd;
+
+    teb = GetThreadTEB();
+    if(teb == NULL) {
+        DebugInt3();
+        return 0;
+    }
+    //PM doesn't allow SetFocus calls during WM_SETFOCUS message processing; 
+    //If focus was changed during WM_SETFOCUS, the focus window handle is
+    //stored in teb->o.odin.hwndFocus (set back to 0 when delayed SetFocus
+    //is activated)
+    if(teb->o.odin.hwndFocus) {
+        dprintf(("USER32: GetFocus %x (DURING WM_SETFOCUS PROCESSING)", teb->o.odin.hwndFocus));
+        return teb->o.odin.hwndFocus;
+    }
 
     hwnd = OSLibWinQueryFocus(OSLIB_HWND_DESKTOP);