Changeset 10430 for trunk/src

Timestamp:

Jan 30, 2004, 11:10:07 PM (22 years ago)

Author:

bird

Message:

#682: Drag & Drop - AttachThreadInput().

Location:

trunk/src/user32

Files:

• oslibmsg.h (modified) (2 diffs)
• oslibmsgtranslate.cpp (modified) (4 diffs)
• windowmsg.cpp (modified) (7 diffs)

trunk/src/user32/oslibmsg.h

@@ -1 @@
-/* $Id: oslibmsg.h,v 1.23 2003-08-22 13:16:45 sandervl Exp $ */
+/* $Id: oslibmsg.h,v 1.24 2004-01-30 22:10:06 bird Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -59 +59 @@
 //Direct posting of messages that must remain invisible to the win32 app
 BOOL OSLibPostMessageDirect(HWND hwnd, ULONG msg, ULONG wParam, ULONG lParam);
+BOOL OSLibForwardMessageToAttachedThread(/*TEB*/ void *pvTeb, MSG *pMsg, void *hmm);
 
 #define WINWM_NULL                  0x0000

trunk/src/user32/oslibmsgtranslate.cpp

@@ -1 @@
-/* $Id: oslibmsgtranslate.cpp,v 1.117 2003-10-22 15:56:38 sandervl Exp $ */
+/* $Id: oslibmsgtranslate.cpp,v 1.118 2004-01-30 22:10:06 bird Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -67 +67 @@
 BOOL setThreadQueueExtraCharMessage(TEB* teb, MSG* pExtraMsg)
 {
+  if (   teb->o.odin.tidAttachedInputThread
+      && OSLibForwardMessageToAttachedThread(teb, pExtraMsg, NULL))
+      return TRUE;
+
   // check if the single slot is occupied already
   if (teb->o.odin.fTranslated == TRUE) {
@@ -165 +169 @@
   BOOL             fIsFrame = FALSE;
   int i;
+
+    /*
+     * Forwarded input (AttachThreadInput()).
+     */
+    if (    os2Msg->hwnd == NULLHANDLE
+        &&  os2Msg->msg == WIN32APP_FORWARDEDPOSTMSG
+        &&  os2Msg->mp2 == (MPARAM)WIN32APP_FORWARDEDPOSTMSG_MAGIC
+        &&  os2Msg->mp1 != NULL)
+    {
+        *winMsg = *(MSG*)os2Msg->mp1;
+        if (fMsgRemoved)
+            _sfree(os2Msg->mp1);
+        dprintf(("OS2ToWinMsgTranslate: Received forwarded messaged %x\n", os2Msg->msg));
+        return TRUE;
+    }
 
     memset(winMsg, 0, sizeof(MSG));
@@ -1203 +1222 @@
 //******************************************************************************
 
+/**
+ * Checks if the message is one that should be forwarded.
+ *
+ * @returns True if the message should be forwarded.
+ * @returns False if the message doesn't fall in to that group.
+ * @param   pMsg    Message to examin.
+ */
+BOOL OSLibForwardableMessage(const MSG *pMsg)
+{
+    return (    (pMsg->message >= WINWM_KEYFIRST   && pMsg->message <= WINWM_KEYLAST)
+            ||  (pMsg->message >= WINWM_MOUSEFIRST && pMsg->message <= WINWM_MOUSELAST) );
+}
+
+/**
+ * Forwards this message to the attached thread if it's in the group of messages
+ * which is supposed to be forwarded.
+ *
+ * @returns True if forwarded.
+ * @returns False if not forwarded.
+ * @param   pTeb    Pointer to the TEB of the current thread.
+ * @param   pMsg    Message to forward.
+ * @author  knut st. osmundsen <bird-srcspam@anduin.net>
+ */
+BOOL OSLibForwardMessageToAttachedThread(void *pvTeb, MSG *pMsg, void *hmm)
+{
+    TEB *pTeb = (TEB *)pvTeb;
+    dprintf(("OSLibForwardMessageToAttachedThread: %p %p (msg=%x)\n", pvTeb, pMsg, pMsg->message));
+    if (!OSLibForwardableMessage(pMsg))
+        return FALSE;
+
+    /*
+     * Find the actual receiver thread.
+     */
+    int c = 100;
+    TEB *pTebTo = pTeb;
+    do
+    {
+        pTebTo = GetTEBFromThreadId(pTebTo->o.odin.tidAttachedInputThread);
+    } while (c-- > 0 && !pTebTo && pTebTo->o.odin.tidAttachedInputThread);
+    if (!c || !pTebTo)
+    {
+        if (c)  dprintf(("OSLibForwardMessageToAttachedThread: The receiver thread is dead or non existing.\n"));
+        else    dprintf(("OSLibForwardMessageToAttachedThread: threads are attached in looooop.\n"));
+        return FALSE; /* hmm.... */
+    }
+    dprintf(("OSLibForwardMessageToAttachedThread: Forwarding message %#x to %#x\n",
+             pMsg->message, pTeb->o.odin.tidAttachedInputThread));
+
+    /*
+     * Pack down the message into shared memory.
+     */
+    MSG *pMsgCopy = (MSG *)_smalloc(sizeof(MSG));
+    if (!pMsgCopy)
+        return FALSE;
+    *pMsgCopy = *pMsg;
+
+    /*
+     * Figure out how we should send the message.
+     */
+    if (WinInSendMsg(pTebTo->o.odin.hab))
+    {
+#if 0
+        /*
+         * Hmm what do we do here....
+         */
+        MRESULT rc = WinSendQueueMsg(pTebTo->o.odin.hmq, /*special! */, pMsgCopy, /*magic*/ );
+        /* if (hmmSendMsgResult)
+            *hmmSendMsgResult = (???)rc; */
+#else
+        dprintf(("OSLibForwardMessage: ERROR! %x in sendmsg!!!\n", pMsg->message));
+        DebugInt3();
+
+        _sfree(pMsgCopy);
+        return FALSE;
+#endif
+    }
+    else
+    {
+        if (!WinPostQueueMsg(pTebTo->o.odin.hmq, WIN32APP_FORWARDEDPOSTMSG, pMsgCopy, (MPARAM)WIN32APP_FORWARDEDPOSTMSG_MAGIC))
+        {
+            dprintf(("OSLibForwardMessage: Failed to post queue message to hmq=%#x\n", pTebTo->o.odin.hmq));
+            _sfree(pMsgCopy);
+        }
+    }
+
+    return TRUE;
+}

trunk/src/user32/windowmsg.cpp

@@ -1 @@
-/* $Id: windowmsg.cpp,v 1.47 2003-08-08 13:30:22 sandervl Exp $ */
+/* $Id: windowmsg.cpp,v 1.48 2004-01-30 22:10:07 bird Exp $ */
 /*
  * Win32 window message APIs for OS/2
@@ -40 +40 @@
 ODINDEBUGCHANNEL(USER32-WINDOWMSG)
 
-
 //******************************************************************************
 //******************************************************************************
@@ -121 +120 @@
 {
     BOOL ret;
+    TEB *pTeb = GetThreadTEB();
 
     dprintf2(("GetMessageA %x %x-%x", hwnd, uMsgFilterMin, uMsgFilterMax));
-    ret = OSLibWinGetMsg(pMsg, hwnd, uMsgFilterMin, uMsgFilterMax);
-    if(ret) dprintf2(("GetMessageA %x %x %x %x", hwnd, pMsg->message, pMsg->wParam, pMsg->lParam));
+    do
+    {
+        ret = OSLibWinGetMsg(pMsg, hwnd, uMsgFilterMin, uMsgFilterMax);
+        if(ret) dprintf2(("GetMessageA %x %x %x %x", hwnd, pMsg->message, pMsg->wParam, pMsg->lParam));
+    } while (   pTeb->o.odin.tidAttachedInputThread
+             && OSLibForwardMessageToAttachedThread(pTeb, pMsg, NULL));
     HOOK_CallHooksA(WH_GETMESSAGE, HC_ACTION, PM_REMOVE, (LPARAM)pMsg);
     return ret;
@@ -133 +137 @@
 {
     BOOL ret;
+    TEB *pTeb = GetThreadTEB();
 
     dprintf2(("GetMessageW %x %x-%x", hwnd, uMsgFilterMin, uMsgFilterMax));
-    ret = OSLibWinGetMsg(pMsg, hwnd, uMsgFilterMin, uMsgFilterMax, TRUE);
+    do
+    {
+        ret = OSLibWinGetMsg(pMsg, hwnd, uMsgFilterMin, uMsgFilterMax, TRUE);
+    } while (   pTeb->o.odin.tidAttachedInputThread
+             && OSLibForwardMessageToAttachedThread(pTeb, pMsg, NULL));
     HOOK_CallHooksW(WH_GETMESSAGE, HC_ACTION, PM_REMOVE, (LPARAM)pMsg);
     return ret;
@@ -145 +154 @@
 {
     BOOL fFoundMsg;
+    TEB *pTeb = GetThreadTEB();
 
     dprintf2(("PeekMessageA %x %d-%d %d", hwndOwner, uMsgFilterMin, uMsgFilterMax, fuRemoveMsg));
-    fFoundMsg = OSLibWinPeekMsg(msg, hwndOwner, uMsgFilterMin, uMsgFilterMax,
-                                fuRemoveMsg, FALSE);
-    if(fFoundMsg) {
+    do
+    {
+        fFoundMsg = OSLibWinPeekMsg(msg, hwndOwner, uMsgFilterMin, uMsgFilterMax, fuRemoveMsg, FALSE);
+        if (   fFoundMsg
+            && pTeb->o.odin.tidAttachedInputThread
+            && OSLibForwardMessageToAttachedThread(pTeb, msg, NULL));
+        {
+            if (!fuRemoveMsg)
+                OSLibWinPeekMsg(msg, hwndOwner, uMsgFilterMin, uMsgFilterMax, TRUE, FALSE);
+            continue;
+        }
+    } while (0);
+
+    if (fFoundMsg) {
         dprintf2(("PeekMessageA %x %d-%d %d found message %x %d %x %x", hwndOwner, uMsgFilterMin, uMsgFilterMax, fuRemoveMsg, msg->hwnd, msg->message, msg->wParam, msg->lParam));
         HOOK_CallHooksA(WH_GETMESSAGE, HC_ACTION, fuRemoveMsg & PM_REMOVE, (LPARAM)msg );
@@ -164 +185 @@
 {
     BOOL fFoundMsg;
+    TEB *pTeb = GetThreadTEB();
 
     dprintf2(("PeekMessageW %x %d-%d %d", hwndOwner, uMsgFilterMin, uMsgFilterMax, fuRemoveMsg));
-    fFoundMsg = OSLibWinPeekMsg(msg, hwndOwner, uMsgFilterMin, uMsgFilterMax,
-                                fuRemoveMsg, TRUE);
+    do
+    {
+        fFoundMsg = OSLibWinPeekMsg(msg, hwndOwner, uMsgFilterMin, uMsgFilterMax, fuRemoveMsg, TRUE);
+        if (   fFoundMsg
+            && pTeb->o.odin.tidAttachedInputThread
+            && OSLibForwardMessageToAttachedThread(pTeb, msg, NULL));
+        {
+            if (!fuRemoveMsg)
+                OSLibWinPeekMsg(msg, hwndOwner, uMsgFilterMin, uMsgFilterMax, TRUE, TRUE);
+            continue;
+        }
+    } while (0);
+
     if(fFoundMsg) {
         dprintf2(("PeekMessageW %x %d-%d %d found message %x %d %x %x", hwndOwner, uMsgFilterMin, uMsgFilterMax, fuRemoveMsg, msg->hwnd, msg->message, msg->wParam, msg->lParam));
@@ -277 +310 @@
 }
 //******************************************************************************
+
+/**
+ * Attach one threads input queue to another thread.
+ *
+ * @returns Success indicator.
+ * @param   idAttach    Thread ID of the thread to attach/detach the input
+ *                      of idAttachTo to.
+ * @param   idAttachTo  The Thread ID of the thread which input is to be taken
+ *                      over or reattached.
+ * @param   fAttach     If set attach the input queue of thread idAttachTo
+ *                      to idAttach.
+ *                      If clear detach the input queue of thread idAttach
+ *                      reattaching it to idAttachTo.
+ * @status  partially implemented.
+ * @author  knut st. osmundsen <bird-srcspam@anduin.net>
+ * @remark  One cannot attach a threads input queue to it self.
+ * @todo    Not sure if all this is 100% ok according to the windows reality.
+ *          I'm sure some error cases aren't caught.
+ */
+BOOL WIN32API AttachThreadInput(DWORD idAttach, DWORD idAttachTo, BOOL fAttach)
+{
+    dprintf(("USER32: AttachThreadInput\n"));
+    if (idAttach != idAttachTo)
+    {
+        /* pray noone frees the TEB while we're working on it... */
+        TEB *pTeb = GetTEBFromThreadId(idAttach);
+        if (pTeb)
+        {
+            TEB *pTebTo = GetTEBFromThreadId(idAttachTo);
+            if (pTebTo)
+            {
+                if (fAttach)
+                {   /* attach. */
+                    if (pTebTo->o.odin.tidAttachedInputThread)
+                    {
+                        dprintf(("USER32: AttachThreadInput: WARNING! %#x is already attached to %#x\n", idAttachTo, pTebTo->o.odin.tidAttachedInputThread));
+                        DebugInt3();
+                    }
+                    pTebTo->o.odin.tidAttachedInputThread = idAttach;
+                    dprintf(("USER32: AttachThreadInput: Attached input from %#x to %#x\n", idAttachTo, idAttach));
+                }
+                else
+                {   /* deattach - i.e. undo previous AttachThreadInput(,,TRUE). */
+                    if (pTebTo->o.odin.tidAttachedInputThread != idAttach)
+                    {
+                        dprintf(("USER32: AttachThreadInput: WARNING! %#x is not attached to %#x\n", idAttachTo, pTebTo->o.odin.tidAttachedInputThread));
+                        DebugInt3();
+                    }
+                    pTebTo->o.odin.tidAttachedInputThread = 0;
+                    dprintf(("USER32: AttachThreadInput: Detached input from %#x to %#x\n", idAttach, idAttachTo));
+                }
+                return TRUE;
+            }
+            else
+            {
+                dprintf(("USER32: AttachThreadInput: Invalid tid=%#x\n", idAttachTo));
+                SetLastError(ERROR_INVALID_PARAMETER);
+            }
+        }
+        else
+        {
+            dprintf(("USER32: AttachThreadInput: Invalid tid=%#x\n", idAttach));
+            SetLastError(ERROR_INVALID_PARAMETER);
+        }
+    }
+    else
+    {
+        dprintf(("USER32: AttachThreadInput idAttach == idAttachTo (== %#x)\n", idAttach));
+        SetLastError(ERROR_ACCESS_DENIED);
+    }
+    return FALSE;
+}
+
 //******************************************************************************
 /**********************************************************************