fixed IntSetFocus()

reactos/subsys/win32k/ntuser

diff -u -r1.24.4.4 -r1.24.4.5
--- focus.c	27 Sep 2004 01:39:10 -0000	1.24.4.4
+++ focus.c	27 Sep 2004 13:17:12 -0000	1.24.4.5
@@ -16,7 +16,7 @@

  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *

- * $Id: focus.c,v 1.24.4.4 2004/09/27 01:39:10 royce Exp $

+ * $Id: focus.c,v 1.24.4.5 2004/09/27 13:17:12 weiden Exp $

  */
 #include <w32k.h>
 

@@ -334,11 +334,11 @@

 }
 
 PWINDOW_OBJECT INTERNAL_CALL

-IntSetFocusWindow(PWINDOW_OBJECT Window)

+IntSetFocusWindow(PUSER_MESSAGE_QUEUE WindowMessageQueue, PWINDOW_OBJECT Window)

 {
   PWINDOW_OBJECT PrevWindow;
   

-  PrevWindow = MsqSetStateWindow(Window->MessageQueue, MSQ_STATE_FOCUS, Window);

+  PrevWindow = MsqSetStateWindow(WindowMessageQueue, MSQ_STATE_FOCUS, Window);

   
   #if 0
   if(Window != PrevWindow)

@@ -354,13 +354,12 @@

 PWINDOW_OBJECT INTERNAL_CALL
 IntSetFocus(PWINDOW_OBJECT Window)
 {

+  PUSER_MESSAGE_QUEUE ThreadQueue = PsGetWin32Thread()->MessageQueue;
+  

   if(Window != NULL)
   {

-    PUSER_MESSAGE_QUEUE ThreadQueue;

     PWINDOW_OBJECT WindowTop;
     

-    ThreadQueue = PsGetWin32Thread()->MessageQueue;
-    

     if(Window->Style & (WS_MINIMIZE | WS_DISABLED))
     {
       /* FIXME - Is this right? */

@@ -383,10 +382,10 @@

       IntSetActiveWindow(WindowTop);
     }
     

-    return IntSetFocusWindow(Window);

+    return IntSetFocusWindow(ThreadQueue, Window);

   }
   

-  return IntSetFocusWindow(NULL);

+  return IntSetFocusWindow(ThreadQueue, NULL);

 }
 
 PWINDOW_OBJECT INTERNAL_CALL

reactos/subsys/win32k/ntuser

diff -u -r1.100.12.5 -r1.100.12.6
--- msgqueue.c	14 Sep 2004 01:00:44 -0000	1.100.12.5
+++ msgqueue.c	27 Sep 2004 13:17:12 -0000	1.100.12.6
@@ -16,7 +16,7 @@

  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */

-/* $Id: msgqueue.c,v 1.100.12.5 2004/09/14 01:00:44 weiden Exp $

+/* $Id: msgqueue.c,v 1.100.12.6 2004/09/27 13:17:12 weiden Exp $

  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel

@@ -1265,7 +1265,7 @@

       return NULL;
   }
   

-  return (PWINDOW_OBJECT)InterlockedExchange((LONG*)Change, (LONG)Window);

+  return (PWINDOW_OBJECT)InterlockedExchangePointer(Change, Window);

 }
 
 /* EOF */